[csw-devel] SF.net SVN: gar:[17880] csw/mgar/pkg/libexplain/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Apr 26 14:45:52 CEST 2012


Revision: 17880
          http://gar.svn.sourceforge.net/gar/?rev=17880&view=rev
Author:   dmichelsen
Date:     2012-04-26 12:45:51 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
libexplain/trunk: Update to 0.52.D002

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

Added Paths:
-----------
    csw/mgar/pkg/libexplain/trunk/files/0001-Solaris-fixes.patch

Modified: csw/mgar/pkg/libexplain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libexplain/trunk/Makefile	2012-04-26 12:27:42 UTC (rev 17879)
+++ csw/mgar/pkg/libexplain/trunk/Makefile	2012-04-26 12:45:51 UTC (rev 17880)
@@ -4,7 +4,7 @@
 # * inspect failed tests from the testsuite
 
 NAME = libexplain
-VERSION = 0.46.D001
+VERSION = 0.52.D002
 GARTYPE = v2
 CATEGORIES = lib
 
@@ -15,6 +15,8 @@
 MASTER_SITES = $(SF_MIRROR)
 DISTFILES  = $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-Solaris-fixes.patch
+
 LICENSE = LICENSE
 
 PACKAGES += CSWexplain

Modified: csw/mgar/pkg/libexplain/trunk/checksums
===================================================================
--- csw/mgar/pkg/libexplain/trunk/checksums	2012-04-26 12:27:42 UTC (rev 17879)
+++ csw/mgar/pkg/libexplain/trunk/checksums	2012-04-26 12:45:51 UTC (rev 17880)
@@ -1 +1 @@
-f8f7d4ce12c34ad211c9763d08cdcfeb  libexplain-0.46.D001.tar.gz
+80f33a99ca4ac0326b8de87602c52f11  libexplain-0.52.D002.tar.gz

Added: csw/mgar/pkg/libexplain/trunk/files/0001-Solaris-fixes.patch
===================================================================
--- csw/mgar/pkg/libexplain/trunk/files/0001-Solaris-fixes.patch	                        (rev 0)
+++ csw/mgar/pkg/libexplain/trunk/files/0001-Solaris-fixes.patch	2012-04-26 12:45:51 UTC (rev 17880)
@@ -0,0 +1,116 @@
+From d46d1fd0a78f99a172aba96b2f5ee16583720e1d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at opencsw.org>
+Date: Thu, 26 Apr 2012 14:01:23 +0200
+Subject: [PATCH] Solaris fixes
+
+---
+ libexplain/buffer/errno/shmat.c |    2 ++
+ libexplain/buffer/ipc_perm.c    |    8 ++++----
+ libexplain/buffer/shm_info.c    |    2 +-
+ libexplain/buffer/shminfo.c     |    4 ++++
+ test_shmctl/main.c              |    2 ++
+ 5 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/libexplain/buffer/errno/shmat.c b/libexplain/buffer/errno/shmat.c
+index 41bb26f..ce147f8 100644
+--- a/libexplain/buffer/errno/shmat.c
++++ b/libexplain/buffer/errno/shmat.c
+@@ -153,11 +153,13 @@ explain_buffer_errno_shmat_explanation(explain_string_buffer_t *sb, int errnum,
+         break;
+ 
+     case EINVAL:
++#ifdef SHM_REMAP
+         if ((shmflg & SHM_REMAP) && !shmaddr)
+         {
+             explain_buffer_is_the_null_pointer(sb, "shmaddr");
+             return;
+         }
++#endif
+         /* use shmctl to find this out */
+         if (!shmid_exists(shmid))
+         {
+diff --git a/libexplain/buffer/ipc_perm.c b/libexplain/buffer/ipc_perm.c
+index 94305dc..ba2912c 100644
+--- a/libexplain/buffer/ipc_perm.c
++++ b/libexplain/buffer/ipc_perm.c
+@@ -96,8 +96,8 @@ explain_buffer_ipc_perm(explain_string_buffer_t *sb,
+     explain_string_buffer_puts(sb, "{ ");
+     if (extra)
+     {
+-        explain_string_buffer_puts(sb, "__key = ");
+-        explain_buffer_int(sb, data->__key);
++        explain_string_buffer_puts(sb, "key = ");
++        explain_buffer_int(sb, data->key);
+         explain_string_buffer_puts(sb, ", ");
+     }
+     explain_string_buffer_puts(sb, "uid = ");
+@@ -115,8 +115,8 @@ explain_buffer_ipc_perm(explain_string_buffer_t *sb,
+     explain_buffer_ipc_perm_mode(sb, data->mode);
+     if (extra)
+     {
+-        explain_string_buffer_puts(sb, ", __seq = ");
+-        explain_buffer_ushort(sb, data->__seq);
++        explain_string_buffer_puts(sb, ", seq = ");
++        explain_buffer_ushort(sb, data->seq);
+     }
+     explain_string_buffer_puts(sb, " }");
+ #else
+diff --git a/libexplain/buffer/shm_info.c b/libexplain/buffer/shm_info.c
+index 56aecda..20c5c02 100644
+--- a/libexplain/buffer/shm_info.c
++++ b/libexplain/buffer/shm_info.c
+@@ -29,7 +29,7 @@ void
+ explain_buffer_shm_info(explain_string_buffer_t *sb,
+     const struct shm_info *data)
+ {
+-#ifdef HAVE_SYS_SHM_H
++#if 0
+     if (explain_is_efault_pointer(data, sizeof(*data)))
+     {
+         explain_buffer_pointer(sb, data);
+diff --git a/libexplain/buffer/shminfo.c b/libexplain/buffer/shminfo.c
+index 01aab9f..050a096 100644
+--- a/libexplain/buffer/shminfo.c
++++ b/libexplain/buffer/shminfo.c
+@@ -38,14 +38,18 @@ explain_buffer_shminfo(explain_string_buffer_t *sb,
+     explain_string_buffer_puts(sb, "{ shmmax = ");
+     explain_buffer_ulong(sb, data->shmmax);
+     explain_string_buffer_puts(sb, ", shmmin = ");
++#if 0
+     explain_buffer_ulong(sb, data->shmmin);
+     explain_string_buffer_puts(sb, ", shmmni = ");
++#endif
+     explain_buffer_ulong(sb, data->shmmni);
+     explain_string_buffer_puts(sb, ", shmseg = ");
++#if 0
+     explain_buffer_ulong(sb, data->shmseg);
+     explain_string_buffer_puts(sb, ", shmall = ");
+     explain_buffer_ulong(sb, data->shmall);
+     explain_string_buffer_puts(sb, " }");
++#endif
+ #else
+     explain_buffer_pointer(sb, data);
+ #endif
+diff --git a/test_shmctl/main.c b/test_shmctl/main.c
+index 98b4be7..9f9ce2c 100644
+--- a/test_shmctl/main.c
++++ b/test_shmctl/main.c
+@@ -84,6 +84,7 @@ print_shmid_ds(int shmid, const struct shmid_ds *data)
+ static void
+ list(void)
+ {
++#if defined SHM_INFO
+     struct shminfo  shminfo;
+     struct shm_info shm_info;
+     int             maxid;
+@@ -113,6 +114,7 @@ list(void)
+         }
+         print_shmid_ds(shmid, &shmseg);
+     }
++#endif
+ }
+ 
+ 
+-- 
+1.7.10
+

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