Mageia Bugzilla – Attachment 2628 Details for
Bug 4223
libstunnel0 package contains weird /usr/lib/debug/ directory & development files
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
Fixes many stunnel packaging issues
stunnel-pkg.patch (text/plain), 6.50 KB, created by
Dan Fandrich
on 2012-08-11 00:23:08 CEST
(
hide
)
Description:
Fixes many stunnel packaging issues
Filename:
MIME Type:
Creator:
Dan Fandrich
Created:
2012-08-11 00:23:08 CEST
Size:
6.50 KB
patch
obsolete
>Index: SPECS/stunnel.spec >=================================================================== >--- SPECS/stunnel.spec (revision 280453) >+++ SPECS/stunnel.spec (working copy) >@@ -1,14 +1,9 @@ > %define pemdir %{_sysconfdir}/ssl/stunnel > >-%define major 0 >-%define libname %mklibname %{name} %{major} >-%define libname_devel %mklibname %{name} -d >-%define libname_static_devel %mklibname %{name} -d -s >- > Summary: Program that wraps normal socket connections with SSL/TLS > Name: stunnel > Version: 4.34 >-Release: %mkrel 3 >+Release: %mkrel 4 > License: GPLv2 > Group: System/Servers > URL: http://www.stunnel.org/ >@@ -17,6 +12,7 @@ > Source2: http://www.stunnel.org/download/stunnel/src/%{name}-%{version}.tar.gz.sha1 > Patch0: stunnel-4.34-path-fix.patch > Patch1: stunnel-4.34-lib64.patch >+Patch2: stunnel-4.34-conf.patch > BuildRequires: libtool > BuildRequires: automake > BuildRequires: autoconf2.5 >@@ -25,7 +21,6 @@ > BuildRequires: tcp_wrappers-devel > Requires: openssl >= 0.9.5a > Requires: tcp_wrappers >-Requires: %{libname} >= %{version} > BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot > > %description >@@ -39,68 +34,11 @@ > and HTTP, and in tunneling PPP over network sockets without changes to the > source code. > >-%package -n %{libname} >-Summary: Shared library for stunnel >-Group: System/Libraries >- >-%description -n %{libname} >-The stunnel program is designed to work as SSL encryption wrapper between >-remote clients and local (inetd-startable) or remote servers. The concept is >-that having non-SSL aware daemons running on your system you can easily set >-them up to communicate with clients over secure SSL channels. >- >-stunnel can be used to add SSL functionality to commonly used inetd daemons >-like POP-2, POP-3, and IMAP servers, to standalone daemons like NNTP, SMTP >-and HTTP, and in tunneling PPP over network sockets without changes to the >-source code. >- >-This package contains the shared library for stunnel. >- >-%package -n %{libname_devel} >-Summary: Development files for stunnel >-Group: Development/C >-Requires: %{libname} = %{version}-%{release} >-Provides: lib%{name}-devel = %{version}-%{release} >-Provides: %{name}-devel = %{version}-%{release} >-Obsoletes: %{libname}-devel < %{version}-%{release} >- >-%description -n %{libname_devel} >-The stunnel program is designed to work as SSL encryption wrapper between >-remote clients and local (inetd-startable) or remote servers. The concept is >-that having non-SSL aware daemons running on your system you can easily set >-them up to communicate with clients over secure SSL channels. >- >-stunnel can be used to add SSL functionality to commonly used inetd daemons >-like POP-2, POP-3, and IMAP servers, to standalone daemons like NNTP, SMTP >-and HTTP, and in tunneling PPP over network sockets without changes to the >-source code. >- >-This package contains development files for stunnel. >- >-%package -n %{libname_static_devel} >-Summary: Static library for stunnel >-Group: Development/C >-Requires: %{libname_devel} = %{version}-%{release} >-Provides: lib%{name}-static-devel = %{version}-%{release} >-Provides: %{name}-static-devel = %{version}-%{release} >- >-%description -n %{libname_static_devel} >-The stunnel program is designed to work as SSL encryption wrapper between >-remote clients and local (inetd-startable) or remote servers. The concept is >-that having non-SSL aware daemons running on your system you can easily set >-them up to communicate with clients over secure SSL channels. >- >-stunnel can be used to add SSL functionality to commonly used inetd daemons >-like POP-2, POP-3, and IMAP servers, to standalone daemons like NNTP, SMTP >-and HTTP, and in tunneling PPP over network sockets without changes to the >-source code. >- >-This package contains the static library for stunnel. >- > %prep > %setup -q > %patch0 -p0 > %patch1 -p1 >+%patch2 -p1 > > iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_ > mv doc/stunnel.fr.8_ doc/stunnel.fr.8 >@@ -118,7 +56,7 @@ > %configure2_5x \ > --with-threads=fork \ > --with-ssl=%{_prefix} \ >- --enable-static \ >+ --disable-static \ > --enable-shared \ > --localstatedir=%{_var} \ > --with-tcp-wrappers \ >@@ -135,11 +73,12 @@ > > # (oe) hack... don't generate the pem file, and stunnel.conf > touch %{buildroot}%{pemdir}/stunnel.pem >-%makeinstall docdir=`pwd`/doc-to-install pkglibdir=%{buildroot}%{_libdir} >+# redirect from /dev/null to avoid interactive certificate generation >+%makeinstall docdir=`pwd`/doc-to-install pkglibdir=%{buildroot}%{_libdir} </dev/null > > %{__mkdir_p} %{buildroot}%{_datadir}/%{name} > %{__cp} -p tools/stunnel.cnf %{buildroot}%{_datadir}/%{name}/stunnel.cnf >-cp %{buildroot}%{_sysconfdir}/%name/stunnel.conf-sample %{buildroot}%{_sysconfdir}/%name/stunnel.conf >+mv %{buildroot}%{_sysconfdir}/%name/stunnel.conf-sample %{buildroot}%{_sysconfdir}/%name/stunnel.conf > # Move the translated man pages to the right subdirectories, and strip off the > # language suffixes. > for lang in fr pl ; do >@@ -151,6 +90,7 @@ > # cleanup > rm -f ./doc-to-install/INSTALL.W32 > rm -f %{buildroot}%{pemdir}/* >+rm -f %{buildroot}%{_libdir}/*.la > > %post > echo "To build a new pem, execute the following OpenSSL command:" >@@ -174,20 +114,7 @@ > %{_mandir}/man8/stunnel.8.* > %lang(fr) %{_mandir}/fr/man8/stunnel.8* > %lang(pl) %{_mandir}/pl/man8/stunnel.8* >-%{_sysconfdir}/%{name}/stunnel.conf-sample > %{_sysconfdir}/%{name}/stunnel.conf > %{_sysconfdir}/%{name}/stunnel.pem >+%{_libdir}/libstunnel.so > >-%files -n %{libname} >-%defattr(-,root,root) >-%{_libdir}/* >- >-%files -n %{libname_devel} >-%defattr(-,root,root) >-%{_libdir}/*.so >-%{_libdir}/*.la >- >-%files -n %{libname_static_devel} >-%{_libdir}/*.a >- >- >--- /dev/null 2012-08-10 17:39:48.328228477 +0200 >+++ SOURCES/stunnel-4.34-conf.patch 2012-08-11 00:12:11.000000000 +0200 >@@ -0,0 +1,21 @@ >+--- stunnel-4.34/tools/stunnel.conf-sample.in.orig 2010-08-20 22:54:55.000000000 +0200 >++++ stunnel-4.34/tools/stunnel.conf-sample.in 2012-08-11 00:11:20.000000000 +0200 >+@@ -4,15 +4,15 @@ >+ ; please read the manual and make sure you understand them >+ >+ ; certificate/key is needed in server mode and optional in client mode >+-cert = @prefix@/etc/stunnel/mail.pem >+-;key = @prefix@/etc/stunnel/mail.pem >++cert = /etc/stunnel/mail.pem >++;key = /etc/stunnel/mail.pem >+ >+ ; protocol version (all, SSLv2, SSLv3, TLSv1) >+ sslVersion = SSLv3 >+ >+ ; security enhancements for UNIX systems - comment them out on Win32 >+ ; for chroot a copy of some devices and files is needed within the jail >+-chroot = @prefix@/var/lib/stunnel/ >++chroot = /var/lib/stunnel/ >+ setuid = nobody >+ setgid = @DEFAULT_GROUP@ >+ ; PID is created inside the chroot jail
Index: SPECS/stunnel.spec =================================================================== --- SPECS/stunnel.spec (revision 280453) +++ SPECS/stunnel.spec (working copy) @@ -1,14 +1,9 @@ %define pemdir %{_sysconfdir}/ssl/stunnel -%define major 0 -%define libname %mklibname %{name} %{major} -%define libname_devel %mklibname %{name} -d -%define libname_static_devel %mklibname %{name} -d -s - Summary: Program that wraps normal socket connections with SSL/TLS Name: stunnel Version: 4.34 -Release: %mkrel 3 +Release: %mkrel 4 License: GPLv2 Group: System/Servers URL: http://www.stunnel.org/ @@ -17,6 +12,7 @@ Source2: http://www.stunnel.org/download/stunnel/src/%{name}-%{version}.tar.gz.sha1 Patch0: stunnel-4.34-path-fix.patch Patch1: stunnel-4.34-lib64.patch +Patch2: stunnel-4.34-conf.patch BuildRequires: libtool BuildRequires: automake BuildRequires: autoconf2.5 @@ -25,7 +21,6 @@ BuildRequires: tcp_wrappers-devel Requires: openssl >= 0.9.5a Requires: tcp_wrappers -Requires: %{libname} >= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description @@ -39,68 +34,11 @@ and HTTP, and in tunneling PPP over network sockets without changes to the source code. -%package -n %{libname} -Summary: Shared library for stunnel -Group: System/Libraries - -%description -n %{libname} -The stunnel program is designed to work as SSL encryption wrapper between -remote clients and local (inetd-startable) or remote servers. The concept is -that having non-SSL aware daemons running on your system you can easily set -them up to communicate with clients over secure SSL channels. - -stunnel can be used to add SSL functionality to commonly used inetd daemons -like POP-2, POP-3, and IMAP servers, to standalone daemons like NNTP, SMTP -and HTTP, and in tunneling PPP over network sockets without changes to the -source code. - -This package contains the shared library for stunnel. - -%package -n %{libname_devel} -Summary: Development files for stunnel -Group: Development/C -Requires: %{libname} = %{version}-%{release} -Provides: lib%{name}-devel = %{version}-%{release} -Provides: %{name}-devel = %{version}-%{release} -Obsoletes: %{libname}-devel < %{version}-%{release} - -%description -n %{libname_devel} -The stunnel program is designed to work as SSL encryption wrapper between -remote clients and local (inetd-startable) or remote servers. The concept is -that having non-SSL aware daemons running on your system you can easily set -them up to communicate with clients over secure SSL channels. - -stunnel can be used to add SSL functionality to commonly used inetd daemons -like POP-2, POP-3, and IMAP servers, to standalone daemons like NNTP, SMTP -and HTTP, and in tunneling PPP over network sockets without changes to the -source code. - -This package contains development files for stunnel. - -%package -n %{libname_static_devel} -Summary: Static library for stunnel -Group: Development/C -Requires: %{libname_devel} = %{version}-%{release} -Provides: lib%{name}-static-devel = %{version}-%{release} -Provides: %{name}-static-devel = %{version}-%{release} - -%description -n %{libname_static_devel} -The stunnel program is designed to work as SSL encryption wrapper between -remote clients and local (inetd-startable) or remote servers. The concept is -that having non-SSL aware daemons running on your system you can easily set -them up to communicate with clients over secure SSL channels. - -stunnel can be used to add SSL functionality to commonly used inetd daemons -like POP-2, POP-3, and IMAP servers, to standalone daemons like NNTP, SMTP -and HTTP, and in tunneling PPP over network sockets without changes to the -source code. - -This package contains the static library for stunnel. - %prep %setup -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_ mv doc/stunnel.fr.8_ doc/stunnel.fr.8 @@ -118,7 +56,7 @@ %configure2_5x \ --with-threads=fork \ --with-ssl=%{_prefix} \ - --enable-static \ + --disable-static \ --enable-shared \ --localstatedir=%{_var} \ --with-tcp-wrappers \ @@ -135,11 +73,12 @@ # (oe) hack... don't generate the pem file, and stunnel.conf touch %{buildroot}%{pemdir}/stunnel.pem -%makeinstall docdir=`pwd`/doc-to-install pkglibdir=%{buildroot}%{_libdir} +# redirect from /dev/null to avoid interactive certificate generation +%makeinstall docdir=`pwd`/doc-to-install pkglibdir=%{buildroot}%{_libdir} </dev/null %{__mkdir_p} %{buildroot}%{_datadir}/%{name} %{__cp} -p tools/stunnel.cnf %{buildroot}%{_datadir}/%{name}/stunnel.cnf -cp %{buildroot}%{_sysconfdir}/%name/stunnel.conf-sample %{buildroot}%{_sysconfdir}/%name/stunnel.conf +mv %{buildroot}%{_sysconfdir}/%name/stunnel.conf-sample %{buildroot}%{_sysconfdir}/%name/stunnel.conf # Move the translated man pages to the right subdirectories, and strip off the # language suffixes. for lang in fr pl ; do @@ -151,6 +90,7 @@ # cleanup rm -f ./doc-to-install/INSTALL.W32 rm -f %{buildroot}%{pemdir}/* +rm -f %{buildroot}%{_libdir}/*.la %post echo "To build a new pem, execute the following OpenSSL command:" @@ -174,20 +114,7 @@ %{_mandir}/man8/stunnel.8.* %lang(fr) %{_mandir}/fr/man8/stunnel.8* %lang(pl) %{_mandir}/pl/man8/stunnel.8* -%{_sysconfdir}/%{name}/stunnel.conf-sample %{_sysconfdir}/%{name}/stunnel.conf %{_sysconfdir}/%{name}/stunnel.pem +%{_libdir}/libstunnel.so -%files -n %{libname} -%defattr(-,root,root) -%{_libdir}/* - -%files -n %{libname_devel} -%defattr(-,root,root) -%{_libdir}/*.so -%{_libdir}/*.la - -%files -n %{libname_static_devel} -%{_libdir}/*.a - - --- /dev/null 2012-08-10 17:39:48.328228477 +0200 +++ SOURCES/stunnel-4.34-conf.patch 2012-08-11 00:12:11.000000000 +0200 @@ -0,0 +1,21 @@ +--- stunnel-4.34/tools/stunnel.conf-sample.in.orig 2010-08-20 22:54:55.000000000 +0200 ++++ stunnel-4.34/tools/stunnel.conf-sample.in 2012-08-11 00:11:20.000000000 +0200 +@@ -4,15 +4,15 @@ + ; please read the manual and make sure you understand them + + ; certificate/key is needed in server mode and optional in client mode +-cert = @prefix@/etc/stunnel/mail.pem +-;key = @prefix@/etc/stunnel/mail.pem ++cert = /etc/stunnel/mail.pem ++;key = /etc/stunnel/mail.pem + + ; protocol version (all, SSLv2, SSLv3, TLSv1) + sslVersion = SSLv3 + + ; security enhancements for UNIX systems - comment them out on Win32 + ; for chroot a copy of some devices and files is needed within the jail +-chroot = @prefix@/var/lib/stunnel/ ++chroot = /var/lib/stunnel/ + setuid = nobody + setgid = @DEFAULT_GROUP@ + ; PID is created inside the chroot jail
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 4223
: 2628