summaryrefslogtreecommitdiff
path: root/chat/jabberd2
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2011-06-01 11:16:09 +0000
committeradam <adam@pkgsrc.org>2011-06-01 11:16:09 +0000
commitf2ff9a5589025fab0c968ff946492b231f8096ff (patch)
tree171824472d236c9baede334afc40d265e3b9b7c3 /chat/jabberd2
parent187ef034eee052072c1e64e7b64c850cc66abbfa (diff)
downloadpkgsrc-f2ff9a5589025fab0c968ff946492b231f8096ff.tar.gz
Changes 2.2.14:
* Prevent the "billion laughs" attack against expat by disabling internal entity expansion. * Shortcut DNS resolution failure in cases when given domain name is invalid * Explicitly link libcrypt to authreg_mysql * Removed xconfig - it's not used anywhere
Diffstat (limited to 'chat/jabberd2')
-rw-r--r--chat/jabberd2/Makefile5
-rw-r--r--chat/jabberd2/distinfo10
-rw-r--r--chat/jabberd2/patches/patch-configure8
3 files changed, 11 insertions, 12 deletions
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index c4c380dc6ca..c508bbd19ca 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2011/04/22 13:43:06 obache Exp $
+# $NetBSD: Makefile,v 1.67 2011/06/01 11:16:09 adam Exp $
-DISTNAME= jabberd-2.2.13
-PKGREVISION= 1
+DISTNAME= jabberd-2.2.14
CATEGORIES= chat
MASTER_SITES= http://codex.xiaoka.com/pub/jabberd2/releases/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 661b93c7e1b..9b191b9a1cb 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2011/02/23 19:27:16 adam Exp $
+$NetBSD: distinfo,v 1.27 2011/06/01 11:16:09 adam Exp $
-SHA1 (jabberd-2.2.13.tar.bz2) = 31bc6babbf5105dbb2927f46d6033c98aaa99371
-RMD160 (jabberd-2.2.13.tar.bz2) = 3b7721fc950c4419012a1625251fee383b9e76c1
-Size (jabberd-2.2.13.tar.bz2) = 626474 bytes
+SHA1 (jabberd-2.2.14.tar.bz2) = 419319cf8a9ec188b50c349033567977a97d0d72
+RMD160 (jabberd-2.2.14.tar.bz2) = 29e2eaeac85dcbd8872478e64b1420c1288b8548
+Size (jabberd-2.2.14.tar.bz2) = 615984 bytes
SHA1 (patch-Makefile.in) = 0db128003f37425a1b7b315f526828f2e328ddb4
-SHA1 (patch-configure) = 63c4c916552779cb8d620efbaa1ccb6b9b7c08e2
+SHA1 (patch-configure) = 3142e9bfdaa1a147d75a3ae86db3287b25129b35
diff --git a/chat/jabberd2/patches/patch-configure b/chat/jabberd2/patches/patch-configure
index b947aa58a5f..e0888ea1e13 100644
--- a/chat/jabberd2/patches/patch-configure
+++ b/chat/jabberd2/patches/patch-configure
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.2 2011/02/12 18:50:14 adam Exp $
+$NetBSD: patch-configure,v 1.3 2011/06/01 11:16:09 adam Exp $
---- configure.orig 2010-08-08 15:51:09.000000000 +0000
+--- configure.orig 2011-05-31 22:11:47.000000000 +0000
+++ configure
-@@ -10875,7 +10875,7 @@ fi
+@@ -10896,7 +10896,7 @@ fi
# check for optimisation level
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS optimization level" >&5
$as_echo_n "checking CFLAGS optimization level... " >&6; }
-if echo $CFLAGS | grep '.*-O[3s].*' >/dev/null 2>&1; then
+if echo $CFLAGS | grep '.*-O[3].*' >/dev/null 2>&1; then
- as_fn_error "maximum allowed optimization level is -O2" "$LINENO" 5
+ as_fn_error $? "maximum allowed optimization level is -O2" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: fine" >&5