Update embedded zip

r-lib · Mar 17, 2024 · 6741148 · 6741148
1 parent ee5adfa
commit 6741148
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 13 deletions.
diff --git a/src/library/zip/DESCRIPTION b/src/library/zip/DESCRIPTION
@@ -1,19 +1,29 @@
 Package: zip
 Title: Cross-Platform 'zip' Compression
-Version: 2.3.0
-Author: Gábor Csárdi, Kuba Podgórski, Rich Geldreich
-Maintainer: Gábor Csárdi <[email protected]>
-Description: Cross-Platform 'zip' Compression Library. A replacement
-    for the 'zip' function, that does not require any additional
-    external tools on any platform.
+Version: 2.3.1
+Authors@R: c(
+    person("Gábor", "Csárdi", , "[email protected]", role = c("aut", "cre")),
+    person("Kuba", "Podgórski", role = "ctb"),
+    person("Rich", "Geldreich", role = "ctb"),
+    person("Posit Software, PBC", role = c("cph", "fnd"))
+  )
+Description: Cross-Platform 'zip' Compression Library. A replacement for
+    the 'zip' function, that does not require any additional external
+    tools on any platform.
 License: MIT + file LICENSE
-URL: https://github.com/r-lib/zip#readme
+URL: https://github.com/r-lib/zip, https://r-lib.github.io/zip/
 BugReports: https://github.com/r-lib/zip/issues
-RoxygenNote: 7.2.1.9000
-Config/testthat/edition: 3
 Suggests: covr, processx, R6, testthat, withr
+Config/Needs/website: tidyverse/tidytemplate
+Config/testthat/edition: 3
 Encoding: UTF-8
+RoxygenNote: 7.2.3
 NeedsCompilation: yes
-Packaged: 2023-04-17 13:48:47 UTC; gaborcsardi
+Packaged: 2024-01-27 09:28:29 UTC; gaborcsardi
+Author: Gábor Csárdi [aut, cre],
+  Kuba Podgórski [ctb],
+  Rich Geldreich [ctb],
+  Posit Software, PBC [cph, fnd]
+Maintainer: Gábor Csárdi <[email protected]>
 Repository: CRAN
-Date/Publication: 2023-04-17 15:30:02 UTC
+Date/Publication: 2024-01-27 10:00:02 UTC
diff --git a/src/library/zip/LICENSE b/src/library/zip/LICENSE
@@ -1,2 +1,2 @@
-YEAR: 2020
+YEAR: 2023
 COPYRIGHT HOLDER: zip authors
diff --git a/src/library/zip/NEWS.md b/src/library/zip/NEWS.md
@@ -1,3 +1,8 @@
+# zip 2.3.1
+
+* The zip shared library now hides its symbols (on platforms that support
+  this), to avoid name clashes with other libraries (#98).
+
 # zip 2.3.0
 
 * zip now handles large zip files on Windows (#65, #75, #79, @weshinsley).

diff --git a/src/library/zip/R/zip-package.R b/src/library/zip/R/zip-package.R
@@ -0,0 +1,7 @@
+#' @aliases zip-package NULL
+#' @keywords internal
+"_PACKAGE"
+
+## usethis namespace: start
+## usethis namespace: end
+NULL
diff --git a/src/library/zip/src/Makevars b/src/library/zip/src/Makevars
@@ -1,4 +1,6 @@
 
+PKG_CFLAGS = $(C_VISIBILITY)
+
 OBJECTS = init.o miniz.o rzip.o zip.o unixutils.o
 
 .PHONY: all clean

diff --git a/src/library/zip/src/init.c b/src/library/zip/src/init.c
@@ -3,6 +3,8 @@
 #include <Rinternals.h>
 #include <stdlib.h> // for NULL
 #include <R_ext/Rdynload.h>
+#include <R_ext/Visibility.h>
+#define r_export attribute_visible extern
 
 /* .Call calls */
 extern SEXP R_zip_list(SEXP);
@@ -22,7 +24,7 @@ static const R_CallMethodDef CallEntries[] = {
   { NULL, NULL, 0 }
 };
 
-void R_init_zip(DllInfo *dll) {
+r_export void R_init_zip(DllInfo *dll) {
   R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
   R_useDynamicSymbols(dll, FALSE);
   R_forceSymbols(dll, TRUE);