Bump. Various SSL fixes, default vhost is now name-based, servername check fixed, config file writes to /etc/apache2/conf.d/system-config-httpd.conf, and more.

Package-Manager: portage-2.1.3_rc8

5 files changed, 179 insertions, 6 deletions

diff --git a/app-admin/system-config-httpd/ChangeLog b/app-admin/system-config-httpd/ChangeLog
index ffd404b23a06..7cdbfe0c2795 100644
--- a/app-admin/system-config-httpd/ChangeLog
+++ b/app-admin/system-config-httpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/system-config-httpd
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-httpd/ChangeLog,v 1.2 2006/09/05 21:54:33 dberkholz Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-httpd/ChangeLog,v 1.3 2007/07/15 03:43:09 dberkholz Exp $
+
+*system-config-httpd-1.4.3 (15 Jul 2007)
+
+  15 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4.3-gentooify.patch, +system-config-httpd-1.4.3.ebuild:
+  Bump. Various SSL fixes, default vhost is now name-based, servername check
+  fixed, config file writes to /etc/apache2/conf.d/system-config-httpd.conf,
+  and more.
 
   05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   system-config-httpd-1.3.3.ebuild:
diff --git a/app-admin/system-config-httpd/Manifest b/app-admin/system-config-httpd/Manifest
index 522355f63584..012af96597fd 100644
--- a/app-admin/system-config-httpd/Manifest
+++ b/app-admin/system-config-httpd/Manifest
@@ -2,15 +2,24 @@ AUX 1.3.3-gentooify.patch 3118 RMD160 9f68958e61ac52a6d889f0334ea57f91d68625f4 S
 MD5 4f9820a39380cb483deeac5cad17a2f9 files/1.3.3-gentooify.patch 3118
 RMD160 9f68958e61ac52a6d889f0334ea57f91d68625f4 files/1.3.3-gentooify.patch 3118
 SHA256 355c7f1ea7691ca6750a17c0d372cc603d22f0f3cc6e2885e5e8f74e542500b7 files/1.3.3-gentooify.patch 3118
+AUX 1.4.3-gentooify.patch 4267 RMD160 29545759b3b2a7e3819804bb22ba14d21559b94b SHA1 8b3b6282314f5125e8a4957ae9b129219156daee SHA256 43359269a7a44233e174e8dc596026a1b1cd52e6271bdb6267e629a69314cf03
+MD5 2137b806ab88691568b97b79fc4f936c files/1.4.3-gentooify.patch 4267
+RMD160 29545759b3b2a7e3819804bb22ba14d21559b94b files/1.4.3-gentooify.patch 4267
+SHA256 43359269a7a44233e174e8dc596026a1b1cd52e6271bdb6267e629a69314cf03 files/1.4.3-gentooify.patch 4267
 DIST system-config-httpd-1.3.3-1.1.1.src.rpm 833094 RMD160 2a96e737d3b1b8ef9128ca149edd46fb60ae3b30 SHA1 db88aee34a952aff5aef69bd8f68535813132d68 SHA256 e52343a1290fd39b0b55fd58ab6961c998104e3423de72e7b2574eb84907d942
+DIST system-config-httpd-1.4.3-1.fc7.src.rpm 1083633 RMD160 daa04cc38823038e0a78acdfe42c27d520264fbf SHA1 3186ecc1f216a23ff869835ebaad4f69d3b8c200 SHA256 d0a67894ca8ef14c0d7b4bc95d67aef81b5650e43378006ef100e2b628a23e0d
 EBUILD system-config-httpd-1.3.3.ebuild 1279 RMD160 07f1226b55f73491b640732954b9b45f300a7a06 SHA1 1062df22f8818fa96ecb3edcfe8db4df17bd78cc SHA256 86d45d2577efed094996a9de8931926d3c32b4e1286551ab8fda04808859115c
 MD5 b939e128c7968b888719aabd3450205b system-config-httpd-1.3.3.ebuild 1279
 RMD160 07f1226b55f73491b640732954b9b45f300a7a06 system-config-httpd-1.3.3.ebuild 1279
 SHA256 86d45d2577efed094996a9de8931926d3c32b4e1286551ab8fda04808859115c system-config-httpd-1.3.3.ebuild 1279
-MISC ChangeLog 569 RMD160 c0b82b028d90d773b3f6abf680cb7e0cdce982f4 SHA1 896a830af30f03dabb3e153a0374bb48612ceb37 SHA256 c0db75ec9fb2b4b79af6b93150b89c653043faec4e02c40ca41d873d2d8f4ba8
-MD5 f1e42a6a9e88b3a67157b710b3a11e85 ChangeLog 569
-RMD160 c0b82b028d90d773b3f6abf680cb7e0cdce982f4 ChangeLog 569
-SHA256 c0db75ec9fb2b4b79af6b93150b89c653043faec4e02c40ca41d873d2d8f4ba8 ChangeLog 569
+EBUILD system-config-httpd-1.4.3.ebuild 1342 RMD160 a8fe9f27a6af79ac1f3b3302abcf7cc81fc9443c SHA1 1bd288a39e5633d96f3dd39cf19e75d548046285 SHA256 9bce87bc1a758f55d847c8f55bd21dfdc244ed47753b7bda13f2fb53022e8f28
+MD5 e2cf90dcbc2e236c5dc3bc9e5cc33b2b system-config-httpd-1.4.3.ebuild 1342
+RMD160 a8fe9f27a6af79ac1f3b3302abcf7cc81fc9443c system-config-httpd-1.4.3.ebuild 1342
+SHA256 9bce87bc1a758f55d847c8f55bd21dfdc244ed47753b7bda13f2fb53022e8f28 system-config-httpd-1.4.3.ebuild 1342
+MISC ChangeLog 900 RMD160 2c950e29357c12724854839957f030607af987f5 SHA1 dd5d4d1c0a2bb1a402cc5fb547c884f5b52df626 SHA256 43cb23f3f373e197061c9679931dcbe1426fae61ac70cd44adaac67c4fcc46c2
+MD5 f9adcae8b485f63623a3552e2b3fb6d4 ChangeLog 900
+RMD160 2c950e29357c12724854839957f030607af987f5 ChangeLog 900
+SHA256 43cb23f3f373e197061c9679931dcbe1426fae61ac70cd44adaac67c4fcc46c2 ChangeLog 900
 MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506
 MD5 4f7fe0eacb3ba0ef618e04831e4a7517 metadata.xml 252
 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 metadata.xml 252
@@ -18,3 +27,6 @@ SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506 metadata
 MD5 271f6db54f7a01ded6433812c9c276c3 files/digest-system-config-httpd-1.3.3 298
 RMD160 556178dd7dd9aa325f569871ea1f3605d39b93e3 files/digest-system-config-httpd-1.3.3 298
 SHA256 78a07bfaf5b309e7cb67075a9925a1dcd31e6957a0c7b1262f28f44a7dc61207 files/digest-system-config-httpd-1.3.3 298
+MD5 e1be94fd6fa777cdb7b7a014d60ff6e2 files/digest-system-config-httpd-1.4.3 301
+RMD160 03e0f5b601c7393e9aed93225c24a54dee70f181 files/digest-system-config-httpd-1.4.3 301
+SHA256 71f7b9393a0b94c15b29f83880d4bfcd215b042427d76eadeab118755f798ee6 files/digest-system-config-httpd-1.4.3 301
diff --git a/app-admin/system-config-httpd/files/1.4.3-gentooify.patch b/app-admin/system-config-httpd/files/1.4.3-gentooify.patch
new file mode 100644
index 000000000000..09cda3c575ed
--- /dev/null
+++ b/app-admin/system-config-httpd/files/1.4.3-gentooify.patch
@@ -0,0 +1,95 @@
+Index: README.1st
+===================================================================
+RCS file: /usr/local/CVS/apacheconf/README.1st,v
+retrieving revision 1.4
+diff -u -b -B -r1.4 README.1st
+--- README.1st	20 Nov 2006 16:41:44 -0000	1.4
++++ README.1st	15 Jul 2007 03:31:11 -0000
+@@ -21,7 +21,7 @@
+ Small update on the plan of parsing:
+ 
+ As with the newer httpd packages we started supporting and automatically
+-including /etc/httpd/conf.d/* in our default setup, so the plan is to
++including /etc/apache2/conf.d/* in our default setup, so the plan is to
+ store the configuration generated by system-config-httpd in a file (or more
+ files) in that directory.
+ 
+Index: system-config-httpd.1
+===================================================================
+RCS file: /usr/local/CVS/apacheconf/system-config-httpd.1,v
+retrieving revision 1.2
+diff -u -b -B -r1.2 system-config-httpd.1
+--- system-config-httpd.1	11 Jan 2007 11:57:56 -0000	1.2
++++ system-config-httpd.1	15 Jul 2007 03:31:11 -0000
+@@ -26,7 +26,7 @@
+ .SH "BUGS"
+ Not all possible checks for correct values are done yet.
+ 
+-The current /etc/httpd/conf/httpd.conf file is \fBNOT\fR parsed, so changing the
++The current /etc/apache2/conf/httpd.conf file is \fBNOT\fR parsed, so changing the
+ configuration with system-config-httpd will overwrite any manual changes to the httpd.conf file or
+ the changes done with system-config-httpd are discarded. In case of overwriting the manually
+ editied file a backup file will be generated.
+Index: src/ApacheBase.py
+===================================================================
+RCS file: /usr/local/CVS/apacheconf/src/ApacheBase.py,v
+retrieving revision 1.29
+diff -u -b -B -r1.29 ApacheBase.py
+--- src/ApacheBase.py	10 Nov 2006 16:43:46 -0000	1.29
++++ src/ApacheBase.py	15 Jul 2007 03:31:12 -0000
+@@ -4349,7 +4349,7 @@
+ 
+     # Compute md5sum of currently installed httpd.conf
+     try:
+-        rmd5 = hexstr (md5 (open ('/etc/httpd/conf.d/system-config-httpd.conf', 'r').read ()).digest())
++        rmd5 = hexstr (md5 (open ('/etc/apache2/modules.d/system-config-httpd.conf', 'r').read ()).digest())
+     except:
+         rmd5 = ''
+ 
+@@ -4361,14 +4361,14 @@
+     if omd5 != rmd5:
+         if force:
+             try:
+-                os.remove ('/etc/httpd/conf.d/system-config-httpd.conf.bak')
++                os.remove ('/etc/apache2/modules.d/system-config-httpd.conf.bak')
+             except:
+                 pass
+             try:
+-                os.rename ('/etc/httpd/conf.d/system-config-httpd.conf', '/etc/httpd/conf.d/system-config-httpd.conf.bak')
++                os.rename ('/etc/apache2/modules.d/system-config-httpd.conf', '/etc/apache2/modules.d/system-config-httpd.conf.bak')
+             except:
+                 pass
+-            open ('/etc/httpd/conf.d/system-config-httpd.conf', 'w').write (result)
++            open ('/etc/apache2/modules.d/system-config-httpd.conf', 'w').write (result)
+             open ('/usr/share/system-config-httpd/system-config-httpd.conf.md5', 'w').write (nmd5)
+             local_box.write (ctx)
+ 	    return 0
+@@ -4377,7 +4377,7 @@
+         else:
+             return -2
+     else:
+-        open ('/etc/httpd/conf.d/system-config-httpd.conf', 'w').write (result)
++        open ('/etc/apache2/modules.d/system-config-httpd.conf', 'w').write (result)
+         open ('/usr/share/system-config-httpd/system-config-httpd.conf.md5', 'w').write (nmd5)
+         local_box.write (ctx)
+ 	return 0
+Index: src/rpm.xml
+===================================================================
+RCS file: /usr/local/CVS/apacheconf/src/rpm.xml,v
+retrieving revision 1.17
+diff -u -b -B -r1.17 rpm.xml
+--- src/rpm.xml	10 Nov 2006 16:43:47 -0000	1.17
++++ src/rpm.xml	15 Jul 2007 03:31:12 -0000
+@@ -7,10 +7,10 @@
+   <datatree>
+     <apache TYPE="LIST">
+       <serveroptions TYPE="LIST">
+-        <ServerRoot TYPE="STRING" VALUE="/etc/httpd"/>
++        <ServerRoot TYPE="STRING" VALUE="/etc/apache2"/>
+         <ServerName TYPE="STRING" VALUE=""/>
+         <ServerAdmin TYPE="STRING" VALUE="root@localhost"/>
+-	<CoreDumpDirectory TYPE="STRING" VALUE="/etc/httpd"/>
++	<CoreDumpDirectory TYPE="STRING" VALUE="/etc/apache2"/>
+ 	<listener ANONYMOUS="TRUE" ATOMIC="TRUE" TYPE="LIST">
+ 	</listener>
+         <Port TYPE="INT" VALUE="80"/>
diff --git a/app-admin/system-config-httpd/files/digest-system-config-httpd-1.4.3 b/app-admin/system-config-httpd/files/digest-system-config-httpd-1.4.3
new file mode 100644
index 000000000000..06a733c63123
--- /dev/null
+++ b/app-admin/system-config-httpd/files/digest-system-config-httpd-1.4.3
@@ -0,0 +1,3 @@
+MD5 5d8e734b8faa609d64cc4052283a4b71 system-config-httpd-1.4.3-1.fc7.src.rpm 1083633
+RMD160 daa04cc38823038e0a78acdfe42c27d520264fbf system-config-httpd-1.4.3-1.fc7.src.rpm 1083633
+SHA256 d0a67894ca8ef14c0d7b4bc95d67aef81b5650e43378006ef100e2b628a23e0d system-config-httpd-1.4.3-1.fc7.src.rpm 1083633
diff --git a/app-admin/system-config-httpd/system-config-httpd-1.4.3.ebuild b/app-admin/system-config-httpd/system-config-httpd-1.4.3.ebuild
new file mode 100644
index 000000000000..a9f7aad0a333
--- /dev/null
+++ b/app-admin/system-config-httpd/system-config-httpd-1.4.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-httpd/system-config-httpd-1.4.3.ebuild,v 1.1 2007/07/15 03:43:09 dberkholz Exp $
+
+inherit python eutils rpm
+
+# Tag for which Fedora Core version it's from
+FCVER="7"
+# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
+# tarball out of it
+RPMREV="1"
+
+DESCRIPTION="Apache configuration tool"
+HOMEPAGE="http://fedora.redhat.com/projects/config-tools/"
+SRC_URI="mirror://fedora/development/source/SRPMS/${P}-${RPMREV}.fc${FCVER}.src.rpm"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+RDEPEND="dev-libs/alchemist
+	=dev-python/pygtk-2*
+	dev-lang/python
+	=dev-python/gnome-python-2*
+	>=net-www/apache-2.0.52-r3
+	sys-apps/usermode
+	dev-libs/libxslt"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool"
+
+pkg_setup() {
+	if ! built_with_use dev-libs/libxslt python; then
+		local msg="Build dev-libs/libxslt with USE=python"
+		eerror "$msg"
+		die "$msg"
+	fi
+}
+
+src_unpack() {
+	rpm_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-gentooify.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	make_desktop_entry /usr/bin/${PN}
+
+	fperms 644 /etc/pam.d/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}