Author: oden
Date: Mon Feb 5 12:30:21 2007
New Revision: 116207
Added:
packages/cooker/stunnel/current/SOURCES/stunnel-4.20.tar.gz (contents,
props changed)
packages/cooker/stunnel/current/SOURCES/stunnel-4.20.tar.gz.asc
packages/cooker/stunnel/current/SOURCES/stunnel-mdvconf.diff
packages/cooker/stunnel/current/SOURCES/stunnel-soname.diff
Removed:
packages/cooker/stunnel/current/SOURCES/stunnel-4.06-distcache.diff
packages/cooker/stunnel/current/SOURCES/stunnel-4.06-soname.diff
packages/cooker/stunnel/current/SOURCES/stunnel-4.15-mdkconf.diff
packages/cooker/stunnel/current/SOURCES/stunnel-4.15-tcpwrappers.patch
packages/cooker/stunnel/current/SOURCES/stunnel-4.15.tar.gz
packages/cooker/stunnel/current/SOURCES/stunnel-4.15.tar.gz.asc
Modified:
packages/cooker/stunnel/current/SPECS/stunnel.spec
Log:
- 4.20
- drop obsolete and unmaintained patches
- fix the soname loading in client.c
- rediffed some patches
- synced a bit with fedora
Added: packages/cooker/stunnel/current/SOURCES/stunnel-4.20.tar.gz
==============================================================================
Binary file. No diff available.
Added: packages/cooker/stunnel/current/SOURCES/stunnel-4.20.tar.gz.asc
==============================================================================
--- (empty file)
+++ packages/cooker/stunnel/current/SOURCES/stunnel-4.20.tar.gz.asc Mon Feb
5 12:30:21 2007
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQBFb0Y6/NU+nXTHMtERAoABAJwICy7hdA8CQdEndNSLZOeNZDT+YgCfQNuQ
+D419LPkGgLEtfKOL7F/f4Tk=
+=Kk15
+-----END PGP SIGNATURE-----
Added: packages/cooker/stunnel/current/SOURCES/stunnel-mdvconf.diff
==============================================================================
--- (empty file)
+++ packages/cooker/stunnel/current/SOURCES/stunnel-mdvconf.diff Mon Feb
5 12:30:21 2007
@@ -0,0 +1,72 @@
+diff -Naur stunnel-4.20/src/Makefile.am stunnel-4.20.oden/src/Makefile.am
+--- stunnel-4.20/src/Makefile.am 2006-11-04 23:23:22.000000000 +0100
++++ stunnel-4.20.oden/src/Makefile.am 2007-02-05 12:11:35.000000000 +0100
+@@ -27,7 +27,7 @@
+
+ # Additional compiler flags
+
+-AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"'
-DPIDFILE='"$(prefix)/var/run/stunnel/stunnel.pid"'
++AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)/ssl/stunnel"'
-DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
+
+ # Win32 executable
+
+diff -Naur stunnel-4.20/src/Makefile.in stunnel-4.20.oden/src/Makefile.in
+--- stunnel-4.20/src/Makefile.in 2006-11-11 15:58:22.000000000 +0100
++++ stunnel-4.20.oden/src/Makefile.in 2007-02-05 12:11:35.000000000 +0100
+@@ -221,7 +221,7 @@
+ INCLUDES = -I/usr/kerberos/include
+
+ # Additional compiler flags
+-AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"'
-DPIDFILE='"$(prefix)/var/run/stunnel/stunnel.pid"'
++AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)/ssl/stunnel"'
-DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
+
+ # Win32 executable
+ EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c
os2.mak
+diff -Naur stunnel-4.20/tools/Makefile.am stunnel-4.20.oden/tools/Makefile.am
+--- stunnel-4.20/tools/Makefile.am 2006-04-26 14:46:27.000000000 +0200
++++ stunnel-4.20.oden/tools/Makefile.am 2007-02-05 12:11:35.000000000
+0100
+@@ -3,7 +3,7 @@
+ EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
+ stunnel.spec stunnel.mak stunnel.cnf stunnel.nsi stunnel.conf
+
+-confdir = $(sysconfdir)/stunnel
++confdir = $(sysconfdir)/ssl/stunnel
+ conf_DATA = stunnel.conf-sample
+
+ docdir = $(datadir)/doc/stunnel
+diff -Naur stunnel-4.20/tools/stunnel.conf-sample.in
stunnel-4.20.oden/tools/stunnel.conf-sample.in
+--- stunnel-4.20/tools/stunnel.conf-sample.in 2006-08-31 21:02:30.000000000
+0200
++++ stunnel-4.20.oden/tools/stunnel.conf-sample.in 2007-02-05
12:13:06.000000000 +0100
+@@ -3,14 +3,14 @@
+ ; Please make sure you understand them (especially the effect of chroot jail)
+
+ ; 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 = @sysconfdir@/ssl/stunnel/mail.pem
++;key = @sysconfdir@/ssl/stunnel/mail.pem
+
+ ; Protocol version (all, SSLv2, SSLv3, TLSv1)
+ sslVersion = SSLv3
+
+ ; Some security enhancements for UNIX systems - comment them out on Win32
+-chroot = @prefix@/var/lib/stunnel/
++chroot = @localstatedir@/lib/stunnel/
+ setuid = nobody
+ setgid = @DEFAULT_GROUP@
+ ; PID is created inside chroot jail
+@@ -30,12 +30,12 @@
+ ; CApath is located inside chroot jail
+ ;CApath = /certs
+ ; It's often easier to use CAfile
+-;CAfile = @prefix@/etc/stunnel/certs.pem
++;CAfile = @sysconfdir@/ssl/stunnel/certs.pem
+ ; Don't forget to c_rehash CRLpath
+ ; CRLpath is located inside chroot jail
+ ;CRLpath = /crls
+ ; Alternatively you can use CRLfile
+-;CRLfile = @prefix@/etc/stunnel/crls.pem
++;CRLfile = @sysconfdir@/ssl/stunnel/crls.pem
+
+ ; Some debugging stuff useful for troubleshooting
+ ;debug = 7
Added: packages/cooker/stunnel/current/SOURCES/stunnel-soname.diff
==============================================================================
--- (empty file)
+++ packages/cooker/stunnel/current/SOURCES/stunnel-soname.diff Mon Feb 5
12:30:21 2007
@@ -0,0 +1,24 @@
+diff -Naur stunnel-4.20/src/Makefile.am stunnel-4.20.oden/src/Makefile.am
+--- stunnel-4.20/src/Makefile.am 2006-11-04 23:23:22.000000000 +0100
++++ stunnel-4.20.oden/src/Makefile.am 2007-02-05 12:04:27.000000000 +0100
+@@ -19,7 +19,7 @@
+
+ lib_LTLIBRARIES = libstunnel.la
+ libstunnel_la_SOURCES = $(shared_sources)
+-libstunnel_la_LDFLAGS = -avoid-version
++libstunnel_la_LDFLAGS = -version-info 0:0:0
+
+ # Red Hat "by design" bug #82369
+
+diff -Naur stunnel-4.20/src/client.c stunnel-4.20.oden/src/client.c
+--- stunnel-4.20/src/client.c 2006-11-15 09:25:51.000000000 +0100
++++ stunnel-4.20.oden/src/client.c 2007-02-05 12:05:10.000000000 +0100
+@@ -867,7 +867,7 @@
+ *portname='\0';
+ putenv(env[0]);
+ if(c->opt->option.transparent) {
+- putenv("LD_PRELOAD=" LIBDIR "/libstunnel.so");
++ putenv("LD_PRELOAD=" LIBDIR "/libstunnel.so.0");
+ /* For Tru64 _RLD_LIST is used instead */
+ putenv("_RLD_LIST=" LIBDIR "/libstunnel.so:DEFAULT");
+ }
Modified: packages/cooker/stunnel/current/SPECS/stunnel.spec
==============================================================================
--- packages/cooker/stunnel/current/SPECS/stunnel.spec (original)
+++ packages/cooker/stunnel/current/SPECS/stunnel.spec Mon Feb 5 12:30:21 2007
@@ -1,46 +1,30 @@
-%define name stunnel
-%define version 4.15
%define pemdir %{_sysconfdir}/ssl/stunnel
-%define build_distcache 0
-
-# commandline overrides:
-# rpm -ba|--rebuild --with 'xxx'
-%{?_with_distcache: %{expand: %%define build_distcache 1}}
-
-%if %{build_distcache}
-%define build_distcache 1
-%endif
-
%define major 0
%define libname %mklibname %{name} %{major}
Summary: Program that wraps normal socket connections with SSL/TLS
-Name: %{name}
-Version: %{version}
-Release: %mkrel 2
+Name: stunnel
+Version: 4.20
+Release: %mkrel 1
License: GPL
Group: System/Servers
URL: http://www.stunnel.org/
Source0:
http://www.stunnel.org/download/stunnel/src/%{name}-%{version}.tar.gz
Source1:
http://www.stunnel.org/download/stunnel/src/%{name}-%{version}.tar.gz.asc
-Patch0: stunnel-4.15-mdkconf.diff
+Patch0: stunnel-mdvconf.diff
Patch1: stunnel-4.06-authpriv.patch
-Patch2: stunnel-4.06-soname.diff
-Patch3: stunnel-4.15-tcpwrappers.patch
+Patch2: stunnel-soname.diff
Patch4: stunnel-4.15-lib64.patch
-# (oe): P100 originates from:
-# http://www.stunnel.org/patches/patches/distcache_geoff.patch
-Patch100: stunnel-4.06-distcache.diff
+BuildRequires: libtool
BuildRequires: automake1.7
BuildRequires: autoconf2.5
BuildRequires: openssl >= 0.9.5
BuildRequires: openssl-devel >= 0.9.5
-BuildRequires: tcp_wrappers-devel
-%if %{build_distcache}
-BuildRequires: distcache-devel
-%endif
+BuildRequires: tcp_wrappers-devel
Requires: openssl >= 0.9.5a
+Requires: tcp_wrappers
+Requires: %{libname} = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%description
@@ -54,15 +38,6 @@
and HTTP, and in tunneling PPP over network sockets without changes to the
source code.
-You can also rebuild %{name} with distcache support. The following are
-valid build options.
-
-(ie. use with rpm --rebuild):
-
- --with distcache Build with distcache support (disabled per default)
-
-More information about distcache here: http://distcache.sourceforge.net/
-
%package -n %{libname}
Summary: Shared library for stunnel
Group: System/Libraries
@@ -100,16 +75,17 @@
This package contains development files for stunnel.
%prep
+
%setup -q
%patch0 -p1 -b .confdir
%patch1 -p1 -b .authprv
%patch2 -p1 -b .soname
-%patch3 -p1 -b .tcpwrappers
%patch4 -p1 -b .lib64
-%if %{build_distcache}
-%patch100 -p1 -b .distcache
-%endif
+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
+iconv -f iso-8859-2 -t utf-8 < doc/stunnel.pl.8 > doc/stunnel.pl.8_
+mv doc/stunnel.pl.8_ doc/stunnel.pl.8
# XXX don't install /var/lib/stunnel
perl -ni -e '/INSTALL.*-m 1770 -g nogroup.*stunnel$/ or print'
tools/Makefile.am
@@ -118,19 +94,16 @@
libtoolize --copy --force && aclocal-1.7 && automake-1.7 -a && autoconf
%build
+
%configure2_5x \
--with-ssl=%{_prefix} \
--enable-static \
--enable-shared \
-%if !%{build_distcache}
- --without-distcache --disable-distcache \
-%endif
--localstatedir=%{_var} \
--with-tcp-wrappers \
--with-ipv6
echo -e "\n\n\n\n\n\n\n\n" | make
-
%install
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
@@ -143,9 +116,16 @@
%makeinstall docdir=`pwd`/doc-to-install
+# Move the translated man pages to the right subdirectories, and strip off the
+# language suffixes.
+for lang in fr pl ; do
+ mkdir -p %{buildroot}%{_mandir}/${lang}/man8
+ mv %{buildroot}%{_mandir}/man8/*.${lang}.8*
%{buildroot}%{_mandir}/${lang}/man8/
+ rename ".${lang}" "" %{buildroot}%{_mandir}/${lang}/man8/*
+done
+
# cleanup
-rm -f %{buildroot}%{_mandir}/man8/*.pl.8* \
- %{buildroot}%{_mandir}/man8/*fr.8* ./doc-to-install/INSTALL.W32
+rm -f ./doc-to-install/INSTALL.W32
rm -f %{buildroot}%{pemdir}/*
%post
@@ -167,10 +147,12 @@
%doc doc-to-install/* tools/stunnel.cnf
%{_sbindir}/stunnel
%{_sbindir}/stunnel3
-%{_mandir}/man8/stunnel.8.*
%dir %{pemdir}
%dir %{_var}/run/stunnel
%dir %{_var}/openssl/certs/trusted
+%{_mandir}/man8/stunnel.8.*
+%lang(fr) %{_mandir}/fr/man8/stunnel.8*
+%lang(pl) %{_mandir}/pl/man8/stunnel.8*
%files -n %{libname}
%defattr(-,root,root)
