From owner-freebsd-stable@FreeBSD.ORG Tue Nov 27 12:16:24 2012 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48712FF5 for ; Tue, 27 Nov 2012 12:16:24 +0000 (UTC) (envelope-from fluca1978@gmail.com) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx1.freebsd.org (Postfix) with ESMTP id DFAD48FC08 for ; Tue, 27 Nov 2012 12:16:23 +0000 (UTC) Received: by mail-vc0-f182.google.com with SMTP id fo13so16694835vcb.13 for ; Tue, 27 Nov 2012 04:16:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=celpPDmNMeLUAh19CaGPMK6NL4OdNzyPLlyiji8bhVQ=; b=Zkf76y+G4kdQUa4HUxfd0yP41BJELKynAmTFNAo+P+5LQLYLJoIu7Qyjr81XuaP5PO JuIINo57J6R9woL8dzaHHlSvWkbCGfFjMhKeb4BRbAKVQ/o7Qzmr3KlCzUrAhNQvBExb OgQbWo5mKEfzIzmTpNmfHO5igvSzY9Z9k92qHbCvFI+Cpoa1PBzouNssRJM3mz6ZPfaZ 5QavDBtvk9iYw3/ZZJZSXO7cuN7CL3mvhi8aJ1y40nFnNTgsmM5ulP6cf/4USWMD4q6h wCZTsiPDhfSiEHerWRiTZhg0Ik5SGUT/rEcpBbApRloTUC6rlILCKrlIQ0td2OJu7rch BI0w== MIME-Version: 1.0 Received: by 10.52.77.101 with SMTP id r5mr20827274vdw.25.1354018582885; Tue, 27 Nov 2012 04:16:22 -0800 (PST) Sender: fluca1978@gmail.com Received: by 10.220.2.137 with HTTP; Tue, 27 Nov 2012 04:16:22 -0800 (PST) In-Reply-To: References: Date: Tue, 27 Nov 2012 13:16:22 +0100 X-Google-Sender-Auth: 5f0HthO7FLGt2sZ22hnMKbCcrBM Message-ID: Subject: Re: simple patch for portsnap to use wget From: Luca Ferrari To: freebsd-stable@freebsd.org Content-Type: multipart/mixed; boundary=20cf307abd93a6f68604cf79047d X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 12:16:24 -0000 --20cf307abd93a6f68604cf79047d Content-Type: text/plain; charset=ISO-8859-1 I did a little review and now it is possible to specify to use wget or not using the portsnap.conf file, as well as the option to ingore certificate checking even if I don't believe this is correct. Therefore portsnap with this patch could work with either wget or phttpget, even if I'm not able to test if the laminating is still correct for phttpget (someone could test please?). Regards, Luca --20cf307abd93a6f68604cf79047d Content-Type: application/octet-stream; name="portsnap.conf.patch" Content-Disposition: attachment; filename="portsnap.conf.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ha0zord80 MzZhMzcsNDYKPiAKPiAjIEVuYWJsZSB0aGlzIG9wdGlvbiBpZiB5b3Ugd2FudCBwb3J0c25hcCB0 byB1c2Ugd2dldCgxKQo+ICMgaW5zdGVhZCBvZiB0aGUgc3RhbmRhcmQgcGh0dHBnZXQgcHJvZ3Jh bSB0byBkb3dubG9hZAo+ICMgYWxsIHRoZSByZXF1aXJlZCBmaWxlcy4KPiBXR0VUX0VOQUJMRT0i WUVTIgo+IAo+ICMgSWYgdXNpbmcgd2dldCgxKSBhbmQgZGVhbGluZyB3aXRoIHNpdGVzIHdpdGgg c2VsZi1zaWduZWQgY2VydGlmaWNhdGVzCj4gIyB0dXJuIG9uIHRoaXMgb3B0aW9uIHRvIGFsbG93 IHdnZXQoMSkgdG8gc2tpcCBjaGVja2luZyB0aGUgY2VydGlmaWNhdGUuCj4gIyBXQVJOSU5HOiB0 aGlzIGNvdWxkIGJlIGEgcmlza3kgd2F5IG9mIHVwZGF0aW5nIHRoZSBzeXN0ZW0hISEhCj4gI1dH RVRfQ0hFQ0tfQ0VSVElGSUNBVEVTPSJZRVMiClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo= --20cf307abd93a6f68604cf79047d Content-Type: application/octet-stream; name="portsnap.patch" Content-Disposition: attachment; filename="portsnap.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ha0zordo1 MTk1YTE5NiwyMDYKPiAJCSMgaGFuZGxpbmcgd2dldCBzcGVjaWZpYyBleHRlbnNpb24KPiAJCWZv ciB3Z2V0WCBpbiBXR0VUX0VOQUJMRSBXR0VUX0NIRUNLX0NFUlRJRklDQVRFUzsgZG8KPiAJCSAg ICBldmFsIF89XCQke3dnZXRYfQo+IAkJCWlmIFsgLXogIiR7X30iIF07IHRoZW4KPiAJCQkJZXZh bCAke3dnZXRYfT1gZ3JlcCAiXiR7d2dldFh9PSIgIiR7Q09ORkZJTEV9IiB8Cj4gCQkJCSAgICBj dXQgLWYgMi0gLWQgJz0nIHwgdGFpbCAtMSB8IHRyICdbOmxvd2VyOl0nICdbOnVwcGVyOl0nYAo+ IAkJCWZpCj4gCQlkb25lCj4gCQkKPiAKPiAKMjY4YzI3OSwyOTgKPCAJUEhUVFBHRVQ9L3Vzci9s aWJleGVjL3BodHRwZ2V0Ci0tLQo+IAo+IAkjIGRvIHdlIG5lZWQgdGhlIHVzYWdlIG9mIHdnZXQo MSkgaW5zdGVhZCBvZiB0aGUKPiAJIyBkZWZhdWx0IHBodHRwZ2V0Pwo+IAlpZiBbICIke1dHRVRf RU5BQkxFfSIgPSAiWUVTIiBdCj4gCXRoZW4KPiAJICAgIFBIVFRQR0VUPS91c3IvbG9jYWwvYmlu L3dnZXQKPiAJICAgIFBIVFRQR0VUX09QVFM9IiIKPiAKPiAJICAgICMgc2tpcCBjaGVja2luZyBj ZXJ0aWZpY2F0ZXMsIHJlYWxseSBkYW5nZXJvdXMhCj4gCSAgICBpZiBbICEgLXogIiR7V0dFVF9D SEVDS19DRVJUSUZJQ0FURVN9IiAtYSAiJHtXR0VUX0NIRUNLX0NFUlRJRklDQVRFU30iID0gIk5P IiBdCj4gCSAgICB0aGVuCj4gCQlQSFRUUEdFVF9PUFRTPSIke1BIVFRQR0VUX09QVFN9IC0tbm8t Y2hlY2stY2VydGlmaWNhdGUgIgo+IAkJZWNobyAiV0FSTklORzogY2hlY2sgb2YgY2VydGlmaWNh dGVzIGlzIGRpc2FibGVkIGFzIHNwZWNpZmllZCBieSBvcHRpb24gV0dFVF9DSEVDS19DRVJUSUZJ Q0FURVMgaW4gJENPTkZGSUxFIgo+IAkgICAgZmkKPiAJZWxzZQo+IAkgICAgUEhUVFBHRVQ9L3Vz ci9saWJleGVjL3BodHRwZ2V0Cj4gCWZpCj4gCj4gCWNoZWNrX2Rvd25sb2FkZXIKPiAJZWNobyAi V2lsbCB1c2UgWyRQSFRUUEdFVF0gYXMgZG93bmxvYWRlciIKNjg3LDY5MGM3MTcsNzIyCjwgCXRy ICd8JyAnLScgPCBwYXRjaGxpc3QgfAo8IAkgICAgbGFtIC1zICJ0cC8iIC0gLXMgIi5neiIgfAo8 IAkgICAgeGFyZ3MgJHtYQVJHU1R9ICR7UEhUVFBHRVR9ICR7U0VSVkVSTkFNRX0JXAo8IAkgICAg Mj4ke1NUQVRTUkVESVJ9IHwgZmV0Y2hfcHJvZ3Jlc3MKLS0tCj4gCj4gCWZvciBjdXJyZW50X2Zp bGUgaW4gYHRyICd8JyAnLScgPCBwYXRjaGxpc3QgfCBsYW0gLXMgInRwLyIgLSAtcyAiLmd6ImAK PiAJZG8KPiAJICAgIGVjaG8gJHtQSFRUUEdFVH0gJHtQSFRUUEdFVF9PUFRTfSAke1NFUlZFUk5B TUV9LyR7Y3VycmVudF9maWxlfSA+IC9kZXYvbnVsbCAyPiYxCj4gCWRvbmUKPiAKNzIxLDcyNGM3 NTMsNzYwCjwgCWVjaG8gJHtOREVCVUd9ICJtZXRhZGF0YSBmaWxlcy4uLiAiCjwgCWxhbSAtcyAi Zi8iIC0gLXMgIi5neiIgPCBmaWxlbGlzdCB8CjwgCSAgICB4YXJncyAke1hBUkdTVH0gJHtQSFRU UEdFVH0gJHtTRVJWRVJOQU1FfQlcCjwgCSAgICAyPiR7UVVJRVRSRURJUn0KLS0tCj4gCWVjaG8g JHtOREVCVUd9ICJtZXRhZGF0YSBmaWxlcy4uLiIKPiAKPiAJIyBmZXRjaCBtZXRhZGF0YSBmaWxl cyB1c2luZyB3Z2V0IGJlaGluZCBhIHByb3h5Cj4gCWZvciBjdXJyZW50X2ZpbGUgaW4gYGNhdCBm aWxlbGlzdGAKPiAJZG8KPiAJICAgIGVjaG8gJHtQSFRUUEdFVH0gICR7UEhUVFBHRVRfT1BUU30g JHtTRVJWRVJOQU1FfS9mLyR7Y3VycmVudF9maWxlfS5neiAgPiAvZGV2L251bGwgMj4mMQo+IAlk b25lCj4gCSAgICAKNzYzLDc2NWM3OTksODA0CjwgCXRyICd8JyAnLScgPCBwYXRjaGxpc3QgfCBs YW0gLXMgImJwLyIgLSB8CjwgCSAgICB4YXJncyAke1hBUkdTVH0gJHtQSFRUUEdFVH0gJHtTRVJW RVJOQU1FfQlcCjwgCSAgICAyPiR7U1RBVFNSRURJUn0gfCBmZXRjaF9wcm9ncmVzcwotLS0KPiAK PiAJIyBmZXRjaCBtZXRhZGF0YSBmaWxlcyB1c2luZyB3Z2V0IGJlaGluZCBhIHByb3h5Cj4gCWZv ciBjdXJyZW50X2ZpbGUgaW4gYHRyICd8JyAnLScgPCBwYXRjaGxpc3QgfCBsYW0gLXMgImJwLyIg LSAtcyAiLmd6ImAKPiAJZG8KPiAJICAgIGVjaG8gJHtQSFRUUEdFVH0gICR7UEhUVFBHRVRfT1BU U30gJHtTRVJWRVJOQU1FfS8ke2N1cnJlbnRfZmlsZX0gID4gL2Rldi9udWxsIDI+JjEKPiAJZG9u ZQo3OTQsNzk2YzgzMyw4MzcKPCAJbGFtIC1zICJmLyIgLSAtcyAiLmd6IiA8IGZpbGVsaXN0IHwK PCAJICAgIHhhcmdzICR7WEFSR1NUfSAke1BIVFRQR0VUfSAke1NFUlZFUk5BTUV9CVwKPCAJICAg IDI+JHtRVUlFVFJFRElSfQotLS0KPiAJIyBmZXRjaCBtZXRhZGF0YSBmaWxlcyB1c2luZyB3Z2V0 IGJlaGluZCBhIHByb3h5Cj4gCWZvciBjdXJyZW50X2ZpbGUgaW4gYGxhbSAtcyAiZi8iIC0gLXMg Ii5neiIgPCBmaWxlbGlzdGAKPiAJZG8KPiAJICAgICR7UEhUVFBHRVR9ICAke1BIVFRQR0VUX09Q VFN9ICR7U0VSVkVSTkFNRX0vJHtjdXJyZW50X2ZpbGV9ICA+IC9kZXYvbnVsbCAyPiYxCj4gCWRv bmUKOTk3YTEwMzksMTA3OQo+ICMgY2hlY2sgdGhhdCB0aGUgZG93bmxvYWRlciBwcm9ncmFtIGlz IHNldCBpbnRvIHRoZSB2YXJpYWJsZSBQSFRUUEdFVAo+ICMgYW5kIHRoYXQgaXMgZXhlY3V0YWJs ZSAoaW4gdGhlIGNhc2Ugb2Ygd2dldCgxKSBpdCBtdXN0IGJlIGF2YWlsYWJsZSBvbgo+ICMgdGhl IHN5c3RlbS4KPiAjCj4gIyBJbiB0aGUgY2FzZSB0aGUgZG93bmxvYWRlciBwcm9ncmFtIGlzIG5v dCB1c2FibGUgdGhlIHByb2dyYW0gd2lsbCBiZSBhYm9ydGVkCj4gIyB3aXRoIHRoZSBmb2xsb3dp bmcgZXhpdCBjb2RlczoKPiAjIDk5ID0gUEhUVFBHRVQgaW50ZXJuYWwgdmFyaWFibGUgbm90IHNl dAo+ICMgOTggPSBwcm9ncmFtIGRvZXMgbm90IGV4aXN0Cj4gIyA5NyA9IHByb2dyYW0gaXMgbm90 IGV4ZWN1dGFibGUKPiAjCj4gIwo+IGNoZWNrX2Rvd25sb2FkZXIoKXsKPiAgICAgc2hvdWxkX2V4 aXQ9MAo+IAo+ICAgICBpZiBbIC16ICIke1BIVFRQR0VUfSIgXQo+ICAgICB0aGVuCj4gCWVjaG8g IlRoZSBkb3dubG9hZGVyIHByb2dyYW0gaXMgbm90IHNldCBpbnRvIHRoZSBQSFRUUEdFVCB2YXJp YWJsZSEiCj4gCXNob3VsZF9leGl0PTk5Cj4gICAgIGVsc2UKPiAJaWYgWyAhIC1mICIke1BIVFRQ R0VUfSIgXQo+IAl0aGVuCj4gCSAgICBlY2hvICJUaGUgZG93bmxvYWRlciBwcm9ncmFtICRQSFRU UEdFVCBkb2VzIG5vdCBleGlzdHMhIgo+IAkgICAgZWNobyAiU2VlIGhlcmU6ICIgYHdoZXJlaXMg IiRQSFRUUEdFVCJgCj4gCSAgICBzaG91bGRfZXhpdD05OAo+IAllbHNlCj4gCSAgICBpZiBbICEg LXggIiR7UEhUVFBHRVR9IiBdCj4gCSAgICB0aGVuCj4gCQllY2hvICJUaGUgZG93bmxvYWRlciBw cm9ncmFtICRQSFRUUEdFVCBpcyBub3QgZXhlY3V0YWJsZSEiCj4gCQlzaG91bGRfZXhpdD05Nwo+ IAkgICAgZmkKPiAJZmkKPiAgICAgZmkKPiAKPiAgICAgaWYgWyAkc2hvdWxkX2V4aXQgLWd0IDAg XQo+ICAgICB0aGVuCj4gCWVjaG8gInBvcnRzbmFwIGNhbm5vdCBjb250aW51ZSwgc29ycnkiCj4g CWV4aXQgJHNob3VsZF9leGl0Cj4gICAgIGZpCj4gfQo+IAo+IAo= --20cf307abd93a6f68604cf79047d--