summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stewart <vericgar@gentoo.org>2006-07-30 04:35:11 +0000
committerMichael Stewart <vericgar@gentoo.org>2006-07-30 04:35:11 +0000
commit3e53bc0550824382d296f92617220f2f8e0ecf20 (patch)
tree7648cf6bad42ef5afca51b2700cd6dc0a66975af /net-www/apache
parentBug #141897, version bump. (diff)
downloadgentoo-2-3e53bc0550824382d296f92617220f2f8e0ecf20.tar.gz
gentoo-2-3e53bc0550824382d296f92617220f2f8e0ecf20.tar.bz2
gentoo-2-3e53bc0550824382d296f92617220f2f8e0ecf20.zip
Tweak how patches are handled (now ${PV} based). Rolled new patch tarball
(Portage version: 2.1.1_pre2-r2)
Diffstat (limited to 'net-www/apache')
-rw-r--r--net-www/apache/apache-1.3.37.ebuild12
-rw-r--r--net-www/apache/files/digest-apache-1.3.376
2 files changed, 12 insertions, 6 deletions
diff --git a/net-www/apache/apache-1.3.37.ebuild b/net-www/apache/apache-1.3.37.ebuild
index c3b48f23663c..388dd97080ca 100644
--- a/net-www/apache/apache-1.3.37.ebuild
+++ b/net-www/apache/apache-1.3.37.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.37.ebuild,v 1.1 2006/07/29 20:08:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.37.ebuild,v 1.2 2006/07/30 04:35:11 vericgar Exp $
inherit eutils fixheadtails multilib
# latest gentoo apache files
GENTOO_PATCHNAME="gentoo-apache-${PVR}"
GENTOO_PATCHSTAMP="20060729"
-GENTOO_DEVSPACE="kloeri"
+GENTOO_DEVSPACE="vericgar"
GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
# The mod_ssl archive is only for providing the EAPI patch in here.
@@ -63,7 +63,13 @@ src_unpack() {
# 90-99 security patches
EPATCH_SUFFIX="patch"
epatch ${GENTOO_PATCHDIR}/patches/[0-2]*
- #epatch ${GENTOO_PATCHDIR}/patches/9*
+
+ # security patches are version based
+ # 99_all_${PV}_Name.patch
+ if $(ls ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* &>/dev/null); then
+ epatch ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* || \
+ die "Patching for version ${PV} failed"
+ fi
# setup the filesystem layout config
cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
diff --git a/net-www/apache/files/digest-apache-1.3.37 b/net-www/apache/files/digest-apache-1.3.37
index fe89016d9133..0558f91b506a 100644
--- a/net-www/apache/files/digest-apache-1.3.37
+++ b/net-www/apache/files/digest-apache-1.3.37
@@ -1,9 +1,9 @@
MD5 b278f0969a9ccadeb781316e79e3520f apache_1.3.37.tar.gz 2665370
RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 apache_1.3.37.tar.gz 2665370
SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc apache_1.3.37.tar.gz 2665370
-MD5 a63730fecf4a5b1c40a6a05c5c4f5464 gentoo-apache-1.3.37-20060729.tar.bz2 27552
-RMD160 a11de53cb8e6251caae93c194fd9c99a86d1802b gentoo-apache-1.3.37-20060729.tar.bz2 27552
-SHA256 8aff068a743f6f658afe94cef29d2ce3a26a4092ec22cb5e9fe205300c859d0d gentoo-apache-1.3.37-20060729.tar.bz2 27552
+MD5 7f991bd4d1ce19222a54b6e241ce04a2 gentoo-apache-1.3.37-20060729.tar.bz2 27992
+RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 gentoo-apache-1.3.37-20060729.tar.bz2 27992
+SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b gentoo-apache-1.3.37-20060729.tar.bz2 27992
MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f lingerd-0.94.tar.gz 33938
SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 lingerd-0.94.tar.gz 33938