[csw-devel] SF.net SVN: gar:[11664] csw/mgar/pkg/zutils/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Nov 19 14:40:39 CET 2010
Revision: 11664
http://gar.svn.sourceforge.net/gar/?rev=11664&view=rev
Author: dmichelsen
Date: 2010-11-19 13:40:39 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
zutils: Update to 0.9
Modified Paths:
--------------
csw/mgar/pkg/zutils/trunk/Makefile
csw/mgar/pkg/zutils/trunk/checksums
csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch
csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch
Added Paths:
-----------
csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch
csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch
Removed Paths:
-------------
csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch
Modified: csw/mgar/pkg/zutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zutils/trunk/Makefile 2010-11-19 13:38:17 UTC (rev 11663)
+++ csw/mgar/pkg/zutils/trunk/Makefile 2010-11-19 13:40:39 UTC (rev 11664)
@@ -1,5 +1,5 @@
GARNAME = zutils
-GARVERSION = 0.7
+GARVERSION = 0.8
CATEGORIES = utils
DESCRIPTION = Utilities to deal with compressed and non-compressed files
@@ -14,15 +14,19 @@
MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 0001-Use-inttypes-instead-of-stdint.patch
+PATCHFILES = 0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch
PATCHFILES += 0002-Use-correct-path-on-testsuite.patch
PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch
+PATCHFILES += 0004-Fix-ambinguity-to-str.insert.patch
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
BUILD_DEP_PKGS = CSWhelp2man CSWlzip
+
+# The lzip binary is used from the scripts which is not detected by checkpkg
RUNTIME_DEP_PKGS = CSWlzip
+CHECKPKG_OVERRIDES_CSWzutils += surplus-dependency|CSWlzip
VENDOR_URL = http://www.nongnu.org/zutils/zutils.html
Modified: csw/mgar/pkg/zutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/zutils/trunk/checksums 2010-11-19 13:38:17 UTC (rev 11663)
+++ csw/mgar/pkg/zutils/trunk/checksums 2010-11-19 13:40:39 UTC (rev 11664)
@@ -1,4 +1 @@
-649455382564a2724f207badf40a26eb 0001-Use-inttypes-instead-of-stdint.patch
-fce5a15a5f23bb5e3e44009823031c5f 0002-Use-correct-path-on-testsuite.patch
-b6d252ee0235190dac20876097d451d0 0003-Use-Zutils-instead-of-zutils.patch
-c9163bbaf3c6e84044b86b58fa9fe3ff zutils-0.7.tar.gz
+e7607d23b62ef3c4c74baed04a79ec6d zutils-0.8.tar.gz
Deleted: csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2010-11-19 13:38:17 UTC (rev 11663)
+++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2010-11-19 13:40:39 UTC (rev 11664)
@@ -1,26 +0,0 @@
-From 7e91887f79edf0b1893f2a0e0ddd0f6c96d5d239 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 19 Feb 2010 16:44:13 +0100
-Subject: [PATCH 1/2] Use inttypes instead of stdint
-
----
- main.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/main.cc b/main.cc
-index eba364b..75765c2 100644
---- a/main.cc
-+++ b/main.cc
-@@ -33,7 +33,8 @@
- #include <string>
- #include <vector>
- #include <fcntl.h>
--#include <stdint.h>
-+#include <inttypes.h>
-+#include <signal.h>
- #include <unistd.h>
- #include <utime.h>
- #include <sys/stat.h>
---
-1.6.5.1
-
Copied: csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch (from rev 11660, csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes-instead-of-stdint.patch)
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch (rev 0)
+++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2010-11-19 13:40:39 UTC (rev 11664)
@@ -0,0 +1,69 @@
+From 58974984d2356dbe92326769535f7ca7eb6c6588 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 19 Nov 2010 14:30:36 +0100
+Subject: [PATCH] Use inttypes.h instead of stdint.h and add signal.h
+
+---
+ main.cc | 3 ++-
+ zcmp.cc | 2 +-
+ zdiff.cc | 3 ++-
+ zutils.cc | 2 +-
+ 4 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/main.cc b/main.cc
+index bc7c5fb..fc598df 100644
+--- a/main.cc
++++ b/main.cc
+@@ -28,7 +28,8 @@
+ #include <vector>
+ #include <dirent.h>
+ #include <fcntl.h>
+-#include <stdint.h>
++#include <inttypes.h>
++#include <signal.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #if defined(__MSVCRT__) || defined(__OS2__)
+diff --git a/zcmp.cc b/zcmp.cc
+index caa7852..32275b6 100644
+--- a/zcmp.cc
++++ b/zcmp.cc
+@@ -27,7 +27,7 @@
+ #include <string>
+ #include <vector>
+ #include <fcntl.h>
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #if defined(__MSVCRT__) || defined(__OS2__)
+diff --git a/zdiff.cc b/zdiff.cc
+index d01f492..138a75b 100644
+--- a/zdiff.cc
++++ b/zdiff.cc
+@@ -27,7 +27,8 @@
+ #include <string>
+ #include <vector>
+ #include <fcntl.h>
+-#include <stdint.h>
++#include <inttypes.h>
++#include <signal.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #if defined(__MSVCRT__) || defined(__OS2__)
+diff --git a/zutils.cc b/zutils.cc
+index 5451534..367e933 100644
+--- a/zutils.cc
++++ b/zutils.cc
+@@ -22,7 +22,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <string>
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <unistd.h>
+ #include <sys/wait.h>
+
+--
+1.7.3
+
Modified: csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch 2010-11-19 13:38:17 UTC (rev 11663)
+++ csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch 2010-11-19 13:40:39 UTC (rev 11664)
@@ -1,14 +1,14 @@
-From 5a911b56730fe7fb0d792ebafa6197ead63c4f5d Mon Sep 17 00:00:00 2001
+From bcb402f846f5eeb9d1a3cc4ac1c3c7f9aaf24cd9 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam at opencsw.org>
Date: Fri, 19 Feb 2010 16:44:26 +0100
-Subject: [PATCH 2/2] Use correct path on testsuite
+Subject: [PATCH 1/3] Use correct path on testsuite
---
testsuite/check.sh | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/testsuite/check.sh b/testsuite/check.sh
-index 1c8b249..11e8171 100755
+index 073843e..fa5727c 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -5,6 +5,10 @@
@@ -23,5 +23,5 @@
export LC_ALL
objdir=`pwd`
--
-1.6.5.1
+1.7.3
Modified: csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch 2010-11-19 13:38:17 UTC (rev 11663)
+++ csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch 2010-11-19 13:40:39 UTC (rev 11664)
@@ -1,124 +1,61 @@
-From 594dfe11efc4dd32d988e96e74b7c164e1ac9718 Mon Sep 17 00:00:00 2001
+From 6b133e98acfe1262b598878f1c3dc5e91c5ea587 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 23 Feb 2010 15:55:20 +0100
-Subject: [PATCH] Use Zutils instead of zutils
+Date: Fri, 19 Nov 2010 14:09:29 +0100
+Subject: [PATCH 3/3] Use Zutils instead of zutils
---
- zcat.in | 6 +++---
- zdiff.in | 4 ++--
- zgrep.in | 6 +++---
- ztest.in | 6 +++---
- 4 files changed, 11 insertions(+), 11 deletions(-)
+ zcat.in | 2 +-
+ zegrep.in | 2 +-
+ zfgrep.in | 2 +-
+ zgrep.in | 2 +-
+ ztest.in | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zcat.in b/zcat.in
-index 010b7bb..3d133a9 100644
+index d88eef1..fb080d9 100644
--- a/zcat.in
+++ b/zcat.in
-@@ -67,7 +67,7 @@ done
-
- if [ $# = 0 ] ; then
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
-- prog_name=`"${bindir}"zutils -t`
-+ prog_name=`"${bindir}"Zutils -t`
- case "${prog_name}" in
- bzip2) prog="bzip2 -cdfq" ;;
- gzip) prog="gzip -cdfq ${gz_args}" ;;
-@@ -75,7 +75,7 @@ if [ $# = 0 ] ; then
- xz) prog="xz -cdfq ${xz_args}" ;;
- *) prog=cat ;;
- esac
-- { "${bindir}"zutils -m ${prog_name} ; cat ; } | ${prog} | cat ${args}
-+ { "${bindir}"Zutils -m ${prog_name} ; cat ; } | ${prog} | cat ${args}
- exit $?
- fi
-
-@@ -98,7 +98,7 @@ for i in "$@" ; do
- fi
- fi
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
-- prog_name=`"${bindir}"zutils -t -- "$i"`
-+ prog_name=`"${bindir}"Zutils -t -- "$i"`
- case "${prog_name}" in
- bzip2) prog="bzip2 -cdfq" ;;
- gzip) prog="gzip -cdfq ${gz_args}" ;;
-diff --git a/zdiff.in b/zdiff.in
-index 0ece51f..fc1d4e1 100644
---- a/zdiff.in
-+++ b/zdiff.in
-@@ -120,13 +120,13 @@ prog1=
- prog2=
+@@ -1,3 +1,3 @@
+ #! /bin/sh
bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
- if [ -f "${file1}" ] ; then
-- prog_name=`"${bindir}"zutils -t -- "${file1}"`
-+ prog_name=`"${bindir}"Zutils -t -- "${file1}"`
- case "${prog_name}" in
- bzip2 | gzip | lzip | xz) prog1=${prog_name} ;;
- esac
- fi
- if [ -f "${file2}" ] ; then
-- prog_name=`"${bindir}"zutils -t -- "${file2}"`
-+ prog_name=`"${bindir}"Zutils -t -- "${file2}"`
- case "${prog_name}" in
- bzip2 | gzip | lzip | xz) prog2=${prog_name} ;;
- esac
+-exec "${bindir}"zutils --zcat "$@"
++exec "${bindir}"Zutils --zcat "$@"
+diff --git a/zegrep.in b/zegrep.in
+index e01f655..d2dc371 100644
+--- a/zegrep.in
++++ b/zegrep.in
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+ bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-exec "${bindir}"zutils --zgrep -E "$@"
++exec "${bindir}"Zutils --zgrep -E "$@"
+diff --git a/zfgrep.in b/zfgrep.in
+index a3d54f3..74c6a95 100644
+--- a/zfgrep.in
++++ b/zfgrep.in
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+ bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-exec "${bindir}"zutils --zgrep -F "$@"
++exec "${bindir}"Zutils --zgrep -F "$@"
diff --git a/zgrep.in b/zgrep.in
-index 3298646..1d9b34a 100644
+index bfbc490..ba5a3de 100644
--- a/zgrep.in
+++ b/zgrep.in
-@@ -85,12 +85,12 @@ fi
-
- if [ $# = 0 ] ; then
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
-- prog_name=`"${bindir}"zutils -t`
-+ prog_name=`"${bindir}"Zutils -t`
- case "${prog_name}" in
- bzip2 | gzip | lzip | xz) prog="${prog_name} -cdfq" ;;
- *) prog=cat ;;
- esac
-- { "${bindir}"zutils -m ${prog_name} ; cat ; } | ${prog} | grep ${args}
-+ { "${bindir}"Zutils -m ${prog_name} ; cat ; } | ${prog} | grep ${args}
- exit $?
- fi
-
-@@ -110,7 +110,7 @@ for i in "$@" ; do
- fi
- fi
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
-- prog_name=`"${bindir}"zutils -t -- "$i"`
-+ prog_name=`"${bindir}"Zutils -t -- "$i"`
- case "${prog_name}" in
- bzip2 | gzip | lzip | xz) prog="${prog_name} -cdfq" ;;
- *) prog=cat ;;
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+ bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-exec "${bindir}"zutils --zgrep "$@"
++exec "${bindir}"Zutils --zgrep "$@"
diff --git a/ztest.in b/ztest.in
-index f56c853..a9973d7 100644
+index cc7dc9b..f973603 100644
--- a/ztest.in
+++ b/ztest.in
-@@ -60,14 +60,14 @@ done
-
- if [ $# = 0 ] ; then
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
-- prog=`"${bindir}"zutils -t`
-+ prog=`"${bindir}"Zutils -t`
- case "${prog}" in
- bzip2 | gzip | lzip | xz)
- ;;
- *) echo "$0: Unknown data format read from stdin" 1>&2
- exit 1 ;;
- esac
-- { "${bindir}"zutils -m ${prog} ; cat ; } | ${prog} -t ${args}
-+ { "${bindir}"Zutils -m ${prog} ; cat ; } | ${prog} -t ${args}
- exit $?
- fi
-
-@@ -87,7 +87,7 @@ for i in "$@" ; do
- fi
- fi
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
-- prog=`"${bindir}"zutils -t -- "$i"`
-+ prog=`"${bindir}"Zutils -t -- "$i"`
- case "${prog}" in
- bzip2 | gzip | lzip | xz)
- ;;
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+ bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-exec "${bindir}"zutils --ztest "$@"
++exec "${bindir}"Zutils --ztest "$@"
--
-1.6.6
+1.7.3
Added: csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch (rev 0)
+++ csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch 2010-11-19 13:40:39 UTC (rev 11664)
@@ -0,0 +1,25 @@
+From f0b61c050f2b244a33a7c19b8c2164d95725470d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 19 Nov 2010 14:28:47 +0100
+Subject: [PATCH 4/4] Fix ambinguity to str.insert
+
+---
+ zcat.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/zcat.cc b/zcat.cc
+index f813bbe..34a37f3 100644
+--- a/zcat.cc
++++ b/zcat.cc
+@@ -45,7 +45,7 @@ public:
+ str[i] = '0';
+ }
+ if( first_digit_pos > 0 ) str[--first_digit_pos] = '1';
+- else str.insert( 0, 1, '1' );
++ else str.insert( (unsigned) 0, 1, '1' );
+ }
+
+ int sprint( uint8_t * const buf )
+--
+1.7.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list