Bug 271199 - textproc/augeas: Update to version 1.14.0
Summary: textproc/augeas: Update to version 1.14.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: FreeBSD Puppet Team
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-05-02 12:49 UTC by linus.sundqvist
Modified: 2023-05-07 01:46 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (puppet)

Attachments
Augeas update to 1.14.0 (5.83 KB, patch)
2023-05-02 12:49 UTC, linus.sundqvist 		no flags Details | Diff
Augeas update to 1.14.0 fixed (5.81 KB, patch)
2023-05-02 18:18 UTC, linus.sundqvist 		no flags Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description linus.sundqvist 2023-05-02 12:49:00 UTC 
Created attachment 241925 [details]
Augeas update to 1.14.0

Version 1.14.0 was release December 7, 2022. It also seems that the project has changed their download URL from download.augeas.net to Github.

If something is wrong with the diff or Makefile, please tell me! I'm still learning!
Comment 2 linus.sundqvist 2023-05-02 15:18:30 UTC 
(In reply to Mina Galić from comment #1)
Thank you, I tried using USE_GITHUB but I can't seem to build the port then, not sure exactly why but when USE_GITHUB is used it downloads the "Source files" from the release 1.14.0, which does not include gnulib submodule.

Trying to add the submodule to the Makefile (GH_TUPLE=       coreutils:gnulib:2f7479a:gnulib) and moving it into WRKSRC gives some errors about missing files that are included when downloading the file directly with MASTER_SITES=  https://github.com/hercules-team/augeas/releases/download/release-${DISTVERSION}/

So I'm not sure How to use USE_GITHUB correctly since the file downloaded that way doesn't include gnulib and possible other files.

USE_GITHUB:
=> Attempting to fetch https://codeload.github.com/hercules-team/augeas/tar.gz/release-1.14.0?dummy=/hercules-team-augeas-release-1.14.0_GH0.tar.gz
vs. MASTER_SITES:
=> Attempting to fetch https://github.com/hercules-team/augeas/releases/download/release-1.14.0/augeas-1.14.0.tar.gz
Comment 3 Mina Galić freebsd_triage 2023-05-02 17:15:33 UTC 
then let's keep it at the thing that works
Comment 4 linus.sundqvist 2023-05-02 18:17:06 UTC 
Comment on attachment 241925 [details]
Augeas update to 1.14.0

>diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
>index b1249cb20..e231b78ae 100644
>--- a/textproc/augeas/Makefile
>+++ b/textproc/augeas/Makefile
>@@ -1,8 +1,7 @@
> PORTNAME=      augeas
>-PORTVERSION=	1.12.0
>-PORTREVISION=	3
>+DISTVERSION=	1.14.0
> CATEGORIES=	textproc
>-MASTER_SITES=	http://download.augeas.net/
>+MASTER_SITES=	https://github.com/hercules-team/augeas/releases/download/release-${DISTVERSION}/
>
> MAINTAINER=    puppet@FreeBSD.org
> COMMENT=       Configuration editing tool
>diff --git a/textproc/augeas/distinfo b/textproc/augeas/distinfo
>index c1eaacc73..dd0c8f9c1 100644
>--- a/textproc/augeas/distinfo
>+++ b/textproc/augeas/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1555260791
>-SHA256 (augeas-1.12.0.tar.gz) = 321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87
>-SIZE (augeas-1.12.0.tar.gz) = 2429279
>+TIMESTAMP = 1683030743
>+SHA256 (augeas-1.14.0.tar.gz) = 8c101759ca3d504bd1d805e70e2f615fa686af189dd7cf0529f71d855c087df1
>+SIZE (augeas-1.14.0.tar.gz) = 2651463
>diff --git a/textproc/augeas/pkg-plist b/textproc/augeas/pkg-plist
>index 97b07341a..44ed0cb57 100644
>--- a/textproc/augeas/pkg-plist
>+++ b/textproc/augeas/pkg-plist
>@@ -1,5 +1,6 @@
> bin/augmatch
> bin/augparse
>+bin/augprint
> bin/augtool
> bin/fadot
> include/augeas.h
>@@ -7,7 +8,7 @@ include/fa.h
> lib/libaugeas.a
> lib/libaugeas.so
> lib/libaugeas.so.0
>-lib/libaugeas.so.0.24.2
>+lib/libaugeas.so.0.25.0
> lib/libfa.a
> lib/libfa.so
> lib/libfa.so.1
>@@ -15,6 +16,7 @@ lib/libfa.so.1.5.3
> libdata/pkgconfig/augeas.pc
> man/man1/augmatch.1.gz
> man/man1/augparse.1.gz
>+man/man1/augprint.1.gz
> man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/access.aug
> %%DATADIR%%/lenses/dist/activemq_conf.aug
>@@ -29,7 +31,9 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/aptconf.aug
> %%DATADIR%%/lenses/dist/aptpreferences.aug
> %%DATADIR%%/lenses/dist/aptsources.aug
>+%%DATADIR%%/lenses/dist/authinfo2.aug
> %%DATADIR%%/lenses/dist/authorized_keys.aug
>+%%DATADIR%%/lenses/dist/authselectpam.aug
> %%DATADIR%%/lenses/dist/automaster.aug
> %%DATADIR%%/lenses/dist/automounter.aug
> %%DATADIR%%/lenses/dist/avahi.aug
>@@ -45,8 +49,10 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/channels.aug
> %%DATADIR%%/lenses/dist/chrony.aug
> %%DATADIR%%/lenses/dist/clamav.aug
>+%%DATADIR%%/lenses/dist/cmdline.aug
> %%DATADIR%%/lenses/dist/cobblermodules.aug
> %%DATADIR%%/lenses/dist/cobblersettings.aug
>+%%DATADIR%%/lenses/dist/cockpit.aug
> %%DATADIR%%/lenses/dist/collectd.aug
> %%DATADIR%%/lenses/dist/cpanel.aug
> %%DATADIR%%/lenses/dist/cron.aug
>@@ -71,6 +77,7 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/ethers.aug
> %%DATADIR%%/lenses/dist/exports.aug
> %%DATADIR%%/lenses/dist/fai_diskconfig.aug
>+%%DATADIR%%/lenses/dist/fail2ban.aug
> %%DATADIR%%/lenses/dist/fonts.aug
> %%DATADIR%%/lenses/dist/fstab.aug
> %%DATADIR%%/lenses/dist/fuse.aug
>@@ -202,6 +209,7 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/smbusers.aug
> %%DATADIR%%/lenses/dist/solaris_system.aug
> %%DATADIR%%/lenses/dist/soma.aug
>+%%DATADIR%%/lenses/dist/sos.aug
> %%DATADIR%%/lenses/dist/spacevars.aug
> %%DATADIR%%/lenses/dist/splunk.aug
> %%DATADIR%%/lenses/dist/squid.aug
>@@ -232,7 +240,9 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/tests/test_aptconf.aug
> %%DATADIR%%/lenses/dist/tests/test_aptpreferences.aug
> %%DATADIR%%/lenses/dist/tests/test_aptsources.aug
>+%%DATADIR%%/lenses/dist/tests/test_authinfo2.aug
> %%DATADIR%%/lenses/dist/tests/test_authorized_keys.aug
>+%%DATADIR%%/lenses/dist/tests/test_authselectpam.aug
> %%DATADIR%%/lenses/dist/tests/test_automaster.aug
> %%DATADIR%%/lenses/dist/tests/test_automounter.aug
> %%DATADIR%%/lenses/dist/tests/test_avahi.aug
>@@ -248,8 +258,10 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/tests/test_channels.aug
> %%DATADIR%%/lenses/dist/tests/test_chrony.aug
> %%DATADIR%%/lenses/dist/tests/test_clamav.aug
>+%%DATADIR%%/lenses/dist/tests/test_cmdline.aug
> %%DATADIR%%/lenses/dist/tests/test_cobblermodules.aug
> %%DATADIR%%/lenses/dist/tests/test_cobblersettings.aug
>+%%DATADIR%%/lenses/dist/tests/test_cockpit.aug
> %%DATADIR%%/lenses/dist/tests/test_collectd.aug
> %%DATADIR%%/lenses/dist/tests/test_cpanel.aug
> %%DATADIR%%/lenses/dist/tests/test_cron.aug
>@@ -274,6 +286,7 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/tests/test_ethers.aug
> %%DATADIR%%/lenses/dist/tests/test_exports.aug
> %%DATADIR%%/lenses/dist/tests/test_fai_diskconfig.aug
>+%%DATADIR%%/lenses/dist/tests/test_fail2ban.aug
> %%DATADIR%%/lenses/dist/tests/test_fonts.aug
> %%DATADIR%%/lenses/dist/tests/test_fstab.aug
> %%DATADIR%%/lenses/dist/tests/test_fuse.aug
>@@ -405,6 +418,7 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/tests/test_smbusers.aug
> %%DATADIR%%/lenses/dist/tests/test_solaris_system.aug
> %%DATADIR%%/lenses/dist/tests/test_soma.aug
>+%%DATADIR%%/lenses/dist/tests/test_sos.aug
> %%DATADIR%%/lenses/dist/tests/test_spacevars.aug
> %%DATADIR%%/lenses/dist/tests/test_splunk.aug
> %%DATADIR%%/lenses/dist/tests/test_squid.aug
>@@ -423,6 +437,7 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/tests/test_systemd.aug
> %%DATADIR%%/lenses/dist/tests/test_termcap.aug
> %%DATADIR%%/lenses/dist/tests/test_thttpd.aug
>+%%DATADIR%%/lenses/dist/tests/test_tinc.aug
> %%DATADIR%%/lenses/dist/tests/test_tmpfiles.aug
> %%DATADIR%%/lenses/dist/tests/test_toml.aug
> %%DATADIR%%/lenses/dist/tests/test_trapperkeeper.aug
>@@ -444,6 +459,7 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/tests/test_yaml.aug
> %%DATADIR%%/lenses/dist/tests/test_yum.aug
> %%DATADIR%%/lenses/dist/thttpd.aug
>+%%DATADIR%%/lenses/dist/tinc.aug
> %%DATADIR%%/lenses/dist/tmpfiles.aug
> %%DATADIR%%/lenses/dist/toml.aug
> %%DATADIR%%/lenses/dist/trapperkeeper.aug
>@@ -464,5 +480,8 @@ man/man1/augtool.1.gz
> %%DATADIR%%/lenses/dist/xymon_alerting.aug
> %%DATADIR%%/lenses/dist/yaml.aug
> %%DATADIR%%/lenses/dist/yum.aug
>+share/bash-completion/completions/augmatch
>+share/bash-completion/completions/augprint
>+share/bash-completion/completions/augtool
> share/vim/vimfiles/ftdetect/augeas.vim
> share/vim/vimfiles/syntax/augeas.vim
Comment 5 linus.sundqvist 2023-05-02 18:18:57 UTC 
Created attachment 241936 [details]
Augeas update to 1.14.0 fixed

Some tabs became spaces when I uploaded the first file. This file applies cleanly.
Comment 6 Romain Tartière freebsd_committer freebsd_triage 2023-05-07 01:17:22 UTC 
I'm on it!
Comment 7 commit-hook freebsd_committer freebsd_triage 2023-05-07 01:44:43 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=195f3a08b3187a576fac0fe5d2498f3075e52fb2

commit 195f3a08b3187a576fac0fe5d2498f3075e52fb2
Author:     Linus Sundqvist <linus.sundqvist@loopia.se>
AuthorDate: 2023-05-07 01:15:29 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2023-05-07 01:43:37 +0000

    textproc/augeas: Update to 1.14.0

    News:
    https://github.com/hercules-team/augeas/blob/master/NEWS

    PR:             271199
    With hat:       puppet

 textproc/augeas/Makefile  |  5 ++---
 textproc/augeas/distinfo  |  6 +++---
 textproc/augeas/pkg-plist | 21 ++++++++++++++++++++-
 3 files changed, 25 insertions(+), 7 deletions(-)
Comment 8 Romain Tartière freebsd_committer freebsd_triage 2023-05-07 01:46:03 UTC 
Committed, thanks!