diff options
author | xtraeme <xtraeme> | 2004-02-21 05:38:29 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2004-02-21 05:38:29 +0000 |
commit | 1420ccae6e0f97e3e9720440cd3d0e12514d093a (patch) | |
tree | c3ae62b0892cc2160982f35b3d95bd19ea033d9f /chat/jabberd | |
parent | dadc411e258fce5849352641a6f8b6b0e2e25302 (diff) | |
download | pkgsrc-1420ccae6e0f97e3e9720440cd3d0e12514d093a.tar.gz |
Downgrade jabberd to 1.4.2. Because 1.4.3 version doesn't work with
current pth's version from pkgsrc. It was tested by David Ferlier
<david@NetBSD-fr dot org> and it works perfectly, reported in PR
pkg/24462.
Diffstat (limited to 'chat/jabberd')
-rw-r--r-- | chat/jabberd/Makefile | 11 | ||||
-rw-r--r-- | chat/jabberd/PLIST | 2 | ||||
-rw-r--r-- | chat/jabberd/buildlink3.mk | 5 | ||||
-rw-r--r-- | chat/jabberd/distinfo | 13 | ||||
-rw-r--r-- | chat/jabberd/files/jabberd.sh | 2 | ||||
-rw-r--r-- | chat/jabberd/patches/patch-aa | 184 | ||||
-rw-r--r-- | chat/jabberd/patches/patch-ab | 129 | ||||
-rw-r--r-- | chat/jabberd/patches/patch-ac | 46 | ||||
-rw-r--r-- | chat/jabberd/patches/patch-ad | 36 |
9 files changed, 222 insertions, 206 deletions
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile index 3c5f989be5b..22d1817bb99 100644 --- a/chat/jabberd/Makefile +++ b/chat/jabberd/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2004/02/11 03:22:37 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/21 05:38:29 xtraeme Exp $ # -DISTNAME= jabberd-1.4.3 -PKGREVISION= 1 +DISTNAME= jabber-1.4.2 +PKGNAME= jabberd-1.4.2 CATEGORIES= chat -MASTER_SITES= http://jabberd.jabberstudio.org/1.4/dist/ +MASTER_SITES= http://jabberd.jabberstudio.org/downloads/ \ + http://jabberd.jabberstudio.org/1.4/dist/ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://jabberd.jabberstudio.org/1.4/ @@ -82,6 +83,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/jabberd/lib/lib.h ${INCDIR}/lib ${INSTALL_DATA} ${WRKSRC}/jabberd/lib/xmlparse.h ${INCDIR}/lib -.include "../../devel/pth/buildlink3.mk" +#.include "../../devel/pth/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/jabberd/PLIST b/chat/jabberd/PLIST index 66c3edd3f12..81a38733db7 100644 --- a/chat/jabberd/PLIST +++ b/chat/jabberd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/02/11 03:22:37 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/02/21 05:38:29 xtraeme Exp $ etc/rc.d/jabberd include/jabberd/jabberd.h include/jabberd/lib/lib.h diff --git a/chat/jabberd/buildlink3.mk b/chat/jabberd/buildlink3.mk index 9adb730a725..5402d51791c 100644 --- a/chat/jabberd/buildlink3.mk +++ b/chat/jabberd/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:26:44 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/02/21 05:38:29 xtraeme Exp $ # # This Makefile fragment is included by packages that use jabberd. # @@ -14,10 +14,9 @@ BUILDLINK_DEPENDS+= jabberd .if !empty(JABBERD_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= jabberd -BUILDLINK_DEPENDS.jabberd+= jabberd>=1.4.3nb1 +BUILDLINK_DEPENDS.jabberd+= jabberd>=1.4.2 BUILDLINK_PKGSRCDIR.jabberd?= ../../chat/jabberd -.include "../../devel/pth/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .endif # JABBERD_BUILDLINK3_MK diff --git a/chat/jabberd/distinfo b/chat/jabberd/distinfo index 01dce5cc6f4..7998e36b15b 100644 --- a/chat/jabberd/distinfo +++ b/chat/jabberd/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/12/23 10:16:20 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2004/02/21 05:38:29 xtraeme Exp $ -SHA1 (jabberd-1.4.3.tar.gz) = cf968017c8a4f2d0dc3c139c712846a722d9bbed -Size (jabberd-1.4.3.tar.gz) = 258016 bytes -SHA1 (patch-aa) = f51bb9bbab6e884d6f36f4e67c7d76a38fd7db4f -SHA1 (patch-ab) = 8685472f1acc4b5ae4cc15627076ff67b6964a25 -SHA1 (patch-ac) = 7639bc0762d9e64438034b016c1bb3c87c5f5a94 -SHA1 (patch-ad) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367 +SHA1 (jabber-1.4.2.tar.gz) = aa0bc2e9815e4fa4a1ca8ba7f320bfd3c85ba11f +Size (jabber-1.4.2.tar.gz) = 690217 bytes +SHA1 (patch-aa) = 726ff89388dca237ac9acb83113a683feca8a356 +SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1 +SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367 diff --git a/chat/jabberd/files/jabberd.sh b/chat/jabberd/files/jabberd.sh index 5ae7da7e557..8809638a5ae 100644 --- a/chat/jabberd/files/jabberd.sh +++ b/chat/jabberd/files/jabberd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: jabberd.sh,v 1.1.1.1 2003/12/23 10:16:20 xtraeme Exp $ +# $NetBSD: jabberd.sh,v 1.2 2004/02/21 05:38:29 xtraeme Exp $ # # PROVIDE: jabberd diff --git a/chat/jabberd/patches/patch-aa b/chat/jabberd/patches/patch-aa index 7f83042e770..b30df914945 100644 --- a/chat/jabberd/patches/patch-aa +++ b/chat/jabberd/patches/patch-aa @@ -1,133 +1,59 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/12/23 10:16:21 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2004/02/21 05:38:29 xtraeme Exp $ ---- jabber.xml.in.orig 2003-11-17 11:01:33.000000000 +0100 -+++ jabber.xml.in 2003-11-17 11:07:37.000000000 +0100 -@@ -295,21 +295,21 @@ - --> +--- configure.orig Mon Feb 11 20:14:06 2002 ++++ configure Sat Feb 14 01:59:47 2004 +@@ -32,7 +32,8 @@ + LDFLAGS="$LDFLAGS" + LIBS="$LIBS" + XLDFLAGS="$XLDFLAGS " +-JHOME=`pwd` ++JHOME=${PKG_SYSCONFDIR} ++WRKSRC="`cat .wrksrc-freebsd`" + + ## + # Print a cool header +@@ -76,31 +77,19 @@ + ## + # Pth check + ## +-printf "Getting pth settings..." +-PTH_CFLAGS=`pth-config --cflags` +-PTH_LDFLAGS=`pth-config --ldflags` +-PTH_LIBS=`pth-config --libs` +-PTH_LIBDIR=`pth-config --libdir` +-if [ -n "$PTH_CFLAGS" ]; then +- CFLAGS="$CFLAGS $PTH_CFLAGS"; +- LDFLAGS="$LDFLAGS $PTH_LDFLAGS"; +- LIBS="$LIBS $PTH_LIBS"; +- SLIBS="$SLIBS $PTH_LIBDIR/libpth.a"; +- printf " Done.\n"; +-else +- if [ -d "jabberd/pth-1.4.0" ]; then +- opwd=`pwd` +- cd jabberd/pth-1.4.0; +- ./configure || (printf "Error Configuring pth"; exit 1); +- cd $opwd; +- PSUBDIR="pth-1.4.0"; +- PTHP=`pwd`"/jabberd/pth-1.4.0"; +- PLINK="$PTHP/pth_*.o"; +- CFLAGS="$CFLAGS -I`pwd`/jabberd/pth-1.4.0"; +- else +- printf " Error.\n\n No version of PTH is available on this system\nhttp://www.gnu.org/software/pth/"; +- fi +-fi ++echo "Using jabber's internal copy of pth 1.4.0 because 1.4.1 is incompatible" ++opwd=`pwd` ++cd jabberd/pth-1.4.0; ++echo "Configuring jabber pth-1.4.0..." ++./configure || (echo "Error Configuring pth"; exit 1); ++echo "Building pth-1.4.0..." ++gmake ++cd $opwd; ++PSUBDIR="pth-1.4.0"; ++PTHP="`pwd`/jabberd/pth-1.4.0"; ++PLINK="$PTHP/pth_*.o"; ++CFLAGS="$CFLAGS -I${PTHP}"; ++LDFLAGS="$LDFLAGS -L${PTHP}"; - <load main="jsm"> -- <jsm>./jsm/jsm.so</jsm> -- <mod_echo>./jsm/jsm.so</mod_echo> -- <mod_roster>./jsm/jsm.so</mod_roster> -- <mod_time>./jsm/jsm.so</mod_time> -- <mod_vcard>./jsm/jsm.so</mod_vcard> -- <mod_last>./jsm/jsm.so</mod_last> -- <mod_version>./jsm/jsm.so</mod_version> -- <mod_announce>./jsm/jsm.so</mod_announce> -- <mod_agents>./jsm/jsm.so</mod_agents> -- <mod_browse>./jsm/jsm.so</mod_browse> -- <mod_disco>./jsm/jsm.so</mod_disco> -- <mod_admin>./jsm/jsm.so</mod_admin> -- <mod_filter>./jsm/jsm.so</mod_filter> -- <mod_offline>./jsm/jsm.so</mod_offline> -- <mod_presence>./jsm/jsm.so</mod_presence> -+ <jsm>@LIBDIR@/jsm.so</jsm> -+ <mod_echo>@LIBDIR@/jsm.so</mod_echo> -+ <mod_roster>@LIBDIR@/jsm.so</mod_roster> -+ <mod_time>@LIBDIR@/jsm.so</mod_time> -+ <mod_vcard>@LIBDIR@/jsm.so</mod_vcard> -+ <mod_last>@LIBDIR@/jsm.so</mod_last> -+ <mod_version>@LIBDIR@/jsm.so</mod_version> -+ <mod_announce>@LIBDIR@/jsm.so</mod_announce> -+ <mod_agents>@LIBDIR@/jsm.so</mod_agents> -+ <mod_browse>@LIBDIR@/jsm.so</mod_browse> -+ <mod_disco>@LIBDIR@/jsm.so</mod_disco> -+ <mod_admin>@LIBDIR@/jsm.so</mod_admin> -+ <mod_filter>@LIBDIR@/jsm.so</mod_filter> -+ <mod_offline>@LIBDIR@/jsm.so</mod_offline> -+ <mod_presence>@LIBDIR@/jsm.so</mod_presence> - <!-- - Authentication -@@ -325,19 +325,19 @@ - --> - <!-- mod_auth_digest: Password in clear text in storage, - encrypted/hashed on the wire --> -- <mod_auth_digest>./jsm/jsm.so</mod_auth_digest> -+ <mod_auth_digest>@LIBDIR@/jsm.so</mod_auth_digest> - <!-- mod_auth_plain: Password in clear text in storage - and on the wire. Disable this if you do not use clients - that need plaintext auth --> -- <mod_auth_plain>./jsm/jsm.so</mod_auth_plain> -+ <mod_auth_plain>@LIBDIR@/jsm.so</mod_auth_plain> - <!-- mod_auth_crypt: Password encrypted/hashed in storage, - clear text on the wire. Disabled as this only makes - sense when used exclusively and with SSL mandatory - <mod_auth_crypt>./jsm/jsm.so</mod_auth_crypt> --> -- <mod_log>./jsm/jsm.so</mod_log> -- <mod_register>./jsm/jsm.so</mod_register> -- <mod_xml>./jsm/jsm.so</mod_xml> -+ <mod_log>@LIBDIR@/jsm.so</mod_log> -+ <mod_register>@LIBDIR@/jsm.so</mod_register> -+ <mod_xml>@LIBDIR@/jsm.so</mod_xml> - </load> - - </service> -@@ -353,10 +353,10 @@ - <xdb id="xdb"> - <host/> - <load> -- <xdb_file>./xdb_file/xdb_file.so</xdb_file> -+ <xdb_file>@LIBDIR@/xdb_file.so</xdb_file> - </load> - <xdb_file xmlns="jabber:config:xdb_file"> -- <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool> -+ <spool><jabberd:cmdline flag='s'>@SPOOLDIR@</jabberd:cmdline></spool> - </xdb_file> - </xdb> - -@@ -387,7 +387,7 @@ - - <service id="c2s"> - <load> -- <pthsock_client>./pthsock/pthsock_client.so</pthsock_client> -+ <pthsock_client>@LIBDIR@/pthsock_client.so</pthsock_client> - </load> - <pthcsock xmlns='jabber:config:pth-csock'> - <authtime/> -@@ -430,7 +430,7 @@ - <host/> - <logtype/> - <format>%d: [%t] (%h): %s</format> -- <file>error.log</file> -+ <file>@LOGDIR@/error.log</file> - <stderr/> - </log> - -@@ -443,7 +443,7 @@ - <host/> - <logtype>record</logtype> - <format>%d %h %s</format> -- <file>record.log</file> -+ <file>@LOGDIR@/record.log</file> - </log> - - <!-- The following two services are for handling server-to-server traffic. --> -@@ -453,7 +453,7 @@ - <service id="dnsrv"> - <host/> - <load> -- <dnsrv>./dnsrv/dnsrv.so</dnsrv> -+ <dnsrv>@LIBDIR@/dnsrv.so</dnsrv> - </load> - <dnsrv xmlns="jabber:config:dnsrv"> - <resend service="_xmpp-server._tcp">s2s</resend> <!-- for supporting XMPP compliant SRV records --> -@@ -473,7 +473,7 @@ - - <service id="s2s"> - <load> -- <dialback>./dialback/dialback.so</dialback> -+ <dialback>@LIBDIR@/dialback.so</dialback> - </load> - <dialback xmlns='jabber:config:dialback'> - <legacy/> -@@ -668,7 +668,7 @@ - <!-- - This specifies the file to store the pid of the process in. - --> -- <pidfile>./jabber.pid</pidfile> -+ <pidfile>@PIDDIR@/jabber.pid</pidfile> - - - </jabber> diff --git a/chat/jabberd/patches/patch-ab b/chat/jabberd/patches/patch-ab index a25af0a6056..c3702c8fcb1 100644 --- a/chat/jabberd/patches/patch-ab +++ b/chat/jabberd/patches/patch-ab @@ -1,13 +1,118 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/12/23 10:16:21 xtraeme Exp $ +$NetBSD: patch-ab,v 1.2 2004/02/21 05:38:29 xtraeme Exp $ ---- configure.orig 2003-05-10 11:40:14.000000000 +0200 -+++ configure 2003-05-10 11:41:01.000000000 +0200 -@@ -32,7 +32,7 @@ - LDFLAGS="$LDFLAGS" - LIBS="$LIBS" - XLDFLAGS="$XLDFLAGS " --JHOME=`pwd` -+JHOME=${PKG_SYSCONFDIR} - - ## - # Print a cool header +--- jabber.xml.in.orig Tue May 15 17:21:56 2001 ++++ jabber.xml.in Sat Feb 14 02:06:11 2004 +@@ -264,26 +264,26 @@ + --> + + <load main="jsm"> +- <jsm>./jsm/jsm.so</jsm> +- <mod_echo>./jsm/jsm.so</mod_echo> +- <mod_roster>./jsm/jsm.so</mod_roster> +- <mod_time>./jsm/jsm.so</mod_time> +- <mod_vcard>./jsm/jsm.so</mod_vcard> +- <mod_last>./jsm/jsm.so</mod_last> +- <mod_version>./jsm/jsm.so</mod_version> +- <mod_announce>./jsm/jsm.so</mod_announce> +- <mod_agents>./jsm/jsm.so</mod_agents> +- <mod_browse>./jsm/jsm.so</mod_browse> +- <mod_admin>./jsm/jsm.so</mod_admin> +- <mod_filter>./jsm/jsm.so</mod_filter> +- <mod_offline>./jsm/jsm.so</mod_offline> +- <mod_presence>./jsm/jsm.so</mod_presence> +- <mod_auth_plain>./jsm/jsm.so</mod_auth_plain> +- <mod_auth_digest>./jsm/jsm.so</mod_auth_digest> +- <mod_auth_0k>./jsm/jsm.so</mod_auth_0k> +- <mod_log>./jsm/jsm.so</mod_log> +- <mod_register>./jsm/jsm.so</mod_register> +- <mod_xml>./jsm/jsm.so</mod_xml> ++ <jsm>@LIBDIR@/jsm.so</jsm> ++ <mod_echo>@LIBDIR@/jsm.so</mod_echo> ++ <mod_roster>@LIBDIR@/jsm.so</mod_roster> ++ <mod_time>@LIBDIR@/jsm.so</mod_time> ++ <mod_vcard>@LIBDIR@/jsm.so</mod_vcard> ++ <mod_last>@LIBDIR@/jsm.so</mod_last> ++ <mod_version>@LIBDIR@/jsm.so</mod_version> ++ <mod_announce>@LIBDIR@/jsm.so</mod_announce> ++ <mod_agents>@LIBDIR@/jsm.so</mod_agents> ++ <mod_browse>@LIBDIR@/jsm.so</mod_browse> ++ <mod_admin>@LIBDIR@/jsm.so</mod_admin> ++ <mod_filter>@LIBDIR@/jsm.so</mod_filter> ++ <mod_offline>@LIBDIR@/jsm.so</mod_offline> ++ <mod_presence>@LIBDIR@/jsm.so</mod_presence> ++ <mod_auth_plain>@LIBDIR@/jsm.so</mod_auth_plain> ++ <mod_auth_digest>@LIBDIR@/jsm.so</mod_auth_digest> ++ <mod_auth_0k>@LIBDIR@/jsm.so</mod_auth_0k> ++ <mod_log>@LIBDIR@/jsm.so</mod_log> ++ <mod_register>@LIBDIR@/jsm.so</mod_register> ++ <mod_xml>@LIBDIR@/jsm.so</mod_xml> + </load> + + </service> +@@ -295,10 +295,10 @@ + <xdb id="xdb"> + <host/> + <load> +- <xdb_file>./xdb_file/xdb_file.so</xdb_file> ++ <xdb_file>@LIBDIR@/xdb_file.so</xdb_file> + </load> + <xdb_file xmlns="jabber:config:xdb_file"> +- <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool> ++ <spool><jabberd:cmdline flag='s'>@SPOOLDIR@</jabberd:cmdline></spool> + </xdb_file> + </xdb> + +@@ -319,7 +319,7 @@ + + <service id="c2s"> + <load> +- <pthsock_client>./pthsock/pthsock_client.so</pthsock_client> ++ <pthsock_client>@LIBDIR@/pthsock_client.so</pthsock_client> + </load> + <pthcsock xmlns='jabber:config:pth-csock'> + <authtime/> +@@ -359,7 +359,7 @@ + <host/> + <logtype/> + <format>%d: [%t] (%h): %s</format> +- <file>error.log</file> ++ <file>@LOGDIR@/error.log</file> + <stderr/> + </log> + +@@ -372,7 +372,7 @@ + <host/> + <logtype>record</logtype> + <format>%d %h %s</format> +- <file>record.log</file> ++ <file>@LOGDIR@/record.log</file> + </log> + + <!-- The following two services are for handling server-to-server traffic. --> +@@ -382,7 +382,7 @@ + <service id="dnsrv"> + <host/> + <load> +- <dnsrv>./dnsrv/dnsrv.so</dnsrv> ++ <dnsrv>@LIBDIR@/dnsrv.so</dnsrv> + </load> + <dnsrv xmlns="jabber:config:dnsrv"> + <resend service="_jabber._tcp">s2s</resend> <!-- for supporting SRV records --> +@@ -401,7 +401,7 @@ + + <service id="s2s"> + <load> +- <dialback>./dialback/dialback.so</dialback> ++ <dialback>@LIBDIR@/dialback.so</dialback> + </load> + <dialback xmlns='jabber:config:dialback'> + <legacy/> +@@ -596,7 +596,7 @@ + <!-- + This specifies the file to store the pid of the process in. + --> +- <pidfile>./jabber.pid</pidfile> ++ <pidfile>@PIDDIR@/jabber.pid</pidfile> + + + </jabber> diff --git a/chat/jabberd/patches/patch-ac b/chat/jabberd/patches/patch-ac index 7ed805e6511..0e96d9558e7 100644 --- a/chat/jabberd/patches/patch-ac +++ b/chat/jabberd/patches/patch-ac @@ -1,14 +1,36 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/12/23 10:16:20 xtraeme Exp $ +$NetBSD: patch-ac,v 1.2 2004/02/21 05:38:29 xtraeme Exp $ ---- jsm/modules/mod_auth_crypt.c.orig 2003-12-02 21:47:29.000000000 +0100 -+++ jsm/modules/mod_auth_crypt.c 2003-12-02 21:48:19.000000000 +0100 -@@ -28,7 +28,8 @@ - * - * --------------------------------------------------------------------------*/ - #include "jsm.h" --#include "crypt.h" -+#define _XOPEN_SOURCE -+#include <unistd.h> +--- jabberd/jabberd.c.orig 2003-12-19 12:17:00.000000000 +0000 ++++ jabberd/jabberd.c 2003-12-19 12:17:52.000000000 +0000 +@@ -199,15 +199,6 @@ + if(home != NULL && chdir(home)) + fprintf(stderr,"Unable to access home folder %s: %s\n",home,strerror(errno)); - #define HASH_CRYPT 1 - #define HASH_SHA1 2 +- /* background ourselves if we have been flagged to do so */ +- if(do_background != 0) +- { +- if (fork() != 0) +- { +- exit(0); +- } +- } +- + /* load the config passing the file if it was manually set */ + cfgfile=ghash_get(cmd__line,"c"); + if(configurate(cfgfile)) +@@ -234,6 +225,15 @@ + dynamic_init(); + deliver_init(); + ++ /* background ourselves if we have been flagged to do so */ ++ if(do_background != 0) ++ { ++ if (fork() != 0) ++ { ++ exit(0); ++ } ++ } ++ + /* everything should be registered for the config pass, validate */ + deliver__flag = 0; /* pause deliver() while starting up */ + if(configo(0)) diff --git a/chat/jabberd/patches/patch-ad b/chat/jabberd/patches/patch-ad deleted file mode 100644 index 167ef938aef..00000000000 --- a/chat/jabberd/patches/patch-ad +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2003/12/23 10:16:22 xtraeme Exp $ - ---- jabberd/jabberd.c.orig 2003-12-19 12:17:00.000000000 +0000 -+++ jabberd/jabberd.c 2003-12-19 12:17:52.000000000 +0000 -@@ -199,15 +199,6 @@ - if(home != NULL && chdir(home)) - fprintf(stderr,"Unable to access home folder %s: %s\n",home,strerror(errno)); - -- /* background ourselves if we have been flagged to do so */ -- if(do_background != 0) -- { -- if (fork() != 0) -- { -- exit(0); -- } -- } -- - /* load the config passing the file if it was manually set */ - cfgfile=ghash_get(cmd__line,"c"); - if(configurate(cfgfile)) -@@ -234,6 +225,15 @@ - dynamic_init(); - deliver_init(); - -+ /* background ourselves if we have been flagged to do so */ -+ if(do_background != 0) -+ { -+ if (fork() != 0) -+ { -+ exit(0); -+ } -+ } -+ - /* everything should be registered for the config pass, validate */ - deliver__flag = 0; /* pause deliver() while starting up */ - if(configo(0)) |