Added patch to disable the custom printf to avoid conflicting strnlen

definition with glibc headers (thanks to Lubomir Rintel)
epel9
Robert Scheck 16 years ago
parent 213d573d72
commit cc343f8943

@ -0,0 +1,15 @@
Patch by Lubomir Rintel <lkundrak@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

@ -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@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@fedoraproject.org> 3.10.22-7
- Rebuild against gcc 4.4 and rpm 4.6

Loading…
Cancel
Save