GNU bug report logs -
#45296
[PATCH] gnu: miredo: Fix to use iproute2 from the store.
Previous Next
Reported by: John Doe <dftxbs3e <at> free.fr>
Date: Thu, 17 Dec 2020 14:26:02 UTC
Severity: normal
Tags: patch
Done: Efraim Flashner <efraim <at> flashner.co.il>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your message dated Sat, 26 Dec 2020 22:31:54 +0200
with message-id <X+edut22w7jBDQcH <at> 3900XT>
and subject line Re: [bug#45296] [PATCH] gnu: miredo: Fix to use iproute2 from the store.
has caused the debbugs.gnu.org bug report #45296,
regarding [PATCH] gnu: miredo: Fix to use iproute2 from the store.
to be marked as done.
(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)
--
45296: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=45296
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
* gnu/packages/networking.scm (miredo):
[inputs]: Add iproute.
[arguments]: New phase 'patch-iproute2 that patches sources to use
iproute2 from the store.
---
gnu/packages/networking.scm | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 1226b8606f..281c4a0179 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -688,13 +688,22 @@ or, more generally, MAC addresses of the same category of hardware.")
(arguments
'(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-iproute2
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((iproute (assoc-ref inputs "iproute"))
+ (ip (string-append iproute "/sbin/ip")))
+ (substitute* "misc/client-hook.iproute"
+ (("/sbin/ip") ip))
+ #t)))
;; The checkconf test in src/ requires network access.
(add-before
- 'check 'disable-checkconf-test
- (lambda _
- (substitute* "src/Makefile"
- (("^TESTS = .*") "TESTS = \n"))
- #t)))))
+ 'check 'disable-checkconf-test
+ (lambda _
+ (substitute* "src/Makefile"
+ (("^TESTS = .*") "TESTS = \n"))
+ #t)))))
+ (inputs
+ `(("iproute" ,iproute)))
(home-page "https://www.remlab.net/miredo/")
(synopsis "Teredo IPv6 tunneling software")
(description
--
2.29.2
[Message part 3 (message/rfc822, inline)]
[Message part 4 (text/plain, inline)]
I fixed the patch to not also change the indentation on the other lines
and pushed it. Thanks!
--
Efraim Flashner <efraim <at> flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]
This bug report was last modified 4 years and 173 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.