Manual merge commit e3d6e4b86f7f10d32e5faef30532d351f624adc6 from PR 16994

This commit is contained in:
Sandino Araico Sanchez 2020-09-17 23:14:41 -05:00
parent 8030802146
commit 6d436d48f0
2 changed files with 2 additions and 10 deletions

View file

@ -16,5 +16,5 @@ DIST dbmail-3.2.4.tar.gz 2461068 BLAKE2B 2aea108bd314f2f0f3ac5c1764683aa093f07b9
DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
EBUILD dbmail-3.2.3-r102.ebuild 4749 BLAKE2B a5b5f821cd256bee124d0649b910718db20b679f76fde36ff5a82e51fbc15fade8380c99ebc367a68a2ecd7c7ab1b9c43c4ea00f27d1a8f5408968ec2db16071 SHA512 aabb8ce3bd21b133cf32bd9323a5970d8c173be6d13ba013e7d99107b7370545ac6dde716f395fcdd83e185358b87a0275f30a87ae0076817038eed959baac4c
EBUILD dbmail-3.2.4.ebuild 4876 BLAKE2B dcd2aef5ad6572080af315eb5604137ec7b340f3b1b3858a0591a30ef5d95cd95569a7b68e4aeeed356464cfcbd6b37e34d0d89e790da296f7a639ec6031d5ce SHA512 50caa2e33bd1f8111df1d3c44a43093e6a776287122e70208ab6a63f4201b790cc8edf6ddd13a1b2ad1bc735b6ee40372c483e4c0c028b0d43125ad558ffad93
EBUILD dbmail-3.2.5.ebuild 4826 BLAKE2B 2c742713787ec6db3f470a25dd82eb16b9e1688df3db01305f80f9b6bbb6beac2dc44cc1f8ef3e4e064d02a15f8e4483ad4df1ee455fe21cb5a2e63169f472e2 SHA512 896dfcf09ce57e741bf80b4b6512f456a513c769451457c0818a0a18a7878960dcdd2e67aba39c147af747e1d3a352d3d2b27e56ff055894ce70282563189e8f
EBUILD dbmail-3.2.5.ebuild 4384 BLAKE2B 8669036c5591342212094e4ed926af60716f707645c54383a6a61b58e9a768fcd6f2244ec59252d25fdf95883fcda07c45e6a25f86ef82231fa0aa11a439f671 SHA512 9e0d5095ab1f8f8adea9da27b4128879bcc16b21833385d3fd65a2724e649e10457b8e780e35fff96b50475e777b03b67cc0b39b2d333693525a25f426b1147b
MISC metadata.xml 644 BLAKE2B 70a3c2d8665df2f44e04a95a47ba9ff39778fb386c0cd9d23fe0bf824767a432c5fd9b7a87a50635b9d6592dc72632957be5c45e6777cb77625810a38823f354 SHA512 e1be3706af1329c23f831c4b2d58e076bdd0f5f30c01a4a08fd7554be392ea1dfb5f219c6852099f9c45df17cd37a71a3c228434fddbcebfac3a6ca235128877

View file

@ -32,6 +32,7 @@ DEPEND="dev-db/libzdb
RDEPEND="${DEPEND}
acct-group/dbmail
acct-user/dbmail"
DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
src_configure() {
econf \
@ -47,8 +48,6 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
einstalldocs
docompress -x /usr/share/doc/${PF}/sql
@ -66,10 +65,6 @@ 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 || die
#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail || die
#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail || die
#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
# use custom init scripts until updated in upstream contrib
newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
@ -89,9 +84,6 @@ src_install() {
keepdir /var/lib/dbmail
fperms 750 /var/lib/dbmail
fowners dbmail:dbmail /var/lib/dbmail
# create this through init-scripts instead of at install time (bug #455002)
#keepdir /run/dbmail
#fowners dbmail:dbmail /run/dbmail
}
pkg_postinst() {