From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ED550138A1F for ; Tue, 15 Apr 2014 18:18:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74A4FE0A88; Tue, 15 Apr 2014 18:18:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13772E0A88 for ; Tue, 15 Apr 2014 18:18:53 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 410363400F1 for ; Tue, 15 Apr 2014 18:18:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E385B180E8 for ; Tue, 15 Apr 2014 18:18:50 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1397585914.fc69aa3192ad56b4527248820e3a628da3a91809.robbat2@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: net/ X-VCS-Repository: proj/netifrc X-VCS-Files: net/macchanger.sh X-VCS-Directories: net/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: fc69aa3192ad56b4527248820e3a628da3a91809 X-VCS-Branch: master Date: Tue, 15 Apr 2014 18:18:50 +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: 176bce31-987a-4698-86b8-6f6d06525a35 X-Archives-Hash: 8620bc67454f2e14f224b81a7fa4132d commit: fc69aa3192ad56b4527248820e3a628da3a91809 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Tue Apr 15 18:11:05 2014 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Apr 15 18:18:34 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=fc69aa31 net/macchanger: fix for bug 503358 This adds support for macchanger 1.6 as well as keeping support for macchanger <1.6. Reported-By: teknocratdefunct riseup.net X-Gentoo-Bug: 504458 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=504458 Signed-off-by: Robin H. Johnson gentoo.org> --- net/macchanger.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/macchanger.sh b/net/macchanger.sh index 4e535ec..ff13770 100644 --- a/net/macchanger.sh +++ b/net/macchanger.sh @@ -69,13 +69,13 @@ macchanger_pre_start() fi mac=$(/sbin/macchanger ${opts} "${IFACE}" \ - | sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' ) + | sed -n -e 's/^\(Faked\|New\) MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\2/p' ) _up # Sometimes the interface needs to be up .... if [ -z "${mac}" ]; then mac=$(/sbin/macchanger ${opts} "${IFACE}" \ - | sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' ) + | sed -n -e 's/^\(Faked\|New\) MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\2/p' ) fi if [ -z "${mac}" ]; then