From 2f09140509faf984cb6aa5a6563f24bf0b0aaaee Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 22 Oct 2002 21:49:52 +0000 Subject: [PATCH] - link patch (link *.so using gcc not ld to avoid binary compatibility problems) - release 4 Changed files: libcap-link.patch -> 1.1 libcap.spec -> 1.29 --- libcap-link.patch | 11 +++++++++++ libcap.spec | 12 +++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 libcap-link.patch diff --git a/libcap-link.patch b/libcap-link.patch new file mode 100644 index 0000000..4dc623e --- /dev/null +++ b/libcap-link.patch @@ -0,0 +1,11 @@ +--- libcap-1.92/libcap/Makefile.orig Fri Apr 23 08:15:10 1999 ++++ libcap-1.92/libcap/Makefile Tue Oct 22 23:33:28 2002 +@@ -34,7 +34,7 @@ + # @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_\([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed + + $(MINLIBNAME): $(OBJS) +- $(LD) -soname $(MAJLIBNAME) -x -shared -o $@ $(OBJS) ++ $(CC) -Wl,-soname -Wl,$(MAJLIBNAME) -Wl,-x -shared -o $@ $(OBJS) + ln -sf $(MINLIBNAME) $(MAJLIBNAME) + ln -sf $(MAJLIBNAME) $(LIBNAME) + diff --git a/libcap.spec b/libcap.spec index 502652a..f0c0f41 100644 --- a/libcap.spec +++ b/libcap.spec @@ -2,11 +2,12 @@ Summary: POSIX.1e capability suite Summary(pl): Wsparcie dla standardu "capability" POSIX.1e Name: libcap Version: 1.92 -Release: 3 +Release: 4 License: GPL/BSD Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.2/%{name}-%{version}.tar.gz Patch0: %{name}-1.92-make.patch +Patch1: %{name}-link.patch Icon: libcap.gif URL: http://linux.kernel.org/pub/linux/libs/security/linux-privs/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -35,7 +36,8 @@ Pliki nag %prep %setup -q -%patch -p1 +%patch0 -p1 +%patch1 -p1 %build %{__make} "COPTFLAGS=%{rpmcflags}" @@ -47,12 +49,12 @@ rm -rf $RPM_BUILD_ROOT FAKEROOT=$RPM_BUILD_ROOT \ MANDIR=$RPM_BUILD_ROOT%{_mandir} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + %files %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/* -- 2.44.0