[libstatgrab/el6] * Readd patch
Oliver Falk
oliver at fedoraproject.org
Tue Sep 17 06:20:28 UTC 2013
commit ac3d3e811bd717d3ad0cb7536965ac30d4bd49fa
Author: Oliver Falk <oliver at linux-kernel.at>
Date: Tue Sep 17 08:20:11 2013 +0200
* Readd patch
libstatgrab.nochmod.patch | 52 +++++++++++++++++++++++++++++++++++++++++++++
libstatgrab.spec | 2 +
2 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/libstatgrab.nochmod.patch b/libstatgrab.nochmod.patch
new file mode 100644
index 0000000..e759b35
--- /dev/null
+++ b/libstatgrab.nochmod.patch
@@ -0,0 +1,52 @@
+--- src/statgrab/Makefile.am.old 2005-02-04 19:45:16.384407326 +0100
++++ src/statgrab/Makefile.am 2005-02-04 19:45:23.292225787 +0100
+@@ -19,12 +19,12 @@
+ if STATGRAB
+ if SETGIDBINS
+ # Some operating systems need the binary to be setgid kmem
+- chgrp kmem $(DESTDIR)@bindir@/statgrab
+- chmod g+s $(DESTDIR)@bindir@/statgrab
++ chgrp kmem $(DESTDIR)@bindir@/statgrab || true
++ chmod g+s $(DESTDIR)@bindir@/statgrab || true
+ endif
+ if SETUIDBINS
+ # Some operating systems need the binary to be setuid root
+- chown root $(DESTDIR)@bindir@/statgrab
++ chown root $(DESTDIR)@bindir@/statgrab || true
+ chmod u+s $(DESTDIR)@bindir@/statgrab
+ endif
+ endif
+--- src/statgrab/Makefile.in.old 2005-02-04 19:56:55.352716673 +0100
++++ src/statgrab/Makefile.in 2005-02-04 19:57:31.010601483 +0100
+@@ -507,10 +507,10 @@
+
+ install-exec-local:
+ # Some operating systems need the binary to be setgid kmem
+- at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chgrp kmem $(DESTDIR)@bindir@/statgrab
+- at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chmod g+s $(DESTDIR)@bindir@/statgrab
++ at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chgrp kmem $(DESTDIR)@bindir@/statgrab || true
++ at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chmod g+s $(DESTDIR)@bindir@/statgrab || true
+ # Some operating systems need the binary to be setuid root
+- at SETUIDBINS_TRUE@@STATGRAB_TRUE@ chown root $(DESTDIR)@bindir@/statgrab
++ at SETUIDBINS_TRUE@@STATGRAB_TRUE@ chown root $(DESTDIR)@bindir@/statgrab || true
+ @SETUIDBINS_TRUE@@STATGRAB_TRUE@ chmod u+s $(DESTDIR)@bindir@/statgrab
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- src/saidar/Makefile.in.old 2005-02-04 20:34:08.108193091 +0100
++++ src/saidar/Makefile.in 2005-02-04 20:34:34.550848428 +0100
+@@ -474,11 +474,11 @@
+
+ install-exec-local:
+ # Some operating systems need the binary to be setgid kmem
+- at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chgrp kmem $(DESTDIR)@bindir@/saidar
+- at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chmod g+s $(DESTDIR)@bindir@/saidar
++ at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chgrp kmem $(DESTDIR)@bindir@/saidar || true
++ at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chmod g+s $(DESTDIR)@bindir@/saidar || true
+ # Some operating systems need the binary to be setuid root
+- at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chown root $(DESTDIR)@bindir@/saidar
+- at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chmod u+s $(DESTDIR)@bindir@/saidar
++ at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chown root $(DESTDIR)@bindir@/saidar || true
++ at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chmod u+s $(DESTDIR)@bindir@/saidar || true
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/libstatgrab.spec b/libstatgrab.spec
index 1cd60ed..ff49b73 100644
--- a/libstatgrab.spec
+++ b/libstatgrab.spec
@@ -8,6 +8,7 @@ Release: 1%{?dist}.1
Epoch: 1
Source0: http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
+Patch0: %{name}.nochmod.patch
License: LGPLv2+
Group: System Environment/Libraries
@@ -66,6 +67,7 @@ to develop libstatgrab based applications.
%prep
%setup -q
+%patch0 -p0
%build
%configure --with-ncurses --disable-static
More information about the scm-commits
mailing list