diff --git a/augeas-1.12.0.tar.gz b/augeas-1.12.0.tar.gz deleted file mode 100644 index af760c1..0000000 --- a/augeas-1.12.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87 -size 2429279 diff --git a/augeas-1.12.0.tar.gz.sig b/augeas-1.12.0.tar.gz.sig deleted file mode 100644 index 3acd088..0000000 Binary files a/augeas-1.12.0.tar.gz.sig and /dev/null differ diff --git a/augeas-1.13.0-replace_security_context_t-patch b/augeas-1.13.0-replace_security_context_t-patch new file mode 100644 index 0000000..d17b1f3 --- /dev/null +++ b/augeas-1.13.0-replace_security_context_t-patch @@ -0,0 +1,22 @@ +From f38398a2d07028b892eac59449a35e1a3d645fac Mon Sep 17 00:00:00 2001 +From: Leo-Schmit <63145459+Leo-Schmit@users.noreply.github.com> +Date: Tue, 20 Sep 2022 13:41:31 +0200 +Subject: [PATCH] Replace deprecated 'security_context_t' with 'char *' (#747) + +--- + src/transform.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/transform.c b/src/transform.c +index 176482b93..d46f2c497 100644 +--- a/src/transform.c ++++ b/src/transform.c +@@ -918,7 +918,7 @@ static int transfer_file_attrs(FILE *from, FILE *to, + struct stat st; + int ret = 0; + int selinux_enabled = (is_selinux_enabled() > 0); +- security_context_t con = NULL; ++ char *con = NULL; + + int from_fd; + int to_fd = fileno(to); diff --git a/augeas-1.13.0.tar.gz b/augeas-1.13.0.tar.gz new file mode 100644 index 0000000..b09e7a5 --- /dev/null +++ b/augeas-1.13.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5002f33f42365ab78be974609a0f3b76a4c277fc404ec79f516305cab5ce5de1 +size 2562588 diff --git a/augeas-allow_printable_ASCII.patch b/augeas-allow_printable_ASCII.patch deleted file mode 100644 index 976c4c3..0000000 --- a/augeas-allow_printable_ASCII.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 - - (************************************************************************ diff --git a/augeas-new_options_for_chrony.patch b/augeas-new_options_for_chrony.patch deleted file mode 100644 index c1dc13a..0000000 --- a/augeas-new_options_for_chrony.patch +++ /dev/null @@ -1,238 +0,0 @@ -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 - - makestep - - maxchange -- - ratelimit|cmdratelimit -+ - ratelimit|cmdratelimit|ntsratelimit - - refclock - - smoothtime - - tempcomp ( | ) -+ - confdir|sourcedir - *) - - (* 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: *) diff --git a/augeas.changes b/augeas.changes index 46caf60..f797b5a 100644 --- a/augeas.changes +++ b/augeas.changes @@ -1,3 +1,81 @@ +------------------------------------------------------------------- +Fri Nov 4 01:29:24 UTC 2022 - Jason Sikes + +- Update to 1.13.0 + * Fixes bsc#1204554 + * Added augeas-1.13.0-replace_security_context_t-patch to fix a + syntax error. + * Rebased gcc9-disable-broken-test.patch + * Dropped the following patches since they are now upstreamed: + - augeas-new_options_for_chrony.patch + - augeas-allow_printable_ASCII.patch + - remove-unportable-tests.patch + * General changes/additions + - Add Dockerfile (Nicolas Gif) (Issue #650) + - augtool: Improved readline integration to handle quoting + issues (Pino Toscano) + - typechecker: Allow including '/' in keys and labels. Thanks + to felixdoerre for pointing out that this restriction was + unnecessary. See issue #668 for the discussion. + - Add function modified() to select nodes which are marked as + dirty (George Hansper) (Issue #691) + - Add CLI command 'preview' and API 'aug_preview' to preview + file contents (George Hansper) (#690) + - Add "else" operator to augeas path-filter expressions + (priority selector) (George Hansper) (#692) + - Add new axis 'seq' to allow /path/seq::*[expr] to match and + create numeric nodes, as idempotent alternative to + /path/*[expr] (George Hansper) (#706) + * Lens changes/additions + - Authinfo2: new lens to parse Authinfo2 format (Nicolas Gif) + (Issue #649) + - Chrony: add new options (Miroslav Lichvar) (Issue #698) + - Cmdline: New lens to parse /proc/cmdline (Thomas Weißschuh) + - Crypttab: support UUID in device and / in opt (Raphaël + Pinson) (#713) + - Fail2ban: new lens to parse Fail2ban format (Nicolas Gif) + (Issue #651) + - Grub: support '+' in kernel command line option names (Pino + Toscano) (Issue #647) + - Krb5: handle [plugins] subsection (Pino Toscano) (Issue #663) + - Limits: support colons in the domain pattern of the limits + lens (Xavier Mol) (Issue #645) + - Logrotate: add hourly schedule (Jason A. Smith) (Issue #655) + - Mke2fs: parse more common entries between [defaults] and the + tags in [fs_types], fix the type of few entries, handle the + [options] stanza (Pino Toscano) (Issue #642) + - support quoted values (Pino Toscano) (Issue #661) + - NetworkManager: allow # in values (mfilka) (#723) + - Opendkim: update to match current conffile format (Issue #644) + - Postfix_Master: Allow unix-dgram as type (Issue #635) + - Postfix_transport: Allow underscore (Anton Baranov) (Issue #678) + - Postgresql: Allow hyphen '-' in values that don't require quotes + (Marcin Barczyński) (Issues #700 #701) + - Properties: Allow "/" in property names (felixdoerre) (Issue #680) + - Redis: add incl path /etc/redis.conf (Raphaël Pinson) (#726) + - support "replicaof" (Raphaël Pinson) (#727) + - fix support for "sentinel" (Raphaël Pinson) (#728) + - Resolv: Support new options (Trevor Vaughan) (Issues #707 #708) + - Rsyslog: support multiple actions in filters and selectors (Issue + #653) + - Shellvars: exclude more tcsh profile scripts (Pino Toscano) (Issue + #627) + - Simplevars: add ocsinventory-agent.cfg (Pat Riehecky) (Issue #637) + - Sudoers: support new @include/@includedir directives (Pino + Toscano) (Issue #693) + - Sudoers: Allow AD groups (luchihoratiu) (Issue #696) + - Support negative integers (Ando David Roots) (#724) + - Ssh: add Match keyword support (granquet) (Issue #695) + - Sshd: support quotes in Match conditions (Issue #739) + - Systemd: fix parsing of envvars with spaces (Pino Toscano) (#659) + - Add incl paths according to 'systemd.network(5)' (chruetli) (#683) + - Tinc: new lens for Tinc VPN configuration files (Thomas Weißschuh) + (#718) + - Toml: support arrays (norec) in inline tables (Raphaël Pinson) + (#703) + - Tmpfiles: improvements to the types specification (Pino Toscano) + (Issue #694) + ------------------------------------------------------------------- Tue Jul 26 15:49:09 UTC 2022 - Fabian Vogt diff --git a/augeas.spec b/augeas.spec index 6232f52..7b1b46e 100644 --- a/augeas.spec +++ b/augeas.spec @@ -17,22 +17,19 @@ Name: augeas -Version: 1.12.0 +Version: 1.13.0 Release: 0 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 +Source0: https://github.com/hercules-team/augeas/releases/download/release-%{version}/%{name}-%{version}.tar.gz 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: sysctl_parsing.patch +Patch1: sysctl_parsing.patch +Patch2: augeas-1.13.0-replace_security_context_t-patch +Patch3: gcc9-disable-broken-test.patch BuildRequires: glibc-locale BuildRequires: pkgconfig BuildRequires: readline-devel diff --git a/gcc9-disable-broken-test.patch b/gcc9-disable-broken-test.patch index 26b2737..bc0c37b 100644 --- a/gcc9-disable-broken-test.patch +++ b/gcc9-disable-broken-test.patch @@ -1,7 +1,8 @@ -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 @@ +diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in +index 3850f66..7b223a6 100644 +--- a/gnulib/tests/Makefile.in ++++ b/gnulib/tests/Makefile.in +@@ -134,7 +134,7 @@ TESTS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ test-limits-h$(EXEEXT) test-listen$(EXEEXT) \ test-locale$(EXEEXT) test-localeconv$(EXEEXT) \ @@ -10,124 +11,124 @@ diff -Naur augeas-1.12.0.orig/gnulib/tests/Makefile.in augeas-1.12.0/gnulib/test 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) \ +@@ -172,7 +172,7 @@ TESTS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ + test-sys_socket$(EXEEXT) 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-thread_self$(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) \ +@@ -206,7 +206,7 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ + test-langinfo$(EXEEXT) test-limits-h$(EXEEXT) \ + test-listen$(EXEEXT) test-locale$(EXEEXT) \ + test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ +- test-rwlock1$(EXEEXT) test-lock$(EXEEXT) test-once1$(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-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \ +@@ -240,7 +240,7 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ + test-sys_socket$(EXEEXT) 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-thread_self$(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 +@@ -875,9 +875,6 @@ test_regex_SOURCES = test-regex.c test_regex_OBJECTS = test-regex.$(OBJEXT) - test_regex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) + test_regex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(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) +@@ -1099,9 +1096,6 @@ test_sys_wait_LDADD = $(LDADD) test_sys_wait_DEPENDENCIES = libtests.a ../../gnulib/lib/libgnu.la \ - libtests.a $(am__DEPENDENCIES_1) + 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 \ +@@ -1332,7 +1326,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ + test-pathmax.c test-perror.c test-perror2.c test-pipe.c \ + test-pthread.c test-pthread-thread.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-sched.c $(test_scratch_buffer_SOURCES) test-select.c \ + test-select-fd.c test-select-stdin.c test-setenv.c \ + test-setlocale1.c test-setlocale2.c test-setlocale_null.c \ +@@ -1345,7 +1339,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ 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-sys_random.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-sys_uio.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 \ +@@ -1374,7 +1368,7 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ + test-pathmax.c test-perror.c test-perror2.c test-pipe.c \ + test-pthread.c test-pthread-thread.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-sched.c $(test_scratch_buffer_SOURCES) test-select.c \ + test-select-fd.c test-select-stdin.c test-setenv.c \ + test-setlocale1.c test-setlocale2.c test-setlocale_null.c \ +@@ -1387,7 +1381,7 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ 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-sys_random.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-sys_uio.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@ +@@ -2949,7 +2943,7 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.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-once.c atomic-int-gnulib.h \ ++ test-lock.c test-once.c atomic-int-gnulib.h \ + 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 test-mbrtowc.c \ +@@ -3004,7 +2998,7 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ + test-sys_socket.c test-sys_stat.c sys_time.in.h \ + 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 \ +- thread-optim.h test-thread_self.c test-thread_create.c \ ++ thread-optim.h test-thread_self.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 \ +@@ -3075,7 +3069,6 @@ test_inet_pton_LDADD = $(LDADD) @INET_PTON_LIB@ test_listen_LDADD = $(LDADD) @LIBSOCKET@ - test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD) + test_localcharset_LDADD = $(LDADD) $(LIB_SETLOCALE) + test_localename_LDADD = $(LDADD) $(LIB_SETLOCALE) @INTL_MACOSX_LIBS@ $(LIBTHREAD) -test_rwlock1_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ - test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ + test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ @LIB_SEMAPHORE@ test_once1_SOURCES = test-once.c test_once1_LDADD = $(LDADD) @LIBTHREAD@ -@@ -2684,7 +2677,6 @@ +@@ -3130,7 +3123,6 @@ test_sockets_LDADD = $(LDADD) @LIBSOCKET@ test_stat_LDADD = $(LDADD) $(LIBINTL) test_stat_time_LDADD = $(LDADD) $(LIB_NANOSLEEP) test_thread_self_LDADD = $(LDADD) @LIBTHREAD@ -test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@ + test_wcrtomb_LDADD = $(LDADD) $(LIB_SETLOCALE) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive - -@@ -3053,10 +3045,6 @@ +@@ -3528,10 +3520,6 @@ test-regex$(EXEEXT): $(test_regex_OBJECTS) $(test_regex_DEPENDENCIES) $(EXTRA_te @rm -f test-regex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_regex_OBJECTS) $(test_regex_LDADD) $(LIBS) @@ -138,7 +139,7 @@ diff -Naur augeas-1.12.0.orig/gnulib/tests/Makefile.in augeas-1.12.0/gnulib/test 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 @@ +@@ -3700,10 +3688,6 @@ test-sys_wait$(EXEEXT): $(test_sys_wait_OBJECTS) $(test_sys_wait_DEPENDENCIES) $ @rm -f test-sys_wait$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_sys_wait_OBJECTS) $(test_sys_wait_LDADD) $(LIBS) @@ -149,15 +150,15 @@ diff -Naur augeas-1.12.0.orig/gnulib/tests/Makefile.in augeas-1.12.0/gnulib/test 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 @@ +@@ -3884,7 +3868,6 @@ distclean-compile: @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-sched.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-scratch-buffer.Po@am__quote@ # am--include-marker +@@ -3927,7 +3910,6 @@ distclean-compile: @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 @@ -165,7 +166,7 @@ diff -Naur augeas-1.12.0.orig/gnulib/tests/Makefile.in augeas-1.12.0/gnulib/test @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 @@ +@@ -4582,13 +4564,6 @@ test-localename.log: test-localename$(EXEEXT) --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) @@ -179,17 +180,17 @@ diff -Naur augeas-1.12.0.orig/gnulib/tests/Makefile.in augeas-1.12.0/gnulib/test 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" \ +@@ -5184,13 +5159,6 @@ test-thread_self.log: test-thread_self$(EXEEXT) --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) + "$$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) +- "$$tst" $(AM_TESTS_FD_REDIRECT) test-time.log: test-time$(EXEEXT) @p='test-time$(EXEEXT)'; \ + b='test-time'; \ diff --git a/remove-unportable-tests.patch b/remove-unportable-tests.patch deleted file mode 100644 index d147a4b..0000000 --- a/remove-unportable-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Paul Eggert -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