From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KDslDsrA4169NwAA0tVLHw (envelope-from ) for ; Fri, 12 Jun 2020 17:52:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aL3uCcrA414ILQAAB5/wlQ (envelope-from ) for ; Fri, 12 Jun 2020 17:52:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 63CD49409D6 for ; Fri, 12 Jun 2020 17:52:09 +0000 (UTC) Received: from localhost ([::1]:38738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjnqY-0005Dy-KV for larch@yhetil.org; Fri, 12 Jun 2020 13:52:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjnqU-0005Ci-Mu for guix-patches@gnu.org; Fri, 12 Jun 2020 13:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57215) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jjnqU-0003wa-EC for guix-patches@gnu.org; Fri, 12 Jun 2020 13:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jjnqU-0003a5-Ch for guix-patches@gnu.org; Fri, 12 Jun 2020 13:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41830] xl2tpd fixes Resent-From: Ivan Kozlov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Jun 2020 17:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41830 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41830@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.159198426213677 (code B ref -1); Fri, 12 Jun 2020 17:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jun 2020 17:51:02 +0000 Received: from localhost ([127.0.0.1]:40528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjnpW-0003YR-6a for submit@debbugs.gnu.org; Fri, 12 Jun 2020 13:51:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:38948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjnpQ-0003Y2-N6 for submit@debbugs.gnu.org; Fri, 12 Jun 2020 13:51:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjnpQ-0004DK-EX for guix-patches@gnu.org; Fri, 12 Jun 2020 13:50:56 -0400 Received: from forward105p.mail.yandex.net ([77.88.28.108]:34937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjnpN-0003l8-Io for guix-patches@gnu.org; Fri, 12 Jun 2020 13:50:55 -0400 Received: from mxback27j.mail.yandex.net (mxback27j.mail.yandex.net [IPv6:2a02:6b8:0:1619::227]) by forward105p.mail.yandex.net (Yandex) with ESMTP id 635A64D40CCE for ; Fri, 12 Jun 2020 20:45:16 +0300 (MSK) Received: from localhost (localhost [::1]) by mxback27j.mail.yandex.net (mxback/Yandex) with ESMTP id W4qeTemMe4-jFm0bW5C; Fri, 12 Jun 2020 20:45:15 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1591983915; bh=A7GbjopLpzJT0ZMohZ+Np2wEvva9q012CCsYFPYwKSc=; h=Message-Id:Date:Subject:To:From; b=uvFkRxT91wyWgd0UE+XfDjadePkcB3gfy2/Ctp3Z7X+Nz+ubupjoa6bfuTrd7OYpL /2VJvgnxo9+773MKI9ia3j3gtXkWrnvOboVAzXUCvmlKIVtOgTtVZaLcfN+S7zO80e L6Pqpbp6dNj4xkcmZfzCfi/Gg+tGShOy2TEmlNuc= Received: by sas1-5d226e857bd8.qloud-c.yandex.net with HTTP; Fri, 12 Jun 2020 20:45:15 +0300 From: Ivan Kozlov MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Fri, 12 Jun 2020 20:45:15 +0300 Message-Id: <168051591983732@mail.yandex.ru> Content-Transfer-Encoding: 7bit Content-Type: text/plain Received-SPF: pass client-ip=77.88.28.108; envelope-from=kanichos@yandex.ru; helo=forward105p.mail.yandex.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/12 13:45:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=yandex.ru header.s=mail header.b=uvFkRxT9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yandex.ru (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: uLYaLn8yqfvm 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 +++ # @@ -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