aboutsummaryrefslogtreecommitdiffstats
path: root/net-im
diff options
context:
space:
mode:
authorseanc <seanc@FreeBSD.org>2004-11-01 04:15:20 +0800
committerseanc <seanc@FreeBSD.org>2004-11-01 04:15:20 +0800
commit0961027e8c1dd0526084980a252fff781aeb87e5 (patch)
tree8fb23fee6b24d4e71ca50452ec694737550d6f93 /net-im
parentd61c9a9d233e39fc2ed8a9818f6bdc444b731110 (diff)
downloadfreebsd-ports-gnome-0961027e8c1dd0526084980a252fff781aeb87e5.tar.gz
freebsd-ports-gnome-0961027e8c1dd0526084980a252fff781aeb87e5.tar.zst
freebsd-ports-gnome-0961027e8c1dd0526084980a252fff781aeb87e5.zip
Update to jabber 1.4.3.1. Jabber 1.4.3 contains a remotely exploitable
vulnerability detailed here. All jabber 1.4.3 users are strongly advised to upgrade now: http://mail.jabber.org/pipermail/jabberd/2004-September/002004.html Reset maintainership back to ports@ (not using 1.X any more). Submitted by: Randy Bush <randy -at- psg.com>
Diffstat (limited to 'net-im')
-rw-r--r--net-im/jabber/Makefile14
-rw-r--r--net-im/jabber/distinfo4
-rw-r--r--net-im/jabber/files/patch-Makefile3
-rw-r--r--net-im/jabber/pkg-plist1
4 files changed, 13 insertions, 9 deletions
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 6068f21e389c..af131afe9f1b 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -6,20 +6,23 @@
#
PORTNAME= jabber
-PORTVERSION= 1.4.3
+PORTVERSION= 1.4.3.1
CATEGORIES= net
-MASTER_SITES= http://jabberd.jabberstudio.org/1.4/dist/
+MASTER_SITES= http://devel.amessage.info/jabberd14/
DISTNAME= ${PORTNAME}d-${PORTVERSION}
DIST_SUBDIR= jabber
-MAINTAINER= seanc@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Online presence and instant messaging server
-LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth
+LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth \
+ expat.5:${PORTSDIR}/textproc/expat2
+USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_OPENSSL= yes
+USE_REINPLACE= yes
CONFIGURE_ARGS+= --enable-ssl
.if defined(WITH_IPV6)
@@ -36,6 +39,9 @@ post-patch:
${ECHO} "${INSTALL_SCRIPT}" > ${WRKSRC}/.install_script-freebsd
${ECHO} "${INSTALL_PROGRAM}" > ${WRKSRC}/.install_program-freebsd
+post-configure:
+ ${REINPLACE_CMD} -e "s#-I\. -I\.\. #-I\. -I\.\. -I${LOCALBASE}/include #" -e "s#-L/usr/lib#-L/usr/lib -L${LOCALBASE}/lib#" ${WRKSRC}/platform-settings
+
post-install:
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
${INSTALL_DATA} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/
diff --git a/net-im/jabber/distinfo b/net-im/jabber/distinfo
index 2dd9ec7c1caf..3b416ba344ff 100644
--- a/net-im/jabber/distinfo
+++ b/net-im/jabber/distinfo
@@ -1,2 +1,2 @@
-MD5 (jabber/jabberd-1.4.3.tar.gz) = a3e964d6fa07b5d850302ae0512f94c6
-SIZE (jabber/jabberd-1.4.3.tar.gz) = 258016
+MD5 (jabber/jabberd-1.4.3.1.tar.bz2) = a7df3204b3e845735227c07b8fe9c670
+SIZE (jabber/jabberd-1.4.3.1.tar.bz2) = 156597
diff --git a/net-im/jabber/files/patch-Makefile b/net-im/jabber/files/patch-Makefile
index ce467316fcdd..bc261a63564e 100644
--- a/net-im/jabber/files/patch-Makefile
+++ b/net-im/jabber/files/patch-Makefile
@@ -11,7 +11,7 @@
all: all-recursive
-@@ -13,8 +17,28 @@
+@@ -13,8 +17,27 @@
single: single-recursive
@@ -36,7 +36,6 @@
+ ${INSTALL_DATA} jabberd/jabberd.h ${INCDIR}
+ ${INSTALL_DIR} ${INCDIR}/lib
+ ${INSTALL_DATA} jabberd/lib/lib.h ${INCDIR}/lib
-+ ${INSTALL_DATA} jabberd/lib/xmlparse.h ${INCDIR}/lib
+
all-local:
diff --git a/net-im/jabber/pkg-plist b/net-im/jabber/pkg-plist
index 071bb1f22f38..f14fdda30b3c 100644
--- a/net-im/jabber/pkg-plist
+++ b/net-im/jabber/pkg-plist
@@ -3,7 +3,6 @@ sbin/jabberd
etc/jabber.xml.sample
etc/rc.d/jabberd.sh
include/jabber/lib/lib.h
-include/jabber/lib/xmlparse.h
include/jabber/platform-settings
include/jabber/jabberd.h
lib/jabber/dialback/dialback.so