From 15e411d7b67dced70106de4b5dbbfe4b96bcf2ac41c055fcdbf19a5c6d57df88 Mon Sep 17 00:00:00 2001 From: Andreas Vetter Date: Fri, 22 Feb 2019 09:52:05 +0000 Subject: [PATCH] Accepting request 678172 from home:fbui:branches:security:Stunnel - Drop use of $FIRST_ARG in .spec The use of $FIRST_ARG was probably required because of the %service_* rpm macros were playing tricks with the shell positional parameters. This is bad practice and error prones so let's assume that no macros should do that anymore and hence it's safe to assume that positional parameters remains unchanged after any rpm macro call. OBS-URL: https://build.opensuse.org/request/show/678172 OBS-URL: https://build.opensuse.org/package/show/security:Stunnel/stunnel?expand=0&rev=105 --- stunnel.changes | 12 ++++++++++++ stunnel.spec | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/stunnel.changes b/stunnel.changes index 859e131..3deebc9 100644 --- a/stunnel.changes +++ b/stunnel.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 22 07:49:21 UTC 2019 - Franck Bui + +- Drop use of $FIRST_ARG in .spec + + The use of $FIRST_ARG was probably required because of the + %service_* rpm macros were playing tricks with the shell positional + parameters. This is bad practice and error prones so let's assume + that no macros should do that anymore and hence it's safe to assume + that positional parameters remains unchanged after any rpm macro + call. + ------------------------------------------------------------------- Sun Nov 11 11:08:22 UTC 2018 - obs@botter.cc diff --git a/stunnel.spec b/stunnel.spec index f0c8ffb..044b68c 100644 --- a/stunnel.spec +++ b/stunnel.spec @@ -1,7 +1,7 @@ # # spec file for package stunnel # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -154,7 +154,7 @@ if ! test -s etc/stunnel/stunnel.conf; then echo copying default config file to %{_sysconfdir}/stunnel/stunnel.conf fi # first installation? -if [ ${FIRST_ARG:-0} = 1 ] && [ ! -f etc/stunnel/stunnel.pem ]; then +if [ $1 = 1 ] && [ ! -f etc/stunnel/stunnel.pem ]; then cat usr/share/doc/packages/stunnel/README.%{VENDORAFFIX} fi