[Midnightbsd-cvs] mports [18961] trunk/net-im/jabberd: jabberd 2.3.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu May 14 23:30:57 EDT 2015
Revision: 18961
http://svnweb.midnightbsd.org/mports/?rev=18961
Author: laffer1
Date: 2015-05-14 23:30:56 -0400 (Thu, 14 May 2015)
Log Message:
-----------
jabberd 2.3.1
Modified Paths:
--------------
trunk/net-im/jabberd/Makefile
trunk/net-im/jabberd/distinfo
trunk/net-im/jabberd/pkg-plist
Added Paths:
-----------
trunk/net-im/jabberd/files/jabberd.in
trunk/net-im/jabberd/files/patch-etc__Makefile.in
trunk/net-im/jabberd/files/patch-etc__templates__Makefile.in
trunk/net-im/jabberd/files/patch-sm__mod_iq_time.c
trunk/net-im/jabberd/files/patch-storage__authreg_ldapfull.c
trunk/net-im/jabberd/files/patch-storage__authreg_mysql.c
trunk/net-im/jabberd/files/patch-storage__authreg_pgsql.c
trunk/net-im/jabberd/files/patch-storage__authreg_sqlite.c
trunk/net-im/jabberd/files/patch-tools__jabberd.in
Modified: trunk/net-im/jabberd/Makefile
===================================================================
--- trunk/net-im/jabberd/Makefile 2015-05-15 03:30:12 UTC (rev 18960)
+++ trunk/net-im/jabberd/Makefile 2015-05-15 03:30:56 UTC (rev 18961)
@@ -1,10 +1,10 @@
# $MidnightBSD$
PORTNAME= jabberd
-PORTVERSION= 2.2.17
-PORTREVISION= 1
+PORTVERSION= 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}/ \
+ FREEBSD_LOCAL/matthew/${PORTNAME}
MAINTAINER= ports at MidnightBSD.org
COMMENT= Online presence and instant messaging server
@@ -11,27 +11,25 @@
LICENSE= gpl2
-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
GNU_CONFIGURE= yes
-USE_PERL5_RUN= yes
+INSTALL_TARGET= install-strip
+USES= compiler:c11 iconv libtool perl5 tar:xz
+USE_PERL5= run
USE_OPENSSL= yes
-USES= iconv
USE_RC_SUBR= jabberd
USE_LDCONFIG= ${PREFIX}/lib/jabberd
-CONFIGURE_ARGS+= --localstatedir=/var \
+CONFIGURE_ARGS= --localstatedir=/var \
--sysconfdir=${PREFIX}/etc/jabberd \
--enable-ssl --enable-mio=poll \
--disable-tests \
@@ -47,133 +45,103 @@
JABBER_ETCDIR= "${PREFIX}/etc/jabberd"
JABBER_RUNDIR= "/var/jabberd"
-SUB_LIST+= JABBER_USER=${JABBER_USER} \
+PLIST_SUB+= JABBER_USER=${JABBER_USER} \
JABBER_GROUP=${JABBER_GROUP} \
JABBER_ETCDIR="${JABBER_ETCDIR}" \
+ JABBER_RUNDIR="${JABBER_RUNDIR}"
+
+SUB_LIST+= JABBER_USER=${JABBER_USER} \
JABBER_RUNDIR="${JABBER_RUNDIR}" \
PERL="${PERL}"
-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
-.include <bsd.mport.options.mk>
-
ELP+= ${OPENSSLLIB}
EIP+= ${OPENSSLINC}
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
+DEBUG_CONFIGURE_ENABLE= debug
+PGSQL_USES= pgsql
+PGSQL_CONFIGURE_ENABLE= pgsql
+
+SQLITE_CONFIGURE_ENABLE=sqlite
+SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
+
+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.mport.options.mk>
+
+WITH_OPENSSL_PORT= yes
+
.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 "
+_REQUIRE+= postgresql
.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 "
-.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}
SUB_LIST+= REQUIRE="${_REQUIRE}"
.else
SUB_LIST+= REQUIRE="LOGIN"
.endif
+REQUIRES_DESC= Add backend requires to startup script
-.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
-
post-patch:
- @${REINPLACE_CMD} -e 's|"-lsqlite3|"-lsqlite3 ${PTHREAD_LIBS}|g' \
- ${WRKSRC}/configure
+.for FILE in c2s.xml jabberd.cfg router-filter.xml router-users.xml \
+ router.xml s2s.xml sm.xml templates/roster.xml
+ @${MV} ${WRKSRC}/etc/${FILE}.dist.in ${WRKSRC}/etc/${FILE}.sample.in
+.endfor
@${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \
${WRKSRC}/tools/jabberd.in
.if ${PORT_OPTIONS:MCYRUS}
@@ -182,17 +150,17 @@
.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
+.for DIR in db logs pid
+ @${MKDIR} ${STAGEDIR}${JABBER_RUNDIR}/${DIR}
+.endfor
+ @${CHMOD} -R go= ${STAGEDIR}${JABBER_RUNDIR}
.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
Modified: trunk/net-im/jabberd/distinfo
===================================================================
--- trunk/net-im/jabberd/distinfo 2015-05-15 03:30:12 UTC (rev 18960)
+++ trunk/net-im/jabberd/distinfo 2015-05-15 03:30:56 UTC (rev 18961)
@@ -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
Added: trunk/net-im/jabberd/files/jabberd.in
===================================================================
--- trunk/net-im/jabberd/files/jabberd.in (rev 0)
+++ trunk/net-im/jabberd/files/jabberd.in 2015-05-15 03:30:56 UTC (rev 18961)
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# $FreeBSD: head/net-im/jabberd/files/jabberd.in 340872 2014-01-24 00:14:07Z mat $
+
+# PROVIDE: jabberd
+# REQUIRE: %%REQUIRE%%
+# KEYWORD: shutdown
+
+
+# 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-"%%JABBER_RUNDIR%%/pid"}
+jabberd_enable=${jabberd_enable-"NO"}
+jabberd_user=${jabberd_user-"%%JABBER_USER%%"}
+
+. /etc/rc.subr
+
+name="jabberd"
+rcvar=jabberd_enable
+command_interpreter="%%PERL%%"
+command="%%PREFIX%%/bin/jabberd"
+command_args="-b"
+stop_postcmd=jabberd_post_stopcmd
+
+load_rc_config $name
+
+jabberd_post_stopcmd()
+{
+ for file in c2s router s2s sm; do
+ rm -f ${jabberd_chdir}/$file.pid
+ done
+}
+
+case "$1" in
+ forcestop)
+ echo "Stopping jabberd."
+ killall -u ${jabberd_user} c2s router s2s sm
+ jabberd_post_stopcmd
+ ;;
+ *)
+ run_rc_command "$1"
+ ;;
+esac
Property changes on: trunk/net-im/jabberd/files/jabberd.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net-im/jabberd/files/patch-etc__Makefile.in
===================================================================
--- trunk/net-im/jabberd/files/patch-etc__Makefile.in (rev 0)
+++ trunk/net-im/jabberd/files/patch-etc__Makefile.in 2015-05-15 03:30:56 UTC (rev 18961)
@@ -0,0 +1,34 @@
+--- etc/Makefile.in.orig 2013-11-28 12:16:25.000000000 +0100
++++ etc/Makefile.in 2014-11-22 12:36:09.272204737 +0100
+@@ -334,11 +334,11 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ 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
++sysconf_DATA = c2s.xml.sample router.xml.sample s2s.xml.sample sm.xml.sample jabberd.cfg.sample router-users.xml.sample router-filter.xml.sample
+ initdir = $(prefix)/etc/init
+ init_DATA = jabberd-c2s.conf jabberd-router.conf jabberd-s2s.conf jabberd-sm.conf
+ configs = $(sysconf_DATA) $(init_DATA)
+-EXTRA_DIST = $(sysconf_DATA:%.dist=%.dist.in) $(init_DATA:%.conf=%.conf.in)
++EXTRA_DIST = $(sysconf_DATA:%.sample=%.sample.in) $(init_DATA:%.conf=%.conf.in)
+ SUBDIRS = templates
+ jabberd_bin = router sm s2s c2s
+ edit = sed \
+@@ -599,7 +599,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:
+@@ -709,7 +709,7 @@
+ uninstall-am uninstall-initDATA uninstall-sysconfDATA
+
+
+-$(configs): $(sysconf_DATA:%.dist=@srcdir@/%.dist.in) $(init_DATA:%.conf=@srcdir@/%.conf.in)
++$(configs): $(sysconf_DATA:%.sample=@srcdir@/%.sample.in) $(init_DATA:%.conf=@srcdir@/%.conf.in)
+ @echo "generating $@ from $@.in"; \
+ edit='$(edit)'; \
+ list='$(jabberd_bin)'; for p in $$list; do \
Property changes on: trunk/net-im/jabberd/files/patch-etc__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net-im/jabberd/files/patch-etc__templates__Makefile.in
===================================================================
--- trunk/net-im/jabberd/files/patch-etc__templates__Makefile.in (rev 0)
+++ trunk/net-im/jabberd/files/patch-etc__templates__Makefile.in 2015-05-15 03:30:56 UTC (rev 18961)
@@ -0,0 +1,31 @@
+--- etc/templates/Makefile.in.orig 2014-02-24 10:13:54.000000000 +0100
++++ etc/templates/Makefile.in 2014-11-22 12:01:11.535347369 +0100
+@@ -275,8 +275,8 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ templatesdir = $(sysconfdir)/templates
+-templates_DATA = roster.xml.dist
+-EXTRA_DIST = roster.xml.dist.in
++templates_DATA = roster.xml.sample
++EXTRA_DIST = roster.xml.sample.in
+ edit = sed \
+ -e 's, at sysconfdir\@,$(sysconfdir),g' \
+ -e 's, at localstatedir\@,$(localstatedir),g' \
+@@ -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:
Property changes on: trunk/net-im/jabberd/files/patch-etc__templates__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net-im/jabberd/files/patch-sm__mod_iq_time.c
===================================================================
--- trunk/net-im/jabberd/files/patch-sm__mod_iq_time.c (rev 0)
+++ trunk/net-im/jabberd/files/patch-sm__mod_iq_time.c 2015-05-15 03:30:56 UTC (rev 18961)
@@ -0,0 +1,11 @@
+--- ./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);
+ nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
+-#ifdef HAVE_TZSET
++#ifdef HAVE_TZNAME
+ snprintf(buf, 64, "%+03d:%02d", -((int)timezone)/(60*60), -((int)timezone)%(60*60));
+ #else
+ snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60));
Property changes on: trunk/net-im/jabberd/files/patch-sm__mod_iq_time.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net-im/jabberd/files/patch-storage__authreg_ldapfull.c
===================================================================
--- trunk/net-im/jabberd/files/patch-storage__authreg_ldapfull.c (rev 0)
+++ trunk/net-im/jabberd/files/patch-storage__authreg_ldapfull.c 2015-05-15 03:30:56 UTC (rev 18961)
@@ -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"
+
Property changes on: trunk/net-im/jabberd/files/patch-storage__authreg_ldapfull.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net-im/jabberd/files/patch-storage__authreg_mysql.c
===================================================================
--- trunk/net-im/jabberd/files/patch-storage__authreg_mysql.c (rev 0)
+++ trunk/net-im/jabberd/files/patch-storage__authreg_mysql.c 2015-05-15 03:30:56 UTC (rev 18961)
@@ -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>
Property changes on: trunk/net-im/jabberd/files/patch-storage__authreg_mysql.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net-im/jabberd/files/patch-storage__authreg_pgsql.c
===================================================================
--- trunk/net-im/jabberd/files/patch-storage__authreg_pgsql.c (rev 0)
+++ trunk/net-im/jabberd/files/patch-storage__authreg_pgsql.c 2015-05-15 03:30:56 UTC (rev 18961)
@@ -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>
Property changes on: trunk/net-im/jabberd/files/patch-storage__authreg_pgsql.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net-im/jabberd/files/patch-storage__authreg_sqlite.c
===================================================================
--- trunk/net-im/jabberd/files/patch-storage__authreg_sqlite.c (rev 0)
+++ trunk/net-im/jabberd/files/patch-storage__authreg_sqlite.c 2015-05-15 03:30:56 UTC (rev 18961)
@@ -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>
Property changes on: trunk/net-im/jabberd/files/patch-storage__authreg_sqlite.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net-im/jabberd/files/patch-tools__jabberd.in
===================================================================
--- trunk/net-im/jabberd/files/patch-tools__jabberd.in (rev 0)
+++ trunk/net-im/jabberd/files/patch-tools__jabberd.in 2015-05-15 03:30:56 UTC (rev 18961)
@@ -0,0 +1,53 @@
+--- ./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-*-
+-
+-exec perl -w -x $0 "$@"
+-
+-#!perl
++#!/usr/local/bin/perl
+
+ ##############################################################################
+ #
+@@ -28,8 +23,7 @@
+ my $LibExec = "@libexecdir@";
+ my $VERSION = "@VERSION@";
+ my $config_dir = "@sysconfdir@";
+-my $config = $config_dir."/jabberd.cfg";
+-$config = "internal" unless (-e $config);
++my $config = "jabberd.cfg";
+ my $debug = 0;
+ my $daemon = 0;
+ my $g_kill_signal = "";
+@@ -44,13 +38,20 @@
+ # Process the command line arguments
+ #-----------------------------------------------------------------------------
+ my %opts;
+-getopts("c:Dhb",\%opts);
++getopts("c:d:Dhb",\%opts);
+ &usage if exists($opts{h});
+ if (exists($opts{c}))
+ {
+ $config = $opts{c} if (defined($opts{c}) && ($opts{c} ne ""));
+ &usage() if (!defined($opts{c}) || ($opts{c} eq ""));
+ }
++if (exists($opts{d}))
++{
++ $config_dir = $opts{d} if (defined($opts{d}) && ($opts{d} ne ""));
++ &usage() if (!defined($opts{d}) || ($opts{d} eq ""));
++}
++$config = $config_dir.'/'.$config if ($config !~ /^\//);
++$config = "internal" unless (-e $config);
+
+ $debug = 1 if exists($opts{D});
+ $daemon = 1 if exists($opts{b});
+@@ -120,6 +121,7 @@
+ &debug("jabberd","stdout","debug on\n");
+ &debug("jabberd","stdout","version($VERSION)\n");
+ &debug("jabberd","stdout","config_dir($config_dir)\n");
++ &debug("jabberd","stdout","config($config)\n");
+ }
+
+ #-----------------------------------------------------------------------------
Property changes on: trunk/net-im/jabberd/files/patch-tools__jabberd.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/net-im/jabberd/pkg-plist
===================================================================
--- trunk/net-im/jabberd/pkg-plist 2015-05-15 03:30:12 UTC (rev 18960)
+++ trunk/net-im/jabberd/pkg-plist 2015-05-15 03:30:56 UTC (rev 18961)
@@ -4,127 +4,110 @@
bin/router
bin/s2s
bin/sm
- at unexec if cmp -s %D/etc/jabberd/c2s.xml %D/etc/jabberd/c2s.xml.dist; then rm -f %D/etc/jabberd/c2s.xml; fi
-etc/jabberd/c2s.xml.dist
- at unexec if cmp -s %D/etc/jabberd/jabberd.cfg %D/etc/jabberd/jabberd.cfg.dist; then rm -f %D/etc/jabberd/jabberd.cfg; fi
-etc/jabberd/jabberd.cfg.dist
- at unexec if cmp -s %D/etc/jabberd/router-filter.xml %D/etc/jabberd/router-filter.xml.dist; then rm -f %D/etc/jabberd/router-filter.xml; fi
-etc/jabberd/router-filter.xml.dist
- at unexec if cmp -s %D/etc/jabberd/router-users.xml %D/etc/jabberd/router-users.xml.dist; then rm -f %D/etc/jabberd/router-users.xml; fi
-etc/jabberd/router-users.xml.dist
- at unexec if cmp -s %D/etc/jabberd/router.xml %D/etc/jabberd/router.xml.dist; then rm -f %D/etc/jabberd/router.xml; fi
-etc/jabberd/router.xml.dist
- at unexec if cmp -s %D/etc/jabberd/s2s.xml %D/etc/jabberd/s2s.xml.dist; then rm -f %D/etc/jabberd/s2s.xml; fi
-etc/jabberd/s2s.xml.dist
- at unexec if cmp -s %D/etc/jabberd/sm.xml %D/etc/jabberd/sm.xml.dist; then rm -f %D/etc/jabberd/sm.xml; fi
-etc/jabberd/sm.xml.dist
- at 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
-lib/jabberd/libstorage.la
+ at sample etc/jabberd/c2s.xml.sample
+ at sample etc/jabberd/jabberd.cfg.sample
+ at sample etc/jabberd/router-filter.xml.sample
+ at sample etc/jabberd/router-users.xml.sample
+ at sample etc/jabberd/router.xml.sample
+ at sample etc/jabberd/s2s.xml.sample
+ at sample etc/jabberd/sm.xml.sample
+ at sample etc/jabberd/templates/roster.xml.sample
+%%ANON%%lib/jabberd/authreg_anon.so
+%%BDB%%lib/jabberd/authreg_db.so
+%%LDAP%%lib/jabberd/authreg_ldap.so
+%%LDAP%%lib/jabberd/authreg_ldapfull.so
+%%MYSQL%%lib/jabberd/authreg_mysql.so
+%%PAM%%lib/jabberd/authreg_pam.so
+%%PIPE%%lib/jabberd/authreg_pipe.so
+%%PGSQL%%lib/jabberd/authreg_pgsql.so
+%%SQLITE%%lib/jabberd/authreg_sqlite.so
lib/jabberd/libstorage.so
lib/jabberd/libstorage.so.0
-lib/jabberd/mod_active.la
+lib/jabberd/libstorage.so.0.0.0
lib/jabberd/mod_active.so
lib/jabberd/mod_active.so.0
-lib/jabberd/mod_amp.la
+lib/jabberd/mod_active.so.0.0.0
lib/jabberd/mod_amp.so
lib/jabberd/mod_amp.so.0
-lib/jabberd/mod_announce.la
+lib/jabberd/mod_amp.so.0.0.0
lib/jabberd/mod_announce.so
lib/jabberd/mod_announce.so.0
-lib/jabberd/mod_deliver.la
+lib/jabberd/mod_announce.so.0.0.0
lib/jabberd/mod_deliver.so
lib/jabberd/mod_deliver.so.0
-lib/jabberd/mod_disco.la
+lib/jabberd/mod_deliver.so.0.0.0
lib/jabberd/mod_disco.so
lib/jabberd/mod_disco.so.0
-lib/jabberd/mod_echo.la
+lib/jabberd/mod_disco.so.0.0.0
lib/jabberd/mod_echo.so
lib/jabberd/mod_echo.so.0
-lib/jabberd/mod_help.la
+lib/jabberd/mod_echo.so.0.0.0
lib/jabberd/mod_help.so
lib/jabberd/mod_help.so.0
-lib/jabberd/mod_iq-last.la
+lib/jabberd/mod_help.so.0.0.0
lib/jabberd/mod_iq-last.so
lib/jabberd/mod_iq-last.so.0
-lib/jabberd/mod_iq-ping.la
+lib/jabberd/mod_iq-last.so.0.0.0
lib/jabberd/mod_iq-ping.so
lib/jabberd/mod_iq-ping.so.0
-lib/jabberd/mod_iq-private.la
+lib/jabberd/mod_iq-ping.so.0.0.0
lib/jabberd/mod_iq-private.so
lib/jabberd/mod_iq-private.so.0
-lib/jabberd/mod_iq-time.la
+lib/jabberd/mod_iq-private.so.0.0.0
lib/jabberd/mod_iq-time.so
lib/jabberd/mod_iq-time.so.0
-lib/jabberd/mod_iq-vcard.la
+lib/jabberd/mod_iq-time.so.0.0.0
lib/jabberd/mod_iq-vcard.so
lib/jabberd/mod_iq-vcard.so.0
-lib/jabberd/mod_iq-version.la
+lib/jabberd/mod_iq-vcard.so.0.0.0
lib/jabberd/mod_iq-version.so
lib/jabberd/mod_iq-version.so.0
-lib/jabberd/mod_offline.la
+lib/jabberd/mod_iq-version.so.0.0.0
lib/jabberd/mod_offline.so
lib/jabberd/mod_offline.so.0
-lib/jabberd/mod_pep.la
+lib/jabberd/mod_offline.so.0.0.0
lib/jabberd/mod_pep.so
lib/jabberd/mod_pep.so.0
-lib/jabberd/mod_presence.la
+lib/jabberd/mod_pep.so.0.0.0
lib/jabberd/mod_presence.so
lib/jabberd/mod_presence.so.0
-lib/jabberd/mod_privacy.la
+lib/jabberd/mod_presence.so.0.0.0
lib/jabberd/mod_privacy.so
lib/jabberd/mod_privacy.so.0
-lib/jabberd/mod_roster.la
+lib/jabberd/mod_privacy.so.0.0.0
lib/jabberd/mod_roster.so
lib/jabberd/mod_roster.so.0
-lib/jabberd/mod_roster-publish.la
+lib/jabberd/mod_roster.so.0.0.0
lib/jabberd/mod_roster-publish.so
lib/jabberd/mod_roster-publish.so.0
-lib/jabberd/mod_session.la
+lib/jabberd/mod_roster-publish.so.0.0.0
lib/jabberd/mod_session.so
lib/jabberd/mod_session.so.0
-lib/jabberd/mod_status.la
+lib/jabberd/mod_session.so.0.0.0
lib/jabberd/mod_status.so
lib/jabberd/mod_status.so.0
-lib/jabberd/mod_template-roster.la
+lib/jabberd/mod_status.so.0.0.0
lib/jabberd/mod_template-roster.so
lib/jabberd/mod_template-roster.so.0
-lib/jabberd/mod_vacation.la
+lib/jabberd/mod_template-roster.so.0.0.0
lib/jabberd/mod_vacation.so
lib/jabberd/mod_vacation.so.0
-lib/jabberd/mod_validate.la
+lib/jabberd/mod_vacation.so.0.0.0
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
- at dirrm lib/jabberd
- at dirrmtry etc/jabberd/templates
- at dirrmtry etc/jabberd
+lib/jabberd/mod_validate.so.0.0.0
+%%FS%%lib/jabberd/storage_fs.so
+%%BDB%%lib/jabberd/storage_db.so
+%%LDAP%%lib/jabberd/storage_ldapvcard.so
+%%MYSQL%%lib/jabberd/storage_mysql.so
+%%PGSQL%%lib/jabberd/storage_pgsql.so
+%%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
+ at dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%%/db
+ at dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%%/logs
+ at dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%%/pid
+ at dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%%
More information about the Midnightbsd-cvs
mailing list