diff options
| -rw-r--r-- | net-im/jabber/Makefile | 37 | ||||
| -rw-r--r-- | net-im/jabber/distinfo | 6 | ||||
| -rw-r--r-- | net-im/jabber/files/jabberd.sh.in | 4 | ||||
| -rw-r--r-- | net-im/jabber/files/patch-Makefile | 42 | ||||
| -rw-r--r-- | net-im/jabber/files/patch-configure | 9 | ||||
| -rw-r--r-- | net-im/jabber/files/patch-jabber.xml | 49 | ||||
| -rw-r--r-- | net-im/jabber/files/patch-jsm-modules-mod_auth_crypt.c | 11 | ||||
| -rw-r--r-- | net-im/jabber/pkg-deinstall | 3 | ||||
| -rw-r--r-- | net-im/jabber/pkg-install | 42 | ||||
| -rw-r--r-- | net-im/jabber/pkg-plist | 59 |
10 files changed, 89 insertions, 173 deletions
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile index e5ac235c049b..efdfee84d7a5 100644 --- a/net-im/jabber/Makefile +++ b/net-im/jabber/Makefile @@ -6,8 +6,7 @@ # PORTNAME= jabber -PORTVERSION= 1.4.3.1 -PORTREVISION= 1 +PORTVERSION= 1.4.4 PORTEPOCH= 1 CATEGORIES= net-im ipv6 MASTER_SITES= http://download.jabberd.org/jabberd14/ @@ -18,16 +17,27 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Online presence and instant messaging server LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth \ + idn.16:${PORTSDIR}/dns/libidn \ expat.6:${PORTSDIR}/textproc/expat2 +OPTIONS= IPV6 "Enable IPv6 support" off + +USE_GNOME= gnometarget USE_RC_SUBR= jabberd.sh -GNU_CONFIGURE= yes -USE_GMAKE= yes USE_OPENSSL= yes +USE_ICONV= yes +USE_GMAKE= yes +USE_AUTOTOOLS= libtool:15 +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS= --localstatedir=/var \ + --with-ssl-legacy=/usr +USE_LDCONFIG= yes -CONFIGURE_ARGS+= --enable-ssl +MAN5= jabber.xml.5 +MAN8= jabberd.8 -OPTIONS= IPV6 "Enable IPv6 support" off +CPPFLAGS= -I${LOCALBASE}/include/pth -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib/pth -L${LOCALBASE}/lib .include <bsd.port.pre.mk> @@ -35,21 +45,6 @@ OPTIONS= IPV6 "Enable IPv6 support" off CONFIGURE_ARGS+= --enable-ipv6 .endif -#JABDIR= ${PORTNAME}-${PORTVERSION} -# Save this data for use later: jabber doesn't have an install target -# or a sane set of defaults. -post-patch: - ${ECHO} "${WRKSRC}" > ${WRKSRC}/.wrksrc-freebsd - ${ECHO} "${PREFIX}" > ${WRKSRC}/.prefix-freebsd - ${ECHO} "${INSTALL_DATA}" > ${WRKSRC}/.install_data-freebsd - ${ECHO} "${INSTALL_SCRIPT}" > ${WRKSRC}/.install_script-freebsd - ${ECHO} "${INSTALL_PROGRAM}" > ${WRKSRC}/.install_program-freebsd - -post-configure: - ${REINPLACE_CMD} -e "s#-I\. -I\.\. #-I\. -I\.\. -I${LOCALBASE}/include #" \ - -e "s#-L/usr/lib#-L/usr/lib -L${LOCALBASE}/lib#" \ - ${WRKSRC}/platform-settings - post-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/net-im/jabber/distinfo b/net-im/jabber/distinfo index c51cae94b5a3..8b59abab87ae 100644 --- a/net-im/jabber/distinfo +++ b/net-im/jabber/distinfo @@ -1,3 +1,3 @@ -MD5 (jabber/jabberd-1.4.3.1.tar.gz) = ab367ab23919c45d9f96c44aa8a66ea1 -SHA256 (jabber/jabberd-1.4.3.1.tar.gz) = 4a2dcb408e3e0c69bf2b757af79b18e11186f1d96083b858e312b4fb53389040 -SIZE (jabber/jabberd-1.4.3.1.tar.gz) = 209797 +MD5 (jabber/jabberd-1.4.4.tar.gz) = 395f814a6627436ba7bd235509adcbc7 +SHA256 (jabber/jabberd-1.4.4.tar.gz) = 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af +SIZE (jabber/jabberd-1.4.4.tar.gz) = 613479 diff --git a/net-im/jabber/files/jabberd.sh.in b/net-im/jabber/files/jabberd.sh.in index 89e1ae9e4b37..82a112444cef 100644 --- a/net-im/jabber/files/jabberd.sh.in +++ b/net-im/jabber/files/jabberd.sh.in @@ -21,12 +21,12 @@ load_rc_config $name required_files=%%PREFIX%%/etc/${name}.xml : ${jabber_enable="NO"} -: ${jabber_pidfile="/var/spool/jabber/${name}.pid"} +: ${jabber_pidfile="/var/run/jabber/${name}.pid"} : ${jabber_flags="-B -h `/bin/hostname` -c ${required_files}"} : ${jabber_user="jabber"} : ${jabber_group="jabber"} -command=%%PREFIX%%/sbin/jabberd +command=%%PREFIX%%/bin/jabberd command_args="${jabber_flags}" pidfile=${jabber_pidfile} diff --git a/net-im/jabber/files/patch-Makefile b/net-im/jabber/files/patch-Makefile deleted file mode 100644 index bc261a63564e..000000000000 --- a/net-im/jabber/files/patch-Makefile +++ /dev/null @@ -1,42 +0,0 @@ ---- Makefile.orig Sat Jan 20 21:32:48 2001 -+++ Makefile Sun Apr 14 23:30:36 2002 -@@ -4,6 +4,10 @@ - include platform-settings - - SUBDIRS=pthsock xdb_file dnsrv jsm dialback jabberd -+INSTALL_DATA=`cat .install_data-freebsd` -+INSTALL_DIR=install -d -+INSTALL_PROGRAM=`cat .install_program-freebsd` -+INSTALL_SCRIPT=`cat .install_data-freebsd` - - all: all-recursive - -@@ -13,8 +17,27 @@ - - single: single-recursive - -+LIBDIR=${PREFIX}/lib/jabber -+INCDIR=${PREFIX}/include/jabber - install: -- printf "\n\nNo actual make install, you just run it out of the directory!\n" -+ ${INSTALL_PROGRAM} jabberd/jabberd ${PREFIX}/sbin -+ ${INSTALL_DATA} jabber.xml ${PREFIX}/etc/jabber.xml.sample -+ ${INSTALL_DIR} ${LIBDIR}/jsm -+ ${INSTALL_DATA} jsm/jsm.so ${LIBDIR}/jsm -+ ${INSTALL_DIR} ${LIBDIR}/xdb_file -+ ${INSTALL_DATA} xdb_file/xdb_file.so ${LIBDIR}/xdb_file -+ ${INSTALL_DIR} ${LIBDIR}/pthsock -+ ${INSTALL_DATA} pthsock/pthsock_client.so ${LIBDIR}/pthsock -+ ${INSTALL_DIR} ${LIBDIR}/dnsrv -+ ${INSTALL_DATA} dnsrv/dnsrv.so ${LIBDIR}/dnsrv -+ ${INSTALL_DIR} ${LIBDIR}/dialback -+ ${INSTALL_DATA} dialback/dialback.so ${LIBDIR}/dialback -+ ${INSTALL_DIR} ${INCDIR} -+ ${INSTALL_DATA} platform-settings ${INCDIR} -+ ${INSTALL_DATA} jabberd/jabberd.h ${INCDIR} -+ ${INSTALL_DIR} ${INCDIR}/lib -+ ${INSTALL_DATA} jabberd/lib/lib.h ${INCDIR}/lib -+ - - all-local: - diff --git a/net-im/jabber/files/patch-configure b/net-im/jabber/files/patch-configure deleted file mode 100644 index 07f6c8b3c757..000000000000 --- a/net-im/jabber/files/patch-configure +++ /dev/null @@ -1,9 +0,0 @@ ---- configure.orig Mon Feb 11 11:14:06 2002 -+++ configure Sun Apr 14 18:38:40 2002 -@@ -32,7 +32,8 @@ - LDFLAGS="$LDFLAGS" - LIBS="$LIBS" - XLDFLAGS="$XLDFLAGS " --JHOME=`pwd` -+JHOME="`cat .prefix-freebsd`/lib/jabber" -+WRKSRC="`cat .wrksrc-freebsd`" diff --git a/net-im/jabber/files/patch-jabber.xml b/net-im/jabber/files/patch-jabber.xml deleted file mode 100644 index 925184122ed1..000000000000 --- a/net-im/jabber/files/patch-jabber.xml +++ /dev/null @@ -1,49 +0,0 @@ ---- jabber.xml.orig Thu Nov 13 22:53:46 2003 -+++ jabber.xml Thu May 6 04:19:22 2004 -@@ -49,6 +49,10 @@ - separate virtual server. Note that each host entry must - be on one line, the server doesn't like it otherwise! :) - Use lowercase for the hostname. -+ -+ Currently on FreeBSD jabberd is started with the -h option -+ from /usr/local/etc/rc.d/jabberd.sh. You'll need to modify -+ it before the below applies. - --> - - <host><jabberd:cmdline flag="h">localhost</jabberd:cmdline></host> -@@ -356,7 +360,7 @@ - <xdb_file>./xdb_file/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'>/var/spool/jabber</jabberd:cmdline></spool> - </xdb_file> - </xdb> - -@@ -430,7 +434,7 @@ - <host/> - <logtype/> - <format>%d: [%t] (%h): %s</format> -- <file>error.log</file> -+ <file>/var/log/jabber.error</file> - <stderr/> - </log> - -@@ -443,7 +447,7 @@ - <host/> - <logtype>record</logtype> - <format>%d %h %s</format> -- <file>record.log</file> -+ <file>/var/log/jabber.record</file> - </log> - - <!-- The following two services are for handling server-to-server traffic. --> -@@ -668,7 +672,7 @@ - <!-- - This specifies the file to store the pid of the process in. - --> -- <pidfile>./jabber.pid</pidfile> -+ <pidfile>/var/spool/jabber/jabber.pid</pidfile> - - - </jabber> diff --git a/net-im/jabber/files/patch-jsm-modules-mod_auth_crypt.c b/net-im/jabber/files/patch-jsm-modules-mod_auth_crypt.c deleted file mode 100644 index bc7d2121959e..000000000000 --- a/net-im/jabber/files/patch-jsm-modules-mod_auth_crypt.c +++ /dev/null @@ -1,11 +0,0 @@ ---- jsm/modules/mod_auth_crypt.c.orig Thu May 6 00:00:20 2004 -+++ jsm/modules/mod_auth_crypt.c Thu May 6 00:00:01 2004 -@@ -28,7 +28,7 @@ - * - * --------------------------------------------------------------------------*/ - #include "jsm.h" --#include "crypt.h" -+#include <unistd.h> - - #define HASH_CRYPT 1 - #define HASH_SHA1 2 diff --git a/net-im/jabber/pkg-deinstall b/net-im/jabber/pkg-deinstall index b886ee3b5b00..7adc2901c773 100644 --- a/net-im/jabber/pkg-deinstall +++ b/net-im/jabber/pkg-deinstall @@ -14,6 +14,7 @@ if pw groupshow "${USER}" 2>/dev/null 1>&2; then echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'" fi -echo "If you wish to delete jabber data files, remove '/var/spool/jabber' directory." +echo "If you wish to delete jabber data files, remove '/var/spool/jabberd' directory." +echo "If you wish to delete jabber log files, remove '/var/log/jabberd' directory." exit 0 diff --git a/net-im/jabber/pkg-install b/net-im/jabber/pkg-install index 926e79391c4c..1d8a161cc6b9 100644 --- a/net-im/jabber/pkg-install +++ b/net-im/jabber/pkg-install @@ -8,8 +8,10 @@ USER=jabber GROUP=${USER} UID=93 GID=${UID} -SPOOLDIR="/var/spool/jabber" ETCDIR=${PREFIX:-$PKG_PREFIX}/etc +LOGDIR="/var/log/jabberd" +PIDDIR="/var/run/jabberd" +SPOOLDIR="/var/spool/jabberd" if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then if pw groupadd ${GROUP} -g ${GID}; then @@ -32,6 +34,30 @@ if ! pw usershow "${USER}" 2>/dev/null 1>&2; then fi fi +if [ ! -f ${ETCDIR}/jabber.xml ]; then + echo "Creating \"${ETCDIR}/jabber.xml\"." + cp -p ${ETCDIR}/jabber.xml.dist ${ETCDIR}/jabber.xml +fi + +echo "Fixing config files ownerships and modes." +chown root:${GROUP} ${ETCDIR}/jabber.xml ${ETCDIR}/jabber.xml.dist +chmod 640 ${ETCDIR}/jabber.xml ${ETCDIR}/jabber.xml.dist + +if [ ! -d ${LOGDIR} ]; then + echo "Creating \"${LOGDIR}\"." + mkdir -p ${LOGDIR} +fi + +echo "Fixing ownerships and modes in \"${LOGDIR}\"." +touch ${LOGDIR}/error.log ${LOGDIR}/record.log +chown ${USER}:${GROUP} ${LOGDIR}/error.log ${LOGDIR}/record.log +chmod 640 ${LOGDIR}/error.log ${LOGDIR}/record.log + +if [ ! -d ${PIDDIR} ]; then + echo "Creating \"${PIDDIR}\"." + mkdir -p ${PIDDIR} +fi + if [ ! -d ${SPOOLDIR} ]; then echo "Creating \"${SPOOLDIR}\"." mkdir -p ${SPOOLDIR} @@ -40,17 +66,3 @@ fi echo "Fixing ownerships and modes in \"${SPOOLDIR}\"." chown -R ${USER}:${GROUP} ${SPOOLDIR} chmod -R go= ${SPOOLDIR} - -if [ ! -f ${ETCDIR}/jabber.xml ]; then - echo "Creating \"${ETCDIR}/jabber.xml\"." - cp -p ${ETCDIR}/jabber.xml.sample ${ETCDIR}/jabber.xml -fi - -echo "Fixing config files ownerships and modes." -chown root:${GROUP} ${ETCDIR}/jabber.xml ${ETCDIR}/jabber.xml.sample -chmod 640 ${ETCDIR}/jabber.xml ${ETCDIR}/jabber.xml.sample - -echo "Fixing log files, ownerships and modes." -touch /var/log/jabber.error /var/log/jabber.record -chown ${USER}:${GROUP} /var/log/jabber.error /var/log/jabber.record -chmod 640 /var/log/jabber.error /var/log/jabber.record diff --git a/net-im/jabber/pkg-plist b/net-im/jabber/pkg-plist index 007b1c128808..0e4d1221c672 100644 --- a/net-im/jabber/pkg-plist +++ b/net-im/jabber/pkg-plist @@ -1,20 +1,39 @@ -sbin/jabberd -@unexec if cmp -s %D/etc/jabber.xml.sample %D/etc/jabber.xml; then rm -f %D/etc/jabber.xml; fi -etc/jabber.xml.sample -include/jabber/lib/lib.h -include/jabber/platform-settings -include/jabber/jabberd.h -lib/jabber/dialback/dialback.so -lib/jabber/dnsrv/dnsrv.so -lib/jabber/jsm/jsm.so -lib/jabber/pthsock/pthsock_client.so -lib/jabber/xdb_file/xdb_file.so -@dirrm include/jabber/lib -@dirrm include/jabber -@dirrm lib/jabber/dialback -@dirrm lib/jabber/dnsrv -@dirrm lib/jabber/jsm -@dirrm lib/jabber/pthsock -@dirrm lib/jabber/xdb_file -@dirrm lib/jabber -@unexec rmdir /var/spool/jabber 2>/dev/null || true +bin/jabberd +bin/xdbfiletool +@unexec if cmp -s %D/etc/jabber.xml.dist %D/etc/jabber.xml; then rm -f %D/etc/jabber.xml; fi +etc/jabber.xml.dist +include/jabberd.h +include/jabberdlib.h +lib/libjabberd.a +lib/libjabberd.la +lib/libjabberd.so +lib/libjabberd.so.0 +lib/libjabberddialback.a +lib/libjabberddialback.la +lib/libjabberddialback.so +lib/libjabberddialback.so.0 +lib/libjabberddnsrv.a +lib/libjabberddnsrv.la +lib/libjabberddnsrv.so +lib/libjabberddnsrv.so.0 +lib/libjabberdpthsock.a +lib/libjabberdpthsock.la +lib/libjabberdpthsock.so +lib/libjabberdpthsock.so.0 +lib/libjabberdsm.a +lib/libjabberdsm.la +lib/libjabberdsm.so +lib/libjabberdsm.so.0 +lib/libjabberdxdbfile.a +lib/libjabberdxdbfile.la +lib/libjabberdxdbfile.so +lib/libjabberdxdbfile.so.0 +lib/libjabberdxdbsql.a +lib/libjabberdxdbsql.la +lib/libjabberdxdbsql.so +lib/libjabberdxdbsql.so.0 +@unexec if test ! -s /var/log/jabberd/error.log; then rm -f /var/log/jabberd/error.log; fi +@unexec if test ! -s /var/log/jabberd/record.log; then rm -f /var/log/jabberd/record.log; fi +@unexec rmdir /var/spool/jabberd 2>/dev/null || true +@unexec rmdir /var/run/jabberd 2>/dev/null || true +@unexec rmdir /var/log/jabberd 2>/dev/null || true |