From 1f52b2ae1d2bbc5784c10dda397493236fb1ed5a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 11 Nov 2011 16:04:54 -0300 Subject: libgpg-error: bump to version 1.10 Bump to version 1.10, closes bug #3403 Switch to gnupg.org mirror, closes bug #3409 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libgpg-error/libgpg-error.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 45a348e72..1b78b17ce 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -3,10 +3,9 @@ # libgpg-error # ############################################################# -LIBGPG_ERROR_VERSION:=1.8 -LIBGPG_ERROR_SOURCE:=libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 -LIBGPG_ERROR_SITE:=ftp://gd.tuwien.ac.at/privacy/gnupg/libgpg-error +LIBGPG_ERROR_VERSION = 1.10 +LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error LIBGPG_ERROR_INSTALL_STAGING = YES $(eval $(call AUTOTARGETS)) -- cgit v1.2.3 From 2c1035097755db14cb219752e188d5c4e862fbab Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 9 Nov 2011 15:57:52 +0100 Subject: iw: bump to 3.2 version 3.2 provides support for libnl 3.x, so remove the relevant patch Signed-off-by: Yegor Yefremov Acked-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/iw/iw-libnl-30-support.patch | 47 ------------------------------------ package/iw/iw.mk | 2 +- 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 package/iw/iw-libnl-30-support.patch (limited to 'package') diff --git a/package/iw/iw-libnl-30-support.patch b/package/iw/iw-libnl-30-support.patch deleted file mode 100644 index 48a179fb2..000000000 --- a/package/iw/iw-libnl-30-support.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- - Makefile | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -24,6 +24,7 @@ - - NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y) - NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y) -+NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y) - - ifeq ($(NL1FOUND),Y) - NLLIBNAME = libnl-1 -@@ -35,6 +36,12 @@ - NLLIBNAME = libnl-2.0 - endif - -+ifeq ($(NL3FOUND),Y) -+CFLAGS += -DCONFIG_LIBNL20 -+LIBS += -lnl-genl -+NLLIBNAME = libnl-3.0 -+endif -+ - ifeq ($(NLLIBNAME),) - $(error Cannot find development files for any supported version of libnl) - endif -@@ -53,6 +60,8 @@ - all: version_check $(ALL) - - version_check: -+ifeq ($(NL3FOUND),Y) -+else - ifeq ($(NL2FOUND),Y) - else - ifeq ($(NL1FOUND),Y) -@@ -60,6 +69,7 @@ - $(error No libnl found) - endif - endif -+endif - - - VERSION_OBJS := $(filter-out version.o, $(OBJS)) - diff --git a/package/iw/iw.mk b/package/iw/iw.mk index 9f1d65f4d..ab6c67681 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,7 +4,7 @@ # ############################################################# -IW_VERSION = 3.1 +IW_VERSION = 3.2 IW_SOURCE = iw-$(IW_VERSION).tar.bz2 IW_SITE = http://wireless.kernel.org/download/iw IW_DEPENDENCIES = host-pkg-config libnl -- cgit v1.2.3 From ba2a0cf5a135873ab0029a43de7d0bf82d6578df Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 9 Nov 2011 15:57:53 +0100 Subject: usbmount: bump to 0.0.22 FSTYPE detection bug was fixed upstream, so delete relevant patch Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- .../usbmount/usbmount-fstype-detection-fix.patch | 25 ---------------------- package/usbmount/usbmount.mk | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 package/usbmount/usbmount-fstype-detection-fix.patch (limited to 'package') diff --git a/package/usbmount/usbmount-fstype-detection-fix.patch b/package/usbmount/usbmount-fstype-detection-fix.patch deleted file mode 100644 index a3686f1c4..000000000 --- a/package/usbmount/usbmount-fstype-detection-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -newer blkid version shows two parameter with TYPE within: - -/dev/sda1: VERSION="0.0" TYPE="ext2" USAGE="filesystem" PART_ENTRY_SCHEME="dos" -PART_ENTRY_TYPE="0xc" PART_ENTRY_FLAGS="0x80" PART_ENTRY_NUMBER="1" - -change regular expression to take " TYPE" only - -Signed-off-by: Yegor Yefremov ---- - usbmount | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/usbmount -=================================================================== ---- a/usbmount -+++ b/usbmount -@@ -88,7 +88,7 @@ - # FIXME: improvement: implement mounting by label (notice that labels - # can contain spaces, which makes things a little bit less comfortable). - DEVINFO=$(/sbin/blkid -p $DEVNAME) -- FSTYPE=$(echo "$DEVINFO" | sed 's/.*TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') -+ FSTYPE=$(echo "$DEVINFO" | sed 's/.* TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') - UUID=$(echo "$DEVINFO" | sed 's/.*UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') - USAGE=$(echo "$DEVINFO" | sed 's/.*USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') - diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk index 843457005..a6b2d43db 100644 --- a/package/usbmount/usbmount.mk +++ b/package/usbmount/usbmount.mk @@ -3,7 +3,7 @@ # usbmount # ############################################################# -USBMOUNT_VERSION = 0.0.21 +USBMOUNT_VERSION = 0.0.22 USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz USBMOUNT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbmount USBMOUNT_DEPENDENCIES = udev lockfile-progs util-linux -- cgit v1.2.3 From 7c60be98b2d898e5d49b0fa305b7f56dec59a366 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 10 Nov 2011 08:25:25 -0300 Subject: module-init-tools: bump to version 3.15 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...nit-tools-3.11-add-manpages-config-option.patch | 47 ---------------------- ...nit-tools-3.15-add-manpages-config-option.patch | 47 ++++++++++++++++++++++ package/module-init-tools/module-init-tools.mk | 13 +++--- 3 files changed, 54 insertions(+), 53 deletions(-) delete mode 100644 package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch create mode 100644 package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch (limited to 'package') diff --git a/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch b/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch deleted file mode 100644 index 28f51de11..000000000 --- a/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch +++ /dev/null @@ -1,47 +0,0 @@ -Disable manual pages generation when docbook2man is not available. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 7 ++++++- - configure.ac | 7 +++---- - 2 files changed, 9 insertions(+), 5 deletions(-) - -Index: module-init-tools-3.11/Makefile.am -=================================================================== ---- module-init-tools-3.11.orig/Makefile.am -+++ module-init-tools-3.11/Makefile.am -@@ -39,7 +39,12 @@ - MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5 - MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 - SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) --dist_man_MANS = $(MAN5) $(MAN8) -+ -+if HAVE_DOCBOOKTOMAN -+MANPAGES = $(MAN5) $(MAN8) -+endif -+dist_man_MANS = $(MANPAGES) -+ - # If they haven't overridden mandir, fix it (never /man!) - mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) - -Index: module-init-tools-3.11/configure.ac -=================================================================== ---- module-init-tools-3.11.orig/configure.ac -+++ module-init-tools-3.11/configure.ac -@@ -29,13 +29,12 @@ - AC_PROG_CC - AC_PROG_RANLIB - --AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],) --if test x"$DOCBOOKTOMAN" = xno -+AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man) -+if test x"$DOCBOOKTOMAN" = x - then - AC_MSG_WARN([docbook2man not found]) -- # fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile -- DOCBOOKTOMAN=docbook2man - fi -+AM_CONDITIONAL([HAVE_DOCBOOKTOMAN], [test "x$DOCBOOKTOMAN" != "x"]) - - # Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish - # between a broken cc and a working cc but missing libz.a. diff --git a/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch b/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch new file mode 100644 index 000000000..28f51de11 --- /dev/null +++ b/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch @@ -0,0 +1,47 @@ +Disable manual pages generation when docbook2man is not available. + +Signed-off-by: Thomas Petazzoni +--- + Makefile.am | 7 ++++++- + configure.ac | 7 +++---- + 2 files changed, 9 insertions(+), 5 deletions(-) + +Index: module-init-tools-3.11/Makefile.am +=================================================================== +--- module-init-tools-3.11.orig/Makefile.am ++++ module-init-tools-3.11/Makefile.am +@@ -39,7 +39,12 @@ + MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5 + MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 + SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) +-dist_man_MANS = $(MAN5) $(MAN8) ++ ++if HAVE_DOCBOOKTOMAN ++MANPAGES = $(MAN5) $(MAN8) ++endif ++dist_man_MANS = $(MANPAGES) ++ + # If they haven't overridden mandir, fix it (never /man!) + mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) + +Index: module-init-tools-3.11/configure.ac +=================================================================== +--- module-init-tools-3.11.orig/configure.ac ++++ module-init-tools-3.11/configure.ac +@@ -29,13 +29,12 @@ + AC_PROG_CC + AC_PROG_RANLIB + +-AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],) +-if test x"$DOCBOOKTOMAN" = xno ++AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man) ++if test x"$DOCBOOKTOMAN" = x + then + AC_MSG_WARN([docbook2man not found]) +- # fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile +- DOCBOOKTOMAN=docbook2man + fi ++AM_CONDITIONAL([HAVE_DOCBOOKTOMAN], [test "x$DOCBOOKTOMAN" != "x"]) + + # Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish + # between a broken cc and a working cc but missing libz.a. diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index d7e7c2401..ad92a1ac9 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -3,19 +3,20 @@ # module-init-tools # ############################################################# -MODULE_INIT_TOOLS_VERSION=3.12 -MODULE_INIT_TOOLS_SOURCE=module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2 -MODULE_INIT_TOOLS_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/ + +MODULE_INIT_TOOLS_VERSION = 3.15 +MODULE_INIT_TOOLS_SOURCE = module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2 +MODULE_INIT_TOOLS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/ MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN='' MODULE_INIT_TOOLS_CONF_OPT = \ --disable-static-utils \ --disable-builddir \ --program-transform-name='' -# module-init-tools-3.11-add-manpages-config-option.patch is modifying +# module-init-tools-3.15-add-manpages-config-option.patch is modifying # configure.ac and Makefile.am -MODULE_INIT_TOOLS_AUTORECONF=YES -HOST_MODULE_INIT_TOOLS_AUTORECONF=YES +MODULE_INIT_TOOLS_AUTORECONF = YES +HOST_MODULE_INIT_TOOLS_AUTORECONF = YES HOST_MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN='' $(eval $(call AUTOTARGETS)) -- cgit v1.2.3 From a1dd178f3a11a0f19aaf4fe76c61869ea8836a55 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 10 Nov 2011 08:25:26 -0300 Subject: flex: bump to version 2.5.35-10 and cleanup style Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/flex/flex-2.5.33-prog-ar.patch | 11 ----------- package/flex/flex-2.5.35-prog-ar.patch | 11 +++++++++++ package/flex/flex.mk | 23 ++++++++++++----------- 3 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 package/flex/flex-2.5.33-prog-ar.patch create mode 100644 package/flex/flex-2.5.35-prog-ar.patch (limited to 'package') diff --git a/package/flex/flex-2.5.33-prog-ar.patch b/package/flex/flex-2.5.33-prog-ar.patch deleted file mode 100644 index e0626ff95..000000000 --- a/package/flex/flex-2.5.33-prog-ar.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in ---- flex-2.5.33.orig/Makefile.in 2007-01-18 17:29:25.000000000 +0100 -+++ flex-2.5.33/Makefile.in 2007-01-18 18:28:22.000000000 +0100 -@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" - "$(DESTDIR)$(includedir)" - libLIBRARIES_INSTALL = $(INSTALL_DATA) - LIBRARIES = $(lib_LIBRARIES) --AR = ar - ARFLAGS = cru - libfl_a_AR = $(AR) $(ARFLAGS) - libfl_a_LIBADD = diff --git a/package/flex/flex-2.5.35-prog-ar.patch b/package/flex/flex-2.5.35-prog-ar.patch new file mode 100644 index 000000000..e0626ff95 --- /dev/null +++ b/package/flex/flex-2.5.35-prog-ar.patch @@ -0,0 +1,11 @@ +diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in +--- flex-2.5.33.orig/Makefile.in 2007-01-18 17:29:25.000000000 +0100 ++++ flex-2.5.33/Makefile.in 2007-01-18 18:28:22.000000000 +0100 +@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" + "$(DESTDIR)$(includedir)" + libLIBRARIES_INSTALL = $(INSTALL_DATA) + LIBRARIES = $(lib_LIBRARIES) +-AR = ar + ARFLAGS = cru + libfl_a_AR = $(AR) $(ARFLAGS) + libfl_a_LIBADD = diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 706b89d23..df1b4201b 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -3,24 +3,25 @@ # flex # ############################################################# -FLEX_VERSION:=2.5.35 -FLEX_PATCH_VERSION:=9.1 -FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz -FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz -FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex -FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION) -FLEX_INSTALL_STAGING=YES + +FLEX_VERSION = 2.5.35 +FLEX_PATCH_VERSION = 10 +FLEX_SOURCE = flex_$(FLEX_VERSION).orig.tar.gz +FLEX_PATCH = flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz +FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex +FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION) +FLEX_INSTALL_STAGING = YES FLEX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_GETTEXT),gettext) \ $(if $(BR2_PACKAGE_LIBINTL),libintl) # lex -> flex define FLEX_INSTALL_LEX -cd $(TARGET_DIR)/usr/bin && ln -snf flex lex + cd $(TARGET_DIR)/usr/bin && ln -snf flex lex endef define FLEX_UNINSTALL_LEX --rm $(TARGET_DIR)/usr/bin/lex + -rm $(TARGET_DIR)/usr/bin/lex endef FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX @@ -29,11 +30,11 @@ FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LEX # libfl installation ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y) define FLEX_INSTALL_LIBFL -install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a + install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a endef define FLEX_UNINSTALL_LIBFL --rm $(STAGING_DIR)/lib/libfl.a + -rm $(STAGING_DIR)/lib/libfl.a endef FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL -- cgit v1.2.3 From 8b56bfe8385826c6417dbc8dc731ad535b0de3b5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 10 Nov 2011 08:25:27 -0300 Subject: dropbear: bump to version 2011.54 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../dropbear-0.53.1-static_build_fix.patch | 26 ---------------------- package/dropbear/dropbear-2011.54-no-ipv6.patch | 18 +++++++++++++++ package/dropbear/dropbear.mk | 3 +-- 3 files changed, 19 insertions(+), 28 deletions(-) delete mode 100644 package/dropbear/dropbear-0.53.1-static_build_fix.patch create mode 100644 package/dropbear/dropbear-2011.54-no-ipv6.patch (limited to 'package') diff --git a/package/dropbear/dropbear-0.53.1-static_build_fix.patch b/package/dropbear/dropbear-0.53.1-static_build_fix.patch deleted file mode 100644 index 0e0a91a27..000000000 --- a/package/dropbear/dropbear-0.53.1-static_build_fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -dropbear: fix static build - -the -lcrypt is missing during the link - -svr-authpasswd.o: In function `svr_auth_password': -svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt' -collect2: ld returned 1 exit status - -Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -77,7 +77,7 @@ STRIP=@STRIP@ - INSTALL=@INSTALL@ - CPPFLAGS=@CPPFLAGS@ - CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ --LIBS+=@LIBS@ -+LIBS+=@CRYPTLIB@ @LIBS@ - LDFLAGS=@LDFLAGS@ - - EXEEXT=@EXEEXT@ diff --git a/package/dropbear/dropbear-2011.54-no-ipv6.patch b/package/dropbear/dropbear-2011.54-no-ipv6.patch new file mode 100644 index 000000000..4ee9aaa66 --- /dev/null +++ b/package/dropbear/dropbear-2011.54-no-ipv6.patch @@ -0,0 +1,18 @@ +Check for IPV6_TCLASS instead of IPPROTO_IPV6 since +it's present on non-IPv6 enabled toolchains too. + +Signed-off-by: Gustavo Zacarias +--- + +diff -Nura dropbear-2011.54.orig/dbutil.c dropbear-2011.54/dbutil.c +--- dropbear-2011.54.orig/dbutil.c 2011-11-08 09:48:15.000000000 -0300 ++++ dropbear-2011.54/dbutil.c 2011-11-09 12:14:59.430074138 -0300 +@@ -164,7 +164,7 @@ + /* set the TOS bit for either ipv4 or ipv6 */ + #ifdef IPTOS_LOWDELAY + val = IPTOS_LOWDELAY; +-#ifdef IPPROTO_IPV6 ++#ifdef IPV6_TCLASS + setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, (void*)&val, sizeof(val)); + #endif + setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&val, sizeof(val)); diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index bced0ef4e..5fa50bafa 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,8 +4,7 @@ # ############################################################# -DROPBEAR_VERSION = 0.53.1 -DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz +DROPBEAR_VERSION = 2011.54 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ -- cgit v1.2.3 From e88733af5746c723e6a3a3c5fd1974faa11fa38b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 Nov 2011 19:27:49 -0300 Subject: lame: bump to version 3.99 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/multimedia/lame/lame-no-static.patch | 28 ---------------------------- package/multimedia/lame/lame.mk | 3 ++- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/multimedia/lame/lame-no-static.patch (limited to 'package') diff --git a/package/multimedia/lame/lame-no-static.patch b/package/multimedia/lame/lame-no-static.patch deleted file mode 100644 index f507f7f70..000000000 --- a/package/multimedia/lame/lame-no-static.patch +++ /dev/null @@ -1,28 +0,0 @@ -We don't want statically compiled binaries by force so nuke that. - -Signed-off-by: Gustavo Zacarias - -diff -Nura lame-3.98.4/frontend/Makefile.am lame-3.98.4.nostatic/frontend/Makefile.am ---- lame-3.98.4/frontend/Makefile.am 2006-09-30 06:17:05.000000000 -0300 -+++ lame-3.98.4.nostatic/frontend/Makefile.am 2011-02-10 13:46:05.512559590 -0300 -@@ -52,7 +52,7 @@ - endif - - CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ --LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static -+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ - - INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) - -diff -Nura lame-3.98.4/frontend/Makefile.in lame-3.98.4.nostatic/frontend/Makefile.in ---- lame-3.98.4/frontend/Makefile.in 2008-06-25 09:17:51.000000000 -0300 -+++ lame-3.98.4.nostatic/frontend/Makefile.in 2011-02-10 13:45:54.752559590 -0300 -@@ -152,7 +152,7 @@ - $(top_builddir)/libmp3lame/libmp3lame.la \ - @FRONTEND_LDADD@ - --LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static -+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk index 7609f2db3..fbf0ddae5 100644 --- a/package/multimedia/lame/lame.mk +++ b/package/multimedia/lame/lame.mk @@ -4,11 +4,12 @@ # ############################################################# -LAME_VERSION = 3.98.4 +LAME_VERSION = 3.99 LAME_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lame LAME_DEPENDENCIES = host-pkg-config LAME_INSTALL_STAGING = YES LAME_CONF_ENV = GTK_CONFIG=/bin/false +LAME_CONF_OPT = --enable-dynamic-frontends ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) LAME_DEPENDENCIES += libsndfile -- cgit v1.2.3 From 6ba2d9e28ce3df01efa8dd68bb963311889a4805 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 Nov 2011 19:27:50 -0300 Subject: bash: bump to version 4.2 pl10 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/bash/bash-4.1-001.patch | 48 ---- package/bash/bash-4.1-002.patch | 65 ------ package/bash/bash-4.1-003.patch | 48 ---- package/bash/bash-4.1-004.patch | 47 ---- package/bash/bash-4.1-005.patch | 56 ----- package/bash/bash-4.1-006.patch | 76 ------- package/bash/bash-4.1-007.patch | 47 ---- package/bash/bash-4.1-008.patch | 49 ----- package/bash/bash-4.1-009.patch | 48 ---- package/bash/bash-4.1-mkbuiltins-cross.patch | 31 --- package/bash/bash-4.2-001.patch | 78 +++++++ package/bash/bash-4.2-002.patch | 60 +++++ package/bash/bash-4.2-003.patch | 318 +++++++++++++++++++++++++++ package/bash/bash-4.2-004.patch | 53 +++++ package/bash/bash-4.2-005.patch | 131 +++++++++++ package/bash/bash-4.2-006.patch | 46 ++++ package/bash/bash-4.2-007.patch | 46 ++++ package/bash/bash-4.2-008.patch | 74 +++++++ package/bash/bash-4.2-009.patch | 82 +++++++ package/bash/bash-4.2-010.patch | 61 +++++ package/bash/bash-4.2-mkbuiltins-cross.patch | 31 +++ package/bash/bash.mk | 3 +- 22 files changed, 982 insertions(+), 516 deletions(-) delete mode 100644 package/bash/bash-4.1-001.patch delete mode 100644 package/bash/bash-4.1-002.patch delete mode 100644 package/bash/bash-4.1-003.patch delete mode 100644 package/bash/bash-4.1-004.patch delete mode 100644 package/bash/bash-4.1-005.patch delete mode 100644 package/bash/bash-4.1-006.patch delete mode 100644 package/bash/bash-4.1-007.patch delete mode 100644 package/bash/bash-4.1-008.patch delete mode 100644 package/bash/bash-4.1-009.patch delete mode 100644 package/bash/bash-4.1-mkbuiltins-cross.patch create mode 100644 package/bash/bash-4.2-001.patch create mode 100644 package/bash/bash-4.2-002.patch create mode 100644 package/bash/bash-4.2-003.patch create mode 100644 package/bash/bash-4.2-004.patch create mode 100644 package/bash/bash-4.2-005.patch create mode 100644 package/bash/bash-4.2-006.patch create mode 100644 package/bash/bash-4.2-007.patch create mode 100644 package/bash/bash-4.2-008.patch create mode 100644 package/bash/bash-4.2-009.patch create mode 100644 package/bash/bash-4.2-010.patch create mode 100644 package/bash/bash-4.2-mkbuiltins-cross.patch (limited to 'package') diff --git a/package/bash/bash-4.1-001.patch b/package/bash/bash-4.1-001.patch deleted file mode 100644 index be5f9823e..000000000 --- a/package/bash/bash-4.1-001.patch +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-001 - -Bug-Reported-by: Yann Rouillard -Bug-Reference-ID: <4B44A410.4070107@pleiades.fr.eu.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html - -Bug-Description: - -A prototype for vsnprintf was incorrect, and caused compilation failures -on systems that did not have a suitable vsnprintf, but had a declaration in -one of the system header files. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500 ---- ./builtins/printf.def 2010-01-07 08:50:06.000000000 -0500 -*************** -*** 173,177 **** - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); - #endif - ---- 173,177 ---- - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); - #endif - -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- ./patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.1-002.patch b/package/bash/bash-4.1-002.patch deleted file mode 100644 index 7601ab2d6..000000000 --- a/package/bash/bash-4.1-002.patch +++ /dev/null @@ -1,65 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-002 - -Bug-Reported-by: guillaume.outters@free.fr -Bug-Reference-ID: <20100105230441.70D171AA7F52@asterix.local> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html - -Bug-Description: - -Bash-4.1/Readline-6.1 introduced a hook function that allows applications -to rewrite or modify filenames read from the file system before comparing -them with a word to be completed. The converted filename, if it matches, -needs to be inserted into the line buffer, replacing the original contents. - -This fixes a completion bug on Mac OS X involving filenames containing -UTF-8 characters. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/lib/readline/complete.c 2009-11-29 18:39:30.000000000 -0500 ---- ./lib/readline/complete.c 2010-01-06 08:30:23.000000000 -0500 -*************** -*** 2139,2143 **** - if (filename_len == 0) - { -! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name)) - continue; - ---- 2139,2143 ---- - if (filename_len == 0) - { -! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn)) - continue; - -*************** -*** 2220,2224 **** - } - -! strcpy (temp + dirlen, entry->d_name); - } - else ---- 2220,2224 ---- - } - -! strcpy (temp + dirlen, convfn); - } - else -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- ./patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.1-003.patch b/package/bash/bash-4.1-003.patch deleted file mode 100644 index fc12bb54d..000000000 --- a/package/bash/bash-4.1-003.patch +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-003 - -Bug-Reported-by: coyote@wariat.org.pl -Bug-Reference-ID: <4b64a1f8.06e2660a.60af.4bfb@mx.google.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html - -Bug-Description: - -If command completion is attempted on a word with a quoted globbing -character (e.g., `*' or `?'), bash can reference a NULL pointer and -dump core. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/bashline.c 2009-10-24 14:10:19.000000000 -0400 ---- ./bashline.c 2010-01-30 21:53:49.000000000 -0500 -*************** -*** 1681,1685 **** - characters in the common prefix are bad) will ever be returned on - regular completion. */ -! if (glob_pattern_p (hint)) - { - if (state == 0) ---- 1681,1685 ---- - characters in the common prefix are bad) will ever be returned on - regular completion. */ -! if (globpat) - { - if (state == 0) -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- ./patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.1-004.patch b/package/bash/bash-4.1-004.patch deleted file mode 100644 index a6b83358e..000000000 --- a/package/bash/bash-4.1-004.patch +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-004 - -Bug-Reported-by: Crestez Dan Leonard -Bug-Reference-ID: <1265592839.30682.21.camel@deskbox> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00034.html - -Bug-Description: - -When running in Posix mode and executing a shell function without local -variables, bash will not propagate a variable in a special builtin's temporary -environment to have global scope. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/variables.c 2009-11-03 14:13:58.000000000 -0500 ---- ./variables.c 2010-02-08 17:36:18.000000000 -0500 -*************** -*** 3809,3812 **** ---- 3809,3817 ---- - if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate))) - { -+ /* Make sure we have a hash table to store the variable in while it is -+ being propagated down to the global variables table. Create one if -+ we have to */ -+ if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0) -+ shell_variables->table = hash_create (0); - /* XXX - should we set v->context here? */ - v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0); -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- ./patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.1-005.patch b/package/bash/bash-4.1-005.patch deleted file mode 100644 index 79745475c..000000000 --- a/package/bash/bash-4.1-005.patch +++ /dev/null @@ -1,56 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-005 - -Bug-Reported-by: werner@suse.de -Bug-Reference-ID: <201002251238.o1PCcYcg016893@boole.suse.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00132.html - -Bug-Description: - -When the `read' builtin times out after the timeout specified with -t is -exceeded, it does not reset the flags that tell signal handlers to process -signals immediately instead of deferring their handling. This can result -in unsafe functions being called from signal handlers, which can cause bash -to hang or dump core. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/read.def 2009-10-08 11:35:46.000000000 -0400 ---- ./builtins/read.def 2010-03-17 17:35:39.000000000 -0400 -*************** -*** 616,621 **** - zsyncfd (fd); - -- interrupt_immediately--; -- terminate_immediately--; - discard_unwind_frame ("read_builtin"); - ---- 616,619 ---- -*************** -*** 624,627 **** ---- 622,628 ---- - assign_vars: - -+ interrupt_immediately--; -+ terminate_immediately--; -+ - #if defined (ARRAY_VARS) - /* If -a was given, take the string read, break it into a list of words, -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- ./patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.1-006.patch b/package/bash/bash-4.1-006.patch deleted file mode 100644 index c33d0bd0f..000000000 --- a/package/bash/bash-4.1-006.patch +++ /dev/null @@ -1,76 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-006 - -Bug-Reported-by: Mike Frysinger -Bug-Reference-ID: <201003210155.56618.vapier@gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html - -Bug-Description: - -Bash did not correctly print/reproduce here documents attached to commands -inside compound commands such as for and while. This affected the -execution of such commands inside a shell function when the function -definition is saved and later restored using `.' or `eval'. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400 ---- ./print_cmd.c 2010-03-22 21:15:30.000000000 -0400 -*************** -*** 114,117 **** ---- 114,123 ---- - #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr) - -+ #define PRINT_DEFERRED_HEREDOCS(x) \ -+ do { \ -+ if (deferred_heredocs) \ -+ print_deferred_heredocs (x); \ -+ } while (0) -+ - /* Non-zero means the stuff being printed is inside of a function def. */ - static int inside_function_def; -*************** -*** 561,571 **** - { - print_for_command_head (for_command); -- - cprintf (";"); - newline ("do\n"); - indentation += indentation_amount; - make_command_string_internal (for_command->action); - semicolon (); - indentation -= indentation_amount; - newline ("done"); - } ---- 566,578 ---- - { - print_for_command_head (for_command); - cprintf (";"); - newline ("do\n"); -+ - indentation += indentation_amount; - make_command_string_internal (for_command->action); -+ PRINT_DEFERRED_HEREDOCS (""); - semicolon (); - indentation -= indentation_amount; -+ - newline ("done"); - } -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- ./patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.1-007.patch b/package/bash/bash-4.1-007.patch deleted file mode 100644 index a421b0c41..000000000 --- a/package/bash/bash-4.1-007.patch +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-007 - -Bug-Reported-by: Rob Robason -Bug-Reference-ID: <1269513145.22336.9.camel@home.robason.homelinux.net> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html - -Bug-Description: - -A typo caused bash to not honor a precision specification in a printf -format. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/printf.def 2010-01-18 10:50:22.000000000 -0500 ---- ./builtins/printf.def 2010-03-25 09:40:56.000000000 -0400 -*************** -*** 118,122 **** - nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ - else if (have_precision) \ -! nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \ - else \ - nw = vflag ? vbprintf (f, func) : printf (f, func); \ ---- 118,122 ---- - nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ - else if (have_precision) \ -! nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \ - else \ - nw = vflag ? vbprintf (f, func) : printf (f, func); \ -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- ./patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.1-008.patch b/package/bash/bash-4.1-008.patch deleted file mode 100644 index 72b855ee7..000000000 --- a/package/bash/bash-4.1-008.patch +++ /dev/null @@ -1,49 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-008 - -Bug-Reported-by: Dennis van Dok -Bug-Reference-ID: <4BBF2501.5050703@gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html - -Bug-Description: - -When declaring an associative array and implicitly assigning a value -to element "0", bash does not correctly allocate memory, leading to -a segmentation violation when that element or the array itself is -unset. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/declare.def 2009-11-25 19:42:00.000000000 -0500 ---- ./builtins/declare.def 2010-05-30 18:25:21.000000000 -0400 -*************** -*** 513,517 **** - /* let bind_{array,assoc}_variable take care of this. */ - if (assoc_p (var)) -! bind_assoc_variable (var, name, "0", value, aflags); - else - bind_array_variable (name, 0, value, aflags); ---- 519,523 ---- - /* let bind_{array,assoc}_variable take care of this. */ - if (assoc_p (var)) -! bind_assoc_variable (var, name, savestring ("0"), value, aflags); - else - bind_array_variable (name, 0, value, aflags); -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- ./patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.1-009.patch b/package/bash/bash-4.1-009.patch deleted file mode 100644 index ed136a9fd..000000000 --- a/package/bash/bash-4.1-009.patch +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-009 - -Bug-Reported-by: Tomas Trnka -Bug-Reference-ID: <201003242030.02166.tomastrnka@gmx.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html - -Bug-Description: - -An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to -or read(2) from a terminal. This results in an error message and truncated -input or output. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/sig.c Fri Aug 14 16:31:52 2009 ---- ./sig.c Fri Mar 26 22:34:11 2010 -*************** -*** 655,660 **** ---- 655,663 ---- - act.sa_flags |= SA_INTERRUPT; /* XXX */ - else - act.sa_flags |= SA_RESTART; /* XXX */ -+ #else -+ if (sig == SIGCHLD) -+ act.sa_flags |= SA_RESTART; - #endif - sigemptyset (&act.sa_mask); - sigemptyset (&oact.sa_mask); -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- ./patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ - diff --git a/package/bash/bash-4.1-mkbuiltins-cross.patch b/package/bash/bash-4.1-mkbuiltins-cross.patch deleted file mode 100644 index 4252d5387..000000000 --- a/package/bash/bash-4.1-mkbuiltins-cross.patch +++ /dev/null @@ -1,31 +0,0 @@ -Let mkbuiltins use config.h even if cross compiling - -Signed-off-by: Gustavo Zacarias ---- - builtins/mkbuiltins.c | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) - -diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c -index cdd45e4..1349093 100644 ---- a/builtins/mkbuiltins.c -+++ b/builtins/mkbuiltins.c -@@ -19,16 +19,7 @@ - along with Bash. If not, see . - */ - --#if !defined (CROSS_COMPILING) - # include --#else /* CROSS_COMPILING */ --/* A conservative set of defines based on POSIX/SUS3/XPG6 */ --# define HAVE_UNISTD_H --# define HAVE_STRING_H --# define HAVE_STDLIB_H -- --# define HAVE_RENAME --#endif /* CROSS_COMPILING */ - - #if defined (HAVE_UNISTD_H) - # ifdef _MINIX --- -1.7.2.2 - diff --git a/package/bash/bash-4.2-001.patch b/package/bash/bash-4.2-001.patch new file mode 100644 index 000000000..b5c0aa905 --- /dev/null +++ b/package/bash/bash-4.2-001.patch @@ -0,0 +1,78 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-001 + +Bug-Reported-by: Juergen Daubert +Bug-Reference-ID: <20110214175132.GA19813@jue.netz> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html + +Bug-Description: + +When running in Posix mode, bash does not correctly expand the right-hand +side of a double-quoted word expansion containing single quotes. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500 +--- ./subst.c 2011-02-19 00:00:00.000000000 -0500 +*************** +*** 1380,1387 **** + + /* The handling of dolbrace_state needs to agree with the code in parse.y: +! parse_matched_pair() */ +! dolbrace_state = 0; +! if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) +! dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM; + + i = *sindex; +--- 1380,1389 ---- + + /* The handling of dolbrace_state needs to agree with the code in parse.y: +! parse_matched_pair(). The different initial value is to handle the +! case where this function is called to parse the word in +! ${param op word} (SX_WORD). */ +! dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM; +! if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP)) +! dolbrace_state = DOLBRACE_QUOTE; + + i = *sindex; +*************** +*** 7177,7181 **** + /* Extract the contents of the ${ ... } expansion + according to the Posix.2 rules. */ +! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0); + if (string[sindex] == RBRACE) + sindex++; +--- 7181,7185 ---- + /* Extract the contents of the ${ ... } expansion + according to the Posix.2 rules. */ +! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD); + if (string[sindex] == RBRACE) + sindex++; +*** ../bash-4.2-patched/subst.h 2010-12-02 20:21:29.000000000 -0500 +--- ./subst.h 2011-02-16 21:12:09.000000000 -0500 +*************** +*** 57,60 **** +--- 57,61 ---- + #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */ + #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal expansions in extract_dollar_brace_string */ ++ #define SX_WORD 0x0200 /* extracting word in ${param op word} */ + + /* Remove backslashes which are quoting backquotes from STRING. Modifies +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 0 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-002.patch b/package/bash/bash-4.2-002.patch new file mode 100644 index 000000000..0d35ad267 --- /dev/null +++ b/package/bash/bash-4.2-002.patch @@ -0,0 +1,60 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-002 + +Bug-Reported-by: Clark J. Wang +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html + +Bug-Description: + +The readline vi-mode `cc', `dd', and `yy' commands failed to modify the +entire line. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/readline/vi_mode.c 2010-11-20 19:51:39.000000000 -0500 +--- ./lib/readline/vi_mode.c 2011-02-17 20:24:25.000000000 -0500 +*************** +*** 1115,1119 **** + _rl_vi_last_motion = c; + RL_UNSETSTATE (RL_STATE_VIMOTION); +! return (0); + } + #if defined (READLINE_CALLBACKS) +--- 1115,1119 ---- + _rl_vi_last_motion = c; + RL_UNSETSTATE (RL_STATE_VIMOTION); +! return (vidomove_dispatch (m)); + } + #if defined (READLINE_CALLBACKS) +*** ../bash-4.2-patched/lib/readline/callback.c 2010-06-06 12:18:58.000000000 -0400 +--- ./lib/readline/callback.c 2011-02-17 20:43:28.000000000 -0500 +*************** +*** 149,152 **** +--- 149,155 ---- + /* Should handle everything, including cleanup, numeric arguments, + and turning off RL_STATE_VIMOTION */ ++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) ++ _rl_internal_char_cleanup (); ++ + return; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ + diff --git a/package/bash/bash-4.2-003.patch b/package/bash/bash-4.2-003.patch new file mode 100644 index 000000000..a17b12764 --- /dev/null +++ b/package/bash/bash-4.2-003.patch @@ -0,0 +1,318 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-003 + +Bug-Reported-by: Clark J. Wang +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html + +Bug-Description: + +When using the pattern replacement and pattern removal word expansions, bash +miscalculates the possible match length in the presence of an unescaped left +bracket without a closing right bracket, resulting in a failure to match +the pattern. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/glob/gmisc.c 2011-02-05 16:11:17.000000000 -0500 +--- ./lib/glob/gmisc.c 2011-02-18 23:53:42.000000000 -0500 +*************** +*** 78,83 **** + size_t wmax; + { +! wchar_t wc, *wbrack; +! int matlen, t, in_cclass, in_collsym, in_equiv; + + if (*wpat == 0) +--- 78,83 ---- + size_t wmax; + { +! wchar_t wc; +! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*wpat == 0) +*************** +*** 119,123 **** + case L'[': + /* scan for ending `]', skipping over embedded [:...:] */ +! wbrack = wpat; + wc = *wpat++; + do +--- 119,123 ---- + case L'[': + /* scan for ending `]', skipping over embedded [:...:] */ +! bracklen = 1; + wc = *wpat++; + do +*************** +*** 125,140 **** + if (wc == 0) + { +! matlen += wpat - wbrack - 1; /* incremented below */ +! break; + } + else if (wc == L'\\') + { +! wc = *wpat++; +! if (*wpat == 0) +! break; + } + else if (wc == L'[' && *wpat == L':') /* character class */ + { + wpat++; + in_cclass = 1; + } +--- 125,148 ---- + if (wc == 0) + { +! wpat--; /* back up to NUL */ +! matlen += bracklen; +! goto bad_bracket; + } + else if (wc == L'\\') + { +! /* *wpat == backslash-escaped character */ +! bracklen++; +! /* If the backslash or backslash-escape ends the string, +! bail. The ++wpat skips over the backslash escape */ +! if (*wpat == 0 || *++wpat == 0) +! { +! matlen += bracklen; +! goto bad_bracket; +! } + } + else if (wc == L'[' && *wpat == L':') /* character class */ + { + wpat++; ++ bracklen++; + in_cclass = 1; + } +*************** +*** 142,145 **** +--- 150,154 ---- + { + wpat++; ++ bracklen++; + in_cclass = 0; + } +*************** +*** 147,152 **** + { + wpat++; + if (*wpat == L']') /* right bracket can appear as collating symbol */ +! wpat++; + in_collsym = 1; + } +--- 156,165 ---- + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as collating symbol */ +! { +! wpat++; +! bracklen++; +! } + in_collsym = 1; + } +*************** +*** 154,157 **** +--- 167,171 ---- + { + wpat++; ++ bracklen++; + in_collsym = 0; + } +*************** +*** 159,164 **** + { + wpat++; + if (*wpat == L']') /* right bracket can appear as equivalence class */ +! wpat++; + in_equiv = 1; + } +--- 173,182 ---- + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as equivalence class */ +! { +! wpat++; +! bracklen++; +! } + in_equiv = 1; + } +*************** +*** 166,174 **** +--- 184,196 ---- + { + wpat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((wc = *wpat++) != L']'); + matlen++; /* bracket expression can only match one char */ ++ bad_bracket: + break; + } +*************** +*** 214,219 **** + size_t max; + { +! char c, *brack; +! int matlen, t, in_cclass, in_collsym, in_equiv; + + if (*pat == 0) +--- 236,241 ---- + size_t max; + { +! char c; +! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*pat == 0) +*************** +*** 255,259 **** + case '[': + /* scan for ending `]', skipping over embedded [:...:] */ +! brack = pat; + c = *pat++; + do +--- 277,281 ---- + case '[': + /* scan for ending `]', skipping over embedded [:...:] */ +! bracklen = 1; + c = *pat++; + do +*************** +*** 261,276 **** + if (c == 0) + { +! matlen += pat - brack - 1; /* incremented below */ +! break; + } + else if (c == '\\') + { +! c = *pat++; +! if (*pat == 0) +! break; + } + else if (c == '[' && *pat == ':') /* character class */ + { + pat++; + in_cclass = 1; + } +--- 283,306 ---- + if (c == 0) + { +! pat--; /* back up to NUL */ +! matlen += bracklen; +! goto bad_bracket; + } + else if (c == '\\') + { +! /* *pat == backslash-escaped character */ +! bracklen++; +! /* If the backslash or backslash-escape ends the string, +! bail. The ++pat skips over the backslash escape */ +! if (*pat == 0 || *++pat == 0) +! { +! matlen += bracklen; +! goto bad_bracket; +! } + } + else if (c == '[' && *pat == ':') /* character class */ + { + pat++; ++ bracklen++; + in_cclass = 1; + } +*************** +*** 278,281 **** +--- 308,312 ---- + { + pat++; ++ bracklen++; + in_cclass = 0; + } +*************** +*** 283,288 **** + { + pat++; + if (*pat == ']') /* right bracket can appear as collating symbol */ +! pat++; + in_collsym = 1; + } +--- 314,323 ---- + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as collating symbol */ +! { +! pat++; +! bracklen++; +! } + in_collsym = 1; + } +*************** +*** 290,293 **** +--- 325,329 ---- + { + pat++; ++ bracklen++; + in_collsym = 0; + } +*************** +*** 295,300 **** + { + pat++; + if (*pat == ']') /* right bracket can appear as equivalence class */ +! pat++; + in_equiv = 1; + } +--- 331,340 ---- + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as equivalence class */ +! { +! pat++; +! bracklen++; +! } + in_equiv = 1; + } +*************** +*** 302,310 **** +--- 342,354 ---- + { + pat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((c = *pat++) != ']'); + matlen++; /* bracket expression can only match one char */ ++ bad_bracket: + break; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-004.patch b/package/bash/bash-4.2-004.patch new file mode 100644 index 000000000..fe419fa77 --- /dev/null +++ b/package/bash/bash-4.2-004.patch @@ -0,0 +1,53 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-004 + +Bug-Reported-by: Mike Frysinger +Bug-Reference-ID: <201102182106.17834.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html + +Bug-Description: + +When used in contexts where word splitting and quote removal were not +performed, such as pattern removal or pattern substitution, empty strings +(either literal or resulting from quoted variables that were unset or +null) were not matched correctly, resulting in failure. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500 +--- ./subst.c 2011-02-18 22:30:13.000000000 -0500 +*************** +*** 3373,3379 **** + if (string == 0 || *string == '\0') + return (WORD_LIST *)NULL; + +! td.flags = 0; + td.word = string; + tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); + return (tresult); +--- 3373,3379 ---- + if (string == 0 || *string == '\0') + return (WORD_LIST *)NULL; + +! td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */ + td.word = string; + tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); + return (tresult); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-005.patch b/package/bash/bash-4.2-005.patch new file mode 100644 index 000000000..c53a4e9c9 --- /dev/null +++ b/package/bash/bash-4.2-005.patch @@ -0,0 +1,131 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-005 + +Bug-Reported-by: Dennis Williamson +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html + +Bug-Description: + +Systems that use tzset() to set the local timezone require the TZ variable +to be in the environment. Bash must make sure the environment has been +modified with any updated value for TZ before calling tzset(). This +affects prompt string expansions and the `%T' printf conversion specification +on systems that do not allow bash to supply a replacement for getenv(3). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/variables.h 2010-12-02 20:22:01.000000000 -0500 +--- ./variables.h 2011-02-19 19:57:12.000000000 -0500 +*************** +*** 314,317 **** +--- 314,318 ---- + extern void sort_variables __P((SHELL_VAR **)); + ++ extern int chkexport __P((char *)); + extern void maybe_make_export_env __P((void)); + extern void update_export_env_inplace __P((char *, int, char *)); +*** ../bash-4.2-patched/variables.c 2011-01-24 20:07:48.000000000 -0500 +--- ./variables.c 2011-02-19 20:04:50.000000000 -0500 +*************** +*** 3654,3657 **** +--- 3654,3673 ---- + } + ++ int ++ chkexport (name) ++ char *name; ++ { ++ SHELL_VAR *v; ++ ++ v = find_variable (name); ++ if (exported_p (v)) ++ { ++ array_needs_making = 1; ++ maybe_make_export_env (); ++ return 1; ++ } ++ return 0; ++ } ++ + void + maybe_make_export_env () +*************** +*** 4215,4219 **** + { "TEXTDOMAINDIR", sv_locale }, + +! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) + { "TZ", sv_tz }, + #endif +--- 4231,4235 ---- + { "TEXTDOMAINDIR", sv_locale }, + +! #if defined (HAVE_TZSET) + { "TZ", sv_tz }, + #endif +*************** +*** 4559,4568 **** + #endif /* HISTORY */ + +! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) + void + sv_tz (name) + char *name; + { +! tzset (); + } + #endif +--- 4575,4585 ---- + #endif /* HISTORY */ + +! #if defined (HAVE_TZSET) + void + sv_tz (name) + char *name; + { +! if (chkexport (name)) +! tzset (); + } + #endif +*** ../bash-4.2-patched/parse.y 2011-01-02 15:48:11.000000000 -0500 +--- ./parse.y 2011-02-19 20:05:00.000000000 -0500 +*************** +*** 5136,5139 **** +--- 5136,5142 ---- + /* Make the current time/date into a string. */ + (void) time (&the_time); ++ #if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++ #endif + tm = localtime (&the_time); + +*** ../bash-4.2-patched/builtins/printf.def 2010-11-23 10:02:55.000000000 -0500 +--- ./builtins/printf.def 2011-02-19 20:05:04.000000000 -0500 +*************** +*** 466,469 **** +--- 466,472 ---- + else + secs = arg; ++ #if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++ #endif + tm = localtime (&secs); + n = strftime (timebuf, sizeof (timebuf), timefmt, tm); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-006.patch b/package/bash/bash-4.2-006.patch new file mode 100644 index 000000000..ce8d9890d --- /dev/null +++ b/package/bash/bash-4.2-006.patch @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-006 + +Bug-Reported-by: Allan McRae +Bug-Reference-ID: <4D6D0D0B.50908@archlinux.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html + +Bug-Description: + +A problem with bash42-005 caused it to dump core if TZ was unset. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/variables.c 2011-02-25 12:07:41.000000000 -0500 +--- ./variables.c 2011-03-01 10:13:04.000000000 -0500 +*************** +*** 3661,3665 **** + + v = find_variable (name); +! if (exported_p (v)) + { + array_needs_making = 1; +--- 3661,3665 ---- + + v = find_variable (name); +! if (v && exported_p (v)) + { + array_needs_making = 1; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-007.patch b/package/bash/bash-4.2-007.patch new file mode 100644 index 000000000..6fca89662 --- /dev/null +++ b/package/bash/bash-4.2-007.patch @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-007 + +Bug-Reported-by: Matthias Klose +Bug-Reference-ID: <4D6FD2AC.1010500@debian.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html + +Bug-Description: + +When used in contexts where word splitting and quote removal were not +performed, such as case statement word expansion, empty strings +(either literal or resulting from quoted variables that were unset or +null) were not expanded correctly, resulting in failure. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-02-25 12:03:58.000000000 -0500 +--- ./subst.c 2011-03-03 14:08:23.000000000 -0500 +*************** +*** 4609,4614 **** +--- 4611,4617 ---- + if (ifs_firstc == 0) + #endif + word->flags |= W_NOSPLIT; ++ word->flags |= W_NOSPLIT2; + result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); + expand_no_split_dollar_star = 0; + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-008.patch b/package/bash/bash-4.2-008.patch new file mode 100644 index 000000000..91f888272 --- /dev/null +++ b/package/bash/bash-4.2-008.patch @@ -0,0 +1,74 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-008 + +Bug-Reported-by: Doug McMahon +Bug-Reference-ID: <1299441211.2535.11.camel@doug-XPS-M1330> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html + +Bug-Description: + +Bash-4.2 does not attempt to save the shell history on receipt of a +terminating signal that is handled synchronously. Unfortunately, the +`close' button on most X11 terminal emulators sends SIGHUP, which +kills the shell. + +This is a very small patch to save the history in the case that an +interactive shell receives a SIGHUP or SIGTERM while in readline and +reading a command. + +The next version of bash will do this differently. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/sig.c Tue Nov 23 08:21:22 2010 +--- ./sig.c Tue Mar 8 21:28:32 2011 +*************** +*** 47,50 **** +--- 47,51 ---- + #if defined (READLINE) + # include "bashline.h" ++ # include + #endif + +*************** +*** 63,66 **** +--- 64,68 ---- + extern int history_lines_this_session; + #endif ++ extern int no_line_editing; + + extern void initialize_siglist (); +*************** +*** 506,510 **** + #if defined (HISTORY) + /* XXX - will inhibit history file being written */ +! history_lines_this_session = 0; + #endif + terminate_immediately = 0; +--- 508,515 ---- + #if defined (HISTORY) + /* XXX - will inhibit history file being written */ +! # if defined (READLINE) +! if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0)) +! # endif +! history_lines_this_session = 0; + #endif + terminate_immediately = 0; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-009.patch b/package/bash/bash-4.2-009.patch new file mode 100644 index 000000000..a4a5ded81 --- /dev/null +++ b/package/bash/bash-4.2-009.patch @@ -0,0 +1,82 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-009 + +Bug-Reported-by: +Bug-Reference-ID: <4DAAC0DB.7060606@piumalab.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html + +Bug-Description: + +Under certain circumstances, running `fc -l' two times in succession with a +relative history offset at the end of the history will result in an incorrect +calculation of the last history entry and a seg fault. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/fc.def 2010-05-30 18:25:38.000000000 -0400 +--- ./builtins/fc.def 2011-04-19 15:46:17.000000000 -0400 +*************** +*** 305,309 **** + + /* XXX */ +! if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; +--- 305,309 ---- + + /* XXX */ +! if (i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; +*************** +*** 476,480 **** + { + int sign, n, clen, rh; +! register int i, j; + register char *s; + +--- 476,480 ---- + { + int sign, n, clen, rh; +! register int i, j, last_hist; + register char *s; + +*************** +*** 496,500 **** + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +! i -= rh + hist_last_line_added; + + /* No specification defaults to most recent command. */ +--- 496,508 ---- + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +! last_hist = i - rh - hist_last_line_added; +! +! if (i == last_hist && hlist[last_hist] == 0) +! while (last_hist >= 0 && hlist[last_hist] == 0) +! last_hist--; +! if (last_hist < 0) +! return (-1); +! +! i = last_hist; + + /* No specification defaults to most recent command. */ +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-010.patch b/package/bash/bash-4.2-010.patch new file mode 100644 index 000000000..0970c3775 --- /dev/null +++ b/package/bash/bash-4.2-010.patch @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-010 + +Bug-Reported-by: Mike Frysinger +Bug-Reference-ID: <201104122356.20160.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html + +Bug-Description: + +Bash did not correctly print/reproduce here documents attached to commands +inside compound commands such as arithmetic for loops and user-specified +subshells. This affected the execution of such commands inside a shell +function when the function definition is saved and later restored using +`.' or `eval'. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/print_cmd.c 2010-05-30 18:34:08.000000000 -0400 +--- ./print_cmd.c 2011-04-14 10:43:18.000000000 -0400 +*************** +*** 316,319 **** +--- 317,321 ---- + skip_this_indent++; + make_command_string_internal (command->value.Subshell->command); ++ PRINT_DEFERRED_HEREDOCS (""); + cprintf (" )"); + break; +*************** +*** 593,596 **** +--- 606,610 ---- + indentation += indentation_amount; + make_command_string_internal (arith_for_command->action); ++ PRINT_DEFERRED_HEREDOCS (""); + semicolon (); + indentation -= indentation_amount; +*************** +*** 654,657 **** +--- 668,672 ---- + + make_command_string_internal (group_command->command); ++ PRINT_DEFERRED_HEREDOCS (""); + + if (inside_function_def) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-mkbuiltins-cross.patch b/package/bash/bash-4.2-mkbuiltins-cross.patch new file mode 100644 index 000000000..4252d5387 --- /dev/null +++ b/package/bash/bash-4.2-mkbuiltins-cross.patch @@ -0,0 +1,31 @@ +Let mkbuiltins use config.h even if cross compiling + +Signed-off-by: Gustavo Zacarias +--- + builtins/mkbuiltins.c | 9 --------- + 1 files changed, 0 insertions(+), 9 deletions(-) + +diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c +index cdd45e4..1349093 100644 +--- a/builtins/mkbuiltins.c ++++ b/builtins/mkbuiltins.c +@@ -19,16 +19,7 @@ + along with Bash. If not, see . + */ + +-#if !defined (CROSS_COMPILING) + # include +-#else /* CROSS_COMPILING */ +-/* A conservative set of defines based on POSIX/SUS3/XPG6 */ +-# define HAVE_UNISTD_H +-# define HAVE_STRING_H +-# define HAVE_STDLIB_H +- +-# define HAVE_RENAME +-#endif /* CROSS_COMPILING */ + + #if defined (HAVE_UNISTD_H) + # ifdef _MINIX +-- +1.7.2.2 + diff --git a/package/bash/bash.mk b/package/bash/bash.mk index b20f6a8c3..f1f951c3a 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,9 +4,10 @@ # ############################################################# -BASH_VERSION = 4.1 +BASH_VERSION = 4.2 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses +BASH_CONF_ENV = bash_cv_job_control_missing=no # Make sure we build after busybox so that /bin/sh links to bash ifeq ($(BR2_PACKAGE_BUSYBOX),y) -- cgit v1.2.3 From 28df108c9b446ec582530721636584fefe27b564 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 Nov 2011 19:27:51 -0300 Subject: bison: bump to version 2.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../bison/bison-2.4.3-uclibc-sched_param-def.patch | 19 ------------------- package/bison/bison.mk | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 package/bison/bison-2.4.3-uclibc-sched_param-def.patch (limited to 'package') diff --git a/package/bison/bison-2.4.3-uclibc-sched_param-def.patch b/package/bison/bison-2.4.3-uclibc-sched_param-def.patch deleted file mode 100644 index 50652d8ba..000000000 --- a/package/bison/bison-2.4.3-uclibc-sched_param-def.patch +++ /dev/null @@ -1,19 +0,0 @@ -uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc -and is not needed too per standard. gnulib attempts to use it but we have to account -for it because in this case uclibc does not behave like glibc. - --Khem - -http://bugs.gentoo.org/336484 - ---- m4-1.4.14/lib/spawn.in.h -+++ m4-1.4.14/lib/spawn.in.h -@@ -31,7 +31,7 @@ - - /* Get definitions of 'struct sched_param' and 'sigset_t'. - But avoid namespace pollution on glibc systems. */ --#ifndef __GLIBC__ -+#if !defined __GLIBC__ || defined __UCLIBC__ - # include - # include - #endif diff --git a/package/bison/bison.mk b/package/bison/bison.mk index d365e33cd..759592e16 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -4,7 +4,7 @@ # ############################################################# -BISON_VERSION = 2.4.3 +BISON_VERSION = 2.5 BISON_SITE = $(BR2_GNU_MIRROR)/bison define BISON_DISABLE_EXAMPLES -- cgit v1.2.3 From f00bc8ac3b93e5e2aa5c8b2c8354de7453d9b60a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 Nov 2011 19:27:52 -0300 Subject: gawk: bump to version 4.0.0 Bump gawk to version 4.0.0 Also build after busybox if it's enabled. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gawk/gawk-no-versioned.patch | 37 +++++++----------------------------- package/gawk/gawk.mk | 7 ++++++- 2 files changed, 13 insertions(+), 31 deletions(-) (limited to 'package') diff --git a/package/gawk/gawk-no-versioned.patch b/package/gawk/gawk-no-versioned.patch index 6f74f5284..ff28581ea 100644 --- a/package/gawk/gawk-no-versioned.patch +++ b/package/gawk/gawk-no-versioned.patch @@ -1,20 +1,13 @@ -From 9cb7ff17dd7f81589f0891413efa5d4aec1a1598 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Mon, 7 Jun 2010 11:33:50 -0300 -Subject: [PATCH] Disabled versioned installation to save space and use symlinks where it's appropiate - +Disabled versioned installation of binaries to save space. +Also use symlinks where it's appropiate. Signed-off-by: Gustavo Zacarias --- - Makefile.in | 3 ++- - doc/Makefile.in | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index f946ee1..a3d467a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -392,7 +392,7 @@ CLEANFILES = core core.* +diff -Nura gawk-4.0.0.orig/Makefile.in gawk-4.0.0/Makefile.in +--- gawk-4.0.0.orig/Makefile.in 2011-06-24 05:16:13.000000000 -0300 ++++ gawk-4.0.0/Makefile.in 2011-11-11 15:31:16.429577288 -0300 +@@ -403,7 +403,7 @@ MAINTAINERCLEANFILES = version.c # We want hard links for install-exec-hook, below @@ -23,7 +16,7 @@ index f946ee1..a3d467a 100644 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -993,6 +993,7 @@ uninstall-am: uninstall-binPROGRAMS +@@ -1011,6 +1011,7 @@ # (This is done universally, which may not always be right, but # there's no easy way to distinguish GNU from non-GNU systems.) install-exec-hook: @@ -31,19 +24,3 @@ index f946ee1..a3d467a 100644 (cd $(DESTDIR)$(bindir); \ $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ $(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ -diff --git a/doc/Makefile.in b/doc/Makefile.in -index b1533e7..8b91694 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -272,7 +272,7 @@ AWKCARD = awkcard.ps - # make pgawk.1 a link to gawk.1 in the installed man directory. - - # We want hard links for install-data-hook, below --LN = ln -+LN = $(LN_S) - all: all-am - - .SUFFIXES: --- -1.6.4.4 - diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 445414b58..7fd85eea4 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,10 +4,15 @@ # ############################################################# -GAWK_VERSION = 3.1.8 +GAWK_VERSION = 4.0.0 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_TARGET_BINS = awk gawk igawk pgawk +# Prefer full-blown gawk over busybox awk +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +GAWK_DEPENDENCIES += busybox +endif + define GAWK_CREATE_SYMLINK ln -sf /usr/bin/gawk $(TARGET_DIR)/usr/bin/awk endef -- cgit v1.2.3 From a0f4ddfbe02a2eec7f6f2158d3258a511a55bf56 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 Nov 2011 19:27:53 -0300 Subject: diffutils: bump to version 3.2 Bump to diffutils version 3.2 Drop all unnecessary configure hints. There's no point in installing diffutils to staging so drop that too. Build after busybox if it's enabled to prefer full-blown diff. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/diffutils/Config.in | 4 ++ package/diffutils/diffutils-2.8.1-__mempcpy.patch | 47 ------------------- package/diffutils/diffutils.mk | 57 ++--------------------- 3 files changed, 9 insertions(+), 99 deletions(-) delete mode 100644 package/diffutils/diffutils-2.8.1-__mempcpy.patch (limited to 'package') diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in index df3e426dd..86da5d3a4 100644 --- a/package/diffutils/Config.in +++ b/package/diffutils/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_DIFFUTILS bool"diffutils" + depends on BR2_USE_WCHAR help GNU diff. Compare files per line. http://www.gnu.org/software/diffutils/diffutils.html + +comment "diffutils requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/diffutils/diffutils-2.8.1-__mempcpy.patch b/package/diffutils/diffutils-2.8.1-__mempcpy.patch deleted file mode 100644 index 94144c171..000000000 --- a/package/diffutils/diffutils-2.8.1-__mempcpy.patch +++ /dev/null @@ -1,47 +0,0 @@ -[PATCH] diffutils: Don't use glibc specific __mempcpy - -The configure script checks for mempcpy, but the code uses the (glibc -specific) __mempcpy instead. Fix it to use mempcpy which is more -portable. - -Signed-off-by: Peter Korsgaard x ---- - lib/getopt.c | 4 ++-- - lib/regex.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -Index: diffutils-2.8.1/lib/getopt.c -=================================================================== ---- diffutils-2.8.1.orig/lib/getopt.c -+++ diffutils-2.8.1/lib/getopt.c -@@ -334,7 +334,7 @@ exchange (argv) - nonoption_flags_len = nonoption_flags_max_len = 0; - else - { -- memset (__mempcpy (new_str, __getopt_nonoption_flags, -+ memset (mempcpy (new_str, __getopt_nonoption_flags, - nonoption_flags_max_len), - '\0', top + 1 - nonoption_flags_max_len); - nonoption_flags_max_len = top + 1; -@@ -445,7 +445,7 @@ _getopt_initialize (argc, argv, optstrin - if (__getopt_nonoption_flags == NULL) - nonoption_flags_max_len = -1; - else -- memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), -+ memset (mempcpy (__getopt_nonoption_flags, orig_str, len), - '\0', nonoption_flags_max_len - len); - } - } -Index: diffutils-2.8.1/lib/regex.c -=================================================================== ---- diffutils-2.8.1.orig/lib/regex.c -+++ diffutils-2.8.1/lib/regex.c -@@ -8314,7 +8314,7 @@ regerror (errcode, preg, errbuf, errbuf_ - if (msg_size > errbuf_size) - { - #if defined HAVE_MEMPCPY || defined _LIBC -- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; -+ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; - #else - memcpy (errbuf, msg, errbuf_size - 1); - errbuf[errbuf_size - 1] = 0; diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 693b0c8f6..6d1896afa 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -3,62 +3,15 @@ # diffutils # ############################################################# -DIFFUTILS_VERSION=2.8.1 -DIFFUTILS_SOURCE:=diffutils-$(DIFFUTILS_VERSION).tar.gz -DIFFUTILS_SITE:=$(BR2_GNU_MIRROR)/diffutils - -DIFFUTILS_INSTALL_STAGING = YES +DIFFUTILS_VERSION = 3.2 +DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_GETTEXT),gettext) \ $(if $(BR2_PACKAGE_LIBINTL),libintl) -DIFFUTILS_CONF_ENV = ac_cv_func_strtod=yes - ac_fsusage_space=yes \ - fu_cv_sys_stat_statfs2_bsize=yes \ - ac_cv_func_closedir_void=no \ - ac_cv_func_getloadavg=no \ - ac_cv_lib_util_getloadavg=no \ - ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_func_getgroups=yes \ - ac_cv_func_getgroups_works=yes \ - ac_cv_func_chown_works=yes \ - ac_cv_have_decl_euidaccess=no \ - ac_cv_func_euidaccess=no \ - ac_cv_have_decl_strnlen=yes \ - ac_cv_func_strnlen_working=yes \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ - ac_cv_func_stat_empty_string_bug=no \ - vb_cv_func_rename_trailing_slash_bug=no \ - ac_cv_have_decl_nanosleep=yes \ - jm_cv_func_nanosleep_works=yes \ - gl_cv_func_working_utimes=yes \ - ac_cv_func_utime_null=yes \ - ac_cv_have_decl_strerror_r=yes \ - ac_cv_func_strerror_r_char_p=no \ - jm_cv_func_svid_putenv=yes \ - ac_cv_func_getcwd_null=yes \ - ac_cv_func_getdelim=yes \ - ac_cv_func_mkstemp=yes \ - utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no \ - jm_cv_func_gettimeofday_clobber=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_working_readdir=yes \ - jm_ac_cv_func_link_follows_symlink=no \ - utils_cv_localtime_cache=no \ - ac_cv_struct_st_mtim_nsec=no \ - gl_cv_func_tzset_clobber=no \ - gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes \ - ac_cv_func_fnmatch_gnu=yes \ - am_getline_needs_run_time_check=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_mkdir_trailing_slash_bug=no \ - gl_cv_func_mkstemp_limitations=no \ - ac_cv_func_working_mktime=yes \ - jm_cv_func_working_re_compile_pattern=yes \ - ac_use_included_regex=no +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +DIFFUTILS_DEPENDENCIES += busybox +endif $(eval $(call AUTOTARGETS)) -- cgit v1.2.3 From 3e70816f54c987060bb3f5deabfa7dec7713ab25 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 Nov 2011 19:27:54 -0300 Subject: m4: bump to version 1.4.16 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/m4/m4-1.4.15-uclibc-sched_param-def.patch | 19 ------------------- package/m4/m4-1.4.16-001-MB_CUR_MAX.patch | 13 +++++++++++++ package/m4/m4-1.4.8-001-MB_CUR_MAX.patch | 13 ------------- package/m4/m4.mk | 4 ++-- 4 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 package/m4/m4-1.4.15-uclibc-sched_param-def.patch create mode 100644 package/m4/m4-1.4.16-001-MB_CUR_MAX.patch delete mode 100644 package/m4/m4-1.4.8-001-MB_CUR_MAX.patch (limited to 'package') diff --git a/package/m4/m4-1.4.15-uclibc-sched_param-def.patch b/package/m4/m4-1.4.15-uclibc-sched_param-def.patch deleted file mode 100644 index 47bdd3d84..000000000 --- a/package/m4/m4-1.4.15-uclibc-sched_param-def.patch +++ /dev/null @@ -1,19 +0,0 @@ -uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc -and is not needed too per standard. gnulib attempts to use it but we have to account -for it because in this case uclibc does not behave like glibc. - --Khem - -Index: m4-1.4.14/lib/spawn.in.h -=================================================================== ---- m4-1.4.14.orig/lib/spawn.in.h 2010-06-01 14:27:59.394242980 -0700 -+++ m4-1.4.14/lib/spawn.in.h 2010-06-01 14:28:28.202332200 -0700 -@@ -31,7 +31,7 @@ - - /* Get definitions of 'struct sched_param' and 'sigset_t'. - But avoid namespace pollution on glibc systems. */ --#ifndef __GLIBC__ -+#if !defined __GLIBC__ || defined __UCLIBC__ - # include - # include - #endif diff --git a/package/m4/m4-1.4.16-001-MB_CUR_MAX.patch b/package/m4/m4-1.4.16-001-MB_CUR_MAX.patch new file mode 100644 index 000000000..fce36731b --- /dev/null +++ b/package/m4/m4-1.4.16-001-MB_CUR_MAX.patch @@ -0,0 +1,13 @@ +--- m4-1.4.8.orig/lib/regcomp.c 2006-09-24 06:28:37.000000000 +0200 ++++ m4-1.4.8/lib/regcomp.c 2007-01-06 20:53:10.000000000 +0100 +@@ -871,6 +871,10 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) + dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size); + dfa->state_hash_mask = table_size - 1; + ++#ifndef MB_CUR_MAX ++#define MB_CUR_MAX (0) ++#endif ++ + dfa->mb_cur_max = MB_CUR_MAX; + #ifdef _LIBC + if (dfa->mb_cur_max == 6 diff --git a/package/m4/m4-1.4.8-001-MB_CUR_MAX.patch b/package/m4/m4-1.4.8-001-MB_CUR_MAX.patch deleted file mode 100644 index fce36731b..000000000 --- a/package/m4/m4-1.4.8-001-MB_CUR_MAX.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- m4-1.4.8.orig/lib/regcomp.c 2006-09-24 06:28:37.000000000 +0200 -+++ m4-1.4.8/lib/regcomp.c 2007-01-06 20:53:10.000000000 +0100 -@@ -871,6 +871,10 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) - dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size); - dfa->state_hash_mask = table_size - 1; - -+#ifndef MB_CUR_MAX -+#define MB_CUR_MAX (0) -+#endif -+ - dfa->mb_cur_max = MB_CUR_MAX; - #ifdef _LIBC - if (dfa->mb_cur_max == 6 diff --git a/package/m4/m4.mk b/package/m4/m4.mk index 4f18aa47c..173bba85c 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -3,10 +3,10 @@ # m4 # ############################################################# -M4_VERSION = 1.4.15 + +M4_VERSION = 1.4.16 M4_SOURCE = m4-$(M4_VERSION).tar.bz2 M4_SITE = $(BR2_GNU_MIRROR)/m4 - M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no ifneq ($(BR2_USE_WCHAR),y) -- cgit v1.2.3 From 14520a6866e89d504947443bcf5633ffb34d3a92 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 Nov 2011 19:27:55 -0300 Subject: nano: bump to version 2.3.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/nano/nano.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/nano/nano.mk b/package/nano/nano.mk index c4162c100..2bf712156 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,8 +4,8 @@ # ############################################################# -NANO_VERSION = 2.2.6 -NANO_SITE = http://www.nano-editor.org/dist/v2.2 +NANO_VERSION = 2.3.1 +NANO_SITE = http://www.nano-editor.org/dist/v2.3 NANO_MAKE_ENV = CURSES_LIB="-lncurses" NANO_CONF_OPT = --without-slang --enable-tiny NANO_DEPENDENCIES = ncurses -- cgit v1.2.3 From 7dbf60b29dfe14b46f3a54afba609f73a22e370f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 Nov 2011 19:27:56 -0300 Subject: grep: bump to version 2.9 Bump grep to version 2.9 Also make it build after busybox if it's enabled, we prefer full-blown utilities. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/grep/grep.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/grep/grep.mk b/package/grep/grep.mk index e8b9cfef2..e039135b3 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ############################################################# -GREP_VERSION = 2.7 +GREP_VERSION = 2.9 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_CONF_OPT = --disable-perl-regexp --without-included-regex GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) @@ -15,4 +15,9 @@ GREP_CONF_ENV += LIBS=-liconv GREP_DEPENDENCIES += libiconv endif +# Full grep preferred over busybox grep +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +GREP_DEPENDENCIES += busybox +endif + $(eval $(call AUTOTARGETS)) -- cgit v1.2.3 From ddfb134399b295dbf3410be3ee4bb52d7b97e6ed Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 Nov 2011 19:27:58 -0300 Subject: coreutils: bump to version 8.14 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../coreutils/coreutils-8.14-hostname-man.patch | 51 ++++++++++++++++++++++ package/coreutils/coreutils-8.9-hostname-man.patch | 51 ---------------------- package/coreutils/coreutils.mk | 7 ++- 3 files changed, 56 insertions(+), 53 deletions(-) create mode 100644 package/coreutils/coreutils-8.14-hostname-man.patch delete mode 100644 package/coreutils/coreutils-8.9-hostname-man.patch (limited to 'package') diff --git a/package/coreutils/coreutils-8.14-hostname-man.patch b/package/coreutils/coreutils-8.14-hostname-man.patch new file mode 100644 index 000000000..5f8fa1ee2 --- /dev/null +++ b/package/coreutils/coreutils-8.14-hostname-man.patch @@ -0,0 +1,51 @@ +--- /dev/null 2010-09-18 00:21:07.280000001 -0700 ++++ b/man/hostname.1 2010-09-23 12:08:06.000000000 -0700 +@@ -0,0 +1,48 @@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. ++.TH HOSTNAME "1" "January 2011" "GNU coreutils 8.9" "User Commands" ++.SH NAME ++hostname \- set or print the name of the current host system ++.SH SYNOPSIS ++.B hostname ++[\fINAME\fR] ++.br ++.B hostname ++\fIOPTION\fR ++.SH DESCRIPTION ++.\" Add any additional description here ++.PP ++Print or set the hostname of the current system. ++.TP ++\fB\-\-help\fR ++display this help and exit ++.TP ++\fB\-\-version\fR ++output version information and exit ++.SH AUTHOR ++Written by Jim Meyering. ++.SH "REPORTING BUGS" ++Report hostname bugs to bug\-coreutils at gnu.org ++.br ++GNU coreutils home page: ++.br ++General help using GNU software: ++.br ++Report hostname translation bugs to ++.SH COPYRIGHT ++Copyright \(co 2010 Free Software Foundation, Inc. ++License GPLv3+: GNU GPL version 3 or later . ++.br ++This is free software: you are free to change and redistribute it. ++There is NO WARRANTY, to the extent permitted by law. ++.SH "SEE ALSO" ++The full documentation for ++.B hostname ++is maintained as a Texinfo manual. If the ++.B info ++and ++.B hostname ++programs are properly installed at your site, the command ++.IP ++.B info coreutils \(aqhostname invocation\(aq ++.PP ++should give you access to the complete manual. diff --git a/package/coreutils/coreutils-8.9-hostname-man.patch b/package/coreutils/coreutils-8.9-hostname-man.patch deleted file mode 100644 index 5f8fa1ee2..000000000 --- a/package/coreutils/coreutils-8.9-hostname-man.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- /dev/null 2010-09-18 00:21:07.280000001 -0700 -+++ b/man/hostname.1 2010-09-23 12:08:06.000000000 -0700 -@@ -0,0 +1,48 @@ -+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35. -+.TH HOSTNAME "1" "January 2011" "GNU coreutils 8.9" "User Commands" -+.SH NAME -+hostname \- set or print the name of the current host system -+.SH SYNOPSIS -+.B hostname -+[\fINAME\fR] -+.br -+.B hostname -+\fIOPTION\fR -+.SH DESCRIPTION -+.\" Add any additional description here -+.PP -+Print or set the hostname of the current system. -+.TP -+\fB\-\-help\fR -+display this help and exit -+.TP -+\fB\-\-version\fR -+output version information and exit -+.SH AUTHOR -+Written by Jim Meyering. -+.SH "REPORTING BUGS" -+Report hostname bugs to bug\-coreutils at gnu.org -+.br -+GNU coreutils home page: -+.br -+General help using GNU software: -+.br -+Report hostname translation bugs to -+.SH COPYRIGHT -+Copyright \(co 2010 Free Software Foundation, Inc. -+License GPLv3+: GNU GPL version 3 or later . -+.br -+This is free software: you are free to change and redistribute it. -+There is NO WARRANTY, to the extent permitted by law. -+.SH "SEE ALSO" -+The full documentation for -+.B hostname -+is maintained as a Texinfo manual. If the -+.B info -+and -+.B hostname -+programs are properly installed at your site, the command -+.IP -+.B info coreutils \(aqhostname invocation\(aq -+.PP -+should give you access to the complete manual. diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 7ee37b19f..eb88535cf 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -3,9 +3,10 @@ # coreutils # ############################################################# -COREUTILS_VERSION = 8.9 -COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.gz + +COREUTILS_VERSION = 8.14 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils +COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz # If both coreutils and busybox are selected, make certain coreutils # wins the fight over who gets to have their utils actually installed. @@ -20,6 +21,7 @@ COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false hostnam COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ ac_cv_func_chown_works=yes \ ac_cv_func_euidaccess=no \ + ac_cv_func_fstatat=yes \ ac_cv_func_getdelim=yes \ ac_cv_func_getgroups=yes \ ac_cv_func_getgroups_works=yes \ @@ -41,6 +43,7 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ gl_cv_func_getcwd_null=yes \ gl_cv_func_getcwd_path_max=yes \ gl_cv_func_gettimeofday_clobber=no \ + gl_cv_func_fstatat_zero_flag=no \ gl_cv_func_link_follows_symlink=no \ gl_cv_func_re_compile_pattern_working=yes \ gl_cv_func_svid_putenv=yes \ -- cgit v1.2.3 From 6e223241e1bb58a27eb890291f9f5c1fcc6a0818 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 12 Oct 2011 17:22:11 +0200 Subject: Add Transmission package Initial work by marcus.osdoba@googlemail.com [Peter: add -daemon option, tweak Config.in] Signed-off-by: Maxime Ripard Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/transmission/Config.in | 39 +++++++++ package/transmission/S92transmission | 161 +++++++++++++++++++++++++++++++++++ package/transmission/transmission.mk | 52 +++++++++++ 4 files changed, 253 insertions(+) create mode 100644 package/transmission/Config.in create mode 100644 package/transmission/S92transmission create mode 100644 package/transmission/transmission.mk (limited to 'package') diff --git a/package/Config.in b/package/Config.in index 4b5e5d81a..cc26f20a9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -475,6 +475,7 @@ source "package/thttpd/Config.in" source "package/tinyhttpd/Config.in" endif source "package/tn5250/Config.in" +source "package/transmission/Config.in" source "package/ttcp/Config.in" source "package/udpcast/Config.in" source "package/vpnc/Config.in" diff --git a/package/transmission/Config.in b/package/transmission/Config.in new file mode 100644 index 000000000..528444690 --- /dev/null +++ b/package/transmission/Config.in @@ -0,0 +1,39 @@ +config BR2_PACKAGE_TRANSMISSION + bool "transmission" + depends on BR2_INET_IPV6 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBEVENT + help + Transmission is a cross-platform BitTorrent client. + +if BR2_PACKAGE_TRANSMISSION + +config BR2_PACKAGE_TRANSMISSION_UTP + bool "Transmission uTP support" + depends on BR2_INSTALL_LIBSTDCPP + help + Install support for uTorrent Transport Protocol + +comment "uTP requires a toolchain with C++ support" + depends on !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_TRANSMISSION_CLI + bool "transmission-cli" + help + Install transmission command line interface. + +config BR2_PACKAGE_TRANSMISSION_DAEMON + bool "transmission-daemon" + help + Install transmission daemon. + +config BR2_PACKAGE_TRANSMISSION_REMOTE + bool "transmission-remote" + help + Install transmission remote management tool. +endif + +comment "Transmission requires a toolchain with IPv6 support" + depends on !BR2_INET_IPV6 diff --git a/package/transmission/S92transmission b/package/transmission/S92transmission new file mode 100644 index 000000000..f22615489 --- /dev/null +++ b/package/transmission/S92transmission @@ -0,0 +1,161 @@ +#!/bin/sh + +# Original Author: Lennart A. Jtte, based on Rob Howell's script +# Modified by Maarten Van Coile & others (on IRC) + +# Changes for buildroot: +# USERNAME points to 'default' in standard installation +# TODO: set logfile with --logfile option + +# Do NOT "set -e" + +# +# ----- CONFIGURATION ----- +# +# For the default location Transmission uses, visit: +# http://trac.transmissionbt.com/wiki/ConfigFiles +# For a guide on how set the preferences, visit: +# http://trac.transmissionbt.com/wiki/EditConfigFiles +# For the available environement variables, visit: +# http://trac.transmissionbt.com/wiki/EnvironmentVariables +# +# The name of the user that should run Transmission. +# It's RECOMENDED to run Transmission in it's own user, +# by default, this is set to 'transmission'. +# For the sake of security you shouldn't set a password +# on this user +#USERNAME=transmission +USERNAME=default + + + +# ----- *ADVANCED* CONFIGURATION ----- +# Only change these options if you know what you are doing! +# +# The folder where Transmission stores the config & web files. +# ONLY change this you have it at a non-default location +#TRANSMISSION_HOME="/var/config/transmission-daemon" +#TRANSMISSION_WEB_HOME="/usr/share/transmission/web" +# +# The arguments passed on to transmission-daemon. +# ONLY change this you need to, otherwise use the +# settings file as per above. +#TRANSMISSION_ARGS="" + + +# ----- END OF CONFIGURATION ----- +# +# PATH should only include /usr/* if it runs after the mountnfs.sh script. +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +DESC="bittorrent client" +NAME=transmission-daemon +DAEMON=$(which $NAME) +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +[ -f /etc/default/rcS ] && . /etc/default/rcS + +# +# Function that starts the daemon/service +# + +do_start() +{ + # Export the configuration/web directory, if set + if [ -n "$TRANSMISSION_HOME" ]; then + export TRANSMISSION_HOME + fi + if [ -n "$TRANSMISSION_WEB_HOME" ]; then + export TRANSMISSION_WEB_HOME + fi + + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --chuid $USERNAME --start --pidfile $PIDFILE --make-pidfile \ + --exec $DAEMON --background --test -- -f $TRANSMISSION_ARGS > /dev/null \ + || return 1 + start-stop-daemon --chuid $USERNAME --start --pidfile $PIDFILE --make-pidfile \ + --exec $DAEMON --background -- -f $TRANSMISSION_ARGS \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/10/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + + return "$RETVAL" +} + +case "$1" in + start) + echo "Starting $DESC" "$NAME..." + do_start + case "$?" in + 0|1) echo " Starting $DESC $NAME succeeded" ;; + *) echo " Starting $DESC $NAME failed" ;; + esac + ;; + stop) + echo "Stopping $DESC $NAME..." + do_stop + case "$?" in + 0|1) echo " Stopping $DESC $NAME succeeded" ;; + *) echo " Stopping $DESC $NAME failed" ;; + esac + ;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + echo "Restarting $DESC $NAME..." + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0|1) echo " Restarting $DESC $NAME succeeded" ;; + *) echo " Restarting $DESC $NAME failed: couldn't start $NAME" ;; + esac + ;; + *) + echo " Restarting $DESC $NAME failed: couldn't stop $NAME" ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 3 + ;; +esac diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk new file mode 100644 index 000000000..db0669281 --- /dev/null +++ b/package/transmission/transmission.mk @@ -0,0 +1,52 @@ +############################################################# +# +# transmission +# +############################################################# +TRANSMISSION_VERSION = 2.33 +TRANSMISSION_SITE = http://download.transmissionbt.com/files/ +TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.bz2 +TRANSMISSION_DEPENDENCIES = \ + host-pkg-config \ + libcurl \ + libevent \ + openssl \ + zlib + +TRANSMISSION_CONF_OPT = \ + --disable-gtk \ + --disable-libnotify \ + --enable-lightweight + +define TRANSMISSION_INIT_SCRIPT_INSTALL + [ -f $(TARGET_DIR)/etc/init.d/S92transmission ] || \ + $(INSTALL) -m 0755 -D package/transmission/S92transmission \ + $(TARGET_DIR)/etc/init.d/S92transmission +endef + +ifeq ($(BR2_PACKAGE_TRANSMISSION_UTP),y) + TRANSMISSION_CONF_OPT += --enable-utp +else + TRANSMISSION_CONF_OPT += --disable-utp +endif + +ifeq ($(BR2_PACKAGE_TRANSMISSION_CLI),y) + TRANSMISSION_CONF_OPT += --enable-cli +else + TRANSMISSION_CONF_OPT += --disable-cli +endif + +ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y) + TRANSMISSION_CONF_OPT += --enable-daemon + TRANSMISSION_POST_INSTALL_TARGET_HOOKS += TRANSMISSION_INIT_SCRIPT_INSTALL +else + TRANSMISSION_CONF_OPT += --disable-daemon +endif + +ifeq ($(BR2_PACKAGE_TRANSMISSION_REMOTE),y) + TRANSMISSION_CONF_OPT += --enable-remote +else + TRANSMISSION_CONF_OPT += --disable-remote +endif + +$(eval $(call AUTOTARGETS)) -- cgit v1.2.3 From 2211f63e79d9bc3057e94179fba22284b6b635a8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 17 Nov 2011 20:57:23 +0100 Subject: transmission: add gtk support Signed-off-by: Peter Korsgaard --- package/transmission/Config.in | 7 +++++++ package/transmission/transmission.mk | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/transmission/Config.in b/package/transmission/Config.in index 528444690..3fcf017fd 100644 --- a/package/transmission/Config.in +++ b/package/transmission/Config.in @@ -33,6 +33,13 @@ config BR2_PACKAGE_TRANSMISSION_REMOTE bool "transmission-remote" help Install transmission remote management tool. + +config BR2_PACKAGE_TRANSMISSION_GTK + bool "transmission-gtk" + depends on BR2_PACKAGE_LIBGTK2 + help + Install transmission GTK-based GUI interface. + endif comment "Transmission requires a toolchain with IPv6 support" diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index db0669281..c0d763bc4 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -14,7 +14,6 @@ TRANSMISSION_DEPENDENCIES = \ zlib TRANSMISSION_CONF_OPT = \ - --disable-gtk \ --disable-libnotify \ --enable-lightweight @@ -49,4 +48,11 @@ else TRANSMISSION_CONF_OPT += --disable-remote endif +ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y) + TRANSMISSION_CONF_OPT += --enable-gtk + TRANSMISSION_DEPENDENCIES += libgtk2 +else + TRANSMISSION_CONF_OPT += --disable-gtk +endif + $(eval $(call AUTOTARGETS)) -- cgit v1.2.3 From adaebbcccde5c7dc69ce06fad4cc2c0ad457f32c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 18 Nov 2011 13:08:59 +0100 Subject: libgtk2: bump stable version Signed-off-by: Peter Korsgaard --- .../host-libgtk2-2.20.1-reduce-dependencies.patch | 168 --------------------- .../libgtk2/host-libgtk2-reduce-dependencies.patch | 168 +++++++++++++++++++++ package/libgtk2/libgtk2.mk | 4 +- 3 files changed, 170 insertions(+), 170 deletions(-) delete mode 100644 package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch create mode 100644 package/libgtk2/host-libgtk2-reduce-dependencies.patch (limited to 'package') diff --git a/package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch b/package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch deleted file mode 100644 index 49acf753e..000000000 --- a/package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch +++ /dev/null @@ -1,168 +0,0 @@ -Hack the configure.in file to add a "none" gdktarget which removes -dependencies on graphic backends such as X.org or DirectFB. Gtk does -not fully build in this mode, but it builds sufficiently to build the -host tools that are needed to build the target Gtk. - -Signed-off-by: Thomas Petazzoni ---- - configure.in | 101 ++--------------------------------------------------------- - 1 file changed, 4 insertions(+), 97 deletions(-) - -Index: gtk+-2.22.0/configure.in -=================================================================== ---- gtk+-2.22.0.orig/configure.in -+++ gtk+-2.22.0/configure.in -@@ -258,12 +258,12 @@ - gdktarget=x11 - fi - --AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target], -+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target], - gdktarget=$with_gdktarget) - - AC_SUBST(gdktarget) - case $gdktarget in -- x11|win32|quartz|directfb) ;; -+ x11|win32|quartz|directfb|none) ;; - *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);; - esac - -@@ -373,9 +373,6 @@ - ## annoying to construct - PKG_CHECK_MODULES(BASE_DEPENDENCIES, - [glib-2.0 >= glib_required_version dnl -- atk >= atk_required_version dnl -- pango >= pango_required_version dnl -- cairo >= cairo_required_version dnl - gdk-pixbuf-2.0 >= gdk_pixbuf_required_version]) - - ## In addition to checking that cairo is present, we also need to -@@ -388,8 +385,6 @@ - if test "x$cairo_backend" = "xx11"; then - cairo_backend=xlib - fi --PKG_CHECK_MODULES(CAIRO_BACKEND, -- [cairo-$cairo_backend >= cairo_required_version]) - - if test "$os_win32" != yes; then - # libtool option to control which symbols are exported -@@ -1270,50 +1265,6 @@ - fi - - --# Check for Pango flags -- --if test "x$gdktarget" = "xwin32"; then -- PANGO_PACKAGES="pangowin32 pangocairo" --else -- PANGO_PACKAGES="pango pangocairo" --fi -- --AC_MSG_CHECKING(Pango flags) --if $PKG_CONFIG --exists $PANGO_PACKAGES ; then -- PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` -- PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` -- -- AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS) --else -- AC_MSG_ERROR([ --*** Pango not found. Pango built with Cairo support is required --*** to build GTK+. See http://www.pango.org for Pango information. --]) --fi -- --CFLAGS="$CFLAGS $PANGO_CFLAGS" -- --if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then -- : --else -- gtk_save_LIBS="$LIBS" -- LIBS="$PANGO_LIBS $LIBS" -- AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([ --*** Can't link to Pango. Pango is required to build --*** GTK+. For more information see http://www.pango.org])) -- LIBS="$gtk_save_LIBS" --fi -- --CFLAGS="$saved_cflags" --LDFLAGS="$saved_ldflags" -- --# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c --if test "x$gdktarget" = "xx11"; then -- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend" --else -- GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend" --fi -- - GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`" - GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS" - # -@@ -1321,7 +1272,7 @@ - # into the pkg-config files - # - if test $enable_explicit_deps != yes ; then -- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0" -+ GDK_PACKAGES="gdk-pixbuf-2.0" - GDK_EXTRA_LIBS= - fi - -@@ -1331,37 +1282,7 @@ - AC_SUBST(GDK_DEP_LIBS) - AC_SUBST(GDK_DEP_CFLAGS) - -- --######################################## --# Check for Accessibility Toolkit flags --######################################## -- --ATK_PACKAGES=atk --AC_MSG_CHECKING(ATK flags) --if $PKG_CONFIG --exists $ATK_PACKAGES ; then -- ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` -- ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` -- -- AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS) --else -- AC_MSG_ERROR([ --*** Accessibility Toolkit not found. Accessibility Toolkit is required --*** to build GTK+. --]) --fi -- --if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then -- : --else -- gtk_save_LIBS="$LIBS" -- LIBS="$ATK_LIBS $LIBS" -- AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([ -- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required -- *** to build GTK+])) -- LIBS="$gtk_save_LIBS" --fi -- --GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0" -+GTK_PACKAGES="gdk-pixbuf-2.0" - if test "x$gdktarget" = "xx11"; then - GTK_PACKAGES="$GTK_PACKAGES pangoft2" - fi -@@ -1517,20 +1438,6 @@ - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" - --AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([ --*** Can't find cairo-pdf.h. You must build Cairo with the pdf --*** backend enabled.])) -- --if test "$os_win32" != "yes"; then -- AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([ --*** Can't find cairo-ps.h. You must build Cairo with the --*** postscript backend enabled.])) -- -- AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([ --*** Can't find cairo-svg.h. You must build Cairo with the --*** svg backend enabled.])) --fi -- - CPPFLAGS="$gtk_save_cppflags" - - diff --git a/package/libgtk2/host-libgtk2-reduce-dependencies.patch b/package/libgtk2/host-libgtk2-reduce-dependencies.patch new file mode 100644 index 000000000..091eeb0e5 --- /dev/null +++ b/package/libgtk2/host-libgtk2-reduce-dependencies.patch @@ -0,0 +1,168 @@ +Hack the configure.in file to add a "none" gdktarget which removes +dependencies on graphic backends such as X.org or DirectFB. Gtk does +not fully build in this mode, but it builds sufficiently to build the +host tools that are needed to build the target Gtk. + +Signed-off-by: Thomas Petazzoni +--- + configure.in | 101 ++--------------------------------------------------------- + 1 file changed, 4 insertions(+), 97 deletions(-) + +Index: gtk+-2.24.8/configure.in +=================================================================== +--- gtk+-2.24.8.orig/configure.in ++++ gtk+-2.24.8/configure.in +@@ -259,12 +259,12 @@ + gdktarget=x11 + fi + +-AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target], ++AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target], + gdktarget=$with_gdktarget) + + AC_SUBST(gdktarget) + case $gdktarget in +- x11|win32|quartz|directfb) ;; ++ x11|win32|quartz|directfb|none) ;; + *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);; + esac + +@@ -374,9 +374,6 @@ + ## annoying to construct + PKG_CHECK_MODULES(BASE_DEPENDENCIES, + [glib-2.0 >= glib_required_version dnl +- atk >= atk_required_version dnl +- pango >= pango_required_version dnl +- cairo >= cairo_required_version dnl + gdk-pixbuf-2.0 >= gdk_pixbuf_required_version]) + + ## In addition to checking that cairo is present, we also need to +@@ -389,8 +386,6 @@ + if test "x$cairo_backend" = "xx11"; then + cairo_backend=xlib + fi +-PKG_CHECK_MODULES(CAIRO_BACKEND, +- [cairo-$cairo_backend >= cairo_required_version]) + + if test "$os_win32" != yes; then + # libtool option to control which symbols are exported +@@ -1280,50 +1275,6 @@ + fi + + +-# Check for Pango flags +- +-if test "x$gdktarget" = "xwin32"; then +- PANGO_PACKAGES="pangowin32 pangocairo" +-else +- PANGO_PACKAGES="pango pangocairo" +-fi +- +-AC_MSG_CHECKING(Pango flags) +-if $PKG_CONFIG --exists $PANGO_PACKAGES ; then +- PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` +- PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` +- +- AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS) +-else +- AC_MSG_ERROR([ +-*** Pango not found. Pango built with Cairo support is required +-*** to build GTK+. See http://www.pango.org for Pango information. +-]) +-fi +- +-CFLAGS="$CFLAGS $PANGO_CFLAGS" +- +-if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then +- : +-else +- gtk_save_LIBS="$LIBS" +- LIBS="$PANGO_LIBS $LIBS" +- AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([ +-*** Can't link to Pango. Pango is required to build +-*** GTK+. For more information see http://www.pango.org])) +- LIBS="$gtk_save_LIBS" +-fi +- +-CFLAGS="$saved_cflags" +-LDFLAGS="$saved_ldflags" +- +-# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c +-if test "x$gdktarget" = "xx11"; then +- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend" +-else +- GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend" +-fi +- + GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB" + GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS" + # +@@ -1331,7 +1282,7 @@ + # into the pkg-config files + # + if test $enable_explicit_deps != yes ; then +- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0" ++ GDK_PACKAGES="gdk-pixbuf-2.0" + GDK_EXTRA_LIBS= + fi + +@@ -1341,37 +1292,7 @@ + AC_SUBST(GDK_DEP_LIBS) + AC_SUBST(GDK_DEP_CFLAGS) + +- +-######################################## +-# Check for Accessibility Toolkit flags +-######################################## +- +-ATK_PACKAGES=atk +-AC_MSG_CHECKING(ATK flags) +-if $PKG_CONFIG --exists $ATK_PACKAGES ; then +- ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` +- ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` +- +- AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS) +-else +- AC_MSG_ERROR([ +-*** Accessibility Toolkit not found. Accessibility Toolkit is required +-*** to build GTK+. +-]) +-fi +- +-if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then +- : +-else +- gtk_save_LIBS="$LIBS" +- LIBS="$ATK_LIBS $LIBS" +- AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([ +- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required +- *** to build GTK+])) +- LIBS="$gtk_save_LIBS" +-fi +- +-GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0" ++GTK_PACKAGES="gdk-pixbuf-2.0" + if test "x$gdktarget" = "xx11"; then + GTK_PACKAGES="$GTK_PACKAGES pangoft2" + fi +@@ -1527,20 +1448,6 @@ + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" + +-AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([ +-*** Can't find cairo-pdf.h. You must build Cairo with the pdf +-*** backend enabled.])) +- +-if test "$os_win32" != "yes"; then +- AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([ +-*** Can't find cairo-ps.h. You must build Cairo with the +-*** postscript backend enabled.])) +- +- AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([ +-*** Can't find cairo-svg.h. You must build Cairo with the +-*** svg backend enabled.])) +-fi +- + CPPFLAGS="$gtk_save_cppflags" + + diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 9a8c2bb5d..52edf477b 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -3,8 +3,8 @@ # libgtk2.0 # ############################################################# -LIBGTK2_VERSION_MAJOR:=2.24 -LIBGTK2_VERSION_MINOR:=4 +LIBGTK2_VERSION_MAJOR = 2.24 +LIBGTK2_VERSION_MINOR = 8 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR) LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2 -- cgit v1.2.3 From 61d8d88d4023be0b9e0138bf415cc3f922bdd68a Mon Sep 17 00:00:00 2001 From: Daniele Salvatore Albano Date: Mon, 7 Mar 2011 16:55:36 +0100 Subject: nano: make tiny flag optional Closes #3421 [Peter: tweak Config.in] Signed-off-by: Daniele Salvatore Albano Signed-off-by: Peter Korsgaard --- package/nano/Config.in | 7 +++++++ package/nano/nano.mk | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/nano/Config.in b/package/nano/Config.in index 8c780960f..ef7f69df3 100644 --- a/package/nano/Config.in +++ b/package/nano/Config.in @@ -6,3 +6,10 @@ config BR2_PACKAGE_NANO Great editor for new users. http://www.nano-editor.org/ + +config BR2_PACKAGE_NANO_TINY + bool "optimize for size" + default y + depends on BR2_PACKAGE_NANO + help + Disable all features for the sake of size. diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 2bf712156..439f58349 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -7,9 +7,13 @@ NANO_VERSION = 2.3.1 NANO_SITE = http://www.nano-editor.org/dist/v2.3 NANO_MAKE_ENV = CURSES_LIB="-lncurses" -NANO_CONF_OPT = --without-slang --enable-tiny +NANO_CONF_OPT = --without-slang NANO_DEPENDENCIES = ncurses +ifeq ($(BR2_PACKAGE_NANO_TINY),y) + NANO_CONF_OPT += --enable-tiny +endif + define NANO_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano endef -- cgit v1.2.3 From 08d78545cc1bc1ead30016b41906736eacf7caf5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 18 Nov 2011 23:44:27 +0100 Subject: mtd-utils: bump version, cleanup flash_eraseall / flash_info are no more, and simplify build. Signed-off-by: Peter Korsgaard --- package/mtd/Config.in | 8 -------- package/mtd/mtd.mk | 34 ++++++---------------------------- 2 files changed, 6 insertions(+), 36 deletions(-) (limited to 'package') diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 692654ca8..7330dd598 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -20,14 +20,6 @@ config BR2_PACKAGE_MTD_FLASH_ERASE bool "flash_erase" default y -config BR2_PACKAGE_MTD_FLASH_ERASEALL - bool "flash_eraseall" - default y - -config BR2_PACKAGE_MTD_FLASH_INFO - bool "flash_info" - default y - config BR2_PACKAGE_MTD_FLASH_LOCK bool "flash_lock" default y diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 1b23e8357..ea72ba83a 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -3,7 +3,7 @@ # mtd provides jffs2 utilities # ############################################################# -MTD_VERSION = 1.4.6 +MTD_VERSION = 1.4.7 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y) @@ -29,8 +29,6 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP) += flash_otp_dump MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO) += flash_otp_info @@ -64,37 +62,17 @@ MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol -MTD_MAKE_COMMON_FLAGS = \ - $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ - WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 - -define MTD_TARGETS_BUILD - $(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \ - BUILDDIR=$(@D) \ - -C $(@D) \ - $(addprefix $(@D)/, lib/libmtd.a $(MTD_TARGETS_y)) -endef - -ifneq ($(MTD_TARGETS_UBI_y),) -define MTD_TARGETS_UBI_BUILD - $(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \ - BUILDDIR=$(@D)/ubi-utils/ \ - -C $(@D)/ubi-utils \ - $(addprefix $(@D)/ubi-utils/, $(MTD_TARGETS_UBI_y)) -endef -endif +MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y)) define MTD_BUILD_CMDS - $(MTD_TARGETS_BUILD) - $(MTD_TARGETS_UBI_BUILD) + $(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ + BUILDDIR=$(@D) WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 -C $(@D) \ + $(addprefix $(@D)/,$(MTD_TARGETS_y)) endef define MTD_INSTALL_TARGET_CMDS for f in $(MTD_TARGETS_y) ; do \ - install -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$$f ; \ - done ; \ - for f in $(MTD_TARGETS_UBI_y) ; do \ - install -D -m 0755 $(@D)/ubi-utils/$$f $(TARGET_DIR)/usr/sbin/$$f ; \ + install -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \ done endef -- cgit v1.2.3 From e993877714fd8381dbfbb39fdea36583ffc7ffc0 Mon Sep 17 00:00:00 2001 From: Víctor Manuel Jáquez Leal Date: Sat, 19 Nov 2011 15:31:34 +0100 Subject: gst-dsp: upgrade to 0.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Peter: fix white space while we're at it] Signed-off-by: Víctor Manuel Jáquez Leal Signed-off-by: Peter Korsgaard --- package/multimedia/gst-dsp/gst-dsp.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk index 17eb18966..cd856c138 100644 --- a/package/multimedia/gst-dsp/gst-dsp.mk +++ b/package/multimedia/gst-dsp/gst-dsp.mk @@ -1,6 +1,5 @@ -GST_DSP_VERSION=0.8.0 -GST_DSP_SOURCE=gst-dsp-$(GST_DSP_VERSION).tar.gz -GST_DSP_SITE=http://gst-dsp.googlecode.com/files/ +GST_DSP_VERSION = 0.9.0 +GST_DSP_SITE = http://gst-dsp.googlecode.com/files/ define GST_DSP_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e -- cgit v1.2.3 From 39ea7bcec02c31dcb91f0e606e0c598a24afb4b7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 19 Nov 2011 21:51:58 +0100 Subject: mtd-utils: bump version Identical to 1.4.7, except that the version number in the Makefile is correct. Signed-off-by: Peter Korsgaard --- package/mtd/mtd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index ea72ba83a..6b014407c 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -3,7 +3,7 @@ # mtd provides jffs2 utilities # ############################################################# -MTD_VERSION = 1.4.7 +MTD_VERSION = 1.4.8 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y) -- cgit v1.2.3 From 1d7299194c7107fa295c4fdbc6aef96324700aa5 Mon Sep 17 00:00:00 2001 From: ANDY KENNEDY Date: Wed, 23 Nov 2011 18:36:48 +0000 Subject: htop: Bump version to 1.0 htop 1.0 was released 11-2011. Bumping version in BuildRoot from 0.9 to 1.0. [Peter: Don't use old-style AUTOTARGETS] Signed-off-by: Andy Kennedy Signed-off-by: Peter Korsgaard --- package/htop/htop.mk | 3 +- package/htop/htop.patch | 88 +++++++++++-------------------------------------- 2 files changed, 21 insertions(+), 70 deletions(-) (limited to 'package') diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 5a8eb0d67..07b750c59 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -4,10 +4,11 @@ # ############################################################# -HTOP_VERSION = 0.9 +HTOP_VERSION = 1.0 HTOP_SOURCE = htop-$(HTOP_VERSION).tar.gz HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/htop/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses HTOP_AUTORECONF = YES +HTOP_CONF_OPT += --disable-unicode $(eval $(call AUTOTARGETS)) diff --git a/package/htop/htop.patch b/package/htop/htop.patch index 776561468..bf68e53ed 100644 --- a/package/htop/htop.patch +++ b/package/htop/htop.patch @@ -1,75 +1,25 @@ -# This patch removes the hard dependency on backtrace by checking for -# it at compile time and adds a cross-compile /proc check. -# Patch given to me by Hisham (htop-general) -# -# This patch is taken from upstream svn (r213, r215) +# This patch removes the check for native_affinity for cross compiling. +# This patch has been pushed to htop on 23 November 2011, however, is +# not in the 1.0 release and may not be exactly what Hisham puts into +# the official build. # # Signed-off-by: Andy Kennedy -diff -Naur a/CRT.c b/CRT.c ---- a/CRT.c 2010-11-23 09:56:32.000000000 -0600 -+++ b/CRT.c 2011-03-21 17:08:21.000000000 -0500 -@@ -11,7 +11,9 @@ - #include - #include - #include -+#ifdef HAVE_EXECINFO_H - #include -+#endif - - #include "String.h" - -@@ -125,12 +127,14 @@ - CRT_done(); - #if __linux - fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://htop.sf.net\n"); -- #else -- fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n"); -- #endif -+ #ifdef HAVE_EXECINFO_H - size_t size = backtrace(backtraceArray, sizeof(backtraceArray)); - fprintf(stderr, "Backtrace: \n"); - backtrace_symbols_fd(backtraceArray, size, 2); -+ #endif -+ #else -+ fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n"); -+ #endif - abort(); - } - -diff -Naur a/CRT.h b/CRT.h ---- a/CRT.h 2010-11-23 09:56:32.000000000 -0600 -+++ b/CRT.h 2011-03-21 17:06:16.000000000 -0500 -@@ -14,7 +14,9 @@ - #include - #include - #include -+#ifdef HAVE_EXECINFO_H - #include -+#endif - - #include "String.h" - diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2010-11-23 09:56:32.000000000 -0600 -+++ b/configure.ac 2011-03-21 17:06:16.000000000 -0500 -@@ -25,6 +25,7 @@ - AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[ - missing_headers="$missing_headers $ac_header" - ]) -+AC_CHECK_HEADERS([execinfo.h],[:],[:]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_HEADER_STDBOOL -@@ -99,10 +100,10 @@ - AC_MSG_ERROR([missing headers: $missing_headers]) - fi - -- -- -+if test "$cross_compiling" = "no"; then +--- a/configure.ac 2011-11-20 20:46:48.000000000 -0600 ++++ b/configure.ac 2011-11-23 10:41:44.000000000 -0600 +@@ -111,7 +111,6 @@ + if test "$cross_compiling" = "no"; then AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) +-fi + + AC_ARG_ENABLE(native_affinity, [AC_HELP_STRING([--enable-native-affinity], [enable native sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_native_affinity="yes") + if test "x$enable_native_affinity" = xyes; then +@@ -130,6 +129,7 @@ + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) + fi +fi - - AC_ARG_ENABLE(plpa, [AC_HELP_STRING([--enable-plpa], [enable PLPA support for CPU affinity])], ,enable_plpa="yes") - PLPA_INCLUDED + + AC_ARG_ENABLE(hwloc, [AC_HELP_STRING([--enable-hwloc], [enable hwloc support for CPU affinity])],, enable_hwloc="no") + if test "x$enable_hwloc" = xyes -- cgit v1.2.3 From c61788f097670acd7643288c21fb86c2cc34d28a Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 19 Oct 2011 09:25:40 +0200 Subject: GENTARGETS: add support for scp:// This patch adds support for scp:// both for use in the package Makefiles, as for the BR2_PRIMARY_SITE variable. This patch was based on the work of Richard Guy Briggs (see https://bugs.busybox.net/show_bug.cgi?id=3343). [Peter: small whitespace fixes] Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- Config.in | 13 ++++++++++- package/Makefile.package.in | 55 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 7 deletions(-) (limited to 'package') diff --git a/Config.in b/Config.in index 0cf4d497c..280ff0329 100644 --- a/Config.in +++ b/Config.in @@ -36,6 +36,14 @@ config BR2_LOCALFILES string "Local files retrieval command" default "cp" +config BR2_SCP + string "Secure copy (scp) command" + default "scp" + +config BR2_SSH + string "Secure shell (ssh) command" + default "ssh" + config BR2_ZCAT string "zcat command" default "gzip -d -c" @@ -102,7 +110,10 @@ config BR2_PRIMARY_SITE Primary site to download from. If this option is set then buildroot will try to download package source first from this site and try the default if the file is not found. - NOTE: This only works for packages using the Makefile.autotools.in + Valid URIs are URIs recognized by $(WGET) and scp URIs of the form + scp://[user@]host:path. + NOTE: This works for all packages using the central package + infrastructure (generic, autotools, cmake, ...) config BR2_BACKUP_SITE string "Backup download site" diff --git a/package/Makefile.package.in b/package/Makefile.package.in index b5ef57bb1..7eddf171c 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -92,6 +92,8 @@ WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET) SVN:=$(call qstrip,$(BR2_SVN)) BZR:=$(call qstrip,$(BR2_BZR)) GIT:=$(call qstrip,$(BR2_GIT)) +SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET) +SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET) LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES)) # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK' @@ -104,20 +106,39 @@ ifeq ($(DL_DIR),) DL_DIR:=$(TOPDIR)/dl endif +# +# URI scheme helper functions +# Example URIs: +# * http://www.example.com/dir/file +# * scp://www.example.com:dir/file (with domainseparator :) +# +# geturischeme: http +geturischeme=$(firstword $(subst ://, ,$(call qstrip,$(1)))) +# stripurischeme: www.example.com/dir/file +stripurischeme=$(lastword $(subst ://, ,$(call qstrip,$(1)))) +# domain: www.example.com +domain=$(firstword $(subst $(call domainseparator,$(2)), ,$(call stripurischeme,$(1)))) +# notdomain: dir/file +notdomain=$(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(call stripurischeme,$(1))) +# +# default domainseparator is /, specify alternative value as first argument +domainseparator=$(if $(1),$(1),/) + ################################################################################ # The DOWNLOAD_{GIT,SVN,BZR,LOCALFILES} helpers are in charge of getting a # working copy of the source repository for their corresponding SCM, # checking out the requested version / commit / tag, and create an -# archive out of it. DOWNLOAD_WGET is the normal wget-based download +# archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with +# ssh authentication. DOWNLOAD_WGET is the normal wget-based download # mechanism. # -# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES} helpers are in charge of simply -# checking that the source is available for download. This can be used +# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers are in charge of +# simply checking that the source is available for download. This can be used # to make sure one will be able to get all the sources needed for # one's build configuration. # -# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES} helpers simply output to -# the console the names of the files that will be downloaded, or path +# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers simply output +# to the console the names of the files that will be downloaded, or path # and revision of the source repositories, producing a list of all the # "external dependencies" of a given build configuration. ################################################################################ @@ -176,6 +197,22 @@ define SHOW_EXTERNAL_DEPS_SVN echo $($(PKG)_SOURCE) endef +# SCP URIs should be of the form scp://[user@]host:filepath +# Note that filepath is relative to the user's home directory, so you may want +# to prepend the path with a slash: scp://[user@]host:/absolutepath +define DOWNLOAD_SCP + test -e $(DL_DIR)/$(2) || \ + $(SCP) $(call stripurischeme,$(call qstrip,$(1)))/$(2) $(DL_DIR) +endef + +define SOURCE_CHECK_SCP + $(SSH) $(call domain,$(1),:) ls $(call notdomain,$(1)/$(2),:) > /dev/null +endef + +define SHOW_EXTERNAL_DEPS_SCP + echo $(2) +endef + define DOWNLOAD_WGET test -e $(DL_DIR)/$(2) || \ @@ -218,7 +255,10 @@ endef define DOWNLOAD $(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \ - $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ; \ + case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \ + scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \ + *) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \ + esac ; \ fi ; \ if test -n "$(1)" ; then \ case "$($(PKG)_SITE_METHOD)" in \ @@ -226,6 +266,7 @@ define DOWNLOAD svn) $($(DL_MODE)_SVN) && exit ;; \ bzr) $($(DL_MODE)_BZR) && exit ;; \ file) $($(DL_MODE)_LOCALFILES) && exit ;; \ + scp) $($(DL_MODE)_SCP) && exit ;; \ *) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \ esac ; \ fi ; \ @@ -655,6 +696,8 @@ else ifeq ($$($(2)_SITE_METHOD),git) DL_TOOLS_DEPENDENCIES += git else ifeq ($$($(2)_SITE_METHOD),bzr) DL_TOOLS_DEPENDENCIES += bzr +else ifeq ($$($(2)_SITE_METHOD),scp) +DL_TOOLS_DEPENDENCIES += scp ssh endif # SITE_METHOD endif # $(2)_KCONFIG_VAR -- cgit v1.2.3 From f694c0761d15901b74e972b08938fecfda3b510b Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 19 Oct 2011 09:25:47 +0200 Subject: Add support for packages stored in Mercurial (hg) repositories Add support for packages stored in Mercurial (hg) repositories. Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- Config.in | 4 ++++ package/Makefile.package.in | 33 +++++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) (limited to 'package') diff --git a/Config.in b/Config.in index 280ff0329..ab77ef348 100644 --- a/Config.in +++ b/Config.in @@ -44,6 +44,10 @@ config BR2_SSH string "Secure shell (ssh) command" default "ssh" +config BR2_HG + string "Mercurial (hg) command" + default "hg" + config BR2_ZCAT string "zcat command" default "gzip -d -c" diff --git a/package/Makefile.package.in b/package/Makefile.package.in index 7eddf171c..8985d5a9f 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -92,6 +92,7 @@ WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET) SVN:=$(call qstrip,$(BR2_SVN)) BZR:=$(call qstrip,$(BR2_BZR)) GIT:=$(call qstrip,$(BR2_GIT)) +HG:=$(call qstrip,$(BR2_HG)) $(QUIET) SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET) SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET) LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES)) @@ -125,20 +126,20 @@ notdomain=$(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(c domainseparator=$(if $(1),$(1),/) ################################################################################ -# The DOWNLOAD_{GIT,SVN,BZR,LOCALFILES} helpers are in charge of getting a +# The DOWNLOAD_{GIT,SVN,BZR,HG,LOCALFILES} helpers are in charge of getting a # working copy of the source repository for their corresponding SCM, # checking out the requested version / commit / tag, and create an # archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with # ssh authentication. DOWNLOAD_WGET is the normal wget-based download # mechanism. # -# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers are in charge of +# The SOURCE_CHECK_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers are in charge of # simply checking that the source is available for download. This can be used # to make sure one will be able to get all the sources needed for # one's build configuration. # -# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers simply output -# to the console the names of the files that will be downloaded, or path +# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers simply +# output to the console the names of the files that will be downloaded, or path # and revision of the source repositories, producing a list of all the # "external dependencies" of a given build configuration. ################################################################################ @@ -214,6 +215,27 @@ define SHOW_EXTERNAL_DEPS_SCP endef +define DOWNLOAD_HG + test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ + (pushd $(DL_DIR) > /dev/null && \ + $(HG) clone --noupdate --rev $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \ + $(HG) archive --repository $($(PKG)_BASE_NAME) --type tgz --prefix $($(PKG)_BASE_NAME)/ \ + --rev $($(PKG)_DL_VERSION) $(DL_DIR)/$($(PKG)_SOURCE) && \ + rm -rf $($(PKG)_DL_DIR) && \ + popd > /dev/null) +endef + +# TODO: improve to check that the given PKG_DL_VERSION exists on the remote +# repository +define SOURCE_CHECK_HG + $(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null +endef + +define SHOW_EXTERNAL_DEPS_HG + echo $($(PKG)_SOURCE) +endef + + define DOWNLOAD_WGET test -e $(DL_DIR)/$(2) || \ $(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2) @@ -267,6 +289,7 @@ define DOWNLOAD bzr) $($(DL_MODE)_BZR) && exit ;; \ file) $($(DL_MODE)_LOCALFILES) && exit ;; \ scp) $($(DL_MODE)_SCP) && exit ;; \ + hg) $($(DL_MODE)_HG) && exit ;; \ *) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \ esac ; \ fi ; \ @@ -698,6 +721,8 @@ else ifeq ($$($(2)_SITE_METHOD),bzr) DL_TOOLS_DEPENDENCIES += bzr else ifeq ($$($(2)_SITE_METHOD),scp) DL_TOOLS_DEPENDENCIES += scp ssh +else ifeq ($$($(2)_SITE_METHOD),hg) +DL_TOOLS_DEPENDENCIES += hg endif # SITE_METHOD endif # $(2)_KCONFIG_VAR -- cgit v1.2.3 From e3c6b3853ef054efe3ab9800392aec7aa7656dd3 Mon Sep 17 00:00:00 2001 From: Tristan Lelong Date: Tue, 29 Nov 2011 18:19:46 +0100 Subject: libroxml: bump version to 2.1.2 Fix some xpath bugs Signed-off-by: Tristan Lelong Signed-off-by: Peter Korsgaard --- package/libroxml/libroxml-2.1.1-werror.patch | 22 ---------------------- package/libroxml/libroxml-2.1.2-werror.patch | 22 ++++++++++++++++++++++ package/libroxml/libroxml.mk | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 package/libroxml/libroxml-2.1.1-werror.patch create mode 100644 package/libroxml/libroxml-2.1.2-werror.patch (limited to 'package') diff --git a/package/libroxml/libroxml-2.1.1-werror.patch b/package/libroxml/libroxml-2.1.1-werror.patch deleted file mode 100644 index a72f2a786..000000000 --- a/package/libroxml/libroxml-2.1.1-werror.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] remove -Werror from CFLAGS - --Werror should only be used during development, not in released SW. - -Signed-off-by: Peter Korsgaard ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libroxml-2.1.0/Makefile -=================================================================== ---- libroxml-2.1.0.orig/Makefile -+++ libroxml-2.1.0/Makefile -@@ -41,7 +41,7 @@ - - # options - override CPPFLAGS += -Iinc/ --override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Werror -Iinc/ $(DEFINES) -+override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Iinc/ $(DEFINES) - override LDFLAGS += - - ifeq ("$(OS)", "Darwin") diff --git a/package/libroxml/libroxml-2.1.2-werror.patch b/package/libroxml/libroxml-2.1.2-werror.patch new file mode 100644 index 000000000..a72f2a786 --- /dev/null +++ b/package/libroxml/libroxml-2.1.2-werror.patch @@ -0,0 +1,22 @@ +[PATCH] remove -Werror from CFLAGS + +-Werror should only be used during development, not in released SW. + +Signed-off-by: Peter Korsgaard +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libroxml-2.1.0/Makefile +=================================================================== +--- libroxml-2.1.0.orig/Makefile ++++ libroxml-2.1.0/Makefile +@@ -41,7 +41,7 @@ + + # options + override CPPFLAGS += -Iinc/ +-override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Werror -Iinc/ $(DEFINES) ++override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Iinc/ $(DEFINES) + override LDFLAGS += + + ifeq ("$(OS)", "Darwin") diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk index f49434893..5c0bf011d 100644 --- a/package/libroxml/libroxml.mk +++ b/package/libroxml/libroxml.mk @@ -2,7 +2,7 @@ # libroxml # -LIBROXML_VERSION = 2.1.1 +LIBROXML_VERSION = 2.1.2 LIBROXML_SITE = http://libroxml.googlecode.com/files LIBROXML_INSTALL_STAGING = YES -- cgit v1.2.3