summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libsolv
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/libsolv')
-rw-r--r--meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch19
-rw-r--r--meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch5
2 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch b/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
index a575d0ebce..e5cb60dd56 100644
--- a/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
+++ b/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
@@ -1,4 +1,4 @@
1From 4d9b6ec30b78d00ead0a22eb5d047dcdba37e99c Mon Sep 17 00:00:00 2001 1From 47c6f1b4332a9e4935c48cca826786a6b8fe6f59 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= 2From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?=
3 =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?= 3 =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?=
4 <ngompa13@gmail.com> 4 <ngompa13@gmail.com>
@@ -13,6 +13,7 @@ Alex Kanavin: rebased CMakeLists.txt change to apply to latest upstream code.
13 13
14Upstream-Status: Denied [https://github.com/openSUSE/libsolv/pull/112] 14Upstream-Status: Denied [https://github.com/openSUSE/libsolv/pull/112]
15Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 15Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
16
16--- 17---
17 ext/CMakeLists.txt | 7 ++ 18 ext/CMakeLists.txt | 7 ++
18 ext/solv_xfopen.c | 10 +-- 19 ext/solv_xfopen.c | 10 +--
@@ -23,7 +24,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
23 create mode 100644 ext/solv_xfopen_fallback_fopencookie.h 24 create mode 100644 ext/solv_xfopen_fallback_fopencookie.h
24 25
25diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt 26diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
26index 586eda8..477a2ef 100644 27index b8917a2..fac6c32 100644
27--- a/ext/CMakeLists.txt 28--- a/ext/CMakeLists.txt
28+++ b/ext/CMakeLists.txt 29+++ b/ext/CMakeLists.txt
29@@ -4,6 +4,13 @@ SET (libsolvext_SRCS 30@@ -4,6 +4,13 @@ SET (libsolvext_SRCS
@@ -41,11 +42,11 @@ index 586eda8..477a2ef 100644
41 SET (libsolvext_SRCS ${libsolvext_SRCS} 42 SET (libsolvext_SRCS ${libsolvext_SRCS}
42 pool_fileconflicts.c repo_rpmdb.c) 43 pool_fileconflicts.c repo_rpmdb.c)
43diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c 44diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c
44index b0421bf..31345dd 100644 45index 2c64bb6..eb3a3ad 100644
45--- a/ext/solv_xfopen.c 46--- a/ext/solv_xfopen.c
46+++ b/ext/solv_xfopen.c 47+++ b/ext/solv_xfopen.c
47@@ -13,6 +13,10 @@ 48@@ -12,6 +12,10 @@
48 #include <zlib.h> 49 #include <string.h>
49 #include <fcntl.h> 50 #include <fcntl.h>
50 51
51+#if !defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE) 52+#if !defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
@@ -55,7 +56,7 @@ index b0421bf..31345dd 100644
55 #include "solv_xfopen.h" 56 #include "solv_xfopen.h"
56 #include "util.h" 57 #include "util.h"
57 58
58@@ -39,7 +43,7 @@ static FILE *cookieopen(void *cookie, const char *mode, 59@@ -21,7 +25,7 @@ static FILE *cookieopen(void *cookie, const char *mode,
59 ssize_t (*cwrite)(void *, const char *, size_t), 60 ssize_t (*cwrite)(void *, const char *, size_t),
60 int (*cclose)(void *)) 61 int (*cclose)(void *))
61 { 62 {
@@ -64,7 +65,7 @@ index b0421bf..31345dd 100644
64 if (!cookie) 65 if (!cookie)
65 return 0; 66 return 0;
66 return funopen(cookie, 67 return funopen(cookie,
67@@ -48,7 +52,7 @@ static FILE *cookieopen(void *cookie, const char *mode, 68@@ -30,7 +34,7 @@ static FILE *cookieopen(void *cookie, const char *mode,
68 (fpos_t (*)(void *, fpos_t, int))NULL, /* seekfn */ 69 (fpos_t (*)(void *, fpos_t, int))NULL, /* seekfn */
69 cclose 70 cclose
70 ); 71 );
@@ -73,7 +74,7 @@ index b0421bf..31345dd 100644
73 cookie_io_functions_t cio; 74 cookie_io_functions_t cio;
74 75
75 if (!cookie) 76 if (!cookie)
76@@ -60,8 +64,6 @@ static FILE *cookieopen(void *cookie, const char *mode, 77@@ -42,8 +46,6 @@ static FILE *cookieopen(void *cookie, const char *mode,
77 cio.write = cwrite; 78 cio.write = cwrite;
78 cio.close = cclose; 79 cio.close = cclose;
79 return fopencookie(cookie, *mode == 'w' ? "w" : "r", cio); 80 return fopencookie(cookie, *mode == 'w' ? "w" : "r", cio);
@@ -246,5 +247,5 @@ index 0000000..6a7bfee
246+ 247+
247+#endif 248+#endif
248-- 249--
2492.11.0 2502.4.0
250 251
diff --git a/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch b/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch
index efb4e3ad7e..93b8cc9c18 100644
--- a/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch
+++ b/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch
@@ -1,4 +1,4 @@
1From 99b10cdf6a0f8a24e1670c1813b1d9563ae3f5b5 Mon Sep 17 00:00:00 2001 1From 84e12bf7ece49073c559dfd58005132a6099a964 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= 2From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?=
3 =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?= 3 =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?=
4 <ngompa13@gmail.com> 4 <ngompa13@gmail.com>
@@ -11,6 +11,7 @@ the tests all pass.
11 11
12Upstream-Status: Denied [https://github.com/openSUSE/libsolv/pull/112] 12Upstream-Status: Denied [https://github.com/openSUSE/libsolv/pull/112]
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14
14--- 15---
15 ext/solv_xfopen_fallback_fopencookie.c | 19 ++++++++++--------- 16 ext/solv_xfopen_fallback_fopencookie.c | 19 ++++++++++---------
16 ext/solv_xfopen_fallback_fopencookie.h | 10 +++++----- 17 ext/solv_xfopen_fallback_fopencookie.h | 10 +++++-----
@@ -100,5 +101,5 @@ index 6a7bfee..7223e3f 100644
100 101
101 #ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H 102 #ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H
102-- 103--
1032.11.0 1042.4.0
104 105