Merge branch 'release/debian/6.9.4-1'debian/6.9.4-1

8 files changed, 47 insertions, 19 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
deleted file mode 100644
index e58552a..0000000
--- a/debian/NEWS.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-libonig (6.0.0-1) unstable; urgency=medium
-
-  The file /usr/bin/onig-config is not Multi-Arch conform. So it is removed
-  in this release. You can use pkg-config instead.
-
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Tue, 06 Jan 2015 11:09:12 +0100
diff --git a/debian/changelog b/debian/changelog
index 2ae3106..8dada6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+libonig (6.9.4-1) unstable; urgency=medium
+
+  * Neu upstream release.
+    - Refresh symbols file and add Build-Depends-Package field.
+    - Remove upstream applied patches:
+      + 0105-CVE-2019-13224.patch
+      + 0110-CVE-2019-13225.patch
+    - Refresh debain/copyright.
+    - Fixes CVE-2019-19204: heap-buffer-overflow in fetch_interval_quantifier
+        due to double PFETCH (Closes: #945313).
+    - Fixes CVE-2019-19203: heap-buffer-overflow in gb18030_mbc_enc_len
+        (Closes: #945312).
+    - Fixes CVE-2019-19012: Out of bounds read in mbc_to_code()
+        (Closes: #944959).
+    - Fixes CVE-2019-16163: Stack Exhaustion Problem (Closes: #939988).
+    - Fixes CVE-2019-19246: heap-based buffer over-read in str_lower_case_match.
+  * debian/watch:_Correct typo.
+  * Declare compliance with Debian Policy 4.4.1.1 (No changes needed).
+  * Switch to debhelper-compat:
+    - debian/control: change to debhelper-compat (=12)
+    - remove debian/compat
+  * debian/control:
+    - Add Rules-Requires-Root: no.
+  * Remove outdated debian/NEWS.Debian.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 22 Dec 2019 16:00:46 +0100
+
 libonig (6.9.2-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index bad90d6..a277d0f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: libs
 Priority: extra
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper (>= 12)
-Standards-Version: 4.4.0
+ debhelper-compat (= 12)
+Standards-Version: 4.4.1.1
+Rules-Requires-Root: no
 Homepage: https://github.com/kkos/oniguruma
 Vcs-Git: git://jff.email/opt/git/libonig.git
 Vcs-Browser: https://jff.email/cgit/libonig.git
diff --git a/debian/copyright b/debian/copyright
index cd813f1..6b10c03 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Source: https://github.com/kkos/oniguruma
 
 Files: *
-Copyright: 2002-2018 K.Kosako <kkosako0@gmail.com>
+Copyright: 2002-2019 K.Kosako <kkosako0@gmail.com>
 License: BSD-2-clause
 
 License: BSD-2-clause
@@ -30,7 +30,7 @@ License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2006-2008 Max Kellermann <max@duempel.org>
-           2014-2018 Jörg Frings-Fürst <debian@jff.email>
+           2014-2019 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/patches/series b/debian/patches/series
index e924636..1c34712 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 0100-source_typos.patch
-0105-CVE-2019-13224.patch
-0110-CVE-2019-13225.patch
+#0105-CVE-2019-13224.patch
+#0110-CVE-2019-13225.patch
diff --git a/debian/symbols b/debian/symbols
index 06628e7..19e8a59 100644
--- a/debian/symbols
+++ b/debian/symbols
@@ -1,4 +1,5 @@
 libonig.so.5 libonig5 #MINVER#
+* Build-Depends-Package: libonig-dev
  OnigAsciiLowerMap@Base 6.8.1
  OnigDefaultCaseFoldFlag@Base 6.8.1
  OnigDefaultSyntax@Base 6.8.1
@@ -134,6 +135,7 @@ libonig.so.5 libonig5 #MINVER#
  onig_initialize_match_param@Base 6.8.1
  onig_is_code_in_cc@Base 6.8.1
  onig_is_code_in_cc_len@Base 6.8.1
+ onig_is_error_code_needs_param@Base 6.9.3
  onig_is_in_code_range@Base 6.8.1
  onig_match@Base 6.8.1
  onig_match_with_param@Base 6.8.1
@@ -141,12 +143,11 @@ libonig.so.5 libonig5 #MINVER#
  onig_name_to_group_numbers@Base 6.8.1
  onig_names_free@Base 6.8.1
  onig_new@Base 6.8.1
+ onig_new_cclass_with_code_list@Base 6.9.4
  onig_new_deluxe@Base 6.8.1
  onig_new_match_param@Base 6.8.1
  onig_new_without_alloc@Base 6.8.1
- onig_node_conv_to_str_node@Base 6.8.1
  onig_node_free@Base 6.8.1
- onig_node_list_add@Base 6.8.1
  onig_node_new_alt@Base 6.8.1
  onig_node_new_anchor@Base 6.8.1
  onig_node_new_bag@Base 6.9.1
@@ -172,10 +173,18 @@ libonig.so.5 libonig5 #MINVER#
  onig_region_new@Base 6.8.1
  onig_region_resize@Base 6.8.1
  onig_region_set@Base 6.8.1
+ onig_regset_add@Base 6.9.4
+ onig_regset_free@Base 6.9.4
+ onig_regset_get_regex@Base 6.9.4
+ onig_regset_get_region@Base 6.9.4
+ onig_regset_new@Base 6.9.4
+ onig_regset_number_of_regex@Base 6.9.4
+ onig_regset_replace@Base 6.9.4
+ onig_regset_search@Base 6.9.4
+ onig_regset_search_with_param@Base 6.9.4
  onig_renumber_name_table@Base 6.8.1
  onig_scan@Base 6.8.1
  onig_scan_env_set_error_string@Base 6.8.1
- onig_scan_unsigned_number@Base 6.8.1
  onig_search@Base 6.8.1
  onig_search_with_param@Base 6.8.1
  onig_set_callout_data@Base 6.8.1
@@ -252,10 +261,8 @@ libonig.so.5 libonig5 #MINVER#
  onigenc_is_valid_mbc_string@Base 6.8.1
  onigenc_length_check_is_valid_mbc_string@Base 6.8.1
  onigenc_mb2_code_to_mbc@Base 6.8.1
- onigenc_mb2_code_to_mbclen@Base 6.8.1
  onigenc_mb2_is_code_ctype@Base 6.8.1
  onigenc_mb4_code_to_mbc@Base 6.8.1
- onigenc_mb4_code_to_mbclen@Base 6.8.1
  onigenc_mb4_is_code_ctype@Base 6.8.1
  onigenc_mbn_mbc_case_fold@Base 6.8.1
  onigenc_mbn_mbc_to_code@Base 6.8.1
diff --git a/debian/watch b/debian/watch
index 8a7b475..2f0e85f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,4 +4,4 @@ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/\-/\./g;s/\_/\./g,\
 filenamemangle=s/(?:.*?)?(?:rel|v|oniguruma|ONIGURUMA)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/oniguruma-$1.$2/ \
 https://github.com/kkos/oniguruma/tags \
-(?:.*?/)?(?:rel|v|oniguruma|ONIGURUMA)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \
+(?:.*?/)?(?:rel|v|oniguruma|ONIGURUMA)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))