Initialize for augeas
This commit is contained in:
commit
cba80a2ea3
13 changed files with 2109 additions and 0 deletions
1
.augeas.metadata
Normal file
1
.augeas.metadata
Normal file
|
|
@ -0,0 +1 @@
|
|||
fa3f3fd29e933a5d880df7a01e815f551626fa2b17a9caa9bbfdc5a38e9b6b44 augeas-1.12.0.tar.gz
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
augeas-1.12.0.tar.gz
|
||||
BIN
augeas-1.12.0.tar.gz.sig
Normal file
BIN
augeas-1.12.0.tar.gz.sig
Normal file
Binary file not shown.
23
augeas-allow_printable_ASCII.patch
Normal file
23
augeas-allow_printable_ASCII.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
diff --git a/lenses/networkmanager.aug b/lenses/networkmanager.aug
|
||||
index 81d1cb5..8649168 100644
|
||||
--- a/lenses/networkmanager.aug
|
||||
+++ b/lenses/networkmanager.aug
|
||||
@@ -34,13 +34,17 @@ let eol = Util.eol
|
||||
* ENTRY
|
||||
* GLib entries can contain semicolons, entry names can contain spaces and
|
||||
* brackets
|
||||
+ *
|
||||
+ * At least entry for WPA-PSK definition can contain all printable ASCII
|
||||
+ * characters including '#', ' ' and others. Comments following the entry
|
||||
+ * are no option for this reason.
|
||||
*************************************************************************)
|
||||
(* Variable: entry_re *)
|
||||
let entry_re = /[A-Za-z][A-Za-z0-9:._\(\) \t-]+/
|
||||
|
||||
(* Lens: entry *)
|
||||
let entry = [ key entry_re . sep
|
||||
- . Quote.double_opt? . eol ]
|
||||
+ . IniFile.sto_to_eol? . eol ]
|
||||
| comment
|
||||
|
||||
(************************************************************************
|
||||
24
augeas-modprobe-lense.patch
Normal file
24
augeas-modprobe-lense.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff --git a/lenses/modprobe.aug b/lenses/modprobe.aug
|
||||
index bd897b9..d96f902 100644
|
||||
--- a/lenses/modprobe.aug
|
||||
+++ b/lenses/modprobe.aug
|
||||
@@ -73,6 +73,11 @@ let blacklist = Build.key_value_line_comment "blacklist" sep_space
|
||||
sto_no_spaces
|
||||
comment
|
||||
|
||||
+(* View: allow_unsupported_modules *)
|
||||
+let allow_unsupported_modules = Build.key_value_line_comment "allow_unsupported_modules" sep_space
|
||||
+ sto_no_spaces
|
||||
+ comment
|
||||
+
|
||||
(* View: config *)
|
||||
let config = Build.key_value_line_comment "config" sep_space
|
||||
(store /binary_indexes|yes|no/)
|
||||
@@ -92,6 +97,7 @@ let entry = alias
|
||||
| options
|
||||
| kv_line_command /install|remove/
|
||||
| blacklist
|
||||
+ | allow_unsupported_modules
|
||||
| config
|
||||
| softdep
|
||||
|
||||
238
augeas-new_options_for_chrony.patch
Normal file
238
augeas-new_options_for_chrony.patch
Normal file
|
|
@ -0,0 +1,238 @@
|
|||
diff --git a/lenses/chrony.aug b/lenses/chrony.aug
|
||||
index 9ce177b..91c8ed5 100644
|
||||
--- a/lenses/chrony.aug
|
||||
+++ b/lenses/chrony.aug
|
||||
@@ -79,6 +79,7 @@ module Chrony =
|
||||
Server/Peer/Pool options with values
|
||||
*)
|
||||
let cmd_options = "asymmetry"
|
||||
+ | "filter"
|
||||
| "key"
|
||||
| /maxdelay((dev)?ratio)?/
|
||||
| /(min|max)poll/
|
||||
@@ -95,7 +96,7 @@ module Chrony =
|
||||
Server/Peer/Pool options without values
|
||||
*)
|
||||
let cmd_flags = "auto_offline"|"iburst"|"noselect"|"offline"|"prefer"
|
||||
- |"require"|"trust"|"xleave"|"burst"
|
||||
+ |"require"|"trust"|"xleave"|"burst"|"nts"
|
||||
|
||||
(* Variable: ntp_source
|
||||
Server/Peer/Pool key names
|
||||
@@ -111,7 +112,7 @@ module Chrony =
|
||||
HW timestamping options with values
|
||||
*)
|
||||
let hwtimestamp_options = "minpoll"|"precision"|"rxcomp"|"txcomp"
|
||||
- |"rxfilter"
|
||||
+ |"minsamples"|"maxsamples"|"rxfilter"
|
||||
|
||||
(* Variable: hwtimestamp_flags
|
||||
HW timestamping options without values
|
||||
@@ -153,6 +154,7 @@ module Chrony =
|
||||
| "lock_all"
|
||||
| "manual"
|
||||
| "noclientlog"
|
||||
+ | "nosystemcert"
|
||||
| "rtconutc"
|
||||
| "rtcsync"
|
||||
|
||||
@@ -165,16 +167,22 @@ module Chrony =
|
||||
(* Variable: simple_keys
|
||||
Options with single values
|
||||
*)
|
||||
- let simple_keys = "acquisitionport" | "bindacqaddress"
|
||||
- | "bindaddress" | "bindcmdaddress" | "clientloglimit"
|
||||
- | "combinelimit" | "commandkey"
|
||||
+ let simple_keys = "acquisitionport" | "authselectmode" | "bindacqaddress"
|
||||
+ | "bindaddress" | "bindcmdaddress" | "bindacqdevice"
|
||||
+ | "bindcmddevice" | "binddevice" | "clientloglimit"
|
||||
+ | "clockprecision" | "combinelimit" | "commandkey"
|
||||
| "cmdport" | "corrtimeratio" | "driftfile"
|
||||
+ | "dscp"
|
||||
| "dumpdir" | "hwclockfile" | "include" | "keyfile"
|
||||
| "leapsecmode" | "leapsectz" | "linux_freq_scale"
|
||||
| "linux_hz" | "logbanner" | "logchange" | "logdir"
|
||||
| "maxclockerror" | "maxdistance" | "maxdrift"
|
||||
| "maxjitter" | "maxsamples" | "maxslewrate"
|
||||
+ | "maxntsconnections"
|
||||
| "maxupdateskew" | "minsamples" | "minsources"
|
||||
+ | "nocerttimecheck" | "ntsdumpdir" | "ntsntpserver"
|
||||
+ | "ntsport" | "ntsprocesses" | "ntsrefresh" | "ntsrotate"
|
||||
+ | "ntsservercert" | "ntsserverkey" | "ntstrustedcerts"
|
||||
| "ntpsigndsocket" | "pidfile"
|
||||
| "port" | "reselectdist" | "rtcautotrim" | "rtcdevice"
|
||||
| "rtcfile" | "sched_priority" | "stratumweight" | "user"
|
||||
@@ -218,10 +226,11 @@ module Chrony =
|
||||
- mailonchange <emailaddress> <threshold>
|
||||
- makestep <threshold> <limit>
|
||||
- maxchange <threshold> <delay> <limit>
|
||||
- - ratelimit|cmdratelimit <options>
|
||||
+ - ratelimit|cmdratelimit|ntsratelimit <options>
|
||||
- refclock <driver> <parameter> <options>
|
||||
- smoothtime <maxfreq> <maxwander> <options>
|
||||
- tempcomp <sensorfile> <interval> (<t0> <k0> <k1> <k2> | <pointfile> )
|
||||
+ - confdir|sourcedir <directories>
|
||||
*)
|
||||
|
||||
(* View: host_list
|
||||
@@ -254,6 +263,13 @@ module Chrony =
|
||||
. ( space . [ label "port" . store integer ] )?
|
||||
. eol ]
|
||||
|
||||
+ (* View: bcast
|
||||
+ confdir and sourcedir have specific syntax
|
||||
+ *)
|
||||
+ let dir_list = [ Util.indent . key /(conf|source)dir/
|
||||
+ . [ label "directory" . space . store no_space ]+
|
||||
+ . eol ]
|
||||
+
|
||||
(* View: fdrift
|
||||
fallbackdrift has specific syntax
|
||||
*)
|
||||
@@ -323,7 +339,7 @@ module Chrony =
|
||||
(* View: ratelimit
|
||||
ratelimit/cmdratelimit has specific syntax
|
||||
*)
|
||||
- let ratelimit = [ Util.indent . key /(cmd)?ratelimit/
|
||||
+ let ratelimit = [ Util.indent . key /(cmd|nts)?ratelimit/
|
||||
. [ space . key ratelimit_options
|
||||
. space . store no_space ]*
|
||||
. eol ]
|
||||
@@ -375,7 +391,7 @@ module Chrony =
|
||||
*)
|
||||
let settings = host_list | allowdeny | log_list | bcast | fdrift | istepslew
|
||||
| local | email | makestep | maxchange | refclock | smoothtime
|
||||
- | hwtimestamp | ratelimit | tempcomp | kv | all_flags
|
||||
+ | dir_list | hwtimestamp | ratelimit | tempcomp | kv | all_flags
|
||||
|
||||
(*
|
||||
* View: lns
|
||||
diff --git a/lenses/tests/test_chrony.aug b/lenses/tests/test_chrony.aug
|
||||
index 9011caf..0c86cde 100644
|
||||
--- a/lenses/tests/test_chrony.aug
|
||||
+++ b/lenses/tests/test_chrony.aug
|
||||
@@ -22,7 +22,7 @@ server ntp5.example.com maxdelay 2 offline
|
||||
server ntp6.example.com maxdelay 2 iburst presend 2 xleave offset 1e-4
|
||||
server ntp7.example.com iburst presend 2 offline prefer trust require
|
||||
server ntp8.example.com minsamples 8 maxsamples 16 version 3
|
||||
-server ntp9.example.com burst mindelay 0.1 asymmetry 0.5
|
||||
+server ntp9.example.com burst mindelay 0.1 asymmetry 0.5 nts filter 3
|
||||
peer ntpc1.example.com
|
||||
pool pool1.example.com iburst maxsources 3
|
||||
allow
|
||||
@@ -35,6 +35,10 @@ stratumweight 0
|
||||
makestep 10 -1
|
||||
bindcmdaddress 127.0.0.1
|
||||
bindcmdaddress ::1
|
||||
+bindacqdevice eth0
|
||||
+bindcmddevice eth0
|
||||
+binddevice eth0
|
||||
+clockprecision 10e-9
|
||||
local
|
||||
local stratum 10
|
||||
local distance 1.0 orphan
|
||||
@@ -55,10 +59,12 @@ maxchange 1000 1 2
|
||||
maxdistance 1.0
|
||||
maxdrift 100
|
||||
hwtimestamp eth0 minpoll -2 txcomp 300e-9 rxcomp 645e-9 nocrossts rxfilter all
|
||||
+hwtimestamp eth1 minsamples 10 maxsamples 20
|
||||
initstepslew 30 foo.bar.com
|
||||
initstepslew 30 foo.bar.com baz.quz.com
|
||||
ratelimit interval 4 burst 16 leak 2
|
||||
cmdratelimit
|
||||
+ntsratelimit
|
||||
refclock SHM 0 refid SHM0 delay 0.1 offset 0.2 noselect tai stratum 3
|
||||
refclock SOCK /var/run/chrony-GPS.sock pps width 0.1
|
||||
refclock PPS /dev/pps0 dpoll 2 poll 3 lock SHM0 rate 5 minsamples 8
|
||||
@@ -66,6 +72,22 @@ smoothtime 400 0.001 leaponly
|
||||
tempcomp /sys/class/hwmon/hwmon0/temp2_input 30 26000 0.0 0.000183 0.0
|
||||
tempcomp /sys/class/hwmon/hwmon0/temp2_input 30 /etc/chrony.tempcomp
|
||||
ntpsigndsocket /var/lib/samba/ntp_signd
|
||||
+confdir /etc/chrony.d /usr/lib/chrony.d
|
||||
+sourcedir /etc/chrony.d /var/run/chrony.d
|
||||
+authselectmode require
|
||||
+dscp 46
|
||||
+maxntsconnections 10
|
||||
+nocerttimecheck 1
|
||||
+nosystemcert
|
||||
+ntsservercert /etc/chrony/server.crt
|
||||
+ntsserverkey /etc/chrony/server.key
|
||||
+ntstrustedcerts /etc/chrony/trusted.crt
|
||||
+ntsdumpdir /var/lib/chrony
|
||||
+ntsntpserver foo.example.com
|
||||
+ntsport 123
|
||||
+ntsprocesses 2
|
||||
+ntsrefresh 86400
|
||||
+ntsrotate 86400
|
||||
"
|
||||
|
||||
test Chrony.lns get exampleconf =
|
||||
@@ -117,6 +139,8 @@ ntpsigndsocket /var/lib/samba/ntp_signd
|
||||
{ "burst" }
|
||||
{ "mindelay" = "0.1" }
|
||||
{ "asymmetry" = "0.5" }
|
||||
+ { "nts" }
|
||||
+ { "filter" = "3" }
|
||||
}
|
||||
{ "peer" = "ntpc1.example.com" }
|
||||
{ "pool" = "pool1.example.com"
|
||||
@@ -140,6 +164,10 @@ ntpsigndsocket /var/lib/samba/ntp_signd
|
||||
}
|
||||
{ "bindcmdaddress" = "127.0.0.1" }
|
||||
{ "bindcmdaddress" = "::1" }
|
||||
+ { "bindacqdevice" = "eth0" }
|
||||
+ { "bindcmddevice" = "eth0" }
|
||||
+ { "binddevice" = "eth0" }
|
||||
+ { "clockprecision" = "10e-9" }
|
||||
{ "local" }
|
||||
{ "local"
|
||||
{ "stratum" = "10" }
|
||||
@@ -197,6 +225,11 @@ ntpsigndsocket /var/lib/samba/ntp_signd
|
||||
{ "nocrossts" }
|
||||
{ "rxfilter" = "all" }
|
||||
}
|
||||
+ { "hwtimestamp"
|
||||
+ { "interface" = "eth1" }
|
||||
+ { "minsamples" = "10" }
|
||||
+ { "maxsamples" = "20" }
|
||||
+ }
|
||||
{ "initstepslew"
|
||||
{ "threshold" = "30" }
|
||||
{ "address" = "foo.bar.com" }
|
||||
@@ -212,6 +245,7 @@ ntpsigndsocket /var/lib/samba/ntp_signd
|
||||
{ "leak" = "2" }
|
||||
}
|
||||
{ "cmdratelimit" }
|
||||
+ { "ntsratelimit" }
|
||||
{ "refclock"
|
||||
{ "driver" = "SHM" }
|
||||
{ "parameter" = "0" }
|
||||
@@ -256,6 +290,28 @@ ntpsigndsocket /var/lib/samba/ntp_signd
|
||||
{ "pointfile" = "/etc/chrony.tempcomp" }
|
||||
}
|
||||
{ "ntpsigndsocket" = "/var/lib/samba/ntp_signd" }
|
||||
+ { "confdir"
|
||||
+ { "directory" = "/etc/chrony.d" }
|
||||
+ { "directory" = "/usr/lib/chrony.d" }
|
||||
+ }
|
||||
+ { "sourcedir"
|
||||
+ { "directory" = "/etc/chrony.d" }
|
||||
+ { "directory" = "/var/run/chrony.d" }
|
||||
+ }
|
||||
+ { "authselectmode" = "require" }
|
||||
+ { "dscp" = "46" }
|
||||
+ { "maxntsconnections" = "10" }
|
||||
+ { "nocerttimecheck" = "1" }
|
||||
+ { "nosystemcert" }
|
||||
+ { "ntsservercert" = "/etc/chrony/server.crt" }
|
||||
+ { "ntsserverkey" = "/etc/chrony/server.key" }
|
||||
+ { "ntstrustedcerts" = "/etc/chrony/trusted.crt" }
|
||||
+ { "ntsdumpdir" = "/var/lib/chrony" }
|
||||
+ { "ntsntpserver" = "foo.example.com" }
|
||||
+ { "ntsport" = "123" }
|
||||
+ { "ntsprocesses" = "2" }
|
||||
+ { "ntsrefresh" = "86400" }
|
||||
+ { "ntsrotate" = "86400" }
|
||||
|
||||
|
||||
(* Local Variables: *)
|
||||
152
augeas-sysctl_parsing.patch
Normal file
152
augeas-sysctl_parsing.patch
Normal file
|
|
@ -0,0 +1,152 @@
|
|||
From 6ddfca24cd333ec93938b3de85c2658da19ca8c8 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Filka <mfilka@suse.cz>
|
||||
Date: Thu, 24 Mar 2022 11:18:10 +0100
|
||||
Subject: [PATCH] Sysctl keys can contain some more non-alphanumeric
|
||||
charackters
|
||||
|
||||
like net.ipv4.conf.*.rp_filter = 2
|
||||
---
|
||||
.gnulib | 2 +-
|
||||
lenses/sysctl.aug | 14 +++++++++++++-
|
||||
lenses/tests/test_sysctl.aug | 24 ++++++++++++++++++++++++
|
||||
man/augtool.1 | 26 +++++++++++---------------
|
||||
4 files changed, 49 insertions(+), 17 deletions(-)
|
||||
|
||||
--- a/lenses/sysctl.aug
|
||||
+++ b/lenses/sysctl.aug
|
||||
@@ -33,8 +33,20 @@ let filter = incl "/boot/loader.conf"
|
||||
(* View: comment *)
|
||||
let comment = Util.comment_generic /[ \t]*[#;][ \t]*/ "# "
|
||||
|
||||
+(* View: entry
|
||||
+ basically a Simplevars.entry but key has to allow some special chars as '*' *)
|
||||
+let entry =
|
||||
+ let some_value = Sep.space_equal . store Simplevars.to_comment_re
|
||||
+ (* Rx.word extended by * and : *)
|
||||
+ in let word = /[*:A-Za-z0-9_.-]+/
|
||||
+ (* Avoid ambiguity in tree by making a subtree here *)
|
||||
+ in let empty_value = [del /[ \t]*=/ "="] . store ""
|
||||
+ in [ Util.indent . key word
|
||||
+ . (some_value? | empty_value)
|
||||
+ . (Util.eol | Util.comment_eol) ]
|
||||
+
|
||||
(* View: lns
|
||||
The sysctl lens *)
|
||||
-let lns = (Util.empty | comment | Simplevars.entry)*
|
||||
+let lns = (Util.empty | comment | entry)*
|
||||
|
||||
let xfm = transform lns filter
|
||||
diff --git a/lenses/tests/test_sysctl.aug b/lenses/tests/test_sysctl.aug
|
||||
index 42f31c0f..daec3dc8 100644
|
||||
--- a/lenses/tests/test_sysctl.aug
|
||||
+++ b/lenses/tests/test_sysctl.aug
|
||||
@@ -18,6 +18,13 @@ kernel.sysrq = 0
|
||||
net.ipv4.tcp_mem = \t393216 524288 786432
|
||||
"
|
||||
|
||||
+(* Variable: spec_chars_sysctl *)
|
||||
+let spec_chars_sysctl = "# Kernel sysctl configuration file
|
||||
+# Controls IP packet forwarding
|
||||
+net.ipv4.conf.*.rp_filter = 2
|
||||
+net.ipv4.conf.ib0:0.arp_filter = 1
|
||||
+"
|
||||
+
|
||||
(* Test: Sysctl.lns *)
|
||||
test Sysctl.lns get default_sysctl =
|
||||
{ "#comment" = "Kernel sysctl configuration file" }
|
||||
@@ -31,6 +38,13 @@ test Sysctl.lns get default_sysctl =
|
||||
{ "#comment" = "Semicolon comments are also allowed" }
|
||||
{ "net.ipv4.tcp_mem" = "393216 524288 786432" }
|
||||
|
||||
+(* Test: Sysctl.lns *)
|
||||
+test Sysctl.lns get spec_chars_sysctl =
|
||||
+ { "#comment" = "Kernel sysctl configuration file" }
|
||||
+ { "#comment" = "Controls IP packet forwarding"}
|
||||
+ { "net.ipv4.conf.*.rp_filter" = "2" }
|
||||
+ { "net.ipv4.conf.ib0:0.arp_filter" = "1" }
|
||||
+
|
||||
(* Test: Sysctl.lns *)
|
||||
test Sysctl.lns put default_sysctl after
|
||||
set "net.ipv4.ip_forward" "1" ;
|
||||
@@ -46,6 +60,16 @@ net.ipv4.ip_forward = 1
|
||||
net.ipv4.tcp_mem = \t393216 524288 786432
|
||||
"
|
||||
|
||||
+(* Test: Sysctl.lns *)
|
||||
+test Sysctl.lns put spec_chars_sysctl after
|
||||
+ set "net.ipv4.conf.*.rp_filter" "0" ;
|
||||
+ set "net.ipv4.conf.ib0:0.arp_filter" "0"
|
||||
+ = "# Kernel sysctl configuration file
|
||||
+# Controls IP packet forwarding
|
||||
+net.ipv4.conf.*.rp_filter = 0
|
||||
+net.ipv4.conf.ib0:0.arp_filter = 0
|
||||
+"
|
||||
+
|
||||
(* Local Variables: *)
|
||||
(* mode: caml *)
|
||||
(* End: *)
|
||||
diff --git a/man/augtool.1 b/man/augtool.1
|
||||
index c58cbc1a..7279654c 100644
|
||||
--- a/man/augtool.1
|
||||
+++ b/man/augtool.1
|
||||
@@ -1,4 +1,4 @@
|
||||
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
|
||||
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
|
||||
.\"
|
||||
.\" Standard preamble:
|
||||
.\" ========================================================================
|
||||
@@ -46,7 +46,7 @@
|
||||
.ie \n(.g .ds Aq \(aq
|
||||
.el .ds Aq '
|
||||
.\"
|
||||
-.\" If the F register is turned on, we'll generate index entries on stderr for
|
||||
+.\" If the F register is >0, we'll generate index entries on stderr for
|
||||
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
|
||||
.\" entries marked with X<> in POD. Of course, you'll have to process the
|
||||
.\" output yourself in some meaningful fashion.
|
||||
@@ -54,20 +54,16 @@
|
||||
.\" Avoid warning from groff about undefined register 'F'.
|
||||
.de IX
|
||||
..
|
||||
-.nr rF 0
|
||||
-.if \n(.g .if rF .nr rF 1
|
||||
-.if (\n(rF:(\n(.g==0)) \{
|
||||
-. if \nF \{
|
||||
-. de IX
|
||||
-. tm Index:\\$1\t\\n%\t"\\$2"
|
||||
+.if !\nF .nr F 0
|
||||
+.if \nF>0 \{\
|
||||
+. de IX
|
||||
+. tm Index:\\$1\t\\n%\t"\\$2"
|
||||
..
|
||||
-. if !\nF==2 \{
|
||||
-. nr % 0
|
||||
-. nr F 2
|
||||
-. \}
|
||||
+. if !\nF==2 \{\
|
||||
+. nr % 0
|
||||
+. nr F 2
|
||||
. \}
|
||||
.\}
|
||||
-.rr rF
|
||||
.\"
|
||||
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
|
||||
.\" Fear. Run. Save yourself. No user-serviceable parts.
|
||||
@@ -133,7 +129,7 @@
|
||||
.\" ========================================================================
|
||||
.\"
|
||||
.IX Title "AUGTOOL 1"
|
||||
-.TH AUGTOOL 1 "2016-08-05" "Augeas 1.5.0" "Augeas"
|
||||
+.TH AUGTOOL 1 "2021-05-26" "Augeas 1.13.0" "Augeas"
|
||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||
.\" way too many mistakes in technical documents.
|
||||
.if n .ad l
|
||||
@@ -275,7 +271,7 @@ Parse \s-1NODE\s0 using \s-1LENS\s0 and store the resulting tree at \s-1PATH.\s0
|
||||
Add a transform for \s-1FILE\s0 using \s-1LENS.\s0 The \s-1LENS\s0 may be a module name or a
|
||||
full lens name. If a module name is given, then \*(L"lns\*(R" will be the lens
|
||||
assumed. The \s-1FILTER\s0 must be either \*(L"incl\*(R" or \*(L"excl\*(R". If the filter is
|
||||
-\&\*(L"incl\*(R", the \s-1FILE\s0 will be parsed by the \s-1LENS. \s0 If the filter is \*(L"excl\*(R",
|
||||
+\&\*(L"incl\*(R", the \s-1FILE\s0 will be parsed by the \s-1LENS.\s0 If the filter is \*(L"excl\*(R",
|
||||
the \s-1FILE\s0 will be excluded from the \s-1LENS. FILE\s0 may contain wildcards.
|
||||
.IP "\fBload-file\fR <\s-1FILE\s0>" 4
|
||||
.IX Item "load-file <FILE>"
|
||||
1172
augeas.changes
Normal file
1172
augeas.changes
Normal file
File diff suppressed because it is too large
Load diff
111
augeas.keyring
Normal file
111
augeas.keyring
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
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
|
||||
SQtC9JT3ltp7QaXc
|
||||
=4JHa
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
148
augeas.spec
Normal file
148
augeas.spec
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
#
|
||||
# spec file for package augeas
|
||||
#
|
||||
# Copyright (c) 2022-2023 ZhuningOS
|
||||
#
|
||||
|
||||
|
||||
%define libname lib%{name}0
|
||||
Name: augeas
|
||||
Version: 1.12.0
|
||||
Release: 150400.3.3.6
|
||||
Summary: An utility for changing configuration files
|
||||
License: GPL-3.0-or-later AND LGPL-2.1-or-later
|
||||
URL: https://augeas.net/
|
||||
Source0: http://download.augeas.net/augeas-%{version}.tar.gz
|
||||
Source1: http://download.augeas.net/augeas-%{version}.tar.gz.sig
|
||||
Source2: %{name}.keyring
|
||||
Source3: baselibs.conf
|
||||
Patch0: augeas-modprobe-lense.patch
|
||||
Patch1: gcc9-disable-broken-test.patch
|
||||
Patch2: augeas-new_options_for_chrony.patch
|
||||
Patch3: augeas-allow_printable_ASCII.patch
|
||||
Patch4: remove-unportable-tests.patch
|
||||
# from https://patch-diff.githubusercontent.com/raw/hercules-team/augeas/pull/755.patch
|
||||
Patch5: augeas-sysctl_parsing.patch
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
|
||||
%description
|
||||
An utility for programmatically editing configuration files. Augeas
|
||||
parses configuration files into a tree structure.
|
||||
|
||||
The transformation works very hard to preserve comments and formatting
|
||||
details. It is controlled by ``lens'' definitions that describe the
|
||||
file format and the transformation into a tree.
|
||||
|
||||
%package devel
|
||||
Summary: A library for changing configuration files
|
||||
Requires: %{libname} = %{version}
|
||||
|
||||
%description devel
|
||||
A library for programmatically editing configuration files. Augeas
|
||||
parses configuration files into a tree structure, which it exposes
|
||||
through its public API. Changes made through the API are written back
|
||||
to the initially read files.
|
||||
|
||||
The transformation works very hard to preserve comments and formatting
|
||||
details. It is controlled by ``lens'' definitions that describe the
|
||||
file format and the transformation into a tree.
|
||||
|
||||
%package -n %{libname}
|
||||
Summary: A library for changing configuration files
|
||||
Recommends: %{name}-lenses = %{version}
|
||||
|
||||
%description -n %{libname}
|
||||
A library for programmatically editing configuration files. Augeas
|
||||
parses configuration files into a tree structure, which it exposes
|
||||
through its public API. Changes made through the API are written back
|
||||
to the initially read files.
|
||||
|
||||
The transformation works very hard to preserve comments and formatting
|
||||
details. It is controlled by ``lens'' definitions that describe the
|
||||
file format and the transformation into a tree.
|
||||
|
||||
%package lenses
|
||||
Summary: Official set of lenses for use by %{libname}
|
||||
Requires: %{libname} = %{version}
|
||||
|
||||
%description lenses
|
||||
Augeas parses configuration files described in lenses into a tree
|
||||
structure, which it exposes through its public API. Lenses are the
|
||||
building blocks of the file <-> tree transformation. The transformation
|
||||
is controlled by ``lens'' definitions that describe the file format and
|
||||
mapping of its contents into a tree. This package includes the official
|
||||
set of lenses.
|
||||
|
||||
%package lense-tests
|
||||
Summary: Set of tests for official Augeas lenses
|
||||
Requires: %{name}-lenses = %{version}
|
||||
|
||||
%description lense-tests
|
||||
Set of tests for official Augeas lenses. These can be used when
|
||||
modifying the official lenses, or when creating new ones.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-static \
|
||||
--disable-silent-rules \
|
||||
--disable-rpath
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
# move vim files to the right location
|
||||
mv %{buildroot}/%{_datadir}/vim/vimfiles %{buildroot}/%{_datadir}/vim/site
|
||||
|
||||
%check
|
||||
%make_build check
|
||||
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%{_bindir}/augmatch
|
||||
%{_bindir}/augtool
|
||||
%{_bindir}/augparse
|
||||
%{_bindir}/fadot
|
||||
%{_mandir}/man1/*
|
||||
%license COPYING
|
||||
%doc AUTHORS NEWS
|
||||
|
||||
%files -n %{libname}
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/augeas.pc
|
||||
# vim support files
|
||||
%dir %{_datadir}/vim
|
||||
%dir %{_datadir}/vim/site
|
||||
%dir %{_datadir}/vim/site/ftdetect
|
||||
%{_datadir}/vim/site/ftdetect/augeas.vim
|
||||
%dir %{_datadir}/vim/site/syntax
|
||||
%{_datadir}/vim/site/syntax/augeas.vim
|
||||
|
||||
%files lenses
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_datadir}/%{name}/lenses
|
||||
%dir %{_datadir}/%{name}/lenses/dist
|
||||
%{_datadir}/%{name}/lenses/dist/*.aug
|
||||
|
||||
%files lense-tests
|
||||
%dir %{_datadir}/%{name}/lenses/dist/tests
|
||||
%{_datadir}/%{name}/lenses/dist/tests/*.aug
|
||||
|
||||
%changelog
|
||||
4
baselibs.conf
Normal file
4
baselibs.conf
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
libaugeas0
|
||||
augeas-devel
|
||||
requires -augeas-<targettype>
|
||||
requires "libaugeas0-<targettype> = <version>"
|
||||
195
gcc9-disable-broken-test.patch
Normal file
195
gcc9-disable-broken-test.patch
Normal file
|
|
@ -0,0 +1,195 @@
|
|||
diff -Naur augeas-1.12.0.orig/gnulib/tests/Makefile.in augeas-1.12.0/gnulib/tests/Makefile.in
|
||||
--- augeas-1.12.0.orig/gnulib/tests/Makefile.in 2020-07-07 08:59:05.263213656 +0200
|
||||
+++ augeas-1.12.0/gnulib/tests/Makefile.in 2020-07-07 09:14:46.868061549 +0200
|
||||
@@ -133,7 +133,7 @@
|
||||
test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
|
||||
test-limits-h$(EXEEXT) test-listen$(EXEEXT) \
|
||||
test-locale$(EXEEXT) test-localeconv$(EXEEXT) \
|
||||
- test-localename$(EXEEXT) test-rwlock1$(EXEEXT) \
|
||||
+ test-localename$(EXEEXT) \
|
||||
test-lock$(EXEEXT) test-once1$(EXEEXT) test-once2$(EXEEXT) \
|
||||
test-lstat$(EXEEXT) test-malloca$(EXEEXT) test-mbrtowc1.sh \
|
||||
test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
|
||||
@@ -165,7 +165,7 @@
|
||||
test-sys_stat$(EXEEXT) test-sys_time$(EXEEXT) \
|
||||
test-sys_types$(EXEEXT) test-sys_uio$(EXEEXT) \
|
||||
test-sys_wait$(EXEEXT) test-init.sh test-thread_self$(EXEEXT) \
|
||||
- test-thread_create$(EXEEXT) test-time$(EXEEXT) \
|
||||
+ test-time$(EXEEXT) \
|
||||
test-unistd$(EXEEXT) test-unsetenv$(EXEEXT) \
|
||||
test-usleep$(EXEEXT) test-vasnprintf$(EXEEXT) \
|
||||
test-vasprintf$(EXEEXT) test-verify$(EXEEXT) test-verify.sh \
|
||||
@@ -196,7 +196,7 @@
|
||||
test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
|
||||
test-limits-h$(EXEEXT) test-listen$(EXEEXT) \
|
||||
test-locale$(EXEEXT) test-localeconv$(EXEEXT) \
|
||||
- test-localename$(EXEEXT) test-rwlock1$(EXEEXT) \
|
||||
+ test-localename$(EXEEXT) \
|
||||
test-lock$(EXEEXT) test-once1$(EXEEXT) test-once2$(EXEEXT) \
|
||||
test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
|
||||
test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \
|
||||
@@ -227,7 +227,7 @@
|
||||
test-sys_stat$(EXEEXT) test-sys_time$(EXEEXT) \
|
||||
test-sys_types$(EXEEXT) test-sys_uio$(EXEEXT) \
|
||||
test-sys_wait$(EXEEXT) test-thread_self$(EXEEXT) \
|
||||
- test-thread_create$(EXEEXT) test-time$(EXEEXT) \
|
||||
+ test-time$(EXEEXT) \
|
||||
test-unistd$(EXEEXT) test-unsetenv$(EXEEXT) \
|
||||
test-usleep$(EXEEXT) test-vasnprintf$(EXEEXT) \
|
||||
test-vasprintf$(EXEEXT) test-verify$(EXEEXT) \
|
||||
@@ -783,9 +783,6 @@
|
||||
test_regex_SOURCES = test-regex.c
|
||||
test_regex_OBJECTS = test-regex.$(OBJEXT)
|
||||
test_regex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
|
||||
-test_rwlock1_SOURCES = test-rwlock1.c
|
||||
-test_rwlock1_OBJECTS = test-rwlock1.$(OBJEXT)
|
||||
-test_rwlock1_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
test_safe_alloc_SOURCES = test-safe-alloc.c
|
||||
test_safe_alloc_OBJECTS = test-safe-alloc.$(OBJEXT)
|
||||
test_safe_alloc_LDADD = $(LDADD)
|
||||
@@ -953,9 +950,6 @@
|
||||
test_sys_wait_LDADD = $(LDADD)
|
||||
test_sys_wait_DEPENDENCIES = libtests.a ../../gnulib/lib/libgnu.la \
|
||||
libtests.a $(am__DEPENDENCIES_1)
|
||||
-test_thread_create_SOURCES = test-thread_create.c
|
||||
-test_thread_create_OBJECTS = test-thread_create.$(OBJEXT)
|
||||
-test_thread_create_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
test_thread_self_SOURCES = test-thread_self.c
|
||||
test_thread_self_OBJECTS = test-thread_self.$(OBJEXT)
|
||||
test_thread_self_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
@@ -1166,7 +1160,7 @@
|
||||
$(test_once2_SOURCES) test-open.c test-pathmax.c test-perror.c \
|
||||
test-perror2.c test-pipe.c test-pthread_sigmask1.c \
|
||||
test-pthread_sigmask2.c test-raise.c test-rawmemchr.c \
|
||||
- test-readlink.c test-regex.c test-rwlock1.c test-safe-alloc.c \
|
||||
+ test-readlink.c test-regex.c test-safe-alloc.c \
|
||||
test-select.c test-select-fd.c test-select-stdin.c \
|
||||
test-setenv.c test-setlocale1.c test-setlocale2.c \
|
||||
test-setsockopt.c test-sigaction.c test-signal-h.c \
|
||||
@@ -1177,7 +1171,7 @@
|
||||
test-strstr.c test-symlink.c test-sys_ioctl.c \
|
||||
test-sys_select.c test-sys_socket.c test-sys_stat.c \
|
||||
test-sys_time.c test-sys_types.c test-sys_uio.c \
|
||||
- test-sys_wait.c test-thread_create.c test-thread_self.c \
|
||||
+ test-sys_wait.c test-thread_self.c \
|
||||
test-time.c test-unistd.c test-unsetenv.c test-usleep.c \
|
||||
test-vasnprintf.c test-vasprintf.c test-verify.c \
|
||||
test-verify-try.c test-wchar.c test-wcrtomb.c \
|
||||
@@ -1204,7 +1198,7 @@
|
||||
$(test_once2_SOURCES) test-open.c test-pathmax.c test-perror.c \
|
||||
test-perror2.c test-pipe.c test-pthread_sigmask1.c \
|
||||
test-pthread_sigmask2.c test-raise.c test-rawmemchr.c \
|
||||
- test-readlink.c test-regex.c test-rwlock1.c test-safe-alloc.c \
|
||||
+ test-readlink.c test-regex.c test-safe-alloc.c \
|
||||
test-select.c test-select-fd.c test-select-stdin.c \
|
||||
test-setenv.c test-setlocale1.c test-setlocale2.c \
|
||||
test-setsockopt.c test-sigaction.c test-signal-h.c \
|
||||
@@ -1215,7 +1209,7 @@
|
||||
test-strstr.c test-symlink.c test-sys_ioctl.c \
|
||||
test-sys_select.c test-sys_socket.c test-sys_stat.c \
|
||||
test-sys_time.c test-sys_types.c test-sys_uio.c \
|
||||
- test-sys_wait.c test-thread_create.c test-thread_self.c \
|
||||
+ test-sys_wait.c test-thread_self.c \
|
||||
test-time.c test-unistd.c test-unsetenv.c test-usleep.c \
|
||||
test-vasnprintf.c test-vasprintf.c test-verify.c \
|
||||
test-verify-try.c test-wchar.c test-wcrtomb.c \
|
||||
@@ -2533,7 +2527,7 @@
|
||||
w32sock.h test-listen.c signature.h macros.h \
|
||||
test-localcharset.c test-locale.c test-localeconv.c \
|
||||
signature.h macros.h localename-table.h localename.h \
|
||||
- test-localename.c macros.h test-rwlock1.c test-lock.c \
|
||||
+ test-localename.c macros.h test-lock.c \
|
||||
test-once.c test-lstat.h test-lstat.c signature.h macros.h \
|
||||
test-malloca.c test-mbrtowc1.sh test-mbrtowc2.sh \
|
||||
test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc5.sh \
|
||||
@@ -2583,7 +2577,7 @@
|
||||
test-sys_socket.c test-sys_stat.c test-sys_time.c \
|
||||
test-sys_types.c sys_uio.in.h test-sys_uio.c test-sys_wait.c \
|
||||
test-sys_wait.h init.sh test-init.sh test-thread_self.c \
|
||||
- test-thread_create.c macros.h test-time.c test-unistd.c \
|
||||
+ macros.h test-time.c test-unistd.c \
|
||||
unsetenv.c test-unsetenv.c signature.h macros.h usleep.c \
|
||||
test-usleep.c signature.h macros.h test-vasnprintf.c macros.h \
|
||||
test-vasprintf.c signature.h macros.h test-verify.c \
|
||||
@@ -2641,7 +2635,6 @@
|
||||
test_inet_pton_LDADD = $(LDADD) @INET_PTON_LIB@
|
||||
test_listen_LDADD = $(LDADD) @LIBSOCKET@
|
||||
test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
|
||||
-test_rwlock1_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
|
||||
test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
|
||||
test_once1_SOURCES = test-once.c
|
||||
test_once1_LDADD = $(LDADD) @LIBTHREAD@
|
||||
@@ -2684,7 +2677,6 @@
|
||||
test_stat_LDADD = $(LDADD) $(LIBINTL)
|
||||
test_stat_time_LDADD = $(LDADD) $(LIB_NANOSLEEP)
|
||||
test_thread_self_LDADD = $(LDADD) @LIBTHREAD@
|
||||
-test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@
|
||||
all: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@@ -3053,10 +3045,6 @@
|
||||
@rm -f test-regex$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_regex_OBJECTS) $(test_regex_LDADD) $(LIBS)
|
||||
|
||||
-test-rwlock1$(EXEEXT): $(test_rwlock1_OBJECTS) $(test_rwlock1_DEPENDENCIES) $(EXTRA_test_rwlock1_DEPENDENCIES)
|
||||
- @rm -f test-rwlock1$(EXEEXT)
|
||||
- $(AM_V_CCLD)$(LINK) $(test_rwlock1_OBJECTS) $(test_rwlock1_LDADD) $(LIBS)
|
||||
-
|
||||
test-safe-alloc$(EXEEXT): $(test_safe_alloc_OBJECTS) $(test_safe_alloc_DEPENDENCIES) $(EXTRA_test_safe_alloc_DEPENDENCIES)
|
||||
@rm -f test-safe-alloc$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_safe_alloc_OBJECTS) $(test_safe_alloc_LDADD) $(LIBS)
|
||||
@@ -3201,10 +3189,6 @@
|
||||
@rm -f test-sys_wait$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_sys_wait_OBJECTS) $(test_sys_wait_LDADD) $(LIBS)
|
||||
|
||||
-test-thread_create$(EXEEXT): $(test_thread_create_OBJECTS) $(test_thread_create_DEPENDENCIES) $(EXTRA_test_thread_create_DEPENDENCIES)
|
||||
- @rm -f test-thread_create$(EXEEXT)
|
||||
- $(AM_V_CCLD)$(LINK) $(test_thread_create_OBJECTS) $(test_thread_create_LDADD) $(LIBS)
|
||||
-
|
||||
test-thread_self$(EXEEXT): $(test_thread_self_OBJECTS) $(test_thread_self_DEPENDENCIES) $(EXTRA_test_thread_self_DEPENDENCIES)
|
||||
@rm -f test-thread_self$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_thread_self_OBJECTS) $(test_thread_self_LDADD) $(LIBS)
|
||||
@@ -3385,7 +3369,6 @@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rawmemchr.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-readlink.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-regex.Po@am__quote@ # am--include-marker
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rwlock1.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-safe-alloc.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-select-fd.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-select-stdin.Po@am__quote@ # am--include-marker
|
||||
@@ -3422,7 +3405,6 @@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_types.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_uio.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_wait.Po@am__quote@ # am--include-marker
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_create.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_self.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-time.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unistd.Po@am__quote@ # am--include-marker
|
||||
@@ -4054,13 +4036,6 @@
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
-test-rwlock1.log: test-rwlock1$(EXEEXT)
|
||||
- @p='test-rwlock1$(EXEEXT)'; \
|
||||
- b='test-rwlock1'; \
|
||||
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
- --log-file $$b.log --trs-file $$b.trs \
|
||||
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
test-lock.log: test-lock$(EXEEXT)
|
||||
@p='test-lock$(EXEEXT)'; \
|
||||
b='test-lock'; \
|
||||
@@ -4578,13 +4553,6 @@
|
||||
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
-test-thread_create.log: test-thread_create$(EXEEXT)
|
||||
- @p='test-thread_create$(EXEEXT)'; \
|
||||
- b='test-thread_create'; \
|
||||
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
- --log-file $$b.log --trs-file $$b.trs \
|
||||
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
test-time.log: test-time$(EXEEXT)
|
||||
@p='test-time$(EXEEXT)'; \
|
||||
40
remove-unportable-tests.patch
Normal file
40
remove-unportable-tests.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Thu, 27 Aug 2020 17:52:58 -0700
|
||||
Subject: [PATCH] perror, strerror_r: remove unportable tests
|
||||
|
||||
Problem reported by Florian Weimer in:
|
||||
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
|
||||
* tests/test-perror2.c (main):
|
||||
* tests/test-strerror_r.c (main): Omit unportable tests.
|
||||
---
|
||||
ChangeLog | 8 ++++++++
|
||||
tests/test-perror2.c | 3 ---
|
||||
tests/test-strerror_r.c | 3 ---
|
||||
3 files changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
--- a/gnulib/tests/test-perror2.c
|
||||
+++ b/gnulib/tests/test-perror2.c
|
||||
@@ -79,9 +79,6 @@ main (void)
|
||||
errno = -5;
|
||||
perror ("");
|
||||
ASSERT (!ferror (stderr));
|
||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
||||
ASSERT (STREQ (msg4, str4));
|
||||
|
||||
free (str1);
|
||||
--- a/gnulib/tests/test-strerror_r.c
|
||||
+++ b/gnulib/tests/test-strerror_r.c
|
||||
@@ -165,9 +165,6 @@ main (void)
|
||||
|
||||
strerror_r (EACCES, buf, sizeof buf);
|
||||
strerror_r (-5, buf, sizeof buf);
|
||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
||||
ASSERT (STREQ (msg4, str4));
|
||||
|
||||
free (str1);
|
||||
--
|
||||
2.17.1
|
||||
Loading…
Add table
Reference in a new issue