Comentarios del PR #16994

This commit is contained in:
Sandino Araico Sanchez 2021-01-10 03:34:11 -06:00
parent edfec98f9b
commit 20efd4570a
7 changed files with 64 additions and 58 deletions

View file

@ -1,20 +1,21 @@
AUX 3.0-header_cache_perf.patch 2161 BLAKE2B 7b5448976d808f2db2736f5933e6c3c10b797622346fec1638ad0ce7f48bbd50c475aecbbd6c2edbfedfdb61b1c04066e85234a906f1a7dd5b4726413d57174b SHA512 77df1f39e3c9815a96fff510d24ed32d9229e582ac84c0af4f548cd49b6f9806eaf9f5eaf514c205b6604d1be927ddf782d6c3c867f102b54435cc2bd496357c
AUX 3.0-pgsql-RETURNING.patch 1746 BLAKE2B 0242e34afa88c667a24c432130a9d6ee557ecdf92cb8b5b3104c138589176b65d7e9bd45c26639ab516e96fbaa4a2d2723650d98b234c29a27a918d9261ed3ca SHA512 18b52050eeee5e04cbb4324048938d913fc9be774a4b3f9cd034a00448cc3db7f55c7140be9436b38fd24a513b2c533dd8e4572caa02399e02fd4ca07b818e1e
AUX 3.2-pgsql-RETURNING.patch 1773 BLAKE2B b4ee7bfbaf66472c49a0df3a03878645f2900341b9995acbe3042d898f22df0d4576cae2250ea69709ed87d156a31f126c875fd14745d9c6adb4334193148186 SHA512 d988feb6bb392db7efe0e24e8828ded8568f2ea8317d3ab36ac87988c84145c074ad8e4f34d3272d4c30726a9b9aa6e2d451538290e87f6b8b2e8d8772c660f0
AUX README.gentoo 1652 BLAKE2B beb9d27ac8de471d4ac8a3c4f626e7005d471477943b424b2603fe9ec92a6910bf0102c472e2d17dc1217d4bd6c286cd50da5d9b5fc6bd23c436cec8c0a84afd SHA512 0af8a295ce85260ca559f6491e8b7e318125b4f424639877a5744d0906023ccbd63c18b59f7fdb60da7994df9c3f62cef10a5db0ee940aa12c2382e33340f0a2
AUX dbmail-2.0.11-lcrypt.patch 642 BLAKE2B 211081aff5d1597054be134f091fce21d36e083d254f53803cb87de66b77cbd35160d548f3d7d6b43c8dfdb93cd4a533dda009f7ce9d5c7f69f5a8fe1fbe9835 SHA512 aa3c25ab2206f104e4de6b20929d55c0e3ceeebd41a670dea553797486696b145feee47f720f4043a1b1fa6b37c73c1684eeb467eace5142e1090a08b63044ff
AUX dbmail-2.0.4-01_quota.patch 5108 BLAKE2B 4b6ccfef889abcc50679d23e1f250fa46097f0f344cc080f218e06ab36e4ba44e01c33ced11fe4b508fcff40c7656fe80b5d11b94178e8e1028285d38c73a002 SHA512 3cbc50be3d2766185a37e627e7e2b7f737a083821755b099b6fade2aa3163ca291b368346a961c32dd40892dd3de64c6fa901980fa8c5d54e573a3b9d7e1d050
AUX dbmail-2.0.4-fPIC.patch 2871 BLAKE2B 3c87fba8ccd33efc2b7d875f15c6e146f9493a7930b0e5103a0fa5da6c669a6ebaa86857e6bd8ce1ad9a52e0a4d1177c6133830c4f7b6b09b3a98f4f22ea610f SHA512 dffcc1f79bb1dd4e38aa1842c1aac38fde44ef56c0152013eecabb293154d2d0045596f13321f4c07aaee63e5cf02663305042db5842d612bef461c98fbb67ef
AUX dbmail-imapd.initd 730 BLAKE2B 439a8b7eae9e59a02c2dc65a92be3aae6da1acacf0912a61f9f96b5b9b772477ac8d368c41738be7be4b66c19b09c770690998968a55be3f8892b327c2dbde9a SHA512 f7841d64447630b771d4c3b0885d188d143959f00db1caf08ac4cd32d8610ad2b9221114f08bb456c9ad99529c66a52c5b2403c96ffe62549e28dc64ff9b6f7b
AUX dbmail-imapd.initd 726 BLAKE2B 98627190c184c837480c7fcbe5ee2afa7118de0a299a89c9d7b9a38fdb0b389df734504f79bb361d52324000e1dd2e6d20c64af47e1d81e2808e2cb3c8acc028 SHA512 3a9b175dfa189d74a241f770f701e07d0555e94c45ab162256d60972e4368bea7f9f040f2fa0e1d35969253d8c17fedf1d68f11e975084146d41219067f46486
AUX dbmail-imapd.rc 540 BLAKE2B 1aa1b0a64d62efb9c73313decdd34688c4ef193e5bb8f9aa530b2f8f849133f3d6732616e99342d5ab67671229fbd966efc79c9f827d196a45311946ab1f3174 SHA512 57e6eb07b2492543716f60306017cfff95db4872e0a16becf919ed2113f7ab8a802f6f83c9467ae0174185f13fd703dba4bbde0bf3b6b5e050da4336507d8158
AUX dbmail-lmtpd.initd 730 BLAKE2B 0700ca5aaf95ddf44c141061385f32102f03dc71af9fb35a393c37c8c858b49134afac88a2eb2d870170bb0dd413cd112571ce69c13318f0597ea9e80499da08 SHA512 201161e87a5b14c4637c16bddd07ab2907d95a997b39bb4d40d6ad21d67588149d7d900d364ce7a28006e0fea2bf48ff11ceae83c05a292d80603ed9300e1357
AUX dbmail-pop3d.initd 730 BLAKE2B 046be799e1318c1df5af73691fad5bce6a9d9eeebcc3d42dc4bb61ecbb6105dd30fd5b5fd5b45680a27ceadc553d3600ae0e4587715a61b4036ba680b8fe4721 SHA512 b2df02acc6c941d195f8122ef79dc19b4b105f6cd7813969dc291a55350ae02a9cfaae16bc698da93d771a4b07aff5f6cda579b8ed597f41bba124ecdd4cc53d
AUX dbmail-lmtpd.initd 726 BLAKE2B beb9d6396d906df897aabbbdb92cb30bd8f256c4bda58111a486bd668168e9db3c90672c02ab2faeb74cf7b36e71b943a6d982625a2dcd5a82c829ab1854cc9e SHA512 e0a0c50600ea151c9e2c19f0b460e85f91c560627a71c6133560804f7364ecc0506c052e2b6203df5921bb9d0941b25b2c80d28a9d4f0e3207a1684e86aed9cb
AUX dbmail-pop3d.initd 726 BLAKE2B cfbdf36ef1a1f7feca659a760c968955af933228ed62d7d903e3462de1a9cec2b87258fcb501b8d037b03d0162f843a41f3a1b08ec530649cfec5aba9682d1c8 SHA512 56173abe17cd01d5401038e07ac9e0d1850eb7a2b2f36fbf58c132021ed50a274fb401385192d17df81b410e608e97eb0475e5bcf777ce2a542bd376afb2a00c
AUX dbmail-pop3d.rc 540 BLAKE2B 6d4ccd2508a38387a647c246dfccaab49520720834aa9094be6efc666b461f54bc6989ee960964cc7f6c70512bc703a9233c47a5347c2429e285afdb4d9f9ea8 SHA512 ed184a60ee72f1c6503ee14d00d2c2dbb5098895be1a5b87574418f20a68ea5e3843fef7fd77f2ac771fee8bd1ea564b804f916e23821304c8dcc5887d039045
AUX dbmail-startup-gentoo.patch 10704 BLAKE2B f8c72aaf30254a24df0a583c419d7437f3d954939038a4002d935d990a2539189db621ead1fab7fc7f8cce31155cb262e46749131ca5071b08e226c32d43b38e SHA512 34f2544fb6f9b1e33dff1733c7bcb718117145da5ba037508e851f25f27df4f954158fbbae677d0240fbb3a43f2d48144566a6cddd821fcbfd6b40f369b71021
AUX dbmail-timsieved.initd 716 BLAKE2B 5c5d12b5d589761af4b42646ec3b9b6323781bd3cbabdc136f4cb0332ec7bc1a6375a6fe5bc8ca12b6e75b6b2d6e037877303cad4f07bb196fa0ab12245c8d0e SHA512 04f66443573fde84d220a0d808f98295a8931990a0d7bad13c0c86bfe7b2d95c3311f7fdbc6b4068223601286c34e97cb17b0f5fbc28ca05991d0cdc13d250f5
AUX dbmail-timsieved.initd 712 BLAKE2B 7cf8719435b6b6a5c807d18b3cbd4ca937a20140a2ef05b3241137f30d362577c3b421c290cb26b31b5240bf848ed9bc2f00b0f50be6f88637fad5b4068eaf8f SHA512 8b3127072c664c6de173b4000920cac5df7b710785fd54839bf358ac6009cc296a586594b6086ca5c4ba10d4b19337c2b5befa2bea413396ef6ccc75dae4f505
DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
DIST dbmail-3.2.4.tar.gz 2461068 BLAKE2B 2aea108bd314f2f0f3ac5c1764683aa093f07b9642a2a25db08c8b765387ddbc2d02972ea3ede7e86de09aa7bb2d7a4c8423d2e3ab6831a5c613b93c97ee0e82 SHA512 34df0b17307e3d4bd255b4f3f9df59791379fc0b090a73af9dfb02f416747051cbc7a34039384906ab30d6208efbe9c470de9c950d3ace6129292ec8c8fb1786
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 4384 BLAKE2B 8669036c5591342212094e4ed926af60716f707645c54383a6a61b58e9a768fcd6f2244ec59252d25fdf95883fcda07c45e6a25f86ef82231fa0aa11a439f671 SHA512 9e0d5095ab1f8f8adea9da27b4128879bcc16b21833385d3fd65a2724e649e10457b8e780e35fff96b50475e777b03b67cc0b39b2d333693525a25f426b1147b
EBUILD dbmail-3.2.5.ebuild 2405 BLAKE2B 02e2651da227ff40885862386e1fb1efe47301aaec14a7a3d6cd4d8c666af51d7d3246c020cbc30c635df73735be633d3a3c3ce8355a3a462aca400b4b1695d0 SHA512 e3b2113a9bce5a308feefa2ac34135be68c6bfd48912e9e10dd88f38e274b3eea13ea2528325f0a1a5533f55f7ede5835fc404a41b04792d2adacd1264ca2422
MISC metadata.xml 644 BLAKE2B 70a3c2d8665df2f44e04a95a47ba9ff39778fb386c0cd9d23fe0bf824767a432c5fd9b7a87a50635b9d6592dc72632957be5c45e6777cb77625810a38823f354 SHA512 e1be3706af1329c23f831c4b2d58e076bdd0f5f30c01a4a08fd7554be392ea1dfb5f219c6852099f9c45df17cd37a71a3c228434fddbcebfac3a6ca235128877

View file

@ -3,10 +3,10 @@
EAPI=7
inherit systemd
inherit systemd readme.gentoo-r1
DESCRIPTION="Fast and scalable sql based email services"
HOMEPAGE="http://www.dbmail.org/"
HOMEPAGE="https://www.dbmail.org/"
SRC_URI="https://github.com/dbmail/dbmail/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
@ -34,6 +34,16 @@ RDEPEND="${DEPEND}
acct-user/dbmail"
DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
README_GENTOO_SUFFIX=""
src_prepare() {
sed -i -e "s:nobody:dbmail: ; s:nogroup:dbmail: ; s:/var/run:/run/dbmail:" dbmail.conf || die
# 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
default
}
src_configure() {
econf \
--enable-manpages \
@ -56,21 +66,14 @@ src_install() {
dodoc -r contrib
## TODO: install other contrib stuff
sed -i -e "s:nobody:dbmail:" dbmail.conf || die
sed -i -e "s:nogroup:dbmail:" dbmail.conf || die
sed -i -e "s:/var/run:/run/dbmail:" dbmail.conf || die
insinto /etc/dbmail
newins dbmail.conf dbmail.conf.dist
# 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
# use custom init scripts until updated in upstream contrib
newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
sed -i -e "s:/var/run:/run:" "${D}"/etc/init.d/dbmail-* || die
dobin contrib/mailbox2dbmail/mailbox2dbmail
doman contrib/mailbox2dbmail/mailbox2dbmail.1
@ -87,44 +90,5 @@ src_install() {
}
pkg_postinst() {
elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
elog "for remaining instructions on setting up dbmail users and "
elog "for finishing configuration to connect to your MTA and "
elog "to connect to your db."
echo
elog "DBMail requires either SQLite, PostgreSQL or MySQL."
elog "Database schemes can be found in /usr/share/doc/${PF}/"
elog "You will also want to follow the installation instructions"
elog "on setting up the maintenance program to delete old messages."
elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
echo
elog "For regular maintenance, add this to crontab:"
elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
echo
elog "Please make sure to run etc-update."
elog "If you get an error message about plugins not found"
elog "please add the library_directory configuration switch to"
elog "dbmail.conf and set it to the correct path"
elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
elog "A sample can be found in dbmail.conf.dist after etc-update."
echo
elog "We are now using the init script from upstream."
elog "Please edit /etc/conf.d/dbmail to set which services to start"
elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
elog "forget to rc-update del dbmail-* first)"
echo
elog "Changed pid directory to /run/dbmail (see"
elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
echo
ewarn "The database config has changed to support libzdb db URI"
ewarn "Please check the documentation (or Bug #479664)"
echo
ewarn "The database schema has changed since 3.0.x make sure"
ewarn "to run the migration script"
echo
ewarn "Please be aware, that the single init-script for all services"
ewarn "has been replaced with seperate init scripts for the individual services."
ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
ewarn "and remove dbmail if you want to take advantage of this change."
echo
readme.gentoo_print_elog
}

View file

@ -0,0 +1,41 @@
Please read the INSTALL file in /usr/share/doc/${PF}/
for remaining instructions on setting up dbmail users and
for finishing configuration to connect to your MTA and
to connect to your db.
DBMail requires either SQLite, PostgreSQL or MySQL.
Database schemes can be found in /usr/share/doc/${PF}/
You will also want to follow the installation instructions
on setting up the maintenance program to delete old messages.
Don't forget to edit /etc/dbmail/dbmail.conf as well.
For regular maintenance, add this to crontab:
0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1
Please make sure to run etc-update.
If you get an error message about plugins not found
please add the library_directory configuration switch to
dbmail.conf and set it to the correct path
(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)
A sample can be found in dbmail.conf.dist after etc-update.
We are now using the init script from upstream.
Please edit /etc/conf.d/dbmail to set which services to start
and delete /etc/init.d/dbmail-* when you are done. (don't
forget to rc-update del dbmail-* first)
Changed pid directory to /run/dbmail (see
http://www.dbmail.org/mantis/view.php?id=949 for details)
The database config has changed to support libzdb db URI
Please check the documentation (or Bug #479664)
The database schema has changed since 3.0.x make sure
to run the migration script
Please be aware, that the single init-script for all services
has been replaced with seperate init scripts for the individual services.
Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update
and remove dbmail if you want to take advantage of this change.

View file

@ -1,7 +1,7 @@
#!/sbin/runscript
#
PIDFILE="/var/run/dbmail-imapd.pid"
PIDFILE="/run/dbmail-imapd.pid"
depend() {
need net

View file

@ -1,7 +1,7 @@
#!/sbin/runscript
#
PIDFILE="/var/run/dbmail-lmtpd.pid"
PIDFILE="/run/dbmail-lmtpd.pid"
depend() {
need net

View file

@ -1,7 +1,7 @@
#!/sbin/runscript
#
PIDFILE="/var/run/dbmail-pop3d.pid"
PIDFILE="/run/dbmail-pop3d.pid"
depend() {
need net

View file

@ -1,7 +1,7 @@
#!/sbin/runscript
#
PIDFILE="/var/run/dbmail-timsieved.pid"
PIDFILE="/run/dbmail-timsieved.pid"
depend() {
need net