GNU bug report logs - #41830
xl2tpd fixes

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 41830 in the body.
You can then email your comments to 41830 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

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 #10 received at 41830-done <at> debbugs.gnu.org (full text, mbox):

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

Message #13 received at 41830-done <at> debbugs.gnu.org (full text, mbox):

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

Hi,

There was a typo in the patch in a compiler flag (-DPPD instead of -DPPPD). Would you please correct that?

14.06.2020, 12:59, "Mathieu Othacehe" <othacehe <at> gnu.org>:
> Привет Иван!
>
> 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

Message #16 received at 41830-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Ivan Kozlov <kanichos <at> yandex.ru>
Cc: "41830 <at> debbugs.gnu.org" <41830-done <at> debbugs.gnu.org>
Subject: Re: [bug#41830] xl2tpd fixes
Date: Mon, 22 Jun 2020 10:29:58 +0200

Hello,

> There was a typo in the patch in a compiler flag (-DPPD instead of -DPPPD). Would you please correct that?

Oops, fixed.

Thanks,

Mathieu

Previous Next

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