summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz@pkgsrc.org>2017-11-13 17:05:50 +0000
committerspz <spz@pkgsrc.org>2017-11-13 17:05:50 +0000
commit621408879e3cd0bb6c157421d84a5c15e8868480 (patch)
tree4b5274166450e11f6712a269616d211a500670e8
parentbec3137220ff64c02d721a515520815ee9dc7bb8 (diff)
downloadpkgsrc-621408879e3cd0bb6c157421d84a5c15e8868480.tar.gz
Pullup ticket #5643 - requested by he
www/apache22: security patch Revisions pulled up: - www/apache22/Makefile 1.114 - www/apache22/distinfo 1.68 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: wiz Date: Thu Sep 28 04:58:29 UTC 2017 Modified Files: pkgsrc/www/apache22: Makefile distinfo Log Message: apache: update to 2.2.34nb1. Apply upstream patch to fix CVE 2017-9798. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 pkgsrc/www/apache22/Makefile cvs rdiff -u -r1.67 -r1.68 pkgsrc/www/apache22/distinfo
-rw-r--r--www/apache22/Makefile6
-rw-r--r--www/apache22/distinfo6
2 files changed, 10 insertions, 2 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index e17441c5599..587a4022cd3 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.113 2017/07/12 07:00:40 adam Exp $
+# $NetBSD: Makefile,v 1.113.4.1 2017/11/13 17:05:50 spz Exp $
DISTNAME= httpd-2.2.34
PKGNAME= ${DISTNAME:S/httpd/apache/}
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/}
MASTER_SITES+= http://archive.apache.org/dist/httpd/
MASTER_SITES+= http://archive.eu.apache.org/dist/httpd/
EXTRACT_SUFX= .tar.bz2
+PATCH_SITES= https://www.apache.org/dist/httpd/patches/apply_to_2.2.34/
+PATCHFILES= CVE-2017-9798-patch-2.2.patch
+
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://httpd.apache.org/
COMMENT= Apache HTTP (Web) server, version 2.2
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 9499c83b96a..3bfcc951dcd 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.67 2017/07/12 07:00:40 adam Exp $
+$NetBSD: distinfo,v 1.67.4.1 2017/11/13 17:05:50 spz Exp $
+SHA1 (CVE-2017-9798-patch-2.2.patch) = 5602d73298b1623c1aff6e2bceeec98ba0c0532e
+RMD160 (CVE-2017-9798-patch-2.2.patch) = 6dbcf86821fc69a334b537a8de1c8d610743b1b9
+SHA512 (CVE-2017-9798-patch-2.2.patch) = f4fda08d3c3f66cc6d1288ab986d63e9398de36fe82abff1f40f10a02f0ba570bd6c96795f8c00edaf865278373b467725a9e6031bd3c1eca60b622be17953d4
+Size (CVE-2017-9798-patch-2.2.patch) = 1145 bytes
SHA1 (httpd-2.2.34.tar.bz2) = 829206394e238af0b800fc78d19c74ee466ecb23
RMD160 (httpd-2.2.34.tar.bz2) = 7e913d60ac02c815edac6ab0614f5dc40618c073
SHA512 (httpd-2.2.34.tar.bz2) = e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240