strongswan: add additional PACKAGECONFIG flags
PATCH 1/3 strongswan: add additional PACKAGECONFIG flags
From: Chris Patterson <[email protected]>
- Add aesni, charon, gmp, openssl, scep, stroke, swanctl, and systemd-charon.
- Organize the packageconfig list alphabetically.
- Update the default PACKAGECONFIG to match current defaults.
- If swanctl is enabled, use strongswan-swanctl.service instead of strongswan.service.
--- .../recipes-support/strongswan/strongswan_5.3.2.bb | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-)
meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +17 -7
@@ -14,21 +14,31 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c" SRC_URI[sha256sum] = "a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225" -EXTRA_OECONF = "--enable-gmp \ - --enable-openssl \ +EXTRA_OECONF = " \ --without-lib-prefix \ " EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" -PACKAGECONFIG ??= "sqlite3 curl \ + +PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ " -PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3," -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap," +PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni," +PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," -PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4," +PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp," +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap," PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl," +PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient," +PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4," +PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3," +PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke," +PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" + +# requires swanctl +PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," inherit autotools systemd pkgconfig
@@ -42,4 +52,4 @@ FILES_${PN}-staticdev += "${libdir}/ipsec/*.a ${libdir}/ipsec/plugins/*.a" RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}-swanctl.service', '${BPN}.service', d)}"
Signature · 1 line
1.7.10.4
PATCH 2/3 strongswan: add configure patch fix for systemd
From: Chris Patterson <[email protected]>
Fixes strongswan configure script for systemd >= 209, where it merged libsystemd-journal and libsystemd-daemon into libsystemd.
--- .../strongswan/files/support-newer-systemd.patch | 69 ++++++++++++++++++++ .../recipes-support/strongswan/strongswan_5.3.2.bb | 1 + 2 files changed, 70 insertions(+) create mode 100644 meta-networking/recipes-support/strongswan/files/support-newer-systemd.patch
meta-networking/recipes-support/strongswan/files/support-newer-systemd.patch new file +69 -0
@@ -0,0 +1,69 @@ +commit 82498129e0a91dfc3ed2c4ec3b2252f44655b83c +Author: Chris Patterson <[email protected]> +Date: Fri Dec 18 08:27:57 2015 -0500 + + configure: support systemd >= 209 + + libsystemd-journal and libsystemd-daemon are now just + part of libsystemd. + + Keep original systemd checks as a fallback. + + Updates charon-systemd/Makefile.am accordingly. + + Tested on: + - debian wheezy (systemd v44) + - ubuntu 15.10 (systemd v255). + + Signed-off-by: Chris Patterson <[email protected]> + +Upstream-Status: Submitted +https://github.com/strongswan/strongswan/pull/24 + +diff --git a/configure.ac b/configure.ac +index 3d71ce0..f6c0426 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -941,13 +941,17 @@ if test x$systemd = xtrue; then + AC_MSG_ERROR([not found (try --with-systemdsystemunitdir)]) + fi + +- PKG_CHECK_MODULES(systemd_daemon, [libsystemd-daemon]) +- AC_SUBST(systemd_daemon_CFLAGS) +- AC_SUBST(systemd_daemon_LIBS) +- +- PKG_CHECK_MODULES(systemd_journal, [libsystemd-journal]) +- AC_SUBST(systemd_journal_CFLAGS) +- AC_SUBST(systemd_journal_LIBS) ++ PKG_CHECK_MODULES(systemd, [libsystemd >= 209], ++ [AC_SUBST(systemd_CFLAGS) ++ AC_SUBST(systemd_LIBS)], ++ [PKG_CHECK_MODULES(systemd_daemon, [libsystemd-daemon]) ++ AC_SUBST(systemd_daemon_CFLAGS) ++ AC_SUBST(systemd_daemon_LIBS) ++ ++ PKG_CHECK_MODULES(systemd_journal, [libsystemd-journal]) ++ AC_SUBST(systemd_journal_CFLAGS) ++ AC_SUBST(systemd_journal_LIBS) ++ ]) + fi + + if test x$tss = xtrousers; then +diff --git a/src/charon-systemd/Makefile.am b/src/charon-systemd/Makefile.am +index 1b9ac15..ee85d43 100644 +--- a/src/charon-systemd/Makefile.am ++++ b/src/charon-systemd/Makefile.am +@@ -9,11 +9,11 @@ charon_systemd_CPPFLAGS = \ + -I$(top_srcdir)/src/libstrongswan \ + -I$(top_srcdir)/src/libhydra \ + -I$(top_srcdir)/src/libcharon \ +- $(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \ ++ $(systemd_CFLAGS) $(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \ + -DPLUGINS=\""${charon_plugins}\"" + + charon_systemd_LDADD = \ + $(top_builddir)/src/libstrongswan/libstrongswan.la \ + $(top_builddir)/src/libhydra/libhydra.la \ + $(top_builddir)/src/libcharon/libcharon.la \ +- $(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB) ++ $(systemd_LIBS) $(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB)
meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +1 -0
@@ -9,6 +9,7 @@ DEPENDS = "gmp openssl flex-native flex bison-native" SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://fix-funtion-parameter.patch \ + file://support-newer-systemd.patch \ " SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c"
Signature · 1 line
1.7.10.4
PATCH 3/3 strongswan: install strongswan-swanctl systemd service by default.
In reply to Chris PattersonFrom: Chris Patterson <[email protected]>
Matches start-on-boot behaviour of current strongswan.service.
--- .../files/install-strongswan-swanctl-service.patch | 22 ++++++++++++++++++++ .../recipes-support/strongswan/strongswan_5.3.2.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta-networking/recipes-support/strongswan/files/install-strongswan-swanctl-service.patch
meta-networking/recipes-support/strongswan/files/install-strongswan-swanctl-service.patch new file +22 -0
@@ -0,0 +1,22 @@ +commit 44cbabd8a42bc2a436562ed33fb8c89fa6b75b6e +Author: Chris Patterson <[email protected]> +Date: Fri Dec 18 08:31:48 2015 -0500 + + strongswan-swanctl.service.in: match install used by strongswan.service + + Signed-off-by: Chris Patterson <[email protected]> + +Upstream-Status: Submitted +https://github.com/strongswan/strongswan/pull/25 + +diff --git a/init/systemd-swanctl/strongswan-swanctl.service.in b/init/systemd-swanctl/strongswan-swanctl.service.in +index 818d352..944101f 100644 +--- a/init/systemd-swanctl/strongswan-swanctl.service.in ++++ b/init/systemd-swanctl/strongswan-swanctl.service.in +@@ -7,3 +7,6 @@ Type=notify + ExecStart=@SBINDIR@/charon-systemd + ExecStartPost=@SBINDIR@/swanctl --load-all --noprompt + ExecReload=@SBINDIR@/swanctl --reload ++ ++[Install] ++WantedBy=multi-user.target
meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +1 -0
@@ -10,6 +10,7 @@ DEPENDS = "gmp openssl flex-native flex bison-native" SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://fix-funtion-parameter.patch \ file://support-newer-systemd.patch \ + file://install-strongswan-swanctl-service.patch \ " SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c"
Signature · 1 line
1.7.10.4
Shouldnt openssl be a packageconfig too
Quoted 81 lines · Chris Patterson
From: Chris Patterson <[email protected]>
- Add aesni, charon, gmp, openssl, scep, stroke, swanctl, and systemd-charon.
- Organize the packageconfig list alphabetically.
- Update the default PACKAGECONFIG to match current defaults.
- If swanctl is enabled, use strongswan-swanctl.service instead of strongswan.service.Signed-off-by Chris Patterson <[email protected]>--- .../recipes-support/strongswan/strongswan_5.3.2.bb | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-)(quoted diff) +0
-0strongswan_5.3.2.bb b/meta-networking/recipes-support/strongswan/ strongswan_5.3.2.bb
index a231a90..df7b496 100644meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +0
-0@@ -14,21 +14,31 @@ SRC_URI = " http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c" SRC_URI[sha256sum] ="
a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225"meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +1
-2-EXTRA_OECONF = "--enable-gmp \ - --enable-openssl \ +EXTRA_OECONF = " \ --without-lib-prefix \ " EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +15
-4-PACKAGECONFIG ??= "sqlite3 curl \ + +PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ " -PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3," -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap," +PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni," +PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," -PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4," +PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp," +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap," PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl," +PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient," +PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4," +PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3," +PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke," +PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" + +# requires swanctl +PACKAGECONFIG[systemd-charon] ="--enable-systemd,--disable-systemd,systemd,"
inherit autotools systemd pkgconfig
meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +0
-0@@ -42,4 +52,4 @@ FILES_${PN}-staticdev += "${libdir}/ipsec/*.a${libdir}/ipsec/plugins/*.a"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +1
-1-SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl','${BPN}-swanctl.service', '${BPN}.service', d)}"
--
1.7.10.4--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 1 line · Khem Raj
Shouldnt openssl be a packageconfig too
Yes, I added PACKAGECONFIG[openssl] and openssl to the default PACKAGECONFIG. Or is there something else I am missing? :)
Cheers,
-Chris
Quoted 4 lines
Quoted 4 lines
meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +2
-1-PACKAGECONFIG ??= "sqlite3 curl \ +PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,"