Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Dear release team, I would like to upload augeas/1.7.0-1 (1.7.0-0.1 is in testing) and am seeking pre-approval. I am not worried about the two bugfix patches I added, but I have also added Multi-Arch headers to the binary packages as requested in #715554. Cheers, -Hilko
diff -Nru augeas-1.7.0/debian/changelog augeas-1.7.0/debian/changelog --- augeas-1.7.0/debian/changelog 2017-01-19 23:09:49.000000000 +0100 +++ augeas-1.7.0/debian/changelog 2017-03-18 21:25:44.000000000 +0100 @@ -1,3 +1,13 @@ +augeas (1.7.0-1) unstable; urgency=medium + + * Adopting package + * Update Maintainer, Uploaders fields, with permission from previous + maintainer + * Add Multi-Arch support (Closes: #715554) + * Add fixes to NRPE (Closes: #749919) and krb5 (Closes: #822765) parsers + + -- Hilko Bengen <ben...@debian.org> Sat, 18 Mar 2017 21:25:44 +0100 + augeas (1.7.0-0.1) unstable; urgency=medium * Non-maintainer upload diff -Nru augeas-1.7.0/debian/control augeas-1.7.0/debian/control --- augeas-1.7.0/debian/control 2017-01-19 23:09:30.000000000 +0100 +++ augeas-1.7.0/debian/control 2017-03-18 21:25:44.000000000 +0100 @@ -1,7 +1,9 @@ Source: augeas Priority: optional -Maintainer: Nicolas Valcárcel Scerpella <nvalcar...@gmail.com> -Uploaders: Free Ekanayaka <fr...@debian.org>, Micah Anderson <mi...@debian.org> +Maintainer: Hilko Bengen <ben...@debian.org> +Uploaders: + Marc Haber <zugsch...@debian.org>, + Micah Anderson <mi...@debian.org> Build-Depends: debhelper (>= 9), dh-autoreconf, libreadline-dev, libselinux1-dev [linux-any], @@ -12,13 +14,13 @@ Standards-Version: 3.9.8 Section: libs Homepage: http://augeas.net/ -DM-Upload-Allowed: yes Vcs-Git: git://anonscm.debian.org/collab-maint/augeas.git Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/augeas.git Package: augeas-tools Section: admin Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Description: Augeas command line tools Augeas is a configuration editing tool. It parses configuration files in their @@ -32,6 +34,7 @@ Package: libaugeas-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libaugeas0 (= ${binary:Version}), libxml2-dev, ${shlibs:Depends}, ${misc:Depends} Description: Development files for writing applications based on libaugeas0 @@ -45,6 +48,7 @@ Package: libaugeas0 Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, augeas-lenses Suggests: augeas-tools Description: Augeas configuration editing library and API @@ -60,6 +64,7 @@ Section: debug Priority: extra Architecture: any +Multi-Arch: same Depends: libaugeas0 (= ${binary:Version}), augeas-tools (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for libaugeas0 @@ -76,6 +81,7 @@ Depends: ${misc:Depends} Suggests: augeas-doc Architecture: all +Multi-Arch: foreign Description: Set of lenses needed by libaugeas0 to parse config files Augeas parses configuration files described in lenses into a tree structure, which it exposes through its public API. Changes made through the API are @@ -94,6 +100,7 @@ Section: doc Depends: ${misc:Depends} Architecture: all +Multi-Arch: foreign Description: Augeas lenses documentation Augeas parses configuration files described in lenses into a tree structure, which it exposes through its public API. Changes made through the API are diff -Nru augeas-1.7.0/debian/patches/0003-Make-NRPE-lens-less-strict.patch augeas-1.7.0/debian/patches/0003-Make-NRPE-lens-less-strict.patch --- augeas-1.7.0/debian/patches/0003-Make-NRPE-lens-less-strict.patch 1970-01-01 01:00:00.000000000 +0100 +++ augeas-1.7.0/debian/patches/0003-Make-NRPE-lens-less-strict.patch 2017-03-18 21:25:44.000000000 +0100 @@ -0,0 +1,55 @@ +From: Hilko Bengen <ben...@debian.org> +Date: Sat, 18 Mar 2017 21:06:52 +0100 +Subject: Make NRPE lens less strict + +--- + lenses/nrpe.aug | 4 +++- + lenses/tests/test_nrpe.aug | 13 +++++++++++++ + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/lenses/nrpe.aug b/lenses/nrpe.aug +index c8b0fb4..dedacea 100644 +--- a/lenses/nrpe.aug ++++ b/lenses/nrpe.aug +@@ -18,6 +18,8 @@ let eq = Sep.equal + (* View: word *) + let word = /[^=\n\t ]+/ + ++let words = word . ( / +/ . word )* ++ + (* View: item_re *) + let item_re = /[^#=\n\t\/ ]+/ - (/command\[[^]\/\n]+\]/ | "include" | "include_dir") + +@@ -41,7 +43,7 @@ let command = + + > allow_bash_command_substitution=0 + *) +-let item = [ key item_re . eq . store word . eol ] ++let item = [ key item_re . eq . store words . eol ] + + (* View: include + An include entry. +diff --git a/lenses/tests/test_nrpe.aug b/lenses/tests/test_nrpe.aug +index 8bfe475..e86a241 100644 +--- a/lenses/tests/test_nrpe.aug ++++ b/lenses/tests/test_nrpe.aug +@@ -34,6 +34,19 @@ module Test_nrpe = + { } + + ++ (* Debian bug #749919 *) ++ let allowed_hosts_1 = "allowed_hosts=127.0.0.1\n" ++ ++ test Nrpe.item get allowed_hosts_1 = ++ { "allowed_hosts" = "127.0.0.1" } ++ ++ ++ let allowed_hosts_2 = "allowed_hosts=127.0.0.1, 127.0.0.2\n" ++ ++ test Nrpe.item get allowed_hosts_2 = ++ { "allowed_hosts" = "127.0.0.1, 127.0.0.2" } ++ ++ + let lns = " + # + # server address: diff -Nru augeas-1.7.0/debian/patches/0004-krb5.aug-Support-realms-that-start-with-numbers-437.patch augeas-1.7.0/debian/patches/0004-krb5.aug-Support-realms-that-start-with-numbers-437.patch --- augeas-1.7.0/debian/patches/0004-krb5.aug-Support-realms-that-start-with-numbers-437.patch 1970-01-01 01:00:00.000000000 +0100 +++ augeas-1.7.0/debian/patches/0004-krb5.aug-Support-realms-that-start-with-numbers-437.patch 2017-03-18 21:25:44.000000000 +0100 @@ -0,0 +1,57 @@ +From: Dustin Wheeler <mdwhe...@ncsu.edu> +Date: Mon, 6 Feb 2017 08:57:49 -0500 +Subject: [krb5.aug] Support realms that start with numbers (#437) + +Currently, the default kerberos configuration that ships with +Ubuntu has a realm that starts with a number (1TS.ORG). This +causes the parser to fail and prevents krb5.conf from being +available via augtool. + +This patch allows numbers 0-9 as the first character of a +realm. +--- + lenses/krb5.aug | 4 ++-- + lenses/tests/test_krb5.aug | 8 ++++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/lenses/krb5.aug b/lenses/krb5.aug +index 37778fd..33f18da 100644 +--- a/lenses/krb5.aug ++++ b/lenses/krb5.aug +@@ -21,8 +21,8 @@ let closebr = del /[ \t]*\}/ "}" + and realms in the [appdefaults] section. + *) + +-let realm_re = /[A-Z][.a-zA-Z0-9-]*/ +-let realm_anycase_re = /[A-Za-z][.a-zA-Z0-9-]*/ ++let realm_re = /[A-Z0-9][.a-zA-Z0-9-]*/ ++let realm_anycase_re = /[A-Za-z0-9][.a-zA-Z0-9-]*/ + let app_re = /[a-z][a-zA-Z0-9_]*/ + let name_re = /[.a-zA-Z0-9_-]+/ + +diff --git a/lenses/tests/test_krb5.aug b/lenses/tests/test_krb5.aug +index e17a659..e89c1fd 100644 +--- a/lenses/tests/test_krb5.aug ++++ b/lenses/tests/test_krb5.aug +@@ -92,6 +92,10 @@ module Test_krb5 = + } + } + } ++ 1TS.ORG = { ++ kdc = kerberos.1ts.org ++ admin_server = kerberos.1ts.org ++ } + stanford.edu = { + kdc = krb5auth1.stanford.edu + kdc = krb5auth2.stanford.edu +@@ -367,6 +371,10 @@ test Krb5.lns get fermi_str = + } + } + } ++ { "realm" = "1TS.ORG" ++ { "kdc" = "kerberos.1ts.org" } ++ { "admin_server" = "kerberos.1ts.org" } ++ } + { "realm" = "stanford.edu" + { "kdc" = "krb5auth1.stanford.edu" } + { "kdc" = "krb5auth2.stanford.edu" } diff -Nru augeas-1.7.0/debian/patches/series augeas-1.7.0/debian/patches/series --- augeas-1.7.0/debian/patches/series 2017-01-19 23:06:23.000000000 +0100 +++ augeas-1.7.0/debian/patches/series 2017-03-18 21:25:44.000000000 +0100 @@ -1,2 +1,4 @@ 0001-Install-vim-addons-into-correct-directory.patch 0002-Skip-tests-that-need-root-privileges-when-fakeroot-h.patch +0003-Make-NRPE-lens-less-strict.patch +0004-krb5.aug-Support-realms-that-start-with-numbers-437.patch
