GNU bug report logs - #41830
xl2tpd fixes

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#41830: closed (xl2tpd fixes)
Date: Sun, 14 Jun 2020 10:00:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sun, 14 Jun 2020 11:59:21 +0200
with message-id <87h7veklxi.fsf <at> gnu.org>
and subject line Re: [bug#41830] xl2tpd fixes
has caused the debbugs.gnu.org bug report #41830,
regarding xl2tpd fixes
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
41830: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=41830
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Ivan Kozlov <kanichos <at> yandex.ru>
To: guix-patches <guix-patches <at> gnu.org>
Subject: xl2tpd fixes
Date: Fri, 12 Jun 2020 20:45:15 +0300

xl2tpd runs pppd to complete the connection. It also includes some of the Linux headers (and uses fallbacks otherwise).

--- /gnu/store/869i2xd7jih9cdcrccwk8rsxycwksjba-guix-module-union/share/guile/site/3.0/gnu/packages/vpn.scm
+++ #<buffer vpn.scm>
@@ -576,9 +576,18 @@
      `(#:make-flags (list (string-append "PREFIX=" %output)
                           "CC=gcc")
        #:phases (modify-phases %standard-phases
+                  (add-before 'build 'setup-environment
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (setenv "CFLAGS" (string-append "-DPPD=\""
+                                                      (assoc-ref inputs "ppp")
+                                                      "/sbin/pppd\""))
+                      (setenv "KERNELSRC" (assoc-ref inputs "linux-libre-headers"))
+                      #t))
                   (delete 'configure))  ; no configure script
        #:tests? #f))                    ; no tests provided
-    (inputs `(("libpcap" ,libpcap)))
+    (inputs `(("libpcap" ,libpcap)
+              ("linux-libre-headers" ,linux-libre-headers)
+              ("ppp" ,ppp)))
     (home-page "https://www.xelerance.com/software/xl2tpd/")
     (synopsis "Layer 2 Tunnelling Protocol Daemon (RFC 2661)")
     (description

Diff finished.  Fri Jun 12 20:38:14 2020

[Message part 3 (message/rfc822, inline)]

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Ivan Kozlov <kanichos <at> yandex.ru>
Cc: 41830-done <at> debbugs.gnu.org
Subject: Re: [bug#41830] xl2tpd fixes
Date: Sun, 14 Jun 2020 11:59:21 +0200

Привет Иван!

Thanks for this patch :). For future contributions, patches should be
made on top of Guix git repository, using "git format-patch". You should
also follow the guidelines here:
https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html#Sending-a-Patch-Series
in particular, regarding the commit message.

I applied the patch, added your copyright and a commit message.

Thanks,

Mathieu

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.