Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (5bfcfd3c430f47727d9f393bf5b1085145409fd6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (5bfcfd3c430f47727d9f393bf5b1085145409fd6)
  • Date: Fri, 28 Jan 2011 04:26:42 -0600

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

libs/libcap/HISTORY | 4 +
libs/libcap/PRE_BUILD | 3 -
libs/libcap/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch | 29
++++++++++
3 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 5bfcfd3c430f47727d9f393bf5b1085145409fd6
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libcap: added patch to fix install problem without linux-pam (bug #15932)

diff --git a/libs/libcap/HISTORY b/libs/libcap/HISTORY
index 44e9e58..9e40d06 100644
--- a/libs/libcap/HISTORY
+++ b/libs/libcap/HISTORY
@@ -1,3 +1,7 @@
+2011-01-28 Bor Kraljič <pyrobor AT ver.si>
+ * libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch: added for
install
+ problem without linux-pam (bug #15932)
+
2011-01-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.20

diff --git a/libs/libcap/PRE_BUILD b/libs/libcap/PRE_BUILD
index 0b7ad7b..7143ba1 100755
--- a/libs/libcap/PRE_BUILD
+++ b/libs/libcap/PRE_BUILD
@@ -8,4 +8,5 @@ sed -i "s:^COPTFLAGS=.*:COPTFLAG=${CFLAGS}:; \
s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" Make.Rules &&

# there's no indent for gperf..
-sed -i "s:\$(INDENT)::" libcap/Makefile
+sed -i "s:\$(INDENT)::" libcap/Makefile &&
+patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
diff --git
a/libs/libcap/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
b/libs/libcap/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
new file mode 100644
index 0000000..1bc4d63
--- /dev/null
+++ b/libs/libcap/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
@@ -0,0 +1,29 @@
+From f2020ee4ee4b2f245637c77e81d62ab6d1db3c6c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT gentoo.org>
+Date: Tue, 25 Jan 2011 15:52:31 -0500
+Subject: [PATCH] ignore RAISE_SETFCAP install failures
+
+While the new RAISE_SETFCAP feature is nifty, its failure to run (often
+due to the fs not supporting it) shouldn't impair the default install.
+
+Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
+---
+ progs/Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/progs/Makefile b/progs/Makefile
+index c261f57..9e1a84d 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -30,7 +30,7 @@ install: all
+ install -m 0755 $$p $(SBINDIR) ; \
+ done
+ ifeq ($(RAISE_SETFCAP),yes)
+- $(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap
++ -$(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap
+ endif
+
+ clean:
+--
+1.7.4.rc2
+



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (5bfcfd3c430f47727d9f393bf5b1085145409fd6), Bor Kraljič, 01/28/2011

Archive powered by MHonArc 2.6.24.

Top of Page