[prev in list] [next in list] [prev in thread] [next in thread] 

List:       stunnel-users
Subject:    [PATCH] Allow overriding PIDFILE, was Re: [stunnel-users] stunnel
From:       Miloslav Trmac <mitr () redhat ! com>
Date:       2005-11-03 0:40:50
Message-ID: 43695C92.6080507 () redhat ! com
[Download RAW message or body]

Hello,
Michal Trojnara wrote:
>   - Default pidfile changed from $localstatedir/run/stunnel.pid
>     to $localstatedir/stunnel/stunnel.pid.
For a system-wide installation this conflicts with the Linux FHS,
which specifies "Applications must generally not add directories to the
top level of /var".

At minimum the path should be reasonably easily configurable, which is
what the attached patch does: it allows
	./configure CPPFLAGS=-DPIDFILE='\"/my/desired/path\"'
Currently it is necessary to use
	make CPPFLAGS=-DLIBDIR=...\ -DCONFDIR=...\ -DPIDFILE=...
always specyfing all three variables.
See also (info '(automake)Flag Variables Ordering').

Thanks,
	Mirek

["stunnel-4.14-am_.patch" (text/x-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
 



_______________________________________________
stunnel-users mailing list
stunnel-users@mirt.net
http://stunnel.mirt.net/mailman/listinfo/stunnel-users


[prev in list] [next in list] [prev in thread] [next in thread]