from:"Florian Schlichting"

Bug#984494: unblock: xpdf/3.04+git20210103-2

2021-03-04 Thread Florian Schlichting

Hi Paul,

> > As an unrelated issue, I just noticed after uploading -2 that the
> > -D_FORTIFY_SOURCE=2 hardening buildflag fails to be correctly injected.
> > This can apparently be fixed by a small change to debian/rules:
> > 
> >  export DEB_BUILD_MAINT_OPTIONS=hardening=+all
> > 
> > -export CPPFLAGS+=-DHAVE_PAPER_H
> > +export DEB_CPPFLAGS_MAINT_APPEND = -DHAVE_PAPER_H
> > 
> > Does the release team consider this a permissible change for the hard
> > freeze, and should I upload a -3 straight away so that one unblock will
> > suffice for both fixes?
> 
> Please go ahead with that. Sounds like something we want for a PDF viewer.

yes, thank you!

xpdf 3.04+git20210103-3 is on its way to the archive, the complete
debdiff follows below.

Florian


diff -Nru xpdf-3.04+git20210103/debian/changelog 
xpdf-3.04+git20210103/debian/changelog
--- xpdf-3.04+git20210103/debian/changelog  2021-01-28 15:58:32.0 
+0800
+++ xpdf-3.04+git20210103/debian/changelog  2021-03-04 22:41:56.0 
+0800
@@ -1,3 +1,15 @@
+xpdf (3.04+git20210103-3) unstable; urgency=medium
+
+  * Fix automatic injection of hardening buildflags
+
+ -- Florian Schlichting   Thu, 04 Mar 2021 22:41:56 +0800
+
+xpdf (3.04+git20210103-2) unstable; urgency=medium
+
+  * Fix printing when no psLevel is defined in xpdfrc (closes: #983880)
+
+ -- Florian Schlichting   Thu, 04 Mar 2021 14:20:04 +0800
+
 xpdf (3.04+git20210103-1) unstable; urgency=medium
 
   * Import new upstream version 3.04+git20210103
diff -Nru xpdf-3.04+git20210103/debian/patches/983880.patch 
xpdf-3.04+git20210103/debian/patches/983880.patch
--- xpdf-3.04+git20210103/debian/patches/983880.patch   1970-01-01 
08:00:00.0 +0800
+++ xpdf-3.04+git20210103/debian/patches/983880.patch   2021-03-04 
14:17:41.0 +0800
@@ -0,0 +1,23 @@
+commit 1b27cc5bb4491aed9d65c9f98704a693e3aabe59
+Author: Adam Sampson 
+Date:   Wed Mar 3 14:14:52 2021 +
+
+Initialise XPDFParams::psLevel.
+
+This meant that PostScript output didn't work unless you specified
+psLevel explicitly in the config file.
+
+Reported by Frédéric Brière in Debian bug #983880.
+
+diff --git a/xpdf/XPDFParams.cc b/xpdf/XPDFParams.cc
+index 4929bed..f33dd1e 100644
+--- a/xpdf/XPDFParams.cc
 b/xpdf/XPDFParams.cc
+@@ -159,6 +159,7 @@ XPDFParams::XPDFParams(const char *cfgFileName) {
+   psImageableURY = psPaperHeight;
+   psCrop = true;
+   psDuplex = false;
++  psLevel = psLevel2;
+   initialZoom = "125";
+   continuousView = false;
+   createDefaultKeyBindings();
diff -Nru xpdf-3.04+git20210103/debian/patches/series 
xpdf-3.04+git20210103/debian/patches/series
--- xpdf-3.04+git20210103/debian/patches/series 2021-01-28 14:22:16.0 
+0800
+++ xpdf-3.04+git20210103/debian/patches/series 2021-03-04 15:09:53.0 
+0800
@@ -1 +1,2 @@
 wrapper-options-manpage.patch
+983880.patch
diff -Nru xpdf-3.04+git20210103/debian/rules xpdf-3.04+git20210103/debian/rules
--- xpdf-3.04+git20210103/debian/rules  2021-01-28 14:12:37.0 +0800
+++ xpdf-3.04+git20210103/debian/rules  2021-03-04 15:10:10.0 +0800
@@ -2,7 +2,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-export CPPFLAGS+=-DHAVE_PAPER_H
+export DEB_CPPFLAGS_MAINT_APPEND = -DHAVE_PAPER_H
 export LIBS+=-lpaper
 
 %:

Bug#984494: unblock: xpdf/3.04+git20210103-2

2021-03-03 Thread Florian Schlichting

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package xpdf

-2 that I just uploaded contains a one-line patch correctly initializing the
psLevel variable. This fixes the PostScript generated for printing in
all cases where the user hasn't set a psLevel manually in the config
file. This was reported in #983880 and promptly fixed by Upstream.

I think printing PDFs is one of the most common things people do with
xpdf (apart from simply viewing them, of course), and since this is a
regression from the previous version, getting a fixed version into
bullseye is very important IMHO.

see source debdiff below.

unblock xpdf/3.04+git20210103-2


As an unrelated issue, I just noticed after uploading -2 that the
-D_FORTIFY_SOURCE=2 hardening buildflag fails to be correctly injected.
This can apparently be fixed by a small change to debian/rules:

 export DEB_BUILD_MAINT_OPTIONS=hardening=+all

-export CPPFLAGS+=-DHAVE_PAPER_H
+export DEB_CPPFLAGS_MAINT_APPEND = -DHAVE_PAPER_H

Does the release team consider this a permissible change for the hard
freeze, and should I upload a -3 straight away so that one unblock will
suffice for both fixes?

thanks,
Florian


diff -Nru xpdf-3.04+git20210103/debian/changelog 
xpdf-3.04+git20210103/debian/changelog
--- xpdf-3.04+git20210103/debian/changelog  2021-01-28 15:58:32.0 
+0800
+++ xpdf-3.04+git20210103/debian/changelog  2021-03-04 14:20:04.0 
+0800
@@ -1,3 +1,9 @@
+xpdf (3.04+git20210103-2) unstable; urgency=medium
+
+  * Fix printing when no psLevel is defined in xpdfrc (closes: #983880)
+
+ -- Florian Schlichting   Thu, 04 Mar 2021 14:20:04 +0800
+
 xpdf (3.04+git20210103-1) unstable; urgency=medium
 
   * Import new upstream version 3.04+git20210103
diff -Nru xpdf-3.04+git20210103/debian/patches/983880.patch 
xpdf-3.04+git20210103/debian/patches/983880.patch
--- xpdf-3.04+git20210103/debian/patches/983880.patch   1970-01-01 
08:00:00.0 +0800
+++ xpdf-3.04+git20210103/debian/patches/983880.patch   2021-03-04 
14:17:41.0 +0800
@@ -0,0 +1,23 @@
+commit 1b27cc5bb4491aed9d65c9f98704a693e3aabe59
+Author: Adam Sampson 
+Date:   Wed Mar 3 14:14:52 2021 +
+
+Initialise XPDFParams::psLevel.
+
+This meant that PostScript output didn't work unless you specified
+psLevel explicitly in the config file.
+
+Reported by Frédéric Brière in Debian bug #983880.
+
+diff --git a/xpdf/XPDFParams.cc b/xpdf/XPDFParams.cc
+index 4929bed..f33dd1e 100644
+--- a/xpdf/XPDFParams.cc
 b/xpdf/XPDFParams.cc
+@@ -159,6 +159,7 @@ XPDFParams::XPDFParams(const char *cfgFileName) {
+   psImageableURY = psPaperHeight;
+   psCrop = true;
+   psDuplex = false;
++  psLevel = psLevel2;
+   initialZoom = "125";
+   continuousView = false;
+   createDefaultKeyBindings();
diff -Nru xpdf-3.04+git20210103/debian/patches/series 
xpdf-3.04+git20210103/debian/patches/series
--- xpdf-3.04+git20210103/debian/patches/series 2021-01-28 14:22:16.0 
+0800
+++ xpdf-3.04+git20210103/debian/patches/series 2021-03-04 14:17:21.0 
+0800
@@ -1 +1,2 @@
 wrapper-options-manpage.patch
+983880.patch

Bug#980799: buster-pu: package irssi-plugin-xmpp/0.54-3

2021-01-22 Thread Florian Schlichting

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

As explained in #931886 / upstream at
https://github.com/cdidier/irssi-xmpp/issues/43, due to recent changes
in irssi, irssi-plugin-xmpp in buster is unable to establish STARTTLS
connections because the connect timeout triggers prematurely.

This update contains a one-line patch that allows the intended
connection timeout to take effect.

I have verified that this bug is present in the version of
irssi-plugin-xmpp in buster and fixed by this proposed update. A
corresponding fix has just been uploaded to unstable as part of
irssi-plugin-xmpp 0.54+git20191101+c13fa5-1.

As I think the change is rather trivial and low-risk, I take the liberty
to upload to buster-pu right away. Debdiff below.

Florian


diff -Nru irssi-plugin-xmpp-0.54/debian/changelog 
irssi-plugin-xmpp-0.54/debian/changelog
--- irssi-plugin-xmpp-0.54/debian/changelog 2019-03-27 19:57:14.0 
+0800
+++ irssi-plugin-xmpp-0.54/debian/changelog 2021-01-22 21:53:27.0 
+0800
@@ -1,3 +1,11 @@
+irssi-plugin-xmpp (0.54-3+deb10u1) buster; urgency=medium
+
+  * Cherry-pick bug931886.patch from upstream to not trigger the irssi core
+connect timeout prematurely, thus fixing STARTTLS connections
+(closes: #931886)
+
+ -- Florian Schlichting   Fri, 22 Jan 2021 21:53:27 +0800
+
 irssi-plugin-xmpp (0.54-3) unstable; urgency=medium
 
   * drop -dbg→-dbgsym transition (no longer needed)
diff -Nru irssi-plugin-xmpp-0.54/debian/patches/bug931886.patch 
irssi-plugin-xmpp-0.54/debian/patches/bug931886.patch
--- irssi-plugin-xmpp-0.54/debian/patches/bug931886.patch   1970-01-01 
08:00:00.0 +0800
+++ irssi-plugin-xmpp-0.54/debian/patches/bug931886.patch   2021-01-22 
21:53:06.0 +0800
@@ -0,0 +1,16 @@
+commit 57c62278b97aeb999f3ca2e2b8a492f364405b61
+Author: Ailin Nemui 
+Date:   Tue Jan 29 21:37:05 2019 +0100
+
+do not trigger the irssi core connect timeout prematurely
+
+--- a/src/core/xmpp-servers.c
 b/src/core/xmpp-servers.c
+@@ -528,6 +528,7 @@
+   }
+   lm_connection_set_disconnect_function(server->lmconn,
+   lm_close_cb, server, NULL);
++  server->connect_time = time(NULL);
+   lookup_servers = g_slist_append(lookup_servers, server);
+   signal_emit("server looking", 1, server);
+   server->timeout_tag = g_timeout_add(
diff -Nru irssi-plugin-xmpp-0.54/debian/patches/series 
irssi-plugin-xmpp-0.54/debian/patches/series
--- irssi-plugin-xmpp-0.54/debian/patches/series2019-03-27 
19:57:14.0 +0800
+++ irssi-plugin-xmpp-0.54/debian/patches/series2021-01-22 
21:52:47.0 +0800
@@ -42,3 +42,4 @@
 ailin-nemui-0008-Add-support-for-messages-coming-directly-from-room.patch
 ailin-nemui-0009-Add-support-for-mode-change-in-MUC.patch
 comparison-between-pointer-and-zero-character-constant.patch
+bug931886.patch

Bug#922904: RM: libcpan-meta-perl/2.150010-2

2019-02-21 Thread Florian Schlichting

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: rm

please remove libcpan-meta-perl from testing

This is a separately packaged version of a module that is also bundled
with Perl core. There is no value in releasing buster with this as a
separate package.

Bug #915876 (serious) was filed against libcpan-meta-perl in December to
have the package auto-removed and kept out of buster, but this doesn't
seem to have been effective, hence I'm asking for manual removal now.

Florian

Bug#922903: RM: libautodie-perl/2.29-2

2019-02-21 Thread Florian Schlichting

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: rm

please remove libautodie-perl from testing

This is a separately packaged version of a module that is also bundled
with Perl core. There is no value in releasing buster with this as a
separate package.

Bug #915550 (serious) was filed against libautodie-perl in December to
have the package auto-removed and kept out of buster, but this doesn't
seem to have been effective, hence I'm asking for manual removal now.

Florian

Bug#912425: stretch-pu: package libxml-stream-perl/1.24-2

2018-10-31 Thread Florian Schlichting

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

libxml-stream-perl in Stretch turns on verification of SSL certificates
by default, but fails to provide a default path to the CA root
certificates, without which all encrypted connections fail.

In Debian, the default set of certificates is located in /etc/ssl/certs,
so instead - or in addition to - fixing every program using
libxml-stream-perl behind the curtain (such as sendxmpp), this update
ensures a working set of defaults.

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (900, 'testing'), (800, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.18.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), 
LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru libxml-stream-perl-1.24/debian/changelog 
libxml-stream-perl-1.24/debian/changelog
--- libxml-stream-perl-1.24/debian/changelog2015-06-05 22:03:56.0 
+0200
+++ libxml-stream-perl-1.24/debian/changelog2018-10-31 12:00:40.0 
+0100
@@ -1,3 +1,9 @@
+libxml-stream-perl (1.24-2+deb9u1) stretch; urgency=medium
+
+  * Provide a default CA path (closes: #908027, LP: 1774614)
+
+ -- Florian Schlichting   Wed, 31 Oct 2018 12:00:40 +0100
+
 libxml-stream-perl (1.24-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru libxml-stream-perl-1.24/debian/patches/default-ca-path.patch 
libxml-stream-perl-1.24/debian/patches/default-ca-path.patch
--- libxml-stream-perl-1.24/debian/patches/default-ca-path.patch
1970-01-01 01:00:00.0 +0100
+++ libxml-stream-perl-1.24/debian/patches/default-ca-path.patch
2018-10-31 11:59:27.0 +0100
@@ -0,0 +1,18 @@
+Description: provide a default ssl_ca_path
+ ssl_verify is on by default, but will fail unless provided with a valid
+ ssl_ca_path. On Debian, commonly trusted CA certificates are stored in
+ /etc/ssl/certs
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908027
+Forwarded: https://github.com/dap/XML-Stream/issues/19
+
+--- a/lib/XML/Stream.pm
 b/lib/XML/Stream.pm
+@@ -220,7 +220,7 @@
+ $self->{SIDS}->{default}->{ssl} = 0;
+ $self->{SIDS}->{default}->{_tls} = 0;
+ $self->{SIDS}->{default}->{ssl_verify} = 0x01; # verify peer by default
+-$self->{SIDS}->{default}->{ssl_ca_path} = '';
++$self->{SIDS}->{default}->{ssl_ca_path} = '/etc/ssl/certs';
+ $self->{SIDS}->{default}->{namespace} = "";
+ $self->{SIDS}->{default}->{myhostname} = $fullname;
+ $self->{SIDS}->{default}->{derivedhostname} = $fullname;
diff -Nru libxml-stream-perl-1.24/debian/patches/series 
libxml-stream-perl-1.24/debian/patches/series
--- libxml-stream-perl-1.24/debian/patches/series   2015-06-05 
22:03:56.0 +0200
+++ libxml-stream-perl-1.24/debian/patches/series   2018-10-31 
11:59:27.0 +0100
@@ -1 +1,2 @@
 t_upstream_uninitialized_value.diff
+default-ca-path.patch

Bug#863403: unblock: live-wrapper/0.6+nmu1

2017-05-26 Thread Florian Schlichting

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package live-wrapper

It fixes an RC bug (#861994, "Lacks dependency on python-pycurl") and adds
three missing build-dependencies needed to build all of the lwr autodocs.

diff -Nru live-wrapper-0.6/debian/changelog 
live-wrapper-0.6+nmu1/debian/changelog
--- live-wrapper-0.6/debian/changelog   2017-01-23 03:39:31.0 +0100
+++ live-wrapper-0.6+nmu1/debian/changelog  2017-05-16 23:31:36.0 
+0200
@@ -1,3 +1,12 @@
+live-wrapper (0.6+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add a dependency on python-pycurl, needed by lwr (closes: #861994)
+  * Add Build-Depends: python-apt, python-cliapp, vmdebootstrap needed to
+completely build the lwr autodoc
+
+ -- Florian Schlichting <f...@debian.org>  Tue, 16 May 2017 23:31:36 +0200
+
 live-wrapper (0.6) unstable; urgency=medium
 
   [ Ana C. Custura ]
diff -Nru live-wrapper-0.6/debian/control live-wrapper-0.6+nmu1/debian/control
--- live-wrapper-0.6/debian/control 2017-01-22 23:30:58.0 +0100
+++ live-wrapper-0.6+nmu1/debian/control2017-05-16 23:31:36.0 
+0200
@@ -6,8 +6,11 @@
 Build-Depends: debhelper (>= 9),
dh-python,
python-all,
+   python-apt,
+   python-cliapp,
python-setuptools,
-   python-sphinx
+   python-sphinx,
+   vmdebootstrap
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-live/live-wrapper.git
 Vcs-Git: https://anonscm.debian.org/git/debian-live/live-wrapper.git
--- live-wrapper-0.6/setup.py   2017-01-08 00:44:10.0 +0100
+++ live-wrapper-0.6+nmu1/setup.py  2017-05-16 23:31:36.0 +0200
@@ -41,6 +41,7 @@
 'cliapp >= 1.20150829',
 'vmdebootstrap',
 'requests',
+'pycurl',
 'python-apt'
 ],
 entry_points={


unblock live-wrapper/0.6+nmu1

-- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (990, 'testing'), (700, 'unstable')
Architecture: amd64
 (x86_64)
Foreign Architectures: i386

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

Bug#844264: release.debian.org: Please clarify "Packages must autobuild without failure"

2016-12-21 Thread Florian Schlichting

On Wed, Dec 21, 2016 at 11:04:34PM +0100, Santiago Vila wrote:
> So, if establishing a threshold is the only way to achieve that for
> example Bug #843038 in "elki" is upgraded to serious again, so be it,
> but as I said, it would be a pity if we invest our time trying to
> estimate probabilities instead of actually ensuring that packages
> build all the time as a shared goal with reproducible builds.

Santiago, I think you're doing important work drawing attention to a
class of bugs that has long gone unnoticed.

However, you seem to suggest that simply disabling occasionally failing
tests will improve the quality of Debian. I'm not so sure about that.
Those tests might provide important coverage for high-level functions
our users actually care about, so I'd want those tests to get fixed
instead of disabled. But timing issues are hard to debug or even
reproduce on developers' machines, upstreams may need convincing, while
RC-bugs mere weeks before the freeze create enormous time pressure.

How can we ensure those tests aren't just disabled and forgotten?

Florian

Bug#767846: unblock: mpd/0.19.3-1

2014-11-13 Thread Florian Schlichting

 --enable-sidplay with --disable-glib])
 
 AC_ARG_ENABLE(shine-encoder,
AS_HELP_STRING([--enable-shine-encoder],
@@ -559,6 +577,8 @@
AS_HELP_STRING([--enable-sqlite],
[enable support for the SQLite database]),,
[enable_sqlite=$database_auto])
+MPD_DEPENDS([enable_sqlite], [enable_glib],
+   [Cannot use --enable-sqlite with --disable-glib])
 
 AC_ARG_ENABLE(systemd-daemon,
AS_HELP_STRING([--enable-systemd-daemon],
@@ -599,6 +619,8 @@
AS_HELP_STRING([--enable-vorbis-encoder],
[enable the Ogg Vorbis encoder]),,
[enable_vorbis_encoder=auto])
+MPD_DEPENDS([enable_vorbis_encoder], [enable_glib],
+   [Cannot use --enable-vorbis-encoder with --disable-glib])
 
 AC_ARG_ENABLE(wave-encoder,
AS_HELP_STRING([--enable-wave-encoder],
@@ -609,6 +631,8 @@
AS_HELP_STRING([--enable-wavpack],
[enable WavPack support]),,
enable_wavpack=auto)
+MPD_DEPENDS([enable_wavpack], [enable_glib],
+   [Cannot use --enable-wavpack with --disable-glib])
 
 AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror],
@@ -1709,8 +1733,11 @@
 dnl ---
 if test x$enable_documentation = xyes; then
AC_PATH_PROG(XMLTO, xmlto)
+   if test x$XMLTO = x; then
+   AC_MSG_ERROR([xmlto not found])
+   fi
+
AC_SUBST(XMLTO)
-   AM_CONDITIONAL(HAVE_XMLTO, test x$XMLTO != x)
 
AC_PATH_PROG(DOXYGEN, doxygen)
if test x$DOXYGEN = x; then
@@ -1718,8 +1745,6 @@
fi
 
AC_SUBST(DOXYGEN)
-else
-   AM_CONDITIONAL(HAVE_XMLTO, false)
 fi
 
 AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
@@ -1826,9 +1851,14 @@
 results(tcp, TCP)
 results(un,[UNIX Domain Sockets])
 
+printf '\nStorage support:\n\t'
+results(nfs, [NFS])
+results(smbclient, [SMB])
+
 printf '\nFile format support:\n\t'
 results(aac, [AAC])
 results(adplug, [AdPlug])
+results(dsd, [DSD])
 results(sidplay, [C64 SID])
 results(ffmpeg, [FFMPEG])
 results(flac, [FLAC])
diff -Nru mpd-0.19.1/debian/changelog mpd-0.19.3/debian/changelog
--- mpd-0.19.1/debian/changelog 2014-10-20 00:38:46.0 +0200
+++ mpd-0.19.3/debian/changelog 2014-11-13 21:49:32.0 +0100
@@ -1,3 +1,11 @@
+mpd (0.19.3-1) unstable; urgency=medium
+
+  * Import Upstream version 0.19.3 (closes: #767684, #769436)
+  * Disable libmp4v2 due to incompatible license (closes: #767504)
+  * Add charset_conversion_crash.patch (closes: #768094)
+
+ -- Florian Schlichting f...@debian.org  Thu, 13 Nov 2014 21:34:28 +0100
+
 mpd (0.19.1-1) unstable; urgency=medium
 
   * Import Upstream version 0.19.1
diff -Nru mpd-0.19.1/debian/patches/charset_conversion_crash.patch 
mpd-0.19.3/debian/patches/charset_conversion_crash.patch
--- mpd-0.19.1/debian/patches/charset_conversion_crash.patch1970-01-01 
01:00:00.0 +0100
+++ mpd-0.19.3/debian/patches/charset_conversion_crash.patch2014-11-13 
21:49:32.0 +0100
@@ -0,0 +1,19 @@
+Description: fix crash on failed filename charset conversion
+ Construct a Null AllocatedPath if the filename conversion into UTF8 failed
+Origin: 
http://git.musicpd.org/cgit/master/mpd.git/commit/?id=7e7b403043b55c2e1bb9227fce725ad87626ae97
+
+--- a/src/fs/AllocatedPath.cxx
 b/src/fs/AllocatedPath.cxx
+@@ -46,7 +46,11 @@
+ AllocatedPath::FromUTF8(const char *path_utf8)
+ {
+ #ifdef HAVE_GLIB
+-  return AllocatedPath(Donate(), ::PathFromUTF8(path_utf8));
++char *path = ::PathFromUTF8(path_utf8);
++if (path == nullptr)
++return AllocatedPath::Null();
++
++return AllocatedPath(Donate(), path);
+ #else
+   return FromFS(path_utf8);
+ #endif
diff -Nru mpd-0.19.1/debian/patches/series mpd-0.19.3/debian/patches/series
--- mpd-0.19.1/debian/patches/series2014-10-19 20:59:54.0 +0200
+++ mpd-0.19.3/debian/patches/series2014-11-13 21:49:32.0 +0100
@@ -1,2 +1,3 @@
 systemd_honor_MPDCONF.patch
+charset_conversion_crash.patch
 typo.patch
diff -Nru mpd-0.19.1/doc/doxygen.conf mpd-0.19.3/doc/doxygen.conf
--- mpd-0.19.1/doc/doxygen.conf 2014-10-11 20:26:19.0 +0200
+++ mpd-0.19.3/doc/doxygen.conf 2014-11-05 18:24:29.0 +0100
@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 0.19.1
+PROJECT_NUMBER = 0.19.3
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -534,7 +534,7 @@
 # directories like /usr/src/myproject. Separate the files or directories
 # with spaces.
 
-INPUT = /home/max/git/mpd/src/
+INPUT = /home/max/git/stable-mpd/src/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff -Nru mpd-0.19.1/m4/faad.m4 mpd-0.19.3/m4/faad.m4
--- mpd-0.19.1/m4/faad.m4

Bug#767846: unblock: mpd/0.19.2-1

2014-11-04 Thread Florian Schlichting

-encoder],
[enable the Ogg Vorbis encoder]),,
[enable_vorbis_encoder=auto])
+MPD_DEPENDS([enable_vorbis_encoder], [enable_glib],
+   [Cannot use --enable-vorbis-encoder with --disable-glib])
 
 AC_ARG_ENABLE(wave-encoder,
AS_HELP_STRING([--enable-wave-encoder],
@@ -609,6 +631,8 @@
AS_HELP_STRING([--enable-wavpack],
[enable WavPack support]),,
enable_wavpack=auto)
+MPD_DEPENDS([enable_wavpack], [enable_glib],
+   [Cannot use --enable-wavpack with --disable-glib])
 
 AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror],
@@ -1709,8 +1733,11 @@
 dnl ---
 if test x$enable_documentation = xyes; then
AC_PATH_PROG(XMLTO, xmlto)
+   if test x$XMLTO = x; then
+   AC_MSG_ERROR([xmlto not found])
+   fi
+
AC_SUBST(XMLTO)
-   AM_CONDITIONAL(HAVE_XMLTO, test x$XMLTO != x)
 
AC_PATH_PROG(DOXYGEN, doxygen)
if test x$DOXYGEN = x; then
@@ -1718,8 +1745,6 @@
fi
 
AC_SUBST(DOXYGEN)
-else
-   AM_CONDITIONAL(HAVE_XMLTO, false)
 fi
 
 AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
@@ -1826,9 +1851,14 @@
 results(tcp, TCP)
 results(un,[UNIX Domain Sockets])
 
+printf '\nStorage support:\n\t'
+results(nfs, [NFS])
+results(smbclient, [SMB])
+
 printf '\nFile format support:\n\t'
 results(aac, [AAC])
 results(adplug, [AdPlug])
+results(dsd, [DSD])
 results(sidplay, [C64 SID])
 results(ffmpeg, [FFMPEG])
 results(flac, [FLAC])
diff -Nru mpd-0.19.1/debian/changelog mpd-0.19.2/debian/changelog
--- mpd-0.19.1/debian/changelog 2014-10-20 00:38:46.0 +0200
+++ mpd-0.19.2/debian/changelog 2014-11-02 23:20:25.0 +0100
@@ -1,3 +1,10 @@
+mpd (0.19.2-1) unstable; urgency=medium
+
+  * Import Upstream version 0.19.2 (closes: #767684)
+  * Disable libmp4v2 due to incompatible license (closes: #767504)
+
+ -- Florian Schlichting f...@debian.org  Sun, 02 Nov 2014 23:19:28 +0100
+
 mpd (0.19.1-1) unstable; urgency=medium
 
   * Import Upstream version 0.19.1
diff -Nru mpd-0.19.1/doc/doxygen.conf mpd-0.19.2/doc/doxygen.conf
--- mpd-0.19.1/doc/doxygen.conf 2014-10-11 20:26:19.0 +0200
+++ mpd-0.19.2/doc/doxygen.conf 2014-11-02 12:28:00.0 +0100
@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 0.19.1
+PROJECT_NUMBER = 0.19.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -534,7 +534,7 @@
 # directories like /usr/src/myproject. Separate the files or directories
 # with spaces.
 
-INPUT = /home/max/git/mpd/src/
+INPUT = /home/max/git/stable-mpd/src/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff -Nru mpd-0.19.1/m4/faad.m4 mpd-0.19.2/m4/faad.m4
--- mpd-0.19.1/m4/faad.m4   2013-07-26 12:08:46.0 +0200
+++ mpd-0.19.2/m4/faad.m4   2014-10-25 20:41:52.0 +0200
@@ -62,36 +62,7 @@
CPPFLAGS=$oldcppflags
 fi
 
-if test x$enable_aac = xyes; then
-   oldcflags=$CFLAGS
-   oldlibs=$LIBS
-   oldcppflags=$CPPFLAGS
-   CFLAGS=$CFLAGS $FAAD_CFLAGS -Werror
-   LIBS=$LIBS $FAAD_LIBS
-   CPPFLAGS=$CFLAGS
-
-   AC_MSG_CHECKING(for broken libfaad headers)
-   AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include faad.h
-#include stddef.h
-#include stdint.h
-
-int main() {
-   unsigned char channels;
-   uint32_t sample_rate;
-
-   NeAACDecInit2(NULL, NULL, 0, sample_rate, channels);
-   return 0;
-}
-   ])],
-   [AC_MSG_RESULT(correct)],
-   [AC_MSG_RESULT(broken);
-   AC_DEFINE(HAVE_FAAD_LONG, 1, [Define if faad.h uses the broken 
unsigned long pointers])])
-
-   CFLAGS=$oldcflags
-   LIBS=$oldlibs
-   CPPFLAGS=$oldcppflags
-else
+if test x$enable_aac = xno; then
FAAD_LIBS=
FAAD_CFLAGS=
 fi
diff -Nru mpd-0.19.1/m4/mpd_depends.m4 mpd-0.19.2/m4/mpd_depends.m4
--- mpd-0.19.1/m4/mpd_depends.m41970-01-01 01:00:00.0 +0100
+++ mpd-0.19.2/m4/mpd_depends.m42014-10-25 00:28:53.0 +0200
@@ -0,0 +1,9 @@
+AC_DEFUN([MPD_DEPENDS], [
+   if test x$$2 = xno; then
+   if test x$$1 = xauto; then
+   $1=no
+   elif test x$$1 = xyes; then
+   AC_MSG_ERROR([$3])
+   fi
+   fi
+])
diff -Nru mpd-0.19.1/Makefile.am mpd-0.19.2/Makefile.am
--- mpd-0.19.1/Makefile.am  2014-10-12 08:41:09.0 +0200
+++ mpd-0.19.2/Makefile.am  2014-11-01 13:47:41.0 +0100
@@ -130,7 +130,6 @@
src/IOThread.cxx src/IOThread.hxx \
src/Instance.cxx src/Instance.hxx \
src/win32/Win32Main.cxx \
-   src/osx/OSXMain.cxx \
src/GlobalEvents.cxx src

Bug#767846: unblock: mpd/0.19.2-1

2014-11-02 Thread Florian Schlichting

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock / pre-approve package mpd

mpd 0.19.2 is a bugfix release in the stable mpd series. It fixes a
number of issues that would be good to have fixed in a stable Debian
release, only one of which (#767684, Stack smashing
detected in faad_decoder_init, important) has appeared in the Debian
BTS yet.

mpd will need an unblock to fix a license incompatibility issue
(#767504, serious), and I would like to fix as many important or
yet-to-be filed important bugs in the same upload. I realize the 0.19.1
to 0.19.2 diff (attached) is not very short and not strictly limited to
important bugs, so I'm asking for pre-approval before uploading to
unstable and hope for a favourable decision given that the freeze hasn't
technically started yet.

The full upstream changelog is as follows:

ver 0.19.2 (2014/11/02)
* input
  - curl: fix redirected streams
* playlist
  - don't allow empty playlist name
  - m3u: don't ignore unterminated last line
  - m3u: recognize the file suffix .m3u8
* decoder
  - ignore URI query string for plugin detection
  - faad: remove workaround for ancient libfaad2 ABI bug
  - ffmpeg: recognize MIME type audio/aacp
  - mad: fix negative replay gain values
* output
  - fix memory leak after filter initialization error
  - fall back to PCM if given DSD sample rate is not supported
* fix assertion failure on unsupported PCM conversion
* auto-disable plugins that require GLib when --disable-glib is used


unblock mpd/0.19.2-1
diff --git a/Makefile.am b/Makefile.am
index 2f3ab90..dac3e17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,7 +130,6 @@ libmpd_a_SOURCES = \
 	src/IOThread.cxx src/IOThread.hxx \
 	src/Instance.cxx src/Instance.hxx \
 	src/win32/Win32Main.cxx \
-	src/osx/OSXMain.cxx \
 	src/GlobalEvents.cxx src/GlobalEvents.hxx \
 	src/MixRampInfo.hxx \
 	src/MusicBuffer.cxx src/MusicBuffer.hxx \
@@ -2141,19 +2140,11 @@ user_DATA = $(wildcard doc/user/*.html)
 developerdir = $(docdir)/developer
 developer_DATA = $(wildcard doc/developer/*.html)
 
-if HAVE_XMLTO
-
 DOCBOOK_HTML = $(patsubst %.xml,%/index.html,$(DOCBOOK_FILES))
 
 $(DOCBOOK_HTML): %/index.html: %.xml
 	$(XMLTO) -o $(@D) --stringparam chunker.output.encoding=utf-8 html --stringparam use.id.as.filename=1 $
 
-else
-
-DOCBOOK_HTML =
-
-endif
-
 doc/api/html/index.html: doc/doxygen.conf
 	@$(MKDIR_P) $(@D)
 	$(DOXYGEN) $
diff --git a/NEWS b/NEWS
index 5a24844..e8e84ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+ver 0.19.2 (2014/11/02)
+* input
+  - curl: fix redirected streams
+* playlist
+  - don't allow empty playlist name
+  - m3u: don't ignore unterminated last line
+  - m3u: recognize the file suffix .m3u8
+* decoder
+  - ignore URI query string for plugin detection
+  - faad: remove workaround for ancient libfaad2 ABI bug
+  - ffmpeg: recognize MIME type audio/aacp
+  - mad: fix negative replay gain values
+* output
+  - fix memory leak after filter initialization error
+  - fall back to PCM if given DSD sample rate is not supported
+* fix assertion failure on unsupported PCM conversion
+* auto-disable plugins that require GLib when --disable-glib is used
+
 ver 0.19.1 (2014/10/19)
 * input
   - mms: fix deadlock bug
@@ -85,6 +103,15 @@ ver 0.19 (2014/10/10)
 * install systemd unit for socket activation
 * Android port
 
+ver 0.18.17 (2014/11/02)
+* playlist
+  - don't allow empty playlist name
+  - m3u: recognize the file suffix .m3u8
+* decoder
+  - ignore URI query string for plugin detection
+  - faad: remove workaround for ancient libfaad2 ABI bug
+  - ffmpeg: recognize MIME type audio/aacp
+
 ver 0.18.16 (2014/09/26)
 * fix DSD breakage due to typo in configure.ac
 
diff --git a/configure.ac b/configure.ac
index 3f90bb6..f689a9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 AC_PREREQ(2.60)
 
-AC_INIT(mpd, 0.19.1, musicpd-dev-t...@lists.sourceforge.net)
+AC_INIT(mpd, 0.19.2, musicpd-dev-t...@lists.sourceforge.net)
 
 VERSION_MAJOR=0
 VERSION_MINOR=19
-VERSION_REVISION=0
+VERSION_REVISION=2
 VERSION_EXTRA=0
 
 AC_CONFIG_SRCDIR([src/Main.cxx])
@@ -293,7 +293,9 @@ fi
 AC_ARG_ENABLE(libmpdclient,
 	AS_HELP_STRING([--enable-libmpdclient],
 		[enable support for the MPD client]),,
-	enable_libmpdclient=$database_auto)
+	enable_libmpdclient=auto)
+MPD_DEPENDS([enable_libmpdclient], [enable_database],
+	[Cannot use --enable-libmpdclient with --disable-database])
 
 AC_ARG_ENABLE(expat,
 	AS_HELP_STRING([--enable-expat],
@@ -303,7 +305,9 @@ AC_ARG_ENABLE(expat,
 AC_ARG_ENABLE(upnp,
 	AS_HELP_STRING([--enable-upnp],
 		[enable UPnP client support (default: auto)]),,
-	enable_upnp=$database_auto)
+	enable_upnp=auto)
+MPD_DEPENDS([enable_upnp], [enable_database],
+	[Cannot use --enable-upnp with --disable-database])
 
 AC_ARG_ENABLE(adplug,
 	AS_HELP_STRING([--enable-adplug],
@@ -323,6 +327,8 @@ AC_ARG_ENABLE(ao,

Bug#693111: unblock: libxml-stream-perl/1.23-2

2012-11-13 Thread Florian Schlichting

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package libxml-stream-perl

version 1.23-2 adds a small patch that corrects the argument handling
upon instantiation of a new XML::Stream::Parser, effectively preventing
two annoying warnings per use of 'sendxmpp'.

The full debdiff is in the bug report at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687059#34

unblock libxml-stream-perl/1.23-2

Thank you.
Florian


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/20121113080315.713563.46026.report...@island.zedat.fu-berlin.de

Bug#693108: unblock: libnet-xmpp-perl/1.02-3

2012-11-12 Thread Florian Schlichting

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package libnet-xmpp-perl

it contains a one-line fix that properly checks for the definedness of a
hash key before using it, thus preventing a warning, which can cause a
lot of meaningless emails to people who use xmpp from cron jobs.

The full debdiff is in the bug report at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626897#34

unblock libnet-xmpp-perl/1.02-3

Thank you.
Florian


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/20121113074029.707628.91739.report...@island.zedat.fu-berlin.de

Bug#684209: unblock: libmojomojo-perl/1.05+dfsg-3

2012-08-07 Thread Florian Schlichting

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package libmojomojo-perl

libmojomojo-perl/1.05+dfsg-3 contains a one-line fix picked from
upstream git, removing a workaround for a previous limitation in
Catalyst::Plugins::SubRequest. This limitation was fixed in a
backward-incompatible manner starting from Catalyst::Plugins::SubRequest
version 0.18, causing libmojomojo-perl to FTBFS.

Catalyst::Plugins::SubRequest version 0.18 is packaged as a part of
libcatalyst-modules-perl version 44, so in addition to patching the
upstream source, this upload tightens this dependency accordingly.

unblock libmojomojo-perl/1.05+dfsg-3

Thank you,
Florian

diff -Nru libmojomojo-perl-1.05+dfsg/debian/changelog 
libmojomojo-perl-1.05+dfsg/debian/changelog
--- libmojomojo-perl-1.05+dfsg/debian/changelog 2012-01-14 17:13:41.0 
+0100
+++ libmojomojo-perl-1.05+dfsg/debian/changelog 2012-08-07 20:36:07.0 
+0200
@@ -1,3 +1,11 @@
+libmojomojo-perl (1.05+dfsg-3) unstable; urgency=low
+
+  * Team upload.
+  * Fix FTBFS caused by updated Catalyst::Plugins::SubRequest.
+Closes: #680796
+
+ -- Florian Schlichting fschl...@zedat.fu-berlin.de  Tue, 07 Aug 2012 
20:35:24 +0200
+
 libmojomojo-perl (1.05+dfsg-2) unstable; urgency=low
 
   * Add patch to use Digest::SHA instead of Digest::SHA1.
diff -Nru libmojomojo-perl-1.05+dfsg/debian/control 
libmojomojo-perl-1.05+dfsg/debian/control
--- libmojomojo-perl-1.05+dfsg/debian/control   2012-01-14 17:13:41.0 
+0100
+++ libmojomojo-perl-1.05+dfsg/debian/control   2012-08-07 20:33:50.0 
+0200
@@ -9,7 +9,7 @@
  libcache-fastmmap-perl (= 1.31),
  libcatalyst-engine-psgi-perl,
  libcatalyst-modules-extra-perl,
- libcatalyst-modules-perl (= 42),
+ libcatalyst-modules-perl (= 44),
  libcatalyst-perl (= 5.71001),
  libcatalyst-view-tt-perl,
  libconfig-general-perl,
@@ -85,7 +85,7 @@
  libcache-fastmmap-perl (= 1.31),
  libcatalyst-engine-psgi-perl,
  libcatalyst-modules-extra-perl,
- libcatalyst-modules-perl (= 42),
+ libcatalyst-modules-perl (= 44),
  libcatalyst-perl (= 5.71001),
  libcatalyst-view-tt-perl,
  libconfig-general-perl,
diff -Nru libmojomojo-perl-1.05+dfsg/debian/patches/bug680796.patch 
libmojomojo-perl-1.05+dfsg/debian/patches/bug680796.patch
--- libmojomojo-perl-1.05+dfsg/debian/patches/bug680796.patch   1970-01-01 
01:00:00.0 +0100
+++ libmojomojo-perl-1.05+dfsg/debian/patches/bug680796.patch   2012-08-07 
20:31:24.0 +0200
@@ -0,0 +1,23 @@
+Description: Fix FTBFS due to updated Catalyst-Plugin-SubRequest
+ Remove workaround for a limitation in Catalyst-Plugin-SubRequest, which was
+ fixed in a backwards-incompatible manner in version 0.18 (uploaded as part of
+ libcatalyst-modules-perl 44). Fix picked from upstream git, will become part
+ of MojoMojo 1.06.
+Origin: 
https://github.com/marcusramberg/mojomojo/commit/f52d2941c0c2ddc59a1015563c622f0fbb26a19d
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680796
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=78821
+Bug: https://github.com/marcusramberg/mojomojo/issues/101
+Reviewed-by: Florian Schlichting fschl...@zedat.fu-berlin.de
+
+
+--- a/lib/MojoMojo/Formatter/Include.pm
 b/lib/MojoMojo/Formatter/Include.pm
+@@ -80,7 +80,7 @@
+ my $rel = $url-rel( $c-req-base );
+ if (not $rel-scheme) {
+ # if so, then return the inline version of the page is requests
+-return $c-subreq( '/inline', { path = $rel.'' eq './' ? '/' : 
'/'.$rel } );
++return $c-subreq( ($rel.'' eq './' ? '/' : '/'.$rel).'.inline' );
+ }
+ my $res = URI::Fetch-fetch( $url, Cache = $c-cache );
+ return $res-content if defined $res;
diff -Nru libmojomojo-perl-1.05+dfsg/debian/patches/series 
libmojomojo-perl-1.05+dfsg/debian/patches/series
--- libmojomojo-perl-1.05+dfsg/debian/patches/series2012-01-14 
17:13:41.0 +0100
+++ libmojomojo-perl-1.05+dfsg/debian/patches/series2012-08-07 
20:31:24.0 +0200
@@ -1,2 +1,3 @@
 spelling.patch
 digest-sha.patch
+bug680796.patch



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

Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120807203501.4075.49928.reportbug@thinkpad

Bug#984494: unblock: xpdf/3.04+git20210103-2

Bug#984494: unblock: xpdf/3.04+git20210103-2

Bug#980799: buster-pu: package irssi-plugin-xmpp/0.54-3

Bug#922904: RM: libcpan-meta-perl/2.150010-2

Bug#922903: RM: libautodie-perl/2.29-2

Bug#912425: stretch-pu: package libxml-stream-perl/1.24-2

Bug#863403: unblock: live-wrapper/0.6+nmu1

Bug#844264: release.debian.org: Please clarify "Packages must autobuild without failure"

Bug#767846: unblock: mpd/0.19.3-1

Bug#767846: unblock: mpd/0.19.2-1

Bug#767846: unblock: mpd/0.19.2-1

Bug#693111: unblock: libxml-stream-perl/1.23-2

Bug#693108: unblock: libnet-xmpp-perl/1.02-3

Bug#684209: unblock: libmojomojo-perl/1.05+dfsg-3

14 matches

Site Navigation

Mail list logo

Footer information