diff options
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/ansible-wrap-program-hack.patch | 22 | ||||
-rw-r--r-- | gnu/packages/patches/quagga-reproducible-build.patch | 22 | ||||
-rw-r--r-- | gnu/packages/patches/screen-fix-info-syntax-error.patch | 47 |
3 files changed, 44 insertions, 47 deletions
diff --git a/gnu/packages/patches/ansible-wrap-program-hack.patch b/gnu/packages/patches/ansible-wrap-program-hack.patch new file mode 100644 index 0000000000..c2e1028392 --- /dev/null +++ b/gnu/packages/patches/ansible-wrap-program-hack.patch @@ -0,0 +1,22 @@ +Ansible changes its behaviour depending on the name of the script that it is +called as. Make it deal with guix' .real wrapper scripts. + +FIXME: Remove once wrapping ansible works properly. +See http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html. +--- ansible-2.3.0.0/bin/ansible 2017-04-12 16:08:05.000000000 +0200 ++++ ansible-2.3.0.0-fixed/bin/ansible 2017-05-21 20:11:18.720872385 +0200 +@@ -75,7 +75,13 @@ + # sometimes add that + target = target[:-1] + +- if len(target) > 1: ++ if target[-1] == "real" and target[0].startswith('.'): ++ target = target[:-1] ++ target[0] = target[0][1:] ++ if len(target) > 1 and target[1] != "real" : ++ sub = target[1] ++ myclass = "%sCLI" % sub.capitalize() ++ elif len(target) > 2 and target[2] == "real" : + sub = target[1] + myclass = "%sCLI" % sub.capitalize() + elif target[0] == 'ansible': diff --git a/gnu/packages/patches/quagga-reproducible-build.patch b/gnu/packages/patches/quagga-reproducible-build.patch new file mode 100644 index 0000000000..80efe4bf62 --- /dev/null +++ b/gnu/packages/patches/quagga-reproducible-build.patch @@ -0,0 +1,22 @@ +Make sure, that vtysh_cmd.c is deterministically generated. + +--- a/vtysh/extract.pl.in 2017-03-10 13:55:06.000000000 +0100 ++++ b/vtysh/extract.pl.in 2017-06-24 00:51:56.460000000 +0200 +@@ -214,7 +214,7 @@ + } + + # Output DEFSH +-foreach (keys %live) { ++foreach (sort keys %live) { + my ($proto); + my ($key); + $key = $live{$_}; +@@ -229,7 +229,7 @@ + { + EOF + +-foreach (keys %odefun) { ++foreach (sort keys %odefun) { + my ($node, $str) = (split (/,/)); + $cmd = $ocmd{$_}; + $cmd =~ s/_cmd/_cmd_vtysh/; diff --git a/gnu/packages/patches/screen-fix-info-syntax-error.patch b/gnu/packages/patches/screen-fix-info-syntax-error.patch deleted file mode 100644 index 6ee9091daa..0000000000 --- a/gnu/packages/patches/screen-fix-info-syntax-error.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fix errors when building the info manual: - -[...] -./screen.texinfo:5799: unknown command `suse' -./screen.texinfo:5800: unknown command `deuxchevaux' -make[2]: *** [Makefile:31: screen.info] Error 1 -[...] - -Patch copied from upstream source repository: - -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=a7d2f9e6ecfa794dd0bd3dbeaf6780c88a6f3152 - -From a7d2f9e6ecfa794dd0bd3dbeaf6780c88a6f3152 Mon Sep 17 00:00:00 2001 -From: Andreas Stieger <astieger@suse.com> -Date: Tue, 28 Feb 2017 19:23:01 +0100 -Subject: [PATCH] fix texinfo syntax errors - -thanks to Andreas Stieger <astieger@suse.com> ---- - src/doc/screen.texinfo | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/doc/screen.texinfo b/src/doc/screen.texinfo -index bc4cbae..aadad33 100644 ---- a/doc/screen.texinfo -+++ b/doc/screen.texinfo -@@ -5795,7 +5795,7 @@ and Alexander Naumov <alexander_naumov@@opensuse.org>. - Contributors @* - ============ - --@example -+@verbatim - Thomas Renninger <treen@suse.com>, - Axel Beckert <abe@deuxchevaux.org>, - Ken Beal <kbeal@@amber.ssd.csd.harris.com>, -@@ -5826,7 +5826,7 @@ Contributors @* - Jason Merrill <jason@@jarthur.Claremont.EDU>, - Johannes Zellner <johannes@@zellner.org>, - Pablo Averbuj <pablo@@averbuj.com>. --@end example -+@end verbatim - - @noindent - Version @* --- -cgit v1.0-41-gc330 - |