diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-networking/recipes-protocols')
23 files changed, 604 insertions, 219 deletions
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb deleted file mode 100644 index 0a86504c7..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "ACCEL-PPP is a high performance VPN server application for linux" -HOMEPAGE = "http://sourceforge.net/apps/trac/accel-ppp/wiki" -SECTION = "net" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" - -DEPENDS = "openssl libpcre" - -inherit cmake - -PR = "r1" -PV = "1.7.3+git" - -SRCREV = "4acfa46c321a344b9a6ce4128e72d1e02828d8a0" -SRC_URI = "git://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp;branch=1.7" - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE = " \ - -DBUILD_DRIVER=FALSE \ - -DCMAKE_INSTALL_PREFIX=${prefix} \ - -DCMAKE_BUILD_TYPE=Release \ - -DLOG_PGSQL=FALSE \ - -DRADIUS=FALSE \ - -DNETSNMP=FALSE \ -" -FILES_${PN}-dbg += "/usr/lib/${BPN}/.debug/*" - -PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so" -INSANE_SKIP_${PN}-libs = "dev-so" -RDEPENDS_${PN} += "${PN}-libs" - -do_install_prepend() { - cmlist=`find ${S} -name CMakeLists.txt` - for file in $cmlist; do - sed -i -e "s:LIBRARY DESTINATION lib/accel-ppp:LIBRARY DESTINATION ${baselib}/accel-ppp:g" \ - -e "s:\${CMAKE_INSTALL_PREFIX}/lib/accel-ppp:\${CMAKE_INSTALL_PREFIX}/${baselib}/accel-ppp:g" \ - $cmlist - done -} - -# http://errors.yoctoproject.org/Errors/Details/81003/ -PNBLACKLIST[accel-ppp] ?= "BROKEN: fails to build with new binutils-2.27 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/build.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/build.patch new file mode 100644 index 000000000..4ab9d23bf --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/build.patch @@ -0,0 +1,167 @@ +From 43b6e98c9c37afd0d914949dcff4eab81f5a995f Mon Sep 17 00:00:00 2001 +From: Brendan Le Foll <brendan.le.foll@intel.com> +Date: Tue, 3 Mar 2015 11:42:57 +0000 + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +--- + mDNSPosix/Makefile | 54 +++++++++++++++++++++++++----------------------------- + 1 file changed, 25 insertions(+), 29 deletions(-) + +diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile +index 4f98e90..8ac97ad 100755 +--- a/mDNSPosix/Makefile ++++ b/mDNSPosix/Makefile +@@ -50,6 +50,7 @@ + + LIBVERS = 1 + ++POSIXDIR = ../mDNSPosix + COREDIR = ../mDNSCore + SHAREDDIR ?= ../mDNSShared + JDK = /usr/jdk +@@ -58,11 +59,11 @@ CC = @cc + BISON = @bison + FLEX = @flex + ST = @strip +-LD = ld -shared ++LD =@LD + CP = cp + RM = rm + LN = ln -s -f +-CFLAGS_COMMON = -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\" ++CFLAGS_COMMON = -I$(POSIXDIR) -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\" + CFLAGS_PTHREAD = + LINKOPTS = + LINKOPTS_PTHREAD = -lpthread +@@ -70,7 +71,7 @@ LDSUFFIX = so + JAVACFLAGS_OS = -fPIC -shared -ldns_sd + + # Set up diverging paths for debug vs. prod builds +-DEBUG=0 ++DEBUG?=1 + ifeq ($(DEBUG),1) + CFLAGS_DEBUG = -g -DMDNS_DEBUGMSGS=2 + OBJDIR = objects/debug +@@ -213,7 +214,7 @@ endif + endif + endif + +-CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) ++CFLAGS_BUILD = $(CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) + + ############################################################################# + +@@ -249,8 +250,7 @@ Daemon: setup $(BUILDDIR)/mdnsd + @echo "Responder daemon done" + + $(BUILDDIR)/mdnsd: $(DAEMONOBJS) +- $(CC) -o $@ $+ $(LINKOPTS) +- @$(STRIP) $@ ++ $(CC) -o $@ $+ + + # libdns_sd target builds the client library + libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) +@@ -259,22 +259,18 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) + CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o + + $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) +- @$(LD) $(LINKOPTS) -o $@ $+ +- @$(STRIP) $@ ++ $(LD) -shared $(LINKOPTS) -Wl,-soname,libdns_sd.$(LDSUFFIX).1 -o $@ $+ + +-Clients: setup libdns_sd ../Clients/build/dns-sd ++Clients: setup libdns_sd ++ @$(MAKE) -C ../Clients DEBUG=${DEBUG} + @echo "Clients done" + +-../Clients/build/dns-sd: +- @$(MAKE) -C ../Clients +- + # nss_mdns target builds the Name Service Switch module + nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE) + @echo "Name Service Switch module done" + + $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o +- @$(LD) $(LINKOPTS) -o $@ $+ +- @$(STRIP) $@ ++ $(LD) -shared $(LINKOPTS) -o $@ $+ + + ############################################################################# + +@@ -470,55 +466,55 @@ dnsextd: setup $(BUILDDIR)/dnsextd + @echo "dnsextd done" + + $(BUILDDIR)/mDNSClientPosix: $(APPOBJ) $(OBJDIR)/Client.c.o +- $(CC) $+ -o $@ $(LINKOPTS) ++ $(CC) $+ -o $@ + + $(BUILDDIR)/mDNSResponderPosix: $(COMMONOBJ) $(OBJDIR)/Responder.c.o +- $(CC) $+ -o $@ $(LINKOPTS) ++ $(CC) $+ -o $@ + + $(BUILDDIR)/mDNSProxyResponderPosix: $(COMMONOBJ) $(OBJDIR)/ProxyResponder.c.o +- $(CC) $+ -o $@ $(LINKOPTS) ++ $(CC) $+ -o $@ + + $(BUILDDIR)/mDNSIdentify: $(SPECIALOBJ) $(OBJDIR)/Identify.c.o +- $(CC) $+ -o $@ $(LINKOPTS) ++ $(CC) $+ -o $@ + + $(OBJDIR)/Identify.c.o: $(COREDIR)/mDNS.c # Note: Identify.c textually imports mDNS.c + + $(BUILDDIR)/mDNSNetMonitor: $(SPECIALOBJ) $(OBJDIR)/NetMonitor.c.o +- $(CC) $+ -o $@ $(LINKOPTS) ++ $(CC) $+ -o $@ + + $(OBJDIR)/NetMonitor.c.o: $(COREDIR)/mDNS.c # Note: NetMonitor.c textually imports mDNS.c + + $(BUILDDIR)/dnsextd: $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o +- $(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD) ++ $(CC) $+ -o $@ $(LINKOPTS_PTHREAD) + + ############################################################################# + + # Implicit rules + $(OBJDIR)/%.c.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS_BUILD) -c -o $@ $< + + $(OBJDIR)/%.c.o: $(COREDIR)/%.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS_BUILD) -c -o $@ $< + + $(OBJDIR)/%.c.o: $(SHAREDDIR)/%.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS_BUILD) -c -o $@ $< + + $(OBJDIR)/%.c.threadsafe.o: %.c +- $(CC) $(CFLAGS) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $< ++ $(CC) $(CFLAGS_BUILD) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $< + + $(OBJDIR)/%.c.threadsafe.o: $(SHAREDDIR)/%.c +- $(CC) $(CFLAGS) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $< ++ $(CC) $(CFLAGS_BUILD) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $< + + $(OBJDIR)/%.c.so.o: %.c +- $(CC) $(CFLAGS) -c -fPIC -o $@ $< ++ $(CC) $(CFLAGS_BUILD) -c -fPIC -o $@ $< + + $(OBJDIR)/%.c.so.o: $(SHAREDDIR)/%.c +- $(CC) $(CFLAGS) -c -fPIC -o $@ $< ++ $(CC) $(CFLAGS_BUILD) -c -fPIC -o $@ $< + + $(OBJDIR)/%.y.o: $(SHAREDDIR)/%.y + $(BISON) -o $(OBJDIR)/$*.c -d $< +- $(CC) $(CFLAGS) -c -o $@ $(OBJDIR)/$*.c ++ $(CC) $(CFLAGS_BUILD) -c -o $@ $(OBJDIR)/$*.c + + $(OBJDIR)/%.l.o: $(SHAREDDIR)/%.l + $(FLEX) $(FLEXFLAGS_OS) -i -o$(OBJDIR)/$*.l.c $< +- $(CC) $(CFLAGS) -Wno-error -c -o $@ $(OBJDIR)/$*.l.c ++ $(CC) $(CFLAGS_BUILD) -Wno-error -c -o $@ $(OBJDIR)/$*.l.c +-- +2.9.5 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/mdns.service b/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/mdns.service new file mode 100644 index 000000000..531d142dc --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/mdns.service @@ -0,0 +1,15 @@ +[Unit] +Description=Zero-configuration networking +After=network.target + +[Service] +Type=forking +ExecStartPre=/bin/rm -f /var/run/mdnsd.pid +ExecStart=/usr/sbin/mdnsd +ExecReload=/bin/kill -HUP $MAINPID +PIDFile=/var/run/mdnsd.pid +Restart=always +RestartSec=10s + +[Install] +WantedBy=multi-user.target diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb new file mode 100644 index 000000000..1a80f7acb --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb @@ -0,0 +1,89 @@ +SUMMARY = "Publishes & browses available services on a link according to the Zeroconf / Bonjour protocol" +DESCRIPTION = "Bonjour, also known as zero-configuration networking, enables automatic discovery of computers, devices, and services on IP networks." +HOMEPAGE = "http://developer.apple.com/networking/bonjour/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf" + +RPROVIDES_${PN} += "libdns_sd.so" + +SRC_URI = "http://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ + file://build.patch;patchdir=.. \ + file://mdns.service \ + " + +SRC_URI[md5sum] = "4a6bc1628851002634ea3833a4dca317" +SRC_URI[sha256sum] = "de61dd0034357aa50c60806726fb1f70fa8e953ff9cb62eccfb73efad10dba0a" + +PARALLEL_MAKE = "" + +S = "${WORKDIR}/mDNSResponder-${PV}/mDNSPosix" + +EXTRA_OEMAKE += "os=linux DEBUG=0 'CC=${CC}' 'LD=${CCLD} ${LDFLAGS}'" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install () { + install -d ${D}${sbindir} + install -m 0755 build/prod/mdnsd ${D}${sbindir} + + install -d ${D}${libdir} + cp build/prod/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 + chmod 0644 ${D}${libdir}/libdns_sd.so.1 + ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so + + install -d ${D}${includedir} + install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir} + + install -d ${D}${mandir}/man8 + install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 + + install -d ${D}${bindir} + install -m 0755 ../Clients/build/dns-sd ${D}${bindir} + + install -d ${D}${libdir} + oe_libinstall -C build/prod -so libnss_mdns-0.2 ${D}${libdir} + ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2 + + install -d ${D}${sysconfdir} + install -m 0644 nss_mdns.conf ${D}${sysconfdir} + + install -d ${D}${mandir}/man5 + install -m 0644 nss_mdns.conf.5 ${D}${mandir}/man5 + + install -d ${D}${mandir}/man8 + install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_unitdir}/system/ +} + +pkg_postinst_${PN} () { + sed -e '/^hosts:/s/\s*\<mdns\>//' \ + -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mdns\3\4\5/' \ + -i $D/etc/nsswitch.conf +} + +pkg_prerm_${PN} () { + sed -e '/^hosts:/s/\s*\<mdns\>//' \ + -e '/^hosts:/s/\s*mdns//' \ + -i $D/etc/nsswitch.conf +} + +inherit systemd + +SYSTEMD_SERVICE_${PN} = "mdns.service" + +FILES_${PN} += "${systemd_unitdir}/system/mdns.service" +FILES_${PN} += "${libdir}/libdns_sd.so.1 \ + ${bindir}/dns-sd \ + ${libdir}/libnss_mdns-0.2.so \ + ${sysconfdir}/nss_mdns.conf" + +FILES_${PN}-dev += "${libdir}/libdns_sd.so \ + ${includedir}/dns_sd.h " + +FILES_${PN}-man += "${mandir}/man8/mdnsd.8 \ + ${mandir}/man5/nss_mdns.conf.5 \ + ${mandir}/man8/libnss_mdns.8" + +PACKAGES = "${PN} ${PN}-dev ${PN}-man ${PN}-dbg" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/init b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/init index 2b8fe18b3..47995466f 100755 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/init +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/init @@ -3,9 +3,6 @@ . /etc/init.d/functions -test -x /usr/sbin/snmpd || exit 0 -test -x /usr/sbin/snmptrapd || exit 0 - # Defaults export MIBDIRS=/usr/share/snmp/mibs SNMPDRUN=yes @@ -18,6 +15,9 @@ SPIDFILE=/var/run/snmptrapd.pid # Reads config file if exists (will override defaults above) [ -r /etc/default/snmpd ] && . /etc/default/snmpd +[ "$SNMPDRUN" = "yes" ] && { test -x /usr/sbin/snmpd || exit 0; } +[ "$TRAPDRUN" = "yes" ] && { test -x /usr/sbin/snmptrapd || exit 0; } + case "$1" in start) echo -n "Starting network management services:" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch new file mode 100644 index 000000000..efe803876 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch @@ -0,0 +1,45 @@ +From e47c60dc7f649959f63e56bc62355de4bdfd73f4 Mon Sep 17 00:00:00 2001 +From: Marian Florea <marian.florea@windriver.com> +Date: Thu, 20 Jul 2017 16:55:24 +0800 +Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP + +Upstream-Status: Pending + +Signed-off-by: Marian Florea <marian.florea@windriver.com> +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + agent/snmpd.c | 1 + + snmplib/snmpv3.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/agent/snmpd.c b/agent/snmpd.c +index 056048a..12a7ea1 100644 +--- a/agent/snmpd.c ++++ b/agent/snmpd.c +@@ -1246,6 +1246,7 @@ receive(void) + snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", + netsnmp_get_version()); + update_config(); ++ snmp_store(app_name); + send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); + #if HAVE_SIGHOLD + sigrelse(SIGHUP); +diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c +index 435cafd..6ad8208 100644 +--- a/snmplib/snmpv3.c ++++ b/snmplib/snmpv3.c +@@ -984,9 +984,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg, + /* + * if our engineID has changed at all, the boots record must be set to 1 + */ +- if (engineIDLen != oldEngineIDLength || ++ if (oldEngineIDLength != (size_t)0 && (engineIDLen != oldEngineIDLength || + oldEngineID == NULL || c_engineID == NULL || +- memcmp(oldEngineID, c_engineID, engineIDLen) != 0) { ++ memcmp(oldEngineID, c_engineID, engineIDLen) != 0)) { + engineBoots = 1; + } + +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch new file mode 100644 index 000000000..25eb9c96f --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch @@ -0,0 +1,32 @@ +From 270e952f58a7e5ddeabe5a15e3ddaaadf40017d0 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Thu, 22 Jun 2017 10:25:08 +0800 +Subject: [PATCH] net-snmp: fix for --disable-des + +Include des.h only if it's found in openssl so that +the --disable-des works correctly. + +Upstream-Status: Submitted [net-snmp-coders@lists.sourceforge.net] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + snmplib/scapi.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/snmplib/scapi.c b/snmplib/scapi.c +index 16ac829..271684b 100644 +--- a/snmplib/scapi.c ++++ b/snmplib/scapi.c +@@ -79,7 +79,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support) + #include <openssl/hmac.h> + #include <openssl/evp.h> + #include <openssl/rand.h> ++#ifdef HAVE_OPENSSL_DES_H + #include <openssl/des.h> ++#endif + #ifdef HAVE_AES + #include <openssl/aes.h> + #endif +-- +2.11.0 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb index 2d6887e37..849ae0763 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb @@ -30,6 +30,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ file://0002-configure-fix-a-cc-check-issue.patch \ file://0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch \ file://0004-configure-fix-incorrect-variable.patch \ + file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ + file://net-snmp-fix-for-disable-des.patch \ " SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e" @@ -58,7 +60,8 @@ EXTRA_OECONF = "--enable-shared \ --with-defaults \ --with-install-prefix=${D} \ --with-persistent-directory=${localstatedir}/lib/net-snmp \ - ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}" + ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ +" # net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp EXTRA_OECONF += "--with-mib-modules=smux" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch new file mode 100644 index 000000000..a11a97ebd --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch @@ -0,0 +1,31 @@ +From 8f299df4dd1ca857e34859c377a29b183c630961 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Sep 2017 13:05:03 -0700 +Subject: [PATCH] l2tp_api.c: include rpc/clnt.h for 'resultproc_t' + +Fixes + +| /mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/openl2tp/1.8-r0/recipe-sysroot/usr/include/tirpc/rpc/pmap_clnt.h:81:12: error: unknown type name 'resultproc_t'; did you mean 'rpcproc_t'? | resultproc_t); | ^~~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + l2tp_api.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/l2tp_api.c b/l2tp_api.c +index f0946fd..f77881c 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -26,6 +26,7 @@ + #include <sys/types.h> + #include <rpc/types.h> + #include <rpc/xdr.h> ++#include <rpc/clnt.h> + #include <rpc/pmap_clnt.h> + //#include <netinet/in.h> + +-- +2.14.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch new file mode 100644 index 000000000..3119425e6 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch @@ -0,0 +1,35 @@ +commit 6ea3125e2bec15004f312814022335d94cdf7e94 +Author: Aws Ismail <aws.ismail@windriver.com> +Date: Wed Sep 19 11:34:48 2012 -0400 + + Fix openl2tp config script location + + Correct the location of the sysconfig + script. Use /etc/default/ instead of + /etc/sysconfig/ + + Signed-off-by: Aws Ismail <aws.ismail@windriver.com> + + Upstream-Status: Inappropriate [configuration] + + Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd +index 7f27bb7..4194f63 100755 +--- a/etc/rc.d/init.d/openl2tpd ++++ b/etc/rc.d/init.d/openl2tpd +@@ -8,12 +8,12 @@ + # can be used to implement L2TP VPNs. As a server, it can handle + # hundreds of tunnels and sessions. + # processname: openl2tpd +-# config: /etc/sysconfig/openl2tpd ++# config: /etc/default/openl2tpd + # pidfile: /var/run/openl2tpd.pid + + # Source function library. + . /etc/init.d/functions +-. /etc/sysconfig/openl2tpd ++. /etc/default/openl2tpd + + # See how we were called. + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-warning.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-warning.patch new file mode 100644 index 000000000..15a8c5b08 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-warning.patch @@ -0,0 +1,32 @@ +openl2tp: eliminate warning from modprobe + +modprobe will emit alarming warnings if it cannot +find a module, but we only care that it find one +of two possible modules when we start openl2tpd. + +Suppress messages from modprobe. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <jslater@windriver.com> + +--- a/etc/rc.d/init.d/openl2tpd ++++ b/etc/rc.d/init.d/openl2tpd +@@ -29,7 +29,7 @@ start() { + return 1 + fi + fi +- modprobe -s pppol2tp || modprobe -s l2tp_ppp ++ modprobe -sq pppol2tp || modprobe -sq l2tp_ppp + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + start-stop-daemon --start --exec openl2tpd $OPENL2TPDARGS +@@ -57,7 +57,7 @@ stop() { + return 1; + fi + killproc openl2tpd +- modprobe -s -r pppol2tp || modprobe -s -r l2tp_ppp ++ modprobe -srq pppol2tp || modprobe -srq l2tp_ppp + echo + rm -f /var/run/openl2tpd.pid + rm -f /var/lock/subsys/openl2tpd diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch new file mode 100644 index 000000000..9ecd4b072 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch @@ -0,0 +1,49 @@ +commit 7c58a1e244ea83a9e7bbd51a6d354cee25cdbd33 +Author: Aws Ismail <aws.ismail@windriver.com> +Date: Wed Sep 12 23:35:40 2012 -0400 + + Fix openl2tpd initscript + + - Correct the location of the retval statement. + - use start-stop-daemon instead of daemon. + + Signed-off-by: Aws Ismail <aws.ismail@windriver.com> + + Upstream-Status: Inappropriate [OE specific] + + Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd +index ce21b50..7f27bb7 100755 +--- a/etc/rc.d/init.d/openl2tpd ++++ b/etc/rc.d/init.d/openl2tpd +@@ -24,7 +24,7 @@ start() { + if [ -e /var/lock/subsys/openl2tpd ]; then + if [ -e /var/run/openl2tpd.pid ] && [ -e /proc/`cat /var/run/openl2tpd.pid` ]; then + echo -n $"cannot start openl2tpd: openl2tpd is already running."; +- failure $"cannot start openl2tpd: openl2tpd already running."; ++ #failure $"cannot start openl2tpd: openl2tpd already running."; + echo + return 1 + fi +@@ -32,9 +32,9 @@ start() { + modprobe -s pppol2tp || modprobe -s l2tp_ppp + RETVAL=$? + if [ $RETVAL -eq 0 ]; then +- daemon openl2tpd $OPENL2TPDARGS ++ start-stop-daemon --start --exec openl2tpd $OPENL2TPDARGS ++ RETVAL=$? + fi +- RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + touch /var/lock/subsys/openl2tpd +@@ -52,7 +52,7 @@ stop() { + echo -n $"Stopping $prog: " + if [ ! -e /var/lock/subsys/openl2tpd ]; then + echo -n $"cannot stop openl2tpd: openl2tpd is not running." +- failure $"cannot stop openl2tpd: openl2tpd is not running." ++ #failure $"cannot stop openl2tpd: openl2tpd is not running." + echo + return 1; + fi diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service new file mode 100644 index 000000000..7b3faf672 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service @@ -0,0 +1,17 @@ +[Unit] +Description=The open L2TP implementation +After=network.target remote-fs.target nss-lookup.target rpcbind.target +Requires=rpcbind.service + +[Service] +Type=forking +PIDFile=@STATEDIR@/run/openl2tpd.pid +EnvironmentFile=@SYSCONFDIR@/default/openl2tpd +ExecStartPre=@BASE_BINDIR@/sh -c "@BASE_SBINDIR@/modprobe -sq l2tp_ppp || @BASE_SBINDIR@/modprobe -sq pppol2tp" +ExecStart=@SBINDIR@/openl2tpd $OPENL2TPDARGS +ExecStartPost=@BASE_BINDIR@/sh -c 'if [ -n "$OPENL2TPD_CONFIG_FILE" ]; then sleep 1; @BINDIR@/l2tpconfig config restore file=$OPENL2TPD_CONFIG_FILE; fi' +ExecStopPost=@BASE_BINDIR@/sh -c "@BASE_SBINDIR@/modprobe -rsq l2tp_ppp || @BASE_SBINDIR@/modprobe -rsq pppol2tp" +SuccessExitStatus=1 + +[Install] +WantedBy=multi-user.target diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index e1670b3ae..bbde8a337 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -7,8 +7,15 @@ different configuration. It is used by several ISPs to provide \ L2TP services and by corporations to implement L2TP VPNs." HOMEPAGE = "http://www.openl2tp.org/" SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9d9259cbbf00945adc25a470c1d3585" + +# cli and usl use license LGPL-2.1 +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9d9259cbbf00945adc25a470c1d3585 \ + file://LICENSE;md5=f8970abd5ea9be701a0deedf5afd77a5 \ + file://cli/LICENSE;md5=9c1387a3c5213aa40671438af3e00793 \ + file://usl/LICENSE;md5=9c1387a3c5213aa40671438af3e00793 \ + " + DEPENDS = "popt flex readline" SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ @@ -20,16 +27,24 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://0002-cli-include-fcntl.h-for-O_CREAT-define.patch \ file://0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch \ file://0001-l2tp_api-Included-needed-headers.patch \ + file://openl2tpd-initscript-fix.patch \ + file://openl2tpd-initscript-fix-sysconfig.patch \ + file://openl2tpd-initscript-fix-warning.patch \ + file://openl2tpd.service \ " SRC_URI_append_libc-musl = "\ file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \ file://0002-user-ipv6-structures.patch \ + file://0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" -inherit autotools-brokensep pkgconfig +inherit autotools-brokensep pkgconfig systemd + +SYSTEMD_SERVICE_${PN} = "openl2tpd.service" +SYSTEMD_AUTO_ENABLE = "disable" DEPENDS_append_libc-musl = " libtirpc" CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" @@ -51,3 +66,23 @@ do_compile_prepend() { -e 's:CPPFLAGS-y:CPPFLAGS:g' \ ${S}/Makefile } + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default + install -m 0755 ${S}/etc/rc.d/init.d/openl2tpd ${D}${sysconfdir}/init.d/openl2tpd + install -m 0755 ${S}/etc/sysconfig/openl2tpd ${D}${sysconfdir}/default/openl2tpd + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -D -m 0644 ${WORKDIR}/openl2tpd.service ${D}${systemd_system_unitdir}/openl2tpd.service + sed -i -e 's,@STATEDIR@,${localstatedir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@BINDIR@,${bindir},g' \ + -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ + -e 's,@BASE_BINDIR@,${base_bindir},g' \ + ${D}${systemd_system_unitdir}/openl2tpd.service + fi +} + +RDEPENDS_${PN} = "ppp ppp-l2tp bash" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch new file mode 100644 index 000000000..804bf1234 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch @@ -0,0 +1,28 @@ +From f6c4d2468ae0dadd2f35680d61b98b2a59077328 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 7 Jul 2017 10:31:03 -0700 +Subject: [PATCH] include missing sys/types.h + +Fixes errors seen on musl +pqueue.h:21:3: error: unknown type name 'u_int32_t' + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pqueue.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pqueue.h b/pqueue.h +index c37ba7b..ae4cc6a 100644 +--- a/pqueue.h ++++ b/pqueue.h +@@ -3,6 +3,7 @@ + + #include <time.h> + #include <sys/time.h> ++#include <sys/types.h> + + /* wait this many seconds for missing packets before forgetting about them */ + #define DEFAULT_PACKET_TIMEOUT 0.3 +-- +2.13.2 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp b/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/options.pptp index f446e22a6..f446e22a6 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/options.pptp diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb index bc8b2cb2b..10c9170fb 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb @@ -9,14 +9,13 @@ SECTION = "net" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PR = "r1" - SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ file://options.pptp \ -" + file://0001-include-missing-sys-types.h.patch \ + " -SRC_URI[md5sum] = "4efce9f263e2c3f38d79d9df222476de" -SRC_URI[sha256sum] = "e39c42d933242a8a6dd8600a0fa7f0a5ec8f066d10c4149d8e81a5c68fe4bbda" +SRC_URI[md5sum] = "b2117b377f65294a9786f80f0235d308" +SRC_URI[sha256sum] = "0b1e8cbfc578d3f5ab12ee87c5c2c60419abfe9cc445690a8a19c320b11c9201" S = "${WORKDIR}/pptp-${PV}" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc index 4fb6723c3..dfd6aa7eb 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc @@ -7,21 +7,20 @@ Ishiguro. The Quagga tree aims to build a more involved community \ around Quagga than the current centralised model of GNU Zebra." HOMEPAGE = "http://www.nongnu.org/quagga/" SECTION = "net" -LICENSE = "GPL-2.0 & LGPL-2.0" -DEPENDS = "readline ncurses perl-native" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" -SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" + +LICENSE = "GPL-2.0 & LGPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \ file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c" +DEPENDS = "readline ncurses perl-native c-ares" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" +SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" + # the "ip" command from busybox is not sufficient (flush by protocol flushes all routes) RDEPENDS_${PN} += "iproute2" -QUAGGASUBDIR = "" -# ${QUAGGASUBDIR} is deal with old versions. Set to "/attic" for old -# versions and leave it empty for recent versions. -SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \ +SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga/quagga-${PV}.tar.gz; \ file://quagga.init \ file://quagga.default \ file://watchquagga.init \ @@ -35,7 +34,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \ file://ripd.service \ file://ripngd.service \ file://zebra.service \ -" + " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" @@ -108,10 +107,6 @@ do_install () { sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* - # Remove generated info dir file, it doesn't belong in the generated - # package. - rm -f ${D}${infodir}/dir - # For PAM for feature in ${DISTRO_FEATURES}; do if [ "$feature" = "pam" ]; then @@ -188,9 +183,6 @@ CONFFILES_${PN}-watchquagga = "${sysconfdir}/default/watchquagga" DEBIAN_NOAUTONAME_${PN}-ospfd = "1" DEBIAN_NOAUTONAME_${PN}-ospfclient = "1" -# the "ip" command from busybox is not sufficient (flush by protocol flushes all routes) -RDEPENDS_${PN} += "iproute2" - # Main init script starts all deamons # Seperate init script for watchquagga INITSCRIPT_PACKAGES = "${PN} ${PN}-watchquagga" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.1.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.1.0.bb deleted file mode 100644 index 1b5c34c87..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require quagga.inc - -SRC_URI[md5sum] = "daa303871e07ea5856aae6fd79e89722" -SRC_URI[sha256sum] = "f7a43a9c59bfd3722002210530b2553c8d5cc05bfea5acd56d4f102b9f55dc63" - -QUAGGASUBDIR = "" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.1.bb new file mode 100644 index 000000000..4d43d7b2a --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.1.bb @@ -0,0 +1,4 @@ +require quagga.inc + +SRC_URI[md5sum] = "b1546de89062f7070d56e780b30be4b1" +SRC_URI[sha256sum] = "aaddba5d4f41ed8e4c2f155f4584c993465d122c9096b5b52ada3fc75266fbcd" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc b/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc index 6f7f69330..d037c7cfc 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc @@ -6,12 +6,9 @@ DEPENDS = "ppp virtual/kernel" PACKAGE_ARCH = "${MACHINE_ARCH}" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0636e73ff0215e8d672dc4c32c317bb3" - -INC_PR = "r0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/xelerance/xl2tpd.git \ - file://fix-inline-functions-errors-with-gcc-5.x.patch \ " S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch deleted file mode 100644 index b75c9129d..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch +++ /dev/null @@ -1,134 +0,0 @@ -Upstream-Status: Backport - -Backport from https://github.com/xelerance/xl2tpd/commit/9098f64950eb22cf049058d40f647bafdb822174 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From 9098f64950eb22cf049058d40f647bafdb822174 Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Wed, 23 Sep 2015 10:41:05 +0800 -Subject: [PATCH] Fix build errors caused by inline function with gcc 5 - -GCC 5 defaults to -std=gnu11 instead of -std=gnu89. And -std=gnu89 -employs the GNU89 inline semantics, -std=gnu11 uses the C99 inline -semantics. - -For 'inline' fuction, it is NOT exported by C99. So error messages such as: - -| control.c:1717: undefined reference to `check_control' - -For these functions which is not referred by other compile units, make -them 'static inline'. - -For 'extern inline' function, it fails such as: - -| misc.h:68:20: warning: inline function 'swaps' declared but never defined -| extern inline void swaps (void *, int); -| ^ - -Because function swaps() is referred by other compile units, it must be -exported. The semantics of 'extern inline' are not same between GNU89 -and C99, so remove 'inline' attribute for compatible with GNU89. - -Ref: -https://gcc.gnu.org/gcc-5/porting_to.html - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - control.c | 8 ++++---- - misc.c | 2 +- - misc.h | 2 +- - network.c | 4 ++-- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/control.c b/control.c -index b2891a9..c4a39b5 100644 ---- a/control.c -+++ b/control.c -@@ -1140,7 +1140,7 @@ int control_finish (struct tunnel *t, struct call *c) - return 0; - } - --inline int check_control (const struct buffer *buf, struct tunnel *t, -+static inline int check_control (const struct buffer *buf, struct tunnel *t, - struct call *c) - { - /* -@@ -1276,7 +1276,7 @@ inline int check_control (const struct buffer *buf, struct tunnel *t, - return 0; - } - --inline int check_payload (struct buffer *buf, struct tunnel *t, -+static inline int check_payload (struct buffer *buf, struct tunnel *t, - struct call *c) - { - /* -@@ -1382,7 +1382,7 @@ inline int check_payload (struct buffer *buf, struct tunnel *t, - #endif - return 0; - } --inline int expand_payload (struct buffer *buf, struct tunnel *t, -+static inline int expand_payload (struct buffer *buf, struct tunnel *t, - struct call *c) - { - /* -@@ -1562,7 +1562,7 @@ void send_zlb (void *data) - toss (buf); - } - --inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c, -+static inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c, - int convert) - { - /* -diff --git a/misc.c b/misc.c -index 3092401..af90dbf 100644 ---- a/misc.c -+++ b/misc.c -@@ -170,7 +170,7 @@ void do_packet_dump (struct buffer *buf) - printf ("}\n"); - } - --inline void swaps (void *buf_v, int len) -+void swaps (void *buf_v, int len) - { - #ifdef __alpha - /* Reverse byte order alpha is little endian so lest save a step. -diff --git a/misc.h b/misc.h -index aafdc62..caab7a1 100644 ---- a/misc.h -+++ b/misc.h -@@ -65,7 +65,7 @@ extern void l2tp_log (int level, const char *fmt, ...); - extern struct buffer *new_buf (int); - extern void udppush_handler (int); - extern int addfcs (struct buffer *buf); --extern inline void swaps (void *, int); -+extern void swaps (void *, int); - extern void do_packet_dump (struct buffer *); - extern void status (const char *fmt, ...); - extern void status_handler (int signal); -diff --git a/network.c b/network.c -index b1268c6..d324a71 100644 ---- a/network.c -+++ b/network.c -@@ -135,7 +135,7 @@ int init_network (void) - return 0; - } - --inline void extract (void *buf, int *tunnel, int *call) -+static inline void extract (void *buf, int *tunnel, int *call) - { - /* - * Extract the tunnel and call #'s, and fix the order of the -@@ -155,7 +155,7 @@ inline void extract (void *buf, int *tunnel, int *call) - } - } - --inline void fix_hdr (void *buf) -+static inline void fix_hdr (void *buf) - { - /* - * Fix the byte order of the header --- -2.6.1 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb index 42bc398a1..88ae5d6f8 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb @@ -2,7 +2,7 @@ require xl2tpd.inc # This is v1.3.6 plus some commits. There is no tag for this commit. # -PV = "1.3.6+git${SRCPV}" +PV = "1.3.9+git${SRCPV}" -SRCREV = "a96b345962622ea58490924130675df6db062d11" +SRCREV = "f114c10ac532051badeca0132b144a2f1596f047" |
