- update to 1.6.1

- additional patches
- fix jabber.in, pkg-message.in

Approved by:	garga (mentor)

8 files changed, 51 insertions, 20 deletions

diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 548a67997f4..bbe7eb0331f 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jabber
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.1
 PORTEPOCH=	1
 CATEGORIES=	net-im ipv6
 MASTER_SITES=	http://download.jabberd.org/jabberd14/
@@ -19,14 +19,15 @@ COMMENT=	XMPP/Jabber server daemon
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth-hard \
 		popt.0:${PORTSDIR}/devel/popt \
 		idn.16:${PORTSDIR}/dns/libidn \
-		expat.6:${PORTSDIR}/textproc/expat2
+		expat.6:${PORTSDIR}/textproc/expat2 \
+		tasn1.3:${PORTSDIR}/security/libtasn1 \
+		gnutls.13:${PORTSDIR}/security/gnutls
 
 OPTIONS=	IPV6 "Enable IPv6 support" off \
 		MYSQL "Build with MySQL support" off \
 		PGSQL "Build with PostgreSQL support" off
 
 USE_RC_SUBR=	jabber
-USE_OPENSSL=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
@@ -48,8 +49,8 @@ JABBER_SPOOLDIR="/var/spool/jabberd"
 JABBER_LOGDIR=	"/var/log/jabberd"
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man --localstatedir=/var --enable-ssl \
-		--with-ssl-legacy=${OPENSSLBASE} --sysconfdir=${JABBER_ETCDIR} \
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man --localstatedir=/var \
+		--sysconfdir=${JABBER_ETCDIR} \
 		--includedir=${TARGETDIR}/include/jabber \
 		--libdir=${TARGETDIR}/lib/jabber
 
diff --git a/net-im/jabber/distinfo b/net-im/jabber/distinfo
index d9a4d6bdd39..e023fd4a014 100644
--- a/net-im/jabber/distinfo
+++ b/net-im/jabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (jabber/jabberd14-1.6.0.tar.gz) = 058ae016c2afda43184f4eccb65de91d
-SHA256 (jabber/jabberd14-1.6.0.tar.gz) = 8d0b0097bb68c4234a86030d73fa9b137f4e3ad8d02b015f70df91151c216930
-SIZE (jabber/jabberd14-1.6.0.tar.gz) = 820469
+MD5 (jabber/jabberd14-1.6.1.tar.gz) = 969eeb0ca79062e4390482d475b768f9
+SHA256 (jabber/jabberd14-1.6.1.tar.gz) = b2f19d53fbaf9e2eec7586ebe1b6e61dad8685b991beaadec948085fc0908e0f
+SIZE (jabber/jabberd14-1.6.1.tar.gz) = 833803
diff --git a/net-im/jabber/files/jabber.in b/net-im/jabber/files/jabber.in
index a0c509b1595..2cb77351224 100644
--- a/net-im/jabber/files/jabber.in
+++ b/net-im/jabber/files/jabber.in
@@ -27,8 +27,7 @@ required_files=%%JABBER_ETCDIR%%/jabber.xml
 : ${jabber_group="%%JABBER_GROUP%%"}
 
 command=%%PREFIX%%/bin/jabberd14
-command_args="${jabberd_flags}"
-pidfile=${jabberd_pidfile}
+pidfile=${jabber_pidfile}
 extra_commands="reload"
 
 run_rc_command "$1"
diff --git a/net-im/jabber/files/patch-jabberd-lib-jutil.cc b/net-im/jabber/files/patch-jabberd-lib-jutil.cc
new file mode 100644
index 00000000000..b000ca03bb6
--- /dev/null
+++ b/net-im/jabber/files/patch-jabberd-lib-jutil.cc
@@ -0,0 +1,11 @@
+--- jabberd/lib/jutil.cc.orig	Tue Jul 17 16:03:22 2007
++++ jabberd/lib/jutil.cc	Tue Jul 17 16:04:28 2007
+@@ -261,7 +261,7 @@
+     struct tm *new_time = NULL;
+ 
+     gettimeofday(&tv, &tz);
+-    new_time = gmtime(&(tv.tv_sec));
++    new_time = gmtime((time_t *)&(tv.tv_sec));
+     snprintf(buffer, sizeof(char[25]), "%d-%02d-%02dT%02d:%02d:%02d.%03dZ", 1900+new_time->tm_year,
+ 	     new_time->tm_mon+1, new_time->tm_mday, new_time->tm_hour,
+ 	     new_time->tm_min, new_time->tm_sec, tv.tv_usec/1000);
diff --git a/net-im/jabber/files/patch-jabberd-log.cc b/net-im/jabber/files/patch-jabberd-log.cc
new file mode 100644
index 00000000000..e5210b311b9
--- /dev/null
+++ b/net-im/jabber/files/patch-jabberd-log.cc
@@ -0,0 +1,20 @@
+--- jabberd/log.cc.orig	Tue Jul 17 01:20:44 2007
++++ jabberd/log.cc	Tue Jul 17 15:57:22 2007
+@@ -282,7 +282,7 @@
+  * @param action action that is logged (e.g. a failed auth)
+  * @param msgfmt printf()-like format string, parameters are following
+  */
+-void log_generic(const char *logtype, const char *id, const char *type, const char *action, const char *msgfmt, ...) {
++void log_generic(char *logtype, char *id, char *type, char *action, const char *msgfmt, ...) {
+     va_list ap;
+     char logmsg[512] = "";
+     xmlnode log;
+@@ -327,7 +327,7 @@
+  * @param action action that is logged (e.g. a failed auth)
+  * @param msgfmt printf()-like format string, parameters are following
+  */
+-void log_record(const char *id, const char *type, const char *action, const char *msgfmt, ...) {
++void log_record(char *id, char *type, char *action, const char *msgfmt, ...) {
+     va_list ap;
+     char logmsg[512] = "";
+ 
diff --git a/net-im/jabber/files/patch-jsm-sessions.c b/net-im/jabber/files/patch-jsm-sessions.cc
index 6f77d05a867..d297e41aa7e 100644
--- a/net-im/jabber/files/patch-jsm-sessions.c
+++ b/net-im/jabber/files/patch-jsm-sessions.cc
@@ -1,5 +1,5 @@
---- jsm/sessions.c.orig	Fri Feb  9 11:27:52 2007
-+++ jsm/sessions.c	Fri Feb  9 11:45:32 2007
+--- jsm/sessions.cc.orig	Fri Feb  9 11:27:52 2007
++++ jsm/sessions.cc	Fri Feb  9 11:45:32 2007
 @@ -105,7 +105,9 @@
   */
  static void _js_create_session_id(char resultbuffer[9], xht existing_sessions) {
diff --git a/net-im/jabber/files/pkg-message.in b/net-im/jabber/files/pkg-message.in
index dd33daa33c2..3070422bef8 100644
--- a/net-im/jabber/files/pkg-message.in
+++ b/net-im/jabber/files/pkg-message.in
@@ -7,7 +7,7 @@ To configure jabberd14, please copy:
 and edit this file.
 
 For automatic startup define in your rc.conf: 
-jabberd14_enable="YES"
+jabber_enable="YES"
 
 If you want to use file logging instead of syslog, 
 confgiure this in jabber.xml and create the log directory defined there
diff --git a/net-im/jabber/pkg-plist b/net-im/jabber/pkg-plist
index 67e6e50d195..1bbc5572125 100644
--- a/net-im/jabber/pkg-plist
+++ b/net-im/jabber/pkg-plist
@@ -7,31 +7,31 @@ include/jabber/platform-settings
 lib/jabber/libjabberd.a
 lib/jabber/libjabberd.la
 lib/jabber/libjabberd.so
-lib/jabber/libjabberd.so.1
+lib/jabber/libjabberd.so.2
 lib/jabber/libjabberddialback.a
 lib/jabber/libjabberddialback.la
 lib/jabber/libjabberddialback.so
-lib/jabber/libjabberddialback.so.1
+lib/jabber/libjabberddialback.so.2
 lib/jabber/libjabberddnsrv.a
 lib/jabber/libjabberddnsrv.la
 lib/jabber/libjabberddnsrv.so
-lib/jabber/libjabberddnsrv.so.1
+lib/jabber/libjabberddnsrv.so.2
 lib/jabber/libjabberdpthsock.a
 lib/jabber/libjabberdpthsock.la
 lib/jabber/libjabberdpthsock.so
-lib/jabber/libjabberdpthsock.so.1
+lib/jabber/libjabberdpthsock.so.2
 lib/jabber/libjabberdsm.a
 lib/jabber/libjabberdsm.la
 lib/jabber/libjabberdsm.so
-lib/jabber/libjabberdsm.so.1
+lib/jabber/libjabberdsm.so.2
 lib/jabber/libjabberdxdbfile.a
 lib/jabber/libjabberdxdbfile.la
 lib/jabber/libjabberdxdbfile.so
-lib/jabber/libjabberdxdbfile.so.1
+lib/jabber/libjabberdxdbfile.so.2
 lib/jabber/libjabberdxdbsql.a
 lib/jabber/libjabberdxdbsql.la
 lib/jabber/libjabberdxdbsql.so
-lib/jabber/libjabberdxdbsql.so.1
+lib/jabber/libjabberdxdbsql.so.2
 share/locale/de/LC_MESSAGES/jabberd14.mo
 share/locale/fr/LC_MESSAGES/jabberd14.mo
 share/locale/hu/LC_MESSAGES/jabberd14.mo