From: Luca Longinotti Date: Mon, 15 Jan 2007 15:13:34 +0000 (+0000) Subject: Add Apache herd, cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a145bfa33355837f62cc2990c7ef64ba316483ec;p=gentoo.git Add Apache herd, cleanup. Package-Manager: portage-2.1.2_rc4-r8 --- diff --git a/www-apache/anyterm/ChangeLog b/www-apache/anyterm/ChangeLog index dfb6a46d299f..20d658389ff9 100644 --- a/www-apache/anyterm/ChangeLog +++ b/www-apache/anyterm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apache/anyterm -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/ChangeLog,v 1.3 2006/01/25 19:37:10 twp Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/ChangeLog,v 1.4 2007/01/15 15:13:34 chtekk Exp $ + + 15 Jan 2007; Luca Longinotti metadata.xml, + anyterm-1.1.8-r2.ebuild: + Add Apache herd, cleanup. *anyterm-1.1.8-r2 (25 Jan 2006) diff --git a/www-apache/anyterm/Manifest b/www-apache/anyterm/Manifest index 51b801a9ca3c..165765d7210e 100644 --- a/www-apache/anyterm/Manifest +++ b/www-apache/anyterm/Manifest @@ -1,10 +1,40 @@ -MD5 3c105158bfd888d1dba682cf6e9e1788 ChangeLog 1099 -MD5 aadbf2b77736fa5e2837cb06246e63ec anyterm-1.1.8-r2.ebuild 2843 +AUX 50_anyterm.conf 245 RMD160 03b57404b84294ee3901a772f578ed9a25fcdbcd SHA1 f710f2c78dda13f1212ab9940eb3181562e3c0b5 SHA256 c09d0a7e0e2d8e010afed91d5f03e738fac4e12ff32aff53681b54214892fbd4 MD5 5d4c363d94576d82610a3b238da8b1e4 files/50_anyterm.conf 245 +RMD160 03b57404b84294ee3901a772f578ed9a25fcdbcd files/50_anyterm.conf 245 +SHA256 c09d0a7e0e2d8e010afed91d5f03e738fac4e12ff32aff53681b54214892fbd4 files/50_anyterm.conf 245 +AUX anyterm-1.1.8-apachemod-Makefile.patch 891 RMD160 3eff11859ace8d837818af2ead79d30784bd82e2 SHA1 8012dd26ad97efb588e3a6d1264b7f6e6f9d570f SHA256 797a4f4563b73b30bd218cb6fd04bcb1adde6b8c5ab70732adc511baf65b354c MD5 5a58f6af7f808560b821511c1e00261c files/anyterm-1.1.8-apachemod-Makefile.patch 891 +RMD160 3eff11859ace8d837818af2ead79d30784bd82e2 files/anyterm-1.1.8-apachemod-Makefile.patch 891 +SHA256 797a4f4563b73b30bd218cb6fd04bcb1adde6b8c5ab70732adc511baf65b354c files/anyterm-1.1.8-apachemod-Makefile.patch 891 +AUX anyterm-1.1.8-browser-gentoo.patch 2086 RMD160 a800588cd71b2e3e606a16fcefb05f4d792a2150 SHA1 339cf52c77c970b43efd4f81bb87c1fd2eb556eb SHA256 2843299fcb74886fe7e14dd85be3fb4f72e7b135908421c246dacf02d76fec51 MD5 c9e7d1d08a12c4eccbff1002a3d5295f files/anyterm-1.1.8-browser-gentoo.patch 2086 +RMD160 a800588cd71b2e3e606a16fcefb05f4d792a2150 files/anyterm-1.1.8-browser-gentoo.patch 2086 +SHA256 2843299fcb74886fe7e14dd85be3fb4f72e7b135908421c246dacf02d76fec51 files/anyterm-1.1.8-browser-gentoo.patch 2086 +AUX anyterm-1.1.8-common-extern.patch 655 RMD160 9100d1b535d7c869136d4125ed904fd814280199 SHA1 8a08993527725be7f7496cb313fab4d82b319dc7 SHA256 66328ff3147e5d73b30ae0da48fc5cd67210cd137f094aaa3fda0bb0c2eb3774 MD5 edfc9bd9803d9fd760243cef69b00575 files/anyterm-1.1.8-common-extern.patch 655 +RMD160 9100d1b535d7c869136d4125ed904fd814280199 files/anyterm-1.1.8-common-extern.patch 655 +SHA256 66328ff3147e5d73b30ae0da48fc5cd67210cd137f094aaa3fda0bb0c2eb3774 files/anyterm-1.1.8-common-extern.patch 655 +AUX anyterm-1.1.8-libpbe-no-pg_config.patch 432 RMD160 c0f1f8c9dac436eb74802222f6109b78511dd3dd SHA1 273891dc4a4b21722e3b9c5b0fbe3a10e967dd87 SHA256 ecef206c0f40da0b68664a481aa820f0032e6825f67f30fcf8dd0ef392a9bd8b MD5 a6069c73dec076f0f2c69ea2cb4b55b8 files/anyterm-1.1.8-libpbe-no-pg_config.patch 432 +RMD160 c0f1f8c9dac436eb74802222f6109b78511dd3dd files/anyterm-1.1.8-libpbe-no-pg_config.patch 432 +SHA256 ecef206c0f40da0b68664a481aa820f0032e6825f67f30fcf8dd0ef392a9bd8b files/anyterm-1.1.8-libpbe-no-pg_config.patch 432 +AUX anyterm-1.1.8-postinst-en.txt 1976 RMD160 a2f5a3662989714f9c171d7a484c0dfc3a4869de SHA1 b6f0d6d3fc892282d9406142553e81aaa6ff9ca9 SHA256 43c86934e00be1b61d856e8e15599639bd1e6fa1c8f0c51807c9f71c3dd551d3 MD5 b3ff11277b2fe4d9712d2bf8ded7a6e0 files/anyterm-1.1.8-postinst-en.txt 1976 -MD5 1fafa77a32bc461f15aae771d3d2ea70 files/digest-anyterm-1.1.8-r2 62 -MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 +RMD160 a2f5a3662989714f9c171d7a484c0dfc3a4869de files/anyterm-1.1.8-postinst-en.txt 1976 +SHA256 43c86934e00be1b61d856e8e15599639bd1e6fa1c8f0c51807c9f71c3dd551d3 files/anyterm-1.1.8-postinst-en.txt 1976 +DIST anyterm-1.1.8.tbz2 75137 RMD160 8e2ba675b0697214579524a19d10bc7791a4834e SHA1 8adddcbd840c3f6d7b8d47521d13ba51b60e9dff SHA256 06c3896597cc9353c3d1fdcd33aab071f31b5fe7305561ba03372feeb92913ff +EBUILD anyterm-1.1.8-r2.ebuild 2896 RMD160 2e30fefa9aa1269d74dd57a8d60595d7a070ff16 SHA1 202feedbf9fc3951df8f4eed0191bd08ee133af8 SHA256 7aac9f1016cdf8ffb76f191383253d99a3437c19a5c4e876b6a77adae386d021 +MD5 feb5f1857acf4c8a55d1362dc024f83d anyterm-1.1.8-r2.ebuild 2896 +RMD160 2e30fefa9aa1269d74dd57a8d60595d7a070ff16 anyterm-1.1.8-r2.ebuild 2896 +SHA256 7aac9f1016cdf8ffb76f191383253d99a3437c19a5c4e876b6a77adae386d021 anyterm-1.1.8-r2.ebuild 2896 +MISC ChangeLog 1223 RMD160 2dcf277d4013ba8e8be7e029a2df894d51a0912a SHA1 78d7431f5e0fb16f2dae7c3831814f7872271783 SHA256 340d1968d09bf1b0279a856aad288b78c7479640a1d1d8bb094817f132639317 +MD5 16755844f8992d181a2f2a87998d7ca5 ChangeLog 1223 +RMD160 2dcf277d4013ba8e8be7e029a2df894d51a0912a ChangeLog 1223 +SHA256 340d1968d09bf1b0279a856aad288b78c7479640a1d1d8bb094817f132639317 ChangeLog 1223 +MISC metadata.xml 246 RMD160 bf006099dd917d86dc071e91e458443953a01eea SHA1 e5f25db742cbc1f13347e2f24bab6ceb85fec945 SHA256 374a830808ba3586922cdbddd20f35e9be4c01d0f584dc9cd6b72703fdd75e76 +MD5 49ee2eafa96ccf93603d3975d58ce474 metadata.xml 246 +RMD160 bf006099dd917d86dc071e91e458443953a01eea metadata.xml 246 +SHA256 374a830808ba3586922cdbddd20f35e9be4c01d0f584dc9cd6b72703fdd75e76 metadata.xml 246 +MD5 266fff5eab4bffdf8e0cdac0a7232276 files/digest-anyterm-1.1.8-r2 232 +RMD160 81cc674ad2dcf49d7da58d1acc31f77854c5fd6a files/digest-anyterm-1.1.8-r2 232 +SHA256 585f26cc7631b6f4c3ea8131ed04038f856f5702e0687cf6acbdc1f4c40d3599 files/digest-anyterm-1.1.8-r2 232 diff --git a/www-apache/anyterm/anyterm-1.1.8-r2.ebuild b/www-apache/anyterm/anyterm-1.1.8-r2.ebuild index 121d9f7bdbd2..650f3dcef1d5 100644 --- a/www-apache/anyterm/anyterm-1.1.8-r2.ebuild +++ b/www-apache/anyterm/anyterm-1.1.8-r2.ebuild @@ -1,31 +1,30 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/anyterm-1.1.8-r2.ebuild,v 1.1 2006/01/25 19:37:10 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/anyterm-1.1.8-r2.ebuild,v 1.2 2007/01/15 15:13:34 chtekk Exp $ inherit apache-module eutils toolchain-funcs webapp -DESCRIPTION="A terminal anywhere" +KEYWORDS="~x86" + +DESCRIPTION="A terminal anywhere." HOMEPAGE="http://anyterm.org/" SRC_URI="http://anyterm.org/download/${P}.tbz2" - LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" -IUSE="pam ssl opera" -DEPEND=" - dev-libs/boost - >=dev-libs/rote-0.2.8 - >=sys-devel/gcc-3 - virtual/ssh - pam? ( net-www/mod_auth_pam ) - " +IUSE="opera pam ssl" + +DEPEND="dev-libs/boost + >=dev-libs/rote-0.2.8 + >=sys-devel/gcc-3 + virtual/ssh + pam? ( net-www/mod_auth_pam )" RDEPEND="${DEPEND}" APACHE2_MOD_CONF="50_${PN}" APACHE2_MOD_DEFINE="ANYTERM" -useq ssl && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} -D SSL" -useq pam && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} -D AUTH_PAM" -APACHE2_MOD_FILE="${S}/apachemod/.libs/anyterm.so" +use pam && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} -D AUTH_PAM" +use ssl && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} -D SSL" +APACHE2_MOD_FILE="${S}/apachemod/.libs/${PN}.so" DOCFILES="CHANGELOG README" WEBAPP_MANUAL_SLOT="yes" @@ -46,25 +45,25 @@ pkg_setup() { src_unpack() { unpack ${A} - epatch ${FILESDIR}/${P}-apachemod-Makefile.patch - epatch ${FILESDIR}/${P}-common-extern.patch - epatch ${FILESDIR}/${P}-browser-gentoo.patch + epatch "${FILESDIR}/${P}-apachemod-Makefile.patch" + epatch "${FILESDIR}/${P}-common-extern.patch" + epatch "${FILESDIR}/${P}-browser-gentoo.patch" # The bundled libpbe causes lots of problems because it links to various # assorted packages, without any checks. These packages may or not be # installed. Here we disable all packages which are not required. - epatch ${FILESDIR}/${P}-libpbe-no-pg_config.patch - for f in Database Recoder jpegsize; do - rm ${S}/libpbe/src/${f}.{cc,hh} + epatch "${FILESDIR}/${P}-libpbe-no-pg_config.patch" + for f in Database Recoder jpegsize ; do + rm -f "${S}"/libpbe/src/${f}.{cc,hh} done } src_compile() { - ( cd apachemod && emake CC=$(tc-getCC) CXX=$(tc-getCXX) ) || die + ( cd apachemod && emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ) || die "Apachemod make failed" # Modify browser files to reflect USE flags. - for flag in ssl pam opera; do - if use ${flag}; then + for flag in opera pam ssl ; do + if use ${flag} ; then sed -i -e "s/^#USE=${flag}#//" browser/{*,.htaccess} sed -i -e "/^#USE=-${flag}#/D" browser/{*,.htaccess} else @@ -78,8 +77,8 @@ src_install() { apache-module_src_install webapp_src_preinst - cp browser/{*,.htaccess} ${D}/${MY_HTDOCSDIR} - webapp_postinst_txt en ${FILESDIR}/${P}-postinst-en.txt + cp -f browser/{*,.htaccess} "${D}/${MY_HTDOCSDIR}" + webapp_postinst_txt en "${FILESDIR}/${P}-postinst-en.txt" webapp_src_install } @@ -88,18 +87,18 @@ pkg_postinst() { apache-module_pkg_postinst - if ! use ssl; then + if ! use ssl ; then ewarn "USE=-ssl: Anyterm without SSL is very insecure!" fi - if ! use pam; then + if ! use pam ; then ewarn "USE=-pam: You will have to add your own authentication" ewarn " mechanism." fi - if use opera; then - ewarn "USE=opera: Be sure to disable some logging in your apache" + if use opera ; then + ewarn "USE=opera: Be sure to disable some logging in your Apache" ewarn " configuration files!" fi - if ! use ssl || ! use pam || use opera; then + if ! use ssl || ! use pam || use opera ; then ewarn "For more information see http://anyterm.org/security.html" fi } diff --git a/www-apache/anyterm/files/digest-anyterm-1.1.8-r2 b/www-apache/anyterm/files/digest-anyterm-1.1.8-r2 index 5aa11d832d47..d95bbe335179 100644 --- a/www-apache/anyterm/files/digest-anyterm-1.1.8-r2 +++ b/www-apache/anyterm/files/digest-anyterm-1.1.8-r2 @@ -1 +1,3 @@ MD5 5ad8d6127680122e8f5c45f39093bd58 anyterm-1.1.8.tbz2 75137 +RMD160 8e2ba675b0697214579524a19d10bc7791a4834e anyterm-1.1.8.tbz2 75137 +SHA256 06c3896597cc9353c3d1fdcd33aab071f31b5fe7305561ba03372feeb92913ff anyterm-1.1.8.tbz2 75137 diff --git a/www-apache/anyterm/metadata.xml b/www-apache/anyterm/metadata.xml index d9bb4626fb2b..f5e00e0d0d9b 100644 --- a/www-apache/anyterm/metadata.xml +++ b/www-apache/anyterm/metadata.xml @@ -1,9 +1,9 @@ -no-herd - - twp@gentoo.org - Tom Payne - + apache + + twp@gentoo.org + Tom Payne +