Bumping to 0.7.1

(Portage version: 2.2_rc61/cvs/Linux i686)

3 files changed, 10 insertions, 43 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/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"
 }