The following changes since commit d8de970bae3744fe830e96a1ae0c4aff6ce47ba1: uClibc: sys/ptrace.h fix for 0.9.31 / powerpc so ltrace builds (2010-11-22 10:53:09 +0100) are available in the git repository at: git://repo.or.cz/buildroot-gz.git for-2010.11 Frederik Pasch (1): gpsd: building fails while compiling Qt bindings Gustavo Zacarias (9): libgcrypt: bump to version 1.4.6 to fix MIPS build issues uclibc: snapshot config fix, yet another stalling point sysstat: forcibly disable sensors to avoid build failures squid: bump to version 3.1.9 gpsd: needs host-pkg-config for proper qt bindings support busybox: bump to version 1.17.4 linux kernel: bump to version 2.6.36.1 linux headers: bump to version 2.6.32.26, 2.6.35.9 and 2.6.36.1 squid: ditch MAKE_OPT, it's no longer required Paulius Zaleckas (1): fixup various problems with Config.in linux/Config.in | 6 +- package/busybox/Config.in | 2 +- .../busybox-1.17.3/busybox-1.17.3-dnsd.patch | 12 ---- .../busybox-1.17.3/busybox-1.17.3-iproute.patch | 13 ----- .../busybox/busybox-1.17.3/busybox-1.17.3-ls.patch | 30 ----------- .../busybox-1.17.3/busybox-1.17.3-sort.patch | 12 ---- .../busybox-1.17.3/busybox-1.17.3-unicode.patch | 12 ---- package/gpsd/Config.in | 31 +---------- package/gpsd/gpsd.mk | 9 +++ package/libgcrypt/libgcrypt.mk | 8 ++-- package/squid/Config.in | 5 ++ package/squid/squid-cross-compile.patch | 56 ++++++++++++++----- package/squid/squid-susv3-legacy.patch | 49 ----------------- package/squid/squid.mk | 21 ++++---- package/sysstat/sysstat.mk | 2 +- toolchain/kernel-headers/Config.in | 6 +- ...types-for-headers-exported-to-user-space.patch} | 0 ...types-for-headers-exported-to-user-space.patch} | 0 toolchain/uClibc/uClibc-snapshot.config | 1 + 19 files changed, 80 insertions(+), 195 deletions(-) delete mode 100644 package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch delete mode 100644 package/busybox/busybox-1.17.3/busybox-1.17.3-iproute.patch delete mode 100644 package/busybox/busybox-1.17.3/busybox-1.17.3-ls.patch delete mode 100644 package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch delete mode 100644 package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch delete mode 100644 package/squid/squid-susv3-legacy.patch rename toolchain/kernel-headers/{linux-2.6.32.25-scsi-use-__uX-types-for-headers-exported-to-user-space.patch => linux-2.6.32.26-scsi-use-__uX-types-for-headers-exported-to-user-space.patch} (100%) rename toolchain/kernel-headers/{linux-2.6.35.8-scsi-use-__uX-types-for-headers-exported-to-user-space.patch => linux-2.6.35.9-scsi-use-__uX-types-for-headers-exported-to-user-space.patch} (100%) diff --git a/linux/Config.in b/linux/Config.in index 5191d01..f10b34c 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -22,7 +22,7 @@ choice default BR2_LINUX_KERNEL_2_6_36 config BR2_LINUX_KERNEL_2_6_36 - bool "2.6.36" + bool "2.6.36.1" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -52,7 +52,7 @@ endchoice config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE string "Kernel version" depends on BR2_LINUX_KERNEL_CUSTOM_VERSION - default "2.6.36" + default "2.6.36.1" config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION string "URL of custom kernel tarball" @@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION config BR2_LINUX_KERNEL_VERSION string - default "2.6.36" if BR2_LINUX_KERNEL_2_6_36 + default "2.6.36.1" if BR2_LINUX_KERNEL_2_6_36 default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/package/busybox/Config.in b/package/busybox/Config.in index 784ad52..e53046e 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -45,7 +45,7 @@ config BR2_BUSYBOX_VERSION default "1.14.4" if BR2_BUSYBOX_VERSION_1_14_X 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.3" if BR2_BUSYBOX_VERSION_1_17_X + default "1.17.4" if BR2_BUSYBOX_VERSION_1_17_X config BR2_PACKAGE_BUSYBOX_FULLINSTALL bool "Run BusyBox's own full installation" diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch deleted file mode 100644 index b135c14..0000000 --- a/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urpN busybox-1.17.3/networking/dnsd.c busybox-1.17.3-dnsd/networking/dnsd.c ---- busybox-1.17.3/networking/dnsd.c 2010-10-09 21:57:14.000000000 +0200 -+++ busybox-1.17.3-dnsd/networking/dnsd.c 2010-10-29 00:37:43.066043841 +0200 -@@ -388,7 +388,7 @@ static int process_packet(struct dns_ent - query_len = strlen(query_string) + 1; - /* may be unaligned! */ - unaligned_type_class = (void *)(query_string + query_len); -- query_len += sizeof(unaligned_type_class); -+ query_len += sizeof(*unaligned_type_class); - /* where to append answer block */ - answb = (void *)(unaligned_type_class + 1); - diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-iproute.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-iproute.patch deleted file mode 100644 index 03c749f..0000000 --- a/package/busybox/busybox-1.17.3/busybox-1.17.3-iproute.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urpN busybox-1.17.3/networking/libiproute/iproute.c busybox-1.17.3-iproute/networking/libiproute/iproute.c ---- busybox-1.17.3/networking/libiproute/iproute.c 2010-10-09 21:57:14.000000000 +0200 -+++ busybox-1.17.3-iproute/networking/libiproute/iproute.c 2010-11-04 09:13:06.307919550 +0100 -@@ -791,8 +791,8 @@ static int iproute_get(char **argv) - } - req.r.rtm_dst_len = addr.bitlen; - } -- argv++; - } -+ argv++; - } - - if (req.r.rtm_dst_len == 0) { diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-ls.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-ls.patch deleted file mode 100644 index 1c4f895..0000000 --- a/package/busybox/busybox-1.17.3/busybox-1.17.3-ls.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urpN busybox-1.17.3/coreutils/ls.c busybox-1.17.3-ls/coreutils/ls.c ---- busybox-1.17.3/coreutils/ls.c 2010-10-09 21:57:13.000000000 +0200 -+++ busybox-1.17.3-ls/coreutils/ls.c 2010-11-06 00:26:48.467049575 +0100 -@@ -184,7 +184,7 @@ static const unsigned opt_flags[] = { - LIST_INO, /* i */ - LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */ - LIST_SHORT | STYLE_SINGLE, /* 1 */ -- 0, /* g (don't show group) - handled via OPT_g */ -+ 0, /* g (don't show owner) - handled via OPT_g */ - LIST_ID_NUMERIC, /* n */ - LIST_BLOCKS, /* s */ - DISP_ROWS, /* x */ -@@ -621,7 +621,7 @@ static NOINLINE unsigned list_single(con - if (all_fmt & LIST_ID_NAME) { - if (option_mask32 & OPT_g) { - column += printf("%-8.8s ", -- get_cached_username(dn->dstat.st_uid)); -+ get_cached_groupname(dn->dstat.st_gid)); - } else { - column += printf("%-8.8s %-8.8s ", - get_cached_username(dn->dstat.st_uid), -@@ -631,7 +631,7 @@ static NOINLINE unsigned list_single(con - #endif - if (all_fmt & LIST_ID_NUMERIC) { - if (option_mask32 & OPT_g) -- column += printf("%-8u ", (int) dn->dstat.st_uid); -+ column += printf("%-8u ", (int) dn->dstat.st_gid); - else - column += printf("%-8u %-8u ", - (int) dn->dstat.st_uid, diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch deleted file mode 100644 index ebc9bf9..0000000 --- a/package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urpN busybox-1.17.3/coreutils/sort.c busybox-1.17.3-sort/coreutils/sort.c ---- busybox-1.17.3/coreutils/sort.c 2010-10-09 21:57:13.000000000 +0200 -+++ busybox-1.17.3-sort/coreutils/sort.c 2010-10-20 15:17:35.320293543 +0200 -@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, cha - #if ENABLE_FEATURE_SORT_BIG - /* Open output file _after_ we read all input ones */ - if (option_mask32 & FLAG_o) -- xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO); -+ xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO); - #endif - flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; - for (i = 0; i < linecount; i++) diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch deleted file mode 100644 index dc3b02e..0000000 --- a/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urpN busybox-1.17.3/libbb/unicode.c busybox-1.17.3-unicode/libbb/unicode.c ---- busybox-1.17.3/libbb/unicode.c 2010-10-09 21:58:13.000000000 +0200 -+++ busybox-1.17.3-unicode/libbb/unicode.c 2010-10-29 00:48:36.951494079 +0200 -@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_p - } - } - if (stats) -- stats->byte_count = stats->unicode_count = (d - dst); -+ stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst); - return dst; - } - diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 543f205..5e60bb0 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_GPSD bool "gpsd" help - gpsd is a service daemon that monitors one or more GPSes or AIS + gpsd is a service daemon that monitors one or more GPSes or AIS receivers attached to a host computer through serial or USB ports, making all data on the location/course/velocity of the sensors available to be queried on TCP port 2947 of the host computer. @@ -18,26 +18,21 @@ menu "Features" config BR2_PACKAGE_GPSD_TIMING bool "latency timing support" - default y config BR2_PACKAGE_GPSD_CLIENT_DEBUG bool "client debugging support" - default y config BR2_PACKAGE_GPSD_OLDSTYLE bool "oldstyle (pre-JSON) protocol support" - default y config BR2_PACKAGE_GPSD_PROFILING bool "profiling support" config BR2_PACKAGE_GPSD_NTP_SHM bool "NTP time hinting support" - default y config BR2_PACKAGE_GPSD_PPS bool "PPS time syncing support" - default y config BR2_PACKAGE_GPSD_PPS_ON_CTS bool "PPS pulse on CTS rather than DCD" @@ -99,61 +94,51 @@ menu "Protocols" config BR2_PACKAGE_GPSD_ASHTECH bool "Ashtech" - default y help Ashtech support config BR2_PACKAGE_GPSD_AIVDM bool "Aivdm" - default y help Aivdm support config BR2_PACKAGE_GPSD_EARTHMATE bool "Earthmate" - default y help DeLorme EarthMate Zodiac support config BR2_PACKAGE_GPSD_EVERMORE bool "EverMore" - default y help EverMore binary support config BR2_PACKAGE_GPSD_FV18 bool "FV-18" - default y help San Jose Navigation FV-18 support config BR2_PACKAGE_GPSD_GARMIN bool "Garmin (kernel)" - default y help Garmin kernel driver support config BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT bool "Garmin (simple text)" - default n help Garmin Simple Text support config BR2_PACKAGE_GPSD_GPSCLOCK bool "GPSClock" - default y help GPSClock support config BR2_PACKAGE_GPSD_ITRAX bool "iTrax" - default y help iTrax support -config BR2_PACKAGE_MTK3301 +config BR2_PACKAGE_GPSD_MTK3301 bool "MTK-3301" - default y help Mediatek MTK-3301 support @@ -165,73 +150,61 @@ config BR2_PACKAGE_GPSD_NMEA config BR2_PACKAGE_GPSD_NTRIP bool "NTRIP" - default y help NTRIP support config BR2_PACKAGE_GPSD_NAVCOM bool "Navcom" - default y help Navcom binary support config BR2_PACKAGE_GPSD_OCEANSERVER bool "OceanServer" - default y help OceanServer Digital Compass support config BR2_PACKAGE_GPSD_ONCORE bool "OnCore" - default y help OnCore support config BR2_PACKAGE_GPSD_RTCM104V2 bool "RTCM104 v2" - default y help RTCM104 v2 support config BR2_PACKAGE_GPSD_RTCM104V3 bool "RTCM104 v3" - default y help RTCM104 v3 support config BR2_PACKAGE_GPSD_SIRF bool "SiRF" - default y help SiRF binary support config BR2_PACKAGE_GPSD_SUPERSTAR2 bool "SuperStarII" - default y help Novatel SuperStarII binary support config BR2_PACKAGE_GPSD_TRIMBLE_TSIP bool "Trimble TSIP" - default y help Trimble TSIP support config BR2_PACKAGE_GPSD_TRIPMATE bool "TripMate" - default y help Delorme TripMate support config BR2_PACKAGE_GPSD_TRUE_NORTH bool "True North Technologies" - default n help True North Technologies support config BR2_PACKAGE_GPSD_UBX bool "UBX" - default y help uBlox UBX binary support diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index ab7e921..35e2c7d 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -18,6 +18,15 @@ else GPSD_CONF_OPT += --disable-libgpsmm endif +# Enable or disable Qt binding +ifeq ($(BR2_PACKAGE_QT_NETWORK),y) + GPSD_CONF_ENV += QMAKE="$(QT_QMAKE)" + GPSD_CONF_OPT += --enable-libQgpsmm + GPSD_DEPENDENCIES += qt host-pkg-config +else + GPSD_CONF_OPT += --disable-libQgpsmm +endif + # If libusb is available build it before so the package can use it ifeq ($(BR2_PACKAGE_LIBUSB),y) GPSD_DEPENDENCIES += libusb diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 646ad83..a7163ea 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -3,11 +3,11 @@ # libgcrypt # ############################################################# -LIBGCRYPT_VERSION:=1.4.5 -LIBGCRYPT_SOURCE:=libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 -LIBGCRYPT_SITE:=ftp://ftp.gnupg.org/gcrypt/libgcrypt + +LIBGCRYPT_VERSION = 1.4.6 +LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 +LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt LIBGCRYPT_INSTALL_STAGING = YES -LIBGCRYPT_INSTALL_TARGET = YES LIBGCRYPT_CONF_ENV = \ ac_cv_sys_symbol_underscore=no diff --git a/package/squid/Config.in b/package/squid/Config.in index 587ddbe..a40fa54 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,9 +1,14 @@ comment "Squid requires a toolchain with C++ support enabled" depends on !BR2_INSTALL_LIBSTDCPP +comment "Squid requires a toolchain with IPv6 support" + depends on !BR2_INET_IPV6 + config BR2_PACKAGE_SQUID bool "squid" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_INET_IPV6 + select BR2_PACKAGE_LIBCAP help Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. diff --git a/package/squid/squid-cross-compile.patch b/package/squid/squid-cross-compile.patch index efd2301..6643b4d 100644 --- a/package/squid/squid-cross-compile.patch +++ b/package/squid/squid-cross-compile.patch @@ -1,7 +1,25 @@ -diff -Nura squid-3.0.STABLE17/configure.in squid-3.0.STABLE17.cross/configure.in ---- squid-3.0.STABLE17/configure.in 2009-07-26 09:24:48.000000000 -0300 -+++ squid-3.0.STABLE17.cross/configure.in 2009-07-30 11:54:28.000000000 -0300 -@@ -1895,6 +1895,10 @@ +diff -Nura squid-3.1.8.orig/configure.in squid-3.1.8/configure.in +--- squid-3.1.8.orig/configure.in 2010-09-04 00:26:52.000000000 -0300 ++++ squid-3.1.8/configure.in 2010-09-06 10:12:09.036622139 -0300 +@@ -366,7 +366,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 +@@ -1802,7 +1802,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 +@@ -2115,6 +2115,10 @@ ;; esac @@ -12,20 +30,28 @@ diff -Nura squid-3.0.STABLE17/configure.in squid-3.0.STABLE17.cross/configure.in dnl Check for programs AC_PROG_CPP AC_PROG_INSTALL -diff -Nura squid-3.0.STABLE17/src/Makefile.am squid-3.0.STABLE17.cross/src/Makefile.am ---- squid-3.0.STABLE17/src/Makefile.am 2009-07-26 09:24:46.000000000 -0300 -+++ squid-3.0.STABLE17.cross/src/Makefile.am 2009-07-30 11:55:08.000000000 -0300 -@@ -1034,6 +1034,13 @@ - squid.conf.default: cf_parser.h +diff -Nura squid-3.1.8.orig/src/Makefile.am squid-3.1.8/src/Makefile.am +--- squid-3.1.8.orig/src/Makefile.am 2010-09-04 00:25:57.000000000 -0300 ++++ squid-3.1.8/src/Makefile.am 2010-09-06 10:11:27.319774138 -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) +@@ -752,6 +750,12 @@ + squid.conf.default squid.conf.documented: cf_parser.cci true -+CXX_FOR_BUILD ?= @CXX_FOR_BUILD@ -+ -+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) ++cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES) + $(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \ -+ $(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \ -+ -DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES} ++ $(top_srcdir)/lib/util.c \ ++ $(top_srcdir)/compat/assert.cc \ ++ $(cf_gen_LDADD) $(LIBS) ${INCLUDES} + - cf_parser.h: cf.data cf_gen$(EXEEXT) + cf_parser.cci: cf.data cf_gen$(EXEEXT) ./cf_gen cf.data $(srcdir)/cf.data.depend diff --git a/package/squid/squid-susv3-legacy.patch b/package/squid/squid-susv3-legacy.patch deleted file mode 100644 index c3343bd..0000000 --- a/package/squid/squid-susv3-legacy.patch +++ /dev/null @@ -1,49 +0,0 @@ -[PATCH] replace susv3 legacy functions with modern equivalents - -Signed-off-by: Peter Korsgaard ---- - src/ESIVarState.cc | 6 +++--- - src/HttpHeaderTools.cc | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -Index: squid-3.0.STABLE21/src/ESIVarState.cc -=================================================================== ---- squid-3.0.STABLE21.orig/src/ESIVarState.cc -+++ squid-3.0.STABLE21/src/ESIVarState.cc -@@ -207,7 +207,7 @@ ESIVariableUserAgent::getProductVersion - { - char const *t; - int len; -- t = index (s,'/'); -+ t = strchr (s,'/'); - - if (!t || !*(++t)) - return xstrdup (""); -@@ -382,12 +382,12 @@ ESIVariableUserAgent::ESIVariableUserAge - - if ((t = strstr (s, "MSIE"))) { - browser = ESI_BROWSER_MSIE; -- t = index (t, ' '); -+ t = strchr (t, ' '); - - if (!t) - browserversion = xstrdup (""); - else { -- t1 = index (t, ';'); -+ t1 = strchr (t, ';'); - - if (!t1) - browserversion = xstrdup (t + 1); -Index: squid-3.0.STABLE21/src/HttpHeaderTools.cc -=================================================================== ---- squid-3.0.STABLE21.orig/src/HttpHeaderTools.cc -+++ squid-3.0.STABLE21/src/HttpHeaderTools.cc -@@ -357,7 +357,7 @@ httpHeaderParseQuotedString (const char - pos = start + 1; - - while (1) { -- if (!(end = index (pos,'"'))) { -+ if (!(end = strchr (pos,'"'))) { - debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'"); - return 0; - } diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 6254b84..d45a473 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,20 +4,21 @@ # ############################################################# -SQUID_VERSION = 3.0.STABLE21 -SQUID_SOURCE = squid-$(SQUID_VERSION).tar.bz2 -SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.0 +SQUID_VERSION = 3.1.9 +SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1 +SQUID_DEPENDENCIES = libcap SQUID_AUTORECONF = YES -SQUID_LIBTOOL_PATCH = NO 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 -SQUID_CONF_OPT = --disable-wccp --disable-wccp2 \ - --disable-htcp --disable-snmp \ - --enable-linux-netfilter \ - --enable-storeio=ufs,diskd,aufs,null \ +SQUID_CONF_OPT = --enable-wccp --enable-wccpv2 --enable-async-io=8 \ + --enable-htcp --enable-snmp --enable-linux-netfilter \ --enable-removal-policies="lru,heap" \ - --with-aufs-threads=24 --with-filedescriptors=1024 + --with-filedescriptors=1024 --disable-ident-lookups \ + --enable-auth="digest" \ + --enable-digest-auth-helpers="password" \ + --enable-external-acl-helpers="ip_user" + ifeq ($(BR2_PACKAGE_OPENSSL),y) SQUID_CONF_OPT += --enable-ssl SQUID_DEPENDENCIES += openssl @@ -28,8 +29,6 @@ define SQUID_CLEANUP_TARGET RunCache RunAccel) rm -f $(addprefix $(TARGET_DIR)/etc/, \ cachemgr.conf mime.conf.default squid.conf.default) - rm -f $(TARGET_DIR)/usr/libexec/cachemgr.cgi - rm -f $(TARGET_DIR)/usr/share/mib.txt endef SQUID_POST_INSTALL_TARGET_HOOKS += SQUID_CLEANUP_TARGET diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 4f2f663..c5fe5c9 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -7,8 +7,8 @@ SYSSTAT_VERSION = 9.1.6 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/ +SYSSTAT_CONF_OPT = --disable-man-group --disable-sensors -SYSSTAT_CONF_OPT = --disable-man-group ifneq ($(BR2_HAVE_DOCUMENTATION),y) SYSSTAT_CONF_OPT += --disable-documentation endif diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index d3cde76..5bba7a6 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -59,10 +59,10 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "2.6.30.10" if BR2_KERNEL_HEADERS_2_6_30 default "2.6.31.14" if BR2_KERNEL_HEADERS_2_6_31 - default "2.6.32.25" if BR2_KERNEL_HEADERS_2_6_32 + default "2.6.32.26" if BR2_KERNEL_HEADERS_2_6_32 default "2.6.33.7" if BR2_KERNEL_HEADERS_2_6_33 default "2.6.34.7" if BR2_KERNEL_HEADERS_2_6_34 - default "2.6.35.8" if BR2_KERNEL_HEADERS_2_6_35 - default "2.6.36" if BR2_KERNEL_HEADERS_2_6_36 + default "2.6.35.9" if BR2_KERNEL_HEADERS_2_6_35 + default "2.6.36.1" if BR2_KERNEL_HEADERS_2_6_36 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/toolchain/kernel-headers/linux-2.6.32.25-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.32.26-scsi-use-__uX-types-for-headers-exported-to-user-space.patch similarity index 100% rename from toolchain/kernel-headers/linux-2.6.32.25-scsi-use-__uX-types-for-headers-exported-to-user-space.patch rename to toolchain/kernel-headers/linux-2.6.32.26-scsi-use-__uX-types-for-headers-exported-to-user-space.patch diff --git a/toolchain/kernel-headers/linux-2.6.35.8-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.9-scsi-use-__uX-types-for-headers-exported-to-user-space.patch similarity index 100% rename from toolchain/kernel-headers/linux-2.6.35.8-scsi-use-__uX-types-for-headers-exported-to-user-space.patch rename to toolchain/kernel-headers/linux-2.6.35.9-scsi-use-__uX-types-for-headers-exported-to-user-space.patch diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config index bc3074e..e5d2bea 100644 --- a/toolchain/uClibc/uClibc-snapshot.config +++ b/toolchain/uClibc/uClibc-snapshot.config @@ -183,6 +183,7 @@ UCLIBC_HAS_XLOCALE=y UCLIBC_HAS_HEXADECIMAL_FLOATS=y # UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +# USE_OLD_VFPRINTF is not set UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y # UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set