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

4 files changed, 26 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index a221978..b60e189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libonig (6.9.6-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Refresh symbols file.
+    - Fix CVE-2020-26159 (Closes: #972113).
+  * Migrate to debhelper-compat 13:
+    - Bump debhelper-compat version in debian/control to = 13.
+  * debian/rules:
+    - Add remove for libonig.[la|a] to fix warning about missing installs.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 08 Nov 2020 13:08:04 +0100
+
 libonig (6.9.5-2) unstable; urgency=medium
 
   * debian/rules
diff --git a/debian/control b/debian/control
index fc0c05f..41c5bf7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: extra
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper-compat (= 12)
+ debhelper-compat (= 13)
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://github.com/kkos/oniguruma
diff --git a/debian/rules b/debian/rules
index 0f34908..8434f6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,8 @@ override_dh_auto_configure:
 
 override_dh_install:
 	$(RM) debian/tmp/usr/bin/onig-config
+	$(RM) debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libonig.a
+	$(RM) debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libonig.la
 	dh_install -X.la -X.a
 
 override_dh_makeshlibs:
diff --git a/debian/symbols b/debian/symbols
index 1ea68aa..e764aea 100644
--- a/debian/symbols
+++ b/debian/symbols
@@ -69,6 +69,7 @@ libonig.so.5 libonig5 #MINVER#
  onig_copy_encoding@Base 6.8.1
  onig_copy_syntax@Base 6.8.1
  onig_copyright@Base 6.8.1
+ onig_detect_can_be_slow_pattern@Base 6.9.6
  onig_end@Base 6.8.1
  onig_error_code_to_format@Base 6.8.1
  onig_error_code_to_str@Base 6.8.1
@@ -122,6 +123,7 @@ libonig.so.5 libonig5 #MINVER#
  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_limit_in_search@Base 6.9.6
  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
@@ -167,6 +169,14 @@ libonig.so.5 libonig5 #MINVER#
  onig_number_of_names@Base 6.8.1
  onig_parse_tree@Base 6.8.1
  onig_positive_int_multiply@Base 6.9.1
+ onig_posix_reg_foreach_name@Base 6.9.6
+ onig_posix_reg_name_to_group_numbers@Base 6.9.6
+ onig_posix_reg_number_of_names@Base 6.9.6
+ onig_posix_reg_set_encoding@Base 6.9.6
+ onig_posix_regcomp@Base 6.9.6
+ onig_posix_regerror@Base 6.9.6
+ onig_posix_regexec@Base 6.9.6
+ onig_posix_regfree@Base 6.9.6
  onig_reduce_nested_quantifier@Base 6.8.1
  onig_reg_callout_list_at@Base 6.8.1
  onig_reg_init@Base 6.8.1
@@ -212,6 +222,7 @@ libonig.so.5 libonig5 #MINVER#
  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_limit_in_search@Base 6.9.6
  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
@@ -311,11 +322,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.9.5
- reg_name_to_group_numbers@Base 6.9.5
- reg_number_of_names@Base 6.9.5
- reg_set_encoding@Base 6.9.5
- regcomp@Base 6.9.5
- regerror@Base 6.9.5
- regexec@Base 6.9.5
- regfree@Base 6.9.5