From 045d35b7ac03117852e1c8e29f2a3c92b34377a7 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Mon, 22 Sep 2014 17:07:29 -0700 Subject: [PATCH 1/7] multipath-tools: update to version 0.5.0+ SCRREV includes patches up to 9/12/2014. Modify upstream source to be better set up for cross compilation. Signed-off-by: Joe Slater --- .../always-use-libdevmapper-kpartx.patch | 29 ++++ .../files/always-use-libdevmapper.patch | 44 ++++++ .../multipath-tools/files/makefile_inc.patch | 36 +++++ .../multipath-tools/files/multipathd.oe | 146 ++++++++++++++++++ .../multipath-tools/multipath-tools_git.bb | 58 +++++-- 5 files changed, 304 insertions(+), 9 deletions(-) create mode 100644 meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch create mode 100644 meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch create mode 100644 meta-oe/recipes-support/multipath-tools/files/makefile_inc.patch create mode 100755 meta-oe/recipes-support/multipath-tools/files/multipathd.oe diff --git a/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch b/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch new file mode 100644 index 00000000000..a16a8540522 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch @@ -0,0 +1,29 @@ +Always use devmapper for kpartx + +Do not try to compute the LIBDM_API_COOKIE make variable +from host information when cross-compiling. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Aws Ismail +Signed-off-by: Joe Slater + +diff --git a/kpartx/Makefile b/kpartx/Makefile +index 2a07334..24bdabc 100644 +--- a/kpartx/Makefile ++++ b/kpartx/Makefile +@@ -4,13 +4,7 @@ + # + include ../Makefile.inc + +-CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +- +-LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h) +- +-ifneq ($(strip $(LIBDM_API_COOKIE)),0) +- CFLAGS += -DLIBDM_API_COOKIE +-endif ++CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLIBDM_API_COOKIE + + LDFLAGS = -ldevmapper + OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ diff --git a/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch b/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch new file mode 100644 index 00000000000..89d2352dab3 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch @@ -0,0 +1,44 @@ +Always use devmapper + +Do not try to compute several _API_ make variables +from host information when cross-compiling. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Aws Ismail +Signed-off-by: Joe Slater + +diff --git a/libmultipath/Makefile b/libmultipath/Makefile +index e5b06b3..efd6cf6 100644 +--- a/libmultipath/Makefile ++++ b/libmultipath/Makefile +@@ -17,23 +17,18 @@ OBJS = memory.o parser.o vector.o devmapper.o \ + log.o configure.o structs_vec.o sysfs.o prio.o checkers.o \ + lock.o waiter.o file.o wwids.o + +-LIBDM_API_FLUSH = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_no_flush' /usr/include/libdevmapper.h) + +-ifneq ($(strip $(LIBDM_API_FLUSH)),0) ++#ifneq ($(strip $(LIBDM_API_FLUSH)),0) + CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE +-endif ++#endif + +-LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h) +- +-ifneq ($(strip $(LIBDM_API_COOKIE)),0) ++#ifneq ($(strip $(LIBDM_API_COOKIE)),0) + CFLAGS += -DLIBDM_API_COOKIE +-endif +- +-LIBUDEV_API_RECVBUF = $(shell grep -Ecs '^[a-z]*[[:space:]]+udev_monitor_set_resolve_buffer_size' /usr/include/libudev.h) ++#endif + +-ifneq ($(strip $(LIBUDEV_API_RECVBUF)),0) ++#ifneq ($(strip $(LIBUDEV_API_RECVBUF)),0) + CFLAGS += -DLIBUDEV_API_RECVBUF +-endif ++#endif + + + all: $(LIBS) diff --git a/meta-oe/recipes-support/multipath-tools/files/makefile_inc.patch b/meta-oe/recipes-support/multipath-tools/files/makefile_inc.patch new file mode 100644 index 00000000000..ff71f396759 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/makefile_inc.patch @@ -0,0 +1,36 @@ +multipath-tools: modify Makefile.inc for cross-compilation + +Do not look for systemd info on the host, and allow us to pass in CFLAGS +using the OPTFLAGS variable. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Joe Slater + + +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -21,12 +21,6 @@ ifndef LIB + endif + endif + +-ifndef SYSTEMD +- ifeq ($(shell systemctl --version > /dev/null 2>&1 && echo 1), 1) +- SYSTEMD = $(shell systemctl --version 2> /dev/null | sed -n 's/systemd \([0-9]*\)/\1/p') +- endif +-endif +- + prefix = + exec_prefix = $(prefix) + bindir = $(exec_prefix)/sbin +@@ -49,7 +43,10 @@ ifndef RPM_OPT_FLAGS + RPM_OPT_FLAGS = -O2 -g -pipe -Wformat-security -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 + endif + ++ifndef OPTFLAGS + OPTFLAGS = $(RPM_OPT_FLAGS) -Wunused -Wstrict-prototypes ++endif ++ + CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" + SHARED_FLAGS = -shared + diff --git a/meta-oe/recipes-support/multipath-tools/files/multipathd.oe b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe new file mode 100755 index 00000000000..3bdf875e3cd --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe @@ -0,0 +1,146 @@ +#!/bin/bash +# +# multipathd Starts the multipath daemon +# +# chkconfig: - 06 87 +# description: Manages device-mapper multipath devices + +### BEGIN INIT INFO +# Provides: multipathd +# Required-Start: +# Required-Stop: +# Default-Start: +# Default-Stop: +# Short-Description: Control multipathd +# Description: This service monitors and manages +# device-mapper multipath devices +### END INIT INFO + +DAEMON=/sbin/multipathd +prog=`basename $DAEMON` +initdir=/etc/init.d +lockdir=/var/lock/subsys +sysconfig=/etc/sysconfig +syspath=/sys/block + +RETVAL=0 + +teardown_slaves() +{ +pushd $1 > /dev/null +if [ -d "slaves" ]; then +for slave in slaves/*; +do + if [ "$slave" = "slaves/*" ]; then + read dev < $1/dev + tablename=`dmsetup table --target multipath | sed -n "s/\(.*\): .* $dev .*/\1/p"` + if ! [ -z $tablename ]; then + echo "Root is on a multipathed device, multipathd can not be stopped" + exit 1 + fi + else + local_slave=`readlink -f $slave`; + teardown_slaves $local_slave; + fi + done + +else + read dev < $1/dev + tablename=`dmsetup table --target multipath | sed -n "s/\(.*\): .* $dev .*/\1/p"` + if ! [ -z $tablename ]; then + echo "Root is on a multipathed device, multipathd can not be stopped" + exit 1 + fi +fi +popd > /dev/null +} + +# +# See how we were called. +# + +start() { + test -x $DAEMON || exit 5 + echo -n $"Starting $prog daemon: " + start-stop-daemon --start --quiet --exec $DAEMON + RETVAL=$? + [ $RETVAL -eq 0 ] && touch $lockdir/$prog + echo +} + +force_stop() { + echo -n $"Stopping $prog daemon: " + killall $DAEMON + RETVAL=$? + [ $RETVAL -eq 0 ] && rm -f $lockdir/$prog + echo +} + +stop() { + root_dev=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/mtab) + dm_num=`dmsetup info -c --noheadings -o minor $root_dev 2> /dev/null` + if [ $? -eq 0 ]; then + root_dm_device="dm-$dm_num" + [ -d $syspath/$root_dm_device ] && teardown_slaves $syspath/$root_dm_device + fi + + force_stop +} + +restart() { + stop + start +} + +force_restart() { + force_stop + start +} + +reload() { + echo -n "Reloading $prog: " + trap "" SIGHUP + killall $DAEMON -s SIGHUP -v + RETVAL=$? + echo +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +force-stop) + force_stop + ;; +force-reload|reload) + reload + ;; +restart) + restart + ;; +force-restart) + force_restart + ;; +condrestart|try-restart) + if [ -f $lockdir/$prog ]; then + restart + fi + ;; +status) + if pidof -o %PPID $DAEMON > /dev/null; then + echo "Running" + RETVAL=0 + else + echo "Not running" + RETVAL=1 + fi + ;; +*) + echo $"Usage: $0 {start|stop|force-stop|status|restart|force-restart|condrestart|reload}" + RETVAL=2 +esac + +exit $RETVAL diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb index 038f4e26dfd..055cfe64c92 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb @@ -1,30 +1,70 @@ SUMMARY = "The upstream project used to drive the Device Mapper multipathing driver" -DEPENDS = "lvm2 libaio readline" +DEPENDS = "lvm2 libaio readline udev" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=7be2873b6270e45abacc503abbe2aa3d" +LICENSE = "LGPLv2" +SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ + file://multipathd.oe \ + file://makefile_inc.patch \ + file://always-use-libdevmapper.patch \ + file://always-use-libdevmapper-kpartx.patch \ + " +# 0.5.0 +# +#SRCREV = "82f391e787dc02e9d9294aa391137ab424bb83c4" +#LIC_FILES_CHKSUM = "file://COPYING;md5=7be2873b6270e45abacc503abbe2aa3d" + +# 0.5.0 + commits thru 7/18/2014 +# +#SRCREV = "0d72f46c12207a6b7b89f5ef4f5ab5f87ed8bc90" +#LIC_FILES_CHKSUM = "file://COPYING;md5=b06690e7a95c166eefe0199b39118eb1" + +# 0.5.0 + commits thru 9/12/2014 +# +# includes important systemd related structure size fix +# +SRCREV = "aec68ab217fd2956443b27ceeb97dd6475267789" +LIC_FILES_CHKSUM = "file://COPYING;md5=b06690e7a95c166eefe0199b39118eb1" + +inherit systemd -SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http" -SRCREV = "15fc23ffb2bd1bac6990eda3e23c3e8980e6cfa5" S = "${WORKDIR}/git" -PV = "0.4.9+git" +PV = "0.5.0+git${@'${SRCPV}'.split('+')[-1]}" -EXTRA_OEMAKE = "MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} libdir=${base_libdir}/multipath" +# The exact version of SYSTEMD does not matter but should be greater than 209. +# +EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ + OPTFLAGS="${CFLAGS}" \ + LIB=${base_libdir} libdir=${base_libdir}/multipath \ + unitdir=/lib/systemd/system \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ + ' do_install() { oe_runmake install + + # Copy a sample conf file, but do not rename it multipath.conf. + # + cp multipath.conf.defaults ${D}${sysconfdir} + + # We copy an initscript, but do not start multipathd at init time. + # + cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd + } FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" + +# systemd and udev stuff always goes under /lib! +# FILES_${PN} += "${base_libdir}/multipath \ - ${base_libdir}/systemd" + /lib/systemd" PACKAGES =+ "kpartx" FILES_kpartx = "${base_sbindir}/kpartx \ - ${base_libdir}/udev/kpartx_id" + /lib/udev/kpartx_id" RDEPENDS_${PN} += "kpartx" From 063da301c8a8339ee3e4de366ef2e8cc16bb3260 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Fri, 12 Sep 2014 16:04:18 -0700 Subject: [PATCH 2/7] ptpd: update to version 2.3.1-rc2 Add a little processing to find correct directory for source upstream. Update LIC_FILES_CHKSUM since the latest package doesn't include a COPYRIGHT file anymore. Signed-off-by: Joe Slater Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../ptpd/{ptpd_2.3.0.bb => ptpd_2.3.1-rc2.bb} | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) rename meta-networking/recipes-daemons/ptpd/{ptpd_2.3.0.bb => ptpd_2.3.1-rc2.bb} (64%) diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.0.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1-rc2.bb similarity index 64% rename from meta-networking/recipes-daemons/ptpd/ptpd_2.3.0.bb rename to meta-networking/recipes-daemons/ptpd/ptpd_2.3.1-rc2.bb index 54679dcf1d0..db74e446312 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.0.bb +++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1-rc2.bb @@ -6,17 +6,27 @@ time coordination of LAN connected computers." HOMEPAGE = "http://sourceforge.net/projects/ptpd" SECTION = "network" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4019cad2b3cd55f22ea819ffad6ccd41" +LIC_FILES_CHKSUM = "file://README;md5=2452033fe374283f29579898663b1aa8" DEPENDS = "libpcap" inherit autotools -SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${PV}/ptpd-${PV}.tar.gz" +# return something like '1.2.3' or '1.2.3/rc1' +# +def get_sub(d): + parts = d.getVar('PV',True).split('-') + try: + return parts[0] + '/' + parts[1] + except: + return parts[0] + +SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${@get_sub(d)}/ptpd-${PV}.tar.gz" + +SRC_URI[md5sum] = "1ef2f1f2825080a865bbce0eb61246d4" +SRC_URI[sha256sum] = "2802aab758649bb222859dfcb62a5d282709ccb4d3f1df3f26f739cc091d0c8d" S = "${WORKDIR}/ptpd-${PV}" -SRC_URI[md5sum] = "f5e931b4a229705ff0dbdfe22490566b" -SRC_URI[sha256sum] = "1a4e90496f004bfd91657ccc49209101dc25b787e540648c07c0973469f1d8f7" EXTRA_OEMAKE = "" From 13d040447368422a30280f45f7d260986224fb0a Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Mon, 15 Sep 2014 16:43:51 -0700 Subject: [PATCH 3/7] vftpd: update to version 3.0.2 No changes other than source checksum. Signed-off-by: Joe Slater Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../{vsftpd-3.0.0 => vsftpd-3.0.2}/makefile-destdir.patch | 0 .../{vsftpd-3.0.0 => vsftpd-3.0.2}/makefile-libs.patch | 0 .../{vsftpd-3.0.0 => vsftpd-3.0.2}/makefile-strip.patch | 0 .../nopam-with-tcp_wrappers.patch | 0 .../vsftpd/{vsftpd-3.0.0 => vsftpd-3.0.2}/nopam.patch | 0 .../vsftpd-tcp_wrappers-support.patch | 0 .../vsftpd/{vsftpd_3.0.0.bb => vsftpd_3.0.2.bb} | 5 +++-- 7 files changed, 3 insertions(+), 2 deletions(-) rename meta-networking/recipes-daemons/vsftpd/{vsftpd-3.0.0 => vsftpd-3.0.2}/makefile-destdir.patch (100%) rename meta-networking/recipes-daemons/vsftpd/{vsftpd-3.0.0 => vsftpd-3.0.2}/makefile-libs.patch (100%) rename meta-networking/recipes-daemons/vsftpd/{vsftpd-3.0.0 => vsftpd-3.0.2}/makefile-strip.patch (100%) rename meta-networking/recipes-daemons/vsftpd/{vsftpd-3.0.0 => vsftpd-3.0.2}/nopam-with-tcp_wrappers.patch (100%) rename meta-networking/recipes-daemons/vsftpd/{vsftpd-3.0.0 => vsftpd-3.0.2}/nopam.patch (100%) rename meta-networking/recipes-daemons/vsftpd/{vsftpd-3.0.0 => vsftpd-3.0.2}/vsftpd-tcp_wrappers-support.patch (100%) rename meta-networking/recipes-daemons/vsftpd/{vsftpd_3.0.0.bb => vsftpd_3.0.2.bb} (96%) diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/makefile-destdir.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/makefile-destdir.patch similarity index 100% rename from meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/makefile-destdir.patch rename to meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/makefile-destdir.patch diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/makefile-libs.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/makefile-libs.patch similarity index 100% rename from meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/makefile-libs.patch rename to meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/makefile-libs.patch diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/makefile-strip.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/makefile-strip.patch similarity index 100% rename from meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/makefile-strip.patch rename to meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/makefile-strip.patch diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/nopam-with-tcp_wrappers.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/nopam-with-tcp_wrappers.patch similarity index 100% rename from meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/nopam-with-tcp_wrappers.patch rename to meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/nopam-with-tcp_wrappers.patch diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/nopam.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/nopam.patch similarity index 100% rename from meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/nopam.patch rename to meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/nopam.patch diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/vsftpd-tcp_wrappers-support.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/vsftpd-tcp_wrappers-support.patch similarity index 100% rename from meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.0/vsftpd-tcp_wrappers-support.patch rename to meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.2/vsftpd-tcp_wrappers-support.patch diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb similarity index 96% rename from meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb rename to meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb index 5df8211569b..a1c4ff4ad41 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb @@ -21,8 +21,9 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ file://COPYRIGHT;md5=04251b2eb0f298dae376d92454f6f72e \ file://LICENSE;md5=654df2042d44b8cac8a5654fc5be63eb" -SRC_URI[md5sum] = "ad9fa952558c2c5b0426ccaccff0f972" -SRC_URI[sha256sum] = "ef70205dcd0c7f03b008b9578fb44c0cbe31e66daab8cfafb9904747c17fc2a8" +SRC_URI[md5sum] = "8b00c749719089401315bd3c44dddbb2" +SRC_URI[sha256sum] = "be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56" + PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" From 3a6ce9c003160bccd437e8aac1dcf4951a8b11d5 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 16 Sep 2014 16:50:19 -0700 Subject: [PATCH 4/7] wireshark: update to 12.1 following security fixes included: MEGACO dissector infinite loop. (Bug 10333) CVE-2014-6423 Netflow dissector crash. (Bug 10370) CVE-2014-6424 CUPS dissector crash. (Bug 10353) CVE-2014-6425 HIP dissector infinite loop. CVE-2014-6426 RTSP dissector crash. (Bug 10381) CVE-2014-6427 SES dissector crash. (Bug 10454) CVE-2014-6428 Sniffer file parser crash. (Bug 10461) CVE-2014-6429 CVE-2014-6430 CVE-2014-6431 CVE-2014-6432 re-org'd dd file to be more in-line with style guide. Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- ...ireshark_1.12.0.bb => wireshark_1.12.1.bb} | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) rename meta-networking/recipes-support/wireshark/{wireshark_1.12.0.bb => wireshark_1.12.1.bb} (90%) diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb similarity index 90% rename from meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb rename to meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb index 39a24dc786f..71cc0823a0b 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb @@ -2,9 +2,19 @@ DESCRIPTION = "wireshark - a popular network protocol analyzer" HOMEPAGE = "http://www.wireshark.org" SECTION = "network" LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" DEPENDS = "perl-native libcap libpcap pcre expat glib-2.0 libnl sbc" +SRC_URI = " \ + http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \ +" + +PE = "1" + +SRC_URI[md5sum] = "14b3e3d8979d1eb27ff085bb5f400e67" +SRC_URI[sha256sum]= "82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b" + inherit autotools pkgconfig ARM_INSTRUCTION_SET = "arm" @@ -27,16 +37,6 @@ PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no" -LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" -SRC_URI = " \ - http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0.tar.bz2 \ -" - -PE = "1" - -SRC_URI[md5sum] = "8dcfe451d8769901129809d2e19c1fb7" -SRC_URI[sha256sum]= "0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7" - do_configure_prepend() { # force to use fallback sed -i -e '/^glib_prefix/s/=.*$/=""/' ${S}/aclocal-flags @@ -44,4 +44,3 @@ do_configure_prepend() { ALLOW_EMPTY_${PN} = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - From a6a65241799b9dda4373065399f45c74729dd63c Mon Sep 17 00:00:00 2001 From: "Roy.Li" Date: Wed, 24 Sep 2014 08:18:57 +0800 Subject: [PATCH 5/7] wireshark: not put the CC options into CFLAGS_FOR_BUILD Signed-off-by: Roy Li Signed-off-by: Joe MacDonald --- .../files/Do-not-set-CC_FOR_BUILD-flags.patch | 46 +++++++++++++++++++ .../wireshark/wireshark_1.12.1.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch diff --git a/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch b/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch new file mode 100644 index 00000000000..64a08add793 --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch @@ -0,0 +1,46 @@ +[PATCH] Do not set CC_FOR_BUILD flags + +Upstream-status: Pending + +AC_WIRESHARK_COMPILER_FLAGS_CHECK() is checking which options CC is supported, +and put the supported options into CFLAGS, but it should not put them into +CFLAGS_FOR_BUILD. since CC and BUILD_CC can be different, CFLAGS_FOR_BUILD is +used by BUILD_CC + +BUILD_CC is used to generated host tools, do not use the gcc's optimised options, +do not effect the running of host tools. so do not set CC_FOR_BUILD flags. + +Signed-off-by: Roy.Li +--- + acinclude.m4 | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 136fc27..8d3d360 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1755,10 +1755,6 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then + # just the new option. + # + CFLAGS="$CFLAGS_saved $GCC_OPTION" +- # +- # Add it to the flags we use when building build tools. +- # +- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION" + ], + [ + AC_MSG_RESULT(yes) +@@ -1771,10 +1767,6 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then + # just the new option. + # + CFLAGS="$CFLAGS_saved $GCC_OPTION" +- # +- # Add it to the flags we use when building build tools. +- # +- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION" + fi + ], + [ +-- +1.9.1 + diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb index 71cc0823a0b..147c513955d 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb @@ -8,6 +8,7 @@ DEPENDS = "perl-native libcap libpcap pcre expat glib-2.0 libnl sbc" SRC_URI = " \ http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \ + file://Do-not-set-CC_FOR_BUILD-flags.patch \ " PE = "1" From 7325a6d00a368f7b6b3780f23e7e44d96dfc10ac Mon Sep 17 00:00:00 2001 From: YangHaibo Date: Fri, 19 Sep 2014 13:47:40 +0800 Subject: [PATCH 6/7] pimd: add recipe for pimd-2.1.8 Signed-off-by: YangHaibo Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-support/pimd/pimd_2.1.8.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 meta-networking/recipes-support/pimd/pimd_2.1.8.bb diff --git a/meta-networking/recipes-support/pimd/pimd_2.1.8.bb b/meta-networking/recipes-support/pimd/pimd_2.1.8.bb new file mode 100644 index 00000000000..da097ce825e --- /dev/null +++ b/meta-networking/recipes-support/pimd/pimd_2.1.8.bb @@ -0,0 +1,10 @@ +SUMMARY = "pimd is a lightweight stand-alone PIM-SM v2 multicast routing daemon." +HOMEPAGE = "http://troglobit.com/pimd.html" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94f108f91fab720d62425770b70dd790" + +SRC_URI = "ftp://troglobit.com/pimd/${BP}.tar.bz2" +SRC_URI[md5sum] = "a12448bc7c9bfcebf51a13ebf1ffa962" +SRC_URI[sha256sum] = "01016940543a0a6131d4e6c91b595d47e187012c59a298eec14c3dbc38564b3a" + +CFLAGS += "-I ${S}/include " From 367383dbe6d6a6e386c7a49d00c34310d079c0c7 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Fri, 19 Sep 2014 12:22:49 -0700 Subject: [PATCH 7/7] radvd: update to 1.14 No changes except to source version. Signed-off-by: Joe Slater Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-daemons/radvd/radvd_1.14.bb | 6 ++++++ meta-networking/recipes-daemons/radvd/radvd_1.9.8.bb | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 meta-networking/recipes-daemons/radvd/radvd_1.14.bb delete mode 100644 meta-networking/recipes-daemons/radvd/radvd_1.9.8.bb diff --git a/meta-networking/recipes-daemons/radvd/radvd_1.14.bb b/meta-networking/recipes-daemons/radvd/radvd_1.14.bb new file mode 100644 index 00000000000..bf572e3bb81 --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/radvd_1.14.bb @@ -0,0 +1,6 @@ + +require radvd.inc + +SRC_URI[md5sum] = "a257e05bd6a435ef948d3b407726d56f" +SRC_URI[sha256sum] = "3b16dd9ef3d6c8b889cdabfdb16c81db8bd61b0f1fc42f6acc52d3cf300c6d07" + diff --git a/meta-networking/recipes-daemons/radvd/radvd_1.9.8.bb b/meta-networking/recipes-daemons/radvd/radvd_1.9.8.bb deleted file mode 100644 index 407eb43d3b8..00000000000 --- a/meta-networking/recipes-daemons/radvd/radvd_1.9.8.bb +++ /dev/null @@ -1,6 +0,0 @@ -PR = "r0" - -require radvd.inc - -SRC_URI[md5sum] = "7a96a38252c3964ee18bbc1fdeae25fa" -SRC_URI[sha256sum] = "645ccf1c9b16e769ff4179813712e580e2c8786d64a888d8afa1e296c057c1c1"