ports/74565: [MAINTAINER UPDATE] Update port: net/jabberd to 2.0.5 (2.0s5)

[Kirk Strauser]

>Number:         74565
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] Update port: net/jabberd to 2.0.5 (2.0s5)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 30 22:30:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kirk Strauser
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
The Day Companies
>Environment:
System: FreeBSD kanga.honeypot.net 5.3-STABLE FreeBSD 5.3-STABLE #1: Sat Nov 20 19:09:53 CST 2004 root at kanga.honeypot.net:/usr/obj/usr/src/sys/KANGA i386


	
>Description:
This is an update of the net/jabberd port to version 2.0.5 (vendor string
"2.0s5").  Important security fixes include several remotely-exploitable
buffer overruns as detailed at
<URL:http://lists.netsys.com/pipermail/full-disclosure/2004-November/029346.html>.

Please make this a priority item; users of the old port are at risk until
they update their systems.
	
>How-To-Repeat:
	
>Fix:

	

--- jabberd.patch begins here ---
diff -urN jabberd.old/Makefile jabberd/Makefile
--- jabberd.old/Makefile	Mon Nov  1 09:02:25 2004
+++ jabberd/Makefile	Tue Nov 30 16:05:45 2004
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jabberd
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	net
 MASTER_SITES=	http://www.jabberstudio.org/files/jabberd2/
-DISTNAME=	${PORTNAME}-2.0s4
+DISTNAME=	${PORTNAME}-2.0s5
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	kirk at strauser.com
@@ -24,9 +24,8 @@
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--enable-ssl \
 		--with-extra-include-path=${LOCALBASE}/include${EIP} \
-		--with-extra-library-path=${LOCALBASE}/lib${ELP}
-
-CONFIGURE_ARGS+=--enable-fs
+		--with-extra-library-path=${LOCALBASE}/lib${ELP} \
+		--enable-fs
 
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
diff -urN jabberd.old/distinfo jabberd/distinfo
--- jabberd.old/distinfo	Mon Nov  1 09:02:25 2004
+++ jabberd/distinfo	Tue Nov 30 15:28:43 2004
@@ -1,2 +1,2 @@
-MD5 (jabber/jabberd-2.0s4.tar.gz) = 2682037fc177e1f3e7d7869cb3f59c1d
-SIZE (jabber/jabberd-2.0s4.tar.gz) = 716819
+MD5 (jabber/jabberd-2.0s5.tar.gz) = f8d8acba7515e9e6233364a1a4aea467
+SIZE (jabber/jabberd-2.0s5.tar.gz) = 722712
diff -urN jabberd.old/files/patch-ltmain.sh jabberd/files/patch-ltmain.sh
--- jabberd.old/files/patch-ltmain.sh	Wed Dec 31 18:00:00 1969
+++ jabberd/files/patch-ltmain.sh	Tue Nov 30 15:56:12 2004
@@ -0,0 +1,18 @@
+--- ltmain.sh.orig	Tue Nov 30 15:55:46 2004
++++ ltmain.sh	Tue Nov 30 15:55:59 2004
+@@ -561,7 +561,6 @@
+ 	    # Evaluate the configuration.
+ 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+ 	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
+-	    trimedcc="${CC/${host}-}"
+ 	    case "$base_compile " in
+ 	    "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
+ 	    tagname=CC
+@@ -954,7 +953,6 @@
+ 	    # Evaluate the configuration.
+ 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+ 	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
+-	    trimedcc="${CC/${host}-}"
+ 	    case $base_compile in
+ 	    "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
+ 	    tagname=CC
diff -urN jabberd.old/files/patch-util.h jabberd/files/patch-util.h
--- jabberd.old/files/patch-util.h	Mon Jul 12 21:38:15 2004
+++ jabberd/files/patch-util.h	Wed Dec 31 18:00:00 1969
@@ -1,11 +0,0 @@
---- util/util.h.orig	Mon May 31 16:31:06 2004
-+++ util/util.h	Mon Jul 12 10:29:58 2004
-@@ -30,6 +30,8 @@
- #include <time.h>
- #include <errno.h>
- #include <assert.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
- 
- #ifdef HAVE_NETINET_IN_H
- # include <netinet/in.h>
--- jabberd.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: