summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:15:59 -0800
commitca9c8fe634ca91fe1825fae7ebb0d00021ca480b (patch)
tree62a2d1f1c9e505076e2b856c0848f3dd1a0a9c6d /meta/recipes-support/gnutls
parent9adf817a638229d69d866fd6f8f48ee23caa6864 (diff)
downloadopenembedded-core-ca9c8fe634ca91fe1825fae7ebb0d00021ca480b.tar.gz
openembedded-core-ca9c8fe634ca91fe1825fae7ebb0d00021ca480b.tar.bz2
openembedded-core-ca9c8fe634ca91fe1825fae7ebb0d00021ca480b.zip
gnutls: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r--meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch15
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
index f0b7ca2ec8..b6e7bc9650 100644
--- a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
+++ b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
@@ -14,19 +14,16 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index 6907b21..7c70d9e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -948,7 +948,7 @@ YEAR=`date +%Y`
+Index: gnutls-3.5.16/configure.ac
+===================================================================
+--- gnutls-3.5.16.orig/configure.ac
++++ gnutls-3.5.16/configure.ac
+@@ -955,7 +955,7 @@ YEAR=`date +%Y`
AC_SUBST([YEAR], $YEAR)
for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
- nam=$(basename $i|sed 's/.bak//g')
+ nam=$(basename $i|sed 's/\.bak$//')
if test "$create_libopts_links" = "yes";then
+ rm -f "src/$nam.stamp"
rm -f "src/$nam"
- AC_CONFIG_LINKS([src/$nam:$i])
---
-2.11.0
-