Accepting request 831132 from Archiving

- Add 0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch
- Update to 1.0.9

OBS-URL: https://build.opensuse.org/request/show/831132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/brotli?expand=0&rev=10

0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch

@@ -0,0 +1,51 @@
+From 525e5afc873f17b5891239f188811a2b6d9cf8a2 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 1 Sep 2020 15:55:52 +0200
+Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
+References: https://github.com/google/brotli/issues/836
+
+This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
+---
+ scripts/libbrotlicommon.pc.in | 2 +-
+ scripts/libbrotlidec.pc.in    | 2 +-
+ scripts/libbrotlienc.pc.in    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
+index 10ca969..2a8cf7a 100644
+--- a/scripts/libbrotlicommon.pc.in
++++ b/scripts/libbrotlicommon.pc.in
+@@ -7,5 +7,5 @@ Name: libbrotlicommon
+ URL: https://github.com/google/brotli
+ Description: Brotli common dictionary library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlicommon
++Libs: -L${libdir} -lbrotlicommon
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
+index e7c3124..6f8ef2e 100644
+--- a/scripts/libbrotlidec.pc.in
++++ b/scripts/libbrotlidec.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlidec
+ URL: https://github.com/google/brotli
+ Description: Brotli decoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlidec
++Libs: -L${libdir} -lbrotlidec
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
+index 4dd0811..2098afe 100644
+--- a/scripts/libbrotlienc.pc.in
++++ b/scripts/libbrotlienc.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlienc
+ URL: https://github.com/google/brotli
+ Description: Brotli encoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlienc
++Libs: -L${libdir} -lbrotlienc
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
+-- 
+2.28.0
+

brotli-1.0.7.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c
-size 23827908

brotli.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Sep  1 13:56:47 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Add 0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch
+
+-------------------------------------------------------------------
+Thu Aug 27 14:32:26 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to 1.0.9
+  * Fix integer overflow when input chunk is longer than
+    2GiB [boo#1175825]
+  * `brotli -v` now reports raw / compressed size
+  * decoder: minor speed / memory usage improvements
+  * encoder: fix rare access to uninitialized data in ring-buffer
+- Drop brotli_Ensure-decompression-consumes-all-input.patch,
+  brotli_Verbose-CLI+Shared-Brotli.patch (merged)
+
 -------------------------------------------------------------------
 Wed Aug 12 14:52:42 UTC 2020 - andy great <andythe_great@pm.me>
 

brotli.spec

@@ -19,16 +19,15 @@
 
 %define sover 1
 Name:           brotli
-Version:        1.0.7
+Version:        1.0.9
 Release:        0
 Summary:        Lossless Compression Algorithm
 License:        MIT
 Group:          Productivity/Archiving/Compression
 URL:            https://github.com/google/brotli
-Source:         %url/archive/v%version.tar.gz#/%name-%version.tar.gz
+Source:         https://github.com/google/brotli/archive/v%version.tar.gz
 Source99:       baselibs.conf
-Patch:          brotli_Verbose-CLI+Shared-Brotli.patch
+Patch1:         0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch
-Patch1:         brotli_Ensure-decompression-consumes-all-input.patch
 BuildRequires:  cmake >= 2.8.6
 BuildRequires:  gcc-c++
 BuildRequires:  gzip
@@ -123,25 +122,20 @@ install -pm0644 docs/*.3 "%buildroot/%_mandir/man3/"
 %postun -n libbrotlienc%sover -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %license LICENSE
 %_bindir/brotli
 %_mandir/man1/brotli.1*
 
 %files -n libbrotlicommon%sover
-%defattr(-,root,root)
 %_libdir/libbrotlicommon.so.*
 
 %files -n libbrotlidec%sover
-%defattr(-,root,root)
 %_libdir/libbrotlidec.so.*
 
 %files -n libbrotlienc%sover
-%defattr(-,root,root)
 %_libdir/libbrotlienc.so.*
 
 %files -n libbrotli-devel
-%defattr(-,root,root)
 %_includedir/brotli/
 %_libdir/libbrotlicommon.so
 %_libdir/libbrotlidec.so

brotli_Ensure-decompression-consumes-all-input.patch

@@ -1,74 +0,0 @@
-From 5805f99a533a8f8118699c0100d8c102f3605f65 Mon Sep 17 00:00:00 2001
-From: Justin Ridgewell <justin@ridgewell.name>
-Date: Mon, 12 Nov 2018 04:36:00 -0500
-Subject: [PATCH] Ensure decompression consumes all input (#730)
-
-* Ensure decompression consumes all input
-
-If not, it's a corrupt stream.
-
-* Use byte strings
----
- python/_brotli.cc                 | 4 ++--
- python/tests/decompress_test.py   | 4 ++++
- python/tests/decompressor_test.py | 9 +++++++++
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/python/_brotli.cc b/python/_brotli.cc
-index a6f925ef..5e1828e9 100644
---- a/python/_brotli.cc
-+++ b/python/_brotli.cc
-@@ -414,7 +414,7 @@ static BROTLI_BOOL decompress_stream(BrotliDecoderState* dec,
-       (*output).insert((*output).end(), buffer, buffer + buffer_length);
-     }
-   }
--  ok = result != BROTLI_DECODER_RESULT_ERROR;
-+  ok = result != BROTLI_DECODER_RESULT_ERROR && !available_in;
- 
-   Py_END_ALLOW_THREADS
-   return ok;
-@@ -672,7 +672,7 @@ static PyObject* brotli_decompress(PyObject *self, PyObject *args, PyObject *key
-     if (available_out != 0)
-       output.insert(output.end(), next_out, next_out + available_out);
-   }
--  ok = result == BROTLI_DECODER_RESULT_SUCCESS;
-+  ok = result == BROTLI_DECODER_RESULT_SUCCESS && !available_in;
-   BrotliDecoderDestroyInstance(state);
- 
-   Py_END_ALLOW_THREADS
-diff --git a/python/tests/decompress_test.py b/python/tests/decompress_test.py
-index 7a9e9e30..814e5633 100644
---- a/python/tests/decompress_test.py
-+++ b/python/tests/decompress_test.py
-@@ -31,6 +31,10 @@ def _test_decompress(self, test_data):
-         self._decompress(test_data)
-         self._check_decompression(test_data)
- 
-+    def test_garbage_appended(self):
-+        with self.assertRaises(brotli.error):
-+            brotli.decompress(brotli.compress(b'a') + b'a')
-+
- 
- _test_utils.generate_test_methods(TestDecompress, for_decompression=True)
- 
-diff --git a/python/tests/decompressor_test.py b/python/tests/decompressor_test.py
-index 99667bcd..05918ada 100644
---- a/python/tests/decompressor_test.py
-+++ b/python/tests/decompressor_test.py
-@@ -43,6 +43,15 @@ def _test_decompress(self, test_data):
-         self._decompress(test_data)
-         self._check_decompression(test_data)
- 
-+    def test_garbage_appended(self):
-+        with self.assertRaises(brotli.error):
-+            self.decompressor.process(brotli.compress(b'a') + b'a')
-+
-+    def test_already_finished(self):
-+        self.decompressor.process(brotli.compress(b'a'))
-+        with self.assertRaises(brotli.error):
-+            self.decompressor.process(b'a')
-+
- 
- _test_utils.generate_test_methods(TestDecompressor, for_decompression=True)
- 
-

v1.0.9.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
+size 486984