summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Raschbacher <lordvan@gentoo.org>2012-08-13 08:36:52 +0200
committerThomas Raschbacher <lordvan@gentoo.org>2012-08-13 08:36:52 +0200
commit612041596ecddab863637e37b719eca7197d6bac (patch)
tree99155797e2805a0f21e92ee1376ff791827f947d
parentremoved old init files (diff)
downloadlordvan-612041596ecddab863637e37b719eca7197d6bac.tar.gz
lordvan-612041596ecddab863637e37b719eca7197d6bac.tar.bz2
lordvan-612041596ecddab863637e37b719eca7197d6bac.zip
fix for pid_directory
-rw-r--r--net-mail/dbmail/ChangeLog4
-rw-r--r--net-mail/dbmail/Manifest8
-rw-r--r--net-mail/dbmail/dbmail-3.0.2.ebuild7
3 files changed, 10 insertions, 9 deletions
diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index f556d8f..186deeb 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -3,6 +3,10 @@
# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.43 2011/07/15 21:08:51 maekke Exp $
13 Aug 2012; <lordvan@gentoo.org> dbmail-3.0.2.ebuild:
+ change pid_directory to /var/run/dbmail by default and fix config and init
+ files
+
+ 13 Aug 2012; <lordvan@gentoo.org> dbmail-3.0.2.ebuild:
added notice about /var/run & hardened
15 Jul 2011; Markus Meier <maekke@gentoo.org> dbmail-2.2.17.ebuild:
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 46cd811..a1cb9b7 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,8 +1,4 @@
-AUX dbmail-imapd.initd 730 SHA256 f8c16208f31495d2557e6ac101f1dd9f18636268511c889a0ad4dee0c56612da SHA512 f7841d64447630b771d4c3b0885d188d143959f00db1caf08ac4cd32d8610ad2b9221114f08bb456c9ad99529c66a52c5b2403c96ffe62549e28dc64ff9b6f7b WHIRLPOOL 9b9cb243d70e00f744e9bd4eeab887eb525643fe77cfe3e8c1f01c376edff165052f82965a7486d630d5fac22500641745a0e88b33303bc56e6780e351eaaba3
-AUX dbmail-lmtpd.initd 730 SHA256 2aedd5fecc1ef28289c870030c31f8ecaded4f2651be355a40216262a8a4d4a3 SHA512 201161e87a5b14c4637c16bddd07ab2907d95a997b39bb4d40d6ad21d67588149d7d900d364ce7a28006e0fea2bf48ff11ceae83c05a292d80603ed9300e1357 WHIRLPOOL af80c16be5f3119a88871b007936c5cd3e2b4e9399b89eec832b13f587de48e563a0a024259fa463f514461b7f56693d4ced02e084c4954dbb5f0994f42bd1c3
-AUX dbmail-pop3d.initd 730 SHA256 2b1ee1f7491e6fb94f0d9a6a1424ff3cba66b2880d6bc1d50f008da8be0a7c52 SHA512 b2df02acc6c941d195f8122ef79dc19b4b105f6cd7813969dc291a55350ae02a9cfaae16bc698da93d771a4b07aff5f6cda579b8ed597f41bba124ecdd4cc53d WHIRLPOOL 1000280545cdd50c5e90ba504a2d87f77b9fdae7db79fdba4fb4d7d745295d438893f1b7f5837af1976e3690a37defcf1f41543cd45ba744db061f1de094580b
-AUX dbmail-timsieved.initd 716 SHA256 c92cd221b37391703ec7aaff2eb3b33ed2b9b699a281f318f54ba6efd6e69224 SHA512 04f66443573fde84d220a0d808f98295a8931990a0d7bad13c0c86bfe7b2d95c3311f7fdbc6b4068223601286c34e97cb17b0f5fbc28ca05991d0cdc13d250f5 WHIRLPOOL 8f3c2a53f084861f63db8056b4b2ac82fb9e2ef6e0cf519073368c6bf59b8e2026872af0c847011bd6ac237e94dc7ac280805a3200ec738a96c8dfc50e0bc238
DIST dbmail-3.0.2.tar.gz 867560 SHA256 139558f4fa3e0f460d688f6d29318366cc3f40dd570a1a29484bb580d0190c3e SHA512 ca1d30a114c1b2b8968227ed678e3857c6d5cb98eb9e7086d45c32b4e957396971bd76cfe2e278fe904fbe8a8ded53199ded76da300d9835b324839e42532834 WHIRLPOOL a79d8b344361bd032446e99bbbb865e798db54e60a730cb7191112e4320ca130d194d8a1ad2d676673b2bb06e50e9cc1ccc78a8a1fc7edcb2a9b3eeeb7841500
-EBUILD dbmail-3.0.2.ebuild 4749 SHA256 a2b293f928a22eab648b49ca585444fc36801f710e81cc32208fc762483f8fd4 SHA512 85c0c1c35f12dde543e38c2f691688558cd7f506443719fa58d1947c3dc11b3147cecfb4faf2752d39ef3d20f6baa3191fb28e1f1bf705505cd5d39ee51f371a WHIRLPOOL 5284440d382445345e107fdfb3b45964f6f234fffee8b008c07719cf9b225680e6b96b95dff9a0ebe5693cb44e02359fabad81b4528be7305ae4d28e3fda67f1
-MISC ChangeLog 8938 SHA256 151c9d9f381be21b70504c2394358b5dfa0be46f8839aa4651ad501cc1a61356 SHA512 3a7b9a283cfe635927635420f72032ac59192854cad42fd795f70137d627902de64431a345d70a93f171a3d969af8db9169b17be6aef90e565a54de295aac412 WHIRLPOOL 11409f37d584e782b24693eff20bea3600a4fb36c3e9828bc213c1ff8973193414cc6047b6c3a85be0b9feb04add86d28a6e13d9ce1aae54bf333e5cd9032d3c
+EBUILD dbmail-3.0.2.ebuild 4804 SHA256 8530727026f5ca8bd85f9ea385cc57b5010191ea35eff007a8c4c51980cb16b6 SHA512 2eedf67dd999e5d2e400ced0f70481d0c25add8b18e4ce6ae91bdae0fc878d6d714a368966dce7a9ced389f433e5a1b7131b47385c8d48ac55bcefac3ac11fa3 WHIRLPOOL 371078617162623be025a6577b62cc57bd702e108dfca433bd4eddd3dba56f5bc02f8e5b129fa4ec1f9f2ee163bda95c630ea72b7f305c92658b73e243dd1965
+MISC ChangeLog 9081 SHA256 ae664f68c7b9e1c2d51e7d4ca4a6cc49b400c0a16a067ef1cf15b5367bbb2028 SHA512 d198a00702420a5751f46ebacc760b48f2ed3b88a1a893f713b78c51cc916a4f1300c30f1d8937a1572fb99d32a54aa41c723d2cada2f6b21a275c2cf7e7fbea WHIRLPOOL 0eaeda6a5caa3bab81bfdf9c5889944d073a8ff8ee18dae79da03c2db8d9ebeac6eec095c2f507d15f6c15de5825a5fd72a48867ce354582a82e3a87ac6319f2
MISC metadata.xml 548 SHA256 44a8967070c748d01cf091dc9102c31a4b49c1de45387a244991fa8e1bf09056 SHA512 04e5ffe784421938f9211f9fa1b3b5952f00b1009503d22bf7c4e23e7717305bb6217d7480a31e98bf362f36d76d38effcbd09e08ed4f5292d9e1b1dd0fcb1d0 WHIRLPOOL 969132b4480ce852454416410164b21c5c182b240a47f8007c82c2c76e6dcb9d46d8a9728e5be8e598062e327f5df812dc9325d357a7821b343073948fbb579e
diff --git a/net-mail/dbmail/dbmail-3.0.2.ebuild b/net-mail/dbmail/dbmail-3.0.2.ebuild
index 88e57c6..2015803 100644
--- a/net-mail/dbmail/dbmail-3.0.2.ebuild
+++ b/net-mail/dbmail/dbmail-3.0.2.ebuild
@@ -76,6 +76,7 @@ src_install() {
sed -i -e "s:nobody:dbmail:" dbmail.conf
sed -i -e "s:nogroup:dbmail:" dbmail.conf
+ sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf
#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
insinto /etc/dbmail
@@ -84,6 +85,7 @@ src_install() {
# change config path to our default and use the conf.d and init.d files from the contrib dir
sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
+ sed -i -e "s:/var/run:/var/run/dbmail" contrib/startu-scripts/gentoo/init.d-dbmail
newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
@@ -144,9 +146,8 @@ pkg_postinst() {
elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
elog "forget to rc-update del dbmail-* first)"
echo
- elog "If you use hardened you will probably want to create /var/run/dbmail"
- elog "or similar and set pid_directory to that path"
- elog "(see http://www.dbmail.org/mantis/view.php?id=949 for details)"
+ elog "Changed pid directory to /var/run/dbmail (see"
+ elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
echo
}