diff options
64 files changed, 585 insertions, 65117 deletions
diff --git a/mk/build.mk b/mk/build.mk index aa97026cb..34ae7935a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -13,7 +13,24 @@ CONFIG = config DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_DEBUG=n \ ADK_STATIC=n \ - ADK_FORCE_PARALLEL=n + ADK_FORCE_PARALLEL=n \ + BUSYBOX_SELINUX=n \ + BUSYBOX_LOCALE_SUPPORT=n \ + BUSYBOX_FEATURE_PREFER_APPLETS=n \ + BUSYBOX_FEATURE_SUID=n \ + BUSYBOX_SELINUXENABLED=n \ + BUSYBOX_FEATURE_INSTALLER=n \ + BUSYBOX_PAM=n \ + BUSYBOX_FLASH_LOCK=n \ + BUSYBOX_FLASH_UNLOCK=n \ + BUSYBOX_FLASH_ERASEALL=n \ + BUSYBOX_PIE=n \ + BUSYBOX_DEBUG=n \ + BUSYBOX_NOMMU=n \ + BUSYBOX_WERROR=n \ + BUSYBOX_STATIC=n \ + ADK_KERNEL_RT2X00_DEBUG=n \ + ADK_KERNEL_ATH5K_DEBUG=n noconfig_targets:= menuconfig \ _config \ @@ -227,7 +244,26 @@ modconfig: echo $$symbol >> $(TOPDIR)/all.config; \ done; \ fi + @if [ ! -z "$(FS)" ];then \ + grep "^config" target/Config.in \ + |grep -i "$(FS)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(TOPDIR)/all.config; \ + fi + @if [ ! -z "$(PKG)" ];then \ + grep "^config" target/Config.in \ + |grep -i "$(PKG)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(TOPDIR)/all.config; \ + fi + @if [ ! -z "$(LIBC)" ];then \ + grep "^config" target/Config.in \ + |grep -i "$(LIBC)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(TOPDIR)/all.config; \ + fi ifneq (,$(filter %_qemu,${TARGET})) + @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config endif ifneq (,$(filter %_rescue,${TARGET})) @@ -248,6 +284,14 @@ _mconfig: ${CONFIG}/conf _mconfig2 _config _mconfig2: ${CONFIG}/conf modconfig @${CONFIG}/conf -m ${RCONFIG} >/dev/null +# build all targets and combinations +bulk: + mkdir $(TOPDIR)/bulk + $(MAKE) TARGET=alix1c LIBC=uclibc FS=nfsroot PKG=ipkg allmodconfig + $(MAKE) v + $(CP) $(BIN_DIR) $(TOPDIR)/bulk + $(MAKE) cleantarget + distclean: @$(MAKE) -C $(CONFIG) clean @rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \ diff --git a/mk/modules.mk b/mk/modules.mk index 19ab1b14d..cbaaca78f 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -58,7 +58,6 @@ $(eval $(call KMOD_template,ATH5K,mac80211-ath5k,\ ,20, kmod-led-class)) $(eval $(call KMOD_template,RT2X00,mac80211-rt2x00,\ - $(MODULES_DIR)/kernel/drivers/input/input-polldev \ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \ ,17)) @@ -490,10 +489,6 @@ $(eval $(call KMOD_template,IP_NF_TARGET_NETMAP,nf-ip-target-netmap,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_NETMAP \ ,65)) -$(eval $(call KMOD_template,IP_NF_TARGET_SAME,nf-ip-target-same,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_SAME \ -,65)) - # # Mangle # diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index d234b8a57..ecb33b52d 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.4.26.3 +PKG_VERSION:= 1.4.27.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 04017dfdc8caeb8f4663b5dc4a9e1019 +PKG_MD5SUM:= e09ca163a6e90018c92c65a50b9ec398 PKG_DESCR:= Open Source PBX PKG_SECTION:= net PKG_DEPENDS:= libncurses libpthread libopenssl libcurl @@ -121,8 +121,8 @@ pre-configure: post-build: cd ${WRKBUILD}/sounds ; \ - tar xzf asterisk-core-sounds-en-gsm-1.4.15.tar.gz ; \ - rm asterisk-core-sounds-en-gsm-1.4.15.tar.gz + tar xzf asterisk-core-sounds-en-gsm-1.4.16.tar.gz ; \ + rm asterisk-core-sounds-en-gsm-1.4.16.tar.gz @echo @echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---" @echo diff --git a/package/asterisk/patches/patch-channels_chan_iax2_c b/package/asterisk/patches/patch-channels_chan_iax2_c new file mode 100644 index 000000000..f39c2bf5b --- /dev/null +++ b/package/asterisk/patches/patch-channels_chan_iax2_c @@ -0,0 +1,20 @@ +--- asterisk-1.4.27.1.orig/channels/chan_iax2.c 2009-11-10 18:15:57.000000000 +0100 ++++ asterisk-1.4.27.1/channels/chan_iax2.c 2009-12-03 20:57:05.000000000 +0100 +@@ -7076,7 +7076,7 @@ static int try_transfer(struct chan_iax2 + + memset(&ied, 0, sizeof(ied)); + if (ies->apparent_addr) +- bcopy(ies->apparent_addr, &new, sizeof(new)); ++ memcpy(&new, ies->apparent_addr, sizeof(new)); + if (ies->callno) + newcall = ies->callno; + if (!newcall || !new.sin_addr.s_addr || !new.sin_port) { +@@ -7235,7 +7235,7 @@ static int iax2_ack_registry(struct iax_ + + memset(&us, 0, sizeof(us)); + if (ies->apparent_addr) +- bcopy(ies->apparent_addr, &us, sizeof(us)); ++ memcpy(&us, ies->apparent_addr, sizeof(us)); + if (ies->username) + ast_copy_string(peer, ies->username, sizeof(peer)); + if (ies->refresh) diff --git a/package/asterisk/patches/patch-channels_chan_oss_c b/package/asterisk/patches/patch-channels_chan_oss_c new file mode 100644 index 000000000..33e9aaad7 --- /dev/null +++ b/package/asterisk/patches/patch-channels_chan_oss_c @@ -0,0 +1,37 @@ +--- asterisk-1.4.27.1.orig/channels/chan_oss.c 2009-08-10 21:15:57.000000000 +0200 ++++ asterisk-1.4.27.1/channels/chan_oss.c 2009-12-03 20:58:13.000000000 +0100 +@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p + l = FRAME_SIZE - ofs; + if (l > s->datalen - start) /* don't overflow the source */ + l = s->datalen - start; +- bcopy(s->data + start, myframe + ofs, l * 2); ++ memcpy(myframe + ofs, s->data + start, l * 2); + if (0) + ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs); + l_sampsent += l; +@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p + if (l > 0) { + if (l > FRAME_SIZE - ofs) + l = FRAME_SIZE - ofs; +- bcopy(silence, myframe + ofs, l * 2); ++ memcpy(myframe + ofs, silence, l * 2); + l_sampsent += l; + } else { /* silence is over, restart sound if loop */ + if (s->repeat == 0) { /* last block */ + o->cursound = -1; + o->nosound = 0; /* allow audio data */ + if (ofs < FRAME_SIZE) /* pad with silence */ +- bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2); ++ memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2); + } + l_sampsent = 0; + } +@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct + + /* XXX can be simplified returning &ast_null_frame */ + /* prepare a NULL frame in case we don't have enough data to return */ +- bzero(f, sizeof(struct ast_frame)); ++ memset(f, 0, sizeof(struct ast_frame)); + f->frametype = AST_FRAME_NULL; + f->src = oss_tech.type; + diff --git a/package/asterisk/patches/patch-main_astobj2_c b/package/asterisk/patches/patch-main_astobj2_c new file mode 100644 index 000000000..d8aaf114b --- /dev/null +++ b/package/asterisk/patches/patch-main_astobj2_c @@ -0,0 +1,11 @@ +--- asterisk-1.4.27.1.orig/main/astobj2.c 2009-10-06 03:16:36.000000000 +0200 ++++ asterisk-1.4.27.1/main/astobj2.c 2009-12-03 20:54:12.000000000 +0100 +@@ -236,7 +236,7 @@ int ao2_ref(void *user_data, const int d + /* for safety, zero-out the astobj2 header and also the + * first word of the user-data, which we make sure is always + * allocated. */ +- bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) ); ++ memset(obj, 0, sizeof(struct astobj2 *) + sizeof(void *) ); + free(obj); + } + diff --git a/package/asterisk/patches/patch-main_translate_c b/package/asterisk/patches/patch-main_translate_c new file mode 100644 index 000000000..36d7c3058 --- /dev/null +++ b/package/asterisk/patches/patch-main_translate_c @@ -0,0 +1,11 @@ +--- asterisk-1.4.27.1.orig/main/translate.c 2009-10-21 18:44:49.000000000 +0200 ++++ asterisk-1.4.27.1/main/translate.c 2009-12-03 20:53:36.000000000 +0100 +@@ -442,7 +442,7 @@ static void rebuild_matrix(int samples) + if (option_debug) + ast_log(LOG_DEBUG, "Resetting translation matrix\n"); + +- bzero(tr_matrix, sizeof(tr_matrix)); ++ memset(tr_matrix, 0, sizeof(tr_matrix)); + + /* first, compute all direct costs */ + AST_LIST_TRAVERSE(&translators, t, list) { diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree new file mode 100644 index 000000000..6bac1894d --- /dev/null +++ b/package/asterisk/patches/patch-menuselect-tree @@ -0,0 +1,12 @@ +--- asterisk-1.4.27.1.orig/menuselect-tree 2009-11-30 19:30:41.000000000 +0100 ++++ asterisk-1.4.27.1/menuselect-tree 2009-12-03 20:55:04.000000000 +0100 +@@ -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-res_res_features_c b/package/asterisk/patches/patch-res_res_features_c new file mode 100644 index 000000000..a237fbf97 --- /dev/null +++ b/package/asterisk/patches/patch-res_res_features_c @@ -0,0 +1,11 @@ +--- asterisk-1.4.27.1.orig/res/res_features.c 2009-10-20 19:46:37.000000000 +0200 ++++ asterisk-1.4.27.1/res/res_features.c 2009-12-03 20:53:57.000000000 +0100 +@@ -279,7 +279,7 @@ static void *ast_bridge_call_thread(void + ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig); + ast_hangup(tobj->chan); + ast_hangup(tobj->peer); +- bzero(tobj, sizeof(*tobj)); /*! \todo XXX for safety */ ++ memset(tobj, 0, sizeof(*tobj)); /*! \todo XXX for safety */ + free(tobj); + return NULL; + } diff --git a/package/base-files/extra/init b/package/base-files/extra/init index db8c3a676..e11446366 100755 --- a/package/base-files/extra/init +++ b/package/base-files/extra/init @@ -8,7 +8,7 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys mount none /tmp -t tmpfs -o size=${size}k mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777 } -mount -o nosuid,size=64k,mode=0755 -t tmpfs mdev /dev +mount -o nosuid,size=128k,mode=0755 -t tmpfs mdev /dev mkdir /dev/pts /dev/shm mount -o nosuid,noexec -t devpts devpts /dev/pts exec 0<>/dev/console >&0 2>&0 diff --git a/package/base-files/extra/sbin/update b/package/base-files/extra/sbin/update index 10d6e58c2..0cd4ee713 100755 --- a/package/base-files/extra/sbin/update +++ b/package/base-files/extra/sbin/update @@ -6,9 +6,6 @@ if [ $who -ne 0 ]; then exit 1 fi -cd / -umount -f /etc -mount -o remount,rw / check_exit() { if [ $? -ne 0 ];then @@ -17,17 +14,26 @@ check_exit() { fi } +prepare() { + cd / + umount -f /etc + mount -o remount,rw / +} + extract_from_file() { + prepare cat $1 | gunzip -c | tar -xf - check_exit } extract_from_ssh() { + prepare ssh $1 "cat $2" | gunzip -c | tar -xf - check_exit } extract_from_http() { + prepare wget -O - $1 | gunzip -c | tar -xf - check_exit } diff --git a/package/curl/Makefile b/package/curl/Makefile index a0e27d77c..69768dc63 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.19.6 +PKG_VERSION:= 7.19.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6625de9d42d1b8d3af372d3241a576fd +PKG_MD5SUM:= ecb2e37e45c9933e2a963cabe03670ab PKG_DESCR:= a client-side URL transfer tool PKG_SECTION:= net PKG_URL:= http://curl.haxx.se @@ -28,7 +28,7 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1})) $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t CONFIGURE_ARGS+= --disable-thread \ --enable-cookies \ @@ -50,14 +50,14 @@ CONFIGURE_ARGS+= --disable-thread \ --without-ca-bundle \ --without-gnutls \ --without-libidn -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl ${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/ - ${CP} ${WRKINST}/usr/lib/libcurl.so.* ${IDIR_LIBCURL}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/ ${CP} ${WRKINST}/usr/include/curl/*.h ${IDIR_LIBCURL_DEV}/usr/include/curl/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure index 3cb59e18e..21c0b095d 100644 --- a/package/curl/patches/patch-configure +++ b/package/curl/patches/patch-configure @@ -1,6 +1,6 @@ ---- curl-7.19.6.orig/configure 2009-07-22 22:11:25.000000000 +0200 -+++ curl-7.19.6/configure 2009-10-01 14:05:37.578930054 +0200 -@@ -25479,16 +25479,6 @@ fi +--- curl-7.19.7.orig/configure 2009-11-04 13:26:02.000000000 +0100 ++++ curl-7.19.7/configure 2009-12-03 21:07:01.000000000 +0100 +@@ -19233,15 +19233,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9,11 +9,10 @@ - - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" - export LD_LIBRARY_PATH -- { $as_echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 -$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} - fi - fi -- - fi + fi diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile index f341614d1..5c8cf0fd5 100644 --- a/package/openntpd/Makefile +++ b/package/openntpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openntpd PKG_VERSION:= 3.9p1 -PKG_RELEASE:= 17 +PKG_RELEASE:= 18 PKG_MD5SUM:= afc34175f38d08867c1403d9008600b3 PKG_DESCR:= NTP server daemon PKG_SECTION:= net diff --git a/package/openntpd/files/ntpd.init b/package/openntpd/files/ntpd.init index 42e068860..fd655e9cc 100644 --- a/package/openntpd/files/ntpd.init +++ b/package/openntpd/files/ntpd.init @@ -7,7 +7,7 @@ case $1 in autostop) ;; autostart) - [[ $ntpd_flags = NO ]] && exit 0 + test x"${ntpd:-NO}" = x"NO" && exit 0 exec sh $0 start ;; start) @@ -15,7 +15,7 @@ start) /usr/sbin/ntpd $ntpd_flags ;; stop) - kill $(pidof ntpd|cut -d ' ' -f 3) + pkill ntpd ;; restart) sh $0 stop diff --git a/package/openntpd/files/openntpd.postinst b/package/openntpd/files/openntpd.postinst index 53bc8c387..c6d0bd33d 100644 --- a/package/openntpd/files/openntpd.postinst +++ b/package/openntpd/files/openntpd.postinst @@ -4,4 +4,5 @@ gid=$(get_next_gid) add_group ntp $gid add_user ntp $(get_next_uid) $gid /tmp/.ntp add_service ntp 123/udp -add_rcconf 'e.g. "-s"' ntpd_flags +add_rcconf ntpd_flags ntpd_flags "-s" +add_rcconf ntpd ntpd NO diff --git a/package/radvd/Makefile b/package/radvd/Makefile index e2d7ab460..6c3662b71 100644 --- a/package/radvd/Makefile +++ b/package/radvd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= radvd -PKG_VERSION:= 1.2 +PKG_VERSION:= 1.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 614876420d76cd2bb5bcb49760c8b9e3 +PKG_MD5SUM:= 78598b60ed9d64920739189c3dc0934d PKG_DESCR:= Routing Advertisement Daemon for IPv6 PKG_SECTION:= net PKG_DEPENDS:= kmod-ipv6 diff --git a/package/rpm/Makefile b/package/rpm/Makefile index c7cf91c97..8526288be 100644 --- a/package/rpm/Makefile +++ b/package/rpm/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= rpm -PKG_VERSION:= 4.7.0 +PKG_VERSION:= 4.7.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 74791d638c571ec79f06227d453a6a03 -PKG_DESCR:= GNU rpm +PKG_MD5SUM:= 224715646325df4cd3904e3ac9e16186 +PKG_DESCR:= Package Manager PKG_SECTION:= base PKG_URL:= http://www.rpm.org PKG_SITES:= http://rpm.org/releases/rpm-4.7.x/ diff --git a/package/strace/Makefile b/package/strace/Makefile index 0eda1d6c9..44f56502a 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= strace -PKG_VERSION:= 4.5.18 +PKG_VERSION:= 4.5.19 PKG_RELEASE:= 1 -PKG_MD5SUM:= e9449fcee97e6a8ed73934c883c870e0 +PKG_MD5SUM:= 2415e435d61e40315a298c80aced0cda PKG_DESCR:= System call trace program PKG_SECTION:= misc PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/} diff --git a/package/strace/patches/patch-config_h_in b/package/strace/patches/patch-config_h_in deleted file mode 100644 index ea06ade61..000000000 --- a/package/strace/patches/patch-config_h_in +++ /dev/null @@ -1,15 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- strace-4.5.18.orig/config.h.in 2008-08-28 23:36:28.000000000 +0200 -+++ strace-4.5.18/config.h.in 2009-01-02 21:24:05.414089778 +0100 -@@ -409,6 +409,11 @@ - /* Define for the AMD x86-64 architecture. */ - #undef X86_64 - -+/* Define for the CRISv10 architecture. */ -+#undef CRISV10 -+ -+/* Define for the CRISv32 architecture. */ -+#undef CRISV32 - /* Enable GNU extensions on systems that have them. */ - #ifndef _GNU_SOURCE - # undef _GNU_SOURCE diff --git a/package/strace/patches/patch-configure b/package/strace/patches/patch-configure deleted file mode 100644 index eadd57304..000000000 --- a/package/strace/patches/patch-configure +++ /dev/null @@ -1,26 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- strace-4.5.18.orig/configure 2008-08-28 23:36:06.000000000 +0200 -+++ strace-4.5.18/configure 2009-01-02 21:26:59.664979346 +0100 -@@ -2531,6 +2531,22 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - ;; -+cris|crisv10) -+ arch=crisv10 -+ -+cat >>confdefs.h <<\_ACEOF -+ |