rpm/openvpn
SHA256
1
0
Fork 0
forked from pool/openvpn
Code Pull Requests Activity

Accepting request 501441 from home:ndas:branches:network:vpn

Browse Source 
- cleanup the spec file

OBS-URL: https://build.opensuse.org/request/show/501441
OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=120
This commit is contained in:
Nirmoy Das 2017-06-06 15:27:51 +00:00 committed by Git OBS Bridge
parent ea6e8a6af9
commit 0c21985672
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openvpn.changes
View File

@ -16,6 +16,7 @@ Tue Jun 6 14:59:29 CEST 2017 - ndas@suse.de
*openvpn-2.3.x-fixed-multiple-low-severity-issues.patch *openvpn-2.3.x-fixed-multiple-low-severity-issues.patch
*openvpn-fips140-2.3.2.patch] *openvpn-fips140-2.3.2.patch]
- pkcs11-helper-devel >= 1.11 is needed for openvpn-2.4.2 - pkcs11-helper-devel >= 1.11 is needed for openvpn-2.4.2
- cleanup the spec file
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 21 14:55:09 CEST 2017 - ndas@suse.de Fri Apr 21 14:55:09 CEST 2017 - ndas@suse.de

44
openvpn.spec
View File

@ -147,14 +147,14 @@ sed -e "s|\" __DATE__|$(date '+%b %e %Y' -r version.m4)\"|g" \
sed -e "s|@PLUGIN_LIBDIR@|%{_libdir}/openvpn/plugins|g" \ sed -e "s|@PLUGIN_LIBDIR@|%{_libdir}/openvpn/plugins|g" \
-e "s|@PLUGIN_DOCDIR@|%{_defaultdocdir}/%{name}|g" \ -e "s|@PLUGIN_DOCDIR@|%{_defaultdocdir}/%{name}|g" \
-i doc/openvpn.8 -i doc/openvpn.8
sed -e "s|/var/run|%{_rundir}|g" < \ sed -e "s|%{_localstatedir}/run|%{_rundir}|g" < \
$RPM_SOURCE_DIR/%{name}.service > %{name}.service $RPM_SOURCE_DIR/%{name}.service > %{name}.service
# %%doc items shouldn't be executable. # %%doc items shouldn't be executable.
find contrib sample -type f -exec chmod a-x \{\} \; find contrib sample -type f -exec chmod a-x \{\} \;
%build %build
export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) -W -Wall -fno-strict-aliasing" export CFLAGS="%{optflags} $(getconf LFS_CFLAGS) -W -Wall -fno-strict-aliasing"
export LDFLAGS export LDFLAGS
%configure \ %configure \
--enable-iproute2 \ --enable-iproute2 \
@ -169,14 +169,14 @@ export LDFLAGS
--enable-plugin-auth-pam \ --enable-plugin-auth-pam \
CFLAGS="$CFLAGS $(getconf LFS_CFLAGS) -fPIE $PLUGIN_DEFS" \ CFLAGS="$CFLAGS $(getconf LFS_CFLAGS) -fPIE $PLUGIN_DEFS" \
LDFLAGS="$LDFLAGS -pie -lpam -rdynamic -Wl,-rpath,%{_libdir}/%{name}/plugins" LDFLAGS="$LDFLAGS -pie -lpam -rdynamic -Wl,-rpath,%{_libdir}/%{name}/plugins"
make make %{_smp_mflags}
%install %install
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f find %{buildroot} -type f -name "*.la" -delete -print
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openvpn mkdir -p %{buildroot}/%{_sysconfdir}/openvpn
mkdir -p $RPM_BUILD_ROOT/%{_rundir}/openvpn mkdir -p %{buildroot}/%{_rundir}/openvpn
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openvpn mkdir -p %{buildroot}/%{_datadir}/openvpn
%if %{with_systemd} %if %{with_systemd}
rm %{buildroot}%{_libdir}/systemd/system/openvpn-client@.service rm %{buildroot}%{_libdir}/systemd/system/openvpn-client@.service
rm %{buildroot}%{_libdir}/systemd/system/openvpn-server@.service rm %{buildroot}%{_libdir}/systemd/system/openvpn-server@.service
@ -187,36 +187,36 @@ install -D -m 755 $RPM_SOURCE_DIR/rc%{name} %{buildroot}%{_sbindir}/rc%{name}
mkdir -p %{buildroot}%{_libdir}/tmpfiles.d mkdir -p %{buildroot}%{_libdir}/tmpfiles.d
install -m 0644 $RPM_SOURCE_DIR/%{name}-tmpfile.conf %{buildroot}%{_libdir}/tmpfiles.d/%{name}.conf install -m 0644 $RPM_SOURCE_DIR/%{name}-tmpfile.conf %{buildroot}%{_libdir}/tmpfiles.d/%{name}.conf
%else %else
install -D -m 755 $RPM_SOURCE_DIR/openvpn.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/openvpn install -D -m 755 $RPM_SOURCE_DIR/openvpn.init %{buildroot}/%{_sysconfdir}/init.d/openvpn
ln -sv %{_sysconfdir}/init.d/openvpn $RPM_BUILD_ROOT/%{_sbindir}/rcopenvpn ln -sv %{_sysconfdir}/init.d/openvpn %{buildroot}/%{_sbindir}/rcopenvpn
# the /etc/sysconfig/openvpn template only with sysvinit, no needed with systemd # the /etc/sysconfig/openvpn template only with sysvinit, no needed with systemd
install -d -m0755 %{buildroot}/var/adm/fillup-templates install -d -m0755 %{buildroot}%{_localstatedir}/adm/fillup-templates
install -m0600 $RPM_SOURCE_DIR/openvpn.sysconfig \ install -m0600 $RPM_SOURCE_DIR/openvpn.sysconfig \
%{buildroot}/var/adm/fillup-templates/sysconfig.openvpn %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.openvpn
%endif %endif
cp -p $RPM_SOURCE_DIR/openvpn.README.SUSE README.SUSE cp -p $RPM_SOURCE_DIR/openvpn.README.SUSE README.SUSE
install -m 755 $RPM_SOURCE_DIR/client-netconfig.up sample/sample-scripts/client-netconfig.up install -m 755 $RPM_SOURCE_DIR/client-netconfig.up sample/sample-scripts/client-netconfig.up
install -m 755 $RPM_SOURCE_DIR/client-netconfig.down sample/sample-scripts/client-netconfig.down install -m 755 $RPM_SOURCE_DIR/client-netconfig.down 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 $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name} rm -rf %{buildroot}%{_datadir}/doc/{OpenVPN,%{name}}
find sample -name .gitignore | xargs rm -f find sample -name .gitignore | xargs rm -f
%post %post
%if %{with_systemd} %if %{with_systemd}
systemd-tmpfiles --create /usr/lib64/tmpfiles.d/%{name}.conf ||: systemd-tmpfiles --create %{_libdir}/tmpfiles.d/%{name}.conf ||:
%service_add_post %{name}.target %service_add_post %{name}.target
# try to migrate openvpn.service autostart to openvpn@<CONF>.service # try to migrate openvpn.service autostart to openvpn@<CONF>.service
if test ${FIRST_ARG:-$1} -ge 1 -a \ if test ${FIRST_ARG:-$1} -ge 1 -a \
-x /bin/systemctl -a \ -x /bin/systemctl -a \
-f /etc/sysconfig/openvpn -a \ -f %{_sysconfdir}/sysconfig/openvpn -a \
-f /var/adm/fillup-templates/sysconfig.openvpn && \ -f %{_localstatedir}/adm/fillup-templates/sysconfig.openvpn && \
/bin/systemctl --quiet is-enabled openvpn.service &>/dev/null ; /bin/systemctl --quiet is-enabled openvpn.service &>/dev/null ;
then then
. /etc/sysconfig/openvpn . %{_sysconfdir}/sysconfig/openvpn
try_service_cgroup_join() try_service_cgroup_join()
{ {
local p="/var/run/openvpn/${1}.pid" local p="%{_localstatedir}/run/openvpn/${1}.pid"
local t="/sys/fs/cgroup/systemd/system/openvpn@.service/${1}" local t="/sys/fs/cgroup/systemd/system/openvpn@.service/${1}"
/sbin/checkproc -p "$p" "%{_sbindir}/openvpn" &>/dev/null || return 0 /sbin/checkproc -p "$p" "%{_sbindir}/openvpn" &>/dev/null || return 0
test -d "$t" || mkdir -p "$t" 2>/dev/null || return 1 test -d "$t" || mkdir -p "$t" 2>/dev/null || return 1
@ -224,22 +224,22 @@ then
} }
if test "X$OPENVPN_AUTOSTART" != "X" ; then if test "X$OPENVPN_AUTOSTART" != "X" ; then
for conf in $OPENVPN_AUTOSTART ; do for conf in $OPENVPN_AUTOSTART ; do
test -f "/etc/openvpn/${conf}.conf" && \ test -f "%{_sysconfdir}/openvpn/${conf}.conf" && \
/bin/systemctl enable "openvpn@${conf}.service" && \ /bin/systemctl enable "openvpn@${conf}.service" && \
try_service_cgroup_join "$conf" || continue try_service_cgroup_join "$conf" || continue
done done
else else
shopt -s nullglob || : shopt -s nullglob || :
for conf in /etc/openvpn/*.conf ; do for conf in %{_sysconfdir}/openvpn/*.conf ; do
conf=${conf##*/} conf=${conf##*/}
conf=${conf%.conf} conf=${conf%.conf}
test -f "/etc/openvpn/${conf}.conf" && \ test -f "%{_sysconfdir}/openvpn/${conf}.conf" && \
/bin/systemctl enable "openvpn@${conf}.service" && \ /bin/systemctl enable "openvpn@${conf}.service" && \
try_service_cgroup_join "$conf" || continue try_service_cgroup_join "$conf" || continue
done done
fi fi
fi fi
rm -f /etc/sysconfig/openvpn || : rm -f %{_sysconfdir}/sysconfig/openvpn || :
%else %else
%{?fillup_and_insserv:%fillup_and_insserv} %{?fillup_and_insserv:%fillup_and_insserv}
%endif %endif
@ -278,7 +278,7 @@ rm -f /etc/sysconfig/openvpn || :
%dir %attr(0750,root,root) %ghost %{_rundir}/openvpn/ %dir %attr(0750,root,root) %ghost %{_rundir}/openvpn/
%else %else
%config %{_sysconfdir}/init.d/openvpn %config %{_sysconfdir}/init.d/openvpn
/var/adm/fillup-templates/sysconfig.openvpn %{_localstatedir}/adm/fillup-templates/sysconfig.openvpn
%dir %attr(750,root,root) %{_rundir}/openvpn/ %dir %attr(750,root,root) %{_rundir}/openvpn/
%endif %endif
%{_sbindir}/rcopenvpn %{_sbindir}/rcopenvpn