aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2021-03-14 19:12:53 -0400
committerMark H Weaver <mhw@netris.org>2021-03-14 19:16:17 -0400
commitd059485257bbe5b4f4d903b357ec99a3af2d4f39 (patch)
tree9b5bb038a773138e8753c7689c41731d8dbb02bf /gnu
parentb082ea9406f19f0d0c296227510256b87fe11e3c (diff)
downloadguix-d059485257bbe5b4f4d903b357ec99a3af2d4f39.tar.gz
guix-d059485257bbe5b4f4d903b357ec99a3af2d4f39.zip
gnu: unzip: Remove redundant and unused "unzip-symlink.patch".
This is a followup to commit 31d289a4759909d24dd309ac24d42902a8c20da0, which added, but did not use, "unzip-symlink.patch", which is redundant with the pre-existing "unzip-initialize-symlink-flag.patch". * gnu/packages/patches/unzip-symlink.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/unzip-symlink.patch17
2 files changed, 0 insertions, 18 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 25f8a7fde8..cf8849cf59 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1752,7 +1752,6 @@ dist_patch_DATA = \
%D%/packages/patches/unzip-fix-recmatch.patch \
%D%/packages/patches/unzip-manpage-fix.patch \
%D%/packages/patches/unzip-overflow.patch \
- %D%/packages/patches/unzip-symlink.patch \
%D%/packages/patches/unzip-timestamp.patch \
%D%/packages/patches/unzip-valgrind.patch \
%D%/packages/patches/unzip-x-option.patch \
diff --git a/gnu/packages/patches/unzip-symlink.patch b/gnu/packages/patches/unzip-symlink.patch
deleted file mode 100644
index d7eaf160b4..0000000000
--- a/gnu/packages/patches/unzip-symlink.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/process.c b/process.c
-index 1e9a1e1..905732b 100644
---- a/process.c
-+++ b/process.c
-@@ -1751,6 +1751,12 @@ int process_cdir_file_hdr(__G) /* return PK-type error code */
- = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11);
- #endif
-
-+#ifdef SYMLINKS
-+ /* Initialize the symlink flag, may be set by the platform-specific
-+ mapattr function. */
-+ G.pInfo->symlink = 0;
-+#endif
-+
- return PK_COOL;
-
- } /* end function process_cdir_file_hdr() */