From e9ea875a1bd9c54f837f9706d5cefdf4eb8209e6 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 23 Feb 2020 06:20:35 +0200 Subject: [PATCH] zip: remove package zip has 12 year old source code that would require work to make the binary actually work. > root@router1:/# zip > zip error: Not supported (uzoff_t not same size as zoff_t) As the binary does not work, lets remove the package to avoid confusion for the end-users. Reference to #10985 and #11089 as well as https://github.com/openwrt/openwrt/commit/ad8c2d6099a7da5192ee6e2c52a8303642271 Adapted from: c1201a999b0 (note: The package was renamed in master from zip to infozip a few weeks ago due to buildbot's relutance to compile zip in master and 19.07 ever since host zip was added as a build tool.) Signed-off-by: Hannu Nyman --- utils/zip/Makefile | 73 --------------- ...e-borrow-the-LFS-test-from-autotools.patch | 90 ------------------- utils/zip/patches/010-remove-build-date.patch | 15 ---- 3 files changed, 178 deletions(-) delete mode 100644 utils/zip/Makefile delete mode 100644 utils/zip/patches/001-unix-configure-borrow-the-LFS-test-from-autotools.patch delete mode 100644 utils/zip/patches/010-remove-build-date.patch diff --git a/utils/zip/Makefile b/utils/zip/Makefile deleted file mode 100644 index c87f1ed84..000000000 --- a/utils/zip/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (C) 2007-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=zip -PKG_REV:=30 -PKG_VERSION:=3.0 -PKG_RELEASE:=4 - -PKG_SOURCE:=$(PKG_NAME)$(PKG_REV).tar.gz -PKG_SOURCE_URL:=@SF/infozip -PKG_HASH:=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 -PKG_MAINTAINER:=Álvaro Fernández Rojas - -PKG_LICENSE:=BSD-4-Clause -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/zip$(PKG_REV) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)/zip$(PKG_REV) -PKG_CHECK_FORMAT_SECURITY:=0 - -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/package.mk - -define Package/zip - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:= - TITLE:=Archiver for .zip files - URL:=http://infozip.sourceforge.net/Zip.html - SUBMENU:=Compression -endef - -define Package/zip/description - This is InfoZIP's zip program. It produces files that are fully - compatible with the popular PKZIP program; however, the command line - options are not identical. In other words, the end result is the same, - but the methods differ. -endef - -define Build/Configure -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) -f unix/Makefile generic \ - prefix="$(PKG_INSTALL_DIR)/usr" \ - CFLAGS="$(TARGET_CFLAGS)" \ - CC="$(TARGET_CC) $(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX $(TARGET_LDFLAGS)" \ - IZ_BZIP2="no" \ - install -endef - -define Package/zip/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ -endef - -define Host/Compile - +$(HOST_MAKE_VARS) $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) -I. -f unix/Makefile generic -endef - -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/ - $(INSTALL_BIN) $(HOST_BUILD_DIR)/zip $(STAGING_DIR_HOSTPKG)/bin/ -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,zip)) diff --git a/utils/zip/patches/001-unix-configure-borrow-the-LFS-test-from-autotools.patch b/utils/zip/patches/001-unix-configure-borrow-the-LFS-test-from-autotools.patch deleted file mode 100644 index 892540b48..000000000 --- a/utils/zip/patches/001-unix-configure-borrow-the-LFS-test-from-autotools.patch +++ /dev/null @@ -1,90 +0,0 @@ -From fc392c939b9a18959482f588aff0afc29dd6d30a Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 23 Jan 2015 22:20:18 +0100 -Subject: [PATCH 6/6] unix/configure: borrow the LFS test from autotools. - -Infozip's LFS check can't work for cross-compilation -since it try to run a target's binary on the host system. - -Instead, use to LFS test used by autotools which is a -compilation test. -(see autotools/lib/autoconf/specific.m4) - -Reported-by: Richard Genoud -Signed-off-by: Romain Naour ---- - configure | 46 +++++++++++++++------------------------------- - 1 file changed, 15 insertions(+), 31 deletions(-) - -diff --rupN a/unix/configure b/unix/configure ---- a/unix/configure -+++ b/unix/configure -@@ -399,9 +399,8 @@ else - fi - - --# Now we set the 64-bit file environment and check the size of off_t --# Added 11/4/2003 EG --# Revised 8/12/2004 EG -+# LFS check borrowed from autotools sources -+# lib/autoconf/specific.m4 - - echo Check for Large File Support - cat > conftest.c << _EOF_ -@@ -410,23 +409,19 @@ cat > conftest.c << _EOF_ - # define _FILE_OFFSET_BITS 64 /* select default interface as 64 bit */ - # define _LARGE_FILES /* some OSes need this for 64-bit off_t */ - #include --#include --#include --#include -+ -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+ - int main() - { -- off_t offset; -- struct stat s; -- /* see if have 64-bit off_t */ -- if (sizeof(offset) < 8) -- return 1; -- printf(" off_t is %d bytes\n", sizeof(off_t)); -- /* see if have 64-bit stat */ -- if (sizeof(s.st_size) < 8) { -- printf(" s.st_size is %d bytes\n", sizeof(s.st_size)); -- return 2; -- } -- return 3; -+ return 0; - } - _EOF_ - # compile it -@@ -434,19 +429,8 @@ $CC -o conftest conftest.c >/dev/null 2> - if [ $? -ne 0 ]; then - echo -- no Large File Support - else --# run it -- ./conftest -- r=$? -- if [ $r -eq 1 ]; then -- echo -- no Large File Support - no 64-bit off_t -- elif [ $r -eq 2 ]; then -- echo -- no Large File Support - no 64-bit stat -- elif [ $r -eq 3 ]; then -- echo -- yes we have Large File Support! -- CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT" -- else -- echo -- no Large File Support - conftest returned $r -- fi -+ echo -- yes we have Large File Support! -+ CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT" - fi - - diff --git a/utils/zip/patches/010-remove-build-date.patch b/utils/zip/patches/010-remove-build-date.patch deleted file mode 100644 index d7165cd01..000000000 --- a/utils/zip/patches/010-remove-build-date.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Santiago Vila -Subject: Remove (optional) build date to make the build reproducible -Bug-Debian: http://bugs.debian.org/779042 - ---- a/unix/unix.c -+++ b/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 ""