[neon/extras/exiv2/Neon/unstable] debian/patches: sync patches from master
Jonathan Riddell
null at kde.org
Mon Nov 23 13:52:10 GMT 2020
Git commit acce385c4cc1267dc864ebba8f93577219bb31bd by Jonathan Riddell.
Committed on 23/11/2020 at 13:51.
Pushed by jriddell into branch 'Neon/unstable'.
sync patches from master
D +0 -24 debian/patches/Add-comment-to-explain-choice-of-cut-off-value.patch
D +- -- debian/patches/Fix-1011-fix_1011_jp2_readmetadata_loop.patch
D +- -- debian/patches/Fix-issue-712.patch
R +12 -5 debian/patches/fcf-protection-only-on-x86.diff [from: debian/patches/neon_fcf-protection.diff - 052% similarity]
M +4 -10 debian/patches/fix-man-page-table-formatting.patch
D +0 -12 debian/patches/remove-execute-permission-bit-from-ini-test-sample.patch
M +3 -1 debian/patches/series
https://invent.kde.org/neon/extras/exiv2/commit/acce385c4cc1267dc864ebba8f93577219bb31bd
diff --git a/debian/patches/Add-comment-to-explain-choice-of-cut-off-value.patch b/debian/patches/Add-comment-to-explain-choice-of-cut-off-value.patch
deleted file mode 100644
index 11b320b9..00000000
--- a/debian/patches/Add-comment-to-explain-choice-of-cut-off-value.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Kevin Backhouse <kevinbackhouse at github.com>
-Date: Fri, 24 Jan 2020 09:34:34 +0000
-Subject: Add comment to explain choice of cut-off value.
-
----
- src/bigtiffimage.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/bigtiffimage.cpp b/src/bigtiffimage.cpp
-index 122e675..68a57f9 100644
---- a/src/bigtiffimage.cpp
-+++ b/src/bigtiffimage.cpp
-@@ -196,6 +196,11 @@ namespace Exiv2
- // Fix for https://github.com/Exiv2/exiv2/issues/712
- // A malicious file can cause a very deep recursion, leading to
- // stack exhaustion.
-+ // Note: 200 is an arbitrarily chosen cut-off value. The value
-+ // of depth determines the amount of indentation inserted by the
-+ // pretty-printer. The output starts to become unreadable as
-+ // soon as the indentation exceeds 80 characters or so. That's
-+ // why 200 ought to be a reasonable cut-off.
- if (depth > 200) {
- out << Internal::indent(depth) << "Maximum indentation depth exceeded." << std::endl;
- return;
diff --git a/debian/patches/Fix-1011-fix_1011_jp2_readmetadata_loop.patch b/debian/patches/Fix-1011-fix_1011_jp2_readmetadata_loop.patch
deleted file mode 100644
index 3162f82a..00000000
Binary files a/debian/patches/Fix-1011-fix_1011_jp2_readmetadata_loop.patch and /dev/null differ
diff --git a/debian/patches/Fix-issue-712.patch b/debian/patches/Fix-issue-712.patch
deleted file mode 100644
index f3f3a25e..00000000
Binary files a/debian/patches/Fix-issue-712.patch and /dev/null differ
diff --git a/debian/patches/neon_fcf-protection.diff b/debian/patches/fcf-protection-only-on-x86.diff
similarity index 52%
rename from debian/patches/neon_fcf-protection.diff
rename to debian/patches/fcf-protection-only-on-x86.diff
index 01212cb1..9062a0c6 100644
--- a/debian/patches/neon_fcf-protection.diff
+++ b/debian/patches/fcf-protection-only-on-x86.diff
@@ -1,13 +1,20 @@
-Index: exiv2-0.27.3/cmake/compilerFlags.cmake
-===================================================================
---- exiv2-0.27.3.orig/cmake/compilerFlags.cmake
-+++ exiv2-0.27.3/cmake/compilerFlags.cmake
-@@ -26,7 +26,7 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Li
+Author: Pino Toscano <pino at debian.org>
+Description: Use -fcf-protection only on x86 architectures
+ It does not exist elsewhere.
+Forwarded: no
+Last-Update: 2020-08-09
+
+--- a/cmake/compilerFlags.cmake
++++ b/cmake/compilerFlags.cmake
+@@ -26,7 +26,10 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Li
# This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
- add_compile_options(-fstack-clash-protection -fcf-protection)
+ add_compile_options(-fstack-clash-protection)
++ if (CMAKE_SYSTEM_PROCESSOR MATCHES "i686|x86_64")
++ add_compile_options(-fcf-protection)
++ endif()
endif()
if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8
diff --git a/debian/patches/fix-man-page-table-formatting.patch b/debian/patches/fix-man-page-table-formatting.patch
index 26268e1f..f015f63b 100644
--- a/debian/patches/fix-man-page-table-formatting.patch
+++ b/debian/patches/fix-man-page-table-formatting.patch
@@ -1,15 +1,9 @@
-From: Simon Frei <freisim93 at gmail.com>
+Author: Simon Frei <freisim93 at gmail.com>
Date: Sun, 1 Sep 2019 12:08:49 +0200
-Subject: fix man page table width and separation
+Description: fix man page table width and separation
----
- src/exiv2.1 | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/exiv2.1 b/src/exiv2.1
-index 775ecec..801a468 100644
---- a/src/exiv2.1
-+++ b/src/exiv2.1
+--- a/man/man1/exiv2.1
++++ b/man/man1/exiv2.1
@@ -39,31 +39,31 @@ lB lB lB lB lB lB
_ _ _ _ _ _
l l l l l l.
diff --git a/debian/patches/remove-execute-permission-bit-from-ini-test-sample.patch b/debian/patches/remove-execute-permission-bit-from-ini-test-sample.patch
deleted file mode 100644
index 3493a38e..00000000
--- a/debian/patches/remove-execute-permission-bit-from-ini-test-sample.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-From: Simon Frei <freisim93 at gmail.com>
-Date: Sun, 1 Sep 2019 12:39:09 +0200
-Subject: remove execute permission bit from ini test sample
-
----
- samples/ini-test.ini | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100755 => 100644 samples/ini-test.ini
-
-diff --git a/samples/ini-test.ini b/samples/ini-test.ini
-old mode 100755
-new mode 100644
diff --git a/debian/patches/series b/debian/patches/series
index 105ffe59..4878a775 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
-neon_fcf-protection.diff
+xmpsdk-integer-typedef-x64.patch
+fix-man-page-table-formatting.patch
+fcf-protection-only-on-x86.diff
More information about the Neon-commits
mailing list