summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2013-09-30 06:16:34 +0000
committerobache <obache@pkgsrc.org>2013-09-30 06:16:34 +0000
commitd8d980b1c3a69979878617f939d47d17ddc1c670 (patch)
tree9c3334efebf9c1bee54a0e0392aadc0f766542b6
parent4b86e9a64f64d8fe5a93f272c204e826d3256de0 (diff)
downloadpkgsrc-d8d980b1c3a69979878617f939d47d17ddc1c670.tar.gz
Take patch for CVE-2013-4122 from upstream git repo.
Bump PKGREVISION of cyrus-saslauthd.
-rw-r--r--security/cyrus-sasl/Makefile.common6
-rw-r--r--security/cyrus-sasl/distinfo5
-rw-r--r--security/cyrus-saslauthd/Makefile4
3 files changed, 11 insertions, 4 deletions
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common
index 2844f02aad6..7096e3fc501 100644
--- a/security/cyrus-sasl/Makefile.common
+++ b/security/cyrus-sasl/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2012/12/16 01:36:44 obache Exp $
+# $NetBSD: Makefile.common,v 1.20 2013/09/30 06:16:34 obache Exp $
#
# used by security/cyrus-sasl/Makefile
# used by security/cy2-anonymous/Makefile
@@ -21,6 +21,10 @@ DISTNAME= cyrus-sasl-2.1.26
CATEGORIES= security
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
+PATCHFILES+= cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch
+SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch= \
+ -http://git.cyrusimap.org/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d
+PATCH_DIST_STRIP= -p1
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.cyrussasl.org/
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 13a2893ff59..c0da5a42761 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.25 2013/09/30 05:44:33 obache Exp $
+$NetBSD: distinfo,v 1.26 2013/09/30 06:16:34 obache Exp $
SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c
RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8
Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes
+SHA1 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch) = a3913afc26a37cd6e4681c7bf1e09db001c15d57
+RMD160 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch) = 8228d02e2b2cbb54da77d7767f8b9951c3423349
+Size (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch) = 3836 bytes
SHA1 (patch-include_sasl.h) = db40d75998075a5e347209b776230540c54c9e35
SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20
SHA1 (patch-saslauthd_auth__rimap.c) = cc3e04ae0cf049eeb507df3226a2098528afaaab
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index 952f9228019..5f2ae103577 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2013/02/06 23:23:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.46 2013/09/30 06:16:34 obache Exp $
PKGNAME= ${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION= 1
+PKGREVISION= 2
CONFLICTS+= cyrus-sasl<2.1.15nb2
PKG_INSTALLATION_TYPES= overwrite pkgviews