commit 4743182
hovercats
·
2024-05-24 21:19:42 +0000 UTC
parent ab81094
zip: fix implicit function decl. also fix missing time.h in timezone.c
6 files changed,
+81,
-2
+0,
-1
1@@ -2,7 +2,6 @@
2
3 export CFLAGS="$CFLAGS -DNO_BZIP_SUPPORT"
4
5-
6 for p in *.patch; do
7 patch -p1 < "$p"
8 done
+2,
-0
1@@ -2,3 +2,5 @@ c622bb4295213bc6d94e42a6da58d8bdb32fc6d8f7f37aa078238c31b05c9d9176
2 85d4fccfcc73d98604d4183cc1322d7e1aa9dfa7de74c85d26bae7ea812d304ba4
3 0738c7aac287329b8de073c7e9d4cf8fafe6189c3fd103a30f69ac82b251afa4da
4 b4c5dbd122ccd610de483d5fca0d33b74888733f037f1f8105c011d14c8f5c35f2
5+3f25068fad5058105922b27ee7d2ea3535d0f6276efb77ad2c147efa3e2112724e
6+a654fbd300356b1b9e5b4990aad4acf5140ffcd8c3a40492185e76da060df84e11
1@@ -0,0 +1,24 @@
2+From 217eb7bfb7e17152a28cb7108d6907628c3de24d Mon Sep 17 00:00:00 2001
3+From: hovercats <hovercatswithlasereyes@protonmail.com>
4+Date: Sat, 25 May 2024 00:01:24 +0200
5+Subject: [PATCH 4/5] add missing time.h
6+
7+---
8+ timezone.c | 1 +
9+ 1 file changed, 1 insertion(+)
10+
11+diff --git a/timezone.c b/timezone.c
12+index 485ec02..18aecbd 100644
13+--- a/timezone.c
14++++ b/timezone.c
15+@@ -41,6 +41,7 @@
16+ #include "timezone.h"
17+ #include <ctype.h>
18+ #include <errno.h>
19++#include <time.h>
20+
21+ #ifdef IZTZ_DEFINESTDGLOBALS
22+ long timezone = 0;
23+--
24+2.45.1
25+
1@@ -0,0 +1,52 @@
2+From 92c57f1dfa2a811236c36d93a02d7b6ae932e002 Mon Sep 17 00:00:00 2001
3+From: hovercats <hovercatswithlasereyes@protonmail.com>
4+Date: Sat, 25 May 2024 02:02:44 +0200
5+Subject: [PATCH 5/5] fix conflicting types for memset and memcpy
6+
7+https://bugs.gentoo.org/869203
8+---
9+ unix/configure | 8 ++++----
10+ 1 file changed, 4 insertions(+), 4 deletions(-)
11+
12+diff --git a/unix/configure b/unix/configure
13+index 73ba803..ecb2d7b 100644
14+--- a/unix/configure
15++++ b/unix/configure
16+@@ -512,14 +512,14 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
17+ for func in rmdir strchr strrchr rename mktemp mktime mkstemp
18+ do
19+ echo Check for $func
20+- echo "int main(){ $func(); return 0; }" > conftest.c
21++ echo "char $func(); int main(){ return $func(); }" > conftest.c
22+ $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
23+ [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`"
24+ done
25+
26+
27+ echo Check for memset
28+-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
29++echo "int main(){ char memset(); return memset(); }" > conftest.c
30+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
31+ [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
32+
33+@@ -556,7 +556,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
34+
35+ echo Check for directory libraries
36+ cat > conftest.c << _EOF_
37+-int main() { return closedir(opendir(".")); }
38++int main() { char closedir(); char opendir(); return closedir(opendir()); }
39+ _EOF_
40+
41+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
42+@@ -578,7 +578,7 @@ fi
43+ # Dynix/ptx 1.3 needed this
44+
45+ echo Check for readlink
46+-echo "int main(){ return readlink(); }" > conftest.c
47++echo "int main(){ char readlink(); return readlink(); }" > conftest.c
48+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
49+ if [ $? -ne 0 ]; then
50+ $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null
51+--
52+2.45.1
53+
+2,
-0
1@@ -2,3 +2,5 @@ https://downloads.sourceforge.net/infozip/zip30.tar.gz
2 patches/0001-fix-build-with-Werror-format-security.patch
3 patches/0002-strip-redundant-leading-.-sections.patch
4 patches/0003-add-proper-GNU-stack-markings-so-we-dont-get-the-def.patch
5+patches/0004-add-missing-time.h.patch
6+patches/0005-fix-conflicting-types-for-memset-and-memcpy.patch
+1,
-1
1@@ -1 +1 @@
2-3.0 3
3+3.0 4