Revision: 26675
http://sourceforge.net/p/gar/code/26675
Author: dmichelsen
Date: 2020-07-03 08:24:32 +0000 (Fri, 03 Jul 2020)
Log Message:
-----------
zutils/trunk: Update to 1.9
Modified Paths:
--------------
csw/mgar/pkg/zutils/trunk/Makefile
csw/mgar/pkg/zutils/trunk/checksums
Added 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 2020-06-24 10:58:04 UTC (rev 26674)
+++ csw/mgar/pkg/zutils/trunk/Makefile 2020-07-03 08:24:32 UTC (rev 26675)
@@ -1,5 +1,5 @@
NAME = zutils
-VERSION = 1.7
+VERSION = 1.9
GARTYPE = v2
DESCRIPTION = Utilities to deal with compressed and non-compressed files
@@ -18,6 +18,10 @@
PATCHFILES += 0001-Add-headers-for-kill-2.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
Modified: csw/mgar/pkg/zutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/zutils/trunk/checksums 2020-06-24 10:58:04 UTC (rev 26674)
+++ csw/mgar/pkg/zutils/trunk/checksums 2020-07-03 08:24:32 UTC (rev 26675)
@@ -1 +1 @@
-7e80bbf1e9f578fa283cba0c9887a2d0 zutils-1.7.tar.lz
+c3f542e3cf4131e294d1d6c9ac9095aa zutils-1.9.tar.lz
Added: csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch
(rev 0)
+++ csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch
2020-07-03 08:24:32 UTC (rev 26675)
@@ -0,0 +1,26 @@
+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.
