Merge branch 'master' of git+ssh://openadk.org/git/openadk

Makefile

@@ -90,6 +90,7 @@ oldconfig: .prereq_done
 
 download: .prereq_done
 	@${GMAKE_INV} toolchain/download
+	@${GMAKE_INV} dep
 	@${GMAKE_INV} package/download
 
 cleankernel kernelclean: .prereq_done

mk/build.mk

@@ -272,12 +272,11 @@ cleandir:
 
 cleantoolchain:
 	@$(TRACE) cleantoolchain
-	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) 
-	rm -rf $(BUILD_DIR_PFX) $(TARGET_DIR_PFX) \
+	@rm -rf $(BUILD_DIR_PFX) $(TARGET_DIR_PFX) \
 	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
-	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
-	rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
-	rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
+	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
+	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+	@rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk
 
 cleantarget:
 	@$(TRACE) cleantarget
@@ -500,7 +499,7 @@ bulktoolchain:
 			if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz ];then exit;fi; \
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
-				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
+				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; break;fi; \
 				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}*; \
 				$(GMAKE) cleantoolchain; \
 			rm .config; \
@@ -621,6 +620,7 @@ package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) $(TO
 	@:>.menu
 
 $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker: $(TOPDIR)/tools/adk/depmaker.c
+	@mkdir -p host_$(GNU_HOST_NAME)/usr/bin
 	$(CC_FOR_BUILD) -g -o $@ $(TOPDIR)/tools/adk/depmaker.c
 
 dep: $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker

mk/mirrors.mk

@@ -42,6 +42,8 @@ MASTER_SITE_GNU?=	\
   	ftp://ftp.sunet.se/pub/gnu/ \
 
 MASTER_SITE_SOURCEFORGE?=	\
+	http://skylink.dl.sourceforge.net/sourceforge/ \
+	http://garr.dl.sourceforge.net/sourceforge/ \
 	http://heanet.dl.sourceforge.net/sourceforge/ \
 	http://jaist.dl.sourceforge.net/sourceforge/ \
 	http://nchc.dl.sourceforge.net/sourceforge/ \

package/libevent/Makefile

@@ -4,13 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libevent
-PKG_VERSION:=		1.4.14b
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		a00e037e4d3f9e4fe9893e8a2d27918c
-PKG_DESCR:=		Event notification library for event-driven network servers
+PKG_VERSION:=		2.0.21
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b2405cc9ebf264aa47ff615d9de527a2
+PKG_DESCR:=		event notification library for event-driven network servers
 PKG_SECTION:=		libs
-PKG_URL:=		http://www.monkey.org/~provos/
-PKG_SITES:=		http://www.monkey.org/~provos/
+PKG_URL:=		http://libevent.org/
+PKG_SITES:=		https://github.com/downloads/libevent/libevent/
 PKG_OPTS:=		dev
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION)-stable.tar.gz
@@ -20,8 +20,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-
 libevent-install:
 	$(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libevent*.so* $(IDIR_LIBEVENT)/usr/lib

package/libevent/patches/patch-configure

@@ -1,20 +0,0 @@
---- libevent-1.4.14b-stable.orig/configure	2010-06-20 15:06:18.000000000 +0200
-+++ libevent-1.4.14b-stable/configure	2011-05-11 13:12:43.000000000 +0200
-@@ -10847,7 +10847,7 @@ if test "${ac_cv_lib_nsl_inet_ntoa+set}"
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnsl  $LIBS"
-+LIBS="$LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -10882,7 +10882,7 @@ if test "x$ac_cv_lib_nsl_inet_ntoa" = x"
- #define HAVE_LIBNSL 1
- _ACEOF
- 
--  LIBS="-lnsl $LIBS"
-+  LIBS="$LIBS"
- 
- fi
- 

package/mpd/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
-PKG_VERSION:=		0.18.8
+PKG_VERSION:=		0.18.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7bbe1caf5abe404dc985ca4f44984b1f
+PKG_MD5SUM:=		0e5156a831d4302d2032998bcfd5c36f
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		glib libstdcxx libgcc libiconv-tiny libmpdclient
@@ -120,7 +120,7 @@ PKG_FDEPENDS+=		pulseaudio
 endif
 
 PKGFD_WITH_AVAHI:=	enable AVAHI/zeroconf support
-PKGFS_WITH_AVAHI:=	libavahi
+PKGFS_WITH_AVAHI:=	libavahi libdbus
 PKGFB_WITH_AVAHI:=	avahi
 ifeq ($(ADK_PACKAGE_MPD_WITH_AVAHI),y)
 PKG_FDEPENDS+=		libavahi

package/net-snmp/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		net-snmp
-PKG_VERSION:=		5.7.2
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		5bddd02e2f82b62daa79f82717737a14
+PKG_VERSION:=		5.7.2.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		7db683faba037249837b226f64d566d4
 PKG_DESCR:=		SNMP Agent
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libnetsnmp libelf libnl

package/openssl/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl
 PKG_VERSION:=		1.0.1f
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f26b09c028a0541cab33da697d522b25
 PKG_DESCR:=		OpenSSL (Secure Socket Layer) libraries
 PKG_SECTION:=		libs
@@ -39,7 +39,7 @@ BUILD_STYLE:=		manual
 INSTALL_TARGET:=	install_sw
 FAKE_FLAGS+=		INSTALL_PREFIX=${WRKINST}
 
-OPENSSL_OPTIONS:= shared no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
+OPENSSL_OPTIONS:= shared threads no-err no-krb5 zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
 
 ifneq ($(ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV),)
 OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS

package/osiris/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		admin
 PKG_DEPENDS:=		libopenssl libpthread
 PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://osiris.shmoo.com/
-PKG_SITES:=		http://osiris.shmoo.com/data/
+PKG_SITES:=		http://openadk.org/distfiles/
 
 include ${TOPDIR}/mk/package.mk
 

package/php/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		php
-PKG_VERSION:=		5.5.6
+PKG_VERSION:=		5.5.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		82968eac50c523ecf7a05855cb5c3d0a
+PKG_MD5SUM:=		e760656f7cf2f05158f73da75e8b720b
 PKG_DESCR:=		PHP language interpreter
 PKG_SECTION:=		lang
 PKG_DEPENDS:=		libpthread librt libgcc
@@ -130,7 +130,6 @@ PKG_CONFIGURE_OPTS+=	--with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \
 			--with-png-dir="$(STAGING_TARGET_DIR)/usr" \
 			--with-jpeg-dir="$(STAGING_TARGET_DIR)/usr" \
 			--without-freetype-dir \
-			--without-xpm-dir \
 			--without-ttf \
 			--without-t1lib	\
 			--enable-gd-native-ttf \

package/php/patches/patch-configure

@@ -0,0 +1,96 @@
+--- php-5.5.10.orig/configure	2014-03-05 11:52:32.000000000 +0100
++++ php-5.5.10/configure	2014-03-11 19:16:14.718425962 +0100
+@@ -37475,19 +37475,7 @@ fi
+ 
+ 
+ php_with_xpm_dir=no
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libXpm" >&5
+-$as_echo_n "checking for the location of libXpm... " >&6; }
+-
+-# Check whether --with-xpm-dir was given.
+-if test "${with_xpm_dir+set}" = set; then :
+-  withval=$with_xpm_dir; PHP_XPM_DIR=$withval
+-else
+-
+-  PHP_XPM_DIR=no
+-
+-
+-fi
++PHP_XPM_DIR=no
+ 
+ 
+ ext_output=$PHP_XPM_DIR
+@@ -39551,13 +39539,6 @@ $as_echo "#define HAVE_GD_JPG 1" >>confd
+     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG"
+   fi
+ 
+-  if test -n "$GD_XPM_DIR"; then
+-
+-$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
+-
+-    GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM"
+-  fi
+-
+   if test -n "$FREETYPE2_DIR"; then
+ 
+ $as_echo "#define HAVE_GD_FREETYPE 1" >>confdefs.h
+@@ -42258,58 +42239,6 @@ fi
+     esac
+   done
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromXpm in -lgd" >&5
+-$as_echo_n "checking for gdImageCreateFromXpm in -lgd... " >&6; }
+-if ${ac_cv_lib_gd_gdImageCreateFromXpm+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgd  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gdImageCreateFromXpm ();
+-int
+-main ()
+-{
+-return gdImageCreateFromXpm ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_gd_gdImageCreateFromXpm=yes
+-else
+-  ac_cv_lib_gd_gdImageCreateFromXpm=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromXpm" >&5
+-$as_echo "$ac_cv_lib_gd_gdImageCreateFromXpm" >&6; }
+-if test "x$ac_cv_lib_gd_gdImageCreateFromXpm" = xyes; then :
+-
+-    LDFLAGS=$save_old_LDFLAGS
+-    ext_shared=$save_ext_shared
+-
+-$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
+-
+-
+-else
+-
+-    LDFLAGS=$save_old_LDFLAGS
+-    ext_shared=$save_ext_shared
+-    unset ac_cv_lib_gd_gdImageCreateFromXpm
+-
+-
+-fi
+ 
+ 
+   save_old_LDFLAGS=$LDFLAGS

package/squid/Makefile

@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		squid
-PKG_VERSION:=		3.4.1
+PKG_VERSION:=		3.4.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		da9f30aeff856bc8348494da2730f94e
+PKG_MD5SUM:=		b36ab3696485a86b43d9194ac9b6b7fe
 PKG_DESCR:=		squid web and cache proxy
 PKG_SECTION:=		proxy
 PKG_DEPENDS:=		libopenssl libpthread libstdcxx libltdl
-PKG_BUILDDEP:=		openssl libtool
+PKG_BUILDDEP:=		autotool openssl libtool
 PKG_URL:=		http://www.squid-cache.org/
 PKG_SITES:=		http://www.squid-cache.org/Versions/v3/3.4/
 PKG_MULTI:=		1
@@ -95,6 +95,7 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth))
 $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,ext_unix_group_acl))
 $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,ntlm_fake_auth))
 
+AUTOTOOL_STYLE:=	autoreconf
 TARGET_LDFLAGS+=	-lpthread
 CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
 			ac_cv_sizeof_short=2 \
@@ -120,6 +121,7 @@ CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
 			squid_cv_pf_inet6=yes \
 			ac_cv_have_squid=yes
 XAKE_FLAGS+=		MKDIR_P="mkdir -p"
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--libexecdir=/usr/lib/squid \
 			--sysconfdir=/etc/squid \

package/squid/files/autotool.patch

@@ -1,37 +0,0 @@
-diff -Nur squid-3.1.11.orig/configure.ac squid-3.1.11/configure.ac
---- squid-3.1.11.orig/configure.ac	2011-02-08 05:07:06.000000000 +0100
-+++ squid-3.1.11/configure.ac	2011-03-04 23:03:25.000000000 +0100
-@@ -3913,6 +3913,9 @@
- fi
- AC_SUBST(XTRA_LIBS)
- 
-+CXX_FOR_BUILD="g++"
-+AC_SUBST(CXX_FOR_BUILD)
-+
- dnl Clean up after OSF/1 core dump bug
- rm -f core 
- 
-diff -Nur squid-3.1.11.orig/src/Makefile.am squid-3.1.11/src/Makefile.am
---- squid-3.1.11.orig/src/Makefile.am	2011-02-08 05:05:51.000000000 +0100
-+++ squid-3.1.11/src/Makefile.am	2011-03-04 23:16:39.000000000 +0100
-@@ -732,6 +732,8 @@
- # Make location configure settings available to the code
- DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
- 
-+CXX_FOR_BUILD ?= @CXX_FOR_BUILD@
-+
- snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
- 
- globals.cc: globals.h mk-globals-c.pl
-@@ -753,6 +755,11 @@
- squid.conf.default squid.conf.documented: cf_parser.cci
- 	true
- 
-+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
-+	$(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \
-+		$(top_srcdir)/lib/util.c $(top_srcdir)/compat/assert.cc \
-+		-DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES} ${CXXFLAGS_FOR_BUILD}
-+
- cf_parser.cci: cf.data cf_gen$(EXEEXT)
- 	./cf_gen cf.data $(srcdir)/cf.data.depend
- 

package/squid/files/squid.conf

@@ -1,4 +1,4 @@
-visible_hostname linux
+visible_hostname openadk
 # for transparent proxy use following
 # http_port 3128 transparent
 http_port 3128
@@ -10,7 +10,5 @@ cache_log /var/log/squid-cache.log
 # security
 cache_effective_user squid
 cache_effective_group squid
-# cache dir
-cache_dir ufs /var/squid/cache 10M 16 256
 # allow all
 http_access allow all

package/squid/patches/patch-configure

@@ -1,207 +0,0 @@
---- squid-3.3.9.orig/configure	2013-09-11 06:09:44.000000000 +0200
-+++ squid-3.3.9/configure	2013-10-05 21:38:15.000000000 +0200
-@@ -18948,52 +18948,9 @@ unset squid_tmp_define
- # to be used by sub-commands
- export enable_inline
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU atomic operations support" >&5
--$as_echo_n "checking for GNU atomic operations support... " >&6; }
--if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--    int n = 0;
--
--int
--main ()
--{
--
--    __sync_add_and_fetch(&n, 10); // n becomes 10
--    __sync_fetch_and_add(&n, 20); // n becomes 30
--    __sync_sub_and_fetch(&n, 15); // n becomes 15
--    __sync_bool_compare_and_swap(&n, 15, 201); // n becomes 201
--    __sync_fetch_and_and(&n, 200); // n becomes 200
--    return (n == 200) ? 0 : -1;
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_run "$LINENO"; then :
--
- 
- $as_echo "#define HAVE_ATOMIC_OPS 1" >>confdefs.h
- 
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--else
--
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
- 
- 
- # Check whether --enable-debug-cbdata was given.
-@@ -21049,151 +21006,6 @@ if test "x$with_openssl" = "xyes"; then
- 
- 
- 
--# save state, key is check_SSL_get_certificate
--check_SSL_get_certificate_CFLAGS="${CFLAGS}"
--check_SSL_get_certificate_CXXFLAGS="${CXXFLAGS}"
--check_SSL_get_certificate_LDFLAGS="${LDFLAGS}"
--check_SSL_get_certificate_LIBS="${LIBS}"
--check_SSL_get_certificate_CC="${CC}"
--check_SSL_get_certificate_CXX="${CXX}"
--check_SSL_get_certificate_squid_saved_vars=""
--for squid_util_var_tosave in $check_SSL_get_certificate_squid_saved_vars
--do
--    squid_util_var_tosave2="check_SSL_get_certificate_${squid_util_var_tosave}"
--    eval "${squid_util_var_tosave2}=\"${squid_util_var_tosave}\""
--done
--
--  LIBS="$SSLLIB $LIBS"
--  if test "x$SSLLIBDIR" != "x"; then
--     LIBS="$LIBS -Wl,-rpath -Wl,$SSLLIBDIR"
--  fi
--
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the SSL_get_certificate is buggy" >&5
--$as_echo_n "checking whether the SSL_get_certificate is buggy... " >&6; }
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--
--     #include <openssl/ssl.h>
--     #include <openssl/err.h>
--
--int
--main ()
--{
--
--    SSLeay_add_ssl_algorithms();
--    SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
--    SSL *ssl = SSL_new(sslContext);
--    X509* cert = SSL_get_certificate(ssl);
--    return 0;
--
--  ;
--  return 0;
--}
--
--_ACEOF
--if ac_fn_cxx_try_run "$LINENO"; then :
--
--   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--else
--
--   $as_echo "#define SQUID_SSLGETCERTIFICATE_BUGGY 1" >>confdefs.h
--
--   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the workaround for SSL_get_certificate works" >&5
--$as_echo_n "checking whether the workaround for SSL_get_certificate works... " >&6; }
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--
--     #include <openssl/ssl.h>
--     #include <openssl/err.h>
--
--int
--main ()
--{
--
--    SSLeay_add_ssl_algorithms();
--    SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
--    X509 ***pCert = (X509 ***)sslContext->cert;
--    X509 *sslCtxCert = pCert && *pCert ? **pCert : (X509 *)0x1;
--    if (sslCtxCert != NULL)
--        return 1;
--    return 0;
--
--  ;
--  return 0;
--}
--
--_ACEOF
--if ac_fn_cxx_try_run "$LINENO"; then :
--
--   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--   $as_echo "#define SQUID_USE_SSLGETCERTIFICATE_HACK 1" >>confdefs.h
--
--
--else
--
--   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--
--
--# rollback state, key is check_SSL_get_certificate
--CFLAGS="${check_SSL_get_certificate_CFLAGS}"
--CXXFLAGS="${check_SSL_get_certificate_CXXFLAGS}"
--LDFLAGS="${check_SSL_get_certificate_LDFLAGS}"
--LIBS="${check_SSL_get_certificate_LIBS}"
--CC="${check_SSL_get_certificate_CC}"
--CXX="${check_SSL_get_certificate_CXX}"
--for squid_util_var_tosave in $check_SSL_get_certificate_squid_saved_vars
--do
--    squid_util_var_tosave2="\$check_SSL_get_certificate_${squid_util_var_tosave}"
--    eval "$squid_util_var_tosave=\"${squid_util_var_tosave2}\""
--done
--
--# commit state, key is check_SSL_get_certificate
--unset check_SSL_get_certificate_CFLAGS
--unset check_SSL_get_certificate_CXXFLAGS
--unset check_SSL_get_certificate_LDFLAGS
--unset check_SSL_get_certificate_LIBS
--unset check_SSL_get_certificate_CC
--unset check_SSL_get_certificate_CXX
--for squid_util_var_tosave in $check_SSL_get_certificate_squid_saved_vars
--do
--    unset ${squid_util_var_tosave}
--done
--
--
--
- 
- 
- 

package/squid/patches/patch-helpers_basic_auth_LDAP_config_test

@@ -1,12 +0,0 @@
---- squid-3.3.9.orig/helpers/basic_auth/LDAP/config.test	2013-09-11 06:08:38.000000000 +0200
-+++ squid-3.3.9/helpers/basic_auth/LDAP/config.test	2013-10-06 11:00:22.000000000 +0200
-@@ -1,8 +1,2 @@
- #!/bin/sh
--if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
--	exit 0
--fi
--if [ -f /usr/include/winldap.h ]; then
--	exit 0
--fi
--exit 1
-+exit 0

package/squid/patches/patch-helpers_external_acl_file_userip_config_test

@@ -1,9 +0,0 @@
---- squid-3.3.9.orig/helpers/external_acl/file_userip/config.test	2013-09-11 06:08:38.000000000 +0200
-+++ squid-3.3.9/helpers/external_acl/file_userip/config.test	2013-10-06 11:01:02.000000000 +0200
-@@ -1,5 +1,2 @@
- #!/bin/sh
--if [ -f /usr/include/sys/socket.h ]; then
--    exit 0
--fi
--exit 1
-+exit 0

package/squid/patches/patch-src_Makefile_in

@@ -1,11 +0,0 @@
---- squid-3.3.9.orig/src/Makefile.in	2013-09-11 06:09:23.000000000 +0200
-+++ squid-3.3.9/src/Makefile.in	2013-10-05 21:42:09.000000000 +0200
-@@ -7295,7 +7295,7 @@ cache_cf.o: cf_parser.cci
- 
- # cf_gen builds the configuration files.
- cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
--	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
-+	$(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
- 
- # squid.conf.default is built by cf_gen when making cf_parser.cci
- squid.conf.default squid.conf.documented: cf_parser.cci

package/tor/Makefile

@@ -4,20 +4,22 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tor
-PKG_VERSION:=		0.2.3.25
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		a1c364189a9a66ed9daa8e6436489daf
-PKG_DESCR:=		An anonymous Internet communication system
+PKG_VERSION:=		0.2.4.21
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		bde981d10e8faf1e171ef1ebbb7b398a
+PKG_DESCR:=		anonymous internet communication system
 PKG_SECTION:=		proxy
 PKG_DEPENDS:=		libevent libopenssl zlib libpthread
 PKG_BUILDDEP:=		libevent openssl zlib
-PKG_URL:=		http://tor.eff.org/
-PKG_SITES:=		http://tor.eff.org/dist/
+PKG_URL:=		https://www.torproject.org/
+PKG_SITES:=		https://www.torproject.org/dist/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+# -DNDEBUG not supported
+TARGET_CPPFLAGS:=
 CONFIGURE_ENV+=		ac_cv_libevent_normal=yes \
 			ac_cv_libevent_linker_option="" \
 			ac_cv_libevent_dir="${STAGING_TARGET_DIR}/usr" \

package/tor/patches/patch-contrib_suse_tor_sh

@@ -1,11 +0,0 @@
---- tor-0.2.1.20.orig/contrib/suse/tor.sh	2009-10-15 18:16:23.000000000 +0200
-+++ tor-0.2.1.20/contrib/suse/tor.sh	2009-12-03 23:45:45.000000000 +0100
-@@ -43,7 +43,7 @@ rc_reset
- # Increase open file descriptors a reasonable amount
- ulimit -n 8192
- 
--TORCTL=/usr/local/bin/torctl
-+TORCTL=/usr/bin/torctl
- 
- # torctl will use these environment variables
- TORUSER=_tor

package/tor/patches/patch-contrib_tor_sh

@@ -1,11 +0,0 @@
---- tor-0.2.1.20.orig/contrib/tor.sh	2009-10-15 18:16:22.000000000 +0200
-+++ tor-0.2.1.20/contrib/tor.sh	2009-12-03 23:45:44.000000000 +0100
-@@ -26,7 +26,7 @@ fi
- # Increase open file descriptors a reasonable amount
- ulimit -n 8192
- 
--TORCTL=/usr/local/bin/torctl
-+TORCTL=/usr/bin/torctl
- 
- # torctl will use these environment variables
- TORUSER=_tor

package/tor/patches/patch-contrib_torctl

@@ -1,27 +0,0 @@
---- tor-0.2.1.20.orig/contrib/torctl	2009-10-15 18:16:22.000000000 +0200
-+++ tor-0.2.1.20/contrib/torctl	2009-12-03 23:45:44.000000000 +0100
-@@ -24,19 +24,19 @@
- EXEC=tor
- #
- # the path to your binary, including options if necessary
--TORBIN="/usr/local/bin/$EXEC"
-+TORBIN="/usr/bin/$EXEC"
- #
- # the path to the configuration file
--TORCONF="/usr/local/etc/tor/torrc"
-+TORCONF="/etc/tor/torrc"
- #
- # the path to your PID file
--PIDFILE="/usr/local/var/run/tor/tor.pid"
-+PIDFILE="/var/run/tor/tor.pid"
- #
- # The path to the log file
--LOGFILE="/usr/local/var/log/tor/tor.log"
-+LOGFILE="/var/log/tor/tor.log"
- #
- # The path to the datadirectory
--TORDATA="/usr/local/var/lib/tor"
-+TORDATA="/var/lib/tor"
- #
- TORARGS="--pidfile $PIDFILE --log \"notice file $LOGFILE\" --runasdaemon 1"
- TORARGS="$TORARGS --datadirectory $TORDATA"

package/tor/patches/patch-src_common_util_h

@@ -1,23 +0,0 @@
---- tor-0.2.1.20.orig/src/common/util.h	2009-06-19 08:13:53.000000000 +0200
-+++ tor-0.2.1.20/src/common/util.h	2009-12-03 23:47:21.000000000 +0100
-@@ -24,20 +24,6 @@
- #define O_TEXT 0
- #endif
- 
--/* Replace assert() with a variant that sends failures to the log before
-- * calling assert() normally.
-- */
--#ifdef NDEBUG
--/* Nobody should ever want to build with NDEBUG set.  99% of our asserts will
-- * be outside the critical path anyway, so it's silly to disable bug-checking
-- * throughout the entire program just because a few asserts are slowing you
-- * down.  Profile, optimize the critical path, and keep debugging on.
-- *
-- * And I'm not just saying that because some of our asserts check
-- * security-critical properties.
-- */
--#error "Sorry; we don't support building with NDEBUG."
--#endif
- 
- /** Like assert(3), but send assertion failures to the log as well as to
-  * stderr. */

package/tor/patches/patch-src_or_eventdns_c

@@ -1,18 +0,0 @@
---- tor-0.2.1.20.orig/src/or/eventdns.c	2009-09-17 08:02:18.000000000 +0200
-+++ tor-0.2.1.20/src/or/eventdns.c	2009-12-03 23:49:27.000000000 +0100
-@@ -375,7 +375,6 @@ error_is_eagain(int err)
- #define TOLOWER(c) TOR_TOLOWER(c)
- #define TOUPPER(c) TOR_TOUPPER(c)
- 
--#ifndef NDEBUG
- static const char *
- debug_ntoa(u32 address)
- {
-@@ -404,7 +403,6 @@ debug_ntop(const struct sockaddr *sa)
- 	}
- 	return "<unknown>";
- }
--#endif
- 
- static evdns_debug_log_fn_type evdns_log_fn = NULL;
- 

package/tor/patches/patch-tor_spec

@@ -1,11 +0,0 @@
---- tor-0.2.1.20.orig/tor.spec	2009-10-15 18:16:22.000000000 +0200
-+++ tor-0.2.1.20/tor.spec	2009-12-03 23:45:44.000000000 +0100
-@@ -101,7 +101,7 @@
- %endif
- 
- %if %{!?_localstatedir:1}%{?_localstatedir:0}
--%define _localstatedir /usr/local/var
-+%define _localstatedir /var
- %endif
- 
- ## Package information

target/linux/patches/3.13.6/microblaze-early-printk.patch

@@ -0,0 +1,12 @@
+diff -Nur linux-3.13.6.orig/arch/microblaze/include/asm/setup.h linux-3.13.6/arch/microblaze/include/asm/setup.h
+--- linux-3.13.6.orig/arch/microblaze/include/asm/setup.h	2014-03-07 07:07:02.000000000 +0100
++++ linux-3.13.6/arch/microblaze/include/asm/setup.h	2014-03-12 13:28:53.315145258 +0100
+@@ -19,8 +19,6 @@
+ 
+ extern char *klimit;
+ 
+-void early_printk(const char *fmt, ...);
+-
+ int setup_early_printk(char *opt);
+ void remap_early_printk(void);
+ void disable_early_printk(void);