diff options
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jabber/Makefile | 74 | ||||
| -rw-r--r-- | net-im/jabber/distinfo | 6 | ||||
| -rw-r--r-- | net-im/jabber/files/jabberd.sh.in | 5 | ||||
| -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/files/pkg-message.in | 9 | ||||
| -rw-r--r-- | net-im/jabber/pkg-install | 21 | ||||
| -rw-r--r-- | net-im/jabber/pkg-plist | 46 |
10 files changed, 168 insertions, 104 deletions
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile index f40861beac83..103c8bf98271 100644 --- a/net-im/jabber/Makefile +++ b/net-im/jabber/Makefile @@ -6,71 +6,49 @@ # PORTNAME= jabber -PORTVERSION= 1.4.4 +PORTVERSION= 1.4.3.1 +PORTEPOCH= 1 CATEGORIES= net-im -MASTER_SITES= http://download.jabberd.org/jabberd14/ \ - http://fresh.t-systems-sfr.com/unix/src/privat2/ +MASTER_SITES= http://devel.amessage.info/jabberd14/ DISTNAME= ${PORTNAME}d-${PORTVERSION} DIST_SUBDIR= jabber -MAINTAINER= garga@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Online presence and instant messaging server LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth \ - expat.6:${PORTSDIR}/textproc/expat2 \ - idn.16:${PORTSDIR}/dns/libidn + expat.6:${PORTSDIR}/textproc/expat2 -USE_RC_SUBR= jabberd.sh -SUB_FILES= pkg-message -USE_GMAKE= yes - -MAN5= jabber.xml.5 -MAN8= jabberd.8 -NOMANCOMPRESS= yes +DEPRECATED= fd_set -- bitmap index overflow in multiple applications. +EXPIRATION_DATE= 2006-07-01 +USE_RC_SUBR= jabberd.sh +USE_BZIP2= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -CONFIGURE_ARGS+= --with-libidn=${LOCALBASE} --with-libpth=${LOCALBASE} --localstatedir=/var -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - -OPTIONS= SSL "Build SSL support" on \ - IPV6 "Use IPV6 code" off \ - MYSQL "Build mysql support" off \ - PGSQL "Build PostgreSQL support" off - -.include <bsd.port.pre.mk> - -.if defined(WITH_SSL) -# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk -WITH_OPENSSL=yes -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -CONFIGURE_ARGS+= --with-ssl-legacy=${OPENSSLBASE} -.endif +USE_GMAKE= yes +USE_OPENSSL= yes +CONFIGURE_ARGS+= --enable-ssl .if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .endif -.if defined(WITH_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -.endif - -.if defined(WITH_PGSQL) -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} -.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: - @${REINPLACE_CMD} -E 's,libpth/(lib|include),libpth/\1/pth,g; \ - s,(mysql)/(lib|include),\1/\2/\1,g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,postgresql/libpq-fe.h,libpq-fe.h,g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/xdb_sql/xdb_sql.c + ${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 - @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/jabber/distinfo b/net-im/jabber/distinfo index 8b59abab87ae..60acadeaa4e4 100644 --- a/net-im/jabber/distinfo +++ b/net-im/jabber/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (jabber/jabberd-1.4.3.1.tar.bz2) = a7df3204b3e845735227c07b8fe9c670 +SHA256 (jabber/jabberd-1.4.3.1.tar.bz2) = 649cb17f047471f83fb6186ab4aaf9bb73571149473e81c5f626deb3ea291c2d +SIZE (jabber/jabberd-1.4.3.1.tar.bz2) = 156597 diff --git a/net-im/jabber/files/jabberd.sh.in b/net-im/jabber/files/jabberd.sh.in index 8a41c5a60fad..89e1ae9e4b37 100644 --- a/net-im/jabber/files/jabberd.sh.in +++ b/net-im/jabber/files/jabberd.sh.in @@ -21,12 +21,13 @@ load_rc_config $name required_files=%%PREFIX%%/etc/${name}.xml : ${jabber_enable="NO"} -: ${jabber_pidfile="/var/run/jabberd/${name}.pid"} +: ${jabber_pidfile="/var/spool/jabber/${name}.pid"} : ${jabber_flags="-B -h `/bin/hostname` -c ${required_files}"} : ${jabber_user="jabber"} : ${jabber_group="jabber"} +command=%%PREFIX%%/sbin/jabberd +command_args="${jabber_flags}" pidfile=${jabber_pidfile} -command="%%PREFIX%%/bin/jabberd" run_rc_command "$1" diff --git a/net-im/jabber/files/patch-Makefile b/net-im/jabber/files/patch-Makefile new file mode 100644 index 000000000000..bc261a63564e --- /dev/null +++ b/net-im/jabber/files/patch-Makefile @@ -0,0 +1,42 @@ +--- 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 new file mode 100644 index 000000000000..07f6c8b3c757 --- /dev/null +++ b/net-im/jabber/files/patch-configure @@ -0,0 +1,9 @@ +--- 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 new file mode 100644 index 000000000000..925184122ed1 --- /dev/null +++ b/net-im/jabber/files/patch-jabber.xml @@ -0,0 +1,49 @@ +--- 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 new file mode 100644 index 000000000000..bc7d2121959e --- /dev/null +++ b/net-im/jabber/files/patch-jsm-modules-mod_auth_crypt.c @@ -0,0 +1,11 @@ +--- 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/files/pkg-message.in b/net-im/jabber/files/pkg-message.in deleted file mode 100644 index 43b0dfa2f904..000000000000 --- a/net-im/jabber/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ - -************** WARNING !!! ***************** - -If you are upgrading from a version < 1.4.4 -please review your %%PREFIX%%/etc/jabber.xml -based on new %%PREFIX%%/etc/jabber.xml.dist -because it's *NOT* backward compatible - -******************************************** diff --git a/net-im/jabber/pkg-install b/net-im/jabber/pkg-install index 8b6db8b6a711..926e79391c4c 100644 --- a/net-im/jabber/pkg-install +++ b/net-im/jabber/pkg-install @@ -9,7 +9,6 @@ GROUP=${USER} UID=93 GID=${UID} SPOOLDIR="/var/spool/jabber" -PIDDIR="/var/run/jabberd" ETCDIR=${PREFIX:-$PKG_PREFIX}/etc if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then @@ -42,24 +41,16 @@ echo "Fixing ownerships and modes in \"${SPOOLDIR}\"." chown -R ${USER}:${GROUP} ${SPOOLDIR} chmod -R go= ${SPOOLDIR} -if [ ! -d ${PIDDIR} ]; then - echo "Creating \"${PIDDIR}\"." - mkdir -p ${PIDDIR} -fi - -echo "Fixing ownerships and modes in \"${PIDDIR}\"." -chown -R ${USER}:${GROUP} ${PIDDIR} - if [ ! -f ${ETCDIR}/jabber.xml ]; then echo "Creating \"${ETCDIR}/jabber.xml\"." - cp -p ${ETCDIR}/jabber.xml.dist ${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.dist -chmod 640 ${ETCDIR}/jabber.xml ${ETCDIR}/jabber.xml.dist +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/jabberd/error.log /var/log/jabberd/record.log -chown ${USER}:${GROUP} /var/log/jabberd/error.log /var/log/jabberd/record.log -chmod 640 /var/log/jabberd/error.log /var/log/jabberd/record.log +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 23bc67496e08..007b1c128808 100644 --- a/net-im/jabber/pkg-plist +++ b/net-im/jabber/pkg-plist @@ -1,28 +1,20 @@ -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.la -lib/libjabberd.so -lib/libjabberd.so.0 -lib/libjabberddialback.la -lib/libjabberddialback.so -lib/libjabberddialback.so.0 -lib/libjabberddnsrv.la -lib/libjabberddnsrv.so -lib/libjabberddnsrv.so.0 -lib/libjabberdpthsock.la -lib/libjabberdpthsock.so -lib/libjabberdpthsock.so.0 -lib/libjabberdsm.la -lib/libjabberdsm.so -lib/libjabberdsm.so.0 -lib/libjabberdxdbfile.la -lib/libjabberdxdbfile.so -lib/libjabberdxdbfile.so.0 -lib/libjabberdxdbsql.la -lib/libjabberdxdbsql.so -lib/libjabberdxdbsql.so.0 +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 |