diff --git a/0002-Grub-support-in-kernel-command-line-option-names-647.patch b/0002-Grub-support-in-kernel-command-line-option-names-647.patch new file mode 100644 index 0000000..0dcdfd5 --- /dev/null +++ b/0002-Grub-support-in-kernel-command-line-option-names-647.patch @@ -0,0 +1,58 @@ +From 368059e27f9364a15b209456148c249d8956f140 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Wed, 23 Oct 2019 11:35:57 +0200 +Subject: Grub: support '+' in kernel command line option names (#647) + +This way it is possible to parse files that pass options with '+' in the +name to the kernel. + +(cherry picked from commit 2ba77589baee1bf2d43d3a49f8e6f3eb522e5bba) +--- + lenses/grub.aug | 2 +- + lenses/tests/test_grub.aug | 17 +++++++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/lenses/grub.aug b/lenses/grub.aug +index 24ad39bc..82c1c37a 100644 +--- a/lenses/grub.aug ++++ b/lenses/grub.aug +@@ -196,7 +196,7 @@ module Grub = + (* View: kernel_args + Parse the file name and args on a kernel or module line. *) + let kernel_args = +- let arg = /[A-Za-z0-9_.$-]+/ - /type|no-mem-option/ in ++ let arg = /[A-Za-z0-9_.$\+-]+/ - /type|no-mem-option/ in + store /(\([a-z0-9,]+\))?\/[^ \t\n]*/ . + (spc . multiboot_arg)? . + (spc . [ key arg . (eq. store /([^ \t\n])*/)?])* . eol +diff --git a/lenses/tests/test_grub.aug b/lenses/tests/test_grub.aug +index 75657203..e50bdc4f 100644 +--- a/lenses/tests/test_grub.aug ++++ b/lenses/tests/test_grub.aug +@@ -258,6 +258,23 @@ password --encrypted ^9^32kwzzX./3WISQ0C /boot/grub/custom.lst + { "md5" } + } } + ++ (* Test kernel options with different special characters. *) ++ test Grub.lns get "title Fedora (2.6.24.4-64.fc8) ++ root (hd0,0) ++ kernel /vmlinuz-2.6.24.4-64.fc8 ro root=/dev/vg00/lv00 with.dot=1 with-dash=1 with_underscore=1 with+plus=1 ++ initrd /initrd-2.6.24.4-64.fc8.img\n" = ++ { "title" = "Fedora (2.6.24.4-64.fc8)" ++ { "root" = "(hd0,0)" } ++ { "kernel" = "/vmlinuz-2.6.24.4-64.fc8" ++ { "ro" } ++ { "root" = "/dev/vg00/lv00" } ++ { "with.dot" = "1" } ++ { "with-dash" = "1" } ++ { "with_underscore" = "1" } ++ { "with+plus" = "1" } ++ } ++ { "initrd" = "/initrd-2.6.24.4-64.fc8.img" } } ++ + (* Test parsing of invalid entries via menu_error *) + test Grub.lns get "default=0\ncrud=no\n" = + { "default" = "0" } +-- +2.27.0 + diff --git a/0003-Rsyslog-support-multiple-actions-in-filters-and-sele.patch b/0003-Rsyslog-support-multiple-actions-in-filters-and-sele.patch new file mode 100644 index 0000000..954b420 --- /dev/null +++ b/0003-Rsyslog-support-multiple-actions-in-filters-and-sele.patch @@ -0,0 +1,93 @@ +From d2f6980cdb811c46c58807988f1965a828feed5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= +Date: Tue, 12 Nov 2019 13:33:26 +0100 +Subject: Rsyslog: support multiple actions in filters and selectors (#653) + +(cherry picked from commit 5181105bae84dc7819a00886f068ad0bb4e6d05a) +--- + lenses/rsyslog.aug | 11 ++++++++--- + lenses/tests/test_rsyslog.aug | 37 +++++++++++++++++++++++++++++++++++ + 2 files changed, 45 insertions(+), 3 deletions(-) + +diff --git a/lenses/rsyslog.aug b/lenses/rsyslog.aug +index 7b9f7dc9..29ff9b10 100644 +--- a/lenses/rsyslog.aug ++++ b/lenses/rsyslog.aug +@@ -65,11 +65,17 @@ let hostname = [ label "hostname" . + ( Syslog.plus | [ Build.xchgs "-" "reverse" ] ) . + Syslog.hostnames . Util.eol . Syslog.entries ] + ++(* View: actions *) ++let actions = ++ let prop_act = [ label "action" . action ] ++ in let act_sep = del /[ \t]*\n&[ \t]*/ "\n& " ++ in Build.opt_list prop_act act_sep ++ + (* View: entry + An entry contains selectors and an action + *) + let entry = [ label "entry" . Syslog.selectors . Syslog.sep_tab . +- [ label "action" . action ] . Util.eol ] ++ actions . Util.eol ] + + (* View: prop_filter + Parses property-based filters, which start with ":" and the property name *) +@@ -78,9 +84,8 @@ let prop_filter = + in let prop_name = [ Util.del_str ":" . label "property" . store Rx.word ] + in let prop_oper = [ label "operation" . store /[A-Za-z!-]+/ ] + in let prop_val = [ label "value" . Quote.do_dquote (store /[^\n"]*/) ] +- in let prop_act = [ label "action" . action ] + in [ label "filter" . prop_name . sep . prop_oper . sep . prop_val . +- Sep.space . prop_act . Util.eol ] ++ Sep.space . actions . Util.eol ] + + let entries = ( Syslog.empty | Util.comment | entry | macro | config_object | prop_filter )* + +diff --git a/lenses/tests/test_rsyslog.aug b/lenses/tests/test_rsyslog.aug +index 9011a2b3..e83613a2 100644 +--- a/lenses/tests/test_rsyslog.aug ++++ b/lenses/tests/test_rsyslog.aug +@@ -222,3 +222,40 @@ test Rsyslog.lns get "*.* ?DynamicFile\n" = + { "dynamic" = "DynamicFile" } + } + } ++ ++(* Multiple actions in filters and selectors *) ++test Rsyslog.lns get ":msg, startswith, \"iptables:\" -/var/log/iptables.log ++& ~ ++# Save boot messages also to boot.log ++local7.* /var/log/boot.log ++local3.err /var/log/nfsen/nfsenlog ++& /var/log/also.log ++\n" = ++ { "filter" ++ { "property" = "msg" } ++ { "operation" = "startswith" } ++ { "value" = "iptables:" } ++ { "action" ++ { "no_sync" } ++ { "file" = "/var/log/iptables.log" } } ++ { "action" ++ { "discard" } } ++ } ++ { "#comment" = "Save boot messages also to boot.log" } ++ { "entry" ++ { "selector" ++ { "facility" = "local7" } ++ { "level" = "*" } } ++ { "action" ++ { "file" = "/var/log/boot.log" } } ++ } ++ { "entry" ++ { "selector" ++ { "facility" = "local3" } ++ { "level" = "err" } } ++ { "action" ++ { "file" = "/var/log/nfsen/nfsenlog" } } ++ { "action" ++ { "file" = "/var/log/also.log" } } } ++ { } ++ +-- +2.27.0 + diff --git a/0004-src-augrun.c-nexttoken-add-more-escape-characters.patch b/0004-src-augrun.c-nexttoken-add-more-escape-characters.patch new file mode 100644 index 0000000..b1a4c08 --- /dev/null +++ b/0004-src-augrun.c-nexttoken-add-more-escape-characters.patch @@ -0,0 +1,37 @@ +From 6fcfb7282921cb87ca40816bd9c4a6723dd08293 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Fri, 17 May 2019 13:47:20 +0200 +Subject: * src/augrun.c (nexttoken): add more escape characters + +Synchonize the list of "pass-through" characters with the set in the +'name_follow' variable in pathx.c: as pathx_escape_name() escapes them, +make sure that aug_srun() accepts them as arguments. +--- + src/augrun.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/augrun.c b/src/augrun.c +index 07f865a9..fd710c5f 100644 +--- a/src/augrun.c ++++ b/src/augrun.c +@@ -133,8 +133,16 @@ static char *nexttoken(struct command *cmd, char **line, bool path) { + copy = true; + if (*s == '\\') { + switch (*(s+1)) { ++ case ']': + case '[': +- case ']': /* pass both literally */ ++ case '|': ++ case '/': ++ case '=': ++ case '(': ++ case ')': ++ case '!': ++ case ',': /* pass them literally; ++ * see 'name_follow' in pathx.c */ + nescaped = 2; + break; + case 't': /* insert tab */ +-- +2.27.0 + diff --git a/0005-src-augtool.c-hopefully-fix-readline-quoting-issues.patch b/0005-src-augtool.c-hopefully-fix-readline-quoting-issues.patch new file mode 100644 index 0000000..d6d8c4f --- /dev/null +++ b/0005-src-augtool.c-hopefully-fix-readline-quoting-issues.patch @@ -0,0 +1,42 @@ +From 05de2f89c57b08ddabda64b494997f302773a5a6 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Fri, 17 May 2019 15:18:50 +0200 +Subject: * src/augtool.c: hopefully fix readline quoting issues + +Configure the quoting (also using a detector) and word break characters, +so it is possible to autocomplete paths with special characters (like +spaces, which are already quoted by augeas). +--- + src/augtool.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/augtool.c b/src/augtool.c +index b42ef630..31a991eb 100644 +--- a/src/augtool.c ++++ b/src/augtool.c +@@ -267,10 +267,22 @@ static char *get_home_dir(uid_t uid) { + return result; + } + ++/* Inspired from: ++ * https://thoughtbot.com/blog/tab-completion-in-gnu-readline ++ */ ++static int quote_detector(char *str, int index) { ++ return index > 0 ++ && str[index - 1] == '\\' ++ && quote_detector(str, index - 1) == 0; ++} ++ + static void readline_init(void) { + rl_readline_name = "augtool"; + rl_attempted_completion_function = readline_completion; + rl_completion_entry_function = readline_path_generator; ++ rl_completer_quote_characters = "\"'"; ++ rl_completer_word_break_characters = (char *) " "; ++ rl_char_is_quoted_p = "e_detector; + + /* Set up persistent history */ + char *home_dir = get_home_dir(getuid()); +-- +2.27.0 + diff --git a/0006-Krb5-improve-dbmodules-and-includes-630.patch b/0006-Krb5-improve-dbmodules-and-includes-630.patch new file mode 100644 index 0000000..ad2cc3d --- /dev/null +++ b/0006-Krb5-improve-dbmodules-and-includes-630.patch @@ -0,0 +1,133 @@ +From dcd0d5accbf55da94ca934ba3e7f22e5d1f6c33a Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 4 Feb 2020 17:54:22 +0100 +Subject: Krb5: improve [dbmodules] and includes (#630) + +* Krb5: fix/revamp parsing of [dbmodules] subsection + +The [dbmodules] subsection so far was parsed much like the [dbdefaults] +one, and thus it did not handle realms. + +Revamp it a bit to handle realms, and specify the only keyword not in +realm subsections. + +* Krb5: allow include/includedir directives everywhere + +MIT Kerberos allows this, so do not restrict them only before any other +section. +--- + lenses/krb5.aug | 27 +++++++++++++++++++-------- + lenses/tests/test_krb5.aug | 36 +++++++++++++++++++++++++++++++++++- + 2 files changed, 54 insertions(+), 9 deletions(-) + +diff --git a/lenses/krb5.aug b/lenses/krb5.aug +index 46c22656..6b509c42 100644 +--- a/lenses/krb5.aug ++++ b/lenses/krb5.aug +@@ -21,10 +21,11 @@ let closebr = del /[ \t]*\}/ "}" + and realms in the [appdefaults] section. + *) + ++let include_re = /include(dir)?/ + let realm_re = /[A-Z0-9][.a-zA-Z0-9-]*/ + let realm_anycase_re = /[A-Za-z0-9][.a-zA-Z0-9-]*/ + let app_re = /[a-z][a-zA-Z0-9_]*/ +-let name_re = /[.a-zA-Z0-9_-]+/ ++let name_re = /[.a-zA-Z0-9_-]+/ - include_re + + let value_br = store /[^;# \t\r\n{}]+/ + let value = store /[^;# \t\r\n]+/ +@@ -130,10 +131,19 @@ let dbdefaults = + simple_section "dbdefaults" keys + + let dbmodules = +- let keys = /db_library|ldap_kerberos_container_dn|ldap_kdc_dn/ +- |/ldap_kadmind_dn|ldap_service_password_file|ldap_servers/ +- |/ldap_conns_per_server/ in +- simple_section "dbmodules" keys ++ let subsec_key = /database_name|db_library|disable_last_success/ ++ |/disable_lockout|ldap_conns_per_server|ldap_(kdc|kadmind)_dn/ ++ |/ldap_(kdc|kadmind)_sasl_mech|ldap_(kdc|kadmind)_sasl_authcid/ ++ |/ldap_(kdc|kadmind)_sasl_authzid|ldap_(kdc|kadmind)_sasl_realm/ ++ |/ldap_kerberos_container_dn|ldap_servers/ ++ |/ldap_service_password_file|mapsize|max_readers|nosync/ ++ |/unlockiter/ in ++ let subsec_option = subsec_entry subsec_key eq comment in ++ let key = /db_module_dir/ in ++ let option = entry key eq value comment in ++ let realm = [ indent . label "realm" . store realm_re . ++ eq_openbr . (subsec_option)* . closebr . eol ] in ++ record "dbmodules" (option|realm) + + (* This section is not documented in the krb5.conf manpage, + but the Fermi example uses it. *) +@@ -152,11 +162,12 @@ let kdc = + let pam = + simple_section "pam" name_re + +-let includes = Build.key_value_line /include(dir)?/ Sep.space (store Rx.fspath) ++let includes = Build.key_value_line include_re Sep.space (store Rx.fspath) ++let include_lines = includes . (comment|empty)* + +-let lns = (comment|empty|includes)* . ++let lns = (comment|empty)* . + (libdefaults|login|appdefaults|realms|domain_realm +- |logging|capaths|dbdefaults|dbmodules|instance_mapping|kdc|pam)* ++ |logging|capaths|dbdefaults|dbmodules|instance_mapping|kdc|pam|include_lines)* + + let filter = (incl "/etc/krb5.conf.d/*.conf") + . (incl "/etc/krb5.conf") +diff --git a/lenses/tests/test_krb5.aug b/lenses/tests/test_krb5.aug +index f746543b..10b87605 100644 +--- a/lenses/tests/test_krb5.aug ++++ b/lenses/tests/test_krb5.aug +@@ -1029,7 +1029,7 @@ default_ccache_name = KEYRING:persistent:%{uid}\n" = + { } + { "default_ccache_name" = "KEYRING:persistent:%{uid}" } } + +-(* Include(dir) test *) ++(* Include(dir) tests *) + let include_test = "include /etc/krb5.other_conf.d/other.conf + includedir /etc/krb5.conf.d/ + " +@@ -1037,3 +1037,37 @@ includedir /etc/krb5.conf.d/ + test Krb5.lns get include_test = + { "include" = "/etc/krb5.other_conf.d/other.conf" } + { "includedir" = "/etc/krb5.conf.d/" } ++ ++let include2_test = "[logging] ++ default = FILE:/var/log/krb5libs.log ++ ++include /etc/krb5.other_conf.d/other.conf ++ ++includedir /etc/krb5.conf.d/ ++" ++ ++test Krb5.lns get include2_test = ++ { "logging" ++ { "default" ++ { "file" = "/var/log/krb5libs.log" } } ++ { } ++ } ++ { "include" = "/etc/krb5.other_conf.d/other.conf" } ++ { } ++ { "includedir" = "/etc/krb5.conf.d/" } ++ ++(* [dbmodules] test *) ++let dbmodules_test = "[dbmodules] ++ ATHENA.MIT.EDU = { ++ disable_last_success = true ++ } ++ db_module_dir = /some/path ++" ++ ++test Krb5.lns get dbmodules_test = ++ { "dbmodules" ++ { "realm" = "ATHENA.MIT.EDU" ++ { "disable_last_success" = "true" } ++ } ++ { "db_module_dir" = "/some/path" } ++ } +-- +2.27.0 + diff --git a/0007-Systemd-fix-parsing-of-envvars-with-spaces-659.patch b/0007-Systemd-fix-parsing-of-envvars-with-spaces-659.patch new file mode 100644 index 0000000..f09c950 --- /dev/null +++ b/0007-Systemd-fix-parsing-of-envvars-with-spaces-659.patch @@ -0,0 +1,59 @@ +From fb5a5444c1ada5f8182440128e4f9996d55ea0a0 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 4 Feb 2020 18:05:05 +0100 +Subject: Systemd: fix parsing of envvars with spaces (#659) + +Allow spaces inside of values quoted with single or double quotes. + +This amends commit f64d8bc7a7670f3af2549fdcefb64c2b5f22cd0d that added +support for quoted values. +--- + lenses/systemd.aug | 4 ++-- + lenses/tests/test_systemd.aug | 9 +++++++++ + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/lenses/systemd.aug b/lenses/systemd.aug +index b868e86f..77434367 100644 +--- a/lenses/systemd.aug ++++ b/lenses/systemd.aug +@@ -132,8 +132,8 @@ let entry_env = + let envkv (env_val:lens) = key env_key . Util.del_str "=" . env_val + (* bare has no spaces, and is optionally quoted *) + in let bare = Quote.do_quote_opt (envkv (store /[^#'" \t\n]*[^#'" \t\n\\]/)?) +- in let bare_dqval = envkv (store /"[^#" \t\n]*[^#" \t\n\\]"/) +- in let bare_sqval = envkv (store /'[^#' \t\n]*[^#' \t\n\\]'/) ++ in let bare_dqval = envkv (store /"[^#"\t\n]*[^#"\t\n\\]"/) ++ in let bare_sqval = envkv (store /'[^#'\t\n]*[^#'\t\n\\]'/) + (* quoted has at least one space, and must be quoted *) + in let quoted = Quote.do_quote (envkv (store /[^#"'\n]*[ \t]+[^#"'\n]*/)) + in let envkv_quoted = [ bare ] | [ bare_dqval ] | [ bare_sqval ] | [ quoted ] +diff --git a/lenses/tests/test_systemd.aug b/lenses/tests/test_systemd.aug +index 3397456e..19c57075 100644 +--- a/lenses/tests/test_systemd.aug ++++ b/lenses/tests/test_systemd.aug +@@ -206,6 +206,8 @@ FOO=BAR + Environment=\"LANG=foo bar\" FOO=BAR + Environment=OPTIONS=\"-LS0-6d\" + Environment=OPTIONS='-LS0-6d' ++Environment=VAR=\"with some spaces\" VAR2='more spaces' ++Environment=VAR='with some spaces' + " + (* Test: Systemd.lns *) + test Systemd.lns get env = +@@ -247,6 +249,13 @@ test Systemd.lns get env = + { "Environment" + { "OPTIONS" = "'-LS0-6d'" } + } ++ { "Environment" ++ { "VAR" = "\"with some spaces\"" } ++ { "VAR2" = "'more spaces'" } ++ } ++ { "Environment" ++ { "VAR" = "'with some spaces'" } ++ } + } + + (* Variable: unit *) +-- +2.27.0 + diff --git a/0008-Ssh-add-Match-keyword-support-695.patch b/0008-Ssh-add-Match-keyword-support-695.patch new file mode 100644 index 0000000..de7190c --- /dev/null +++ b/0008-Ssh-add-Match-keyword-support-695.patch @@ -0,0 +1,85 @@ +From 0a0b61864b8e5796ef5f53864474cd718c0b8ece Mon Sep 17 00:00:00 2001 +From: granquet +Date: Tue, 6 Oct 2020 23:03:18 +0200 +Subject: Ssh: add Match keyword support (#695) + +Signed-off-by: Guillaume Ranquet +--- + lenses/ssh.aug | 19 +++++++++++++++++-- + lenses/tests/test_ssh.aug | 12 ++++++++++++ + 2 files changed, 29 insertions(+), 2 deletions(-) + +diff --git a/lenses/ssh.aug b/lenses/ssh.aug +index 4e731581..c140c9a9 100644 +--- a/lenses/ssh.aug ++++ b/lenses/ssh.aug +@@ -92,7 +92,7 @@ module Ssh = + | rekey_limit + + let key_re = /[A-Za-z0-9]+/ +- - /SendEnv|Host|ProxyCommand|RemoteForward|LocalForward|MACs|Ciphers|(HostKey|Kex)Algorithms|PubkeyAcceptedKeyTypes|GlobalKnownHostsFile|RekeyLimit/i ++ - /SendEnv|Host|Match|ProxyCommand|RemoteForward|LocalForward|MACs|Ciphers|(HostKey|Kex)Algorithms|PubkeyAcceptedKeyTypes|GlobalKnownHostsFile|RekeyLimit/i + + + let other_entry = [ indent . key key_re +@@ -105,11 +105,26 @@ module Ssh = + let host = [ key /Host/i . spc . value_to_eol . eol . entry* ] + + ++ let condition_entry = ++ let value = store /[^ \t\r\n=]+/ in ++ [ spc . key /[A-Za-z0-9]+/ . spc . value ] ++ ++ let match_cond = ++ [ label "Condition" . condition_entry+ . eol ] ++ ++ let match_entry = entry ++ ++ let match = ++ [ key /Match/i . match_cond ++ . [ label "Settings" . match_entry+ ] ++ ] ++ ++ + (************************************************************************ + * Group: LENS + *************************************************************************) + +- let lns = entry* . host* ++ let lns = entry* . (host | match)* + + let xfm = transform lns (incl "/etc/ssh/ssh_config" . + incl (Sys.getenv("HOME") . "/.ssh/config") . +diff --git a/lenses/tests/test_ssh.aug b/lenses/tests/test_ssh.aug +index f5fca252..456624e4 100644 +--- a/lenses/tests/test_ssh.aug ++++ b/lenses/tests/test_ssh.aug +@@ -5,6 +5,9 @@ module Test_ssh = + "# start + IdentityFile /etc/ssh/identity.asc + ++Match final all ++ GSSAPIAuthentication yes ++ + Host suse.cz + ForwardAgent yes + SendEnv LC_LANG +@@ -30,6 +33,15 @@ PubkeyAcceptedKeyTypes ssh-ed25519-cert-v01@openssh.com,ssh-ed25519,ssh-rsa-cert + { "#comment" = "start" } + { "IdentityFile" = "/etc/ssh/identity.asc" } + { } ++ { "Match" ++ { "Condition" ++ { "final" = "all" } ++ } ++ { "Settings" ++ { "GSSAPIAuthentication" = "yes" } ++ { } ++ } ++ } + { "Host" = "suse.cz" + { "ForwardAgent" = "yes" } + { "SendEnv" +-- +2.27.0 + diff --git a/augeas.spec b/augeas.spec index 515695a..4d41e29 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,17 +1,24 @@ Name: augeas Version: 1.12.0 -Release: 5%{?dist} +Release: 6%{?dist}.patchwork202104060848 Summary: A library for changing configuration files License: LGPLv2+ URL: http://augeas.net/ Source0: http://download.augeas.net/%{name}-%{version}.tar.gz -Provides: bundled(gnulib) +Patch0002: 0002-Grub-support-in-kernel-command-line-option-names-647.patch +Patch0003: 0003-Rsyslog-support-multiple-actions-in-filters-and-sele.patch +Patch0004: 0004-src-augrun.c-nexttoken-add-more-escape-characters.patch +Patch0005: 0005-src-augtool.c-hopefully-fix-readline-quoting-issues.patch +Patch0006: 0006-Krb5-improve-dbmodules-and-includes-630.patch +Patch0007: 0007-Systemd-fix-parsing-of-envvars-with-spaces-659.patch +Patch0008: 0008-Ssh-add-Match-keyword-support-695.patch + BuildRequires: gcc BuildRequires: readline-devel libselinux-devel libxml2-devel -BuildRequires: make +BuildRequires: autoconf, automake Requires: %{name}-libs = %{version}-%{release} %description @@ -35,7 +42,9 @@ developing applications that use %{name}. %package libs -Summary: Libraries for %{name} +Summary: Libraries for %{name}a + +Provides: bundled(gnulib) %description libs The libraries for %{name}. @@ -45,25 +54,17 @@ 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. -%package static -Summary: Static libraries for %{name} -Requires: %{name}-devel = %{version}-%{release} - -%description static -The %{name}-static package contains static libraries needed to produce -static builds using %{name}. - %prep -%setup -q +%autosetup -p1 %build %configure \ %ifarch riscv64 --disable-gnulib-tests \ %endif - --enable-static + --disable-static make %{?_smp_mflags} %check @@ -71,13 +72,11 @@ make %{?_smp_mflags} # to differing SELinux labelling. export SKIP_TEST_PRESERVE_SELINUX=1 -# Tests disabled because gnulib tests fail see: -# https://bugzilla.redhat.com/show_bug.cgi?id=1674672 -#make %{?_smp_mflags} check || { -# echo '===== tests/test-suite.log =====' -# cat tests/test-suite.log -# exit 1 -#} +make %{?_smp_mflags} check || { + echo '===== tests/test-suite.log =====' + cat tests/test-suite.log + exit 1 +} %install rm -rf $RPM_BUILD_ROOT @@ -89,11 +88,13 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' rm -r $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/tests # In 1.9.0, the example /usr/bin/dump gets installed inadvertently -rm -f $RPM_BUILD_ROOT/usr/bin/dump +#rm -f $RPM_BUILD_ROOT/usr/bin/dump %ldconfig_scriptlets libs + %files +%defattr(-,root,root,-) %{_bindir}/augmatch %{_bindir}/augparse %{_bindir}/augtool @@ -103,6 +104,7 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_datadir}/vim/vimfiles/ftdetect/augeas.vim %files libs +%defattr(-,root,root,-) # _datadir/augeas and _datadir/augeas/lenses are owned # by filesystem. %{_datadir}/augeas/lenses/dist @@ -110,14 +112,12 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %doc AUTHORS COPYING NEWS %files devel +%defattr(-,root,root,-) %doc %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/augeas.pc -%files static -%{_libdir}/libaugeas.a -%{_libdir}/libfa.a %changelog * Tue Jan 26 2021 Fedora Release Engineering - 1.12.0-5