[packages/wpa_supplicant] - updated to 2.10

qboosh qboosh at pld-linux.org
Wed Oct 25 21:47:08 CEST 2023 

commit 5357058fd271e292b850a34a448620fb663acc72
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 25 21:48:12 2023 +0200

    - updated to 2.10

 wpa_supplicant-0.7.2-generate-libeap-peer.patch | 45 ++++++-------------------
 wpa_supplicant-OPTCFLAGS.patch                  | 12 -------
 wpa_supplicant-gui-qt4.patch                    | 11 +++---
 wpa_supplicant.spec                             | 28 +++++++--------
 4 files changed, 29 insertions(+), 67 deletions(-)
---
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index fd66bf7..53fcf2b 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -11,22 +11,21 @@
 Summary:	Linux WPA/WPA2/RSN/IEEE 802.1X supplicant
 Summary(pl.UTF-8):	Suplikant WPA/WPA2/RSN/IEEE 802.1X dla Linuksa
 Name:		wpa_supplicant
-Version:	2.9
-Release:	4
+Version:	2.10
+Release:	1
 License:	BSD
 Group:		Networking
 Source0:	http://w1.fi/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	2d2958c782576dc9901092fbfecb4190
+# Source0-md5:	d26797fcb002898d4ee989179346e1cc
 Source1:	%{name}.config
 Source2:	%{name}-wpa_gui.desktop
 Source3:	%{name}.tmpfiles
 Source4:	%{name}.service
 Patch0:		%{name}-makefile.patch
-Patch1:		%{name}-OPTCFLAGS.patch
-Patch2:		%{name}-gui-qt4.patch
+Patch1:		%{name}-gui-qt4.patch
 # http://www.linuxwimax.org/Download
-Patch3:		%{name}-0.7.2-generate-libeap-peer.patch
-Patch4:		dbus-services.patch
+Patch2:		%{name}-0.7.2-generate-libeap-peer.patch
+Patch3:		dbus-services.patch
 URL:		http://w1.fi/wpa_supplicant/
 %{?with_dbus:BuildRequires:	dbus-devel}
 BuildRequires:	libnl-devel >= 1:3.5
@@ -141,7 +140,6 @@ Pliki programistyczne dla biblioteki eap.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %{__sed} -i -e 's, at LIB@,%{_lib},' src/eap_peer/libeap0.pc
 
@@ -161,19 +159,19 @@ echo 'CONFIG_EAP_AKA_PRIME=y' >> wpa_supplicant/.config
 %endif
 
 %build
+CFLAGS="%{rpmcppflags} %{rpmcflags}" \
 %{__make} -C wpa_supplicant \
 	V=1 \
 	CC="%{__cc}" \
 	BINDIR="%{_sbindir}" \
-	LDFLAGS="%{rpmldflags}" \
-	OPTCFLAGS="%{rpmcppflags} %{rpmcflags}"
+	LDFLAGS="%{rpmldflags}"
 
 # eapol_test:
+CFLAGS="%{rpmcppflags} %{rpmcflags}" \
 %{__make} -C wpa_supplicant eapol_test \
 	V=1 \
 	CC="%{__cc}" \
-	LDFLAGS="%{rpmldflags}" \
-	OPTCFLAGS="%{rpmcppflags} %{rpmcflags}"
+	LDFLAGS="%{rpmldflags}"
 
 %if %{with gui}
 cd wpa_supplicant/wpa_gui-qt4
@@ -190,8 +188,8 @@ cd ../..
 	UIC=%{_bindir}/uic-qt%{qtver}
 %endif
 
-%{__make} -C src/eap_peer clean
-%{__make} -C src/eap_peer \
+%{__make} -C src/eap_peer -f Makefile.libeap clean
+%{__make} -C src/eap_peer -f Makefile.libeap \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcppflags} %{rpmcflags} -MMD -Wall $(pkg-config --cflags libnl-3.0) -DTLS_DEFAULT_CIPHERS=\\\"PROFILE=SYSTEM:3DES\\\"" \
 	LDFLAGS="%{rpmldflags} -shared"
@@ -228,7 +226,7 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/wpa_gui.desktop
 install -p wpa_supplicant/eapol_test $RPM_BUILD_ROOT%{_bindir}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
-%{__make} -C src/eap_peer install \
+%{__make} -C src/eap_peer -f Makefile.libeap install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	LIBDIR=%{_libdir}
 
diff --git a/wpa_supplicant-0.7.2-generate-libeap-peer.patch b/wpa_supplicant-0.7.2-generate-libeap-peer.patch
index a719a05..cae9e2c 100644
--- a/wpa_supplicant-0.7.2-generate-libeap-peer.patch
+++ b/wpa_supplicant-0.7.2-generate-libeap-peer.patch
@@ -38,12 +38,9 @@ Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez at intel.com>
  5 files changed, 320 insertions(+), 8 deletions(-)
  create mode 100644 src/eap_peer/libeap0.pc
 
-diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
-index 3651056..58c067a 100644
---- a/src/eap_peer/Makefile
-+++ b/src/eap_peer/Makefile
-@@ -1,23 +1,193 @@
--all: libeap_peer.a
+--- wpa_supplicant-2.10/src/eap_peer/Makefile.libeap.orig	1970-01-01 01:00:00.000000000 +0100
++++ wpa_supplicant-2.10/src/eap_peer/Makefile.libeap	2023-10-25 20:38:09.894163431 +0200
+@@ -0,0 +1,193 @@
 +LIBEAP_NAME = libeap
 +LIBEAP_CURRENT = 0
 +LIBEAP_REVISION = 0
@@ -232,29 +229,11 @@ index 3651056..58c067a 100644
 +	rm $(DESTDIR)$(LIBDIR)/$(LIBEAP)
 +	rm -fr $(DESTDIR)$(INCLUDE_INSTALL_DIR)
 +	rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/libeap0.pc
- 
- clean:
--	rm -f *~ *.o *.so *.d *.gcno *.gcda *.gcov libeap_peer.a
--
--install:
--	if ls *.so >/dev/null 2>&1; then \
--		install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \
--		cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \
--	; fi
--
--include ../lib.rules
--
--CFLAGS += -DIEEE8021X_EAPOL
--
--LIB_OBJS= \
--	eap.o \
--	eap_methods.o
--
--libeap_peer.a: $(LIB_OBJS)
--	$(AR) crT $@ $?
++
++clean:
 +	rm -f *~ *.o *.so *.d *.gcno *.gcda *.gcov libeap.a $(LIBEAP) $(OBJS_lib)
- 
- -include $(OBJS:%.o=%.d)
++
++-include $(OBJS:%.o=%.d)
 diff --git a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c
 index 3b0af05..092f266 100644
 --- a/src/eap_peer/eap_methods.c
@@ -380,12 +359,10 @@ index 3b0af05..092f266 100644
   * eap_peer_unregister_methods - Unregister EAP peer methods
   *
   * This function is called at program termination to unregister all EAP peer
-diff --git a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h
-index 384c61b..b83a46f 100644
---- a/src/eap_peer/eap_methods.h
-+++ b/src/eap_peer/eap_methods.h
-@@ -32,6 +32,7 @@ EapType eap_peer_get_type(const char *name, int *vendor);
- const char * eap_get_name(int vendor, EapType type);
+--- wpa_supplicant-2.10/src/eap_peer/eap_methods.h.orig	2023-10-25 21:12:58.396182379 +0200
++++ wpa_supplicant-2.10/src/eap_peer/eap_methods.h	2023-10-25 21:15:46.048607461 +0200
+@@ -27,6 +27,7 @@ enum eap_type eap_peer_get_type(const ch
+ const char * eap_get_name(int vendor, enum eap_type type);
  size_t eap_get_names(char *buf, size_t buflen);
  char ** eap_get_names_as_string_array(size_t *num);
 +int eap_peer_register_methods(void);
diff --git a/wpa_supplicant-OPTCFLAGS.patch b/wpa_supplicant-OPTCFLAGS.patch
deleted file mode 100644
index 969fa72..0000000
--- a/wpa_supplicant-OPTCFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp -x '*.orig' wpa_supplicant-2.9.org/wpa_supplicant/Makefile wpa_supplicant-2.9/wpa_supplicant/Makefile
---- wpa_supplicant-2.9.org/wpa_supplicant/Makefile	2021-09-26 23:01:54.976837708 +0200
-+++ wpa_supplicant-2.9/wpa_supplicant/Makefile	2021-09-26 23:01:55.070171269 +0200
-@@ -3,7 +3,7 @@ CC=gcc
- endif
- 
- ifndef CFLAGS
--CFLAGS = -MMD -O2 -Wall -g
-+CFLAGS = -MMD $(OPTCFLAGS) -Wall -g
- endif
- 
- ifdef LIBS
diff --git a/wpa_supplicant-gui-qt4.patch b/wpa_supplicant-gui-qt4.patch
index 931b680..aab6f17 100644
--- a/wpa_supplicant-gui-qt4.patch
+++ b/wpa_supplicant-gui-qt4.patch
@@ -9,11 +9,10 @@ different locations.
  wpa_supplicant/Makefile | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff -urNp -x '*.orig' wpa_supplicant-2.9.org/wpa_supplicant/Makefile wpa_supplicant-2.9/wpa_supplicant/Makefile
---- wpa_supplicant-2.9.org/wpa_supplicant/Makefile	2021-09-26 23:01:55.206838269 +0200
-+++ wpa_supplicant-2.9/wpa_supplicant/Makefile	2021-09-26 23:01:55.293505147 +0200
-@@ -22,6 +22,9 @@ export INCDIR ?= /usr/local/include/
- export BINDIR ?= /usr/local/sbin/
+--- wpa_supplicant-2.10/wpa_supplicant/Makefile.orig	2023-10-25 20:25:14.325031717 +0200
++++ wpa_supplicant-2.10/wpa_supplicant/Makefile	2023-10-25 20:32:58.929181407 +0200
+@@ -35,6 +35,9 @@ export INCDIR ?= /usr/local/include
+ export BINDIR ?= /usr/local/sbin
  PKG_CONFIG ?= pkg-config
  
 +QMAKE ?= qmake
@@ -22,7 +21,7 @@ diff -urNp -x '*.orig' wpa_supplicant-2.9.org/wpa_supplicant/Makefile wpa_suppli
  CFLAGS += $(EXTRA_CFLAGS)
  CFLAGS += -I$(abspath ../src)
  CFLAGS += -I$(abspath ../src/utils)
-@@ -2021,10 +2024,10 @@ wpa_gui:
+@@ -2044,10 +2047,10 @@ wpa_gui:
  	@echo "wpa_gui has been removed - see wpa_gui-qt4 for replacement"
  
  wpa_gui-qt4/Makefile:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wpa_supplicant.git/commitdiff/5357058fd271e292b850a34a448620fb663acc72

More information about the pld-cvs-commit mailing list