diff options
Diffstat (limited to 'mail-mta/netqmail')
| -rw-r--r-- | mail-mta/netqmail/Manifest | 16 | ||||
| -rw-r--r-- | mail-mta/netqmail/files/1.06-fbsd-utmpx.patch | 4 | ||||
| -rw-r--r-- | mail-mta/netqmail/files/genqmail-20080406-ldflags.patch | 4 | ||||
| -rw-r--r-- | mail-mta/netqmail/files/netqmail-1.06-ipme-multiple.patch | 117 | ||||
| -rw-r--r-- | mail-mta/netqmail/files/use-new-path-for-functions.sh.patch | 4 | ||||
| -rw-r--r-- | mail-mta/netqmail/metadata.xml | 9 | ||||
| -rw-r--r-- | mail-mta/netqmail/netqmail-1.06-r2.ebuild | 11 | ||||
| -rw-r--r-- | mail-mta/netqmail/netqmail-1.06-r4.ebuild | 11 | ||||
| -rw-r--r-- | mail-mta/netqmail/netqmail-1.06-r6.ebuild | 21 | ||||
| -rw-r--r-- | mail-mta/netqmail/netqmail-1.06-r7.ebuild | 201 |
10 files changed, 374 insertions, 24 deletions
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest index c4303672c81e..b9efa372deed 100644 --- a/mail-mta/netqmail/Manifest +++ b/mail-mta/netqmail/Manifest @@ -1,9 +1,10 @@ AUX 1.06-exit.patch 551 BLAKE2B 77a928b1aff304bce5b5df69d067e1271f6ce5ecf0342486d4c8dcbb3546f1a19cdf758a3af3ebbc24d02d3e924a05dceaf7ab6c27605f662df4ec66fc80067b SHA512 9623d4c045d1399ca035ad49f82e50a344529edffaf7c0e2f1015fe0958dfaf8814462a70b944403203d84b86852e8a01f6a3c4688228b45443258dc908e9236 -AUX 1.06-fbsd-utmpx.patch 1903 BLAKE2B d4eab87c0fd0ef276947d94500b09fa5ae9971f88ed535202791715bed902b1d4154fb83b8a28c5af6868a50ab4b968841e53c566c3f3417674a47fb26d9d90b SHA512 b6e8ff4f6f582e0d6d69072547a68a3741345d08041e29285a3bf39c016b2b15231d5b0370123a95b35473d67f1780b69d19b61ddfbddae5f463709575344481 +AUX 1.06-fbsd-utmpx.patch 1902 BLAKE2B 8c2a278e10ed48db89b76c7005655f6e7707ee4e61d9cbfdcfbd3b7f335450131eecb810b1bc92fd49243ae03ab7f94384bf9078115f01bcf625d8c87d624040 SHA512 c1267365a1199aa5041cc75769e838cfacddd82e1f6dddcc99d86f4b4fc901d8604abdab96a86479109f2278970d88249d8013115dfb89d3e2cfa0e823a01a86 AUX 1.06-readwrite.patch 237 BLAKE2B a8c9af939378bb423c68aebdafeeb3ecb53def9e7d050272e6f669c4d99d938a10a268420b1cf7e699146b3f71bb75c461e45f3f0905b9ccd3371572947aafca SHA512 4cfb7991f2b30740d007a655743e77f5271ebefb4ed31ceb44d10ee53168eec713bbe64ff3616c372851c5fe1f04e57601dc83a27f1ce9cccdd0e2fbc942b550 -AUX genqmail-20080406-ldflags.patch 456 BLAKE2B d0f07e23d300dea389c1bcee0d5abc15c6ce528f23283641a599fb0279a8623640755a11a8c91c9b82775de9173b6af8628bb10588e982696b878a5407ff1ab4 SHA512 2e0061f135bafb6eba363c165e3282992d326a581adbeac5d790fb665b251ed2a2b5febed4987bafd39b33fe8275cc81a3523eb77418543c2bc7923647df1dd5 +AUX genqmail-20080406-ldflags.patch 455 BLAKE2B 9a820b3ed89ec74063076ac88933e14ee92776ed310b4e2e1f6ecb472fbf6ff6361c2cbe2cebcf2c8e2c9ca4a3d3a1611edcc601ab32bf2dcca8560e669678e9 SHA512 5579e6d60b4c71dca70163a832ef079a19abe815eeaa83b362edcccd4a2646c2cfb25d30cfab44c49b3b124c3b069c169b299d0f251495a15d0f785c3ef16e82 +AUX netqmail-1.06-ipme-multiple.patch 3694 BLAKE2B 53d1db0766a1720cf626210bd9272f2e5bbe310738c934ed8c3c0ffc7adb54ba8938af0d12771c77f59cada9d1c97f858cacfd86a4a0b0bcbb5c6c4e7d0d0d6e SHA512 08f26af9ecab24258956d20c8e7201bd4f3d55ce9f2793417ae3fa1ecae4e610eaa2fcfe01462ffa70f4974b5ee4969851c254ab051fe039dd2a8eb9fb8b8f5e AUX qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4 -AUX use-new-path-for-functions.sh.patch 410 BLAKE2B 829dcd0e2c771a682881e23bd1b504e7e031c1f873ee07883a11d13dd86ff12336d8934579fedbc21d1ec165153d3f60f4cf22cd54eb43e2e8c1ea51c8b4da8c SHA512 72f31612286d6869078f6546966cc005b6d413a154fbe20bda97da15851b81c309a6ee3e5ae8b03124ad6e20773dee393fb8a029b48b8d8a903e92fe224df565 +AUX use-new-path-for-functions.sh.patch 409 BLAKE2B 512bac6c1515cb7cdeb6a7ec849bb7cc7382da638db33f7e8def05ce08d5e668c98e4ebec4345a0441628aaa8b238ab15bd5869f3ddb7fd65c386355ab397814 SHA512 e751f7b5e5244ec627ab1ae55aa12a0324161943797255b96ef4b94525e99c8d2bdc9f3673d771fa6e623c6c40a60aee6fea1ac79f10e382a0db6149943d9304 DIST big-todo.103.patch 5546 BLAKE2B 34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554 SHA512 fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975 DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3 SHA512 744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35 DIST netqmail-1.05-tls-smtpauth-20070417.patch 67942 BLAKE2B c9498d9ef5987f1f8eae77894a839708add2186bbd8b1d4a7df36b56e0345da9643b384bc3f575bdd87dae9571d7e22c9e09894fa5330910a2bf8679675e41b5 SHA512 ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41 @@ -13,7 +14,8 @@ DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a8 DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65 -EBUILD netqmail-1.06-r2.ebuild 3955 BLAKE2B 80a549c28b008ca7a9bbd9c514b1239487be72f2c2381231cc92fa3ff345b5c700ceab4a1f95d8585e3be61a17f6b4b0fed93621f910e2493c9f1291289844e2 SHA512 4da917138b1e48d4a4926f12a9d25f2b3b89f2c08c02c02c2728195c3ee44ebcdecbde43675ec369677083981f23c51acc1b74be9ef5be5d77ee7e5bea1ce814 -EBUILD netqmail-1.06-r4.ebuild 4168 BLAKE2B 4e8f5cbdbf4d3dad977814856d8b757cf73b1851bf79cafe8ec46975872241770281827e5e1a061d08be41edd79c9f55770681bb5dd3ce477efeda4f98c99978 SHA512 2a79163fe009405f4bb77f725fc520ff6503005377c9a949611002a99e124e1baf266f8d48d9a17cced99d3ef3f09d9a588f319fcf6eccd2e40c611c89b91fc8 -EBUILD netqmail-1.06-r6.ebuild 4346 BLAKE2B 6947e256e37c6d7645269d42546312b44c2793a3db994a82053da41a094126e41b22f30ec4f7f9d628faaa3ba84c5055d2653843de0b516acc335505bedc744b SHA512 2c318c4241f19cef9ab3778e4e783982957582764189dad1f7b5914d0ba2b5090fdcc6a6e58d7b0c45b0086aa0bd75dcd45e5b1e59e9470003d2ccef4f0204c9 -MISC metadata.xml 478 BLAKE2B d947af2777a19a9c422bf722a2755c00302885909dfcf3877624c3c3baf2f5bc13befdbd8865a9de246e3ea3ab446a0bb42d5f26febb5bc585393e66b76d214e SHA512 13a8e6e9fb1bb277d98625b6e87d03aea279802263806476ebb8057248e787eb6abbca5fc9b5f4855750f47b8281adefadc87fec7ef61cb2a1e74b0d8a0f346e +EBUILD netqmail-1.06-r2.ebuild 4097 BLAKE2B 2c7fbfb751b501114416dc47b29392fcc41eac16b9c7195946aea9f36f73004bb61c4d956da25d21d83be8b2330bbfb66b6bc297abb0db56510a6a12f06f7a8e SHA512 5b41dec6c172bc7f75500823bfe9ebc758a1fab8aceb3af363d78c4e3372dc0304138bf08c56d6c99b30675a21aff073ab7c9dfe77252490021866678e68d0a6 +EBUILD netqmail-1.06-r4.ebuild 4310 BLAKE2B ec5fb7dafdadc8eab94ce47819a07269af50481f75dc7aa071bc1ab7da9c84597ca527eb0946f4b19d853b2f4638b889d373bd860d676afba5210dc9c446ac20 SHA512 45e6b9a5bf5f480b62d6a1ba7600db545174da04f1c348766b590c0a94a485c006f77569e8af88a62ac47fbedd2ef916e96ffcc04d9fd3b035c704cc7053a0f9 +EBUILD netqmail-1.06-r6.ebuild 4485 BLAKE2B 039f3ca37cabc829e900b8a9c989e8db4be9631d4986caf99817e4f16b31c7818de322462cf3c9e6936fd9211d20187535eafbb1d459605725f5492a650e9141 SHA512 45a6aa69f81087f7d91e3d91666e7d1bc13a8dd2d6521b2330bec78ad6f518e1906714fd2dc183197446efb7551a4eba5e6bf70848b04706eaf99040c0c483e1 +EBUILD netqmail-1.06-r7.ebuild 4648 BLAKE2B b7694ae0a8d83c4b7ec5e3e7e71df9551114bf85f34b08862b0a5650413127d810756a6db55903903b1dedef626f06bb8e3c07de1ee3a62cfde313f0e8382b07 SHA512 fc13471b148ee1235a1c2e437629e835336f6f88ae66a3c2b93351ed67d6f0902a7754e1015467d91c45e7294a5f0ea8d343e741ab7f53259aa6e5e2283fb53f +MISC metadata.xml 673 BLAKE2B ed2a0e5538649aad627dfc0e7c28753f62445d27ea7c27e78fe453eecc0b2b75e902060a1616fadbae59beddb0ff0d24dd6a35e8cd16423df15a8f92a9da1bd4 SHA512 14b27384c8af56fe2d30d12af1d455ce8db52a21848ffc3cfa15e784a459d54c071fd6f93bf467e2e3e1786e41f7207fff0cd77751dfb153373d249c2cd4509e diff --git a/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch b/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch index 8500eb53e3ee..0307a0d19412 100644 --- a/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch +++ b/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch @@ -1,5 +1,5 @@ ---- qbiff.c.orig 2010-04-06 08:43:28.000000000 -0300 -+++ qbiff.c 2010-04-06 08:44:35.000000000 -0300 +--- a/qbiff.c 2010-04-06 08:43:28.000000000 -0300 ++++ b/qbiff.c 2010-04-06 08:44:35.000000000 -0300 @@ -1,13 +1,6 @@ #include <sys/types.h> #include <sys/stat.h> diff --git a/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch b/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch index 1eb334c259c1..cfd27cbb8280 100644 --- a/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch +++ b/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch @@ -1,6 +1,6 @@ diff -Nuar genqmail-20080406.orig/spp/Makefile genqmail-20080406/spp/Makefile ---- genqmail-20080406.orig/spp/Makefile 2008-04-06 15:44:14.000000000 +0000 -+++ genqmail-20080406/spp/Makefile 2013-05-27 00:37:58.687763457 +0000 +--- a/genqmail-20080406/spp/Makefile 2008-04-06 15:44:14.000000000 +0000 ++++ b/genqmail-20080406/spp/Makefile 2013-05-27 00:37:58.687763457 +0000 @@ -14,7 +14,7 @@ rm -f $(TARGETS) diff --git a/mail-mta/netqmail/files/netqmail-1.06-ipme-multiple.patch b/mail-mta/netqmail/files/netqmail-1.06-ipme-multiple.patch new file mode 100644 index 000000000000..85b5a450c959 --- /dev/null +++ b/mail-mta/netqmail/files/netqmail-1.06-ipme-multiple.patch @@ -0,0 +1,117 @@ +From d24a34857afc33ed11da9ba62736c0bb9b3e5b94 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer <eike@sf-mail.de> +Date: Thu, 29 Aug 2019 20:35:48 +0200 +Subject: [PATCH 1/2] ask kernel for the correct buffer size to satisfy + SIOCGIFCONF before looping + +--- + ipme.c | 41 ++++++++++++++++++++++++++++------------- + 1 file changed, 28 insertions(+), 13 deletions(-) + +diff --git a/ipme.c b/ipme.c +index 3c86127..d88785d 100644 +--- a/ipme.c ++++ b/ipme.c +@@ -52,20 +52,35 @@ int ipme_init() + byte_copy(&ix.ip,4,"\0\0\0\0"); + if (!ipalloc_append(&ipme,&ix)) { return 0; } + if ((s = socket(AF_INET,SOCK_STREAM,0)) == -1) return -1; +- +- len = 256; +- for (;;) { +- if (!stralloc_ready(&buf,len)) { close(s); return 0; } +- buf.len = 0; ++ ++ ifc.ifc_buf = 0; ++ ifc.ifc_len = 0; ++ ++ /* first pass: just ask what the correct length for all addresses is */ ++ len = 0; ++ if (ioctl(s,SIOCGIFCONF,&ifc) >= 0 && ifc.ifc_len > 0) { /* > is for System V */ ++ if (!stralloc_ready(&buf,ifc.ifc_len)) { close(s); return 0; } + ifc.ifc_buf = buf.s; +- ifc.ifc_len = len; +- if (ioctl(s,SIOCGIFCONF,&ifc) >= 0) /* > is for System V */ +- if (ifc.ifc_len + sizeof(*ifr) + 64 < len) { /* what a stupid interface */ +- buf.len = ifc.ifc_len; +- break; +- } +- if (len > 200000) { close(s); return -1; } +- len += 100 + (len >> 2); ++ if (ioctl(s,SIOCGIFCONF,&ifc) >= 0) ++ buf.len = ifc.ifc_len; ++ } ++ ++ /* check if we have complete length, otherwise try so sort that out */ ++ if (buf.len == 0) { ++ len = 256; ++ for (;;) { ++ if (!stralloc_ready(&buf,len)) { close(s); return 0; } ++ buf.len = 0; ++ ifc.ifc_buf = buf.s; ++ ifc.ifc_len = len; ++ if (ioctl(s,SIOCGIFCONF,&ifc) >= 0) /* > is for System V */ ++ if (ifc.ifc_len + sizeof(*ifr) + 64 < len) { /* what a stupid interface */ ++ buf.len = ifc.ifc_len; ++ break; ++ } ++ if (len > 200000) { close(s); return -1; } ++ len += 100 + (len >> 2); ++ } + } + x = buf.s; + while (x < buf.s + buf.len) { +-- +2.16.4 + +From 9d6c05d092e3cf94a6591cd5420f8026fcd4691f Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer <eike@sf-mail.de> +Date: Thu, 29 Aug 2019 20:37:03 +0200 +Subject: [PATCH 2/2] ipme: fix detection of multiple IP addresses on the same + link + +The problem was that the code did another ioctl() to check if the link is +actually up, and when doing this overwrites the information it is currently +looking at. The code when sa_len is available copies the current IP address out +before checking if the link is up. Reorder the code so both branches share more +code and both work. +--- + CHANGES | 2 ++ + ipme.c | 14 +++----------- + 2 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/ipme.c b/ipme.c +index d88785d..e163f5b 100644 +--- a/ipme.c ++++ b/ipme.c +@@ -89,6 +89,9 @@ int ipme_init() + len = sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len; + if (len < sizeof(*ifr)) + len = sizeof(*ifr); ++#else ++ len = sizeof(*ifr); ++#endif + if (ifr->ifr_addr.sa_family == AF_INET) { + sin = (struct sockaddr_in *) &ifr->ifr_addr; + byte_copy(&ix.ip,4,&sin->sin_addr); +@@ -96,17 +99,6 @@ int ipme_init() + if (ifr->ifr_flags & IFF_UP) + if (!ipalloc_append(&ipme,&ix)) { close(s); return 0; } + } +-#else +- len = sizeof(*ifr); +- if (ioctl(s,SIOCGIFFLAGS,x) == 0) +- if (ifr->ifr_flags & IFF_UP) +- if (ioctl(s,SIOCGIFADDR,x) == 0) +- if (ifr->ifr_addr.sa_family == AF_INET) { +- sin = (struct sockaddr_in *) &ifr->ifr_addr; +- byte_copy(&ix.ip,4,&sin->sin_addr); +- if (!ipalloc_append(&ipme,&ix)) { close(s); return 0; } +- } +-#endif + x += len; + } + close(s); +-- +2.16.4 + diff --git a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch index 52f3d8e9a957..c107db0480f9 100644 --- a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch +++ b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch @@ -1,5 +1,5 @@ ---- genqmail-20080406.orig/ssl/mkservercert.orig 2015-10-18 12:46:40.082559295 -0200 -+++ genqmail-20080406/ssl/mkservercert 2015-10-18 12:49:03.749576181 -0200 +--- a/genqmail-20080406/ssl/mkservercert.orig 2015-10-18 12:46:40.082559295 -0200 ++++ b/genqmail-20080406/ssl/mkservercert 2015-10-18 12:49:03.749576181 -0200 @@ -5,7 +5,7 @@ # Based on mkimapdcert from courier-imap. diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml index 3bed043ffa57..c6d666316346 100644 --- a/mail-mta/netqmail/metadata.xml +++ b/mail-mta/netqmail/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>eike@sf-mail.de</email> + <name>Rolf Eike Beer</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="authcram">Enable AUTHCRAM support</flag> <flag name="gencertdaily">Generate SSL certificates daily instead of diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild b/mail-mta/netqmail/netqmail-1.06-r2.ebuild index 076e9266515f..d0a6074fd8f8 100644 --- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild @@ -43,6 +43,15 @@ RESTRICT="test" DEPEND=" !mail-mta/qmail + acct-group/nofiles + acct-group/qmail + acct-user/alias + acct-user/qmaild + acct-user/qmaill + acct-user/qmailp + acct-user/qmailq + acct-user/qmailr + acct-user/qmails net-mail/queue-repair ssl? ( dev-libs/openssl:0= ) sys-apps/groff @@ -77,8 +86,6 @@ pkg_setup() { eerror die "QMAIL_PATCH_DIR is not supported anymore" fi - - qmail_create_users } src_unpack() { diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild index aa64d3d57d5e..913f34b6ea27 100644 --- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild @@ -43,6 +43,15 @@ RESTRICT="test" DEPEND=" !mail-mta/qmail + acct-group/nofiles + acct-group/qmail + acct-user/alias + acct-user/qmaild + acct-user/qmaill + acct-user/qmailp + acct-user/qmailq + acct-user/qmailr + acct-user/qmails net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) @@ -81,8 +90,6 @@ pkg_setup() { eerror die "QMAIL_PATCH_DIR is not supported anymore" fi - - qmail_create_users } src_unpack() { diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild b/mail-mta/netqmail/netqmail-1.06-r6.ebuild index f58a3c0abad7..196164f97d71 100644 --- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild @@ -28,12 +28,14 @@ HOMEPAGE=" SRC_URI="mirror://qmail/${P}.tar.gz https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F} https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS} - http://inoa.net/qmail-tls/${QMAIL_TLS_CVE} - http://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch !vanilla? ( highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} ) qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} ) - ssl? ( https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F} ) + ssl? ( + https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F} + http://inoa.net/qmail-tls/${QMAIL_TLS_CVE} + https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch + ) ) " @@ -46,6 +48,15 @@ RESTRICT="test" DEPEND=" !mail-mta/qmail + acct-group/nofiles + acct-group/qmail + acct-user/alias + acct-user/qmaild + acct-user/qmaill + acct-user/qmailp + acct-user/qmailq + acct-user/qmailr + acct-user/qmails net-mail/queue-repair ssl? ( !libressl? ( >=dev-libs/openssl-1.1:0= ) @@ -81,12 +92,10 @@ pkg_setup() { eerror eerror "The QMAIL_PATCH_DIR variable for custom patches" eerror "has been removed from ${PN}. If you need custom patches" - eerror "you should create a copy of this ebuild in an overlay." + eerror "see 'user patches' in the portage manual." eerror die "QMAIL_PATCH_DIR is not supported anymore" fi - - qmail_create_users } src_unpack() { diff --git a/mail-mta/netqmail/netqmail-1.06-r7.ebuild b/mail-mta/netqmail/netqmail-1.06-r7.ebuild new file mode 100644 index 000000000000..10a852843631 --- /dev/null +++ b/mail-mta/netqmail/netqmail-1.06-r7.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GENQMAIL_PV=20080406 +QMAIL_SPP_PV=0.42 + +QMAIL_TLS_PV=20190114 +QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch +QMAIL_TLS_CVE=vu555316.patch + +QMAIL_BIGTODO_PV=103 +QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch + +QMAIL_LARGE_DNS='qmail-103.patch' + +QMAIL_SMTPUTF8='qmail-smtputf8.patch' + +inherit qmail + +DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent" +HOMEPAGE=" + http://netqmail.org + https://cr.yp.to/qmail.html + http://qmail.org +" +SRC_URI="mirror://qmail/${P}.tar.gz + https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F} + https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS} + !vanilla? ( + highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} ) + qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} ) + ssl? ( + https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F} + http://inoa.net/qmail-tls/${QMAIL_TLS_CVE} + https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch + ) + ) +" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" +IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla" +REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )" +RESTRICT="test" + +DEPEND=" + acct-group/nofiles + acct-group/qmail + acct-user/alias + acct-user/qmaild + acct-user/qmaill + acct-user/qmailp + acct-user/qmailq + acct-user/qmailr + acct-user/qmails + net-dns/libidn2 + net-mail/queue-repair + sys-apps/gentoo-functions + sys-apps/groff + ssl? ( + !libressl? ( >=dev-libs/openssl-1.1:0= ) + libressl? ( dev-libs/libressl:= ) + ) +" +RDEPEND="${DEPEND} + >=net-mail/dot-forward-0.71-r3 + >=sys-apps/ucspi-tcp-0.88-r17 + virtual/checkpassword + virtual/daemontools + authcram? ( >=net-mail/cmd5checkpw-0.30 ) + ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/mini-qmail + !mail-mta/msmtp[mta] + !mail-mta/nullmailer + !mail-mta/opensmtpd + !mail-mta/postfix + !mail-mta/qmail-ldap + !mail-mta/sendmail + !mail-mta/ssmtp[mta] +" + +pkg_setup() { + if [[ -n "${QMAIL_PATCH_DIR}" ]]; then + eerror + eerror "The QMAIL_PATCH_DIR variable for custom patches" + eerror "has been removed from ${PN}. If you need custom patches" + eerror "see 'user patches' in the portage manual." + eerror + die "QMAIL_PATCH_DIR is not supported anymore" + fi +} + +src_unpack() { + genqmail_src_unpack + use qmail-spp && qmail_spp_src_unpack + + unpack ${P}.tar.gz +} + +PATCHES=( + "${FILESDIR}/${PV}-exit.patch" + "${FILESDIR}/${PV}-readwrite.patch" + "${DISTDIR}/${QMAIL_LARGE_DNS}" + "${FILESDIR}/${PV}-fbsd-utmpx.patch" + "${FILESDIR}/${P}-ipme-multiple.patch" +) + +src_prepare() { + if ! use vanilla; then + if use ssl; then + # This patch contains relative paths and needs to be cleaned up. + sed 's~^--- \.\./\.\./~--- ~g' \ + < "${DISTDIR}"/${QMAIL_TLS_F} \ + > "${T}"/${QMAIL_TLS_F} || die + PATCHES+=( "${T}/${QMAIL_TLS_F}" + "${DISTDIR}/${QMAIL_TLS_CVE}" + "${FILESDIR}/qmail-smtputf8.patch" + ) + fi + if use highvolume; then + PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" ) + fi + + if use qmail-spp; then + if use ssl; then + SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff" + else + SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff" + fi + # make the patch work with "-p1" + sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die + + PATCHES+=( "${SPP_PATCH}" ) + fi + fi + + default + + pushd "${WORKDIR}" >/dev/null || die + use qmail-spp && eapply "${FILESDIR}/genqmail-20080406-ldflags.patch" + eapply "${FILESDIR}"/use-new-path-for-functions.sh.patch + popd >/dev/null || die + + qmail_src_postunpack + + # Fix bug #33818 but for netqmail (Bug 137015) + if ! use authcram; then + einfo "Disabled CRAM_MD5 support" + sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die + else + einfo "Enabled CRAM_MD5 support" + fi + + ht_fix_file Makefile* +} + +src_compile() { + qmail_src_compile + use qmail-spp && qmail_spp_src_compile +} + +src_install() { + qmail_src_install +} + +pkg_postinst() { + qmail_queue_setup + qmail_rootmail_fixup + qmail_tcprules_build + + qmail_config_notice + qmail_supervise_config_notice + elog + elog "If you are looking for documentation, check those links:" + elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail" + elog " -- qmail/vpopmail Virtual Mail Hosting System Guide" + elog "http://www.lifewithqmail.com/" + elog " -- Life with qmail" + elog +} + +pkg_preinst() { + qmail_tcprules_fixup +} + +pkg_config() { + # avoid some weird locale problems + export LC_ALL=C + + qmail_config_fast + qmail_tcprules_config + qmail_tcprules_build + + use ssl && qmail_ssl_generate +} |