From 46eeeaf1452cf738e4859fd9425930620c999114 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Tue, 19 Dec 2006 10:00:29 +0000 Subject: [PATCH] Remove obsolete version. Add postinst warning about cgi-bin ownership. Fix configuration autodetection in cgi scripts. Package-Manager: portage-2.1.1-r2 --- www-apps/dspam-web/Manifest | 51 +++--- www-apps/dspam-web/dspam-web-3.6.4.ebuild | 160 ------------------ www-apps/dspam-web/dspam-web-3.6.8.ebuild | 64 ------- .../dspam-web/files/digest-dspam-web-3.6.4 | 6 - .../dspam-web/files/digest-dspam-web-3.6.8 | 6 - 5 files changed, 26 insertions(+), 261 deletions(-) delete mode 100644 www-apps/dspam-web/dspam-web-3.6.4.ebuild delete mode 100644 www-apps/dspam-web/dspam-web-3.6.8.ebuild delete mode 100644 www-apps/dspam-web/files/digest-dspam-web-3.6.4 delete mode 100644 www-apps/dspam-web/files/digest-dspam-web-3.6.8 diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest index f99e1ef02bc3..d5c8097b3a21 100644 --- a/www-apps/dspam-web/Manifest +++ b/www-apps/dspam-web/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX htaccess 135 RMD160 4f79db8e1bdf56ef86b922d2a87a7c2a1ba78d71 SHA1 f1cdf9aa23cef60ccc48f2303699b467bf7a98b5 SHA256 e0c0da58eea5ef6af65cc03c22eaa47ad4f6584cec0f6430817f836d60457c3b MD5 ffdfc8d816078f4c58b75b9bed07503f files/htaccess 135 RMD160 4f79db8e1bdf56ef86b922d2a87a7c2a1ba78d71 files/htaccess 135 @@ -6,37 +9,35 @@ AUX htpasswd 19 RMD160 9ef909dbde45fd311062229354ba56c76174fa96 SHA1 d5e26992468 MD5 b4099a94a52af9abd4ade48d82914c3c files/htpasswd 19 RMD160 9ef909dbde45fd311062229354ba56c76174fa96 files/htpasswd 19 SHA256 0fae2fe609644c4c631385e0f4127bb1a19dcf18013871c8353117f38fa7ea2a files/htpasswd 19 -AUX postinst-en.txt 933 RMD160 9b857c29753403944e7fb76147c07645c6c3aa76 SHA1 c31ab3f3505f50eb08a6436d9e2dd3b592ddbe98 SHA256 997a7ca9295cd82cc7a70ba99a411abb52765e929800260d43499307f9958288 -MD5 cb22b2a146edb15c93a8f9ed59e08987 files/postinst-en.txt 933 -RMD160 9b857c29753403944e7fb76147c07645c6c3aa76 files/postinst-en.txt 933 -SHA256 997a7ca9295cd82cc7a70ba99a411abb52765e929800260d43499307f9958288 files/postinst-en.txt 933 +AUX postinst-en.txt 935 RMD160 8ac16b059581ac3d4a8f6adb28cbba7fd185671f SHA1 4f5914e32d216cee1a97d806c29569f93e847f21 SHA256 9d864da422c9e28e8ac645a2534af7a885d22ff4b49e5b7ef938e8bb84ea81dc +MD5 5ee979e10569f4b79896beeef5f28f58 files/postinst-en.txt 935 +RMD160 8ac16b059581ac3d4a8f6adb28cbba7fd185671f files/postinst-en.txt 935 +SHA256 9d864da422c9e28e8ac645a2534af7a885d22ff4b49e5b7ef938e8bb84ea81dc files/postinst-en.txt 935 AUX setperms 255 RMD160 4b29c87a2d1129c9aa9a7df9e2a6f412aeb029c8 SHA1 17f1bab63693018be6dbbb4ec7e4d1a5658f9fac SHA256 85cfd1a8a6e322698c5e09573dfb4e04220e8642d1835e9a7eedbb809736e9ed MD5 355cfc338e3f9e912ea954471b0bb458 files/setperms 255 RMD160 4b29c87a2d1129c9aa9a7df9e2a6f412aeb029c8 files/setperms 255 SHA256 85cfd1a8a6e322698c5e09573dfb4e04220e8642d1835e9a7eedbb809736e9ed files/setperms 255 -DIST dspam-3.6.4.tar.gz 743664 RMD160 fcd431205e3fd737cfdfb90b695ba7c84bbb27d5 SHA1 bc11d8c1584175de9cdeed7ed20e11c2a49bf53a SHA256 bdb10acbff97483db8ef7aafee8ba2e9113f6b7d5fc76cf569334b32937ca304 -DIST dspam-3.6.8-patches-20061029.tar.gz 5030 RMD160 cfc2d2c8f896b1e17b8ceed2f51d2c74640e3a58 SHA1 b9cc608c9b111ada584a1a09c72b37b28c6dd823 SHA256 841e93b6347dd3f96f536e9fab3717b5b1c7aa21f0acf04f524fe4c1bb8e903a +DIST dspam-3.6.8-patches-20061219.tar.gz 5370 RMD160 0347a618b63b9fe662838f888f84b705bd24c72a SHA1 a998c131ef763efb32c6f538188de987ec544dc9 SHA256 cdd43862d939e089052bf0fde9e85f7a6b056a441d2d54ff4f3b8bb016f0de4c DIST dspam-3.6.8.tar.gz 743275 RMD160 93a70db14070cb61bd2ef1b0ca55a18be1dbfd7b SHA1 e8c413882eadf1e02837e4a2ffcfc98b801eded1 SHA256 88c7b41fb81e90ba8a260885a1d14bce39f2ef4a06cc2c6b8bfa0b99ba1aec34 -DIST dspam_sa_trainer.tar.gz 1230 RMD160 c3d0fca7169d23ecf9d44c850ee255b42d97d818 SHA1 71a002f26a888bdfe47759cf1f780cd6478dacac SHA256 8fb6b1ebe592acf00a028737ef8e174544af166768b987d29048b2319bc5a215 -EBUILD dspam-web-3.6.4.ebuild 5283 RMD160 52f67d8465bf85161b74f27791bbfad68b8b4ac6 SHA1 4f065d836c66b3ba8da361a441cebde11b2dbff7 SHA256 53117c0447656b2484da9d8ce2339c6100cea1f85330141cf4930ae47f749916 -MD5 0b6678de0797dac88999bbc6cdc37301 dspam-web-3.6.4.ebuild 5283 -RMD160 52f67d8465bf85161b74f27791bbfad68b8b4ac6 dspam-web-3.6.4.ebuild 5283 -SHA256 53117c0447656b2484da9d8ce2339c6100cea1f85330141cf4930ae47f749916 dspam-web-3.6.4.ebuild 5283 -EBUILD dspam-web-3.6.8.ebuild 1488 RMD160 32dc4d1f30527aea19271cc359a7c55f39da540a SHA1 e202ffc28f3bd093f461b2639c45af84fbf883a7 SHA256 2a5a20ee4a831110ae39a916a2849ef52f212d4a3fc1141c591a3ce8770fc155 -MD5 0cf0e2fbd8422c526110de5b0f9d22e7 dspam-web-3.6.8.ebuild 1488 -RMD160 32dc4d1f30527aea19271cc359a7c55f39da540a dspam-web-3.6.8.ebuild 1488 -SHA256 2a5a20ee4a831110ae39a916a2849ef52f212d4a3fc1141c591a3ce8770fc155 dspam-web-3.6.8.ebuild 1488 -MISC ChangeLog 4497 RMD160 8fb09bc55736117efcb6be1d136f022b17919a46 SHA1 fc447d5141aa507c21fa65f3d1396df8670186ee SHA256 f0790719dcb2f6fd067db2be16eb9d43c966ff33817cd03fc966d2ce76d05829 -MD5 6dbd9322d0cac677979fc0862b8de94c ChangeLog 4497 -RMD160 8fb09bc55736117efcb6be1d136f022b17919a46 ChangeLog 4497 -SHA256 f0790719dcb2f6fd067db2be16eb9d43c966ff33817cd03fc966d2ce76d05829 ChangeLog 4497 +EBUILD dspam-web-3.6.8-r1.ebuild 2039 RMD160 5931d91339c2b094fcfaadea284db8859285eea4 SHA1 dffd6cc9a0372b3c9516ac57615d75d74b9bf393 SHA256 d71627c79457706b868985083496bf016ac399d536b7c31c993877922a5a00ad +MD5 5e542cc9ef833351fdeff7ac2b343b60 dspam-web-3.6.8-r1.ebuild 2039 +RMD160 5931d91339c2b094fcfaadea284db8859285eea4 dspam-web-3.6.8-r1.ebuild 2039 +SHA256 d71627c79457706b868985083496bf016ac399d536b7c31c993877922a5a00ad dspam-web-3.6.8-r1.ebuild 2039 +MISC ChangeLog 4811 RMD160 8a42406c8cb25076452fd8ff7ae4cd302075e071 SHA1 5cba7f133bf9679b974cd62ae4e6e30c02fa0d74 SHA256 fbe4673552783d7022a03678ac04df84ec082079ab07748576a860a4391b5ad4 +MD5 b8aada74a3111fde82c5e7db72208097 ChangeLog 4811 +RMD160 8a42406c8cb25076452fd8ff7ae4cd302075e071 ChangeLog 4811 +SHA256 fbe4673552783d7022a03678ac04df84ec082079ab07748576a860a4391b5ad4 ChangeLog 4811 MISC metadata.xml 430 RMD160 6fa735da9fcd312590517721dda5edd4ab35cdcc SHA1 6da347cad0bca1abe943e6bf0ce78ccfeaa112d4 SHA256 26a30308c5e734031a73875e8bd5c8e0e3f55f3b171638e5cd793542db4f9d83 MD5 bafc2acde9ac4dc56148b6e52928ee37 metadata.xml 430 RMD160 6fa735da9fcd312590517721dda5edd4ab35cdcc metadata.xml 430 SHA256 26a30308c5e734031a73875e8bd5c8e0e3f55f3b171638e5cd793542db4f9d83 metadata.xml 430 -MD5 7581683a18b328f3fa07b2904787e0bd files/digest-dspam-web-3.6.4 479 -RMD160 9ef62154897f5cdcd28c2ab1f04ccad9f19b8967 files/digest-dspam-web-3.6.4 479 -SHA256 af3f77afae9380d52f6f7910135aad0fda7b9c080b6ce9f88919abee9247d421 files/digest-dspam-web-3.6.4 479 -MD5 04c15c2b7159970b8dc3c3065ef7cf65 files/digest-dspam-web-3.6.8 515 -RMD160 14dee357234e1f88207fb04e4157136fcbd65d10 files/digest-dspam-web-3.6.8 515 -SHA256 2794a7da0abf546a484955d92450c1f29872252dbcfc02f9895ce60e13dfd863 files/digest-dspam-web-3.6.8 515 +MD5 f6c1e7cd08fce2a07170af163f8381f0 files/digest-dspam-web-3.6.8-r1 515 +RMD160 d85a5beb425a0065a96614746ba4bc29950f1c9a files/digest-dspam-web-3.6.8-r1 515 +SHA256 86f6bad1bd99c4b4fbf80a71c56cc57dbce789331dc914d203ee01b884348f08 files/digest-dspam-web-3.6.8-r1 515 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFh7g43sf9c6kjmR8RAlp0AJ9owAAR7kHgFBgHvLxbDgUUFb3b/QCfV0gy +9jIE9cGQrrAtinHBISf1hJ4= +=LtfY +-----END PGP SIGNATURE----- diff --git a/www-apps/dspam-web/dspam-web-3.6.4.ebuild b/www-apps/dspam-web/dspam-web-3.6.4.ebuild deleted file mode 100644 index f816acc2ac47..000000000000 --- a/www-apps/dspam-web/dspam-web-3.6.4.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.6.4.ebuild,v 1.3 2006/11/23 16:36:21 vivo Exp $ - -inherit webapp eutils - -MY_PN=${PN/-web/} -MY_P=${MY_PN}-${PV} - -S=${WORKDIR}/${MY_P} -DESCRIPTION="Web based administration and user controls for dspam" -SRC_URI="http://dspam.nuclearelephant.com/sources/${MY_P}.tar.gz - http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz" -HOMEPAGE="http://dspam.nuclearelephant.com/" -LICENSE="GPL-2" - -IUSE="clamav debug large-domain ldap logrotate mysql neural oci8 postgres sqlite virtual-users" -DEPEND=">=mail-filter/dspam-${PV} - clamav? ( >=app-antivirus/clamav-0.86 ) - ldap? ( >=net-nds/openldap-2.2 ) - mysql? ( virtual/mysql ) - sqlite? ( dev-db/sqlite ) - postgres? ( >=dev-db/postgresql-7.4.3 ) - >=sys-libs/db-4.0 - >=net-www/apache-1.3 - >=dev-lang/perl-5.8.2 - >=dev-perl/GD-2.0 - dev-perl/GD-Graph3d - dev-perl/GDGraph - dev-perl/GDTextUtil" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -# some FHS-like structure -HOMEDIR="/var/spool/dspam" -CONFDIR="/etc/mail/dspam" -LOGDIR="/var/log/dspam" - -src_compile() { - local myconf - - myconf="${myconf} --enable-long-username" - myconf="${myconf} --with-delivery-agent=/usr/bin/procmail" - use large-domain && myconf="${myconf} --enable-large-scale" ||\ - myconf="${myconf} --enable-domain-scale" - - myconf="${myconf} --with-dspam-home=${HOMEDIR}" - myconf="${myconf} --sysconfdir=${CONFDIR}" - use virtual-users || myconf="${myconf} --enable-homedir" - use clamav || myconf="${myconf} --enable-clamav" - use ldap && myconf="${myconf} --enable-ldap" - - # enables support for debugging (touch /etc/dspam/.debug to turn on) - # optional: even MORE debugging output, use with extreme caution! - use debug && myconf="${myconf} --enable-debug --enable-verbose-debug --enable-bnr-debug" - - # select storage driver - if use sqlite ; then - myconf="${myconf} --with-storage-driver=sqlite_drv" - myconf="${myconf} --enable-virtual-users" - elif use mysql; then - myconf="${myconf} --with-storage-driver=mysql_drv" - myconf="${myconf} --with-mysql-includes=/usr/include/mysql" - myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql" - myconf="${myconf} --enable-preferences-extension" - - if has_version ">sys-kernel/linux-headers-2.6"; then - myconf="${myconf} --enable-daemon" - fi - - use virtual-users && myconf="${myconf} --enable-virtual-users" - # an experimental feature available with MySQL and PgSQL backend - use neural && myconf="${myconf} --enable-neural-networking" - elif use postgres ; then - myconf="${myconf} --with-storage-driver=pgsql_drv" - myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql" - myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql" - myconf="${myconf} --enable-preferences-extension" - - if has_version ">sys-kernel/linux-headers-2.6"; then - myconf="${myconf} --enable-daemon" - fi - - use virtual-users && myconf="${myconf} --enable-virtual-users" - # an experimental feature available with MySQL and PgSQL backend - use neural && myconf="${myconf} --enable-neural-networking" - elif use oci8 ; then - myconf="${myconf} --with-storage-driver=ora_drv" - myconf="${myconf} --with-oracle-home=${ORACLE_HOME}" - myconf="${myconf} --enable-virtual-users" - - # I am in no way a Oracle specialist. If someone knows - # how to query the version of Oracle, then let me know. - if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1); then - myconf="${myconf} --with-oracle-version=10" - fi - else - myconf="${myconf} --with-storage-driver=libdb4_drv" - fi - - econf ${myconf} || die - cd ${S}/webui - make -} - -src_install () { - cd ${S}/webui - webapp_src_preinst - - sed -e 's,/var/dspam,/etc/mail/dspam,' \ - -e 's,/usr/local,/usr,' \ - -i ${S}/webui/cgi-bin/admin.cgi - sed -e 's,/var/dspam,/etc/mail/dspam,' \ - -e 's,/usr/local,/usr,' \ - -i ${S}/webui/cgi-bin/dspam.cgi - - cp -r ${S}/webui/htdocs/* ${D}/${MY_HTDOCSDIR} || die - cp -r ${S}/webui/cgi-bin/* ${D}/${MY_CGIBINDIR} || die - insinto ${MY_HTDOCSDIR} - insopts -m644 -o apache -g apache - - newins ${FILESDIR}/htaccess .htaccess - newins ${FILESDIR}/htpasswd .htpasswd - - #All files must be owned by server - cd ${D}/${MY_HTDOCSDIR} - for file in `find -type d -printf "%p/* "`; do - webapp_serverowned "${MY_HTDOCSDIR}/${file}" - done - - #All files must be owned by server - cd ${D}/${MY_CGIBINDIR} - for file in `find -type d -printf "%p/* "`; do - webapp_serverowned "${MY_CGIBINDIR}/${file}" - done - - webapp_src_install -} - -pkg_config () { - # add apache to the dspam group so the CGIs can access the data - - local groups - groups=`groups apache` - groups=`echo ${groups} | sed -e 's/ /,/g'` - usermod -G "${groups},dspam" apache -} - -pkg_postinst () { - einfo "The CGIs need to be executed as group dspam in order to write" - einfo "to the dspam data directory. You will need to configure apache" - einfo "manually to do this. Another option is to add the user apache" - einfo "to the dspam group. You can do this automatically by running:" - echo - einfo "emerge --config ${PF}" - echo - einfo "This app requires basic auth in order to operate properly." - einfo "You will need to add dspam users to the .htpasswd file or" - einfo "configure a different authentication mechanism for the user" - einfo "accounts." -} diff --git a/www-apps/dspam-web/dspam-web-3.6.8.ebuild b/www-apps/dspam-web/dspam-web-3.6.8.ebuild deleted file mode 100644 index e43cc9200554..000000000000 --- a/www-apps/dspam-web/dspam-web-3.6.8.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.6.8.ebuild,v 1.1 2006/10/29 18:16:13 mrness Exp $ - -inherit webapp eutils autotools - -DESCRIPTION="Web based administration and user controls for dspam" -HOMEPAGE="http://dspam.nuclearelephant.com/" -SRC_URI="http://dspam.nuclearelephant.com/sources/dspam-${PV}.tar.gz - mirror://gentoo/dspam-${PV}-patches-20061029.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" - -DEPEND=">=mail-filter/dspam-${PV}" -RDEPEND="${DEPEND} - >=dev-perl/GD-2.0 - dev-perl/GD-Graph3d - dev-perl/GDGraph - dev-perl/GDTextUtil" - -# some FHS-like structure -HOMEDIR="/var/spool/dspam" -CONFDIR="/etc/mail/dspam" - -S="${WORKDIR}/dspam-${PV}" - -src_unpack() { - unpack ${A} - cd "${S}" - - EPATCH_SUFFIX="patch" - epatch "${WORKDIR}"/patches - - AT_M4DIR="${S}/m4" - eautoreconf -} - -src_compile() { - econf \ - --with-dspam-home=${HOMEDIR} \ - --sysconfdir=${CONFDIR} || die "econf failed" - cd "${S}/webui" - emake || die "emake failed" -} - -src_install () { - webapp_src_preinst - - cd "${S}/webui" - insinto "${MY_HTDOCSDIR}" - insopts -m644 - doins htdocs/*.{css,gif} - insinto "${MY_CGIBINDIR}/templates" - doins cgi-bin/templates/*.html - insinto "${MY_CGIBINDIR}" - doins cgi-bin/{admins,configure.pl,default.prefs,rgb.txt,*.cgi} - - webapp_hook_script "${FILESDIR}/setperms" - webapp_postinst_txt en "${FILESDIR}/postinst-en.txt" - - webapp_src_install -} diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.6.4 b/www-apps/dspam-web/files/digest-dspam-web-3.6.4 deleted file mode 100644 index b8dc57612d69..000000000000 --- a/www-apps/dspam-web/files/digest-dspam-web-3.6.4 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 e9fdb00a23a99e05c9e4c22aa8aa3655 dspam-3.6.4.tar.gz 743664 -RMD160 fcd431205e3fd737cfdfb90b695ba7c84bbb27d5 dspam-3.6.4.tar.gz 743664 -SHA256 bdb10acbff97483db8ef7aafee8ba2e9113f6b7d5fc76cf569334b32937ca304 dspam-3.6.4.tar.gz 743664 -MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230 -RMD160 c3d0fca7169d23ecf9d44c850ee255b42d97d818 dspam_sa_trainer.tar.gz 1230 -SHA256 8fb6b1ebe592acf00a028737ef8e174544af166768b987d29048b2319bc5a215 dspam_sa_trainer.tar.gz 1230 diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.6.8 b/www-apps/dspam-web/files/digest-dspam-web-3.6.8 deleted file mode 100644 index d6f8d22a7ebd..000000000000 --- a/www-apps/dspam-web/files/digest-dspam-web-3.6.8 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 1111971fe18d1cd9c8117870f7363b78 dspam-3.6.8-patches-20061029.tar.gz 5030 -RMD160 cfc2d2c8f896b1e17b8ceed2f51d2c74640e3a58 dspam-3.6.8-patches-20061029.tar.gz 5030 -SHA256 841e93b6347dd3f96f536e9fab3717b5b1c7aa21f0acf04f524fe4c1bb8e903a dspam-3.6.8-patches-20061029.tar.gz 5030 -MD5 c4b1a7079690ee16d8b0f36b2a2a90a4 dspam-3.6.8.tar.gz 743275 -RMD160 93a70db14070cb61bd2ef1b0ca55a18be1dbfd7b dspam-3.6.8.tar.gz 743275 -SHA256 88c7b41fb81e90ba8a260885a1d14bce39f2ef4a06cc2c6b8bfa0b99ba1aec34 dspam-3.6.8.tar.gz 743275 -- 2.26.2