nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: vpnc: Use newer vpnc-scripts. 

* gnu/packages/vpn.scm (vpnc)[source]: Remove patch.
[inputs]: Remove net-tools and iproute2.  Add vpnc-scripts.
[arguments]: Delete ‘configure’ and ‘wrap-vpnc-script’ #:phases.
Add ‘use-store-paths’ phase.
* gnu/packages/patches/vpnc-script.patch: Delete patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
Tobias Geerinckx-Rice 2017-05-07 01:56:41 +02:00
parent 06d91fd944
commit 101e67ac20
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
3 changed files with 15 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -1126,7 +1126,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/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \

15
gnu/packages/patches/vpnc-script.patch
View File

@ -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() {

42
gnu/packages/vpn.scm
View File

@ -74,41 +74,29 @@ endpoints.")
(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"))))
"1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6"))))
(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
("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=/usr/local") (string-append "PREFIX=" out)))
(substitute* "Makefile"
(("ETCDIR=/etc/vpnc") (string-append "ETCDIR=" 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=.*")
(string-append "ETCDIR=" out "/etc/vpnc\n"))
(("PREFIX=.*")
(string-append "PREFIX=" 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.