[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#804385: jessie-pu: package mongrel2/1.9.1-6



Control: tags -1 + pending

On Sat, 2016-02-20 at 14:16 +0000, Adam D. Barratt wrote:
> Control: tags -1 -moreinfo +confirmed
> 
> On Sat, 2016-02-20 at 15:07 +0100, Jan Niehusmann wrote:
> > On Sat, Feb 20, 2016 at 12:17:57PM +0000, Adam D. Barratt wrote:
> > > On Mon, 2015-12-28 at 19:18 +0000, Adam D. Barratt wrote:
> > > > On 2015-11-21 19:05, Jan Niehusmann wrote:
> > > > > On Sat, Nov 21, 2015 at 05:40:44PM +0100, Julien Cristau wrote:
> > > > >> We like to see a tested source package debdiff in the bug, please
> > > > >> provide it instead of a link.
> > > > > 
> > > > > Sure, here is the debdiff. Unfortunately, it's not very readable:
> > > > > 
> > > > > debian/patches/debian-changes is auto-generated, and the generation
> > > > > process doesn't have a stable ordering, so most of the diff is not
> > > > > really meaningful:
> > > > 
> > > > Could you point out precisely where the test is being disabled, please? 
> > > > I'm failing to spot it in the diff and unpacking the source package, 
> > > > applying the patch from your mail and diffing the trees gives:
> > > > 
> > > > $ diff -adNru mongrel2-1.9.1{.orig,} | filterdiff -x 
> > > > "*/debian/patches/debian-changes" | diffstat
> > > >   changelog |    7 +++++++
> > > >   1 file changed, 7 insertions(+)
> > > > 
> > > > (for additional reference, the version should be 1.9.1-6+deb8u1 and the 
> > > > distribution "jessie".)
> > > 
> > > Ping?
> > 
> > Sorry - I missed your last mail.
> > 
> > The original report already contained a link to a short diff showing the
> > acutal changes:
> > (http://anonscm.debian.org/cgit/users/jan/mongrel2.git/diff/?h=stable)
> > 
> > diff --git a/debian/changelog b/debian/changelog
> > index 6808f2c..f29c37a 100644
> > --- a/debian/changelog
> > +++ b/debian/changelog
> > @@ -1,3 +1,10 @@
> > +mongrel2 (1.9.1-7) UNRELEASED; urgency=medium
> > +
> > +  * Comment out failing test caused by an expired certificate.
> > +    (Closes: Bug#804331)
> > +
> > + -- Jan Niehusmann <jan@debian.org>  Sat, 07 Nov 2015 15:45:05 +0100
> > +
> >  mongrel2 (1.9.1-6) unstable; urgency=low
> >  
> >    * Update Vcs URL
> > diff --git a/tests/cert_tests.c b/tests/cert_tests.c
> > index e0dfc83..7238c37 100644
> > --- a/tests/cert_tests.c
> > +++ b/tests/cert_tests.c
> > @@ -35,7 +35,7 @@ char *test_SSL_verify_cert()
> >      int flags = 0;
> >      ret =x509_crt_verify( &crt, &ca_crt, NULL, NULL, &flags, NULL, NULL);
> >  
> > -    mu_assert(ret == 0, "failed to verify cert m2-cert.pem");
> > +    //mu_assert(ret == 0, "failed to verify cert m2-cert.pem");
> >  
> >      x509_crt_free( &crt );
> >      x509_crt_free( &ca_crt );
> 
> Hmmm, I can see it reading through the debdiff again. Not sure what
> happened before. :-(
> 
> Please go ahead.

Uploaded and flagged for acceptance.

Regards,

Adam


Reply to: