diff options
author | Roy Li <rongqing.li@windriver.com> | 2014-08-12 15:19:20 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-13 23:28:05 +0200 |
commit | 4d7e174324d61c8da79152b67c4e8a434bd2d078 (patch) | |
tree | 2c5169869591efb5737b9a3bd932538c4c424021 /meta-networking/recipes-support/ipsec-tools | |
parent | 61d61c4eb8e533fb929ab6842f50509896d3df6e (diff) | |
download | meta-openembedded-4d7e174324d61c8da79152b67c4e8a434bd2d078.tar.gz |
ipsec-tools: uprev it to 0.8.2
Remove 0001-Fix-warning-with-gcc-4.8.patch, it has been in 0.8.2
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/ipsec-tools')
-rw-r--r-- | meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-warning-with-gcc-4.8.patch | 36 | ||||
-rw-r--r-- | meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb (renamed from meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb) | 5 |
2 files changed, 2 insertions, 39 deletions
diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-warning-with-gcc-4.8.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-warning-with-gcc-4.8.patch deleted file mode 100644 index 61f39d196..000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-warning-with-gcc-4.8.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From fc230d5ded73fe4049aa586eacbe4098aeff912f Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Barker <paul@paulbarker.me.uk> | ||
3 | Date: Wed, 12 Jun 2013 17:39:06 +0100 | ||
4 | Subject: [PATCH] Fix warning with gcc 4.8. | ||
5 | |||
6 | The line "memset(pair, 0, sizeof(pair));" was causing the following warning: | ||
7 | |||
8 | error: argument to 'sizeof' in 'memset' call is the same expression as | ||
9 | the destination; did you mean to dereference | ||
10 | |||
11 | Compiling with -Werror (as specified in configure.ac) was causing this warning | ||
12 | to become an error. The line itself is not needed as memory is allocated via | ||
13 | calloc which performs zero initialization. Therefore, the line is removed to fix | ||
14 | the warning and does not need replacing anything. | ||
15 | --- | ||
16 | src/racoon/ipsec_doi.c | 1 - | ||
17 | 1 file changed, 1 deletion(-) | ||
18 | |||
19 | Upstream-Status: Accepted | ||
20 | (in CVS HEAD and 0_8-stable, expected to be present in next release) | ||
21 | |||
22 | diff --git a/src/racoon/ipsec_doi.c b/src/racoon/ipsec_doi.c | ||
23 | index 2b48d49..4e9d3a8 100644 | ||
24 | --- a/src/racoon/ipsec_doi.c | ||
25 | +++ b/src/racoon/ipsec_doi.c | ||
26 | @@ -1183,7 +1183,6 @@ get_proppair_and_doi_sit(sa, mode, doitype, sittype) | ||
27 | "failed to get buffer.\n"); | ||
28 | goto bad; | ||
29 | } | ||
30 | - memset(pair, 0, sizeof(pair)); | ||
31 | |||
32 | bp = (caddr_t)(sab + 1); | ||
33 | tlen = sa->l - sizeof(*sab); | ||
34 | -- | ||
35 | 1.8.3 | ||
36 | |||
diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb index c0c22a220..208268f83 100644 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb | |||
@@ -8,15 +8,14 @@ LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7 | |||
8 | DEPENDS = "virtual/kernel openssl readline flex-native bison-native" | 8 | DEPENDS = "virtual/kernel openssl readline flex-native bison-native" |
9 | 9 | ||
10 | SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV}.tar.bz2 \ | 10 | SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV}.tar.bz2 \ |
11 | file://0001-Fix-warning-with-gcc-4.8.patch \ | ||
12 | file://0002-Don-t-link-against-libfl.patch \ | 11 | file://0002-Don-t-link-against-libfl.patch \ |
13 | file://configure.patch \ | 12 | file://configure.patch \ |
14 | file://0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch \ | 13 | file://0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch \ |
15 | file://racoon-check-invalid-pointers.patch \ | 14 | file://racoon-check-invalid-pointers.patch \ |
16 | file://racoon-check-invalid-ivm.patch \ | 15 | file://racoon-check-invalid-ivm.patch \ |
17 | " | 16 | " |
18 | SRC_URI[md5sum] = "d38b39f291ba2962387c3232e7335dd8" | 17 | SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41" |
19 | SRC_URI[sha256sum] = "fa4a95bb36842f001b84c4e7a1bb727e3ee06147edbc830a881d63abe8153dd4" | 18 | SRC_URI[sha256sum] = "8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d" |
20 | 19 | ||
21 | inherit autotools | 20 | inherit autotools |
22 | 21 | ||