Le jeudi 26 novembre 2015 à 23:05 +0100, me...@dogguy.org a écrit : > On Mon, Nov 23, 2015 at 10:12:49AM +0000, SOUBEYRAND Yann - externe > <yann-externe.soubeyr...@edf.fr> wrote: > > I made a package for augeas containing a patch to fix bug #764699 > > (https://bugs.debian.org/764699) and I'm looking for a sponsor to upload > > it as the maintainer gave no news on this issue. > > > > There is an RC bug reported against the package (See #802665). > If you are considering NMUing the package, then the fix for #802665 should > be included as well. Can you please update the package including the fix > for the mentioned bug (and test it)? Then, I'd be willing to sponsor the > upload. > > Cheers.
I prepared a new package with the aforementioned patch included (http://mentors.debian.net/debian/pool/main/a/augeas/augeas_1.2.0-0.3.dsc). See below for the diff. Thanks for your feedback! Cheers Yann diff -Nru augeas-1.2.0/debian/changelog augeas-1.2.0/debian/changelog --- augeas-1.2.0/debian/changelog 2014-08-27 19:45:17.000000000 +0200 +++ augeas-1.2.0/debian/changelog 2015-11-27 14:43:43.000000000 +0100 @@ -1,3 +1,13 @@ +augeas (1.2.0-0.3) unstable; urgency=medium + + * Non-maintainer upload. + * Httpd lense: + - Allow EOL comments after section tags (thanks Dominic Cleal from Red + Hat for reporting the patch) (Closes: #802665) + - Include /etc/apache2/conf-available directory (Closes: #764699) + + -- Yann Soubeyrand <yann-externe.soubeyr...@edf.fr> Fri, 27 Nov 2015 10:00:36 +0100 + augeas (1.2.0-0.2) unstable; urgency=medium * Non-maintainer upload diff -Nru augeas-1.2.0/debian/patches/0003-Httpd-Allow-eol-comments-after-section-tags.patch augeas-1.2.0/debian/patches/0003-Httpd-Allow-eol-comments-after-section-tags.patch --- augeas-1.2.0/debian/patches/0003-Httpd-Allow-eol-comments-after-section-tags.patch 1970-01-01 01:00:00.000000000 +0100 +++ augeas-1.2.0/debian/patches/0003-Httpd-Allow-eol-comments-after-section-tags.patch 2015-11-27 10:41:06.000000000 +0100 @@ -0,0 +1,150 @@ +From 875b63ce9c0eaa72fc1451697b18c60ba50b8165 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pin...@camptocamp.com> +Date: Tue, 11 Mar 2014 17:41:35 +0100 +Subject: [PATCH] Httpd: Allow eol comments after section tags + +(cherry picked from commit 3af5c7d44c838b52bbdaf1beb8780fd6a471a77e) + +Httpd: Define an eol_comment in section to allow for \n before comment + +(cherry picked from commit fb749ea4d1ba4ecd95a5cec6aa7b20b010ef04a8) + +Httpd: Do not pass empty as body to section + +This causes a conflict with eol_comment over newlines. +`empty` is just a generic part of `section`, not really a body. + +(cherry picked from commit 97d3d931fefdfe816e6fb1d6e55a779742f255fa) + +Httpd: Make \ illegal in char_arg_dir + +Add tests to check non-recursive behaviour +of partial lenses + +Fix #223 + +(cherry picked from commit 3df041be9196a8ca0b7a3e8c90a47b800500cba1) + +Httpd: Properly manage eol after opening tag + +Allow comments and empty lines after opening tag. + +Fix #220 + +(cherry picked from commit 34980ae52bf4367664ad0551a15c2d1e5a3f2ac4) +--- + lenses/httpd.aug | 9 ++++--- + lenses/tests/test_httpd.aug | 62 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 68 insertions(+), 3 deletions(-) + +diff --git a/lenses/httpd.aug b/lenses/httpd.aug +index caea9b6..331d807 100644 +--- a/lenses/httpd.aug ++++ b/lenses/httpd.aug +@@ -59,7 +59,7 @@ let empty = Util.empty_dos + let indent = Util.indent + + (* borrowed from shellvars.aug *) +-let char_arg_dir = /[^ '"\t\r\n]|\\\\"|\\\\'/ ++let char_arg_dir = /[^\\ '"\t\r\n]|\\\\"|\\\\'/ + let char_arg_sec = /[^ '"\t\r\n>]|\\\\"|\\\\'/ + let dquot = /"([^"\\\r\n]|\\\\.)*"/ + let squot = /'([^'\\\r\n]|\\\\.)*'/ +@@ -77,13 +77,16 @@ let directive = [ indent . label "directive" . store word . + (sep_spc . argv arg_dir)? . eol ] + + let section (body:lens) = ++ (* opt_eol includes empty lines *) ++ let opt_eol = del /([ \t]*#?\r?\n)*/ "\n" in + let inner = (sep_spc . argv arg_sec)? . sep_osp . +- dels ">" . eol . body* . indent . dels "</" in ++ dels ">" . opt_eol . ((body|comment) . (body|empty|comment)*)? . ++ indent . dels "</" in + let kword = key word in + let dword = del word "a" in + [ indent . dels "<" . square kword inner dword . del ">" ">" . eol ] + +-let rec content = section (content|directive|comment|empty) ++let rec content = section (content|directive) + + let lns = (content|directive|comment|empty)* + +diff --git a/lenses/tests/test_httpd.aug b/lenses/tests/test_httpd.aug +index af6cdc1..bed6cc6 100644 +--- a/lenses/tests/test_httpd.aug ++++ b/lenses/tests/test_httpd.aug +@@ -1,5 +1,11 @@ + module Test_httpd = + ++(* Check that we can iterate on directive *) ++let _ = Httpd.directive+ ++ ++(* Check that we can do a non iterative section *) ++let _ = Httpd.section Httpd.directive ++ + (* directives testing *) + let d1 = "ServerRoot \"/etc/apache2\"\n" + test Httpd.directive get d1 = +@@ -339,3 +345,59 @@ test Httpd.lns get conf2 = + { } + } + ++(* Eol comment *) ++test Httpd.lns get "<a> # a comment ++MyDirective Foo ++</a>\n" = ++ { "a" ++ { "#comment" = "a comment" } ++ { "directive" = "MyDirective" { "arg" = "Foo" } } } ++ ++test Httpd.lns get "<a> ++# a comment ++</a>\n" = ++ { "a" { "#comment" = "a comment" } } ++ ++(* GH #220 *) ++let double_comment = "<IfDefine Foo> ++## ++## Comment ++## ++</IfDefine>\n" ++ ++test Httpd.lns get double_comment = ++ { "IfDefine" ++ { "arg" = "Foo" } ++ { "#comment" = "#" } ++ { "#comment" = "# Comment" } ++ { "#comment" = "#" } ++ } ++ ++let single_comment = "<IfDefine Foo> ++# ++## Comment ++## ++</IfDefine>\n" ++ ++test Httpd.lns get single_comment = ++ { "IfDefine" ++ { "arg" = "Foo" } ++ { "#comment" = "# Comment" } ++ { "#comment" = "#" } ++ } ++ ++let single_empty = "<IfDefine Foo> ++# ++ ++</IfDefine>\n" ++test Httpd.lns get single_empty = ++ { "IfDefine" ++ { "arg" = "Foo" } ++ } ++ ++let eol_empty = "<IfDefine Foo> # ++</IfDefine>\n" ++test Httpd.lns get eol_empty = ++ { "IfDefine" ++ { "arg" = "Foo" } ++ } +-- +2.4.3 + diff -Nru augeas-1.2.0/debian/patches/0004-Httpd-Include-conf-available-directory.patch augeas-1.2.0/debian/patches/0004-Httpd-Include-conf-available-directory.patch --- augeas-1.2.0/debian/patches/0004-Httpd-Include-conf-available-directory.patch 1970-01-01 01:00:00.000000000 +0100 +++ augeas-1.2.0/debian/patches/0004-Httpd-Include-conf-available-directory.patch 2015-11-27 14:42:44.000000000 +0100 @@ -0,0 +1,13 @@ +Description: Httpd: Include /etc/apache2/conf-available directory +Origin: upstream, https://github.com/hercules-team/augeas/commit/f99de5dfe072f20f4c2f7c79083c6ddd04aef26c +Bug-Debian: https://bugs.debian.org/764699 +--- a/lenses/httpd.aug ++++ b/lenses/httpd.aug +@@ -94,6 +94,7 @@ + (incl "/etc/apache2/httpd.conf") . + (incl "/etc/apache2/ports.conf") . + (incl "/etc/apache2/conf.d/*") . ++ (incl "/etc/apache2/conf-available/*") . + (incl "/etc/apache2/mods-available/*") . + (incl "/etc/apache2/sites-available/*") . + (incl "/etc/httpd/conf.d/*.conf") . diff -Nru augeas-1.2.0/debian/patches/series augeas-1.2.0/debian/patches/series --- augeas-1.2.0/debian/patches/series 2014-08-25 18:56:18.000000000 +0200 +++ augeas-1.2.0/debian/patches/series 2015-11-27 10:41:10.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-Httpd-Allow-eol-comments-after-section-tags.patch +0004-Httpd-Include-conf-available-directory.patch Ce message et toutes les pièces jointes (ci-après le 'Message') sont établis à l'intention exclusive des destinataires et les informations qui y figurent sont strictement confidentielles. Toute utilisation de ce Message non conforme à sa destination, toute diffusion ou toute publication totale ou partielle, est interdite sauf autorisation expresse. Si vous n'êtes pas le destinataire de ce Message, il vous est interdit de le copier, de le faire suivre, de le divulguer ou d'en utiliser tout ou partie. Si vous avez reçu ce Message par erreur, merci de le supprimer de votre système, ainsi que toutes ses copies, et de n'en garder aucune trace sur quelque support que ce soit. Nous vous remercions également d'en avertir immédiatement l'expéditeur par retour du message. Il est impossible de garantir que les communications par messagerie électronique arrivent en temps utile, sont sécurisées ou dénuées de toute erreur ou virus. ____________________________________________________ This message and any attachments (the 'Message') are intended solely for the addressees. The information contained in this Message is confidential. Any use of information contained in this Message not in accord with its purpose, any dissemination or disclosure, either whole or partial, is prohibited except formal approval. If you are not the addressee, you may not copy, forward, disclose or use any part of it. If you have received this message in error, please delete it and all copies from your system and notify the sender immediately by return message. E-mail communication cannot be guaranteed to be timely secure, error or virus-free.
