diff options
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_toolbar_get_type(); + *tp++ = gtk_toolbar_space_style_get_type(); + *tp++ = gtk_toolbar_style_get_type(); +-*tp++ = gtk_tool_button_get_type(); +-*tp++ = gtk_tool_item_get_type(); +-*tp++ = gtk_tool_shell_get_type(); + *tp++ = gtk_tooltip_get_type(); + *tp++ = gtk_tree_drag_dest_get_type(); + *tp++ = gtk_tree_drag_source_get_type(); diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile index 8377f6245..c2badb0fd 100644 --- a/package/libXrender/Makefile +++ b/package/libXrender/Makefile @@ -25,7 +25,7 @@ BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXrender.so* ${IDIR_LIBXAU}/usr/lib/ + ${INSTALL_DIR} ${IDIR_LIBXRENDER}/usr/lib + ${CP} ${WRKINST}/usr/lib/libXrender.so* ${IDIR_LIBXRENDER}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 69d8e8432..b20841a24 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -4,14 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= lighttpd -PKG_VERSION:= 1.4.22 +PKG_VERSION:= 1.4.25 PKG_RELEASE:= 1 -PKG_MD5SUM:= 949c33a81e83f7718a47280bef21b90c +PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704 PKG_DESCR:= a flexible and lightweight web server PKG_SECTION:= net PKG_DEPENDS:= libxml2 libsqlite libpcre PKG_URL:= http://www.lighttpd.net -PKG_SITES:= http://www.lighttpd.net/download/ +PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ include $(TOPDIR)/mk/package.mk @@ -65,7 +65,7 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav)) TCPPFLAGS+= -I$(STAGING_DIR)/usr/include/libxml2 -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= PCRE_LIB="-lpcre" CONFIGURE_ARGS+= --without-openssl \ --libdir=/usr/lib/lighttpd \ @@ -81,8 +81,8 @@ CONFIGURE_ARGS+= --without-openssl \ --with-pcre \ --without-valgrind \ --with-webdav-props -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-openssl='${STAGING_DIR}/usr' endif diff --git a/package/lighttpd/patches/500-configure_cross.patch b/package/lighttpd/patches/500-configure_cross.patch deleted file mode 100644 index 8f8099823..000000000 --- a/package/lighttpd/patches/500-configure_cross.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN lighttpd-1.4.2-old/configure lighttpd-1.4.2-new/configure ---- lighttpd-1.4.2-old/configure 2005-08-29 14:18:11.000000000 +0200 -+++ lighttpd-1.4.2-new/configure 2005-09-01 09:06:29.000000000 +0200 -@@ -23849,7 +23849,7 @@ - echo "$as_me:$LINENO: result: $WITH_PCRE" >&5 - echo "${ECHO_T}$WITH_PCRE" >&6 - --if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then -+if test "$WITH_PCRE" != "no"; then - # Extract the first word of "pcre-config", so it can be a program name with args. - set dummy pcre-config; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 -diff -ruN lighttpd-1.4.2-old/configure.in lighttpd-1.4.2-new/configure.in ---- lighttpd-1.4.2-old/configure.in 2005-08-29 14:06:03.000000000 +0200 -+++ lighttpd-1.4.2-new/configure.in 2005-09-01 09:05:39.000000000 +0200 -@@ -222,7 +222,7 @@ - [WITH_PCRE=$withval],[WITH_PCRE=yes]) - AC_MSG_RESULT([$WITH_PCRE]) - --if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then -+if test "$WITH_PCRE" != "no"; then - AC_PATH_PROG(PCRECONFIG, pcre-config) - - if test x"$PCRECONFIG" != x; then diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 0c330a792..5ad3cc1f5 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,17 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer -PKG_VERSION:= 1.0rc2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 7e27e535c2d267637df34898f1b91707 +PKG_VERSION:= 1.0-29973 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a2fd085d18fc92c70389e7b4d2b6ad43 PKG_DESCR:= popular video player PKG_SECTION:= video PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg PKG_URL:= http://www.mplayerhq.hu -PKG_SITES:= http://www7.mplayerhq.hu/MPlayer/releases/ +PKG_SITES:= http://openadk.org/distfiles/ -DISTFILES:= MPlayer-${PKG_VERSION}.tar.bz2 -WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION} +#DISTFILES:= MPlayer-${PKG_VERSION}.tar.bz2 +#WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION} include ${TOPDIR}/mk/package.mk @@ -23,12 +23,6 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P BUILD_STYLE:= auto INSTALL_STYLE:= auto -ifeq ($(ADK_X11),y) -CONFIGURE_ARG:= --enable-x11 -else -CONFIGURE_ARG:= --disable-x11 -endif - ifeq (${ADK_LINUX_X86_ALIX1C},y) CONFIGURE_CPU_OPTS:= \ --disable-ssse3 \ @@ -52,21 +46,19 @@ endif pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ ./configure \ + --enable-x11 \ --prefix=/usr \ --confdir=/etc \ --enable-cross-compile \ --target=$(REAL_GNU_TARGET_NAME) \ --cc=$(TARGET_CC) \ --host-cc=$(HOSTCC) \ - --with-extraincdir=$(STAGING_DIR)/usr/include \ - --with-extralibdir=$(STAGING_DIR)/usr/lib \ --disable-mencoder \ --enable-fbdev \ --enable-alsa \ --enable-png \ --enable-jpeg \ --enable-mad \ - --enable-faad-external \ --disable-faad-internal \ --enable-libvorbis \ --disable-ossaudio \ @@ -81,14 +73,12 @@ pre-configure: --disable-ftp \ --disable-v4l2 \ --disable-ivtv \ - --disable-vidix-internal \ --disable-dvdread-internal \ --disable-libdvdcss-internal \ --disable-freetype \ --disable-tremor-internal \ --disable-arts \ --disable-esd \ - --disable-polyp \ --disable-jack \ --disable-openal \ --disable-nas \ diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure deleted file mode 100644 index 4ef4de805..000000000 --- a/package/mplayer/patches/patch-configure +++ /dev/null @@ -1,39 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- MPlayer-1.0rc2.orig/configure 2007-10-07 21:49:33.000000000 +0200 -+++ MPlayer-1.0rc2/configure 2009-05-10 18:37:32.000000000 +0200 -@@ -2331,7 +2331,7 @@ elif test -z "$CFLAGS" ; then - elif test "$cc_vendor" != "gnu" ; then - CFLAGS="-O2 $_march $_mcpu $_pipe" - else -- CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" -+ CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" - fi - else - _warn_CFLAGS=yes -@@ -3853,26 +3853,6 @@ else - fi - - --echocheck "X11 headers presence" -- _x11_headers="no" -- _res_comment="check if the dev(el) packages are installed" -- for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do -- if test -f "$I/X11/Xlib.h" ; then -- _x11_headers="yes" -- _res_comment="" -- break -- fi -- done -- for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/openwin/include ; do -- if test -f "$I/X11/Xlib.h" ; then -- _inc_extra="$_inc_extra -I$I" -- _x11_headers="yes" -- _res_comment="using $I" -- break -- fi -- done --echores "$_x11_headers" -- - - echocheck "X11" - if test "$_x11" = auto && test "$_x11_headers" = yes ; then diff --git a/package/mplayer/patches/patch-loader_win32_c b/package/mplayer/patches/patch-loader_win32_c index e5537e02a..9392be1ce 100644 --- a/package/mplayer/patches/patch-loader_win32_c +++ b/package/mplayer/patches/patch-loader_win32_c @@ -1,10 +1,9 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- MPlayer-1.0rc2.orig/loader/win32.c 2007-10-07 21:49:32.000000000 +0200 -+++ MPlayer-1.0rc2/loader/win32.c 2008-10-28 15:29:47.000000000 +0100 -@@ -63,7 +63,6 @@ for DLL to know too much about its envir - #include <sys/types.h> +--- mplayer-1.0-29973.orig/loader/win32.c 2009-12-02 19:45:33.000000000 +0100 ++++ mplayer-1.0-29973/loader/win32.c 2009-12-04 22:32:05.000000000 +0100 +@@ -61,7 +61,6 @@ for DLL to know too much about its envir #include <dirent.h> #include <sys/time.h> + #include <sys/stat.h> -#include <sys/timeb.h> #ifdef HAVE_KSTAT #include <kstat.h> diff --git a/package/openssh/Makefile b/package/openssh/Makefile index e5803b003..2bf5163eb 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 5.2p1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= ada79c7328a8551bdf55c95e631e7dad +PKG_VERSION:= 5.3p1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 13563dbf61f36ca9a1e4254260131041 PKG_DESCR:= OpenSSH server PKG_SECTION:= net PKG_DEPENDS:= zlib libopenssl diff --git a/package/openssh/patches/patch-auth2-jpake_c b/package/openssh/patches/patch-auth2-jpake_c index 3ea529fce..c5e444523 100644 --- a/package/openssh/patches/patch-auth2-jpake_c +++ b/package/openssh/patches/patch-auth2-jpake_c @@ -1,6 +1,6 @@ ---- openssh-5.2p1.orig/auth2-jpake.c 2008-11-11 06:33:03.000000000 +0100 -+++ openssh-5.2p1/auth2-jpake.c 2009-09-18 12:28:10.000000000 +0200 -@@ -172,7 +172,7 @@ derive_rawsalt(const char *username, u_c +--- openssh-5.3p1.orig/auth2-jpake.c 2009-06-21 11:50:08.000000000 +0200 ++++ openssh-5.3p1/auth2-jpake.c 2009-12-05 12:10:19.000000000 +0100 +@@ -173,7 +173,7 @@ derive_rawsalt(const char *username, u_c fatal("%s: not enough bytes for rawsalt (want %u have %u)", __func__, len, digest_len); memcpy(rawsalt, digest, len); @@ -9,7 +9,7 @@ xfree(digest); } -@@ -197,10 +197,10 @@ makesalt(u_int want, const char *user) +@@ -198,10 +198,10 @@ makesalt(u_int want, const char *user) fatal("%s: want %u", __func__, want); derive_rawsalt(user, rawsalt, sizeof(rawsalt)); @@ -22,7 +22,7 @@ return ret; } -@@ -354,7 +354,7 @@ auth2_jpake_get_pwdata(Authctxt *authctx +@@ -355,7 +355,7 @@ auth2_jpake_get_pwdata(Authctxt *authctx debug3("%s: scheme = %s", __func__, *hash_scheme); JPAKE_DEBUG_BN((*s, "%s: s = ", __func__)); #endif @@ -31,7 +31,7 @@ xfree(secret); } -@@ -395,12 +395,12 @@ auth2_jpake_start(Authctxt *authctxt) +@@ -396,12 +396,12 @@ auth2_jpake_start(Authctxt *authctxt) packet_send(); packet_write_wait(); @@ -48,7 +48,7 @@ xfree(x3_proof); xfree(x4_proof); -@@ -447,8 +447,8 @@ input_userauth_jpake_client_step1(int ty +@@ -448,8 +448,8 @@ input_userauth_jpake_client_step1(int ty &pctx->b, &x4_s_proof, &x4_s_proof_len)); @@ -59,7 +59,7 @@ xfree(x1_proof); xfree(x2_proof); -@@ -462,7 +462,7 @@ input_userauth_jpake_client_step1(int ty +@@ -463,7 +463,7 @@ input_userauth_jpake_client_step1(int ty packet_send(); packet_write_wait(); @@ -68,7 +68,7 @@ xfree(x4_s_proof); /* Expect step 2 packet from peer */ -@@ -503,7 +503,7 @@ input_userauth_jpake_client_step2(int ty +@@ -504,7 +504,7 @@ input_userauth_jpake_client_step2(int ty &pctx->k, &pctx->h_k_sid_sessid, &pctx->h_k_sid_sessid_len)); diff --git a/package/openssh/patches/patch-channels_c b/package/openssh/patches/patch-channels_c index 3712809e4..babf434b3 100644 --- a/package/openssh/patches/patch-channels_c +++ b/package/openssh/patches/patch-channels_c @@ -1,5 +1,5 @@ ---- openssh-5.2p1.orig/channels.c 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1/channels.c 2009-09-18 12:29:28.000000000 +0200 +--- openssh-5.3p1.orig/channels.c 2009-08-28 03:02:37.000000000 +0200 ++++ openssh-5.3p1/channels.c 2009-12-05 12:10:19.000000000 +0100 @@ -411,7 +411,7 @@ channel_free(Channel *c) if (cc->abandon_cb != NULL) cc->abandon_cb(c, cc->ctx); @@ -9,7 +9,7 @@ xfree(cc); } if (c->filter_cleanup != NULL && c->filter_ctx != NULL) -@@ -2447,7 +2447,7 @@ channel_input_status_confirm(int type, u +@@ -2449,7 +2449,7 @@ channel_input_status_confirm(int type, u return; cc->cb(type, c, cc->ctx); TAILQ_REMOVE(&c->status_confirms, cc, entry); @@ -18,7 +18,7 @@ xfree(cc); } -@@ -2941,7 +2941,7 @@ channel_connect_ctx_free(struct channel_ +@@ -2943,7 +2943,7 @@ channel_connect_ctx_free(struct channel_ xfree(cctx->host); if (cctx->aitop) freeaddrinfo(cctx->aitop); diff --git a/package/openssh/patches/patch-clientloop_c b/package/openssh/patches/patch-clientloop_c index 1da1d31c9..cdd0615d6 100644 --- a/package/openssh/patches/patch-clientloop_c +++ b/package/openssh/patches/patch-clientloop_c @@ -1,6 +1,6 @@ ---- openssh-5.2p1.orig/clientloop.c 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1/clientloop.c 2009-09-18 12:28:59.000000000 +0200 -@@ -487,7 +487,7 @@ client_global_request_reply(int type, u_ +--- openssh-5.3p1.orig/clientloop.c 2009-08-28 03:21:07.000000000 +0200 ++++ openssh-5.3p1/clientloop.c 2009-12-05 12:10:19.000000000 +0100 +@@ -488,7 +488,7 @@ client_global_request_reply(int type, u_ gc->cb(type, seq, gc->ctx); if (--gc->ref_count <= 0) { TAILQ_REMOVE(&global_confirms, gc, entry); @@ -9,7 +9,7 @@ xfree(gc); } -@@ -768,7 +768,7 @@ process_cmdline(void) +@@ -769,7 +769,7 @@ process_cmdline(void) int cancel_port; Forward fwd; diff --git a/package/openssh/patches/patch-configure b/package/openssh/patches/patch-configure deleted file mode 100644 index aa0b7af45..000000000 --- a/package/openssh/patches/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openssh-5.2p1.orig/configure 2009-02-23 01:18:14.000000000 +0100 -+++ openssh-5.2p1/configure 2009-05-01 12:34:00.000000000 +0200 -@@ -26712,7 +26712,7 @@ echo "${ECHO_T}yes" >&6; } - #define HEIMDAL 1 - _ACEOF - -- K5LIBS="-lkrb5 -ldes" -+ K5LIBS="-lkrb5" - K5LIBS="$K5LIBS -lcom_err -lasn1" - { echo "$as_me:$LINENO: checking for net_write in -lroken" >&5 - echo $ECHO_N "checking for net_write in -lroken... $ECHO_C" >&6; } diff --git a/package/openssh/patches/patch-jpake_c b/package/openssh/patches/patch-jpake_c index 37b69ee45..c4dfdedce 100644 --- a/package/openssh/patches/patch-jpake_c +++ b/package/openssh/patches/patch-jpake_c @@ -1,15 +1,6 @@ ---- openssh-5.2p1.orig/jpake.c 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1/jpake.c 2009-09-18 12:26:24.000000000 +0200 -@@ -160,7 +160,7 @@ hash_buffer(const u_char *buf, u_int len - success = 0; - out: - EVP_MD_CTX_cleanup(&evp_md_ctx); -- bzero(digest, sizeof(digest)); -+ memset(digest, 0, sizeof(digest)); - digest_len = 0; - return success; - } -@@ -259,7 +259,7 @@ jpake_free(struct jpake_ctx *pctx) +--- openssh-5.3p1.orig/jpake.c 2009-03-05 14:58:22.000000000 +0100 ++++ openssh-5.3p1/jpake.c 2009-12-05 12:10:19.000000000 +0100 +@@ -104,7 +104,7 @@ jpake_free(struct jpake_ctx *pctx) #define JPAKE_BUF_CLEAR_FREE(v, l) \ do { \ if ((v) != NULL) { \ @@ -18,7 +9,7 @@ xfree(v); \ (v) = NULL; \ (l) = 0; \ -@@ -287,7 +287,7 @@ jpake_free(struct jpake_ctx *pctx) +@@ -132,7 +132,7 @@ jpake_free(struct jpake_ctx *pctx) #undef JPAKE_BN_CLEAR_FREE #undef JPAKE_BUF_CLEAR_FREE @@ -27,7 +18,7 @@ xfree(pctx); } -@@ -592,7 +592,7 @@ jpake_check_confirm(const BIGNUM *k, +@@ -437,7 +437,7 @@ jpake_check_confirm(const BIGNUM *k, else if (memcmp(peer_confirm_hash, expected_confirm_hash, expected_confirm_hash_len) == 0) success = 1; diff --git a/package/openssh/patches/patch-monitor_c b/package/openssh/patches/patch-monitor_c index 8992b3e6e..db7e7a370 100644 --- a/package/openssh/patches/patch-monitor_c +++ b/package/openssh/patches/patch-monitor_c @@ -1,6 +1,6 @@ ---- openssh-5.2p1.orig/monitor.c 2009-02-14 06:33:31.000000000 +0100 -+++ openssh-5.2p1/monitor.c 2009-09-18 12:31:53.000000000 +0200 -@@ -2029,8 +2029,8 @@ mm_answer_jpake_step1(int sock, Buffer * +--- openssh-5.3p1.orig/monitor.c 2009-06-21 10:58:46.000000000 +0200 ++++ openssh-5.3p1/monitor.c 2009-12-05 12:10:19.000000000 +0100 +@@ -2042,8 +2042,8 @@ mm_answer_jpake_step1(int sock, Buffer * debug3("%s: sending step1", __func__); mm_request_send(sock, MONITOR_ANS_JPAKE_STEP1, m); @@ -11,7 +11,7 @@ xfree(x3_proof); xfree(x4_proof); -@@ -2059,8 +2059,8 @@ mm_answer_jpake_get_pwdata(int sock, Buf +@@ -2072,8 +2072,8 @@ mm_answer_jpake_get_pwdata(int sock, Buf debug3("%s: sending pwdata", __func__); mm_request_send(sock, MONITOR_ANS_JPAKE_GET_PWDATA, m); @@ -22,7 +22,7 @@ xfree(hash_scheme); xfree(salt); -@@ -2099,8 +2099,8 @@ mm_answer_jpake_step2(int sock, Buffer * +@@ -2112,8 +2112,8 @@ mm_answer_jpake_step2(int sock, Buffer * JPAKE_DEBUG_CTX((pctx, "step2 done in %s", __func__)); @@ -33,7 +33,7 @@ xfree(x1_proof); xfree(x2_proof); -@@ -2112,7 +2112,7 @@ mm_answer_jpake_step2(int sock, Buffer * +@@ -2125,7 +2125,7 @@ mm_answer_jpake_step2(int sock, Buffer * debug3("%s: sending step2", __func__); mm_request_send(sock, MONITOR_ANS_JPAKE_STEP2, m); @@ -42,7 +42,7 @@ xfree(x4_s_proof); monitor_permit(mon_dispatch, MONITOR_REQ_JPAKE_KEY_CONFIRM, 1); -@@ -2146,7 +2146,7 @@ mm_answer_jpake_key_confirm(int sock, Bu +@@ -2159,7 +2159,7 @@ mm_answer_jpake_key_confirm(int sock, Bu JPAKE_DEBUG_CTX((pctx, "key_confirm done in %s", __func__)); @@ -51,7 +51,7 @@ buffer_clear(m); /* pctx->k is sensitive, not sent */ -@@ -2180,7 +2180,7 @@ mm_answer_jpake_check_confirm(int sock, +@@ -2193,7 +2193,7 @@ mm_answer_jpake_check_confirm(int sock, JPAKE_DEBUG_CTX((pctx, "check_confirm done in %s", __func__)); diff --git a/package/openssh/patches/patch-myproposal_h b/package/openssh/patches/patch-myproposal_h deleted file mode 100644 index 38345863e..000000000 --- a/package/openssh/patches/patch-myproposal_h +++ /dev/null @@ -1,45 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openssh-5.2p1.orig/myproposal.h 2009-01-28 06:33:31.000000000 +0100 -+++ openssh-5.2p1/myproposal.h 2009-05-01 14:00:47.000000000 +0200 -@@ -42,15 +42,35 @@ - - #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" - -+ -+#ifndef OPENSSL_NO_AES192 -+#define KEX_ENCRYPT_AES192 ",aes192-ctr,aes192-cbc" -+#else -+#define KEX_ENCRYPT_AES192 -+#endif -+#ifndef OPENSSL_NO_BF -+#define KEX_ENCRYPT_BF ",blowfish-cbc" -+#else -+#define KEX_ENCRYPT_BF -+#endif -+#ifndef OPENSSL_NO_CAST -+#define KEX_ENCRYPT_CAST ",cast128-cbc" -+#define KEX_MAC_CAST ",hmac-ripemd160,hmac-ripemd160@openssh.com" -+#else -+#define KEX_ENCRYPT_CAST -+#define KEX_MAC_CAST -+#endif -+ - #define KEX_DEFAULT_ENCRYPT \ -- "aes128-ctr,aes192-ctr,aes256-ctr," \ -+ "aes128-ctr,aes256-ctr," \ - "arcfour256,arcfour128," \ -- "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ -- "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" -+ "aes128-cbc,3des-cbc," \ -+ "aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" \ -+ KEX_ENCRYPT_AES192 KEX_ENCRYPT_BF KEX_ENCRYPT_CAST - #define KEX_DEFAULT_MAC \ -- "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \ -- "hmac-ripemd160@openssh.com," \ -- "hmac-sha1-96,hmac-md5-96" -+ "hmac-md5,hmac-sha1,umac-64@openssh.com," \ -+ "hmac-sha1-96,hmac-md5-96" \ -+ KEX_MAC_CAST - #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" - #define KEX_DEFAULT_LANG "" - diff --git a/package/openssh/patches/patch-schnorr_c b/package/openssh/patches/patch-schnorr_c index aff2497ba..8a9e4a950 100644 --- a/package/openssh/patches/patch-schnorr_c +++ b/package/openssh/patches/patch-schnorr_c @@ -1,11 +1,29 @@ ---- openssh-5.2p1.orig/schnorr.c 2009-02-21 02:45:18.000000000 +0100 -+++ openssh-5.2p1/schnorr.c 2009-09-18 12:28:29.000000000 +0200 -@@ -105,7 +105,7 @@ schnorr_hash(const BIGNUM *p, const BIGN +--- openssh-5.3p1.orig/schnorr.c 2009-03-07 02:01:47.000000000 +0100 ++++ openssh-5.3p1/schnorr.c 2009-12-05 12:10:08.000000000 +0100 +@@ -101,7 +101,7 @@ schnorr_hash(const BIGNUM *p, const BIGN + SCHNORR_DEBUG_BN((h, "%s: h = ", __func__)); out: buffer_free(&b); - EVP_MD_CTX_cleanup(&evp_md_ctx); - bzero(digest, digest_len); + memset(digest, 0, digest_len); xfree(digest); digest_len = 0; if (success == 0) +@@ -451,7 +451,7 @@ hash_buffer(const u_char *buf, u_int len + success = 0; + out: + EVP_MD_CTX_cleanup(&evp_md_ctx); +- bzero(digest, sizeof(digest)); ++ memset(digest, 0, sizeof(digest)); + digest_len = 0; + return success; + } +@@ -544,7 +544,7 @@ modp_group_free(struct modp_group *grp) + BN_clear_free(grp->p); + if (grp->q != NULL) + BN_clear_free(grp->q); +- bzero(grp, sizeof(*grp)); ++ memset(grp, 0, sizeof(*grp)); + xfree(grp); + } + diff --git a/package/openssh/patches/patch-session_c b/package/openssh/patches/patch-session_c index ea9508cfd..fd1e879b3 100644 --- a/package/openssh/patches/patch-session_c +++ b/package/openssh/patches/patch-session_c @@ -1,6 +1,6 @@ ---- openssh-5.2p1.orig/session.c 2009-01-28 06:29:49.000000000 +0100 -+++ openssh-5.2p1/session.c 2009-09-18 12:25:29.000000000 +0200 -@@ -1865,7 +1865,7 @@ session_unused(int id) +--- openssh-5.3p1.orig/session.c 2009-08-20 08:20:50.000000000 +0200 ++++ openssh-5.3p1/session.c 2009-12-05 12:10:19.000000000 +0100 +@@ -1859,7 +1859,7 @@ session_unused(int id) fatal("%s: insane session id %d (max %d nalloc %d)", __func__, id, options.max_sessions, sessions_nalloc); } diff --git a/package/openssh/patches/patch-ssh_c b/package/openssh/patches/patch-ssh_c index 486429320..d9edf659e 100644 --- a/package/openssh/patches/patch-ssh_c +++ b/package/openssh/patches/patch-ssh_c @@ -1,6 +1,6 @@ ---- openssh-5.2p1.orig/ssh.c 2009-02-14 06:28:21.000000000 +0100 -+++ openssh-5.2p1/ssh.c 2009-09-18 12:26:46.000000000 +0200 -@@ -1277,8 +1277,8 @@ load_public_identity_files(void) +--- openssh-5.3p1.orig/ssh.c 2009-07-05 23:16:56.000000000 +0200 ++++ openssh-5.3p1/ssh.c 2009-12-05 12:10:19.000000000 +0100 +@@ -1280,8 +1280,8 @@ load_public_identity_files(void) options.identity_files[i] = filename; options.identity_keys[i] = public; } diff --git a/package/openssh/patches/patch-sshconnect2_c b/package/openssh/patches/patch-sshconnect2_c index 405989001..1e6f16b1f 100644 --- a/package/openssh/patches/patch-sshconnect2_c +++ b/package/openssh/patches/patch-sshconnect2_c @@ -1,6 +1,6 @@ ---- openssh-5.2p1.orig/sshconnect2.c 2008-11-05 06:20:47.000000000 +0100 -+++ openssh-5.2p1/sshconnect2.c 2009-09-18 12:30:37.000000000 +0200 -@@ -921,14 +921,14 @@ jpake_password_to_secret(Authctxt *authc +--- openssh-5.3p1.orig/sshconnect2.c 2009-03-05 14:58:22.000000000 +0100 ++++ openssh-5.3p1/sshconnect2.c 2009-12-05 12:10:19.000000000 +0100 +@@ -922,14 +922,14 @@ jpake_password_to_secret(Authctxt *authc &secret, &secret_len) != 0) fatal("%s: hash_buffer", __func__); @@ -18,7 +18,7 @@ xfree(secret); return ret; -@@ -965,8 +965,8 @@ input_userauth_jpake_server_step1(int ty +@@ -966,8 +966,8 @@ input_userauth_jpake_server_step1(int ty /* Obtain password and derive secret */ pctx->s = jpake_password_to_secret(authctxt, crypt_scheme, salt); @@ -29,7 +29,7 @@ xfree(crypt_scheme); xfree(salt); JPAKE_DEBUG_BN((pctx->s, "%s: s = ", __func__)); -@@ -981,8 +981,8 @@ input_userauth_jpake_server_step1(int ty +@@ -982,8 +982,8 @@ input_userauth_jpake_server_step1(int ty &pctx->a, &x2_s_proof, &x2_s_proof_len); @@ -40,7 +40,7 @@ xfree(x3_proof); xfree(x4_proof); -@@ -994,7 +994,7 @@ input_userauth_jpake_server_step1(int ty +@@ -995,7 +995,7 @@ input_userauth_jpake_server_step1(int ty packet_put_string(x2_s_proof, x2_s_proof_len); packet_send(); @@ -49,7 +49,7 @@ xfree(x2_s_proof); /* Expect step 2 packet from peer */ -@@ -1034,7 +1034,7 @@ input_userauth_jpake_server_step2(int ty +@@ -1035,7 +1035,7 @@ input_userauth_jpake_server_step2(int ty &pctx->k, &pctx->h_k_cid_sessid, &pctx->h_k_cid_sessid_len); @@ -58,7 +58,7 @@ xfree(x4_s_proof); JPAKE_DEBUG_CTX((pctx, "confirm sending in %s", __func__)); -@@ -1700,8 +1700,8 @@ userauth_jpake(Authctxt *authctxt) +@@ -1701,8 +1701,8 @@ userauth_jpake(Authctxt *authctxt) packet_put_string(x2_proof, x2_proof_len); packet_send(); diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index c0914b98f..d798e36ba 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.1_rc19 +PKG_VERSION:= 2.1_rc22 PKG_RELEASE:= 1 -PKG_MD5SUM:= ba2ee667a8b7606b125b7d32f47ca578 +PKG_MD5SUM:= a4ca5d79f7467fc537b216bff1c744f2 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net PKG_DEPENDS:= kmod-tun diff --git a/package/pango/Makefile b/package/pango/Makefile index 7c87dac2c..e6272d4f9 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -26,6 +26,6 @@ INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_PANGO}/usr/lib - ${CP} ${WRKINST}/usr/lib/libpango.so* ${IDIR_PANGO}/usr/lib + ${CP} ${WRKINST}/usr/lib/libpango*.so* ${IDIR_PANGO}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk |