summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:02 -0800
commit438685084d2e26745796a32faee2b07cb44d0993 (patch)
tree0674d46400ab88e848db196b6f3eecb5faeaf48d /meta
parentaa0c57f6a521c0cb562c818316020ebe61fd797e (diff)
downloadpoky-438685084d2e26745796a32faee2b07cb44d0993.tar.gz
libksba: 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. (From OE-Core rev: f413ae03a61ad8593cc3c0dda11f2bb02cd96c25) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch38
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
index d28dfd9ebe..5afe6de923 100644
--- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
@@ -6,13 +6,13 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile.
6 6
7Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 7Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
8 8
9Index: libksba-1.3.0/Makefile.am 9Index: libksba-1.3.5/Makefile.am
10=================================================================== 10===================================================================
11--- libksba-1.3.0.orig/Makefile.am 2014-05-13 21:39:22.390385646 +0000 11--- libksba-1.3.5.orig/Makefile.am
12+++ libksba-1.3.0/Makefile.am 2014-05-13 21:39:22.462385646 +0000 12+++ libksba-1.3.5/Makefile.am
13@@ -21,6 +21,9 @@ 13@@ -20,6 +20,9 @@
14
14 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 15 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
15 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
16 16
17+pkgconfigdir = ${libdir}/pkgconfig 17+pkgconfigdir = ${libdir}/pkgconfig
18+pkgconfig_DATA = ksba.pc 18+pkgconfig_DATA = ksba.pc
@@ -20,11 +20,11 @@ Index: libksba-1.3.0/Makefile.am
20 # (A suitable gitlog-to-changelog script can be found in GnuPG master.) 20 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
21 GITLOG_TO_CHANGELOG=gitlog-to-changelog 21 GITLOG_TO_CHANGELOG=gitlog-to-changelog
22 22
23Index: libksba-1.3.0/configure.ac 23Index: libksba-1.3.5/configure.ac
24=================================================================== 24===================================================================
25--- libksba-1.3.0.orig/configure.ac 2014-05-13 21:39:22.390385646 +0000 25--- libksba-1.3.5.orig/configure.ac
26+++ libksba-1.3.0/configure.ac 2014-05-13 21:39:22.462385646 +0000 26+++ libksba-1.3.5/configure.ac
27@@ -400,6 +400,7 @@ 27@@ -414,6 +414,7 @@ gl/Makefile
28 src/Makefile 28 src/Makefile
29 src/ksba-config 29 src/ksba-config
30 src/versioninfo.rc 30 src/versioninfo.rc
@@ -32,10 +32,10 @@ Index: libksba-1.3.0/configure.ac
32 tests/Makefile 32 tests/Makefile
33 doc/Makefile 33 doc/Makefile
34 ]) 34 ])
35Index: libksba-1.3.0/ksba.pc.in 35Index: libksba-1.3.5/ksba.pc.in
36=================================================================== 36===================================================================
37--- /dev/null 1970-01-01 00:00:00.000000000 +0000 37--- /dev/null
38+++ libksba-1.3.0/ksba.pc.in 2014-05-13 21:39:22.462385646 +0000 38+++ libksba-1.3.5/ksba.pc.in
39@@ -0,0 +1,17 @@ 39@@ -0,0 +1,17 @@
40+prefix=@prefix@ 40+prefix=@prefix@
41+exec_prefix=@exec_prefix@ 41+exec_prefix=@exec_prefix@
@@ -54,11 +54,11 @@ Index: libksba-1.3.0/ksba.pc.in
54+Libs.private: -L${libdir} -lgpg-error 54+Libs.private: -L${libdir} -lgpg-error
55+Cflags: -I${includedir} 55+Cflags: -I${includedir}
56+ 56+
57Index: libksba-1.3.0/src/ksba.m4 57Index: libksba-1.3.5/src/ksba.m4
58=================================================================== 58===================================================================
59--- libksba-1.3.0.orig/src/ksba.m4 2014-05-13 21:39:22.390385646 +0000 59--- libksba-1.3.5.orig/src/ksba.m4
60+++ libksba-1.3.0/src/ksba.m4 2014-05-13 21:49:03.650382696 +0000 60+++ libksba-1.3.5/src/ksba.m4
61@@ -22,18 +22,7 @@ 61@@ -22,18 +22,7 @@ dnl with a changed API.
62 dnl 62 dnl
63 AC_DEFUN([AM_PATH_KSBA], 63 AC_DEFUN([AM_PATH_KSBA],
64 [AC_REQUIRE([AC_CANONICAL_HOST]) 64 [AC_REQUIRE([AC_CANONICAL_HOST])
@@ -77,7 +77,7 @@ Index: libksba-1.3.0/src/ksba.m4
77 tmp=ifelse([$1], ,1:1.0.0,$1) 77 tmp=ifelse([$1], ,1:1.0.0,$1)
78 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 78 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
79 req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` 79 req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
80@@ -43,48 +32,13 @@ 80@@ -43,48 +32,13 @@ AC_DEFUN([AM_PATH_KSBA],
81 min_ksba_version="$tmp" 81 min_ksba_version="$tmp"
82 fi 82 fi
83 83
@@ -129,7 +129,7 @@ Index: libksba-1.3.0/src/ksba.m4
129 if test "$tmp" -gt 0 ; then 129 if test "$tmp" -gt 0 ; then
130 AC_MSG_CHECKING([KSBA API version]) 130 AC_MSG_CHECKING([KSBA API version])
131 if test "$req_ksba_api" -eq "$tmp" ; then 131 if test "$req_ksba_api" -eq "$tmp" ; then
132@@ -97,10 +51,8 @@ 132@@ -97,10 +51,8 @@ AC_DEFUN([AM_PATH_KSBA],
133 fi 133 fi
134 fi 134 fi
135 if test $ok = yes; then 135 if test $ok = yes; then
@@ -141,7 +141,7 @@ Index: libksba-1.3.0/src/ksba.m4
141 if test x"$libksba_config_host" != xnone ; then 141 if test x"$libksba_config_host" != xnone ; then
142 if test x"$libksba_config_host" != x"$host" ; then 142 if test x"$libksba_config_host" != x"$host" ; then
143 AC_MSG_WARN([[ 143 AC_MSG_WARN([[
144@@ -114,8 +66,6 @@ 144@@ -114,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA],
145 fi 145 fi
146 fi 146 fi
147 else 147 else