Hello community, here is the log from the commit of package stunnel checked in at Sat Jan 26 00:00:30 CET 2008. -------- --- stunnel/stunnel.changes 2007-10-29 17:54:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/stunnel/stunnel.changes 2008-01-25 13:51:26.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 25 11:23:01 CET 2008 - poeml@suse.de + +- fix build (re-diff stunnel-4.21-write_pid_as_root.diff) +- fix filelist (make sure that the binaries stay in /usr/sbin) + +------------------------------------------------------------------- Old: ---- stunnel-4.14-write_pid_as_root.diff New: ---- stunnel-4.21-write_pid_as_root.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stunnel.spec ++++++ --- /var/tmp/diff_new_pack.e16011/_old 2008-01-25 23:58:18.000000000 +0100 +++ /var/tmp/diff_new_pack.e16011/_new 2008-01-25 23:58:18.000000000 +0100 @@ -20,7 +20,7 @@ Summary: Universal SSL Tunnel License: LGPL v2.1 or later Version: 4.21 -Release: 1 +Release: 2 Group: Productivity/Networking/Security Url: http://www.stunnel.org/ AutoReqProv: on @@ -32,7 +32,7 @@ Source2: stunnel.README Source3: sysconfig.syslog-stunnel Source4: stunnel.rc -Patch1: stunnel-4.14-write_pid_as_root.diff +Patch1: stunnel-4.21-write_pid_as_root.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define VENDOR SUSE @@ -67,6 +67,7 @@ %install rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{_sbindir} mkdir -p $RPM_BUILD_ROOT/var/lib/stunnel/{etc,dev,bin,sbin,%_lib} mkdir -p $RPM_BUILD_ROOT/var/lib/stunnel mkdir -p $RPM_BUILD_ROOT/etc/init.d/ @@ -85,6 +86,7 @@ install -m 744 $RPM_SOURCE_DIR/stunnel.rc $RPM_BUILD_ROOT/etc/init.d/stunnel ln -s ../../etc/init.d/stunnel $RPM_BUILD_ROOT/usr/sbin/rcstunnel ln -s stunnel3 $RPM_BUILD_ROOT/usr/sbin/stunnel3_wrapper +mv $RPM_BUILD_ROOT/%{_bindir}/* $RPM_BUILD_ROOT/%{_sbindir} rm $RPM_BUILD_ROOT/%{_sysconfdir}/stunnel/stunnel.pem rm $RPM_BUILD_ROOT/%{_sysconfdir}/stunnel/stunnel.conf-sample rm -rf $RPM_BUILD_ROOT/usr/share/doc/stunnel @@ -138,7 +140,7 @@ %doc tools/stunnel.cnf %doc tools/stunnel.conf-sample %{_sbindir}/* -%{_libdir}/libstunnel* +%{_libdir}/stunnel/* %{_mandir}/man8/* %dir %attr(700,root,root) %{_sysconfdir}/stunnel %dir %attr(755,root,root) /var/lib/stunnel @@ -151,6 +153,9 @@ %config /etc/init.d/* %changelog +* Fri Jan 25 2008 poeml@suse.de +- fix build (re-diff stunnel-4.21-write_pid_as_root.diff) +- fix filelist (make sure that the binaries stay in /usr/sbin) * Mon Oct 29 2007 poeml@suse.de - update to 4.21: Changes: Initial FIPS 140-2 support was added. Non-MT-safe libwrap (TCP ++++++ stunnel-4.14-write_pid_as_root.diff -> stunnel-4.21-write_pid_as_root.diff ++++++ --- stunnel/stunnel-4.14-write_pid_as_root.diff 2005-11-27 18:14:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/stunnel/stunnel-4.21-write_pid_as_root.diff 2008-01-25 11:17:06.000000000 +0100 @@ -1,18 +1,18 @@ -Index: stunnel-4.14/src/stunnel.c +Index: stunnel-4.21/src/stunnel.c =================================================================== ---- stunnel-4.14.orig/src/stunnel.c -+++ stunnel-4.14/src/stunnel.c -@@ -173,8 +173,8 @@ static void daemon_loop(void) { - #if !defined (USE_WIN32) && !defined (__vms) - if(!(options.option.foreground)) - daemonize(); +--- stunnel-4.21.orig/src/stunnel.c ++++ stunnel-4.21/src/stunnel.c +@@ -174,8 +174,8 @@ + #ifdef HAVE_CHROOT + make_chroot(); + #endif /* HAVE_CHROOT */ - drop_privileges(); create_pid(); + drop_privileges(); #endif /* !defined USE_WIN32 && !defined (__vms) */ - /* create exec+connect services */ -@@ -420,8 +420,10 @@ static void delete_pid(void) { + for(opt=local_options.next; opt; opt=opt->next) { +@@ -433,8 +433,10 @@ s_log(LOG_DEBUG, "removing pid file %s", options.pidfile); if((unsigned long)getpid()!=options.dpid) return; /* current process is not main daemon process */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org