Date: Fri, 15 Apr 2005 23:43:58 -0500 (CDT) From: Kirk Strauser <kirk@strauser.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/79993: [MAINTAINER UPDATE] Update port: net/jabberd to 2.0.7 (2.0s7) Message-ID: <20050416044358.C17632207C1@kanga.honeypot.net> Resent-Message-ID: <200504160450.j3G4oOGq000171@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79993 >Category: ports >Synopsis: [MAINTAINER UPDATE] Update port: net/jabberd to 2.0.7 (2.0s7) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Apr 16 04:50:23 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Kirk Strauser >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: The Day Companies >Environment: System: FreeBSD kanga.honeypot.net 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Sat Mar 5 13:39:04 CST 2005 root@kanga.honeypot.net:/usr/obj/usr/src/sys/KANGA i386 >Description: This is an update of the net/jabberd port to version 2.0.7 (vendor string "2.0s7"). >How-To-Repeat: >Fix: --- jabber.patch begins here --- diff -urN jabberd-old/Makefile jabberd/Makefile --- jabberd-old/Makefile Tue Feb 15 10:21:02 2005 +++ jabberd/Makefile Fri Apr 15 23:36:14 2005 @@ -6,10 +6,10 @@ # PORTNAME= jabberd -PORTVERSION= 2.0.6 +PORTVERSION= 2.0.7 CATEGORIES= net -MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/ -DISTNAME= ${PORTNAME}-2.0s6 +MASTER_SITES= http://files.jabberstudio.org/jabberd2/ +DISTNAME= ${PORTNAME}-2.0s7 DIST_SUBDIR= jabber MAINTAINER= kirk@strauser.com @@ -20,15 +20,13 @@ GNU_CONFIGURE= yes USE_OPENSSL= yes USE_ICONV= yes -USE_RC_SUBR= yes +USE_RC_SUBR= jabberd.sh CONFIGURE_ARGS= --localstatedir=/var \ --enable-ssl \ --with-extra-include-path=${LOCALBASE}/include${EIP} \ --with-extra-library-path=${LOCALBASE}/lib${ELP} \ --enable-fs -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - .if !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif @@ -82,10 +80,6 @@ @${ECHO} "WITH_LDAP use LDAP for authentication" @${ECHO} "WITH_PAM use PAM for authentication" @${ECHO} - -post-patch: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/jabberd.sh > ${WRKDIR}/jabberd.sh pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff -urN jabberd-old/distinfo jabberd/distinfo --- jabberd-old/distinfo Tue Dec 21 10:11:48 2004 +++ jabberd/distinfo Fri Apr 15 23:17:15 2005 @@ -1,2 +1,2 @@ -MD5 (jabber/jabberd-2.0s6.tar.gz) = ca2818885e126181e002949c71603df3 -SIZE (jabber/jabberd-2.0s6.tar.gz) = 724448 +MD5 (jabber/jabberd-2.0s7.tar.gz) = 1f10641964d257944eae2f8f295cfcba +SIZE (jabber/jabberd-2.0s7.tar.gz) = 749170 diff -urN jabberd-old/files/jabberd.sh jabberd/files/jabberd.sh --- jabberd-old/files/jabberd.sh Thu Jul 29 15:56:33 2004 +++ jabberd/files/jabberd.sh Wed Dec 31 18:00:00 1969 @@ -1,46 +0,0 @@ -#!/bin/sh - -# Start or stop jabberd -# $FreeBSD: ports/net/jabberd/files/jabberd.sh,v 1.5 2004/07/29 20:56:33 pav Exp $ - -# PROVIDE: jabberd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: FreeBSD shutdown -# -prefix=%%PREFIX%% - -# Define these jabberd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -jabberd_chdir=${jabberd_chdir-"/var/jabberd/pid"} -jabberd_enable=${jabberd_enable-"NO"} -jabberd_user=${jabberd_user-"jabber"} - -. %%RC_SUBR%% - -name="jabberd" -rcvar=`set_rcvar` -command="${prefix}/bin/jabberd" -command_args="&" -procname="${prefix}/bin/router" - -load_rc_config $name - -pidfile="${jabberd_chdir}/router.pid" - -case "$1" in - stop|faststop|onestop) - 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 diff -urN jabberd-old/files/jabberd.sh.in jabberd/files/jabberd.sh.in --- jabberd-old/files/jabberd.sh.in Wed Dec 31 18:00:00 1969 +++ jabberd/files/jabberd.sh.in Thu Jul 29 15:56:33 2004 @@ -0,0 +1,46 @@ +#!/bin/sh + +# Start or stop jabberd +# $FreeBSD: ports/net/jabberd/files/jabberd.sh,v 1.5 2004/07/29 20:56:33 pav Exp $ + +# PROVIDE: jabberd +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: FreeBSD shutdown +# +prefix=%%PREFIX%% + +# Define these jabberd_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +jabberd_chdir=${jabberd_chdir-"/var/jabberd/pid"} +jabberd_enable=${jabberd_enable-"NO"} +jabberd_user=${jabberd_user-"jabber"} + +. %%RC_SUBR%% + +name="jabberd" +rcvar=`set_rcvar` +command="${prefix}/bin/jabberd" +command_args="&" +procname="${prefix}/bin/router" + +load_rc_config $name + +pidfile="${jabberd_chdir}/router.pid" + +case "$1" in + stop|faststop|onestop) + 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 diff -urN jabberd-old/files/patch-configure jabberd/files/patch-configure --- jabberd-old/files/patch-configure Tue Nov 30 15:29:40 2004 +++ jabberd/files/patch-configure Fri Apr 15 23:27:42 2005 @@ -1,11 +1,11 @@ ---- configure.orig Mon Jul 12 10:15:17 2004 -+++ configure Mon Jul 12 10:15:26 2004 -@@ -20575,7 +20575,7 @@ +--- configure.orig Fri Apr 15 23:25:38 2005 ++++ configure Fri Apr 15 23:27:08 2005 +@@ -23985,7 +23985,7 @@ done 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 ++ for lib in db-4.2 db-4.1 db-4 db4 db41 db ; 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 jabberd-old/files/patch-ltmain.sh jabberd/files/patch-ltmain.sh --- jabberd-old/files/patch-ltmain.sh Tue Nov 30 15:56:12 2004 +++ jabberd/files/patch-ltmain.sh Wed Dec 31 18:00:00 1969 @@ -1,18 +0,0 @@ ---- ltmain.sh.orig Tue Nov 30 15:55:46 2004 -+++ ltmain.sh Tue Nov 30 15:55:59 2004 -@@ -561,7 +561,6 @@ - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc' -- trimedcc="${CC/${host}-}" - case "$base_compile " in - "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) - tagname=CC -@@ -954,7 +953,6 @@ - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc' -- trimedcc="${CC/${host}-}" - case $base_compile in - "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) - tagname=CC diff -urN jabberd-old/files/patch-util.h jabberd/files/patch-util.h --- jabberd-old/files/patch-util.h Mon Jul 12 21:38:15 2004 +++ jabberd/files/patch-util.h Wed Dec 31 18:00:00 1969 @@ -1,11 +0,0 @@ ---- util/util.h.orig Mon May 31 16:31:06 2004 -+++ util/util.h Mon Jul 12 10:29:58 2004 -@@ -30,6 +30,8 @@ - #include <time.h> - #include <errno.h> - #include <assert.h> -+#include <sys/types.h> -+#include <sys/socket.h> - - #ifdef HAVE_NETINET_IN_H - # include <netinet/in.h> --- jabber.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050416044358.C17632207C1>