Misc version bumps

PATCH New Gustavo Zacarias 3 participants 30 messages Sep 2, 2011 – Sep 27, 2011

lore

Share & tools

lore

Gustavo Zacarias

author

2011-09-02 14:04 UTC #0 lore raw

cover Misc version bumps

Many version bumps.
Of notable importance is musepack which contains a security fix.

Gustavo Zacarias (13):
netsnmp: bump to version 5.6.1.1
libreplaygain: bump to r475
libcuefile: bump to r475
libsndfile: bump to version 1.0.25
libcurl: bump to version 7.21.7
libsamplerate: bump to version 0.1.8
libao: bump to version 1.1.0
sqlite: bump to version 3.7.7.1
musepack: bump to r475
mpd: bump to version 0.16.3
squid: bump to version 3.1.15
busybox: add 1.19.x branch and remove deprecated
dnsmasq: bump to version 2.58

 package/busybox/Config.in                          |   13 +-
 .../busybox-1.19.0/busybox-1.19.0-cttyhack.patch   |   18 +
 .../busybox-1.19.0/busybox-1.19.0-find.patch       |   14 +
 .../busybox-1.19.0/busybox-1.19.0-less.patch       |   12 +
 .../busybox-1.19.0/busybox-1.19.0-sed.patch        |  237 +++++
 .../busybox-1.19.0/busybox-1.19.0-swap.patch       |   12 +
 .../busybox-1.19.0/busybox-1.19.0-top.patch        |   69 ++
 .../busybox-1.19.0/busybox-1.19.0-uncompress.patch |   50 +
 package/busybox/busybox-1.19.x.config              | 1013 ++++++++++++++++++++
 package/dnsmasq/dnsmasq.mk                         |    2 +-
 package/libcurl/libcurl.mk                         |    3 +-
 package/multimedia/libao/libao.mk                  |    2 +-
 package/multimedia/libcuefile/libcuefile.mk        |    2 +-
 package/multimedia/libreplaygain/libreplaygain.mk  |    2 +-
 package/multimedia/libsamplerate/libsamplerate.mk  |    2 +-
 package/multimedia/libsndfile/libsndfile.mk        |    2 +-
 .../mpd/mpd-0.16.2-tremor-needs-ogg_common.patch   |   20 -
 package/multimedia/mpd/mpd.mk                      |    2 +-
 package/multimedia/musepack/musepack-shared.patch  |   24 +
 package/multimedia/musepack/musepack.mk            |    5 +-
 package/netsnmp/netsnmp.mk                         |    2 +-
 package/sqlite/sqlite.mk                           |    2 +-
 package/squid/squid-cross-compile.patch            |   65 --
 package/squid/squid.mk                             |    5 +-
 24 files changed, 1470 insertions(+), 108 deletions(-)
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-cttyhack.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-find.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-less.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-sed.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-swap.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-top.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-uncompress.patch
 create mode 100644 package/busybox/busybox-1.19.x.config
 delete mode 100644 package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch
 create mode 100644 package/multimedia/musepack/musepack-shared.patch
 delete mode 100644 package/squid/squid-cross-compile.patch

Signature · 1 line

1.7.3.4

Gustavo Zacarias

author

2011-09-02 14:04 UTC #1 lore raw

PATCH 1/2 ncurses: fix host build breakage

Disable GPM support for host ncurses build since it sometimes breaks the build.

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

---
 package/ncurses/ncurses.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/ncurses/ncurses.mk +1 -1

index ac4c12b..8c8ae36 100644
@@ -131,7 +131,7 @@ define HOST_NCURSES_BUILD_CMDS
 endef
 
 HOST_NCURSES_CONF_OPT = \
-	--without-shared
+	--without-shared --without-gpm
 
 $(eval $(call AUTOTARGETS,package,ncurses))
 $(eval $(call AUTOTARGETS,package,ncurses,host))

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-27 21:27 UTC #2 lore raw

PATCH 1/2 ncurses: fix host build breakage

Quoted 1 line

Gustavo> Disable GPM support for host ncurses build since it sometimes Gustavo> breaks the build.

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #3 lore raw

PATCH 1/13 netsnmp: bump to version 5.6.1.1

In reply to Gustavo Zacarias

Bump netsnmp to version 5.6.1.1 which contains minor fixes.

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

---
 package/netsnmp/netsnmp.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/netsnmp/netsnmp.mk +1 -1

index 5704327..a44f3fe 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETSNMP_VERSION = 5.6.1
+NETSNMP_VERSION = 5.6.1.1
 NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
 NETSNMP_INSTALL_STAGING = YES

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:00 UTC #4 lore raw

PATCH 1/13 netsnmp: bump to version 5.6.1.1

Quoted 1 line

Gustavo> Bump netsnmp to version 5.6.1.1 which contains minor fixes. Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #5 lore raw

PATCH 2/13 libreplaygain: bump to r475

In reply to Gustavo Zacarias

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

---
 package/multimedia/libreplaygain/libreplaygain.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/multimedia/libreplaygain/libreplaygain.mk +1 -1

index c941092..cc023a0 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBREPLAYGAIN_VERSION =  r453
+LIBREPLAYGAIN_VERSION =  r475
 LIBREPLAYGAIN_SITE = http://files.musepack.net/source
 LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
 # upstream doesn't ship configure

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:01 UTC #6 lore raw

PATCH 2/13 libreplaygain: bump to r475

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #7 lore raw

PATCH 3/13 libcuefile: bump to r475

In reply to Gustavo Zacarias

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

---
 package/multimedia/libcuefile/libcuefile.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/multimedia/libcuefile/libcuefile.mk +1 -1

index 86ec070..765c5a2 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCUEFILE_VERSION = r453
+LIBCUEFILE_VERSION = r475
 LIBCUEFILE_SITE = http://files.musepack.net/source
 LIBCUEFILE_SOURCE = libcuefile_$(LIBCUEFILE_VERSION).tar.gz
 LIBCUEFILE_INSTALL_STAGING = YES

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:01 UTC #8 lore raw

PATCH 3/13 libcuefile: bump to r475

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #9 lore raw

PATCH 4/13 libsndfile: bump to version 1.0.25

In reply to Gustavo Zacarias

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

---
 package/multimedia/libsndfile/libsndfile.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/multimedia/libsndfile/libsndfile.mk +1 -1

index d554699..52ecce5 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBSNDFILE_VERSION = 1.0.23
+LIBSNDFILE_VERSION = 1.0.25
 LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files
 LIBSNDFILE_INSTALL_STAGING = YES

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:03 UTC #10 lore raw

PATCH 4/13 libsndfile: bump to version 1.0.25

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #11 lore raw

PATCH 5/13 libcurl: bump to version 7.21.7

In reply to Gustavo Zacarias

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

---
 package/libcurl/libcurl.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

package/libcurl/libcurl.mk +2 -1

index ca293fb..5773570 100644
@@ -3,7 +3,8 @@
 # libcurl
 #
 #############################################################
-LIBCURL_VERSION = 7.21.2
+
+LIBCURL_VERSION = 7.21.7
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download/
 LIBCURL_INSTALL_STAGING = YES

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:11 UTC #12 lore raw

PATCH 5/13 libcurl: bump to version 7.21.7

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #13 lore raw

PATCH 6/13 libsamplerate: bump to version 0.1.8

In reply to Gustavo Zacarias

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

---
 package/multimedia/libsamplerate/libsamplerate.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/multimedia/libsamplerate/libsamplerate.mk +1 -1

index 94b07a4..f20026a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSAMPLERATE_VERSION = 0.1.7
+LIBSAMPLERATE_VERSION = 0.1.8
 LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC
 LIBSAMPLERATE_INSTALL_STAGING = YES
 LIBSAMPLERATE_DEPENDENCIES = host-pkg-config

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:11 UTC #14 lore raw

PATCH 6/13 libsamplerate: bump to version 0.1.8

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #15 lore raw

PATCH 7/13 libao: bump to version 1.1.0

In reply to Gustavo Zacarias

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

---
 package/multimedia/libao/libao.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/multimedia/libao/libao.mk +1 -1

index ee02d18..83d3154 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBAO_VERSION = 1.0.0
+LIBAO_VERSION = 1.1.0
 LIBAO_SITE = http://downloads.xiph.org/releases/ao
 LIBAO_DEPENDENCIES = host-pkg-config
 LIBAO_INSTALL_STAGING = YES

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:12 UTC #16 lore raw

PATCH 7/13 libao: bump to version 1.1.0

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #17 lore raw

PATCH 8/13 sqlite: bump to version 3.7.7.1

In reply to Gustavo Zacarias

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

---
 package/sqlite/sqlite.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/sqlite/sqlite.mk +1 -1

index de2e499..db9c53e 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3070603
+SQLITE_VERSION = 3070701
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:13 UTC #18 lore raw

PATCH 8/13 sqlite: bump to version 3.7.7.1

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #19 lore raw

PATCH 9/13 musepack: bump to r475

In reply to Gustavo Zacarias

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

---
 package/multimedia/musepack/musepack-shared.patch |   24 +++++++++++++++++++++
 package/multimedia/musepack/musepack.mk           |    5 +--
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 package/multimedia/musepack/musepack-shared.patch

package/multimedia/musepack/musepack-shared.patch new file +24 -0

new file mode 100644
index 0000000..d8c788d
@@ -0,0 +1,24 @@
+Fixup installation of shared mpcdec library.
+Based on gentoo patch.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+---
+
+diff -Nura musepack_src_r475.orig/libmpcdec/CMakeLists.txt musepack_src_r475/libmpcdec/CMakeLists.txt
+--- musepack_src_r475.orig/libmpcdec/CMakeLists.txt	2010-08-21 12:55:01.000000000 -0300
++++ musepack_src_r475/libmpcdec/CMakeLists.txt	2011-08-17 15:53:06.126873408 -0300
+@@ -1,7 +1,12 @@
+ include_directories(${libmpc_SOURCE_DIR}/include)
+ if(SHARED)
+-  add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++  add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++  set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
++  target_link_libraries(mpcdec_shared m)
++  install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+ else(SHARED)
+   add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++  set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1)
++  target_link_libraries(mpcdec_static m)
++  install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+ endif(SHARED)
+-

package/multimedia/musepack/musepack.mk +2 -3

index 34581b6..21601eb 100644
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-MUSEPACK_VERSION =  r435
+MUSEPACK_VERSION =  r475
 MUSEPACK_SITE = http://files.musepack.net/source
 MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
 MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
-MUSEPACK_AUTORECONF = YES
 MUSEPACK_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/multimedia,musepack))
+$(eval $(call CMAKETARGETS,package/multimedia,musepack))

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:31 UTC #20 lore raw

PATCH 9/13 musepack: bump to r475

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #21 lore raw

PATCH 10/13 mpd: bump to version 0.16.3

In reply to Gustavo Zacarias

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

---
 .../mpd/mpd-0.16.2-tremor-needs-ogg_common.patch   |   20 --------------------
 package/multimedia/mpd/mpd.mk                      |    2 +-
 2 files changed, 1 insertions(+), 21 deletions(-)
 delete mode 100644 package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch

package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch deleted +0 ~~-20~~

deleted file mode 100644
index d315f14..0000000
@@ -1,20 +0,0 @@
-[PATCH] configure: tremor needs common ogg support just like libvorbis does
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: mpd-0.16.2/configure.ac
-===================================================================
---- mpd-0.16.2.orig/configure.ac
-+++ mpd-0.16.2/configure.ac
-@@ -1081,7 +1081,7 @@
- fi
- 
- AM_CONDITIONAL(HAVE_OGG_COMMON,
--	  test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
-+	  test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
- 
- AM_CONDITIONAL(HAVE_FLAC_COMMON,
- 	  test x$enable_flac = xyes || test x$enable_oggflac = xyes)

package/multimedia/mpd/mpd.mk +1 -1

index d418f61..e647b4a 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.16.2
+MPD_VERSION = 0.16.3
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
 MPD_AUTORECONF = YES
 MPD_DEPENDENCIES = host-pkg-config libglib2

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:34 UTC #22 lore raw

PATCH 10/13 mpd: bump to version 0.16.3

Quoted 1 line

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

Committed, thanks - Notice that 0.16.4 is out though.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:04 UTC #23 lore raw

PATCH 11/13 squid: bump to version 3.1.15

In reply to Gustavo Zacarias

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

---
 package/squid/squid-cross-compile.patch |   65 -------------------------------
 package/squid/squid.mk                  |    5 +-
 2 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 package/squid/squid-cross-compile.patch

package/squid/squid-cross-compile.patch deleted +0 ~~-65~~

deleted file mode 100644
index 98424ae..0000000
@@ -1,65 +0,0 @@
-diff -Nura squid-3.1.10.orig/configure.ac squid-3.1.10/configure.ac
---- squid-3.1.10.orig/configure.ac	2010-12-22 02:48:27.000000000 -0300
-+++ squid-3.1.10/configure.ac	2010-12-22 11:31:08.420533635 -0300
-@@ -384,7 +384,7 @@
- 
- dnl Nasty hack to get autoconf 2.64 on Linux to run.
- dnl all other uses of RUN_IFELSE are wrapped inside CACHE_CHECK which breaks on 2.64
--AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[:])
-+dnl AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[:])
- 
- dnl This is a developer only option.. developers know how to set defines
- dnl
-@@ -1889,7 +1889,7 @@
-     AC_MSG_NOTICE([Negotiate auth helpers built: $NEGOTIATE_AUTH_HELPERS])
- fi
- AC_SUBST(NEGOTIATE_AUTH_HELPERS)
--AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
-+dnl AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
- 
- dnl Select digest auth scheme helpers to build
- if test -n "$AUTH_MODULE_digest"; then
-@@ -2202,6 +2202,18 @@
- 	;;
- esac
- 
-+dnl Define CXX_FOR_BUILD
-+CXX_FOR_BUILD="$CXX_FOR_BUILD"
-+AC_SUBST(CXX_FOR_BUILD)
-+
-+dnl Define CXXFLAGS_FOR_BUILD
-+CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD"
-+AC_SUBST(CXXFLAGS_FOR_BUILD)
-+
-+dnl Define LDFLAGS_FOR_BUILD
-+LDFLAGS_FOR_BUILD="$LDFLAGS_FOR_BUILD"
-+AC_SUBST(LDFLAGS_FOR_BUILD)
-+
- dnl Check for programs
- AC_PROG_CPP
- AC_PROG_INSTALL
-diff -Nura squid-3.1.10.orig/src/Makefile.am squid-3.1.10/src/Makefile.am
---- squid-3.1.10.orig/src/Makefile.am	2010-12-22 02:46:56.000000000 -0300
-+++ squid-3.1.10/src/Makefile.am	2010-12-22 11:31:08.422533643 -0300
-@@ -195,8 +195,6 @@
- cf_gen_SOURCES = cf_gen.cc
- nodist_cf_gen_HEADER = cf_gen_defines.cci
- cf_gen_LDADD= \
--	../compat/libcompat.la \
--	-L../lib -lmiscutil \
- 	$(EPOLL_LIBS) \
- 	$(MINGW_LIBS) \
- 	$(XTRA_LIBS)
-@@ -753,6 +751,12 @@
- squid.conf.default squid.conf.documented: cf_parser.cci
- 	true
- 
-+cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES)
-+	$(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \
-+		$(top_srcdir)/lib/util.c \
-+		$(top_srcdir)/compat/assert.cc \
-+		$(cf_gen_LDADD) $(LIBS) ${INCLUDES}
-+
- cf_parser.cci: cf.data cf_gen$(EXEEXT)
- 	./cf_gen cf.data $(srcdir)/cf.data.depend
-

package/squid/squid.mk +2 -3

index 2184f1a..fbcdc48 100644
@@ -4,13 +4,12 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.1.14
+SQUID_VERSION = 3.1.15
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
 SQUID_DEPENDENCIES = libcap host-libcap
-SQUID_AUTORECONF = YES
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
 			ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \
-			ac_cv_func_strnstr=no
+			ac_cv_func_strnstr=no ac_cv_have_squid=yes
 SQUID_CONF_OPT =	--enable-wccp --enable-wccpv2 --enable-async-io=8 \
 			--enable-htcp --enable-snmp --enable-linux-netfilter \
 			--enable-removal-policies="lru,heap" \

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:34 UTC #24 lore raw

PATCH 11/13 squid: bump to version 3.1.15

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2011-09-02 14:05 UTC #25 lore raw

PATCH 12/13 busybox: add 1.19.x branch and remove deprecated

In reply to Gustavo Zacarias

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

---
 package/busybox/Config.in                          |   13 +-
 .../busybox-1.19.0/busybox-1.19.0-cttyhack.patch   |   18 +
 .../busybox-1.19.0/busybox-1.19.0-find.patch       |   14 +
 .../busybox-1.19.0/busybox-1.19.0-less.patch       |   12 +
 .../busybox-1.19.0/busybox-1.19.0-sed.patch        |  237 +++++
 .../busybox-1.19.0/busybox-1.19.0-swap.patch       |   12 +
 .../busybox-1.19.0/busybox-1.19.0-top.patch        |   69 ++
 .../busybox-1.19.0/busybox-1.19.0-uncompress.patch |   50 +
 package/busybox/busybox-1.19.x.config              | 1013 ++++++++++++++++++++
 9 files changed, 1431 insertions(+), 7 deletions(-)
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-cttyhack.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-find.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-less.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-sed.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-swap.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-top.patch
 create mode 100644 package/busybox/busybox-1.19.0/busybox-1.19.0-uncompress.patch
 create mode 100644 package/busybox/busybox-1.19.x.config

package/busybox/Config.in +6 -7

index 488b124..18b266a 100644
@@ -13,14 +13,10 @@ if BR2_PACKAGE_BUSYBOX
 
 choice
 	prompt "BusyBox Version"
-	default BR2_BUSYBOX_VERSION_1_18_X
+	default BR2_BUSYBOX_VERSION_1_19_X
 	help
 	  Select the version of BusyBox you wish to use.
 
-	config BR2_BUSYBOX_VERSION_1_15_X
-		bool "BusyBox 1.15.x"
-		depends on BR2_DEPRECATED
-
 	config BR2_BUSYBOX_VERSION_1_16_X
 		bool "BusyBox 1.16.x"

@@ -30,6 +26,9 @@ choice
 	config BR2_BUSYBOX_VERSION_1_18_X
 		bool "BusyBox 1.18.x"
 
+	config BR2_BUSYBOX_VERSION_1_19_X
+		bool "BusyBox 1.19.x"
+
 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 		bool "daily snapshot"

@@ -37,18 +36,18 @@ endchoice
 
 config BR2_BUSYBOX_VERSION
 	string
-	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
 	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
 	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
+	default "1.19.0"	if BR2_BUSYBOX_VERSION_1_19_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
 	default "package/busybox/busybox-1.18.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
-	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_15_X
 	default "package/busybox/busybox-1.16.x.config" if BR2_BUSYBOX_VERSION_1_16_X
 	default "package/busybox/busybox-1.17.x.config" if BR2_BUSYBOX_VERSION_1_17_X
 	default "package/busybox/busybox-1.18.x.config" if BR2_BUSYBOX_VERSION_1_18_X
+	default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X
 	help
 	  Some people may wish to use their own modified BusyBox configuration
 	  file, and will specify their config file location with this option.

package/busybox/busybox-1.19.0/busybox-1.19.0-cttyhack.patch new file +18 -0

new file mode 100644
index 0000000..ef2781d
@@ -0,0 +1,18 @@
+--- busybox-1.19.0/shell/cttyhack.c
++++ busybox-1.19.0-cttyhack/shell/cttyhack.c
+@@ -122,10 +122,12 @@ int cttyhack_main(int argc UNUSED_PARAM,
+ 		do {
+ #ifdef __linux__
+ 			int s = open_read_close("/sys/class/tty/console/active",
+-				console + 5, sizeof(console) - 5 - 1);
++				console + 5, sizeof(console) - 5);
+ 			if (s > 0) {
+-				/* found active console via sysfs (Linux 2.6.38+) */
+-				console[5 + s] = '\0';
++				/* found active console via sysfs (Linux 2.6.38+)
++				 * sysfs string looks like "ttyS0\n" so zap the newline:
++				 */
++				console[4 + s] = '\0';
+ 				break;
+ 			}
+

package/busybox/busybox-1.19.0/busybox-1.19.0-find.patch new file +14 -0

new file mode 100644
index 0000000..a795ffd
@@ -0,0 +1,14 @@
+--- busybox-1.19.0/findutils/find.c
++++ busybox-1.19.0-find/findutils/find.c
+@@ -932,7 +932,10 @@ static action*** parse_params(char **arg
+  * expression is reached.
+  */
+ 		/* Options */
+-		if (0) { }
++		if (parm == OPT_FOLLOW) {
++                        dbg("follow enabled: %d", __LINE__);
++                        G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
++		}
+ #if ENABLE_FEATURE_FIND_XDEV
+ 		else if (parm == OPT_XDEV) {
+ 			dbg("%d", __LINE__);

package/busybox/busybox-1.19.0/busybox-1.19.0-less.patch new file +12 -0

new file mode 100644
index 0000000..a1d3374
@@ -0,0 +1,12 @@
+--- busybox-1.19.0/miscutils/less.c
++++ busybox-1.19.0-less/miscutils/less.c
+@@ -990,7 +990,8 @@ static int64_t less_getch(int pos)
+ 	 */
+ 	if (key >= 0 && key < ' ' && key != 0x0d && key != 8)
+ 		goto again;
+-	return key;
++
++	return key64;
+ }
+ 
+ static char* less_gets(int sz)

package/busybox/busybox-1.19.0/busybox-1.19.0-sed.patch new file +237 -0

237 lines not on this page · raw message

package/busybox/busybox-1.19.0/busybox-1.19.0-swap.patch new file +12 -0

new file mode 100644
index 0000000..c783945
@@ -0,0 +1,12 @@
+--- busybox-1.19.0/util-linux/swaponoff.c
++++ busybox-1.19.0-swap/util-linux/swaponoff.c
+@@ -114,7 +114,8 @@ int swap_on_off_main(int argc UNUSED_PAR
+ #if !ENABLE_FEATURE_SWAPON_PRI
+ 	ret = getopt32(argv, "a");
+ #else
+-	opt_complementary = "p+";
++	if (applet_name[5] == 'n')
++		opt_complementary = "p+";
+ 	ret = getopt32(argv, (applet_name[5] == 'n') ? "ap:" : "a", &g_flags);
+ 
+ 	if (ret & 2) { // -p

package/busybox/busybox-1.19.0/busybox-1.19.0-top.patch new file +69 -0

69 lines not on this page · raw message

package/busybox/busybox-1.19.0/busybox-1.19.0-uncompress.patch new file +50 -0

50 lines not on this page · raw message

package/busybox/busybox-1.19.x.config new file +1013 -0

1,013 lines not on this page · raw message

Signature · 1 line

1.7.3.4

Thomas Petazzoni

2011-09-05 06:50 UTC #26 lore raw

PATCH 12/13 busybox: add 1.19.x branch and remove deprecated

Hello,

Le Fri, 2 Sep 2011 11:05:00 -0300,
Gustavo Zacarias <[email protected]> a ?crit :

package/busybox/Config.in endchoice · line 42

Quoted 7 lines

config BR2_BUSYBOX_VERSION

package/busybox/Config.in +1 -1

 	string
-	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
 	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
 	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
+	default "1.19.0"	if BR2_BUSYBOX_VERSION_1_19_X

I guess we could also set 1.16.x and 1.17.x as deprecated. For Busybox, there really isn't much reason to support 4-5 different versions. Supporting the last two ones seems sufficient to me.

Thomas

Signature · 4 lines

Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Gustavo Zacarias

author

2011-09-06 13:40 UTC #27 lore raw

PATCH 12/13 busybox: add 1.19.x branch and remove deprecated

Quoted 18 lines · Thomas Petazzoni

Quoted 1 line

Yes, we should deprecate them for now.
Sent a revised patch with the new 1.19.2 version and 1.16.x & 1.17.x marked as deprecated.
Regards.

Gustavo Zacarias

author

2011-09-02 14:05 UTC #28 lore raw

PATCH 13/13 dnsmasq: bump to version 2.58

In reply to Gustavo Zacarias

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

---
 package/dnsmasq/dnsmasq.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/dnsmasq/dnsmasq.mk +1 -1

index d8f4d77..f62ec21 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.57
+DNSMASQ_VERSION = 2.58
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-09-11 20:35 UTC #29 lore raw

PATCH 13/13 dnsmasq: bump to version 2.58

Quoted 1 line

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

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard