update to augeas-1.6.0

This commit is contained in:
jasper 2016-08-15 10:32:33 +00:00
parent a2d2ab232b
commit bf3ae9fea0
5 changed files with 32 additions and 12 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.33 2016/05/14 12:52:49 jasper Exp $
# $OpenBSD: Makefile,v 1.34 2016/08/15 10:32:33 jasper Exp $
COMMENT= configuration editing tool and API
DISTNAME= augeas-1.5.0
DISTNAME= augeas-1.6.0
CATEGORIES= sysutils devel
SHARED_LIBS += augeas 0.0 # 20.1
SHARED_LIBS += fa 0.0 # 5.2
SHARED_LIBS += augeas 0.1 # 21.0
SHARED_LIBS += fa 0.0 # 5.3
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>

View File

@ -1,2 +1,2 @@
SHA256 (augeas-1.5.0.tar.gz) = Iju25v4+npInfa/V005iNzPrlppyo4KZjSBP6rJT9z8=
SIZE (augeas-1.5.0.tar.gz) = 2072169
SHA256 (augeas-1.6.0.tar.gz) = i6DZvwWefvUhGIJtEoXwl7OZ/HpWdWzijgU9oLOrabU=
SIZE (augeas-1.6.0.tar.gz) = 2076723

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-lenses_csv_aug,v 1.1 2016/08/15 10:32:33 jasper Exp $
From 80bbf23347c212964c7065e10687e7bb5c13014c Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Mon, 15 Aug 2016 08:45:09 +0100
Subject: [PATCH] Csv: remove unused caret from comment regexp
--- lenses/csv.aug.orig Wed May 4 01:02:57 2016
+++ lenses/csv.aug Mon Aug 15 12:31:43 2016
@@ -28,7 +28,7 @@ let eol = Util.del_str "\n"
(* View: comment *)
let comment = Util.comment
- | [ del /^#[ \t]*\r?\n/ "#\n" ]
+ | [ del /#[ \t]*\r?\n/ "#\n" ]
(* View: entry
An entry of fields, quoted or not *)

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-lenses_shellvars_aug,v 1.11 2016/05/14 12:52:49 jasper Exp $
$OpenBSD: patch-lenses_shellvars_aug,v 1.12 2016/08/15 10:32:33 jasper Exp $
- adduser.conf is not a shell script, so don't try to parse it as such.
- rc.conf* are not shell scripts anymore.
--- lenses/shellvars.aug.orig Wed May 4 01:02:57 2016
+++ lenses/shellvars.aug Sat May 14 14:45:59 2016
@@ -296,7 +296,6 @@ module Shellvars =
--- lenses/shellvars.aug.orig Sat Aug 6 00:08:48 2016
+++ lenses/shellvars.aug Fri Aug 12 21:05:49 2016
@@ -298,7 +298,6 @@ module Shellvars =
. incl "/etc/environment"
. incl "/etc/firewalld/firewalld.conf"
. incl "/etc/blkid.conf"
@ -13,7 +13,7 @@ $OpenBSD: patch-lenses_shellvars_aug,v 1.11 2016/05/14 12:52:49 jasper Exp $
. incl "/etc/cowpoke.conf"
. incl "/etc/cvs-cron.conf"
. incl "/etc/cvs-pserver.conf"
@@ -307,8 +306,6 @@ module Shellvars =
@@ -310,8 +309,6 @@ module Shellvars =
. incl "/etc/os-release"
. incl "/etc/periodic.conf"
. incl "/etc/popularity-contest.conf"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2016/05/14 12:52:49 jasper Exp $
@comment $OpenBSD: PLIST,v 1.9 2016/08/15 10:32:33 jasper Exp $
@bin bin/augparse
@bin bin/augtool
@bin bin/fadot
@ -150,6 +150,7 @@ share/augeas/lenses/dist/phpvars.aug
share/augeas/lenses/dist/postfix_access.aug
share/augeas/lenses/dist/postfix_main.aug
share/augeas/lenses/dist/postfix_master.aug
share/augeas/lenses/dist/postfix_passwordmap.aug
share/augeas/lenses/dist/postfix_sasl_smtpd.aug
share/augeas/lenses/dist/postfix_transport.aug
share/augeas/lenses/dist/postfix_virtual.aug
@ -339,6 +340,7 @@ share/augeas/lenses/dist/tests/test_phpvars.aug
share/augeas/lenses/dist/tests/test_postfix_access.aug
share/augeas/lenses/dist/tests/test_postfix_main.aug
share/augeas/lenses/dist/tests/test_postfix_master.aug
share/augeas/lenses/dist/tests/test_postfix_passwordmap.aug
share/augeas/lenses/dist/tests/test_postfix_sasl_smtpd.aug
share/augeas/lenses/dist/tests/test_postfix_transport.aug
share/augeas/lenses/dist/tests/test_postfix_virtual.aug