Hello community, here is the log from the commit of package stunnel for openSUSE:Factory checked in at 2018-02-06 16:50:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stunnel (Old) and /work/SRC/openSUSE:Factory/.stunnel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stunnel" Tue Feb 6 16:50:03 2018 rev:11 rq:573241 version:5.44 Changes: -------- --- /work/SRC/openSUSE:Factory/stunnel/stunnel.changes 2018-02-02 22:21:39.203636938 +0100 +++ /work/SRC/openSUSE:Factory/.stunnel.new/stunnel.changes 2018-02-06 16:50:04.273493499 +0100 @@ -1,0 +2,7 @@ +Thu Feb 1 23:07:21 UTC 2018 - [email protected] + +- Do not ignore errors from useradd. Ensure nogroup exists + beforehand. +- Replace old $RPM_ variables. Combine two nested ifs. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stunnel.spec ++++++ --- /var/tmp/diff_new_pack.fy4gjB/_old 2018-02-06 16:50:05.949415015 +0100 +++ /var/tmp/diff_new_pack.fy4gjB/_new 2018-02-06 16:50:05.957414640 +0100 @@ -53,6 +53,9 @@ PreReq: %{_sbindir}/useradd PreReq: fileutils PreReq: textutils +%if 0%{?suse_version} >= 1500 +Requires(pre): group(nogroup) +%endif %description The stunnel program is designed to work as an SSL encryption wrapper @@ -77,8 +80,8 @@ %prep %setup -q -n stunnel-%{version} %patch0 -p1 -chmod -x $RPM_BUILD_DIR/stunnel-%{version}/tools/ca.* -chmod -x $RPM_BUILD_DIR/stunnel-%{version}/tools/importCA.* +chmod -x %{_builddir}/stunnel-%{version}/tools/ca.* +chmod -x %{_builddir}/stunnel-%{version}/tools/importCA.* %build sed -i 's/-m 1770 -g nogroup//g' tools/Makefile.in @@ -101,11 +104,11 @@ mkdir -p %{buildroot}%{_fillupdir} cp -p %{SOURCE3} %{buildroot}%{_fillupdir}/ %if 0%{?has_systemd} -install -D -m 0644 $RPM_SOURCE_DIR/stunnel.service %{buildroot}/%{_unitdir}/stunnel.service +install -D -m 0644 %{_sourcedir}/stunnel.service %{buildroot}/%{_unitdir}/stunnel.service ln -s service %{buildroot}%{_sbindir}/rcstunnel %else mkdir -p %{buildroot}%{_initddir}/ -install -m 744 $RPM_SOURCE_DIR/stunnel.rc %{buildroot}%{_initddir}/stunnel +install -m 744 %{_sourcedir}/stunnel.rc %{buildroot}/%{_initddir}/stunnel ln -s ../..%{_initddir}/stunnel %{buildroot}%{_sbindir}/rcstunnel %endif mv %{buildroot}/%{_sysconfdir}/stunnel/stunnel.conf-sample tools/stunnel.conf-sample @@ -120,7 +123,7 @@ %pre if ! %{_bindir}/getent passwd stunnel >/dev/null; then %{_sbindir}/useradd -r -c "Daemon user for stunnel (universal SSL tunnel)" -g nogroup -s /bin/false \ - -d %{_localstatedir}/lib/stunnel stunnel || : + -d %{_localstatedir}/lib/stunnel stunnel fi %if 0%{?has_systemd} @@ -139,11 +142,9 @@ echo copying default config file to %{_sysconfdir}/stunnel/stunnel.conf fi # first installation? -if [ ${FIRST_ARG:-0} = 1 ]; then -if ! test -f etc/stunnel/stunnel.pem; then +if [ ${FIRST_ARG:-0} = 1 ] && [ ! -f etc/stunnel/stunnel.pem ]; then cat usr/share/doc/packages/stunnel/README.%{VENDOR} fi -fi %preun %if 0%{?has_systemd}
