Revision: 26994 http://sourceforge.net/p/gar/code/26994 Author: dmichelsen Date: 2023-01-11 03:43:51 +0000 (Wed, 11 Jan 2023) Log Message: ----------- zutils/trunk: Update to 1.12
Modified Paths: -------------- csw/mgar/pkg/zutils/trunk/Makefile csw/mgar/pkg/zutils/trunk/checksums csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch Removed Paths: ------------- csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch Modified: csw/mgar/pkg/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile 2023-01-08 04:47:36 UTC (rev 26993) +++ csw/mgar/pkg/zutils/trunk/Makefile 2023-01-11 03:43:51 UTC (rev 26994) @@ -1,5 +1,5 @@ NAME = zutils -VERSION = 1.9 +VERSION = 1.12 GARTYPE = v2 DESCRIPTION = Utilities to deal with compressed and non-compressed files @@ -16,12 +16,8 @@ MASTER_SITES += http://download.savannah.gnu.org/releases/zutils/ DISTFILES += $(DISTNAME).tar.lz PATCHFILES += 0001-Add-headers-for-kill-2.patch -PATCHFILES += 0002-Use-test-f-instead-of-e.patch +# PATCHFILES += 0002-Use-test-f-instead-of-e.patch -# Use patch from -# https://lists.nongnu.org/archive/html/zutils-bug/2020-07/msg00002.html -PATCHFILES += 0003-Fix-function-type.patch - VENDOR_URL = http://www.nongnu.org/zutils/zutils.html BUILD_DEP_PKGS += CSWhelp2man @@ -53,12 +49,11 @@ CONFIGURE_ARGS += DIFF=/opt/csw/bin/gdiff CONFIGURE_ARGS += GREP=/opt/csw/bin/ggrep -INSTALL_OVERRIDE_VARS = INSTALL +INSTALL_OVERRIDE_VARS += INSTALL INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall +INSTALL_OVERRIDE_VARS += SHELL +INSTALL_OVERRIDE_VAR_SHELL = /usr/bin/bash -EXTRA_INSTALL_EXPORTS += SHELL -INSTALL_ENV_SHELL = /usr/bin/bash - EXTRA_PAX_ARGS = -s ",/z,/Z,p" TEST_ENV_PATH = $(bindir):$(prefix)/gnu:$(PATH) Modified: csw/mgar/pkg/zutils/trunk/checksums =================================================================== --- csw/mgar/pkg/zutils/trunk/checksums 2023-01-08 04:47:36 UTC (rev 26993) +++ csw/mgar/pkg/zutils/trunk/checksums 2023-01-11 03:43:51 UTC (rev 26994) @@ -1 +1 @@ -c3f542e3cf4131e294d1d6c9ac9095aa zutils-1.9.tar.lz +ef83c50afce7deb254917d91d9392f72 zutils-1.12.tar.lz Modified: csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch 2023-01-08 04:47:36 UTC (rev 26993) +++ csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch 2023-01-11 03:43:51 UTC (rev 26994) @@ -1,6 +1,6 @@ -From c45c292f7ebaa90ea4ab2ec9e7d4647909f08b1b Mon Sep 17 00:00:00 2001 +From 0cf92941a0ea6661a0e009354926b323291d4d3a Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen <d...@opencsw.org> -Date: Wed, 21 Feb 2018 16:39:28 +0100 +Date: Fri, 9 Dec 2022 06:15:54 +0100 Subject: [PATCH] Use test -f instead of -e --- @@ -8,7 +8,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 67b6998..6911492 100644 +index fbd7102..81972a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -134,7 +134,7 @@ install-bin : all @@ -15,10 +15,10 @@ $(INSTALL_PROGRAM) ./zgrep "$(DESTDIR)$(bindir)/zgrep" $(INSTALL_PROGRAM) ./ztest "$(DESTDIR)$(bindir)/ztest" $(INSTALL_PROGRAM) ./zupdate "$(DESTDIR)$(bindir)/zupdate" -- if [ ! -e "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ] ; then \ -+ if [ ! -f "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ] ; then \ - if [ ! -d "$(DESTDIR)$(sysconfdir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)" ; fi ; \ - $(INSTALL_DATA) $(VPATH)/$(pkgname)rc "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ; \ +- if [ ! -e "$(DESTDIR)$(sysconfdir)/$(pkgname).conf" ] ; then \ ++ if [ ! -f "$(DESTDIR)$(sysconfdir)/$(pkgname).conf" ] ; then \ + if [ ! -d "$(DESTDIR)$(sysconfdir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)" ; fi ; \ + $(INSTALL_DATA) $(VPATH)/$(pkgname).conf "$(DESTDIR)$(sysconfdir)/$(pkgname).conf" ; \ fi -- 2.4.0 Deleted: csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch 2023-01-08 04:47:36 UTC (rev 26993) +++ csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch 2023-01-11 03:43:51 UTC (rev 26994) @@ -1,26 +0,0 @@ -From 12b161614b54346a92e97c7f7a06f2d754ae5731 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen <d...@opencsw.org> -Date: Fri, 3 Jul 2020 10:08:10 +0200 -Subject: [PATCH] Fix function type - ---- - zupdate.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/zupdate.cc b/zupdate.cc -index cc0ffde..0acaa48 100644 ---- a/zupdate.cc -+++ b/zupdate.cc -@@ -280,7 +280,8 @@ int zupdate_file( const std::string & name, const char * const lzip_name, - std::string zcmp_command( invocation_name ); - unsigned i = zcmp_command.size(); - while( i > 0 && zcmp_command[i-1] != '/' ) --i; -- zcmp_command.resize( i ); zcmp_command.insert( 0U, 1, '\'' ); -+ zcmp_command.resize( i ); zcmp_command.insert( zcmp_command.begin(), '\'' ); -+ - zcmp_command += "zcmp' "; // '[dir/]zcmp' - if( no_rcfile ) zcmp_command += "-N "; - if( verbosity < 0 ) zcmp_command += "-q "; --- -2.4.0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.