rpms/arj/F-11 arj-3.10.22-custom-printf.patch, NONE, 1.1 arj.spec, 1.7, 1.8

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/arj/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30193

Modified Files:
	arj.spec 
Added Files:
	arj-3.10.22-custom-printf.patch 
Log Message:
Added patch to disable the custom printf to avoid conflicting
strnlen definition with glibc headers (thanks to Lubomir Rintel)


arj-3.10.22-custom-printf.patch:

--- NEW FILE arj-3.10.22-custom-printf.patch ---
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


Index: arj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arj/F-11/arj.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- arj.spec	23 Feb 2009 20:32:10 -0000	1.7
+++ arj.spec	16 May 2009 15:29:32 -0000	1.8
@@ -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