Merge ~sergiodj/ubuntu/+source/re2c:merge-re2c-1.3-2 into ubuntu/+source/re2c:debian/sid

[Sergio Durigan Junior]

This is a simple merge, and the package became a sync.

Upstream incorporated the fix for CVE-2020-11958, which is the only delta we had.

Even though it's not necessary, I created a PPA for it:

https://launchpad.net/~sergiodj/+archive/ubuntu/re2c-merge

autopkgtest is still happy:

autopkgtest [17:12:05]: test upstream-runtests: -----------------------]
autopkgtest [17:12:05]: test upstream-runtests: - - - - - - - - - - results - - - - - - - - - -
upstream-runtests PASS
autopkgtest [17:12:06]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-runtests PASS

[Lucas Kanashiro (lucaskanashiro)]

Do you want me to sync this package on your behalf? If yes I'll run this command:

$ syncpackage --verbose --sponsor=sergiodj --force --debian-version=1.3-2 re2c

This wiki page might be useful for you on future sync requests:

https://wiki.ubuntu.com/SyncRequestProcess

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Thursday, July 09 2020, Lucas Kanashiro wrote:

> Do you want me to sync this package on your behalf? If yes I'll run this command:
>
> $ syncpackage --verbose --sponsor=sergiodj --force --debian-version=1.3-2 re2c

Yes, please!

> This wiki page might be useful for you on future sync requests:
>
> https://wiki.ubuntu.com/SyncRequestProcess

Thank you.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Lucas Kanashiro (lucaskanashiro)]

Done:

$ syncpackage --verbose --sponsor=sergiodj --force --debian-version=1.3-2 re2c
Loading KWallet
Loading SecretService
Loading Windows
Loading chainer
Loading macOS
Source re2c -> groovy/Proposed: current version 1.3-1ubuntu0.1, new version 1.3-2
New changes:
re2c (1.3-2) unstable; urgency=high

  [ JCF Ploemen (jcfp) ]
  * Control: add build-dep on python3-pygments, for use by rst2man.
  * Patches:
    + add 01, backport of the upstream fix for a heap-based buffer
      overflow in Scanner::fill in parse/scanner.cc.
      (CVE-2020-11958; closes: #963158)
    + add 02, fix for a manpage spelling error.
  * Rules: switch dh_auto_test override to execute_after.
  * Lintian: remove override for override_dh_auto_test-does-not-
    check-DEB_BUILD_OPTIONS, no longer needed.
  * Bump compat level to 13 (from 12; no further changes).

  [ Debian Janitor ]
  * Set upstream metadata fields: Bug-Submit.
  * Update standards version to 4.5.0, no changes needed.

 -- JCF Ploemen (jcfp) <email address hidden> Tue, 23 Jun 2020 14:18:11 +0000
Sponsoring this sync for Sergio Durigan Junior (sergiodj)
Sync this package [y|N]? y
Request succeeded; you should get an e-mail once it is processed.

diff --git a/debian/changelog b/debian/changelog
index f450513..623b211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+re2c (1.3-2ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable.
+  * Dropped changes, included in Debian:
+    - SECURITY UPDATE: Heap-based buffer overflow
+      + debian/patches/CVE-2020-11958.patch: fix calculation
+        of the shift offset in src/parse/scanner.cc.
+      + CVE-2020-11958
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 09 Jul 2020 14:59:41 -0400
+
 re2c (1.3-2) unstable; urgency=high
 
   [ JCF Ploemen (jcfp) ]
@@ -18,6 +29,21 @@ re2c (1.3-2) unstable; urgency=high
 
  -- JCF Ploemen (jcfp) <[e-mail]>  Tue, 23 Jun 2020 14:18:11 +0000
 
+re2c (1.3-1ubuntu0.1) focal-security; urgency=medium
+
+  * SECURITY UPDATE: Heap-based buffer overflow
+    - debian/patches/CVE-2020-11958.patch: fix calculation
+      of the shift offset in src/parse/scanner.cc.
+    - CVE-2020-11958
+
+ -- Leonidas S. Barbosa <[e-mail]>  Mon, 27 Apr 2020 09:48:36 -0300
+
+re2c (1.3-1build1) focal; urgency=medium
+
+  * No-change rebuild for libgcc-s1 package name change.
+
+ -- Matthias Klose <[e-mail]>  Sat, 21 Mar 2020 13:29:19 +0100
+
 re2c (1.3-1) unstable; urgency=medium
 
   [ JCF Ploemen (jcfp) ]
diff --git a/debian/control b/debian/control
index fc07bbd..15d2ff4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: re2c
 Section: devel
 Priority: optional
-Maintainer: JCF Ploemen (jcfp) <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: JCF Ploemen (jcfp) <[e-mail]>
 Build-Depends:
  bison,
  debhelper-compat (= 13),