Although bit of a jump with lots of changelog, this update is straight
forward with no dynamic export changes according to
/usr/src/lib/check_sym in either of the shared libraries; all patches
still apply (with offset), one got merged upstream.
The update includes a fix for the syslog lense which currently chokes on
certain comments in syslog.conf(5); from ChangeLog:
2018-11-30 Axel Arnold <[email protected]>
Xorg: Accept empty values for options
Rsyslog: In rsyslog, bsd-like #!/+/- are just comments without
special meaning
I hit this bug with https://forge.puppet.com/herculesteam/augeasproviders_syslog
and our default /etc/syslog.conf which contains a "#!doas" line.
Cranking augeas fixes the lense so the the provider in puppet works and
I can now manage entries without managing the entire file.
Run-tested like this on sparc64 and amd64 through ruby26-augeas-0.5.0p6,
`make regress' seems happy enough amd64:
============================================================================
Testsuite summary for augeas 1.12.0
============================================================================
# TOTAL: 253
# PASS: 245
# SKIP: 4
# XFAIL: 0
# FAIL: 4
# XPASS: 0
# ERROR: 0
============================================================================
See tests/test-suite.log
============================================================================
Given the lack of interest in augeas (according to [missing] CVS log)
I'll commit this in a few days unless there are objections.
Feedback? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/augeas/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 16 Jul 2019 21:29:41 -0000 1.45
+++ Makefile 8 Oct 2020 20:10:51 -0000
@@ -2,12 +2,11 @@
COMMENT= configuration editing tool and API
-DISTNAME= augeas-1.10.1
-REVISION= 2
+DISTNAME= augeas-1.12.0
CATEGORIES= sysutils devel
-SHARED_LIBS += augeas 0.2 # 22.0
+SHARED_LIBS += augeas 0.2 # 24.0
SHARED_LIBS += fa 0.0 # 5.4
HOMEPAGE= http://augeas.net/
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/augeas/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 5 Feb 2018 16:29:47 -0000 1.12
+++ distinfo 8 Oct 2020 19:44:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (augeas-1.10.1.tar.gz) = UtslavqyYdMcwUfqoacXlaX+xZ6Ijf0LZahMeqzWNk0=
-SIZE (augeas-1.10.1.tar.gz) = 2289207
+SHA256 (augeas-1.12.0.tar.gz) = MhlCycwyGF4unLctCnDuoQZjW1AmkHWspnFOPsKCy4c=
+SIZE (augeas-1.12.0.tar.gz) = 2429279
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/sysutils/augeas/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 17 Nov 2018 09:28:25 -0000 1.3
+++ patches/patch-configure 8 Oct 2020 19:44:41 -0000
@@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.3 2018/11/
Index: configure
--- configure.orig
+++ configure
-@@ -15475,7 +15475,7 @@ fi
+@@ -15635,7 +15635,7 @@ fi
warnCFLAGS=
Index: patches/patch-examples_dump_c
===================================================================
RCS file: /cvs/ports/sysutils/augeas/patches/patch-examples_dump_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-examples_dump_c
--- patches/patch-examples_dump_c 1 Nov 2018 08:39:04 -0000 1.1
+++ patches/patch-examples_dump_c 8 Oct 2020 19:44:41 -0000
@@ -5,7 +5,7 @@ $OpenBSD: patch-examples_dump_c,v 1.1 20
Index: examples/dump.c
--- examples/dump.c.orig
+++ examples/dump.c
-@@ -121,7 +121,7 @@ static void print_time_taken(const struct timeval *sta
+@@ -119,7 +119,7 @@ static void print_time_taken(const struct timeval *sta
const struct timeval *stop) {
time_t elapsed = (stop->tv_sec - start->tv_sec)*1000
+ (stop->tv_usec - start->tv_usec)/1000;
Index: patches/patch-lenses_shellvars_aug
===================================================================
RCS file: /cvs/ports/sysutils/augeas/patches/patch-lenses_shellvars_aug,v
retrieving revision 1.13
diff -u -p -r1.13 patch-lenses_shellvars_aug
--- patches/patch-lenses_shellvars_aug 8 Oct 2017 08:19:25 -0000 1.13
+++ patches/patch-lenses_shellvars_aug 8 Oct 2020 19:44:41 -0000
@@ -6,7 +6,7 @@ $OpenBSD: patch-lenses_shellvars_aug,v 1
Index: lenses/shellvars.aug
--- lenses/shellvars.aug.orig
+++ lenses/shellvars.aug
-@@ -298,7 +298,6 @@ module Shellvars =
+@@ -304,7 +304,6 @@ module Shellvars =
. incl "/etc/environment"
. incl "/etc/firewalld/firewalld.conf"
. incl "/etc/blkid.conf"
@@ -14,7 +14,7 @@ Index: lenses/shellvars.aug
. incl "/etc/cowpoke.conf"
. incl "/etc/cvs-cron.conf"
. incl "/etc/cvs-pserver.conf"
-@@ -310,9 +309,7 @@ module Shellvars =
+@@ -316,9 +315,7 @@ module Shellvars =
. incl "/etc/os-release"
. incl "/etc/periodic.conf"
. incl "/etc/popularity-contest.conf"
Index: patches/patch-man_augparse_1
===================================================================
RCS file: /cvs/ports/sysutils/augeas/patches/patch-man_augparse_1,v
retrieving revision 1.4
diff -u -p -r1.4 patch-man_augparse_1
--- patches/patch-man_augparse_1 27 Nov 2016 12:28:16 -0000 1.4
+++ patches/patch-man_augparse_1 8 Oct 2020 19:44:41 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-man_augparse_1,v 1.4 2016/11/27 12:28:16 jasper Exp $
---- man/augparse.1.orig Sun Oct 2 22:18:19 2016
-+++ man/augparse.1 Sun Nov 27 12:40:16 2016
-@@ -149,7 +149,7 @@ Execute an Augeas module, most commonly to evaluate th
+Index: man/augparse.1
+--- man/augparse.1.orig
++++ man/augparse.1
+@@ -153,7 +153,7 @@ Execute an Augeas module, most commonly to evaluate th
Add \s-1DIR\s0 to the module loadpath. Can be given multiple times. The
directories set here are searched before any directories specified in the
\&\s-1AUGEAS_LENS_LIB\s0 environment variable, and before the default
directory
Index: patches/patch-src_augmatch_c
===================================================================
RCS file: patches/patch-src_augmatch_c
diff -N patches/patch-src_augmatch_c
--- patches/patch-src_augmatch_c 5 Feb 2018 16:29:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_augmatch_c,v 1.1 2018/02/05 16:29:47 jasper Exp $
-
-augmatch.c:316:16: warning: implicit declaration of function 'basename' is
invalid in C99 [-Wimplicit-function-declaration]
-
-Index: src/augmatch.c
---- src/augmatch.c.orig
-+++ src/augmatch.c
-@@ -25,6 +25,7 @@
- #include <getopt.h>
- #include <stdbool.h>
- #include <ctype.h>
-+#include <libgen.h>
-
- #include "memory.h"
- #include "augeas.h"
Index: patches/patch-src_augtool_c
===================================================================
RCS file: /cvs/ports/sysutils/augeas/patches/patch-src_augtool_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_augtool_c
--- patches/patch-src_augtool_c 5 Feb 2018 16:29:47 -0000 1.1
+++ patches/patch-src_augtool_c 8 Oct 2020 19:44:41 -0000
@@ -5,7 +5,7 @@ augtool.c:450:30: warning: format specif
Index: src/augtool.c
--- src/augtool.c.orig
+++ src/augtool.c
-@@ -447,7 +447,7 @@ static void print_time_taken(const struct timeval *sta
+@@ -454,7 +454,7 @@ static void print_time_taken(const struct timeval *sta
const struct timeval *stop) {
time_t elapsed = (stop->tv_sec - start->tv_sec)*1000
+ (stop->tv_usec - start->tv_usec)/1000;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/augeas/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 5 Feb 2018 16:29:47 -0000 1.13
+++ pkg/PLIST 8 Oct 2020 19:55:42 -0000
@@ -6,10 +6,10 @@
include/augeas.h
include/fa.h
@comment lib/charset.alias
-lib/libaugeas.a
+@static-lib lib/libaugeas.a
lib/libaugeas.la
@lib lib/libaugeas.so.${LIBaugeas_VERSION}
-lib/libfa.a
+@static-lib lib/libfa.a
lib/libfa.la
@lib lib/libfa.so.${LIBfa_VERSION}
lib/pkgconfig/augeas.pc
@@ -24,6 +24,7 @@ share/augeas/lenses/dist/activemq_conf.a
share/augeas/lenses/dist/activemq_xml.aug
share/augeas/lenses/dist/afs_cellalias.aug
share/augeas/lenses/dist/aliases.aug
+share/augeas/lenses/dist/anaconda.aug
share/augeas/lenses/dist/anacron.aug
share/augeas/lenses/dist/approx.aug
share/augeas/lenses/dist/apt_update_manager.aug
@@ -60,6 +61,7 @@ share/augeas/lenses/dist/cyrus_imapd.aug
share/augeas/lenses/dist/darkice.aug
share/augeas/lenses/dist/debctrl.aug
share/augeas/lenses/dist/desktop.aug
+share/augeas/lenses/dist/devfsrules.aug
share/augeas/lenses/dist/device_map.aug
share/augeas/lenses/dist/dhclient.aug
share/augeas/lenses/dist/dhcpd.aug
@@ -189,6 +191,7 @@ share/augeas/lenses/dist/rx.aug
share/augeas/lenses/dist/samba.aug
share/augeas/lenses/dist/schroot.aug
share/augeas/lenses/dist/securetty.aug
+share/augeas/lenses/dist/semanage.aug
share/augeas/lenses/dist/sep.aug
share/augeas/lenses/dist/services.aug
share/augeas/lenses/dist/shadow.aug
@@ -209,6 +212,7 @@ share/augeas/lenses/dist/ssh.aug
share/augeas/lenses/dist/sshd.aug
share/augeas/lenses/dist/sssd.aug
share/augeas/lenses/dist/star.aug
+share/augeas/lenses/dist/strongswan.aug
share/augeas/lenses/dist/stunnel.aug
share/augeas/lenses/dist/subversion.aug
share/augeas/lenses/dist/sudoers.aug
@@ -224,6 +228,7 @@ share/augeas/lenses/dist/tests/test_acti
share/augeas/lenses/dist/tests/test_activemq_xml.aug
share/augeas/lenses/dist/tests/test_afs_cellalias.aug
share/augeas/lenses/dist/tests/test_aliases.aug
+share/augeas/lenses/dist/tests/test_anaconda.aug
share/augeas/lenses/dist/tests/test_anacron.aug
share/augeas/lenses/dist/tests/test_approx.aug
share/augeas/lenses/dist/tests/test_apt_update_manager.aug
@@ -260,6 +265,7 @@ share/augeas/lenses/dist/tests/test_cyru
share/augeas/lenses/dist/tests/test_darkice.aug
share/augeas/lenses/dist/tests/test_debctrl.aug
share/augeas/lenses/dist/tests/test_desktop.aug
+share/augeas/lenses/dist/tests/test_devfsrules.aug
share/augeas/lenses/dist/tests/test_device_map.aug
share/augeas/lenses/dist/tests/test_dhclient.aug
share/augeas/lenses/dist/tests/test_dhcpd.aug
@@ -390,6 +396,7 @@ share/augeas/lenses/dist/tests/test_rx.a
share/augeas/lenses/dist/tests/test_samba.aug
share/augeas/lenses/dist/tests/test_schroot.aug
share/augeas/lenses/dist/tests/test_securetty.aug
+share/augeas/lenses/dist/tests/test_semanage.aug
share/augeas/lenses/dist/tests/test_services.aug
share/augeas/lenses/dist/tests/test_shadow.aug
share/augeas/lenses/dist/tests/test_shells.aug
@@ -409,6 +416,7 @@ share/augeas/lenses/dist/tests/test_ssh.
share/augeas/lenses/dist/tests/test_sshd.aug
share/augeas/lenses/dist/tests/test_sssd.aug
share/augeas/lenses/dist/tests/test_star.aug
+share/augeas/lenses/dist/tests/test_strongswan.aug
share/augeas/lenses/dist/tests/test_stunnel.aug
share/augeas/lenses/dist/tests/test_subversion.aug
share/augeas/lenses/dist/tests/test_sudoers.aug
@@ -420,6 +428,7 @@ share/augeas/lenses/dist/tests/test_syst
share/augeas/lenses/dist/tests/test_termcap.aug
share/augeas/lenses/dist/tests/test_thttpd.aug
share/augeas/lenses/dist/tests/test_tmpfiles.aug
+share/augeas/lenses/dist/tests/test_toml.aug
share/augeas/lenses/dist/tests/test_trapperkeeper.aug
share/augeas/lenses/dist/tests/test_tuned.aug
share/augeas/lenses/dist/tests/test_up2date.aug
@@ -440,6 +449,7 @@ share/augeas/lenses/dist/tests/test_yaml
share/augeas/lenses/dist/tests/test_yum.aug
share/augeas/lenses/dist/thttpd.aug
share/augeas/lenses/dist/tmpfiles.aug
+share/augeas/lenses/dist/toml.aug
share/augeas/lenses/dist/trapperkeeper.aug
share/augeas/lenses/dist/tuned.aug
share/augeas/lenses/dist/up2date.aug
