ports/68967: Update net/jabberd to 2.0.3
Kirk Strauser
kirk at strauser.com
Tue Jul 13 01:20:03 UTC 2004
>Number: 68967
>Category: ports
>Synopsis: Update net/jabberd to 2.0.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 13 01:20:02 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Kirk Strauser
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
The Day Companies
>Environment:
System: FreeBSD kanga.honeypot.net 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Apr 8 15:37:48 CDT 2004 root at kanga.honeypot.net:/usr/obj/usr/src/sys/NEW_KANGA i386
>Description:
This PR replaces ports/68963.
This is an update of the net/jabberd port to version 2.0.3 (vendor string
"2.0s3") which fixes some serious memory leaks and other significant bugs.
This update also replaces the rc.d script with a new version that uses the
rc.subr framework.
I was able to successfully compile the port with all of the WITH_* knobs,
but only have the means to test WITH_POSTGRESQL (which worked as expected).
>How-To-Repeat:
>Fix:
--- jabberd.patch begins here ---
diff -urN net/jabberd-old/Makefile net/jabberd/Makefile
--- net/jabberd-old/Makefile Mon Jul 12 11:41:43 2004
+++ net/jabberd/Makefile Mon Jul 12 20:06:24 2004
@@ -2,14 +2,14 @@
# Date created: 29 December 2003
# Whom: Dmitry Sivachenko <demon at FreeBSD.org>
#
-# $FreeBSD: ports/net/jabberd/Makefile,v 1.16 2004/07/12 16:41:43 demon Exp $
+# $FreeBSD: ports/net/jabberd/Makefile,v 1.15 2004/06/14 10:01:47 demon Exp $
#
PORTNAME= jabberd
-PORTVERSION= 2.0.2
+PORTVERSION= 2.0.3
CATEGORIES= net
MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/
-DISTNAME= ${PORTNAME}-2.0s2
+DISTNAME= ${PORTNAME}-2.0s3
DIST_SUBDIR= jabber
MAINTAINER= ports at FreeBSD.org
@@ -18,14 +18,13 @@
GNU_CONFIGURE= yes
USE_OPENSSL= yes
USE_ICONV= yes
+USE_RC_SUBR= yes
CONFIGURE_ARGS= --localstatedir=/var \
- --with-libiconv-prefix=${LOCALBASE} \
- --with-openssl=${OPENSSLBASE} \
- --enable-storage='${STORAGE}' \
- --enable-authreg='${AUTHREG}'
+ --enable-ssl \
+ --with-extra-include-path=${LOCALBASE}/include:${LOCALBASE}/include/mysql \
+ --with-extra-library-path=${LOCALBASE}/lib:${LOCALBASE}/lib/mysql
-STORAGE+= fs
-AUTHREG+= anon pipe
+CONFIGURE_ARGS+=--enable-fs
.if !defined(WITHOUT_DEBUG)
CONFIGURE_ARGS+=--enable-debug
@@ -33,34 +32,28 @@
.if defined(WITH_POSTGRESQL)
LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7
-CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}/include:${LOCALBASE}/lib
-STORAGE+= pgsql
-AUTHREG+= pgsql
+CONFIGURE_ARGS+=--enable-pgsql
.endif
.if defined(WITH_MYSQL)
USE_MYSQL= yes
-CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}/include/mysql:${LOCALBASE}/lib/mysql
-STORAGE+= mysql
-AUTHREG+= mysql
+CONFIGURE_ARGS+=--enable-mysql
+.else
+CONFIGURE_ARGS+=--disable-mysql
.endif
.if defined(WITH_BDB)
LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
-CONFIGURE_ARGS+=--with-berkeley-db=${LOCALBASE}/include/db41:${LOCALBASE}/lib
-STORAGE+= db
-AUTHREG+= db
+CONFIGURE_ARGS+=--enable-db
.endif
.if defined(WITH_LDAP)
USE_OPENLDAP= yes
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-AUTHREG+= ldap
+CONFIGURE_ARGS+=--enable-ldap
.endif
.if defined(WITH_PAM)
-CONFIGURE_ARGS+=--with-pam
-AUTHREG+= pam
+CONFIGURE_ARGS+=--enable-pam
.endif
MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8
@@ -79,11 +72,8 @@
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- ${INSTALL_DATA} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh-dist
- @if [ ! -f ${PREFIX}/etc/rc.d/jabberd.sh ]; then \
- ${ECHO} "Installing ${PREFIX}/etc/rc.d/jabberd.sh startup file."; \
- ${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh; \
- fi
+ ${ECHO} "Installing ${PREFIX}/etc/rc.d/jabberd.sh startup file."; \
+ ${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh; \
@${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd
@${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
@${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660
diff -urN net/jabberd-old/distinfo net/jabberd/distinfo
--- net/jabberd-old/distinfo Sun Feb 22 04:19:36 2004
+++ net/jabberd/distinfo Mon Jul 12 10:13:21 2004
@@ -1,2 +1,2 @@
-MD5 (jabber/jabberd-2.0s2.tar.gz) = 0f794b00e480a7b4c36d858d4d0095bf
-SIZE (jabber/jabberd-2.0s2.tar.gz) = 780944
+MD5 (jabber/jabberd-2.0s3.tar.gz) = c15f8f07cb2ee499cd21c0b883b9f353
+SIZE (jabber/jabberd-2.0s3.tar.gz) = 705819
diff -urN net/jabberd-old/files/jabberd.sh net/jabberd/files/jabberd.sh
--- net/jabberd-old/files/jabberd.sh Thu Jan 1 07:19:25 2004
+++ net/jabberd/files/jabberd.sh Mon Jul 12 13:47:52 2004
@@ -1,37 +1,48 @@
-#! /bin/sh
+#!/bin/sh
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jabberd\.sh\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
+# Start or stop jabberd
+# $FreeBSD: $
-USER="jabber"
-RUNDIR="/var/jabberd/pid"
-HOSTNAME=`/bin/hostname`
+# PROVIDE: jabberd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+#
+prefix=/usr/local
+
+# Define these jabberd_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/gkrellmd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+jabberd_chdir="/var/jabberd/pid"
+jabberd_enable="NO"
+jabberd_flags=""
+jabberd_user="jabber"
+
+. /etc/rc.subr
+
+name="jabberd"
+rcvar=`set_rcvar`
+command="/usr/local/bin/jabberd"
+command_args="&"
+procname="/usr/local/bin/router"
-test -x ${PREFIX}/bin/jabberd || exit 1
+load_rc_config $name
-export PATH=/sbin:/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin
-umask 077
-
-cd ${RUNDIR} || exit
+pidfile="${jabberd_chdir}/router.pid"
case "$1" in
-start)
- su -f -m ${USER} -c ${PREFIX}/bin/jabberd &
- echo -n ' jabberd'
- ;;
-stop)
- killall -u ${USER} jabberd c2s resolver router s2s sm
- for file in c2s resolver router s2s sm
- do
- rm -f ${RUNDIR}/$file.pid
- done
- echo -n ' jabberd'
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
+ stop)
+ echo "Stopping Jabber2"
+ killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
+ for file in c2s resolver router s2s sm; do
+ rm -f ${jabberd_chdir}/$file.pid
+ done
+ ;;
+ *)
+ run_rc_command "$1"
+ ;;
esac
-
-exit 0
diff -urN net/jabberd-old/files/patch-configure net/jabberd/files/patch-configure
--- net/jabberd-old/files/patch-configure Sun Feb 22 04:19:36 2004
+++ net/jabberd/files/patch-configure Mon Jul 12 10:15:46 2004
@@ -1,11 +1,11 @@
---- configure.orig Sun Feb 22 13:14:13 2004
-+++ configure Sun Feb 22 13:14:42 2004
-@@ -23709,7 +23709,7 @@
- ;;
- esac
+--- configure.orig Mon Jul 12 10:15:17 2004
++++ configure Mon Jul 12 10:15:26 2004
+@@ -20575,7 +20575,7 @@
+ done
-- for db_libname in db-4.2 db-4.1 db-4 db4 db; do
-+ for db_libname in db-4.2 db-4.1 db-4 db4 db41 db; do
- # We generate a separate cache variable for each prefix and libname
- # we search under. That way, we avoid caching information that
- # changes if the user runs `configure' with a different set of
+ if test "x-$ac_cv_header_db_h" = "x-yes" ; then
+- for lib in db-4.2 db-4.1 db-4 db4 db ; do
++ for lib in db-4.2 db-4.1 db-4 db4 db41 ; do
+ if test "x-$have_db_version" != "x-yes" ; then
+ echo "$as_me:$LINENO: checking for db_create in -l$lib" >&5
+ echo $ECHO_N "checking for db_create in -l$lib... $ECHO_C" >&6
diff -urN net/jabberd-old/files/patch-util.h net/jabberd/files/patch-util.h
--- net/jabberd-old/files/patch-util.h Wed Dec 31 18:00:00 1969
+++ net/jabberd/files/patch-util.h Mon Jul 12 10:30:32 2004
@@ -0,0 +1,10 @@
+--- util/util.h.orig Mon May 31 16:31:06 2004
++++ util/util.h Mon Jul 12 10:29:58 2004
+@@ -30,6 +30,7 @@
+ #include <time.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <sys/socket.h>
+
+ #ifdef HAVE_NETINET_IN_H
+ # include <netinet/in.h>
diff -urN net/jabberd-old/pkg-plist net/jabberd/pkg-plist
--- net/jabberd-old/pkg-plist Thu Jan 1 15:19:32 2004
+++ net/jabberd/pkg-plist Mon Jul 12 14:12:23 2004
@@ -20,8 +20,8 @@
etc/jabberd/sm.xml.dist
@unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi
etc/jabberd/templates/roster.xml.dist
- at unexec if cmp -s %D/etc/rc.d/jabberd.sh %D/etc/rc.d/jabberd.sh-dist; then rm -f %D/etc/rc.d/jabberd.sh; fi
-etc/rc.d/jabberd.sh-dist
+ at unexec if cmp -s %D/etc/rc.d/jabberd.sh %D/etc/rc.d/jabberd.sh; then rm -f %D/etc/rc.d/jabberd.sh; fi
+etc/rc.d/jabberd.sh
share/jabberd/db-setup.mysql
share/jabberd/db-setup.pgsql
@dirrm share/jabberd
--- jabberd.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list