NEW changes in stable-new

2015-08-28 Thread Debian FTP Masters
Processing changes file: binutils-mingw-w64_5.2+deb8u1_mips.changes
  ACCEPT



Bug#796281: jessie-pu: package pcre3/2:8.35-3.3+deb8u1

2015-08-28 Thread Julien Cristau
On Fri, Aug 28, 2015 at 07:19:28 +0200, Moritz Mühlenhoff wrote:

 On Fri, Aug 21, 2015 at 03:59:15PM +0100, Adam D. Barratt wrote:
  Control: tags -1 + moreinfo
  
  On Fri, 2015-08-21 at 01:35 +0200, Moritz Muehlenhoff wrote:
   This update fixes four minor security issues which don't warrant
   a DSA. These have been tested in a production setup and were
   working fine there.
  [...]
   +  * CVE-2015-2325 CVE-2015-2326 CVE-2015-3210 CVE-2015-5073
  
  The BTS and Security Tracker indicate that the first three of those
  aren't fixed in unstable yet; is that correct?
 
 No, but these are backports from current upstream and I suppose Matthew
 will simply move to a new upstream version at some point.
 
We don't like to include fixes in jessie that aren't in sid/stretch.
Please ping again when that's done.

Thanks,
Julien


signature.asc
Description: Digital signature


Bug#796595: jessie-pu: package debian-installer-launcher/19

2015-08-28 Thread Iain R. Learmonth
Hi,

On Thu, Aug 27, 2015 at 09:26:13PM +0100, Adam D. Barratt wrote:
 Please go ahead.

Uploaded.

Thanks,
Iain.

-- 
e: i...@fsfe.orgw: iain.learmonth.me
x: i...@jabber.fsfe.org t: EPVPN 2105
c: 2M0STB  g: IO87we
p: 1F72 607C 5FF2 CCD5 3F01 600D 56FF 9EA4 E984 6C49


pgpM9q2FPAnG1.pgp
Description: PGP signature


Re: libstdc++ follow-up transitions

2015-08-28 Thread Julien Cristau
On Thu, Aug 27, 2015 at 20:04:25 +0100, Simon McVittie wrote:

 On 27/08/15 11:37, Julien Cristau wrote:
  On Tue, Aug 25, 2015 at 08:48:54 +0100, Simon McVittie wrote:
  * https://release.debian.org/transitions/html/auto-assimp.html
  
  blocked by #794990
 
 The root cause of #794990 appears to be opencv hasn't started its
 transition yet, which has now been resolved (mrpt builds).
 
 mrpt has cxx11 symbols itself, but nothing actually depends on it, so I
 think it's OK to just rebuild.
 
Scheduled.

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#796045: nmu: leveldb_1.18.3

2015-08-28 Thread GCS
On Tue, Aug 18, 2015 at 9:52 PM, Gaudenz Steinlin gaud...@debian.org wrote:
 Usertags: binnmu

 nmu leveldb_1.18.3 . ALL . unstable . -m Rebuild for libsnappy transition

 leveldb has already been uploaded for it's own transition before the
 upload of snappy for it's transition. So leveldb needs another rebuild
 to be compiled against libsnappy1v5.
 Just for the record, leveldb now enforced to compile against the
transitioned snappy package version and builds on all architectures.

Laszlo/GCS



NEW changes in stable-new

2015-08-28 Thread Debian FTP Masters
Processing changes file: binutils-mingw-w64_5.2+deb8u1_armel.changes
  ACCEPT
Processing changes file: binutils-mingw-w64_5.2+deb8u1_armhf.changes
  ACCEPT
Processing changes file: binutils-mingw-w64_5.2+deb8u1_mipsel.changes
  ACCEPT
Processing changes file: binutils-mingw-w64_5.2+deb8u1_ppc64el.changes
  ACCEPT



Re: libstdc++ follow-up transitions

2015-08-28 Thread Julien Cristau
On Thu, Aug 27, 2015 at 12:37:39 +0200, Julien Cristau wrote:

  * https://release.debian.org/transitions/html/auto-givaro.html
 
 need to check linbox I guess.  I thought I'd done that, but I guess not.
 
nevermind that.  linbox does seem to break ABI, but has no reverse deps.
binNMUs scheduled.

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#791215: netcdf: library transition may be needed when GCC 5 is the default

2015-08-28 Thread Sebastiaan Couwenberg
On 28-08-15 10:21, Julien Cristau wrote:
 On Tue, Aug 25, 2015 at 15:33:10 +0200, Sebastiaan Couwenberg wrote:
 
  dx(1:4.4.4-7)
  grace (1:5.1.25-1)
  gri   (2.12.23-9)
  kst   (2.0.3-4)[also needed for netcdf-cxx-legacy]
  octave-octcdf (1.1.8-1)
  python-scientific (2.9.4-3)
  r-cran-ncdf4  (1.13-1)
  r-cran-rnetcdf(1.6.3-1-1)
  v-sim (3.7.2-1)

 binNMUs scheduled.

Thanks.

gri (2.12.23-9) doesn't need any binNMU for netcdf anymore as mentioned
in my previous message, the new upload by the maintainer already built
with the new netcdf packages on the buildds, only the maintainer build
on i386 needed a manual binNMU to use the new netcdf packages too.

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1



Bug#791215: netcdf: library transition may be needed when GCC 5 is the default

2015-08-28 Thread Julien Cristau
On Fri, Aug 28, 2015 at 10:30:43 +0200, Sebastiaan Couwenberg wrote:

 gri (2.12.23-9) doesn't need any binNMU for netcdf anymore as mentioned
 in my previous message, the new upload by the maintainer already built
 with the new netcdf packages on the buildds, only the maintainer build
 on i386 needed a manual binNMU to use the new netcdf packages too.
 
Yes, I didn't actually touch gri.  (Please avoid those manual binNMUs
in the future though.)

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#797170: jessie-pu: package python-yaql/0.2.3-2 (removal of Python3 support to fix #795910).

2015-08-28 Thread Thomas Goirand
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

Hi,

The python3-yaql binary package in Jessie is completely broken, and has
no reverse dependency. Therefore, I'd like to remove it from Jessie
completely (ie: remove Python 3 support from python-yaql).

Please find attached the debdiff doing this. The package is built and
available here:

http://sid.gplhost.com/jessie-proposed-updates/python-yaql/

Please allow me to upload the package to jessie-p-u to fix the
RC bug #795910.

Cheers,

Thomas Goirand (zigo)
diff -Nru python-yaql-0.2.3/debian/changelog python-yaql-0.2.3/debian/changelog
--- python-yaql-0.2.3/debian/changelog	2014-10-13 09:04:17.0 +
+++ python-yaql-0.2.3/debian/changelog	2015-08-28 08:51:44.0 +
@@ -1,3 +1,10 @@
+python-yaql (0.2.3-2+deb8u1) jessie-proposed-updates; urgency=medium
+
+  * Removed python3-yaql package: it's not working, and nothing depends on it
+(Closes: #795910).
+
+ -- Thomas Goirand z...@debian.org  Fri, 28 Aug 2015 10:46:10 +0200
+
 python-yaql (0.2.3-2) unstable; urgency=medium
 
   * Also build-depends on python3-ply. This avoids FTBFS, because the package
diff -Nru python-yaql-0.2.3/debian/control python-yaql-0.2.3/debian/control
--- python-yaql-0.2.3/debian/control	2014-10-13 09:04:17.0 +
+++ python-yaql-0.2.3/debian/control	2015-08-28 08:51:44.0 +
@@ -6,9 +6,7 @@
 Build-Depends: debhelper (= 9),
python-all (= 2.6.6-3~),
python-setuptools,
-   python3-all,
-   python3-setuptools
-Build-Depends-Indep: python-ply, python3-ply
+Build-Depends-Indep: python-ply
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-yaql.git
 Vcs-Git: git://anonscm.debian.org/openstack/python-yaql.git
@@ -39,29 +37,3 @@
  one of the implementations in Python.
  .
  This package contains the Python 2.x module.
-
-Package: python3-yaql
-Architecture: all
-Pre-Depends: dpkg (= 1.15.6~)
-Depends: ${misc:Depends}, ${python3:Depends}
-Description: Yet Another Query Language - Python 3.x
- At the beginning of millennium the growing trend towards data formats
- standardization and application integrability made XML extremely popular. XML
- became lingua franca of the data. Applications tended to process lots of XML
- files ranging from small config files to very large datasets. As these data
- often had a complex structure with many levels of nestedness it is quickly
- became obvious that there is a need for specially crafted domain specific
- languages to query these data sets. This is how XPath and later XQL were born.
- .
- With later popularization of REST services and Web 2.0 JSON started to take
- XML’s place. JSON’s main advantage (besides being simpler than XML) is that is
- closely reassembles data structures found in most programming languages
- (arrays, dictionaries, scalars) making it very convenient for data
- serialization. As JSON lacked all the brilliant XML-related technologies like
- XSLT, XML Schema, XPath etc. various attempts to develop similar languages for
- JSON were made. One of those efforts was JSONPath library developed in 2007 by
- Stefan Gössner. Initial implementation was for PHP and JavaScript languages,
- but later on ports to other languages including Python were written. YAQL is
- one of the implementations in Python.
- .
- This package contains the Python 3.x module.
diff -Nru python-yaql-0.2.3/debian/gbp.conf python-yaql-0.2.3/debian/gbp.conf
--- python-yaql-0.2.3/debian/gbp.conf	2014-10-13 09:04:17.0 +
+++ python-yaql-0.2.3/debian/gbp.conf	2015-08-28 08:51:44.0 +
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian/unstable
+debian-branch = debian/jessie
 upstream-tag = %(version)s
 compression = xz
 
diff -Nru python-yaql-0.2.3/debian/python3-yaql.postinst python-yaql-0.2.3/debian/python3-yaql.postinst
--- python-yaql-0.2.3/debian/python3-yaql.postinst	2014-10-13 09:04:17.0 +
+++ python-yaql-0.2.3/debian/python3-yaql.postinst	1970-01-01 00:00:00.0 +
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ $1 = configure ] ; then
-	update-alternatives --install /usr/bin/yaql yaql /usr/bin/python3-yaql 200
-fi
-
-#DEBHELPER#
-
-exit 0
-
diff -Nru python-yaql-0.2.3/debian/python3-yaql.postrm python-yaql-0.2.3/debian/python3-yaql.postrm
--- python-yaql-0.2.3/debian/python3-yaql.postrm	2014-10-13 09:04:17.0 +
+++ python-yaql-0.2.3/debian/python3-yaql.postrm	1970-01-01 00:00:00.0 +
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ $1 = remove ] || [ $1 = disappear ]; then
-	update-alternatives --remove yaql /usr/bin/python3-yaql
-fi
-
-#DEBHELPER#
-
-exit 0
-
diff -Nru python-yaql-0.2.3/debian/python3-yaql.prerm python-yaql-0.2.3/debian/python3-yaql.prerm
--- python-yaql-0.2.3/debian/python3-yaql.prerm	2014-10-13 09:04:17.0 +
+++ 

Processed: retitle 745475 to autoremoval should ignore alternate depends when considering affected reverse dependencies

2015-08-28 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 retitle 745475 autoremoval should ignore alternate depends when considering 
 affected reverse dependencies
Bug #745475 [release.debian.org] broken auto-removal logic
Changed Bug title to 'autoremoval should ignore alternate depends when 
considering affected reverse dependencies' from 'broken auto-removal logic'
 thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
745475: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745475
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems



Bug#790996: marked as done (cgal: library transition may be needed when GCC 5 is the default)

2015-08-28 Thread Debian Bug Tracking System
Your message dated Fri, 28 Aug 2015 11:00:16 +
with message-id e1zvhok-0002al...@franck.debian.org
and subject line Bug#790996: fixed in cgal 4.6.1-2
has caused the Debian Bug report #790996,
regarding cgal: library transition may be needed when GCC 5 is the default
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
790996: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790996
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---
Package: src:cgal
Version: 4.6-3
Severity: important
Tags: sid stretch
User: debian-...@lists.debian.org
Usertags: libstdc++-cxx11

Background [1]: libstdc++6 introduces a new ABI to conform to the
C++11 standard, but keeps the old ABI to not break existing binaries.
Packages which are built with g++-5 from experimental (not the one
from testing/unstable) are using the new ABI.  Libraries built from
this source package export some of the new __cxx11 or B5cxx11 symbols,
and dropping other symbols.  If these symbols are part of the API of
the library, then this rebuild with g++-5 will trigger a transition
for the library.

What is needed:

 - Rebuild the library using g++/g++-5 from experimental. Note that
   most likely all C++ libraries within the build dependencies need
   a rebuild too. You can find the log for a rebuild in
 https://people.debian.org/~doko/logs/gcc5-20150701/
   Search for BEGIN GCC CXX11 in the log.

 - Decide if the symbols matching __cxx11 or B5cxx11 are part of the
   library API, and are used by the reverse dependencies of the
   library.

 - If there are no symbols matching __cxx11 or B5cxx11 in the symbols
   forming the library API, you should close this issue with a short
   explanation.
 
 - If there are no reverse dependencies, it should be the package
   maintainers decision if a transition is needed.  However this might
   break software which is not in the Debian archive, and built
   against these packages.

 - If a library transition is needed, please prepare for the change.
   Rename the library package, append v5 to the name of the package
   (e.g. libfoo2 - libfoo2v5). Such a change can be avoided, if you
   have a soversion bump and you upload this version instead of the
   renamed package.  Prepare a patch and attach it to this issue (mark
   this issue with patch), so that it is possible to NMU such a
   package. We'll probably have more than hundred transitions
   triggered. Then reassign the issue to release.debian.org and
   properly tag it as a transition issue, by sending an email to
   cont...@bugs.debian.org:
   
 user release.debian@packages.debian.org
 usertag this issue + transition
 block this issue by 790756
 reassign this issue release.debian.org
   
 - If unsure if a transition is needed, please tag the issue with help
   to ask for feedback from other Debian developers.

The libstdc++6 transition will be a large one, and it will come with a
lot of pain.  Please help it by preparing the follow-up transitions.

[1] https://wiki.debian.org/GCC5#libstdc.2B-.2B-_ABI_transition
---End Message---
---BeginMessage---
Source: cgal
Source-Version: 4.6.1-2

We believe that the bug you reported is fixed in the latest version of
cgal, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 790...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Joachim Reichel reic...@debian.org (supplier of updated cgal package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Thu, 27 Aug 2015 21:38:50 +0200
Source: cgal
Binary: libcgal11v5 libcgal-qt4-11v5 libcgal-dev libcgal-qt4-dev libcgal-demo 
libcgal-ipelets
Architecture: source all amd64
Version: 4.6.1-2
Distribution: unstable
Urgency: medium
Maintainer: Joachim Reichel reic...@debian.org
Changed-By: Joachim Reichel reic...@debian.org
Description:
 libcgal-demo - C++ library for computational geometry (demos)
 libcgal-dev - C++ library for computational geometry (development files)
 libcgal-ipelets - C++ library for computational geometry (ipelets)
 libcgal-qt4-11v5 - C++ library for computational geometry (support for Qt4)
 libcgal-qt4-dev - C++ library for computational geometry 

Bug#791215: netcdf: library transition may be needed when GCC 5 is the default

2015-08-28 Thread Julien Cristau
On Tue, Aug 25, 2015 at 15:33:10 +0200, Sebastiaan Couwenberg wrote:

  dx(1:4.4.4-7)
  grace (1:5.1.25-1)
  gri   (2.12.23-9)
  kst   (2.0.3-4)[also needed for netcdf-cxx-legacy]
  octave-octcdf (1.1.8-1)
  python-scientific (2.9.4-3)
  r-cran-ncdf4  (1.13-1)
  r-cran-rnetcdf(1.6.3-1-1)
  v-sim (3.7.2-1)
 
binNMUs scheduled.

Cheers,
Julien


signature.asc
Description: Digital signature


Processed: reopening 790996

2015-08-28 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 reopen 790996
Bug #790996 {Done: Joachim Reichel reic...@debian.org} [release.debian.org] 
cgal: library transition may be needed when GCC 5 is the default
'reopen' may be inappropriate when a bug has been closed with a version;
all fixed versions will be cleared, and you may need to re-add them.
Bug reopened
No longer marked as fixed in versions cgal/4.6.1-2.
 thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
790996: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790996
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems



Bug#797179: jessie-pu: package mozilla-gnome-keyring/0.6.11-3

2015-08-28 Thread Ximin Luo
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

Hi release team, 

I just uploaded a rebuild of the version of mozilla-gnome-keyring currently in 
testing (0.10-1~deb8u1) to the jessie-proposed-updates queue, awaiting your 
approval.

The reason is that the current version of this package in jessie (0.6.11-3) no 
longer works with the current iceweasel in jessie (38.2.0). Several users have 
complained about it, see 
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=797040 and 
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788967#17

It would take a considerable amount of work to fix this in that version. OTOH, 
this version (0.10-1) has been running fine in testing for about 2 months.

Do ask if you have more questions.

X

-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.0.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)



Bug#797192: Hang on

2015-08-28 Thread Thomas Goirand
Dear release team,

Actually, hang on a bit, the previous patch isn't enough, that's only
for the oslo-incubator, and nova itself needs to be patched too.

I'm currently working on a backport of
https://review.openstack.org/#/c/214528/ to nova Icehouse (ie: the
version in Jessie).

Cheers,

Thomas Goirand (zigo)



Bug#797201: jessie-pu: package bird/1.4.5-1+deb8u1

2015-08-28 Thread Ondřej Surý
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Hi,

this is a simple patch that help migrate /etc/bird6.conf to
/etc/bird/bird6.conf as the /etc/bird6.conf was provided in bird6
package in wheezy (and that was dropped in jessie).  The d-m-s call
missed an old package name, that is fixed here.  (Courtesy of
Christopher Biebl)

$ diffstat bird_1.4.5-1+deb8u1.debdiff
 bird-big.postinst |2 +-
 bird-big.postrm   |2 +-
 bird-big.preinst  |2 +-
 bird-big.prerm|2 +-
 bird.postinst |2 +-
 bird.postrm   |2 +-
 bird.preinst  |2 +-
 bird.prerm|2 +-
 changelog |7 +++
 gbp.conf  |4 ++--
 10 files changed, 17 insertions(+), 10 deletions(-)

(gbp.conf changed to reflect the separate branch fo jessie)

Cheers,
Ondrej
- -- System Information:
Debian Release: 8.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.19.0-18-generic (SMP w/24 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQJ8BAEBCgBmBQJV4GGxXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMEI5MzNEODBGQ0UzRDk4MUEyRDM4RkIw
Qzk5QjcwRUY0RkNCQjA3AAoJEAyZtw70/LsHyq0QAI18JBcesrUaqki+xotuO5ay
JJJIdwTWDNmE3Stu49D4WDqJEmoLUCdTJNiN/YxrYNgDAO9Wy9xiydBgX3fj9BhJ
Igy6JG8fHx//bXVoo+2CvrR9nsqedVTGihZxLEx0Vj1CiuUL1SKUKYe6zsqHDGa8
0fD7Ha9qPNqqYhld1HnCq9bZoj3VCgRKzcaVVLNdgvCy3bBW4jI0Q3joBGJRN+bx
Fg0QZn+jVv8dJt70qroRqikDdF/abJpCmNuqAQ1oPD+zuUsTwpvEshDtugnOeGk4
THycDDc0UV9QbcSQApENbbjug4FnPUdSX05LbvlmLGWSwNhkv6WiTy+2xUF+s6+G
VLcCaR3aphMF4NTGLm6QBbF3t/rdwW2uVNos6XdxDVQKb9qgs/KCCV5koxl4QNJN
yh8FnuE7+WN0AJrfGr9utGjn8ZmLYfpLjZy2E/7VMMNXQFYqbhXNJxiSLcxWaR8x
+JRaWX1Aq19opr8zx+TsPyjbfbIGZKG26LUjOS/d94TONLPwUOpJhJCGTbB6GvxQ
ItdETlpJsZfW8St4t9HwRnIBXgCfcZ5mbIpNB3XZGxmzKyKDktlak2xzsgssAEiG
4shlzSw5Sg3b/PzFuSJ+3iDIwWXTmqyuI7A0BlTckNGjYxbO6lnH+m0aVOjMRriy
DMxkrrwyzu+uA/oGfy1x
=r8AR
-END PGP SIGNATURE-
diff -Nru bird-1.4.5/debian/bird-big.postinst bird-1.4.5/debian/bird-big.postinst
--- bird-1.4.5/debian/bird-big.postinst	2014-10-08 10:23:26.0 +0200
+++ bird-1.4.5/debian/bird-big.postinst	2015-08-28 15:09:41.0 +0200
@@ -3,7 +3,7 @@
 
 dpkg-maintscript-helper rm_conffile /etc/default/bird 1.3.11-5~ -- $@
 dpkg-maintscript-helper mv_conffile /etc/bird.conf /etc/bird/bird.conf 1.3.11-5~ -- $@
-dpkg-maintscript-helper mv_conffile /etc/bird6.conf /etc/bird/bird6.conf 1.3.11-5~ -- $@
+dpkg-maintscript-helper mv_conffile /etc/bird6.conf /etc/bird/bird6.conf 1.3.11-5~ bird6 -- $@
 
 if [ $1 = configure ]; then
 if ! getent passwd bird  /dev/null; then
diff -Nru bird-1.4.5/debian/bird-big.postrm bird-1.4.5/debian/bird-big.postrm
--- bird-1.4.5/debian/bird-big.postrm	2014-10-08 10:23:26.0 +0200
+++ bird-1.4.5/debian/bird-big.postrm	2015-08-28 15:09:41.0 +0200
@@ -3,7 +3,7 @@
 
 dpkg-maintscript-helper rm_conffile /etc/default/bird 1.3.11-5~ -- $@
 dpkg-maintscript-helper mv_conffile /etc/bird.conf /etc/bird/bird.conf 1.3.11-5~ -- $@
-dpkg-maintscript-helper mv_conffile /etc/bird6.conf /etc/bird/bird6.conf 1.3.11-5~ -- $@
+dpkg-maintscript-helper mv_conffile /etc/bird6.conf /etc/bird/bird6.conf 1.3.11-5~ bird6 -- $@
 
 if test $1 = purge; then
 dpkg-statoverride --remove /etc/bird/bird.conf /dev/null 2/dev/null || true
diff -Nru bird-1.4.5/debian/bird-big.preinst bird-1.4.5/debian/bird-big.preinst
--- bird-1.4.5/debian/bird-big.preinst	2014-10-08 10:23:26.0 +0200
+++ bird-1.4.5/debian/bird-big.preinst	2015-08-28 15:09:41.0 +0200
@@ -3,7 +3,7 @@
 
 dpkg-maintscript-helper rm_conffile /etc/default/bird 1.3.11-5~ -- $@
 dpkg-maintscript-helper mv_conffile /etc/bird.conf /etc/bird/bird.conf 1.3.11-5~ -- $@
-dpkg-maintscript-helper mv_conffile /etc/bird6.conf /etc/bird/bird6.conf 1.3.11-5~ -- $@
+dpkg-maintscript-helper mv_conffile /etc/bird6.conf /etc/bird/bird6.conf 1.3.11-5~ bird6 -- $@
 
 #DEBHELPER#
 
diff -Nru bird-1.4.5/debian/bird-big.prerm bird-1.4.5/debian/bird-big.prerm
--- bird-1.4.5/debian/bird-big.prerm	2014-10-08 10:23:26.0 +0200
+++ bird-1.4.5/debian/bird-big.prerm	2015-08-28 15:09:41.0 +0200
@@ -3,7 +3,7 @@
 
 dpkg-maintscript-helper rm_conffile /etc/default/bird 1.3.11-5~ -- $@
 dpkg-maintscript-helper mv_conffile /etc/bird.conf /etc/bird/bird.conf 1.3.11-5~ -- $@
-dpkg-maintscript-helper mv_conffile /etc/bird6.conf /etc/bird/bird6.conf 1.3.11-5~ -- $@
+dpkg-maintscript-helper mv_conffile /etc/bird6.conf /etc/bird/bird6.conf 1.3.11-5~ bird6 -- $@
 
 #DEBHELPER#
 
diff -Nru bird-1.4.5/debian/bird.postinst bird-1.4.5/debian/bird.postinst
--- bird-1.4.5/debian/bird.postinst	2014-10-08 10:23:26.0 +0200
+++ bird-1.4.5/debian/bird.postinst	2015-08-28 

Bug#796323: stretch-pu: package icedove/38.2.0-1~stretch

2015-08-28 Thread Carsten Schoenert
Hello Julien,

On Tue, Aug 25, 2015 at 02:54:22PM +0200, Julien Cristau wrote:
 Control: tag -1 stretch
 Control: reopen -1
 
 On Fri, Aug 21, 2015 at 12:24:07 +0200, Carsten Schoenert wrote:
 
  Package: release.debian.org
  Severity: normal
  Tags: strech
  User: release.debian@packages.debian.org
  Usertags: pu
  
  Hello there,
  
  due the GCC-5 transition we would like to upload the current Icedove ESR
  version (aka Thunderbird 38.2.0) to proposed updates for jessie.
  
 Do you mean stretch?

yes, sorry for wrong spelled distro.

  The latest beta version 40.0~b1 is uploaded several days ago to
  experimental and the previous version 38.1.0-1 is currently in unstable.
  
  Due not go out of sync to current upstream versions we would like to
  place a recent version into stretch via proposed updated.
  
 That upload FTBFS on mips.  (Also, please don't close release.d.o bugs
 via package changelogs.)

I was asking Mike Homey if he can see something that would be probably wrong
but he/we found nothing. We come to the conclusion that we should try another
build on another buildd first before refractoring the patches again.
We had similiar issue in the past on other architecture there a new build on
another host went fine.

Could please retrigger a build for mips on another host than mips-aql-01?

Thanks and regards
Carsten



Please dak copy-installer 20150828 hint it into testing

2015-08-28 Thread Cyril Brulebois
Hi,

FTPmasters, please sync the installer from sid to testing:

  dak copy-installer 20150828


Release team, please hint it into testing:

  urgent debian-installer/20150828


Thanks for your time.

Mraw,
KiBi.


signature.asc
Description: Digital signature


Processed: Re: Bug#796379: jessie-pu: package bareos/14.2.1+20141017gitc6c5b56-3+deb8u1

2015-08-28 Thread Debian Bug Tracking System
Processing control commands:

 tags -1 - moreinfo
Bug #796379 [release.debian.org] jessie-pu: package 
bareos/14.2.1+20141017gitc6c5b56-3+deb8u1
Removed tag(s) moreinfo.

-- 
796379: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=796379
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems



Bug#797192: jessie-pu: package nova/2014.1.3-11 (CVE-2015-3241, #796109)

2015-08-28 Thread Thomas Goirand
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

Hi,

I've prepared an update of nova for Jessie which fixes CVE-2015-3241.
This CVE is about DoS nova-compute machines by resizing and immediately
after it delete the VM, which makes nova-compute consume all CPU.

The package is available here:
http://sid.gplhost.com/jessie-proposed-updates/nova/

Please allow me to upload it to jessie-p-u.

Cheers,

Thomas Goirand (zigo)

P.S: As we speak, I'm preparing the update for Sid, it should be
ready soonish today, and it will include the point release update.
diff -Nru nova-2014.1.3/debian/changelog nova-2014.1.3/debian/changelog
--- nova-2014.1.3/debian/changelog	2015-03-11 08:48:55.0 +
+++ nova-2014.1.3/debian/changelog	2015-08-28 09:24:00.0 +
@@ -1,3 +1,10 @@
+nova (2014.1.3-11+deb8u1) jessie-proposed-updates; urgency=medium
+
+  * CVE-2015-3241: Resize/delete combo allows to overload nova-compute. Applied
+upstream patch (Closes: #796109).
+
+ -- Thomas Goirand z...@debian.org  Fri, 28 Aug 2015 11:10:06 +0200
+
 nova (2014.1.3-11) unstable; urgency=high
 
   * CVE-2015-0259: Websocket Hijacking Vulnerability in Nova VNC Server. Done
diff -Nru nova-2014.1.3/debian/patches/CVE-2015-3241_Resize_delete_combo_allow_to_overload_nova-compute.patch nova-2014.1.3/debian/patches/CVE-2015-3241_Resize_delete_combo_allow_to_overload_nova-compute.patch
--- nova-2014.1.3/debian/patches/CVE-2015-3241_Resize_delete_combo_allow_to_overload_nova-compute.patch	1970-01-01 00:00:00.0 +
+++ nova-2014.1.3/debian/patches/CVE-2015-3241_Resize_delete_combo_allow_to_overload_nova-compute.patch	2015-08-28 09:24:00.0 +
@@ -0,0 +1,103 @@
+Description: CVE-2015-3241: Sync process utils from oslo for execute callbacks
+ The sync pulls in the following changes:
+ .
+  Ifc23325 Add 2 callbacks to processutils.execute()
+  I22b2d7b processutils: ensure on_completion callback is always called
+  I59d5799 Let oslotest manage the six.move setting for mox
+  I245750f Remove `processutils` dependency on `log`
+  Ia5bb418 Fix exception message in openstack.common.processutils.execute
+Author: Abhishek Kekane abhishek.kek...@nttdata.com
+Bug-Debian: https://bugs.debian.org/796109
+Origin: upstream, https://review.openstack.org/#/c/208876/
+Bug-Ubuntu: https://launchpad.net/bugs/1387543
+Last-Update: 2015-08-28
+
+--- nova-2014.1.3.orig/nova/openstack/common/processutils.py
 nova-2014.1.3/nova/openstack/common/processutils.py
+@@ -112,6 +112,17 @@ def execute(*cmd, **kwargs):
+ :type shell:boolean
+ :param loglevel:log level for execute commands.
+ :type loglevel: int.  (Should be logging.DEBUG or logging.INFO)
++:param on_execute:  This function will be called upon process creation
++with the object as a argument.  The Purpose of this
++is to allow the caller of `processutils.execute` to
++track process creation asynchronously.
++:type on_execute:   function(:class:`subprocess.Popen`)
++:param on_completion:   This function will be called upon process
++completion with the object as a argument.  The
++Purpose of this is to allow the caller of
++`processutils.execute` to track process completion
++asynchronously.
++:type on_completion:function(:class:`subprocess.Popen`)
+ :returns:   (stdout, stderr) from process execution
+ :raises::class:`UnknownArgumentError` on
+ receiving unknown arguments
+@@ -127,6 +138,8 @@ def execute(*cmd, **kwargs):
+ root_helper = kwargs.pop('root_helper', '')
+ shell = kwargs.pop('shell', False)
+ loglevel = kwargs.pop('loglevel', logging.DEBUG)
++on_execute = kwargs.pop('on_execute', None)
++on_completion = kwargs.pop('on_completion', None)
+ 
+ if isinstance(check_exit_code, bool):
+ ignore_exit_code = not check_exit_code
+@@ -135,8 +148,7 @@ def execute(*cmd, **kwargs):
+ check_exit_code = [check_exit_code]
+ 
+ if kwargs:
+-raise UnknownArgumentError(_('Got unknown keyword args '
+- 'to utils.execute: %r') % kwargs)
++raise UnknownArgumentError(_('Got unknown keyword args: %r') % kwargs)
+ 
+ if run_as_root and hasattr(os, 'geteuid') and os.geteuid() != 0:
+ if not root_helper:
+@@ -168,23 +180,32 @@ def execute(*cmd, **kwargs):
+close_fds=close_fds,
+preexec_fn=preexec_fn,
+shell=shell)
+-result = None
+-for _i in six.moves.range(20):
+-# NOTE(russellb) 20 is an arbitrary number of retries to
+-# prevent any 

Bug#796379: jessie-pu: package bareos/14.2.1+20141017gitc6c5b56-3+deb8u1

2015-08-28 Thread Evgeni Golov
control: tags -1 - moreinfo

Hi Adam,

thanks for looking into this.

On Thu, Aug 27, 2015 at 09:28:05PM +0100, Adam D. Barratt wrote:
 Control: tags -1 + moreinfo
 
 On Fri, 2015-08-21 at 17:39 +0200, Evgeni Golov wrote:
  I'd love to update bareos in jessie to fix #788543 (backup corruption).
  While at it, I thought it would be a good idea to also enable autopkgtests.
  Sadly the upstream testsuite wants to create it's own database,
  so I had to patch that part out (and can totally see if you would not like
  that).
 
 I'm debating the test question a bit, but a quick query - what happens
 when starting the services if no database has been created? (i.e. what
 will the autopkgtest actually end up testing?)

if there is really no database configured, the start (and thus the test) 
will fail. but the packaging does already create databases with 
dbconfig-common, so the db creation in the test is useles (and actually 
harmful, as it would hide dbconfig-common problems).

so with the patch, adt will test the installed bareos using the 
dbconfig-common created database.

hope this clarifies it for you

Greets
Evgeni

-- 
Bruce Schneier can read and understand Perl programs.



NEW changes in oldstable-new

2015-08-28 Thread Debian FTP Masters
Processing changes file: unrar-nonfree_4.1.4-1+deb7u1_ia64.changes
  ACCEPT



Bug#797213: wheezy-pu: package partconf/1.40+deb7u1

2015-08-28 Thread Cyril Brulebois
Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian@packages.debian.org
Usertags: pu

[ cc: debian-b...@lists.debian.org, mi...@physics.harvard.edu ]

Hi,

A fix for a very old bug was committed during the jessie release
cycle, but I had been initially reluctant to pushing it for a point
release as it had received little testing. It's been a very long time
now, and I'm not aware of related regressions, so let's go for it?

Changelog entry:
| partconf (1.40+deb7u1) wheezy; urgency=low
| 
|   [ Milan Kupcevic ]
|   * Exclude CD/DVD drives from partition search. (thanks, Frank Fegert)
| Closes: #332227
| 
|  -- Cyril Brulebois k...@debian.org  Fri, 28 Aug 2015 17:31:58 +0200

and patch attached.

Thanks for your time.

Mraw,
KiBi.
diff -Nru partconf-1.40/debian/changelog partconf-1.40+deb7u1/debian/changelog
--- partconf-1.40/debian/changelog	2012-10-20 18:12:50.0 +0200
+++ partconf-1.40+deb7u1/debian/changelog	2015-08-28 17:32:02.0 +0200
@@ -1,3 +1,11 @@
+partconf (1.40+deb7u1) wheezy; urgency=low
+
+  [ Milan Kupcevic ]
+  * Exclude CD/DVD drives from partition search. (thanks, Frank Fegert)
+Closes: #332227
+
+ -- Cyril Brulebois k...@debian.org  Fri, 28 Aug 2015 17:31:58 +0200
+
 partconf (1.40) unstable; urgency=low
 
   [ Updated translations ]
diff -Nru partconf-1.40/find-parts.c partconf-1.40+deb7u1/find-parts.c
--- partconf-1.40/find-parts.c	2011-01-19 05:53:21.0 +0100
+++ partconf-1.40+deb7u1/find-parts.c	2015-08-28 17:31:52.0 +0200
@@ -113,6 +113,60 @@
 fclose(fp);
 }
 
+/**
+ * Determine if a device is a CD-ROM/DVD based on major/minor device
+ * number. Based on information from Linux's Documentation/devices.txt.
+ */
+bool
+is_cdrom(const char * const device_name)
+{
+struct stat st;
+
+if (stat(device_name, st) != 0)
+return false;
+
+switch (major(st.st_rdev)) {
+case 11: /* SCSI CD-ROM devices */
+case 113: /* Parallel port ATAPI CD-ROM devices */
+return true;
+default:
+break;
+}
+
+if (minor(st.st_rdev) == 0) {
+switch (major(st.st_rdev)) {
+case 15: /* Sony CDU-31A/CDU-33A CD-ROM */
+case 16: /* GoldStar CD-ROM */
+case 17: /* Optics Storage CD-ROM */
+case 18: /* Sanyo CD-ROM */
+case 20: /* Hitachi CD-ROM */
+case 23: /* Mitsumi proprietary CD-ROM */
+case 24: /* Sony CDU-535 CD-ROM */
+case 29: /* Aztech/Orchid/Okano/Wearnes CD-ROM */
+case 30: /* Philips LMS CM-205 CD-ROM */
+case 32: /* Philips LMS CM-206 CD-ROM */
+return true;
+default:
+break;
+}
+}
+
+if (minor(st.st_rdev) = 0  minor(st.st_rdev) = 3) {
+switch (major(st.st_rdev)) {
+case 25: /* First Matsushita (Panasonic/SoundBlaster: CD-ROM */
+case 26: /* Second Matsushita (Panasonic/SoundBlaster: CD-ROM */
+case 27: /* Fourth Matsushita (Panasonic/SoundBlaster: CD-ROM */
+case 28: /* Third Matsushita (Panasonic/SoundBlaster: CD-ROM */
+case 46: /* Parallel port ATAPI CD-ROM devices */
+return true;
+default:
+break;
+}
+}
+
+return false;
+}
+
 #ifndef FIND_PARTS_MAIN
 int
 block_partition(const char *part)
@@ -182,6 +236,8 @@
 continue;
 if (strstr(dev-path, /dev/mtd) == dev-path)
 continue;
+if (is_cdrom(dev-path))
+continue;
 if (!ped_disk_probe(dev))
 continue;
 disk = ped_disk_new(dev);


Re: Please dak copy-installer 20150828 hint it into testing

2015-08-28 Thread Ansgar Burchardt
Cyril Brulebois k...@debian.org writes:
 FTPmasters, please sync the installer from sid to testing:

   dak copy-installer 20150828

Done.

Ansgar



Bug#797209: jessie-pu: package grub-installer/1.117+deb8u1

2015-08-28 Thread Cyril Brulebois
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

[ cc: debian-b...@lists.debian.org, i...@hellion.org.uk ]

Hi,

Ian prepared a backport of a fix to grub-installer, which currently
fails to propagate a variable to the installed system. Changelog entry:
| grub-installer (1.117+deb8u1) jessie; urgency=medium
| 
|   [ Ian Campbell ]
|   * Correctly propagate grub-installer/force-efi-extra-removable to installed
| system. (Closes: #792247).
| 
|  -- Cyril Brulebois k...@debian.org  Fri, 28 Aug 2015 17:20:01 +0200

and patch attached.

Please tell us whether that looks OK and if timing for next point
release still allows that.

Thanks for your time.

Mraw,
KiBi.
diff -Nru grub-installer-1.117/debian/changelog grub-installer-1.117+deb8u1/debian/changelog
--- grub-installer-1.117/debian/changelog	2015-04-22 06:48:31.0 +0200
+++ grub-installer-1.117+deb8u1/debian/changelog	2015-08-28 17:20:41.0 +0200
@@ -1,3 +1,11 @@
+grub-installer (1.117+deb8u1) jessie; urgency=medium
+
+  [ Ian Campbell ]
+  * Correctly propagate grub-installer/force-efi-extra-removable to installed
+system. (Closes: #792247).
+
+ -- Cyril Brulebois k...@debian.org  Fri, 28 Aug 2015 17:20:01 +0200
+
 grub-installer (1.117) unstable; urgency=low
 
   [ Updated translations ]
diff -Nru grub-installer-1.117/grub-installer grub-installer-1.117+deb8u1/grub-installer
--- grub-installer-1.117/grub-installer	2015-01-13 05:01:14.0 +0100
+++ grub-installer-1.117+deb8u1/grub-installer	2015-08-28 17:19:14.0 +0200
@@ -809,7 +809,7 @@
 			grub_install_params=$grub_install_params --force-extra-removable
 			# Make sure this happens on upgrades too
 			$chroot $ROOT 'debconf-set-selections' EOF
-grub2/force_efi_extra_removable boolean true
+$grub_package grub2/force_efi_extra_removable boolean true
 EOF
 		fi
 


Processed: reassign 791134 to release.debian.org

2015-08-28 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 reassign 791134 release.debian.org
Bug #791134 {Done: Julien Cristau jcris...@debian.org} [src:libktoblzcheck] 
libktoblzcheck: library transition may be needed when GCC 5 is the default
Bug reassigned from package 'src:libktoblzcheck' to 'release.debian.org'.
No longer marked as found in versions libktoblzcheck/1.48-2.
No longer marked as fixed in versions 1.48-2.1.
 thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
791134: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791134
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems



Quick Question

2015-08-28 Thread Larry North

Hey there,

Not sure if you got my last email but wanted to touch base again.
I was wondering if you wanted to try our email marketing and lead
generation solutions.
We can help to grow your business fast by using our services.
We have worked on a number of projects and campaigns, all our packages are
tailor made and designed
according to your requirements.

If you are interested, I would be more than happy to reach out with more
information
and develop a plan that works with your business type.

Thanks,
Larry
Contact: mor...@tom.com



Re: Please dak copy-installer 20150828 hint it into testing

2015-08-28 Thread Cyril Brulebois
Hi,

Ansgar Burchardt ans...@debian.org (2015-08-28):
 Cyril Brulebois k...@debian.org writes:
  FTPmasters, please sync the installer from sid to testing:
 
dak copy-installer 20150828
 
 Done.
 
 Ansgar

Thanks; Steve, feel free to start building images whenever you see the
20150828 files reach stretch (after 1952 dinstall if my count is
correct) or wait until you see debian-installer's source in testing.

(It needs a urgent, maybe a force, depending on whether/when the BTS is
fixed as far as exporting RC bugs is concerned.)

Mraw,
KiBi.


signature.asc
Description: Digital signature


Bug#797083: jessie-pu: package apache2/2.4.10-10+deb8u2

2015-08-28 Thread Stefan Fritsch
On Thursday 27 August 2015 21:19:13, Adam D. Barratt wrote:
 [ Jean-Michel Vourgère ]
 * apache2.postinst: Fixed tests on deferred mpm switch.
 Closes: #789914

It turns out that this fix is not complete. As we are now not 100% 
sure that it does not make things worse, we would prefer to not have 
it in 8.2.

 Please go ahead, bearing in mind that the window for 8.2 closes this
 weekend.

Since I would really like the other fixes to get into 8.2, I am 
uploading 2.4.10-10+deb8u3 now:

apache2 (2.4.10-10+deb8u3) jessie; urgency=medium

  * Revert fix for deferred mpm switch for now, because it is at least
not complete or maybe causes regressions (see #791902). Re-opens
#789914

 -- Stefan Fritsch s...@debian.org  Fri, 28 Aug 2015 18:24:17 +0200


This reverts the apache2.postinst part of the 2.4.10-10+deb8u2 diff.

Sorry for the hassle.

Cheers,
Stefan



NEW changes in oldstable-new

2015-08-28 Thread Debian FTP Masters
Processing changes file: unrar-nonfree_4.1.4-1+deb7u1_mips.changes
  ACCEPT



Bug#797246: jessie-pu: package glibc/2.19-18+deb8u1

2015-08-28 Thread Aurelien Jarno
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

I would like to update the glibc in jessie using the upstream stable
branch. It only contains 3 small commits, fixing important bugs and
one security issue:

- Fix pthread_mutex_trylock with lock elision.  Closes: #759197,
  #788999.
- Fix gprof entry point on ppc64el.  Closes: #794222.
- Fix a bugger overflow in overflow in getanswer_r (CVE-2015-1781)
  Closes: #796105.

You'll fine the debdiff compared to the jessie version attached.

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Index: changelog
===
--- changelog
+++ changelog
@@ -1,3 +1,15 @@
+glibc (2.19-18+deb8u1) stable; urgency=medium
+
+  [ Aurelien Jarno ]
+  * Update from upstream stable branch:
+- Fix pthread_mutex_trylock with lock elision.  Closes: #759197,
+  #788999.
+- Fix gprof entry point on ppc64el.  Closes: #794222.
+- Fix a bugger overflow in overflow in getanswer_r (CVE-2015-1781)
+  Closes: #796105.
+
+ -- Aurelien Jarno aure...@debian.org  Fri, 28 Aug 2015 23:25:37 +0200
+
 glibc (2.19-18) unstable; urgency=medium
 
   [ Aurelien Jarno ]
Index: patches/git-updates.diff
===
--- patches/git-updates.diff
+++ patches/git-updates.diff
@@ -1,10 +1,30 @@
 GIT update of git://sourceware.org/git/glibc.git/release/2.19/master from glibc-2.19
 
 diff --git a/ChangeLog b/ChangeLog
-index 81c393a..cecd6ec 100644
+index 81c393a..0eb6c3f 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,321 @@
+@@ -1,3 +1,341 @@
++2015-04-21  Arjun Shankar  arjun...@lostca.se
++
++	[BZ #18287]
++	* resolv/nss_dns/dns-host.c (getanswer_r): Adjust buffer length
++	based on padding.  (CVE-2015-1781)
++
++2014-12-11  Andreas Schwab  sch...@suse.de
++
++	[BZ #16657]
++	* nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): Use
++	FORCE_ELISION instead of DO_ELISION.
++	* nptl/sysdeps/unix/sysv/linux/x86/force-elision.h (DO_ELISION):
++	Remove.
++
++2013-07-29  Adhemerval Zanella  azane...@linux.vnet.ibm.com
++
++	[BZ #17213]
++	* sysdeps/powerpc/powerpc64/entry.h: Fix TEXT_START definition for
++	powerpc64le.
++
 +2014-11-11  Renlin Li  renlin...@arm.com
 +
 +	[BZ #17555]
@@ -327,10 +347,10 @@
  
  	[BZ #16529]
 diff --git a/NEWS b/NEWS
-index 98b479e..d74f4a6 100644
+index 98b479e..7f9388f 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -5,6 +5,51 @@ See the end for copying conditions.
+@@ -5,6 +5,59 @@ See the end for copying conditions.
  Please send GNU C library bug reports via http://sourceware.org/bugzilla/
  using `glibc' in the product field.
  
@@ -338,9 +358,17 @@
 +
 +* The following bugs are resolved with this release:
 +
-+  15946, 16545, 16574, 16623, 16695, 16878, 16882, 16885, 16916, 16932,
-+  16943, 16958, 17048, 17069, 17137, 17263, 17325, 17555.
++  15946, 16545, 16574, 16623, 16657, 16695, 16878, 16882, 16885, 16916,
++  16932, 16943, 16958, 17048, 17069, 17137, 17213, 17263, 17325, 17555,
++  18287.
 +
++* A buffer overflow in gethostbyname_r and related functions performing DNS
++  requests has been fixed.  If the NSS functions were called with a
++  misaligned buffer, the buffer length change due to pointer alignment was
++  not taken into account.  This could result in application crashes or,
++  potentially arbitrary code execution, using crafted, but syntactically
++  valid DNS responses.  (CVE-2015-1781)
++
 +* Reverted change of ABI data structures for s390 and s390x:
 +  On s390 and s390x the size of struct ucontext and jmp_buf was increased in
 +  2.19. This change is reverted in 2.19.1 and 2.20. The introduced 2.19 symbol
@@ -1354,6 +1382,40 @@
  	tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
  	tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \
  	tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \
+diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
+index 4d5f75d..1157320 100644
+--- a/nptl/pthread_mutex_trylock.c
 b/nptl/pthread_mutex_trylock.c
+@@ -26,8 +26,8 @@
+ #define lll_trylock_elision(a,t) lll_trylock(a)
+ #endif
+ 
+-#ifndef DO_ELISION
+-#define DO_ELISION(m) 0
++#ifndef FORCE_ELISION
++#define FORCE_ELISION(m, s)
+ #endif
+ 
+ /* We don't force elision in trylock, because this can lead to inconsistent
+@@ -69,7 +69,7 @@ __pthread_mutex_trylock (mutex)
+   break;
+ 
+ case PTHREAD_MUTEX_TIMED_ELISION_NP:
+-elision:
++elision: __attribute__((unused))
+   if (lll_trylock_elision (mutex-__data.__lock,
+ 			   mutex-__data.__elision) != 0)
+