[csw-devel] SF.net SVN: gar:[8328] csw/mgar/pkg/chkconfig/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Feb 3 12:34:27 CET 2010


Revision: 8328
          http://gar.svn.sourceforge.net/gar/?rev=8328&view=rev
Author:   dmichelsen
Date:     2010-02-03 11:34:27 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
chkconfig: Add patches

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

Added Paths:
-----------
    csw/mgar/pkg/chkconfig/trunk/files/0001-Add-missing-include-to-alloca.h.patch
    csw/mgar/pkg/chkconfig/trunk/files/0002-Don-t-use-named-struct-initializers.patch

Modified: csw/mgar/pkg/chkconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/Makefile	2010-02-03 09:48:58 UTC (rev 8327)
+++ csw/mgar/pkg/chkconfig/trunk/Makefile	2010-02-03 11:34:27 UTC (rev 8328)
@@ -5,18 +5,29 @@
 GARNAME = chkconfig
 GARVERSION = 1.3.30c
 CATEGORIES = utils
-DESCRIPTION = 
+
+DESCRIPTION = Alternatives system from Red Hat
 define BLURB
   Alternatives system from Red Hat
 endef
-SPKG_SOURCEURL = http://www.sfr-fresh.com/unix/privat/chkconfig-1.3.30c.tar.gz/
+
 MASTER_SITES = http://www.sfr-fresh.com/unix/privat/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = alloca.patch
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES += 0001-Add-missing-include-to-alloca.h.patch
+PATCHFILES += 0002-Don-t-use-named-struct-initializers.patch
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
 PACKAGES = CSWchkconfig CSWalternatives
+
 SPKG_DESC_CSWalternatives = Alternatives engine from Red Hat chkconfig-$(GARVERSION)
+
 PKGFILES_CSWalternatives = .*alternatives.*
 CATALOGNAME_CSWalternatives = alternatives
+
 CONFIGURE_ARGS = $(DIRPATHS)
+
+TEST_TARGET = check
+
 include gar/category.mk

Modified: csw/mgar/pkg/chkconfig/trunk/checksums
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/checksums	2010-02-03 09:48:58 UTC (rev 8327)
+++ csw/mgar/pkg/chkconfig/trunk/checksums	2010-02-03 11:34:27 UTC (rev 8328)
@@ -1,2 +1,4 @@
+d56d4f7b5aef5af5235943c384734780  0001-Add-missing-include-to-alloca.h.patch
+a1045173b8bc0a667883080f85a38597  0002-Don-t-use-named-struct-initializers.patch
 02019af22d048085f3006de791a0c95e  alloca.patch
 592a1fe77f3844d7748adbab6357ee25  chkconfig-1.3.30c.tar.gz

Added: csw/mgar/pkg/chkconfig/trunk/files/0001-Add-missing-include-to-alloca.h.patch
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/files/0001-Add-missing-include-to-alloca.h.patch	                        (rev 0)
+++ csw/mgar/pkg/chkconfig/trunk/files/0001-Add-missing-include-to-alloca.h.patch	2010-02-03 11:34:27 UTC (rev 8328)
@@ -0,0 +1,24 @@
+From ade3200eeae37b7686bb25f58c45d4224d4cc238 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 3 Feb 2010 11:37:50 +0100
+Subject: [PATCH 1/2] Add missing include to alloca.h
+
+---
+ chkconfig.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/chkconfig.c b/chkconfig.c
+index 2f84c5d..f3ed967 100644
+--- a/chkconfig.c
++++ b/chkconfig.c
+@@ -10,6 +10,7 @@
+  * Tiny portions copyright 2001-2007, BSI.  http://www.fastcoder.net/
+  */
+ #include "config.h"
++#include <alloca.h>
+ #include <ctype.h>
+ #include <dirent.h>
+ #include <errno.h>
+-- 
+1.6.6
+

Added: csw/mgar/pkg/chkconfig/trunk/files/0002-Don-t-use-named-struct-initializers.patch
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/files/0002-Don-t-use-named-struct-initializers.patch	                        (rev 0)
+++ csw/mgar/pkg/chkconfig/trunk/files/0002-Don-t-use-named-struct-initializers.patch	2010-02-03 11:34:27 UTC (rev 8328)
@@ -0,0 +1,74 @@
+From 71e72baa80d1aae18ca0026aadac032a40a773b3 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 3 Feb 2010 11:38:17 +0100
+Subject: [PATCH 2/2] Don't use named struct initializers
+
+---
+ leveldb.c |   44 ++++++++++++++++++++++----------------------
+ 1 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/leveldb.c b/leveldb.c
+index f2883c0..a98fa3b 100644
+--- a/leveldb.c
++++ b/leveldb.c
+@@ -150,17 +150,17 @@ int readXinetdServiceInfo(char *name, struct service * service, int honorHide) {
+ 	char * filename = alloca(strlen(name) + strlen(XINETDDIR) + 50);
+ 	int fd;
+ 	struct service serv = { 
+-			name: NULL,
+-			levels: -1,
+-			kPriority: -1,
+-			sPriority: -1, 
+-			desc: NULL, 
+-			startDeps: NULL, 
+-			stopDeps: NULL,
+-		        provides: NULL,
+-			type: TYPE_XINETD, 
+-			isLSB: 0, 
+-			enabled: -1
++			NULL,
++			-1,
++			-1,
++			-1, 
++			NULL, 
++			NULL, 
++			NULL,
++		        NULL,
++			TYPE_XINETD, 
++			0, 
++			-1
+ 	};
+ 	struct stat sb;
+ 	char * buf, *ptr;
+@@ -247,17 +247,17 @@ int readServiceInfo(char * name, struct service * service, int honorHide) {
+     struct stat sb;
+     char * bufstart, * bufstop, * start, * end, * next, *tmpbufstart;
+     struct service serv = { 
+-	    	    name: NULL, 
+-		    levels: -1, 
+-		    kPriority: -1, 
+-		    sPriority: -1, 
+-		    desc: NULL, 
+-		    startDeps: NULL, 
+-		    stopDeps: NULL,
+-		    provides: NULL,
+-		    type: TYPE_INIT_D, 
+-		    isLSB: 0, 
+-		    enabled: 0
++	    	    NULL, 
++		    -1, 
++		    -1, 
++		    -1, 
++		    NULL, 
++		    NULL, 
++		    NULL,
++		    NULL,
++		    TYPE_INIT_D, 
++		    0, 
++		    0
+     };
+     char overflow;
+     char levelbuf[20];
+-- 
+1.6.6
+


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