Bug#1035757: unblock: org-mode/9.5.2+dfsh-5

[David Bremner]

Paul Gevers  writes:

>
> The debdiff in message #36 looks OK. If the upload happens very soon, as 
> in today, than we'll see if we can have it migrate in time.
>
> Paul

Uploaded and built:

https://buildd.debian.org/status/fetch.php?pkg=org-mode=9.5.2%2Bdfsh-5=all=1685619895

d

Bug#1035757: unblock: org-mode/9.5.2+dfsh-5

[David Bremner]

David Bremner  writes:

> 1m1.2s ERROR: FAIL: Package purging left files on system:
>   /root/.ssh/ not owned
>   /var/cache/private/ not owned
>   /var/lib/private/   not owned
>   /var/lib/systemd/coredump/  not owned
>   /var/lib/systemd/pstore/not owned
>   /var/log/private/   not owned
>

I dove down this rabbit-hole a bit, not enough to figure the ultimate
cause, but enough to notice these files are also because of
"apt install systemd". So no related to org-mode. FWIW, systemd is
pulled in by emacs-gtk.

d

Bug#1034146: unblock: ledger/3.3.0-3

[David Bremner]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: led...@packages.debian.org
Control: affects -1 + src:ledger

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package ledger


[ Reason ]

This version fixes two bugs with severity important: #1032292 and #1033552.

[ Impact ]

The first is a regression from the version in bullseye, while the
second is an old crash.

[ Tests ]

Ledger has an extensive build time test suite. I have also manually
sanity checked the new binary packages.

[ Risks ]

Ledger is a leaf package. The two patches are cherry-picked from
upstream, and the total diff is small (6 insertions , 4 deletions)

[ 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 ]

Trimmed diff of only upstream changes also attached.


unblock ledger/3.3.0-3


-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmQz8r8ACgkQA0U5G1Wq
FSEE3Q//cNItCQC0KvUyWw0kY4v0aa05Y3K+F+F3u8IOBjnhGkBA5+gR4Rq110dE
4N0K7l7JLemR7eJBHtOh+LfGI6AmLGurD0hmAwVrjYC+ti5xcnDMN7tpfXLKaqIS
jmCATrWtKN9+IZKl6G4V0R7o+HtKfHb4qG8Gzk3qwvjCtTvEGJGiwA1ErwCjUidn
+uBlIzn3MRiAjxrNWUQqq8RkPtyvP95JSgvpAXtQuo0qI2YQ0/613wlS2Fq4S1+J
mlC1rr/gpLl2wpxpUGVB8ph6rsgcKs5TY8GQ5nCk8h8EfH8eAvNwrs6AKEdVna+z
TC31HQ5Jw4s7jyoQRu2L2K3lM0F97FO8P5DXA2nn+AjfQqNvBXyXZMFtLfdnWKIc
g2mws+mD0/zVUwUJtTAdeei46SJilGDJXZ9To7I0LxYcFRPvP8CGfJP0wTSNdvAU
ylEmIppHnJ/Byz5N/JgPg/oi/ehwgixmt6j9Z/2r0CwSTdBqXiEe9Qu9XjEuqT2I
O6okdg8t07zGyf2+wSyeh6cJ7x87od2OtRZi48N2yrD+t8/sPuo6TvdxZmp+LIgg
AqDvkCiQ2uCnEFg3B6shARL51Jp2UScPLnXdVH6sjSQ0QwwaHzopZ2G+nCVYG7mc
uRFlbIq9yWHGQY5oYLXDvUs+kuB98BPZOR17CYh6h3ZKvywGNmc=
=dJ3v
-END PGP SIGNATURE-
diff -Nru ledger-3.3.0/debian/changelog ledger-3.3.0/debian/changelog
--- ledger-3.3.0/debian/changelog   2023-02-17 09:58:07.0 -0400
+++ ledger-3.3.0/debian/changelog   2023-03-28 08:05:17.0 -0300
@@ -1,3 +1,18 @@
+ledger (3.3.0-3) unstable; urgency=medium
+
+  * Bug fix: "Valid transaction: Error: Divide by zero", thanks to Martin
+Michlmayr (Closes: #1033552). Cherry-pick upstream commit 49cf332.
+
+ -- David Bremner   Tue, 28 Mar 2023 08:05:17 -0300
+
+ledger (3.3.0-2) unstable; urgency=medium
+
+  * Bug fix: "Ledger 3.3.0 regression: specifying format for commodity",
+thanks to Martin Michlmayr (Closes: #1032292). Cherry-pick upstream
+commit 87b6a1e.
+
+ -- David Bremner   Sat, 04 Mar 2023 15:32:33 -0800
+
 ledger (3.3.0-1) unstable; urgency=medium
 
   * Bug fix: "New upstream release: 3.3.0", thanks to Martin Michlmayr
diff -Nru 
ledger-3.3.0/debian/patches/0001-Do-not-perform-commodity-reduction-when-parsing-a-fo.patch
 
ledger-3.3.0/debian/patches/0001-Do-not-perform-commodity-reduction-when-parsing-a-fo.patch
--- 
ledger-3.3.0/debian/patches/0001-Do-not-perform-commodity-reduction-when-parsing-a-fo.patch
 1969-12-31 20:00:00.0 -0400
+++ 
ledger-3.3.0/debian/patches/0001-Do-not-perform-commodity-reduction-when-parsing-a-fo.patch
 2023-03-28 08:05:17.0 -0300
@@ -0,0 +1,28 @@
+From: John Wiegley 
+Date: Thu, 2 Mar 2023 15:04:29 -0800
+Subject: Do not perform commodity reduction when parsing a format directive
+
+---
+ src/textual.cc | 8 +---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/textual.cc b/src/textual.cc
+index 62007ab..5276c92 100644
+--- a/src/textual.cc
 b/src/textual.cc
+@@ -1132,10 +1132,12 @@ void 
instance_t::commodity_format_directive(commodity_t& comm, string format)
+   // observational formatting.
+   trim(format);
+   amount_t amt;
+-  amt.parse(format);
++  amt.parse(format, PARSE_NO_REDUCE);
+   if (amt.commodity() != comm)
+-throw_(parse_error, _f("commodity directive symbol %1% and format 
directive symbol %2% should be the same") %
+-  comm.symbol() % amt.commodity().symbol());
++throw_(parse_error,
++   _f("commodity directive symbol %1% and format directive symbol %2% 
should be the same")
++ % comm.symbol()
++ % amt.commodity().symbol());
+   amt.commodity().add_flags(COMMODITY_STYLE_NO_MIGRATE);
+   VERIFY(amt.valid());
+ }
diff -Nru 
ledger-3.3.0/debian/patches/0002-Change-a-use-of-is_realzero-to-just-is_zero.patch
 
ledger-3.3.0/debian/patches/0002-Change-a-use-of-is_realzero-to-just-is_zero.patch
--- 
ledger-3.3.0/debian/patches/0002-Change-a-use-of-is_realzero-to-just-is_zero.patch
  1969-12-31 20:00:00.0 -0400
+++ 
ledger-3.3.0/debian/patches/0002-Change-a-use-of-is_realzero-to-just-is_zero.patch
  2023-03-28 08:05:17.0 -0300
@@ -0,0 +1,22 @@
+From: John Wiegley 
+Date: Thu, 23 Mar 2023 11:23:39 -0700
+Subject: Change a use of is_realzero to just is_zero
+
+This is needed to avoid a possible divide by zero.
+---
+ src/pool.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+

Bug#1033213: unblock: darktable/4.2.1-4

[David Bremner]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: darkta...@packages.debian.org
Control: affects -1 + src:darktable

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package darktable

[ Reason ]
This upload fixes bug #1033001

[ Impact ]

Although the bug is arguably cosmetic (it relates to whether GNOME
displays the correct icon in certain places), it does affect all
darktable users on Wayland, who will presumably be a large fraction of
it's users, as darktable is widely used by non-programmers.

[ Tests ]

I have installed the new package in a clean Bookworm VM and verified
it fixes the bug as claimed.  I also installed it on my development
machine (not running GNOME) and verified basic functionality.

[ Risks ]

darktable is a leaf package. The change introduced by this file is a
single line added to a .desktop file

[ 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 ]

The one line upstream change is a bit hard to spot in the debdiff (at
least for me), so I will also attach the actual patch.

unblock darktable/4.2.1-4


-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmQXlNMACgkQA0U5G1Wq
FSG4axAArjJPzP+ohn9w4KUWe4b2WyW//Pxvu6SdEWKSLB+Q3v/UXVgYD7/C1cY0
NTQ9D4opqSh3ihgvvFRkq1UwnJ/qxOfQMeuvf2d5LCUyuuxfp6kKXCHmCuGWxc9T
vIkjfemZkqI4F0TlNEjdL3DP64f+zonkJNo2oRDmmyQoesSHwP5MI08B+TMiV8N6
mi1zxY5rS1EyOEpXOIvEazSWe94TqcjHNHQzinQ3qU7kEBvfiRPUcuTWSD9+uBE/
mr5VhFBHVQSXW7TfTn4IIqB9m25SXHNBcoHlPr0R1oVNgOgdoSkWru3A9NFCfxq8
UyWRZmuZLLLHOrwU5aYWP6LpiuLCY/brhvyq98kaf7O5gIrNp9zP+WQbsgCUO8df
dQx4O63UBpAxT8UiEw6fDraO7uc+dpnL5sRZr5xSfuk7fyorhHt0VB9t44iLESn5
Ca1Rp0A5/XpmiuWO4hA3cDNpM8PTxq5WnmIOXkVZPV9HykgYe+WHi/im+/ZMOHX8
tr7J3SjyWHO6Qf3EvUSxEu9b9onqwsnt324VF37c7dusCmdI2nxjKyVRphPMrkyB
wiVV1ka1s9L48xaEAp8KaQmdaVG+GohAAucfs/4K6p05PfURwvhT9Gof5lSswvmp
JBMQv/a3ZvukqivKb28qPosZV5N72ORQ9z3tppFwyaB4mnqDId4=
=atQJ
-END PGP SIGNATURE-
diff -Nru darktable-4.2.1/debian/changelog darktable-4.2.1/debian/changelog
--- darktable-4.2.1/debian/changelog2023-02-27 08:03:27.0 -0400
+++ darktable-4.2.1/debian/changelog2023-03-19 14:10:18.0 -0300
@@ -1,3 +1,10 @@
+darktable (4.2.1-4) unstable; urgency=medium
+
+  * Cherry-pick upstream commit 385aacf61e55903bb064e0fe99a1d138645f697c:
+add StartupWMClass=darktable to .desktop file. (Closes: #1033001).
+
+ -- David Bremner   Sun, 19 Mar 2023 14:10:18 -0300
+
 darktable (4.2.1-3) unstable; urgency=medium
 
   * Bug fix: "AVIF support is missing in Darktable", thanks to Guy
diff -Nru 
darktable-4.2.1/debian/patches/0001-Fix-missing-application-icon-in-Wayland.patch
 
darktable-4.2.1/debian/patches/0001-Fix-missing-application-icon-in-Wayland.patch
--- 
darktable-4.2.1/debian/patches/0001-Fix-missing-application-icon-in-Wayland.patch
   1969-12-31 20:00:00.0 -0400
+++ 
darktable-4.2.1/debian/patches/0001-Fix-missing-application-icon-in-Wayland.patch
   2023-03-19 14:10:18.0 -0300
@@ -0,0 +1,21 @@
+From: Victor Forsiuk 
+Date: Sat, 18 Mar 2023 13:03:48 +0200
+Subject: Fix missing application icon in Wayland
+
+(cherry picked from commit 385aacf61e55903bb064e0fe99a1d138645f697c)
+---
+ data/org.darktable.darktable.desktop.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/org.darktable.darktable.desktop.in 
b/data/org.darktable.darktable.desktop.in
+index 23bf16c..4d8895b 100644
+--- a/data/org.darktable.darktable.desktop.in
 b/data/org.darktable.darktable.desktop.in
+@@ -20,6 +20,7 @@ StartupNotify=true
+ 
MimeType=application/x-darktable;image/x-dcraw;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crw;image/x-fuji-raf;image/x-kodak-dcr;image/x-kodak-kdc;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-rw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-portable-floatmap;image/vnd.radiance;${DESKTOP_MIME_TYPES}
+ 
+ Icon=darktable
++StartupWMClass=darktable
+ 
+ X-Unity-IconBackgroundColor=#252525
+ 
diff -Nru darktable-4.2.1/debian/patches/series 
darktable-4.2.1/debian/patches/series
--- darktable-4.2.1/debian/patches/series   1969-12-31 20:00:00.0 
-0400
+++ darktable-4.2.1/debian/patches/series   2023-03-19 14:10:18.0 
-0300
@@ -0,0 +1 @@
+0001-Fix-missing-application-icon-in-Wayland.patch
commit 6d62433d6ef413116b0ce834798a694427019891
Author: Victor Forsiuk 
Date:   Sat Mar 18 13:03:48 2023 +0200

Fix missing application icon in Wayland

(cherry picked from commit 385aacf61e55903bb064e0fe99a1d138645f697c)

diff --git a/data/org.darktable.darktable.desktop.in 
b/data/org.darktable.darktable.desktop.in
index 23bf16c543..4d8895b234 100644

Bug#1019258: nmu: xapian-core_1.4.20-2

[David Bremner]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: binnmu
X-Debbugs-Cc: o...@debian.org

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

nmu xapian-core_1.4.20-2 . ANY . unstable . -m "Rebuild with gcc 12"

discussion:

03-09-2022 07:29:30 > bremner: olly: will there be a new version of xapian in 
Debian testing compiled with gcc 12? the current version complains about 
potential ABI mismatch
03-09-2022 15:40:40 < olly > i'm wondering about retiring that message - it 
seems to do more harm than good at this point
03-09-2022 15:42:00 < olly > in the ~GCC3 days you'd get weird link failures 
which people would waste time trying to debug, but the modern ABI changes all 
seem to be obscure corner cases
03-09-2022 15:42:08 < olly > and the ABI changes frequently
03-09-2022 15:48:43 < olly > bremner: if you want to make an nmu so it gets 
rebuilt with GCC 12 to sort it out for now that's fine with me
03-09-2022 15:49:15 > bremner: olly: that would just be a binNMU?
03-09-2022 15:49:50 < olly > : it certainly could be

-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmMXM78ACgkQA0U5G1Wq
FSEfRQ/+PjJIJjU//dhmdsUEqEQPwuyQYke4K/WVBOAAYezay52ibi4VAWUIrhNf
KDcc6vXJ4NeXQS0iGpF6W03aUuQ009oUVno6r3wy+C5jhdewxUSmRdeS3D6fiqwt
djHcua23JoVkpu85iJKerxPmpDooGcrjp1V9F9nzPPRSj2Rnj810iklQ8VAqoaqX
JfcA91zadaqGmBS0WS0jzZimCcZt+sY1x8qKFH3pgckVhfSLz/LHOZ1pONMmX0LM
VE6pOXhttZdJPy3oK3X8hqmujsY9nJtFQSFZZvnrSdYM1RebBjHc6jCxfs1tJlVL
R70gDbg0vlxf+TzGGvVrf27rq8Fa531Zyv4+YHopQZA8ua7vciJbkNbwfVj+nZO2
WfWHt6Ck1gaVPDqCvKYMe05RV4lhu66cFtex4jx7Mx9T72SfDGR+MFzsrolnjWKl
w9Wvyz4yQENr063BohXdB2/7g+jvQwK1WMwcBQGBQmFBQu85107VxTjzCP5VEB1c
Vmn5hsOjqsxnfnUePNr5vJauQSqPlPbdrg9BzbisTE+UIgfH5XdUoFFCvDGTeMB1
nNMxZfdPweZRcUnxsUA4dQDpbADh0hW4+v1QRLXmZaCG0AG+kQzdykUPYWD722Nm
OKCXss0/2AxTmqq3YuzCeFE+4+JzuF1YH0nSk4HZJFSr5mRzhRw=
=puHs
-END PGP SIGNATURE-

Bug#991486: unblock: racket/7.9+dfsg1-2

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package racket

[ Reason ]

This upload fixes a recently announced security bug in racket
(#991327, CVE-2021-32773).

[ Impact ]

The main use of sandboxing that I know about is the handin-server used
to run student code.  Operators of the the handin-server face the
possibility of arbitrary remote code execution (from authenticated
users) when running the unpatched version of racket 7.9. This is a
relatively small subset of the users of racket, but possibly a group
more likely to be running Debian stable (since it is a multi-user
service).

[ Tests ]

The following manual tests have been applied:

0) The package installs and drracket runs on a bullseye / amd64 system
1) The upstream provided test [1] verifies that the vulnerability is fixed in 
7.9+dfsg1-2
2) I ran the test suite of sparktope, a research project that uses racket to 
implement compiler front-end.

[ Risks ]

racket is almost a leaf package (minlog and racket-mode are the only 
(Build)-rdeps)
outside the source).

On the other hand, the change is to the expander, which
racket interpreter.

[ 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 ]

The changes consist of two patches.  The first patch [2] updates the
racket source and docs, and the second [3] propagates those changes to
the generated C code used to build the interpreter.  The second commit
is not really verifiable other than by following the sequence of
instructions in the commit message and comparing the results. I chose
this method because to re-generate the code at build time would have
needed a second build. On top of potential packaging bugs (being in
CDBS doesn't help my confidence here), this might be too much for some
architectures, given the build takes about 3h. I could try to do the
generation at build time, but it would most likely cause some delay in
addition to the identified risks.

unblock racket/7.9+dfsg1-2

[1]: https://gist.github.com/mflatt/f4231d8b9f2418f189d839e587235f04
[2]: 
https://salsa.debian.org/bremner/racket/-/commit/f34ab2ac023d35dd77c74040863e938180740ca2
[3]: 
https://salsa.debian.org/bremner/racket/-/commit/6c691f2fc7129bb692093ae0b022e9e8b1e71e85

-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmD9jrsACgkQA0U5G1Wq
FSG1chAAlBRLs7IUIEp/RT4cWYOsycoiKBDV6C2kfHggidTYbie4EfRbVqaCXY3K
gU6x4rTaP8Z6jlEdgF9cdGWj2Sy+sb9JMBuVr31XyG5SewxEU02NoS7Fa+yTeo1X
g6h5fndpVooekd0JPlZwr83aT7abrgq1de768hMl2KDL5fPENooEbcFEOecq1wFY
3nb1YcYrRaXXLQzzs2A5zzS8zctjM6BSLT0kl1afC0xRJlBBoqgE6yEh4GGHfNoG
c1wx2m6VaVwSTwdskkEDpNRADnXUkAeE/9VMju5RJPg2g7aYaHWYy42XhEH+g8DT
aszEbvr4lfON5lnoJ5mANSbTP4fcGl+NZ9Ij8m4UiAVymXoY/HO2SUO9pE4pn1p0
xX1eQbpfXJJne3Xqv159+DZitm7aHGRXRAFb3p2lqtUIuwTM0YkYoBwEGdzk59RY
OUIvRmKi92m+fq+Hhc+fhKwRPfS3eHk/HgMShrjIB96BnvTL6zU/Jts47BE2FEgo
+F8ZGyY8f2kpbGZqGkchYcKI5nvX/bM3ndAS1kTk1kQzGN7/gt0gxOBPvtS1SRhv
t2lCfmyc133qnXheFj6GfIE2R/lSJI1jfXnxNmQ6tw/V8Ju5TjW7xibUHlOqdw6z
jRsdDDvA2A5J1+jsroR/tfsyc2UwzwbuykXqPg65WBpWZT5fbew=
=KkK0
-END PGP SIGNATURE-
diff -Nru racket-7.9+dfsg1/debian/changelog racket-7.9+dfsg1/debian/changelog
--- racket-7.9+dfsg1/debian/changelog   2020-12-08 20:47:19.0 -0400
+++ racket-7.9+dfsg1/debian/changelog   2021-07-24 11:13:09.0 -0300
@@ -1,3 +1,11 @@
+racket (7.9+dfsg1-2) unstable; urgency=medium
+
+  * Bug fix: "CVE-2021-32773", thanks to Moritz Mühlenhoff (Closes:
+#991327). Backport commit aa2e814a02 from racket 8.2. See also
+https://github.com/racket/racket/issues/3923
+
+ -- David Bremner   Sat, 24 Jul 2021 11:13:09 -0300
+
 racket (7.9+dfsg1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru 
racket-7.9+dfsg1/debian/patches/0001-prohibit-import-from-module-with-a-weak-code-inspect.patch
 
racket-7.9+dfsg1/debian/patches/0001-prohibit-import-from-module-with-a-weak-code-inspect.patch
--- 
racket-7.9+dfsg1/debian/patches/0001-prohibit-import-from-module-with-a-weak-code-inspect.patch
 1969-12-31 20:00:00.0 -0400
+++ 
racket-7.9+dfsg1/debian/patches/0001-prohibit-import-from-module-with-a-weak-code-inspect.patch
 2021-07-24 11:13:09.0 -0300
@@ -0,0 +1,104 @@
+From: Matthew Flatt 
+Date: Sun, 27 Jun 2021 08:46:02 -0600
+Subject: prohibit import from module with a weak code inspector
+
+Cherry-picking commit aa2e814a02, with changes to generated files
+dropped. This change alone will not fix #991327; the code in
+src/bc/src/startup.inc needs to be regenerated by running "make
+expander" in src/expander.
+---
+ .../scribblings/reference/code-inspectors.scrbl  | 12 +---
+ src/expander/namespace/module.rkt| 20 
+ 2 files changed, 25 insertions(+), 7 deletions(-)
+
+diff --git

Bug#990491: unblock: darktable/3.4.1-5

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package darktable

[ Reason ]

The new version fixes an unclosed comment in the Italian translation
of user.css. If the user triggers the creation of this file (e.g. by
adding a keyboard shortcut in the preferences), then the GUI is
somewhat mangled.

[ Impact ]

Probably further confusion for Italian speaking users of
darktable. There is a fairly simple workaround (fix the comment in
user.css), if the user seeks help and/reports the problem. The fact
that it only happens in Italian locales makes it trickier for users to
figure out the problem. OTOH I guess from a utilitarian point of view
it also affects less users.

[ Tests ]

I've run the new version under it_IT.utf8 and en_CA.utf8 locales. Both
seem OK, and I can define keyboard shortcuts without trashing the GUI.

[ Risks ]

Darktable is a leaf package; the change is one line cherry-picked from
upstream.

[ 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 ]
(Anything else the release team should know.)

unblock darktable/3.4.1-5


-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmDcjM0ACgkQA0U5G1Wq
FSGAvw//YjMLahGNm+kbIBBHz4FKC5c8ZnKTNJPt9s8b5lvrM4EsYUEMMuxRkSUA
ARZWKnDlB/IoLgjzcmOiOlCknDTP90W8P3oWDALMIjHzwJVqZBm54rDblKJKAzFI
Egb+5WPMEgxHTLzEg7vA/gyeAiF/k2sliSAOxRJLGdYDAbJfFHmpUYGjqZvcf7S/
owZmz6tFUnjQmTdlnLycg34vzBrfM1e7G2xFONoHKNWq2WDRMjcHVKC7Gxx/ApdX
QYjzC5t3eRqPiC4ZN+50EU+j+5i1qlwGPY1L2K9fOC3miOpFpnoBxSxpsgIQMf2x
Utkt4DzufQ7M2Y3SVr2JAQ7ROce3NsAebN3ywm3P3Ld1kAmpFTndjj2vFBf5b7aP
BgPiyR1f2/ID1UbxWsmahpZolc12oXEYqaaK9tVhCAy4sEon3XktSP9gcOhzoTav
fSHjf/Cq0rrRgQIxaggpFbA9HWzL9RQGBzDi2b+PluwfBAHLhlgHu59QA8ExW8SK
rLxHQwMLNkTcSiq8/ay1Z1Y1RPXjAJAy1ARRZ4CZnaNTRi3HgIrkq6dyfjaTyBFF
NgEZtUjc3zwaurVRyV/WrIVyWzVzGlnC3W5X/XhKUghsFL7cJ61UCI+FfwIBF6tq
f/x+Mw0iBtzqi4OEJbVRx2fkaHr6c/SgJkyriDuuvvmTwX+/o/c=
=7OD0
-END PGP SIGNATURE-
diff -Nru darktable-3.4.1/debian/changelog darktable-3.4.1/debian/changelog
--- darktable-3.4.1/debian/changelog2021-06-05 12:41:39.0 -0300
+++ darktable-3.4.1/debian/changelog2021-06-30 09:37:35.0 -0300
@@ -1,3 +1,11 @@
+darktable (3.4.1-5) unstable; urgency=medium
+
+  * Bug fix: "configuring shortcuts breaks filemanager gui at next start
+filemanager issueVersion: 3.4.1-4", thanks to stef.binde (Closes:
+#990405). Closed by cherry-picking upstream commit 154e945f.
+
+ -- David Bremner   Wed, 30 Jun 2021 09:37:35 -0300
+
 darktable (3.4.1-4) unstable; urgency=medium
 
   * Bug fix: "crashes with 'Floating point exception (core dumped)' after
diff -Nru 
darktable-3.4.1/debian/patches/0003-it-fix-wrong-translation-breaking-the-CSS.patch
 
darktable-3.4.1/debian/patches/0003-it-fix-wrong-translation-breaking-the-CSS.patch
--- 
darktable-3.4.1/debian/patches/0003-it-fix-wrong-translation-breaking-the-CSS.patch
 1969-12-31 20:00:00.0 -0400
+++ 
darktable-3.4.1/debian/patches/0003-it-fix-wrong-translation-breaking-the-CSS.patch
 2021-06-30 09:37:35.0 -0300
@@ -0,0 +1,22 @@
+From: Pascal Obry 
+Date: Thu, 7 Jan 2021 09:49:25 +0100
+Subject: it: fix wrong translation breaking the CSS.
+
+(cherry picked from commit 154e945f4bef98de82eff728a6485b1c6c4d79c5)
+---
+ po/it.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/it.po b/po/it.po
+index 3fb64aa..73be374 100644
+--- a/po/it.po
 b/po/it.po
+@@ -7586,7 +7586,7 @@ msgid ""
+ "/* Enter CSS theme tweaks here */\n"
+ "\n"
+ msgstr ""
+-"/* Inserisci le modifiche al CSS qui /*\n"
++"/* Inserisci le modifiche al CSS qui */\n"
+ "\n"
+ 
+ #: ../src/gui/preferences.c:546
diff -Nru darktable-3.4.1/debian/patches/series 
darktable-3.4.1/debian/patches/series
--- darktable-3.4.1/debian/patches/series   2021-06-05 12:41:39.0 
-0300
+++ darktable-3.4.1/debian/patches/series   2021-06-30 09:37:35.0 
-0300
@@ -1,2 +1,3 @@
 0001-add-explicit-dependency-on-generate_conf.patch
 0002-Avoid-div-by-zero-in-dt_iop_clip_and_zoom_mosaic_hal.patch
+0003-it-fix-wrong-translation-breaking-the-CSS.patch

Bug#990445: unblock: notmuch/0.31.4-2

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package notmuch

[ Reason ]

The new version contains a backported (well, cherry-picked) fix for a
database corruption bug fixed in 0.32.2.  

[ Impact ]

The corruption is relatively mild, if that is possible.  Roughly
speaking, when multiple mail files have the same message-id, the
message document with that message id gets added to multiple
threads. I introduced this bug in 2017, but there has only been
occasional mystified users complaining about misthreading of
messages. Still, it's not very nice to have a subtle failure in a core
feature.

[ Tests ]

I have backported the new integration test, and it (and the rest of
the test suite) passes). I ran for about 24 hours with the proposed
version as my MUA, didn't notice anything untoward.

[ Risks ]

The changed code is confined to about 6 lines of code in
add-message.c. Most of the diff is adjusting the test suite (which had
unknowingly encoded the bug in several tests). On the other hand, this
is a change in the core of notmuch, so potentially affects several
rdeps, most notably (from a popcon point of view) neomutt.

[ 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 also attach the output of git diff --diff-filter=MRC, to hide the
contents of debian/patches

unblock notmuch/0.31.4-2


-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmDa/4gACgkQA0U5G1Wq
FSELyA//ZHb3pqhnMRXvxlM6yHUYrinl2yvIl0ZVizKTOTVMvU3TpijbJ5ozUPe5
7HD6vgOz0YovosCr/FvBleCSp6n8z5tspsiIoTnaDFZfaQ8QslYRCTpAaFZ2u939
L4nE13J8aWP58Az8Pq6zKf+P88xFZkd2kzKBtgiBwl2mB6guIc9XDtlz4LvFAUZP
XuqGD6wIO+hX72HIDTzeN/NsC43fEkEtmIOpbDnlX0qLOm1pEf8AqwzCvkkFwwgs
Ml2Bq6jZJwSfzCAKXQohl7fu+SAgvd5ifBngCQq/RDcj1T+u4EiOfAVlQC2cylwL
vIjAb/Kg0/QpjA1glj3zgv7eX18iVWbQ6MKZDnlGzeqzAUfRSd8BvN8SY9uBhTqX
S12pXsD0ZYW2Qr2bRVIChFHkoAxppU38shpQ81gAXyP1W0kicfmMMLIidr8R22Xg
PB4SBhtbfsorc7KiJ2Y3lCs/pcTaq3zupm2UA3xAdFSDj9ugXJg2iye7wqNnmmV9
uchNeLoY9LD6dnJN1FP3rH5HPL4DMejFoKzhjBKwlZwsLjCyNdu/pQPczSopWDcN
pgI969jNUzfEV95VpexTpRbFJtNwNUuwF1g5Yy1p36ZKnDDOph99TOvmJks0V9+I
/RXMLJdA4oohmWu069q6VmdR1nC+mnMLwsbRJq1ld4FfLowW0ZU=
=Pb2W
-END PGP SIGNATURE-
diff -Nru notmuch-0.31.4/debian/changelog notmuch-0.31.4/debian/changelog
--- notmuch-0.31.4/debian/changelog 2021-02-18 07:23:00.0 -0400
+++ notmuch-0.31.4/debian/changelog 2021-06-28 22:09:09.0 -0300
@@ -1,3 +1,11 @@
+notmuch (0.31.4-2) unstable; urgency=medium
+
+  * Cherry pick upstream commit 3f4de98e7c8, which fixes a bug where
+duplicate message-ids can cause multiple thread-ids for some message
+documents.
+
+ -- David Bremner   Mon, 28 Jun 2021 22:09:09 -0300
+
 notmuch (0.31.4-1) unstable; urgency=medium
 
   * New upstream bugfix release
diff -Nru notmuch-0.31.4/debian/control notmuch-0.31.4/debian/control
--- notmuch-0.31.4/debian/control   2021-02-18 07:23:00.0 -0400
+++ notmuch-0.31.4/debian/control   2021-06-28 22:09:09.0 -0300
@@ -37,6 +37,7 @@
  ruby,
  ruby-dev (>>1:1.9.3~),
  texinfo,
+ xapian-tools ,
 Standards-Version: 4.4.1
 Homepage: https://notmuchmail.org/
 Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release
diff -Nru notmuch-0.31.4/debian/patches/debian-changes 
notmuch-0.31.4/debian/patches/debian-changes
--- notmuch-0.31.4/debian/patches/debian-changes1969-12-31 
20:00:00.0 -0400
+++ notmuch-0.31.4/debian/patches/debian-changes2021-06-28 
22:09:09.0 -0300
@@ -0,0 +1,136 @@
+This is an autogenerated patch header for a single-debian-patch file. The
+delta against upstream is either kept as a single patch, or maintained
+in some VCS, and exported as a single patch instead of more manageable
+atomic patches.
+
+--- notmuch-0.31.4.orig/lib/add-message.cc
 notmuch-0.31.4/lib/add-message.cc
+@@ -407,14 +407,17 @@ static notmuch_status_t
+ _notmuch_database_link_message (notmuch_database_t *notmuch,
+   notmuch_message_t *message,
+   notmuch_message_file_t *message_file,
+-  bool is_ghost)
++  bool is_ghost,
++  bool is_new)
+ {
+ void *local = talloc_new (NULL);
+ notmuch_status_t status;
+ const char *thread_id = NULL;
+ 
+ /* Check if the message already had a thread ID */
+-if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) {
++if (! is_new) {
++  thread_id = notmuch_message_get_thread_id (message);
++} else if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) {
+   if (is_ghost)
+   thread_id = notmuch_message_get_thread_id (message);
+ } else {
+@@ -539,7 +542,7 @@ notmuch_database_index_file (notmuch_dat
+   

Bug#989582: unblock: darktable/3.4.1-4

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package darktable

[ Reason ]

This version contains a fix for #989222.  This involves a crash when
exporting raws of a certain format.  According to Jonas this bug is
triggered by output from megapixels which is in bullseye and used by
(at least) the Librem 5 and pinephone (with mobian).

[ Impact ]

Users of some free software friendly phones will be unable to process
their images with darktable from bullseye.

[ Tests ]

I have verified the basic functionality of darktable is still
OK. Jonas tested the DNG images in question and verified that they
exported OK now.

[ Risks ]

darktable is a leaf package. The diff is a bit large, but most of it
is deletions of SSE2 specialized code. The additions are only 7 lines
and easy to sanity check.

[ 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 also attach a "reduced diff" with the deleted #ifdef __SSE__ blocks
collapsed.

unblock darktable/3.4.1-4


-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmC+o1YACgkQA0U5G1Wq
FSGEug/+NjvWDdVP6jwcU0rXEUCHpgPbqYXygkVn4TIyVeqRh1e6DJCwU3mzkNo8
DnR7siTEdXp6F9e1MpCaN9G404ptk7MZasN6Aswu5Fj37knj6YzhYnrqp6fbgurL
w1dcbNhnSSlPf6czeDtSIe0uIIR3TNbhG0ICX8D6xhTumolW0+EtPHTcG8E9y7Ib
f+wlp/0mwwdpmeYB32ObkF8v4t7g4f9Y1SWrjPI0xZ/tgYiDgY8nOW39a4Nj0HQX
HzqW0oQXMaLsjFecEv7Wuf3VTWmmBubKKANvs++Lg/EQi3pbjeVMzDa2WuZBTxUL
YHe0bW012OWOtgnfuLuKdIvots8afNYpi1jtS58e4ZT1wHxEvUW2ww09jjcrnsdP
CnKFT5Ybg3WZ7rqUQ8VsYXkgCe5CdauFAlKdWluTK2SAXn7brfvnpzpUpTzFbxRN
zOtZfwPqsCJt8l3rPoMdLIlD5IQAxkPavyc1ow3bym/IIEiuVXCSSbohRHYyUBDT
lQyM7aAVi8aawGVpbB/2MeuBsdWMPCx37etU/Jz3YMtqhC1rIi6OMVoXWFb1BAAQ
sGjgRvrSes/2bkODcC/YBE9jNKinsLXbCbhQU50ObEQqHb7yeec9DsPe7NYfvhGN
22ueQyjNT1LguYVwsNzPE1WBobrSwghdFh8MFcJwNuqJR3SnEDI=
=o+Yk
-END PGP SIGNATURE-
diff -Nru darktable-3.4.1/debian/changelog darktable-3.4.1/debian/changelog
--- darktable-3.4.1/debian/changelog2021-05-20 14:07:16.0 -0300
+++ darktable-3.4.1/debian/changelog2021-06-05 12:41:39.0 -0300
@@ -1,3 +1,11 @@
+darktable (3.4.1-4) unstable; urgency=medium
+
+  * Bug fix: "crashes with 'Floating point exception (core dumped)' after
+loading some DNG files", thanks to Jonas Smedegaard (Closes: #989222).
+Cherry pick upstream commit 2ff4fc58e44.
+
+ -- David Bremner   Sat, 05 Jun 2021 12:41:39 -0300
+
 darktable (3.4.1-3) unstable; urgency=medium
 
   * Bug fix: "broken symlinks: /usr/share/darktable/js/*.js -
diff -Nru 
darktable-3.4.1/debian/patches/0002-Avoid-div-by-zero-in-dt_iop_clip_and_zoom_mosaic_hal.patch
 
darktable-3.4.1/debian/patches/0002-Avoid-div-by-zero-in-dt_iop_clip_and_zoom_mosaic_hal.patch
--- 
darktable-3.4.1/debian/patches/0002-Avoid-div-by-zero-in-dt_iop_clip_and_zoom_mosaic_hal.patch
  1969-12-31 20:00:00.0 -0400
+++ 
darktable-3.4.1/debian/patches/0002-Avoid-div-by-zero-in-dt_iop_clip_and_zoom_mosaic_hal.patch
  2021-06-05 12:41:39.0 -0300
@@ -0,0 +1,1001 @@
+From: Hanno Schwalm 
+Date: Fri, 14 May 2021 18:20:37 +0200
+Subject: Avoid div by zero in dt_iop_clip_and_zoom_mosaic_half_size (#8954)
+
+* Avoid div by zero in dt_iop_clip_and_zoom_mosaic_half_size_plain
+
+Fixes #8951
+
+Although the file given in the issue is crippled we can avoid the crash.
+In `dt_iop_clip_and_zoom_mosaic_half_size` and the sse friend there is 
possibly a div/0
+problem that should be checked.
+
+* Fixing same dib by zero in dt_iop_clip_and_zoom_mosaic_half_size_f
+
+* Remove sse code for dt_iop_clip_and_zoom_mosaic... after testing performance
+
+checked performance non-sse vs sse specific code
+- with added local timers
+- using gcc 10.2
+- testing -t 1/4/8/16
+- intel (xeon like 9900) with fixed clock rate
+
+in
+- dt_iop_clip_and_zoom_mosaic_half_size
+- dt_iop_clip_and_zoom_mosaic_half_size_f
+- dt_iop_clip_and_zoom_demosaic_passthrough_monochrome_f
+- dt_iop_clip_and_zoom_demosaic_half_size_f
+
+with consitant results. For all functions the sse specific code was somewhat 
slower (~20%)
+than the vectorized compiler code. Number of omp cores didn't matter, just 
made the results
+more measurable because of low execution times.
+
+So i removed all the sse specific code for less code burden and better 
performance.
+
+* Fix sse header plus div/0
+
+At least for bayer images we absolutely want to be sure there is no div by 
zero as there might
+be buggy dng files.
+---
+ src/develop/imageop_math.c | 890 +
+ 1 file changed, 7 insertions(+), 883 deletions(-)
+
+diff --git a/src/develop/imageop_math.c b/src/develop/imageop_math.c
+index ef55965..0066a83 100644
+--- a/src/develop/imageop_math.c
 b/src/develop/imageop_math.c
+@@ -18,14 +18,8 @@
+ 
+ #includ

Bug#988913: unblock: darktable/3.4.1-3

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package darktable

[ Reason ]

Upload -3 fixes a piuparts error from some dangling symlinks.

[ Impact ]

As far as I can tell, the only user impact would be if they somehow
cared about dangling symlinks. I did not audit the code, but my
understanding is that the code which uses that JS was dropped from dt,
which is why the dependencies were dropped.

[ Tests ]

I have verified that the new package starts and basic functionality
works.

[ Risks ]

It's a leaf package.

[ 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 darktable/3.4.1-3


-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmCnlFcACgkQA0U5G1Wq
FSGW5hAAsci8wqo1T7AIq3dbvAKmBHYxxeeSrzx2fTY9kGc/D8GiBs5GM9Khga0W
1cn65jH3qWNUk+QDVklR2pbPaKUV+eSnrGdxlrXFkNCWd42ryV/z6iR9NsPkd9f/
lN+VkC4QqBIKyNNd6NcoHiwj1SKpv2RecISGwUtvZpGqjoNsy2VwZWab1AInEDvj
MNTN6eSkNJd1PHxuLUmDYaVig+uGyA9u31OiKpn6uIJdG5RGSpA9A6baj8sg71XU
JVhVKO5y5BwU5sBlfjPQ7tiuLZU4aihh1GxJaWqd0m5Co63nngwzW6jwM2xRssxR
IKbYA6FkovOhiADCDSeOdbSxhYxEOKG7d7Vy5Oze8y9bdmp4Q7fyTq5Lncu8MPzx
+V5n2wHi4iTbXtgYwzz2XHtLoEtmDh8D+jq7+nofeRTChuJxThoLL1hzIyngcK0W
G4PUUVHfx635/hqfb9VS5E30MdLay7UVPoPmWkmqM6QjG8E+OzKK7tJHVB8guuvn
BKc6ENLR+LDIWKUFdBVEEpyGZXJ+lH+Lp9MCSkNmwW4SGNBCvo5Ta8DyMirZ5tlj
3NUTIXF2lGcmyxUZztE9MDLFg2eP2gVrofga+WW8D2EQGi5KBV28W4ro5jitgy9a
OIt+IwuEtn4oOwtMW73flSz4ekNn1qvOwXgOF5lEPDKYMoxMdZU=
=BOtq
-END PGP SIGNATURE-
diff -Nru darktable-3.4.1/debian/changelog darktable-3.4.1/debian/changelog
--- darktable-3.4.1/debian/changelog2021-04-08 07:58:21.0 -0300
+++ darktable-3.4.1/debian/changelog2021-05-20 14:07:16.0 -0300
@@ -1,3 +1,11 @@
+darktable (3.4.1-3) unstable; urgency=medium
+
+  * Bug fix: "broken symlinks: /usr/share/darktable/js/*.js -
+../../javascript/*/*.js", thanks to Andreas Beckmann (Closes:
+#988874).
+
+ -- David Bremner   Thu, 20 May 2021 14:07:16 -0300
+
 darktable (3.4.1-2) unstable; urgency=medium
 
   * Bug fix: "darktable FTBFS with DEB_BUILD_OPTIONS=parallel=1", thanks
diff -Nru darktable-3.4.1/debian/darktable.links 
darktable-3.4.1/debian/darktable.links
--- darktable-3.4.1/debian/darktable.links  2021-04-08 07:58:21.0 
-0300
+++ darktable-3.4.1/debian/darktable.links  1969-12-31 20:00:00.0 
-0400
@@ -1,4 +0,0 @@
-/usr/share/javascript/prototype/prototype.js 
/usr/share/darktable/js/prototype.js
-/usr/share/javascript/scriptaculous/scriptaculous.js 
/usr/share/darktable/js/scriptaculous.js
-/usr/share/javascript/scriptaculous/builder.js 
/usr/share/darktable/js/builder.js
-/usr/share/javascript/scriptaculous/effects.js 
/usr/share/darktable/js/effects.js

Bug#987088: unblock: helm/3.7.0-2

[David Bremner]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: debian-emac...@lists.debian.org

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package helm


[ Reason ]

This upload closes RC Bug #986854

[ Impact ]

Apparently the package is useless for some / most users without these
file of keybindings.

[ Tests ]

I have loaded the newly provided file of keybindings from the binary
package, and verified that the corresponding keybindings are provided.

[ Risks ]

This is a leaf package. The changes seem low risk, given the package
builds (which it does). The net result is to provide a file of
bytecode (and corresponding source) that can optionally be loaded by
the user.

[ 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'm not actually a user of this package, so I'm mostly taking the reporter's
word for the severity.

unblock helm/3.7.0-2


-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmB6xY4ACgkQA0U5G1Wq
FSG8kw/+OQVISK5ffRPkfTJr1X3Gnh6hag1YTbodJr4LTXIqbfqs/MphD1XwaXLq
sntDeALOWUa+X3pdb5Wq474g+cZbwmyQ1zqRZssqxOfdeUUKE+mzDMT0BVhtnaB5
o8FDUEuqT7lc++Cm9pY75xw5hwhC2E70veyE6ZGSjmwJYaOIbulK1r5L5xkydQ5m
HZCRMBPl5soe9HICd8A61y/s6LOpz4QVoSSkkKEOeolFiDjLjc8LGPbs6pL1dDL+
NQc4ms2pEcOGXZ5qpTIwUamZAl/MGCtJ0yBpLeFRVs4+sgJPMZA3SZemm7ErhjNi
ZrTGLDHt/5fl7tAfoz84eDfXMsu2GWN8QkJglD9wd8VAbxs7x2G95Fcm6tuc0Akw
XzSTdjumSPSm6DWm9H6KP8ifmnDvcE9AvFELELLFDwbo0gVUCZKb/bpOuyzxKa7T
ncFsjodyUfe7DCc4Btu41/i8NyIb63CqFixjWERjNxIKaA4QrxQpHKf/TiIliUeN
hae65Hm2qoCqbG2+U6ptQBRaSOpFJ5nizVH95ovM7Ry+JpAsYWpdyijm0fW+HAOA
Z+MT1HJvxYQtqF0bpKwZAUhu8bzSwh7/d0aIG3nLboqm9w9f6iMpTyaUEYOO/FKg
cpOb6eWXnxQcbQA44Su2BPAxDja0L0gFYv/wL2xvjdbZnF5g3yM=
=I3QQ
-END PGP SIGNATURE-
diff -Nru helm-3.7.0/debian/changelog helm-3.7.0/debian/changelog
--- helm-3.7.0/debian/changelog 2020-11-07 15:43:36.0 -0400
+++ helm-3.7.0/debian/changelog 2021-04-17 07:31:15.0 -0300
@@ -1,3 +1,10 @@
+helm (3.7.0-2) unstable; urgency=medium
+
+  * Team upload
+  * ship helm-global-bindings.el in elpa-helm (Closes: #986854).
+
+ -- David Bremner   Sat, 17 Apr 2021 07:31:15 -0300
+
 helm (3.7.0-1) unstable; urgency=medium
 
   * Update to new upstream version 3.7.0.
diff -Nru helm-3.7.0/debian/elpa-helm.elpa helm-3.7.0/debian/elpa-helm.elpa
--- helm-3.7.0/debian/elpa-helm.elpa2020-11-07 15:43:36.0 -0400
+++ helm-3.7.0/debian/elpa-helm.elpa2021-04-17 07:31:15.0 -0300
@@ -16,6 +16,7 @@
 helm-find.el
 helm-font.el
 helm-for-files.el
+helm-global-bindings.el
 helm-grep.el
 helm-help.el
 helm-id-utils.el

Bug#986658: unblock: polymake/4.3-4

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package polymake

[ Reason ]

This fixes #986381, which could be classified severity important

[ Impact ]

There is no 3D visualization facility in the version in testing.

[ Tests ]

I have manually tested that the fix in the package (proposed by
upstream) restores the visualization facility.

[ Risks ]

This is low risk. The visualization facility is seperate pile of JS
from the rest of project, so even if I botched that, it won't affect
the previously working functionality. Polymake is of course a non-key,
leaf package.

[ 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 polymake/4.3-4


-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmBvkh4ACgkQA0U5G1Wq
FSFPfw/8CIiriDj2S4KSnSrsOgklKJc+d32QgCa8oHgMtL5hfSRVOP0DHpNAPjHb
4Y7xSKCqiT/sgIdt8AYlyM7Dfk/O86mlagZC6bNYGcK1x/XZqOQ6YPW6/ARaQrny
CC1vstSrFNFsXLP+P2TvSgVxNBONm34pnVi582CEs/MSIjzICj+RbT6oQR63cA6E
6NH3FLK5TRKLW9OcS9xzwEB1J94tPvrd/nMQAv2UHpI283symjyrxilBNat/CT1q
2r2fWDtx1Qv0C+8vHi7rpSiViDRgGsjyjAf3aKEpBXoUKMrJE5o8lhSrV+3tt23t
vpVzaEZHxPHNIClpu3ioKBpEe24SVqy0HB1ixxBiSv+9UpsBtOxFmyfeL2U+shfH
A5w+fD07E4LYs8x09UZjrC7MJwc2MWExBF8JNs7v5oC8zzUnWWa6zm91x2fFnyXj
lD6fdA5flivEiEh9JjfZqaSfnNqOHTZn4rAp/3TYn0nEUMP6UpZw8A75feHOKaUT
12T2MLGqm2oV1Wj7elT7LqqfoT/jaEB4pGtJWy5dCh6hx0g5Jp9RWaBii9XY0zHv
TDK6hqFr2QdzcdVl7Te9PuJMmoz1kxXTD2vVMS8INAciecwXLZt6OSPrdnFZIFGG
ZuiY6A63nmMhML5AnbOjrK8SeN+GaHWbkEkZr77DO8JCkj5SfLY=
=l6KS
-END PGP SIGNATURE-
diff -Nru polymake-4.3/debian/changelog polymake-4.3/debian/changelog
--- polymake-4.3/debian/changelog   2021-01-29 20:45:56.0 -0400
+++ polymake-4.3/debian/changelog   2021-04-07 11:56:59.0 -0300
@@ -1,3 +1,10 @@
+polymake (4.3-4) unstable; urgency=medium
+
+  * Bug fix: "VISUAL with threejs fails", thanks to Joachim Zobel (Closes:
+#986381).
+
+ -- David Bremner   Wed, 07 Apr 2021 11:56:59 -0300
+
 polymake (4.3-3) unstable; urgency=medium
 
   * Disable relative volume test when flint is missing (Closes: #981252).
diff -Nru polymake-4.3/debian/rules polymake-4.3/debian/rules
--- polymake-4.3/debian/rules   2021-01-29 20:45:56.0 -0400
+++ polymake-4.3/debian/rules   2021-04-07 11:56:59.0 -0300
@@ -28,7 +28,7 @@
 
 export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 
-JS:= OrbitControls.js Projector.js SVGRenderer.js three.js 
TrackballControls.js  WebGL.js
+JS:= three.js OrbitControls.js Projector.js SVGRenderer.js 
TrackballControls.js WebGL.js
 JSSOURCE=$(addprefix external/js/,${JS})
 
 build build-arch build-indep binary binary-arch binary-indep clean:

Bug#986631: unblock: darktable/3.4.1-2

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package darktable


[ Reason ]

This fixes a FTBFS. 

[ Impact ]

A rebuild with DEB_BUILD_OPTIONS=parallel=1 will fail for the version
currently in testing. This is arguably RC.

[ Tests ]

I installed and ran the updated binary packgge in my development bullseye 
system.

[ Risks ]

It's a leaf package. I added en extra dependency rule to the upstream
build system, so I guess given I'm not really a cmake expert that
could fail under some unforseen circumstances.

[ 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 ]

A bullseye-ignore tag for the bug #986574 might also make sense (in
lieu of an unblock).


unblock darktable/3.4.1-2


-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmBu+zIACgkQA0U5G1Wq
FSFMeBAAp3kAQnPjaDCqwqpKbSWUkLvLCqookAbq5+y0YF7fFPfoUCIqs7PfDF4h
DoQGkc43sYjQbHH5/LVwnL8wJqX7+960GsHk3IkGcFmsOFBfoeeSuVcZISsLzsbP
4L52nRWJ5Lvf2ncEIcZHuWYLZqXZSDInQWL5bejBOf/qtWteAJoBiNxQAxmSmzzZ
WTc088W6F0ovMlC9TYnMJxICpZyVzVs3HPPELRaqYKp1GYmqCiCZ56r1jOpApGap
gmXrG9j6wXloj5Iv1sJH7GrMcL5+tWd/OOCiX9h1oVxIVbMa27R98ssTBHNn3Sef
zPYPZT42ROXw7S6np7v+2y91U55nVbzvGo7wu8SoDePfErfDQyjx6Fn7zFq+LapG
F1jDpBTjbz3HPjnctmYzsGMhHZs2ciU4q+/Blj36OKjMzcedwmrYt72kCUVonSJq
QIGZIEFf3jCf1fUQg0a6VRNzTr1LqAP52mRXOsi6Jar9CjImipac12nYGo/eK5Sx
KqbMFAka1zC37zE3Vm/NrPDzoLZLaK9icpw3wNCSV7iFkw7fww0sKxdQgzvEW33k
B84BPDtPUQ7o3CPUAEi6dHdsnvE9N3o28946a5nXZAf+RO1FIaTMJlPMLb2lZP5N
+RThFF9RIEvJ7nufAO9vApiefkTw7DRoEjI0yuEn+NAHGLoob3Q=
=NrQ2
-END PGP SIGNATURE-
diff -Nru darktable-3.4.1/debian/changelog darktable-3.4.1/debian/changelog
--- darktable-3.4.1/debian/changelog2021-02-06 12:42:43.0 -0400
+++ darktable-3.4.1/debian/changelog2021-04-08 07:58:21.0 -0300
@@ -1,3 +1,11 @@
+darktable (3.4.1-2) unstable; urgency=medium
+
+  * Bug fix: "darktable FTBFS with DEB_BUILD_OPTIONS=parallel=1", thanks
+to Helmut Grohne (Closes: #986574). As Helmut guessed, the fix is to
+add a dependency to the CMake configuration.
+
+ -- David Bremner   Thu, 08 Apr 2021 07:58:21 -0300
+
 darktable (3.4.1-1) unstable; urgency=medium
 
   * Update to new upstream version 3.4.1.
diff -Nru 
darktable-3.4.1/debian/patches/0001-add-explicit-dependency-on-generate_conf.patch
 
darktable-3.4.1/debian/patches/0001-add-explicit-dependency-on-generate_conf.patch
--- 
darktable-3.4.1/debian/patches/0001-add-explicit-dependency-on-generate_conf.patch
  1969-12-31 20:00:00.0 -0400
+++ 
darktable-3.4.1/debian/patches/0001-add-explicit-dependency-on-generate_conf.patch
  2021-04-08 07:58:21.0 -0300
@@ -0,0 +1,22 @@
+From: David Bremner 
+Date: Thu, 8 Apr 2021 07:54:49 -0300
+Subject: add explicit dependency on generate_conf
+
+Weirdly, this missing dependency seems to only show up when running
+"make -j1".
+---
+ src/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f415ae8..5c40b17 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -863,6 +863,7 @@ add_library(lib_darktable SHARED 
${DARKTABLE_BINDIR}/preferences_gen.h ${DARKTAB
+ # since this isn't the same directory we do have to manually set it
+ set_source_files_properties(${DARKTABLE_BINDIR}/version_gen.c PROPERTIES 
GENERATED TRUE)
+ 
++add_dependencies(lib_darktable generate_conf)
+ add_dependencies(lib_darktable generate_version)
+ add_dependencies(lib_darktable generate_preferences)
+ 
diff -Nru darktable-3.4.1/debian/patches/series 
darktable-3.4.1/debian/patches/series
--- darktable-3.4.1/debian/patches/series   1969-12-31 20:00:00.0 
-0400
+++ darktable-3.4.1/debian/patches/series   2021-04-08 07:58:21.0 
-0300
@@ -0,0 +1 @@
+0001-add-explicit-dependency-on-generate_conf.patch

Bug#983064: unblock: notmuch/0.31.4-1

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package notmuch

[ Reason ]

There is two improvements in 0.31.4-1 that would be nice for
bullseye. The first is a fix for a flaky test that causes failures
about 15% of the time for parallel builds. The second fixes a build
failure against glib 2.67 (currently in experimental).

[ Impact ]

The test related build failures generate failures generate false
positives during archive rebuilds. They could potentially cause issues
for binNMUs, although that hasn't been an issue in practice. The
incompatibility with glib 2.67 is mostly hypothetical at this point.

[ Tests ]

I've done 80+ rebuilds on 60 hardware threads / 30 cores without
triggering the test failure.

I also built a few times against glib 2.67 in an sid/experimental chroot.

[ Risks ]

Both sets of changes are (textually) trivial.  Notmuch is not quite a
leaf package, but the number of dependencies is relatively small.

[ 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 notmuch/0.31.4-1

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

Kernel: Linux 5.10.0-2-amd64 (SMP w/8 CPU threads)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmAu0gsACgkQA0U5G1Wq
FSHc/hAAof5a6L+xF/v/O9HEpTeKI2mSGwxQpsrce3qna56dS3ochLvHJ1F0PBTZ
/JZ1ka+OmqJ/txcITQjHWgBVSdb5ulUJuVxBljVt4Ysos7V468isd1pqBX33W3Jy
qUBrqpqclZ6S3uyof6KUAshrG5Exj5gm379PW+DoHouaujeJysXA5FNj+R2PavB2
DIupBLPaHFEhiYtFHJj4Zvk5dULVctrlhYE8vo1hrS3GEJg1F9Sbrp7K8Wy//fB7
93qMP7hIG63S77TZ7PXTB88dLXuszVzwXirc1jIF0OemLnDXgIvpC4I2VKKR3+I+
NYYhjhxJoD/w6MtjJElTmS0CU6LRqcy+Cw4ErMUDwNdxIxie7tVaiCvlrYYBEL6C
ALlXCNyLrnBzx1XLQofGRX/m9sNxcEqHBwaaHoRuegmyRbxEW36r+O91K1uLQIlH
taWYthp7UX9dcdo6QogWHdMVTOKpdwFAGWBtHXjbwwYahJdPzOHhG/hgsdVEH4EN
HTxC7R4tcoqUbdwIvHvcTwAUGX2Dy/gV3ThCLanG6dbrZccTAv3SpfQjbn68TAtq
r9kHfh+J4R+tohu4zlIrxoksPyKlAp2J06BhWfDnf0Guu/vWu+4ich+5LOjGv5rp
eDD81pANU3bjehfotY83kcaz5mShnKq3YcGTB8S7eCsYn+n7NcA=
=Q+wV
-END PGP SIGNATURE-
diff -Nru --exclude debian-changes 
notmuch-0.31.3/bindings/python/notmuch/version.py 
notmuch-0.31.4/bindings/python/notmuch/version.py
--- notmuch-0.31.3/bindings/python/notmuch/version.py   2020-12-25 
12:21:05.0 -0400
+++ notmuch-0.31.4/bindings/python/notmuch/version.py   2021-02-18 
07:55:28.0 -0400
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.31.3'
+__VERSION__ = '0.31.4'
 SOVERSION = '5'
diff -Nru --exclude debian-changes 
notmuch-0.31.3/bindings/python-cffi/version.txt 
notmuch-0.31.4/bindings/python-cffi/version.txt
--- notmuch-0.31.3/bindings/python-cffi/version.txt 2020-12-25 
12:21:05.0 -0400
+++ notmuch-0.31.4/bindings/python-cffi/version.txt 2021-02-18 
07:55:28.0 -0400
@@ -1 +1 @@
-0.31.3
+0.31.4
diff -Nru --exclude debian-changes notmuch-0.31.3/debian/changelog 
notmuch-0.31.4/debian/changelog
--- notmuch-0.31.3/debian/changelog 2020-12-26 15:14:07.0 -0400
+++ notmuch-0.31.4/debian/changelog 2021-02-18 07:23:00.0 -0400
@@ -1,3 +1,11 @@
+notmuch (0.31.4-1) unstable; urgency=medium
+
+  * New upstream bugfix release
+- Fix include bug triggered by glib 2.67
+- Fix race condition in T568-lib-thread
+
+ -- David Bremner   Thu, 18 Feb 2021 07:23:00 -0400
+
 notmuch (0.31.3-2) unstable; urgency=medium
 
   * Don't install gdb on hppa (skip gdb based tests)
diff -Nru --exclude debian-changes notmuch-0.31.3/debian/patches/series 
notmuch-0.31.4/debian/patches/series
--- notmuch-0.31.3/debian/patches/series2020-12-26 15:14:07.0 
-0400
+++ notmuch-0.31.4/debian/patches/series1969-12-31 20:00:00.0 
-0400
@@ -1 +0,0 @@
-debian-changes
diff -Nru --exclude debian-changes notmuch-0.31.3/doc/conf.py 
notmuch-0.31.4/doc/conf.py
--- notmuch-0.31.3/doc/conf.py  2020-12-25 12:21:05.0 -0400
+++ notmuch-0.31.4/doc/conf.py  2021-02-18 07:55:28.0 -0400
@@ -14,7 +14,7 @@
 
 # General information about the project.
 project = u'notmuch'
-copyright = u'2009-2020, Carl Worth and many others'
+copyright = u'2009-2021, Carl Worth and many others'
 
 location = os.path.dirname(__file__)
 
diff -Nru --exclude debian-changes notmuch-0.31.3/lib/notmuch-private.h 
notmuch-0.31.4/lib/notmuch-private.h
--- notmuch-0.31.3/lib/notmuch-private.h2020-12-25 12:21:05.0 
-0400
+++ notmuch-0.31.4

Bug#934684: nmu: tellico_3.2.1-1

[David Bremner]

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

nmu tellico_3.2.1-1 . ANY . unstable . -m "rebuild against libbtparse2"
dw tellico_3.2.1-1 . ANY . -m libbtparse2

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

Kernel: Linux 4.19.0-5-amd64 (SMP w/8 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Bug#928502: unblock: notmuch/0.28.4-1

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package notmuch

This release fixes a bug discovered by Rob Browning. The version of
notmuch in testing will report an error and exit with status 1 (after
generating the correct output) if the input for "notmuch show
- --format=raw" is a multiple of 4096 bytes. This seems at least
severity important since it breaks people's scripts.

There's one line of code change, to notmuch-show.c. There is some new
tests, which could be disabled if that seemed safer/better.

diff -Nru notmuch-0.28.3/bindings/python/notmuch/version.py 
notmuch-0.28.4/bindings/python/notmuch/version.py
- --- notmuch-0.28.3/bindings/python/notmuch/version.py 2019-03-05 
21:46:41.0 -0400
+++ notmuch-0.28.4/bindings/python/notmuch/version.py   2019-05-05 
08:09:30.0 -0300
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
- -__VERSION__ = '0.28.3'
+__VERSION__ = '0.28.4'
 SOVERSION = '5'
diff -Nru notmuch-0.28.3/debian/changelog notmuch-0.28.4/debian/changelog
- --- notmuch-0.28.3/debian/changelog   2019-03-05 15:39:09.0 -0400
+++ notmuch-0.28.4/debian/changelog 2019-05-05 08:08:56.0 -0300
@@ -1,3 +1,12 @@
+notmuch (0.28.4-1) unstable; urgency=medium
+
+  * New upstream bugfix release
+  * Fix for bug in 'notmuch show --raw' that causes spurious errors to be
+reported when the mail file is a multiple of the libc buffer size
+(e.g. 4096 bytes).
+
+ -- David Bremner   Sun, 05 May 2019 08:08:56 -0300
+
 notmuch (0.28.3-1) unstable; urgency=medium
 
   * New upstream bugfix release.
diff -Nru notmuch-0.28.3/NEWS notmuch-0.28.4/NEWS
- --- notmuch-0.28.3/NEWS   2019-03-05 21:46:41.0 -0400
+++ notmuch-0.28.4/NEWS 2019-05-05 08:09:30.0 -0300
@@ -1,3 +1,12 @@
+Notmuch 0.28.4 (2019-05-05)
+===
+
+Command line interface
+--
+
+Fix a spurious error when using `notmuch show --raw` on messages whose
+size is a multiple of the internal buffer size.
+
 Notmuch 0.28.3 (2019-03-05)
 ===
 
diff -Nru notmuch-0.28.3/notmuch-show.c notmuch-0.28.4/notmuch-show.c
- --- notmuch-0.28.3/notmuch-show.c 2019-03-05 21:46:41.0 -0400
+++ notmuch-0.28.4/notmuch-show.c   2019-05-05 08:09:30.0 -0300
@@ -851,7 +851,7 @@
return NOTMUCH_STATUS_FILE_ERROR;
}
 
- - if (fwrite (buf, size, 1, stdout) != 1) {
+   if (size > 0 && fwrite (buf, size, 1, stdout) != 1) {
fprintf (stderr, "Error: Write failed\n");
fclose (file);
return NOTMUCH_STATUS_FILE_ERROR;
diff -Nru notmuch-0.28.3/test/T210-raw.sh notmuch-0.28.4/test/T210-raw.sh
- --- notmuch-0.28.3/test/T210-raw.sh   2019-03-05 21:46:41.0 -0400
+++ notmuch-0.28.4/test/T210-raw.sh 2019-05-05 08:09:30.0 -0300
@@ -30,4 +30,38 @@
 
 This is just a test message (#2)"
 
+test_python < 0:
+line = '.' * min(padding, 72)
+lines.append(line)
+padding = padding - len(line) - 1
+content ='\n'.join(lines)
+msg.set_content(content)
+with open('mail/size-{:07d}'.format(size), 'wb') as f:
+f.write(bytes(msg))
+EOF
+
+notmuch new --quiet
+
+for pow in {10..20}; do
+printf -v size "%07d" $((2**$pow))
+test_begin_subtest "content, message of size $size"
+notmuch show --format=raw subject:$size > OUTPUT
+test_expect_equal_file mail/size-$size OUTPUT
+test_begin_subtest "return value, message of size $size"
+test_expect_success  "notmuch show --format=raw subject:$size > /dev/null"
+done
+
 test_done
diff -Nru notmuch-0.28.3/.travis.yml notmuch-0.28.4/.travis.yml
- --- notmuch-0.28.3/.travis.yml2019-03-05 21:46:41.0 -0400
+++ notmuch-0.28.4/.travis.yml  2019-05-05 08:09:30.0 -0300
@@ -1,7 +1,6 @@
 language: c
 
- -dist: trusty
- -sudo: false
+dist: xenial
 
 addons:
   apt:
diff -Nru notmuch-0.28.3/version notmuch-0.28.4/version
- --- notmuch-0.28.3/version2019-03-05 21:46:41.0 -0400
+++ notmuch-0.28.4/version  2019-05-05 08:09:30.0 -0300
@@ -1 +1 @@
- -0.28.3
+0.28.4


unblock notmuch/0.28.4-1

- -- System Information:
Debian Release: buster/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'testing-proposed-updates-debug'), 
(500, 'testing-debug'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-4-amd64 (SMP w/8 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-BEGIN PGP SIG

Bug#924869: unblock: geiser/0.8.1-4

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package geiser

The version in buster is afaict completely unusable due to
incompatibility with emacs 26.x (this is reported in Debian as
#924866).

unblock geiser/0.8.1-4

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

Kernel: Linux 4.19.0-2-amd64 (SMP w/8 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-BEGIN PGP SIGNATURE-

iQGzBAEBCAAdFiEE3VS2dnyDRXKVCQCp8gKXHaSnniwFAlyOqiYACgkQ8gKXHaSn
nizgHQv+Ki16FlBWNldbIpDL50pv+88DKpNjIwEZKCr/QO/yu8yypnbitG3NSFTY
A523ENZFJtKxN3zv3NJ5NAA0Lc3SdntlnGC0PDokzauy5Qesu1fbQd5By4DJErpw
XjYT/VQmW9z295x6St7ZO3oHFKGTLilpn68naymrXNqU7QQY8+1w2OWpctMvmssg
SVMjVRHPkfr16xqySKtTBVULUH2ZB7qD0NNsLCV1L9qE3IMxTzgRPuAanmU63H+E
IUkl69A8tsLsFhNpGOuxsKSzxKVdo1+YbzAScARllf0cBX5Yh3BStMO1QhHfx7Uf
zsn+pF70kHvQJhy8mF2dwxPUxen0wBsJ4Q+BDxvs1Ke1BYX4HOEznG1GnKhAoRWo
n0GesdGBfikWS5M43UyEYqqJwHKNgrr57clI3xb4D9CnAHJ9ZTVvcWoCD7c0GbJ4
jRbDzyf/m3oAIiMSYbOvuIpXOa2K+ywhe9tCu1W5IZed0HB5fzFSXnQvEXk1cRdU
ZBxHQAwF
=65w4
-END PGP SIGNATURE-
diff -Nru geiser-0.8.1/debian/changelog geiser-0.8.1/debian/changelog
--- geiser-0.8.1/debian/changelog   2018-05-31 20:15:11.0 -0300
+++ geiser-0.8.1/debian/changelog   2019-03-17 16:57:31.0 -0300
@@ -1,3 +1,11 @@
+geiser (0.8.1-4) unstable; urgency=medium
+
+  * Cherry pick commit ae895088 from upstream to restore compatibility
+with emacs 26 (Closes: #924866)
+  * Point Vcs-* to salsa
+
+ -- David Bremner   Sun, 17 Mar 2019 16:57:31 -0300
+
 geiser (0.8.1-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru geiser-0.8.1/debian/control geiser-0.8.1/debian/control
--- geiser-0.8.1/debian/control 2018-05-31 20:15:11.0 -0300
+++ geiser-0.8.1/debian/control 2019-03-17 16:57:31.0 -0300
@@ -7,8 +7,8 @@
   dh-elpa (>= 0.0.12)
 Standards-Version: 3.9.6
 Homepage: http://www.nongnu.org/geiser/
-Vcs-Git: git://anonscm.debian.org/pkg-emacsen/pkg/geiser.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-emacsen/pkg/geiser.git/
+Vcs-Git: https://salsa.debian.org/emacsen-team/geiser.git
+Vcs-Browser: https://salsa.debian.org/emacsen-team/geiser
 
 Package: elpa-geiser
 Architecture: all
diff -Nru geiser-0.8.1/debian/patches/0001-fix-malformed-argument-lists.patch 
geiser-0.8.1/debian/patches/0001-fix-malformed-argument-lists.patch
--- geiser-0.8.1/debian/patches/0001-fix-malformed-argument-lists.patch 
1969-12-31 20:00:00.0 -0400
+++ geiser-0.8.1/debian/patches/0001-fix-malformed-argument-lists.patch 
2019-03-17 16:57:31.0 -0300
@@ -0,0 +1,38 @@
+From 225b69f0c1867c9da40d9bbbfbe52083c3d8b4f0 Mon Sep 17 00:00:00 2001
+From: Peter Wang 
+Date: Sat, 26 Nov 2016 17:06:38 +0800
+Subject: [PATCH] fix malformed argument lists.
+
+Emacs trunk does not support arguments list like (lambda () nil)
+anymore, which breaks geiser and errors with "Invalid function: "
+---
+ elisp/geiser-eval.el | 2 +-
+ elisp/geiser-impl.el | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/elisp/geiser-eval.el b/elisp/geiser-eval.el
+index 29797e6..291b017 100644
+--- a/elisp/geiser-eval.el
 b/elisp/geiser-eval.el
+@@ -29,7 +29,7 @@
+ 
+ (defvar geiser-eval--get-impl-module nil)
+ (geiser-impl--register-local-method
+- 'geiser-eval--get-impl-module 'find-module '(lambda () nil)
++ 'geiser-eval--get-impl-module 'find-module '(lambda ( args) nil)
+  "Function used to obtain the module for current buffer. It takes
+ an optional argument, for cases where we want to force its
+ value.")
+diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
+index aadfef7..b6d5977 100644
+--- a/elisp/geiser-impl.el
 b/elisp/geiser-impl.el
+@@ -157,7 +157,7 @@ determine its scheme flavour."
+  (= 2 (length m))
+  (symbolp (car m)))
+ (if (functionp (cadr m)) m
+-  `(,(car m) (lambda () ,(cadr m))
++  `(,(car m) (lambda ( args) ,(cadr m))
+ 
+ (defun geiser-impl--define (file name parent methods)
+   (let* ((methods (mapcar 'geiser-impl--normalize-method methods))
diff -Nru geiser-0.8.1/debian/patches/series geiser-0.8.1/debian/patches/series
--- geiser-0.8.1/debian/patches/series  1969-12-31 20:00:00.0 -0400
+++ geiser-0.8.1/debian/patches/series  2019-03-17 16:57:31.0 -0300
@@ -0,0 +1,2 @@
+# exported from git by git-debcherry
+0001-fix-malformed-argument-lists.patch
diff --git a/debian/changelog b/debian/changelog
index da6e005..633ed06 100644
--- a/debian/changelog
++

Bug#923868: unblock: notmuch/0.28.3-1

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package notmuch

It contains two bugfixes for bugs that were not reported to Debian,
but probably qualify as at least severity important.

1) The API function notmuch_message_property_get was unusable when
   messages had more than two properties, return "not found" for most
   queries.

2) The documentation build had a race condition between parallel
   invocations of sphinx-build. Sphinx-build caches state using
   python's "pickle" facility, and does not lock the on-disk database.

   This led to FTBFS about one in 25 times. Since it's a race
   condition, that's sensitive to the environment. A minor change I
   made in attempting to fix it increased the failure frequence to 1
   in 10 times.

I'll attach a debdiff and a git log --patch. The bulk of the diff is
added unit tests for the message_property fix (really a one line fix
to the underlying data structure). 

unblock notmuch/0.28.3-1

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

Kernel: Linux 4.19.0-2-amd64 (SMP w/8 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-BEGIN PGP SIGNATURE-

iQGzBAEBCAAdFiEE3VS2dnyDRXKVCQCp8gKXHaSnniwFAlx/1D4ACgkQ8gKXHaSn
niyOywv+Nj5M2Esilhd2ax+E4qbpQdUg7s+kEYwzR1/P9HL1KowOwiTHo8QSKTlZ
DpEchcNxCrOIuXbRgRVEENBRBoYjqkNyspdLAcka+YSryHUHRHJOTk/Obf4WCqZQ
gAj50zfviA6u/bCQKh7YzbR7eDDwYIt5pES3mbLp56smi+f37uo42JYI+vSjOIyS
IBQYM7kiaPWHnFiUj9Go4udCtS+AM94lruIv8a/V+PrqoGukoS26daIaot5Berxw
7GJm+idU03ROSUG0FpsW8cctRXYPenw4qAoiC1e/vk6pMfBBKXrDwyvE+qyccUHM
d+jn3QAAtmFVpDfj0aSfKgS+PVZfThuEsziZBY4ozU3X0n5MEUaGnJ94UK3zCDDT
LqLNrUH1QEXwCAHdR+XwiGCEJdgDcQJtX0Nb7HzRfelJRfjqk70REevNWSqDO9Di
L25sMvAWK68MW1fopu7JWiKBoBqWQq5gS16ulD2CQYmfkcukwl6XvbeZBnBGmNm2
R8+crQL+
=viAD
-END PGP SIGNATURE-
diff -Nru notmuch-0.28.2/bindings/python/notmuch/version.py 
notmuch-0.28.3/bindings/python/notmuch/version.py
--- notmuch-0.28.2/bindings/python/notmuch/version.py   2019-02-17 
07:32:59.0 -0400
+++ notmuch-0.28.3/bindings/python/notmuch/version.py   2019-03-05 
21:46:41.0 -0400
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.28.2'
+__VERSION__ = '0.28.3'
 SOVERSION = '5'
diff -Nru notmuch-0.28.2/debian/changelog notmuch-0.28.3/debian/changelog
--- notmuch-0.28.2/debian/changelog 2019-02-17 07:30:33.0 -0400
+++ notmuch-0.28.3/debian/changelog 2019-03-05 15:39:09.0 -0400
@@ -1,3 +1,12 @@
+notmuch (0.28.3-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Fix for bug in message property search
+  * Fix for race condition leading to (very) occasional build failures
+when building the documentation.
+
+ -- David Bremner   Tue, 05 Mar 2019 15:39:09 -0400
+
 notmuch (0.28.2-1) unstable; urgency=medium
 
   * [notmuch-emacs] Invoke gpg from with --batch and --no-tty
diff -Nru notmuch-0.28.2/doc/Makefile.local notmuch-0.28.3/doc/Makefile.local
--- notmuch-0.28.2/doc/Makefile.local   2019-02-17 07:32:59.0 -0400
+++ notmuch-0.28.3/doc/Makefile.local   2019-03-05 21:46:41.0 -0400
@@ -37,6 +37,14 @@
 %.gz: %
rm -f $@ && gzip --stdout $^ > $@
 
+# Sequentialize the calls to sphinx-build to avoid races with
+# reading/writing cached state. This uses GNU make specific
+# "order-only" prerequisites.
+
+sphinx-html: | $(DOCBUILDDIR)/.roff.stamp
+sphinx-texinfo: | sphinx-html
+sphinx-info: | sphinx-texinfo
+
 sphinx-html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(DOCBUILDDIR)/html
 
diff -Nru notmuch-0.28.2/lib/string-map.c notmuch-0.28.3/lib/string-map.c
--- notmuch-0.28.2/lib/string-map.c 2019-02-17 07:32:59.0 -0400
+++ notmuch-0.28.3/lib/string-map.c 2019-03-05 21:46:41.0 -0400
@@ -106,7 +106,7 @@
 map->sorted = true;
 }
 
-static bool
+static int
 string_cmp (const char *a, const char *b, bool exact)
 {
 if (exact)
diff -Nru notmuch-0.28.2/NEWS notmuch-0.28.3/NEWS
--- notmuch-0.28.2/NEWS 2019-02-17 07:32:59.0 -0400
+++ notmuch-0.28.3/NEWS 2019-03-05 21:46:41.0 -0400
@@ -1,3 +1,17 @@
+Notmuch 0.28.3 (2019-03-05)
+===
+
+Library
+---
+
+Fix a bug with the internal data structure _notmuch_string_map_t used
+by message properties.
+
+Build System
+
+
+Serialize calls to sphinx-build to avoid race condition.
+`
 Notmuch 0.28.2 (2019-02-17)
 ===
 
diff -Nru notmuch-0.28.2/test/T610-message-property.sh 
notmuch-0.28

Bug#883933: nmu: polymake_3.1-5

[David Bremner]

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

The following crash seems cured by a rebuild:

Can't locate loadable object for module Polymake::Ext in @INC (@INC contains: 
/usr/share/polymake/perllib /usr/lib/polymake/perlx/5.26.0 
/usr/lib/polymake/perlx /home/bremner/.config/perl /etc/perl 
/usr/local/lib/x86_64-linux-gnu/perl/5.26.1 /usr/local/share/perl/5.26.1 
/usr/lib/x86_64-linux-gnu/perl5/5.26 /usr/share/perl5 
/usr/lib/x86_64-linux-gnu/perl/5.26 /usr/share/perl/5.26 
/usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base) at 
/usr/share/polymake/perllib/Polymake/Namespaces.pm line 17.

nmu polymake_3.1-5 . ANY . unstable . -m "rebuild for perl 5.26"

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

Kernel: Linux 4.13.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Bug#868722: transition: notmuch

[David Bremner]

Emilio Pozuelo Monfort  writes:
>
> Up to you what happens with notmuch-addrlookup, as long as it gets fixed. With
> that said, you can go ahead.
>

I have uploaded an NMU of notmuch-addrlookup to delayed/5

Bug#868722: transition: notmuch

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

There is an upstream SONAME bump in libnotmuch due to some long
deprecated symbols changing API.

There are two reverse depends: mutt rebuilds fine.  notmuch-addrlookup
currently fails, but apparently this is fixed with the latest upstream
version.  I can NMU notmuch-addrlookup, but I'd rather the maintainer
uploaded a new pustream version.

Ben file:

title = "notmuch";
is_affected = .depends ~ "libnotmuch4" | .depends ~ "libnotmuch5";
is_good = .depends ~ "libnotmuch5";
is_bad = .depends ~ "libnotmuch4";


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

Kernel: Linux 4.11.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-BEGIN PGP SIGNATURE-

iQGzBAEBCAAdFiEE3VS2dnyDRXKVCQCp8gKXHaSnniwFAlltRqEACgkQ8gKXHaSn
niwmAgwAkB4WPQ92AbW74buG6OEtCCgzVZHz0L2m4e7A5vPHqhCW8fJvDGZcr0Iz
iti4Pzu3oQJlcrOQ5dBSR4OOqmXA6++NlYgHxMIRpAXB2fyK0duDjIb8VHipx3yi
ONN+lHBw/6aKlCPE8xzBsr9LLSinM1EGbf8UqZCXhJeZE0kqgTBOVfCR/YZ6qCax
8LLCTtzXgFH5MIkF4RyPWUKAo1H1re+e0zVnkCCDETVgJsC7GP1xz0XQTvofURmr
ggz91XR+FuCPuhzoCWn8SMwvAj9Vq9uQUrAJDXCutCLsTLgAklrJhPlyy0D6AHOt
TBwQ+xSfGD0ym07golCM/YBwSuvC5dvQ9jn4qkOZEKuJCIkeIQ7zXGZAum+aovBi
YAzaJsy2/yHwkZLABC+d8Rqtflevwp4rGaalkOiZo3rqpgso4D51rMGMxhiRZq1i
o8W0//K6cP+dM3n5qwgFZrg8ivcByyIx2a1XloSYNvRYBWE4df5Q18ZWqSyWTDVy
V2jMcWC7
=cvtH
-END PGP SIGNATURE-

Bug#862498: jessie-pu: package gitolite3/3.6.1-2+deb8u2

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

I'd like to close #834153 in stable. The bug has an easy workaround,
but it still admittedly pretty annoying.

There isn't that much to test here, but I've installed the resulting
package on jessie, and did a few basic operations.  Of course I
already had openssh-client on the host in question.

diff -u gitolite3-3.6.1/debian/changelog gitolite3-3.6.1/debian/changelog
- --- gitolite3-3.6.1/debian/changelog
+++ gitolite3-3.6.1/debian/changelog
@@ -1,3 +1,10 @@
+gitolite3 (3.6.1-2+deb8u2) stable; urgency=medium
+
+  * Bug fix: "gitolite3 should depend on openssh-client", thanks to Keller
+Fuchs (Closes: #834153).
+
+ -- David Bremner <brem...@debian.org>  Sat, 13 May 2017 12:38:44 -0300
+
 gitolite3 (3.6.1-2+deb8u1) stable; urgency=medium
 
   * Bug fix: "Git-annex-shell not working", thanks to risca (Closes:
diff -u gitolite3-3.6.1/debian/control gitolite3-3.6.1/debian/control
- --- gitolite3-3.6.1/debian/control
+++ gitolite3-3.6.1/debian/control
@@ -13,7 +13,7 @@
 Package: gitolite3
 Architecture: all
 Depends: ${misc:Depends}, git (>= 1:1.7.0.4) | git-core (>= 1:1.6.2), perl (>= 
5.6.0-16),
- - ssh-server, debconf (>= 0.5) | debconf-2.0, adduser
+ ssh-server, debconf (>= 0.5) | debconf-2.0, adduser, openssh-client
 Suggests: git-daemon-run, gitweb
 Description: SSH-based gatekeeper for git repositories (version 3)
  Gitolite is an SSH-based gatekeeper providing access control for a server that


- -- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (900, 'testing')
Architecture: amd64
 (x86_64)

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

-BEGIN PGP SIGNATURE-

iQGzBAEBCAAdFiEE3VS2dnyDRXKVCQCp8gKXHaSnniwFAlkXM28ACgkQ8gKXHaSn
nixJNAv+K3/xnzDa+8u/pJqwRlqpwcmbtytfmABpCiKMLefChRKfPu0wRTj+ljuL
Y/146rZ6JZ/PfOj8jY+lJa8xagh+XdxOsBssrm1LW8l7+5F3ksT1c53pTPgiqimS
NA2KSCeT72fwScCmUfYnc//apWfiuzsg03UbhveN/iU7GXUcU1BUbK7U3sBOjUOA
VvjmgG00NdHtd5d9AbZPrP4x8IUG+0umnQMgXAmAQ5ZvQjOWB6FvHT9oVi4HPwD1
Tz6zCzHjkOVdNgZSm1RPBaTLDa626h/uYihqgo6xtNH3lTPOepKyL5Z8YULCwIKM
Hkmq8jootM6SdheKg0hfGsTdLjRVghssM3sIBRs72X+XMkLIlfBHB9DZD1fiqPHb
YweHcgbm9POUu/v2EzgcoNKaB9zafwcB5wt8dfA09WhFwrG8pL4+wH2oBV7ZIveq
xmph7ASdMnJFbLg6paiWyDWVPDgDhAQ6s3syYA9Jt0QZc4tGXSz141UkQFBZ0I9y
Pv2JJmWs
=En6i
-END PGP SIGNATURE-

Bug#859328: unblock: notmuch/0.23.7-3

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package notmuch

I recently discovered a bug in the output of "notmuch dump",
specifically that in listing the types of metadata included in the
dump, it lists "properties" a second time rather than "tags". This
doesn't cause any data loss when using the output with notmuch
restore.  I guess in some (probably contrived) situations it might
cause data loss for third party tools.  The main downside of
ignoring this bug for the stretch cycle would be forcing people to
write workarounds for it into their scripts.

diff -Nru notmuch-0.23.7/debian/changelog notmuch-0.23.7/debian/changelog
- --- notmuch-0.23.7/debian/changelog   2017-03-19 09:38:17.0 -0300
+++ notmuch-0.23.7/debian/changelog 2017-04-01 21:09:36.0 -0300
@@ -1,3 +1,9 @@
+notmuch (0.23.7-3) unstable; urgency=medium
+
+  * Cherry pick fixes to dump header from 0.24.1
+
+ -- David Bremner <brem...@debian.org>  Sat, 01 Apr 2017 21:09:36 -0300
+
 notmuch (0.23.7-2) unstable; urgency=medium
 
   * Cherry pick 06adc276, fix use after free in libnotmuch4
diff -Nru notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch 
notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch
- --- notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch
2017-03-19 09:38:17.0 -0300
+++ notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch  
2017-04-01 21:09:36.0 -0300
@@ -1,7 +1,7 @@
- -From 0fa0d9586e63d44e53aa7cf6cde5d1bd88bdbf35 Mon Sep 17 00:00:00 2001
+From dbdf6942f7e829cf3f1ab5cfd04ec3008a822856 Mon Sep 17 00:00:00 2001
 From: David Bremner <da...@tethera.net>
- -Date: Sun, 19 Mar 2017 09:48:03 -0300
- -Subject: [PATCH] debcherry fixup patch
+Date: Sat, 1 Apr 2017 21:13:02 -0300
+Subject: [PATCH 1/3] debcherry fixup patch
 
 aa0bccba lib/message.cc: fix Coverity finding (use after free)
 - extra changes or conflicts
diff -Nru 
notmuch-0.23.7/debian/patches/0002-cli-dump-fix-bug-in-dump-header.patch 
notmuch-0.23.7/debian/patches/0002-cli-dump-fix-bug-in-dump-header.patch
- --- notmuch-0.23.7/debian/patches/0002-cli-dump-fix-bug-in-dump-header.patch  
1969-12-31 20:00:00.0 -0400
+++ notmuch-0.23.7/debian/patches/0002-cli-dump-fix-bug-in-dump-header.patch
2017-04-01 21:09:36.0 -0300
@@ -0,0 +1,26 @@
+From bb60768e31f681f161ac00079e869dec1d35bc85 Mon Sep 17 00:00:00 2001
+From: David Bremner <da...@tethera.net>
+Date: Tue, 28 Mar 2017 08:09:03 -0300
+Subject: [PATCH 2/3] cli/dump: fix bug in dump header
+
+Fix copy paste error.
+
+(cherry picked from commit 1f3c7916f82774cacbfbb0fbc9d0e0aaae9399b3)
+(changes to missing test dropped)
+---
+ notmuch-dump.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/notmuch-dump.c b/notmuch-dump.c
+index e7965cea..0bb946f8 100644
+--- a/notmuch-dump.c
 b/notmuch-dump.c
+@@ -84,7 +84,7 @@ print_dump_header (gzFile output, int output_format, int 
include)
+   sep = ",";
+ }
+ if (include & DUMP_INCLUDE_TAGS) {
+-  gzprintf (output, "%sproperties", sep);
++  gzprintf (output, "%stags", sep);
+ }
+ gzputs (output, "\n");
+ }
diff -Nru 
notmuch-0.23.7/debian/patches/0003-cli-dump-bump-dump-format-version-to-3.patch 
notmuch-0.23.7/debian/patches/0003-cli-dump-bump-dump-format-version-to-3.patch
- --- 
notmuch-0.23.7/debian/patches/0003-cli-dump-bump-dump-format-version-to-3.patch 
  1969-12-31 20:00:00.0 -0400
+++ 
notmuch-0.23.7/debian/patches/0003-cli-dump-bump-dump-format-version-to-3.patch 
2017-04-01 21:09:36.0 -0300
@@ -0,0 +1,52 @@
+From cad718ad2098f5359dfa7e55d13247ce98c679d6 Mon Sep 17 00:00:00 2001
+From: David Bremner <da...@tethera.net>
+Date: Fri, 31 Mar 2017 07:55:17 -0300
+Subject: [PATCH 3/3] cli/dump: bump dump format version to 3
+
+No changes to the format of the body, but the header format was
+fixed, and version 2 headers probably shouldn't be relied on.
+---
+ doc/man1/notmuch-dump.rst | 2 +-
+ notmuch-client.h  | 2 +-
+ test/T590-libconfig.sh| 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/man1/notmuch-dump.rst b/doc/man1/notmuch-dump.rst
+index 58570272..738ba4a3 100644
+--- a/doc/man1/notmuch-dump.rst
 b/doc/man1/notmuch-dump.rst
+@@ -95,7 +95,7 @@ Supported options for **dump** include
+ 
+   The default is to include all available types of data.  The
+   option can be specified multiple times to select some subset. As
+-  of version 2 of the dump format, there is a header line of the
++  of version 3 of the dump format, there is a header line of the
+   following form
+ 
+   |
+diff --git a/notmuch-client.h b/notmuch-client.h
+index d026e600..dc640326 100644
+--- a/notmuch-client.h
 b/no

Bug#858184: unblock: notmuch/0.23.7-2

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package notmuch

We've recently fixed a use-after-free bug upstream.  As this error is
in the library, it does at least potentially impact a large number of
users.  We've not seen any problems in the wild because of it (or
detected a bad memory access with valgrind). On the other hand I think
the fix is low risk, it mimics things we've done before.

diff -Nru notmuch-0.23.7/debian/changelog notmuch-0.23.7/debian/changelog
- --- notmuch-0.23.7/debian/changelog   2017-02-28 20:39:30.0 -0400
+++ notmuch-0.23.7/debian/changelog 2017-03-19 09:38:17.0 -0300
@@ -1,3 +1,9 @@
+notmuch (0.23.7-2) unstable; urgency=medium
+
+  * Cherry pick 06adc276, fix use after free in libnotmuch4
+
+ -- David Bremner <brem...@debian.org>  Sun, 19 Mar 2017 09:38:17 -0300
+
 notmuch (0.23.7-1) unstable; urgency=medium
 
   * Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths.
diff -Nru notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch 
notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch
- --- notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch
1969-12-31 20:00:00.0 -0400
+++ notmuch-0.23.7/debian/patches/0001-debcherry-fixup-patch.patch  
2017-03-19 09:38:17.0 -0300
@@ -0,0 +1,27 @@
+From 0fa0d9586e63d44e53aa7cf6cde5d1bd88bdbf35 Mon Sep 17 00:00:00 2001
+From: David Bremner <da...@tethera.net>
+Date: Sun, 19 Mar 2017 09:48:03 -0300
+Subject: [PATCH] debcherry fixup patch
+
+aa0bccba lib/message.cc: fix Coverity finding (use after free)
+- extra changes or conflicts
+---
+ lib/message.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/message.cc b/lib/message.cc
+index 9d3e8071..a91e69e0 100644
+--- a/lib/message.cc
 b/lib/message.cc
+@@ -849,9 +849,9 @@ _notmuch_message_ensure_filename_list (notmuch_message_t 
*message)
+*
+* It would be nice to do the upgrade of the document directly
+* here, but the database is likely open in read-only mode. */
+-  const char *data;
+ 
+-  data = message->doc.get_data ().c_str ();
++  std::string datastr = message->doc.get_data ();
++  const char *data = datastr.c_str ();
+ 
+   if (data == NULL)
+   INTERNAL_ERROR ("message with no filename");
diff -Nru notmuch-0.23.7/debian/patches/series 
notmuch-0.23.7/debian/patches/series
- --- notmuch-0.23.7/debian/patches/series  1969-12-31 20:00:00.0 
-0400
+++ notmuch-0.23.7/debian/patches/series2017-03-19 09:38:17.0 
-0300
@@ -0,0 +1,2 @@
+# exported from git by git-debcherry
+0001-debcherry-fixup-patch.patch


unblock notmuch/0.23.7-2

- -- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (900, 'testing')
Architecture: amd64 (x86_64)

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

-BEGIN PGP SIGNATURE-

iQGzBAEBCAAdFiEE3VS2dnyDRXKVCQCp8gKXHaSnniwFAljOnAsACgkQ8gKXHaSn
niwVVQv9FPjOrf9lA+2gfftBiPBjNRBX6akl01H+WysWsSeMg8rcb3lMPEI4JjIl
QtemhZgRdVbe7wvyE1sBVhJY6Byj4P+0JQsGu+ldWZMGqqIp9/Dc9uLn/B8qpqXE
WLce8TJwV2Kf20bxPGt2S3Var967ZoAR4fccaOpVSs+rPs1njdHMOcvO5zSZJeaR
5ri/33fAunkvrElnS6eO3SzHkdg5onfi8IUGUA7JIWgPD7+RQATGn4pab+mBl4lv
AUlB54sNI/opn6P9JLV1dso2wGIiJEbRuLSx2GIbWH4vhIw9z3PnzMRoQ2iMkNPL
yJETZjfLNj7qFZWPjKIIMRZSu4cDRuZa3E2r9oJEC5eaXYAAnGcgV9nLDKMxALO/
bVcCnx5fKjUoum73Vm+C0tTUeoS+h6xdjlQV24ilQwU3Lc5aC5MoRkC6f4MBAzKX
JU87YRzpPBC7IexPrl/jymN8eUq+9xYT4GE517/QHJaxLSqgmTn0BkE3+JQ7sAIY
YteBO+Ev
=LEXU
-END PGP SIGNATURE-

Bug#857497: unblock: darktable/2.2.1-3

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package darktable

this version (only) drops i386 binary packages

diff -Nru darktable-2.2.1/debian/changelog darktable-2.2.1/debian/changelog
- --- darktable-2.2.1/debian/changelog  2017-01-02 13:54:11.0 -0400
+++ darktable-2.2.1/debian/changelog2017-03-10 13:41:38.0 -0400
@@ -1,3 +1,11 @@
+darktable (2.2.1-3) unstable; urgency=medium
+
+  * Drop support for 32bit intel (i386) architectures (Closes: #857147)
+- Upstream no longer supports 32bit address spaces.
+- The i386 build is reported to be unstable.
+
+ -- David Bremner <brem...@debian.org>  Fri, 10 Mar 2017 13:41:38 -0400
+
 darktable (2.2.1-2) unstable; urgency=medium
 
   * re-re-enable arm64 (sigh)
diff -Nru darktable-2.2.1/debian/control darktable-2.2.1/debian/control
- --- darktable-2.2.1/debian/control2017-01-02 13:54:11.0 -0400
+++ darktable-2.2.1/debian/control  2017-03-10 13:41:38.0 -0400
@@ -41,7 +41,7 @@
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-phototools/darktable.git;a=summary
 
 Package: darktable
- -Architecture: any-i386 any-amd64 any-arm64
+Architecture: any-amd64 any-arm64
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-prototype, 
libjs-scriptaculous
 Replaces: darktable-plugins-legacy (<< 0.9), darktable-plugins-experimental 
(<< 1.0~)
 Breaks: darktable-plugins-legacy (<< 0.9), darktable-plugins-experimental (<< 
1.0~)


unblock darktable/2.2.1-3

- -- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (900, 'testing')
Architecture: amd64 (x86_64)

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

-BEGIN PGP SIGNATURE-

iQGzBAEBCAAdFiEE3VS2dnyDRXKVCQCp8gKXHaSnniwFAljEeqgACgkQ8gKXHaSn
nixyDgv+LyTXdxi61m/Tjm+SWghYlPCuQb5aWlvoX3z2R5rUbI7i8IZzgbSxINnm
ivboSULIr/IS8qImH8yg1xGyWvblc3Kss7FoEXtKjsKfeS9M/YBMY3TLB4FUSYVn
tKRzURhYyD7ONwR1umfRLRJo0ToRER8do6DS8RTHM5KO3aKnVxdS0xFLpLGNXxnX
ANYNYVwiT1UziwWKqKdXUliDXZgXxbuhISF41KTFx2folGevnADN0kdQuTQZvTRN
UVZd90mp75h4B4au7PoVIAQlhGK7Is1LwTfGmZIbDh+R66pYkUvWLgHUIHnCBC/3
85Eotr4GW+xOnE32FvqaHVe2BzIj0O8CI4qdZzef3vVg8mEdRAj+JpehWLE2C6f7
OFAeoUcsXH1g/NuhwhoOPoYHKDuZC7bDtpxPI10JhJ0H32gV9nXGVVwS0MrQNZ3r
duTN6m0DF8o1UGTrBlEQ5d9OJH0H1Qsny1IH26TeLm+57Vi8M0VbP4fJagGaol9s
8S4LdhH9
=Yqu3
-END PGP SIGNATURE-

Bug#856863: unblock: racket/6.7-2

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package racket

I think bug #836346 is probably worth fixing in stretch. Otherwise
most users of racket will need to install libssl-dev (because of the
not ideal way that racket loads the openssl libraries). I don't yet
have confirmation from upstream that they agree with my fix.

diff -Nru racket-6.7/debian/changelog racket-6.7/debian/changelog
- --- racket-6.7/debian/changelog   2016-10-29 09:14:40.0 -0300
+++ racket-6.7/debian/changelog 2017-03-05 08:55:03.0 -0400
@@ -1,3 +1,11 @@
+racket (6.7-2) unstable; urgency=medium
+
+  * Patch libcrypto.rkt to look for openssl 1.1, recommend libssl1.1. Bug
+fix: "Raco fails without libssl-dev", thanks to Martin Tang (Closes:
+#836346).
+
+ -- David Bremner <brem...@debian.org>  Sun, 05 Mar 2017 08:55:03 -0400
+
 racket (6.7-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru racket-6.7/debian/control racket-6.7/debian/control
- --- racket-6.7/debian/control 2016-10-29 09:14:40.0 -0300
+++ racket-6.7/debian/control   2017-03-05 08:55:03.0 -0400
@@ -17,7 +17,7 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}, racket-common (= 
${source:Version})
 Recommends: racket-doc (>= ${source:Upstream-Version}),
 libglib2.0-0, libpangocairo-1.0-0, libjpeg62-turbo, libpng16-16,
- -libgtk2.0-0, libgdk-pixbuf2.0-0, libunique-1.0-0
+libgtk2.0-0, libgdk-pixbuf2.0-0, libunique-1.0-0, libssl1.1
 Breaks: plt-scheme (<<5.0~)
 Replaces: plt-scheme (<<5.0~)
 Provides: plt-scheme
diff -Nru 
racket-6.7/debian/patches/0001-openssl-update-known-versions-of-lib-crypto-ssl.patch
 
racket-6.7/debian/patches/0001-openssl-update-known-versions-of-lib-crypto-ssl.patch
- --- 
racket-6.7/debian/patches/0001-openssl-update-known-versions-of-lib-crypto-ssl.patch
  1969-12-31 20:00:00.0 -0400
+++ 
racket-6.7/debian/patches/0001-openssl-update-known-versions-of-lib-crypto-ssl.patch
2017-03-05 08:55:03.0 -0400
@@ -0,0 +1,37 @@
+From 403bd68ab40f224b669a82eaf7ef5f5939addd43 Mon Sep 17 00:00:00 2001
+From: David Bremner <da...@tethera.net>
+Date: Sat, 4 Mar 2017 09:18:41 -0400
+Subject: [PATCH] openssl: update known versions of lib{crypto,ssl}.
+
+The existing versions no longer work on current Debian.
+---
+ collects/openssl/libcrypto.rkt | 7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/collects/openssl/libcrypto.rkt b/collects/openssl/libcrypto.rkt
+index 774d9611ca..9a946fe228 100644
+--- a/collects/openssl/libcrypto.rkt
 b/collects/openssl/libcrypto.rkt
+@@ -15,7 +15,8 @@
+ ;; - Debian and Ubuntu use a few fixed library versions even though
+ ;;   actual OpenSSL version changes:
+ ;;   - Debian squeeze: lib{crypto,ssl}.so.0.9.8
+-;;   - Debian {wheezy, jessie, stretch, sid}: lib{crypto,ssl}.so.1.0.0
++;;   - Debian {wheezy, jessie}: lib{crypto,ssl}.so.1.0.0
++;;   - Debian {stretch, sid}: lib{crypto,ssl}.so.1.1, lib{crypto,ssl}.so.1.0.2
+ ;;   - Ubuntu {14.04, 14.10, 15.04}: lib{crypto,ssl}.so.1.0.0
+ ;;   - Debian and Ubuntu also provide versionless library in pkg "libssl-dev"
+ ;; - Fedora provides libraries suffixed with actual versions (eg
+@@ -32,9 +33,11 @@
+ 
+ ;; Compatibility-based version / SONAME
+ "10" ;; Fedora
+-"1.0.0"  ;; Debian, Ubuntu
++"1.1";; Newer Debian
++"1.0.0"  ;; Older Debian, Ubuntu
+ 
+ ;; Other specific known versions
++"1.0.2"
+ "1.0.1k" "1.0.1j" "1.0.1g" "1.0.1e"
+ "1.0" "1.0.0" "1.0.0e" "1.0.0d" "1.0.0c" "1.0.0b" "1.0.0a"
+ "0.9.8e" "0.9.8b" "0.9.8" "0.9.7"))
diff -Nru racket-6.7/debian/patches/series racket-6.7/debian/patches/series
- --- racket-6.7/debian/patches/series  1969-12-31 20:00:00.0 -0400
+++ racket-6.7/debian/patches/series2017-03-05 08:55:03.0 -0400
@@ -0,0 +1,2 @@
+# debian/source/git-patches exported from git by quilt-patches-deb-export-hook
+0001-openssl-update-known-versions-of-lib-crypto-ssl.patch
diff -Nru racket-6.7/debian/source/git-patches 
racket-6.7/debian/source/git-patches
- --- racket-6.7/debian/source/git-patches  1969-12-31 20:00:00.0 
-0400
+++ racket-6.7/debian/source/git-patches2017-03-05 08:55:03.0 
-0400
@@ -0,0 +1,2 @@
+upstream/${UPSTREAM_REF}..patches/${DEB_REF}
+


unblock racket/6.7-2

- -- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (900, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 4.8.0-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
She

Bug#856129: pre-approval: notmuch/0.23.6-1

[David Bremner]

Jonathan Wiltshire <j...@debian.org> writes:

> Control: tag -1 confirmed moreinfo
>
> On Sat, Feb 25, 2017 at 09:10:01AM -0400, David Bremner wrote:
>> I've appended a diff from upstream git, this also includes any debian
>> changes except finalizing the date and distribution in the
>> changelog(s).
>
> Please go ahead, and remove the moreinfo tag from this bug when it is built
> on all architectures.

Here's an updated debdiff.

I turned out my initial idea was flawed. Or gnupg is flawed. Or
something. In anycase the new debdiff is actually smaller (not counting
upstream changelog).

diff -Nru notmuch-0.23.5/bindings/python/notmuch/version.py notmuch-0.23.7/bindings/python/notmuch/version.py
--- notmuch-0.23.5/bindings/python/notmuch/version.py	2017-01-09 06:25:01.0 -0400
+++ notmuch-0.23.7/bindings/python/notmuch/version.py	2017-02-28 20:49:24.0 -0400
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.23.5'
+__VERSION__ = '0.23.7'
 SOVERSION = '4'
diff -Nru notmuch-0.23.5/debian/changelog notmuch-0.23.7/debian/changelog
--- notmuch-0.23.5/debian/changelog	2017-01-09 06:24:39.0 -0400
+++ notmuch-0.23.7/debian/changelog	2017-02-28 20:39:30.0 -0400
@@ -1,3 +1,10 @@
+notmuch (0.23.7-1) unstable; urgency=medium
+
+  * Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths.
+  * Fix read-after-free bug in `notmuch new`.
+
+ -- David Bremner <brem...@debian.org>  Tue, 28 Feb 2017 20:39:30 -0400
+
 notmuch (0.23.5-1) unstable; urgency=medium
 
   * Remove RUNPATH from /usr/bin/notmuch
diff -Nru notmuch-0.23.5/lib/database.cc notmuch-0.23.7/lib/database.cc
--- notmuch-0.23.5/lib/database.cc	2017-01-09 06:25:01.0 -0400
+++ notmuch-0.23.7/lib/database.cc	2017-02-28 20:49:24.0 -0400
@@ -652,7 +652,7 @@
 	ref = _parse_message_id (ctx, refs, );
 
 	if (ref && strcmp (ref, message_id)) {
-	g_hash_table_insert (hash, ref, NULL);
+	g_hash_table_add (hash, ref);
 	last_ref = ref;
 	}
 }
@@ -661,7 +661,7 @@
  * reference to the database.  We should avoid making a message
  * its own parent, thus the above check.
  */
-return last_ref;
+return talloc_strdup(ctx, last_ref);
 }
 
 notmuch_status_t
diff -Nru notmuch-0.23.5/NEWS notmuch-0.23.7/NEWS
--- notmuch-0.23.5/NEWS	2017-01-09 06:25:01.0 -0400
+++ notmuch-0.23.7/NEWS	2017-02-28 20:49:24.0 -0400
@@ -1,3 +1,33 @@
+Notmuch 0.23.7 (2017-02-28)
+===
+
+Test Suite
+--
+
+Drop use of gpgconf --create-socketdir. Move $GNUPGHOME to /tmp.
+
+  It turns out the hardcoded use of /run/user in gpg doesn't work out
+  that well in some environments. The more low tech fix is to move all
+  of $GNUPGHOME to somewhere where we can control the length of the
+  paths.
+
+Notmuch 0.23.6 (2017-02-27)
+===
+
+Command Line Interface
+--
+
+Fix read-after-free bug in `notmuch new`.
+
+Test Suite
+--
+
+Use gpgconf --create-socketdir if available.
+
+  GnuPG has a facility to use sockets in /run or /var/run to avoid
+  problems with long socket paths, but this is not enabled by default
+  for GNUPGHOME other than $HOME/.gnupg. Enable it, if possible.
+
 Notmuch 0.23.5 (2017-01-09)
 ===
 
diff -Nru notmuch-0.23.5/test/test-lib-common.sh notmuch-0.23.7/test/test-lib-common.sh
--- notmuch-0.23.5/test/test-lib-common.sh	2017-01-09 06:25:01.0 -0400
+++ notmuch-0.23.7/test/test-lib-common.sh	2017-02-28 20:49:24.0 -0400
@@ -158,7 +158,6 @@
 mkdir -p "${HOME}"
 
 MAIL_DIR="${TMP_DIRECTORY}/mail"
-export GNUPGHOME="${TMP_DIRECTORY}/gnupg"
 export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config"
 
 mkdir -p "${test}"
diff -Nru notmuch-0.23.5/test/test-lib.sh notmuch-0.23.7/test/test-lib.sh
--- notmuch-0.23.5/test/test-lib.sh	2017-01-09 06:25:01.0 -0400
+++ notmuch-0.23.7/test/test-lib.sh	2017-02-28 20:49:24.0 -0400
@@ -270,6 +270,8 @@
 GIT_EXIT_OK=
 # Note: TEST_TMPDIR *NOT* exported!
 TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XX")
+# Put GNUPGHOME in TMPDIR to avoid problems with long paths.
+export GNUPGHOME="${TEST_TMPDIR}/gnupg"
 trap 'trap_exit' EXIT
 trap 'trap_signal' HUP INT TERM
 
diff -Nru notmuch-0.23.5/version notmuch-0.23.7/version
--- notmuch-0.23.5/version	2017-01-09 06:29:27.0 -0400
+++ notmuch-0.23.7/version	2017-02-28 21:05:57.0 -0400
@@ -1 +1 @@
-0.23.5
+0.23.7


signature.asc
Description: PGP signature

Bug#856129: pre-approval: notmuch/0.23.6-1

[David Bremner]

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

I'm planning to upload a new uptream point release of notmuch to
unstable.  This fixes two bugs that have not yet been reported to
Debian.  The first bug is that if the path of the build directory gets
long enough, the package will FTBFS due to problems with gnupg
sockets. I don't know how stable the paths on the buildds are, but it
seems a bit fragile to rely on them not changing for the whole stretch
release cycle.  The second bug is a memory management bug (read after
free). I'm not aware of any actual user-visible symptoms of the second
bug; it was found during an unrelated check with valgrind. OTOH, it's
the kind of nasty C programming bug that so often escalates...

I've appended a diff from upstream git, this also includes any debian
changes except finalizing the date and distribution in the
changelog(s).

diff --git a/NEWS b/NEWS
index c023c03e..3ac46355 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Notmuch 0.23.6 (UNRELEASED)
+===
+
+Command Line Interface
+--
+
+Fix read-after-free bug in `notmuch new`.
+
+Test Suite
+--
+
+Use gpgconf --create-socketdir if available.
+
+  GnuPG has a facility to use sockets in /run or /var/run to avoid
+  problems with long socket paths, but this is not enabled by default
+  for GNUPGHOME other than $HOME/.gnupg. Enable it, if possible.
+
 Notmuch 0.23.5 (2017-01-09)
 ===
 
diff --git a/bindings/python/notmuch/version.py 
b/bindings/python/notmuch/version.py
index 1397fefd..8d700260 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.23.5'
+__VERSION__ = '0.23.6'
 SOVERSION = '4'
diff --git a/configure b/configure
index f1773044..46063b5d 100755
--- a/configure
+++ b/configure
@@ -602,6 +602,19 @@ if [ $WITH_DOCS = "1" ] ; then
 fi
 fi
 
+have_gpgconf_socketdir=0
+printf "Checking for gpgconf --{create,remove}-socketdir... "
+if gpgconf --dump-options > /dev/null ; then
+if gpgconf --dump-options | grep -q create-socketdir ; then
+   printf "Yes.\n"
+   have_gpgconf_socketdir=1
+else
+   printf "No.\n"
+fi
+else
+printf "No. (missing or broken gpgconf?)\n"
+fi
+
 libdir_in_ldconfig=0
 
 printf "Checking which platform we are on... "
@@ -1179,6 +1192,9 @@ NOTMUCH_PYTHON=${python}
 # Are the ruby development files (and ruby) available? If not skip
 # building/testing ruby bindings.
 NOTMUCH_HAVE_RUBY_DEV=${have_ruby_dev}
+
+# Recent enough gnupg to support gpgconf --create-socketdir?
+NOTMUCH_HAVE_GPGCONF_SOCKETDIR=${have_gpgconf_socketdir}
 EOF
 
 # Finally, after everything configured, inform the user how to continue.
diff --git a/debian/changelog b/debian/changelog
index 513ddebe..2ff6d5de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+notmuch (0.23.6-1) UNRELEASED; urgency=medium
+
+  * Use gpgconf --create-socketdir to create gpg-agent sockets for
+test suite.
+  * Fix read-after-free bug in `notmuch new`.
+
+ -- David Bremner <brem...@debian.org>  Tue, 21 Feb 2017 07:51:08 -0400
+
 notmuch (0.23.5-1) unstable; urgency=medium
 
   * Remove RUNPATH from /usr/bin/notmuch
diff --git a/lib/database.cc b/lib/database.cc
index f0bfe566..eddb780c 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -652,7 +652,7 @@ parse_references (void *ctx,
ref = _parse_message_id (ctx, refs, );
 
if (ref && strcmp (ref, message_id)) {
-   g_hash_table_insert (hash, ref, NULL);
+   g_hash_table_add (hash, ref);
last_ref = ref;
}
 }
@@ -661,7 +661,7 @@ parse_references (void *ctx,
  * reference to the database.  We should avoid making a message
  * its own parent, thus the above check.
  */
-return last_ref;
+return talloc_strdup(ctx, last_ref);
 }
 
 notmuch_status_t
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 86e792a8..ba1580cd 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -229,10 +229,19 @@ test_fixed=0
 test_broken=0
 test_success=0
 
+
+_shutdown_gpg_agent () {
+if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then
+   gpgconf --kill gpg-agent
+   gpgconf --remove-socketdir
+fi
+}
+
 _exit_common () {
code=$?
trap - EXIT
set +ex
+   _shutdown_gpg_agent
rm -rf "$TEST_TMPDIR"
 }
 
@@ -1276,6 +1285,11 @@ test_init_ () {
 
 . ./test-lib-common.sh || exit 1
 
+# we need the setting of GNUPGHOME in test-lib-common.sh
+if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then
+gpgconf --create-socketdir
+fi
+
 emacs_generate_script
 
 
diff --git a/version b/version
index f6de0017..df47809d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.23.5
+0.23.6


unblock notmuch/0.23.6-1

-- S

Bug#838882: Acknowledgement (jessie-pu: package darktable/1.4.2-1+b3)

[David Bremner]

Lintian points out I want a ':' after Closes.

Bug#838882: jessie-pu: package darktable/1.4.2-1+b3

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

This update would fix CVE-2015-3885 / #786792 in stable.  The CVE has
previously been classified as not severe enough for a DSA.

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

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

-BEGIN PGP SIGNATURE-

iQGcBAEBCAAGBQJX6HNlAAoJEPIClx2kp54sPD8L/RpiaGuf3Qn6Wy7RZboY+5Wp
2m1TKjYzdWUTm46yldmiSuMrvsy39rUR//c+KkJGTAqbCXus5V1sXgFiSGRxiiVt
rMWJd2F3JjdBWbU8uFVTFNj7ihSkV2B6g37tlySbUQaBNZY5y3EkTfMKEo6hL/M+
js/wNIRJkK5+fwIAKyo1kPQR6D3VGps4EJt1xOAoxGC62j3v0J0efgGsuSxVCZNQ
RUqkrkIt3YRgUMrZGJlmLeezOfHI9k3E/1mLKbgqkP+tVF2bMgINbQWvBgDDJsPy
y7As5Pi0I741ekBKfhTx9zrUaXpA2+qu8tEsKJDrSLxsEnAeRGEN2OCtBcHUiLwK
TLRH4Ktq+jVgES3y5eCie3EGCIQTHUxIVeZyQJcFyOlF3z5fepXdIiG2VmPnMsCI
nMkqq3wsgr5rIYovfOCALONmOnV+9DcAsmE7E38WlG7u+79pBbrLY8lSdNx0dNzK
5QuFUQ8pC2qapF3BpufFAGikTiYl3VvyBNSGAvKjoA==
=dFI8
-END PGP SIGNATURE-
diff -Nru darktable-1.4.2/debian/changelog darktable-1.4.2/debian/changelog
--- darktable-1.4.2/debian/changelog	2014-05-04 00:43:43.0 -0300
+++ darktable-1.4.2/debian/changelog	2016-09-25 21:51:51.0 -0300
@@ -1,3 +1,10 @@
+darktable (1.4.2-1+deb8u1) stable; urgency=medium
+
+  * Cherry pick upstream commit 0f809ca5048. Fix for CVE-2015-3885
+(Closes #786792)
+
+ -- David Bremner <brem...@debian.org>  Sun, 25 Sep 2016 21:49:23 -0300
+
 darktable (1.4.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru darktable-1.4.2/debian/patches/0001-LibRaw-address-CVE-2015-3885-fix-integer-overflow-in.patch darktable-1.4.2/debian/patches/0001-LibRaw-address-CVE-2015-3885-fix-integer-overflow-in.patch
--- darktable-1.4.2/debian/patches/0001-LibRaw-address-CVE-2015-3885-fix-integer-overflow-in.patch	1969-12-31 20:00:00.0 -0400
+++ darktable-1.4.2/debian/patches/0001-LibRaw-address-CVE-2015-3885-fix-integer-overflow-in.patch	2016-09-25 21:52:29.0 -0300
@@ -0,0 +1,40 @@
+From b2c17dd163bea76f4817ad726a1e874206969dc1 Mon Sep 17 00:00:00 2001
+From: Roman Lebedev <lebedev...@gmail.com>
+Date: Fri, 22 May 2015 13:18:48 +0300
+Subject: [PATCH] LibRaw: address CVE-2015-3885: fix integer overflow in
+ ljpeg_start()
+
+The fix is not tested.
+Based on ufraw.
+
+(cherry picked from commit 0f809ca5048c71080437da543aefbfde65ebf10a)
+---
+ src/external/LibRaw/internal/dcraw_common.cpp | 8 +---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/external/LibRaw/internal/dcraw_common.cpp b/src/external/LibRaw/internal/dcraw_common.cpp
+index 948ef3f..982ecd7 100644
+--- a/src/external/LibRaw/internal/dcraw_common.cpp
 b/src/external/LibRaw/internal/dcraw_common.cpp
+@@ -630,7 +630,8 @@ void CLASS canon_compressed_load_raw()
+ 
+ int CLASS ljpeg_start (struct jhead *jh, int info_only)
+ {
+-  int c, tag, len;
++  int c, tag;
++  ushort len;
+   uchar data[0x1];
+   const uchar *dp;
+ 
+@@ -641,8 +642,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only)
+   do {
+ fread (data, 2, 2, ifp);
+ tag =  data[0] << 8 | data[1];
+-len = (data[2] << 8 | data[3]) - 2;
+-if (tag <= 0xff00) return 0;
++len = (data[2] << 8 | data[3]);
++if (tag <= 0xff00 || len <= 2) return 0;
++len -= 2;
+ fread (data, 1, len, ifp);
+ switch (tag) {
+   case 0xffc3:
diff -Nru darktable-1.4.2/debian/patches/series darktable-1.4.2/debian/patches/series
--- darktable-1.4.2/debian/patches/series	1969-12-31 20:00:00.0 -0400
+++ darktable-1.4.2/debian/patches/series	2016-09-25 21:52:29.0 -0300
@@ -0,0 +1,2 @@
+# exported from git by git-debcherry
+0001-LibRaw-address-CVE-2015-3885-fix-integer-overflow-in.patch

Bug#821205: jessie-pu: package gitolite3/3.6.1-2

[David Bremner]

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

This is a fix for a missing functionality bug (819841) in jessie.  The
fix has been in several subsequent upstream releases, so it should be
safe, even if it does involve regex-soup.

diff -u gitolite3-3.6.1/debian/changelog gitolite3-3.6.1/debian/changelog
--- gitolite3-3.6.1/debian/changelog
+++ gitolite3-3.6.1/debian/changelog
@@ -1,3 +1,11 @@
+gitolite3 (3.6.1-2+deb8u1) stable; urgency=medium
+
+  * Bug fix: "Git-annex-shell not working", thanks to risca (Closes:
+#819941). Enable repository paths without '~/'. Cherry picked from
+upstream commit, 276cf761de0522a19b0312f4466fc497a2a38b5f
+
+ -- David Bremner <brem...@debian.org>  Sat, 16 Apr 2016 13:16:24 -0300
+
 gitolite3 (3.6.1-2) unstable; urgency=low
 
   [ Rhonda D'Vine ]
only in patch2:
unchanged:
--- gitolite3-3.6.1.orig/src/commands/git-annex-shell
+++ gitolite3-3.6.1/src/commands/git-annex-shell
@@ -18,12 +18,13 @@
 
 # Expect commands like:
 #   git-annex-shell 'configlist' '/~/repo'
+#   git-annex-shell 'configlist' '/repo'
 #   git-annex-shell 'sendkey' '/~/repo' 'key'
 # The parameters are always single quoted, and the repo path is always
 # the second parameter.
 # Further parameters are not validated here (see below).
 die "bad git-annex-shell command: $cmd"
-  unless $cmd =~ m#^(git-annex-shell '\w+' 
')/\~/([0-9a-zA-Z][0-9a-zA-Z._\@/+-]*)('( .*|))$#;
+  unless $cmd =~ m#^(git-annex-shell '\w+' 
')/(?:\~/)?([0-9a-zA-Z][0-9a-zA-Z._\@/+-]*)('( .*|))$#;
 my $start = $1;
 my $repo  = $2;
 my $end   = $3;


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

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

Bug#771966: unblock: ledger/3.1+dfsg1-2

[David Bremner]

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

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Please unblock package ledger

(explain the reason for the unblock here)

Upstream 3.1 contained several usability regressions for the
emacs-mode in binary package ledger-el. These regressions are
reported in bug #769454

Shortly after the release of 3.1 upstream committed several patches to
the emacs support, which I have cherry-picked.

(include/attach the debdiff against the package in testing)

I will attach the debdiff.  Unfortunately the patch export is a bit
sub-optimimal, so I'll also attach a git log, in case that helps.

unblock ledger/3.1+dfsg1-2

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

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

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQGcBAEBCAAGBQJUf5SbAAoJEPIClx2kp54sYPoL/jDUXIBgzd1cKGajStjA1Bto
86hcuplnZUenLY/wFupXYfSvpH+AMUYFJ2og9Z4F7W/lHbdNK8chwWzkl1eWUmNi
qhge/gk9qK0JRxlE3t1Ia+Q9DgKDPwrhA9GGGLAGpkr/cdVOu33+zBuvZkGATDjS
9e0XoAPO2V/ntY9bC2PRp0vpazEiRYWR4dfm3Sr3yUAzKVJRK/pPeV2e1Xb0ewZU
wVERza3cbXAyGYCNlToA82FE0umCjADiRNJaG6iVNjJU44KGw4NRG6RTGm6LTBp2
KsG9JqyaQDIlGfggmj71HUszs1hSWryx0w65O10EykyH4CoUonBbqP6QSLhVngT0
GU0w/yLcQrG9L9ge4ecP7bdlETmihMg9owJuqKcYmIhK3VylzNqntxpax0i8k749
2XPBrb5dSwBJivHdD2LfhQyDIfXPAh/D1Hf5qImPbAVZNcJh9m0UhZ/nHCERG4DU
jRp/wr9MC6dsk1dj3GDkGl7faAtU5BTi0dTf7i1X6Q==
=siMe
-END PGP SIGNATURE-
diff -Nru ledger-3.1+dfsg1/debian/changelog ledger-3.1+dfsg1/debian/changelog
--- ledger-3.1+dfsg1/debian/changelog	2014-10-13 11:04:40.0 +0200
+++ ledger-3.1+dfsg1/debian/changelog	2014-12-03 22:29:20.0 +0100
@@ -1,3 +1,12 @@
+ledger (3.1+dfsg1-2) unstable; urgency=medium
+
+  * Cherry pick patches for Emacs ledger-mode (ledger-el) from
+upstream (Closes: #769454).
+- fix for completely broken M-p in Emacs ledger-mode
+- fixes for syntax highlightling in ledger-mode
+
+ -- David Bremner brem...@debian.org  Wed, 03 Dec 2014 22:25:08 +0100
+
 ledger (3.1+dfsg1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru ledger-3.1+dfsg1/debian/patches/0001-debcherry-fixup-patch.patch ledger-3.1+dfsg1/debian/patches/0001-debcherry-fixup-patch.patch
--- ledger-3.1+dfsg1/debian/patches/0001-debcherry-fixup-patch.patch	2014-10-13 11:04:57.0 +0200
+++ ledger-3.1+dfsg1/debian/patches/0001-debcherry-fixup-patch.patch	2014-12-03 23:24:40.0 +0100
@@ -1,8 +1,24 @@
-From 6bf5613f5adff590fe25f22583c5e09625debcf3 Mon Sep 17 00:00:00 2001
+From 95ad158c8d7fa773dadbaf49d5ce4174bb110e4b Mon Sep 17 00:00:00 2001
 From: David Bremner da...@tethera.net
-Date: Mon, 13 Oct 2014 11:04:57 +0200
+Date: Wed, 3 Dec 2014 23:24:40 +0100
 Subject: [PATCH 1/2] debcherry fixup patch
 
+6f83309 Fix minor navigation bugs.  Prev and next act now properly handle directives and empty lines
+	 - no changes against upstream or conflicts
+aabb590 Fix a bug the caused reconciliation to lock up in an automatic transaction was followed immediately with a virtual transaction on the same account.
+	 - no changes against upstream or conflicts
+2950adb Smash a bug that cause the status on a posting with no amount to bleed into the next line.
+	 - extra changes or conflicts
+66c1721 Add 1 to the end of region for single line directives.  This will force the layout to show across the entire buffer.
+	 - no changes against upstream or conflicts
+0b47567 Handle block comments as blocks rather than individual lines.
+	 - extra changes or conflicts
+2f7d166 Fix navigate bug keeping prev-xact key binding from working.
+	 - extra changes or conflicts
+839f618 Detect the beginning of periodic transactions properly.
+	 - extra changes or conflicts
+7857f98 Improve finding boundaries of elements for fontification.  Also added P for price directives.
+	 - extra changes or conflicts
 88dbf49 disable RPATH for libledger
 	 - extra changes or conflicts
 a5315c6 Don't install files deleted by Debian
@@ -12,9 +28,16 @@
 b55f44e enable tidy mode for texi2pdf
 	 - extra changes or conflicts
 ---
- doc/CMakeLists.txt | 2 +-
- src/CMakeLists.txt | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
+ doc/CMakeLists.txt  |  2 +-
+ lisp/ledger-fontify.el  | 75 +++--
+ lisp/ledger-fonts.el|  7 +
+ lisp/ledger-mode.el | 12 
+ lisp/ledger-navigate.el | 81 -
+ lisp/ledger-occur.el|  2 +-
+ lisp/ledger-regex.el|  5 +--
+ lisp/ledger-xact.el |  2 +-
+ src/CMakeLists.txt  |  4 ++-
+ 9 files changed, 149 insertions(+), 41 deletions(-)
 
 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
 index 96c6d51..d810078 100644
@@ -29,6 +52,330 @@
DEPENDS

Bug#771966: changelog

[David Bremner]

Here's the changelog entry:

ledger (3.1+dfsg1-2) unstable; urgency=medium

  * Cherry pick patches for Emacs ledger-mode (ledger-el) from
upstream (Closes: #769454).
- fix for completely broken M-p in Emacs ledger-mode
- fixes for syntax highlightling in ledger-mode

 -- David Bremner brem...@debian.org  Wed, 03 Dec 2014 22:25:08 +0100

Since I'm sending this message anyway, here is is zack's summary from
the bug:

,
| Here are the issues that seem to work well
| with this version:
| 
|  - I have 4 commodity lines, each gets a different face
|(font-lock-fontify-block will clear all of these)
| 
|  - random transaction are fontified as ledger-font-comment-face
| 
|  - transactions with no amount on the first account line and amount of
|second account line will fontify the second account line as
|  ledger-font-posting-amount-face
| 
|  - transactions with effective date will highlight transaction above with
|ledger-font-xact-highlight-face instead of current transaction
| 
|  - automated transactions are not fontified
`


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/87ppc0jpxu@maritornes.cs.unb.ca

Bug#769662: unblock: gitolite3/3.6.1-2

[David Bremner]

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

Please unblock package gitolite3

The latest upload contains only translation changes, plus an update to
my co-maintainers name.

This would fix the following translation bugs in jessie:

 719509 719777 722125 729824 739792 759876 764599 768271 768455 769447

diffstat:

 debian/po/tr.po  |   88 +++
 gitolite3-3.6.1/debian/changelog |   18 +++
 gitolite3-3.6.1/debian/control   |2 
 gitolite3-3.6.1/debian/po/cs.po  |8 +--
 gitolite3-3.6.1/debian/po/da.po  |   15 +++---
 gitolite3-3.6.1/debian/po/de.po  |3 -
 gitolite3-3.6.1/debian/po/fr.po  |7 +--
 gitolite3-3.6.1/debian/po/it.po  |   16 ---
 gitolite3-3.6.1/debian/po/ja.po  |6 +-
 gitolite3-3.6.1/debian/po/nl.po  |   19 
 gitolite3-3.6.1/debian/po/pt.po  |   15 +++---
 gitolite3-3.6.1/debian/po/ru.po  |   10 ++--
 gitolite3-3.6.1/debian/po/sv.po  |7 +--
 13 files changed, 165 insertions(+), 49 deletions(-)

debdiff | filterdiff --exclude $pkg/debian/po

diff -u gitolite3-3.6.1/debian/changelog gitolite3-3.6.1/debian/changelog
--- gitolite3-3.6.1/debian/changelog
+++ gitolite3-3.6.1/debian/changelog
@@ -1,3 +1,21 @@
+gitolite3 (3.6.1-2) unstable; urgency=low
+
+  [ Rhonda D'Vine ]
+  * The l10n R us release:
+- Updated German translation by myself
+- Updated Japanese by victory (closes: #719509)
+- Updated French by Christian Perrier (closes: #719777)
+- Updated Russian by Yuri Kozlov (closes: #722125)
+- Updated Portuguese by Américo Monteiro (closes: #729824)
+- Updated Danish by Joe Hansen (closes: #739792)
+- New Turkish translation by Mert Dirik (closes: #759876)
+- Updated Dutch by Frans Spiesschaert (closes: #764599)
+- Updated Czech by Michal Simunek (closes: #768271)
+- Updated Swedish by Martin Bagge (closes: #768455)
+- Updated Italian by Beatrice Torracca (closes: #769447)
+
+ -- David Bremner brem...@debian.org  Fri, 14 Nov 2014 21:04:22 +0100
+
 gitolite3 (3.6.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #755784)
diff -u gitolite3-3.6.1/debian/control gitolite3-3.6.1/debian/control
--- gitolite3-3.6.1/debian/control
+++ gitolite3-3.6.1/debian/control
@@ -2,7 +2,7 @@
 Section: vcs
 Priority: optional
 Maintainer: David Bremner brem...@debian.org
-Uploaders: Gerfried Fuchs rho...@debian.org
+Uploaders: Rhonda D'Vine rho...@debian.org
 Build-Depends: quilt, debhelper
 Build-Depends-Indep: po-debconf
 Standards-Version: 3.9.3
diff -u gitolite3-3.6.1/debian/po/cs.po gitolite3-3.6.1/debian/po/cs.po
diff -u gitolite3-3.6.1/debian/po/da.po gitolite3-3.6.1/debian/po/da.po
diff -u gitolite3-3.6.1/debian/po/de.po gitolite3-3.6.1/debian/po/de.po
diff -u gitolite3-3.6.1/debian/po/fr.po gitolite3-3.6.1/debian/po/fr.po
diff -u gitolite3-3.6.1/debian/po/it.po gitolite3-3.6.1/debian/po/it.po
diff -u gitolite3-3.6.1/debian/po/ja.po gitolite3-3.6.1/debian/po/ja.po
diff -u gitolite3-3.6.1/debian/po/nl.po gitolite3-3.6.1/debian/po/nl.po
diff -u gitolite3-3.6.1/debian/po/pt.po gitolite3-3.6.1/debian/po/pt.po
diff -u gitolite3-3.6.1/debian/po/ru.po gitolite3-3.6.1/debian/po/ru.po
diff -u gitolite3-3.6.1/debian/po/sv.po gitolite3-3.6.1/debian/po/sv.po
only in patch2:
unchanged:


unblock gitolite3/3.6.1-2

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

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


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/20141115121828.10216.59899.report...@maritornes.cs.unb.ca

Bug#726874: pu: package darktable/1.0.4-1+deb7u1

[David Bremner]

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

I have prepared a targeted upload which closes two CVEs.

These are relatively mild security bugs in the embedded copy of libraw
(which cannot be trivially removed, alas). 

A debdiff is attached.  I believe the risk of the update is relatively
low, since according to darktable upstream only a few code paths
actually use libraw. On the other hand, I did have to monkey with the
patch a bit by hand to get it to apply, since libraw upstream provided
a patch against a later version.


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

Kernel: Linux 3.10-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru darktable-1.0.4/debian/changelog darktable-1.0.4/debian/changelog
--- darktable-1.0.4/debian/changelog	2013-02-13 09:31:21.0 -0400
+++ darktable-1.0.4/debian/changelog	2013-10-16 19:43:33.0 -0300
@@ -1,3 +1,11 @@
+darktable (1.0.4-1+deb7u2) wheezy; urgency=low
+
+  * Port libraw commit c4e374ea. This one commit is a fix for two bugs.
+- CVE-2013-1438 (Closes: #721233).
+- CVE-2013-1439 (Closes: #721339).
+
+ -- David Bremner brem...@debian.org  Wed, 16 Oct 2013 19:42:55 -0300
+
 darktable (1.0.4-1+deb7u1) testing; urgency=low
 
   * Flickurl will not ship with wheezy (see #700150), so remove support
diff -Nru darktable-1.0.4/debian/patches/0001-partial-manual-backport-of-additional-data-checks-ba.patch darktable-1.0.4/debian/patches/0001-partial-manual-backport-of-additional-data-checks-ba.patch
--- darktable-1.0.4/debian/patches/0001-partial-manual-backport-of-additional-data-checks-ba.patch	1969-12-31 20:00:00.0 -0400
+++ darktable-1.0.4/debian/patches/0001-partial-manual-backport-of-additional-data-checks-ba.patch	2013-10-16 19:45:45.0 -0300
@@ -0,0 +1,187 @@
+From e8961dfbf9a0176dbc64e329117031add060beb3 Mon Sep 17 00:00:00 2001
+From: David Bremner brem...@debian.org
+Date: Mon, 14 Oct 2013 18:17:50 -0300
+Subject: [PATCH] partial manual backport of additional data checks backported
+ from 0.15.4
+
+This corresponds to upstream commit c4e374e
+
+changes to libraw_datastream.cpp were ignored, as that file does not
+exist in this version.
+---
+ src/external/LibRaw/internal/dcraw_common.cpp | 72 ++-
+ 1 file changed, 60 insertions(+), 12 deletions(-)
+
+diff --git a/src/external/LibRaw/internal/dcraw_common.cpp b/src/external/LibRaw/internal/dcraw_common.cpp
+index 7684690..ec6e7ca 100644
+--- a/src/external/LibRaw/internal/dcraw_common.cpp
 b/src/external/LibRaw/internal/dcraw_common.cpp
+@@ -653,7 +653,10 @@ void CLASS ljpeg_end (struct jhead *jh)
+ int CLASS ljpeg_diff (ushort *huff)
+ {
+   int len, diff;
+-
++#ifdef LIBRAW_LIBRARY_BUILD
++  if(!huff)
++throw LIBRAW_EXCEPTION_IO_CORRUPT;
++#endif
+   len = gethuff(huff);
+   if (len == 16  (!dng_version || dng_version = 0x101))
+ return -32768;
+@@ -667,6 +670,8 @@ int CLASS ljpeg_diff (ushort *huff)
+ int CLASS ljpeg_diff_new (LibRaw_bit_buffer bits, LibRaw_byte_buffer* buf,ushort *huff)
+ {
+   int len, diff;
++  if(!huff || !buf)
++throw LIBRAW_EXCEPTION_IO_CORRUPT;
+ 
+   len = bits._gethuff_lj(buf,*huff,huff+1);
+   if (len == 16  (!dng_version || dng_version = 0x101))
+@@ -803,6 +808,10 @@ void CLASS lossless_jpeg_load_raw()
+ 
+ 
+   if (!ljpeg_start (jh, 0)) return;
++#ifdef LIBRAW_LIBRARY_BUILD
++  if(jh.wide1 || jh.high1 || jh.clrs1 || jh.bits 1)
++throw LIBRAW_EXCEPTION_IO_CORRUPT;
++#endif
+   jwide = jh.wide * jh.clrs;
+ 
+ #ifdef LIBRAW_LIBRARY_BUILD
+@@ -819,13 +828,18 @@ void CLASS lossless_jpeg_load_raw()
+   }
+
+   slices = slicesWcnt * jh.high;
++  if(!slices)
++throw LIBRAW_EXCEPTION_IO_CORRUPT;
+   offset = (unsigned*)calloc(slices+1,sizeof(offset[0]));
+-  
++
+   for(slice=0;sliceslices;slice++)
+   {
+   offset[slice] = (t_x + t_y * raw_width)| (t_s28);
+-  if(offset[slice]  0x0fff = raw_width * raw_height)
++  if((offset[slice]  0x0fff) = raw_width * raw_height)
++{
++  free(offset);
+   throw LIBRAW_EXCEPTION_IO_BADFILE; 
++}
+   t_y++;
+   if(t_y == jh.high)
+   {
+@@ -877,11 +891,27 @@ void CLASS lossless_jpeg_load_raw()
+   pixno++;
+   if (0 == --pixelsInSlice)
+   {
++if(slice  slices)
++  {
++free(offset);
++throw LIBRAW_EXCEPTION_IO_CORRUPT;
++  }
+   unsigned o = offset[slice++];
+   pixno = o  0x0fff;
+   pixelsInSlice = slicesW[o28];
+   }
+ #endif
++
++  if(rowraw_height)
++#ifdef LIBRAW_LIBRARY_BUILD
++  {
++free(offset);
++throw LIBRAW_EXCEPTION_IO_CORRUPT;
++  }
++#else

Bug#700318: Updated patch

[David Bremner]

I reworded to the changelog entry a bit.


From 88992669a559d8e4ab6f34a18ae71ffb4cf5d904 Mon Sep 17 00:00:00 2001
From: David Bremner brem...@debian.org
Date: Tue, 12 Feb 2013 08:44:07 -0400
Subject: [PATCH] remove flickurl for wheezy

---
 debian/changelog |8 
 debian/control   |2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 95878b0..fe85a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+darktable (1.0.4-1+deb7u1) testing; urgency=low
+
+  * Flickurl will not ship with wheezy (see #700150), so remove support
+from darktable. Thanks to Ivo De Decker for the report/patch
+(Closes: #700314).
+
+ -- David Bremner brem...@debian.org  Tue, 12 Feb 2013 08:38:19 -0400
+
 darktable (1.0.4-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 5b55f87..95875cb 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (= 7.0.50~), cmake,
  libtiff-dev, libexiv2-dev, intltool, libglade2-dev,
  libsqlite3-dev, libopenexr-dev, libgphoto2-2-dev,
  libcurl4-gnutls-dev|libcurl-dev, libdbus-glib-1-dev, libgnome-keyring-dev,
- librsvg2-dev, libflickcurl-dev
+ librsvg2-dev,
 Standards-Version: 3.9.3
 Homepage: http://darktable.sourceforge.net/
 Vcs-Git: git://git.debian.org/pkg-phototools/darktable.git
-- 
1.7.10.4

Bug#700318: I'll do the upload.

[David Bremner]

Hi Ivo;

Thanks for the patch, and getting the RT to approve. Unless there is
some reason this whole process has to happen in 24 hours, I'd prefer to
test the build and upload it myself.

For future reference, it would have saved me a little trouble if you
CCed the maintained when filing this unblock bug.

d


-- 
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/87bobp90p9.fsf@zancas.localnet

Bug#692449: unblock: bliss/0.72-4

[David Bremner]

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

Please unblock package bliss

There are two simple fixes (one line in -3 and two lines in -4).

The RCish fix is in 0.72-4. In versions 0.72-2 and 0.72-3, if the user
neglects to define the preprocessor symbol BLISS_USE_GMP when
compiling their code, it will build successfuly but segfault at
runtime.  This is fixed in -4. The fix in -3 is needed for this to
work transparently.

bliss is a leaf package in Wheezy, but I've already had bug reports
(on the bugtracker of an upstream project) for -3.

Here is the debdiff, less the changelog stanzas.

diff -u bliss-0.72/debian/Makefile.shlib bliss-0.72/debian/Makefile.shlib
--- bliss-0.72/debian/Makefile.shlib
+++ bliss-0.72/debian/Makefile.shlib
@@ -15,7 +15,7 @@
$(CC) -fPIC -c $(CFLAGS) -o $@ $
 
 libbliss.so: $(GMPSHOBJS)
-   $(CC) -shared -Wl,-soname,$(SONAME) -o $(SOFULL) $^
+   $(CC) -shared -Wl,-soname,$(SONAME) $(LIB) -o $(SOFULL) $^
ln -sf $(SOFULL) $(SONAME)
ln -sf $(SOFULL) libbliss.so
 
only in patch2:
unchanged:
--- bliss-0.72.orig/defs.hh
+++ bliss-0.72/defs.hh
@@ -23,6 +23,8 @@
   along with Foobar.  If not, see http://www.gnu.org/licenses/.
 */
 
+#undef BLISS_USE_GMP
+#define BLISS_USE_GMP
 
 namespace bliss {
 


unblock bliss/0.72-4

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

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


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

proposed update for highlight in squeeze.

[David Bremner]

Hi Team;

Bug #662748 results from a broken postrm in squeeze. Unfortunately the
usual kill the postrm in the new preinst trick won't help here, since
the bug is about manual removal.

In fact the underlying problem is more serious than described in the
bug. apt-get remove highlight removes a file belonging to
highlight-common, and hence breaks libhighlight-perl if the user has
that installed. Apparently people haven't encountered this very often,
luckily, perhaps because it does not manifest by upgrading, only by
manual removal of highlight (but leaving highlight-common).  

The same fix has been applied sid, but formally it can't be tested
there. I did test in a squeeze chroot, remove, distupgrade works
smoothly with this fix. Also, I verified that (surprise!) the conffile
belonging to highlight-common is no longer deleted by removing highlight.

Debdiff follows, 

diff -Nru highlight-2.16/debian/changelog highlight-2.16/debian/changelog
--- highlight-2.16/debian/changelog 2010-04-02 09:04:24.0 -0300
+++ highlight-2.16/debian/changelog 2012-03-07 09:40:18.0 -0400
@@ -1,3 +1,11 @@
+highlight (2.16-1+squeeze1) squeeze; urgency=low
+
+  * remove faulty postrm; this script caused a file owned by
+highlight-common to be removed when highlight is removed.
+(Closes: #662748).
+
+ -- David Bremner brem...@debian.org  Wed, 07 Mar 2012 09:17:12 -0400
+
 highlight (2.16-1) unstable; urgency=low
 
   * New Upstream Version
diff -Nru highlight-2.16/debian/postrm highlight-2.16/debian/postrm
--- highlight-2.16/debian/postrm2010-04-02 09:04:24.0 -0300
+++ highlight-2.16/debian/postrm1969-12-31 20:00:00.0 -0400
@@ -1,31 +0,0 @@
-#!/bin/sh
-# postrm script for highlight
-#
-# see: dh_installdeb(1)
-set -e
-
-
-CONFDIR=/etc/highlight
-if [ -d $CONFDIR ] 
-then
-#DEBHELPER#
-   FILES=`ls $CONFDIR |xargs`
-   case $1 in
-   purge|remove)
-   for f in $FILES
-do
-   file=$CONFDIR/$f
-   if [ -f $file ]
-   then
-   rm -f $file
-   fi
-
-done
-rm -rf $CONFDIR
-   ;;
-   esac
-fi
-
-exit 0
-
-






pgp8ZAn4ApcrI.pgp
Description: PGP signature

Re: RFS: hugs98 (NMU, RC bugfix)

[David Bremner]

On Sun, 16 Jan 2011 18:08:13 +0100, Felix Geyer debfx-...@fobos.de wrote:
 I am looking for a sponsor for my NMU of the package hugs98.
 
 The upload would fix this RC bug: http://bugs.debian.org/608220

 http://mentors.debian.net/debian/pool/main/h/hugs98/hugs98_98.200609.21-5.2.dsc
 

Hi Felix;

Please discuss with the release team (in CC) whether your upload is OK
for squeeze. If they approve it I (or someone else) can sponsor the NMU.

Release team: diffstat is big because autoconf rewrites all of 
configure. Other than that, the interesting change is 

--- hugs98-98.200609.21/debian/rules
+++ hugs98-98.200609.21/debian/rules
@@ -18,6 +18,9 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+# Ensure that LDFLAGS is empty as the build system can't handle commas.
+LDFLAGS :=
+
 CONFIG_DIRS := . packages/network/ packages/Cabal/tests/HSQL/ \
packages/ALUT/ packages/GLUT/ packages/OpenAL/ \
packages/OpenGL/ src/unix/ 


d


pgpcGY9KuXx5q.pgp
Description: PGP signature

clisp install failure is a powerpc64 only problem?

[David Bremner]

Hi; 

It seems like the install problems for clisp might only be happening on
powerpc64. There are several reports of installation success on powerpc,
and I verified myself on qemu-system-powerpc.

Debian does not have any powerpc64 porterbox, so this is difficult for me
to test. 

I'm not sure what this means from the point of view of Squeeze
release. It does seem a bit odd to pull clisp from the release based on
bugs which we cannot duplicate on Debian machines.  On the other hand,
officially there is no separate powerpc64 architecture, and having
only 32 bit supported is hardly desirable.

Of course, if someone can duplicate the bug running a 32-bit kernel that
changes things.  I still think we probably need a powerpc64 porterbox if
powerpc is going to continue as a release architecture post squeeze.

David


pgpMlVaGxMmuO.pgp
Description: PGP signature

Bug#605310: unblock: libmojomojo-perl/1.01+dfsg-1

[David Bremner]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: freeze-exception


Please unblock package libmojomojo-perl

Jonathan Yu has repacked the upstream tar ball to remove some .swf
files that can not be regenerated using tools in Debian main. This
closes RC bug #591974. It also closes important bug #591973, although
this is missing from the changelog.

 MANIFEST   |3 -
 debian/NEWS|   13 +++
 debian/changelog   |   23 +
 debian/control |  166 ++--
 debian/copyright   |4 +
 debian/libmojomojo-perl.examples   |1 +
 debian/repack.local|4 +
 debian/repack.stub |   82 ++
 debian/watch   |6 +-
 root/static/flash/swfupload.swf|  Bin 11932 - 0 bytes
 root/static/flash/swfupload_f8.swf |  Bin 7835 - 0 bytes
 root/static/flash/swfupload_f9.swf |  Bin 9506 - 0 bytes
 12 files changed, 216 insertions(+), 86 deletions(-)

The change in debian/control is mainly sorting the build depends.

unblock libmojomojo-perl/1.01+dfsg-1

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

Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash



-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/20101128204010.19887.69570.report...@zancas.localnet

Re: advice for syncevolution in squeeze

[David Bremner]

On Sun, 14 Nov 2010 17:38:56 +, Adam D. Barratt 
a...@adam-barratt.org.uk wrote:
   - Nokia E55: needs absolute alarm times (MBC #1657)
   - Nokia phones: alarm times in UTC, sending PHOTO (BMC #1657, #5860)
 
 Does the latter of these not render the former redundant?  The comment
 in the generic Nokia fix mentions that the alarm time issue was first
 seen on the E55 and the fix appears to be the same in both.

I refreshed the packages at 
  
  
http://pivot.cs.unb.ca/debian/pool/main/s/syncevolution/syncevolution_1.0+ds1~beta2a-2.dsc

and on git.debian.org

My main motivation in doing the refresh was working through some build
problems in dirty chroots.  Based on Patrick's comments, I removed the
first Nokia patch.  I also included a 4 line patch for a FTBFS
discovered by Yves-Alexis Perez, although the failure itself seems hard
to duplicate.  A second build failure (related to bluez gdbus) occurs
with glib  2.24 (know to fail for 2.26 and 2.27). Unfortunately the
upstream patch for this is bigish, and drags in a bunch of unrelated
changes. Since glib is fixed (I hope!)  for squeeze, I decided just to
add a versioned depends on glib.

David




pgpT6NCZqT5fc.pgp
Description: PGP signature

Re: advice for syncevolution in squeeze

[David Bremner]

On Sat, 23 Oct 2010 17:08:22 +0100, Adam D. Barratt 
a...@adam-barratt.org.uk wrote:
 On Sun, 2010-10-10 at 14:33 -0300, David Bremner wrote:
 
 My preference would be to see if the fixes for data loss, crashes, etc.
 are backportable to the current version in the archive.  A quick look
 through the git log shows many more commits than I'd imagine correspond
 to the fixes mentioned but I obviously don't know the codebase well
 enough to tell if a sequence of commits might correspond to a single
 fix.

I have prepared a potential upload for testing-proposed-updates
cherry-picking most but not all of the fixes mentioned in Patrick's
previous messages. 

Changes: 
 syncevolution (1.0+ds1~beta2a-2) testing; urgency=low
 .
   * Fixes cherry-picked from upstream releases 1.0 and 1.1 for Debian Squeeze.
 - Nokia phones: avoid data loss in two-way sync due to X-EVOLUTION-UI-SLOT 
(MBC #2566
 - Mobical: add workaround for 'alarm' in vCalendar1.0 (MB#10458)
 - e_cal_check_timezones(): broken in EDS 2.30 due to change of error code
   (GNOME Bugzilla #611558, Moblin Bugzilla #9820)
 - Nokia 7120C: fix for enabling TZ (MB #9907)
 - Nokia E55: needs absolute alarm times (MBC #1657)
 - Nokia phones: alarm times in UTC, sending PHOTO (BMC #1657, #5860)
 - gtk-ui: preserve configuration names on save (BME #1266)
 - syncevo-dbus-server: first sync was done without libical time zone info 
(MBC #2435)
 - lcs: fixed out-of-bounds array access (MBC #1007)
 - Funambol, Memotoo: preserve meeting series when receiving update for 
detached recurrence
   (MBC #1916)

A couple of the omitted fixes are still serious, but I wasn't confident
with the level of editing I had to do to get the patches to apply, so I
decided to err on the side of not making things worse.

Here is a diffstat 

 changelog   |   18 
 patches/0001-EDS-compatibility-added-several-recurrence-ID-relate.patch |  115 
+
 patches/0002-Funambol-Memotoo-preserve-meeting-series-when-receiv.patch |   57 
++
 patches/0003-lcs-fixed-out-of-bounds-array-access-MBC-1007.patch|   45 
++
 patches/0004-syncevo-dbus-server-first-sync-was-done-without-libi.patch |   39 
++
 patches/0005-gtk-ui-preserve-configuration-names-on-save-BME-1266.patch |   50 
++
 patches/0006-Nokia-phones-alarm-times-in-UTC-sending-PHOTO-BMC-16.patch |   45 
++
 patches/0007-Nokia-E55-needs-absolute-alarm-times-MBC-1657.patch|   34 
+
 patches/0008-Nokia-7120C-fix-for-enabling-TZ-MB-9907.patch  |   23 
+
 patches/0009-e_cal_check_timezones-broken-in-EDS-2.30-due-to-chan.patch |   33 
+
 patches/0010-Calendar-add-workaround-for-alarm-in-vCalendar1.0-MB.patch |   44 
++
 patches/0011-Cal-Mobical-apply-the-workaround-only-for-Mobical-MB.patch |   84 

 patches/0012-Nokia-phones-avoid-data-loss-in-two-way-sync-due-to-.patch |  193 
++
 patches/0013-disable-stopping-the-build-in-case-missing-translati.patch |   24 
+
 patches/series  |   13 

Except for changelog, all changes in debian/patches (the package was
already 3.0 (quilt) so no packaging changes were needed).

The patches taken together make the following changes to upstream source:

 autogen.sh |2 +
 src/backends/evolution/EvolutionCalendarSource.cpp |   27 +--
 src/backends/evolution/e-cal-check-timezones.c |3 +-
 src/backends/file/FileSyncSource.h |9 ++
 src/gtk-ui/sync-config-widget.c|1 +
 src/gtk-ui/sync-ui.c   |5 +++-
 src/syncevo-dbus-server.cpp|8 ++
 src/syncevo/SyncContext.cpp|2 +
 src/syncevo/configs/datatypes/01vcard-profile.xml  |   20 +++---
 .../remoterules/00_have_evolution_ui_slot.xml  |5 +++
 .../configs/remoterules/00_need_tz_in_event.xml|1 +
 .../configs/remoterules/00_syncevolution.xml   |7 +
 src/syncevo/configs/remoterules/all.xml|5 +++
 .../configs/remoterules/client/01mobical.xml   |8 ++
 src/syncevo/configs/remoterules/evolution.xml  |1 +
 .../configs/remoterules/server/00_nokia.xml|   19 ++
 src/syncevo/configs/remoterules/server/46_E55.xml  |   14 ++
 src/syncevo/configs/scripting/11calendar.xml   |   18 +
 src/syncevo/eds_abi_wrapper.cpp|6 
 src/syncevo/eds_abi_wrapper.h  |   12 +
 src/syncevo/lcs.h  |   16 +++-

You can dget a source package from

http://pivot.cs.unb.ca/debian/pool/main/s/syncevolution/syncevolution_1.0+ds1~beta2a-2.dsc

You can also inspect the changes in git. debcheckout syncevolution;
there are two relevant branches. Branch squeeze is the source package;
branch patch-queue/squeeze has

Re: advice for syncevolution in squeeze

[David Bremner]

On Mon, 08 Nov 2010 10:05:15 +0100, Patrick Ohly patrick.o...@intel.com wrote:
 On So, 2010-11-07 at 22:05 +, Adam D. Barratt wrote:

  I'm not sure I'm going to like the answer, given the commit count you
  mention below, but how large is the diff between what's currently in
  squeeze and the proposed 1.0 packages?

Just upstream changes:

% git diff --shortstat syncevolution-1-0-beta-2a syncevolution-1-0

178 files changed, 26314 insertions(+), 8971 deletions(-)

About half of this is translations. Detailed diffstat is at the end.

 
 Not sure about the Debian versions. But the Synthesis engine hasn't
 changed that much recently, so the one from experimental should be fine
 for SyncEvolution 1.0.1.
 

I guess the version of libsynthesis in testing is also too old
(3.4.0.5+something). The difference between that and the version shipped
with syncevolution 1.0 (ignoring file renames) is

  74 files changed, 3701 insertions(+), 1008 deletions(-)


David

Here is the detailed diffstat for syncevolution, with translations
removed. It _looks_ like I see more differences than Patrick, I'm not
sure why.

 .gitignore |3 +-
 HACKING|   74 +
 Makefile-gen.am|   51 +-
 NEWS   |  283 +++
 README |  856 -
 README.packagers   |5 +-
 README.rst |  631 +++
 configure-post.in  |7 +-
 configure-pre.in   |  103 +-
 dbus-timeout.patch |   58 -
 gen-autotools.sh   |   94 +-
 src/Makefile-gen.am|  121 +-
 src/backends/evolution/EvolutionCalendarSource.cpp |   41 +-
 .../evolution/EvolutionCalendarSourceRegister.cpp  |3 +-
 src/backends/evolution/EvolutionContactSource.cpp  |   16 +-
 src/backends/evolution/e-cal-check-timezones.c |3 +-
 src/backends/file/FileSyncSource.cpp   |3 +-
 src/backends/file/FileSyncSourceRegister.cpp   |   12 +
 src/backends/sqlite/SQLiteContactSource.cpp|1 +
 src/backends/sqlite/SQLiteContactSource.h  |1 +
 src/client-test-app.cpp|   22 +-
 src/dbus/Makefile.am   |2 +
 src/dbus/interfaces/Makefile.am|   30 +-
 src/dbus/interfaces/README |9 +
 src/dbus/interfaces/dbus-introspect-docs.dtd   |   32 +
 src/dbus/interfaces/spec-strip-docs.xsl|1 +
 src/dbus/interfaces/spec-to-docbook.xsl|  271 ++-
 src/dbus/interfaces/syncevo-server-full.xml|  175 ++-
 src/dbus/interfaces/syncevo-session-full.xml   |   45 +-
 src/dbus/qt/dbustypes.cpp  |   78 +
 src/dbus/qt/dbustypes.h|   97 +
 src/dbus/syncevo-dbus-types.h  |1 +
 src/dbus/syncevo-server.c  |6 +-
 src/dbus/test.c|1 -
 src/gdbus/gdbus-cxx-bridge.h   |  587 +-
 src/gdbus/mainloop.c   |   12 +-
 src/gtk-ui/Makefile.am |3 +-
 src/gtk-ui/close.png   |  Bin 631 - 0 bytes
 src/gtk-ui/close_hover.png |  Bin 767 - 0 bytes
 src/gtk-ui/mux-icon-button.c   |  283 ---
 src/gtk-ui/mux-icon-button.h   |   71 -
 src/gtk-ui/mux-window.c|  630 ---
 src/gtk-ui/mux-window.h|   92 -
 src/gtk-ui/settings.png|  Bin 1094 - 0 bytes
 src/gtk-ui/settings_hover.png  |  Bin 1389 - 0 bytes
 src/gtk-ui/sync-config-widget.c|  439 +++--
 src/gtk-ui/sync-config-widget.h|2 +
 src/gtk-ui/sync-ui.c   |  627 +--
 src/gtk-ui/sync-ui.rc  |   12 +-
 src/gtk-ui/ui.glade| 1349 +++---
 src/syncevo-dbus-server-startup.sh.in  |3 +
 src/syncevo-dbus-server.cpp| 1984 +++-
 src/syncevo-dbus-server.desktop.in |6 +
 src/syncevo/Cmdline.cpp|  432 -
 src/syncevo/Cmdline.h  |   89 +-
 src/syncevo/ConfigNode.cpp |   43 +
 src/syncevo/DataBlob.h |   63 +
 src/syncevo/FileConfigNode.cpp |   18 -
 src/syncevo/FileDataBlob.cpp   |   71 +
 src/syncevo/FileDataBlob.h |   61 +
 src/syncevo/IniConfigNode.cpp  |  375 

Re: advice for syncevolution in squeeze

[David Bremner]

On Sun, 24 Oct 2010 13:46:58 +0200, Patrick Ohly patrick.o...@intel.com wrote:

 If 1.0 + bug fixes is not acceptable for Debian Squeeze, then I suggest
 that direct synchronization with phones gets disabled entirely in the
 Debian Squeeze build by turning off Bluetooth support. Users who want
 that need to find a backport of SyncEvolution.

This is of course easy to do.  And I don't mind doing the backport.

 FWIW, I still think that 1.0 + bug fixes is the better choice for
 Squeeze. It has been in use for a while now and arguably is better than
 beta 2, with no known regressions whatsoever. 

I'm also willing to do this if the release team approves it. One thing I
(belatedly) realized is that we need to think about not only the changes
introduced by a new upstream version of syncevolution (some 360 commits
between 1.0beta2 and 1.0, about 80 of these are translations) but also
in libsynthesis (another 77 commits).

David


-- 
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/878w1lg2av@rocinante.cs.unb.ca

advice for syncevolution in squeeze

[David Bremner]

I need some advice for how to proceed for syncevolution.  Around the
time of the freeze, I asked on the upstream list for any serious issues
with the debian packages, and not receiving any reports, decided to
stick with the version in squeeze. However, upstream has since brought
to my attention
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582376#31) that
several fairly severe upstream have been fixed in more recent versions.
I have looked at the first 3 or 4, and they do involve data loss.

To complicate things further, in the mean time we have made a split into
5 binary packages from 2 (one of the 5 being debugging symbols).

Would either of the following be acceptable for a freeze exception:

1) A new upstream release with the new packaging?

2) A new upstream release (1.0.99.7) with the old packaging?  

   Some of the current packaging would have to be backported in any case
   to keep up with changing build-deps, but obviously I could try to
   minimize the packaging changes.

I suppose the diff between upstream versions is pretty enormous, but
there are a lot of bugs fixed.

David

P.S. I can hear Julien sighing already :)


pgpsJXdMG0SvR.pgp
Description: PGP signature

Re: unblock request for libjifty-pluginchart-perl_1.01+dfsg-1

[David Bremner]

On Sat, 09 Oct 2010 10:03:46 +0100, Adam D. Barratt 
a...@adam-barratt.org.uk wrote:
 On Fri, 2010-10-08 at 23:05 -0300, David Bremner wrote:
  I've removed the non-free (and it turns out, non-essential) .swf files
  From libjifty-chart-plugin-perl.  This fixes the RC bug 591976.
 
 Those changes look ok; thanks.
 

Uploaded to unstable.

Thanks release team for all your hard work, 

David



-- 
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/87fwwfi546@rocinante.cs.unb.ca

unblock request for libjifty-pluginchart-perl_1.01+dfsg-1

[David Bremner]

Dear Release Team;

I've removed the non-free (and it turns out, non-essential) .swf files
From libjifty-chart-plugin-perl.  This fixes the RC bug 591976.

The package had accumulated a certain amount of tidying in pkg-perl svn
since the last upload.  I'm writing to see if you OK with this, or if I
should backport my changes?

Here is the changelog entries since the last upload

   [ David Bremner ]
   * Repacked upstream tarball. Removed XMLSWF and corresponding renderer
 module. (Closes: #591976)
   * Remove MochiKit.js during repack instead of after install
   * Bump Standards-Version (no other changes)
 .
   [ Salvatore Bonaccorso ]
   * debian/control: Changed: Replace versioned (build-)dependency on
 perl (= 5.6.0-{12,16}) with an unversioned dependency on perl (as
 permitted by Debian Policy 3.8.3).
 .
   [ Ryan Niebur ]
   * Update jawnsy's email address
 .
   [ gregor herrmann ]
   * debian/watch: adjust uversionmangle to newer uscan/PET.

Here is a diffstat

 MANIFEST   |   21 -
 debian/changelog   |   22 +
 debian/control |6 +-
 debian/copyright   |7 +-
 debian/repack.local|4 +
 debian/repack.stub |   82 +
 debian/rules   |5 -
 debian/watch   |4 +-
 lib/Jifty/Plugin/Chart/Renderer/XMLSWF.pm  |  173 -
 share/web/static/flash/xmlswf/charts.swf   |  Bin 29311 - 0 bytes
[15 more deletions snipped]
 .../static/flash/xmlswf/charts_library/scno.swf|  Bin 7209 - 0 bytes
 share/web/static/js/MochiKit/MochiKit.js   | 4802 

Comments:
- The removal of MochiKit.js during the repack is not necessary for the
  fix, and can be reverted.

- repack.stub looks big, but is pkg-perl boilerplate, and about 75 lines
  of it is doc.



pgp1xa2eZDzUa.pgp
Description: PGP signature

Request for freeze exception for maxima

[David Bremner]

Dear Release Team;

maxima 5.13.0-3.2 was an NMU instigated by me, that used SBCL to build
maxima.  This fixed several (important and serious) bugs, but left
maxima with a tight versioned dependency on sbcl, and restricted
maxima to building on alpha, amd64, i386, mips, mipsel, powerpc, and
sparc.

maxima 5.15.0-2 is a version by the maintainer Camm McGuire using GCL
to build.  This version contains fixes for the same bugs, but builds
(in principle; alpha buildd is still catching up) on all of the
non-red architectures on
http://release.debian.org/lenny/arch_qualify.html.

Because of better portability, and the fact that the new version is
not an NMU, I would like to request a freeze exception for maxima.
Camm is in agreement, but is offline for a couple of a weeks.  I
hesitate to post his (entirely innocuous) private email, but I can if
that is necessary.

David
[EMAIL PROTECTED] / bremner @  IRC


pgph5P2eao5JD.pgp
Description: OpenPGP Digital Signature