unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Ivan Kozlov <kanichos@yandex.ru>
To: 41830@debbugs.gnu.org
Subject: [bug#41830] xl2tpd fixes
Date: Fri, 12 Jun 2020 20:45:15 +0300	[thread overview]
Message-ID: <168051591983732@mail.yandex.ru> (raw)

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





             reply	other threads:[~2020-06-12 17:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-12 17:45 Ivan Kozlov [this message]
2020-06-14  9:59 ` bug#41830: xl2tpd fixes Mathieu Othacehe
2020-06-22  8:09   ` [bug#41830] " Ivan Kozlov
2020-06-22  8:29     ` Mathieu Othacehe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=168051591983732@mail.yandex.ru \
    --to=kanichos@yandex.ru \
    --cc=41830@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).