From 104273aa5541ee0805106ec02ed39a23eb2ba816 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 6 Jul 2021 17:11:37 +0100 Subject: [PATCH] Package up a git pre-release of 1.12.1 or 1.13.0. --- ...00c2a6b7aade2ad520cb3a2378381e373a62.patch | 251 ------------------ augeas.spec | 32 ++- sources | 2 +- 3 files changed, 24 insertions(+), 261 deletions(-) delete mode 100644 739100c2a6b7aade2ad520cb3a2378381e373a62.patch diff --git a/739100c2a6b7aade2ad520cb3a2378381e373a62.patch b/739100c2a6b7aade2ad520cb3a2378381e373a62.patch deleted file mode 100644 index 48821ea..0000000 --- a/739100c2a6b7aade2ad520cb3a2378381e373a62.patch +++ /dev/null @@ -1,251 +0,0 @@ -From 739100c2a6b7aade2ad520cb3a2378381e373a62 Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar -Date: Thu, 15 Oct 2020 16:16:29 +0200 -Subject: [PATCH] Chrony: add new options - -Add new directives and options supported in chrony since 3.3 up to 4.0, -with the exception of the ntsport options, which conflicts with the nts -option. ---- - lenses/chrony.aug | 32 +++++++++++++++----- - lenses/tests/test_chrony.aug | 58 +++++++++++++++++++++++++++++++++++- - 2 files changed, 81 insertions(+), 9 deletions(-) - -diff --git a/lenses/chrony.aug b/lenses/chrony.aug -index 9ce177bb..91c8ed51 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 9011cafa..0c86cde7 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.spec b/augeas.spec index 5f0b3c3..eb02f38 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,21 +1,32 @@ +# Upstream releases have been very infrequent but there is still +# development going on, so for now (July 2021) package up the latest +# git version. +%global commit 18558bbeaeee7f6bed5dba64592aa8b23fa521ee +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: augeas -Version: 1.12.0 -Release: 6%{?dist} +Version: 1.12.1 +Release: 0.1.git%{shortcommit}%{?dist} Summary: A library for changing configuration files License: LGPLv2+ URL: http://augeas.net/ -Source0: http://download.augeas.net/%{name}-%{version}.tar.gz - -# Upstream patch to parse chrony configuration. -# https://bugzilla.redhat.com/show_bug.cgi?id=1949838 -Patch1: 739100c2a6b7aade2ad520cb3a2378381e373a62.patch +# Upstream tarballs. +#Source0: http://download.augeas.net/%%{name}-%%{version}.tar.gz +# Upstream git repo. +#Source0: https://github.com/hercules-team/augeas/archive/%%{commit}/%%{name}-%%{shortcommit}.tar.gz +# However because of gnulib stupidity we can't use either with +# pre-releases. Instead I had to build a tarball from the prerelease +# commit: +Source0: augeas-18558bb.tar.gz Provides: bundled(gnulib) BuildRequires: make BuildRequires: gcc -BuildRequires: readline-devel libselinux-devel libxml2-devel +BuildRequires: readline-devel +BuildRequires: libselinux-devel +BuildRequires: libxml2-devel Requires: %{name}-libs = %{version}-%{release} @@ -61,7 +72,7 @@ static builds using %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-1.12.0 %build %configure \ @@ -125,6 +136,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump %{_libdir}/libfa.a %changelog +* Tue Jul 06 2021 Richard W.M. Jones - 1.12.1-0.1 +- Package up a git pre-release of 1.12.1 or 1.13.0. + * Thu Apr 15 2021 Richard W.M. Jones - 1.12.0-6 - Add upstream patch to parse chrony configuration. - Use %%autosetup. diff --git a/sources b/sources index 960a902..dad857e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (augeas-1.12.0.tar.gz) = 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40 +SHA512 (augeas-18558bb.tar.gz) = bd3a51a2f350664565a32deaeec43f037c5a512ba16189571da9a0c8762156cc2481e59bd3fac824444b831473e78a667216094963be3ce2d3aa4c707ccfb437