guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: unzip: Remove redundant and unused "unzip-sy


From: guix-commits
Subject: branch master updated: gnu: unzip: Remove redundant and unused "unzip-symlink.patch".
Date: Sun, 14 Mar 2021 19:17:24 -0400

This is an automated email from the git hooks/post-receive script.

mhw pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new d059485  gnu: unzip: Remove redundant and unused "unzip-symlink.patch".
d059485 is described below

commit d059485257bbe5b4f4d903b357ec99a3af2d4f39
Author: Mark H Weaver <mhw@netris.org>
AuthorDate: Sun Mar 14 19:12:53 2021 -0400

    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.
---
 gnu/local.mk                             |  1 -
 gnu/packages/patches/unzip-symlink.patch | 17 -----------------
 2 files changed, 18 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 25f8a7f..cf8849c 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 d7eaf16..0000000
--- 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() */



reply via email to

[Prev in Thread] Current Thread [Next in Thread]