diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2006-09-05 21:25:15 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-09-05 21:25:15 +0000 |
commit | 8e8e0eb40eeb53da3b9f68240695efab21919782 (patch) | |
tree | 6547d196a4f2fe8eabe03253f05ed17858986b84 /app-admin/system-config-httpd | |
parent | A multi-sourced configuration back-end (diff) | |
download | gentoo-2-8e8e0eb40eeb53da3b9f68240695efab21919782.tar.gz gentoo-2-8e8e0eb40eeb53da3b9f68240695efab21919782.tar.bz2 gentoo-2-8e8e0eb40eeb53da3b9f68240695efab21919782.zip |
Apache configuration tool
(Portage version: 2.1.1_rc1-r1)
Diffstat (limited to 'app-admin/system-config-httpd')
6 files changed, 171 insertions, 0 deletions
diff --git a/app-admin/system-config-httpd/ChangeLog b/app-admin/system-config-httpd/ChangeLog new file mode 100644 index 000000000000..8d710ed7c2b1 --- /dev/null +++ b/app-admin/system-config-httpd/ChangeLog @@ -0,0 +1,11 @@ +# 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.1 2006/09/05 21:25:15 dberkholz Exp $ + +*system-config-httpd-1.3.3 (05 Sep 2006) + + 05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.3.3-gentooify.patch, +metadata.xml, + +system-config-httpd-1.3.3.ebuild: + Apache configuration tool + diff --git a/app-admin/system-config-httpd/Manifest b/app-admin/system-config-httpd/Manifest new file mode 100644 index 000000000000..4ba85a210c56 --- /dev/null +++ b/app-admin/system-config-httpd/Manifest @@ -0,0 +1,20 @@ +AUX 1.3.3-gentooify.patch 3118 RMD160 9f68958e61ac52a6d889f0334ea57f91d68625f4 SHA1 252d67e354fe2240e273a4b85b28bd82ecd430e3 SHA256 355c7f1ea7691ca6750a17c0d372cc603d22f0f3cc6e2885e5e8f74e542500b7 +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 +DIST system-config-httpd-1.3.3-1.1.1.src.rpm 833094 RMD160 2a96e737d3b1b8ef9128ca149edd46fb60ae3b30 SHA1 db88aee34a952aff5aef69bd8f68535813132d68 SHA256 e52343a1290fd39b0b55fd58ab6961c998104e3423de72e7b2574eb84907d942 +EBUILD system-config-httpd-1.3.3.ebuild 1090 RMD160 fb141845f22c15cd6dd45d33ea57c7ab72df2652 SHA1 3e989be051047272346d91eb7b8f59faa1f644dc SHA256 18ad6c1d05c8f0e5c9866fc9e498827158ad9740e31fbce9a8ff7e123365db32 +MD5 0b1aa32cd512b83588dffcbad472fc4b system-config-httpd-1.3.3.ebuild 1090 +RMD160 fb141845f22c15cd6dd45d33ea57c7ab72df2652 system-config-httpd-1.3.3.ebuild 1090 +SHA256 18ad6c1d05c8f0e5c9866fc9e498827158ad9740e31fbce9a8ff7e123365db32 system-config-httpd-1.3.3.ebuild 1090 +MISC ChangeLog 340 RMD160 8f5435b819f6295be995365f30f5ec170161488d SHA1 a233cbb7d4640c847353316b399500f658b7f858 SHA256 656af6f2838a39ff5e81d4fdd7c9032c9d625bae267e26c72b332549718c1bae +MD5 78b51f77e0c137ce698119d42bbc8ec5 ChangeLog 340 +RMD160 8f5435b819f6295be995365f30f5ec170161488d ChangeLog 340 +SHA256 656af6f2838a39ff5e81d4fdd7c9032c9d625bae267e26c72b332549718c1bae ChangeLog 340 +MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506 +MD5 4f7fe0eacb3ba0ef618e04831e4a7517 metadata.xml 252 +RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 metadata.xml 252 +SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506 metadata.xml 252 +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 diff --git a/app-admin/system-config-httpd/files/1.3.3-gentooify.patch b/app-admin/system-config-httpd/files/1.3.3-gentooify.patch new file mode 100644 index 000000000000..8e0e2eb89e9e --- /dev/null +++ b/app-admin/system-config-httpd/files/1.3.3-gentooify.patch @@ -0,0 +1,79 @@ +diff -urN system-config-httpd-1.3.3.orig/src/ApacheBase.py system-config-httpd-1.3.3/src/ApacheBase.py +--- system-config-httpd-1.3.3.orig/src/ApacheBase.py 2006-09-04 11:57:25.000000000 -0700 ++++ system-config-httpd-1.3.3/src/ApacheBase.py 2006-09-04 12:01:10.000000000 -0700 +@@ -4349,7 +4349,7 @@ + + # Compute md5sum of currently installed httpd.conf + try: +- rmd5 = hexstr (md5 (open ('/etc/httpd/conf/httpd.conf', 'r').read ()).digest()) ++ rmd5 = hexstr (md5 (open ('/etc/apache2/httpd.conf', 'r').read ()).digest()) + except: + rmd5 = '' + +@@ -4361,14 +4361,14 @@ + if omd5 != rmd5: + if force: + try: +- os.remove ('/etc/httpd/conf/httpd.conf.bak') ++ os.remove ('/etc/apache2/httpd.conf.bak') + except: + pass + try: +- os.rename ('/etc/httpd/conf/httpd.conf', '/etc/httpd/conf/httpd.conf.bak') ++ os.rename ('/etc/apache2/httpd.conf', '/etc/apache2/httpd.conf.bak') + except: + pass +- open ('/etc/httpd/conf/httpd.conf', 'w').write (result) ++ open ('/etc/apache2/httpd.conf', 'w').write (result) + open ('/usr/share/system-config-httpd/httpd.conf.md5', 'w').write (nmd5) + local_box.write (ctx) + return 0 +@@ -4377,7 +4377,7 @@ + else: + return -2 + else: +- open ('/etc/httpd/conf/httpd.conf', 'w').write (result) ++ open ('/etc/apache2/httpd.conf', 'w').write (result) + open ('/usr/share/system-config-httpd/httpd.conf.md5', 'w').write (nmd5) + local_box.write (ctx) + return 0 +diff -urN system-config-httpd-1.3.3.orig/src/httpd.conf.xsl system-config-httpd-1.3.3/src/httpd.conf.xsl +--- system-config-httpd-1.3.3.orig/src/httpd.conf.xsl 2006-09-04 11:57:25.000000000 -0700 ++++ system-config-httpd-1.3.3/src/httpd.conf.xsl 2006-09-04 12:00:25.000000000 -0700 +@@ -29,8 +29,8 @@ + # of the server's control files begin with "/" (or "drive:/" for Win32), the + # server will use that explicit path. If the filenames do *not* begin + # with "/", the value of ServerRoot is prepended -- so "logs/foo.log" +-# with ServerRoot set to "/etc/httpd" will be interpreted by the +-# server as "/etc/httpd/logs/foo.log". ++# with ServerRoot set to "/etc/apache2" will be interpreted by the ++# server as "/etc/apache2/logs/foo.log". + # + + ### Section 1: Global Environment +@@ -203,9 +203,14 @@ + LoadModule cgi_module modules/mod_cgi.so + + # +-# Load config files from the config directory "/etc/httpd/conf.d". ++# Load config files from the config directory "/etc/apache2/modules.d". + # +-Include conf.d/*.conf ++Include modules.d/*.conf ++ ++# ++# Load config files from the config directory "/etc/apache2/vhosts.d". ++# ++Include vhosts.d/*.conf + + # + # ExtendedStatus controls whether Apache will generate "full" status +@@ -865,7 +870,7 @@ + # To enable the cache as well, edit and uncomment the following lines: + # (no cacheing without CacheRoot) + # +-#CacheRoot "/etc/httpd/proxy" ++#CacheRoot "/etc/apache2/proxy" + #CacheSize 5 + #CacheGcInterval 4 + #CacheMaxExpire 24 diff --git a/app-admin/system-config-httpd/files/digest-system-config-httpd-1.3.3 b/app-admin/system-config-httpd/files/digest-system-config-httpd-1.3.3 new file mode 100644 index 000000000000..ec82282320f6 --- /dev/null +++ b/app-admin/system-config-httpd/files/digest-system-config-httpd-1.3.3 @@ -0,0 +1,3 @@ +MD5 3cfcd670ba650ed5781e03d0f7ba130c system-config-httpd-1.3.3-1.1.1.src.rpm 833094 +RMD160 2a96e737d3b1b8ef9128ca149edd46fb60ae3b30 system-config-httpd-1.3.3-1.1.1.src.rpm 833094 +SHA256 e52343a1290fd39b0b55fd58ab6961c998104e3423de72e7b2574eb84907d942 system-config-httpd-1.3.3-1.1.1.src.rpm 833094 diff --git a/app-admin/system-config-httpd/metadata.xml b/app-admin/system-config-httpd/metadata.xml new file mode 100644 index 000000000000..cd89a979878d --- /dev/null +++ b/app-admin/system-config-httpd/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>no-herd</herd> +<maintainer> +<email>dberkholz@gentoo.org</email> +<name>Donnie Berkholz</name> +</maintainer> +</pkgmetadata> diff --git a/app-admin/system-config-httpd/system-config-httpd-1.3.3.ebuild b/app-admin/system-config-httpd/system-config-httpd-1.3.3.ebuild new file mode 100644 index 000000000000..7ca9bfc2bdaa --- /dev/null +++ b/app-admin/system-config-httpd/system-config-httpd-1.3.3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2006 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.3.3.ebuild,v 1.1 2006/09/05 21:25:15 dberkholz Exp $ + +inherit eutils rpm + +# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source +# tarball out of it +RPMREV="1.1.1" + +DESCRIPTION="Apache configuration tool" +HOMEPAGE="http://fedora.redhat.com/projects/config-tools/" +SRC_URI="mirror://fedora/development/source/SRPMS/${P}-${RPMREV}.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} +} |