cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rc.conf* aren't shell scripts anymore, but don't match the simplevars lens'

Browse Source 
format either, so just make them simplelines instead.
This commit is contained in:
jasper 2014-07-21 14:12:35 +00:00
parent ac92ebcdbc
commit 9181cdd753
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/augeas/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2014/03/09 19:47:18 jasper Exp $
# $OpenBSD: Makefile,v 1.25 2014/07/21 14:12:35 jasper Exp $
COMMENT= configuration editing tool and API
DISTNAME= augeas-1.2.0
REVISION= 0
REVISION= 1
CATEGORIES= sysutils devel
SHARED_LIBS += augeas 0.0 # 16.0

14
sysutils/augeas/patches/patch-lenses_shellvars_aug
View File

@ -1,9 +1,10 @@
$OpenBSD: patch-lenses_shellvars_aug,v 1.7 2014/02/06 10:21:09 jasper Exp $
$OpenBSD: patch-lenses_shellvars_aug,v 1.8 2014/07/21 14:12:35 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 Mon Jan 27 11:36:08 2014
+++ lenses/shellvars.aug Thu Feb 6 11:15:37 2014
+++ lenses/shellvars.aug Tue Jul 22 02:05:36 2014
@@ -210,7 +210,6 @@ module Shellvars =
. incl "/etc/environment"
. incl "/etc/firewalld/firewalld.conf"
@ -12,3 +13,12 @@ $OpenBSD: patch-lenses_shellvars_aug,v 1.7 2014/02/06 10:21:09 jasper Exp $
. incl "/etc/cowpoke.conf"
. incl "/etc/cvs-cron.conf"
. incl "/etc/cvs-pserver.conf"
@@ -219,8 +218,6 @@ module Shellvars =
. incl "/etc/lsb-release"
. incl "/etc/os-release"
. incl "/etc/popularity-contest.conf"
- . incl "/etc/rc.conf"
- . incl "/etc/rc.conf.local"
. incl "/etc/selinux/config"
. incl "/etc/ucf.conf"
. incl "/etc/locale.conf"

13
sysutils/augeas/patches/patch-lenses_simplelines_aug
View File

@ -1,13 +1,16 @@
$OpenBSD: patch-lenses_simplelines_aug,v 1.1 2013/04/15 20:31:23 jasper Exp $
$OpenBSD: patch-lenses_simplelines_aug,v 1.2 2014/07/21 14:12:35 jasper Exp $
Parse hostname.if(5) files.
- Parse hostname.if(5) files
- rc.conf* are not shell scripts anymore.
--- lenses/simplelines.aug.orig Mon Apr 15 22:27:24 2013
+++ lenses/simplelines.aug Mon Apr 15 22:27:27 2013
@@ -43,5 +43,6 @@ let filter = incl "/etc/at.allow"
--- lenses/simplelines.aug.orig Fri Nov 2 16:20:11 2012
+++ lenses/simplelines.aug Tue Jul 22 02:05:54 2014
@@ -43,5 +43,8 @@ let filter = incl "/etc/at.allow"
. incl "/etc/cron.d/cron.deny"
. incl "/etc/default/grub_installdevice"
. incl "/etc/pam.d/allow.pamlist"
+ . incl "/etc/hostname.*"
+ . incl "/etc/rc.conf"
+ . incl "/etc/rc.conf.local"
let xfm = transform lns filter