Index: head/net-im/jabberd/Makefile =================================================================== --- head/net-im/jabberd/Makefile (revision 421019) +++ head/net-im/jabberd/Makefile (revision 421020) @@ -1,159 +1,159 @@ # Created by: Dmitry Sivachenko # $FreeBSD$ PORTNAME= jabberd -PORTVERSION= 2.3.6 +PORTVERSION= 2.4.0 CATEGORIES= net-im MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \ LOCAL/matthew/${PORTNAME} MAINTAINER= mm@FreeBSD.org COMMENT= Online presence and instant messaging server LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:textproc/expat2 \ libgsasl.so:security/gsasl \ libidn.so:dns/libidn \ libudns.so:dns/udns OPTIONS_DEFINE= MYSQL PGSQL LDAP BDB SQLITE PAM PIPE ANON FS DEBUG REQUIRES \ DOCS SUPERSEDED EXPERIMENTAL OPTIONS_DEFAULT=MYSQL DEBUG OPTIONS_SUB= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= compiler:c11 iconv libtool perl5 ssl tar:xz USE_PERL5= run USE_RC_SUBR= jabberd USE_LDCONFIG= ${PREFIX}/lib/jabberd CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${PREFIX}/etc/jabberd \ --enable-ssl --enable-mio=kqueue \ --disable-tests \ --with-sasl=gsasl \ --with-extra-include-path="${LOCALBASE}/include ${EIP}" \ --with-extra-library-path="${LOCALBASE}/lib ${ELP}" JABBER_USER= jabber JABBER_GROUP= jabber USERS= ${JABBER_USER} GROUPS= ${JABBER_GROUP} JABBER_ETCDIR= "${PREFIX}/etc/jabberd" JABBER_RUNDIR= "/var/jabberd" 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}" PORTDOCS= * DOCFILES= AUTHORS ChangeLog NEWS README README.config \ README.protocol TODO _REQUIRE= LOGIN ELP+= ${OPENSSLLIB} EIP+= ${OPENSSLINC} DEBUG_CONFIGURE_ENABLE= debug PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= pgsql SQLITE_CONFIGURE_ENABLE=sqlite SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= mysql BDB_USES= bdb 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) SUPERSEDED_CONFIGURE_ENABLE= superseded SUPERSEDED_DESC= Enable superseded features (ns_TIME) EXPERIMENTAL_CONFIGURE_ENABLE= experimental EXPERIMENTAL_DESC= Enable experimental features (TLS-Everywhere) .include .if (${OPSYS} != FreeBSD || ${OSVERSION} < 1000000) WITH_OPENSSL_PORT= yes .endif .if ${PORT_OPTIONS:MPGSQL} _REQUIRE+= postgresql .endif .if ${PORT_OPTIONS:MMYSQL} EIP+=${LOCALBASE}/include/mysql ELP+=${LOCALBASE}/lib/mysql _REQUIRE+= mysql .endif .if ${PORT_OPTIONS:MBDB} EIP+=${BDB_INCLUDE_DIR} ELP+=${BDB_LIB_DIR} .endif .if ${PORT_OPTIONS:MLDAP} _REQUIRE+= slapd .endif .if ${PORT_OPTIONS:MREQUIRES} SUB_LIST+= REQUIRE="${_REQUIRE}" .else SUB_LIST+= REQUIRE="LOGIN" .endif REQUIRES_DESC= Add backend requires to startup script post-patch: .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 #.if ${PORT_OPTIONS:MCYRUS} # @${REINPLACE_CMD} -e '/^#error /d' \ # ${WRKSRC}/sx/sasl_cyrus.c #.endif post-install: .for DIR in db logs pid @${MKDIR} ${STAGEDIR}${JABBER_RUNDIR}/${DIR} .endfor @${CHMOD} -R go= ${STAGEDIR}${JABBER_RUNDIR} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .for FILE in db-setup.mysql db-setup.pgsql db-setup.sqlite ${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .endif .include Index: head/net-im/jabberd/distinfo =================================================================== --- head/net-im/jabberd/distinfo (revision 421019) +++ head/net-im/jabberd/distinfo (revision 421020) @@ -1,2 +1,3 @@ -SHA256 (jabberd-2.3.6.tar.xz) = 33cbf58135f856f5e6e6a7769623fedfda21f0c5f88b3b687a22e04ad915c051 -SIZE (jabberd-2.3.6.tar.xz) = 1503864 +TIMESTAMP = 1472386025 +SHA256 (jabberd-2.4.0.tar.xz) = 1101571f4a94d7ec5a82839e9e2abee51f3983e3b9c416f1b7f2f738ebebdee1 +SIZE (jabberd-2.4.0.tar.xz) = 1507452 Index: head/net-im/jabberd/files/patch-etc__Makefile.in =================================================================== --- head/net-im/jabberd/files/patch-etc__Makefile.in (revision 421019) +++ head/net-im/jabberd/files/patch-etc__Makefile.in (revision 421020) @@ -1,45 +1,45 @@ ---- etc/Makefile.in.orig 2015-04-13 09:58:51.000000000 +0200 -+++ etc/Makefile.in 2015-10-04 10:13:29.313945122 +0200 -@@ -335,13 +335,13 @@ +--- etc/Makefile.in.orig 2016-05-22 19:40:00 UTC ++++ etc/Makefile.in +@@ -347,13 +347,13 @@ target_alias = @target_alias@ 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 systemddir = $(prefix)/lib/systemd/system systemd_DATA = jabberd-sm.service jabberd.service jabberd-s2s.service jabberd-router.service jabberd-c2s.service configs = $(sysconf_DATA) $(init_DATA) $(systemd_DATA) -EXTRA_DIST = $(sysconf_DATA:%.dist=%.dist.in) $(init_DATA:%.conf=%.conf.in) $(systemd_DATA:%.service=%.service.in) +EXTRA_DIST = $(sysconf_DATA:%.sample=%.sample.in) $(init_DATA:%.conf=%.conf.in) $(systemd_DATA:%.service=%.service.in) SUBDIRS = templates jabberd_bin = router sm s2s c2s edit = sed \ -@@ -623,7 +623,7 @@ +@@ -634,7 +634,7 @@ install-data: install-data-recursive 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: -@@ -735,7 +735,7 @@ - uninstall-sysconfDATA uninstall-systemdDATA +@@ -748,7 +748,7 @@ uninstall-am: uninstall-initDATA uninsta + .PRECIOUS: Makefile -$(configs): $(sysconf_DATA:%.dist=@srcdir@/%.dist.in) $(init_DATA:%.conf=@srcdir@/%.conf.in) $(systemd_DATA:%.service=%.service.in) +$(configs): $(sysconf_DATA:%.sample=@srcdir@/%.sample.in) $(init_DATA:%.conf=@srcdir@/%.conf.in) $(systemd_DATA:%.service=%.service.in) @echo "generating $@ from $@.in"; \ edit='$(edit)'; \ list='$(jabberd_bin)'; for p in $$list; do \ -@@ -748,7 +748,7 @@ +@@ -761,7 +761,7 @@ $(configs): $(sysconf_DATA:%.dist=@srcdi install-data-hook: @list='$(sysconf_DATA)'; for p in $$list; do \ - dest=`echo $$p | sed -e s/.dist//`; \ + dest=`echo $$p | sed -e s/.sample//`; \ if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \ echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \ else \ Index: head/net-im/jabberd/files/patch-etc__templates__Makefile.in =================================================================== --- head/net-im/jabberd/files/patch-etc__templates__Makefile.in (revision 421019) +++ head/net-im/jabberd/files/patch-etc__templates__Makefile.in (revision 421020) @@ -1,31 +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 @@ +--- etc/templates/Makefile.in.orig 2016-05-22 19:40:00 UTC ++++ etc/templates/Makefile.in +@@ -287,8 +287,8 @@ top_build_prefix = @top_build_prefix@ 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,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@localstatedir\@,$(localstatedir),g' \ -@@ -506,14 +506,9 @@ +@@ -519,14 +519,9 @@ $(templates_DATA): 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: Index: head/net-im/jabberd/files/patch-sm__mod_iq_time.c =================================================================== --- head/net-im/jabberd/files/patch-sm__mod_iq_time.c (revision 421019) +++ head/net-im/jabberd/files/patch-sm__mod_iq_time.c (revision 421020) @@ -1,11 +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 @@ +--- sm/mod_iq_time.c.orig 2016-02-09 09:47:02 UTC ++++ sm/mod_iq_time.c +@@ -77,7 +77,7 @@ static mod_ret_t _iq_time_pkt_sm(mod_ins 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)); Index: head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c =================================================================== --- head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c (revision 421019) +++ head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c (revision 421020) @@ -1,11 +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 +--- storage/authreg_ldapfull.c.orig 2016-05-03 18:51:56 UTC ++++ storage/authreg_ldapfull.c @@ -29,6 +29,8 @@ * !!! this blocks for every auth. */ +#include + #define _XOPEN_SOURCE 500 // need this to get crypt() #include "c2s.h" Index: head/net-im/jabberd/files/patch-storage__authreg_mysql.c =================================================================== --- head/net-im/jabberd/files/patch-storage__authreg_mysql.c (revision 421019) +++ head/net-im/jabberd/files/patch-storage__authreg_mysql.c (revision 421020) @@ -1,11 +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 +--- storage/authreg_mysql.c.orig 2016-05-22 15:52:07 UTC ++++ storage/authreg_mysql.c @@ -20,6 +20,8 @@ /* this module talks to a MySQL server via libmysqlclient */ +#include + #define _XOPEN_SOURCE 500 #include "c2s.h" #include Index: head/net-im/jabberd/files/patch-storage__authreg_pgsql.c =================================================================== --- head/net-im/jabberd/files/patch-storage__authreg_pgsql.c (revision 421019) +++ head/net-im/jabberd/files/patch-storage__authreg_pgsql.c (revision 421020) @@ -1,11 +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 +--- storage/authreg_pgsql.c.orig 2016-05-08 14:30:08 UTC ++++ storage/authreg_pgsql.c @@ -20,6 +20,8 @@ /* this module talks to a PostgreSQL server via libpq */ +#include + #define _XOPEN_SOURCE 500 #include "c2s.h" #include Index: head/net-im/jabberd/files/patch-storage__authreg_sqlite.c =================================================================== --- head/net-im/jabberd/files/patch-storage__authreg_sqlite.c (revision 421019) +++ head/net-im/jabberd/files/patch-storage__authreg_sqlite.c (revision 421020) @@ -1,11 +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 +--- storage/authreg_sqlite.c.orig 2016-05-03 20:05:25 UTC ++++ storage/authreg_sqlite.c @@ -29,6 +29,8 @@ * to the Jabberd project. */ +#include + #define _XOPEN_SOURCE 500 #include "c2s.h" #include Index: head/net-im/jabberd/files/patch-tools__jabberd.in =================================================================== --- head/net-im/jabberd/files/patch-tools__jabberd.in (revision 421019) +++ head/net-im/jabberd/files/patch-tools__jabberd.in (revision 421020) @@ -1,53 +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 +--- tools/jabberd.in.orig 2016-02-09 09:45:54 UTC ++++ tools/jabberd.in @@ -1,9 +1,4 @@ -#!/bin/sh -#-*-Perl-*- - -exec perl -w -x $0 "$@" - -#!perl +#!/usr/local/bin/perl ############################################################################## # -@@ -28,8 +23,7 @@ +@@ -28,8 +23,7 @@ my $Bin = "@bindir@"; 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 @@ +@@ -44,13 +38,20 @@ my @programs; # 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 @@ +@@ -120,6 +121,7 @@ if ($debug) &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"); } #----------------------------------------------------------------------------- Index: head/net-im/jabberd/files/patch-util_crypt__blowfish.c =================================================================== --- head/net-im/jabberd/files/patch-util_crypt__blowfish.c (nonexistent) +++ head/net-im/jabberd/files/patch-util_crypt__blowfish.c (revision 421020) @@ -0,0 +1,11 @@ +--- util/crypt_blowfish.c.orig 2016-05-08 14:30:08 UTC ++++ util/crypt_blowfish.c +@@ -1106,7 +1106,7 @@ char *crypt_ra(const char *key, const ch + return _crypt_blowfish_rn(key, setting, (char *)*data, *size); + } + +-char *crypt_r(const char *key, const char *setting, void *data) ++char *_crypt_r(const char *key, const char *setting, void *data) + { + return _crypt_retval_magic( + crypt_rn(key, setting, data, CRYPT_OUTPUT_SIZE), Property changes on: head/net-im/jabberd/files/patch-util_crypt__blowfish.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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 Index: head/net-im/jabberd/files/patch-util_crypt__blowfish.h =================================================================== --- head/net-im/jabberd/files/patch-util_crypt__blowfish.h (nonexistent) +++ head/net-im/jabberd/files/patch-util_crypt__blowfish.h (revision 421020) @@ -0,0 +1,11 @@ +--- util/crypt_blowfish.h.orig 2016-05-08 14:30:08 UTC ++++ util/crypt_blowfish.h +@@ -23,7 +23,7 @@ + #endif + + extern char *bcrypt(__const char *key, __const char *setting); +-extern char *crypt_r(__const char *key, __const char *setting, void *data); ++extern char *_crypt_r(__const char *key, __const char *setting, void *data); + + #ifndef __SKIP_OW + extern char *crypt_rn(__const char *key, __const char *setting, Property changes on: head/net-im/jabberd/files/patch-util_crypt__blowfish.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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