summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-01-26 03:31:49 +0000
committerMike Frysinger <vapier@gentoo.org>2011-01-26 03:31:49 +0000
commit322e3920edefc55c6fd461e137c0e0ce14aee04a (patch)
treea5f48ef3ddbf83ba460d80562f09b8257e2a9dc4 /sys-libs/libcap
parentDrop some of the user changes to the ebuild and keep the code from the 1.2.x ... (diff)
downloadgentoo-2-322e3920edefc55c6fd461e137c0e0ce14aee04a.tar.gz
gentoo-2-322e3920edefc55c6fd461e137c0e0ce14aee04a.tar.bz2
gentoo-2-322e3920edefc55c6fd461e137c0e0ce14aee04a.zip
Also build pam module with -fPIC #352758 by Seemant Kulleen.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/libcap')
-rw-r--r--sys-libs/libcap/ChangeLog6
-rw-r--r--sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch19
2 files changed, 19 insertions, 6 deletions
diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index fc979d498732..d1271d87a973 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/libcap
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.105 2011/01/25 21:00:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.106 2011/01/26 03:31:49 vapier Exp $
+
+ 26 Jan 2011; Mike Frysinger <vapier@gentoo.org>
+ files/libcap-2.20-build-system-fixes.patch:
+ Also build pam module with -fPIC #352758 by Seemant Kulleen.
*libcap-2.20 (25 Jan 2011)
diff --git a/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch
index 4e113fb93866..c7273df39a8c 100644
--- a/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch
+++ b/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch
@@ -1,4 +1,4 @@
-From bb4491059b315433a421e8fd37286f1a0077fd1e Mon Sep 17 00:00:00 2001
+From 5540f3c2a3bd70ebc8140b74ac5a0aecdbc53234 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 16 Nov 2008 09:10:31 -0500
Subject: [PATCH] build system fixes
@@ -16,9 +16,9 @@ Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
Make.Rules | 25 +++++++++++++------------
libcap/Makefile | 11 ++++++-----
- pam_cap/Makefile | 6 +++---
+ pam_cap/Makefile | 8 +++++---
progs/Makefile | 2 +-
- 4 files changed, 23 insertions(+), 21 deletions(-)
+ 4 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/Make.Rules b/Make.Rules
index 011aa14..6e432a6 100644
@@ -115,10 +115,19 @@ index 4762c60..cf99523 100644
install: all
mkdir -p -m 0755 $(INCDIR)/sys
diff --git a/pam_cap/Makefile b/pam_cap/Makefile
-index 9ca5bef..be49338 100644
+index 9ca5bef..bdae933 100644
--- a/pam_cap/Makefile
+++ b/pam_cap/Makefile
-@@ -17,13 +17,13 @@ install: all
+@@ -9,6 +9,8 @@ include ../Make.Rules
+ # written (and you know why it fails), email me and explain why. Thanks!
+ LDLIBS += -L../libcap -lcap
+
++CFLAGS += -fPIC
++
+ all: pam_cap.so
+ $(MAKE) testcompile
+
+@@ -17,13 +19,13 @@ install: all
install -m 0755 pam_cap.so $(LIBDIR)/security
pam_cap.so: pam_cap.o