Date: Sun, 28 Aug 2016 12:28:32 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421020 - in head/net-im/jabberd: . files Message-ID: <201608281228.u7SCSW4s066505@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Sun Aug 28 12:28:32 2016 New Revision: 421020 URL: https://svnweb.freebsd.org/changeset/ports/421020 Log: Update net-im/jabberd to 2.4.0 Add patch for crypt_r() conflict in 12-CURRENT Added: head/net-im/jabberd/files/patch-util_crypt__blowfish.c (contents, props changed) head/net-im/jabberd/files/patch-util_crypt__blowfish.h (contents, props changed) Modified: head/net-im/jabberd/Makefile head/net-im/jabberd/distinfo head/net-im/jabberd/files/patch-etc__Makefile.in head/net-im/jabberd/files/patch-etc__templates__Makefile.in head/net-im/jabberd/files/patch-sm__mod_iq_time.c head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c head/net-im/jabberd/files/patch-storage__authreg_mysql.c head/net-im/jabberd/files/patch-storage__authreg_pgsql.c head/net-im/jabberd/files/patch-storage__authreg_sqlite.c head/net-im/jabberd/files/patch-tools__jabberd.in Modified: head/net-im/jabberd/Makefile ============================================================================== --- head/net-im/jabberd/Makefile Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/Makefile Sun Aug 28 12:28:32 2016 (r421020) @@ -2,7 +2,7 @@ # $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} Modified: head/net-im/jabberd/distinfo ============================================================================== --- head/net-im/jabberd/distinfo Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/distinfo Sun Aug 28 12:28:32 2016 (r421020) @@ -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 Modified: head/net-im/jabberd/files/patch-etc__Makefile.in ============================================================================== --- head/net-im/jabberd/files/patch-etc__Makefile.in Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/files/patch-etc__Makefile.in Sun Aug 28 12:28:32 2016 (r421020) @@ -1,6 +1,6 @@ ---- 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@ @@ -16,7 +16,7 @@ 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 @@ -25,8 +25,8 @@ 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) @@ -34,7 +34,7 @@ @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 \ Modified: head/net-im/jabberd/files/patch-etc__templates__Makefile.in ============================================================================== --- head/net-im/jabberd/files/patch-etc__templates__Makefile.in Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/files/patch-etc__templates__Makefile.in Sun Aug 28 12:28:32 2016 (r421020) @@ -1,6 +1,6 @@ ---- 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 @@ -11,7 +11,7 @@ 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: Modified: head/net-im/jabberd/files/patch-sm__mod_iq_time.c ============================================================================== --- head/net-im/jabberd/files/patch-sm__mod_iq_time.c Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/files/patch-sm__mod_iq_time.c Sun Aug 28 12:28:32 2016 (r421020) @@ -1,6 +1,6 @@ ---- ./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); Modified: head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c ============================================================================== --- head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c Sun Aug 28 12:28:32 2016 (r421020) @@ -1,5 +1,5 @@ ---- ./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. */ Modified: head/net-im/jabberd/files/patch-storage__authreg_mysql.c ============================================================================== --- head/net-im/jabberd/files/patch-storage__authreg_mysql.c Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/files/patch-storage__authreg_mysql.c Sun Aug 28 12:28:32 2016 (r421020) @@ -1,5 +1,5 @@ ---- ./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 */ Modified: head/net-im/jabberd/files/patch-storage__authreg_pgsql.c ============================================================================== --- head/net-im/jabberd/files/patch-storage__authreg_pgsql.c Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/files/patch-storage__authreg_pgsql.c Sun Aug 28 12:28:32 2016 (r421020) @@ -1,5 +1,5 @@ ---- ./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 */ Modified: head/net-im/jabberd/files/patch-storage__authreg_sqlite.c ============================================================================== --- head/net-im/jabberd/files/patch-storage__authreg_sqlite.c Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/files/patch-storage__authreg_sqlite.c Sun Aug 28 12:28:32 2016 (r421020) @@ -1,5 +1,5 @@ ---- ./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. */ Modified: head/net-im/jabberd/files/patch-tools__jabberd.in ============================================================================== --- head/net-im/jabberd/files/patch-tools__jabberd.in Sun Aug 28 12:26:22 2016 (r421019) +++ head/net-im/jabberd/files/patch-tools__jabberd.in Sun Aug 28 12:28:32 2016 (r421020) @@ -1,5 +1,5 @@ ---- ./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-*- @@ -11,7 +11,7 @@ ############################################################################## # -@@ -28,8 +23,7 @@ +@@ -28,8 +23,7 @@ my $Bin = "@bindir@"; my $LibExec = "@libexecdir@"; my $VERSION = "@VERSION@"; my $config_dir = "@sysconfdir@"; @@ -21,7 +21,7 @@ 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; @@ -43,7 +43,7 @@ $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"); Added: head/net-im/jabberd/files/patch-util_crypt__blowfish.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-util_crypt__blowfish.c Sun Aug 28 12:28:32 2016 (r421020) @@ -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), Added: head/net-im/jabberd/files/patch-util_crypt__blowfish.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-util_crypt__blowfish.h Sun Aug 28 12:28:32 2016 (r421020) @@ -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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608281228.u7SCSW4s066505>