pool/augeas
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1105582 from devel:libraries:c_c++

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1105582
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/augeas?expand=0&rev=60
This commit is contained in:
Ana Guerrero 2023-08-30 08:17:54 +00:00 committed by Git OBS Bridge
commit 882f68f321
7 changed files with 172 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
augeas-1.13.0-replace_security_context_t-patch
View File

@ -1,22 +0,0 @@
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);

3
augeas-1.13.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5002f33f42365ab78be974609a0f3b76a4c277fc404ec79f516305cab5ce5de1
size 2562588

BIN
augeas-1.14.1.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

76
augeas.changes
View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Thu Aug 24 09:28:41 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>
- Update to 1.14.1
* General changes/additions
- internal.c: update #if to only use GNU-specific strerror_r() when GLIBC
is defined (#791) Dimitry Andric
- augeas.c: Fix bug from PR#691 where the nodes of a newly created file
are lost upon a subsequent load operation (#810) George Hansper
- HACKING.md: describe testing (#796) Laszlo Ersek
- Add GitHub Actions (#714) Raphaël Pinson
- augprint.c: remove #include <malloc.h> , add #include <libgen.h>
(#792) Ruoyu Zhong
* Lens changes/additions
- TOML: support trailing commas in arrays (#809) Bao
- Tmpfiles: allow '=', '~', '^' for letter types, allow ":" as prefix for
the mode (#805) Pino Toscano
- Sshd: Add keyword PubkeyAcceptedAlgorithms as comma-separated list of
items (#806) Dave Re
- Cmdline: Allow whitespace at the end of kernel commnd line
(#798) rwmjones
-------------------------------------------------------------------
Wed May 31 14:46:30 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>
- Update to 1.14.0
* General changes/additions
- Update submodule gnulib to 2f7479a16a3395f1429c7795f10c5d19b9b4453e
(#781)
- Add bash-completion for augtool, augmatch, augprint (#783) George
Hansper
- Fix: Allow values to contain arbitrary unbalanced square brackets
(#782) George Hansper
- Add package bash to build stage in Dockerfile (#776) George Hansper
- Add augprint tool for creating idempotent augtool scripts (#752) George
Hansper
- Replace deprecated 'security_context_t' with 'char *' (#747) Leo-Schmit
- src/syntax.c: Fix whitespace which confuses static checkers
(#725) rwmjones
- README.md: Add oss-fuzz status badge (#702) Sergey Nizovtsev
- Package augmatch, too (#688) oleksandriegorov
- Add Github workflow to create releases with complete source tarballs
(#744) Hilko Bengen
* Lens changes/additions
- Resolv: add option trust-ad (#784) George Hansper
- Sos: new lens for /etc/sos/sos.conf (based on IniFile) (#779) George
Hansper
- Pg_Hba: unquoted auth-method may contain hyphens (#777) George Hansper
- Sysctl: Allow keys to contain * and : and / characters (#755) M Filka
- Semanage: Fix parsing of ignoredirs (#758) Richard W M Jones
- Systemd: allow empty quoted environment variable values (#757) Michal
Vasko
- Systemd: allow values starting with whitespaces for Exec* and
Environment service entries. (#757) Michal Vasko
- Toml: workaround to allow writing toml files (#742) Richard
- Kdump: parse "auto_reset_crashkernel" (#754) Laszlo Ersek
- Keepalived: add parameters notify_stop and notify_deleted (#749) Adam
Bambuch
- Chrony: add new directives and options (#745) Miroslav Lichvar
- Redis: Allow redis lens to set 'SAVE ""' as a valid option (#738) Mitch
Hagstrand
- ClamAV: update ClamAV lens to autoload /etc/clamav/*.conf
(#748) Guillaume Ross
- AuthselectPam: new lens for /etc/authselect/custom/*/*-auth
and /etc/authselect/custom/*/postlogin (#743) Heston Snodgrass
- Sshd: Parse GSSAPIKexAlgorithms PubkeyAcceptedKeyTypes
CASignatureAlgorithms as comma-seperated lists instead of simple
strings (#721) Edward Garbade
- Yum: Add additional unit tests (#677) Pat Riehecky
- Cockpit: new lens for /etc/cockpit/cockpit.conf (#675) Pat Riehecky
* Rebased patch gcc9-disable-broken-test.patch
* Deleted patches:
- sysctl_parsing.patch
- augeas-1.13.0-replace_security_context_t-patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 6 14:34:04 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com> Thu Apr 6 14:34:04 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>

32
augeas.spec
View File

@ -17,19 +17,18 @@
Name: augeas Name: augeas
Version: 1.13.0 Version: 1.14.1
Release: 0 Release: 0
Summary: An utility for changing configuration files Summary: An utility for changing configuration files
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/Shells
URL: https://augeas.net/ URL: https://augeas.net/
Source0: https://github.com/hercules-team/augeas/releases/download/release-%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/hercules-team/augeas/releases/download/release-%{version}/%{name}-%{version}.tar.gz
Source2: %{name}.keyring Source2: %{name}.keyring
Source3: baselibs.conf Source3: baselibs.conf
Patch0: augeas-modprobe-lense.patch Patch0: augeas-modprobe-lense.patch
# from https://patch-diff.githubusercontent.com/raw/hercules-team/augeas/pull/755.patch # from https://patch-diff.githubusercontent.com/raw/hercules-team/augeas/pull/755.patch
Patch1: sysctl_parsing.patch Patch1: gcc9-disable-broken-test.patch
Patch2: augeas-1.13.0-replace_security_context_t-patch
Patch3: gcc9-disable-broken-test.patch
BuildRequires: glibc-locale BuildRequires: glibc-locale
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: readline-devel BuildRequires: readline-devel
@ -45,6 +44,7 @@ file format and the transformation into a tree.
%package devel %package devel
Summary: A library for changing configuration files Summary: A library for changing configuration files
Group: System/Shells
Requires: libaugeas0 = %{version} Requires: libaugeas0 = %{version}
Requires: libfa1 = %{version} Requires: libfa1 = %{version}
@ -56,6 +56,7 @@ to the initially read files.
%package -n libaugeas0 %package -n libaugeas0
Summary: A library for changing configuration files Summary: A library for changing configuration files
Group: System/Shells
Recommends: %{name}-lenses = %{version} Recommends: %{name}-lenses = %{version}
%description -n libaugeas0 %description -n libaugeas0
@ -70,12 +71,14 @@ file format and the transformation into a tree.
%package -n libfa1 %package -n libfa1
Summary: Finite automaton library for Augeas Summary: Finite automaton library for Augeas
Group: System/Shells
%description -n libfa1 %description -n libfa1
Component library for the Augeas configuration parser. Component library for the Augeas configuration parser.
%package lenses %package lenses
Summary: Official set of lenses for use by libaugeas Summary: Official set of lenses for use by libaugeas
Group: System/Shells
Requires: libaugeas0 = %{version} Requires: libaugeas0 = %{version}
%description lenses %description lenses
@ -88,12 +91,27 @@ set of lenses.
%package lense-tests %package lense-tests
Summary: Set of tests for official Augeas lenses Summary: Set of tests for official Augeas lenses
Group: System/Shells
Requires: %{name}-lenses = %{version} Requires: %{name}-lenses = %{version}
%description lense-tests %description lense-tests
Set of tests for official Augeas lenses. These can be used when Set of tests for official Augeas lenses. These can be used when
modifying the official lenses, or when creating new ones. modifying the official lenses, or when creating new ones.
%package bash-completion
Summary: Bash completion for augeas
Group: System/Shells
Requires: %{name}
Requires: bash-completion
%if 0%{?suse_version} >= 1500
Supplements: (%{name} and bash-completion)
%else
Supplements: packageand(%{name}:bash-completion)
%endif
%description bash-completion
bash command line completion support for augeas.
%prep %prep
%autosetup -p1 %autosetup -p1
@ -126,6 +144,7 @@ unset MALLOC_PERTURB_
%{_bindir}/augmatch %{_bindir}/augmatch
%{_bindir}/augtool %{_bindir}/augtool
%{_bindir}/augparse %{_bindir}/augparse
%{_bindir}/augprint
%{_bindir}/fadot %{_bindir}/fadot
%{_mandir}/man1/* %{_mandir}/man1/*
@ -157,4 +176,9 @@ unset MALLOC_PERTURB_
%dir %{_datadir}/%{name}/lenses/dist/tests %dir %{_datadir}/%{name}/lenses/dist/tests
%{_datadir}/%{name}/lenses/dist/tests/*.aug %{_datadir}/%{name}/lenses/dist/tests/*.aug
%files bash-completion
%{_datadir}/bash-completion/completions/augmatch
%{_datadir}/bash-completion/completions/augprint
%{_datadir}/bash-completion/completions/augtool
%changelog %changelog

128
gcc9-disable-broken-test.patch
View File

@ -1,44 +1,46 @@
diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in ---
index 3850f66..7b223a6 100644 gnulib/tests/Makefile.in | 52 +++++++++--------------------------------------
1 file changed, 10 insertions(+), 42 deletions(-)
--- a/gnulib/tests/Makefile.in --- a/gnulib/tests/Makefile.in
+++ b/gnulib/tests/Makefile.in +++ b/gnulib/tests/Makefile.in
@@ -134,7 +134,7 @@ TESTS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ @@ -136,7 +136,7 @@ TESTS = test-accept$(EXEEXT) test-alloca
test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
test-limits-h$(EXEEXT) test-listen$(EXEEXT) \ test-limits-h$(EXEEXT) test-listen$(EXEEXT) \
test-locale$(EXEEXT) test-localeconv$(EXEEXT) \ test-locale$(EXEEXT) test-localeconv$(EXEEXT) \
- test-localename$(EXEEXT) test-rwlock1$(EXEEXT) \ - test-localename$(EXEEXT) test-rwlock1$(EXEEXT) \
+ test-localename$(EXEEXT) \ + test-localename$(EXEEXT) \
test-lock$(EXEEXT) test-once1$(EXEEXT) test-once2$(EXEEXT) \ test-lock$(EXEEXT) test-once1$(EXEEXT) test-once2$(EXEEXT) \
test-lstat$(EXEEXT) test-malloca$(EXEEXT) test-mbrtowc1.sh \ test-lstat$(EXEEXT) test-malloc-gnu$(EXEEXT) \
test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \ test-malloca$(EXEEXT) test-mbrtowc1.sh test-mbrtowc2.sh \
@@ -172,7 +172,7 @@ TESTS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ @@ -176,7 +176,7 @@ TESTS = test-accept$(EXEEXT) test-alloca
test-sys_socket$(EXEEXT) test-sys_stat$(EXEEXT) \ test-sys_stat$(EXEEXT) test-sys_time$(EXEEXT) \
test-sys_time$(EXEEXT) test-sys_types$(EXEEXT) \ test-sys_types$(EXEEXT) test-sys_uio$(EXEEXT) \
test-sys_uio$(EXEEXT) test-sys_wait$(EXEEXT) test-init.sh \ test-sys_wait$(EXEEXT) test-init.sh test-thread_self$(EXEEXT) \
- test-thread_self$(EXEEXT) test-thread_create$(EXEEXT) \ - test-thread_create$(EXEEXT) test-time$(EXEEXT) \
+ test-thread_self$(EXEEXT) \ + test-time$(EXEEXT) \
test-time$(EXEEXT) test-unistd$(EXEEXT) test-unsetenv$(EXEEXT) \ test-unistd$(EXEEXT) test-unsetenv$(EXEEXT) \
test-usleep$(EXEEXT) test-vasnprintf$(EXEEXT) \ test-usleep$(EXEEXT) test-vasnprintf$(EXEEXT) \
test-vasprintf$(EXEEXT) test-verify$(EXEEXT) test-verify.sh \ test-vasprintf$(EXEEXT) test-verify$(EXEEXT) test-verify.sh \
@@ -206,7 +206,7 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ @@ -212,7 +212,7 @@ check_PROGRAMS = test-accept$(EXEEXT) te
test-langinfo$(EXEEXT) test-limits-h$(EXEEXT) \ test-langinfo$(EXEEXT) test-limits-h$(EXEEXT) \
test-listen$(EXEEXT) test-locale$(EXEEXT) \ test-listen$(EXEEXT) test-locale$(EXEEXT) \
test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
- test-rwlock1$(EXEEXT) test-lock$(EXEEXT) test-once1$(EXEEXT) \ - test-rwlock1$(EXEEXT) test-lock$(EXEEXT) test-once1$(EXEEXT) \
+ test-lock$(EXEEXT) test-once1$(EXEEXT) \ + test-lock$(EXEEXT) test-once1$(EXEEXT) \
test-once2$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ test-once2$(EXEEXT) test-lstat$(EXEEXT) \
test-malloc-gnu$(EXEEXT) test-malloca$(EXEEXT) \
test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \ test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \
test-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \ @@ -248,7 +248,7 @@ check_PROGRAMS = test-accept$(EXEEXT) te
@@ -240,7 +240,7 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ test-sys_stat$(EXEEXT) test-sys_time$(EXEEXT) \
test-sys_socket$(EXEEXT) test-sys_stat$(EXEEXT) \ test-sys_types$(EXEEXT) test-sys_uio$(EXEEXT) \
test-sys_time$(EXEEXT) test-sys_types$(EXEEXT) \ test-sys_wait$(EXEEXT) test-thread_self$(EXEEXT) \
test-sys_uio$(EXEEXT) test-sys_wait$(EXEEXT) \ - test-thread_create$(EXEEXT) test-time$(EXEEXT) \
- test-thread_self$(EXEEXT) test-thread_create$(EXEEXT) \ + test-time$(EXEEXT) \
+ test-thread_self$(EXEEXT) \ test-unistd$(EXEEXT) test-unsetenv$(EXEEXT) \
test-time$(EXEEXT) test-unistd$(EXEEXT) test-unsetenv$(EXEEXT) \
test-usleep$(EXEEXT) test-vasnprintf$(EXEEXT) \ test-usleep$(EXEEXT) test-vasnprintf$(EXEEXT) \
test-vasprintf$(EXEEXT) test-verify$(EXEEXT) \ test-vasprintf$(EXEEXT) test-verify$(EXEEXT) \
@@ -875,9 +875,6 @@ test_regex_SOURCES = test-regex.c @@ -1023,9 +1023,6 @@ test_regex_SOURCES = test-regex.c
test_regex_OBJECTS = test-regex.$(OBJEXT) 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) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@ -48,7 +50,7 @@ index 3850f66..7b223a6 100644
test_safe_alloc_SOURCES = test-safe-alloc.c test_safe_alloc_SOURCES = test-safe-alloc.c
test_safe_alloc_OBJECTS = test-safe-alloc.$(OBJEXT) test_safe_alloc_OBJECTS = test-safe-alloc.$(OBJEXT)
test_safe_alloc_LDADD = $(LDADD) test_safe_alloc_LDADD = $(LDADD)
@@ -1099,9 +1096,6 @@ test_sys_wait_LDADD = $(LDADD) @@ -1247,9 +1244,6 @@ test_sys_wait_LDADD = $(LDADD)
test_sys_wait_DEPENDENCIES = libtests.a ../../gnulib/lib/libgnu.la \ test_sys_wait_DEPENDENCIES = libtests.a ../../gnulib/lib/libgnu.la \
libtests.a ../../gnulib/lib/libgnu.la libtests.a \ libtests.a ../../gnulib/lib/libgnu.la libtests.a \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@ -58,16 +60,16 @@ index 3850f66..7b223a6 100644
test_thread_self_SOURCES = test-thread_self.c test_thread_self_SOURCES = test-thread_self.c
test_thread_self_OBJECTS = test-thread_self.$(OBJEXT) test_thread_self_OBJECTS = test-thread_self.$(OBJEXT)
test_thread_self_DEPENDENCIES = $(am__DEPENDENCIES_2) test_thread_self_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1332,7 +1326,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ @@ -1486,7 +1480,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_
test-pathmax.c test-perror.c test-perror2.c test-pipe.c \ test-pthread-thread.c test-pthread_sigmask1.c \
test-pthread.c test-pthread-thread.c test-pthread_sigmask1.c \
test-pthread_sigmask2.c test-raise.c test-rawmemchr.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-realloc-gnu.c test-reallocarray.c \
+ test-readlink.c test-regex.c test-safe-alloc.c \ - test-regex.c test-rwlock1.c test-safe-alloc.c test-sched.c \
test-sched.c $(test_scratch_buffer_SOURCES) test-select.c \ + test-regex.c test-safe-alloc.c test-sched.c \
test-select-fd.c test-select-stdin.c test-setenv.c \ $(test_scratch_buffer_SOURCES) test-select.c test-select-fd.c \
test-setlocale1.c test-setlocale2.c test-setlocale_null.c \ test-select-stdin.c test-setenv.c test-setlocale1.c \
@@ -1345,7 +1339,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ test-setlocale2.c test-setlocale_null.c \
@@ -1499,7 +1493,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_
test-strstr.c test-symlink.c test-sys_ioctl.c \ test-strstr.c test-symlink.c test-sys_ioctl.c \
test-sys_random.c test-sys_select.c test-sys_socket.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_stat.c test-sys_time.c test-sys_types.c \
@ -76,16 +78,16 @@ index 3850f66..7b223a6 100644
test-thread_self.c test-time.c test-unistd.c test-unsetenv.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-usleep.c test-vasnprintf.c test-vasprintf.c test-verify.c \
test-verify-try.c test-wchar.c test-wcrtomb.c \ test-verify-try.c test-wchar.c test-wcrtomb.c \
@@ -1374,7 +1368,7 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ @@ -1531,7 +1525,7 @@ DIST_SOURCES = $(am__libtests_a_SOURCES_
test-pathmax.c test-perror.c test-perror2.c test-pipe.c \ test-pthread-thread.c test-pthread_sigmask1.c \
test-pthread.c test-pthread-thread.c test-pthread_sigmask1.c \
test-pthread_sigmask2.c test-raise.c test-rawmemchr.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-realloc-gnu.c test-reallocarray.c \
+ test-readlink.c test-regex.c test-safe-alloc.c \ - test-regex.c test-rwlock1.c test-safe-alloc.c test-sched.c \
test-sched.c $(test_scratch_buffer_SOURCES) test-select.c \ + test-regex.c test-safe-alloc.c test-sched.c \
test-select-fd.c test-select-stdin.c test-setenv.c \ $(test_scratch_buffer_SOURCES) test-select.c test-select-fd.c \
test-setlocale1.c test-setlocale2.c test-setlocale_null.c \ test-select-stdin.c test-setenv.c test-setlocale1.c \
@@ -1387,7 +1381,7 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ test-setlocale2.c test-setlocale_null.c \
@@ -1544,7 +1538,7 @@ DIST_SOURCES = $(am__libtests_a_SOURCES_
test-strstr.c test-symlink.c test-sys_ioctl.c \ test-strstr.c test-symlink.c test-sys_ioctl.c \
test-sys_random.c test-sys_select.c test-sys_socket.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_stat.c test-sys_time.c test-sys_types.c \
@ -94,25 +96,25 @@ index 3850f66..7b223a6 100644
test-thread_self.c test-time.c test-unistd.c test-unsetenv.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-usleep.c test-vasnprintf.c test-vasprintf.c test-verify.c \
test-verify-try.c test-wchar.c test-wcrtomb.c \ test-verify-try.c test-wchar.c test-wcrtomb.c \
@@ -2949,7 +2943,7 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ @@ -3144,7 +3138,7 @@ EXTRA_DIST = w32sock.h test-accept.c sig
test-listen.c signature.h macros.h test-localcharset.c \ test-listen.c signature.h macros.h test-localcharset.c \
test-locale.c test-localeconv.c signature.h macros.h \ test-locale.c test-localeconv.c signature.h macros.h \
localename-table.h localename.h test-localename.c 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-rwlock1.c test-lock.c test-once.c atomic-int-gnulib.h \
+ 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-lstat.h test-lstat.c signature.h macros.h \
test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \ test-malloc-gnu.c macros.h test-malloca.c test-mbrtowc1.sh \
test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc.c \ test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
@@ -3004,7 +2998,7 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ @@ -3196,7 +3190,7 @@ EXTRA_DIST = w32sock.h test-accept.c sig
test-sys_socket.c test-sys_stat.c sys_time.in.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_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-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 test-thread_create.c \
+ thread-optim.h test-thread_self.c \ + thread-optim.h test-thread_self.c \
macros.h test-time.c test-unistd.c unsetenv.c test-unsetenv.c \ macros.h test-time.c test-unistd.c test-unsetenv.c signature.h \
signature.h macros.h usleep.c test-usleep.c signature.h \ macros.h test-usleep.c signature.h macros.h test-vasnprintf.c \
macros.h test-vasnprintf.c macros.h test-vasprintf.c \ macros.h test-vasprintf.c signature.h macros.h test-verify.c \
@@ -3075,7 +3069,6 @@ test_inet_pton_LDADD = $(LDADD) @INET_PTON_LIB@ @@ -3287,7 +3281,6 @@ test_inet_pton_LDADD = $(LDADD) @INET_PT
test_listen_LDADD = $(LDADD) @LIBSOCKET@ test_listen_LDADD = $(LDADD) @LIBSOCKET@
test_localcharset_LDADD = $(LDADD) $(LIB_SETLOCALE) test_localcharset_LDADD = $(LDADD) $(LIB_SETLOCALE)
test_localename_LDADD = $(LDADD) $(LIB_SETLOCALE) @INTL_MACOSX_LIBS@ $(LIBTHREAD) test_localename_LDADD = $(LDADD) $(LIB_SETLOCALE) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
@ -120,7 +122,7 @@ index 3850f66..7b223a6 100644
test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ @LIB_SEMAPHORE@ test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ @LIB_SEMAPHORE@
test_once1_SOURCES = test-once.c test_once1_SOURCES = test-once.c
test_once1_LDADD = $(LDADD) @LIBTHREAD@ test_once1_LDADD = $(LDADD) @LIBTHREAD@
@@ -3130,7 +3123,6 @@ test_sockets_LDADD = $(LDADD) @LIBSOCKET@ @@ -3337,7 +3330,6 @@ test_sockets_LDADD = $(LDADD) @LIBSOCKET
test_stat_LDADD = $(LDADD) $(LIBINTL) test_stat_LDADD = $(LDADD) $(LIBINTL)
test_stat_time_LDADD = $(LDADD) $(LIB_NANOSLEEP) test_stat_time_LDADD = $(LDADD) $(LIB_NANOSLEEP)
test_thread_self_LDADD = $(LDADD) @LIBTHREAD@ test_thread_self_LDADD = $(LDADD) @LIBTHREAD@
@ -128,7 +130,7 @@ index 3850f66..7b223a6 100644
test_wcrtomb_LDADD = $(LDADD) $(LIB_SETLOCALE) test_wcrtomb_LDADD = $(LDADD) $(LIB_SETLOCALE)
all: $(BUILT_SOURCES) all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -3528,10 +3520,6 @@ test-regex$(EXEEXT): $(test_regex_OBJECTS) $(test_regex_DEPENDENCIES) $(EXTRA_te @@ -3763,10 +3755,6 @@ test-regex$(EXEEXT): $(test_regex_OBJECT
@rm -f test-regex$(EXEEXT) @rm -f test-regex$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_regex_OBJECTS) $(test_regex_LDADD) $(LIBS) $(AM_V_CCLD)$(LINK) $(test_regex_OBJECTS) $(test_regex_LDADD) $(LIBS)
@ -139,7 +141,7 @@ index 3850f66..7b223a6 100644
test-safe-alloc$(EXEEXT): $(test_safe_alloc_OBJECTS) $(test_safe_alloc_DEPENDENCIES) $(EXTRA_test_safe_alloc_DEPENDENCIES) test-safe-alloc$(EXEEXT): $(test_safe_alloc_OBJECTS) $(test_safe_alloc_DEPENDENCIES) $(EXTRA_test_safe_alloc_DEPENDENCIES)
@rm -f test-safe-alloc$(EXEEXT) @rm -f test-safe-alloc$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_safe_alloc_OBJECTS) $(test_safe_alloc_LDADD) $(LIBS) $(AM_V_CCLD)$(LINK) $(test_safe_alloc_OBJECTS) $(test_safe_alloc_LDADD) $(LIBS)
@@ -3700,10 +3688,6 @@ test-sys_wait$(EXEEXT): $(test_sys_wait_OBJECTS) $(test_sys_wait_DEPENDENCIES) $ @@ -3935,10 +3923,6 @@ test-sys_wait$(EXEEXT): $(test_sys_wait_
@rm -f test-sys_wait$(EXEEXT) @rm -f test-sys_wait$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_sys_wait_OBJECTS) $(test_sys_wait_LDADD) $(LIBS) $(AM_V_CCLD)$(LINK) $(test_sys_wait_OBJECTS) $(test_sys_wait_LDADD) $(LIBS)
@ -150,15 +152,15 @@ index 3850f66..7b223a6 100644
test-thread_self$(EXEEXT): $(test_thread_self_OBJECTS) $(test_thread_self_DEPENDENCIES) $(EXTRA_test_thread_self_DEPENDENCIES) test-thread_self$(EXEEXT): $(test_thread_self_OBJECTS) $(test_thread_self_DEPENDENCIES) $(EXTRA_test_thread_self_DEPENDENCIES)
@rm -f test-thread_self$(EXEEXT) @rm -f test-thread_self$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_thread_self_OBJECTS) $(test_thread_self_LDADD) $(LIBS) $(AM_V_CCLD)$(LINK) $(test_thread_self_OBJECTS) $(test_thread_self_LDADD) $(LIBS)
@@ -3884,7 +3868,6 @@ distclean-compile: @@ -4125,7 +4109,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-realloc-gnu.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-reallocarray.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-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-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-safe-alloc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sched.Po@am__quote@ # am--include-marker @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 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-scratch-buffer.Po@am__quote@ # am--include-marker
@@ -3927,7 +3910,6 @@ distclean-compile: @@ -4168,7 +4151,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_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_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-sys_wait.Po@am__quote@ # am--include-marker
@ -166,7 +168,7 @@ index 3850f66..7b223a6 100644
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_self.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-time.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unistd.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unistd.Po@am__quote@ # am--include-marker
@@ -4582,13 +4564,6 @@ test-localename.log: test-localename$(EXEEXT) @@ -4851,13 +4833,6 @@ test-localename.log: test-localename$(EX
--log-file $$b.log --trs-file $$b.trs \ --log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT) "$$tst" $(AM_TESTS_FD_REDIRECT)
@ -180,17 +182,17 @@ index 3850f66..7b223a6 100644
test-lock.log: test-lock$(EXEEXT) test-lock.log: test-lock$(EXEEXT)
@p='test-lock$(EXEEXT)'; \ @p='test-lock$(EXEEXT)'; \
b='test-lock'; \ b='test-lock'; \
@@ -5184,13 +5159,6 @@ test-thread_self.log: test-thread_self$(EXEEXT) @@ -5473,13 +5448,6 @@ test-thread_self.log: test-thread_self$(
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \ --log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ $(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) -test-thread_create.log: test-thread_create$(EXEEXT)
- @p='test-thread_create$(EXEEXT)'; \ - @p='test-thread_create$(EXEEXT)'; \
- b='test-thread_create'; \ - b='test-thread_create'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \ - --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - $(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) test-time.log: test-time$(EXEEXT)
@p='test-time$(EXEEXT)'; \ @p='test-time$(EXEEXT)'; \
b='test-time'; \

152
sysctl_parsing.patch
View File

@ -1,152 +0,0 @@
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>"