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

8 files changed, 27 insertions, 127 deletions

diff --git a/debian/changelog b/debian/changelog
index 8dada6e..85525aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libonig (6.9.5-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Refresh symbols file.
+  * Declare compliance with Debian Policy 4.5.0 (No changes needed).
+  * debian/copyright:
+    - Add year 2020.
+  * Remove unused patches:
+    - debian/patches/0105-CVE-2019-13224.patch,
+    - debian/patches/0110-CVE-2019-13225.patch.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Mon, 20 Apr 2020 22:35:52 +0200
+
 libonig (6.9.4-1) unstable; urgency=medium
 
   * Neu upstream release.
diff --git a/debian/control b/debian/control
index a277d0f..fc0c05f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  debhelper-compat (= 12)
-Standards-Version: 4.4.1.1
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://github.com/kkos/oniguruma
 Vcs-Git: git://jff.email/opt/git/libonig.git
diff --git a/debian/copyright b/debian/copyright
index 6b10c03..291fcf8 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-2019 K.Kosako <kkosako0@gmail.com>
+Copyright: 2002-2020 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-2019 Jörg Frings-Fürst <debian@jff.email>
+           2014-2020 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/patches/0105-CVE-2019-13224.patch b/debian/patches/0105-CVE-2019-13224.patch
deleted file mode 100644
index 6ea4f95..0000000
--- a/debian/patches/0105-CVE-2019-13224.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: CVE-2019-13224
- don't allow different encodings for onig_new_deluxe()
-Origin: upstream, https://github.com/kkos/oniguruma/commit/0f7f61ed1b7b697e283e37bd2d731d0bd57adb55
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931878
-Last-Update: 2019-07-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/src/regext.c
-===================================================================
---- trunk.orig/src/regext.c
-+++ trunk/src/regext.c
-@@ -29,6 +29,7 @@
- 
- #include "regint.h"
- 
-+#if 0
- static void
- conv_ext0be32(const UChar* s, const UChar* end, UChar* conv)
- {
-@@ -158,6 +159,7 @@ conv_encoding(OnigEncoding from, OnigEnc
- 
-   return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION;
- }
-+#endif
- 
- extern int
- onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
-@@ -169,9 +171,7 @@ onig_new_deluxe(regex_t** reg, const UCh
-   if (IS_NOT_NULL(einfo)) einfo->par = (UChar* )NULL;
- 
-   if (ci->pattern_enc != ci->target_enc) {
--    r = conv_encoding(ci->pattern_enc, ci->target_enc, pattern, pattern_end,
--                      &cpat, &cpat_end);
--    if (r != 0) return r;
-+    return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION;
-   }
-   else {
-     cpat     = (UChar* )pattern;
diff --git a/debian/patches/0110-CVE-2019-13225.patch b/debian/patches/0110-CVE-2019-13225.patch
deleted file mode 100644
index be9e152..0000000
--- a/debian/patches/0110-CVE-2019-13225.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: CVE-2019-13225
- problem in converting if-then-else pattern to bytecode.
-Origin: upstream, https://github.com/kkos/oniguruma/commit/c509265c5f6ae7264f7b8a8aae1cfa5fc59d108c
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931878
-Last-Update: 2019-07-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/src/regcomp.c
-===================================================================
---- trunk.orig/src/regcomp.c
-+++ trunk/src/regcomp.c
-@@ -1307,8 +1307,9 @@ compile_length_bag_node(BagNode* node, r
-         len += tlen;
-       }
- 
-+      len += SIZE_OP_JUMP + SIZE_OP_ATOMIC_END;
-+
-       if (IS_NOT_NULL(Else)) {
--        len += SIZE_OP_JUMP;
-         tlen = compile_length_tree(Else, reg);
-         if (tlen < 0) return tlen;
-         len += tlen;
-@@ -1455,7 +1456,7 @@ compile_bag_node(BagNode* node, regex_t*
- 
-   case BAG_IF_ELSE:
-     {
--      int cond_len, then_len, jump_len;
-+      int cond_len, then_len, else_len, jump_len;
-       Node* cond = NODE_BAG_BODY(node);
-       Node* Then = node->te.Then;
-       Node* Else = node->te.Else;
-@@ -1472,8 +1473,7 @@ compile_bag_node(BagNode* node, regex_t*
-       else
-         then_len = 0;
- 
--      jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END;
--      if (IS_NOT_NULL(Else)) jump_len += SIZE_OP_JUMP;
-+      jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END + SIZE_OP_JUMP;
- 
-       r = add_op(reg, OP_PUSH);
-       if (r != 0) return r;
-@@ -1490,11 +1490,20 @@ compile_bag_node(BagNode* node, regex_t*
-       }
- 
-       if (IS_NOT_NULL(Else)) {
--        int else_len = compile_length_tree(Else, reg);
--        r = add_op(reg, OP_JUMP);
--        if (r != 0) return r;
--        COP(reg)->jump.addr = else_len + SIZE_INC_OP;
-+        else_len = compile_length_tree(Else, reg);
-+        if (else_len < 0) return else_len;
-+      }
-+      else
-+        else_len = 0;
- 
-+      r = add_op(reg, OP_JUMP);
-+      if (r != 0) return r;
-+      COP(reg)->jump.addr = SIZE_OP_ATOMIC_END + else_len + SIZE_INC_OP;
-+
-+      r = add_op(reg, OP_ATOMIC_END);
-+      if (r != 0) return r;
-+
-+      if (IS_NOT_NULL(Else)) {
-         r = compile_tree(Else, reg, env);
-       }
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 1c34712..ea79fff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0100-source_typos.patch
-#0105-CVE-2019-13224.patch
-#0110-CVE-2019-13225.patch
diff --git a/debian/rules b/debian/rules
index ee95689..833094f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,13 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 #
-# Test for gcc-6 support
+# Test for gcc-10 support
 #
-#export CC=gcc-6
-#export CXX=g++-6
+#export CC=gcc-10
+#export CXX=g++-10
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
diff --git a/debian/symbols b/debian/symbols
index 19e8a59..1659176 100644
--- a/debian/symbols
+++ b/debian/symbols
@@ -117,10 +117,12 @@ libonig.so.5 libonig5 #MINVER#
  onig_get_retraction_callout@Base 6.8.1
  onig_get_retry_counter_by_callout_args@Base 6.8.1
  onig_get_retry_limit_in_match@Base 6.8.1
+ onig_get_retry_limit_in_search@Base 6.9.5
  onig_get_right_range_by_callout_args@Base 6.8.1
  onig_get_start_by_callout_args@Base 6.8.1
  onig_get_string_by_callout_args@Base 6.8.1
  onig_get_string_end_by_callout_args@Base 6.8.1
+ onig_get_subexp_call_max_nest_level@Base 6.9.5
  onig_get_syntax@Base 6.8.1
  onig_get_syntax_behavior@Base 6.8.1
  onig_get_syntax_op2@Base 6.8.1
@@ -147,12 +149,14 @@ libonig.so.5 libonig5 #MINVER#
  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_copy@Base 6.9.5
  onig_node_free@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
  onig_node_new_list@Base 6.8.1
  onig_node_new_str@Base 6.8.1
+ onig_node_reset_empty@Base 6.9.5
+ onig_node_reset_fail@Base 6.9.5
  onig_node_str_cat@Base 6.8.1
  onig_node_str_clear@Base 6.8.1
  onig_node_str_set@Base 6.8.1
@@ -206,6 +210,9 @@ libonig.so.5 libonig5 #MINVER#
  onig_set_retraction_callout_of_match_param@Base 6.8.1
  onig_set_retry_limit_in_match@Base 6.8.1
  onig_set_retry_limit_in_match_of_match_param@Base 6.8.1
+ onig_set_retry_limit_in_search@Base 6.9.5
+ onig_set_retry_limit_in_search_of_match_param@Base 6.9.5
+ onig_set_subexp_call_max_nest_level@Base 6.9.5
  onig_set_syntax_behavior@Base 6.8.1
  onig_set_syntax_op2@Base 6.8.1
  onig_set_syntax_op@Base 6.8.1
@@ -304,11 +311,3 @@ libonig.so.5 libonig5 #MINVER#
  re_mbcinit@Base 6.8.1
  re_search@Base 6.8.1
  re_set_casetable@Base 6.8.1
- reg_foreach_name@Base 6.8.1
- reg_name_to_group_numbers@Base 6.8.1
- reg_number_of_names@Base 6.8.1
- reg_set_encoding@Base 6.8.1
- regcomp@Base 6.8.1
- regerror@Base 6.8.1
- regexec@Base 6.8.1
- regfree@Base 6.8.1