Subject: bug#41830: closed (Re: [bug#41830] xl2tpd fixes)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 14 Jun 2020 10:00:02 +0000

Your bug report

#41830: xl2tpd fixes

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
41830: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=41830
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#41830] xl2tpd fixes
From: Mathieu Othacehe <[email-masked]>
To: Ivan Kozlov <[email-masked]>
Cc: [email-masked]
Date: Sun, 14 Jun 2020 11:59:21 +0200
List-Id: <debbugs-submit.debbugs.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

Subject: xl2tpd fixes
From: Ivan Kozlov <[email-masked]>
To: guix-patches <[email-masked]>
Date: Fri, 12 Jun 2020 20:45:15 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

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