Date: Wed, 21 Jan 2004 23:05:51 +0500 (YEKT) From: "Andrew A. Khlebutin" <andreyh@perm.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61693: net/jabber port update to 1.4.3 version Message-ID: <200401211805.i0LI5pVg077044@hydra.pstu.ru> Resent-Message-ID: <200401212230.i0LMUAus059652@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61693
>Category: ports
>Synopsis: net/jabber port update to 1.4.3 version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 21 14:30:10 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Andrew A. Khlebutin
>Release: FreeBSD 5.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD hydra.pstu.ru 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #0: Mon Oct 6 23:02:59 YEKST 2003 andrew@hydra.pstu.ru:/usr/obj/usr/src/sys/hydra i386
>Description:
Please update net/jabber port to newest version
>How-To-Repeat:
>Fix:
--- jabber.shar begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# jabber
# jabber/files
# jabber/files/jabberd.sh
# jabber/files/patch-aa
# jabber/files/patch-ab
# jabber/files/patch-ac
# jabber/Makefile
# jabber/distinfo
# jabber/pkg-deinstall
# jabber/pkg-descr
# jabber/pkg-install
# jabber/pkg-plist
#
echo c - jabber
mkdir -p jabber > /dev/null 2>&1
echo c - jabber/files
mkdir -p jabber/files > /dev/null 2>&1
echo x - jabber/files/jabberd.sh
sed 's/^X//' >jabber/files/jabberd.sh << 'END-of-jabber/files/jabberd.sh'
X#! /bin/sh
X
Xif ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jabberd\.sh\$"); then
X echo "$0: Cannot determine the PREFIX" >&2
X exit 1
Xfi
X
XUSER="jabber"
XRUNDIR="/var/jabberd/pid"
X
Xexport PATH=/sbin:/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin
Xumask 077
X
Xcd ${RUNDIR} || exit
X
Xtest -x ${PREFIX}/sbin/jabberd || exit 1
X
Xcase ${1:-start} in
Xstart)
X su -f -m ${USER} -c "jabberd -B -H ${RUNDIR} -c ${PREFIX}/etc/jabberd/jabber.xml" &
X echo -n ' jabberd'
X ;;
X
Xstop)
X kill -SIGKILL `cat ${RUNDIR}/jabberd.pid`;
X rm -f ${RUNDIR}/jabberd.pid;
X echo -n ' jabberd'
X ;;
X*)
X echo "Usage: `basename $0` {start|stop}" >&2
X ;;
Xesac
X
Xexit 0
END-of-jabber/files/jabberd.sh
echo x - jabber/files/patch-aa
sed 's/^X//' >jabber/files/patch-aa << 'END-of-jabber/files/patch-aa'
X--- jsm/modules/mod_auth_crypt.c.orig Tue Oct 28 00:16:50 2003
X+++ jsm/modules/mod_auth_crypt.c Tue Jan 20 23:46:25 2004
X@@ -28,7 +28,7 @@
X *
X * --------------------------------------------------------------------------*/
X #include "jsm.h"
X-#include "crypt.h"
X+#include "unistd.h"
X
X #define HASH_CRYPT 1
X #define HASH_SHA1 2
END-of-jabber/files/patch-aa
echo x - jabber/files/patch-ab
sed 's/^X//' >jabber/files/patch-ab << 'END-of-jabber/files/patch-ab'
X--- Makefile.orig Mon Nov 3 16:52:42 2003
X+++ Makefile Wed Jan 21 16:47:31 2004
X@@ -21,6 +21,13 @@
X
X endif
X
X+INSTALL_DATA=`cat .install_data-freebsd`
X+INSTALL_DIR=install -d
X+INSTALL_PROGRAM=`cat .install_program-freebsd`
X+INSTALL_SCRIPT=`cat .install_data-freebsd`
X+LIBDIR=${PREFIX}/lib/jabber
X+INCDIR=${PREFIX}/include/jabber
X+
X all: all-recursive
X
X clean: clean-recursive
X@@ -30,7 +37,25 @@
X single: single-recursive
X
X install:
X- printf "\n\nNo actual make install, you just run it out of the directory!\n"
X+ ${INSTALL_PROGRAM} jabberd/jabberd ${PREFIX}/sbin
X+ ${INSTALL_DIR} ${PREFIX}/etc/jabberd
X+ ${INSTALL_DATA} jabber.xml ${PREFIX}/etc/jabberd/jabber.xml.dist
X+ ${INSTALL_DIR} ${LIBDIR}/jsm
X+ ${INSTALL_DATA} jsm/jsm.so ${LIBDIR}/jsm
X+ ${INSTALL_DIR} ${LIBDIR}/xdb_file
X+ ${INSTALL_DATA} xdb_file/xdb_file.so ${LIBDIR}/xdb_file
X+ ${INSTALL_DIR} ${LIBDIR}/pthsock
X+ ${INSTALL_DATA} pthsock/pthsock_client.so ${LIBDIR}/pthsock
X+ ${INSTALL_DIR} ${LIBDIR}/dnsrv
X+ ${INSTALL_DATA} dnsrv/dnsrv.so ${LIBDIR}/dnsrv
X+ ${INSTALL_DIR} ${LIBDIR}/dialback
X+ ${INSTALL_DATA} dialback/dialback.so ${LIBDIR}/dialback
X+ ${INSTALL_DIR} ${INCDIR}
X+ ${INSTALL_DATA} platform-settings ${INCDIR}
X+ ${INSTALL_DATA} jabberd/jabberd.h ${INCDIR}
X+ ${INSTALL_DIR} ${INCDIR}/lib
X+ ${INSTALL_DATA} jabberd/lib/lib.h ${INCDIR}/lib
X+ ${INSTALL_DATA} jabberd/lib/xmlparse.h ${INCDIR}/lib
X
X all-local:
X
END-of-jabber/files/patch-ab
echo x - jabber/files/patch-ac
sed 's/^X//' >jabber/files/patch-ac << 'END-of-jabber/files/patch-ac'
X--- jabber.xml.orig Thu Nov 13 23:53:46 2003
X+++ jabber.xml Wed Jan 21 22:14:58 2004
X@@ -295,21 +295,21 @@
X -->
X
X <load main="jsm">
X- <jsm>./jsm/jsm.so</jsm>
X- <mod_echo>./jsm/jsm.so</mod_echo>
X- <mod_roster>./jsm/jsm.so</mod_roster>
X- <mod_time>./jsm/jsm.so</mod_time>
X- <mod_vcard>./jsm/jsm.so</mod_vcard>
X- <mod_last>./jsm/jsm.so</mod_last>
X- <mod_version>./jsm/jsm.so</mod_version>
X- <mod_announce>./jsm/jsm.so</mod_announce>
X- <mod_agents>./jsm/jsm.so</mod_agents>
X- <mod_browse>./jsm/jsm.so</mod_browse>
X- <mod_disco>./jsm/jsm.so</mod_disco>
X- <mod_admin>./jsm/jsm.so</mod_admin>
X- <mod_filter>./jsm/jsm.so</mod_filter>
X- <mod_offline>./jsm/jsm.so</mod_offline>
X- <mod_presence>./jsm/jsm.so</mod_presence>
X+ <jsm>/usr/local/lib/jabber/jsm/jsm.so</jsm>
X+ <mod_echo>/usr/local/lib/jabber/jsm/jsm.so</mod_echo>
X+ <mod_roster>/usr/local/lib/jabber/jsm/jsm.so</mod_roster>
X+ <mod_time>/usr/local/lib/jabber/jsm/jsm.so</mod_time>
X+ <mod_vcard>/usr/local/lib/jabber/jsm/jsm.so</mod_vcard>
X+ <mod_last>/usr/local/lib/jabber/jsm/jsm.so</mod_last>
X+ <mod_version>/usr/local/lib/jabber/jsm/jsm.so</mod_version>
X+ <mod_announce>/usr/local/lib/jabber/jsm/jsm.so</mod_announce>
X+ <mod_agents>/usr/local/lib/jabber/jsm/jsm.so</mod_agents>
X+ <mod_browse>/usr/local/lib/jabber/jsm/jsm.so</mod_browse>
X+ <mod_disco>/usr/local/lib/jabber/jsm/jsm.so</mod_disco>
X+ <mod_admin>/usr/local/lib/jabber/jsm/jsm.so</mod_admin>
X+ <mod_filter>/usr/local/lib/jabber/jsm/jsm.so</mod_filter>
X+ <mod_offline>/usr/local/lib/jabber/jsm/jsm.so</mod_offline>
X+ <mod_presence>/usr/local/lib/jabber/jsm/jsm.so</mod_presence>
X
X <!--
X Authentication
X@@ -325,19 +325,19 @@
X -->
X <!-- mod_auth_digest: Password in clear text in storage,
X encrypted/hashed on the wire -->
X- <mod_auth_digest>./jsm/jsm.so</mod_auth_digest>
X+ <mod_auth_digest>/usr/local/lib/jabber/jsm/jsm.so</mod_auth_digest>
X <!-- mod_auth_plain: Password in clear text in storage
X and on the wire. Disable this if you do not use clients
X that need plaintext auth -->
X- <mod_auth_plain>./jsm/jsm.so</mod_auth_plain>
X+ <mod_auth_plain>/usr/local/lib/jabber/jsm/jsm.so</mod_auth_plain>
X <!-- mod_auth_crypt: Password encrypted/hashed in storage,
X clear text on the wire. Disabled as this only makes
X sense when used exclusively and with SSL mandatory
X <mod_auth_crypt>./jsm/jsm.so</mod_auth_crypt> -->
X
X- <mod_log>./jsm/jsm.so</mod_log>
X- <mod_register>./jsm/jsm.so</mod_register>
X- <mod_xml>./jsm/jsm.so</mod_xml>
X+ <mod_log>/usr/local/lib/jabber/jsm/jsm.so</mod_log>
X+ <mod_register>/usr/local/lib/jabber/jsm/jsm.so</mod_register>
X+ <mod_xml>/usr/local/lib/jabber/jsm/jsm.so</mod_xml>
X </load>
X
X </service>
X@@ -353,10 +353,10 @@
X <xdb id="xdb">
X <host/>
X <load>
X- <xdb_file>./xdb_file/xdb_file.so</xdb_file>
X+ <xdb_file>/usr/local/lib/jabber/xdb_file/xdb_file.so</xdb_file>
X </load>
X <xdb_file xmlns="jabber:config:xdb_file">
X- <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool>
X+ <spool><jabberd:cmdline flag='s'>/var/jabberd/spool</jabberd:cmdline></spool>
X </xdb_file>
X </xdb>
X
X@@ -387,7 +387,7 @@
X
X <service id="c2s">
X <load>
X- <pthsock_client>./pthsock/pthsock_client.so</pthsock_client>
X+ <pthsock_client>/usr/local/lib/jabber/pthsock/pthsock_client.so</pthsock_client>
X </load>
X <pthcsock xmlns='jabber:config:pth-csock'>
X <authtime/>
X@@ -430,7 +430,7 @@
X <host/>
X <logtype/>
X <format>%d: [%t] (%h): %s</format>
X- <file>error.log</file>
X+ <file>/var/jabberd/log/error.log</file>
X <stderr/>
X </log>
X
X@@ -443,7 +443,7 @@
X <host/>
X <logtype>record</logtype>
X <format>%d %h %s</format>
X- <file>record.log</file>
X+ <file>/var/jabberd/log/record.log</file>
X </log>
X
X <!-- The following two services are for handling server-to-server traffic. -->
X@@ -453,7 +453,7 @@
X <service id="dnsrv">
X <host/>
X <load>
X- <dnsrv>./dnsrv/dnsrv.so</dnsrv>
X+ <dnsrv>/usr/local/lib/jabber/dnsrv/dnsrv.so</dnsrv>
X </load>
X <dnsrv xmlns="jabber:config:dnsrv">
X <resend service="_xmpp-server._tcp">s2s</resend> <!-- for supporting XMPP compliant SRV records -->
X@@ -473,7 +473,7 @@
X
X <service id="s2s">
X <load>
X- <dialback>./dialback/dialback.so</dialback>
X+ <dialback>/usr/local/lib/jabber/dialback/dialback.so</dialback>
X </load>
X <dialback xmlns='jabber:config:dialback'>
X <legacy/>
X@@ -668,7 +668,7 @@
X <!--
X This specifies the file to store the pid of the process in.
X -->
X- <pidfile>./jabber.pid</pidfile>
X+ <pidfile>/var/jabberd/pid/jabberd.pid</pidfile>
X
X
X </jabber>
END-of-jabber/files/patch-ac
echo x - jabber/Makefile
sed 's/^X//' >jabber/Makefile << 'END-of-jabber/Makefile'
X# New ports collection makefile for: jabber
X# Date created: 5 February 2001
X# Whom: joe
X#
X# $FreeBSD$
X#
X
XPORTNAME= jabberd
XPORTVERSION= 1.4.3
XCATEGORIES= net
XMASTER_SITES= http://jabberd.jabberstudio.org/1.4/dist/
XDISTNAME= ${PORTNAME}-${PORTVERSION}
XDIST_SUBDIR= jabber
X
XMAINTAINER= seanc@FreeBSD.org
XCOMMENT= Online presence and instant messaging server
X
XGNU_CONFIGURE= yes
XUSE_GMAKE= yes
XUSE_OPENSSL= yes
XUSE_PERL5= yes
X
XLIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth
X
XCONFIGURE_ARGS+= --enable-ssl
X
Xrc=${PREFIX}/etc/rc.d
X
X#JABDIR= ${PORTNAME}-${PORTVERSION}
X# Save this data for use later: jabber doesn't have an install target
X# or a sane set of defaults.
Xpost-patch:
X @echo "${WRKSRC}" > ${WRKSRC}/.wrksrc-freebsd
X @echo "${PREFIX}" > ${WRKSRC}/.prefix-freebsd
X @echo "${INSTALL_DATA}" > ${WRKSRC}/.install_data-freebsd
X @echo "${INSTALL_SCRIPT}" > ${WRKSRC}/.install_script-freebsd
X @echo "${INSTALL_PROGRAM}" > ${WRKSRC}/.install_program-freebsd
X
Xpost-install:
X @PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
X ${INSTALL_DATA} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh-dist
X @if [ ! -f ${PREFIX}/etc/rc.d/jabberd.sh ]; then \
X ${ECHO} "Installing ${PREFIX}/etc/rc.d/jabberd.sh startup file."; \
X ${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh; \
X fi
X @${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd
X @${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
X @${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660
X
X.include <bsd.port.mk>
END-of-jabber/Makefile
echo x - jabber/distinfo
sed 's/^X//' >jabber/distinfo << 'END-of-jabber/distinfo'
XMD5 (jabber/jabberd-1.4.3.tar.gz) = a3e964d6fa07b5d850302ae0512f94c6
END-of-jabber/distinfo
echo x - jabber/pkg-deinstall
sed 's/^X//' >jabber/pkg-deinstall << 'END-of-jabber/pkg-deinstall'
X#!/bin/sh
X# $FreeBSD: ports/net/jabberd/pkg-deinstall,v 1.3 2004/01/01 13:21:15 demon Exp $
X#
X
Xif [ "$2" != "POST-DEINSTALL" ]; then
X exit 0
Xfi
X
XUSER=jabber
X
Xif pw usershow "${USER}" 2>/dev/null 1>&2; then
X echo "To delete Jabber user permanently, use 'pw userdel ${USER}'"
Xfi
X
Xif pw groupshow "${USER}" 2>/dev/null 1>&2; then
X echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
Xfi
X
Xecho "If you wish to delete jabber data files, remove '/var/jabberd' directory."
X
Xexit 0
END-of-jabber/pkg-deinstall
echo x - jabber/pkg-descr
sed 's/^X//' >jabber/pkg-descr << 'END-of-jabber/pkg-descr'
XThe Jabber server (jabberd) is a daemon for Jabber clients to connect
Xand communicate with.
X
XAfter editing $PREFIX/etc/jabberd/jabber.xml, the server can be started by
Xrc.d script.
X
XComplete information about configuration can be found in the Jabber Server
Xmini-HOWTO at http://www.jabber.org/admin/.
X
XYou can learn more about Jabber at
XWWW: http://www.jabber.org/
END-of-jabber/pkg-descr
echo x - jabber/pkg-install
sed 's/^X//' >jabber/pkg-install << 'END-of-jabber/pkg-install'
X#!/bin/sh
X# $FreeBSD: ports/net/jabberd/pkg-install,v 1.3 2004/01/09 11:30:09 demon Exp $
X#
X
Xif [ "$2" != "PRE-INSTALL" ]; then
X exit 0
Xfi
X
XUSER=jabber
XGROUP=${USER}
XUID=93
XGID=${UID}
X
Xif ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
X if pw groupadd ${GROUP} -g ${GID}; then
X echo "Added group \"${GROUP}\"."
X else
X echo "Adding group \"${GROUP}\" failed..."
X exit 1
X fi
Xfi
X
Xif ! pw usershow "${USER}" 2>/dev/null 1>&2; then
X if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
X -s "/sbin/nologin" -d "/nonexistent" \
X -c "Jabber Daemon"; \
X then
X echo "Added user \"${USER}\"."
X else
X echo "Adding user \"${USER}\" failed..."
X exit 1
X fi
Xfi
X
Xmkdir -m 750 /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log
Xchown jabber:jabber /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log
X
Xexit 0
END-of-jabber/pkg-install
echo x - jabber/pkg-plist
sed 's/^X//' >jabber/pkg-plist << 'END-of-jabber/pkg-plist'
Xsbin/jabberd
X@unexec if cmp -s %D/etc/jabber.xml.dist %D/etc/jabber.xml; then rm -f %D/etc/jabber.xml; fi
Xetc/jabberd/jabber.xml.dist
Xetc/rc.d/jabberd.sh
Xinclude/jabber/lib/lib.h
Xinclude/jabber/lib/xmlparse.h
Xinclude/jabber/platform-settings
Xinclude/jabber/jabberd.h
Xlib/jabber/dialback/dialback.so
Xlib/jabber/dnsrv/dnsrv.so
Xlib/jabber/jsm/jsm.so
Xlib/jabber/pthsock/pthsock_client.so
Xlib/jabber/xdb_file/xdb_file.so
X@dirrm include/jabber/lib
X@dirrm include/jabber
X@dirrm lib/jabber/dialback
X@dirrm lib/jabber/dnsrv
X@dirrm lib/jabber/jsm
X@dirrm lib/jabber/pthsock
X@dirrm lib/jabber/xdb_file
X@dirrm lib/jabber
END-of-jabber/pkg-plist
exit
--- jabber.shar ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401211805.i0LI5pVg077044>