From unknown Tue Aug 19 01:10:56 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#27549 <27549@debbugs.gnu.org> To: bug#27549 <27549@debbugs.gnu.org> Subject: Status: [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. Reply-To: bug#27549 <27549@debbugs.gnu.org> Date: Tue, 19 Aug 2025 08:10:56 +0000 retitle 27549 [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. reassign 27549 guix-patches submitter 27549 Jelle Licht severity 27549 normal tag 27549 patch owner 27549 Ricardo Wurmus thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 01 10:48:52 2017 Received: (at submit) by debbugs.gnu.org; 1 Jul 2017 14:48:52 +0000 Received: from localhost ([127.0.0.1]:47801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJhX-00080S-PQ for submit@debbugs.gnu.org; Sat, 01 Jul 2017 10:48:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJhU-00080D-4a for submit@debbugs.gnu.org; Sat, 01 Jul 2017 10:48:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRJhN-0003u3-FD for submit@debbugs.gnu.org; Sat, 01 Jul 2017 10:48:39 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dRJhN-0003tz-B3 for submit@debbugs.gnu.org; Sat, 01 Jul 2017 10:48:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRJhL-0001ae-I1 for guix-patches@gnu.org; Sat, 01 Jul 2017 10:48:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRJhH-0003tZ-Vx for guix-patches@gnu.org; Sat, 01 Jul 2017 10:48:35 -0400 Received: from mout02.posteo.de ([185.67.36.142]:56908) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dRJhH-0003t8-Jg for guix-patches@gnu.org; Sat, 01 Jul 2017 10:48:31 -0400 Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3x0GVM6QM5z10HC for ; Sat, 1 Jul 2017 16:48:27 +0200 (CEST) User-agent: mu4e 0.9.18; emacs 25.2.1 From: Jelle Licht To: guix-patches@gnu.org Subject: [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. Date: Sat, 01 Jul 2017 16:48:26 +0200 Message-ID: <87y3s8kybp.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -7.8 (-------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --=-=-= Content-Type: text/plain Hello Guix, Having tried to get `vpnc' working with my university's vpn system, and failing, I looked into other distributions and how they got it to work. It seems that most people use an updated version of the bundled `vpnc-script' to make it work. This patch updates `vpnc' to make use of the latest revision of the public Subversion repo. It also includes the updated `vpnc-script'. To note, our old `vpnc' (and its included `vpnc-script') crashed when trying to conn ect to any vpn. Regards, Jelle --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-vpnc-Update-to-0.5.3-revision-550.patch >From fed76ff5a53a5b32d333085deb9eeba3a807b7ef Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sat, 1 Jul 2017 16:14:34 +0200 Subject: [PATCH] gnu: vpnc: Update to 0.5.3, revision 550. * gnu/packages/vpn.scm (vpnc): Update to 0.5.3, revision 550. [source]: Use svn-fetch, download from Subersion mirror. [arguments]: End phases on #t. Remove reference to /etc/vpnc. --- gnu/local.mk | 1 - gnu/packages/patches/vpnc-script.patch | 15 ----- gnu/packages/vpn.scm | 109 ++++++++++++++++++--------------- 3 files changed, 61 insertions(+), 64 deletions(-) delete mode 100644 gnu/packages/patches/vpnc-script.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83b019605..55b4071e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1047,7 +1047,6 @@ dist_patch_DATA = \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ - %D%/packages/patches/vpnc-script.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/weechat-python.patch \ diff --git a/gnu/packages/patches/vpnc-script.patch b/gnu/packages/patches/vpnc-script.patch deleted file mode 100644 index a0d948195..000000000 --- a/gnu/packages/patches/vpnc-script.patch +++ /dev/null @@ -1,15 +0,0 @@ -This patch adapts the vpnc script to newer kernel versions, see - https://lkml.org/lkml/2011/3/24/645 - -diff -u a/vpnc-script.in b/vpnc-script.in ---- a/vpnc-script.in 2013-03-03 13:55:16.000000000 +0100 -+++ b/vpnc-script.in 2013-03-03 13:56:11.000000000 +0100 -@@ -116,7 +116,7 @@ - - if [ -n "$IPROUTE" ]; then - fix_ip_get_output () { -- sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' -+ sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g' - } - - set_vpngateway_route() { diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 87fea4a47..692891150 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -26,9 +26,11 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix svn-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) @@ -63,58 +65,69 @@ endpoints.") (license license:gpl3+))) (define-public vpnc - (package - (name "vpnc") - (version "0.5.3") - (source (origin - (method url-fetch) - (uri (string-append "https://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-" - version ".tar.gz")) - (sha256 (base32 - "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6")) - (patches (search-patches "vpnc-script.patch")))) - (build-system gnu-build-system) - (inputs `(("libgcrypt" ,libgcrypt) - ("perl" ,perl) - - ;; The following packages provide commands that 'vpnc-script' - ;; expects. - ("net-tools" ,net-tools) ;ifconfig, route - ("iproute2" ,iproute))) ;ip - (arguments - `(#:tests? #f ; there is no check target - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("PREFIX=/usr/local") (string-append "PREFIX=" out))) - (substitute* "Makefile" - (("ETCDIR=/etc/vpnc") (string-append "ETCDIR=" out - "/etc/vpnc")))))) - (add-after 'install 'wrap-vpnc-script - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Wrap 'etc/vpnc/vpnc-script' so that it finds the commands it - ;; needs. Assume coreutils/grep/sed are in $PATH. - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/etc/vpnc/vpnc-script") - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "net-tools") - "/sbin") - ,(string-append (assoc-ref inputs "net-tools") - "/bin") - ,(string-append (assoc-ref inputs "iproute2") - "/sbin")))))))))) - (synopsis "Client for Cisco VPN concentrators") - (description - "vpnc is a VPN client compatible with Cisco's EasyVPN equipment. + (let ((commit 550) ; subversion revision identifier + (revision "1")) ; guix package revision + (package + (name "vpnc") + (version (string-append "0.5.3-" revision "." (number->string commit))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "http://svn.unix-ag.uni-kl.de/vpnc/trunk") + (revision commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 (base32 + "1ng585qlwd22q8qrcly5f0vran5jy9n0dlc2h14vf5kl4dkqljw0")))) + (build-system gnu-build-system) + (inputs `(("libgcrypt" ,libgcrypt) + ("perl" ,perl) + ("gnutls" ,gnutls) + ;; The following packages provide commands that 'vpnc-script' + ;; expects. + ("net-tools" ,net-tools) ;ifconfig, route + ("iproute2" ,iproute))) ;ip + (native-inputs `(("which" ,which) + ("pkg-config" ,pkg-config))) + (arguments + `(#:tests? #f ; there is no check target + #:make-flags '("CC=gcc") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("PREFIX=/usr/local") (string-append "PREFIX=" out))) + (substitute* "Makefile" + (("ETCDIR=/etc/vpnc") (string-append "ETCDIR=" out + "/etc/vpnc"))) + (substitute* "config.c" + (("/etc/vpnc/") (string-append out "/etc/vpnc/"))) + #t))) + (add-after 'install 'wrap-vpnc-script + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Wrap 'etc/vpnc/vpnc-script' so that it finds the commands it + ;; needs. Assume coreutils/grep/sed are in $PATH. + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/etc/vpnc/vpnc-script") + `("PATH" ":" prefix + (,(string-append (assoc-ref inputs "net-tools") + "/sbin") + ,(string-append (assoc-ref inputs "net-tools") + "/bin") + ,(string-append (assoc-ref inputs "iproute2") + "/sbin")))) + #t)))))) + (synopsis "Client for Cisco VPN concentrators") + (description + "vpnc is a VPN client compatible with Cisco's EasyVPN equipment. It supports IPSec (ESP) with Mode Configuration and Xauth. It supports only shared-secret IPSec authentication with Xauth, AES (256, 192, 128), 3DES, 1DES, MD5, SHA1, DH1/2/5 and IP tunneling. It runs entirely in userspace. Only \"Universal TUN/TAP device driver support\" is needed in the kernel.") - (license license:gpl2+) ; some file are bsd-2, see COPYING - (home-page "http://www.unix-ag.uni-kl.de/~massar/vpnc/"))) + (license license:gpl2+) ; some file are bsd-2, see COPYING + (home-page "http://www.unix-ag.uni-kl.de/~massar/vpnc/")))) (define-public openconnect -- 2.13.2 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 01 10:56:00 2017 Received: (at 27549) by debbugs.gnu.org; 1 Jul 2017 14:56:00 +0000 Received: from localhost ([127.0.0.1]:47823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJoV-0008BO-R2 for submit@debbugs.gnu.org; Sat, 01 Jul 2017 10:56:00 -0400 Received: from mout02.posteo.de ([185.67.36.142]:44910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRJoS-0008B0-GM for 27549@debbugs.gnu.org; Sat, 01 Jul 2017 10:55:59 -0400 Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3x0Gfr3Kx9z104d; Sat, 1 Jul 2017 16:55:48 +0200 (CEST) References: <87y3s8kybp.fsf@gmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Jelle Licht To: Jelle Licht Subject: Re: [bug#27549] [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. In-reply-to: <87y3s8kybp.fsf@gmail.com> Date: Sat, 01 Jul 2017 16:55:47 +0200 Message-ID: <87wp7skxzg.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27549 Cc: 27549@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Jelle Licht writes: [ .. ] And now with the actual commit message that I intended to have here. Apologies for the noise. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-vpnc-Update-to-0.5.3-revision-550.patch >From 03d6dc0348cc073d86360149351857853e01eac7 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sat, 1 Jul 2017 16:14:34 +0200 Subject: [PATCH] gnu: vpnc: Update to 0.5.3, revision 550. * gnu/packages/vpn.scm (vpnc): Update to 0.5.3, revision 550. [source]: Use svn-fetch, download from Subversion mirror. Remove patch. [arguments]: End phases on #t. Remove reference to /etc/vpnc. * gnu/packages/patches/vpnc-script.patch: Delete patch * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/patches/vpnc-script.patch | 15 ----- gnu/packages/vpn.scm | 109 ++++++++++++++++++--------------- 3 files changed, 61 insertions(+), 64 deletions(-) delete mode 100644 gnu/packages/patches/vpnc-script.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83b019605..55b4071e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1047,7 +1047,6 @@ dist_patch_DATA = \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ - %D%/packages/patches/vpnc-script.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/weechat-python.patch \ diff --git a/gnu/packages/patches/vpnc-script.patch b/gnu/packages/patches/vpnc-script.patch deleted file mode 100644 index a0d948195..000000000 --- a/gnu/packages/patches/vpnc-script.patch +++ /dev/null @@ -1,15 +0,0 @@ -This patch adapts the vpnc script to newer kernel versions, see - https://lkml.org/lkml/2011/3/24/645 - -diff -u a/vpnc-script.in b/vpnc-script.in ---- a/vpnc-script.in 2013-03-03 13:55:16.000000000 +0100 -+++ b/vpnc-script.in 2013-03-03 13:56:11.000000000 +0100 -@@ -116,7 +116,7 @@ - - if [ -n "$IPROUTE" ]; then - fix_ip_get_output () { -- sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' -+ sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g' - } - - set_vpngateway_route() { diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 87fea4a47..692891150 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -26,9 +26,11 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix svn-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) @@ -63,58 +65,69 @@ endpoints.") (license license:gpl3+))) (define-public vpnc - (package - (name "vpnc") - (version "0.5.3") - (source (origin - (method url-fetch) - (uri (string-append "https://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-" - version ".tar.gz")) - (sha256 (base32 - "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6")) - (patches (search-patches "vpnc-script.patch")))) - (build-system gnu-build-system) - (inputs `(("libgcrypt" ,libgcrypt) - ("perl" ,perl) - - ;; The following packages provide commands that 'vpnc-script' - ;; expects. - ("net-tools" ,net-tools) ;ifconfig, route - ("iproute2" ,iproute))) ;ip - (arguments - `(#:tests? #f ; there is no check target - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("PREFIX=/usr/local") (string-append "PREFIX=" out))) - (substitute* "Makefile" - (("ETCDIR=/etc/vpnc") (string-append "ETCDIR=" out - "/etc/vpnc")))))) - (add-after 'install 'wrap-vpnc-script - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Wrap 'etc/vpnc/vpnc-script' so that it finds the commands it - ;; needs. Assume coreutils/grep/sed are in $PATH. - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/etc/vpnc/vpnc-script") - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "net-tools") - "/sbin") - ,(string-append (assoc-ref inputs "net-tools") - "/bin") - ,(string-append (assoc-ref inputs "iproute2") - "/sbin")))))))))) - (synopsis "Client for Cisco VPN concentrators") - (description - "vpnc is a VPN client compatible with Cisco's EasyVPN equipment. + (let ((commit 550) ; subversion revision identifier + (revision "1")) ; guix package revision + (package + (name "vpnc") + (version (string-append "0.5.3-" revision "." (number->string commit))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "http://svn.unix-ag.uni-kl.de/vpnc/trunk") + (revision commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 (base32 + "1ng585qlwd22q8qrcly5f0vran5jy9n0dlc2h14vf5kl4dkqljw0")))) + (build-system gnu-build-system) + (inputs `(("libgcrypt" ,libgcrypt) + ("perl" ,perl) + ("gnutls" ,gnutls) + ;; The following packages provide commands that 'vpnc-script' + ;; expects. + ("net-tools" ,net-tools) ;ifconfig, route + ("iproute2" ,iproute))) ;ip + (native-inputs `(("which" ,which) + ("pkg-config" ,pkg-config))) + (arguments + `(#:tests? #f ; there is no check target + #:make-flags '("CC=gcc") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("PREFIX=/usr/local") (string-append "PREFIX=" out))) + (substitute* "Makefile" + (("ETCDIR=/etc/vpnc") (string-append "ETCDIR=" out + "/etc/vpnc"))) + (substitute* "config.c" + (("/etc/vpnc/") (string-append out "/etc/vpnc/"))) + #t))) + (add-after 'install 'wrap-vpnc-script + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Wrap 'etc/vpnc/vpnc-script' so that it finds the commands it + ;; needs. Assume coreutils/grep/sed are in $PATH. + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/etc/vpnc/vpnc-script") + `("PATH" ":" prefix + (,(string-append (assoc-ref inputs "net-tools") + "/sbin") + ,(string-append (assoc-ref inputs "net-tools") + "/bin") + ,(string-append (assoc-ref inputs "iproute2") + "/sbin")))) + #t)))))) + (synopsis "Client for Cisco VPN concentrators") + (description + "vpnc is a VPN client compatible with Cisco's EasyVPN equipment. It supports IPSec (ESP) with Mode Configuration and Xauth. It supports only shared-secret IPSec authentication with Xauth, AES (256, 192, 128), 3DES, 1DES, MD5, SHA1, DH1/2/5 and IP tunneling. It runs entirely in userspace. Only \"Universal TUN/TAP device driver support\" is needed in the kernel.") - (license license:gpl2+) ; some file are bsd-2, see COPYING - (home-page "http://www.unix-ag.uni-kl.de/~massar/vpnc/"))) + (license license:gpl2+) ; some file are bsd-2, see COPYING + (home-page "http://www.unix-ag.uni-kl.de/~massar/vpnc/")))) (define-public openconnect -- 2.13.2 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 01 13:16:44 2017 Received: (at 27549) by debbugs.gnu.org; 1 Jul 2017 17:16:44 +0000 Received: from localhost ([127.0.0.1]:47921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRM0h-0002zd-OX for submit@debbugs.gnu.org; Sat, 01 Jul 2017 13:16:43 -0400 Received: from tobias.gr ([51.15.135.5]:60440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRM0g-0002zU-Bx for 27549@debbugs.gnu.org; Sat, 01 Jul 2017 13:16:42 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 78aeb6c9; Sat, 1 Jul 2017 17:16:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=subject:to :references:from:message-id:date:mime-version:in-reply-to :content-type; s=201706; bh=3U61cdkrk1OMjJgqUZp2TMlEEVAjizv1b7CA 3wWWCFc=; b=0d6bVA6d8AIcMow4fx5G21qBQK55K6aB6iilUC9/LvgDkqI/GX3I l2DMPYbQ12j5UNcQ+lUY38Y2D9nsf5+Rg5nGVLWdOr6BI1N1qJjF7Na9lH2TF9/E yEQVHi7sjCoXY6J48BZ4KaFQ7TH6PsUBCxH5MK8t4yCHz/2pTRYDrHe+wuSViGC7 Kxa9qMCa38gqGT7ahucPKGW0dshayjiF9IlpQ1Wc+UdRK2pOUjRqnETgNKoBhYY/ PYf7yEbclLfLL7X53jwoMaOw3dwHrZjp3oSWCNsMmJLNPSqbKOlWOdZrLtv35uIb yq6FmP2De6nkB4pWFtmh7CJnP4in2QA6DQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id f380db84 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO); Sat, 1 Jul 2017 17:16:38 +0000 (UTC) Subject: Re: [bug#27549] [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. To: jlicht@fsfe.org, 27549@debbugs.gnu.org References: <87y3s8kybp.fsf@gmail.com> From: Tobias Geerinckx-Rice Message-ID: <01350273-2593-618d-a461-b99c1f310265@tobias.gr> Date: Sat, 1 Jul 2017 19:18:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <87y3s8kybp.fsf@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="qqu2W76iitBlaQdkDXw8qp8tMMHhhvAQn" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 27549 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --qqu2W76iitBlaQdkDXw8qp8tMMHhhvAQn Content-Type: multipart/mixed; boundary="P2CEBrAARWCmdnUnFBTLrjN1VBtToEqtf"; protected-headers="v1" From: Tobias Geerinckx-Rice To: jlicht@fsfe.org, 27549@debbugs.gnu.org Message-ID: <01350273-2593-618d-a461-b99c1f310265@tobias.gr> Subject: Re: [bug#27549] [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. References: <87y3s8kybp.fsf@gmail.com> In-Reply-To: <87y3s8kybp.fsf@gmail.com> --P2CEBrAARWCmdnUnFBTLrjN1VBtToEqtf Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jelle, On 01/07/17 16:48, Jelle Licht wrote: > Hello Guix, > > Having tried to get `vpnc' working with my university's vpn system, and= > failing, I looked into other distributions and how they got it to work.= > It seems that most people use an updated version of the bundled > `vpnc-script' to make it work. Indeed. I'd started on packaging those updated vpnc-scripts, but that kind of fell through all kind of cracks. I don't think I needed to bundle anything. I'll dig them up and see how far I got. Kind regards, T G-R --P2CEBrAARWCmdnUnFBTLrjN1VBtToEqtf-- --qqu2W76iitBlaQdkDXw8qp8tMMHhhvAQn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQFBBAEBCgArFiEEeqzfDJ8DWw5d4xcqkczbm0hUG5kFAllX2VYNHG1lQHRvYmlh cy5ncgAKCRCRzNubSFQbmUF0B/92IMYRdSlmOPW1trdNa/S0y7/Q7o6Jjg5P6Wc5 NuAsiVdcAoUPXSqWfbV5VwUATDHr1MlX7cJ+HYrVE06a6geiq5eNK5wN8AA4pt/R bGk1d+qpbAl0E1lTLznYwRmitQg5y+jKHcNTBTvQnK1L8Qh4Cl/ZlLswSRjeacOe xp+4jCmWOqus/edSfG47WOszMLhj9EKvS9LwTTZAh3mOXGn5TYWNmn9jHGVYL1NN 50HuCismJrUL+Qxmwvq5TW5I3QfqJqZ1SQa1Yuh9eqX+VfxWbDiUOX4u1mvBVfGu uiQC0AuuyZnPFhnxBLDP0X16pc746zldcR8Kw+R3j0mMR1l9 =Thvk -----END PGP SIGNATURE----- --qqu2W76iitBlaQdkDXw8qp8tMMHhhvAQn-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 02 11:14:03 2017 Received: (at 27549) by debbugs.gnu.org; 2 Jul 2017 15:14:03 +0000 Received: from localhost ([127.0.0.1]:48912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRgZX-0005LN-Aq for submit@debbugs.gnu.org; Sun, 02 Jul 2017 11:14:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRgZV-0005Kn-L5 for 27549@debbugs.gnu.org; Sun, 02 Jul 2017 11:14:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRgZN-00087o-7j for 27549@debbugs.gnu.org; Sun, 02 Jul 2017 11:13:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRgZN-00087a-3q; Sun, 02 Jul 2017 11:13:53 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:33548 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dRgZM-0007sl-8q; Sun, 02 Jul 2017 11:13:52 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Tobias Geerinckx-Rice Subject: Re: [bug#27549] [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. References: <87y3s8kybp.fsf@gmail.com> <01350273-2593-618d-a461-b99c1f310265@tobias.gr> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 14 Messidor an 225 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Sun, 02 Jul 2017 17:13:50 +0200 In-Reply-To: <01350273-2593-618d-a461-b99c1f310265@tobias.gr> (Tobias Geerinckx-Rice's message of "Sat, 1 Jul 2017 19:18:14 +0200") Message-ID: <87efty7txt.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -7.8 (-------) X-Debbugs-Envelope-To: 27549 Cc: jlicht@fsfe.org, 27549@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -7.8 (-------) Hi! Tobias Geerinckx-Rice skribis: > On 01/07/17 16:48, Jelle Licht wrote: >> Hello Guix, >> >> Having tried to get `vpnc' working with my university's vpn system, and >> failing, I looked into other distributions and how they got it to work. >> It seems that most people use an updated version of the bundled >> `vpnc-script' to make it work. > > Indeed. > > I'd started on packaging those updated vpnc-scripts, but that kind of > fell through all kind of cracks. > > I don't think I needed to bundle anything. I'll dig them up and see how > far I got. Indeed, that would be nice. In the meantime, could you apply Jelle=E2=80=99s patch if it looks right to= you? It=E2=80=99s a bit sad that upstream hasn=E2=80=99t made new releases. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 03 01:17:32 2017 Received: (at 27549) by debbugs.gnu.org; 3 Jul 2017 05:17:32 +0000 Received: from localhost ([127.0.0.1]:49334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRtjg-0004lb-6S for submit@debbugs.gnu.org; Mon, 03 Jul 2017 01:17:32 -0400 Received: from tobias.gr ([51.15.135.5]:39696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRtjb-0004lP-4E for 27549@debbugs.gnu.org; Mon, 03 Jul 2017 01:17:22 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id b112e577; Mon, 3 Jul 2017 05:17:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=subject:to :references:from:message-id:date:mime-version:in-reply-to :content-type; s=201706; bh=i57Ts9xTU2POFat1PtiuyfFwl9VEbARr3oSR +lv6xzw=; b=fRujlucwlLISK1cZij4HNAVBGLR5NA6Hq+vPnUkkWsGkV/lVOlbh yS5GeI8j0+bajjeXp5cGbHgQr4AlnV0K+ehYD+VjU/wnwqWxukIjrLqz+2cH0api rx/kX+I3srB1qGci5jAWR45kFc9XrL60xJojy2NsKv+YXUjC2Ds/8VwbMgVYJ3p4 ioz61DVjh7JtQGZO5GpvDtWSGhq6RKeemO32R7XrTj07RuFerTDU71dc/4DpO+J2 KFxhbDP90V4Jus55YFn55beYw3gXrZOkqAuwetxrWGXE7U1rwpbirqlcXRnRlyaa lacQ7cubsXe+LIjtVx1TjjMc7ydxrA8NvA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id b53007bf (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO); Mon, 3 Jul 2017 05:17:13 +0000 (UTC) Subject: Re: [bug#27549] [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. To: jlicht@fsfe.org, 27549@debbugs.gnu.org References: <87y3s8kybp.fsf@gmail.com> <01350273-2593-618d-a461-b99c1f310265@tobias.gr> From: Tobias Geerinckx-Rice Message-ID: <3702cc9a-9066-4e6c-c9be-050e5e6c1ffe@tobias.gr> Date: Mon, 3 Jul 2017 07:18:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <01350273-2593-618d-a461-b99c1f310265@tobias.gr> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="900HRR5x7A30mU8WIMAWvms4D2muvb7Pd" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 27549 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --900HRR5x7A30mU8WIMAWvms4D2muvb7Pd Content-Type: multipart/mixed; boundary="RnIwT3MIQFB0IPHbNkOuAN2CGOgHN8TLJ"; protected-headers="v1" From: Tobias Geerinckx-Rice To: jlicht@fsfe.org, 27549@debbugs.gnu.org Message-ID: <3702cc9a-9066-4e6c-c9be-050e5e6c1ffe@tobias.gr> Subject: Re: [bug#27549] [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. References: <87y3s8kybp.fsf@gmail.com> <01350273-2593-618d-a461-b99c1f310265@tobias.gr> In-Reply-To: <01350273-2593-618d-a461-b99c1f310265@tobias.gr> --RnIwT3MIQFB0IPHbNkOuAN2CGOgHN8TLJ Content-Type: multipart/mixed; boundary="------------CBC399970E456BCB93E2F9C6" This is a multi-part message in MIME format. --------------CBC399970E456BCB93E2F9C6 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jelle, On 01/07/17 19:18, Tobias Geerinckx-Rice wrote: > I'd started on packaging those updated vpnc-scripts, [...] > I'll dig them up and see how far I got. Found 'em! If you have some spare time, could you give the attached patches a try? They look finished[0], but I don't have a VPN to test. I hope we can avoid relying on the copy of vpnc-scripts bundled with vpnc= : - the bundled copy still lags behind upstream[1], even in trunk - unbundling allows using a stable release of the vpnc client instead of a subversion checkout, while still easily updating the scripts - and shaves ~50MiB from our openconnect package. Of course, it has to actually work for you first :-) Kind regards, T G-R [0]: I don't like the look of 'wrap-keys, but I don't know a better way. [1]: http://git.infradead.org/users/dwmw2/vpnc-scripts.git --------------CBC399970E456BCB93E2F9C6 Content-Type: text/x-patch; name="0002-gnu-vpnc-Use-newer-vpnc-scripts.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-vpnc-Use-newer-vpnc-scripts.patch" =46rom 935a3896c8bb0c356bb04865dc7af3daa09cdb44 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 May 2017 01:56:41 +0200 Subject: [PATCH 2/3] gnu: vpnc: Use newer vpnc-scripts. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vpn.scm (vpnc)[source]: Remove patch. [inputs]: Remove net-tools and iproute2. Add vpnc-scripts. [arguments]: Delete =E2=80=98configure=E2=80=99 and =E2=80=98wrap-vpnc-sc= ript=E2=80=99 #:phases. Add =E2=80=98use-store-paths=E2=80=99 phase. * gnu/packages/patches/vpnc-script.patch: Delete patch. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/vpnc-script.patch | 15 ------------ gnu/packages/vpn.scm | 42 ++++++++++++----------------= ------ 3 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 gnu/packages/patches/vpnc-script.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83b019605..55b4071e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1047,7 +1047,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \= %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ - %D%/packages/patches/vpnc-script.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/weechat-python.patch \ diff --git a/gnu/packages/patches/vpnc-script.patch b/gnu/packages/patche= s/vpnc-script.patch deleted file mode 100644 index a0d948195..000000000 --- a/gnu/packages/patches/vpnc-script.patch +++ /dev/null @@ -1,15 +0,0 @@ -This patch adapts the vpnc script to newer kernel versions, see - https://lkml.org/lkml/2011/3/24/645 - -diff -u a/vpnc-script.in b/vpnc-script.in ---- a/vpnc-script.in 2013-03-03 13:55:16.000000000 +0100 -+++ b/vpnc-script.in 2013-03-03 13:56:11.000000000 +0100 -@@ -116,7 +116,7 @@ -=20 - if [ -n "$IPROUTE" ]; then - fix_ip_get_output () { -- sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' -+ sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/= ipid 0x....//g' - } -=20 - set_vpngateway_route() { diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 4b47a76b3..aa79a7cfb 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -73,41 +73,29 @@ endpoints.") (uri (string-append "https://www.unix-ag.uni-kl.de/~massar/v= pnc/vpnc-" version ".tar.gz")) (sha256 (base32 - "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7k= j6")) - (patches (search-patches "vpnc-script.patch")))) + "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7k= j6")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt) ("perl" ,perl) - - ;; The following packages provide commands that 'vpnc-scrip= t' - ;; expects. - ("net-tools" ,net-tools) ;ifconfig, route - ("iproute2" ,iproute))) ;ip + ("vpnc-scripts" ,vpnc-scripts))) (arguments `(#:tests? #f ; there is no check target #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("PREFIX=3D/usr/local") (string-append "PREFIX=3D" out)= )) - (substitute* "Makefile" - (("ETCDIR=3D/etc/vpnc") (string-append "ETCDIR=3D" out - "/etc/vpnc")))))) - (add-after 'install 'wrap-vpnc-script + (add-after 'unpack 'use-store-paths (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Wrap 'etc/vpnc/vpnc-script' so that it finds the commands= it - ;; needs. Assume coreutils/grep/sed are in $PATH. - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/etc/vpnc/vpnc-script") - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "net-tools") - "/sbin") - ,(string-append (assoc-ref inputs "net-tools") - "/bin") - ,(string-append (assoc-ref inputs "iproute2") - "/sbin")))))))))) + (let ((out (assoc-ref outputs "out")) + (vpnc-scripts (assoc-ref inputs "vpnc-scripts"))) + (substitute* "config.c" + (("/etc/vpnc/vpnc-script") + (string-append vpnc-scripts "/etc/vpnc/vpnc-script"))) + (substitute* "Makefile" + (("ETCDIR=3D.*") + (string-append "ETCDIR=3D" out "/etc/vpnc\n")) + (("PREFIX=3D.*") + (string-append "PREFIX=3D" out "\n"))) + #t))) + (delete 'configure)))) ; no configure script (synopsis "Client for Cisco VPN concentrators") (description "vpnc is a VPN client compatible with Cisco's EasyVPN equipment. --=20 2.13.1 --------------CBC399970E456BCB93E2F9C6 Content-Type: text/x-patch; name="0001-gnu-Add-vpnc-scripts.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-vpnc-scripts.patch" =46rom 43e557609bff42cafcaaefa757ed794af5441efa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 May 2017 01:19:12 +0200 Subject: [PATCH 1/3] gnu: Add vpnc-scripts. * gnu/packages/vpn.scm (vpnc-scripts): New variable. --- gnu/packages/vpn.scm | 91 ++++++++++++++++++++++++++++++++++++++++++++++= +++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 87fea4a47..4b47a76b3 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -4,7 +4,7 @@ ;;; Copyright =C2=A9 2014 Eric Bavier ;;; Copyright =C2=A9 2015 Jeff Mickey ;;; Copyright =C2=A9 2016, 2017 Efraim Flashner -;;; Copyright =C2=A9 2016 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2016, 2017 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2017 Julien Lepiller ;;; ;;; This file is part of GNU Guix. @@ -26,9 +26,11 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) @@ -116,6 +118,93 @@ Only \"Universal TUN/TAP device driver support\" is = needed in the kernel.") (license license:gpl2+) ; some file are bsd-2, see COPYING (home-page "http://www.unix-ag.uni-kl.de/~massar/vpnc/"))) =20 +(define-public vpnc-scripts + (let ((commit "6f87b0fe7b20d802a0747cc310217920047d58d3")) + (package + (name "vpnc-scripts") + (version (string-append "20161214." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri + (git-reference + (url "git://git.infradead.org/users/dwmw2/vpnc-scripts= =2Egit") + (commit commit))) + (sha256 + (base32 + "0pa36w4wlyyvfb66cayhans99wsr2j5si2fvfr7ldfm512ajwn8h"= )))) + (build-system gnu-build-system) + (inputs `(("coreutils" ,coreutils) + ("grep" ,grep) + ("iproute2" ,iproute) ; for =E2=80=98ip=E2=80=99 + ("net-tools" ,net-tools) ; for =E2=80=98ifconfig=E2=80=99= , =E2=80=98route=E2=80=99 + ("sed" ,sed) + ("which" ,which))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-relative-paths + ;; Patch the scripts to work with and use relative paths. + (lambda* _ + (for-each (lambda (script) + (substitute* script + (("^PATH=3D.*") "") + (("(/usr|)/s?bin/") "") + (("\\[ +-x +([^]]+) +\\]" _ command) + (string-append "command -v >/dev/null 2>&1= " + command)))) + (find-files "." "^vpnc-script")) + #t)) + (delete 'configure) ; no configure script + (replace 'build + (lambda _ + (zero? (system* "gcc" "-o" "netunshare" "netunshare.c")))= ) + (replace 'install + ;; There is no Makefile; manually install the relevant file= s. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (etc (string-append out "/etc/vpnc"))) + (for-each (lambda (file) + (install-file file etc)) + (append (find-files "." "^vpnc-script") + (list "netunshare" + "xinetd.netns.conf"))) + #t))) + (add-after 'install 'wrap-scripts + ;; Wrap scripts with paths to their common hard dependencie= s. + ;; Optional dependencies will need to be installed by the u= ser. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (script) + (wrap-program script + `("PATH" ":" prefix + ,(map (lambda (name) + (let ((input (assoc-ref inputs name))) + (string-append input "/bin:" + input "/sbin"))) + (list "coreutils" + "grep" + "iproute2" + "net-tools" + "sed" + "which"))))) + (find-files (string-append out "/etc/vpnc/vpnc-script"= ) + "^vpnc-script")))))) + #:tests? #f)) ; no tests + (home-page "http://git.infradead.org/users/dwmw2/vpnc-scripts.git"= ) + (synopsis "Network configuration scripts for Cisco VPN clients") + (description + "This set of scripts configures routing and name services when in= voked +by the VPNC or OpenConnect Cisco @dfn{Virtual Private Network} (VPN) cli= ents. + +The default @command{vpnc-script} automatically configures most common +connections, and provides hooks for performing custom actions at various= stages +of the connection or disconnection process. + +Alternative scripts are provided for more complicated set-ups, or to ser= ve as an +example for writing your own. For example, @command{vpnc-script-sshd} c= ontains +the entire VPN in a network namespace accessible only through SSH.") + (license license:gpl2+)))) =20 (define-public openconnect (package --=20 2.13.1 --------------CBC399970E456BCB93E2F9C6-- --RnIwT3MIQFB0IPHbNkOuAN2CGOgHN8TLJ-- --900HRR5x7A30mU8WIMAWvms4D2muvb7Pd Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQFBBAEBCgArFiEEeqzfDJ8DWw5d4xcqkczbm0hUG5kFAllZ07gNHG1lQHRvYmlh cy5ncgAKCRCRzNubSFQbmRMYCACUKV6j71YdJy0aq3D3xDbA0zHs+qxNechnKDMQ 3yPfN8Rx24wD1kECLGVlIkZmzmINmYlqC58z2b4pz4IdiJLEhTvMu8NFygXGGX5S TPnVw/yeDueNwnBl/ls7satIYQeaXbMQY3OvSY+y0QQ8GlxRb27VW9upy1cb+BhN Fyk3NJR1CDEHz9UFpIHXCPsVnkcM+ogiMDnK5eAj4T8c/4iqsNq+oQNLFvkhBc7h swK4ie8V8VDATzIQ33WmED3IsnUProbfhc5pQdthq2xqB1uk9ANpbwG8U1sdy1Nv jfLv2xgN3HkbKps+WMq3aFC+Gupf72O2IqFaGZDCImvP8PYb =oZii -----END PGP SIGNATURE----- --900HRR5x7A30mU8WIMAWvms4D2muvb7Pd-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 05 17:47:34 2017 Received: (at 27549) by debbugs.gnu.org; 5 Jul 2017 21:47:34 +0000 Received: from localhost ([127.0.0.1]:53834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSs8z-0006lJ-Bo for submit@debbugs.gnu.org; Wed, 05 Jul 2017 17:47:34 -0400 Received: from mout02.posteo.de ([185.67.36.142]:56621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSrXW-0005qo-Qj for 27549@debbugs.gnu.org; Wed, 05 Jul 2017 17:08:51 -0400 Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3x2tlF62sqz10HX; Wed, 5 Jul 2017 23:08:39 +0200 (CEST) References: <87y3s8kybp.fsf@gmail.com> <01350273-2593-618d-a461-b99c1f310265@tobias.gr> <3702cc9a-9066-4e6c-c9be-050e5e6c1ffe@tobias.gr> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Jelle Licht To: Tobias Geerinckx-Rice Subject: Re: [bug#27549] [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. In-reply-to: <3702cc9a-9066-4e6c-c9be-050e5e6c1ffe@tobias.gr> Date: Wed, 05 Jul 2017 23:08:38 +0200 Message-ID: <87shiaiobt.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 27549 X-Mailman-Approved-At: Wed, 05 Jul 2017 17:47:32 -0400 Cc: jlicht@fsfe.org, 27549@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Tobias, Tobias Geerinckx-Rice writes: > Jelle, > > On 01/07/17 19:18, Tobias Geerinckx-Rice wrote: >> I'd started on packaging those updated vpnc-scripts, [...] >> I'll dig them up and see how far I got. > > Found 'em! If you have some spare time, could you give the attached > patches a try? They look finished[0], but I don't have a VPN to test. > > I hope we can avoid relying on the copy of vpnc-scripts bundled with vpnc: > > - the bundled copy still lags behind upstream[1], even in trunk > - unbundling allows using a stable release of the vpnc client instead > of a subversion checkout, while still easily updating the scripts > - and shaves ~50MiB from our openconnect package. Fair enough, this seems like a good reason to apply your patches ;-). > > Of course, it has to actually work for you first :-) Good news! Your patches work, I verified this with my university vpn. Why are we using this specific versions of the vpnc-scripts? What is the problem regarding `wrap-keys' (wrap-program?) exactly? Regards, Jelle From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 18 18:12:54 2017 Received: (at 27549) by debbugs.gnu.org; 18 Oct 2017 22:12:54 +0000 Received: from localhost ([127.0.0.1]:48797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4wa6-0005lV-H1 for submit@debbugs.gnu.org; Wed, 18 Oct 2017 18:12:54 -0400 Received: from tobias.gr ([51.15.135.5]:41012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4wa2-0005lJ-BP for 27549@debbugs.gnu.org; Wed, 18 Oct 2017 18:12:52 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 5f4aa721; Wed, 18 Oct 2017 22:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=subject:to :cc:references:from:message-id:date:mime-version:in-reply-to :content-type:content-transfer-encoding; s=201706; bh=DBVv2sUYxJ 5dBtzKoCkQA0dFZJOwJcGDMZRfgVrC7nU=; b=tqxjbjbBc5M6tWg4wQdAMyBbX7 XaMOBNymHdx/XvMwUb/gSKGMHkTYzfZQAhl63cDB7eaOSovMh8eeBXBPEbDFMUR2 85eANENLMTyo73GxPf6vNC+4qYBAsHBcQDgMvxOXNVoxV2mQxnNQxHCaFkj9JatE Q5Z035XtMXbWzZLfyf27lOL3tpEFD6fDiDxAdq/jnfbn4XG9DdhMijneVXcbdmWH VrYuhEY9Z04RZGXHeR5QjZDblum8P4oWnaQ9NZaGNB21Bxb7nVU5GZiUsfzwUZja i0hJioKyJamhyNKrwR8sIJqMLnfH3buYaBd+CWVxPQq58EMKmAzwEDRABCTA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 52d10e7e (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO); Wed, 18 Oct 2017 22:12:42 +0000 (UTC) Subject: Re: [bug#27549] [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. To: rekado@elephly.net References: <87y3s8kybp.fsf@gmail.com> <01350273-2593-618d-a461-b99c1f310265@tobias.gr> <3702cc9a-9066-4e6c-c9be-050e5e6c1ffe@tobias.gr> <87shiaiobt.fsf@gmail.com> <87zi8o2l82.fsf@elephly.net> From: Tobias Geerinckx-Rice Message-ID: Date: Thu, 19 Oct 2017 00:14:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <87zi8o2l82.fsf@elephly.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 27549 Cc: 27549@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Ricardo, Ricardo Wurmus wrote on 18/10/17 at 23:35: > What’s the current status here? I'd arranged for someone else with access to such a VPN to (also) test these patches, but never got an answer. I'm afraid I lost track of this issue in the meantime. I'll look into it after some much-needed rest. Kind regards, T G-R From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:23:05 2017 Received: (at control) by debbugs.gnu.org; 19 Oct 2017 05:23:05 +0000 Received: from localhost ([127.0.0.1]:49007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e53IP-0003oV-MT for submit@debbugs.gnu.org; Thu, 19 Oct 2017 01:23:05 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21049) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e53IN-0003oK-MO for control@debbugs.gnu.org; Thu, 19 Oct 2017 01:23:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1508362520; s=zoho; d=elephly.net; i=rekado@elephly.net; h=Date:To:From:Subject; l=15; bh=+fvU428UAUFtfdAJOUNGuj4wts1RCBc6ii5fH3MKSXU=; b=RRo83v+avbQOXwn01IeoIqUff45qIsVlpsIs7RQjVTo+hD32bbNUFM4UVJpKjb5F V+2udUwxYEj/H21pIB0zdyYop6c87Pjt9fYZJNE4DCXjdQVpTneV4xY/W6wj+AAdsP8 gRXSly7PcYpWcr4Q2+/XqhuR+MSkQoVl4bbhtJYY= Received: from localhost (port-92-200-55-161.dynamic.qsc.de [92.200.55.161]) by mx.zohomail.com with SMTPS id 1508362520837745.4864650965353; Wed, 18 Oct 2017 14:35:20 -0700 (PDT) Date: Wed, 18 Oct 2017 23:35:18 +0200 To: control@debbugs.gnu.org From: Ricardo Wurmus Subject: control message for bug #27549 X-ZohoMailClient: External X-Spam-Score: -2.7 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" Message-Id: X-Spam-Score: -2.8 (--) owner 27549 ! From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 20 21:41:25 2017 Received: (at 27549) by debbugs.gnu.org; 21 Oct 2017 01:41:25 +0000 Received: from localhost ([127.0.0.1]:52934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5imy-0003tJ-1W for submit@debbugs.gnu.org; Fri, 20 Oct 2017 21:41:25 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5imv-0003t9-NP for 27549@debbugs.gnu.org; Fri, 20 Oct 2017 21:41:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1508362512; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; l=1343; bh=EvwjzdQnQOm12433H6+8HQug5MBaCZ9WLfi8K6g8bo4=; b=GBsGCZAmKp9/H4BKTX58FWWjLNpPl2ELtNJKxtMN/RxgZlz39TjRiGPbqXSWM0zB xL0Ts7iT23v9sHxYqWVJOOMPTYvUAafvaiSaxyPz3QZCKMemmpV5d4bttDopCch2AUa JEu0Ym+ccO3qMwrxNOlR9eXpS2tjKJ+KtMMhQ9Ss= Received: from localhost (port-92-200-55-161.dynamic.qsc.de [92.200.55.161]) by mx.zohomail.com with SMTPS id 1508362512274554.1809959031228; Wed, 18 Oct 2017 14:35:12 -0700 (PDT) References: <87y3s8kybp.fsf@gmail.com> <01350273-2593-618d-a461-b99c1f310265@tobias.gr> <3702cc9a-9066-4e6c-c9be-050e5e6c1ffe@tobias.gr> <87shiaiobt.fsf@gmail.com> User-agent: mu4e 0.9.18; emacs 25.3.1 From: Ricardo Wurmus To: Jelle Licht Subject: Re: [bug#27549] [PATCH] gnu: vpnc: Update to 0.5.3, revision-550. In-reply-to: <87shiaiobt.fsf@gmail.com> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 18 Oct 2017 23:35:09 +0200 Message-ID: <87zi8o2l82.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 27549 Cc: Tobias Geerinckx-Rice , 27549@debbugs.gnu.org, jlicht@fsfe.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Hi Jelle, hi Tobias, > Tobias, > > > Tobias Geerinckx-Rice writes: > >> Jelle, >> >> On 01/07/17 19:18, Tobias Geerinckx-Rice wrote: >>> I'd started on packaging those updated vpnc-scripts, [...] >>> I'll dig them up and see how far I got. >> >> Found 'em! If you have some spare time, could you give the attached >> patches a try? They look finished[0], but I don't have a VPN to test. >> >> I hope we can avoid relying on the copy of vpnc-scripts bundled with vpnc: >> >> - the bundled copy still lags behind upstream[1], even in trunk >> - unbundling allows using a stable release of the vpnc client instead >> of a subversion checkout, while still easily updating the scripts >> - and shaves ~50MiB from our openconnect package. > Fair enough, this seems like a good reason to apply your patches ;-). > >> >> Of course, it has to actually work for you first :-) > > Good news! Your patches work, I verified this with my university vpn. > Why are we using this specific versions of the vpnc-scripts? > > What is the problem regarding `wrap-keys' (wrap-program?) exactly? It looks like these patches were dropped. What’s the current status here? Can we apply them or are they no longer needed? -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 29 10:12:52 2017 Received: (at 27549-done) by debbugs.gnu.org; 29 Nov 2017 15:12:52 +0000 Received: from localhost ([127.0.0.1]:37140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eK42e-0000nF-K6 for submit@debbugs.gnu.org; Wed, 29 Nov 2017 10:12:52 -0500 Received: from tobias.gr ([51.15.135.5]:34670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eK42c-0000n4-Ky; Wed, 29 Nov 2017 10:12:51 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id 67975e8f; Wed, 29 Nov 2017 15:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=to:from :message-id:date:mime-version:content-type :content-transfer-encoding; s=2018; bh=5Q/Nf8L+WH404Tz9iY9hvaGGV GxuW0KZrYsXedrD7v8=; b=nytKpUZXVssdOs8511gUByIR+miE2ufT9Cxy7jMCK tk0btaJ8OwVt72Xee8YSG7p74dN0cfD2c25mRjozxI9oDfgBbPcBYZ6QkH33ARV5 9SC4tuSMtr23psyu0TvJXZg2kYS8zpwt4eGXlmYMeiXf9phYKJqZhk2vsE0WG3ml 5JLsDD4BqyqTVPyv0r1H8/RFVcL+T6UWQJBwqrOKYCD0sI6lIbCJpMZp5Ic5j4rK rqZ0VATaXsMqxugj69qfV6xINNnhj/oy99JgeBpo7yPTeYDubjelxMiN02E2pve5 N1ty7aQYfVo3w+CTbT6Ds8fPwOD3WPvjK3csR4GzI0qJA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 72efd3c4 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO); Wed, 29 Nov 2017 15:12:45 +0000 (UTC) To: 27549-done@debbugs.gnu.org, 26386-done@debbugs.gnu.org From: Tobias Geerinckx-Rice Message-ID: <1765f7b3-bad6-33cc-f2f3-802180563d8d@tobias.gr> Date: Wed, 29 Nov 2017 16:15:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 27549-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) Ricardo Wurmus wrote: > It looks like these patches were dropped. Down 6 flights of very cracked stairs. Finally pushed as 06d91fd944e58ce787048f5c1b7804b210ad1f82 et al. Kind regards, T G-R From unknown Tue Aug 19 01:10:56 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 28 Dec 2017 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator