updated 2 packages

lzip-1.22-1

wpa_supplicant-2.9-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12558 ec354946-7b23-47d6-9f5a-488ba84defc7

l/lzip/lzip-vl.spec

@@ -1,9 +1,11 @@
 Name:           lzip
-Version:        1.18
-Release:        2%{?_dist_release}
+Version:        1.22
+Release:        1%{?_dist_release}
 Summary:        LZMA compressor with integrity checking
+Group:          accessories
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          Applications/Archiving
 License:        GPLv3+
 URL:            http://www.nongnu.org/lzip/lzip.html
 Source0:        http://download.savannah.gnu.org/releases/lzip/lzip-%{version}.tar.gz
@@ -22,10 +24,14 @@ multiple files, tar can be used with lzip. Please note, that the lzip file
 format (.lz) is not compatible with the lzma file format (.lzma).
 
 
+%debug_package
+
+
 %prep
 %setup -q
 #%patch0 -p1 -b .missing_cstdio
 
+
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
@@ -66,6 +72,9 @@ fi
 
 
 %changelog
+* Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22-1
+- new upstream release.
+
 * Fri Sep 02 2016 Toshiaki Ara <ara_t@384.jp> 1.18-2
 - rebuild with gcc-5.4.0
 

w/wpa_supplicant/wpa_supplicant-vl.spec

@@ -1,20 +1,23 @@
-%define build_gui 1
+%bcond_with systemd
+%bcond_with gui
 
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Version: 2.9
-Release: 1%{?_dist_release}
-Group: System Environment/Base
-License: BSD
-URL: https://w1.fi/wpa_supplicant/
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Group: network,system
 Vendor: Project Vine
 Distribution: Vine Linux
 
+License: BSD
+URL: https://w1.fi/wpa_supplicant/
 Source0: https://w1.fi/releases/%{name}-%{version}.tar.gz
 Source2: %{name}.conf
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
 Source6: %{name}.logrotate
+Source100: %{name}.service
+Source101: %{name}.sysconfig.systemd
 
 # distro specific customization and not suitable for upstream,
 # Fedora-specific updates to defconfig
@@ -31,10 +34,21 @@ Patch4: wpa_supplicant-gui-qt4.patch
 # fix AP mode PMF disconnection protection bypass
 Patch5: 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
 
+# fix some issues with P2P operation
+Patch6: 0001-P2P-Always-use-global-p2p_long_listen.patch
+Patch7: 0001-D-Bus-Fix-P2P-NULL-dereference-after-interface-remov.patch
+Patch8: 0001-p2p-Limit-P2P_DEVICE-name-to-appropriate-ifname-size.patch
+
+#fix for bz1915236
+Patch9: 0001-D-Bus-Allow-changing-an-interface-bridge-via-D-Bus.patch
+
+#expose OWE capability in D-Bus
+Patch10: 0001-dbus-Export-OWE-capability-and-OWE-BSS-key_mgmt.patch
+
 ## Vine patches
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-%if %{build_gui}
+%if %{with gui}
 BuildRequires: qt4-devel
 %endif
 BuildRequires: openssl-devel
@@ -42,10 +56,13 @@ BuildRequires: readline-devel
 BuildRequires: dbus-devel
 BuildRequires: libnl3-devel
 BuildRequires: docbook-utils
-
+%if %{with systemd}
+%{?systemd_requires}
+%else
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig /sbin/service
 Requires(postun): /sbin/service
+%endif
 
 %description
 wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support 
@@ -54,11 +71,12 @@ component that is used in the client stations. It implements key negotiation
 with a WPA Authenticator and it controls the roaming and IEEE 802.11 
 authentication/association of the wlan driver.
 
-%if %{build_gui}
+
+%if %{with gui}
 %package gui
 Summary: Graphical User Interface for %{name}
 Summary(ja): %{name} のグラフィカルユーザインタフェース
-Group: Applications/System
+Group: admin-tools
 
 %description gui
 Graphical User Interface for wpa_supplicant written using QT4
@@ -68,6 +86,9 @@ QT4 を用いた wpa_supplicant のグラフィカルユーザインタフェー
 %endif
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %autopatch -p1
@@ -84,7 +105,7 @@ pushd wpa_supplicant
   export BINDIR="%{_sbindir}"
   export LIBDIR="%{_libdir}"
   make %{_smp_mflags} V=1
-%if %{build_gui}
+%if %{with gui}
   make wpa_gui-qt4 %{_smp_mflags} V=1 QTDIR=%{_libdir}/qt4
 %endif
   make eapol_test
@@ -93,13 +114,21 @@ popd
 %install
 rm -rf %{buildroot}
 
+%if %{with systemd}
+# systemd unit
+install -D -m 0644 %{SOURCE100} %{buildroot}%{_unitdir}/%{name}.service
+install -D -m 0644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%else
 # init scripts
-install -D -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/rc.d/init.d/%{name}
-install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
-install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
+install -D -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
+install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%endif
+
+# logrotate
+install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 # config
-install -D -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
+install -D -m 0600 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 
 # binary
 install -d %{buildroot}/%{_sbindir}
@@ -112,7 +141,7 @@ install -D -m 0644 %{name}/dbus/dbus-wpa_supplicant.conf \
 install -D -m 0644 %{name}/dbus/fi.w1.wpa_supplicant1.service \
   %{buildroot}/%{_datadir}/dbus-1/system-services/fi.w1.wpa_supplicant1.service
 
-%if %{build_gui}
+%if %{with gui}
 # gui
 install -d %{buildroot}/%{_bindir}
 install -m 0755 %{name}/wpa_gui-qt4/wpa_gui %{buildroot}/%{_bindir}
@@ -131,25 +160,40 @@ rm -f  %{name}/doc/.cvsignore
 rm -rf %{name}/doc/docbook
 chmod -R 0644 %{name}/examples/*.py
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
+%if %{with systemd}
+%systemd_post wpa_supplicant.service
+%else
 if [ $1 = 1 ]; then
     /sbin/chkconfig --add %{name}
 fi
+%endif
 
 %preun
-if [ $1 = 0 ]; then
+%if %{with systemd}
+%systemd_preun wpa_supplicant.service
+%else
+if [ $1 = 0 -o -x /bin/systemctl ]; then
     /sbin/service %{name} stop > /dev/null 2>&1
     killall -TERM wpa_supplicant >/dev/null 2>&1
     /sbin/chkconfig --del %{name}
 fi
+%endif
 
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart wpa_supplicant.service
+%else
 if [ $1 -ge 1 ]; then
     /sbin/service %{name} condrestart > /dev/null 2>&1
 fi
+%endif
+
 
 %files
 %defattr(-, root, root)
@@ -158,7 +202,11 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%if %{with systemd}
+%{_unitdir}/%{name}.service
+%else
 %{_sysconfdir}/rc.d/init.d/%{name}
+%endif
 %{_sysconfdir}/dbus-1/system.d/%{name}.conf
 %{_datadir}/dbus-1/system-services/fi.w1.wpa_supplicant1.service
 %{_sbindir}/wpa_passphrase
@@ -170,13 +218,19 @@ fi
 %{_mandir}/man8/*
 %{_mandir}/man5/*
 
-%if %{build_gui}
+%if %{with gui}
 %files gui
 %defattr(-, root, root)
 %{_bindir}/wpa_gui
 %endif
 
+
 %changelog
+* Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.9-2
+- diasabled gui as default.
+- added systemd support (disabled as default).
+- replaced all patches to rawhide's.
+
 * Tue Mar 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.9-1
 - new upstream release.
 - replaced all patches to rawhide's.