From 061e321853e8bfd4d1fecbeee41365a7e2309076 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:41:17 +0000 Subject: [PATCH 1/6] Initialize branch F-11 for libcap --- 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 59beb49fda72c79778b4581f5ca3036b5a38eb6d Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 8 Jun 2009 10:33:09 +0000 Subject: [PATCH 2/6] - disable headerfix patch (#503927) --- libcap.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libcap.spec b/libcap.spec index 7e4e2c9..faaedaf 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for getting and setting POSIX.1e capabilities Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.gz Patch0: libcap-2.16-headerfix.patch @@ -31,7 +31,7 @@ libcap. %prep %setup -q -%patch0 -p1 +#patch0 -p1 %build # libcap can not be build with _smp_mflags: @@ -77,6 +77,9 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.* rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jun 08 2009 Karsten Hopp 2.16-3 +- disable headerfix patch (#503927) + * Sun Mar 22 2009 Karsten Hopp 2.16-1 - update, with a fix for rebuild problems From 24a00c578bad2c688c8ab457f242f8fe959f9a4f Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 15 Jun 2009 12:53:01 +0000 Subject: [PATCH 3/6] - make it build again on 32bit --- libcap-2.16-headerfix.patch | 21 ++++++++++----------- libcap.spec | 7 +++++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libcap-2.16-headerfix.patch b/libcap-2.16-headerfix.patch index ae6eb28..dc9fae1 100644 --- a/libcap-2.16-headerfix.patch +++ b/libcap-2.16-headerfix.patch @@ -1,12 +1,11 @@ -diff -up libcap-2.16/libcap/include/sys/capability.h.incfix libcap-2.16/libcap/include/sys/capability.h ---- libcap-2.16/libcap/include/sys/capability.h.incfix 2009-03-22 17:54:02.000000000 +0100 -+++ libcap-2.16/libcap/include/sys/capability.h 2009-03-22 17:54:09.000000000 +0100 -@@ -19,7 +19,7 @@ extern "C" { - * information for the user library. - */ +diff -up libcap-2.16/libcap/include/sys/capability.h.hfix libcap-2.16/libcap/include/sys/capability.h +--- libcap-2.16/libcap/include/sys/capability.h.hfix 2009-06-15 14:46:51.000000000 +0200 ++++ libcap-2.16/libcap/include/sys/capability.h 2009-06-15 14:47:00.000000000 +0200 +@@ -30,6 +30,7 @@ extern "C" { + #define _LINUX_FS_H + #define __LINUX_COMPILER_H + #define __user ++#define _ASM_X86_SIGCONTEXT_H --#include -+#include - #include - - /* + typedef unsigned int __u32; + typedef __u32 __le32; diff --git a/libcap.spec b/libcap.spec index faaedaf..929d5dc 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for getting and setting POSIX.1e capabilities Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.gz Patch0: libcap-2.16-headerfix.patch @@ -31,7 +31,7 @@ libcap. %prep %setup -q -#patch0 -p1 +%patch0 -p1 %build # libcap can not be build with _smp_mflags: @@ -77,6 +77,9 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.* rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jun 15 2009 Karsten Hopp 2.16-4 +- make it build again on 32bit + * Mon Jun 08 2009 Karsten Hopp 2.16-3 - disable headerfix patch (#503927) From 7984527c6837e9d908eafc1e76d14cc08fc2d883 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 16 Jun 2009 20:11:57 +0000 Subject: [PATCH 4/6] - update headerfix patch --- libcap-2.16-headerfix.patch | 4 +++- libcap.spec | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libcap-2.16-headerfix.patch b/libcap-2.16-headerfix.patch index dc9fae1..d7a1d0b 100644 --- a/libcap-2.16-headerfix.patch +++ b/libcap-2.16-headerfix.patch @@ -1,11 +1,13 @@ diff -up libcap-2.16/libcap/include/sys/capability.h.hfix libcap-2.16/libcap/include/sys/capability.h --- libcap-2.16/libcap/include/sys/capability.h.hfix 2009-06-15 14:46:51.000000000 +0200 +++ libcap-2.16/libcap/include/sys/capability.h 2009-06-15 14:47:00.000000000 +0200 -@@ -30,6 +30,7 @@ extern "C" { +@@ -30,6 +30,9 @@ extern "C" { #define _LINUX_FS_H #define __LINUX_COMPILER_H #define __user +#define _ASM_X86_SIGCONTEXT_H ++#define _ASM_POWERPC_SIGCONTEXT_H ++#define _SPARC_SIGCONTEXT_H typedef unsigned int __u32; typedef __u32 __le32; diff --git a/libcap.spec b/libcap.spec index 929d5dc..b894692 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 2.16 -Release: 4%{?dist} +Release: 4%{?dist}.1 Summary: Library for getting and setting POSIX.1e capabilities Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.gz Patch0: libcap-2.16-headerfix.patch @@ -77,6 +77,9 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.* rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Jun 16 2009 Karsten Hopp 2.16-4.1 +- update headerfix patch + * Mon Jun 15 2009 Karsten Hopp 2.16-4 - make it build again on 32bit From a2c3ddd055b2eb322cd93979f026fa4715dbf113 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:45:58 +0000 Subject: [PATCH 5/6] 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 19efe41..4a3275b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libcap -# $Id: Makefile,v 1.1 2004/09/09 07:21:20 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:59:38 notting Exp $ NAME := libcap 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 b6ccf2c9cd9f9172b07855b8e71e04f4b813d518 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:46:18 +0000 Subject: [PATCH 6/6] 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 4a3275b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libcap -# $Id: Makefile,v 1.2 2007/10/15 18:59:38 notting Exp $ -NAME := libcap -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),) -# attempt 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