From 0e8e0720ff1da8107b84b4ca8e7c0ae0b6cdb0a2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:16:06 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for chrpath --- 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 6ea5736523d7e7ef8ede79ca3b577f00708164c8 Mon Sep 17 00:00:00 2001 From: athimm Date: Thu, 23 Jul 2009 15:27:23 +0000 Subject: [PATCH 2/4] Fix last NULL in .dynamic section. --- chrpath-0.13-NULL-entry.patch | 16 ++++++++++++++++ chrpath.spec | 8 +++++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 chrpath-0.13-NULL-entry.patch diff --git a/chrpath-0.13-NULL-entry.patch b/chrpath-0.13-NULL-entry.patch new file mode 100644 index 0000000..27275d2 --- /dev/null +++ b/chrpath-0.13-NULL-entry.patch @@ -0,0 +1,16 @@ +diff -uNr chrpath-0.13.old/killrpath.c chrpath-0.13/killrpath.c +--- chrpath-0.13.old/killrpath.c 2003-06-24 00:46:15.000000000 +0200 ++++ chrpath-0.13/killrpath.c 2009-07-19 23:05:11.000000000 +0200 +@@ -73,8 +73,11 @@ + if ( ! elf_dynpath_tag(dyns[i].d_tag) ) + dynpos++; + } +- for (; dynpos < i; dynpos++) ++ for (; dynpos < i; dynpos++) { + dyns[dynpos].d_tag = DT_NULL; ++ dyns[dynpos].d_un.d_val = 0x0; ++ } ++ + + if (lseek(fd, phdr.p_offset, SEEK_SET) == -1 + || write(fd, dyns, phdr.p_filesz) != (int)phdr.p_filesz) diff --git a/chrpath.spec b/chrpath.spec index fe973b3..44bfa5a 100644 --- a/chrpath.spec +++ b/chrpath.spec @@ -1,10 +1,11 @@ Summary: Modify rpath of compiled programs Name: chrpath Version: 0.13 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ Group: Development/Tools URL: ftp://ftp.hungry.com/pub/hungry/chrpath/ +Patch0: chrpath-0.13-NULL-entry.patch Source0: ftp://ftp.hungry.com/pub/hungry/chrpath/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -15,6 +16,7 @@ is supported. %prep %setup -q +%patch0 -p1 -b .NULL %build %configure @@ -36,8 +38,8 @@ rm -rf %{buildroot} %{_mandir}/man1/chrpath.1* %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 0.13-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Thu Jul 23 2009 Axel Thimm - 0.13-5 +- Fix last entry in .dynamic (by Christian Krause ). * Sat Sep 8 2007 Ville Skyttä - 0.13-2 - License: GPL+ From 4d6a2bf77bd5f1f27d49de772a7da5804197c4c6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:26 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8f487b6..644f45c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := chrpath 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 f170c4c58bed951839f1b4a49da4270155c1c92f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:43:27 +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 644f45c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: chrpath -# $Id$ -NAME := chrpath -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