From 1b6c323c851cc74ffabef8d131625d71580d94ff Mon Sep 17 00:00:00 2001 From: xtraeme Date: Tue, 23 Dec 2003 10:16:20 +0000 Subject: Initial import of jabberd-1.4.3 from pkgsrc-wip. Jabber is an open XML protocol for real-time exchange of messages and presence notification between any two points on the Internet. The first application of Jabber technology is an asynchronous, extensible instant messaging platform, and an IM network that offers functionality similar to legacy IM systems such as AIM, ICQ, MSN, and Yahoo. --- chat/jabberd/DESCR | 5 ++ chat/jabberd/Makefile | 81 +++++++++++++++++++++++++ chat/jabberd/PLIST | 16 +++++ chat/jabberd/distinfo | 8 +++ chat/jabberd/files/jabberd.sh | 21 +++++++ chat/jabberd/patches/patch-aa | 133 ++++++++++++++++++++++++++++++++++++++++++ chat/jabberd/patches/patch-ab | 13 +++++ chat/jabberd/patches/patch-ac | 14 +++++ chat/jabberd/patches/patch-ad | 36 ++++++++++++ 9 files changed, 327 insertions(+) create mode 100644 chat/jabberd/DESCR create mode 100644 chat/jabberd/Makefile create mode 100644 chat/jabberd/PLIST create mode 100644 chat/jabberd/distinfo create mode 100644 chat/jabberd/files/jabberd.sh create mode 100644 chat/jabberd/patches/patch-aa create mode 100644 chat/jabberd/patches/patch-ab create mode 100644 chat/jabberd/patches/patch-ac create mode 100644 chat/jabberd/patches/patch-ad (limited to 'chat/jabberd') diff --git a/chat/jabberd/DESCR b/chat/jabberd/DESCR new file mode 100644 index 00000000000..8132f6b03f0 --- /dev/null +++ b/chat/jabberd/DESCR @@ -0,0 +1,5 @@ +Jabber is an open XML protocol for real-time exchange of messages and +presence notification between any two points on the Internet. The first +application of Jabber technology is an asynchronous, extensible instant +messaging platform, and an IM network that offers functionality similar +to legacy IM systems such as AIM, ICQ, MSN, and Yahoo. diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile new file mode 100644 index 00000000000..d638481deed --- /dev/null +++ b/chat/jabberd/Makefile @@ -0,0 +1,81 @@ +# $NetBSD: Makefile,v 1.1.1.1 2003/12/23 10:16:20 xtraeme Exp $ +# + +DISTNAME= jabberd-1.4.3 +CATEGORIES= chat +MASTER_SITES= http://jabberd.jabberstudio.org/1.4/dist/ + +MAINTAINER= xtraeme@NetBSD.org +HOMEPAGE= http://jabberd.jabberstudio.org/1.4/ +COMMENT= Instant messaging server + +CONFLICTS= jabberd2-[0-9]*:../../wip/jabberd2 + +USE_BUILDLINK2= yes +HAS_CONFIGURE= yes +USE_GMAKE= yes +USE_PKGINSTALL= yes + +CONFIGURE_ARGS+= --enable-ssl + +RCD_SCRIPTS= jabberd +PKG_SYSCONFSUBDIR= jabberd + +EGDIR= ${PREFIX}/share/examples/jabberd +LIBDIR= ${PREFIX}/lib/jabberd +INCDIR= ${PREFIX}/include/jabberd + +.include "../../mk/bsd.prefs.mk" + +BUILD_DEFS+= JABBERD_USER JABBERD_GROUP \ + JABBERD_LOGDIR JABBERD_SPOOLDIR \ + JABBERD_PIDDIR USE_INET6 + +.if !empty(USE_INET6:M[Yy][Ee][Ss]) +CONFIGURE_ARGS+= --enable-ipv6 +.endif + +PKG_GROUPS= ${JABBERD_GROUP} +PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}::Jabberd\\ user + +FILES_SUBST+= JABBERD_USER="${JABBERD_USER}" +FILES_SUBST+= JABBERD_GROUP="${JABBERD_GROUP}" +FILES_SUBST+= JABBERD_SPOOLDIR="${JABBERD_SPOOLDIR}" +FILES_SUBST+= JABBERD_PIDDIR="${JABBERD_PIDDIR}" + +.for f in ${JABBERD_LOGDIR} ${JABBERD_SPOOLDIR} ${JABBERD_PIDDIR} +OWN_DIRS_PERMS+= ${f} ${JABBERD_USER} ${JABBERD_GROUP} 750 +.endfor +.undef f + +CONF_FILES= ${EGDIR}/jabber.xml ${PKG_SYSCONFDIR}/jabber.xml +SUPPORT_FILES= ${EGDIR}/platform-settings \ + ${PKG_SYSCONFDIR}/platform-settings +post-extract: + @${MV} ${WRKSRC}/jabber.xml ${WRKSRC}/jabber.xml.in + +pre-configure: + @${SED} \ + -e "s|@LIBDIR@|${PREFIX}/lib/jabberd|g" \ + -e "s|@LOGDIR@|${JABBERD_LOGDIR}|g" \ + -e "s|@PIDDIR@|${JABBERD_PIDDIR}|g" \ + -e "s|@SPOOLDIR@|${JABBERD_SPOOLDIR}|g" \ + ${WRKSRC}/jabber.xml.in > ${WRKSRC}/jabber.xml + +do-install: + ${INSTALL_DATA_DIR} ${EGDIR} ${LIBDIR} ${INCDIR} + ${INSTALL_DATA} ${WRKSRC}/jabber.xml ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/platform-settings ${EGDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/jabberd/jabberd ${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/jsm/jsm.so ${LIBDIR} + ${INSTALL_DATA} ${WRKSRC}/xdb_file/xdb_file.so ${LIBDIR} + ${INSTALL_DATA} ${WRKSRC}/pthsock/pthsock_client.so ${LIBDIR} + ${INSTALL_DATA} ${WRKSRC}/dnsrv/dnsrv.so ${LIBDIR} + ${INSTALL_DATA} ${WRKSRC}/dialback/dialback.so ${LIBDIR} + ${INSTALL_DATA} ${WRKSRC}/jabberd/jabberd.h ${INCDIR} + ${INSTALL_DATA} ${WRKSRC}/jabberd/lib/lib.h ${INCDIR} + ${INSTALL_DATA} ${WRKSRC}/jabberd/lib/xmlparse.h ${INCDIR} + +.include "../../devel/pth/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/chat/jabberd/PLIST b/chat/jabberd/PLIST new file mode 100644 index 00000000000..e7f2ef77499 --- /dev/null +++ b/chat/jabberd/PLIST @@ -0,0 +1,16 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/23 10:16:20 xtraeme Exp $ +etc/rc.d/jabberd +include/jabberd/jabberd.h +include/jabberd/lib.h +include/jabberd/xmlparse.h +lib/jabberd/dialback.so +lib/jabberd/dnsrv.so +lib/jabberd/jsm.so +lib/jabberd/pthsock_client.so +lib/jabberd/xdb_file.so +sbin/jabberd +share/examples/jabberd/jabber.xml +share/examples/jabberd/platform-settings +@dirrm share/examples/jabberd +@dirrm lib/jabberd +@dirrm include/jabberd diff --git a/chat/jabberd/distinfo b/chat/jabberd/distinfo new file mode 100644 index 00000000000..01dce5cc6f4 --- /dev/null +++ b/chat/jabberd/distinfo @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1.1.1 2003/12/23 10:16:20 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 diff --git a/chat/jabberd/files/jabberd.sh b/chat/jabberd/files/jabberd.sh new file mode 100644 index 00000000000..5ae7da7e557 --- /dev/null +++ b/chat/jabberd/files/jabberd.sh @@ -0,0 +1,21 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: jabberd.sh,v 1.1.1.1 2003/12/23 10:16:20 xtraeme Exp $ +# + +# PROVIDE: jabberd +# REQUIRE: DAEMON LOGIN + +. /etc/rc.subr + +name="jabberd" +help_name="jabber" +rcvar=$name +command="@PREFIX@/sbin/${name}" +required_files="@PKG_SYSCONFDIR@/jabber.xml" +command_args="-B -c $required_files 2> /dev/null" +pidfile="@JABBERD_PIDDIR@/${help_name}.pid" +jabberd_user="@JABBERD_USER@" + +load_rc_config $name +run_rc_command "$1" diff --git a/chat/jabberd/patches/patch-aa b/chat/jabberd/patches/patch-aa new file mode 100644 index 00000000000..7f83042e770 --- /dev/null +++ b/chat/jabberd/patches/patch-aa @@ -0,0 +1,133 @@ +$NetBSD: patch-aa,v 1.1.1.1 2003/12/23 10:16:21 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 @@ + --> + + +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so + + + +- ./jsm/jsm.so ++ @LIBDIR@/jsm.so + +- ./jsm/jsm.so ++ @LIBDIR@/jsm.so + + +- ./jsm/jsm.so +- ./jsm/jsm.so +- ./jsm/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so ++ @LIBDIR@/jsm.so + + + +@@ -353,10 +353,10 @@ + + + +- ./xdb_file/xdb_file.so ++ @LIBDIR@/xdb_file.so + + +- ./spool ++ @SPOOLDIR@ + + + +@@ -387,7 +387,7 @@ + + + +- ./pthsock/pthsock_client.so ++ @LIBDIR@/pthsock_client.so + + + +@@ -430,7 +430,7 @@ + + + %d: [%t] (%h): %s +- error.log ++ @LOGDIR@/error.log + + + +@@ -443,7 +443,7 @@ + + record + %d %h %s +- record.log ++ @LOGDIR@/record.log + + + +@@ -453,7 +453,7 @@ + + + +- ./dnsrv/dnsrv.so ++ @LIBDIR@/dnsrv.so + + + s2s +@@ -473,7 +473,7 @@ + + + +- ./dialback/dialback.so ++ @LIBDIR@/dialback.so + + + +@@ -668,7 +668,7 @@ + +- ./jabber.pid ++ @PIDDIR@/jabber.pid + + + diff --git a/chat/jabberd/patches/patch-ab b/chat/jabberd/patches/patch-ab new file mode 100644 index 00000000000..a25af0a6056 --- /dev/null +++ b/chat/jabberd/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1 2003/12/23 10:16:21 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 diff --git a/chat/jabberd/patches/patch-ac b/chat/jabberd/patches/patch-ac new file mode 100644 index 00000000000..7ed805e6511 --- /dev/null +++ b/chat/jabberd/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1.1.1 2003/12/23 10:16:20 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 + + #define HASH_CRYPT 1 + #define HASH_SHA1 2 diff --git a/chat/jabberd/patches/patch-ad b/chat/jabberd/patches/patch-ad new file mode 100644 index 00000000000..167ef938aef --- /dev/null +++ b/chat/jabberd/patches/patch-ad @@ -0,0 +1,36 @@ +$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)) -- cgit v1.2.3