Date: Wed, 1 Oct 2003 11:11:05 -0400 From: Vivek Khera <khera@kcilink.com> To: "Sergey A. Osokin" <osa@FreeBSD.org> Cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: ports/57083 - Update mail/postfix to 2.0.16 Message-ID: <16250.61065.150071.620732@yertle.int.kciLink.com> In-Reply-To: <20031001105314.GY39789@freebsd.org.ru> References: <200309291430.h8TEUQTB087360@freefall.freebsd.org> <20031001105314.GY39789@freebsd.org.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
--J6EOwj55ms Content-Type: text/plain; charset=us-ascii Content-Description: message body text Content-Transfer-Encoding: 7bit >>>>> "SAO" == Sergey A Osokin <osa@FreeBSD.org> writes: >> The postfix-2.0-ns-mx-acl-patch.gz conflicts with the TLS patch. when >> the SSL+TLS patch is applied, it fails. there needs to be a way to >> turn off the postfix-2.0-ns-mx-acl-patch for this case. SAO> OK. Here is another version of patch without of SAO> postfix-2.0-ns-mx-acl-patch.gz Actually, it turns out that the conflict was with the TLS patch and postfix 2.0.16. If you update the TLS patch to the latest one for postfix 2.0.16, your original patch works fine. Here's your original patch updated, ready for committing. --J6EOwj55ms Content-Type: application/octet-stream Content-Description: patch for postfix Content-Disposition: attachment; filename="postfix.patch" Content-Transfer-Encoding: base64 ZGlmZiAtUHJ1IHBvc3RmaXgub2xkL01ha2VmaWxlIHBvc3RmaXgvTWFrZWZpbGUKLS0tIHBv c3RmaXgub2xkL01ha2VmaWxlCVR1ZSBTZXAgIDkgMTA6MzU6MTAgMjAwMworKysgcG9zdGZp eC9NYWtlZmlsZQlXZWQgT2N0ICAxIDEwOjM5OjQxIDIwMDMKQEAgLTE1LDcgKzE1LDcgQEAK ICMgTk9URTogUENSRSBpcyBlbmFibGVkIGJ5IGRlZmF1bHQgdW5sZXNzIHlvdSBzcGVjaWZp Y2FsbHkgZGlzYWJsZSBpdC4KIAogUE9SVE5BTUU9CXBvc3RmaXgKLVBPUlRWRVJTSU9OPQky LjAuMTUKK1BPUlRWRVJTSU9OPQkyLjAuMTYKIFBPUlRFUE9DSD0JMQogQ0FURUdPUklFUz0J bWFpbCBpcHY2CiBNQVNURVJfU0lURVM9CWZ0cDovL2Z0cC5wb3JjdXBpbmUub3JnL21pcnJv cnMvcG9zdGZpeC1yZWxlYXNlL29mZmljaWFsLyBcCkBAIC0yNyw2ICsyNyw4IEBACiBNQVNU RVJfU0lURV9TVUJESVI9CS4gb2xkIHJlbGF0ZWQvcG9zdGZpeAogRElTVE5BTUU9CXBvc3Rm aXgtJHtQT1JUVkVSU0lPTn0KIERJU1RfU1VCRElSPQkke1BPUlROQU1FfQorUEFUQ0hfU0lU RVM9CSR7TUFTVEVSX1NJVEVTfQorUEFUQ0hGSUxFUz0JcG9zdGZpeC0yLjAtbnMtbXgtYWNs LXBhdGNoLmd6CiAKIE1BSU5UQUlORVI9CWtoZXJhQGtjaUxpbmsuY29tCiBDT01NRU5UPQlB IHNlY3VyZSBhbHRlcm5hdGl2ZSB0byB3aWRlbHktdXNlZCBTZW5kbWFpbApkaWZmIC1QcnUg cG9zdGZpeC5vbGQvZGlzdGluZm8gcG9zdGZpeC9kaXN0aW5mbwotLS0gcG9zdGZpeC5vbGQv ZGlzdGluZm8JVHVlIFNlcCAgOSAxMDozNToxMCAyMDAzCisrKyBwb3N0Zml4L2Rpc3RpbmZv CVdlZCBPY3QgIDEgMTE6MDg6MTMgMjAwMwpAQCAtMSw1ICsxLDYgQEAKLU1ENSAocG9zdGZp eC9wb3N0Zml4LTIuMC4xNS50YXIuZ3opID0gNzIzYzJiN2Y2NzAxNmUwYzE5YjBlMWFhMDhk YWQyNDYKLU1ENSAocG9zdGZpeC9wZml4dGxzLTAuOC4xNS0yLjAuMTMtMC45LjdiLnRhci5n eikgPSAyOThmNTVlMmQ4OTZhMDI0MGY1OTEzYTNiNjExZTYyMworTUQ1IChwb3N0Zml4L3Bv c3RmaXgtMi4wLjE2LnRhci5neikgPSBhYzEzNzc2NDQyYmE3NzA4ZTY4M2JjMWJmYmFkYWIy ZgorTUQ1IChwb3N0Zml4L3Bvc3RmaXgtMi4wLW5zLW14LWFjbC1wYXRjaC5neikgPSA1NWEz ZDc2ZDUyZmRkZDVjZDAzNjUwMDQ5NTdhMTE2MAorTUQ1IChwb3N0Zml4L3BmaXh0bHMtMC44 LjE2LTIuMC4xNi0wLjkuN2IudGFyLmd6KSA9IGIzOWMwOGVhYmU4MDdkYjRhZjViY2IxY2Fm Yzk3NjFlCiBNRDUgKHBvc3RmaXgvcG9zdGZpeC1wZy5wb3N0Zml4LTIuMC4wLjIucGF0Y2gp ID0gNWEwYWE1ZWY2YTIzMWE1OTNlYjZjNTYyODIzNmEzZTQKLU1ENSAocG9zdGZpeC9pcHY2 LTEuMTctcGYtMi4wLjE0LnBhdGNoLmd6KSA9IDVkYmFmYWU4Njc0NGMxODkzZDFkM2M1MmIz Y2RiY2I3Ci1NRDUgKHBvc3RmaXgvdGxzK2lwdjYtMS4xNy1wZi0yLjAuMTQucGF0Y2guZ3op ID0gYWJhM2MxZDIzMGYxNTkxZTdmN2Y4YzQyNmNlNmIyZmMKK01ENSAocG9zdGZpeC9pcHY2 LTEuMThhLXBmLTIuMC4xNi5wYXRjaC5neikgPSA4ZTBiODVjNmMxMzFkMzY3ZGM1YjBkMGQ5 NWU3ZTJjMQorTUQ1IChwb3N0Zml4L3RscytpcHY2LTEuMThhLXBmLTIuMC4xNi5wYXRjaC5n eikgPSBiMzI4NzZiMWEwMmQzYThmNmE5M2E2NmU1NzRkZGVlNwpkaWZmIC1QcnUgcG9zdGZp eC5vbGQvc2NyaXB0cy9jb25maWd1cmUucG9zdGZpeCBwb3N0Zml4L3NjcmlwdHMvY29uZmln dXJlLnBvc3RmaXgKLS0tIHBvc3RmaXgub2xkL3NjcmlwdHMvY29uZmlndXJlLnBvc3RmaXgJ V2VkIEF1ZyAyNyAxNjoxOTo1OCAyMDAzCisrKyBwb3N0Zml4L3NjcmlwdHMvY29uZmlndXJl LnBvc3RmaXgJV2VkIE9jdCAgMSAxMTowMjoxMyAyMDAzCkBAIC0xMDYsOCArMTA2LDggQEAK IAkJCWVjaG8gIlVTRV9PUEVOU1NMPQl5ZXMiCiAJCQllY2hvICJQT1NURklYX0NDQVJHUys9 CS1ESEFTX1NTTCAtSVwke09QRU5TU0xJTkN9IgogCQkJZWNobyAiUE9TVEZJWF9BVVhMSUJT Kz0JLUxcJHtPUEVOU1NMTElCfSAtbHNzbCAtbGNyeXB0byIKLQkJCWVjaG8gIkRJU1RGSUxF Uys9CVwke0RJU1ROQU1FfS50YXIuZ3ogcGZpeHRscy0wLjguMTUtMi4wLjEzLTAuOS43Yi50 YXIuZ3oiCi0JCQllY2hvICJFWFRSQV9QQVRDSEVTKz0JXCR7V1JLRElSfS9wZml4dGxzLTAu OC4xNS0yLjAuMTMtMC45LjdiL3BmaXh0bHMuZGlmZiIKKwkJCWVjaG8gIkRJU1RGSUxFUys9 CVwke0RJU1ROQU1FfS50YXIuZ3ogcGZpeHRscy0wLjguMTYtMi4wLjE2LTAuOS43Yi50YXIu Z3oiCisJCQllY2hvICJFWFRSQV9QQVRDSEVTKz0JXCR7V1JLRElSfS9wZml4dGxzLTAuOC4x Ni0yLjAuMTYtMC45LjdiL3BmaXh0bHMuZGlmZiIKIAkJCWVjaG8gIlBBVENIX1NUUklQPQkt cDEiCiAJCQllY2hvICJUTFNfU1VGRklYPQkrdGxzIgogCQkJU1VCX1RMUz0iIgpAQCAtMjAz LDcgKzIwMyw3IEBACiAJCQkJZXhpdCAxCiAJCQlmaQogCQkJZWNobyAiUEFUQ0hfU0lURVMr PQlodHRwOi8vd3d3LmlwbmV0Ni5vcmcvcG9zdGZpeC9kb3dubG9hZC8iCi0JCQllY2hvICJQ QVRDSEZJTEVTKz0JaXB2Ni0xLjE3LXBmLTIuMC4xNC5wYXRjaC5neiIKKwkJCWVjaG8gIlBB VENIRklMRVMrPQlpcHY2LTEuMThhLXBmLTIuMC4xNi5wYXRjaC5neiIKIAkJCWVjaG8gIlBB VENIX0RJU1RfU1RSSVA9CS1wMSIKIAkJCWVjaG8gIklQdjZfU1VGRklYPQkraXB2NiIKIAkJ CWVjaG8gIiIKQEAgLTIyMSw3ICsyMjEsNyBAQAogCQkJZWNobyAiUE9TVEZJWF9DQ0FSR1Mr PQktREhBU19TU0wgLUlcJHtPUEVOU1NMSU5DfSIKIAkJCWVjaG8gIlBPU1RGSVhfQVVYTElC Uys9CS1MXCR7T1BFTlNTTExJQn0gLWxzc2wgLWxjcnlwdG8iCiAJCQllY2hvICJQQVRDSF9T SVRFUys9CWh0dHA6Ly93d3cuaXBuZXQ2Lm9yZy9wb3N0Zml4L2Rvd25sb2FkLyIKLQkJCWVj aG8gIlBBVENIRklMRVMrPQl0bHMraXB2Ni0xLjE3LXBmLTIuMC4xNC5wYXRjaC5neiIKKwkJ CWVjaG8gIlBBVENIRklMRVMrPQl0bHMraXB2Ni0xLjE4YS1wZi0yLjAuMTYucGF0Y2guZ3oi CiAJCQllY2hvICJQQVRDSF9ESVNUX1NUUklQPQktcDEiCiAJCQllY2hvICJUTFNfU1VGRklY PQkrdGxzK2lwdjYiCiAJCQlTVUJfVExTPSIiCg== --J6EOwj55ms--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?16250.61065.150071.620732>