- Update to 1.0.0

PR:		ports/178605
Submitted by:	Garrett Wollman <wollman@csail.mit.edu>

7 files changed, 25 insertions, 90 deletions

diff --git a/textproc/augeas/files/patch-021ea39f8e b/textproc/augeas/files/patch-021ea39f8e
deleted file mode 100644
index 86df8f12c5da..000000000000
--- a/textproc/augeas/files/patch-021ea39f8e
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/regexp.c b/src/regexp.c
-index cf0ea5d..811087d 100644
---- src/regexp.c
-+++ src/regexp.c
-@@ -50,7 +50,7 @@
-     ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str),
-                                &nre, &nre_len, 2, 1);
-     if (ret == 0) {
--        pat = escape(nre, nre_len);
-+        pat = escape(nre, nre_len, RX_ESCAPES);
-         free(nre);
-     }
- #endif
diff --git a/textproc/augeas/files/patch-lenses__puppet.aug b/textproc/augeas/files/patch-lenses__puppet.aug
deleted file mode 100644
index 9602e1e1388c..000000000000
--- a/textproc/augeas/files/patch-lenses__puppet.aug
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lenses/puppet.aug.orig	2012-05-06 13:14:13.000000000 +0100
-+++ ./lenses/puppet.aug	2012-05-06 13:14:45.000000000 +0100
-@@ -38,6 +38,7 @@
-  *************************************************************************)
- let lns     = IniFile.lns record comment
- 
--let filter = (incl "/etc/puppet/puppet.conf")
-+let filter = (incl "/etc/puppet/puppet.conf"
-+             .incl "%%LOCALBASE%%/etc/puppet/puppet.conf")
- 
- let xfm = transform lns filter
diff --git a/textproc/augeas/files/patch-lenses__puppetfileserver.aug b/textproc/augeas/files/patch-lenses__puppetfileserver.aug
deleted file mode 100644
index b10683243a61..000000000000
--- a/textproc/augeas/files/patch-lenses__puppetfileserver.aug
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lenses/puppetfileserver.aug.orig	2012-05-06 13:14:17.000000000 +0100
-+++ ./lenses/puppetfileserver.aug	2012-05-06 13:15:08.000000000 +0100
-@@ -105,6 +105,7 @@
- let lns = IniFile.lns record comment
- 
- (* Variable: filter *)
--let filter = (incl "/etc/puppet/fileserver.conf")
-+let filter = (incl "/etc/puppet/fileserver.conf"
-+             .incl "%%LOCALBASE%%/etc/puppet/fileserver.conf")
- 
- let xfm = transform lns filter
diff --git a/textproc/augeas/files/patch-lenses__shellvars.aug b/textproc/augeas/files/patch-lenses__shellvars.aug
index abbf36aff813..9c4e1f5dfb86 100644
--- a/textproc/augeas/files/patch-lenses__shellvars.aug
+++ b/textproc/augeas/files/patch-lenses__shellvars.aug
@@ -1,12 +1,29 @@
---- lenses/shellvars.aug.orig	2011-11-28 18:51:05.000000000 -0500
-+++ lenses/shellvars.aug	2012-05-02 21:42:02.878164637 -0400
-@@ -196,6 +196,9 @@
+--- lenses/shellvars.aug.orig	2012-12-17 16:39:45.000000000 -0500
++++ lenses/shellvars.aug	2013-05-13 19:34:17.538347901 -0400
+@@ -18,7 +18,7 @@
+   let eol = del (/[ \t]+|[ \t]*[;\n]/ . empty_part_re*) "\n"
+   let semicol_eol = del (/[ \t]*[;\n]/ . empty_part_re*) "\n"
+ 
+-  let key_re = /[A-Za-z0-9_]+(\[[0-9]+\])?/ - "unset" - "export"
++  let key_re = /[A-Za-z0-9_.]+(\[[0-9]+\])?/ - "unset" - "export"
+   let matching_re = "${!" . key_re . /[\*@]\}/
+   let eq = Util.del_str "="
+ 
+@@ -201,7 +201,8 @@
+   let filter_default = incl "/etc/default/*"
+                      . excl "/etc/default/grub_installdevice*"
+                      . excl "/etc/default/whoopsie"
+-  let filter_misc    = incl "/etc/arno-iptables-firewall/debconf.cfg"
++  let filter_misc    = incl "/boot/loader.conf"
++                     . incl "/etc/arno-iptables-firewall/debconf.cfg"
                       . incl "/etc/cron-apt/config"
                       . incl "/etc/environment"
                       . incl "/etc/blkid.conf"
-+                     . incl "/etc/rc.conf"
+@@ -213,6 +214,7 @@
+                      . incl "/etc/lintianrc"
+                      . incl "/etc/lsb-release"
+                      . incl "/etc/os-release"
 +                     . incl "/etc/periodic.conf"
-+                     . incl "/boot/loader.conf"
- 
-   let filter = filter_sysconfig
-              . filter_ifcfg
+                      . incl "/etc/popularity-contest.conf"
+                      . incl "/etc/rc.conf"
+                      . incl "/etc/selinux/config"
diff --git a/textproc/augeas/files/patch-lenses__sysctl.aug b/textproc/augeas/files/patch-lenses__sysctl.aug
deleted file mode 100644
index fcd6aabdccdd..000000000000
--- a/textproc/augeas/files/patch-lenses__sysctl.aug
+++ /dev/null
@@ -1,11 +0,0 @@
---- lenses/sysctl.aug.orig	2012-08-19 01:11:41.000000000 +0000
-+++ lenses/sysctl.aug	2012-08-19 01:11:57.000000000 +0000
-@@ -6,7 +6,7 @@
-   let eol = Util.eol
-   let indent = Util.indent
-   let key_re = /[A-Za-z0-9_.-]+/
--  let eq = del /[ \t]*=[ \t]*/ " = "
-+  let eq = del /[ \t]*=[ \t]*/ "="
-   let value_re = /[^ \t\n](.*[^ \t\n])?/
- 
-   let comment = [ indent . label "#comment" . del /[#;][ \t]*/ "# "
diff --git a/textproc/augeas/files/patch-src-augeas.c b/textproc/augeas/files/patch-src-augeas.c
deleted file mode 100644
index 1cce522e3dba..000000000000
--- a/textproc/augeas/files/patch-src-augeas.c
+++ /dev/null
@@ -1,17 +0,0 @@
-index 6919845..2d0a5bd 100644 (file)
---- src/augeas.c
-+++ src/augeas.c
-@@ -1439,10 +1439,9 @@ int aug_save(struct augeas *aug) {
-         transform_validate(aug, xfm);
- 
-     if (files->dirty) {
--        list_for_each(t, files->children) {
--            if (tree_save(aug, t, AUGEAS_FILES_TREE) == -1)
--                ret = -1;
--        }
-+        if (tree_save(aug, files->children, AUGEAS_FILES_TREE) == -1)
-+            ret = -1;
-+
-         /* Remove files whose entire subtree was removed. */
-         if (meta_files != NULL) {
-             if (unlink_removed_files(aug, files, meta_files) < 0)
diff --git a/textproc/augeas/files/patch-src-augrun.c b/textproc/augeas/files/patch-src-augrun.c
deleted file mode 100644
index 26e4193e5927..000000000000
--- a/textproc/augeas/files/patch-src-augrun.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./src/augrun.c.orig	2012-02-11 04:26:33.948339055 -0500
-+++ ./src/augrun.c	2012-02-11 04:29:28.090339060 -0500
-@@ -988,6 +988,16 @@
-     &cmd_def_last
- };
- 
-+char *strchrnul(const char *s, int c) {
-+  char *i;
-+  for (i = (char*)s; *i != '\0'; ++i) {
-+    if (*i == c) {
-+      return i;
-+    }
-+  }
-+  return i;
-+}
-+
- int aug_srun(augeas *aug, FILE *out, const char *text) {
-     char *line = NULL;
-     const char *eol;