Merge lp:~hipl-core/hipl/hip-checksum into lp:hipl
Proposed by
Miika Komu
Status: | Merged |
---|---|
Merged at revision: | 6426 |
Proposed branch: | lp:~hipl-core/hipl/hip-checksum |
Merge into: | lp:hipl |
Diff against target: |
185 lines (+62/-17) 8 files modified
Makefile.am (+2/-2) hipfw/reinject.c (+1/-1) hipfw/rewrite.c (+1/-1) hipfw/user_ipsec_esp.c (+1/-1) libcore/builder.c (+1/-1) libcore/checksum.c (+53/-8) libhipl/output.c (+1/-1) test/libcore/checksum.c (+2/-2) |
To merge this branch: | bzr merge lp:~hipl-core/hipl/hip-checksum |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Diego Biurrun | Pending | ||
Review via email: mp+166952@code.launchpad.net |
This proposal supersedes a proposal from 2013-06-01.
Description of the change
Moving checksum.c under new licenses (under a single file). Diego's previous comments should be now addressed.
To post a comment you must log in.
review needs-fixing
On Sat, Jun 01, 2013 at 06:39:25PM -0000, Miika Komu wrote: /code.launchpad .net/~hipl- core/hipl/ hip-checksum/ +merge/ 166947
>
> For more details, see:
> https:/
>
> In order to change the copyright of checksum.c, should we retain
> the copyright boilerplates in a single file or should we split the
> checksum file (articially) into multiple files each with different
> copyright information?
Whatever you prefer.
What is the WIDE project? Also note that the last two copyright statements
are the same BSD 3-clause license.
> --- Makefile.am 2013-03-25 06:43:57 +0000 gpl/checksum. c \ solve.c \ straddr. c \ gpl/checksum. c \ checksum. c \ gpl/pk. c \ modules/ midauth_ builder. c
> +++ Makefile.am 2013-06-01 18:38:25 +0000
> @@ -158,7 +158,7 @@
> libcore/straddr.c \
> libcore/transform.c \
> - libcore/
> + libcore/checksum.c \
> libcore/gpl/nlink.c \
> libcore/gpl/pk.c \
> @@ -233,7 +233,7 @@
> test/libcore/
> test/libcore/
> - test/libcore/
> + test/libcore/
> test/libcore/
> test/libcore/
These were previously in alphabetical order.
> --- hipfw/reinject.c 2012-05-12 06:54:33 +0000 gpl/checksum. h" checksum. h"
> +++ hipfw/reinject.c 2013-06-01 18:38:25 +0000
> @@ -1,5 +1,5 @@
> /*
> - * Copyright (c) 2010 Aalto University and RWTH Aachen University.
> + * Copyright (c) 2010, 2013 Aalto University and RWTH Aachen University.
> *
> * Permission is hereby granted, free of charge, to any person
> * obtaining a copy of this software and associated documentation
> @@ -45,7 +45,7 @@
> #include "libcore/debug.h"
> #include "libcore/ife.h"
> #include "libcore/prefix.h"
> -#include "libcore/
> +#include "libcore/
> #include "reinject.h"
I wouldn't bother changing the copyright statement for such silly
mechanical changes that are not copyrightable anyway.
> --- hipfw/rewrite.c 2012-05-12 06:54:33 +0000
> +++ hipfw/rewrite.c 2013-06-01 18:38:25 +0000
> @@ -54,7 +54,6 @@
> * more thoroughly, these optimizations should be considered hacks (and
> * are thus not used here).
> *
> - * @author Christof Mroz <email address hidden>
> */
This seems unrelated.
> --- hipfw/user_ ipsec_esp. c 2013-01-27 15:57:14 +0000 ipsec_esp. c 2013-06-01 18:38:25 +0000 gpl/checksum. h" checksum. h"
> +++ hipfw/user_
> @@ -42,7 +42,7 @@
> #include "libcore/ife.h"
> #include "libcore/keylen.h"
> #include "libcore/prefix.h"
> -#include "libcore/
> +#include "libcore/
> #include "esp_prot_api.h"
> #include "hipfw_defines.h"
> #include "user_ipsec_sadb.h"
Here you don't change the copyright statement.
Diego