rpms/stunnel/devel stunnel-4.14-am_.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 stunnel.spec, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: mitr

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

Modified Files:
	.cvsignore sources stunnel.spec 
Added Files:
	stunnel-4.14-am_.patch 
Log Message:
* Thu Nov  3 2005 Miloslav Trmac <mitr at redhat.com> - 4.14-1
- Update to stunnel-4.14
- Override changed default pid file location, keep it in %{_localstatedir}/run


stunnel-4.14-am_.patch:
 configure.ac    |    1 -
 src/Makefile.am |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE stunnel-4.14-am_.patch ---
Use AM_CPPFLAGS instead of adding defines at the end of CPPFLAGS, to allow
redefining individual macros.

--- stunnel-4.14/src/Makefile.am.am_	2005-11-03 00:57:34.000000000 +0100
+++ stunnel-4.14/src/Makefile.am	2005-11-03 01:00:24.000000000 +0100
@@ -26,6 +26,8 @@
 
 INCLUDES = -I/usr/kerberos/include
 
+AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/stunnel/stunnel.pid"'
+
 # Win32 executable
 
 EXTRA_DIST = stunnel.exe make.bat Makefile.w32
--- stunnel-4.14/configure.ac.am_	2005-11-03 00:57:28.000000000 +0100
+++ stunnel-4.14/configure.ac	2005-11-03 01:00:15.000000000 +0100
@@ -296,7 +296,6 @@
 )
 
 AC_MSG_NOTICE([**************************************** write the results])
-CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/stunnel/stunnel.pid\\\""
 AC_CONFIG_FILES([Makefile src/Makefile src/stunnel3 doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init])
 AC_OUTPUT
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	22 Oct 2005 17:06:28 -0000	1.15
+++ .cvsignore	3 Nov 2005 00:37:24 -0000	1.16
@@ -1,2 +1,2 @@
-stunnel-4.13.tar.gz
-stunnel-4.13.tar.gz.asc
+stunnel-4.14.tar.gz
+stunnel-4.14.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Oct 2005 17:06:28 -0000	1.15
+++ sources	3 Nov 2005 00:37:24 -0000	1.16
@@ -1,2 +1,2 @@
-d06383b49d8da71ca0b7f46caff90bde  stunnel-4.13.tar.gz
-1decffa51589673d8eaf2befdaa0fad9  stunnel-4.13.tar.gz.asc
+0969cc4868dfd75f22792ecccc9ec555  stunnel-4.14.tar.gz
+99e54fa6cb263ffd29be7a02f4e9b536  stunnel-4.14.tar.gz.asc


Index: stunnel.spec
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- stunnel.spec	22 Oct 2005 17:06:28 -0000	1.31
+++ stunnel.spec	3 Nov 2005 00:37:24 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
-Version: 4.13
+Version: 4.14
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -15,9 +15,12 @@
 Source7: stunnel-pop3s-client.conf
 Patch0: stunnel-4.08-authpriv.patch
 Patch1: stunnel-4.12-sample.patch
+Patch2: stunnel-4.14-am_.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
+BuildRequires: autoconf, automake, libtool
 
 %description
 Stunnel is a socket wrapper which can provide SSL (Secure Sockets
@@ -28,6 +31,7 @@
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
+%patch2 -p1 -b .am_
 
 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
@@ -35,12 +39,14 @@
 mv doc/stunnel.pl.8_ doc/stunnel.pl.8
 
 %build
+autoreconf -f # For stunnel-4.14-am_.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
+%configure --enable-ipv6 \
+	CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
 make LDADD="-pie -Wl,-z,defs,-z,relro"
 
 %install
@@ -85,6 +91,10 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Thu Nov  3 2005 Miloslav Trmac <mitr at redhat.com> - 4.14-1
+- Update to stunnel-4.14
+- Override changed default pid file location, keep it in %{_localstatedir}/run
+
 * Sat Oct 22 2005 Miloslav Trmac <mitr at redhat.com> - 4.13-1
 - Update to stunnel-4.13