Revision: 15005
http://gar.svn.sourceforge.net/gar/?rev=15005&view=rev
Author: phipsy
Date: 2011-07-08 11:16:16 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Updates to augeas to cater for sudoers on csw path
Modified Paths:
--------------
csw/mgar/pkg/augeas/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch
Removed Paths:
-------------
csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch
csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch
Modified: csw/mgar/pkg/augeas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/augeas/trunk/Makefile 2011-07-08 09:07:34 UTC (rev 15004)
+++ csw/mgar/pkg/augeas/trunk/Makefile 2011-07-08 11:16:16 UTC (rev 15005)
@@ -6,18 +6,18 @@
define BLURB
Augeas is a configuration editing tool. It parses configuration files in
their native formats and transforms them into a tree. Configuration changes
- are made by manipulating this tree and saving it back into native config
files.
+ are made by manipulating this tree and saving it back into native config
+ files.
endef
MASTER_SITES = http://augeas.net/download/
DISTFILES = $(NAME)-$(VERSION).tar.gz
-#PATCHFILES = 0001-Do-not-use-_N-already-taken-on-Solaris.patch
-#PATCHFILES += 0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch
VENDOR_URL = http://augeas.net
RUNTIME_DEP_PKGS = CSWgcc4corert CSWlibgnugetopt CSWreadline
GARCOMPILER = GCC4
EXTRA_LDFLAGS = -lgnugetopt
+PATCHFILES += 0001-add-csw-paths-for-sudoers.patch
# Building on Solaris 10 doesn't work as it support C99 and the above fixes are
# not necessary there.
@@ -28,11 +28,10 @@
TEST_TARGET = check
-CHECKPKG_OVERRIDES_CSWaugeas += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWaugeas += file-with-bad-content
CHECKPKG_OVERRIDES_CSWaugeas +=
non-uniform-lib-versions-in-package|sonames=libaugeas.so.0,libfa.so.1
CHECKPKG_OVERRIDES_CSWaugeas += shared-lib-package-contains-so-symlink
-
EXTRA_MERGE_EXCLUDE_FILES = .*/charset.alias
MERGE_DIRS_isa-extra = $(libdir)
Deleted:
csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch
===================================================================
---
csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch
2011-07-08 09:07:34 UTC (rev 15004)
+++
csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch
2011-07-08 11:16:16 UTC (rev 15005)
@@ -1,43 +0,0 @@
-From 7f2da212368aa6eb7d4e63afaa7e8a4ab3325214 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Mon, 1 Mar 2010 11:55:44 +0100
-Subject: [PATCH] Do not use _N already taken on Solaris
-
----
- src/fa.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/fa.c b/src/fa.c
-index b3f56d0..0c6f8b8 100644
---- a/src/fa.c
-+++ b/src/fa.c
-@@ -46,7 +46,7 @@ typedef unsigned char uchar;
-
- #define _E(cond) if (cond) goto error
- #define _F(expr) if ((expr) < 0) goto error
--#define _N(expr) if ((expr) == NULL) goto error
-+#define _NULL(expr) if ((expr) == NULL) goto error
-
- /* Which algorithm to use in FA_MINIMIZE */
- int fa_minimization_algorithm = FA_MIN_HOPCROFT;
-@@ -2241,7 +2241,7 @@ struct fa *fa_intersect(struct fa *fa1, struct fa *fa2) {
- t1[n1].to, t2[n2].to);
- if (r == NULL) {
- r = add_state(fa, 0);
-- _N(r);
-+ _NULL(r);
- _F(state_set_push(worklist, t1[n1].to));
- _F(state_set_push(worklist, t2[n2].to));
- _F(state_set_push(worklist, r));
-@@ -2601,7 +2601,7 @@ int fa_example(struct fa *fa, char **example, size_t
*example_len) {
- int toind = state_set_index(path, t->to);
- if (toind == -1) {
- struct re_str *w = string_extend(NULL, ps, c);
-- _N(w);
-+ _NULL(w);
- _F(state_set_push(worklist, t->to));
- _F(state_set_push_data(path, t->to, w));
- } else {
---
-1.6.6
-
Added: csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch
(rev 0)
+++ csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch
2011-07-08 11:16:16 UTC (rev 15005)
@@ -0,0 +1,25 @@
+From 4f44644052f34452a6a5be402b964ad0da55be54 Mon Sep 17 00:00:00 2001
+From: Mark Phillips <none@none>
+Date: Fri, 8 Jul 2011 13:13:11 +0200
+Subject: [PATCH] add csw paths for sudoers
+
+---
+ lenses/sudoers.aug | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/lenses/sudoers.aug b/lenses/sudoers.aug
+index a108ee2..ec3764a 100644
+--- a/lenses/sudoers.aug
++++ b/lenses/sudoers.aug
+@@ -493,6 +493,8 @@ let filter = (incl "/etc/sudoers")
+ . (incl "/usr/local/etc/sudoers")
+ . (incl "/etc/sudoers.d/*")
+ . (incl "/usr/local/etc/sudoers.d/*")
++ . (incl "/opt/csw/etc/sudoers")
++ . (incl "/etc/opt/csw/sudoers")
+ . Util.stdexcl
+
+ let xfm = transform lns filter
+--
+1.7.6
+
Deleted:
csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch
===================================================================
---
csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch
2011-07-08 09:07:34 UTC (rev 15004)
+++
csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch
2011-07-08 11:16:16 UTC (rev 15005)
@@ -1,24 +0,0 @@
-From 3c294e2e73c600d888329188b41adb7ed02577e7 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Mon, 1 Mar 2010 12:12:02 +0100
-Subject: [PATCH] Hack in isblank as gnutools dont seem to be used
-
----
- src/augtool.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/augtool.c b/src/augtool.c
-index ab412fd..0539b64 100644
---- a/src/augtool.c
-+++ b/src/augtool.c
-@@ -21,6 +21,7 @@
- */
-
- #include <config.h>
-+# define isblank(ch) ((ch) == ' ' || (ch) == '\t')
- #include "augeas.h"
- #include "internal.h"
- #include "safe-alloc.h"
---
-1.6.6
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
