From 59ddeac813d11c6c41c0a2b9303ec1097c17cb82 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:21:18 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for arj --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From f9eba36ba964beea3c73553e17dfb62d4af801ed Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 16 May 2009 15:29:32 +0000 Subject: [PATCH 2/4] 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 | 15 +++++++++++++++ arj.spec | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 arj-3.10.22-custom-printf.patch 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 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 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 3.10.22-7 - Rebuild against gcc 4.4 and rpm 4.6 From a804f36550ec3ec9b3fe599143ea29887ba3be53 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:10 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f0c5a63..44135a8 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: arj -# $Id$ +# $Id: Makefile,v 1.1 2006/09/10 05:10:29 jwrdegoede Exp $ NAME := arj SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4fcd5edb97997314c8909649fe1d3b5bee0a4ce3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:11:01 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 44135a8..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: arj -# $Id: Makefile,v 1.1 2006/09/10 05:10:29 jwrdegoede Exp $ -NAME := arj -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11