summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/zip
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/zip')
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0001-configure-Specify-correct-function-signatures-and-de.patch134
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch88
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0001-configure-use-correct-CPP.patch47
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch96
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0002-configure-support-PIC-code-build.patch34
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch35
-rw-r--r--meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch2
-rw-r--r--meta/recipes-extended/zip/zip-3.0/fix-security-format.patch2
-rw-r--r--meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch2
-rw-r--r--meta/recipes-extended/zip/zip_3.0.bb15
10 files changed, 446 insertions, 9 deletions
diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-Specify-correct-function-signatures-and-de.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-Specify-correct-function-signatures-and-de.patch
new file mode 100644
index 0000000000..a4f8382625
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-Specify-correct-function-signatures-and-de.patch
@@ -0,0 +1,134 @@
1From 8810f2643c9372a8083272dc1fc157427646d961 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 10 Aug 2022 17:16:23 -0700
4Subject: [PATCH 1/2] configure: Specify correct function signatures and
5 declarations
6
7Include needed system headers in configure tests, this is needed because
8newer compilers are getting stricter about the C99 specs and turning
9-Wimplicit-function-declaration into hard error e.g. clang-15+
10
11Upstream-Status: Inactive-Upstream
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 unix/configure | 79 +++++++++++++++++++++++++++++++++++++++++---------
15 1 file changed, 66 insertions(+), 13 deletions(-)
16
17diff --git a/unix/configure b/unix/configure
18index 1d9a9bb..f2b3d02 100644
19--- a/unix/configure
20+++ b/unix/configure
21@@ -513,21 +513,70 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
22 # Check for missing functions
23 # add NO_'function_name' to flags if missing
24
25-for func in rmdir strchr strrchr rename mktemp mktime mkstemp
26-do
27- echo Check for $func
28- echo "int main(){ $func(); return 0; }" > conftest.c
29- $CC $CFLAGS $LDFLAGS $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
30- [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`"
31-done
32+echo Check for rmdir
33+cat > conftest.c << _EOF_
34+#include <unistd.h>
35+int main(){ rmdir(NULL); return 0; }
36+_EOF_
37+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
38+[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_RMDIR"
39+
40+echo Check for strchr
41+cat > conftest.c << _EOF_
42+#include <string.h>
43+int main(){ strchr(NULL,0); return 0; }
44+_EOF_
45+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
46+[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_STRCHR"
47
48+echo Check for strrchr
49+cat > conftest.c << _EOF_
50+#include <string.h>
51+int main(){ strrchr(NULL,0); return 0; }
52+_EOF_
53+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
54+[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_STRRCHR"
55+
56+echo Check for rename
57+cat > conftest.c << _EOF_
58+#include <stdio.h>
59+int main(){ rename(NULL,NULL); return 0; }
60+_EOF_
61+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
62+[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_RENAME"
63+
64+echo Check for mktemp
65+cat > conftest.c << _EOF_
66+#include <stdlib.h>
67+int main(){ mktemp(NULL); return 0; }
68+_EOF_
69+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
70+[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_MKTEMP"
71+
72+echo Check for mktime
73+cat > conftest.c << _EOF_
74+#include <time.h>
75+int main(){ mktime(NULL); return 0; }
76+_EOF_
77+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
78+[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_MKTIME"
79+
80+echo Check for mkstemp
81+cat > conftest.c << _EOF_
82+#include <stdlib.h>
83+int main(){ return mkstemp(NULL); }
84+_EOF_
85+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
86+[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_MKSTEMP"
87
88 echo Check for memset
89-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
90+cat > conftest.c << _EOF_
91+#include <string.h>
92+int main(){ char k; memset(&k,0,0); return 0; }
93+_EOF_
94 $CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
95 [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
96
97-
98 echo Check for memmove
99 cat > conftest.c << _EOF_
100 #include <string.h>
101@@ -548,7 +597,7 @@ $CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
102 echo Check for errno declaration
103 cat > conftest.c << _EOF_
104 #include <errno.h>
105-main()
106+int main()
107 {
108 errno = 0;
109 return 0;
110@@ -625,14 +674,18 @@ CFLAGS="${CFLAGS} ${OPT}"
111
112 echo Check for valloc
113 cat > conftest.c << _EOF_
114-main()
115+#include <stdlib.h>
116+int main()
117 {
118 #ifdef MMAP
119- valloc();
120+ valloc(0);
121 #endif
122+ return 0;
123 }
124 _EOF_
125-$CC ${CFLAGS} -c conftest.c > /dev/null 2>/dev/null
126+#$CC ${CFLAGS} -c conftest.c > /dev/null 2>/dev/null
127+$CC ${CFLAGS} -c conftest.c
128+echo "==========================================="
129 [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_VALLOC"
130
131
132--
1332.37.1
134
diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch
new file mode 100644
index 0000000000..92d0d5db58
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch
@@ -0,0 +1,88 @@
1From ab5df4826c4a532da78828b72a2751c899e27ef2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 8 Mar 2022 22:31:21 -0800
4Subject: [PATCH] configure: Use CFLAGS and LDFLAGS when doing link tests
5
6Some case link flags contain important flags which are required during
7linking, link fails otherwise without them, which can result in
8configure detection go wrong, ensure these flags are used along with CC
9when tests involve linking
10
11Upstream-Status: Inactive-Upstream
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 unix/configure | 16 ++++++++--------
15 1 file changed, 8 insertions(+), 8 deletions(-)
16
17diff --git a/unix/configure b/unix/configure
18index 1bc698b..1d9a9bb 100644
19--- a/unix/configure
20+++ b/unix/configure
21@@ -517,14 +517,14 @@ for func in rmdir strchr strrchr rename mktemp mktime mkstemp
22 do
23 echo Check for $func
24 echo "int main(){ $func(); return 0; }" > conftest.c
25- $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
26+ $CC $CFLAGS $LDFLAGS $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
27 [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`"
28 done
29
30
31 echo Check for memset
32 echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
33-$CC -o conftest conftest.c >/dev/null 2>/dev/null
34+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
35 [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
36
37
38@@ -533,7 +533,7 @@ cat > conftest.c << _EOF_
39 #include <string.h>
40 int main() { int a; int b = 0; memmove( &a, &b, sizeof( a)); return a; }
41 _EOF_
42-$CC -o conftest conftest.c >/dev/null 2>/dev/null
43+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
44 [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_MEMMOVE"
45
46
47@@ -542,7 +542,7 @@ cat > conftest.c << _EOF_
48 #include <string.h>
49 int main() { strerror( 0); return 0; }
50 _EOF_
51-$CC -o conftest conftest.c >/dev/null 2>/dev/null
52+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
53 [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_STRERROR"
54
55 echo Check for errno declaration
56@@ -563,7 +563,7 @@ cat > conftest.c << _EOF_
57 int main() { return closedir(opendir(".")); }
58 _EOF_
59
60-$CC -o conftest conftest.c >/dev/null 2>/dev/null
61+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
62 if [ $? -ne 0 ]; then
63 OPT=""
64 for lib in ndir dir ucb bsd BSD PW x dirent
65@@ -583,9 +583,9 @@ fi
66
67 echo Check for readlink
68 echo "int main(){ return readlink(); }" > conftest.c
69-$CC -o conftest conftest.c >/dev/null 2>/dev/null
70+$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null
71 if [ $? -ne 0 ]; then
72- $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null
73+ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lseq >/dev/null 2>/dev/null
74 [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq"
75 fi
76
77@@ -661,7 +661,7 @@ elif [ -f /xenix ]; then
78 elif uname -X >/dev/null 2>/dev/null; then
79 # SCO shared library check
80 echo "int main() { return 0;}" > conftest.c
81- $CC -o conftest conftest.c -lc_s -nointl >/dev/null 2> /dev/null
82+ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lc_s -nointl >/dev/null 2> /dev/null
83 [ $? -eq 0 ] && LFLAGS2="-lc_s -nointl"
84 else
85 SYSTEM=`uname -s 2>/dev/null` || SYSTEM="unknown"
86--
872.35.1
88
diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-use-correct-CPP.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-use-correct-CPP.patch
new file mode 100644
index 0000000000..02253f968c
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-use-correct-CPP.patch
@@ -0,0 +1,47 @@
1From 7a2729ee7f5d9b9d4a0d9b83fe641a2ab03c4ee0 Mon Sep 17 00:00:00 2001
2From: Joe Slater <joe.slater@windriver.com>
3Date: Thu, 24 Feb 2022 17:36:59 -0800
4Subject: [PATCH 1/2] configure: use correct CPP
5
6configure uses CPP to test that two assembler routines
7can be built. Unfortunately, it will use /usr/bin/cpp
8if it exists, invalidating the tests. We use the $CC
9passed to configure.
10
11Upstream-Status: Inappropriate [openembedded specific]
12
13Signed-off-by: Joe Slater <joe.slater@windriver.com>
14---
15 unix/configure | 15 +++++++++------
16 1 file changed, 9 insertions(+), 6 deletions(-)
17
18diff --git a/unix/configure b/unix/configure
19index 73ba803..7e21070 100644
20--- a/unix/configure
21+++ b/unix/configure
22@@ -220,13 +220,16 @@ fi
23 echo Check for the C preprocessor
24 # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
25 CPP="${CC} -E"
26+
27+# We should not change CPP for yocto builds.
28+#
29 # solaris as(1) needs -P, maybe others as well ?
30-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
31-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
32-[ -f /lib/cpp ] && CPP=/lib/cpp
33-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
34-[ -f /xenix ] && CPP="${CC} -E"
35-[ -f /lynx.os ] && CPP="${CC} -E"
36+# [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
37+# [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
38+# [ -f /lib/cpp ] && CPP=/lib/cpp
39+# [ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
40+# [ -f /xenix ] && CPP="${CC} -E"
41+# [ -f /lynx.os ] && CPP="${CC} -E"
42
43 echo "#include <stdio.h>" > conftest.c
44 $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
45--
462.24.1
47
diff --git a/meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch b/meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch
new file mode 100644
index 0000000000..106f246a7c
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch
@@ -0,0 +1,96 @@
1From 9916fc6f1f93f3e092e3c6937c30dc8137c26d34 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 15 Jun 2023 18:31:26 +0800
4Subject: [PATCH] unix/configure: use _Static_assert to do correct detection
5
6We're doing cross compilation, running a cross-compiled problem
7on host to detemine feature is not correct. Use _Static_assert
8to do the detection correctly.
9
10Upstream-Status: Inactive-Upstream
11
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13---
14 unix/configure | 42 ++++++++++++------------------------------
15 1 file changed, 12 insertions(+), 30 deletions(-)
16
17diff --git a/unix/configure b/unix/configure
18index f2b3d02..f917086 100644
19--- a/unix/configure
20+++ b/unix/configure
21@@ -361,6 +361,10 @@ cat > conftest.c << _EOF_
22 #include <sys/stat.h>
23 #include <unistd.h>
24 #include <stdio.h>
25+
26+_Static_assert(sizeof((struct stat){0}.st_uid) == 2, "sizeof st_uid is not 16 bit");
27+_Static_assert(sizeof((struct stat){0}.st_gid) == 2, "sizeof st_gid is not 16 bit");
28+
29 int main()
30 {
31 struct stat s;
32@@ -385,21 +389,7 @@ if [ $? -ne 0 ]; then
33 echo -- UID/GID test failed on compile - disabling old 16-bit UID/GID support
34 CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT"
35 else
36-# run it
37- ./conftest
38- r=$?
39- if [ $r -eq 1 ]; then
40- echo -- UID not 2 bytes - disabling old 16-bit UID/GID support
41- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT"
42- elif [ $r -eq 2 ]; then
43- echo -- GID not 2 bytes - disabling old 16-bit UID/GID support
44- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT"
45- elif [ $r -eq 3 ]; then
46- echo -- 16-bit UIDs and GIDs - keeping old 16-bit UID/GID support
47- else
48- echo -- test failed - conftest returned $r - disabling old 16-bit UID/GID support
49- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT"
50- fi
51+ echo -- 16-bit UIDs and GIDs - keeping old 16-bit UID/GID support
52 fi
53
54
55@@ -417,6 +407,10 @@ cat > conftest.c << _EOF_
56 #include <sys/stat.h>
57 #include <unistd.h>
58 #include <stdio.h>
59+
60+_Static_assert(sizeof(off_t) < 8, "sizeof off_t < 8 failed");
61+_Static_assert(sizeof((struct stat){0}.st_size) < 8, "sizeof st_size < 8 failed");
62+
63 int main()
64 {
65 off_t offset;
66@@ -436,24 +430,12 @@ _EOF_
67 # compile it
68 $CC -o conftest conftest.c >/dev/null 2>/dev/null
69 if [ $? -ne 0 ]; then
70- echo -- no Large File Support
71+ echo -- yes we have Large File Support!
72+ CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT"
73 else
74-# run it
75- ./conftest
76- r=$?
77- if [ $r -eq 1 ]; then
78- echo -- no Large File Support - no 64-bit off_t
79- elif [ $r -eq 2 ]; then
80- echo -- no Large File Support - no 64-bit stat
81- elif [ $r -eq 3 ]; then
82- echo -- yes we have Large File Support!
83- CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT"
84- else
85- echo -- no Large File Support - conftest returned $r
86- fi
87+ echo -- no Large File Support
88 fi
89
90-
91 # Check for wide char for Unicode support
92 # Added 11/24/2005 EG
93
94--
952.34.1
96
diff --git a/meta/recipes-extended/zip/zip-3.0/0002-configure-support-PIC-code-build.patch b/meta/recipes-extended/zip/zip-3.0/0002-configure-support-PIC-code-build.patch
new file mode 100644
index 0000000000..6e0879616a
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/0002-configure-support-PIC-code-build.patch
@@ -0,0 +1,34 @@
1From b0492506d2c28581193906e9d260d4f0451e2c39 Mon Sep 17 00:00:00 2001
2From: Joe Slater <joe.slater@windriver.com>
3Date: Thu, 24 Feb 2022 17:46:03 -0800
4Subject: [PATCH 2/2] configure: support PIC code build
5
6Disable building match.S. The code requires
7relocation in .text.
8
9Upstream-Status: Inappropriate [openembedded specific]
10
11Signed-off-by: Joe Slater <joe.slater@windriver.com>
12---
13 unix/configure | 5 +++--
14 1 file changed, 3 insertions(+), 2 deletions(-)
15
16diff --git a/unix/configure b/unix/configure
17index 7e21070..1bc698b 100644
18--- a/unix/configure
19+++ b/unix/configure
20@@ -242,8 +242,9 @@ if eval "$CPP match.S > _match.s 2>/dev/null"; then
21 if test ! -s _match.s || grep error < _match.s > /dev/null; then
22 :
23 elif eval "$CC -c _match.s >/dev/null 2>/dev/null" && [ -f _match.o ]; then
24- CFLAGS="${CFLAGS} -DASMV"
25- OBJA="match.o"
26+ # disable match.S for PIC code
27+ # CFLAGS="${CFLAGS} -DASMV"
28+ # OBJA="match.o"
29 echo "int foo() { return 0;}" > conftest.c
30 $CC -c conftest.c >/dev/null 2>/dev/null
31 echo Check if compiler generates underlines
32--
332.24.1
34
diff --git a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch b/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch
new file mode 100644
index 0000000000..a86e03e620
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch
@@ -0,0 +1,35 @@
1From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 10 Aug 2022 17:19:38 -0700
4Subject: [PATCH 2/2] unix.c: Do not redefine DIR as FILE
5
6DIR is already provided on Linux via
7/usr/include/dirent.h system header
8
9Upstream-Status: Inactive-Upstream
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 unix/unix.c | 2 --
13 1 file changed, 2 deletions(-)
14
15diff --git a/unix/unix.c b/unix/unix.c
16index ba87614..6e6f4d2 100644
17--- a/unix/unix.c
18+++ b/unix/unix.c
19@@ -61,13 +61,11 @@ local time_t label_utim = 0;
20 /* Local functions */
21 local char *readd OF((DIR *));
22
23-
24 #ifdef NO_DIR /* for AT&T 3B1 */
25 #include <sys/dir.h>
26 #ifndef dirent
27 # define dirent direct
28 #endif
29-typedef FILE DIR;
30 /*
31 ** Apparently originally by Rich Salz.
32 ** Cleaned up and modified by James W. Birdsall.
33--
342.37.1
35
diff --git a/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch b/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch
index 244ddea363..6fd04df1c6 100644
--- a/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch
+++ b/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch
@@ -2,7 +2,7 @@ From: Santiago Vila <sanvila@debian.org>
2Subject: Remove (optional) build date to make the build reproducible 2Subject: Remove (optional) build date to make the build reproducible
3Bug-Debian: http://bugs.debian.org/779042 3Bug-Debian: http://bugs.debian.org/779042
4 4
5Upstream-Status: Inappropriate [no upstream] 5Upstream-Status: Inactive-Upstream [no upstream]
6 6
7Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> 7Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
8 8
diff --git a/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch b/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch
index 19d8548273..f85fddbc60 100644
--- a/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch
+++ b/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch
@@ -14,7 +14,7 @@ zip.c:1228:5: error: format not a string literal and no format arguments [-Werro
14[YOCTO #9552] 14[YOCTO #9552]
15[https://bugzilla.yoctoproject.org/show_bug.cgi?id=9552] 15[https://bugzilla.yoctoproject.org/show_bug.cgi?id=9552]
16 16
17Upstream-Status: Pending 17Upstream-Status: Inactive-Upstream [need a new release]
18 18
19Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> 19Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
20 20
diff --git a/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch b/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch
index ce6caff83e..77ade40a04 100644
--- a/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch
+++ b/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch
@@ -4,7 +4,7 @@ https://bugs.archlinux.org/task/47713
4 4
5Signed-off-by: Jate Sujjavanich <jatedev@gmail.com> 5Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
6 6
7Upstream-Status: Inappropriate [no upstream] 7Upstream-Status: Inactive-Upstream [no upstream]
8 8
9diff --git a/zipnote.c b/zipnote.c 9diff --git a/zipnote.c b/zipnote.c
10index 5e02cb6..996f012 100644 10index 5e02cb6..996f012 100644
diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb
index 97e5e57533..70df5ab872 100644
--- a/meta/recipes-extended/zip/zip_3.0.bb
+++ b/meta/recipes-extended/zip/zip_3.0.bb
@@ -1,11 +1,11 @@
1SUMMARY = "Compressor/archiver for creating and modifying .zip files" 1SUMMARY = "Compressor/archiver for creating and modifying .zip files"
2HOMEPAGE = "http://www.info-zip.org" 2HOMEPAGE = "http://www.info-zip.org"
3DESCRIPTION = "Info-ZIP's purpose is to provide free, portable, high-quality versions of the Zip and UnZip compressor-archiver utilities that are compatible with the DOS-based PKZIP by PKWARE, Inc."
3SECTION = "console/utils" 4SECTION = "console/utils"
4 5
5LICENSE = "BSD-3-Clause" 6LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d"
7 8
8PR = "r2"
9 9
10S = "${WORKDIR}/zip30" 10S = "${WORKDIR}/zip30"
11 11
@@ -13,17 +13,20 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.
13 file://fix-security-format.patch \ 13 file://fix-security-format.patch \
14 file://10-remove-build-date.patch \ 14 file://10-remove-build-date.patch \
15 file://zipnote-crashes-with-segfault.patch \ 15 file://zipnote-crashes-with-segfault.patch \
16 file://0001-configure-use-correct-CPP.patch \
17 file://0002-configure-support-PIC-code-build.patch \
18 file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \
19 file://0001-configure-Specify-correct-function-signatures-and-de.patch \
20 file://0002-unix.c-Do-not-redefine-DIR-as-FILE.patch \
21 file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \
16 " 22 "
17UPSTREAM_VERSION_UNKNOWN = "1" 23UPSTREAM_VERSION_UNKNOWN = "1"
18 24
19SRC_URI[md5sum] = "7b74551e63f8ee6aab6fbc86676c0d37" 25SRC_URI[md5sum] = "7b74551e63f8ee6aab6fbc86676c0d37"
20SRC_URI[sha256sum] = "f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369" 26SRC_URI[sha256sum] = "f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369"
21 27
22# Disputed and also Debian doesn't consider a vulnerability 28CVE_STATUS[CVE-2018-13410] = "disputed: Disputed and also Debian doesn't consider a vulnerability"
23CVE_CHECK_WHITELIST += "CVE-2018-13410" 29CVE_STATUS[CVE-2018-13684] = "cpe-incorrect: Not for zip but for smart contract implementation for it"
24
25# Not for zip but for smart contract implementation for it
26CVE_CHECK_WHITELIST += "CVE-2018-13684"
27 30
28# zip.inc sets CFLAGS, but what Makefile actually uses is 31# zip.inc sets CFLAGS, but what Makefile actually uses is
29# CFLAGS_NOOPT. It will also force -O3 optimization, overriding 32# CFLAGS_NOOPT. It will also force -O3 optimization, overriding
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-28 02:54:02 +0000