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

actually, move /etc/{audio,mixer}ctl.conf into the shellvars lens. as discussed

Browse Source 
with upstream.
This commit is contained in:
jasper 2013-01-02 18:42:19 +00:00
parent 8f6ebd70c1
commit ed840b131b
3 changed files with 17 additions and 23 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.7 2013/01/01 21:16:56 jasper Exp $
# $OpenBSD: Makefile,v 1.8 2013/01/02 18:42:19 jasper Exp $
COMMENT= configuration editing tool and API
DISTNAME= augeas-1.0.0
REVISION= 5
REVISION= 6
CATEGORIES= sysutils devel
SHARED_LIBS += augeas 0.0 # 16.0

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

@ -1,4 +1,4 @@
$OpenBSD: patch-lenses_shellvars_aug,v 1.3 2012/12/30 21:30:57 jasper Exp $
$OpenBSD: patch-lenses_shellvars_aug,v 1.4 2013/01/02 18:42:19 jasper Exp $
- adduser.conf is not a shell script, so don't try to parse it as such.
@ -7,10 +7,15 @@ From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Sun, 30 Dec 2012 19:32:23 +0000
Subject: Shellvars: parse /etc/rc.conf.local which is found on OpenBSD.
From df0367487f8f97925e2b665773d08194207461c5 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Sun, 30 Dec 2012 23:01:16 +0100
Subject: [PATCH] Add two files found on OpenBSD to the shellvars lens.
Fixes ticket #320
--- lenses/shellvars.aug.orig Mon Dec 17 22:39:45 2012
+++ lenses/shellvars.aug Sun Dec 30 20:31:20 2012
--- lenses/shellvars.aug.orig Wed Jan 2 19:34:39 2013
+++ lenses/shellvars.aug Wed Jan 2 19:34:34 2013
@@ -205,7 +205,6 @@ module Shellvars =
. incl "/etc/cron-apt/config"
. incl "/etc/environment"
@ -19,7 +24,7 @@ Fixes ticket #320
. incl "/etc/cowpoke.conf"
. incl "/etc/cvs-cron.conf"
. incl "/etc/cvs-pserver.conf"
@@ -215,6 +214,7 @@ module Shellvars =
@@ -215,10 +214,13 @@ module Shellvars =
. incl "/etc/os-release"
. incl "/etc/popularity-contest.conf"
. incl "/etc/rc.conf"
@ -27,3 +32,9 @@ Fixes ticket #320
. incl "/etc/selinux/config"
. incl "/etc/ucf.conf"
. incl "/etc/locale.conf"
. incl "/etc/vconsole.conf"
+ . incl "/etc/mixerctl.conf"
+ . incl "/etc/wsconsctlctl.conf"
let filter = filter_sysconfig
. filter_default

17
sysutils/augeas/patches/patch-lenses_simplevars_aug
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-lenses_simplevars_aug,v 1.1 2013/01/01 21:16:56 jasper Exp $
From 4e1be482cab52d3a33e8ba8bd408418644b4c5a3 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Sun, 30 Dec 2012 23:01:16 +0100
Subject: [PATCH] Add two files found on OpenBSD to the simplevars lens.
--- lenses/simplevars.aug.orig Sun Dec 30 22:49:10 2012
+++ lenses/simplevars.aug Sun Dec 30 22:49:20 2012
@@ -40,5 +40,7 @@ let filter = incl "/etc/kernel-img.conf"
. incl "/etc/wgetrc"
. incl "/etc/zabbix/*.conf"
. incl "/etc/audit/auditd.conf"
+ . incl "/etc/wsconsctl.conf"
+ . incl "/etc/mixerctl.conf"
let xfm = transform lns filter