Bumping to 0.7.1

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 16 insertions, 50 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 2220b19a9b93..02aac444f43f 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.105 2010/01/16 13:08:58 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.106 2010/01/24 20:49:34 gurligebis Exp $
+
+*hostapd-0.7.1 (24 Jan 2010)
+
+  24 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -hostapd-0.7.0.ebuild, -files/hostapd-0.7.0-fix_linking.patch,
+  +hostapd-0.7.1.ebuild:
+  Bumping to 0.7.1 , fixing bugs #301540 and #301542
 
 *hostapd-0.7.0 (16 Jan 2010)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index cbc8a984ae80..5369b1caac8f 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX hostapd-0.7.0-fix_linking.patch 1244 RMD160 b21a109d416316e0365f2a82cfcb41bd3409caf5 SHA1 cf3b173cad3cffead65a6531e678424297ac7f2b SHA256 4160232e105cdebc394c7749cad86a68ad8a93947d01eb819c292cabc99dc330
 AUX hostapd-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
 AUX hostapd-init.d 1015 RMD160 9c5908b38de714f6c79aad61ee2c248bf9d06c0a SHA1 6238deb6c618169ab5a8147850a1a0e594d69ba3 SHA256 d2c0f0d97a8c7d25e723c55c4377c1f7344762375998cc8498788f3a340fdf95
 DIST hostapd-0.6.10.tar.gz 1100734 RMD160 2da84cf89be263fe08f0b7a90a0e2cdd7409c36f SHA1 2cacf994abd3cebad36679d32f64c9e9906ccff8 SHA256 53cb165d5fec821f186b811beb2fcb212964b1a8ea84cc8cfcf229227989581b
 DIST hostapd-0.6.8.tar.gz 1078338 RMD160 eae5adfabe734c7586473ef9cdbde4d86b622536 SHA1 0f03a3d4dcce3560b5bb516628570c4eff88b58f SHA256 90e735947f84492c10ccfb6801971f4b0789e4639a37a379987db49c9291cab6
 DIST hostapd-0.6.9.tar.gz 1089548 RMD160 1faf1728984756b54ee353af4ed6d173259a953d SHA1 80d1d3922fc0daf2aab2d41a2e37172d5371cf4f SHA256 4430fe2c7a2176c6890ac3a726a8b3d234a77beb3ca987b4349c467331343e67
-DIST hostapd-0.7.0.tar.gz 1126732 RMD160 36826d536fe3a68cedce3d18cc8bba4cdaa44c73 SHA1 9dbb810ddeb9a1b3e51cc7758dd33a0059503b16 SHA256 417f8b320236f9937cb606c87d9efc921265c8d90a355d9a83a797b125a4b06f
+DIST hostapd-0.7.1.tar.gz 1119118 RMD160 9d0c1632914a42556d25439f164abaac666e591b SHA1 3e3eb774a01134ec8e03778ba254841acd5514c9 SHA256 aae7cb7cda830aa9d496ce60b210e387dcbb9c805ba00815879f6c72afd429c6
 EBUILD hostapd-0.6.10.ebuild 4957 RMD160 74e9a7888d732603f6a9f5abb0bb74cf878e2113 SHA1 df3b2ed436fe8912f11d07ea2e0d522faedcde7b SHA256 21d9fc4dfe6cb88aa3abee61a3abe9f2eade4560449012a732472105a3ca3942
 EBUILD hostapd-0.6.8.ebuild 5340 RMD160 2d4fc98e901f60b0b2f745a454b66e27a7cd837a SHA1 1bf794377abfff4ff5b653fc63b4f6c4b18b8b4f SHA256 8aa339e1735369ed64bfe00b97e92d39b869664cbe43d66d2aae6faf4aad2e96
 EBUILD hostapd-0.6.9.ebuild 4953 RMD160 dcd2a03675d34ce9a1854c3ef788eb6218ee9193 SHA1 fc713e42361c63c7a5c3b222dd643b54aa5b4f30 SHA256 bd870808e074117ee66b41c62ff3358fea8fe17d54bb72d1c9dae67e5e907a04
-EBUILD hostapd-0.7.0.ebuild 5162 RMD160 34eefd4462252007670eab9bfd1dec664ee26f23 SHA1 837d4ef4f4f09623ee7bf4bacc73e156d819ac52 SHA256 afc9c06716117608836c83682b4083b6e8009ebbc0240063a9cbfc3294ddf554
-MISC ChangeLog 19390 RMD160 2a08a934742c4773a7a38dc6813cfe2021530dfd SHA1 5b9959e27125d505f38acd578839787af9f9e7b6 SHA256 e6f2a10b3b5c802534c6f667164256d3c88e0d3ad20a1c320a20140672997b3a
+EBUILD hostapd-0.7.1.ebuild 5116 RMD160 dec16b92a908b29874aac3fed4d503b761c4a020 SHA1 d8652621dc5d88344778a89e8e6949bebdbc6509 SHA256 4b530570e5dcb9946791bc473c31048bd7a1c8e047bd81e5d6cbe9b5dd5853e7
+MISC ChangeLog 19626 RMD160 b9f57542f1395250b173d97f5788c986c0307cfc SHA1 99853d377cd588c2c3d3df643bf6ca344ed7ee4c SHA256 793bc0f3eb3dff60d27e18161bcd4307ffeb36002cabd4dd36887c01440f811f
 MISC metadata.xml 751 RMD160 f473d2ada1fb90c62d5c3900c93cde054c5cf853 SHA1 740713843db857280e5f5183ac441bf382ed3c07 SHA256 2850ed2169000b501c346a7651cc0e12e2935be201dbeca1941f1ba6cb81ec29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktRunMACgkQsR7PQhRXYEmAkQCfSfgFlIuGco/8iLOaIV1yEOtY
-NJgAniX3AX5QESeIi713gf0lwAF2AO2m
-=gmjg
+iEYEARECAAYFAktcsmkACgkQsR7PQhRXYEkYywCePi67QI5YaFGwGD6oWgbrvahC
+p3YAn1uo0xnZl4aqpsq89yoL7lLGfstB
+=ewUJ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/hostapd/files/hostapd-0.7.0-fix_linking.patch b/net-wireless/hostapd/files/hostapd-0.7.0-fix_linking.patch
deleted file mode 100644
index 89c3f6fe3180..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.7.0-fix_linking.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Jouni Malinen <j@w1.fi>
-Date: Sat, 16 Jan 2010 08:38:53 +0000 (+0200)
-Subject: Fix linking of nt_password_hash
-X-Git-Url: http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=73b217570c2dabcf409a19e746c6a929f88a5781
-
-Fix linking of nt_password_hash
-
-Need to use conditional linking of some crypto functionality and add
-couple of additional object files. [Bug 343]
----
-
-diff --git a/hostapd/Makefile b/hostapd/Makefile
-index d94ceb9..6594df0 100644
---- a/hostapd/Makefile
-+++ b/hostapd/Makefile
-@@ -749,11 +749,22 @@ endif
- hostapd_cli: $(OBJS_c)
- 	$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
- 
--NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS) ../src/crypto/rc4.o ../src/crypto/md5.o
-+NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS) ../src/crypto/md5.o
-+ifdef NEED_RC4
-+ifdef CONFIG_INTERNAL_RC4
-+NOBJS += ../src/crypto/rc4.o
-+endif
-+endif
- ifdef CONFIG_INTERNAL_MD5
- NOBJS += ../src/crypto/md5-internal.o
- endif
- NOBJS += ../src/crypto/crypto_openssl.o ../src/utils/os_$(CONFIG_OS).o
-+NOBJS += ../src/utils/wpa_debug.o
-+NOBJS += ../src/utils/wpabuf.o
-+ifdef CONFIG_WPA_TRACE
-+NOBJS += ../src/utils/trace.o
-+LIBS_n += -lbfd
-+endif
- ifdef TLS_FUNCS
- LIBS_n += -lcrypto
- endif
diff --git a/net-wireless/hostapd/hostapd-0.7.0.ebuild b/net-wireless/hostapd/hostapd-0.7.1.ebuild
index a3028a8117c7..ad330b219d76 100644
--- a/net-wireless/hostapd/hostapd-0.7.0.ebuild
+++ b/net-wireless/hostapd/hostapd-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.7.0.ebuild,v 1.1 2010/01/16 13:08:58 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.7.1.ebuild,v 1.1 2010/01/24 20:49:34 gurligebis Exp $
 
 EAPI="2"
 
@@ -20,12 +20,11 @@ DEPEND="ssl? ( dev-libs/openssl )
 	madwifi? ( ||
 		( >net-wireless/madwifi-ng-tools-0.9.3
 		net-wireless/madwifi-old ) )"
-RDEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 S="${S}/hostapd"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fix_linking.patch"
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
 		"${S}/hostapd.conf"
 }