[csw-devel] SF.net SVN: gar:[9864] csw/mgar/pkg/libarchive/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9864
          http://gar.svn.sourceforge.net/gar/?rev=9864&view=rev
Author:   dmichelsen
Date:     2010-05-14 10:29:31 +0000 (Fri, 14 May 2010)

Log Message:
-----------
libarchive: Add patch

Modified Paths:
--------------
    csw/mgar/pkg/libarchive/trunk/Makefile
    csw/mgar/pkg/libarchive/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch

Modified: csw/mgar/pkg/libarchive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libarchive/trunk/Makefile	2010-05-14 08:38:34 UTC (rev 9863)
+++ csw/mgar/pkg/libarchive/trunk/Makefile	2010-05-14 10:29:31 UTC (rev 9864)
@@ -10,6 +10,10 @@
 MASTER_SITES = $(GOOGLE_MIRROR)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
+# This is already in trunk from r2347:
+#   <http://code.google.com/p/libarchive/source/diff?spec=svn2396&r=2347&format=side&path=/trunk/cpio/test/test_owner_parse.c>
+PATCHFILES = 0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch
+
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 

Modified: csw/mgar/pkg/libarchive/trunk/checksums
===================================================================
--- csw/mgar/pkg/libarchive/trunk/checksums	2010-05-14 08:38:34 UTC (rev 9863)
+++ csw/mgar/pkg/libarchive/trunk/checksums	2010-05-14 10:29:31 UTC (rev 9864)
@@ -1 +1,2 @@
+9539f1e6273764c7d7f798876c198a83  0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch
 fe8d917e101d4b37580124030842a1d0  libarchive-2.8.3.tar.gz

Added: csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch	2010-05-14 10:29:31 UTC (rev 9864)
@@ -0,0 +1,31 @@
+From 9c1bc0a961436ef420f1b379f58309db7ce43d60 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 14 May 2010 12:01:53 +0200
+Subject: [PATCH] Check against gids 0 and 1 for root on Solaris
+
+---
+ cpio/test/test_owner_parse.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/cpio/test/test_owner_parse.c b/cpio/test/test_owner_parse.c
+index 9875e91..a3ebccd 100644
+--- a/cpio/test/test_owner_parse.c
++++ b/cpio/test/test_owner_parse.c
+@@ -30,8 +30,14 @@ __FBSDID("$FreeBSD$");
+ 
+ #if !defined(_WIN32)
+ #define ROOT "root"
++#if defined(__sun)
++static int root_uids[] = { 0 };
++/* Solaris 9 has gid 1 (=other) */
++static int root_gids[] = { 0, 1 };
++#else
+ static int root_uids[] = { 0 };
+ static int root_gids[] = { 0 };
++#endif
+ #elif defined(__CYGWIN__)
+ /* On cygwin, the Administrator user most likely exists (unless
+  * it has been renamed or is in a non-English localization), but
+-- 
+1.7.0
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.