zip: add Debian patches.

This commit is contained in:
travankor 2020-02-01 23:42:26 -07:00 committed by Helmut Pozimski
parent ebe7f73566
commit 6ea7207ca9
4 changed files with 55 additions and 3 deletions

View file

@ -0,0 +1,21 @@
From: Kees Cook <kees@debian.org>
Subject: put stack markings in i386 assembly to avoid executable stack
Bug-Debian: http://bugs.debian.org/528280
X-Debian-version: 3.0-2
--- crc_i386.S
+++ crc_i386.S
@@ -302,3 +302,5 @@
#endif /* i386 || _i386 || _I386 || __i386 */
#endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
+.section .note.GNU-stack, "", @progbits
+.previous
--- match.S
+++ match.S
@@ -405,3 +405,5 @@
#endif /* i386 || _I386 || _i386 || __i386 */
#endif /* !USE_ZLIB */
+.section .note.GNU-stack, "", @progbits
+.previous

View file

@ -0,0 +1,15 @@
From: Santiago Vila <sanvila@debian.org>
Subject: Remove (optional) build date to make the build reproducible
Bug-Debian: http://bugs.debian.org/779042
--- unix/unix.c
+++ unix/unix.c
@@ -1020,7 +1020,7 @@
/* Define the compile date string */
-#ifdef __DATE__
+#if 0
# define COMPILE_DATE " on " __DATE__
#else
# define COMPILE_DATE ""

View file

@ -0,0 +1,16 @@
From: Christian Spieler
Subject: zipnote.c: Close in_file instead of undefined file x
Bug-Debian: http://bugs.debian.org/628594
X-Debian-version: 3.0-4
--- zipnote.c
+++ zipnote.c
@@ -661,7 +661,7 @@
if ((r = zipcopy(z)) != ZE_OK)
ziperr(r, "was copying an entry");
}
- fclose(x);
+ fclose(in_file);
/* Write central directory and end of central directory with new comments */
if ((c = zftello(y)) == (zoff_t)-1) /* get start of central */

View file

@ -1,11 +1,11 @@
# Template build file for 'zip'.
# Template file for 'zip'
pkgname=zip
version=3.0
revision=5
revision=6
wrksrc="zip30"
short_desc="Create/update ZIP files compatible with pkzip"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD"
license="Info-ZIP"
homepage="http://infozip.sf.net/"
distfiles="${SOURCEFORGE_SITE}/infozip/zip30.tar.gz"
checksum=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369