summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2012-01-06 11:38:35 +0000
committerEray Aslan <eras@gentoo.org>2012-01-06 11:38:35 +0000
commit33ba45a8c0448db6f4adc0e1dd41c21ac6d68034 (patch)
treeb9cceddcc278e896749897cd5daf2704bd7abeb9 /mail-filter/amavisd-new
parentdev-java/netbeans-profiler: version bump (diff)
downloadhistorical-33ba45a8c0448db6f4adc0e1dd41c21ac6d68034.tar.gz
historical-33ba45a8c0448db6f4adc0e1dd41c21ac6d68034.tar.bz2
historical-33ba45a8c0448db6f4adc0e1dd41c21ac6d68034.zip
fix in init script - bug #397763
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
Diffstat (limited to 'mail-filter/amavisd-new')
-rw-r--r--mail-filter/amavisd-new/ChangeLog7
-rw-r--r--mail-filter/amavisd-new/Manifest34
-rw-r--r--mail-filter/amavisd-new/files/amavisd.initd9
3 files changed, 27 insertions, 23 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 59bc50f1d588..4aca2da663fe 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for mail-filter/amavisd-new
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.174 2011/12/30 16:08:48 halcy0n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.175 2012/01/06 11:38:35 eras Exp $
+
+ 06 Jan 2012; Eray Aslan <eras@gentoo.org> files/amavisd.initd:
+ fix in init script - bug #397763
30 Dec 2011; Mark Loeser <halcy0n@gentoo.org> amavisd-new-2.6.3-r2.ebuild:
Revert to ~ppc/~ppc64; bug #381977
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index eedf46e675c9..1a0bd4652084 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,12 +1,12 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878 RMD160 bf7faec0c54aa24bd689db9d1d22cccbdcff47b3 SHA1 18a44d7cf4e155206b26582abf4e3b92682275ea SHA256 b9db712af97ec836f1177fbeeaa284a4eb254f0a4eea1783606553273078fee3
AUX amavisd-new-2.6.3-amavisd.conf-gentoo.patch 4882 RMD160 0d6b26e68128f021fb6869e4a1804dd60c9dae28 SHA1 0127b60d376fffacafcc20db1a82e9be2114ae77 SHA256 f928336035c432e1358fef2a494ae3727b789f4eb8847ca8c7ac816c622a184e
AUX amavisd-new-2.6.3-dkimconf.patch 735 RMD160 778aad1195caf735eb44ff2c4e9147e88b68881d SHA1 3ff44615cb9b161da069055eb4fc79f6b24fd70c SHA256 1d0489bfd14d794617c12ec797404373a632b2c26e381d9e09c364cbfa2ae248
AUX amavisd-new-2.6.3-startup.patch 522 RMD160 e7e864c260efc9b7f27c54771956c85fe67fd1eb SHA1 70092348cfc2ab5e8bd1776196a49e76c611b0bf SHA256 ebc531320945ab009da3b59d829d7f6dd938647063ec495ed85d96833eee0647
AUX amavisd-new-dkimconf.patch 735 RMD160 721bc3fdaf15c2838092825e0b88c781841184b0 SHA1 7b57c4c80a92c3d764f9d338dac6146cd37e3080 SHA256 033f6758dc3f62d19f8a269c8ba1e3960f8b55a48aaccbb6d1d0078cd92352a8
-AUX amavisd.initd 1339 RMD160 15cf49baa5adb69a327fef74e3b86318292c00ee SHA1 f392b0444ae71cedab10b5d9896ca68c10af8434 SHA256 bc72e87936b75b16a1239dc2325a51fea4ca563c59a988c40361da704c8fd457
+AUX amavisd.initd 1366 RMD160 e79a0286803db75176450380cec93931b4d6adc8 SHA1 bb5903d2197046f13176ff64567696592adb5937 SHA256 a462493764542e85078f527b0f294818acd32b330e0681042da2cfefc4e3c27d
AUX amavisd.rc6 371 RMD160 d32a99dd9a229a133741501ec443509e22c6867a SHA1 f353cd12004bff30ac2361df2a2784f697b0cb8d SHA256 f2010650d3ef408359f41e3a84173c2b27300e9d6d2e4f7558ef39858e01da9d
DIST amavisd-new-2.6.3.tar.gz 918888 RMD160 911e356dbc2a900734c5c87bdd231846abe4f9e8 SHA1 12a120b4fc614a0b3269cb0ec0ee185cb3e7c13f SHA256 47e774579fdab1e1c10ef2295d49cb511b13e05431a7955c73f07e98025d788e
DIST amavisd-new-2.6.4.tar.gz 947596 RMD160 010dd9bf49a3c7553996c49553fd0fa84ca7bdab SHA1 993b7ca839ce038fd13f65351950f0ef03d99ff9 SHA256 40fe1b655deb934c7a655a6b5b430df268ec9ac80754b120795bc45d4ae769ef
@@ -18,22 +18,22 @@ EBUILD amavisd-new-2.6.4.ebuild 5451 RMD160 7b2d69e9319e59cb14736697267a72272c0e
EBUILD amavisd-new-2.6.5.ebuild 5503 RMD160 bfef5fdefcb1d871ca6f7931df33733dd6c5d265 SHA1 4dcdbd03b4c6c4faa697f88c0b4d79521ac1476b SHA256 8396b23e232a890851b0056bc57351fc1e5629856bd6ba7174eebcc812e77116
EBUILD amavisd-new-2.6.6.ebuild 5503 RMD160 a6bd6c4f1139e248763e38fcba3200eb9405bfeb SHA1 b388ba11ab05edcc379b5b76ecf3c7714f13984d SHA256 f8a9cb437a966b50147898f62b448de800855ab8301dea0dbf673873a86ebbf5
EBUILD amavisd-new-2.7.0.ebuild 4282 RMD160 1859c541ab4d8374d97c5e44829a49e997449c05 SHA1 a6827374186f7d92c5c2612f446e02a5d586f454 SHA256 fb677e578d476bc11b028c0618dd3331028c825026dffab014f58fe04f3a40d8
-MISC ChangeLog 33755 RMD160 012df62990c18e96ffdf63d9701687cb8c84be64 SHA1 9545fb944a5dab1c388343a676213ca39bdd9df0 SHA256 7e1ecccc980570148828f5badeea35d0af2912882eddda0a9c7c8f5d73113355
+MISC ChangeLog 33853 RMD160 12052b0b86628963f7fcb4aad1b86e892e37511b SHA1 e1e60c686507932f831ccf980770194cc0338199 SHA256 7ef68bb3298e1ef93c096b2d0fe91abee320a674e30682280a92113ed25be3d2
MISC metadata.xml 492 RMD160 5cc972a4e9a4a4d988864d3860c14faaab49b486 SHA1 2ba196114139a71488d3561cebb5634603f4e6f1 SHA256 9210f93fc9ec4b70f4fc79c08f43bb50f29e02aa33bad7061c0047ac8781d190
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBAgAGBQJO/eIVAAoJEPTTRK0uRVaN4HwP/0uKGEHYKQAYrLhNQ8cGgvB7
-lLFq9gxKCE5E+/nnjmJBe3Mb8fHecX/8i7S5g82NA3WUt0jmlYh2SxGLHCM+62cy
-F1woNWblzUAuUW3n0Hfg6TPezzLmurWv9C8HQh6nGVITKjTnvZWBDYO8WG2kNqpU
-CdJ/SLMOaISmdYAfLA5EG7KPZsafPx4HurOhc+IVdZlAyEAGfUfeN2k+TO2Rk0Du
-bDceZArywyND0JyzCpY5ABekPIBQIr0CC2NBUU5zi/dybF5AkkTjNKClChNvjh3a
-xcfA+VlatvCYic9/MS6zG5HT/d3lLen/Lz3i4RWviHLTTJbCgNYvyOS0mDpM62+n
-5bU0juIqX3c8vcmqq0Iss7PrwQz32GduRicRHEWZwbX3E3DXqamyJMBJAsiQbi23
-myiYZ4HYrfuJTCNdEve8yMNPtIhJOYy17SwG3I2AKf3TxIfUcQvQxHcsnoqjTVJZ
-3ktxA+bgTIANAao6puZPAPvn5HpinIyv+C+3yZLjeIsPdKVN8gFhNFgA3oMPnpQd
-cVyVZlUodsChEn/B6SM8nPB03DnNfY4LeeaGyi7wy8tfKQAUCenHOeLNSpNs/i+F
-e3ciPtIVE28/Ee5F/SgcpsNYIMLhpDWtg791S8tDjjfFQjNqCDBew1Sks5cbjodE
-j25GR2zptJ5DvozPQ4eK
-=bwHG
+iQIcBAEBCAAGBQJPBt1AAAoJEHfx8XVYajsf4dYP/Rg5hnd2aDzd+GROa0yI8LIt
+4x5Y+VcTxfoMawG9348OooT/ArjducCCfwCiYrl93II30gzXcQsMCMJ9z2E/I+7l
+cSxly/vO0iqYaTuJYAHrKjqUflBgY1NRj0ImHd+B/wggUZbrgJC28js/yEmU/pUl
+6i0k+H4sXSBQjcf2zSSPsl2smklIUiOu18W6Ct8YxzbLq8xMtXAx5E0op5OgEPDo
+E3sgQGTU5C8C3yXJv1ECQ4+HZLRZ2KnmOTbNXFSutyKEpKXPxiX53QUpTINQ5f1n
+l7IwZAYQUYmDjjtgoAXvMzqktzKJtoEejEf5PkLl2DuY6GvQWivzlmjLDY+FmNXs
+XnSYvNrX9qwOMTo6792C+eD4pcoM2A0K3Ogg5yLs9/khTtYecfahMZKwTNOmw66b
+X1axuBuYtYhZf4ZCyTocQQunczR+4N1RMEZQnutQZczmfihdOOLbXeKwKEPv7NTl
+K7DKs6SzF8d0Z6vI1gwJ7hySwzEUoniZnIeAOM3SGUspkyUvaCVqilaSYFCipER+
+ebNtKO9RRfVOQF+RP8JLozIyoch+KU2cI88fFlWv6c52KPii5EHvLTllYN/e3u6Z
+4RUGhaW1ipsxDIUm84bQBUJGp2Zlha1R//32dp6seOVltcOS2NqRPDdQ5NwhjVmh
+ULlK7TT9Ulnl9vs6jCHp
+=Nib4
-----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/files/amavisd.initd b/mail-filter/amavisd-new/files/amavisd.initd
index f1ced7766c02..bd47bc9a79f4 100644
--- a/mail-filter/amavisd-new/files/amavisd.initd
+++ b/mail-filter/amavisd-new/files/amavisd.initd
@@ -1,9 +1,10 @@
#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.2 2010/12/07 10:34:32 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.3 2012/01/06 11:38:35 eras Exp $
-opts="${opts} reload debug debug_sa"
+extra_started_commands="reload"
+extra_commands="debug debug_sa"
prog="/usr/sbin/amavisd"
progname="amavisd-new"
@@ -20,7 +21,7 @@ checkconfig() {
if [ -r "${conffile}" ] ; then
pidfile=$(grep -m1 ^[^#].*pid_file "${conffile}"|sed -e 's/.*"\(.*\)".*/\1/')
piddir=${pidfile%/*}
- if [ ! -d "${piddir:-/var/amavis}" ] ; then
+ if [ ! -d "${piddir:=/var/amavis}" ] ; then
checkpath -q -d -o root:amavis -m 0770 "${piddir}" || return 1
fi
else