Skip to contentSkip to conversation

bind: security bump to version 9.6-ESV-R5-P1

PATCH New Gustavo Zacarias 2 participants 15 messages Jan 26, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/13 bind: security bump to version 9.6-ESV-R5-P1

---
 package/bind/bind.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/bind/bind.mk +1 -1
index 4c7a612..0de986d 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BIND_VERSION = 9.6-ESV-R5
+BIND_VERSION = 9.6-ESV-R5-P1
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 2/13 ntp: bump to version 4.2.6p5

---
 package/ntp/ntp.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/ntp/ntp.mk +1 -1
index f17193f..8076ce7 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NTP_VERSION = 4.2.6p4
+NTP_VERSION = 4.2.6p5
 NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
 
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH 3/13 libraw1394: bump to version 2.0.7

In reply to Gustavo Zacarias
---
 package/libraw1394/Config.in     |    9 +++------
 package/libraw1394/libraw1394.mk |    8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)
package/libraw1394/Config.in +3 -6
index 49399e3..0b7e280 100644
@@ -1,10 +1,7 @@
 config BR2_PACKAGE_LIBRAW1394
 	bool "libraw1394"
 	help
-		Library for direct access to IEEE 1394 bus.
+		libraw1394 provides direct access to the IEEE 1394 bus through
+		the Linux 1394 subsystem's raw1394 user space interface. 
 
-		Through libraw1394/raw1394, applications can directly
-		send to and receive from other nodes without requiring
-		a kernel driver for the protocol in question.
-
-		http://www.linux1394.org/
+		http://sourceforge.net/projects/libraw1394/
package/libraw1394/libraw1394.mk +4 -4
index b7c844c..2f77a48 100644
@@ -3,9 +3,9 @@
 # libraw1394
 #
 #############################################################
-LIBRAW1394_VERSION:=1.2.1
-LIBRAW1394_SOURCE:=libraw1394-$(LIBRAW1394_VERSION).tar.gz
-LIBRAW1394_SITE:=http://www.kernel.org/pub/linux/libs/ieee1394/
-LIBRAW1394_INSTALL_STAGING=YES
+
+LIBRAW1394_VERSION = 2.0.7
+LIBRAW1394_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ieee1394
+LIBRAW1394_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))
Signature · 1 line
1.7.3.4
#3 lore raw

PATCH 3/13 libraw1394: bump to version 2.0.7

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/libraw1394/Config.in     |    9 +++------
 Gustavo>  package/libraw1394/libraw1394.mk |    8 ++++----

Gustavo> 2 files changed, 7 insertions(+), 10 deletions(-)

Gustavo> diff --git a/package/libraw1394/Config.in b/package/libraw1394/Config.in Gustavo> index 49399e3..0b7e280 100644
Gustavo> --- a/package/libraw1394/Config.in
Gustavo> +++ b/package/libraw1394/Config.in
Gustavo> @@ -1,10 +1,7 @@

 Gustavo>  config BR2_PACKAGE_LIBRAW1394
 Gustavo>  	bool "libraw1394"
 Gustavo>  	help

Gustavo> - Library for direct access to IEEE 1394 bus.
Gustavo> + libraw1394 provides direct access to the IEEE 1394 bus through
Gustavo> + the Linux 1394 subsystem's raw1394 user space interface.

Gustavo> - Through libraw1394/raw1394, applications can directly
Gustavo> - send to and receive from other nodes without requiring
Gustavo> - a kernel driver for the protocol in question.
Gustavo> -

Indentation is wrong, but I'll fix that up.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 4/13 bluez_utils: bump to version 4.98

In reply to Gustavo Zacarias
---
 ...tils-move-libcheck-under-TEST-conditional.patch |   85 --------------------
 package/bluez_utils/bluez_utils.mk                 |    5 +-
 2 files changed, 3 insertions(+), 87 deletions(-)
 delete mode 100755 package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch
package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch deleted +0 -85
deleted file mode 100755
index b2f5303..0000000
@@ -1,85 +0,0 @@
-From bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7 Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <[email protected]>
-Date: Tue, 27 Dec 2011 20:09:56 -0800
-Subject: [PATCH] build: Move libcheck under TEST conditional
-
----
- Makefile.am  |    5 ++++-
- acinclude.m4 |    8 +++++++-
- configure.ac |    3 +--
- 3 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 9112483..5cf287c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -449,6 +449,7 @@ endif
- 
- unit_objects =
- 
-+if TEST
- unit_tests = unit/test-eir
- 
- noinst_PROGRAMS += $(unit_tests)
-@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests)
- unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
- unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
- unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
--unit_test_eir_SHORTNAME = unit
- unit_objects += $(unit_test_eir_OBJECTS)
-+else
-+unit_tests =
-+endif
- 
- TESTS = $(unit_tests)
- 
-diff --git a/acinclude.m4 b/acinclude.m4
-index 2097d77..753b994 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [
- 		[])
- ])
- 
-+AC_DEFUN([AC_PATH_CHECK], [
-+	PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no)
-+	AC_SUBST(CHECK_CFLAGS)
-+	AC_SUBST(CHECK_LIBS)
-+])
-+
- AC_DEFUN([AC_PATH_OUI], [
- 	AC_ARG_WITH(ouifile,
- 		    AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]),
-@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
- 	AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
- 	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
--	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
-+	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes")
- 	AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
- 	AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
- 	AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
-diff --git a/configure.ac b/configure.ac
-index 3a5dfde..a7670da 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,8 +24,6 @@ AC_PROG_YACC
- AM_PROG_LEX
- AM_PROG_MKDIR_P
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
--
- m4_define([_LT_AC_TAGCONFIG], [])
- m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
- 
-@@ -50,6 +48,7 @@ AC_PATH_UDEV
- AC_PATH_SNDFILE
- AC_PATH_OUI
- AC_PATH_READLINE
-+AC_PATH_CHECK
- 
- AC_ARG_BLUEZ
- 
--- 
-1.7.6.5
-
package/bluez_utils/bluez_utils.mk +3 -2
index fe0f43f..025f31a 100644
@@ -3,9 +3,10 @@
 # bluez_utils
 #
 #############################################################
-BLUEZ_UTILS_VERSION = 4.97
+
+BLUEZ_UTILS_VERSION = 4.98
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
-BLUEZ_UTILS_SITE = http://www.kernel.org/pub/linux/bluetooth/
+BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES
 BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
 BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools
Signature · 1 line
1.7.3.4
#5 lore raw

PATCH 5/13 netperf: bump to version 2.5.0

In reply to Gustavo Zacarias
---
 package/netperf/netperf-2.4.5-dccp.patch      |   38 ------------------
 package/netperf/netperf-2.4.5-netserver.patch |   51 -------------------------
 package/netperf/netperf.mk                    |    2 +-
 3 files changed, 1 insertions(+), 90 deletions(-)
 delete mode 100644 package/netperf/netperf-2.4.5-dccp.patch
 delete mode 100644 package/netperf/netperf-2.4.5-netserver.patch
package/netperf/netperf-2.4.5-dccp.patch deleted +0 -38
deleted file mode 100644
index ae84cee..0000000
@@ -1,38 +0,0 @@
-[PATCH] fix build on systems where IPROTO_DCCP is defined, but SOCK_DCCP isn't
-
-On some systems (E.G. uClibc 0.9.31) IPROTO_DCCP is defined, but SOCK_DCCP
-isn't - Causing the build to break. Fix it by checking for both before
-using.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/netsh.c       |    2 +-
- src/nettest_bsd.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: netperf-2.4.5/src/netsh.c
-===================================================================
---- netperf-2.4.5.orig/src/netsh.c
-+++ netperf-2.4.5/src/netsh.c
-@@ -452,7 +452,7 @@ parse_protocol(char protocol_string[])
-     return IPPROTO_SDP;
-   }
- #endif
--#ifdef IPPROTO_DCCP
-+#if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-   if (!strcasecmp(temp,"dccp")) {
-     socket_type = SOCK_DCCP;
-     return IPPROTO_DCCP;
-Index: netperf-2.4.5/src/nettest_bsd.c
-===================================================================
---- netperf-2.4.5.orig/src/nettest_bsd.c
-+++ netperf-2.4.5/src/nettest_bsd.c
-@@ -712,7 +712,7 @@ complete_addrinfo(char *controlhost, cha
- 	 that we did this so the code for the Solaris kludge can do
- 	 the fix-up for us.  also flip error over to EAI_AGAIN and
- 	 make sure we don't "count" this time around the loop. */
--#if defined(IPPROTO_DCCP)
-+#if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-       /* only tweak on this one the second time around, after we've
- 	 kludged the ai_protocol field */
-       if ((hints.ai_socktype == SOCK_DCCP) &&
package/netperf/netperf-2.4.5-netserver.patch deleted +0 -51

51 lines not on this page · raw message

package/netperf/netperf.mk +1 -1
index a66d4ef..6a8aced 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETPERF_VERSION = 2.4.5
+NETPERF_VERSION = 2.5.0
 NETPERF_SITE = ftp://ftp.netperf.org/netperf
 NETPERF_CONF_ENV = ac_cv_func_setpgrp_void=set
 
Signature · 1 line
1.7.3.4
#6 lore raw

PATCH 6/13 expat: fix style and drop stray file

In reply to Gustavo Zacarias
---
 package/expat/Makefile.in |    3 ---
 package/expat/expat.mk    |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)
 delete mode 100644 package/expat/Makefile.in
package/expat/Makefile.in deleted +0 -3
deleted file mode 100644
index 1d5d6bc..0000000
@@ -1,3 +0,0 @@
-ifeq ($(BR2_PACKAGE_EXPAT),y)
-TARGETS+=expat
-endif
package/expat/expat.mk +0 -3
index 64a1416..b179383 100644
@@ -5,13 +5,10 @@
 #############################################################
 
 EXPAT_VERSION = 2.0.1
-EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.gz
 EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
 EXPAT_INSTALL_STAGING = YES
-EXPAT_INSTALL_TARGET = YES
 EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
 EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
-
 EXPAT_DEPENDENCIES = host-pkg-config
 
 $(eval $(call AUTOTARGETS))
Signature · 1 line
1.7.3.4
#7 lore raw

PATCH 7/13 lm-sensors: bump to version 3.3.1 and fix pwmconfig install

In reply to Gustavo Zacarias
---
 package/lm-sensors/lm-sensors.mk |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
package/lm-sensors/lm-sensors.mk +3 -1
index 99a8e3b..a351329 100644
@@ -3,7 +3,8 @@
 # lm-sensors
 #
 #############################################################
-LM_SENSORS_VERSION = 3.2.0
+
+LM_SENSORS_VERSION = 3.3.1
 LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
 LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
 LM_SENSORS_INSTALL_STAGING = YES
@@ -13,6 +14,7 @@ LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS) += bin/sensors
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_FANCONTROL) += sbin/fancontrol
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_ISADUMP) += sbin/isadump
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_ISASET) += sbin/isaset
+LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
 
 define LM_SENSORS_BUILD_CMDS
Signature · 1 line
1.7.3.4
#8 lore raw

PATCH 8/13 i2c-tools: bump to version 3.1.0

In reply to Gustavo Zacarias
---
 package/i2c-tools/i2c-tools.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/i2c-tools/i2c-tools.mk +2 -2
index 8628eaf..aeabf02 100644
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-I2C_TOOLS_VERSION = 3.0.3
+I2C_TOOLS_VERSION = 3.1.0
 I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.bz2
-I2C_TOOLS_SITE = http://dl.lm-sensors.org/i2c-tools/releases/
+I2C_TOOLS_SITE = http://dl.lm-sensors.org/i2c-tools/releases
 
 define I2C_TOOLS_BUILD_CMDS
  $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
Signature · 1 line
1.7.3.4
#9 lore raw

PATCH 9/13 hdparm: bump to version 9.38

In reply to Gustavo Zacarias
---
 package/hdparm/hdparm.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/hdparm/hdparm.mk +2 -2
index d19dff0..abbb0c3 100644
@@ -3,8 +3,8 @@
 # hdparm
 #
 #############################################################
-HDPARM_VERSION = 9.36
-HDPARM_SOURCE = hdparm-$(HDPARM_VERSION).tar.gz
+
+HDPARM_VERSION = 9.38
 HDPARM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm
 
 define HDPARM_BUILD_CMDS
Signature · 1 line
1.7.3.4
#10 lore raw

PATCH 10/13 e2fsprogs: bump to version 1.42

In reply to Gustavo Zacarias
---
 package/e2fsprogs/Config.in                        |    3 ++
 ... e2fsprogs-add-missing-dep-of-tst_uuid-o.patch} |    0
 package/e2fsprogs/e2fsprogs-fallocate.patch        |   22 ++++++++++++++++++++
 ...it-libs.patch => e2fsprogs-sem-init-libs.patch} |    0
 package/e2fsprogs/e2fsprogs.mk                     |    3 +-
 5 files changed, 27 insertions(+), 1 deletions(-)
 rename package/e2fsprogs/{e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch => e2fsprogs-add-missing-dep-of-tst_uuid-o.patch} (100%)
 create mode 100644 package/e2fsprogs/e2fsprogs-fallocate.patch
 rename package/e2fsprogs/{e2fsprogs-1.41.9-sem-init-libs.patch => e2fsprogs-sem-init-libs.patch} (100%)
package/e2fsprogs/Config.in +3 -0
index a98c49e..d4f4405 100644
@@ -47,6 +47,9 @@ config BR2_PACKAGE_E2FSPROGS_E2UNDO
 	bool "e2undo"
 	default y
 
+config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
+	bool "e4defrag"
+
 config BR2_PACKAGE_E2FSPROGS_FILEFRAG
 	bool "filefrag"
 	default y
package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch renamed from package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch +0 -0
similarity index 100%
rename from package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch
rename to package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
package/e2fsprogs/e2fsprogs-fallocate.patch new file +22 -0
new file mode 100644
index 0000000..4d952a5
@@ -0,0 +1,22 @@
+We assume that fallocate is supported somehow
+but we need to check if we have fallocate()
+this problem shows up on uclibc systems since
+uclibc does not have fallocate() implemented
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Upstream-Status: Pending
+
+Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c
+===================================================================
+--- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c	2012-01-17 17:24:34.290780625 -0800
++++ e2fsprogs-1.42/lib/ext2fs/unix_io.c	2012-01-17 17:25:37.338783680 -0800
+@@ -895,7 +895,7 @@
+ 		goto unimplemented;
+ #endif
+ 	} else {
+-#ifdef FALLOC_FL_PUNCH_HOLE
++#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE
+ 		/*
+ 		 * If we are not on block device, try to use punch hole
+ 		 * to reclaim free space.
package/e2fsprogs/e2fsprogs-sem-init-libs.patch renamed from package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch +0 -0
similarity index 100%
rename from package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch
rename to package/e2fsprogs/e2fsprogs-sem-init-libs.patch
package/e2fsprogs/e2fsprogs.mk +2 -1
index d945a12..912deab 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-E2FSPROGS_VERSION = 1.41.14
+E2FSPROGS_VERSION = 1.42
 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 
 E2FSPROGS_CONF_OPT = \
@@ -39,6 +39,7 @@ E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FREEFRAG) += usr/sbin/e2freefrag
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FSCK) += usr/sbin/e2fsck
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2LABEL) += usr/sbin/e2label
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2UNDO) += usr/sbin/e2undo
+E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E4DEFRAG) += usr/sbin/e4defrag
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FILEFRAG) += usr/sbin/filefrag
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FSCK) += usr/sbin/fsck
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += usr/sbin/logsave
Signature · 1 line
1.7.3.4
#11 lore raw

PATCH 11/13 libpcap: bump to version 1.2.1

In reply to Gustavo Zacarias
---
 package/libpcap/libpcap.mk |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
package/libpcap/libpcap.mk +7 -8
index 6b44e49..0b88a42 100644
@@ -4,18 +4,17 @@
 #
 #############################################################
 
-LIBPCAP_VERSION:=1.1.1
-LIBPCAP_SITE:=http://www.tcpdump.org/release
-LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz
-LIBPCAP_INSTALL_STAGING:=YES
+LIBPCAP_VERSION = 1.2.1
+LIBPCAP_SITE = http://www.tcpdump.org/release
+LIBPCAP_INSTALL_STAGING = YES
 # doesn't have an install-strip
 LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \
 	$(if $(BR2_PREFER_STATIC_LIB),install,install-shared)
 LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \
 	$(if $(BR2_PREFER_STATIC_LIB),,install-shared)
-LIBPCAP_DEPENDENCIES:=zlib
-LIBPCAP_CONF_ENV:=ac_cv_linux_vers=2 \
-		  ac_cv_header_linux_wireless_h=yes # configure misdetects this
-LIBPCAP_CONF_OPT:=--disable-yydebug --with-pcap=linux
+LIBPCAP_DEPENDENCIES = zlib
+LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
+		ac_cv_header_linux_wireless_h=yes # configure misdetects this
+LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 
 $(eval $(call AUTOTARGETS))
Signature · 1 line
1.7.3.4
#12 lore raw

PATCH 12/13 tcpdump: bump to version 4.2.1

In reply to Gustavo Zacarias
---
 package/tcpdump/tcpdump-4.1.1-vfork.patch |  127 -----------------------------
 package/tcpdump/tcpdump.mk                |   12 ++--
 2 files changed, 6 insertions(+), 133 deletions(-)
 delete mode 100644 package/tcpdump/tcpdump-4.1.1-vfork.patch
package/tcpdump/tcpdump-4.1.1-vfork.patch deleted +0 -127
deleted file mode 100644
index 8213f35..0000000
@@ -1,127 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3120897&group_id=53066&atid=469575
-
-From 6f8927c609d1f986a45010b7acae0eb570668642 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-Date: Sat, 27 Nov 2010 17:18:05 -0500
-Subject: [PATCH] add support for nommu systems
-
-Rather than hardcode the WIN32 define, add proper fork checks to the
-configure script and check those.  This fixes building for nommu systems
-which lack the fork function.
-
-While we're here though, add support for this functionality via vfork
-so that it does work on nommu systems.  And fix an old bug where we
-exit properly in the forked child when the exec failed instead of just
-returning to the calling code (which isn't expecting it).
-
-Signed-off-by: Mike Frysinger <[email protected]>
----
-
---- tcpdump-4.0.0/config.h.in
-+++ tcpdump-4.0.0/config.h.in
-@@ -151,6 +151,9 @@
- /* Define to 1 if you have the <fcntl.h> header file. */
- #undef HAVE_FCNTL_H
- 
-+/* Define to 1 if you have the `fork' function. */
-+#undef HAVE_FORK
-+
- /* Define to 1 if you have the `getnameinfo' function. */
- #undef HAVE_GETNAMEINFO
- 
-@@ -274,6 +277,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* Define to 1 if you have the `vfork' function. */
-+#undef HAVE_VFORK
-+
- /* Define to 1 if you have the `vfprintf' function. */
- #undef HAVE_VFPRINTF
- 
---- tcpdump-4.0.0/configure
-+++ tcpdump-4.0.0/configure
-@@ -7976,7 +7976,7 @@ done
- 
- 
- 
--for ac_func in strftime
-+for ac_func in fork vfork strftime
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
-diff --git a/tcpdump.c b/tcpdump.c
-index c8da36b..abf3e69 100644
---- a/tcpdump.c
-+++ b/tcpdump.c
-@@ -1250,8 +1250,10 @@ main(int argc, char **argv)
- 	(void)setsignal(SIGPIPE, cleanup);
- 	(void)setsignal(SIGTERM, cleanup);
- 	(void)setsignal(SIGINT, cleanup);
--	(void)setsignal(SIGCHLD, child_cleanup);
- #endif /* WIN32 */
-+#if defined(HAVE_FORK) || defined(HAVE_VFORK)
-+	(void)setsignal(SIGCHLD, child_cleanup);
-+#endif
- 	/* Cooperate with nohup(1) */
- #ifndef WIN32	
- 	if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)
-@@ -1464,13 +1466,13 @@ cleanup(int signo _U_)
-   On windows, we do not use a fork, so we do not care less about
-   waiting a child processes to die
-  */
--#ifndef WIN32
-+#if defined(HAVE_FORK) || defined(HAVE_VFORK)
- static RETSIGTYPE
- child_cleanup(int signo _U_)
- {
-   wait(NULL);
- }
--#endif /* WIN32 */
-+#endif /* HAVE_FORK || HAVE_VFORK */
- 
- static void
- info(register int verbose)
-@@ -1514,11 +1516,15 @@ info(register int verbose)
- 	infoprint = 0;
- }
- 
--#ifndef WIN32
-+#if defined(HAVE_FORK) || defined(HAVE_VFORK)
- static void
- compress_savefile(const char *filename)
- {
-+# ifdef HAVE_FORK
- 	if (fork())
-+# else
-+	if (vfork())
-+# endif
- 		return;
- 	/*
- 	 * Set to lowest priority so that this doesn't disturb the capture
-@@ -1534,15 +1540,20 @@ compress_savefile(const char *filename)
- 			zflag,
- 			filename,
- 			strerror(errno));
-+# ifdef HAVE_FORK
-+	exit(1);
-+# else
-+	_exit(1);
-+# endif
- }
--#else  /* WIN32 */
-+#else  /* HAVE_FORK || HAVE_VFORK */
- static void
- compress_savefile(const char *filename)
- {
- 	fprintf(stderr,
--		"compress_savefile failed. Functionality not implemented under windows\n");
-+		"compress_savefile failed. Functionality not implemented under your system\n");
- }
--#endif /* WIN32 */
-+#endif /* HAVE_FORK || HAVE_VFORK */
- 
- static void
- dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
--- 
-1.7.3.1
package/tcpdump/tcpdump.mk +6 -6
index 1534543..cf23df3 100644
@@ -6,13 +6,13 @@
 # Copyright (C) 2001-2003 by Erik Andersen <[email protected]>
 # Copyright (C) 2002 by Tim Riker <[email protected]>
 
-TCPDUMP_VERSION:=4.1.1
-TCPDUMP_SITE:=http://www.tcpdump.org/release
-TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VERSION).tar.gz
-TCPDUMP_CONF_ENV:=ac_cv_linux_vers=2
-TCPDUMP_CONF_OPT:=--without-crypto \
+TCPDUMP_VERSION = 4.2.1
+TCPDUMP_SITE = http://www.tcpdump.org/release
+TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
+TCPDUMP_CONF_ENV = ac_cv_linux_vers=2
+TCPDUMP_CONF_OPT = --without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
-TCPDUMP_DEPENDENCIES:=zlib libpcap
+TCPDUMP_DEPENDENCIES = zlib libpcap
 
 # make install installs an unneeded extra copy of the tcpdump binary
 define TCPDUMP_REMOVE_DUPLICATED_BINARY
Signature · 1 line
1.7.3.4
#13 lore raw

PATCH 13/13 ipset: bump to version 6.11

In reply to Gustavo Zacarias
---
 package/ipset/ipset.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/ipset/ipset.mk +1 -1
index d8df026..06393f4 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.10
+IPSET_VERSION = 6.11
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_AUTORECONF = YES
Signature · 1 line
1.7.3.4