From bb2d5ed4859cba54acb3eb9e607e71fd5e0e9ff3c2d0a5dedec73389d6b4f9de Mon Sep 17 00:00:00 2001 From: Andreas Vetter Date: Thu, 15 Sep 2022 12:59:43 +0000 Subject: [PATCH] Accepting request 1002951 from home:dirkmueller:Factory - update to 5.66: * Fixed building on machines without pkg-config. * Added the missing "environ" declaration for BSD-based operating systems. * Fixed the passphrase dialog with OpenSSL 3.0. - package license - remove non-systemd case from spec file OBS-URL: https://build.opensuse.org/request/show/1002951 OBS-URL: https://build.opensuse.org/package/show/security:Stunnel/stunnel?expand=0&rev=154 --- stunnel-5.65.tar.gz | 3 - stunnel-5.65.tar.gz.asc | 18 ---- stunnel-5.66.tar.gz | 3 + stunnel-5.66.tar.gz.asc | 18 ++++ stunnel.changes | 10 ++ stunnel.keyring | 211 +++++++++++++++++++++------------------- stunnel.spec | 57 +++-------- 7 files changed, 156 insertions(+), 164 deletions(-) delete mode 100644 stunnel-5.65.tar.gz delete mode 100644 stunnel-5.65.tar.gz.asc create mode 100644 stunnel-5.66.tar.gz create mode 100644 stunnel-5.66.tar.gz.asc diff --git a/stunnel-5.65.tar.gz b/stunnel-5.65.tar.gz deleted file mode 100644 index 37c4027..0000000 --- a/stunnel-5.65.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc -size 872293 diff --git a/stunnel-5.65.tar.gz.asc b/stunnel-5.65.tar.gz.asc deleted file mode 100644 index cd2220c..0000000 --- a/stunnel-5.65.tar.gz.asc +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQKTBAABCgB9FiEEK8fk5n48wMG+py+MLvx/8NQW4BQFAmLUaMtfFIAAAAAALgAo -aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDJC -QzdFNEU2N0UzQ0MwQzFCRUE3MkY4QzJFRkM3RkYwRDQxNkUwMTQACgkQLvx/8NQW -4BRaaQ/+PGBdshTe1fhZR0IGQevwGl3lFzWpKoX6OFFxKfUwveiY5NqaQrIFf2iG -O/l86GstWmq0IaOEFvZ8lg3k+GtJolIvVYeN5DGGXBWiOEJkIozjztkVhO7YxbLu -b11K5pTs12TTXHx6Zrr7MfCkdBb/wf0Jie56G/7E85vWc4snU4LWEUCHM+OG+6tP -hYT4IHerKd8Y2V7AQuEx7BHaBOGA3kieYQa+KpL2i1szErsK/LkLVDFv/IeRN5TR -1nUGTqcE1UWIde4KCW4Y++pgVBZBFk5HeweOmDtsNX26kRVzaXAC08I6I65qYTw8 -c9NWJIDEwCMAzp4IX5v6JFdiE80BbefqLH025L26U7PuS2Zg4jg+V6OU1y9A4aLG -NP31axlmH77Z2WxsLytos6rVqBLYL8vpgP91fUlmoSvTOlBYumXMCRHuHYKqahs1 -pfsnBPl6p2mFUnzfJ04LlmLxsBK1huLRYH8wNdisxCwoaJMcb5fnJdJcZbWdJPUr -GcdAEYX/AuZdmzD4mLeH+7R6iyXAAYr2y9G6eGFTDwnDgwEKp9Wa229gppxfD0Qu -SYSFPzP7flsZNMQGBCeyfD6vc60dGLMxdWMKJveLEZ8fjdv7YOpAFreF3NshHHpv -FnViO7lGOGdsc3LHTDCkFpHCQK9IuYD4FqU68Dd14b4cW30VxX8= -=jK+1 ------END PGP SIGNATURE----- diff --git a/stunnel-5.66.tar.gz b/stunnel-5.66.tar.gz new file mode 100644 index 0000000..f57377d --- /dev/null +++ b/stunnel-5.66.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c +size 875128 diff --git a/stunnel-5.66.tar.gz.asc b/stunnel-5.66.tar.gz.asc new file mode 100644 index 0000000..216fe5c --- /dev/null +++ b/stunnel-5.66.tar.gz.asc @@ -0,0 +1,18 @@ +-----BEGIN PGP SIGNATURE----- + +iQKTBAABCgB9FiEEK8fk5n48wMG+py+MLvx/8NQW4BQFAmMeU9pfFIAAAAAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDJC +QzdFNEU2N0UzQ0MwQzFCRUE3MkY4QzJFRkM3RkYwRDQxNkUwMTQACgkQLvx/8NQW +4BT2CxAA1XmJt8kcafRvpKpW/Grh2wrza/ndcAHgikLvTVwwwmhUyPTbgIv3xTXY +d6FlzCcboopOObOZmr5PDKR0GRTHVkt+5tA6ZLqezF+pCkuKk89FREgmtkBZCHpy +ML4Hz8pU95gyQwZXMIpQjiaW8+4pT5zR9YHUWiAnbXvHGvIkC9O68N2Hz/Y7AQ9+ +lhEGrDPLRhq5+/BPLBJf7kfAYUfgA7tQoXVqPSBXjfLN9d9f3KtB3TQPTrVEXDZU +eUibDDE3wotVaN3e+6kUzMwray/gOu+7r/OhZBbbE+RzchKtP1VsDHSFVgiL85az +Jd/LjNziyx5pz09eHV3HSVWUVoyxddJXIozd2kr0k2+cU5YR+JB/K0FOAIdhg489 +otRYtTAFfG+mNaIDruMSh08zMbZIss8w7CmT7r9CClcLRp2R1+E+5UbVZzWJEaok +hdON7IBKl4Ya3SvVbnQ2jWxEKbwagSn11AGv1Fv36R73ecPOD/Zjj/uVh4M8sYFs +ZoVadmuypN/wr7uYS5wuxdIBv+sjJyIsQXAy62hZnhJoPfHZ2eS3DDsCF4mhece/ +JGWtwP4GcH+HWZS7m4ysChni9NW73TRI7Ip+kOicsCiSbUZ0fcjFhwtkxlyrK41k +6VFw6LXRuWrN4ZPeVc8jzFoZllaY+yfaX8pQGEUG44n+JV+lTZw= +=7/zL +-----END PGP SIGNATURE----- diff --git a/stunnel.changes b/stunnel.changes index 12fbd75..6c7182e 100644 --- a/stunnel.changes +++ b/stunnel.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 12 13:31:16 UTC 2022 - Dirk Müller + +- update to 5.66: + * Fixed building on machines without pkg-config. + * Added the missing "environ" declaration for BSD-based operating systems. + * Fixed the passphrase dialog with OpenSSL 3.0. +- package license +- remove non-systemd case from spec file + ------------------------------------------------------------------- Mon Jul 18 13:59:13 UTC 2022 - Pedro Monreal diff --git a/stunnel.keyring b/stunnel.keyring index 63dfe7f..cb6173b 100644 --- a/stunnel.keyring +++ b/stunnel.keyring @@ -1,5 +1,4 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 mQINBFTU6YwBEAC6PP7E4J6cRZQsJlFE+o3zdQYo7Mg2sVxDR6K9Cha52wn7P0t0 hHUd0CSmWyfjmYUy3/7jYjgKe4oiGzeSCVK8b3TiX3ylHi/nW3mixwpDPwFmr5Cf @@ -13,104 +12,114 @@ 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 -UW75VAlQKPWj1Ag5uVpc2ScMEjevQQ== -=od9U +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 +=EgcU -----END PGP PUBLIC KEY BLOCK----- diff --git a/stunnel.spec b/stunnel.spec index 1d7f270..941a358 100644 --- a/stunnel.spec +++ b/stunnel.spec @@ -17,22 +17,16 @@ %define VENDORAFFIX openSUSE - -%define has_systemd 1 -BuildRequires: pkgconfig(systemd) -%{?systemd_ordering} - #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: stunnel -Version: 5.65 +Version: 5.66 Release: 0 Summary: Universal TLS Tunnel License: GPL-2.0-or-later Group: Productivity/Networking/Security -Recommends: stunnel-doc = %version URL: https://www.stunnel.org/ Source: https://www.stunnel.org/downloads/%{name}-%{version}.tar.gz Source1: https://www.stunnel.org/downloads/%{name}-%{version}.tar.gz.asc @@ -44,17 +38,21 @@ Source7: stunnel.README Patch1: stunnel-5.59_service_always_after_network.patch Patch2: harden_stunnel.service.patch BuildRequires: libopenssl-devel +# test dependencies +BuildRequires: netcat +BuildRequires: pkgconfig +BuildRequires: procps BuildRequires: python3 BuildRequires: tcpd-devel BuildRequires: zlib-devel -# test dependencies -BuildRequires: netcat -BuildRequires: procps +BuildRequires: pkgconfig(systemd) # Requires(pre): %fillup_prereq Requires(pre): %{_sbindir}/useradd Requires(pre): fileutils Requires(pre): textutils +Recommends: stunnel-doc = %{version} +%{?systemd_ordering} %if 0%{?suse_version} >= 1500 Requires(pre): group(nogroup) %endif @@ -85,7 +83,7 @@ sed -i 's/-m 1770//g' tools/Makefile.in %configure \ --disable-static \ --bindir=%{_sbindir} -make %{?_smp_mflags} LDADD="-pie -Wl,-z,defs,-z,relro,-z,now" +%make_build LDADD="-pie -Wl,-z,defs,-z,relro,-z,now" %install %make_install @@ -95,14 +93,8 @@ mv %{buildroot}%{_datadir}/doc/stunnel %{buildroot}%{_docdir}/ mkdir -p %{buildroot}%{_docdir}/stunnel/tools mkdir -p %{buildroot}%{_fillupdir} cp -p %{SOURCE3} %{buildroot}%{_fillupdir}/ -%if 0%{?has_systemd} install -D -m 0644 %{buildroot}%{_docdir}/stunnel/examples/stunnel.service %{buildroot}/%{_unitdir}/stunnel.service ln -s service %{buildroot}%{_sbindir}/rcstunnel -%else -mkdir -p %{buildroot}%{_initddir}/ -install -m 744 %{_sourcedir}/stunnel.rc %{buildroot}/%{_initddir}/stunnel -ln -s ../..%{_initddir}/stunnel %{buildroot}%{_sbindir}/rcstunnel -%endif sed -i "s/^;setuid = nobody/setuid = stunnel/" %{buildroot}/%{_sysconfdir}/stunnel/stunnel.conf-sample sed -i "s/^;setgid =/setgid =/" %{buildroot}/%{_sysconfdir}/stunnel/stunnel.conf-sample sed -i "s/^;include =/include =/" %{buildroot}/%{_sysconfdir}/stunnel/stunnel.conf-sample @@ -125,7 +117,7 @@ install -d %{buildroot}%{_sysconfdir}/%{name}/conf.d # only works in Tumbleweed as of 2021-04-08 %if 0%{?suse_version} > 1500 rm tests/plugins/*fips*.py - make %{?_smp_mflags} test + %make_build test %endif %pre @@ -134,38 +126,25 @@ if ! %{_bindir}/getent passwd stunnel >/dev/null; then -d %{_localstatedir}/lib/stunnel stunnel fi -%if 0%{?has_systemd} %service_add_pre %{name}.service -%endif %post -%if 0%{?has_systemd} %service_add_post %{name}.service -%else -%{fillup_and_insserv -f} -%endif %{fillup_only -ans syslog stunnel} %preun -%if 0%{?has_systemd} %service_del_preun %{name}.service -%else -%stop_on_removal stunnel -%endif %postun -%if 0%{?has_systemd} %service_del_postun %{name}.service -%else -%restart_on_update stunnel -%insserv_cleanup -%endif %files -%defattr(-,root,root) -%{_sbindir}/* +%license COPYING.md +%{_sbindir}/rcstunnel +%{_sbindir}/stunnel +%{_sbindir}/stunnel3 %{_libdir}/%{name}/ -%{_mandir}/man8/* +%{_mandir}/man8/stunnel*8%{?ext_man} %dir %attr(700,root,root) %{_sysconfdir}/%{name}/ %dir %attr(700,root,root) %{_sysconfdir}/%{name}//conf.d %config(noreplace) %{_sysconfdir}/%{name}/stunnel.conf @@ -178,15 +157,9 @@ fi %dir %attr(755,root,root) %{_localstatedir}/lib/stunnel%{_localstatedir} %dir %attr(755,stunnel,root) %{_localstatedir}/lib/stunnel%{_localstatedir}/run %{_fillupdir}/sysconfig.syslog-stunnel -%if 0%{?has_systemd} %{_unitdir}/stunnel.service -%else -%config %{_initddir}/* -%endif -%{_datadir}/bash-completion/completions/%{name}.bash %files doc -%defattr(-,root,root) %doc %{_docdir}/%{name} %changelog