Bug#806129: jessie-pu: package augeas/1.2.0-0.2+deb8u1

[SOUBEYRAND Yann - externe]

Le mardi 05 janvier 2016 à 00:10 +0100, me...@dogguy.org a écrit :
> Hi,
> 
> On 04/01/2016 11:57, SOUBEYRAND Yann - externe wrote:
> > 
> > Thank you for the review of the package.
> > 
> > FYI I've open a RFS to find a sponsor for the upload
> > (https://bugs.debian.org/809809).
> > 
> 
> I've uploaded it.
> 
> Thanks for your contribution!
> 
> Regards,
> 

Thank you for the upload!

Regards

Yann



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.

Bug#806129: jessie-pu: package augeas/1.2.0-0.2+deb8u1

[Adam D. Barratt]

Control: tags -1 + pending

On Tue, 2016-01-05 at 00:10 +0100, Mehdi Dogguy wrote:
> Hi,
> 
> On 04/01/2016 11:57, SOUBEYRAND Yann - externe wrote:
> > 
> > Thank you for the review of the package.
> > 
> > FYI I've open a RFS to find a sponsor for the upload
> > (https://bugs.debian.org/809809).
> > 
> 
> I've uploaded it.

Flagged for acceptance.

Regards,

Adam

Bug#806129: jessie-pu: package augeas/1.2.0-0.2+deb8u1

[SOUBEYRAND Yann - externe]

Le vendredi 01 janvier 2016 à 16:22 +, a...@adam-barratt.org.uk a
écrit :
> Control: tags -1 -moreinfo +confirmed
> 
> On Thu, 2015-12-17 at 17:55 +0100, Yann Soubeyrand wrote:
> > On Tue, 24 Nov 2015 17:33:51 + "Adam D. Barratt" 
> >  wrote:
> > > Control: tags -1 + moreinfo
> > > 
> > > On 2015-11-24 15:22, Yann Soubeyrand wrote:
> > > > I prepared a package for augeas containing a patch to fix bug #764699
> > > > (https://bugs.debian.org/764699) which affects httpd lens: files under
> > > > /etc/apache2/conf-enabled directory are not taken into account by this 
> > > > lens.
> > > 
> > > Thanks for caring about fixing bugs in stable. As far as I can see, this 
> > > bug is not yet fixed in unstable, which is a pre-requisite for fixing it 
> > > in stable.
> > > 
> > > Regards,
> > > 
> > > Adam
> > 
> > Control: tags -1 - moreinfo
> > 
> > Hi,
> > 
> > A new version of Augeas which fixes bugs #764699 and #802665 has been
> > uploaded to unstable. I updated my package to take into account the
> > modifications brought to the unstable one. Attached is the diff of this
> > new package which can be found at
> > http://mentors.debian.net/debian/pool/main/a/augeas/augeas_1.2.0-0.2
> > +deb8u1.dsc
> 
> Please go ahead.
> 
> Regards,
> 
> Adam
> 

Hi,

Thank you for the review of the package.

FYI I've open a RFS to find a sponsor for the upload
(https://bugs.debian.org/809809).

Regards

Yann



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.

Bug#806129: jessie-pu: package augeas/1.2.0-0.2+deb8u1

[Mehdi Dogguy]

Hi,

On 04/01/2016 11:57, SOUBEYRAND Yann - externe wrote:
> 
> Thank you for the review of the package.
> 
> FYI I've open a RFS to find a sponsor for the upload
> (https://bugs.debian.org/809809).
> 

I've uploaded it.

Thanks for your contribution!

Regards,

-- 
Mehdi

Bug#806129: jessie-pu: package augeas/1.2.0-0.2+deb8u1

[Adam D. Barratt]

Control: tags -1 -moreinfo +confirmed

On Thu, 2015-12-17 at 17:55 +0100, Yann Soubeyrand wrote:
> On Tue, 24 Nov 2015 17:33:51 + "Adam D. Barratt" 
>  wrote:
> > Control: tags -1 + moreinfo
> > 
> > On 2015-11-24 15:22, Yann Soubeyrand wrote:
> > > I prepared a package for augeas containing a patch to fix bug #764699
> > > (https://bugs.debian.org/764699) which affects httpd lens: files under
> > > /etc/apache2/conf-enabled directory are not taken into account by this 
> > > lens.
> > 
> > Thanks for caring about fixing bugs in stable. As far as I can see, this 
> > bug is not yet fixed in unstable, which is a pre-requisite for fixing it 
> > in stable.
> > 
> > Regards,
> > 
> > Adam
> 
> Control: tags -1 - moreinfo
> 
> Hi,
> 
> A new version of Augeas which fixes bugs #764699 and #802665 has been
> uploaded to unstable. I updated my package to take into account the
> modifications brought to the unstable one. Attached is the diff of this
> new package which can be found at
> http://mentors.debian.net/debian/pool/main/a/augeas/augeas_1.2.0-0.2
> +deb8u1.dsc

Please go ahead.

Regards,

Adam

Bug#806129: jessie-pu: package augeas/1.2.0-0.2+deb8u1

[Yann Soubeyrand]

On Tue, 24 Nov 2015 17:33:51 + "Adam D. Barratt"  
wrote:
> Control: tags -1 + moreinfo
> 
> On 2015-11-24 15:22, Yann Soubeyrand wrote:
> > I prepared a package for augeas containing a patch to fix bug #764699
> > (https://bugs.debian.org/764699) which affects httpd lens: files under
> > /etc/apache2/conf-enabled directory are not taken into account by this 
> > lens.
> 
> Thanks for caring about fixing bugs in stable. As far as I can see, this 
> bug is not yet fixed in unstable, which is a pre-requisite for fixing it 
> in stable.
> 
> Regards,
> 
> Adam

Control: tags -1 - moreinfo

Hi,

A new version of Augeas which fixes bugs #764699 and #802665 has been
uploaded to unstable. I updated my package to take into account the
modifications brought to the unstable one. Attached is the diff of this
new package which can be found at
http://mentors.debian.net/debian/pool/main/a/augeas/augeas_1.2.0-0.2
+deb8u1.dsc

Regards

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.0 +0200
+++ augeas-1.2.0/debian/changelog	2015-12-17 11:33:10.0 +0100
@@ -1,3 +1,19 @@
+augeas (1.2.0-0.2+deb8u1) jessie-proposed-updates; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Yann Soubeyrand ]
+  * 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)
+
+  [ Mattia Rizzolo ]
+  * debian/patches/0003-Httpd-Allow-eol-comments-after-section-tags.patch:
++ Rewrite DEP-3 header.
+
+ -- Yann Soubeyrand   Thu, 17 Dec 2015 11:31:48 +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.0 +0100
+++ augeas-1.2.0/debian/patches/0003-Httpd-Allow-eol-comments-after-section-tags.patch	2015-12-06 16:41:42.0 +0100
@@ -0,0 +1,127 @@
+Description: Httpd: Allow eol comments after section tags
+Origin: upstream,
+Httpd: Allow eol comments after section tags: https://github.com/hercules-team/augeas/commit/3af5c7d44c838b52bbdaf1beb8780fd6a471a77e
+Httpd: Define an eol_comment in section to allow for \n before comment: https://github.com/hercules-team/augeas/commit/fb749ea4d1ba4ecd95a5cec6aa7b20b010ef04a8
+Httpd: Do not pass empty as body to section: https://github.com/hercules-team/augeas/commit/97d3d931fefdfe816e6fb1d6e55a779742f255fa
+Httpd: Make \ illegal in char_arg_dir: https://github.com/hercules-team/augeas/commit/3df041be9196a8ca0b7a3e8c90a47b800500cba1
+Httpd: Properly manage eol after opening tag: https://github.com/hercules-team/augeas/commit/34980ae52bf4367664ad0551a15c2d1e5a3f2ac4
+Bug: https://github.com/hercules-team/augeas/pull/223
+Bug: https://github.com/hercules-team/augeas/pull/220
+Bug-Debian: https://bugs.debian.org/802665
+
+---
+ 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 "" . opt_eol . ((body|comment) . (body|empty|comment)*)? .
++ indent . dels "" ">" . 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 

Bug#806129: jessie-pu: package augeas/1.2.0-0.2+deb8u1

[Adam D. Barratt]

Control: tags -1 + moreinfo

On 2015-11-24 15:22, Yann Soubeyrand wrote:

I prepared a package for augeas containing a patch to fix bug #764699
(https://bugs.debian.org/764699) which affects httpd lens: files under
/etc/apache2/conf-enabled directory are not taken into account by this 
lens.


Thanks for caring about fixing bugs in stable. As far as I can see, this 
bug is not yet fixed in unstable, which is a pre-requisite for fixing it 
in stable.


Regards,

Adam

Bug#806129: jessie-pu: package augeas/1.2.0-0.2+deb8u1

[Yann Soubeyrand]

Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

Dear release managers,

I prepared a package for augeas containing a patch to fix bug #764699
(https://bugs.debian.org/764699) which affects httpd lens: files under
/etc/apache2/conf-enabled directory are not taken into account by this lens.
The diff is attached to this message.

The source package can be found at
http://mentors.debian.net/debian/pool/main/a/augeas/augeas_1.2.0-0.2+deb8u1.dsc

Regards,

Yann Soubeyrand

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.0 +0200
+++ augeas-1.2.0/debian/changelog   2015-11-24 13:55:49.0 +0100
@@ -1,3 +1,10 @@
+augeas (1.2.0-0.2+deb8u1) jessie-proposed-updates; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix httpd lens (Closes: #764699)
+
+ -- Yann Soubeyrand   Tue, 24 Nov 2015 
13:55:31 +0100
+
 augeas (1.2.0-0.2) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru augeas-1.2.0/debian/patches/0003-Fix-httpd-lens.patch 
augeas-1.2.0/debian/patches/0003-Fix-httpd-lens.patch
--- augeas-1.2.0/debian/patches/0003-Fix-httpd-lens.patch   1970-01-01 
01:00:00.0 +0100
+++ augeas-1.2.0/debian/patches/0003-Fix-httpd-lens.patch   2015-10-28 
16:50:48.0 +0100
@@ -0,0 +1,13 @@
+Description: fix httpd lens
+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
+@@ -91,6 +91,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.0 +0200
+++ augeas-1.2.0/debian/patches/series  2015-10-28 16:50:48.0 +0100
@@ -1,2 +1,3 @@
 0001-Install-vim-addons-into-correct-directory.patch
 0002-Skip-tests-that-need-root-privileges-when-fakeroot-h.patch
+0003-Fix-httpd-lens.patch