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

Accepting request 547614 from security:Stunnel

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/547614
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/stunnel?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2017-12-04 11:16:14 +00:00 committed by Git OBS Bridge
commit 05e67b4bc6
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stunnel.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:54:29 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 17 12:23:45 UTC 2017 - vetter@physik.uni-wuerzburg.de Thu Aug 17 12:23:45 UTC 2017 - vetter@physik.uni-wuerzburg.de

11
stunnel.spec
View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
Name: stunnel Name: stunnel
Version: 5.42 Version: 5.42
Release: 0 Release: 0
@ -89,8 +94,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
cp -p %{S:1} tools/stunnel.conf-sample.%VENDOR cp -p %{S:1} tools/stunnel.conf-sample.%VENDOR
cp -p %{S:2} README.%VENDOR cp -p %{S:2} README.%VENDOR
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
cp -p %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/ cp -p %{S:3} $RPM_BUILD_ROOT%{_fillupdir}/
%if 0%{?has_systemd} %if 0%{?has_systemd}
install -D -m 0644 $RPM_SOURCE_DIR/stunnel.service $RPM_BUILD_ROOT/%_unitdir/stunnel.service install -D -m 0644 $RPM_SOURCE_DIR/stunnel.service $RPM_BUILD_ROOT/%_unitdir/stunnel.service
ln -s service $RPM_BUILD_ROOT/usr/sbin/rcstunnel ln -s service $RPM_BUILD_ROOT/usr/sbin/rcstunnel
@ -170,7 +175,7 @@ fi
%dir %attr(755,root,root) /var/lib/stunnel/sbin %dir %attr(755,root,root) /var/lib/stunnel/sbin
%dir %attr(755,root,root) /var/lib/stunnel/var %dir %attr(755,root,root) /var/lib/stunnel/var
%dir %attr(755,stunnel,root) /var/lib/stunnel/var/run %dir %attr(755,stunnel,root) /var/lib/stunnel/var/run
/var/adm/fillup-templates/sysconfig.syslog-stunnel %{_fillupdir}/sysconfig.syslog-stunnel
%if 0%{?has_systemd} %if 0%{?has_systemd}
%_unitdir/stunnel.service %_unitdir/stunnel.service
%else %else