Skip to contentSkip to conversation

sed: Update a patch to avoid fuzz

PATCH New Peter Kjellerstedt 1 participant 4 messages Apr 23, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 sed: Update a patch to avoid fuzz

---
 .../sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch +4 -4
index c7c0aa0..86b64a1 100644
@@ -27,11 +27,11 @@ Index: sed-4.1.2/po/Makefile.in.in
 --- sed-4.1.2.orig/po/Makefile.in.in
 +++ sed-4.1.2/po/Makefile.in.in
 @@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po
- INSTALL = /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/bin/install -c
- INSTALL_DATA = ${INSTALL} -m 644
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
  mkinstalldirs = $(mkdir_p)
 -mkdir_p = @mkdir_p@
 +mkdir_p = @MKDIR_P@
  
- CC = i586-poky-linux-gcc  -m32   -march=i586 --sysroot=/srv/home/nitin/builds2/build0/tmp/sysroots/qemux86
- GMSGFMT = /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/bin/msgfmt
+ CC = @CC@
+ GMSGFMT = @GMSGFMT@
Signature · 1 line
2.12.0
#1 lore raw

PATCH 2/4 dosfstools: Update a patch to avoid fuzz

---
 .../dosfstools/dosfstools/dosfstools-msdos_fs-types.patch           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-devtools/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch +3 -3
index 35abd1a..c04280e 100644
@@ -8,7 +8,7 @@ Signed-off-by: Scott Garman <[email protected]>
 --- dosfstools-2.10/dosfsck/dosfsck.h.org	2006-02-21 08:36:14.000000000 -0700
 +++ dosfstools-2.10/dosfsck/dosfsck.h	2006-02-21 08:40:12.000000000 -0700
 @@ -22,6 +22,14 @@
-        #undef __KERNEL__
+ # undef __KERNEL__
  #endif
  
 +#ifndef __s8
@@ -21,11 +21,11 @@ Signed-off-by: Scott Garman <[email protected]>
 +
  #include <linux/msdos_fs.h>
  
- /* 2.1 kernels use le16_to_cpu() type functions for CF_LE_W & Co., but don't
+ #undef CF_LE_W
 --- dosfstools-2.10/dosfsck/file.c.org	2006-02-21 08:37:36.000000000 -0700
 +++ dosfstools-2.10/dosfsck/file.c	2006-02-21 08:37:47.000000000 -0700
 @@ -23,6 +23,10 @@
-        #undef __KERNEL__
+ # undef __KERNEL__
  #endif
  
 +#ifndef __s8
Signature · 1 line
2.12.0
#2 lore raw

PATCH 3/4 gnupg: Update a patch to avoid fuzz

In reply to Peter Kjellerstedt
---
 recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch +1 -2
index 2855cab..c3c361d 100644
@@ -15,5 +15,4 @@ Upstream-Status: Inappropriate [configuration]
 +#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__)
  #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
    __asm__ ("adds %1, %4, %5\n"                                          \
-          "adc  %0, %2, %3"                                            \
-
+ 	   "adc  %0, %2, %3"                                            \
Signature · 1 line
2.12.0
#3 lore raw

PATCH 4/4 texinfo: Update a patch to avoid fuzz

In reply to Peter Kjellerstedt
---
 recipes-extended/texinfo/texinfo-4.8/use_host_makedoc.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-extended/texinfo/texinfo-4.8/use_host_makedoc.patch +3 -3
index 5b7f32d..11e21aa 100644
@@ -6,9 +6,9 @@ Index: texinfo-5.1/info/Makefile.am
 ===================================================================
 --- texinfo-5.1.orig/info/Makefile.am
 +++ texinfo-5.1/info/Makefile.am
-@@ -76,7 +76,7 @@ cmd_sources = $(srcdir)/session.c $(srcd
- # more than once.
- funs.h: makedoc$(EXEEXT) $(cmd_sources)
+@@ -67,7 +67,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
+ # The $(EXEEXT) should be added by Automake, but isn't. Fine.
+ $(generated_sources): makedoc$(EXEEXT) $(cmd_sources)
  	rm -f $(generated_sources)
 -	$(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
 +	makedoc $(cmd_sources)
Signature · 1 line
2.12.0