Patchwork [meta-networking,1/2] ipsec-tools: updated to 0.8.1

login
register
mail settings
Submitter Paul Barker
Date June 14, 2013, 5:20 p.m.
Message ID <1371230436-10343-1-git-send-email-paul@paulbarker.me.uk>
Download mbox | patch
Permalink /patch/51737/
State Accepted, archived
Headers show

Comments

Paul Barker - June 14, 2013, 5:20 p.m.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 .../ipsec-tools/files/ipsec-tools-install.patch        | 18 ------------------
 .../recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb   |  7 -------
 .../recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb   |  6 ++++++
 3 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch
 delete mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb
 create mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
Khem Raj - June 14, 2013, 5:38 p.m.
Paul

There should be already fixed see
http://git.openembedded.org/meta-openembedded/commit/?id=4136f35d5bcdd4e386ea8f105540c64e2cff0cf7

On Jun 14, 2013, at 10:20 AM, Paul Barker <paul@paulbarker.me.uk> wrote:

> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
> .../ipsec-tools/files/ipsec-tools-install.patch        | 18 ------------------
> .../recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb   |  7 -------
> .../recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb   |  6 ++++++
> 3 files changed, 6 insertions(+), 25 deletions(-)
> delete mode 100644 meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch
> delete mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb
> create mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
> 
> diff --git a/meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch b/meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch
> deleted file mode 100644
> index 85035b1..0000000
> --- a/meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -Avoid attempting to install vmbuf.h twice
> -
> -Upstream-Status: Accepted
> -
> -Taken from pld-linux.org:
> -http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipsec-tools/ipsec-tools-install.patch
> -
> ---- ipsec-tools-0.7.2/src/racoon/Makefile.am~	2008-07-23 13:48:40.000000000 +0200
> -+++ ipsec-tools-0.7.2/src/racoon/Makefile.am	2009-07-04 01:43:48.148433975 +0200
> -@@ -3,7 +3,7 @@
> - sbin_PROGRAMS = racoon racoonctl plainrsa-gen
> - noinst_PROGRAMS = eaytest
> - include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \
> --	schedule.h sockmisc.h vmbuf.h isakmp_var.h isakmp.h isakmp_xauth.h \
> -+	schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \
> - 	isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h
> - lib_LTLIBRARIES = libracoon.la
> - 
> diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb
> deleted file mode 100644
> index 255246e..0000000
> --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -require ipsec-tools.inc
> -
> -LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24"
> -
> -SRC_URI += "file://ipsec-tools-install.patch"
> -SRC_URI[ipsec-tools-0.7.2.md5sum] = "72861f005746ee27984b2ee715ecc629"
> -SRC_URI[ipsec-tools-0.7.2.sha256sum] = "08722ff6c62de3e042fef337454f03622a79053108d6dcc686c9c854f9f9e031"
> 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.1.bb
> new file mode 100644
> index 0000000..e8178ce
> --- /dev/null
> +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
> @@ -0,0 +1,6 @@
> +require ipsec-tools.inc
> +
> +LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24"
> +
> +SRC_URI[ipsec-tools-0.8.1.md5sum] = "d38b39f291ba2962387c3232e7335dd8"
> +SRC_URI[ipsec-tools-0.8.1.sha256sum] = "fa4a95bb36842f001b84c4e7a1bb727e3ee06147edbc830a881d63abe8153dd4"
> -- 
> 1.8.3
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Paul Barker - June 14, 2013, 5:56 p.m.
On 14 June 2013 18:38, Khem Raj <raj.khem@gmail.com> wrote:
> Paul
>
> There should be already fixed see
> http://git.openembedded.org/meta-openembedded/commit/?id=4136f35d5bcdd4e386ea8f105540c64e2cff0cf7
>

Sorry, didn't update my git tree before sending the patches... Just
came back to see that my bitbake world had succeeded and sent them.
Ignore these then, glad to see it's fixed.

--
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

Patch

diff --git a/meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch b/meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch
deleted file mode 100644
index 85035b1..0000000
--- a/meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch
+++ /dev/null
@@ -1,18 +0,0 @@ 
-Avoid attempting to install vmbuf.h twice
-
-Upstream-Status: Accepted
-
-Taken from pld-linux.org:
-http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipsec-tools/ipsec-tools-install.patch
-
---- ipsec-tools-0.7.2/src/racoon/Makefile.am~	2008-07-23 13:48:40.000000000 +0200
-+++ ipsec-tools-0.7.2/src/racoon/Makefile.am	2009-07-04 01:43:48.148433975 +0200
-@@ -3,7 +3,7 @@
- sbin_PROGRAMS = racoon racoonctl plainrsa-gen
- noinst_PROGRAMS = eaytest
- include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \
--	schedule.h sockmisc.h vmbuf.h isakmp_var.h isakmp.h isakmp_xauth.h \
-+	schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \
- 	isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h
- lib_LTLIBRARIES = libracoon.la
- 
diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb
deleted file mode 100644
index 255246e..0000000
--- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@ 
-require ipsec-tools.inc
-
-LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24"
-
-SRC_URI += "file://ipsec-tools-install.patch"
-SRC_URI[ipsec-tools-0.7.2.md5sum] = "72861f005746ee27984b2ee715ecc629"
-SRC_URI[ipsec-tools-0.7.2.sha256sum] = "08722ff6c62de3e042fef337454f03622a79053108d6dcc686c9c854f9f9e031"
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.1.bb
new file mode 100644
index 0000000..e8178ce
--- /dev/null
+++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
@@ -0,0 +1,6 @@ 
+require ipsec-tools.inc
+
+LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24"
+
+SRC_URI[ipsec-tools-0.8.1.md5sum] = "d38b39f291ba2962387c3232e7335dd8"
+SRC_URI[ipsec-tools-0.8.1.sha256sum] = "fa4a95bb36842f001b84c4e7a1bb727e3ee06147edbc830a881d63abe8153dd4"