From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] ipsec.conf: Include ipsec.user.conf and ipsec.user-post.conf Date: Thu, 04 Jun 2015 18:02:24 +0200 Message-ID: <1433433744.25208.13.camel@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4579906565501565964==" List-Id: --===============4579906565501565964== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Thu, 2015-06-04 at 17:59 +0200, Larsen wrote: > On Thu, 04 Jun 2015 17:53:27 +0200, Michael Tremer > wrote: > > > thank you for sending this in. The patch looks good and I merged it > > already as it is a pretty simple one. > > thx! > > > > However I had again trouble applying it right away. I do not really know > > why. It must some sort of whitespace error because the patch applies > > with patch --ignore-whitespace. So this wasn't a one-time error with the > > last patch. > > For testing purposes, could you please create a patch file from what you > have just merged so I can compare your patch with the file that > Tortoisegit created for me? Sure. You will find that attached for your convenience. > > > Lars -Michael --===============4579906565501565964== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ipsec.conf.patch" MIME-Version: 1.0 Y29tbWl0IGJkNzY3YjI3Yzg1YjJjNjk5MmNhYzM4NzgxYjdiYjc4YTAzYjY5NGEKQXV0aG9yOiBM YXJzIFNjaHVobWFjaGVyIDxsYXJzZW4wMDdAd2ViLmRlPgpEYXRlOiAgIFRodSBKdW4gNCAwMDo1 ODo0OSAyMDE1ICswMjAwCgogICAgaXBzZWMuY29uZjogSW5jbHVkZSBpcHNlYy51c2VyLmNvbmYg YW5kIGlwc2VjLnVzZXItcG9zdC5jb25mCiAgICAKICAgIEZpeCBidWcgMTA4NjkgYXMgdGhlIGNv ZGUgaGFzIGJlZW4gcmVtb3ZlZCBieSBtaXN0YWtlIGJ5IHRoZQogICAgcHJldmlvdXMgY29tbWl0 IGRmZWE0Zjg2YzIyYzgzZTA3ZDBmNGE2ZjJhMDIxNjYyMjllY2IxMjAuCiAgICBJdCBhbHNvIGlu Y2x1ZGVzIGlwc2VjLnVzZXIuY29uZiBvbmx5IHdoZW4gaXQgZXhpc3RzLgogICAgCiAgICBTaWdu ZWQtb2ZmLWJ5OiBMYXJzIFNjaHVobWFjaGVyIDxsYXJzZW4wMDdAd2ViLmRlPgogICAgU2lnbmVk LW9mZi1ieTogTWljaGFlbCBUcmVtZXIgPG1pY2hhZWwudHJlbWVyQGlwZmlyZS5vcmc+CgpkaWZm IC0tZ2l0IGEvaHRtbC9jZ2ktYmluL3Zwbm1haW4uY2dpIGIvaHRtbC9jZ2ktYmluL3Zwbm1haW4u Y2dpCmluZGV4IDk0OTAwNzY1ZjUyMy4uMjE4ZGFmYTI2ODE0IDEwMDY0NAotLS0gYS9odG1sL2Nn aS1iaW4vdnBubWFpbi5jZ2kKKysrIGIvaHRtbC9jZ2ktYmluL3Zwbm1haW4uY2dpCkBAIC0yNTMs OCArMjUzLDEwIEBAIHN1YiB3cml0ZWlwc2VjZmlsZXMgewogICAgIHByaW50IENPTkYgIlxuIjsK IAogICAgICMgQWRkIHVzZXIgaW5jbHVkZXMgdG8gY29uZmlnIGZpbGUKLSAgICBwcmludCBDT05G ICJpbmNsdWRlIC9ldGMvaXBzZWMudXNlci5jb25mXG4iOwotICAgIHByaW50IENPTkYgIlxuIjsK KyAgICBpZiAoLWUgIi9ldGMvaXBzZWMudXNlci5jb25mIikgeworICAgICAgICBwcmludCBDT05G ICJpbmNsdWRlIC9ldGMvaXBzZWMudXNlci5jb25mXG4iOworICAgICAgICBwcmludCBDT05GICJc biI7CisgICAgfQogCiAgICAgcHJpbnQgU0VDUkVUUyAiaW5jbHVkZSAvZXRjL2lwc2VjLnVzZXIu c2VjcmV0c1xuIjsKIApAQCAtNDA3LDYgKzQwOSwxNCBAQCBzdWIgd3JpdGVpcHNlY2ZpbGVzIHsK IAogCXByaW50IENPTkYgIlxuIjsKICAgICB9I2ZvcmVhY2gga2V5CisKKyAgICAjIEFkZCBwb3N0 IHVzZXIgaW5jbHVkZXMgdG8gY29uZmlnIGZpbGUKKyAgICAjIEFmdGVyIHRoZSBHVUktY29ubmVj dGlvbnMgYWxsb3dzIHRvIHBhdGNoIGNvbm5lY3Rpb25zLgorICAgIGlmICgtZSAiL2V0Yy9pcHNl Yy51c2VyLXBvc3QuY29uZiIpIHsKKyAgICAgICAgcHJpbnQgQ09ORiAiaW5jbHVkZSAvZXRjL2lw c2VjLnVzZXItcG9zdC5jb25mXG4iOworICAgICAgICBwcmludCBDT05GICJcbiI7CisgICAgfQor CiAgICAgcHJpbnQgU0VDUkVUUyAkbGFzdF9zZWNyZXRzIGlmICgkbGFzdF9zZWNyZXRzKTsKICAg ICBjbG9zZShDT05GKTsKICAgICBjbG9zZShTRUNSRVRTKTsK --===============4579906565501565964== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlZjSGFRQUFvSkVJQjU4UDl2a0FrSDB0VVAvM21SOEUrVkZkWTEzTklHeDFGamVscHIK ZnZScHdtVTZNWkxVSzV1dXZ6OWVtSVBScWU3MzJid05JbExsdWVkaWJiRU50VkxWc0dLems2ZXgw dWlsdDU3bgpySk5NWVQxLzAwN0I3RmZPUU13cXo2V0dpeFp3TFhlQWcxdC91MUdOSmh3OUZnendN QzE3N0I4eWNHc1oyNHRlCldKd0ZtUkRydWROQ1FTYjkzWWJJdWlZT2laZzVDY3pPZHJyMVp1dFJ2 UWR4b2daL1pmcU5sSXp4eEZaWDU0ZE4KZGZiQyswVElrS2MwSENsYW1kNWZnWVVRaElNTG9jb3lQ QjVXUEl6dlBRTEplNUZmUDNmQ3VrVGZoWnNRZEVDUQp6K3VXdlhSRDZnOWtJUnlBMCsyR0xwTGdK UUdwMExYZGlXMDMxNHdmejJBWUVHWDBqWmJzeHcxbUtPRjc2RU1BCitwN3pHR0p2eHl1QlhaRHhq bkltUHUyRW9nK0dqNTFDS0NQSGpXQmxveXRzLy96a2lGTHBwc1RGaVpFbmo5ZUkKdE5wOUttNll1 UHBuWGZNOU5tcUNsV1ROeC9NQTR1NHJ5Tnd2WGRSMGdpRUVvWHRRWTg5Wklla0hqZ0NuUFg3bQpI cmpVUWVxUHY5eENseEFiNVM3RlAvb3NSVGZrZ3R5cThTdDVRWUIxbFQ1WmRscEc5UHdibC9sdS80 L1UwQVhyCjVGRXZYK3BBbmFVYVJ1NEQycFJRTFVnR0xvdVVXVmZoZEtVVytHVno5NUowSFVGckRM anlZRVp2VzdLOGtxV2UKTXJ4S1Rya2tGdVA4bGNRczRCbm9MQ056MWE2NW8vZjYvcjIwRmxIZ240 a2o5S3E4RlZ5UjVheU1oM2wwanBOUApGbGJwYlQzOUkxTWRBYzZnK2VzUQo9eHUwUwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============4579906565501565964==--