robert pushed to arj (el5). "Added patch to disable the custom printf to avoid conflicting strnlen (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 3 14:06:58 UTC 2015
>From cc343f8943d8053a4ecea4f5f3e646a84a7d0b88 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Sat, 18 Apr 2009 14:35:49 +0000
Subject: Added patch to disable the custom printf to avoid conflicting strnlen
definition with glibc headers (thanks to Lubomir Rintel)
diff --git a/arj-3.10.22-custom-printf.patch b/arj-3.10.22-custom-printf.patch
new file mode 100644
index 0000000..b789dd5
--- /dev/null
+++ b/arj-3.10.22-custom-printf.patch
@@ -0,0 +1,15 @@
+Patch by Lubomir Rintel <lkundrak at v3.sk> for arj >= 3.10.22, which disables
+the custom printf to avoid conflicting strnlen definition with the glibc
+headers. By using custom printf (as in the past), we're completely loosing
+all the _FORTIFY_SOURCE printf protections.
+
+--- arj-3.10.22/fardata.c 2004-04-17 13:39:42.000000000 +0200
++++ arj-3.10.22/fardata.c.printf 2009-04-18 16:23:52.000000000 +0200
+@@ -13,7 +13,6 @@
+ /* ASR fix 02/05/2003: need that regardless of COLOR_OUTPUT to support -jp
+ correctly */
+ #if SFX_LEVEL>=ARJ
+- #define CUSTOM_PRINTF
+ #define CHUNK_SIZE 512 /* Size of the output block */
+ #define CHUNK_THRESHOLD (CHUNK_SIZE-256) /* Safety bound */
+ #endif
diff --git a/arj.spec b/arj.spec
index 6685efa..6d228c6 100644
--- a/arj.spec
+++ b/arj.spec
@@ -1,7 +1,7 @@
Summary: Archiver for .arj files
Name: arj
Version: 3.10.22
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPL+
Group: Applications/Archiving
URL: http://arj.sourceforge.net/
@@ -11,6 +11,7 @@ Source1: unarj.sh
Source2: unarj.1
Patch0: http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz
Patch1: arj-3.10.22-missing-protos.patch
+Patch2: arj-3.10.22-custom-printf.patch
BuildRequires: autoconf
Provides: unarj = %{version}-%{release}
Obsoletes: unarj < 3
@@ -26,6 +27,7 @@ Software, Inc.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for i in debian/patches/00*.patch; do
patch -p1 < $i
@@ -67,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*arj*1.*
%changelog
+* Sat Apr 18 2009 Robert Scheck <robert at fedoraproject.org> 3.10.22-8
+- Added patch to disable the custom printf to avoid conflicting
+ strnlen definition with glibc headers (thanks to Lubomir Rintel)
+
* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 3.10.22-7
- Rebuild against gcc 4.4 and rpm 4.6
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/arj.git/commit/?h=el5&id=cc343f8943d8053a4ecea4f5f3e646a84a7d0b88
More information about the scm-commits
mailing list