Fix security bug #372967. Also fixes bugs #335077, #331901, #370611, #403893, #404225.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64

10 files changed, 219 insertions, 29 deletions

diff --git a/mail-mta/netqmail/ChangeLog b/mail-mta/netqmail/ChangeLog
index 35094576c6b2..40c1f8925eec 100644
--- a/mail-mta/netqmail/ChangeLog
+++ b/mail-mta/netqmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/netqmail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.62 2013/04/15 22:55:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.63 2013/05/27 00:45:52 robbat2 Exp $
+
+*netqmail-1.06-r2 (27 May 2013)
+
+  27 May 2013; Robin H. Johnson <robbat2@gentoo.org>
+  +files/genqmail-20080406-ldflags.patch, +netqmail-1.06-r2.ebuild,
+  files/conf-common, files/conf-qmqpd, files/conf-qmtpd, files/conf-smtpd,
+  files/servercert.cnf, netqmail-1.06-r1.ebuild:
+  Fix security bug #372967. Also fixes bugs #335077, #331901, #370611, #403893,
+  #404225.
 
 *netqmail-1.06-r1 (15 Apr 2013)
 
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index f5f1d94977a9..f3688066f0f8 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,13 +1,14 @@
 AUX 1.06-exit.patch 551 SHA256 400ab4719d145e29b08d266b38766b80d894d5473e4c4f3b5e436916a36a4333 SHA512 9623d4c045d1399ca035ad49f82e50a344529edffaf7c0e2f1015fe0958dfaf8814462a70b944403203d84b86852e8a01f6a3c4688228b45443258dc908e9236 WHIRLPOOL 9e7df2a478efe792fb6b392429ce32e2920baeaa4a7082493a7ddb208927d344185ddab245e2b92ec05c5471c08c18d4b75f04f093849c2305d140f8cde13a83
 AUX 1.06-readwrite.patch 237 SHA256 71b60967ca83d9c8ac0ae041298ade87174930472f4eb2628a26e30665aafd35 SHA512 4cfb7991f2b30740d007a655743e77f5271ebefb4ed31ceb44d10ee53168eec713bbe64ff3616c372851c5fe1f04e57601dc83a27f1ce9cccdd0e2fbc942b550 WHIRLPOOL 34768aaa96a56b324755187b8edc64cbd84afa3562bd7f01cf136c4c8fd91999e351221d7bb5379977887c6128efeec581b20b34f7a8e597971c25e5e1cb84d9
 AUX 99qmail 137 SHA256 b721c405ab3a13803c4647b98a3c0ffbdfb450e4a0f9e5476c1633470b0d6e50 SHA512 8b97ad912f350b7c3673b3cf3837fe9bbfbcd4bd31b67bf016a29ceb7efff6472c9edc7416edd3cc80a851aba6e894731e09d542224e14198fd3f6b320242290 WHIRLPOOL c9a718b7987d586b09859f9233fc4e5b32931e8a00b9fc9090caef804598ac423ca68336a7f14faf48f73e2a24dab15a973676fc01e837894e3c6dc9dcfc45c6
-AUX conf-common 2375 SHA256 c51efbf910e000659ce38c0fa6c1647bad966a9e53a3a3f58d5049c7fec4c126 SHA512 335c0fc13dbc6b19f39bfcf304d4dce337e63ac82cf5cfd115700cdffa066abbc503c4169233395cc3ccd740d9df67915f9231ea80d8226a298eb6c801effff4 WHIRLPOOL 23cedfa4c50bf43c5ec6202bc19b8f5648b7d27321810c094ff7f3da095b9f4a85d0fa764f37696c9b88c4cc42b4d0560c54cf433fb5447b804d7157e2aa81d4
+AUX conf-common 2428 SHA256 1b04a7e6de7298bd469f19a08b2a03e3efa6f61e51ac0ee3e807bd7fa26a2925 SHA512 614214d4d0cb103acb826fe3bc2bf8d781be9f91448692e5ed868c55398e10b4fda1e71cb59585856dedbe7356aee31c50e258521a4bd16da8722964be2acd12 WHIRLPOOL 6c51e9ae45c6456e46c9fb4a8dd71482b64a051758cf17e528bdde97e4de6db82144ad5ea202c16cffadac4d06a265a58cc71f31ccd21f9325444153eeef080f
 AUX conf-pop3d 1205 SHA256 92100277f9858cd65711fcae9662ef72d40a769b84f2ed9814e2062102836d76 SHA512 94f894b269db00f4bde1993b9718f3c1f9bfb92692feacc203d753b1d0ab5f06a08558cdf4a5b528fdf8dd894e79a67e34bbd3b2537dbf604a646a85d01e05dd WHIRLPOOL c3496bd451a2fd945c0c05552883d15b56dbe91df57e1b395bffb57c019877aeefbd240420d9506ee4232f1846cea0f4d58853abc7be2f9833d43e60e07c32f4
-AUX conf-qmqpd 463 SHA256 98ffb06e09db4329cbfb722446e18e9a127c4043b93cbbd9406cdf2c9841f381 SHA512 b81fec80b72fa1c5887f893a669a8fff88cc15f1602addd08ef0c199459dc903c5438897b14a998fcdb9d896e5ab5d8e7733a0633cea85556f974dee16be707b WHIRLPOOL 71bbb53ac5bb77c153b7f6b3572d5e70a173f11ff27066aee7898ecd61f6866146884eb565bc7e4c6f600932f958bbc909d198669d10a6cf056e3ab5810866d1
-AUX conf-qmtpd 555 SHA256 c46f2d4f0819f87a6f2e49d6d3499381f2aab36edd116a2ee20bd14cb0cb64d6 SHA512 926e2616ded8794f159fe9da850ada088f492007cfb63e9e0f27c21622a1989c1b42b57775cbf9427f863391e79bc593d043bf901192070da4afccd9c8bc75a8 WHIRLPOOL d48ad59ff80075fec1438f969108b27656b3b06a4f64757cc297ce109e57894c5c312cf1f2e3616ee418be031ec200513b7d2b4f91b5bc6ef007fa8aa2a182a9
+AUX conf-qmqpd 371 SHA256 f9f82206bd26b3999fcadf87324e2a9e449000ba5df47876c8c5892b7cc2914e SHA512 24381dc0bef64937735ba041d4c10313c771f69599af7e4d2ff36e6431157f36e2774f95f19eb718c97cb0448078bf7a9f63a13516b316244e114cdc086f0513 WHIRLPOOL 785277668bd6ab867327a56b84588d9d0456c04ebc824f02f36046f75a731b9df1176b68d3295545e207398e7e3b265e726f93dc5132e26e695e89c1c5f7e2ea
+AUX conf-qmtpd 463 SHA256 7d9b855f5922c38616f75b17903bda9c1d03b82f0860b9db95a4044b660ec59f SHA512 056e1fbebaa93d40068543fc5fc280b36cb5ca90c0b33514fe96b6f0e9265b4eb05e7a8b354f2c29a0bc434e2b58612a7c1b9ba2a91d10caadfe94bd28a8ace1 WHIRLPOOL d43c50ad863950d1127244ddf61ef81c3f4985ea65d0ac07f665e759e950f3e9360fe2b5f2d5d7eb44fa940d2bf6d83cf5f9c473b2d00bb12bbc193b0e284cc2
 AUX conf-send 233 SHA256 c4fcf9e1d82a2bcc95e943aa5f81c91cc14813c1bd9a55aec62b9e2506c50af6 SHA512 1d322a1c4ad44cadf2bf058a3623daf9d252fec4e4b93c6a37f58c75455ed7a85142ac888a52eb2db2b6f6d8f5f2b706b4b796b155d616d0ec03ac731dd4fc11 WHIRLPOOL b1585babb1e4d8272cc5d7358e5b2e9094ff92e473cf716ee4506d9dd038b4dbaed83b40b8936ccdca09743f265bc0de9496845ff8acc54343b9f2823f8decfb
-AUX conf-smtpd 2069 SHA256 b887d8d903f5a6c809fdf2ac548d7e7ba3fd2975a94c189fb0940a3c8872c966 SHA512 57824fb45f2facc5a121527ca0cee71df021016bc2ee3fbb37ee11de1f0abfd94a67c4585ed6314f0acf3302118d3d2c9378715c4c6b2009c0ffe66a01a6b453 WHIRLPOOL 73c021cf29843470960784c061f8576081d9130b45bc999cd32d67e72c7855befcfd4f2ddecc8ca9323b8404a99309ec4d1c82a98a63de4e58fd92cd6413f57b
+AUX conf-smtpd 1977 SHA256 035f6a7c32ecb20ef5dc89c2b1addbc0e34ba82ae884883abd29235cb31d61e1 SHA512 2fad782699f4d0e54a30f3a9f396fbe432a0de5976711732dc99c844d6cdb970cf9bed9b6854c54fe6af50e4676622a1a894f70792137dd9c69cfecdeb62ccba WHIRLPOOL dc81acbc6a91f3639dc6ccde911f7a9e5ce22d00ba4d93e4ac6817a0799d116e0d6694c49715a4bd4c1fab68ccc251113f7e96d455a34779370933985f486d32
 AUX dot-qmail 82 SHA256 ceed2e098092a550d66778241149439871f5518ff2c71dc53ce05308b1a63a06 SHA512 ae2596407f1aff6b428e44032700b2da50b4e76cd015de8453e469a2ef17212865449474595fb78440089ec85b13281c9f0fab66598ca0fab1c27f99afb53c59 WHIRLPOOL 4d2ccdf2468a97888850157bb2bc1e7358bf308590e1a4eb1df69ba5478b0909cf313e4af10710c05a5bf6711694ae9bfafa1663cfe748d4502ca7f57beba355
+AUX genqmail-20080406-ldflags.patch 456 SHA256 595d1aa847ff678754245c292f64b87305f16a175ef1ec030d479c7fb5adcba8 SHA512 2e0061f135bafb6eba363c165e3282992d326a581adbeac5d790fb665b251ed2a2b5febed4987bafd39b33fe8275cc81a3523eb77418543c2bc7923647df1dd5 WHIRLPOOL 00ff535ef475f2d0ab894bce40d4cdfe20b32edb64227abac69a1827ec208c0018262c11b9fe00cb454920bda902e5dcce067e53cf8fa43ac7e2a6b75d1d67db
 AUX mailer.conf 179 SHA256 7f248612dc9bb4ca3f901d6a50b4ffb452deb1eb543da33bca89ed776c95cf23 SHA512 7f7354240d97e20676277796f68f954ab511e019b2be7d42476d82d10dc829b7cf4fbbb03b675e6a4d89734989e826635214285472e344ffd0275a994d0d7fe0 WHIRLPOOL dfa0bd8199b4cfc793414fbc919433e10a497f2275e871fc06ca71db8dffdd98b283c807a18b737b1117ce239aea9642fe24244266c6727ec881727dc9fb36f8
 AUX mkservercert 1444 SHA256 17d5f1f6122b9ef2b31af1b5d2c259601168cd1b09b75645dca634486f799d04 SHA512 d7d20d753a4a45fdc2e63b59ae8a9004642f3b131b0722a8cf9d58ed4f71000e5fd4d53d5954031ee0d8cccd2e7be57d96b59004369db7ce535e69d8c28d34ad WHIRLPOOL c73f95760376735c1db61cbd0868160de56470caa028ec4aa4d5037be1080e61bcb7b9142c8a71f6ea2937af820f3eec5650b07d1c270230084122eb295e3ae5
 AUX qmail-config-system 2085 SHA256 d77a3b498ac2fd88f839edf7b725208446dafa54a396113ffdfbd77d9e34ac38 SHA512 dc892a858aa9c8f63b15ee23c6eef503520031c00bcfd13de1f5551c14509238b9cef57645617f33ecbe70ed0d70c0bc1b76e23f764ff7d11de84a01766f604e WHIRLPOOL f5d25df8e643ff37c1114b4470e40d3f5ea9eddd4608f5a4c982de714601447923ae2927f785ff252bab0817bfe207c6126294bd7ca2c0502bb05c5f9ef74a7f
@@ -22,7 +23,7 @@ AUX run-qmail-send 267 SHA256 03c1cadb582d9810064a848424caf9fd35590260ca517dc144
 AUX run-qmail-send-log 321 SHA256 3977df622fae12b1f4f0fbd9695ccfdfc0063882d6d76fb2b2678351c60713ab SHA512 293548bdefda439d49adc1a3b7aa69a249419e6933971d3b876f3643a90340660c8c4217b50828c9f825e61beae72e8c218990ca25df571cd68bb1e6530cd988 WHIRLPOOL 7fd555a6ead8af79a12d787a46a8ffd5705f07fe25bd2b50ed2d3eea6d1583270e056d44e49a6e01db68a94474e85fbb52366927c4fb54f957c0e508b8669a64
 AUX run-qmail-smtpd 839 SHA256 fda1d42ad010acb316694ce6827286b3daf7bac248ced93847e97cece8ffb12f SHA512 0194f54fb5b840b471e9492b95a4863ee276066cac45638fd562deec672e603a66ac1903fe34cea13d1733dee5a64af8385880fb984624c96468c6b5e1469baf WHIRLPOOL cb4b3c00fd20171e9f31f99b673167e924a5b524ab63d6754372b7ae311a62bf13a6b5563794902636fca1a0e3a5d45f07e892ce8040a1a9640367a7976866f1
 AUX run-qmail-smtpd-log 322 SHA256 c213418ca663ef28260e982f4250d0906ac3ca7991e8380b46b96ff48277cb8c SHA512 8debdd5a03568b6ba02e5168712b5c47f949041115a507d26a73d1064f2a24d3974fabc9d620a8750923776e98b3c06d8afb172a68fed570d92d6beb70dd2084 WHIRLPOOL c78d7d5a83e695d256015c1f21ac59a5df3488b168ddf98003dc49a0312dd265ae7b0edc4fab5705590648e6919f07524f91981c920bfd47002ff38fd96a0e24
-AUX servercert.cnf 1008 SHA256 da0282f96e6dfd886d565c0793975ef0f1114cd59c2f8e310b7b3e7c57d8330c SHA512 bc6e7df14bc79edcfd79b519b98b16f725252058b52ea8d801eaa284af6f52628dc0e0ec425348829fbfc6f9da96beabee94465e6bf0565bd9543dba9781a49a WHIRLPOOL d2319a8bb0eb5fe78dbb4a27691aa2fc1d2ee8b1f6b14de073d05f428a270b22845bf8adf89a8435a38c08894317de9185b025e9e15fc4538439b272cafe8f89
+AUX servercert.cnf 1008 SHA256 97c6b50d0cf31074e11d24aadb8aa3cc29c3f49bfbe62bb810b27d5ac19a9a2c SHA512 aec9f3ef1e91924f32e38409106cfa7631b5ec5668019abff1bbeddf4c8da45e05330f5757e2666b77f49e5bd13d1d28f66404d7b3d5a4130f0bd6494eed7889 WHIRLPOOL fca55b36713dd2ac22328aadfb3ffc934de5a00946ddc649ef67eb7a71dd1689701a9893bac6cccabbeaa3dd3cb56a3403b5301bde3638bcd913b325846d7808
 AUX tcp.pop3.sample 517 SHA256 3f04ad47c10e7466ea9bd18b38bd809066734fb9616858bf75bb95e18e28253c SHA512 c10fb79fbd093ff16f8373a2b193bc9aaa64726baff96cf6ee7bfe7d903b1d3c9c21b038bc2ed079495d1527bc8585aa6a392a3b7f9c0dcaf7f0df3694ac8eff WHIRLPOOL 653512741cd3b81ccc941ca109e96b6ce6182b11dcdc41774c880b2ad79c7cfd9404e1eec00623677632bc05c8107a5cea3cc0db8d7cc93f07d0e6bf5052b934
 AUX tcp.qmqp.sample 571 SHA256 17dc778b0ad88b42f3f15f2bc94d3448b65bd5f436c5f21a92d0012be827cecc SHA512 d3210ed3e1859ceeba6f2ab05d08edce90029fb3f8e288d61a5cb753e335bc004b93738fd6ee63de3700412a3ad9dd6a5da3454292cf0310620d8cf6629849d9 WHIRLPOOL c78905b4e07ca9111b6d8125f1bb1d30af55acd9de8046d39f84e1a0127b48ef50b736cf9a36b8159d6d99817761a25f4566c6ab83197dc46fc5145efb686e6c
 AUX tcp.qmtp.sample 994 SHA256 d5c63cdb489a4675c58d13cd3dd977b874bffcada17861eae149960cb394932c SHA512 076cec99c66296e9ba64ae4133dd90bdcf385e8b2f13b7d450f3b5ba219e6d2b399f82fb5ac6a19cd776f053e2f2f1d1c623fa1d48411c10b935dc35c09c507d WHIRLPOOL 11de73c24e0d1c72e0bededb1c01707d93cc2608233c5b32a4e9d8dac9686e3904ffb197088563935216d6448223769612d59b1195dc7d7b865d013934445392
@@ -36,9 +37,11 @@ DIST netqmail-1.05.tar.gz 252264 SHA256 59788abf252e2da224542c1c8b727311335c61d9
 DIST netqmail-1.06.tar.gz 260941 SHA256 8e7d98d15211fc9f9c28109e942e2268f42a6672d68df92a42f2afa90ff00532 SHA512 de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b WHIRLPOOL 167bd5c290f13bf7d39daae0a6245afa1bcf760b01fd7ffcc88676f02a9ed1013c545c9f87c4d6e05ee7b073c838ee1613f97cb75ae3eab65106e32040d74712
 DIST qmail-103.patch 2104 SHA256 4cad53c7a6628a600c74c36bfee327db5052ca24c222d4013e4dfcd7f427653d SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354 WHIRLPOOL 5785684b98b9d9732ed14aa1b53910746bd09aa93514e0e6ef3d74831c3df8ed0a55f257057488f34a3d462e485b7a4417ed255f66abaff6dd63d881b9230063
 DIST qmail-spp-0.42.tar.gz 18689 SHA256 1518e7e82d10fbbb8ecc520f51daf503edeb9c3a9fb935be65a8185e7b53808d SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf WHIRLPOOL 2f8525bb264fbec4b057bad6d92968e29085fdf10b8538b8e572d81ea8793e74c07c6093d0cc2a34de00b629e797b048007b30e3845dce76829037fdb44f527c
+DIST vu555316.patch 617 SHA256 cc7b2876ecb183fe55c280404c1c825a6bd1f6ccc87db67e7cfc8bc6336f9b0f SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65 WHIRLPOOL 2564d5622576b89918e247de5dd830011e8ef18a50fd03e6f48e98ebf4a53db2f4994eb0fb22a76c4cd0cbb35b457ac2a5507e05159130a72685866137c5ebc1
 EBUILD netqmail-1.05-r4.ebuild 12979 SHA256 d16ad423a4cf1225e2bfe59afa24b93505aa20d6af455de64cdd5940a24267ab SHA512 3961a71917af9cfb5ba4dbcd958fd307a77f515e9fa8ff5b35a34b4cf6420b456df09913fbcc017dd9ed18ff1138d9e3d3365c9b7b23ca97f35faa1c6d0a65c1 WHIRLPOOL 907d36aafcc5eb27a5bab883c265ee87e6a387eb92d92683b5f7530ca6030eedc81e5d4fe55d1d87f85008c25c81f813a22d1b9b91426ef9c8608ff1bdf1931f
 EBUILD netqmail-1.05-r8.ebuild 13572 SHA256 dd6868ef7869cd39d31bdadf4ca23b848a9cbf48fb0bd5e6ac505ec848ccf065 SHA512 990c4024d23fa1a4afa0b06e15eb53c9244a1d86d68daa80f8d966104442eff38c3f0977e9cd2fc9b222cb29006187e19a73e313001e1117d297f46741b5560e WHIRLPOOL 605283149cf85c5c8ef121d171fd2d7abaa3fdea9ce1a9d95fd093ddc2d7ffe50f5941b996bd1abfceda555d2ef791360e19229bd24d4ee51c7a3d688bd41cbc
-EBUILD netqmail-1.06-r1.ebuild 3638 SHA256 5875dae25e3957a5e77abd2329ad8232650f31053d8bc4a57d4a521939025937 SHA512 21842a5f29a7c05e03a3466ed6ffa4f7022041d92c0493589dbf619d700eee9371377ec6ee441fe967042feff1830558c413d790785beacbb251e1813a1fde58 WHIRLPOOL 6ca89f306b3ba8d6c0e3905c995b9d1c7b2e988ff7af192a05b4af813561de2709cc1304ae3ea6fa579be5c1903dea046046ce81904891bf6ebcf3490ca18264
+EBUILD netqmail-1.06-r1.ebuild 3790 SHA256 7ef9de2121ed5c9f50089cdf6bba9bd5e097c2b54d83a570ced730b8ae4fcb84 SHA512 08dd32cd775c99717e1cb6065b00950618514e392ebd8680bc821b783af73ef0d00552061bdffde8a78b818c000058b45a5b1449885fd7ec27b039fcc64aa698 WHIRLPOOL 5e6e5f06329aaf37877996ea52b0c579d2fa0e53e28d54e09cf51622576908757680cd517e7707d6d164e9306ddc654527dd8ca8184bbf996a4c4b27f3d9e5b7
+EBUILD netqmail-1.06-r2.ebuild 4019 SHA256 1845339090efb25fdf7246c56e3bfe4e6c81221751fe1ae06e988f014e78d55d SHA512 535fdfb28819367e91ec754975b74c729f6be690ba306e0bc9958cfdb3fd5232990208cb3ff1e6e03f8fa2b03ba7a8b824d10dcb6f56678a0e635a362346079d WHIRLPOOL 17b059dfbbc69abedfc50914acdcce0d52cd4974c3420485f9704944dd99ad70cc42e0fefda2de4c236fb8ac5f3667e92a96306ff07385e4d1ce6aff0397961b
 EBUILD netqmail-1.06.ebuild 3384 SHA256 d1f33e62d838f5cafdf23e03bfbd53545cfb9425dee6a495eaefcbe6ca57b60c SHA512 5bdfa66e704b2049d519f98a90c575b186b179378f2bdb98f950a0b250e5ed6b4797406eef64b199c72245d72338dcd3e74b70c6a1525a25b0678accb31a17ad WHIRLPOOL ae75b3b9306ac1101362bcddcd892f001fb5e16cccbad26679d43b2cb07b6f9359ca1ede79811fb9600ccd1cc46c277cbd336820cb47e603967c733c0f6f6b62
-MISC ChangeLog 8999 SHA256 eb073055fb88fd471243a97c3613eea3b85e756aa8fcb7965dc13ac7c3e8211d SHA512 361007da646cfedc26e0597e58482e7ccd0781571591e76aacf193efc07332ea5eb189845b93cb53edb325de9d95ccd1b5461bce9b012b09172fe12de8d0535f WHIRLPOOL 4d932a184c71eba25af68f71f8b1666b4bb73d9cb963583b50c4575ee5f741abb754e254aee7a1075433f7535c13da6cbb71e3cfe8812e59e8ab49fb8ca83c15
+MISC ChangeLog 9369 SHA256 6c609cb52ea97335823c7977673501657c7bee1eb1d1777ca1d9bc42ca164b98 SHA512 d6e01e2c22089d2eba403063902a35c02a90016bfc3922b346302b1a3b7858bd239b6a9e10aec14cb21f88c8678852be8566de788e5fd4cd09a458cdb397de97 WHIRLPOOL 05e8f63da9ad9cebf9992271de360a807f5cc4355355ae38e93af623c2f517f92190492830139eb6784934e977c6adecebf977d108502a2040a55120bf2a01df
 MISC metadata.xml 471 SHA256 e6459541b665becde89ffe335f74359b4d5c9ef320fa19bff02afd7ced4305bd SHA512 4f3f1cf6b1ca3db3ee19463f0ffbf46cf933586f9b13b67de7235fbf5de8694cccf1aaca2db8c3a9d71fa6a0bf488f98261103cd61ede5cfe7bf873d2bae67ba WHIRLPOOL 20753ac53327edaf958211a020829e5709c1920f132c7796d26abeb6dd5616e309d338290d369d4d48582f0dda00660aa6c1c2321369b1299302f8d3565b6e7f
diff --git a/mail-mta/netqmail/files/conf-common b/mail-mta/netqmail/files/conf-common
index 613193cc9773..008fe63c3076 100644
--- a/mail-mta/netqmail/files/conf-common
+++ b/mail-mta/netqmail/files/conf-common
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Common Configuration file for all qmail daemons
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-common,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-common,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
 
 # Qmail User IDS to run daemons as
 QMAILDUID=$(id -u qmaild)
@@ -17,7 +17,7 @@ TCPSERVER_PORT=${SERVICE}
 
 # you do not need to specify -x, -c, -u or -g in this variable as those are
 # added later
-TCPSERVER_OPTS="-p -v"
+TCPSERVER_OPTS="-p -v -R"
 
 #  This tells tcpserver where to file the rules cdb file
 [[ -d /etc/tcprules.d/ ]] && \
@@ -25,9 +25,10 @@ TCPSERVER_OPTS="-p -v"
 [[ ! -f "${TCPSERVER_RULESCDB}" ]] && \
 	TCPSERVER_RULESCDB=/etc/tcp.${SERVICE}.cdb
 
-# we limit data and stack segments to 8mbytes, you may need to raise this if
-# you are using a filter in QMAILQUEUE
-SOFTLIMIT_OPTS="-m 16000000"
+# we limit data and stack segments to 32mbytes, you may need to raise this if
+# you are using a filter in QMAILQUEUE. 
+# Per bug #403893 amd64 needs a higher limit.
+SOFTLIMIT_OPTS="-m 32000000"
 
 # We don't have anything to set QMAILQUEUE to at the moment, so we leave it
 # alone. Generally it is best to add this in your appropriate (usually SMTP)
diff --git a/mail-mta/netqmail/files/conf-qmqpd b/mail-mta/netqmail/files/conf-qmqpd
index b3622411dc3a..2b337d930772 100644
--- a/mail-mta/netqmail/files/conf-qmqpd
+++ b/mail-mta/netqmail/files/conf-qmqpd
@@ -1,5 +1,5 @@
 # Configuration file for qmail-qmqpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmqpd,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmqpd,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
 
 # Stuff to run before tcpserver
 #QMAIL_TCPSERVER_PRE=""
@@ -8,8 +8,5 @@
 # Stuff to after qmail-qmqpd
 #QMAIL_QMQP_POST=""
 
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
 # I don't trust /etc/services to have obscure ports
 TCPSERVER_PORT=628
diff --git a/mail-mta/netqmail/files/conf-qmtpd b/mail-mta/netqmail/files/conf-qmtpd
index 7116efc29672..6d6df72e6506 100644
--- a/mail-mta/netqmail/files/conf-qmtpd
+++ b/mail-mta/netqmail/files/conf-qmtpd
@@ -1,5 +1,5 @@
 # Configuration file for qmail-qmtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmtpd,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmtpd,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
 
 # For more information on making your servers talk QMTP
 # see http://cr.yp.to/im/mxps.html
@@ -11,8 +11,5 @@
 # Stuff to after qmail-qmtpd
 #QMAIL_QMTP_POST=""
 
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
 # I don't trust /etc/services to have obscure ports
 TCPSERVER_PORT=209
diff --git a/mail-mta/netqmail/files/conf-smtpd b/mail-mta/netqmail/files/conf-smtpd
index cfbdad49a52d..d7cc2c3d3d59 100644
--- a/mail-mta/netqmail/files/conf-smtpd
+++ b/mail-mta/netqmail/files/conf-smtpd
@@ -1,5 +1,5 @@
 # Configuration file for qmail-smtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-smtpd,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-smtpd,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
 
 # Stuff to run before tcpserver
 #QMAIL_TCPSERVER_PRE=""
@@ -8,9 +8,6 @@
 # Stuff to after qmail-smtpd
 #QMAIL_SMTP_POST=""
 
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
 # fixcrio inserts missing CRs at the ends of lines. See:
 # http://cr.yp.to/ucspi-tcp/fixcrio.html
 # http://cr.yp.to/docs/smtplf.html
diff --git a/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch b/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch
new file mode 100644
index 000000000000..1eb334c259c1
--- /dev/null
+++ b/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch
@@ -0,0 +1,13 @@
+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
+@@ -14,7 +14,7 @@
+ 	rm -f $(TARGETS)
+ 
+ $(RESOLV_OBJS):
+-	$(CC) $(CFLAGS) -o $@ $@.c -lresolv
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c -lresolv
+ 
+ $(SIMPLE_OBJS):
+-	$(CC) $(CFLAGS) -o $@ $@.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c
diff --git a/mail-mta/netqmail/files/servercert.cnf b/mail-mta/netqmail/files/servercert.cnf
index 735445eacc87..aa48938ea655 100644
--- a/mail-mta/netqmail/files/servercert.cnf
+++ b/mail-mta/netqmail/files/servercert.cnf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/servercert.cnf,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/servercert.cnf,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
 # This is the openssl config file to generate keys for qmail
 
 [ req ]
@@ -6,7 +6,7 @@
 # this should be a power of 2!
 default_bits = 1024
 # leave the rest of these alone!
-encrypt_key = yes
+encrypt_key = no
 distinguished_name = req_dn
 x509_extensions = cert_type
 prompt = no
diff --git a/mail-mta/netqmail/netqmail-1.06-r1.ebuild b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
index 3576da46d899..20387d64a909 100644
--- a/mail-mta/netqmail/netqmail-1.06-r1.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.06-r1.ebuild,v 1.1 2013/04/15 22:55:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.06-r1.ebuild,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
 
 EAPI=5
 
@@ -94,7 +94,11 @@ src_prepare() {
 	ht_fix_file Makefile*
 
 	if ! use vanilla; then
-		use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_F}
+		# This patch contains relative paths and needs to be cleaned up.
+		sed 's~^--- ../../~--- ~g' \
+			<"${DISTDIR}"/${QMAIL_TLS_F} \
+			>"${T}"/${QMAIL_TLS_F}
+		use ssl        && epatch "${T}"/${QMAIL_TLS_F}
 		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
 		if use qmail-spp; then
diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
new file mode 100644
index 000000000000..1ea9b1749d5d
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.06-r2.ebuild,v 1.1 2013/05/27 00:45:52 robbat2 Exp $
+
+EAPI=5
+
+GENQMAIL_PV=20080406
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20070417
+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'
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+	http://netqmail.org
+	http://cr.yp.to/qmail.html
+	http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+	http://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+	http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+	http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+	!vanilla? (
+		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+		ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
+RESTRICT="test"
+
+DEPEND="
+	!mail-mta/qmail
+	net-mail/queue-repair
+	ssl? ( dev-libs/openssl )
+	sys-apps/groff
+"
+RDEPEND="
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	>=sys-apps/ucspi-tcp-0.88-r17
+	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+	virtual/daemontools
+	>=net-mail/dot-forward-0.71-r3
+	virtual/checkpassword
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	${DEPEND}
+"
+
+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 "you should create a copy of this ebuild in an overlay."
+		eerror
+		die "QMAIL_PATCH_DIR is not supported anymore"
+	fi
+
+	qmail_create_users
+}
+
+src_unpack() {
+	genqmail_src_unpack
+	use qmail-spp && qmail_spp_src_unpack
+
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-exit.patch
+	epatch "${FILESDIR}"/${PV}-readwrite.patch
+	epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
+
+	ht_fix_file Makefile*
+
+	if ! use vanilla; then
+		# This patch contains relative paths and needs to be cleaned up.
+		sed 's~^--- ../../~--- ~g' \
+			<"${DISTDIR}"/${QMAIL_TLS_F} \
+			>"${T}"/${QMAIL_TLS_F}
+		use ssl        && epatch "${T}"/${QMAIL_TLS_F}
+		use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
+
+		if use qmail-spp; then
+			if use ssl; then
+				epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
+			else
+				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
+			fi
+			cd "${WORKDIR}"
+			epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
+			cd -
+		fi
+	fi
+
+	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
+	else
+		einfo "Enabled CRAM_MD5 support"
+	fi
+}
+
+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 "http://www.gentoo.org/doc/en/qmail-howto.xml"
+	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
+}