commit 21f2338d1bd2337701d62b12c2472e5692fbd582
Author: Jan Rękorajski <[email protected]>
Date: Sun Sep 26 23:03:09 2021 +0200
- rediff patches, rebuild with openssl 3.0.0, rel 4
wpa_supplicant-OPTCFLAGS.patch | 10 +++++-----
wpa_supplicant-gui-qt4.patch | 18 +++++++-----------
wpa_supplicant-makefile.patch | 15 ++++++++-------
wpa_supplicant.spec | 2 +-
4 files changed, 21 insertions(+), 24 deletions(-)
---
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 6eafeac..9e3fc9d 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -12,7 +12,7 @@ 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: 3
+Release: 4
License: BSD
Group: Networking
Source0: http://w1.fi/releases/%{name}-%{version}.tar.gz
diff --git a/wpa_supplicant-OPTCFLAGS.patch b/wpa_supplicant-OPTCFLAGS.patch
index d7864e7..969fa72 100644
--- a/wpa_supplicant-OPTCFLAGS.patch
+++ b/wpa_supplicant-OPTCFLAGS.patch
@@ -1,7 +1,7 @@
-diff -Nur wpa_supplicant-0.5.4/wpa_supplicant/Makefile
wpa_supplicant-0.5.4.OPTCFLAGS/wpa_supplicant/Makefile
---- wpa_supplicant-0.5.4/wpa_supplicant/Makefile 2006-08-03
19:30:41.000000000 +0000
-+++ wpa_supplicant-0.5.4.OPTCFLAGS/wpa_supplicant/Makefile 2006-08-03
19:30:42.000000000 +0000
-@@ -3,7 +3,7 @@
+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
@@ -9,4 +9,4 @@ diff -Nur wpa_supplicant-0.5.4/wpa_supplicant/Makefile
wpa_supplicant-0.5.4.OPTC
+CFLAGS = -MMD $(OPTCFLAGS) -Wall -g
endif
- # Include directories for CVS version
+ ifdef LIBS
diff --git a/wpa_supplicant-gui-qt4.patch b/wpa_supplicant-gui-qt4.patch
index c54cd9a..931b680 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 --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
-index ad9ead9..b19676d 100644
---- a/wpa_supplicant/Makefile
-+++ b/wpa_supplicant/Makefile
-@@ -11,6 +11,9 @@ export INCDIR ?= /usr/local/include/
+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/
PKG_CONFIG ?= pkg-config
@@ -23,7 +22,7 @@ index ad9ead9..b19676d 100644
CFLAGS += $(EXTRA_CFLAGS)
CFLAGS += -I$(abspath ../src)
CFLAGS += -I$(abspath ../src/utils)
-@@ -1787,10 +1790,10 @@ wpa_gui:
+@@ -2021,10 +2024,10 @@ wpa_gui:
@echo "wpa_gui has been removed - see wpa_gui-qt4 for replacement"
wpa_gui-qt4/Makefile:
@@ -34,8 +33,5 @@ index ad9ead9..b19676d 100644
- lrelease wpa_gui-qt4/wpa_gui.pro
+ $(LRELEASE) wpa_gui-qt4/wpa_gui.pro
- wpa_gui-qt4: wpa_gui-qt4/Makefile wpa_gui-qt4/lang/wpa_gui_de.qm
- $(MAKE) -C wpa_gui-qt4
---
-2.6.2
-
+ .PHONY: wpa_gui-qt4
+
diff --git a/wpa_supplicant-makefile.patch b/wpa_supplicant-makefile.patch
index ef229bb..5adab23 100644
--- a/wpa_supplicant-makefile.patch
+++ b/wpa_supplicant-makefile.patch
@@ -1,17 +1,18 @@
---- wpa_supplicant-1.0/wpa_supplicant/Makefile.orig 2012-05-09
23:56:09.000000000 +0200
-+++ wpa_supplicant-1.0/wpa_supplicant/Makefile 2012-05-22 17:15:38.836468705
+0200
-@@ -53,6 +53,8 @@
+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 2019-08-07
15:25:25.000000000 +0200
++++ wpa_supplicant-2.9/wpa_supplicant/Makefile 2021-09-26 23:01:54.840170708
+0200
+@@ -84,6 +84,8 @@ $(DESTDIR)$(BINDIR)/%: %
install -D $(<) $(@)
install: $(addprefix $(DESTDIR)$(BINDIR)/,$(BINALL))
+ mkdir -p $(DESTDIR)/etc
+ cp wpa_supplicant.conf $(DESTDIR)/etc
$(MAKE) -C ../src install
-
- OBJS = config.o
-@@ -1483,6 +1483,8 @@
+ ifdef CONFIG_BUILD_WPA_CLIENT_SO
+ install -m 0644 -D libwpa_client.so
$(DESTDIR)/$(LIBDIR)/libwpa_client.so
+@@ -2024,6 +2026,8 @@ wpa_gui-qt4/Makefile:
wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts
- lrelease-qt4 wpa_gui-qt4/wpa_gui.pro
+ lrelease wpa_gui-qt4/wpa_gui.pro
+.PHONY: wpa_gui-qt4
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wpa_supplicant.git/commitdiff/21f2338d1bd2337701d62b12c2472e5692fbd582
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
