diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-03-04 23:27:24 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-04 23:27:24 +0100 |
| commit | 81eec00cb221231123b74d14245ef7caa9d89ff6 (patch) | |
| tree | 3beeb77c5535038dc75db843dd88a1775fb541bb /gnu/packages/patches | |
| parent | 8689a1908a8353b80ed1fcbb81feddc5eb799f24 (diff) | |
| parent | 2a1e82bb5c2ae28b0018aa765cff6733136b3f70 (diff) | |
| download | guix-81eec00cb221231123b74d14245ef7caa9d89ff6.tar guix-81eec00cb221231123b74d14245ef7caa9d89ff6.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
guix/scripts/gc.scm
guix/scripts/package.scm
guix/ui.scm
tests/guix-package.sh
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/vpnc-script.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/patches/vpnc-script.patch b/gnu/packages/patches/vpnc-script.patch new file mode 100644 index 0000000000..a0d9481952 --- /dev/null +++ b/gnu/packages/patches/vpnc-script.patch @@ -0,0 +1,15 @@ +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() { |