[csw-devel] SF.net SVN: gar:[21445] csw/mgar/pkg/zutils/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Jul 5 13:28:21 CEST 2013
Revision: 21445
http://gar.svn.sourceforge.net/gar/?rev=21445&view=rev
Author: dmichelsen
Date: 2013-07-05 11:28:21 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
zutils/trunk: Update to 1.0
Modified Paths:
--------------
csw/mgar/pkg/zutils/trunk/Makefile
csw/mgar/pkg/zutils/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch
Removed 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-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch
Modified: csw/mgar/pkg/zutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zutils/trunk/Makefile 2013-07-05 11:26:02 UTC (rev 21444)
+++ csw/mgar/pkg/zutils/trunk/Makefile 2013-07-05 11:28:21 UTC (rev 21445)
@@ -1,5 +1,5 @@
NAME = zutils
-VERSION = 1.0-rc3
+VERSION = 1.0
GARTYPE = v2
DESCRIPTION = Utilities to deal with compressed and non-compressed files
@@ -15,9 +15,8 @@
MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/
DISTFILES = $(DISTNAME).tar.lz
-PATCHFILES = 0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch
+PATCHFILES += 0001-Add-headers-for-kill-2.patch
PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch
-PATCHFILES += 0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch
BUILD_DEP_PKGS += CSWhelp2man
BUILD_DEP_PKGS += CSWlzip
Modified: csw/mgar/pkg/zutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/zutils/trunk/checksums 2013-07-05 11:26:02 UTC (rev 21444)
+++ csw/mgar/pkg/zutils/trunk/checksums 2013-07-05 11:28:21 UTC (rev 21445)
@@ -1 +1 @@
-2a1c6ea7a2f62bde43474d0e39d727c8 zutils-1.0-rc3.tar.lz
+26b85fac69e83454d00354635e3f787d zutils-1.0.tar.lz
Added: csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch (rev 0)
+++ csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch 2013-07-05 11:28:21 UTC (rev 21445)
@@ -0,0 +1,53 @@
+From 1bf577c42323a4d018f4d674b7617f6c09379498 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 5 Jul 2013 13:13:37 +0200
+Subject: [PATCH] Add headers for kill(2)
+
+---
+ main.cc | 2 ++
+ zcmp.cc | 2 ++
+ zdiff.cc | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/main.cc b/main.cc
+index f0a66e1..f98ac85 100644
+--- a/main.cc
++++ b/main.cc
+@@ -20,6 +20,8 @@
+ #include <cerrno>
+ #include <climits>
+ #include <csignal>
++#include <sys/types.h>
++#include <signal.h>
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+diff --git a/zcmp.cc b/zcmp.cc
+index 0e5b781..52cbe6a 100644
+--- a/zcmp.cc
++++ b/zcmp.cc
+@@ -22,6 +22,8 @@
+ #include <cerrno>
+ #include <climits>
+ #include <csignal>
++#include <sys/types.h>
++#include <signal.h>
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+diff --git a/zdiff.cc b/zdiff.cc
+index 14b679e..c5b3ff9 100644
+--- a/zdiff.cc
++++ b/zdiff.cc
+@@ -22,6 +22,8 @@
+ #include <cerrno>
+ #include <climits>
+ #include <csignal>
++#include <sys/types.h>
++#include <signal.h>
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+--
+1.8.3.1
+
Deleted: 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/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2013-07-05 11:26:02 UTC (rev 21444)
+++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2013-07-05 11:28:21 UTC (rev 21445)
@@ -1,70 +0,0 @@
-From eb0bb7a36ef4f6aaaf43c7aad9390f974d067cb1 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 29 Oct 2012 12:33:21 +0100
-Subject: [PATCH] Use inttypes.h instead of stdint.h and add signal.h
-
----
- main.cc | 3 ++-
- zcmp.cc | 3 ++-
- zdiff.cc | 3 ++-
- zutils.cc | 2 +-
- 4 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/main.cc b/main.cc
-index 38e6b13..7d5b52d 100644
---- a/main.cc
-+++ b/main.cc
-@@ -28,7 +28,8 @@
- #include <vector>
- #include <dirent.h>
- #include <fcntl.h>
--#include <stdint.h>
-+#include <signal.h>
-+#include <inttypes.h>
- #include <unistd.h>
- #include <sys/stat.h>
-
-diff --git a/zcmp.cc b/zcmp.cc
-index 3ebce0e..ec65d30 100644
---- a/zcmp.cc
-+++ b/zcmp.cc
-@@ -28,7 +28,8 @@
- #include <string>
- #include <vector>
- #include <fcntl.h>
--#include <stdint.h>
-+#include <signal.h>
-+#include <inttypes.h>
- #include <unistd.h>
- #include <sys/stat.h>
-
-diff --git a/zdiff.cc b/zdiff.cc
-index 1c329bd..cc8a0b7 100644
---- a/zdiff.cc
-+++ b/zdiff.cc
-@@ -28,7 +28,8 @@
- #include <string>
- #include <vector>
- #include <fcntl.h>
--#include <stdint.h>
-+#include <signal.h>
-+#include <inttypes.h>
- #include <unistd.h>
- #include <sys/stat.h>
-
-diff --git a/zutils.cc b/zutils.cc
-index f65786f..c5abcbf 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.10.3
-
Deleted: csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch 2013-07-05 11:26:02 UTC (rev 21444)
+++ csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch 2013-07-05 11:28:21 UTC (rev 21445)
@@ -1,25 +0,0 @@
-From f28f9f56e929af03f88e89c8620269ac815a0e8c Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 29 Oct 2012 13:12:55 +0100
-Subject: [PATCH] Avoid ambiguity between char* and unsigned long on sparcv9
-
----
- zcat.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zcat.cc b/zcat.cc
-index 02ab766..0c2b46a 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( 0U, 1, '1' );
-+ else str.insert( (char *) NULL, 1, '1' );
- }
-
- int sprint( uint8_t * const buf )
---
-1.7.10.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