rpms/stunnel/devel stunnel-4.15-nogroup.patch, NONE, 1.1 stunnel-4.15-sample.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 stunnel.spec, 1.37, 1.38 stunnel-4.12-sample.patch, 1.1, NONE

Sat Mar 18 01:58:16 UTC 2006

Author: mitr

Update of /cvs/dist/rpms/stunnel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8726

Modified Files:
	.cvsignore sources stunnel.spec 
Added Files:
	stunnel-4.15-nogroup.patch stunnel-4.15-sample.patch 
Removed Files:
	stunnel-4.12-sample.patch 
Log Message:
* Sat Mar 18 2006 Miloslav Trmac <mitr at redhat.com> - 4.15-1
- Update to stunnel-4.15


stunnel-4.15-nogroup.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE stunnel-4.15-nogroup.patch ---
--- stunnel-4.15/tools/Makefile.am.nogroup	2006-03-18 02:37:19.000000000 +0100
+++ stunnel-4.15/tools/Makefile.am	2006-03-18 02:38:09.000000000 +0100
@@ -28,7 +28,7 @@
 		${INSTALL} -m 600 stunnel.pem $(DESTDIR)$(confdir)/stunnel.pem; \
 		rm stunnel.pem; \
 	fi
-	${INSTALL} -d -m 1770 -g nogroup $(DESTDIR)$(prefix)/var/lib/stunnel
+	${INSTALL} -d -m 1770 $(DESTDIR)$(prefix)/var/lib/stunnel
 	if uname | grep SunOS; then \
 		${INSTALL} -d -m 755 $(DESTDIR)$(prefix)/var/lib/stunnel/dev; \
 		mknod $(DESTDIR)$(prefix)/var/lib/stunnel/dev/zero c 13 12; \

stunnel-4.15-sample.patch:
 stunnel.conf-sample.in |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE stunnel-4.15-sample.patch ---
You shouldn't use the sample as-is, but people do.

--- stunnel-4.15/tools/stunnel.conf-sample.in.sample	2005-09-30 16:20:01.000000000 +0200
+++ stunnel-4.15/tools/stunnel.conf-sample.in	2005-09-30 16:22:02.000000000 +0200
@@ -3,13 +3,13 @@
 ; 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@/stunnel/mail.crt
+;key = @sysconfdir@/stunnel/mail.key
 
 ; Some security enhancements for UNIX systems - comment them out on Win32
-chroot = @prefix@/var/lib/stunnel/
+chroot = @localstatedir@/run/stunnel/
 setuid = nobody
-setgid = nogroup
+setgid = nobody
 ; PID is created inside chroot jail
 pid = /stunnel.pid
 
@@ -27,12 +27,13 @@
 ; CApath is located inside chroot jail
 ;CApath = /certs
 ; It's often easier to use CAfile
-;CAfile = @prefix@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/stunnel/certs.pem
+;CAfile = @datadir@/ssl/certs/ca-bundle.crt
 ; 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@/stunnel/crls.pem
 
 ; Some debugging stuff useful for troubleshooting
 ;debug = 7


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Nov 2005 00:37:24 -0000	1.16
+++ .cvsignore	18 Mar 2006 01:58:13 -0000	1.17
@@ -1,2 +1,2 @@
-stunnel-4.14.tar.gz
-stunnel-4.14.tar.gz.asc
+stunnel-4.15.tar.gz
+stunnel-4.15.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	3 Nov 2005 00:37:24 -0000	1.16
+++ sources	18 Mar 2006 01:58:13 -0000	1.17
@@ -1,2 +1,2 @@
-0969cc4868dfd75f22792ecccc9ec555  stunnel-4.14.tar.gz
-99e54fa6cb263ffd29be7a02f4e9b536  stunnel-4.14.tar.gz.asc
+2c00153ad099a5f9c5609e8d1dbbe470  stunnel-4.15.tar.gz
+71ddec1b83133d7479e477ad0ce229c6  stunnel-4.15.tar.gz.asc


Index: stunnel.spec
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- stunnel.spec	11 Feb 2006 05:44:47 -0000	1.37
+++ stunnel.spec	18 Mar 2006 01:58:13 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
-Version: 4.14
-Release: 3.2
+Version: 4.15
+Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -14,12 +14,12 @@
 Source6: pop3-redirect.xinetd
 Source7: stunnel-pop3s-client.conf
 Patch0: stunnel-4.08-authpriv.patch
-Patch1: stunnel-4.12-sample.patch
-Patch2: stunnel-4.14-am_.patch
+Patch1: stunnel-4.15-sample.patch
+Patch2: stunnel-4.15-nogroup.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers, util-linux
-# For stunnel-4.14-am_.patch
+# For stunnel-4.15-nogroup.patch
 BuildRequires: autoconf, automake, libtool
 
 %description
@@ -31,7 +31,7 @@
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
-%patch2 -p1 -b .am_
+%patch2 -p1 -b .nogroup
 
 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
@@ -39,13 +39,13 @@
 mv doc/stunnel.pl.8_ doc/stunnel.pl.8
 
 %build
-autoreconf -f # For stunnel-4.14-am_.patch
+autoreconf -f # For stunnel-4.15-nogroup.patch
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
 	LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
 fi
-%configure --enable-ipv6 --with-threads=pthread \
+%configure --enable-ipv6 \
 	CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
 make LDADD="-pie -Wl,-z,defs,-z,relro"
 
@@ -91,6 +91,9 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Sat Mar 18 2006 Miloslav Trmac <mitr at redhat.com> - 4.15-1
+- Update to stunnel-4.15
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.14-3.2
 - bump again for double-long bug on ppc(64)
 


--- stunnel-4.12-sample.patch DELETED ---


