Update jabberd2 to 2.3.3

Cyrus SASL support has been dropped upstream.

3 files changed, 33 insertions, 25 deletions

diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 5256e1a9786a..9c9d845802af 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jabberd
-PORTVERSION=	2.3.1
-PORTREVISION=	8
+PORTVERSION=	2.3.3
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \
 		LOCAL/matthew/${PORTNAME}
@@ -18,9 +17,7 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libudns.so:${PORTSDIR}/dns/udns
 
 OPTIONS_DEFINE=	MYSQL PGSQL LDAP BDB SQLITE PAM PIPE ANON FS DEBUG REQUIRES \
-		DOCS SUPERSEDED EXPERIMENTAL
-OPTIONS_SINGLE=	SASL
-OPTIONS_SINGLE_SASL=	CYRUS GSASL
+		DOCS SUPERSEDED EXPERIMENTAL GSASL
 OPTIONS_DEFAULT=MYSQL DEBUG GSASL
 OPTIONS_SUB=	yes
 
@@ -95,9 +92,9 @@ 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
+#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
@@ -148,10 +145,10 @@ post-patch:
 .endfor
 	@${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \
 		${WRKSRC}/tools/jabberd.in
-.if ${PORT_OPTIONS:MCYRUS}
-	@${REINPLACE_CMD} -e '/^#error /d' \
-		${WRKSRC}/sx/sasl_cyrus.c
-.endif
+#.if ${PORT_OPTIONS:MCYRUS}
+#	@${REINPLACE_CMD} -e '/^#error /d' \
+#		${WRKSRC}/sx/sasl_cyrus.c
+#.endif
 
 post-install:
 .for DIR in db logs pid
diff --git a/net-im/jabberd/distinfo b/net-im/jabberd/distinfo
index d830c086f859..b48582971317 100644
--- a/net-im/jabberd/distinfo
+++ b/net-im/jabberd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jabberd-2.3.1.tar.xz) = feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0
-SIZE (jabberd-2.3.1.tar.xz) = 1460088
+SHA256 (jabberd-2.3.3.tar.xz) = c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030
+SIZE (jabberd-2.3.3.tar.xz) = 1457340
diff --git a/net-im/jabberd/files/patch-etc__Makefile.in b/net-im/jabberd/files/patch-etc__Makefile.in
index e9d24499efd1..b9584a53df88 100644
--- a/net-im/jabberd/files/patch-etc__Makefile.in
+++ b/net-im/jabberd/files/patch-etc__Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -8,13 +8,15 @@
 +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)
+ 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 \
-@@ -599,7 +599,7 @@
+@@ -623,7 +623,7 @@
  uninstall: uninstall-recursive
  
  install-am: all-am
@@ -23,12 +25,21 @@
  
  installcheck: installcheck-recursive
  install-strip:
-@@ -709,7 +709,7 @@
- 	uninstall-am uninstall-initDATA uninstall-sysconfDATA
+@@ -735,7 +735,7 @@
+ 	uninstall-sysconfDATA uninstall-systemdDATA
  
  
--$(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)
+-$(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 @@
+ 
+ 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 \