make allmodconfig work for alix1c eglibc

many upstream package updates,
squid, php, asterisk, gnutls, nmap, sqlite, dhcp, git

5 files changed, 76 insertions, 29 deletions

diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in
index 72f8b6bca..3cac88628 100644
--- a/package/asterisk/Config.in
+++ b/package/asterisk/Config.in
@@ -1,5 +1,6 @@
 config ADK_PACKAGE_ASTERISK
 	bool "asterisk................... Telephony server"
+	depends on !ADK_LINUX_CRIS_FOXBOARD
         select ADK_PACKAGE_LIBCURL
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBPTHREAD
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index c3f9e0cef..e5a3609a7 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,14 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.26
+PKG_VERSION:=		1.4.26.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f54d6685533a149a0241c3468a88e02a
+PKG_MD5SUM:=		9b46f8628f43e1d3c275460ceee26646
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
 PKG_URL:=		http://www.asterisk.org
-PKG_SITES:=		http://downloads.digium.com/pub/telephony/asterisk/releases/
+PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
 include $(TOPDIR)/mk/package.mk
 
@@ -40,6 +40,11 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+=	asterisk-codec-gsm-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+=	asterisk-pbx-dundi-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+=		asterisk-res-agi-install
 
+#workaround for cris and gcc 4.4, where -Os generates ICE
+ifeq ($(ARCH),cris)
+TARGET_OPTIMIZATION:=$(subst Os,O2,$(TARGET_OPTIMIZATION))
+endif
+
 CONFIGURE_ARGS=		--with-z=${STAGING_DIR}/usr \
 			--with-ncurses=${STAGING_DIR}/usr \
 			--with-ssl=${STAGING_DIR}/usr \
@@ -100,7 +105,7 @@ CONFIGURE_ARGS+=	--without-misdn \
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		STRIP=${STRIP}
 BUILD_STYLE:=		auto
-MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} ${TCFLAGS} -DHAVE_STRTOQ" \
+MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TLDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 			OPTIMIZE="${TARGET_OPTIMIZATION}" \
diff --git a/package/asterisk/patches/patch-codecs_gsm_Makefile b/package/asterisk/patches/patch-codecs_gsm_Makefile
new file mode 100644
index 000000000..82653cc9b
--- /dev/null
+++ b/package/asterisk/patches/patch-codecs_gsm_Makefile
@@ -0,0 +1,66 @@
+disable uname -m checks 
+--- asterisk-1.4.26.orig/codecs/gsm/Makefile	2008-11-19 22:34:47.000000000 +0100
++++ asterisk-1.4.26/codecs/gsm/Makefile	2009-08-21 12:29:21.450418652 +0200
+@@ -37,13 +37,13 @@ WAV49	= -DWAV49
+ ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
+ ######### probably require gcc. 
+ 
+-ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
+-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
+-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
+-OPTIMIZE+=-march=$(PROC)
+-endif
+-endif
+-endif
++#ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
++#ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
++#ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
++#OPTIMIZE+=-march=$(PROC)
++#endif
++#endif
++#endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+ #This works for even old (2.96) versions of gcc and provides a small boost either way.
+@@ -207,13 +207,13 @@ GSM_SOURCES =	$(SRC)/add.c		\
+ # add k6-specific code only if not on a non-k6 hardware or proc.
+ # XXX Keep a space after each findstring argument
+ # XXX should merge with GSM_OBJECTS
+-ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
+-GSM_SOURCES+= $(SRC)/k6opt.s
+-endif
+-endif
+-endif
++#ifeq ($(OSARCH),linux-gnu)
++#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
++#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
++#GSM_SOURCES+= $(SRC)/k6opt.s
++#endif
++#endif
++#endif
+ 
+ TOAST_SOURCES = $(SRC)/toast.c 		\
+ 		$(SRC)/toast_lin.c	\
+@@ -259,13 +259,13 @@ GSM_OBJECTS =	$(SRC)/add.o		\
+ 		$(SRC)/short_term.o	\
+ 		$(SRC)/table.o
+ 
+-ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
+-GSM_OBJECTS+= $(SRC)/k6opt.o
+-endif
+-endif
+-endif
++#ifeq ($(OSARCH),linux-gnu)
++#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
++#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
++#GSM_OBJECTS+= $(SRC)/k6opt.o
++#endif
++#endif
++#endif
+ 
+ TOAST_OBJECTS =	$(SRC)/toast.o 		\
+ 		$(SRC)/toast_lin.o	\
diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree
deleted file mode 100644
index 98c18ec08..000000000
--- a/package/asterisk/patches/patch-menuselect-tree
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/menuselect-tree	2009-04-02 19:44:31.000000000 +0200
-+++ asterisk-1.4.24.1/menuselect-tree	2009-05-12 16:07:12.000000000 +0200
-@@ -59,9 +59,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-menuselect_example_menuselect-tree b/package/asterisk/patches/patch-menuselect_example_menuselect-tree
deleted file mode 100644
index 6c58cc33d..000000000
--- a/package/asterisk/patches/patch-menuselect_example_menuselect-tree
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/menuselect/example_menuselect-tree	2006-08-19 22:55:53.000000000 +0200
-+++ asterisk-1.4.24.1/menuselect/example_menuselect-tree	2009-05-12 16:07:32.000000000 +0200
-@@ -45,8 +45,6 @@
- 		<member name="app_flash" displayname="Flash zap trunk application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>zaptel</depend>
- 		</member>
--		<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--		</member>
- 		<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities." remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- 		</member>
- 		<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">