Update to 2.3.1

* Staging support * New style LIB_DEPENDS * Use OPTIONS helpers * OPTIONS_SINGLE to select between Cyrus SASL and gsasl * Two new options: EXPERIMENTAL and SUPERCEDED The port requires OpenSSL >= 1.0.1, so set WANT_OPENSSL_PORTS=yes everywhere except for on FreeBSD 10.x, where it's in the base system. The github.org MASTER_SITE a) redirects to a server in the Amazon cloud and b) requires use of HTTPS. (a) implies setting fetch(1) to follow redirects, which is usually frowned upon. However, this pattern is recommended in bsd.sites.mk for use with GitHub. (b) is troublesome for FreeBSD 8.x, as fetch(1) hasn't grown HTTPS support there yet. Hence provide a copy of the distfile on http://people.freebsd.org/ as a 2nd MASTER_SITE Approved by: mm (maintainer)
svn path=/head/; revision=336590
2024-11-25 00:51:21 +00:00 · 2013-12-15 22:14:40 +00:00 · 2013-12-15 22:14:40 +00:00 · d895ce64a1 · 2021-03-31 03:12:20 +00:00
commit d895ce64a1
parent 8136ee5a9f
14 changed files with 212 additions and 193 deletions
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@ -2,35 +2,33 @@
 # $FreeBSD$

 PORTNAME=	jabberd
-PORTVERSION=	2.2.17
-PORTREVISION=	1
+DISTVERSION=	2.3.1
 CATEGORIES=	net-im
-MASTER_SITES=	http://cloud.github.com/downloads/jabberd2/jabberd2/
+MASTER_SITES=	https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \
+		http://freefall.freebsd.org/~matthew/distfiles/

 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Online presence and instant messaging server

 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
-		idn:${PORTSDIR}/dns/libidn \
-		udns:${PORTSDIR}/dns/udns
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libidn.so:${PORTSDIR}/dns/libidn \
+		libudns.so:${PORTSDIR}/dns/udns

 OPTIONS_DEFINE=	MYSQL PGSQL LDAP BDB SQLITE PAM PIPE ANON FS DEBUG REQUIRES \
-		CYRUS DOCS
-OPTIONS_DEFAULT=	MYSQL DEBUG
-PIPE_DESC=	Enable pipe (auth/reg)
-ANON_DESC=	Enable anonymous (auth/reg)
-FS_DESC=	Filesystem storage (only for testing)
-REQUIRES_DESC=	Add backend requires to startup script
-CYRUS_DESC=	Use Cyrus SASL backend (not supported)
+		DOCS SUPERSEDED EXPERIMENTAL
+OPTIONS_SINGLE=	SASL
+OPTIONS_SINGLE_SASL=	CYRUS GSASL
+OPTIONS_DEFAULT=MYSQL DEBUG GSASL
+OPTIONS_SUB=	yes

 USE_XZ=		yes
+FETCH_ARGS=	-Fpr
 GNU_CONFIGURE=	yes
 USE_PERL5=	run
 USE_OPENSSL=	yes
-USES=		iconv perl5
+USES=		iconv perl5 compiler:c11
 USE_RC_SUBR=	jabberd
 USE_LDCONFIG=	${PREFIX}/lib/jabberd
 CONFIGURE_ARGS+=	--localstatedir=/var \
@ -59,103 +57,81 @@ SUB_FILES+=	pkg-install pkg-deinstall

 PORTDOCS=	*

-DOCFILES=	AUTHORS COPYING ChangeLog INSTALL NEWS README \
-		TODO UPGRADE
+DOCFILES=	AUTHORS ChangeLog NEWS README README.config \
+		README.protocol TODO

 _REQUIRE=	LOGIN

-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 ELP+=	${OPENSSLLIB}
 EIP+=	${OPENSSLINC}

-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
+DEBUG_CONFIGURE_ENABLE=	debug
+
+PGSQL_USE=		PGSQL=yes
+PGSQL_CONFIGURE_ENABLE=	pgsql
+
+SQLITE_CONFIGURE_ENABLE=sqlite
+SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_CFLAGS=		${PTHREAD_CFLAGS}
+
+MYSQL_USE=		MYSQL=yes
+MYSQL_CONFIGURE_ENABLE=	mysql
+
+BDB_USE=		BDB=41+
+BDB_CONFIGURE_ENABLE=	db
+BDB_CONFIGURE_ON=	--oldincludedir=/nonexistant
+
+LDAP_USE=		OPENLDAP=yes
+LDAP_CONFIGURE_ENABLE=	ldap
+
+FS_CONFIGURE_ENABLE=	fs
+FS_DESC=		Filesystem storage (only for testing)
+
+PAM_CONFIGURE_ENABLE=	pam
+
+PIPE_CONFIGURE_ENABLE=	pipe
+PIPE_DESC=		Enable pipe (auth/reg)
+
+ANON_CONFIGURE_ENABLE=	anon
+ANON_DESC=		Enable anonymous (auth/reg)
+
+CYRUS_CONFIGURE_ON=	--with-sasl=cyrus
+CYRUS_DESC=		Use Cyrus SASL backend (not supported)
+CYRUS_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+
+GSASL_CONFIGURE_ON=	--with-sasl=gsasl
+GSASL_DESC=		Use GSASL backend
+GSASL_LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
+
+SUPERSEDED_CONFIGURE_ENABLE=	superseded
+SUPERSEDED_DESC=	Enable superseded features (ns_TIME)
+
+EXPERIMENTAL_CONFIGURE_ENABLE=	experimental
+EXPERIMENTAL_DESC=	Enable experimental features (TLS-Everywhere)
+
+.include <bsd.port.options.mk>
+
+.if (${OPSYS} != FreeBSD || ${OSVERSION} < 10000000)
+WITH_OPENSSL_PORT=	yes
 .endif

 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-CONFIGURE_ARGS+=--enable-pgsql
-PLIST_SUB+=	SUB_PGSQL=""
-_REQUIRE+=	postgresql
-.else
-CONFIGURE_ARGS+=--disable-pgsql
-PLIST_SUB+=	SUB_PGSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-CONFIGURE_ARGS+=--enable-sqlite
-LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
-CFLAGS+=	${PTHREAD_CFLAGS}
-PLIST_SUB+=	SUB_SQLITE=""
-.else
-CONFIGURE_ARGS+=--disable-sqlite
-PLIST_SUB+=	SUB_SQLITE="@comment "
+_REQUIRE+=		postgresql
 .endif

 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=--enable-mysql
-EIP+=:${LOCALBASE}/include/mysql
-ELP+=:${LOCALBASE}/lib/mysql
-PLIST_SUB+=	SUB_MYSQL=""
+EIP+=${LOCALBASE}/include/mysql
+ELP+=${LOCALBASE}/lib/mysql
 _REQUIRE+=	mysql
-.else
-CONFIGURE_ARGS+=--disable-mysql
-PLIST_SUB+=	SUB_MYSQL="@comment "
 .endif

 .if ${PORT_OPTIONS:MBDB}
-USE_BDB=	41+
-CONFIGURE_ARGS+=--enable-db
-CONFIGURE_ARGS+=--oldincludedir=/nonexistant
-EIP+=:${BDB_INCLUDE_DIR}
-ELP+=:${BDB_LIB_DIR}
-PLIST_SUB+=	SUB_BDB=""
-.else
-CONFIGURE_ARGS+=--disable-db
-PLIST_SUB+=	SUB_BDB="@comment "
+EIP+=${BDB_INCLUDE_DIR}
+ELP+=${BDB_LIB_DIR}
 .endif

 .if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--enable-ldap
-PLIST_SUB+=	SUB_LDAP=""
 _REQUIRE+=	slapd
-.else
-CONFIGURE_ARGS+=--disable-ldap
-PLIST_SUB+=	SUB_LDAP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFS}
-CONFIGURE_ARGS+=--enable-fs
-PLIST_SUB+=	SUB_FS=""
-.else
-CONFIGURE_ARGS+=--disable-fs
-PLIST_SUB+=	SUB_FS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+=--enable-pam
-PLIST_SUB+=	SUB_PAM=""
-.else
-CONFIGURE_ARGS+=--disable-pam
-PLIST_SUB+=	SUB_PAM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPIPE}
-CONFIGURE_ARGS+=--enable-pipe
-PLIST_SUB+=	SUB_PIPE=""
-.else
-PLIST_SUB+=	SUB_PIPE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MANON}
-CONFIGURE_ARGS+=--enable-anon
-PLIST_SUB+=	SUB_ANON=""
-.else
-PLIST_SUB+=	SUB_ANON="@comment "
 .endif

 .if ${PORT_OPTIONS:MREQUIRES}
@ -163,16 +139,7 @@ SUB_LIST+=	REQUIRE="${_REQUIRE}"
 .else
 SUB_LIST+=	REQUIRE="LOGIN"
 .endif
-
-.if ${PORT_OPTIONS:MCYRUS}
-CONFIGURE_ARGS+=	--with-sasl=cyrus
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
-.else
-CONFIGURE_ARGS+=	--with-sasl=gsasl
-LIB_DEPENDS+=	gsasl:${PORTSDIR}/security/gsasl
-.endif
-
-MAN8=		c2s.8 jabberd.8 router.8 s2s.8 sm.8
+REQUIRES_DESC=	Add backend requires to startup script

 post-patch:
 	@${REINPLACE_CMD} -e 's|"-lsqlite3|"-lsqlite3 ${PTHREAD_LIBS}|g' \
@ -185,17 +152,13 @@ post-patch:
 .endif

 post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CHOWN} -R ${JABBER_USER}:${JABBER_GROUP} ${PREFIX}/etc/jabberd
-	@${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
-	@${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for FILE in db-setup.mysql db-setup.pgsql db-setup.sqlite
-	@${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif

--- a/net-im/jabberd/distinfo
+++ b/net-im/jabberd/distinfo
@ -1,2 +1,2 @@
-SHA256 (jabberd-2.2.17.tar.xz) = 0be815dfa1e450cd7416a9a2046c6f9ad547b11b562b6d0bf33520594e03b647
-SIZE (jabberd-2.2.17.tar.xz) = 1382124
+SHA256 (jabberd-2.3.1.tar.xz) = feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0
+SIZE (jabberd-2.3.1.tar.xz) = 1460088
--- a/net-im/jabberd/files/patch-etc-Makefile.in
+++ b/net-im/jabberd/files/patch-etc-Makefile.in
@ -1,20 +0,0 @@
--- etc/Makefile.in.orig	2011-06-19 11:33:59.341460610 +0200
-+++ etc/Makefile.in	2011-06-19 11:35:29.949061936 +0200
-@@ -539,7 +539,7 @@
- uninstall: uninstall-recursive
- 
- install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- 
- installcheck: installcheck-recursive
- install-strip:
-@@ -623,7 +623,7 @@
- 
- ps-am:
- 
-uninstall-am: uninstall-initDATA uninstall-sysconfDATA
-+uninstall-am: uninstall-sysconfDATA
- 
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- 	install-am install-data-am install-strip tags-recursive
--- a/net-im/jabberd/files/patch-etc__Makefile.in
+++ b/net-im/jabberd/files/patch-etc__Makefile.in
@ -0,0 +1,29 @@
+--- ./etc/Makefile.in.orig	2013-11-28 11:16:25.000000000 +0000
+++ ./etc/Makefile.in	2013-12-15 10:29:42.301779845 +0000
+@@ -336,7 +336,7 @@
+ top_srcdir = @top_srcdir@
+ sysconf_DATA = c2s.xml.dist router.xml.dist s2s.xml.dist sm.xml.dist jabberd.cfg.dist router-users.xml.dist router-filter.xml.dist
+ initdir = $(prefix)/etc/init
+-init_DATA = jabberd-c2s.conf jabberd-router.conf jabberd-s2s.conf jabberd-sm.conf
+init_DATA = 
+ configs = $(sysconf_DATA) $(init_DATA)
+ EXTRA_DIST = $(sysconf_DATA:%.dist=%.dist.in) $(init_DATA:%.conf=%.conf.in)
+ SUBDIRS = templates
+@@ -721,14 +721,9 @@
+ 	mv $@.tmp $@ 
+ 
+ install-data-hook:
+-	@list='$(configs)'; for p in $$list; do \
+-      dest=`echo $$p | sed -e s/.dist//`; \
+-	  if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
+-        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
+-      else \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \
+-	  fi; \
+	@list='$(configs)'; for dest in $$list; do \
+	    echo " $(INSTALL_DATA) $$dest $(DESTDIR)$(sysconfdir)/$$dest"; \
+	    $(INSTALL_DATA) $$dest $(DESTDIR)$(sysconfdir)/$$dest; \
+ 	done
+ 
+ clean-local:
--- a/net-im/jabberd/files/patch-etctemplatesMakefile.in
+++ b/net-im/jabberd/files/patch-etctemplatesMakefile.in
@ -0,0 +1,20 @@
+--- ./etc/templates/Makefile.in.orig	2013-11-28 11:16:25.000000000 +0000
+++ ./etc/templates/Makefile.in	2013-12-15 10:29:42.305779574 +0000
+@@ -506,14 +506,9 @@
+ 	mv $@.tmp $@
+ 
+ install-data-hook:
+-	@list='$(templates_DATA)'; for p in $$list; do \
+-      dest=`echo $$p | sed -e s/.dist//`; \
+-	  if test -f $(DESTDIR)$(templatesdir)/$$dest; then \
+-        echo "$@ will not overwrite existing $(DESTDIR)$(templatesdir)/$$dest"; \
+-      else \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(templatesdir)/$$dest"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(templatesdir)/$$dest; \
+-	  fi; \
+	@list='$(templates_DATA)'; for dest in $$list; do \
+	    echo " $(INSTALL_DATA) $$dest $(DESTDIR)$(templatesdir)/$$dest"; \
+	    $(INSTALL_DATA) $$dest $(DESTDIR)$(templatesdir)/$$dest; \
+ 	done
+ 
+ clean-local:
--- a/net-im/jabberd/files/patch-s2s-out.c
+++ b/net-im/jabberd/files/patch-s2s-out.c
@ -1,11 +0,0 @@
--- s2s/out.c.orig	2012-08-22 08:03:58.000000000 +0200
-+++ s2s/out.c	2013-06-13 23:25:13.528682146 +0200
-@@ -627,7 +627,7 @@
-             nad_free(pkt->nad);
-         free(pkt);
- 
-        return;
-+        return 0;
-     }
- 
-     /* new route key */
--- a/net-im/jabberd/files/patch-sm-mod_roster.c
+++ b/net-im/jabberd/files/patch-sm-mod_roster.c
@ -1,11 +0,0 @@
--- sm/mod_roster.c.orig	2012-02-12 22:36:18.000000000 +0100
-+++ sm/mod_roster.c	2013-06-13 23:42:35.669583304 +0200
-@@ -460,7 +460,7 @@
-     log_debug(ZONE, "added %s to roster (to %d from %d ask %d name %s ngroups %d)", jid_full(item->jid), item->to, item->from, item->ask, item->name, item->ngroups);
- 
-     if (sm_storage_rate_limit(sess->user->sm, jid_user(sess->user->jid)))
-        return -stanza_err_RESOURCE_CONSTRAINT;
-+        return;
- 
-     /* save changes */
-     _roster_save_item(sess->user, item);
--- a/net-im/jabberd/files/patch-sm__mod_iq_time.c
+++ b/net-im/jabberd/files/patch-sm__mod_iq_time.c
@ -1,5 +1,5 @@
--- sm/mod_iq_time.c.orig	2007-10-17 21:15:26.000000000 +0200
-+++ sm/mod_iq_time.c	2007-10-21 22:13:05.000000000 +0200
+--- ./sm/mod_iq_time.c.orig	2013-10-07 16:27:54.000000000 +0100
+++ ./sm/mod_iq_time.c	2013-12-15 10:29:42.308777764 +0000
@@ -77,7 +77,7 @@
 
     datetime_out(t, dt_DATETIME, buf, 64);
--- a/net-im/jabberd/files/patch-storage__authreg_ldapfull.c
+++ b/net-im/jabberd/files/patch-storage__authreg_ldapfull.c
@ -0,0 +1,11 @@
+--- ./storage/authreg_ldapfull.c.orig	2013-10-07 16:27:54.000000000 +0100
+++ ./storage/authreg_ldapfull.c	2013-12-15 10:29:42.316778126 +0000
+@@ -29,6 +29,8 @@
+  * !!! this blocks for every auth.
+  */
+ 
+#include <stdio.h>
+
+ #define _XOPEN_SOURCE 500	// need this to get crypt()
+ #include "c2s.h"
+ 
--- a/net-im/jabberd/files/patch-storage__authreg_mysql.c
+++ b/net-im/jabberd/files/patch-storage__authreg_mysql.c
@ -0,0 +1,11 @@
+--- ./storage/authreg_mysql.c.orig	2013-11-12 09:53:47.000000000 +0000
+++ ./storage/authreg_mysql.c	2013-12-15 10:29:42.318779446 +0000
+@@ -20,6 +20,8 @@
+ 
+ /* this module talks to a MySQL server via libmysqlclient */
+ 
+#include <stdio.h>
+
+ #define _XOPEN_SOURCE 500
+ #include "c2s.h"
+ #include <mysql.h>
--- a/net-im/jabberd/files/patch-storage__authreg_pgsql.c
+++ b/net-im/jabberd/files/patch-storage__authreg_pgsql.c
@ -0,0 +1,11 @@
+--- ./storage/authreg_pgsql.c.orig	2013-11-12 10:09:39.000000000 +0000
+++ ./storage/authreg_pgsql.c	2013-12-15 10:29:42.320778996 +0000
+@@ -20,6 +20,8 @@
+ 
+ /* this module talks to a PostgreSQL server via libpq */
+ 
+#include <stdio.h>
+
+ #define _XOPEN_SOURCE 500
+ #include "c2s.h"
+ #include <libpq-fe.h>
--- a/net-im/jabberd/files/patch-storage__authreg_sqlite.c
+++ b/net-im/jabberd/files/patch-storage__authreg_sqlite.c
@ -0,0 +1,11 @@
+--- ./storage/authreg_sqlite.c.orig	2013-10-30 12:38:17.000000000 +0000
+++ ./storage/authreg_sqlite.c	2013-12-15 10:29:42.322779475 +0000
+@@ -29,6 +29,8 @@
+  * to the Jabberd project.
+  */
+ 
+#include <stdio.h>
+
+ #define _XOPEN_SOURCE 500
+ #include "c2s.h"
+ #include <sqlite3.h>
--- a/net-im/jabberd/files/patch-tools__jabberd.in
+++ b/net-im/jabberd/files/patch-tools__jabberd.in
@ -1,5 +1,5 @@
--- tools/jabberd.in.orig	2008-05-22 17:36:30.000000000 +0200
-+++ tools/jabberd.in	2008-06-20 13:24:34.000000000 +0200
+--- ./tools/jabberd.in.orig	2013-10-07 16:27:54.000000000 +0100
+++ ./tools/jabberd.in	2013-12-15 10:29:42.333778600 +0000
@@ -1,9 +1,4 @@
 -#!/bin/sh
 -#-*-Perl-*-
@ -7,12 +7,12 @@
 -exec perl -w -x $0 "$@"
 -
 -#!perl
-+#!%%PERL%%
+#!/usr/local/bin/perl
 
 ##############################################################################
 #
-@@ -27,8 +22,7 @@
- my $Bin = "@bindir@";
+@@ -28,8 +23,7 @@
+ my $LibExec = "@libexecdir@";
 my $VERSION = "@VERSION@";
 my $config_dir = "@sysconfdir@";
 -my $config = $config_dir."/jabberd.cfg";
@ -20,8 +20,8 @@
 +my $config = "jabberd.cfg";
 my $debug = 0;
 my $daemon = 0;
- my $select = IO::Select->new();
-@@ -42,13 +36,20 @@
+ my $g_kill_signal = "";
+@@ -44,13 +38,20 @@
 # Process the command line arguments
 #-----------------------------------------------------------------------------
 my %opts;
@ -43,7 +43,7 @@
 
 $debug = 1 if exists($opts{D});
 $daemon = 1 if exists($opts{b});
-@@ -113,6 +114,7 @@
+@@ -120,6 +121,7 @@
     &debug("jabberd","stdout","debug on\n");
     &debug("jabberd","stdout","version($VERSION)\n");
     &debug("jabberd","stdout","config_dir($config_dir)\n");
--- a/net-im/jabberd/pkg-plist
+++ b/net-im/jabberd/pkg-plist
@ -20,24 +20,24 @@ etc/jabberd/s2s.xml.dist
 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
-%%SUB_ANON%%lib/jabberd/authreg_anon.la
-%%SUB_ANON%%lib/jabberd/authreg_anon.so
-%%SUB_BDB%%lib/jabberd/authreg_db.la
-%%SUB_BDB%%lib/jabberd/authreg_db.so
-%%SUB_LDAP%%lib/jabberd/authreg_ldap.la
-%%SUB_LDAP%%lib/jabberd/authreg_ldap.so
-%%SUB_LDAP%%lib/jabberd/authreg_ldapfull.la
-%%SUB_LDAP%%lib/jabberd/authreg_ldapfull.so
-%%SUB_MYSQL%%lib/jabberd/authreg_mysql.la
-%%SUB_MYSQL%%lib/jabberd/authreg_mysql.so
-%%SUB_PAM%%lib/jabberd/authreg_pam.la
-%%SUB_PAM%%lib/jabberd/authreg_pam.so
-%%SUB_PIPE%%lib/jabberd/authreg_pipe.la
-%%SUB_PIPE%%lib/jabberd/authreg_pipe.so
-%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.la
-%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.so
-%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.la
-%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.so
+%%ANON%%lib/jabberd/authreg_anon.la
+%%ANON%%lib/jabberd/authreg_anon.so
+%%BDB%%lib/jabberd/authreg_db.la
+%%BDB%%lib/jabberd/authreg_db.so
+%%LDAP%%lib/jabberd/authreg_ldap.la
+%%LDAP%%lib/jabberd/authreg_ldap.so
+%%LDAP%%lib/jabberd/authreg_ldapfull.la
+%%LDAP%%lib/jabberd/authreg_ldapfull.so
+%%MYSQL%%lib/jabberd/authreg_mysql.la
+%%MYSQL%%lib/jabberd/authreg_mysql.so
+%%PAM%%lib/jabberd/authreg_pam.la
+%%PAM%%lib/jabberd/authreg_pam.so
+%%PIPE%%lib/jabberd/authreg_pipe.la
+%%PIPE%%lib/jabberd/authreg_pipe.so
+%%PGSQL%%lib/jabberd/authreg_pgsql.la
+%%PGSQL%%lib/jabberd/authreg_pgsql.so
+%%SQLITE%%lib/jabberd/authreg_sqlite.la
+%%SQLITE%%lib/jabberd/authreg_sqlite.so
 lib/jabberd/libstorage.la
 lib/jabberd/libstorage.so
 lib/jabberd/libstorage.so.0
@ -113,18 +113,23 @@ lib/jabberd/mod_vacation.so.0
 lib/jabberd/mod_validate.la
 lib/jabberd/mod_validate.so
 lib/jabberd/mod_validate.so.0
-%%SUB_FS%%lib/jabberd/storage_fs.la
-%%SUB_FS%%lib/jabberd/storage_fs.so
-%%SUB_BDB%%lib/jabberd/storage_db.la
-%%SUB_BDB%%lib/jabberd/storage_db.so
-%%SUB_LDAP%%lib/jabberd/storage_ldapvcard.la
-%%SUB_LDAP%%lib/jabberd/storage_ldapvcard.so
-%%SUB_MYSQL%%lib/jabberd/storage_mysql.la
-%%SUB_MYSQL%%lib/jabberd/storage_mysql.so
-%%SUB_PGSQL%%lib/jabberd/storage_pgsql.la
-%%SUB_PGSQL%%lib/jabberd/storage_pgsql.so
-%%SUB_SQLITE%%lib/jabberd/storage_sqlite.la
-%%SUB_SQLITE%%lib/jabberd/storage_sqlite.so
+%%FS%%lib/jabberd/storage_fs.la
+%%FS%%lib/jabberd/storage_fs.so
+%%BDB%%lib/jabberd/storage_db.la
+%%BDB%%lib/jabberd/storage_db.so
+%%LDAP%%lib/jabberd/storage_ldapvcard.la
+%%LDAP%%lib/jabberd/storage_ldapvcard.so
+%%MYSQL%%lib/jabberd/storage_mysql.la
+%%MYSQL%%lib/jabberd/storage_mysql.so
+%%PGSQL%%lib/jabberd/storage_pgsql.la
+%%PGSQL%%lib/jabberd/storage_pgsql.so
+%%SQLITE%%lib/jabberd/storage_sqlite.la
+%%SQLITE%%lib/jabberd/storage_sqlite.so
+man/man8/c2s.8.gz
+man/man8/jabberd.8.gz
+man/man8/router.8.gz
+man/man8/s2s.8.gz
+man/man8/sm.8.gz
@dirrm lib/jabberd
@dirrmtry etc/jabberd/templates
@dirrmtry etc/jabberd