{"id":816130,"url":"http://patchwork.ozlabs.org/api/patches/816130/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/patch/20170920104143.21404-2-bernd.kuhls@t-online.de/","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920104143.21404-2-bernd.kuhls@t-online.de>","list_archive_url":null,"date":"2017-09-20T10:41:42","name":"[2/3] package/softether: update patch to remove renames","commit_ref":"7afb827d4be93b1575a02b2376352ebd1fe13f87","pull_url":null,"state":"accepted","archived":false,"hash":"e98cc788f9568e6cfa18d78d959def495195224e","submitter":{"id":62613,"url":"http://patchwork.ozlabs.org/api/people/62613/?format=json","name":"Bernd Kuhls","email":"bernd.kuhls@t-online.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20170920104143.21404-2-bernd.kuhls@t-online.de/mbox/","series":[{"id":4077,"url":"http://patchwork.ozlabs.org/api/series/4077/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/list/?series=4077","date":"2017-09-20T10:41:41","name":"[1/3] package/softether: fix hash","version":1,"mbox":"http://patchwork.ozlabs.org/series/4077/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816130/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816130/checks/","tags":{},"related":[],"headers":{"Return-Path":"<buildroot-bounces@busybox.net>","X-Original-To":["incoming@patchwork.ozlabs.org","buildroot@lists.busybox.net"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","buildroot@osuosl.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=<UNKNOWN>)","Received":["from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxxBg70sfz9s8J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Sep 2017 20:42:03 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 662CF88194;\n\tWed, 20 Sep 2017 10:42:00 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id UGe7BmqlHgHp; Wed, 20 Sep 2017 10:41:58 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B369887EE7;\n\tWed, 20 Sep 2017 10:41:58 +0000 (UTC)","from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id A881A1C1F5A\n\tfor <buildroot@lists.busybox.net>;\n\tWed, 20 Sep 2017 10:41:55 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A2B6B88C75\n\tfor <buildroot@lists.busybox.net>;\n\tWed, 20 Sep 2017 10:41:55 +0000 (UTC)","from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id L2A8Mn0avU0e for <buildroot@lists.busybox.net>;\n\tWed, 20 Sep 2017 10:41:54 +0000 (UTC)","from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 0E90588C6D\n\tfor <buildroot@buildroot.org>; Wed, 20 Sep 2017 10:41:54 +0000 (UTC)","from fwd04.aul.t-online.de (fwd04.aul.t-online.de [172.20.26.149])\n\tby mailout01.t-online.de (Postfix) with SMTP id ECD2343381AD\n\tfor <buildroot@buildroot.org>; Wed, 20 Sep 2017 12:41:51 +0200 (CEST)","from fli4l.lan.fli4l\n\t(r4+tJOZXrh2GtSRZtyGun3EGtJ41D1OkG4b5pHl2H6vk4Iv1c8NlECBhl4iWfhQgFu@[79.228.7.10])\n\tby fwd04.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted)\n\tesmtp id 1ducRt-0XPiT20; Wed, 20 Sep 2017 12:41:45 +0200","from mahler.lan.fli4l ([192.168.1.1]:33860 helo=kuhls.lan.fli4l)\n\tby fli4l.lan.fli4l with esmtp (Exim 4.89)\n\t(envelope-from <bernd.kuhls@t-online.de>) id 1ducRs-0007U6-26\n\tfor buildroot@buildroot.org; Wed, 20 Sep 2017 12:41:44 +0200"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","From":"Bernd Kuhls <bernd.kuhls@t-online.de>","To":"buildroot@buildroot.org","Date":"Wed, 20 Sep 2017 12:41:42 +0200","Message-Id":"<20170920104143.21404-2-bernd.kuhls@t-online.de>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170920104143.21404-1-bernd.kuhls@t-online.de>","References":"<20170920104143.21404-1-bernd.kuhls@t-online.de>","X-ID":"r4+tJOZXrh2GtSRZtyGun3EGtJ41D1OkG4b5pHl2H6vk4Iv1c8NlECBhl4iWfhQgFu","X-TOI-MSGID":"43f1245a-4c2d-4dbf-b61a-53c2a8bde2e9","Subject":"[Buildroot] [PATCH 2/3] package/softether: update patch to remove\n\trenames","X-BeenThere":"buildroot@busybox.net","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Discussion and development of buildroot <buildroot.busybox.net>","List-Unsubscribe":"<http://lists.busybox.net/mailman/options/buildroot>,\n\t<mailto:buildroot-request@busybox.net?subject=unsubscribe>","List-Archive":"<http://lists.busybox.net/pipermail/buildroot/>","List-Post":"<mailto:buildroot@busybox.net>","List-Help":"<mailto:buildroot-request@busybox.net?subject=help>","List-Subscribe":"<http://lists.busybox.net/mailman/listinfo/buildroot>,\n\t<mailto:buildroot-request@busybox.net?subject=subscribe>","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" <buildroot-bounces@busybox.net>"},"content":"Since\nhttps://git.buildroot.net/buildroot/commit/?id=85f11d08c387c200dbb59a8559f2ba62376689bf\nbuildroot refuses to apply patches that contain renames.\n\nFixes\nhttp://autobuild.buildroot.net/results/223/2237b9ec78044678aac9e743318ce5dc01309ab7/\n\nSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>\n---\n ...1-Create-autotools-plumbing-for-SoftEther.patch | 176 ++++++++++++++++++++-\n 1 file changed, 172 insertions(+), 4 deletions(-)","diff":"diff --git a/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch b/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch\nindex 587a94d01f..09cf29a837 100644\n--- a/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch\n+++ b/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch\n@@ -1494,10 +1494,178 @@ index 00000000..4a3fc2ba\n +\n +\n +AC_OUTPUT\n-diff --git a/configure b/manual_configure\n-similarity index 100%\n-rename from configure\n-rename to manual_configure\n+--- a/configure\t2016-04-24 16:49:31.000000000 +0200\n++++ b/configure\t1970-01-01 01:00:00.000000000 +0100\n+@@ -1,83 +0,0 @@\n+-#!/bin/sh\n+-\n+-echo '---------------------------------------------------------------------'\n+-echo 'SoftEther VPN for Unix'\n+-echo\n+-echo 'Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.'\n+-echo 'Copyright (c) Daiyuu Nobori. All Rights Reserved.'\n+-echo\n+-echo 'This program is free software; you can redistribute it and/or'\n+-echo 'modify it under the terms of the GNU General Public License'\n+-echo 'version 2 as published by the Free Software Foundation.'\n+-echo\n+-echo 'Read and understand README.TXT, LICENSE.TXT and WARNING.TXT before use.'\n+-echo '---------------------------------------------------------------------'\n+-echo\n+-\n+-echo 'Welcome to the corner-cutting configure script !'\n+-echo\n+-echo 'Select your operating system below:'\n+-echo ' 1: Linux'\n+-echo ' 2: FreeBSD'\n+-echo ' 3: Solaris'\n+-echo ' 4: Mac OS X'\n+-echo ' 5: OpenBSD'\n+-echo\n+-echo -n 'Which is your operating system (1 - 5) ? : '\n+-read TMP\n+-echo\n+-OS=\"\"\n+-if test \"$TMP\" = \"1\"\n+-then\n+-\tOS=\"linux\"\n+-fi\n+-if test \"$TMP\" = \"2\"\n+-then\n+-\tOS=\"freebsd\"\n+-fi\n+-if test \"$TMP\" = \"3\"\n+-then\n+-\tOS=\"solaris\"\n+-fi\n+-if test \"$TMP\" = \"4\"\n+-then\n+-\tOS=\"macos\"\n+-fi\n+-if test \"$TMP\" = \"5\"\n+-then\n+-\tOS=\"openbsd\"\n+-fi\n+-\n+-if test \"$OS\" = \"\"\n+-then\n+-\techo \"Wrong number.\"\n+-\texit 1\n+-fi\n+-\n+-echo 'Select your CPU bits below:'\n+-echo ' 1: 32-bit'\n+-echo ' 2: 64-bit'\n+-echo\n+-echo -n 'Which is the type of your CPU (1 - 2) ? : '\n+-read TMP\n+-echo\n+-CPU=\"\"\n+-if test \"$TMP\" = \"1\"\n+-then\n+-\tCPU=\"32bit\"\n+-fi\n+-if test \"$TMP\" = \"2\"\n+-then\n+-\tCPU=\"64bit\"\n+-fi\n+-\n+-if test \"$CPU\" = \"\"\n+-then\n+-\techo \"Wrong number.\"\n+-\texit 1\n+-fi\n+-\n+-cp src/makefiles/${OS}_${CPU}.mak Makefile\n+-\n+-echo \"The Makefile is generated. Run 'make' to build SoftEther VPN.\"\n+-\n+--- a/manual_configure\t1970-01-01 01:00:00.000000000 +0100\n++++ b/manual_configure\t2016-04-24 16:49:31.000000000 +0200\n+@@ -0,0 +1,83 @@\n++#!/bin/sh\n++\n++echo '---------------------------------------------------------------------'\n++echo 'SoftEther VPN for Unix'\n++echo\n++echo 'Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.'\n++echo 'Copyright (c) Daiyuu Nobori. All Rights Reserved.'\n++echo\n++echo 'This program is free software; you can redistribute it and/or'\n++echo 'modify it under the terms of the GNU General Public License'\n++echo 'version 2 as published by the Free Software Foundation.'\n++echo\n++echo 'Read and understand README.TXT, LICENSE.TXT and WARNING.TXT before use.'\n++echo '---------------------------------------------------------------------'\n++echo\n++\n++echo 'Welcome to the corner-cutting configure script !'\n++echo\n++echo 'Select your operating system below:'\n++echo ' 1: Linux'\n++echo ' 2: FreeBSD'\n++echo ' 3: Solaris'\n++echo ' 4: Mac OS X'\n++echo ' 5: OpenBSD'\n++echo\n++echo -n 'Which is your operating system (1 - 5) ? : '\n++read TMP\n++echo\n++OS=\"\"\n++if test \"$TMP\" = \"1\"\n++then\n++\tOS=\"linux\"\n++fi\n++if test \"$TMP\" = \"2\"\n++then\n++\tOS=\"freebsd\"\n++fi\n++if test \"$TMP\" = \"3\"\n++then\n++\tOS=\"solaris\"\n++fi\n++if test \"$TMP\" = \"4\"\n++then\n++\tOS=\"macos\"\n++fi\n++if test \"$TMP\" = \"5\"\n++then\n++\tOS=\"openbsd\"\n++fi\n++\n++if test \"$OS\" = \"\"\n++then\n++\techo \"Wrong number.\"\n++\texit 1\n++fi\n++\n++echo 'Select your CPU bits below:'\n++echo ' 1: 32-bit'\n++echo ' 2: 64-bit'\n++echo\n++echo -n 'Which is the type of your CPU (1 - 2) ? : '\n++read TMP\n++echo\n++CPU=\"\"\n++if test \"$TMP\" = \"1\"\n++then\n++\tCPU=\"32bit\"\n++fi\n++if test \"$TMP\" = \"2\"\n++then\n++\tCPU=\"64bit\"\n++fi\n++\n++if test \"$CPU\" = \"\"\n++then\n++\techo \"Wrong number.\"\n++\texit 1\n++fi\n++\n++cp src/makefiles/${OS}_${CPU}.mak Makefile\n++\n++echo \"The Makefile is generated. Run 'make' to build SoftEther VPN.\"\n++\n diff --git a/src/Cedar/Makefile.am b/src/Cedar/Makefile.am\n new file mode 100644\n index 00000000..5346537d\n","prefixes":["2/3"]}