Bug#1036897: unblock: tzdata/2023c-5

2023-05-28 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: tzd...@packages.debian.org, bdr...@debian.org
Control: affects -1 + src:tzdata

Please unblock package tzdata

[ Reason ]
This upload only contains translation updates.

[ Tests ]
tzdata has several autopkgtest to cover regressions.

[ Risks ]
The risk of this update is low since it only touches debconf
translations.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock tzdata/2023c-5
diff -Nru tzdata-2023c/debian/changelog tzdata-2023c/debian/changelog
--- tzdata-2023c/debian/changelog   2023-05-10 00:00:40.0 +0200
+++ tzdata-2023c/debian/changelog   2023-05-28 21:54:34.0 +0200
@@ -1,3 +1,10 @@
+tzdata (2023c-5) unstable; urgency=medium
+
+  * Update German debconf translation.
+Thanks to Helge Kreutzmann  (Closes: #1036464)
+
+ -- Benjamin Drung   Sun, 28 May 2023 21:54:34 +0200
+
 tzdata (2023c-4) unstable; urgency=medium
 
   * Sort timezones naturally in debconf
diff -Nru tzdata-2023c/debian/po/de.po tzdata-2023c/debian/po/de.po
--- tzdata-2023c/debian/po/de.po2023-05-06 13:15:17.0 +0200
+++ tzdata-2023c/debian/po/de.po2023-05-27 13:38:23.0 +0200
@@ -1,5 +1,5 @@
 # Translation of tzdata debconf templates to German
-# Copyright (C) Helge Kreutzmann , 2007, 2008.
+# Copyright (C) Helge Kreutzmann , 2007, 2008, 2023.
 # Copyright (C) Holger Wansing , 2010, 2011, 2013, 
2016, 2017.
 # This file is distributed under the same license as the tzdata package.
 # Holger Wansing , 2019.
@@ -8,7 +8,7 @@
 "Project-Id-Version: tzdata 2021c-1\n"
 "Report-Msgid-Bugs-To: tzd...@packages.debian.org\n"
 "POT-Creation-Date: 2023-02-06 11:44+0100\n"
-"PO-Revision-Date: 2021-10-02 20:04+0200\n"
+"PO-Revision-Date: 2023-05-21 10:53+0200\n"
 "Last-Translator: Holger Wansing \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -3412,3 +3412,8 @@
 "negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
 "hours west of Greenwich, commonly called 'UTC-6')."
 msgstr ""
+"Bitte wählen Sie Ihre Zeitzone. Entgegen den Gepflogenheiten verwenden diese "
+"POSIX-kompatiblen Zeitzonen positive Werte für Zonen westlichen von "
+"Greenwich und negative Werte für diese östlich von Greenwich (z.B. bezieht "
+"sich »Etc/GMT+6« auf 6 Studen westlich von Greenwich, was normalerweise "
+"»UTC-6« genannt wird)."


Bug#1033939: unblock: python-tz/2022.7.1-3

2023-04-04 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: bdr...@debian.org

Please unblock package python-tz

[ Reason ]

python-tz contains a hard-coded list of timezones. This causes problems
on updates to tzdata. Last example: tzdata 2021a-1+deb11u9 added
America/Ciudad_Juarez but due to the hard-coded list, this timezone is
not selectable. Following code will fail with `UnknownTimeZoneError`:

```
#!/usr/bin/python3
import pytz
pytz.timezone("America/Ciudad_Juarez")
```

See also https://github.com/stub42/pytz/issues/91

[ Impact ]
Newly added timezones from tzdata will be availble to python3-tz.

[ Tests ]
I added autopkgtest cases to ensure that updates to tzdata do not
introduce regressions.

[ Risks ]

Several Python projects use python3-tz. The autopkgtest should reduce
the risk of regressions of dynamically determine the list of timezones.
python3-tz can fail in case they system has problems or tzdata is not
properly set-up. Python 3.9 ships the zoneinfo module which can be used
as replacement.

[ Checklist ]
  [x] all changes are documented in the d/changelog (except the
  formatting change by wrap-and-sort)
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock python-tz/2022.7.1-3
diff -Nru python-tz-2022.7.1/debian/changelog 
python-tz-2022.7.1/debian/changelog
--- python-tz-2022.7.1/debian/changelog 2023-01-15 11:24:50.0 +0100
+++ python-tz-2022.7.1/debian/changelog 2023-03-27 17:17:53.0 +0200
@@ -1,3 +1,21 @@
+python-tz (2022.7.1-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fix testVersion to not complain about the now dynamic Olson version
+
+ -- Benjamin Drung   Mon, 27 Mar 2023 17:17:53 +0200
+
+python-tz (2022.7.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Dynamically determine list of available and common timezones (LP: #207604)
+  * Determine IANA (nee Olson) database version dynamically
+  * Add autopkgtests to run unittest and own regression tests
+  * Update homepage URL
+  * Bump Standards-Version to 4.6.2
+
+ -- Benjamin Drung   Tue, 21 Mar 2023 11:21:11 +0100
+
 python-tz (2022.7.1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru python-tz-2022.7.1/debian/control python-tz-2022.7.1/debian/control
--- python-tz-2022.7.1/debian/control   2023-01-15 11:24:50.0 +0100
+++ python-tz-2022.7.1/debian/control   2023-03-27 17:12:30.0 +0200
@@ -6,19 +6,19 @@
Debian/Ubuntu Zope Team 
,
Fabio Tranchitella 
 Build-Depends: debhelper-compat (= 13),
-  dh-sequence-python3,
+   dh-sequence-python3,
python3-all,
-   python3-setuptools,
python3-pytest,
-   tzdata,
-Standards-Version: 4.6.1
-Homepage: https://pypi.python.org/pypi/pytz/
+   python3-setuptools,
+   tzdata
+Standards-Version: 4.6.2
+Homepage: https://pythonhosted.org/pytz/
 Vcs-Browser: https://salsa.debian.org/python-team/packages/python-tz
 Vcs-Git: https://salsa.debian.org/python-team/packages/python-tz.git -b 
debian/latest
 
 Package: python3-tz
 Architecture: all
-Depends: tzdata, ${python3:Depends}, ${misc:Depends}
+Depends: tzdata, ${misc:Depends}, ${python3:Depends}
 Description: Python3 version of the Olson timezone database
  python-tz brings the Olson tz database into Python. This library allows
  accurate and cross platform timezone calculations using Python 2.3 or higher.
diff -Nru 
python-tz-2022.7.1/debian/patches/Determine-IANA-nee-Olson-database-version-dynamically.patch
 
python-tz-2022.7.1/debian/patches/Determine-IANA-nee-Olson-database-version-dynamically.patch
--- 
python-tz-2022.7.1/debian/patches/Determine-IANA-nee-Olson-database-version-dynamically.patch
   1970-01-01 01:00:00.0 +0100
+++ 
python-tz-2022.7.1/debian/patches/Determine-IANA-nee-Olson-database-version-dynamically.patch
   2023-03-27 17:14:42.0 +0200
@@ -0,0 +1,69 @@
+From: Benjamin Drung 
+Date: Mon, 27 Mar 2023 17:14:22 +0200
+Subject: Determine IANA (nee Olson) database version dynamically
+
+Forwarded: not-needed
+Signed-off-by: Benjamin Drung 
+---
+ pytz/__init__.py  | 13 -
+ pytz/tests/test_tzinfo.py |  8 
+ 2 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/pytz/__init__.py b/pytz/__init__.py
+index 8b2fa1b..da2f206 100644
+--- a/pytz/__init__.py
 b/pytz/__init__.py
+@@ -12,6 +12,7 @@ import sys
+ import datetime
+ import os.path
+ import pathlib
++import re
+ import zoneinfo
+ 
+ from pytz.exceptions import AmbiguousTimeError
+@@ -23,8 +24,18 @@ from pytz.tzinfo import unpickler, BaseTzInfo
+ from pytz.tzfile import build_tzinfo
+ 
+ 
++def _read_olson_version() -> str:
++tzdata_zi = pathlib.Path("/usr/share/zoneinfo/tzdata.zi")
++with tzdata_zi.open(encoding="utf-8") as tzdata_zi_file:
++line = tzda

Bug#1033837: unblock: devscripts/2.23.3

2023-04-02 Thread Benjamin Drung
On Sun, 2023-04-02 at 16:09 +0200, Mattia Rizzolo wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> X-Debbugs-Cc: devscri...@packages.debian.org
> Control: affects -1 + src:devscripts
> 
> Please unblock package devscripts
> 
> [ Reason ]
> 2.23.3 is only bugfix, including one RC.
> Also, it fixes the description generation.
> 
> [ Tests ]
> most of the changes include tests, and autopkgtest passed great.
> 
> [ Risks ]
> the changes are quite trivial by themselves.
> 
> [ Checklist ]
>   [x] all changes are documented in the d/changelog
>   [x] I reviewed all changes and I approve them
>   [x] attach debdiff against the package in testing
> 
> unblock devscripts/2.23.3

Note about the debdiff: scripts/debootsnap.py is not a new file but a
symlink to scripts/debootsnap (for making it importable in Python for
testing purposes).

-- 
Benjamin Drung
Debian & Ubuntu Developer



Bug#1033838: release.debian.org: Pre-merge review for devscripts

2023-04-02 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: devscri...@packages.debian.org

Hi release team,

I was discussing with Mattia Rizzolo the open merge requests for
devscripts and which of them are material for the bookworm release. It
would be nice to have
https://salsa.debian.org/debian/devscripts/-/merge_requests/310
("Devscripts::Compression: Switch to new Dpkg::Compression getters") in
bookworm. What's your take on that change? Can we merge it for bookworm
or should we wait until the bookworm release is done?

-- 
Benjamin Drung
Debian & Ubuntu Developer



Bug#1031376: tzdata 2022g-3 removed /etc/timezone without a proper transition, breaking multiple packages

2023-02-16 Thread Benjamin Drung
On Thu, 2023-02-16 at 13:59 +0100, Michael Biebl wrote:
> [Looping Benjamin in]
> 
> Hi everyone,
> 
> the removal of /etc/timezone was discussed in the context of a systemd 
> upload targeting experimental, where I suggested this should be handled 
> by the tzdata package and not by systemd, as I considered tzdata the 
> "primary" owner of that file [1]. systemd-localed also handles that file 
> currently via a Debian specific patch, which we'd like to get rid of.
> The information in /etc/timezone is basically redundant as you can just 
> as easily get the information from looking where the /etc/localtime 
> symlink points at. It also avoids that /etc/localtime and /etc/timezone 
> get out-of-sync.
> /etc/timezone is mostly a Debianism afaiu.
> 
> Benjamin was so kind to implement this suggestion swiftly and uploaded 
> this to unstable.
> If this is now causing regressions in several packages, it's probably ok 
> to revert this change for bookworm.
> I did briefly skim over the codesearch list, and found a lot of false 
> positives and fixes for this issue are usually pretty simple, but yes, 
> I'd say this could be done early in the trixie release cycle as well 
> with an accompanying MBF.
> 
> Benjamin, would it cause a lot of trouble to revert this change again or 
> how would you prefer to proceed?

I agree that restoring /etc/timezone is the right solution for the
bookworm. I'll prepare a tzdata upload for it.

> [1] https://salsa.debian.org/systemd-team/systemd/-/merge_requests/189
> 
> Am 16.02.23 um 13:30 schrieb Sebastian Ramacher:
> > On 2023-02-16 12:34:29 +0100, Daniel Leidert wrote:
> > > Am Donnerstag, dem 16.02.2023 um 08:41 +0100 schrieb Paul Gevers:
> > > > Control: tags -1 moreinfo
> > > > Control: severity -1 normal
> > > > 
> > > > Hi Daniel,
> > > > 
> > > > On 16-02-2023 01:11, Daniel Leidert wrote:
> > > > > I ask you to
> > > > > find a reasonable approach to deal with this for the Bookworm
> > > > > release.
> > > > 
> > > > That's not how we normally work. Please come with concrete proposals and
> > > > we can evaluate them.
> > > 
> > > Hi Paul. That is the release team's job. Your team should be on top of
> > > that situation and control that. There is already a freeze in process.
> > > You made that very clear. New transitions are not allowed. The date has
> > > passed that re-introductions into Testing are not allowed anymore. And
> > > people break other packages just like that? It is my expectation that
> > > your team evaluates the situation together with the maintainer of
> > > tzdata now, and then comes to a conclusion and a decision, how this
> > > should be handled. codesearch.d.o proves that multiple packages use
> > > code that relies on the existence of /etc/timezone. So, its removal
> > > should have been handled in a coordinated way in the first place.
> > > Either the maintainer of tzdata does a mass-bug filing, or this change
> > > should be reverted.
> > 
> > I suggest you file a bug with the package that introduced any
> > breakage first. I see no such bug against tzdata.
> > 
> > Cheers
> > 
> > > 
> > > I have already spent two dozen unpaid hours of tracking down and
> > > handling breakages introduced since February 7th(!!) by fellow DDs. I
> > > spent multiple dozen hours of bug-fixing and uploading since the new
> > > year started, to make sure users will get the software they expect in
> > > Bookworm, also unpaid of course. And now I have to evaluate the impact
> > > of the change in tzdata as well and create proposals? No. I'm not the
> > > tzdata maintainer and I'm not a member of the release team. It is your
> > > job to handle transitions.
> > > 
> > > 
> > > And I suggest that you finally do your job and make sure that people
> > > stop uploading breaking changes, so the work for Bookworm gets less and
> > > not constantly more.
> > > 
> > > 
> > > Daniel
> > > 
> > 
> 

-- 
Benjamin Drung
Debian & Ubuntu Developer



Bug#989609: unblock: rdma-core/33.2-1

2021-06-08 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package rdma-core

The rdma-core projects follows a similar release process than the linux
kernel developers. The point releases only contain backported fixes. I
had a look at those commits between our git snapshot from 2021-03-17 and
the 33.2 release.

[ Reason ]
The 33.2 release contains more bugfixes.

[ Impact ]
Users with InfiniBand hardware might not benefit from the fixes.

[ Tests ]
The upstream project has test cases, but our package does not run the
tests, because they rely on having InfiniBand hardware.

[ Risks ]
The package is not a leaf package, but only needed for users with RDMA
hardware. Since we have a good upstream relationship, the code from
upstream is unchanged. In case of a regression, upstream will be
affected as well.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock rdma-core/33.2-1

-- 
Benjamin Drung

Senior DevOps Engineer and Debian & Ubuntu Developer
Compute Platform Operations

1&1 IONOS SE | Greifswalder Str. 207 | 10405 Berlin | Deutschland
E-Mail: benjamin.dr...@ionos.com | Web: www.ionos.de

Hauptsitz Montabaur, Amtsgericht Montabaur, HRB 24498

Vorstand: Hüseyin Dogan, Dr. Martin Endreß, Claudia Frese, Henning
Kettler, Arthur Mai, Matthias Steinberg, Achim Weiß
Aufsichtsratsvorsitzender: Markus Kadelke


Member of United Internet
diff -Nru rdma-core-33.1+git20210317/buildlib/centos6.spec 
rdma-core-33.2/buildlib/centos6.spec
--- rdma-core-33.1+git20210317/buildlib/centos6.spec2021-04-06 
10:12:51.0 +0200
+++ rdma-core-33.2/buildlib/centos6.spec2021-06-03 09:20:05.0 
+0200
@@ -1,5 +1,5 @@
 Name: rdma-core
-Version: 33.1
+Version: 33.2
 Release: 1%{?dist}
 Summary: RDMA core userspace libraries and daemons
 
diff -Nru rdma-core-33.1+git20210317/buildlib/RDMA_EnableCStd.cmake 
rdma-core-33.2/buildlib/RDMA_EnableCStd.cmake
--- rdma-core-33.1+git20210317/buildlib/RDMA_EnableCStd.cmake   2021-04-06 
10:12:51.0 +0200
+++ rdma-core-33.2/buildlib/RDMA_EnableCStd.cmake   2021-06-03 
09:20:05.0 +0200
@@ -58,9 +58,15 @@
   endif()
 endfunction()
 
+function(RDMA_Check_C_Compiles TO_VAR CHECK_PROGRAM)
+  set(CMAKE_REQUIRED_FLAGS "${ARGV2} -Werror")
+  CHECK_C_SOURCE_COMPILES("${CHECK_PROGRAM}" ${TO_VAR})
+  set(${TO_VAR} ${${TO_VAR}} PARENT_SCOPE)
+endfunction()
+
 function(RDMA_Check_Aliasing TO_VAR)
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
-  CHECK_C_SOURCE_COMPILES("
+  RDMA_Check_C_Compiles(HAVE_WORKING_STRICT_ALIASING "
 struct in6_addr {unsigned int u6_addr32[4];};
 struct iphdr {unsigned int daddr;};
 union ibv_gid {unsigned char raw[16];};
@@ -80,8 +86,7 @@
map_ipv4_addr_to_ipv6();
return set_ah_attr_by_ipv4();
 }"
-HAVE_WORKING_STRICT_ALIASING
-FAIL_REGEX "warning")
+  )
 
   set(${TO_VAR} "${HAVE_WORKING_STRICT_ALIASING}" PARENT_SCOPE)
 endfunction()
@@ -107,20 +112,12 @@
 #endif
 ")
 
-  CHECK_C_SOURCE_COMPILES(
-"${SSE_CHECK_PROGRAM}"
-HAVE_TARGET_SSE
-FAIL_REGEX "warning")
+  RDMA_Check_C_Compiles(HAVE_TARGET_SSE "${SSE_CHECK_PROGRAM}")
 
   if(NOT HAVE_TARGET_SSE)
 # Older compiler, we can work around this by adding -msse instead of
 # relying on the function attribute.
-set(CMAKE_REQUIRED_FLAGS "-msse")
-CHECK_C_SOURCE_COMPILES(
-  "${SSE_CHECK_PROGRAM}"
-  NEED_MSSE_FLAG
-  FAIL_REGEX "warning")
-set(CMAKE_REQUIRED_FLAGS)
+RDMA_Check_C_Compiles(NEED_MSSE_FLAG "${SSE_CHECK_PROGRAM}" "-msse")
 
 if(NEED_MSSE_FLAG)
   set(SSE_FLAGS "-msse" PARENT_SCOPE)
diff -Nru rdma-core-33.1+git20210317/CMakeLists.txt 
rdma-core-33.2/CMakeLists.txt
--- rdma-core-33.1+git20210317/CMakeLists.txt   2021-04-06 10:12:51.0 
+0200
+++ rdma-core-33.2/CMakeLists.txt   2021-06-03 09:20:05.0 +0200
@@ -72,7 +72,7 @@
 set(PACKAGE_NAME "RDMA")
 
 # See Documentation/versioning.md
-set(PACKAGE_VERSION "33.1")
+set(PACKAGE_VERSION "33.2")
 # When this is changed the values in these files need changing too:
 #   debian/control
 #   debian/libibverbs1.symbols
@@ -233,26 +233,21 @@
 
 # At some point after 4.4 gcc fixed shadow to ignore function vs variable
 # conflicts
-set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-  set(CMAKE_REQUIRED_FLAGS "-Wshadow")
-CHECK_C_SOURCE_COMPILES("
+RDMA_Check_C_Compiles(HAVE_C_WORKING_SHADOW "
  #include 
  int main(int argc,const char *argv[]) { int access = 1; return access; }"
-  HAVE_C_WORKING_SHADOW
-  FAIL_REGEX "warning")
+  "-Wshadow")
 if (HAVE_C_WORKING_SHADOW)
   RDMA_AddOptCFlag(CMAKE_C_FL

Bug#989077: unblock: ionit/0.3.8-1

2021-05-25 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package ionit

it fixes the YAMLLoadWarning from PyYAML 5.1+ and fixes the support for
ruamel.yaml.

[ Reason ]
1) python3-yaml 5.3.1-4 shows a YAMLLoadWarning.
2) When user have the alternative dependency python3-ruamel.yaml
installed instead of python3-yaml, ionit will fail.

[ Impact ]
Users will see the YAMLLoadWarning in the log output when using YAML
files. ionit will fail if users don't have python3-yaml installed (i.e.
they already have python3-ruamel.yaml installed).

[ Tests ]
ionit has 100% test coverage. The tests are run during package build
time and as autopkgtest against the installed system. There are upstream
tests to test having only python3-ruamel.yaml installed:
https://github.com/bdrung/ionit/actions/runs/863074972

[ Risks ]
The code change is trivial (5 lines in the ionit file). The package is
nearly a leaf package (only lsb build-depends on ionit).

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
I attach the full debdiff and the reduced debdiff. The reduce debdiff
has following stuff removed (since that is not relevant/trivial IMO):

* copyright year and email address update
* README.md update
* Added GitHub CI config file
* Changes to the unittests in the tests directory

unblock ionit/0.3.8-1

-- 
Benjamin Drung

Senior DevOps Engineer and Debian & Ubuntu Developer
Compute Platform Operations

1&1 IONOS SE | Greifswalder Str. 207 | 10405 Berlin | Deutschland
E-Mail: benjamin.dr...@ionos.com | Web: www.ionos.de

Hauptsitz Montabaur, Amtsgericht Montabaur, HRB 24498

Vorstand: Hüseyin Dogan, Dr. Martin Endreß, Claudia Frese, Henning
Kettler, Arthur Mai, Matthias Steinberg, Achim Weiß
Aufsichtsratsvorsitzender: Markus Kadelke


Member of United Internet
diff -Nru ionit-0.3.6/debian/changelog ionit-0.3.8/debian/changelog
--- ionit-0.3.6/debian/changelog2020-12-15 12:48:40.0 +0100
+++ ionit-0.3.8/debian/changelog2021-05-21 09:27:45.0 +0200
@@ -1,3 +1,26 @@
+ionit (0.3.8-1) unstable; urgency=medium
+
+  * New upstream bug-fix release:
+- tests: Mark ionit_plugin as first party module
+  * Let autopkgtest depend on black and ionit as well
+
+ -- Benjamin Drung   Fri, 21 May 2021 09:27:45 +0200
+
+ionit (0.3.7-1) unstable; urgency=medium
+
+  * New upstream bug-fix release:
+- Check import definition order with isort
+- Add test case for black code formatter
+- Fix YAMLLoadWarning with PyYAML 5.1+
+- Fix support for ruamel.yaml
+- setup.py: Add PyYAML as dependency
+  * Build-depend on black and isort
+  * Use py3dist-overrides for alternative yaml dependencies
+  * Update my email to the new ionos.com domain
+  * Update year in debian/copyright
+
+ -- Benjamin Drung   Thu, 20 May 2021 20:30:09 +0200
+
 ionit (0.3.6-2) unstable; urgency=medium
 
   * Create/Remove empty /etc/ionit at install/purge (Closes: #977016)
diff -Nru ionit-0.3.6/debian/control ionit-0.3.8/debian/control
--- ionit-0.3.6/debian/control  2020-12-15 12:47:26.0 +0100
+++ ionit-0.3.8/debian/control  2021-05-21 09:27:45.0 +0200
@@ -1,9 +1,11 @@
 Source: ionit
 Section: utils
 Priority: optional
-Maintainer: Benjamin Drung 
-Build-Depends: debhelper-compat (= 13),
+Maintainer: Benjamin Drung 
+Build-Depends: black,
+   debhelper-compat (= 13),
dh-python,
+   isort,
pandoc,
pylint (>= 2.2.2-2~) | pylint3,
python3,
@@ -19,9 +21,7 @@
 
 Package: ionit
 Architecture: all
-Depends: python3-yaml | python3-ruamel.yaml,
- ${misc:Depends},
- ${python3:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Description: Render configuration files from Jinja templates
  ionit is a simple and small configuration templating tool. It collects a
  context and renders Jinja templates in a given directory. The context can be
diff -Nru ionit-0.3.6/debian/copyright ionit-0.3.8/debian/copyright
--- ionit-0.3.6/debian/copyright2020-09-28 12:12:50.0 +0200
+++ ionit-0.3.8/debian/copyright2021-05-21 09:27:45.0 +0200
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2018-2019 Benjamin Drung 
+Copyright: 2018-2021 Benjamin Drung 
 License: ISC
  Permission to use, copy, modify, and/or distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,7 @@
 
 Files: tests/mock_open.py tests/test_mock_open.py
 Copyright: 2013 Ionuț Arțăriși 
-   2018 Benjamin Drung 
+   2018 Benjamin Drung 
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (th

Bug#987251: unblock: rdma-core/33.1+git20210317-1

2021-04-20 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package rdma-core

we (1&1 IONOS SE) are hit by the race in rdma-ndd that is already fixed
in the latest rdma-core release. The rdma-core projects follows a
similar release process than the linux kernel developers. The point
releases only contain backported fixes. I had a look at those commits
and we probably want those fixes as well.

[ Reason ]
This release contains the rdma-ndd race fix.

[ Impact ]
For system with multiple InfiniBand HCAs, only the first HCA is
guaranteed to be detected by kernel and the node description for the
other ports are often not set due to the race.

[ Tests ]
The upstream project has test cases, but our package does not run the
tests, because they rely on having InfiniBand hardware.

[ Risks ]
The package is not a leaf package, but only needed for users with RDMA
hardware. Since we have a good upstream relationship, the code from
upstream is unchanged. In case of a regression, upstream will be
affected as well (with their latest 34.0 release and their upcoming 33.2
point release).

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock rdma-core/33.1+git20210317-1

-- 
Benjamin Drung

Senior DevOps Engineer and Debian & Ubuntu Developer
Compute Platform Operations

1&1 IONOS SE | Greifswalder Str. 207 | 10405 Berlin | Deutschland
E-Mail: benjamin.dr...@ionos.com | Web: www.ionos.de

Hauptsitz Montabaur, Amtsgericht Montabaur, HRB 24498

Vorstand: Hüseyin Dogan, Dr. Martin Endreß, Claudia Frese, Henning
Kettler, Arthur Mai, Matthias Steinberg, Achim Weiß
Aufsichtsratsvorsitzender: Markus Kadelke


Member of United Internet
diff -Nru rdma-core-33.1/debian/changelog 
rdma-core-33.1+git20210317/debian/changelog
--- rdma-core-33.1/debian/changelog 2021-01-27 14:32:48.0 +0100
+++ rdma-core-33.1+git20210317/debian/changelog 2021-04-12 11:28:57.0 
+0200
@@ -1,3 +1,26 @@
+rdma-core (33.1+git20210317-1) unstable; urgency=medium
+
+  * New upstream bug-fix snapshot:
+- mlx5: Fix uuars to have the 'uar_mmap_offset' data
+- pyverbs: Fix Mlx5 QP constructor
+- efa: Fix DV extension clear check
+- verbs: Fix possible port loop overflow
+- ibacm: Fix possible port loop overflow
+- mlx5: DR, Check new cap for isolated VL TC QP
+- kernel-boot: Fix VF lookup
+- mlx5: DR, Force QP drain on table creation
+- libhns: Avoid double release of a pointer
+- libhns: Correct definition of DB_BYTE_4_TAG_M
+- libhns: Remove assert to check whether a pointer is NULL
+- libhns: Remove the unnecessary mask on QPN of CQE
+- libhns: Remove unnecessary mask of ownerbit
+- libhns: Remove unnecessary barrier when poll cq
+- rdma-ndd: fix udev racy issue for system with multiple InfiniBand HCAs
+- verbs: Fix create CQ comp_mask check
+  * Update my email address
+
+ -- Benjamin Drung   Mon, 12 Apr 2021 11:28:57 +0200
+
 rdma-core (33.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
diff -Nru rdma-core-33.1/debian/control 
rdma-core-33.1+git20210317/debian/control
--- rdma-core-33.1/debian/control   2021-01-27 14:32:46.0 +0100
+++ rdma-core-33.1+git20210317/debian/control   2021-04-12 11:25:05.0 
+0200
@@ -1,5 +1,5 @@
 Source: rdma-core
-Maintainer: Benjamin Drung 
+Maintainer: Benjamin Drung 
 Section: net
 Priority: optional
 Build-Depends: cmake (>= 2.8.11),
diff -Nru rdma-core-33.1/debian/copyright 
rdma-core-33.1+git20210317/debian/copyright
--- rdma-core-33.1/debian/copyright 2020-04-14 16:06:21.0 +0200
+++ rdma-core-33.1+git20210317/debian/copyright 2021-04-12 11:25:21.0 
+0200
@@ -12,7 +12,7 @@
 Copyright: 2008, Genome Research Ltd
2014, Ana Beatriz Guerrero Lopez 
2015-2016, Jason Gunthorpe 
-   2016-2018, Benjamin Drung 
+   2016-2021, Benjamin Drung 
2016-2017, Talat Batheesh 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
diff -Nru rdma-core-33.1/ibacm/src/acme.c 
rdma-core-33.1+git20210317/ibacm/src/acme.c
--- rdma-core-33.1/ibacm/src/acme.c 2021-01-26 09:06:08.0 +0100
+++ rdma-core-33.1+git20210317/ibacm/src/acme.c 2021-04-06 10:12:51.0 
+0200
@@ -461,7 +461,7 @@
struct ibv_port_attr port_attr;
int i, index, ret, found_active;
char host_name[256];
-   uint8_t p;
+   uint32_t p;
 
ret = gethostname(host_name, sizeof host_name);
if (ret) {
@@ -481,17 +481,17 @@
if (!found_active) {
ret = ibv_query_port(verbs[i], p, _attr);
if (!ret && port_attr.state == IBV_PORT_ACTIVE) 
{
-   VPR

Bug#931062: unblock: ionit/0.3.2+really0.2.1-2

2019-06-27 Thread Benjamin Drung
Am Donnerstag, den 27.06.2019, 10:52 +0200 schrieb Paul Gevers:
> Hi Benjamin,
> 
> On 25-06-2019 13:25, Benjamin Drung wrote:
> > The ionit.service fix for bug #919690 introduced a systemd
> > dependency
> > loop. systemd will break the loop at a (random?) place which can
> > make
> > boot behave incorrectly.
> 
> Bah. One of the big reasons why you should fix your bugs earlier.

I discovered the failing ifup@.service in January while testing and
reported #919690 against ifupdown. On 2019-06-20 I troubleshooted this
issue further and discovered that it was a configuration issue caused
by ionit running too late. Then I reassigned it and fixed ionit.

>  And to
> ask a nasty question, why didn't you spot this issue in the previous
> version?

I tested that version and checked that all systemd services were
running. Sadly the dependency loop was just mentioned in the dmesg
output. That's why I didn't saw it in my initial tests.

> > I fixed the dependency loop in ionit 0.3.2+really0.2.1-2. A debdiff
> > is
> > attached.
> > 
> > unblock ionit/0.3.2+really0.2.1-2
> 
> Unblocked, thanks.

Thanks.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet



Bug#931062: unblock: ionit/0.3.2+really0.2.1-2

2019-06-25 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package ionit

The ionit.service fix for bug #919690 introduced a systemd dependency
loop. systemd will break the loop at a (random?) place which can make
boot behave incorrectly.

I fixed the dependency loop in ionit 0.3.2+really0.2.1-2. A debdiff is
attached.

unblock ionit/0.3.2+really0.2.1-2

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet
diff -Nru ionit-0.3.2+really0.2.1/debian/changelog 
ionit-0.3.2+really0.2.1/debian/changelog
--- ionit-0.3.2+really0.2.1/debian/changelog2019-06-20 15:36:08.0 
+0200
+++ ionit-0.3.2+really0.2.1/debian/changelog2019-06-25 13:18:08.0 
+0200
@@ -1,3 +1,10 @@
+ionit (0.3.2+really0.2.1-2) unstable; urgency=medium
+
+  * Drop After=local-fs.target from ionit.service to break dependency loop
+(Closes: #931060)
+
+ -- Benjamin Drung   Tue, 25 Jun 2019 13:18:08 
+0200
+
 ionit (0.3.2+really0.2.1-1) unstable; urgency=medium
 
   * Run ionit.service before systemd-modules-load.service
diff -Nru 
ionit-0.3.2+really0.2.1/debian/patches/Drop-After-local-fs.target-from-ionit.service.patch
 
ionit-0.3.2+really0.2.1/debian/patches/Drop-After-local-fs.target-from-ionit.service.patch
--- 
ionit-0.3.2+really0.2.1/debian/patches/Drop-After-local-fs.target-from-ionit.service.patch
  1970-01-01 01:00:00.0 +0100
+++ 
ionit-0.3.2+really0.2.1/debian/patches/Drop-After-local-fs.target-from-ionit.service.patch
  2019-06-25 13:16:16.0 +0200
@@ -0,0 +1,45 @@
+From ce7c305312bb68319784e2d693955297138c273a Mon Sep 17 00:00:00 2001
+From: Benjamin Drung 
+Date: Tue, 25 Jun 2019 12:00:24 +0200
+Subject: [PATCH] Drop After=local-fs.target from ionit.service
+
+Letting `ionit.service` run before `systemd-udev-trigger.service`
+introduces a dependency loop:
+
+```
+systemd[1]: systemd-udev-trigger.service: Found ordering cycle on 
ionit.service/start
+systemd[1]: systemd-udev-trigger.service: Found dependency on 
local-fs.target/start
+systemd[1]: systemd-udev-trigger.service: Found dependency on 
local-fs-pre.target/start
+systemd[1]: systemd-udev-trigger.service: Found dependency on 
multipathd.service/start
+```
+
+`systemd-udev-trigger.service` runs before `multipathd.service` which
+runs before `local-fs-pre.target` which runs before `local-fs.target`.
+`ionit.service` wants to run before `systemd-udev-trigger.service` but
+after `local-fs.target`.
+
+Therefore drop `After=local-fs.target` from `ionit.service` to break the
+dependency loop. `/etc` and `/usr` is probably mounted inside the initrd
+already.
+
+Bug-Debian: https://bugs.debian.org/931060
+Signed-off-by: Benjamin Drung 
+---
+ ionit.service | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ionit.service b/ionit.service
+index 8f56106..4c4e1c8 100644
+--- a/ionit.service
 b/ionit.service
+@@ -2,7 +2,6 @@
+ Description=Render configuration files from Jinja templates
+ Documentation=man:ionit(1)
+ DefaultDependencies=no
+-After=local-fs.target
+ Before=ferm.service network-pre.target openibd.service shutdown.target 
sysinit.target systemd-modules-load.service systemd-udev-trigger.service
+ Wants=network-pre.target
+ RequiresMountsFor=/usr
+-- 
+2.20.1
+
diff -Nru ionit-0.3.2+really0.2.1/debian/patches/series 
ionit-0.3.2+really0.2.1/debian/patches/series
--- ionit-0.3.2+really0.2.1/debian/patches/series   2019-06-20 
13:54:04.0 +0200
+++ ionit-0.3.2+really0.2.1/debian/patches/series   2019-06-25 
13:16:39.0 +0200
@@ -1,2 +1,3 @@
 Run-ionit.service-before-systemd-modules-load.service.patch
 Run-ionit.service-before-systemd-udev-trigger.service.patch
+Drop-After-local-fs.target-from-ionit.service.patch


Bug#930801: unblock: rdma-core/22.3-1

2019-06-20 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Hi,

rdma-core is maintained by the Linux RDMA group. It follows the Linux
kernel release schedule and concepts. Upstream backports fixes to their
stable branches. We have currently rdma-core 22.1-1 in Debian
unstable/testing. Upstream released 22.3 which contains only bug fixes.

I prepared an updated package 22.3-1 (patch attached). Before uploading
anything, I like to hear your opinion: Is this change okay for buster,
should I wait for the release, or better keep that update out of buster?

unblock rdma-core/22.3-1

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8310ec6c..db291328 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ endif()
 set(PACKAGE_NAME "RDMA")
 
 # See Documentation/versioning.md
-set(PACKAGE_VERSION "22.1")
+set(PACKAGE_VERSION "22.3")
 # When this is changed the values in these files need changing too:
 #   debian/control
 #   debian/libibverbs1.symbols
@@ -360,23 +360,23 @@ else()
   set(HAVE_FULL_SYMBOL_VERSIONS 1)
 endif()
 
-if (${NO_PYVERBS})
-  set(CYTHON_EXECUTABLE "")
-else ()
-  # Look for Python. We prefer some variant of python 3 if the system has it.
-  FIND_PACKAGE(PythonInterp 3 QUIET)
-  if (NOT ${PythonInterp_FOUND})
-FIND_PACKAGE(PythonInterp REQUIRED)
-  endif()
-  FIND_PACKAGE(cython)
-endif()
-
 # Look for Python. We prefer some variant of python 3 if the system has it.
 FIND_PACKAGE(PythonInterp 3 QUIET)
-if (NOT ${PythonInterp_FOUND})
+if (PythonInterp_FOUND)
+  # pyverbs can only use python3:
+  if (NO_PYVERBS)
+set(CYTHON_EXECUTABLE "")
+  else()
+FIND_PACKAGE(cython)
+  endif()
+else()
+  # But we still must have python (be it 2) for the build process:
   FIND_PACKAGE(PythonInterp REQUIRED)
+  set(CYTHON_EXECUTABLE "")
 endif()
+
 # A cython & python-devel installation that matches our selected interpreter.
+
 if (CYTHON_EXECUTABLE)
  # cmake has really bad logic here, if PythonIterp has been run it tries to
  # find a matching -devel installation but will happily return a non-matching
diff --git a/buildlib/RDMA_BuildType.cmake b/buildlib/RDMA_BuildType.cmake
index 0951edad..17206f51 100644
--- a/buildlib/RDMA_BuildType.cmake
+++ b/buildlib/RDMA_BuildType.cmake
@@ -8,7 +8,7 @@ function(RDMA_BuildType)
   # in performance contexts it doesn't make much sense to have the default 
build
   # turn off the optimizer.
   if(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE String
+ set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
   "Options are ${build_types}"
   FORCE
   )
diff --git a/buildlib/cbuild b/buildlib/cbuild
index 9ced0de6..15095d0c 100755
--- a/buildlib/cbuild
+++ b/buildlib/cbuild
@@ -641,10 +641,6 @@ def run_deb_build(args,env):
 "-e","DEB_BUILD_OPTIONS=parallel=%u"%(multiprocessing.cpu_count()),
 ];
 
-if not env.build_pyverbs:
-opts.append("-e");
-opts.append("EXTRA_CMAKE_FLAGS=%s"%(' '.join(["-DNO_PYVERBS=1"])));
-
 # Create a go.py that will let us run the compilation as the user and
 # then switch to root only for the packaging step.
 with open(os.path.join(tmpdir,"go.py"),"w") as F:
diff --git a/buildlib/check-build b/buildlib/check-build
index 5ae0cc1c..348b0590 100755
--- a/buildlib/check-build
+++ b/buildlib/check-build
@@ -14,6 +14,7 @@ import copy
 import shlex
 import pipes
 from contextlib import contextmanager;
+from distutils.version import LooseVersion;
 
 def get_src_dir():
 """Get the source directory using git"""
@@ -106,7 +107,7 @@ def check_lib_symver(args,fn):
 private,args.PACKAGE_VERSION));
 
 syms = list(syms - private);
-syms.sort(key=lambda x:re.split('[._]',x));
+syms.sort(key=LooseVersion)
 if newest_symver != syms[-1]:
 raise ValueError("Symbol version %r implied by filename %r not the 
newest in ELF (%r)"%(
 newest_symver,fn,syms));
diff --git a/buildlib/package-build-test b/buildlib/package-build-test
index 46a1cf6f..29c17838 100755
--- a/buildlib/package-build-test
+++ b/buildlib/package-build-test
@@ -11,7 +11,7 @@ if [ -e "/.dockerenv" ] || (grep -q docker /proc/self/cgroup 
&>/dev/null); then
exit 0
 fi
 
-for OS in centos7 tumbleweed
+for OS in centos7 leap
 do
echo
echo "Check

Bug#930776: unblock: ionit/0.3.2-1

2019-06-20 Thread Benjamin Drung
Control: tags -1 - moreinfo

Am Donnerstag, den 20.06.2019, 15:02 +0200 schrieb Paul Gevers:
> Control: tags -1 moreinfo confirmed
> 
> Hi Benjamin,
> 
> On 20-06-2019 14:05, Benjamin Drung wrote:
> > Okay. I prepared a version with just the fixes for the
> > ionit.service
> > (debdiff attached). Why not going through testing-proposed-updates? 
> > If
> > not, the version number will be 0.3.2+really0.2.1-2 instead of
> > 0.2.1-2.
> 
> Or better 0.3.2+really0.2.1-1 (as the first version of the upstream
> version 0.3.2+really0.2.1) but I don't mind yours if you really
> prefer that.

Okay. Uploaded that debdiff as 0.3.2+really0.2.1-1.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet



Bug#930776: unblock: ionit/0.3.2-1

2019-06-20 Thread Benjamin Drung
Control: tags -1 - moreinfo

Am Donnerstag, den 20.06.2019, 13:45 +0200 schrieb Paul Gevers:
> Control: tags -1 moreinfo
> 
> Hi Benjamin
> 
> On 20-06-2019 12:52, Benjamin Drung wrote:
> > ionit runs too late for /etc/network/interfaces (RC bug #919690).
> > This
> > is fixed in 0.3.2-1. The debdiff is attached.
> 
> Please, pretty please. At this moment of the release only targeted
> fixes
> [1]. Revert the other upstream changes and upload a version which
> targets the bug only (e.g. with a +really version). Your fix has to
> go
> through unstable, not testing-proposed-updates.

Okay. I prepared a version with just the fixes for the ionit.service
(debdiff attached). Why not going through testing-proposed-updates? If
not, the version number will be 0.3.2+really0.2.1-2 instead of 0.2.1-2.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet
diff -Nru ionit-0.2.1/debian/changelog ionit-0.2.1/debian/changelog
--- ionit-0.2.1/debian/changelog	2019-01-07 14:22:30.0 +0100
+++ ionit-0.2.1/debian/changelog	2019-06-20 13:55:12.0 +0200
@@ -1,3 +1,10 @@
+ionit (0.2.1-2) testing-proposed-updates; urgency=medium
+
+  * Run ionit.service before systemd-modules-load.service
+  * Run ionit.service before systemd-udev-trigger.service (Closes: #919690)
+
+ -- Benjamin Drung   Thu, 20 Jun 2019 13:55:12 +0200
+
 ionit (0.2.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-modules-load.service.patch ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-modules-load.service.patch
--- ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-modules-load.service.patch	1970-01-01 01:00:00.0 +0100
+++ ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-modules-load.service.patch	2019-06-20 13:51:57.0 +0200
@@ -0,0 +1,33 @@
+From f56792f9b2d618d38207170d61f420bf58e26603 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung 
+Date: Wed, 10 Apr 2019 13:30:47 +0200
+Subject: [PATCH] Run ionit.service before systemd-modules-load.service
+
+In case you want to render modprobe configuration files, the ionit
+service needs to run before systemd-modules-load.service (which runs
+also before sysinit.target and races with ionit.service).
+
+Therefore let ionit.service run explicitly before
+systemd-modules-load.service.
+
+Signed-off-by: Benjamin Drung 
+---
+ ionit.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ionit.service b/ionit.service
+index 1e23862..a67cc88 100644
+--- a/ionit.service
 b/ionit.service
+@@ -3,7 +3,7 @@ Description=Render configuration files from Jinja templates
+ Documentation=man:ionit(1)
+ DefaultDependencies=no
+ After=local-fs.target
+-Before=ferm.service network-pre.target openibd.service shutdown.target sysinit.target
++Before=ferm.service network-pre.target openibd.service shutdown.target sysinit.target systemd-modules-load.service
+ Wants=network-pre.target
+ RequiresMountsFor=/usr
+ 
+-- 
+2.20.1
+
diff -Nru ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-udev-trigger.service.patch ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-udev-trigger.service.patch
--- ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-udev-trigger.service.patch	1970-01-01 01:00:00.0 +0100
+++ ionit-0.2.1/debian/patches/Run-ionit.service-before-systemd-udev-trigger.service.patch	2019-06-20 13:52:07.0 +0200
@@ -0,0 +1,40 @@
+From 11b6dbab36c0b1d983179d10e3a079e0f31102bc Mon Sep 17 00:00:00 2001
+From: Benjamin Drung 
+Date: Thu, 20 Jun 2019 12:14:42 +0200
+Subject: [PATCH] Run ionit.service before systemd-udev-trigger.service
+
+live-boot creates a `/etc/network/interfaces` file that contains an
+`allow-hotplug` entry for the network boot device `eth0`.
+`systemd-udev-trigger.service` executes
+`/lib/udev/rules.d/80-ifupdown.rules` which calls
+`/lib/udev/ifupdown-hotplug`. This scripts starts `ifup@eth0.service`.
+Afterwards `ionit` runs and might replace `allow-hotplug` by `auto` if a
+template `/etc/network/interfaces.jinja` is provided. Then
+`networking.service` and `ifup@eth0.service` will start at the same time
+and race.
+
+Therefore let `ionit.service` run before `systemd-udev-trigger.service`
+to support generating `/etc/network/interfaces`.
+
+Bug-Debian: https://bugs.debian.org/919690
+Signed-off-by: Benjamin Drung 
+---
+ ionit.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ionit.service b/ionit.service
+index a67cc88..8f56106 100644
+--- a/ionit.service
 b/ionit.service
+@@ -3,7 +3,7 

Bug#930776: unblock: ionit/0.3.2-1

2019-06-20 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package ionit

ionit runs too late for /etc/network/interfaces (RC bug #919690). This
is fixed in 0.3.2-1. The debdiff is attached.

ionit is a quite new and very small tool (popcon count: 4), which is
developed and used by us. It has 100% test coverage (run at build time
and as autopkgtest).

unblock ionit/0.3.2-1

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet
diff -Nru ionit-0.2.1/debian/changelog ionit-0.3.2/debian/changelog
--- ionit-0.2.1/debian/changelog2019-01-07 14:22:30.0 +0100
+++ ionit-0.3.2/debian/changelog2019-06-20 12:21:44.0 +0200
@@ -1,3 +1,13 @@
+ionit (0.3.2-1) unstable; urgency=medium
+
+  * New upstream release.
+- Support specifying a configuration file
+- Support specifying --config multiple times
+- Run ionit.service before systemd-modules-load.service
+- Run ionit.service before systemd-udev-trigger.service (Closes: #919690)
+
+ -- Benjamin Drung   Thu, 20 Jun 2019 12:21:44 
+0200
+
 ionit (0.2.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru ionit-0.2.1/ionit ionit-0.3.2/ionit
--- ionit-0.2.1/ionit   2019-01-07 14:01:10.0 +0100
+++ ionit-0.3.2/ionit   2019-06-20 12:17:42.0 +0200
@@ -28,6 +28,7 @@
 
 import ionit_plugin
 
+DEFAULT_CONFIG = "/etc/ionit"
 LOG_FORMAT = '%(asctime)s %(name)s %(levelname)s: %(message)s'
 SCRIPT_NAME = "ionit"
 
@@ -86,23 +87,34 @@
 return context
 
 
-def collect_context(directory):
+def get_config_files(paths):
+"""Return files for the given paths (could either be files or 
directories)."""
+logger = logging.getLogger(SCRIPT_NAME)
+files = []
+for path in paths:
+logger.debug("Searching for configuration files in '%s'...", path)
+try:
+if os.path.isfile(path):
+files.append(path)
+else:
+files += sorted([os.path.join(path, f) for f in 
os.listdir(path)])
+except OSError as error:
+logger.warning("Failed to read configuration directory: %s", error)
+logger.debug("Configuration files: %s", files)
+return files
+
+
+def collect_context(paths):
 """Collect context that will be used when rendering the templates"""
 logger = logging.getLogger(SCRIPT_NAME)
-logger.debug("Collecting context from '%s'...", directory)
-try:
-files = sorted(os.listdir(directory))
-except OSError as error:
-logger.warning("Failed to read configuration directory: %s", error)
-files = []
+logger.debug("Collecting context...")
 
 failures = 0
 context = {}
 
-for filename in files:
+for file in get_config_files(paths):
 file_context = None
-file = os.path.join(directory, filename)
-extension = os.path.splitext(filename)[1]
+extension = os.path.splitext(file)[1]
 try:
 if extension == ".json":
 logger.info("Reading configuration file '%s'...", file)
@@ -184,9 +196,9 @@
 def main(argv):
 """Main function with argument parsing"""
 parser = argparse.ArgumentParser()
-parser.add_argument("-c", "--config", default="/etc/ionit",
-help="Configuration directory containing context for 
rendering (default: "
- "%(default)s)")
+parser.add_argument("-c", "--config", action="append",
+help="Configuration directory/file containing context 
for rendering "
+ "(default: %s)" % (DEFAULT_CONFIG,))
 parser.add_argument("-t", "--templates", default="/etc",
 help="Directory to search for Jinja templates 
(default: %(default)s)")
 parser.add_argument("-e", "--template-extension", default="jinja",
@@ -197,6 +209,8 @@
 help="Decrease output verbosity to warnings and 
errors",
 action="store_const", const=logging.WARNING)
 args = parser.parse_args(argv)
+if args.config is None:
+args.config = [DEFAULT_CONFIG]
 logging.basicConfig(level=args.log_level, format=LOG_FORMAT)
 logger = logging.getLogger(SCRIPT_NAME)
 
di

Bug#930656: unblock: gokey/0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780-3

2019-06-17 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package gokey

The current version of gokey suffers the RC bug #930426 which makes the
RSA key generation non-deterministic. The main purpose of gokey is to
generate deterministic keys. The second upload to Debian unstable fixes
the build failure by increasing the timeout for the tests, because the
tests take very long on mips/mipsel. The gokey tests takes 11408.183 s
(= 190 min) on minkus.debian.org (mips porter box).

By the way, gokey
0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780-2 is more or less
the same version as 0.0~git20190103.40eba7e-1, because there are only
two upstream commits between 20181023.b4e2780 and 20190103.40eba7e.

The debdiff is attached. My email address changes and this is not
mentioned in the changelog.

unblock gokey/0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780-3

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet
diff -Nru 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/changelog 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/changelog
--- 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/changelog
2019-06-04 20:53:29.0 +0200
+++ 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/changelog
2019-06-17 20:04:04.0 +0200
@@ -1,3 +1,18 @@
+gokey (0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780-3) unstable; 
urgency=medium
+
+  * Increase test timeout to six hours, because the tests need 190 minutes
+on mips (Closes: #919759)
+  * Run tests for RSA2048 and RSA4096 again
+
+ -- Benjamin Drung   Mon, 17 Jun 2019 20:04:04 
+0200
+
+gokey (0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780-2) unstable; 
urgency=medium
+
+  * Cherry-pick patch from upstream to import deterministic RSA key generation
+code from Go 1.10 crypto/rsa package (Closes: #930426)
+
+ -- Benjamin Drung   Thu, 13 Jun 2019 15:51:37 
+0200
+
 gokey (0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780-1) unstable; 
urgency=medium
 
   * Team upload.
diff -Nru 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/control 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/control
--- gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/control  
2019-06-04 20:52:40.0 +0200
+++ gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/control  
2019-06-13 15:53:37.0 +0200
@@ -1,6 +1,6 @@
 Source: gokey
 Maintainer: Debian Go Packaging Team 
-Uploaders: Benjamin Drung ,
+Uploaders: Benjamin Drung ,
Anthony Fok 
 Section: utils
 Testsuite: autopkgtest-pkg-go
diff -Nru 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/patches/0002-disable-TestGetKey-for-RSA.patch
 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/patches/0002-disable-TestGetKey-for-RSA.patch
--- 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/patches/0002-disable-TestGetKey-for-RSA.patch
2019-06-04 20:52:40.0 +0200
+++ 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/patches/0002-disable-TestGetKey-for-RSA.patch
1970-01-01 01:00:00.0 +0100
@@ -1,24 +0,0 @@
-Description: Disable tests for RSA2048 and RSA4096 in TestGetKey
- rsa.GenerateKey has been intentionally made non-deterministic since Go 1.11. 
- This patch fixes the "gokey_test.go:161: keys with same invocation options
- do not match" error in TestGetKey with Go >= 1.11.
-Author: Anthony Fok 
-Origin: vendor
-Bug: https://github.com/cloudflare/gokey/issues/17
-Last-Update: 2018-12-31

-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 a/gokey_test.go
-+++ b/gokey_test.go
-@@ -165,8 +165,9 @@
- func TestGetKey(t *testing.T) {
-   testGetKeyType(EC256, t)
-   testGetKeyType(EC521, t)
--  testGetKeyType(RSA2048, t)
--  testGetKeyType(RSA4096, t)
-+  // rsa.GenerateKey is no longer deterministic in Go >= 1.11
-+  //testGetKeyType(RSA2048, t)
-+  //testGetKeyType(RSA4096, t)
-   testGetKeyType(X25519, t)
-   testGetKeyType(ED25519, t)
- }
diff -Nru 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/patches/Import-deterministic-RSA-key-generation-code-from-Go.patch
 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/patches/Import-deterministic-RSA-key-generation-code-from-Go.patch
--- 
gokey-0.0~git20190103.40eba7e+really0.0~git20181023.b4e2780/debian/patches/Import-deterministic-RSA-key-generation-code-from-Go

Bug#927348: unblock: salt/2018.3.4+dfsg1-2

2019-05-27 Thread Benjamin Drung
Control: tags -1 moreinfo

Am Samstag, den 25.05.2019, 10:58 +0200 schrieb Paul Gevers:
> On 24-05-2019 15:38, Benjamin Drung wrote:
> > I would like to upload that proposed version to unstable.
> 
> Please go ahead and remove the moreinfo tag when the package is build
> and installed.

salt 2018.3.4+dfsg1-6 uploaded, built successfully and debci succeeded
as well.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet



Bug#927348: unblock: salt/2018.3.4+dfsg1-2

2019-05-24 Thread Benjamin Drung
Hi Paul,

Am Dienstag, den 14.05.2019, 20:13 +0200 schrieb Paul Gevers:
> Hi Benjamin,
> 
> On 14-05-2019 13:13, Benjamin Drung wrote:
> > Hi Paul,
> > 
> > Am Freitag, den 10.05.2019, 20:40 +0200 schrieb Paul Gevers:
> > > Control: tags -1 moreinfo
> > > 
> > > So, all in all, I don't want to unblock the new upstream with
> > > your
> > > packaging, we're too late in the cycle and the version really
> > > doesn't
> > > match the freeze policy. However, I am offering you an upload
> > > based
> > > on the version currently in buster via t-p-u. If you go that
> > > route,
> > > please only fix bugs 919849, 928337, 922352, 924763, the
> > > LC_ALL=C.UTF-8 item and the systemd issue. Please fix 919849
> > > without
> > > switching your build to sphinxdoc, that isn't appropriate at this
> > > moment.
> > 
> > Okay. So you prefer an upload to t-p-u or can I just revert those
> > rejected changes (typos fixes and using dh_sphinxdoc) and do
> > another
> > upload to unstable?
> 
> I would prefer an upload to unstable if you also revert to the
> previous
> upstream tar ball (e.g. using the +really version syntax).

I prepared the relevant changes in the master-proposed branch:
https://salsa.debian.org/salt-team/salt/commits/master-proposed

Attached a diff between 2018.3.4~git20180207+dfsg1-1 from testing and
the proposed 2018.3.4+dfsg1-6 created with:

git diff debian/2018.3.4_git20180207+dfsg1-1..master-proposed -- debian

I tested this proposed version that it builds and that the
documentation works as expected (including the search) and that all
needed files are there and that it contains to broken symlinks.

While testing I found and fixed another instance of privacy breach:
https://salsa.debian.org/salt-team/salt/commit/08a00aaa4670d0713ec55c0d23d25e64ad85e624
(privacy breach is not part of the policy yet, see #726998)
Let me know if this change is acceptable or not.

I would like to upload that proposed version to unstable. If you
insists of staying with the 2018.3.4~git20180207+dfsg1 snapshot, I will
rebase this patch on top of 2018.3.4~git20180207+dfsg1 and prepare the
upload for t-p-u.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet
diff --git a/debian/changelog b/debian/changelog
index e1942d9d..9d0dfca3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,65 @@
+salt (2018.3.4+dfsg1-6) unstable; urgency=medium
+
+  * Revert changes that were rejected by the release team:
+- Drop fixing various spelling mistakes
+- Drop using jquery.js from sphinx
+- Drop using dh_sphinxdoc
+- Drop patch to set script type explicitly to text/javascript
+  * doc: Use local Open Sans fonts instead of querying Google
+to fix possible privacy breach
+
+ -- Benjamin Drung   Fri, 24 May 2019 15:01:45 +0200
+
+salt (2018.3.4+dfsg1-5) unstable; urgency=medium
+
+  * Cherry-pick upstream patch to fix edge case when minion ID is a
+16-character string (Closes: #928337)
+
+ -- Benjamin Drung   Thu, 02 May 2019 13:23:44 +0200
+
+salt (2018.3.4+dfsg1-4) unstable; urgency=medium
+
+  * Cherry-pick upstream patch to fix retrieving systemd version (for 241-3)
+
+ -- Benjamin Drung   Fri, 26 Apr 2019 16:38:39 +0200
+
+salt (2018.3.4+dfsg1-3) unstable; urgency=medium
+
+  [ Benjamin Drung ]
+  * tests: Drop copying missing templates directory
+  * salt-doc: Install favicon in document root and do not compress it
+  * salt-doc: Fix JavaScript symlinks to bootstrap (Closes: #919849)
+  * doc: Set script type explicitly to text/javascript
+  * Use jquery.js from sphinx
+  * Symlink vendor JavaScript files before building
+  * Use dh_sphinxdoc
+
+  [ Steffen Kockel ]
+  * doc: Fix logo link to point to contents.html
+  * doc: Ensure searchtools.js gets included (to fix the search)
+
+ -- Benjamin Drung   Thu, 25 Apr 2019 13:39:10 +0200
+
+salt (2018.3.4+dfsg1-2) unstable; urgency=medium
+
+  * Fix test_xen_virtual on kernels with no Xen support (Closes: #922352)
+  * Expose tornado4 as tornado for zmq.eventloop.ioloop (Closes: #924763)
+
+ -- Benjamin Drung   Wed, 17 Apr 2019 20:26:11 +0200
+
+salt (2018.3.4+dfsg1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Refresh patches
+  * Fix various spelling mistakes
+  * Drop NOTICE from salt-common (the upstream tarball does not contain it)
+  * Skip SampleConfTest and ExtendTestCase if the required sample conf or
+templates directories are missing
+  * Run tests with LC_ALL=C.UTF-8
+  * R

Bug#927348: unblock: salt/2018.3.4+dfsg1-2

2019-05-14 Thread Benjamin Drung
Hi Paul,

Am Freitag, den 10.05.2019, 20:40 +0200 schrieb Paul Gevers:
> Control: tags -1 moreinfo
> 
> So, all in all, I don't want to unblock the new upstream with your
> packaging, we're too late in the cycle and the version really doesn't
> match the freeze policy. However, I am offering you an upload based
> on the version currently in buster via t-p-u. If you go that route,
> please only fix bugs 919849, 928337, 922352, 924763, the
> LC_ALL=C.UTF-8 item and the systemd issue. Please fix 919849 without
> switching your build to sphinxdoc, that isn't appropriate at this
> moment.

Okay. So you prefer an upload to t-p-u or can I just revert those
rejected changes (typos fixes and using dh_sphinxdoc) and do another
upload to unstable?

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet



Bug#927348: unblock: salt/2018.3.4+dfsg1-2

2019-05-06 Thread Benjamin Drung
Control: tags -1 - moreinfo

Hi,

Am Donnerstag, den 02.05.2019, 21:05 +0200 schrieb Paul Gevers:
> Control: tags -1 moreinfo
> 
> Hi Benjamin,
> 
> On Thu, 18 Apr 2019 13:01:31 +0200 Benjamin Drung
>  wrote:
> > This version fixes the test_xen_virtual test case (bug #922352) and
> > exposes tornado4 as tornado for zmq.eventloop.ioloop (bug #924763).
> > Our
> > salt 2018.3.3+dfsg1-1 package introduced a big patch to use
> > python3-tornado4 (instead of python3-tornado) due to missing
> > support for
> > tornado version 5. Without the fix for #924763,
> > zmq.eventloop.ioloop
> > will import tornado version 5 (if python3-tornado is installed).
> 
> Both bugs have severity normal. Do you really want to bother now or
> is the severity not correct (then please fix that and elaborate)?

Bug #922352 can cause a build failure (and does on Ubuntu). Therefore I
raised it to serious.

Determining the severity of bug #924763 is more complicated. The
reporter stumbled over a warning spit out by salt. The warning message
by itself is more or less harmless, but the underlying problem of the
wrong import might have bad effects. I haven't seen any yet, but they
might be there. IMO we shouldn't release salt with an issue introduced
by one of our patches.

> > I also included fix-various-spelling-mistakes.patch which fixes
> > several
> > spelling mistakes. Because this patch file is long, I excluded it
> > from the
> > attached debdiff.
> 
> Bugs can be introduced that way. I am not going to review that diff,
> fixing spelling mistakes at this moment isn't appropriate unless
> these mistakes are crucial somewhere.

I can drop that patch again when this is the only blocker for getting
the unblock request accepted.

> > This version also switches from the a pre-release git snapshot to
> > the
> > official 2018.3.4 release. The only difference between this
> > snapshot and
> > the release are two commits ("Fix ssh on Windows" and "Update url
> > to
> > libsodium for mac builds") and that the release tarball ships less
> > files
> > than what can be found in git.
> 
> If that was all (salt/modules/ssh.py and
> tests/integration/modules/test_ssh.py), I could except it. But with
> less files, there is also a changes that ...

All previous upstream releases like 2017.7.3, 2017.7.2, and so on did
not contain these additional files that the git snapshot
2018.3.4~git20180207 contained. All these additional, auxiliary files
are not needed for the installation. I should have used the upstream
method to create the release tarball instead of using "git archive"
when creating the 2018.3.4~git20180207 tarball.

> > For that reason, the attached debdiff is created with this command:
> > 
> > debdiff --exclude fix-various-spelling-mistakes.patch
> > salt_2018.3.4~git20180207+dfsg1-1.dsc salt_2018.3.4+dfsg1-2.dsc |
> > filterdiff -i '*/debian/*' -i '*/tests/*/test_ssh.py' -i
> > '*/salt/modules/ssh.py' -i '*/pkg/osx/build_env.sh' >
> > salt_2018.3.4+dfsg1-2.debdiff
> > 
> > Alternatively this more simple git diff command could be used:
> > 
> > git diff --diff-filter=ACM
> > debian/2018.3.4_git20180207+dfsg1-1..debian/2018.3.4+dfsg1-2
> > 
> > You can also look at all the individual commits on salsa:
> > https://salsa.debian.org/salt-team/salt/compare/debian%2F2018.3.4_git20180207+dfsg1-1...debian%2F2018.3.4+dfsg1-2
> > 
> > All 7575 unittest succeeded and I successfully tested this new salt
> > version on Debian unstable with our production environment setup
> > (running the highstate on a salt minion connected to the salt
> > master).
> > 
> > unblock salt/2018.3.4+dfsg1-2
> 
> You didn't even elaborate on all the (at this phase of the release
> inappropriate) changes to the packaging. There is even a newer
> version
> than the one you already mention in a follow up in this bug.

Which changes to the packaging do you refer to?

Running the tests with LC_ALL=C.UTF-8 fixes a build failure in case the
building machine uses an ANSII locale, which would be worth another RC
bug report.

Upload 2018.3.4+dfsg1-3 repairs the documentation in salt-doc. It
ensures that the pre-built minified Javascript and CSS files are not
leaked into the salt-doc binary package and that all created symlink
are correct. Before this version, salt-doc contained broken symlinks
and the search did not work.

systemd 241 broke salt. Upload 2018.3.4+dfsg1-4 fixes that. There were
no bug report opened for it, but it would be worth one RC bug.

The newly opened RC bug #928337 was fixed in 2018.3.4+dfsg1-5.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet



Bug#927348: unblock: salt/2018.3.4+dfsg1-2

2019-04-26 Thread Benjamin Drung
retitle 927348 unblock: salt/2018.3.4+dfsg1-4
thanks

Hi,

two more uploads for salt were needed: The first for repairing the
documentation (correct JavaScript symlinks and making the search work
again). The second for fixing the autopkgtest when using systemd 241-3. 
A debdiff between salt 2018.3.4+dfsg1-2 and 2018.3.4+dfsg1-4 is
attached.

unblock salt/2018.3.4+dfsg1-4

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

1&1 IONOS Cloud GmbH | Greifswalder Str. 207 | 10405 Berlin | Germany
E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de

Head Office: Berlin, Germany
District Court Berlin Charlottenburg, Registration number: HRB 125506 B
Executive Management: Christoph Steffens, Matthias Steinberg, Achim
Weiss

Member of United Internet
diff -Nru salt-2018.3.4+dfsg1/debian/changelog salt-2018.3.4+dfsg1/debian/changelog
--- salt-2018.3.4+dfsg1/debian/changelog	2019-04-17 20:26:11.0 +0200
+++ salt-2018.3.4+dfsg1/debian/changelog	2019-04-26 16:38:39.0 +0200
@@ -1,3 +1,26 @@
+salt (2018.3.4+dfsg1-4) unstable; urgency=medium
+
+  * Cherry-pick upstream patch to fix retrieving systemd version (for 241-3)
+
+ -- Benjamin Drung   Fri, 26 Apr 2019 16:38:39 +0200
+
+salt (2018.3.4+dfsg1-3) unstable; urgency=medium
+
+  [ Benjamin Drung ]
+  * tests: Drop copying missing templates directory
+  * salt-doc: Install favicon in document root and do not compress it
+  * salt-doc: Fix JavaScript symlinks to bootstrap (Closes: #919849)
+  * doc: Set script type explicitly to text/javascript
+  * Use jquery.js from sphinx
+  * Symlink vendor JavaScript files before building
+  * Use dh_sphinxdoc
+
+  [ Steffen Kockel ]
+  * doc: Fix logo link to point to contents.html
+  * doc: Ensure searchtools.js gets included (to fix the search)
+
+ -- Benjamin Drung   Thu, 25 Apr 2019 13:39:10 +0200
+
 salt (2018.3.4+dfsg1-2) unstable; urgency=medium
 
   * Fix test_xen_virtual on kernels with no Xen support (Closes: #922352)
diff -Nru salt-2018.3.4+dfsg1/debian/control salt-2018.3.4+dfsg1/debian/control
--- salt-2018.3.4+dfsg1/debian/control	2019-04-05 14:43:18.0 +0200
+++ salt-2018.3.4+dfsg1/debian/control	2019-04-25 17:08:50.0 +0200
@@ -11,6 +11,8 @@
debhelper (>= 11),
dh-python,
dpkg-dev (>= 1.16.2),
+   libjs-bootstrap,
+   libjs-modernizr,
python3,
python3 (>= 3.6) | python3-mock,
python3-augeas,
@@ -52,6 +54,7 @@
python3-twilio,
python3-yaml,
python3-zmq (>= 13.1.0),
+   sphinx-common,
virtualenv
 Build-Depends-Indep: python3-doc, python3-sphinx (>= 1.3.5)
 Standards-Version: 4.3.0
@@ -219,11 +222,11 @@
 Package: salt-doc
 Architecture: all
 Section: doc
+Built-Using: ${sphinxdoc:Built-Using}
 Depends: libjs-bootstrap,
- libjs-jquery,
  libjs-modernizr,
- libjs-sphinxdoc,
- ${misc:Depends}
+ ${misc:Depends},
+ ${sphinxdoc:Depends}
 Breaks: salt-common (<< 2016.11.5)
 Replaces: salt-common (<< 2016.11.5)
 Description: additional documentation for salt, the distributed remote execution system
diff -Nru salt-2018.3.4+dfsg1/debian/patches/doc-fix-logo-link.patch salt-2018.3.4+dfsg1/debian/patches/doc-fix-logo-link.patch
--- salt-2018.3.4+dfsg1/debian/patches/doc-fix-logo-link.patch	1970-01-01 01:00:00.0 +0100
+++ salt-2018.3.4+dfsg1/debian/patches/doc-fix-logo-link.patch	2019-04-25 17:09:29.0 +0200
@@ -0,0 +1,27 @@
+From 5c3036d248c4ae76d2fa7598cde179294aa4b2bb Mon Sep 17 00:00:00 2001
+From: Steffen Kockel 
+Date: Tue, 23 Apr 2019 17:45:00 +0200
+Subject: [PATCH] doc: Fix logo link
+
+The link on the brand image was pointing to index.html which does not
+exist. The index file seems to be contents.html.
+---
+ doc/_themes/saltstack/layout.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html
+index 85e0a3cf..d5ff2cd6 100644
+--- a/doc/_themes/saltstack/layout.html
 b/doc/_themes/saltstack/layout.html
+@@ -181,7 +181,7 @@
+ 
+ 
+ 
+-
++
+ 
+ {%- block relbar1 %}{{ relbar() }}{% endblock %}
+ 
+-- 
+2.17.1
+
diff -Nru salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch
--- salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch	1970-01-01 01:00:00.0 +0100
+++ salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch	2019-04-25 17:09:29.0 +0200
@@ -0,0 +1,52 @@
+From e22e49d974937ed9107cf33c679799c914f27777 Mon Sep 17 

Bug#927348: unblock: salt/2018.3.4+dfsg1-2

2019-04-18 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package salt

This version fixes the test_xen_virtual test case (bug #922352) and
exposes tornado4 as tornado for zmq.eventloop.ioloop (bug #924763). Our
salt 2018.3.3+dfsg1-1 package introduced a big patch to use
python3-tornado4 (instead of python3-tornado) due to missing support for
tornado version 5. Without the fix for #924763, zmq.eventloop.ioloop
will import tornado version 5 (if python3-tornado is installed).

I also included fix-various-spelling-mistakes.patch which fixes several
spelling mistakes. Because this patch file is long, I excluded it from the
attached debdiff.

This version also switches from the a pre-release git snapshot to the
official 2018.3.4 release. The only difference between this snapshot and
the release are two commits ("Fix ssh on Windows" and "Update url to
libsodium for mac builds") and that the release tarball ships less files
than what can be found in git.

For that reason, the attached debdiff is created with this command:

debdiff --exclude fix-various-spelling-mistakes.patch
salt_2018.3.4~git20180207+dfsg1-1.dsc salt_2018.3.4+dfsg1-2.dsc |
filterdiff -i '*/debian/*' -i '*/tests/*/test_ssh.py' -i
'*/salt/modules/ssh.py' -i '*/pkg/osx/build_env.sh' >
salt_2018.3.4+dfsg1-2.debdiff

Alternatively this more simple git diff command could be used:

git diff --diff-filter=ACM
debian/2018.3.4_git20180207+dfsg1-1..debian/2018.3.4+dfsg1-2

You can also look at all the individual commits on salsa:
https://salsa.debian.org/salt-team/salt/compare/debian%2F2018.3.4_git20180207+dfsg1-1...debian%2F2018.3.4+dfsg1-2

All 7575 unittest succeeded and I successfully tested this new salt
version on Debian unstable with our production environment setup
(running the highstate on a salt minion connected to the salt master).

unblock salt/2018.3.4+dfsg1-2

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

Kernel: Linux 5.0.0-13-generic (SMP w/12 CPU cores)
Kernel taint flags: TAINT_WARN
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), 
LANGUAGE=de_DE:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru --exclude fix-various-spelling-mistakes.patch 
salt-2018.3.4~git20180207+dfsg1/debian/changelog 
salt-2018.3.4+dfsg1/debian/changelog
--- salt-2018.3.4~git20180207+dfsg1/debian/changelog2019-02-08 
17:05:57.0 +0100
+++ salt-2018.3.4+dfsg1/debian/changelog2019-04-17 20:26:11.0 
+0200
@@ -1,3 +1,23 @@
+salt (2018.3.4+dfsg1-2) unstable; urgency=medium
+
+  * Fix test_xen_virtual on kernels with no Xen support (Closes: #922352)
+  * Expose tornado4 as tornado for zmq.eventloop.ioloop (Closes: #924763)
+
+ -- Benjamin Drung   Wed, 17 Apr 2019 20:26:11 
+0200
+
+salt (2018.3.4+dfsg1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Refresh patches
+  * Fix various spelling mistakes
+  * Drop NOTICE from salt-common (the upstream tarball does not contain it)
+  * Skip SampleConfTest and ExtendTestCase if the required sample conf or
+templates directories are missing
+  * Run tests with LC_ALL=C.UTF-8
+  * Remove unused minified documentation CSS files
+
+ -- Benjamin Drung   Fri, 05 Apr 2019 13:58:40 
+0200
+
 salt (2018.3.4~git20180207+dfsg1-1) unstable; urgency=medium
 
   * New upstream pre-release snapshot.
diff -Nru --exclude fix-various-spelling-mistakes.patch 
salt-2018.3.4~git20180207+dfsg1/debian/patches/0001-Skip-SampleConfTest-if-sample-conf-directories-are-m.patch
 
salt-2018.3.4+dfsg1/debian/patches/0001-Skip-SampleConfTest-if-sample-conf-directories-are-m.patch
--- 
salt-2018.3.4~git20180207+dfsg1/debian/patches/0001-Skip-SampleConfTest-if-sample-conf-directories-are-m.patch
  1970-01-01 01:00:00.0 +0100
+++ 
salt-2018.3.4+dfsg1/debian/patches/0001-Skip-SampleConfTest-if-sample-conf-directories-are-m.patch
  2019-04-03 16:36:21.0 +0200
@@ -0,0 +1,97 @@
+From 0473683aceaba9a975fc28f72ff80e8ab12dea2d Mon Sep 17 00:00:00 2001
+From: Benjamin Drung 
+Date: Wed, 3 Apr 2019 14:50:12 +0200
+Subject: [PATCH 1/2] Skip SampleConfTest if sample conf directories are
+ missing
+
+The release tarball does not contain `conf/cloud.profiles.d`,
+`conf/cloud.providers.d`, and `conf/cloud.maps.d`. Therefore the test
+cases will fail:
+
+```
+==
+ERROR: test_conf_cloud_maps_d_files_are_commented 
(unit.test_config.SampleConfTest)
+[CPU:0.0%|MEM:53.9%]
+--
+Traceback (most recent call last):
+  File "tests/unit/test_config.py", line 236, in 
test_conf_cloud_maps_d_files_are_commented
+cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
+FileNotF

Bug#884845: release.debian.org: rdma-core does not migrate to testing

2017-12-20 Thread Benjamin Drung
Am Mittwoch, den 20.12.2017, 11:59 + schrieb Adam D. Barratt:
> On 2017-12-20 10:35, Benjamin Drung wrote:
> > rdma-core is the new source package that takes over several rdma 
> > related
> > source packages. Therefore it takes over several binary packages,
> > but 
> > it
> > does not break the API of the existing binary library packages. The
> > package builds on all linux architectures and the excuses for rdma-
> > core
> > look good:
> > 
> > * Migration status: OK: Will attempt migration (Any information
> > below
> >   is purely informational)
> > * 8 days old (needed 5 days)
> > * Piuparts tested OK - 
> > https://piuparts.debian.org/sid/source/r/rdma-core.html
> > * Valid candidate
> > 
> > Is there a reason why the package does not migrate?
> 
> If there weren't a reason, it would have migrated, surely?
> 
> The (publicly available via HTTP, and DD-accessible via SSH) log
> says:
> 
> trying: rdma-core
> skipped: rdma-core (0, 22, 197)
>  got: 32+0: a-2:i-24:a-0:a-0:a-0:m-2:m-3:m-0:p-0:s-1
>  * mips: libibverbs1-dbg, librdmacm1-dbg

Where do I find this log? I failed to find it. Is the location
documented somewhere? It would be nice if that could be linked from the
tracker, e.g. https://tracker.debian.org/pkg/rdma-core points to
https://release.debian.org/britney/update_excuses.html#rdma-core

> > Can you push it to migrate?
> 
> I've added this hint, which seems to work fine in a test run:
> 
> easy rdma-core/16.0-1 -librdmacm/1.1.0-2 -libibverbs/1.2.1-2

Thanks.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.dr...@profitbricks.com
URL: https://www.profitbricks.de

Sitz der Gesellschaft: Berlin
Registergericht: Amtsgericht Charlottenburg, HRB 125506 B
Geschäftsführer: Achim Weiss, Matthias Steinberg



Bug#884845: release.debian.org: rdma-core does not migrate to testing

2017-12-20 Thread Benjamin Drung
Package: release.debian.org
Severity: normal

Hi,

rdma-core is the new source package that takes over several rdma related
source packages. Therefore it takes over several binary packages, but it
does not break the API of the existing binary library packages. The
package builds on all linux architectures and the excuses for rdma-core
look good:

* Migration status: OK: Will attempt migration (Any information below
  is purely informational)
* 8 days old (needed 5 days)
* Piuparts tested OK - https://piuparts.debian.org/sid/source/r/rdma-core.html
* Valid candidate

Is there a reason why the package does not migrate? Can you push it to
migrate?

PS: Is this type of bug report the correct way to handle non-working
testing migrations?

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.dr...@profitbricks.com
URL: https://www.profitbricks.de

Sitz der Gesellschaft: Berlin
Registergericht: Amtsgericht Charlottenburg, HRB 125506 B
Geschäftsführer: Achim Weiss, Matthias Steinberg


Bug#863628: unblock: apt-mirror/0.5.4-1

2017-05-30 Thread Benjamin Drung
Control: tag -1 - moreinfo

Hi Jonathan,

Am Montag, den 29.05.2017, 18:49 +0100 schrieb Jonathan Wiltshire:
> Control: tag -1 moreinfo
> 
> On Mon, May 29, 2017 at 02:45:31PM +0200, Benjamin Drung wrote:
> > apt-mirror 0.5.4 is a very small bug-fix release for stretch. It
> > fixes
> > the warning about the use of uninitialized value $config{"options"}
> > (which hits most users).
> 
> That is not all though, is it? Could you provide some background to
> the
> other changes?

I thought that the debian/changelog was sufficient:

- Fix use of uninitialized value $config{"options"} warning
  (Closes: #851979, #859601)
- Fix warning on repository without md5sum
- Write SHA1 and SHA256 in addition to MD5
- Also download xz-compressed Components-$arch.yml.xz

For more details, please look at the 5 individual commits from git
repository: https://github.com/apt-mirror/apt-mirror/commits/master

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.dr...@profitbricks.com
Web: https://www.profitbricks.com

Sitz der Gesellschaft: Berlin.
Registergericht: Amtsgericht Charlottenburg, HRB 125506B.
Geschäftsführer: Achim Weiss.



Bug#863628: unblock: apt-mirror/0.5.4-1

2017-05-29 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package apt-mirror

apt-mirror 0.5.4 is a very small bug-fix release for stretch. It fixes
the warning about the use of uninitialized value $config{"options"}
(which hits most users).

unblock apt-mirror/0.5.4-1

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.dr...@profitbricks.com
Web: https://www.profitbricks.com

Sitz der Gesellschaft: Berlin.
Registergericht: Amtsgericht Charlottenburg, HRB 125506B.
Geschäftsführer: Achim Weiss.
diff -Nru apt-mirror-0.5.3/apt-mirror apt-mirror-0.5.4/apt-mirror
--- apt-mirror-0.5.3/apt-mirror 2017-01-06 17:26:55.0 +0100
+++ apt-mirror-0.5.4/apt-mirror 2017-05-29 13:28:34.0 +0200
@@ -294,7 +294,7 @@
 if ( $line =~ $pattern_deb_line ) {
 $config{'type'} = $+{type};
 $config{'arch'} = $+{arch};
-$config{'options'} = $+{options};
+$config{'options'} = $+{options} ? $+{options} : "";
 $config{'uri'} = $+{uri};
 $config{'components'} = $+{components};
 if ( $config{'options'} =~ /arch=((?[\w\-]+)[,]*)/g ) {
@@ -666,7 +666,7 @@
 if ( @parts == 3 )
 {
 my ( $sha1, $size, $filename ) = @parts;
-if ( $filename =~ 
m{^$component/dep11/(Components-${arch}\.yml|icons-[^./]+\.tar)\.gz$} )
+if ( $filename =~ 
m{^$component/dep11/(Components-${arch}\.yml|icons-[^./]+\.tar)\.(gz|bz2|xz)$} )
 {
 add_url_to_download( $dist_uri . $filename, $size );
 }
@@ -729,6 +729,8 @@
 open FILES_ALL, ">" . get_variable("var_path") . "/ALL" or die("apt-mirror: 
can't write to intermediate file (ALL)");
 open FILES_NEW, ">" . get_variable("var_path") . "/NEW" or die("apt-mirror: 
can't write to intermediate file (NEW)");
 open FILES_MD5, ">" . get_variable("var_path") . "/MD5" or die("apt-mirror: 
can't write to intermediate file (MD5)");
+open FILES_SHA1, ">" . get_variable("var_path") . "/SHA1" or die("apt-mirror: 
can't write to intermediate file (SHA1)");
+open FILES_SHA256, ">" . get_variable("var_path") . "/SHA256" or 
die("apt-mirror: can't write to intermediate file (SHA256)");
 
 my %stat_cache = ();
 
@@ -813,7 +815,9 @@
 {# Packages index
 $skipclean{ remove_double_slashes( $path . "/" . 
$lines{"Filename:"} ) } = 1;
 print FILES_ALL remove_double_slashes( $path . "/" . 
$lines{"Filename:"} ) . "\n";
-print FILES_MD5 $lines{"MD5sum:"} . "  " . remove_double_slashes( 
$path . "/" . $lines{"Filename:"} ) . "\n";
+print FILES_MD5 $lines{"MD5sum:"} . "  " . remove_double_slashes( 
$path . "/" . $lines{"Filename:"} ) . "\n" if defined $lines{"MD5sum:"};
+print FILES_SHA1 $lines{"SHA1:"} . "  " . remove_double_slashes( 
$path . "/" . $lines{"Filename:"} ) . "\n" if defined $lines{"SHA1:"};
+print FILES_SHA256 $lines{"SHA256:"} . "  " . 
remove_double_slashes( $path . "/" . $lines{"Filename:"} ) . "\n" if defined 
$lines{"SHA256:"};
 if ( need_update( $mirror . "/" . $lines{"Filename:"}, 
$lines{"Size:"} ) )
 {
 print FILES_NEW remove_double_slashes( $uri . "/" . 
$lines{"Filename:"} ) . "\n";
@@ -887,6 +891,8 @@
 close FILES_ALL;
 close FILES_NEW;
 close FILES_MD5;
+close FILES_SHA1;
+close FILES_SHA256;
 
 
##
 ## Main download
diff -Nru apt-mirror-0.5.3/CHANGELOG apt-mirror-0.5.4/CHANGELOG
--- apt-mirror-0.5.3/CHANGELOG  2017-01-06 17:36:37.0 +0100
+++ apt-mirror-0.5.4/CHANGELOG  2017-05-29 13:38:52.0 +0200
@@ -1,3 +1,11 @@
+0.5.4 (2017-05-29)
+  * Add limit_rate to example mirror.list (fixes #72)
+  * Fix use of uninitialized value $config{"options"} warning (fixes #68,
+Debian bug #851979, #859601)
+  * Fix warning on repository without md5sum (fixes #66)
+  * Write SHA1 and SHA256 in addition to MD5
+  * Also download xz-compressed Components-$arch.yml.xz (fixes #69)
+
 0.5.3 (2017-01-06)
   * Add support for 'deb [arch=amd64] ...' format (fixes #32, #65)
   * Create directories including their parents
diff -Nru apt-mirror-0.5.3/debian/changelog apt-mi

Bug#863129: jessie-pu: package salt/2014.1.13+ds-3

2017-05-22 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

Hi,

salt in jessie is affected by some security issues. Salvatore Bonaccorso
from the security wrote: So we are basically down at
https://security-tracker.debian.org/tracker/source-package/salt to
no-dsa issues, so up to decicde I guess if you still want a DSA or
rather go via the upcoming point release.

Thus the requests for a SPU to fix four security bugs (debdiff
attached).

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.dr...@profitbricks.com
Web: https://www.profitbricks.com

Sitz der Gesellschaft: Berlin.
Registergericht: Amtsgericht Charlottenburg, HRB 125506B.
Geschäftsführer: Achim Weiss.
diff -Nru salt-2014.1.13+ds/debian/changelog salt-2014.1.13+ds/debian/changelog
--- salt-2014.1.13+ds/debian/changelog  2015-02-13 06:27:53.0 +0100
+++ salt-2014.1.13+ds/debian/changelog  2017-05-22 13:34:40.0 +0200
@@ -1,3 +1,18 @@
+salt (2014.1.13+ds-3+deb8u1) jessie; urgency=high
+
+  [ Benjamin Drung ]
+  * Team upload.
+  * CVE-2015-6918: git module leaks authentication details into log
+  * CVE-2015-6941: user state displays passwords in debug log
+
+  [ Salvatore Bonaccorso ]
+  * CVE-2015-8034: Information leak from state.sls cache data stored as
+world-readable (Closes: #807356)
+  * CVE-2016-3176: Insecure configuration of PAM external authentication
+service (Closes: #819184)
+
+ -- Benjamin Drung <benjamin.dr...@profitbricks.com>  Mon, 22 May 2017 
13:34:36 +0200
+
 salt (2014.1.13+ds-3) unstable; urgency=medium
 
   * [5273cd4] Added python-msgpack dependency. Closes: 777665
diff -Nru salt-2014.1.13+ds/debian/patches/CVE-2015-6918.patch 
salt-2014.1.13+ds/debian/patches/CVE-2015-6918.patch
--- salt-2014.1.13+ds/debian/patches/CVE-2015-6918.patch1970-01-01 
01:00:00.0 +0100
+++ salt-2014.1.13+ds/debian/patches/CVE-2015-6918.patch2017-04-18 
12:18:56.0 +0200
@@ -0,0 +1,46 @@
+From 528916548726976dcc75626dc6f6641ceb206ee3 Mon Sep 17 00:00:00 2001
+From: Tarjei Husøy <g...@thusoy.com>
+Date: Wed, 19 Aug 2015 11:41:10 -0700
+Subject: [PATCH] Git: Don't leak https user/pw to log
+Origin: backport, 
https://github.com/saltstack/salt/commit/28aa9b105804ff433d8f663b2f9b804f2b75495a
+
+---
+ salt/modules/git.py| 17 ++---
+ tests/unit/modules/git_test.py | 18 ++
+ 2 files changed, 32 insertions(+), 3 deletions(-)
+
+--- a/salt/modules/git.py
 b/salt/modules/git.py
+@@ -5,6 +5,7 @@
+ 
+ # Import python libs
+ import os
++import re
+ import tempfile
+ try:
+ import pipes
+@@ -75,6 +76,7 @@
+ result = __salt__['cmd.run_all'](cmd,
+  cwd=cwd,
+  runas=runas,
++ output_loglevel='quiet',
+  env=env,
+  **kwargs)
+ 
+@@ -86,7 +88,15 @@
+ if retcode == 0:
+ return result['stdout']
+ else:
+-raise exceptions.CommandExecutionError(result['stderr'])
++stderr = _remove_sensitive_data(result['stderr'])
++raise exceptions.CommandExecutionError(stderr)
++
++
++def _remove_sensitive_data(sensitive_output):
++'''
++Remove HTTP user and password.
++'''
++return re.sub('(https?)://.*@', r'\1://@', sensitive_output)
+ 
+ 
+ def _git_getdir(cwd, user=None):
diff -Nru salt-2014.1.13+ds/debian/patches/CVE-2015-6941.patch 
salt-2014.1.13+ds/debian/patches/CVE-2015-6941.patch
--- salt-2014.1.13+ds/debian/patches/CVE-2015-6941.patch1970-01-01 
01:00:00.0 +0100
+++ salt-2014.1.13+ds/debian/patches/CVE-2015-6941.patch2017-04-18 
12:32:52.0 +0200
@@ -0,0 +1,33 @@
+From fdd35374562658f4a20767a3703fab93d92f9ca9 Mon Sep 17 00:00:00 2001
+From: twangboy <s...@saltstack.com>
+Date: Fri, 11 Sep 2015 16:39:47 -0600
+Subject: [PATCH] Replaced password with redacted when displayed
+Origin: backport, 
https://github.com/twangboy/salt/commit/c0689e32154c41f59840ae10ffc5fbfa30618710
+
+---
+ salt/states/user.py | 10 ++
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+--- a/salt/states/user.py
 b/salt/states/user.py
+@@ -362,6 +362,8 @@
+ ret['comment'] = ('The following user attributes are set to be '
+   'changed:\n')
+ for key, val in changes.items():
++if key == 'password':
++val = 'XXX-REDACTED-XXX'
+ ret['comment'] += '{0}: {1}\n'.format(key, val)
+ return ret
+ # The user is present
+@@ -480,9 +482,9 @@
+ if spost['passwd'] != password:
+ ret['comment'] = 'User {0} created but failed to set' 
\
+  

Bug#859794: unblock: salt/2016.11.2+ds-1

2017-04-18 Thread Benjamin Drung
Hi,

Am Dienstag, den 18.04.2017, 08:19 + schrieb Niels Thykier:
> Moritz Muehlenhoff:
> > On Fri, Apr 07, 2017 at 02:48:50PM +0200, Benjamin Drung wrote:
> > > Package: release.debian.org
> > > Severity: normal
> > > User: release.debian@packages.debian.org
> > > Usertags: unblock
> > > 
> > > Please unblock package salt
> > > 
> > > 2016.11.2 is a bug-fix release for the 2016.11 series. It
> > > contains
> > > security fixes for CVE-2017-5192 and CVE-2017-5200.
> > 
> > So what's the plan for stretch-security? Are the salt maintainers
> > commiting
> > to preparing security updates for it's lifetime? If not (as it
> > happened for
> > jessie), stable is better off without it.
> > 
> > Cheers,
> > Moritz
> > 
> 
> Hi Benjamin,
> 
> We are waiting for you to reply to the above mail before we can
> process
> this unblock request.

The jessie release predates my involvement in maintaining salt. I just
looked at the open security issues for jessie and send a debdiff to the
security team to fix most of them (one isn't easy to backport).

I will do my best to prepare security updates for stretch's lifetime.
Upstream will probably support the 2016.11 branch for one year or
longer. After that, backports should be doable for most issues.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.dr...@profitbricks.com
URL:  http://www.profitbricks.com

Sitz der Gesellschaft: Berlin.
Registergericht: Amtsgericht Charlottenburg, HRB 125506B.
Geschäftsführer: Andreas Gauger, Achim Weiss.



Re: Please binNMU phonon-backend-vlc against the new libvlccore7

2013-10-31 Thread Benjamin Drung
On Mi, 2013-10-30 at 16:44 +, Adam D. Barratt wrote:
 On 2013-10-30 15:48, Benjamin Drung wrote:
  On Mi, 2013-10-30 at 13:08 +0100, Rémi Denis-Courmont wrote:
 Hello,
 
  On Wed, 30 Oct 2013 11:38:29 +, Adam D. Barratt
  a...@adam-barratt.org.uk wrote:
   On 2013-10-28 6:46, Mateusz Łukasik wrote:
   recently vlc source package has been updated and it now builds
   libvlccore7  instead of libvlccore5.
 [...]
   phonon-backend-vlc isn't the only package affected; CCing the
   maintainers - what's the plan here?
 [...]
  I concur with upstream. These packages should be fixed to use the 
  stable
  API from libvlc instead of using libvlccore. Looking at the other
  package, they all just depend on libvlc, but not on libvlccore. Just
  phonon-backend-vlc requires libvlccore.
 
 Mea culpa, I obviously had a moment and missed that only libvlccore had 
 changed SONAME (can I blame jetlag?).

No problem. You could blame whatever you want or be honest. ;)

 However, it's not just phonon-backend-vlc - goldencheetah depends on 
 both libvlc and libvlccore.

The vlc dependency is quite new (not in wheezy). May I ask you to report
a bug against goldencheetah?

-- 
Benjamin Drung
Debian  Ubuntu Developer


-- 
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/1383217347.3738.22.camel@deep-thought



Re: Please binNMU phonon-backend-vlc against the new libvlccore7

2013-10-30 Thread Benjamin Drung
On Mi, 2013-10-30 at 13:08 +0100, Rémi Denis-Courmont wrote:
Hello,

 On Wed, 30 Oct 2013 11:38:29 +, Adam D. Barratt
 a...@adam-barratt.org.uk wrote:
  On 2013-10-28 6:46, Mateusz Łukasik wrote:
  recently vlc source package has been updated and it now builds
  libvlccore7  instead of libvlccore5.
  It is possible to build phonon-backend-vlc against the new
  libvlccore7.  Now phonon-backend-vlc have broken depends on i386 and
  amd64. On others  architectures new version is not avaitable now, see
  #727831.
  
  phonon-backend-vlc isn't the only package affected; CCing the 
  maintainers - what's the plan here?

 I don't know but this looks like a bug in phonon-backend-vlc to me, in
 upstream and/or in Debian. The external interface to libvlc is libvlc, not
 libvlccore.
 
 libvlccore is explicitly not stable and MUST ONLY be used by VLC plugins.
 In other words, unless a package installs something in
 /usr/lib/vlc/plugins, it has ZERO business linking against libvlccore
 directly. None of the packages below seem to pass that condition, and
 definitely not phonon-backend-vlc nor browser-plugin-vlc.

I concur with upstream. These packages should be fixed to use the stable
API from libvlc instead of using libvlccore. Looking at the other
package, they all just depend on libvlc, but not on libvlccore. Just
phonon-backend-vlc requires libvlccore.

-- 
Benjamin Drung
Debian  Ubuntu Developer


-- 
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/1383148110.8387.2.camel@deep-thought



Bug#702285: unblock: vlc/2.0.3-5

2013-03-04 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package vlc

Attached the debdiff for vlc 2.0.3-5 that I want to upload to testing to fix
the RC bug #685243. This proposed solution works around an apt bug/limitation.

unblock vlc/2.0.3-5
diff -Nru vlc-2.0.3/debian/changelog vlc-2.0.3/debian/changelog
--- vlc-2.0.3/debian/changelog	2012-12-06 21:55:07.0 +0100
+++ vlc-2.0.3/debian/changelog	2013-03-04 16:15:02.0 +0100
@@ -1,3 +1,10 @@
+vlc (2.0.3-5) testing; urgency=low
+
+  * vlc-plugin-*: Break vlc-nox ( 2.0.0) to workaround running an outdated
+vlc-cache-gen. (Closes: #685243)
+
+ -- Benjamin Drung bdr...@debian.org  Mon, 04 Mar 2013 16:15:02 +0100
+
 vlc (2.0.3-4) testing; urgency=low
 
   * SECURITY UPDATE: denial of service via crafted PNG file (Closes: #692130)
diff -Nru vlc-2.0.3/debian/control vlc-2.0.3/debian/control
--- vlc-2.0.3/debian/control	2012-12-06 12:22:24.0 +0100
+++ vlc-2.0.3/debian/control	2013-03-04 16:13:55.0 +0100
@@ -255,6 +255,7 @@
  vlc-nox (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
+Breaks: vlc-nox ( 2.0.0)
 Description: FluidSynth plugin for VLC
  This plugin adds support for playing MIDI file via the FluidSynth software
  synthesizer to the VLC media player.
@@ -267,6 +268,7 @@
 Architecture: any
 Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: vlc-nox ( 2.0.0)
 Description: Jack audio plugins for VLC
  These plugins add support for JACK to the VLC media player. To
  activate the audio output module, use the `--aout jack' flag or
@@ -281,7 +283,7 @@
 Architecture: any
 Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: vlc-nox ( 1.1.2)
+Breaks: vlc-nox ( 2.0.0)
 Replaces: vlc-nox ( 1.1.2)
 Description: LibNotify plugin for VLC
  This plugin adds support for libnotify track change notification to the
@@ -295,6 +297,7 @@
 Architecture: any
 Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: vlc-nox ( 2.0.0)
 Description: PulseAudio plugin for VLC
  This plugin adds support for PulseAudio to the VLC media player. To
  activate the audio output module, use the `--aout pulse' flag or
@@ -308,6 +311,7 @@
 Architecture: any
 Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: vlc-nox ( 2.0.0)
 Description: SDL video and audio output plugin for VLC
  This plugin adds support for the Simple DirectMedia Layer library to
  the VLC media player. To activate it, use the `--vout sdl' or
@@ -322,6 +326,7 @@
 Architecture: any
 Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: vlc-nox ( 2.0.0)
 Description: SVG plugin for VLC
  This plugin allows you to render SVG graphics on top of the video. It is a text
  renderer, and must be activated through the '--text-renderer svg' option. When
@@ -336,6 +341,7 @@
 Architecture: any
 Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: vlc-nox ( 2.0.0)
 Description: VBI teletext plugin for VLC
  This plugin adds support for VBI teletext to the VLC media player.
  .


Bug#692773: unblock: vlc/2.0.4-1

2012-12-06 Thread Benjamin Drung
Am Dienstag, den 04.12.2012, 22:45 +0100 schrieb Moritz Muehlenhoff:
 On Mon, Nov 26, 2012 at 12:47:51AM +0100, Julien Cristau wrote:
  On Thu, Nov  8, 2012 at 18:44:42 +0100, Benjamin Drung wrote:
  
   Package: release.debian.org
   Severity: normal
   User: release.debian@packages.debian.org
   Usertags: unblock
   
   Please unblock package vlc
   
   The 2.0.4 release is a bug-fix only release of upstream 2.0.x branch.
   It fixes a lot of bugs, which only a few where reported against 
   Debian/Ubuntu.
   The 2.0.4 release adds support for Opus besides the bug fixes. I enabled
   the sftp access and Opus codec plugin, because Opus is standardized and
   should be supported out-of-the box.
   
  - The diff was so big it never made it to the mailing list.
  - A freeze is not the time to be enabling new features.  Standardized or
not.
 
 The isolated security fix can be found here:
 http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commit;h=47d4631ac62900484fac206abdfc33a2920b07bf

Thanks for isolating the fix. I have prepared a debdiff for
testing-proposed-updates (attached).

-- 
Benjamin Drung
Debian  Ubuntu Developer
diff -Nru vlc-2.0.3/debian/changelog vlc-2.0.3/debian/changelog
--- vlc-2.0.3/debian/changelog	2012-10-04 21:40:56.0 +0200
+++ vlc-2.0.3/debian/changelog	2012-12-06 15:19:43.0 +0100
@@ -1,3 +1,10 @@
+vlc (2.0.3-4) testing; urgency=low
+
+  * SECURITY UPDATE: denial of service via crafted PNG file (Closes: #692130)
+- CVE-2012-5470
+
+ -- Benjamin Drung bdr...@debian.org  Thu, 06 Dec 2012 15:19:37 +0100
+
 vlc (2.0.3-3) unstable; urgency=low
 
   * debian/vlc.postinst: Fix directory to symlink upgrade in postinst.
diff -Nru vlc-2.0.3/debian/patches/CVE-2012-5470.patch vlc-2.0.3/debian/patches/CVE-2012-5470.patch
--- vlc-2.0.3/debian/patches/CVE-2012-5470.patch	1970-01-01 01:00:00.0 +0100
+++ vlc-2.0.3/debian/patches/CVE-2012-5470.patch	2012-12-06 12:20:21.0 +0100
@@ -0,0 +1,38 @@
+From 47d4631ac62900484fac206abdfc33a2920b07bf Mon Sep 17 00:00:00 2001
+From: Edward Wang edward.c.w...@compdigitec.com
+Date: Sun, 14 Oct 2012 18:58:18 -0400
+Subject: [PATCH] png: Check length before read
+
+Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
+(cherry picked from commit b3b751cb99df71e3c0a18bcb38b4691cf98265fe)
+
+Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
+---
+ modules/codec/png.c |8 +---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/modules/codec/png.c b/modules/codec/png.c
+index acd5694..ced4016 100644
+--- a/modules/codec/png.c
 b/modules/codec/png.c
+@@ -91,12 +91,14 @@ static int OpenDecoder( vlc_object_t *p_this )
+ static void user_read( png_structp p_png, png_bytep data, png_size_t i_length )
+ {
+ block_t *p_block = (block_t *)png_get_io_ptr( p_png );
+-png_size_t i_read = __MIN( p_block-i_buffer, i_length );
++if( i_length  p_block-i_buffer ) {
++png_error( p_png, not enough data );
++return;
++}
++
+ memcpy( data, p_block-p_buffer, i_length );
+ p_block-p_buffer += i_length;
+ p_block-i_buffer -= i_length;
+-
+-if( i_length != i_read ) png_error( p_png, not enough data );
+ }
+ 
+ static void user_error( png_structp p_png, png_const_charp error_msg )
+-- 
+1.7.10.4
+
diff -Nru vlc-2.0.3/debian/patches/series vlc-2.0.3/debian/patches/series
--- vlc-2.0.3/debian/patches/series	2012-10-04 20:36:13.0 +0200
+++ vlc-2.0.3/debian/patches/series	2012-12-06 12:23:23.0 +0100
@@ -2,3 +2,4 @@
 link-vlc-cache-gen-with-c++.patch
 link-vlc-with-c++.patch
 bp-fix-hang-caused-by-notify.patch
+CVE-2012-5470.patch


Bug#694281: unblock: devscripts/2.12.6

2012-11-24 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package devscripts

The German translation was added in the latest version of devscripts in testing,
but it was not installed. I fixed that in the current upload (patch attached).
Please unblock devscripts 2.12.6.

unblock devscripts/2.12.6
diff -Nru devscripts-2.12.5/debian/changelog devscripts-2.12.6/debian/changelog
--- devscripts-2.12.5/debian/changelog	2012-10-24 22:15:38.0 +0200
+++ devscripts-2.12.6/debian/changelog	2012-11-25 00:49:03.0 +0100
@@ -1,3 +1,9 @@
+devscripts (2.12.6) unstable; urgency=low
+
+  * Actual install German translation.
+
+ -- Benjamin Drung bdr...@debian.org  Sun, 25 Nov 2012 00:30:00 +0100
+
 devscripts (2.12.5) unstable; urgency=low
 
   [ James McCoy ]
diff -Nru devscripts-2.12.5/debian/links devscripts-2.12.6/debian/links
--- devscripts-2.12.5/debian/links	2011-06-09 07:10:53.0 +0200
+++ devscripts-2.12.6/debian/links	2012-11-25 00:49:03.0 +0100
@@ -5,6 +5,9 @@
 /usr/share/devscripts/conf.default		/usr/share/doc/devscripts/devscripts.conf.ex
 /usr/share/man/man1/debchange.1.gz		/usr/share/man/man1/dch.1.gz
 /usr/share/man/man1/pts-subscribe.1.gz		/usr/share/man/man1/pts-unsubscribe.1.gz
+/usr/share/man/de/man1/debchange.1.gz		/usr/share/man/de/man1/dch.1.gz
+/usr/share/man/de/man1/pts-subscribe.1.gz	/usr/share/man/de/man1/pts-unsubscribe.1.gz
+/usr/share/man/de/man1/edit-patch.1.gz		/usr/share/man/de/man1/add-patch.1.gz
 /usr/share/man/fr/man1/debchange.1.gz		/usr/share/man/fr/man1/dch.1.gz
 /usr/share/man/fr/man1/pts-subscribe.1.gz	/usr/share/man/fr/man1/pts-unsubscribe.1.gz
 /usr/share/man/fr/man1/edit-patch.1.gz		/usr/share/man/fr/man1/add-patch.1.gz
diff -Nru devscripts-2.12.5/debian/manpages devscripts-2.12.6/debian/manpages
--- devscripts-2.12.5/debian/manpages	2010-01-23 20:45:05.0 +0100
+++ devscripts-2.12.6/debian/manpages	2012-11-25 00:49:03.0 +0100
@@ -1,4 +1,6 @@
 scripts/*.1
 scripts/*.5
+po4a/de/*.1
+po4a/de/*.5
 po4a/fr/*.1
 po4a/fr/*.5


vlc testing migration

2012-10-12 Thread Benjamin Drung
Hi,

Can the required vlc migration time reduced by two days (to eight days)?
VLC 2.0.4 will be released on Sunday and I want to do the upload on the
same day, but vlc 2.0.3-3 should migrate to testing before.

-- 
Benjamin Drung
Debian  Ubuntu Developer


signature.asc
Description: This is a digitally signed message part


Re: VLC Enable sftp

2012-10-04 Thread Benjamin Drung
Am Donnerstag, den 04.10.2012, 09:33 +0200 schrieb Julien Cristau:
 On Wed, Oct  3, 2012 at 22:43:44 +0200, Benjamin Drung wrote:
 
  I asked Larry to ask the release team. I like to get this change into my
  next upload to unstable, which will fix the RC bug #687657. I like to
  discuss this change with the release team before doing an upload and
  getting a 'No' as answer. Is it a bug or a feature to support sftp? The
  sftp module is a separate module and therefore it should bring a very
  low regression risk.
  
 Please fix the RC bug independently.

Done. I uploaded 2.0.3-3 that fixes both RC bugs and do not ship the
sftp support. Please unblock 2.0.3-3 (debdiff attached).

-- 
Benjamin Drung
Debian  Ubuntu Developer
diff -Nru vlc-2.0.3/debian/changelog vlc-2.0.3/debian/changelog
--- vlc-2.0.3/debian/changelog	2012-08-18 17:45:01.0 +0200
+++ vlc-2.0.3/debian/changelog	2012-10-04 21:40:56.0 +0200
@@ -1,3 +1,15 @@
+vlc (2.0.3-3) unstable; urgency=low
+
+  * debian/vlc.postinst: Fix directory to symlink upgrade in postinst.
+Thanks to David Prévot taf...@debian.org (Closes: #687657)
+  * debian/vlc.preinst: Remove insufficient fix to #613121 (similar issue).
+Thanks to David Prévot for the patch.
+  * Cherry-pick fix for VLC hang caused by the notify plugin. (Closes: #662628,
+LP: #970447)
+  * Drop alternative dependency on transitional ttf-freefont.
+
+ -- Benjamin Drung bdr...@debian.org  Thu, 04 Oct 2012 20:59:21 +0200
+
 vlc (2.0.3-2) unstable; urgency=low
 
   * debian/rules: Use xz compression for binary packages.
diff -Nru vlc-2.0.3/debian/control vlc-2.0.3/debian/control
--- vlc-2.0.3/debian/control	2012-08-18 15:43:15.0 +0200
+++ vlc-2.0.3/debian/control	2012-10-04 19:36:29.0 +0200
@@ -170,7 +170,7 @@
 Package: vlc
 Architecture: any
 Pre-Depends: dpkg (= 1.15.6~)
-Depends: fonts-freefont-ttf | ttf-freefont,
+Depends: fonts-freefont-ttf,
  vlc-nox (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
diff -Nru vlc-2.0.3/debian/patches/bp-fix-hang-caused-by-notify.patch vlc-2.0.3/debian/patches/bp-fix-hang-caused-by-notify.patch
--- vlc-2.0.3/debian/patches/bp-fix-hang-caused-by-notify.patch	1970-01-01 01:00:00.0 +0100
+++ vlc-2.0.3/debian/patches/bp-fix-hang-caused-by-notify.patch	2012-10-04 20:57:03.0 +0200
@@ -0,0 +1,39 @@
+From: Rémi Denis-Courmont r...@remlab.net
+Subject: [PATCH] Revert Notify: add a callback to match telepathy, msn
+ .
+ The item-change callback is called with the playlist lock held in
+ at least one case: when the now playing meta is cleared while a new
+ input is created by the playlist.
+ .
+ playlist_CurrentInput() acquires the playlist lock. So the
+ item-change callback cannot call it. This bug is present in the
+ Growl, MSN and Telepathy modules since version 1.0.0. It got copied
+ into Notify in version 2.0.0.
+ .
+ This reverts commit fc56b92af1636c53a0545109a74476fe74c054a5.
+ This should fix #6641.
+ (cherry picked from commit 1e5f4b465a82745e8e7e5a5de491deac39554ed3)
+Origin: http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commitdiff;h=e89f4296
+Applied-Upstream: 2.0.4
+Bug: http://trac.videolan.org/vlc/ticket/6641
+Bug-Debian: http://bugs.debian.org/662628
+Bug-Ubuntu: https://launchpad.net/bugs/970447
+
+--- a/modules/notify/notify.c
 b/modules/notify/notify.c
+@@ -122,7 +122,6 @@
+ 
+ /* */
+ var_AddCallback( pl_Get( p_intf ), item-current, ItemChange, p_intf );
+-var_AddCallback( pl_Get( p_intf ), item-change, ItemChange, p_intf );
+ 
+ return VLC_SUCCESS;
+ }
+@@ -136,7 +135,6 @@
+ intf_sys_t  *p_sys  = p_intf-p_sys;
+ 
+ var_DelCallback( pl_Get( p_this ), item-current, ItemChange, p_this );
+-var_DelCallback( pl_Get( p_this ), item-change, ItemChange, p_this );
+ 
+ if( p_sys-notification )
+ {
diff -Nru vlc-2.0.3/debian/patches/series vlc-2.0.3/debian/patches/series
--- vlc-2.0.3/debian/patches/series	2012-06-30 13:02:46.0 +0200
+++ vlc-2.0.3/debian/patches/series	2012-10-04 20:36:13.0 +0200
@@ -1,3 +1,4 @@
 v4l-kfreebsd.patch
 link-vlc-cache-gen-with-c++.patch
 link-vlc-with-c++.patch
+bp-fix-hang-caused-by-notify.patch
diff -Nru vlc-2.0.3/debian/vlc.postinst vlc-2.0.3/debian/vlc.postinst
--- vlc-2.0.3/debian/vlc.postinst	1970-01-01 01:00:00.0 +0100
+++ vlc-2.0.3/debian/vlc.postinst	2012-10-04 19:54:16.0 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# Replace documentation directory with symlink
+docdir=/usr/share/doc/vlc
+if [ -d $docdir ]  [ ! -L $docdir ]; then
+if rmdir $docdir 2/dev/null; then
+ln -sf vlc-nox $docdir
+fi
+fi
+
+#DEBHELPER#
diff -Nru vlc-2.0.3/debian/vlc.preinst vlc-2.0.3/debian/vlc.preinst
--- vlc-2.0.3/debian/vlc.preinst	2012-06-30 13:02:46.0 +0200
+++ vlc-2.0.3/debian/vlc.preinst	1970-01-01 01:00:00.0 +0100
@@ -1,14 +0,0 @@
-#! /bin/sh
-set -e
-
-case $1 in
-	upgrade)
-		# Make sure /usr/share/doc/vlc doesn't exist or is a symlink

Re: VLC Enable sftp

2012-10-04 Thread Benjamin Drung
Am Donnerstag, den 04.10.2012, 23:47 +0200 schrieb Julien Cristau:
 On Thu, Oct  4, 2012 at 23:28:04 +0200, Benjamin Drung wrote:
 
  +  * Drop alternative dependency on transitional ttf-freefont.
  +
 
 Can I ask why?

Because ttf-freefont is a transitional package for fonts-freefont-ttf,
which vlc depends now. I previously kept the ttf-freefont as alternative
for Ubuntu 12.04, but it is not needed for Debian testing.

-- 
Benjamin Drung
Debian  Ubuntu Developer


signature.asc
Description: This is a digitally signed message part


Re: VLC Enable sftp

2012-10-03 Thread Benjamin Drung
Am Dienstag, den 25.09.2012, 19:02 +0100 schrieb Adam D. Barratt:
 On Wed, 2012-09-26 at 00:35 +0800, Larry Pinney wrote:
  VideoLAN should have sftp enabled in order to play video on the (my)
  LAN.
  Please include the commit from Benjamin Drung in the upcoming Release.
  
  
  http://anonscm.debian.org/gitweb/?p=pkg-multimedia/vlc.git;a=commitdiff;h=ebfad0e
 
 The Release Team can't do anything about a patch that's not in unstable.
 CCing the vlc maintainers; please direct further discussion there.
 (From a very quick look it sounds featurish and therefore possibly not
 appropriate at this point, but if the maintainers wish to include it in
 a future upload then that's their decision.)

I asked Larry to ask the release team. I like to get this change into my
next upload to unstable, which will fix the RC bug #687657. I like to
discuss this change with the release team before doing an upload and
getting a 'No' as answer. Is it a bug or a feature to support sftp? The
sftp module is a separate module and therefore it should bring a very
low regression risk.

-- 
Benjamin Drung
Debian  Ubuntu Developer


signature.asc
Description: This is a digitally signed message part


Bug#687053: unblock: vlc/2.0.3-2

2012-09-11 Thread Benjamin Drung
Am Sonntag, den 09.09.2012, 15:24 +0100 schrieb Adam D. Barratt:
 On Sun, 2012-09-09 at 00:31 +0200, Benjamin Drung wrote:
  Please unblock package vlc. This version uses xz compression to reduce the
  package sizes on the installer media. It also let the sdl plugin package 
  depend
  on the same version of vlc-nox. An unmentioned change is the added bug 
  number
  to the Lintian override comment.
 
 Unblocked.

Thanks.

  Please note, that vlc still has one open RC bug. This bug will be closed 
  with
  upcoming next upstream bug-fix release 2.0.4.
 
 Is there an ETA for that?

There is no specific date, but I guess that the release is a matter of
days. A few days ago upstream asked me if I like to see something in the
2.0.4. I got some stuff fixed that was found by Lintian. Videolan IRC
channel says: VLC 2.0.4 on the way.

-- 
Benjamin Drung
Debian  Ubuntu Developer


signature.asc
Description: This is a digitally signed message part


Bug#687053: unblock: vlc/2.0.3-2

2012-09-08 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package vlc. This version uses xz compression to reduce the
package sizes on the installer media. It also let the sdl plugin package depend
on the same version of vlc-nox. An unmentioned change is the added bug number
to the Lintian override comment.

Please note, that vlc still has one open RC bug. This bug will be closed with
upcoming next upstream bug-fix release 2.0.4.

unblock vlc/2.0.3-2
diff -Nru vlc-2.0.3/debian/changelog vlc-2.0.3/debian/changelog
--- vlc-2.0.3/debian/changelog	2012-07-21 17:52:21.0 +0200
+++ vlc-2.0.3/debian/changelog	2012-08-18 17:45:01.0 +0200
@@ -1,3 +1,12 @@
+vlc (2.0.3-2) unstable; urgency=low
+
+  * debian/rules: Use xz compression for binary packages.
+Thanks to Ansgar Burchardt ans...@debian.org (Closes: #683836)
+  * Add version to vlc-nox dependency of vlc-plugin-sdl (consistent with other
+plug-ins).
+
+ -- Benjamin Drung bdr...@debian.org  Sat, 18 Aug 2012 17:45:01 +0200
+
 vlc (2.0.3-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru vlc-2.0.3/debian/control vlc-2.0.3/debian/control
--- vlc-2.0.3/debian/control	2012-07-07 19:20:38.0 +0200
+++ vlc-2.0.3/debian/control	2012-08-18 15:43:15.0 +0200
@@ -114,6 +114,7 @@
 Package: libvlc-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: libvlc5 (= ${binary:Version}),
  libvlccore-dev,
  pkg-config,
@@ -130,6 +131,7 @@
 Package: libvlc5
 Section: libs
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: vlc ( 0.8.6.c-6)
 Description: multimedia player and streamer library
@@ -143,6 +145,7 @@
 Package: libvlccore-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: libvlccore5 (= ${binary:Version}), pkg-config, ${misc:Depends}
 Description: development files for libvlccore
  This package contains headers and a static library required to build plugins
@@ -155,6 +158,7 @@
 Package: libvlccore5
 Section: libs
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: base library for VLC and its modules
  This package contains the shared library required by VLC modules and libvlc.
@@ -165,6 +169,7 @@
 
 Package: vlc
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: fonts-freefont-ttf | ttf-freefont,
  vlc-nox (= ${binary:Version}),
  ${misc:Depends},
@@ -192,6 +197,7 @@
  or video plugins (vlc-plugin-sdl).
 
 Package: vlc-data
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: ${misc:Depends}
 Architecture: all
 Breaks: vlc-nox ( 2.0.1-3)
@@ -209,6 +215,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for vlc
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -219,6 +226,7 @@
 
 Package: vlc-nox
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: vlc ( 1.1.0)
 Provides: mp3-decoder
@@ -242,6 +250,7 @@
 
 Package: vlc-plugin-fluidsynth
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: fluid-soundfont-gm | musescore-soundfont-gm,
  vlc-nox (= ${binary:Version}),
  ${misc:Depends},
@@ -256,6 +265,7 @@
 
 Package: vlc-plugin-jack
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Jack audio plugins for VLC
  These plugins add support for JACK to the VLC media player. To
@@ -269,6 +279,7 @@
 
 Package: vlc-plugin-notify
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Breaks: vlc-nox ( 1.1.2)
 Replaces: vlc-nox ( 1.1.2)
@@ -282,6 +293,7 @@
 
 Package: vlc-plugin-pulse
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: PulseAudio plugin for VLC
  This plugin adds support for PulseAudio to the VLC media player. To
@@ -294,7 +306,8 @@
 
 Package: vlc-plugin-sdl
 Architecture: any
-Depends: vlc-nox, ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: dpkg (= 1.15.6~)
+Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: SDL video and audio output plugin for VLC
  This plugin adds support for the Simple DirectMedia Layer library to
  the VLC media player. To activate it, use the `--vout sdl' or
@@ -307,6 +320,7 @@
 
 Package: vlc-plugin-svg
 Architecture: any
+Pre-Depends: dpkg (= 1.15.6~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: SVG plugin for VLC
  This plugin allows you to render SVG graphics on top of the video. It is a text
@@ -320,6 +334,7 @@
 
 Package: vlc-plugin

Bug#683028: unblock: libsbsms/2.0.1-1

2012-07-28 Thread Benjamin Drung
Am Samstag, den 28.07.2012, 14:59 +0100 schrieb Adam D. Barratt:
 On Sat, 2012-07-28 at 00:39 +0200, Benjamin Drung wrote:
  Please unblock package libsbsms
  
  The new upstream release 2.0.1 contains just one bug fix (found by the
  Audacity developers). This bug fix touches src/buffer.cpp and
  src/buffer.h [1]. All other changes are just visual clutter and have
  no effect on the package.
 
 What happened to test/*?  The entire tree seems to have vanished.

Yes. It's not shipped in the source any more, but we didn't use the
tests.

-- 
Benjamin Drung
Debian  Ubuntu Developer


signature.asc
Description: This is a digitally signed message part


Bug#683027: unblock: devscripts/2.12.1

2012-07-27 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package devscripts

devscripts 2.12.0 (carrying six bug fixes) got a freeze exception, but didn't 
migrated to testing due to bug #680213. We closed this bug in the following 
2.12.1 upload. You can introspect the changes one by one in our git repository 
[1]. Our test suite is slowly getting more test cases to reduce regressions.

Our git repository accumulated more changes (with more test cases) for the next 
2.12.2 upload. We intend to request an unblock for this version too.

unblock devscripts/2.12.1

[1] http://anonscm.debian.org/gitweb/?p=devscripts/devscripts.git


-- 
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/20120727223555.3658.47294.reportbug@deep-thought



Bug#683028: unblock: libsbsms/2.0.1-1

2012-07-27 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package libsbsms

The new upstream release 2.0.1 contains just one bug fix (found by the Audacity 
developers). This bug fix touches src/buffer.cpp and src/buffer.h [1]. All 
other changes are just visual clutter and have no effect on the package.

unblock libsbsms/2.0.1-1

[1] 
http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libsbsms.git;a=commitdiff;h=df5a14777e2aa8ecf8e8de7fc848163e0718c48b#patch5


-- 
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/20120727223951.3804.53490.reportbug@deep-thought



Bug#683030: unblock: vlc/2.0.3-1

2012-07-27 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package vlc

VLC 2.0.3 is a bug fix release of upstreams 2.0.x maintanence branch. It 
contains a bunch of fixes. You can review them in our git repository [1]. There 
are many changes to extras/package/macosx/ and some to contrib/. These changes 
affect only MacOS or Windows and have no effect on the Debian package.

[1] http://anonscm.debian.org/gitweb/?p=pkg-multimedia/vlc.git;a=summary

unblock vlc/2.0.3-1


-- 
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/20120727224454.3932.98452.reportbug@deep-thought



Re: FFmpeg 0.6 transition

2011-02-17 Thread Benjamin Drung
Am Donnerstag, den 17.02.2011, 21:12 + schrieb Adam D. Barratt:
 [debian-devel dropped from Cc as it didn't seem relevant to the mail]
 
 On Tue, 2011-02-15 at 12:06 +0100, Reinhard Tartler wrote:
  On Di, Feb 15, 2011 at 09:31:33 (CET), Reinhard Tartler wrote:
  
   BTW,  where has mehdi's excellent transition tracker gone?
  
  It is here: http://release.debian.org/transitions/ffmpeg.html
  
  AFAIUI all packages marked red in the list above need to be rebuilt
  (i.e., binNMUed).
 
 I've scheduled an initial set of packages on most architectures (not
 alpha, hppa or mips due to the size of their queues); let's see how that
 goes.
 
 For reference, I've explicitly /not/ scheduled cherokee (#612482) or
 libavg (#580678).

You don't need to binNMU audacity, because I just uploaded 1.3.12-11.

-- 
Benjamin Drung
Debian  Ubuntu Developer


signature.asc
Description: This is a digitally signed message part


one project packages twice (u-boot and uboot-mkimage)

2010-11-07 Thread Benjamin Drung
Hi,

I just want to let you know that the uboot-mkimage source package
contains a stripped version the u-boot source package and both packages
have the same functionality. I filed the series bug #602778 [1].

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=602778

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: This is a digitally signed message part


Please unblock apt-mirror 0.4.8-3

2010-09-28 Thread Benjamin Drung
Hi,

Please unblock apt-mirror 0.4.8-3, which introduces one bug fix:

apt-mirror (0.4.8-3) unstable; urgency=low

  * Bump Standards-Version to 3.9.1 (no changes required).
  * Add a shebang line to clean.sh (LP: #649364).

 -- Benjamin Drung bdr...@ubuntu.com  Tue, 28 Sep 2010 23:53:54 +0200

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: This is a digitally signed message part


audacity 1.3.12-6 and gxmms2 0.7.1-1

2010-09-22 Thread Benjamin Drung
Hi,

Please unblock audacity 1.3.12-6 and gxmms2 0.7.1-1 for squeeze. Here
the explanation why they should go into squeeze:

audacity (1.3.12-6) unstable; urgency=low

  * Build with jack on all architectures (Due to a bug, jack was already
enabled on all architectures except on i386, amd64, powerpc).
  * Fix build failure with GCC 4.5 (Closes: #564865, LP: #629955).

 -- Benjamin Drung bdr...@ubuntu.com  Tue, 21 Sep 2010 22:47:19 +0200

The current version in squeeze doesn't build against jack on  i386,
amd64, powerpc, but  i386, amd64, powerpc are the supported
architectures.

 gxmms2  (0.7.1-1) unstable; urgency=low

   * New upstream release.
   * Drop DrNo.patch and version-string.patch.
   * Bump Standard-Version to 3.9.1 (no changes required).
   * Update debian/copyright.
   * Fix pointer dereference to not sets the initial volume. (Closes:
#546594)

 -- Benjamin Drung bdr...@ubuntu.com  Mon, 13 Sep 2010 02:32:18 +0200 

The new upstream release differs from the previous version 0.7.0
+git20090608-3 only by changed copyright information (updated year).
Instead of having a git snapshot, we should have the official released
version in squeeze. More importing bug #546594 is fixed.

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: This is a digitally signed message part


audacious 2.3 or 2.4 in squeeze

2010-09-04 Thread Benjamin Drung
Hi,

I like to hear your opinion which audacious version should be shipped in
squeeze. The current version in squeeze is 2.3-2. I recommend to use 2.4
for squeeze, because

* upstream said that 2.4 is the first stable branch of audacious2 [1]
* It fixes the serious bug #594519 and six other bugs
* It provides the scrobbler plugin (it was removed by upstream in 2.3
due to bugs)
* The package is in a better shape (less patches and shorter
debian/rules)
* The package is tested in Ubuntu maverick for a month (2.4~beta{1,2}
and 2.4~rc2 to be more specific)

These things need to be done if we want to ship 2.4.0 in squeeze:
* libmowgli 0.7.0-2 from experimental needs to be uploaded to unstable
* A transition is required (four rdeps)

The packages audacious and audacious-plugins 2.4.0-1 are prepared in our
git experimental branch [2,3]. You can check out the debian/changelog
there [4,5]

[1] http://boards.audacious-media-player.org/viewtopic.php?f=1t=168
[2] 
http://git.debian.org/?p=pkg-audacious/audacious.git;a=shortlog;h=refs/heads/experimental
[3] 
http://git.debian.org/?p=pkg-audacious/audacious-plugins.git;a=shortlog;h=refs/heads/experimental
[4] 
http://git.debian.org/?p=pkg-audacious/audacious.git;a=blob;f=debian/changelog;h=e8486ff5ea2910eeb5a1810f96a494dead3a4af7;hb=refs/heads/experimental
[5] 
http://git.debian.org/?p=pkg-audacious/audacious.git;a=blob;f=debian/changelog;h=e8486ff5ea2910eeb5a1810f96a494dead3a4af7;hb=refs/heads/experimental

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


Re: audacious 2.3 or 2.4 in squeeze

2010-09-04 Thread Benjamin Drung
Am Sonntag, den 05.09.2010, 00:20 +0100 schrieb Neil Williams:
 On Sun, 05 Sep 2010 00:51:04 +0200
 Benjamin Drung bdr...@ubuntu.com wrote:
 
  Hi,
  
  I like to hear your opinion which audacious version should be shipped
  in squeeze. The current version in squeeze is 2.3-2. I recommend to
  use 2.4 for squeeze, because
  
  * It fixes the serious bug #594519 and six other bugs
 
 Can the fix for #594519 be backported?

Probably. Repack the source and edit configure{,.ac}.

 Are any of the other bug fixes sufficiently important to merit a freeze
 exception on their own?
 
  These things need to be done if we want to ship 2.4.0 in squeeze:
  * libmowgli 0.7.0-2 from experimental needs to be uploaded to unstable
 
 To me, it seems too far into the freeze, especially if this new
 dependency is not part of the fix for the RC bug.

It's not a new dependency. audacious just requires a newer version of
libmowgli. audacious 2.3 would benefit from updating libmowgli too.

  * A transition is required (four rdeps)
 
 ... and that helps the release of Squeeze how?

That a drawback of getting a better version of audacious in the archive
and making upstream happy.

 Has a simpler fix for #594519 been investigated, based on 2.3?

Not yet.

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


Re: vlc 1.1.3

2010-08-19 Thread Benjamin Drung
Am Mittwoch, den 18.08.2010, 13:52 +0200 schrieb Mehdi Dogguy:
 On 08/12/2010 12:35 PM, Benjamin Drung wrote:
  Am Donnerstag, den 12.08.2010, 03:58 +0200 schrieb Mehdi Dogguy:
  On  0, Benjamin Drung bdr...@ubuntu.com wrote:
  Hi,
 
  In one or two days, vlc 1.1.3 will be released, which fixes the security
  bug #592669. I want to get this version into squeeze and fix bug
  #592456. Will it be ok?
 
 
 The latter doesn't seem to be useful according to the buglog.

Yes, I dropped it.

  Can you show us a diff? and/or can you backport the patches?
  
  The debdiff will look similar to the attached one. The attached one
  targets experimental instead of unstable, because 502_xulrunner_191.diff
  needs to be updated for 1.1.3 and I don't want  to do it before I get a
  yes (otherwise the work would be thrown away).
  
  It would be possible to backport the security fix, but I think that
  1.1.3 is better for squeeze than 1.1.2 and that it may make backporting
  security fixes easier in the future.
  
 
 It looks ok but I don't see any announce for 1.1.3 yet.

1.1.3 is released now. We have prepared 1.1.2-2 in our git repository.
You can find the changes there [1]. Instead of just applying the patch
for the security issue, I would prefer to get 1.1.3 into squeeze,
because then we could follow upstream's 1.1 branch.

[1]
http://git.debian.org/?p=pkg-multimedia/vlc.git;a=blob;f=debian/changelog;h=5b3343d0345e55f1ca8f62e19ac4e80f343e94ac;hb=HEAD


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


vlc 1.1.3

2010-08-11 Thread Benjamin Drung
Hi,

In one or two days, vlc 1.1.3 will be released, which fixes the security
bug #592669. I want to get this version into squeeze and fix bug
#592456. Will it be ok?

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


audacity, vlc, and xmms2

2010-08-06 Thread Benjamin Drung
Hi,

I like to see these three packages migrating to testing:

* audacity: version 1.3.12-4 has an empty debug package. Therefore
audacity-dbg was rendered useless. 1.3.12-5 fixes this.

* vlc: version 1.1.2-1 brings the new upstream bug fix release (1.1.1 -
1.1.2) and re-enable the modplug plugin.

* xmms2: The new version fixed the RC bug #583309 and six other bugs.

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


Bug#577657: release.debian.org: xmms2 giveback on armel

2010-04-13 Thread Benjamin Drung
Package: release.debian.org
Severity: normal

Hi,

It was confirmed that xmms2 builds on armel. So please give it another
try:

gb xmms2_0.7DrNo-5 . armel

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


Bug#576187: release.debian.org: xmms2 giveback on armel

2010-04-01 Thread Benjamin Drung
Package: release.debian.org
Severity: normal

Hi,

It was confirmed that xmms2 builds on armel. So please give it another try:

gb xmms2_0.7DrNo-4 . armel



-- 
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/20100401112329.18731.61011.report...@deep-thought



Re: xmms2 0.7DrNo for squeeze

2010-03-16 Thread Benjamin Drung
Am Dienstag, den 16.03.2010, 15:07 +0100 schrieb Julien Cristau:
 On Mon, Mar 15, 2010 at 01:24:51 +0100, Benjamin Drung wrote:
 
  Hi,
  
  The xmms2 packagers team (or at least me and some xmms2 devolopers) like
  to see xmms2 0.7DrNo in squeeze. The transition is blocked by a FTBFS on
  hppa [1] and a segmentation fault of gcc on armel. Both issues are not
  xmms2's fault.
  
 However that doesn't prevent the xmms2 maintainers from working on them,
 or trying to work around them in xmms2.  Is the armel FTBFS reproducible
 with -O0?  Have you tried coming up with a small testcase and reporting
 the bug to gcc upstream?

Nothing was done on the armel FTBFS front yet.

 Have you tried investigating and working
 around the waf hppa fail?

I assume that it is not waf's fault, because we switched from system waf
to a use a local copy. Maybe it's a vfork/fork issue, because no child
process was started:

Checking for compiler flags -Wstrict-prototypes : make: *** wait: No
child processes.  Stop.
make: *** Waiting for unfinished jobs
make: *** wait: No child processes.  Stop.
E: Caught signal 'Terminated': terminating immediately
make[1]: *** [override_dh_auto_configure] Terminated
Build killed with signal TERM after 300 minutes of inactivity

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


Bug#571972: Please binNMU promoe/0.1.1-1 and xmms2-scrobble/0.4.0-1 against xmms2 0.7DrNo

2010-02-28 Thread Benjamin Drung
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: binnmu

Please rebuild these two packages against xmms2 0.7DrNo. All other xmms2 
clients needs to be patched to support 0.7DrNo.

nmu promoe/0.1.1-1 . ALL . -m Rebuild against xmms2 0.7DrNo.
nmu xmms2-scrobbler/0.4.0-1 . ALL . -m Rebuild against xmms2 0.7DrNo.
dw promoe/0.1.1-1 xmms2-scrobbler/0.4.0-1 . ALL . -m 'libxmmsclient-dev (= 
0.7DrNo)'

Thanks.



-- 
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/20100228172224.17504.47999.report...@deep-thought



Please binNMU esperanza 0.4.0+git20090708-1

2009-11-29 Thread Benjamin Drung
Hi,

Please binNMU esperanza to fix bug #557483. libxmmsclient++-dev
0.6DrMattDestruction-6 depends on the same version of boost, with wich
it was build with. It's the same issue, that promoe had (bug #554496).

nmu esperanza_0.4.0+git20090708-1 . ALL . -m 'Rebuild against
libxmmsclient++-dev 0.6DrMattDestruction-6 to pick up correct boost
version (Closes: #557483)'

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


Please binNMU promoe

2009-11-22 Thread Benjamin Drung
Hi,

Please binNMU promoe to fix bug #554496. libxmmsclient++-dev
0.6DrMattDestruction-6 depends on the same version of boost, with wich
it was build with.

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


Please binNMU promoe

2009-11-22 Thread Benjamin Drung
Hi,

forgot to add a wanna-build action:

nmu promoe_0.1.0-1 . ALL . -m 'Rebuild against libxmmsclient++-dev
0.6DrMattDestruction-6 to pick up correct boost version (Closes:
#554496)'

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)


signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil