From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5DF831395E2 for ; Sun, 11 Dec 2016 21:16:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDE3921C0A3; Sun, 11 Dec 2016 21:15:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F55321C0A3 for ; Sun, 11 Dec 2016 21:15:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A810734106E for ; Sun, 11 Dec 2016 21:15:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E00D49A for ; Sun, 11 Dec 2016 21:15:44 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1481490940.0c44a81c4dcf50d4c01d24a497ac27698d482cde.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch net-dialup/rp-pppoe/files/rp-pppoe-3.12-ifconfig-path.patch net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild X-VCS-Directories: net-dialup/rp-pppoe/files/ net-dialup/rp-pppoe/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 0c44a81c4dcf50d4c01d24a497ac27698d482cde X-VCS-Branch: master Date: Sun, 11 Dec 2016 21:15:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5f19c643-9c6e-489f-8a65-b86bebd91217 X-Archives-Hash: 01e3deb1170af86e601a13aec6a90537 commit: 0c44a81c4dcf50d4c01d24a497ac27698d482cde Author: Lars Wendler gentoo org> AuthorDate: Sun Dec 11 21:15:21 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Dec 11 21:15:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c44a81c net-dialup/rp-pppoe: Revbump to fix path to ifconfig (bug #602344). Removed old. Package-Manager: portage-2.3.3 .../rp-pppoe/files/rp-pppoe-3.11-kmode.patch | 4 +- .../files/rp-pppoe-3.12-ifconfig-path.patch | 65 ++++++++++++++++++++++ ...p-pppoe-3.12.ebuild => rp-pppoe-3.12-r1.ebuild} | 39 +++++++------ 3 files changed, 90 insertions(+), 18 deletions(-) diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch index 039abd4..78a6a3b 100644 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch @@ -1,5 +1,5 @@ ---- src/configure.in.old 2015-01-07 13:08:18.929959937 +0100 -+++ src/configure.in 2015-01-07 13:08:38.253406302 +0100 +--- a/src/configure.in ++++ b/src/configure.in @@ -26,6 +26,7 @@ #include #include diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.12-ifconfig-path.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-ifconfig-path.patch new file mode 100644 index 00000000..2a56d40 --- /dev/null +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-ifconfig-path.patch @@ -0,0 +1,65 @@ +diff --git a/gui/tkpppoe.in b/gui/tkpppoe.in +index 148c8c8..1d952d4 100755 +--- a/gui/tkpppoe.in ++++ b/gui/tkpppoe.in +@@ -1573,7 +1573,7 @@ proc SetButtonStates {} { + #*********************************************************************** + proc GetEthernetInterfaces {} { + set ifs {} +- set fp [open "|/sbin/ifconfig" "r"] ++ set fp [open "|/bin/ifconfig" "r"] + while {[gets $fp line] >= 0} { + if {[regexp {^eth[0-9]+} $line eth]} { + lappend ifs $eth +diff --git a/scripts/pppoe-connect.in b/scripts/pppoe-connect.in +index 2124422..e7eab32 100755 +--- a/scripts/pppoe-connect.in ++++ b/scripts/pppoe-connect.in +@@ -28,7 +28,7 @@ exec_prefix=@exec_prefix@ + localstatedir=/var + + # Paths to programs +-IFCONFIG=/sbin/ifconfig ++IFCONFIG=/bin/ifconfig + PPPD=@PPPD@ + SETSID=@SETSID@ + PPPOE=@sbindir@/pppoe +diff --git a/scripts/pppoe-setup.in b/scripts/pppoe-setup.in +index b378479..4122084 100755 +--- a/scripts/pppoe-setup.in ++++ b/scripts/pppoe-setup.in +@@ -17,7 +17,7 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + + # Paths to programs +-IFCONFIG=/sbin/ifconfig ++IFCONFIG=/bin/ifconfig + PPPD=@PPPD@ + PPPOE=@sbindir@/pppoe + ECHO=@ECHO@ +diff --git a/scripts/pppoe-start.in b/scripts/pppoe-start.in +index 7e15804..b9dd7f0 100755 +--- a/scripts/pppoe-start.in ++++ b/scripts/pppoe-start.in +@@ -29,7 +29,7 @@ exec_prefix=@exec_prefix@ + # Paths to programs + CONNECT=@sbindir@/pppoe-connect + ECHO=@ECHO@ +-IFCONFIG=/sbin/ifconfig ++IFCONFIG=/bin/ifconfig + + # Set to "C" locale so we can parse messages from commands + LANG=C +diff --git a/scripts/pppoe-status b/scripts/pppoe-status +index 9fe89cd..96d6ebd 100755 +--- a/scripts/pppoe-status ++++ b/scripts/pppoe-status +@@ -73,7 +73,7 @@ for i in /etc/ppp/ppp*.pid /var/run/ppp*.pid ; do + exit 1 + fi + echo "pppoe-status: Link is up and running on interface $IF" +- /sbin/ifconfig $IF ++ /bin/ifconfig $IF + exit 0 + fi + fi diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild similarity index 75% rename from net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild rename to net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild index 4739e1f..a3e172f 100644 --- a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild +++ b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit eutils flag-o-matic autotools readme.gentoo +inherit eutils flag-o-matic autotools readme.gentoo-r1 PPP_P="ppp-2.4.7" @@ -35,22 +35,29 @@ pkg_setup() { PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV} } -src_prepare() { +PATCHES=( # Patch to enable integration of pppoe-start and pppoe-stop with # baselayout-1.11.x so that the pidfile can be found reliably per interface - epatch "${FILESDIR}/${PN}-3.10-gentoo-netscripts.patch" - - epatch "${FILESDIR}/${PN}-3.10-username-charset.patch" # bug 82410 - epatch "${FILESDIR}/${PN}-3.10-plugin-options.patch" - epatch "${FILESDIR}/${PN}-3.10-autotools.patch" - has_version '