update some packages to latest upstream

- openssh, aircrack-ng, autoconf, lighttpd
- use mplayer svn version

39 files changed, 209 insertions, 589 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 34ae7935a..df4add94e 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -15,6 +15,8 @@ DEFCONFIG= 		ADK_DEVELSYSTEM=n \
 			ADK_STATIC=n \
 			ADK_FORCE_PARALLEL=n \
 			BUSYBOX_SELINUX=n \
+			BUSYBOX_EJECT=n \
+			BUSYBOX_BUILD_LIBBUSYBOX=n \
 			BUSYBOX_LOCALE_SUPPORT=n \
 			BUSYBOX_FEATURE_PREFER_APPLETS=n \
 			BUSYBOX_FEATURE_SUID=n \
diff --git a/mk/modules.mk b/mk/modules.mk
index cbaaca78f..92156e596 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -54,6 +54,7 @@ $(eval $(call KMOD_template,MAC80211,mac80211,\
 ,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb kmod-crc32))
 
 $(eval $(call KMOD_template,ATH5K,mac80211-ath5k,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath \
 	$(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \
 ,20, kmod-led-class))
 
@@ -639,6 +640,7 @@ $(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-hw-geode,\
 ,10))
 
 $(eval $(call KMOD_template,CRYPTO_ALGAPI,crypto-algapi,\
+    $(MODULES_DIR)/kernel/crypto/pcompress \
     $(MODULES_DIR)/kernel/crypto/crypto_algapi \
 ,02))
 
@@ -661,7 +663,6 @@ $(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng,\
 ,06))
 
 $(eval $(call KMOD_template,CRYPTO_MANAGER,crypto-manager,\
-    $(MODULES_DIR)/kernel/crypto/pcompress \
     $(MODULES_DIR)/kernel/crypto/cryptomgr \
     $(MODULES_DIR)/kernel/crypto/eseqiv \
     $(MODULES_DIR)/kernel/crypto/chainiv \
@@ -773,6 +774,7 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
 ,11))
 
 $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
+    $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \
     $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \
     $(MODULES_DIR)/kernel/crypto/deflate \
 ,10))
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index ef075eedd..bbfc8e498 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		aircrack-ng
-PKG_VERSION:=		1.0-rc3
+PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		37884de939af82eab60d3e7d165b40ad
+PKG_MD5SUM:=		dafbfaf944ca9d523fde4bae86f0c067
 PKG_DESCR:=		set of tools for auditing wireless networks
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpthread libopenssl libpcap
@@ -15,10 +15,10 @@ PKG_SITES:=		http://download.aircrack-ng.org/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,AIRCRACK_NG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=	auto
-INSTALL_STYLE=	auto
+BUILD_STYLE:=	auto
+INSTALL_STYLE:=	auto
 XAKE_FLAGS+=	CC="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS) -Wall" \
 		CROSS="$(TARGET_CROSS)" OSNAME="Linux" \
diff --git a/package/aircrack-ng/patches/patch-src_airbase-ng_c b/package/aircrack-ng/patches/patch-src_airbase-ng_c
deleted file mode 100644
index 87aa03985..000000000
--- a/package/aircrack-ng/patches/patch-src_airbase-ng_c
+++ /dev/null
@@ -1,189 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- aircrack-ng-1.0-rc3.orig/src/airbase-ng.c	2009-03-26 22:01:02.000000000 +0100
-+++ aircrack-ng-1.0-rc3/src/airbase-ng.c	2009-05-01 15:54:30.000000000 +0200
-@@ -627,7 +627,7 @@ int addFrag(unsigned char* packet, unsig
-     if(rFragment == NULL)
-         return -1;
- 
--    bzero(frame, 4096);
-+    memset(frame, 0, 4096);
-     memcpy(frame, packet, len);
- 
-     z = ( ( frame[1] & 3 ) != 3 ) ? 24 : 30;
-@@ -1683,7 +1683,7 @@ int intercept(uchar* packet, int length)
-     uchar K[128];
-     int z=0;
- 
--    bzero(buf, 4096);
-+    memset(buf, 0, 4096);
- 
-     z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
- 
-@@ -1784,7 +1784,7 @@ int packet_xmit(uchar* packet, int lengt
- 
-         if((opt.external & EXT_OUT))
-         {
--            bzero(buf, 4096);
-+            memset(buf, 0, 4096);
-             memcpy(buf+14, h80211, length2);
-             //mark it as outgoing packet
-             buf[12] = 0xFF;
-@@ -1823,7 +1823,7 @@ int packet_xmit_external(uchar* packet, 
-     if(length < 40 || length > 3000)
-         return 1;
- 
--    bzero(buf, 4096);
-+    memset(buf, 0, 4096);
-     if(memcmp(packet, buf, 11) != 0)
-     {
- //         printf("wrong header...\n");
-@@ -2099,13 +2099,13 @@ int addCF(uchar* packet, int length)
-     if(opt.cf_count >= 100)
-         return 1;
- 
--    bzero(clear, 4096);
--    bzero(final, 4096);
--    bzero(flip, 4096);
--    bzero(frag1, 128);
--    bzero(frag2, 128);
--    bzero(frag3, 128);
--    bzero(keystream, 128);
-+    memset(clear, 0, 4096);
-+    memset(final, 0, 4096);
-+    memset(flip, 0, 4096);
-+    memset(frag1, 0, 128);
-+    memset(frag2, 0, 128);
-+    memset(frag3, 0, 128);
-+    memset(keystream, 0, 128);
- 
-     switch( packet[1] & 3 )
-     {
-@@ -2364,7 +2364,7 @@ int addarp(uchar* packet, int length)
-     if(opt.nb_arp >= opt.ringbuffer)
-         return -1;
- 
--    bzero(flip, 4096);
-+    memset(flip, 0, 4096);
- 
-     flip[49-z-4] ^= ((rand() % 255)+1); //flip random bits in last byte of sender MAC
-     flip[53-z-4] ^= ((rand() % 255)+1); //flip random bits in last byte of sender IP
-@@ -2519,7 +2519,7 @@ int packet_recv(uchar* packet, int lengt
-     struct ST_info *st_prv = NULL;
- 
- 	reasso = 0; fixed = 0;
--    bzero(essid, 256);
-+    memset(essid, 0, 256);
- 
-     pthread_mutex_lock( &mx_cap );
-     if(opt.record_data)
-@@ -2643,7 +2643,7 @@ int packet_recv(uchar* packet, int lengt
-             st_cur->ssid_length[i] = 0;
-         }
- 
--        bzero(st_cur->essid, 256);
-+        memset(st_cur->essid, 0, 256);
-         st_cur->essid_length = 0;
- 
-         st_cur->wpatype = 0;
-@@ -2769,7 +2769,7 @@ int packet_recv(uchar* packet, int lengt
-                     len += 8;
- 
-                     //eapol
--                    bzero(h80211+len, 99);
-+                    memset(h80211+len, 0, 99);
-                     h80211[len]    = 0x01;//version
-                     h80211[len+1]  = 0x03;//type
-                     h80211[len+2]  = 0x00;
-@@ -2818,7 +2818,7 @@ int packet_recv(uchar* packet, int lengt
-                     h80211[len+7] = 0x00;
-                     h80211[len+8] = 0x20; //keylen
- 
--                    bzero(h80211+len+9, 90);
-+                    memset(h80211+len+9, 0, 90);
-                     memcpy(h80211+len+17, st_cur->wpa.anonce, 32);
- 
-                     len+=99;
-@@ -2944,7 +2944,7 @@ int packet_recv(uchar* packet, int lengt
-         if(length < 60)
-         {
-             trailer = 60 - length;
--            bzero(h80211 + length, trailer);
-+            memset(h80211 + length, 0, trailer);
-             length += trailer;
-         }
- 
-@@ -2961,7 +2961,7 @@ int packet_recv(uchar* packet, int lengt
-             {
-                 if( opt.promiscuous || !opt.f_essid || gotESSID((char*)tag, len) == 1)
-                 {
--                    bzero(essid, 256);
-+                    memset(essid, 0, 256);
-                     memcpy(essid, tag, len);
- 
-                     /* store probes */
-@@ -3355,11 +3355,11 @@ skip_probe:
-                 printf("\n");
-             }
- 
--            bzero(st_cur->essid, 256);
-+            memset(st_cur->essid, 0, 256);
-             memcpy(st_cur->essid, essid, 255);
-             st_cur->essid_length = strlen(essid);
- 
--            bzero(essid, 256);
-+            memset(essid, 0, 256);
- 
-             /* either specified or determined */
-             if( (opt.sendeapol && ( opt.wpa1type || opt.wpa2type ) ) || (st_cur->wpatype && st_cur->wpahash) )
-@@ -3391,7 +3391,7 @@ skip_probe:
-                 len += 8;
- 
-                 //eapol
--                bzero(h80211+len, 99);
-+                memset(h80211+len, 0, 99);
-                 h80211[len]    = 0x01;//version
-                 h80211[len+1]  = 0x03;//type
-                 h80211[len+2]  = 0x00;
-@@ -3440,7 +3440,7 @@ skip_probe:
-                 h80211[len+7] = 0x00;
-                 h80211[len+8] = 0x20; //keylen
- 
--                bzero(h80211+len+9, 90);
-+                memset(h80211+len+9, 0, 90);
-                 memcpy(h80211+len+17, st_cur->wpa.anonce, 32);
- 
-                 len+=99;
-@@ -3729,7 +3729,7 @@ int cfrag_fuzz(unsigned char *packet, in
-     else
-         smac = packet + 24;
- 
--    bzero(overlay, 4096);
-+    memset(overlay, 0, 4096);
- 
-     smac[4] ^= rnd[0];
-     smac[5] ^= rnd[1];
-@@ -3902,19 +3902,19 @@ int main( int argc, char *argv[] )
-     memset( &apc, 0, sizeof( struct AP_conf ));
- 
-     rESSID = (pESSID_t) malloc(sizeof(struct ESSID_list));
--    bzero(rESSID, sizeof(struct ESSID_list));
-+    memset(rESSID, 0, sizeof(struct ESSID_list));
- 
-     rFragment = (pFrag_t) malloc(sizeof(struct Fragment_list));
--    bzero(rFragment, sizeof(struct Fragment_list));
-+    memset(rFragment, 0, sizeof(struct Fragment_list));
- 
-     rClient = (pMAC_t) malloc(sizeof(struct MAC_list));
--    bzero(rClient, sizeof(struct MAC_list));
-+    memset(rClient, 0, sizeof(struct MAC_list));
- 
-     rBSSID = (pMAC_t) malloc(sizeof(struct MAC_list));
--    bzero(rBSSID, sizeof(struct MAC_list));
-+    memset(rBSSID, 0, sizeof(struct MAC_list));
- 
-     rCF = (pCF_t) malloc(sizeof(struct CF_packet));
--    bzero(rCF, sizeof(struct CF_packet));
-+    memset(rCF, 0, sizeof(struct CF_packet));
- 
-     pthread_mutex_init( &mx_cf, NULL );
-     pthread_mutex_init( &mx_cap, NULL );
diff --git a/package/aircrack-ng/patches/patch-src_aircrack-ng_c b/package/aircrack-ng/patches/patch-src_aircrack-ng_c
deleted file mode 100644
index a852fd762..000000000
--- a/package/aircrack-ng/patches/patch-src_aircrack-ng_c
+++ /dev/null
@@ -1,41 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- aircrack-ng-1.0-rc3.orig/src/aircrack-ng.c	2009-03-26 22:01:02.000000000 +0100
-+++ aircrack-ng-1.0-rc3/src/aircrack-ng.c	2009-05-01 15:53:30.000000000 +0200
-@@ -245,7 +245,7 @@ void clean_exit(int ret)
- 	int child_pid;
- 
- 	char tmpbuf[128];
--	bzero(tmpbuf, 128);
-+	memset(tmpbuf, 0, 128);
- 
- 	if(ret && !opt.is_quiet)
- 	{
-@@ -738,7 +738,7 @@ void read_thread( void *arg )
- 	memset( &rb, 0, sizeof( rb ) );
- 	ap_cur = NULL;
- 
--	bzero(&pfh, sizeof(struct pcap_file_header));
-+	memset(&pfh, 0, sizeof(struct pcap_file_header));
- 
- 	if( ( buffer = (uchar *) malloc( 65536 ) ) == NULL )
- 	{
-@@ -1401,8 +1401,8 @@ void read_thread( void *arg )
-                                     dlen -=6;
-                                 }
- 
--				bzero(weight, sizeof(weight));
--				bzero(clear, sizeof(clear));
-+				memset(weight, 0, sizeof(weight));
-+				memset(clear, 0, sizeof(clear));
- 
- 				/* calculate keystream */
- 				k = known_clear(clear, &clearsize, weight, h80211, dlen);
-@@ -4525,7 +4525,7 @@ int main( int argc, char *argv[] )
- 
- 	/*
- 	all_ivs = malloc( (256*256*256) * sizeof(used_iv));
--	bzero(all_ivs, (256*256*256)*sizeof(used_iv));
-+	memset(all_ivs, 0, (256*256*256)*sizeof(used_iv));
- 	*/
- 
- 	forceptw = 0;
diff --git a/package/aircrack-ng/patches/patch-src_aircrack-ptw-lib_c b/package/aircrack-ng/patches/patch-src_aircrack-ptw-lib_c
deleted file mode 100644
index a6f2505af..000000000
--- a/package/aircrack-ng/patches/patch-src_aircrack-ptw-lib_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- aircrack-ng-1.0-rc3.orig/src/aircrack-ptw-lib.c	2009-03-26 22:01:02.000000000 +0100
-+++ aircrack-ng-1.0-rc3/src/aircrack-ptw-lib.c	2009-05-01 15:52:04.000000000 +0200
-@@ -454,7 +454,7 @@ int PTW_computeKey(PTW_attackstate * sta
- 	{
- 		// Try the original klein attack first
- 		for (i = 0; i < keylen; i++) {
--			bzero(&table[i][0], sizeof(PTW_tableentry) * n);
-+			memset(&table[i][0], 0, sizeof(PTW_tableentry) * n);
- 			for (j = 0; j < n; j++) {
- 				table[i][j].b = j;
- 			}
-@@ -602,7 +602,7 @@ PTW_attackstate * PTW_newattackstate() {
- 	if (state == NULL) {
- 		return NULL;
- 	}
--	bzero(state, sizeof(PTW_attackstate));
-+	memset(state, 0, sizeof(PTW_attackstate));
- 	for (i = 0; i < PTW_KEYHSBYTES; i++) {
-                 for (k = 0; k < n; k++) {
-                         state->table[i][k].b = k;
diff --git a/package/aircrack-ng/patches/patch-src_aireplay-ng_c b/package/aircrack-ng/patches/patch-src_aireplay-ng_c
deleted file mode 100644
index 66a92b0cc..000000000
--- a/package/aircrack-ng/patches/patch-src_aireplay-ng_c
+++ /dev/null
@@ -1,42 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- aircrack-ng-1.0-rc3.orig/src/aireplay-ng.c	2009-03-26 22:01:02.000000000 +0100
-+++ aircrack-ng-1.0-rc3/src/aireplay-ng.c	2009-05-01 15:52:04.000000000 +0200
-@@ -2908,7 +2908,7 @@ add_arp:
-                     return( 1 );
-                 }
- 
--                bzero(flip, 4096);
-+                memset(flip, 0, 4096);
- 
- //                 flip[49-24-4] ^= ((rand() % 255)+1); //flip random bits in last byte of sender MAC
- //                 flip[53-24-4] ^= ((rand() % 255)+1); //flip random bits in last byte of sender IP
-@@ -3086,13 +3086,13 @@ read_packets:
-             break;
-     }
- 
--    bzero(clear, 4096);
--    bzero(final, 4096);
--    bzero(flip, 4096);
--    bzero(frag1, 128);
--    bzero(frag2, 128);
--    bzero(frag3, 128);
--    bzero(keystream, 128);
-+    memset(clear, 0, 4096);
-+    memset(final, 0, 4096);
-+    memset(flip, 0, 4096);
-+    memset(frag1, 0, 128);
-+    memset(frag2, 0, 128);
-+    memset(frag3, 0, 128);
-+    memset(keystream, 0, 128);
- 
-     /* check if it's a potential ARP request */
- 
-@@ -3378,7 +3378,7 @@ int do_attack_chopchop( void )
-     if( opt.r_smac_set == 1 )
-     {
-         //handle picky APs (send one valid packet before all the invalid ones)
--        bzero(packet, sizeof(packet));
-+        memset(packet, 0, sizeof(packet));
- 
-         memcpy( packet, NULL_DATA, 24 );
-         memcpy( packet +  4, "\xFF\xFF\xFF\xFF\xFF\xFF", 6 );
diff --git a/package/aircrack-ng/patches/patch-src_airodump-ng_c b/package/aircrack-ng/patches/patch-src_airodump-ng_c
deleted file mode 100644
index 989f0274d..000000000
--- a/package/aircrack-ng/patches/patch-src_airodump-ng_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- aircrack-ng-1.0-rc3.orig/src/airodump-ng.c	2009-03-26 22:01:02.000000000 +0100
-+++ aircrack-ng-1.0-rc3/src/airodump-ng.c	2009-05-01 15:52:04.000000000 +0200
-@@ -4325,7 +4325,7 @@ int detect_frequencies(struct wif *wi)
-     printf("Checking available frequencies, this could take few seconds.\n");
- 
-     frequencies = (int*) malloc((max_freq_num+1) * sizeof(int)); //field for frequencies supported
--    bzero(frequencies, (max_freq_num+1) * sizeof(int));
-+    memset(frequencies, 0, (max_freq_num+1) * sizeof(int));
-     for(freq=start_freq; freq<=end_freq; freq+=5)
-     {
-         if(wi_set_freq(wi, freq) == 0)
-@@ -4388,7 +4388,7 @@ int rearrange_frequencies()
-     pos = 0;
- 
-     freqs = malloc(sizeof(int) * (count + 1));
--    bzero(freqs, sizeof(int) * (count + 1));
-+    memset(freqs, 0, sizeof(int) * (count + 1));
-     round_done = 0;
- 
-     while(left > 0)
diff --git a/package/aircrack-ng/patches/patch-src_airtun-ng_c b/package/aircrack-ng/patches/patch-src_airtun-ng_c
deleted file mode 100644
index 4723eaf1a..000000000
--- a/package/aircrack-ng/patches/patch-src_airtun-ng_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- aircrack-ng-1.0-rc3.orig/src/airtun-ng.c	2009-03-26 22:01:02.000000000 +0100
-+++ aircrack-ng-1.0-rc3/src/airtun-ng.c	2009-05-01 15:52:04.000000000 +0200
-@@ -222,7 +222,7 @@ int addFrag(unsigned char* packet, unsig
-     if(rFragment == NULL)
-         return -1;
- 
--    bzero(frame, 4096);
-+    memset(frame, 0, 4096);
-     memcpy(frame, packet, len);
- 
-     z = ( ( frame[1] & 3 ) != 3 ) ? 24 : 30;
-@@ -1029,7 +1029,7 @@ int main( int argc, char *argv[] )
-     memset( &dev, 0, sizeof( dev ) );
- 
-     rFragment = (pFrag_t) malloc(sizeof(struct Fragment_list));
--    bzero(rFragment, sizeof(struct Fragment_list));
-+    memset(rFragment, 0, sizeof(struct Fragment_list));
- 
-     opt.r_nbpps = 100;
-     opt.tods    = 0;
diff --git a/package/aircrack-ng/patches/patch-src_osdep_linux_c b/package/aircrack-ng/patches/patch-src_osdep_linux_c
deleted file mode 100644
index 691af6d9f..000000000
--- a/package/aircrack-ng/patches/patch-src_osdep_linux_c
+++ /dev/null
@@ -1,17 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- aircrack-ng-1.0-rc3.orig/src/osdep/linux.c	2009-03-26 22:01:02.000000000 +0100
-+++ aircrack-ng-1.0-rc3/src/osdep/linux.c	2009-05-01 15:52:04.000000000 +0200
-@@ -1639,11 +1639,11 @@ static int do_linux_open(struct wif *wi,
- 
-         //use name in buf as new iface and set original iface as main iface
-         dev->main_if = (char*) malloc(strlen(iface)+1);
--        bzero(dev->main_if, strlen(iface)+1);
-+        memset(dev->main_if, 0, strlen(iface)+1);
-         strncpy(dev->main_if, iface, strlen(iface));
- 
-         iface=(char*)malloc(strlen(buf)+1);
--        bzero(iface, strlen(buf)+1);
-+        memset(iface, 0, strlen(buf)+1);
-         strncpy(iface, buf, strlen(buf));
-     }
- 
diff --git a/package/aircrack-ng/patches/patch-src_version_h b/package/aircrack-ng/patches/patch-src_version_h
index fca57354b..6cd968cc6 100644
--- a/package/aircrack-ng/patches/patch-src_version_h
+++ b/package/aircrack-ng/patches/patch-src_version_h
@@ -1,11 +1,9 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- aircrack-ng-1.0-rc3.orig/src/version.h	2009-03-26 22:01:02.000000000 +0100
-+++ aircrack-ng-1.0-rc3/src/version.h	2009-05-01 15:56:37.000000000 +0200
-@@ -1,6 +1,7 @@
- #define _MAJ 1
+--- aircrack-ng-1.0.orig/src/version.h	2009-09-01 11:30:48.000000000 +0200
++++ aircrack-ng-1.0/src/version.h	2009-12-04 22:53:25.000000000 +0100
+@@ -2,5 +2,6 @@
  #define _MIN 0
  #define _SUB_MIN 0
-+#define _REVISION 1
  #define _BETA 0
- #define _RC 3
++#define _REVISION 1
+ #define _RC 0
  #define WEBSITE "http://www.aircrack-ng.org"
diff --git a/package/atk/Makefile b/package/atk/Makefile
index f7dd38010..3f42dc2ea 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -26,6 +26,6 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ATK}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libatk.so* ${IDIR_ATK}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libatk-*.so* ${IDIR_ATK}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index 6e4abf3d6..b03662330 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		autoconf
-PKG_VERSION:=		2.64
+PKG_VERSION:=		2.65
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		30a198cef839471dd4926e92ab485361
+PKG_MD5SUM:=		46cfb40e0babf4c64f8325f03da81c9b
 PKG_DESCR:=		GNU autoconf
 PKG_SECTION:=		utils
 PKG_URL:=		http://www.gnu.org/software/autoconf/
diff --git a/package/automake/Makefile b/package/automake/Makefile
index 3c999c5cf..3f5bd4b85 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -4,12 +4,12 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		automake
-PKG_VERSION:=		1.9.6
+PKG_VERSION:=		1.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c60f77a42f103606981d456f1615f5b4
+PKG_MD5SUM:=		452163c32d061c53a7acc0e8c1b689ba
 PKG_DESCR:=		GNU automake
 PKG_SECTION:=		utils
-PKG_URL:=		http://www.gnu.org/software/${PKG_NAME}/
+PKG_URL:=		http://www.gnu.org/software/automake/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 PKG_OPTS:=		noscripts
 
diff --git a/package/fontconfig/patches/patch-fc-lang_Makefile_in b/package/fontconfig/patches/patch-fc-lang_Makefile_in
index baa990c83..da9bc5435 100644
--- a/package/fontconfig/patches/patch-fc-lang_Makefile_in
+++ b/package/fontconfig/patches/patch-fc-lang_Makefile_in
@@ -1,5 +1,5 @@
 --- fontconfig-2.8.0.orig/fc-lang/Makefile.in	2009-11-19 00:49:38.000000000 +0100
-+++ fontconfig-2.8.0/fc-lang/Makefile.in	2009-12-04 20:04:44.333036155 +0100
++++ fontconfig-2.8.0/fc-lang/Makefile.in	2009-12-04 21:43:12.000000000 +0100
 @@ -85,14 +85,14 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  AM_V_CC = $(am__v_CC_$(V))
@@ -30,3 +30,12 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
+@@ -154,7 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = 
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/package/git/Makefile b/package/git/Makefile
index e02c9e669..a4a34d363 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.6.4.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		d7732d13a227d89f05122d230c5c8048
+PKG_VERSION:=		1.6.5.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0b3062212857b5778113aa2d4dfd65e2
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		openssl curl
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 09765990a..d4e3b19e9 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -21,7 +21,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,GTK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		gio_can_sniff=no
+CONFIGURE_ENV+=		gio_can_sniff=no \
+			ac_cv_path_GTK_UPDATE_ICON_CACHE="" 
 CONFIGURE_ARGS+=	--without-libtiff \
 			--without-libjpeg
 BUILD_STYLE:=		auto
@@ -29,5 +30,6 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GTK}/usr/lib
+	${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_GTK}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in
new file mode 100644
index 000000000..02ebabfca
--- /dev/null
+++ b/package/gtk+/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- gtk+-2.18.3.orig/Makefile.in	2009-10-17 03:53:04.000000000 +0200
++++ gtk+-2.18.3/Makefile.in	2009-12-04 22:04:14.000000000 +0100
+@@ -464,7 +464,7 @@ XVFB_START = \
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4
diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c
new file mode 100644
index 000000000..a5ed911a2
--- /dev/null
+++ b/package/gtk+/patches/patch-gtk_gtktypefuncs_c
@@ -0,0 +1,70 @@
+--- gtk+-2.18.3.orig/gtk/gtktypefuncs.c	2009-10-17 03:58:56.000000000 +0200
++++ gtk+-2.18.3/gtk/gtktypefuncs.c	2009-12-04 21:57:40.000000000 +0100
+@@ -53,8 +53,8 @@
+ *tp++ = gdk_pixbuf_simple_anim_get_type();
+ *tp++ = gdk_pixbuf_simple_anim_iter_get_type();
+ *tp++ = gdk_pixmap_get_type();
+-*tp++ = gdk_property_state_get_type();
+ *tp++ = gdk_prop_mode_get_type();
++*tp++ = gdk_property_state_get_type();
+ *tp++ = gdk_rectangle_get_type();
+ *tp++ = gdk_rgb_dither_get_type();
+ *tp++ = gdk_screen_get_type();
+@@ -191,14 +191,14 @@
+ *tp++ = gtk_icon_view_drop_position_get_type();
+ *tp++ = gtk_icon_view_get_type();
+ *tp++ = gtk_identifier_get_type();
+-*tp++ = gtk_image_get_type();
+-*tp++ = gtk_image_menu_item_get_type();
+-*tp++ = gtk_image_type_get_type();
+ *tp++ = gtk_im_context_get_type();
+ *tp++ = gtk_im_context_simple_get_type();
+ *tp++ = gtk_im_multicontext_get_type();
+ *tp++ = gtk_im_preedit_style_get_type();
+ *tp++ = gtk_im_status_style_get_type();
++*tp++ = gtk_image_get_type();
++*tp++ = gtk_image_menu_item_get_type();
++*tp++ = gtk_image_type_get_type();
+ *tp++ = gtk_info_bar_get_type();
+ *tp++ = gtk_input_dialog_get_type();
+ *tp++ = gtk_invisible_get_type();
+@@ -283,10 +283,10 @@
+ *tp++ = gtk_ruler_get_type();
+ *tp++ = gtk_scale_button_get_type();
+ *tp++ = gtk_scale_get_type();
+-*tp++ = gtk_scrollbar_get_type();
+-*tp++ = gtk_scrolled_window_get_type();
+ *tp++ = gtk_scroll_step_get_type();
+ *tp++ = gtk_scroll_type_get_type();
++*tp++ = gtk_scrollbar_get_type();
++*tp++ = gtk_scrolled_window_get_type();
+ *tp++ = gtk_selection_data_get_type();
+ *tp++ = gtk_selection_mode_get_type();
+ *tp++ = gtk_sensitivity_type_get_type();
+@@ -305,8 +305,8 @@
+ *tp++ = gtk_spin_button_update_policy_get_type();
+ *tp++ = gtk_spin_type_get_type();
+ *tp++ = gtk_state_type_get_type();
+-*tp++ = gtk_statusbar_get_type();
+ *tp++ = gtk_status_icon_get_type();
++*tp++ = gtk_statusbar_get_type();
+ *tp++ = gtk_style_get_type();
+ *tp++ = gtk_submenu_direction_get_type();
+ *tp++ = gtk_submenu_placement_get_type();
+@@ -330,13 +330,13 @@
+ *tp++ = gtk_toggle_action_get_type();
+ *tp++ = gtk_toggle_button_get_type();
+ *tp++ = gtk_toggle_tool_button_get_type();
++*tp++ = gtk_tool_button_get_type();
++*tp++ = gtk_tool_item_get_type();
++*tp++ = gtk_tool_shell_get_type();
+ *tp++ = gtk_toolbar_child_type_get_type();
+ *tp++ = gtk_t