packages: hostapd/hostapd.spec, hostapd/hostapd-nl.patch (NEW) - rel 3; lin...

[arekm]

Author: arekm                        Date: Sat Sep 17 07:23:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; link with libnl 3.2

---- Files affected:
packages/hostapd:
   hostapd.spec (1.33 -> 1.34) , hostapd-nl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/hostapd/hostapd.spec
diff -u packages/hostapd/hostapd.spec:1.33 packages/hostapd/hostapd.spec:1.34
--- packages/hostapd/hostapd.spec:1.33	Sat Sep 17 09:07:50 2011
+++ packages/hostapd/hostapd.spec	Sat Sep 17 09:23:48 2011
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	HostAP - praca jako access point
 Name:		hostapd
 Version:	0.7.3
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Daemons
 Source0:	http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Source1:	%{name}.init
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-build-time-config.patch
+Patch2:		%{name}-nl.patch
 URL:		http://hostap.epitest.fi/
 BuildRequires:	libnl-devel >= 1:2.0
 BuildRequires:	madwifi-ng-devel
@@ -61,6 +62,8 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
 %{__sed} '/CFLAGS =/{s/-g//; s/-O2/$(OPTCFLAGS)/}' -i hostapd/Makefile
 %{__sed} '/NOBJS =/s at ../src/crypto/rc4.o at ../src/utils/wpabuf.o ../src/utils/wpa_debug.o@' -i hostapd/Makefile
 
@@ -70,8 +73,8 @@
 	all nt_password_hash hlr_auc_gw \
 	V=1 \
 	CC="%{__cc}" \
-	OPTCFLAGS="%{rpmcflags} %{rpmcppflags}" \
-	LDFLAGS="%{rpmcflags} %{rpmldflags}"
+	OPTCFLAGS="%{rpmcflags} %{rpmcppflags} `pkg-config --cflags libnl-3.0`" \
+	LDFLAGS="%{rpmcflags} %{rpmldflags} `pkg-config --libs libnl-3.0 libnl-genl-3.0`"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -117,6 +120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2011/09/17 07:23:48  arekm
+- rel 3; link with libnl 3.2
+
 Revision 1.33  2011/09/17 07:07:50  arekm
 - release 2
 

================================================================
Index: packages/hostapd/hostapd-nl.patch
diff -u /dev/null packages/hostapd/hostapd-nl.patch:1.1
--- /dev/null	Sat Sep 17 09:23:54 2011
+++ packages/hostapd/hostapd-nl.patch	Sat Sep 17 09:23:48 2011
@@ -0,0 +1,15 @@
+--- hostapd-0.7.3/src/drivers/drivers.mak~	2010-09-07 17:43:39.000000000 +0200
++++ hostapd-0.7.3/src/drivers/drivers.mak	2011-09-17 09:21:47.687977062 +0200
+@@ -31,10 +31,10 @@
+ NEED_AP_MLME=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-DRV_LIBS += -lnl
++
+ 
+ ifdef CONFIG_LIBNL20
+-DRV_LIBS += -lnl-genl
++
+ DRV_CFLAGS += -DCONFIG_LIBNL20
+ endif
+ endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hostapd/hostapd.spec?r1=1.33&r2=1.34&f=u