commit cdc056a

hovercats  ·  2024-10-26 17:56:00 +0000 UTC
parent 53edf62
zip: drop.
9 files changed,  +0, -215
+0, -31
 1@@ -1,31 +0,0 @@
 2-#!/bin/sh -e
 3-
 4-export CFLAGS="$CFLAGS -DNO_BZIP_SUPPORT"
 5-
 6-for p in *.patch; do
 7-    patch -p1 < "$p"
 8-done
 9-
10-# The ZIPS variable is intentionally single quoted
11-# shellcheck disable=SC2016
12-make \
13-    prefix=/usr \
14-    CC="$CC -static $LDFLAGS $CFLAGS $CXXFLAGS" \
15-    ZIPS='zip$E' \
16-    -f unix/Makefile generic
17-
18-# The ZIPS variable is intentionally single quoted
19-# shellcheck disable=SC2016
20-make \
21-    prefix="$1/usr" \
22-    MANDIR="$1/usr/share/man/man1" \
23-    ZIPS='zip$E' \
24-    -f unix/Makefile install
25-
26-# We only build and install zip. Remove redundant manpages
27-for p in zipnote zipsplit zipcloak; do
28-	rm -rf "$1/usr/share/man/man1/$p.1"
29-done
30-
31-# Compress manpages
32-find "$1/usr/share/man" -type f -exec gzip -n -9 {} +
+0, -6
1@@ -1,6 +0,0 @@
2-c622bb4295213bc6d94e42a6da58d8bdb32fc6d8f7f37aa078238c31b05c9d9176
3-85d4fccfcc73d98604d4183cc1322d7e1aa9dfa7de74c85d26bae7ea812d304ba4
4-0738c7aac287329b8de073c7e9d4cf8fafe6189c3fd103a30f69ac82b251afa4da
5-b4c5dbd122ccd610de483d5fca0d33b74888733f037f1f8105c011d14c8f5c35f2
6-3f25068fad5058105922b27ee7d2ea3535d0f6276efb77ad2c147efa3e2112724e
7-a654fbd300356b1b9e5b4990aad4acf5140ffcd8c3a40492185e76da060df84e11
+0, -34
 1@@ -1,34 +0,0 @@
 2-From 54a296d45093014dd4e4bda48ef2fea8ed299b35 Mon Sep 17 00:00:00 2001
 3-From: hovercats <hovercatswithlasereyes@protonmail.com>
 4-Date: Sat, 4 May 2024 20:43:40 +0200
 5-Subject: [PATCH 1/3] fix build with -Werror=format-security
 6-
 7----
 8- zip.c | 4 ++--
 9- 1 file changed, 2 insertions(+), 2 deletions(-)
10-
11-diff --git a/zip.c b/zip.c
12-index 439821f..91ad13b 100644
13---- a/zip.c
14-+++ b/zip.c
15-@@ -1028,7 +1028,7 @@ local void help_extended()
16- 
17-   for (i = 0; i < sizeof(text)/sizeof(char *); i++)
18-   {
19--    printf(text[i]);
20-+    printf("%s", text[i]);
21-     putchar('\n');
22-   }
23- #ifdef DOS
24-@@ -1225,7 +1225,7 @@ local void version_info()
25-             CR_MAJORVER, CR_MINORVER, CR_BETA_VER, CR_VERSION_DATE);
26-   for (i = 0; i < sizeof(cryptnote)/sizeof(char *); i++)
27-   {
28--    printf(cryptnote[i]);
29-+    printf("%s", cryptnote[i]);
30-     putchar('\n');
31-   }
32-   ++i;  /* crypt support means there IS at least one compilation option */
33--- 
34-2.44.0
35-
+0, -25
 1@@ -1,25 +0,0 @@
 2-From 51671ebaa4fe539d498305421917bce050637e20 Mon Sep 17 00:00:00 2001
 3-From: hovercats <hovercatswithlasereyes@protonmail.com>
 4-Date: Sat, 4 May 2024 20:46:12 +0200
 5-Subject: [PATCH 2/3] strip redundant leading "./" sections
 6-
 7----
 8- util.c | 2 ++
 9- 1 file changed, 2 insertions(+)
10-
11-diff --git a/util.c b/util.c
12-index 73317da..2dd3a46 100644
13---- a/util.c
14-+++ b/util.c
15-@@ -493,6 +493,8 @@ int cs;                 /* force case-sensitive match if TRUE */
16- /* Compare the sh pattern p with the string s and return true if they match,
17-    false if they don't or if there is a syntax error in the pattern. */
18- {
19-+  while (s[0] == '.' && s[1] == '/') 
20-+    s += 2;                /* strip redundant leading "./" sections */
21-   return recmatch(p, s, cs) == 1;
22- }
23- 
24--- 
25-2.44.0
26-
+0, -36
 1@@ -1,36 +0,0 @@
 2-From 94adfcfb2933d0b053b971cba3d93dfee749b767 Mon Sep 17 00:00:00 2001
 3-From: hovercats <hovercatswithlasereyes@protonmail.com>
 4-Date: Sat, 4 May 2024 20:47:09 +0200
 5-Subject: [PATCH 3/3] add proper GNU stack markings so we dont get the default:
 6- executable
 7-
 8----
 9- crc_i386.S | 3 +++
10- match.S    | 3 +++
11- 2 files changed, 6 insertions(+)
12-
13-diff --git a/crc_i386.S b/crc_i386.S
14-index 38dbc86..62e5c16 100644
15---- a/crc_i386.S
16-+++ b/crc_i386.S
17-@@ -302,3 +302,6 @@ _crc32:                         /* ulg crc32(ulg crc, uch *buf, extent len) */
18- #endif /* i386 || _i386 || _I386 || __i386 */
19- 
20- #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
21-+
22-+.section .note.GNU-stack, "", @progbits
23-+.previous
24-diff --git a/match.S b/match.S
25-index eb8f735..b900d83 100644
26---- a/match.S
27-+++ b/match.S
28-@@ -405,3 +405,6 @@ L__return:
29- #endif /* i386 || _I386 || _i386 || __i386  */
30- 
31- #endif /* !USE_ZLIB */
32-+
33-+.section .note.GNU-stack, "", @progbits
34-+.previous
35--- 
36-2.44.0
37-
+0, -24
 1@@ -1,24 +0,0 @@
 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-
+0, -52
 1@@ -1,52 +0,0 @@
 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-
+0, -6
1@@ -1,6 +0,0 @@
2-https://downloads.sourceforge.net/infozip/zip30.tar.gz
3-patches/0001-fix-build-with-Werror-format-security.patch
4-patches/0002-strip-redundant-leading-.-sections.patch
5-patches/0003-add-proper-GNU-stack-markings-so-we-dont-get-the-def.patch
6-patches/0004-add-missing-time.h.patch
7-patches/0005-fix-conflicting-types-for-memset-and-memcpy.patch
+0, -1
1@@ -1 +0,0 @@
2-3.0 4