Accepting request 1233845 from network:vpn

- Set %_buildshell because of bashisms in build recipe ([[ and =~)
- Replace over-the-top `find -exec rm` by just -delete (forwarded request 1232791 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/1233845
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openvpn?expand=0&rev=117
This commit is contained in:
Ana Guerrero 2024-12-30 11:50:53 +00:00 committed by Git OBS Bridge
commit 1cb5b5ef09
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 20 08:13:18 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Set %_buildshell because of bashisms in build recipe
- Replace over-the-top `find -exec rm` by just -delete
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 10 08:13:54 UTC 2024 - Rahul Jain <rahul.jain@suse.com> Thu Oct 10 08:13:54 UTC 2024 - Rahul Jain <rahul.jain@suse.com>

View File

@ -16,6 +16,7 @@
# #
%define _buildshell /bin/bash
%if ! %{defined _rundir} %if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run %define _rundir %{_localstatedir}/run
%endif %endif
@ -37,7 +38,7 @@ Source9: %{name}.target
Source10: %{name}-tmpfile.conf Source10: %{name}-tmpfile.conf
Source11: rc%{name} Source11: rc%{name}
Patch1: %{name}-2.3-plugin-man.dif Patch1: %{name}-2.3-plugin-man.dif
Patch2: openvpn-CVE-2024-28882.patch Patch2: openvpn-CVE-2024-28882.patch
BuildRequires: iproute2 BuildRequires: iproute2
BuildRequires: libcap-ng-devel BuildRequires: libcap-ng-devel
BuildRequires: liblz4-devel BuildRequires: liblz4-devel
@ -121,7 +122,6 @@ This package provides the header file to build external plugins.
%prep %prep
%autosetup -p0 %autosetup -p0
sed -e "s|\" __DATE__|$(date '+%%b %%e %%Y' -r version.m4)\"|g" \ sed -e "s|\" __DATE__|$(date '+%%b %%e %%Y' -r version.m4)\"|g" \
-i src/openvpn/options.c -i src/openvpn/options.c
sed -e "s|@PLUGIN_LIBDIR@|%{_libdir}/openvpn/plugins|g" \ sed -e "s|@PLUGIN_LIBDIR@|%{_libdir}/openvpn/plugins|g" \
@ -159,7 +159,7 @@ fi
%install %install
%make_install %make_install
find %{buildroot} -type f -name "*.la" -print -exec rm -f {} + find %{buildroot} -type f -name "*.la" -print -delete
mkdir -p %{buildroot}/%{_sysconfdir}/openvpn mkdir -p %{buildroot}/%{_sysconfdir}/openvpn
mkdir -p %{buildroot}/%{_rundir}/openvpn mkdir -p %{buildroot}/%{_rundir}/openvpn
mkdir -p %{buildroot}/%{_datadir}/openvpn mkdir -p %{buildroot}/%{_datadir}/openvpn
@ -179,7 +179,7 @@ install -m 755 %{SOURCE5} sample/sample-scripts/client-netconfig.down
# we install docs via spec into _defaultdocdir/name/management-notes.txt # we install docs via spec into _defaultdocdir/name/management-notes.txt
rm -rf %{buildroot}%{_datadir}/doc/{OpenVPN,%{name}} rm -rf %{buildroot}%{_datadir}/doc/{OpenVPN,%{name}}
find sample -name .gitignore -exec rm -f {} + find sample -name .gitignore -delete
%pre %pre
%service_add_pre %{name}.target %service_add_pre %{name}.target