Fix small-scale use flag - bug #378075 and pid file permissions.

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 26 insertions, 30 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 3e2794094a07..91bf9e25fcbc 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.134 2011/08/06 10:16:52 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.135 2011/08/07 14:49:51 eras Exp $
+
+  07 Aug 2011; Eray Aslan <eras@gentoo.org> dspam-3.10.0-r1.ebuild:
+  Fix small-scale use flag - bug #378075
 
 *dspam-3.10.0-r1 (06 Aug 2011)
 
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 8d7d2a7e5d05..2c4b2f251d6a 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -6,7 +6,7 @@ AUX README.qmail 2317 RMD160 ebdd90be77441540848caf39b6fcde3d332b2b93 SHA1 081b2
 AUX dspam.confd 299 RMD160 f53e474d51912b00ccf4876a20071814d2066364 SHA1 cde7c587dcf94174568d538cd55188bf5916de16 SHA256 fdc691c71a2518c13f61aa44159f1318b03ba4f9ca004a3f38c3c95ba6f02e63
 AUX dspam.cron-r3 9269 RMD160 8063c0d0b5a7150a4aa9ba98e62795adca154e20 SHA1 6c1657aefc2a2e391a20c19ffc82475f88d39515 SHA256 e6a1a4194818a6ede5065979227b6b092ef2bea26cad6767f41de1a1952c840d
 AUX dspam.cron-r4 160 RMD160 cd633a4a72ecae12ad70faf8d0ae486bba1fbe6e SHA1 0b620d69451b52968389c6e83d5a904d38299cc1 SHA256 ef59ea37a272b3d044a59fc1f30d1c60087e15d5735ba961cc57458cc5026aca
-AUX dspam.initd 957 RMD160 6f9f14b0eebadd8cfaea43cb6e68f6a3f93dd9ed SHA1 497f274d7377d4f44082efa347bffa18ca007a51 SHA256 b5a7d772a7e261959c421b36204322bbd3a2eb6fe03d555c7c8e13fb7b541c63
+AUX dspam.initd 957 RMD160 a002760dea3d8e76bc0699ab054b5dabe077d006 SHA1 05b321949337e1213c6a87704cf2381009e6eb50 SHA256 63525106987447d87c5116c194918ee7402db91d7c5325910fe5470b889b8681
 AUX dspam.logrotate 180 RMD160 56ba31d0bf4558dd0b3b6bda247050bd2cbcc18e SHA1 94a988258efad37d51604769b0336c27e1aa3b31 SHA256 17285ab0e624ec52124e8f661649ac9549c00e91a2f8d0d6d9de4eabf273d582
 AUX dspam.rc 1025 RMD160 d223977cf390b1e89392462f06b31b0722810fa3 SHA1 6b243ffac8179120ed7ee6f4b24bf01ad3a511f0 SHA256 9726e4b7699ccbb305d5e161baec2010e115731e582f69c3c670ec36bb099d34
 AUX logrotate.dspam 155 RMD160 17e0f5401843ccac1d349b938b1e9b755f847108 SHA1 7462edc16642aa3b43263f8a7ce093de7f4a2ade SHA256 dd5bce638b92936e02ff02faf781cbf903faac7b73c61c1c666eb06cfb56bfac
@@ -16,25 +16,25 @@ DIST dspam-3.10.0.tar.gz 1027188 RMD160 87c0ea034557a1fce47a5b9e2c8ae0154b5dbb81
 DIST dspam-3.8.0-patches-20091202.tar.gz 16009 RMD160 7dfff3091f4c8ccdd8feda0af8292c5b755e76e2 SHA1 e836d49679e07659775756cd504142d8d194a9b8 SHA256 c72f7e624ceafcf43f0402430eaeaaa47c7a1507192e696dadbc7f0957ca5d5b
 DIST dspam-3.8.0.tar.gz 726160 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 SHA1 d1de7ee2134522adaf52f49167accecf1589fa96 SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7
 DIST dspam_sa_trainer.tar.gz 1230 RMD160 c3d0fca7169d23ecf9d44c850ee255b42d97d818 SHA1 71a002f26a888bdfe47759cf1f780cd6478dacac SHA256 8fb6b1ebe592acf00a028737ef8e174544af166768b987d29048b2319bc5a215
-EBUILD dspam-3.10.0-r1.ebuild 6077 RMD160 ec446e07f1a1fa8bd384b70fc81d26d21f13bcf6 SHA1 1a7b111da5f1136cbbd7056d596cea7a07e86df6 SHA256 24e388e5c2529590a0acf1f611f630e0269bd0a7ccb17041472e440b30ee850d
+EBUILD dspam-3.10.0-r1.ebuild 5908 RMD160 29a67f5fac8ef1c6c1c5787a7a1b1633ee9d629b SHA1 b418139c23bf1aa3bd086f5e962e09d5f37b5fce SHA256 48f3926b64ad9a6e1f9e236bcc327350601eba0385203cf0dd9e6c5e8584fc82
 EBUILD dspam-3.10.0.ebuild 6153 RMD160 6bf5922ab9822aad7acab4c927e6b71cdae57e04 SHA1 a181b49c423a901d93ef89d605fbb6bd3d3ede63 SHA256 35c85a297f2740e07ba6a4a91d5ad4b4b5bd39afaf4d580d5f33a32752813bf2
 EBUILD dspam-3.8.0-r15.ebuild 19692 RMD160 dbfc9ae12e751cc0ade8608f3073c284fd6f7fe4 SHA1 3beff2e7820d8a3a7e35d2ca871e042d8fc0c100 SHA256 6002f6e9db1e6e2de4296596297e7ea91d59b7090652d428df53301737fcd4a7
-MISC ChangeLog 23263 RMD160 9defb6ae40bb1c80b23ff7dfdffd0b0763a70bd0 SHA1 bd49de4f612e2589fe3f9d7887d10b9bc57440c5 SHA256 5d5abaac4381b1b456386c4673db21e2e3d0a650490f02d57acd569d62430a98
+MISC ChangeLog 23373 RMD160 80fd240a0bc8484b8c97f26c7bd5eca15fab23b4 SHA1 0ae9afe84aea395116d5cabef8c90f9d8e315e79 SHA256 18568e45de3a9751f7a47f6570b15b295c92ed655eab899861079f20eedda5b8
 MISC metadata.xml 1429 RMD160 40b71e8574ed33364dd81fae8f6f510c9dadbe5f SHA1 727dcfbe77e781fb4ad6b45837d70acace16e4bb SHA256 797884e76db42660b78b292db1436cf3154c74cd71a891ea482f9a68264d1560
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOPRSkAAoJEHfx8XVYajsfEtIQAKPX6zk0dOBQ2JsrQCM2FOpY
-MtzCxPpvD1SE+JsfSUbSIbmhQtZ1S3x8pAoz4A/F1GJGmM0sgDg1izRBeIxaI8Hc
-QdgpPqq8ccuss6iwqrNJXjtTy5L+t8kBuTkD43Q1ZyCl4/aKRaykwVMiVHqzqQWz
-5vpR0d97Rs4QImAd0Om/XuN2+FlLIp38Zs3gtYYD7FfiWObtYCcJjX1k6FGMdjD1
-UEfdMjNugPLXM66kEtS4wvOt8ePmYT/lJ97jY6w32MYvyORvMOBlJzcIiiV7YQTW
-PRDP63ObkQ9zAunxYKi3m72ONl9i+P77qiU64RuFLdc3qEgtkRzjxGD1Z1d0jaLi
-fBq/hbtmuar4zqgn28+XIpH7FXFHsLqXZxdHMJDHloUbE4zwHvYPPnpMVyYUrwj1
-/+8zPCKBqx9iyydOiamgVTB/sTUtbijMFvYfMP8jUiejxfRONR2guzgMFQPrbokk
-uQNA8sViHfk8u14cGoioFs3253rIR+xRJ/qn8bienr82TlvruSjRNejkBFGDYkS1
-AtZbcT77NZ2f1/I4SCS+rnLg21hy/U4i76Yh+SSivHjkcogenHjcNMu+0MkL8ANm
-IrSa3/uYEa8NCiy1YL8qjHIWhwcpks89ilJlXkry9Ek2CaYaJlSrL/z/nSsN1XO7
-UCAo4jzzYZjhHTyyEYb8
-=CmSl
+iQIcBAEBCAAGBQJOPqYdAAoJEHfx8XVYajsfKe4P/3SN/LjTO4AVrJzegkhL9tGH
+CyT6QX2S4A76b49pH4S8HXMFHHcWxaH+mbfuNE9I+x2A3DDUsfYvyzjfvcB0PtCU
+GLl9c81smn30teSB3Gb7pBUSH9mUANXfkLqnJ6UabGb9pVVeEyLDO/Pf7jddfeL+
+degRqt7oJwnOVyV7SQ5oe8iyR893Gqwrv4auqaICOSi9m2gMx0KLvu2V1gIbXJaO
+odep7qKZEflra2WtRbhRpZcyk6ylVg3p/wx8KFD8ikhCHR4fpRnKYKIEd1JXvJes
+/ldePN02t1Iow+bV/cwxAeIwfG4KvF1jp2OutfdeZIPXoXgFKJbYZqye6TDEEIU+
+nIQjkTZPdlhcBSK5PQcJwoLrLzrdfCSzl1FK33ROR5Oge5/eOnEdC6g0B917cGO2
+ErNWZoUbzkKysTGxtujYCW2EfsunfKL1Sm/QUFktzZhkowkCpFgRJRItFxdRU0w8
+V2iw0tRs8samz9jYSLvc9ts2Cb44ECV/kxOaj6CyZ5M8Vdh1rBqhm2J8PGDOYy+/
+DZ7XfzNVYMiuzE/E+sgNNFAyTvoyl95ZZXA5J5dzn+ZHwHp3JuUDrV6QoG36hOjN
+aDhXTKdTR4TXTkXOPIN9hRC+wutx0WgWNFb8ntnK4QYbDEeCFZHgQyKr290VxJar
+lNqgmYvffi7DWrP4tLPO
+=6eQQ
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/dspam-3.10.0-r1.ebuild b/mail-filter/dspam/dspam-3.10.0-r1.ebuild
index 6f8f14e1196a..22c2416e703b 100644
--- a/mail-filter/dspam/dspam-3.10.0-r1.ebuild
+++ b/mail-filter/dspam/dspam-3.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.0-r1.ebuild,v 1.1 2011/08/06 10:16:52 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.0-r1.ebuild,v 1.2 2011/08/07 14:49:51 eras Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 DRIVERS_IUSE="+hash mysql postgres sqlite"
-SCALES_IUSE="+small-scale domain-scale large-scale"
+SCALES_IUSE="small-scale +domain-scale large-scale"
 IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
 
 DEPEND="
@@ -32,7 +32,7 @@ RDEPEND="
 # Demands on sane USE flags:
 # - find out what driver to use: select at least one
 # - if static-libs is set, only one driver may be selected
-# - find out what scale to use: choose at most one
+# - find out what scale to use: select exactly one
 # - user-homedirs does not work with virtual-users
 # - virtual-users does not work with hash or sqlite
 REQUIRED_USE="
@@ -61,12 +61,6 @@ pkg_setup() {
 }
 
 src_configure() {
-	local myconf=""
-	if ! use large-scale && ! use domain-scale ; then
-		# default to domain-scale
-		myconf="--disable-large-scale --enable-domain-scale"
-	fi
-
 	econf \
 	--sysconfdir=${DSPAM_CONF} \
 	--with-dspam-home=${DSPAM_HOME} \
@@ -90,8 +84,7 @@ src_configure() {
 	$(use_enable virtual-users) \
 	--with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
 	$(use mysql || use postgres && echo "--enable-preferences-extension") \
-	$(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log") \
-	${myconf}
+	$(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log")
 }
 
 dspam_setup_user() {
diff --git a/mail-filter/dspam/files/dspam.initd b/mail-filter/dspam/files/dspam.initd
index b0e05ae28df8..c590fde45a63 100644
--- a/mail-filter/dspam/files/dspam.initd
+++ b/mail-filter/dspam/files/dspam.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/files/dspam.initd,v 1.1 2011/08/05 06:42:42 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/files/dspam.initd,v 1.2 2011/08/07 14:49:51 eras Exp $
 
 opts="${opts} reload"
 PIDFILE=${PID_FILE:-/var/run/dspam/dspam.pid}
@@ -16,7 +16,7 @@ checkconfig() {
 	local PIDDIR
 	PIDDIR=${PIDFILE%/*}
 	if [ ! -d "${PIDDIR:-/var/run/dspam}" ]; then
-		checkpath -q -d -o dspam:dspam -m 0770 "${PIDDIR}" || return 1
+		checkpath -q -d -o dspam:dspam -m 0755 "${PIDDIR}" || return 1
 	fi
 }