* [gentoo-commits] gentoo-x86 commit in eclass: pam.eclass
@ 2008-03-20 23:21 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 8+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2008-03-20 23:21 UTC (permalink / raw
To: gentoo-commits
eva 08/03/20 23:21:37
Modified: pam.eclass
Log:
adding quotes for ${D} (although it should never need it)
Revision Changes Path
1.16 eclass/pam.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?r1=1.15&r2=1.16
Index: pam.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pam.eclass 20 Feb 2008 00:00:01 -0000 1.15
+++ pam.eclass 20 Mar 2008 23:21:37 -0000 1.16
@@ -1,7 +1,7 @@
# Copyright 2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.15 2008/02/20 00:00:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.16 2008/03/20 23:21:37 eva Exp $
#
# This eclass contains functions to install pamd configuration files and
# pam modules.
@@ -176,7 +176,7 @@
cleanpamd() {
while [[ -n $1 ]]; do
if ! has_version sys-libs/pam; then
- sed -i -e '/pam_shells\|pam_console/s:^:#:' ${D}/etc/pam.d/$1
+ sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/pam.d/$1"
fi
shift
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: pam.eclass
@ 2012-08-05 15:34 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-08-05 15:34 UTC (permalink / raw
To: gentoo-commits
jlec 12/08/05 15:34:20
Modified: pam.eclass
Log:
Add magic needed for app-portage/eclass-manpages to pam.eclass, changes approved by author
Revision Changes Path
1.23 eclass/pam.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?r1=1.22&r2=1.23
Index: pam.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pam.eclass 27 Dec 2011 17:55:12 -0000 1.22
+++ pam.eclass 5 Aug 2012 15:34:20 -0000 1.23
@@ -1,18 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.22 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.23 2012/08/05 15:34:20 jlec Exp $
#
+
+# @ECLASS: pam.eclass
+# @MAINTAINER:
+# pam-bugs@gentoo.org
+# @AUTHOR:
+# Diego Pettenò <flameeyes@gentoo.org>
+# @BLURB: Handles pam related tasks
+# @DESCRIPTION:
# This eclass contains functions to install pamd configuration files and
# pam modules.
if [[ ${___ECLASS_ONCE_PAM} != "recur -_+^+_- spank" ]] ; then
___ECLASS_ONCE_PAM="recur -_+^+_- spank"
-inherit multilib flag-o-matic
+inherit flag-o-matic multilib
-# dopamd <file> [more files]
-#
+# @FUNCTION: dopamd
+# @USAGE: <file> [more files]
+# @DESCRIPTION:
# Install pam auth config file in /etc/pam.d
dopamd() {
[[ -z $1 ]] && die "dopamd requires at least one argument"
@@ -29,8 +37,9 @@
cleanpamd "$@"
}
-# newpamd <old name> <new name>
-#
+# @FUNCTION: newpamd
+# @USAGE: <old name> <new name>
+# @DESCRIPTION:
# Install pam file <old name> as <new name> in /etc/pam.d
newpamd() {
[[ $# -ne 2 ]] && die "newpamd requires two arguments"
@@ -47,8 +56,9 @@
cleanpamd $2
}
-# dopamsecurity <section> <file> [more files]
-#
+# @FUNCTION: dopamsecurity
+# @USAGE: <section> <file> [more files]
+# @DESCRIPTION:
# Installs the config files in /etc/security/<section>/
dopamsecurity() {
[[ $# -lt 2 ]] && die "dopamsecurity requires at least two arguments"
@@ -64,8 +74,9 @@
) || die "failed to install ${@:2}"
}
-# newpamsecurity <section> <old name> <new name>
-#
+# @FUNCTION: newpamsecurity
+# @USAGE: <section> <old name> <new name>
+# @DESCRIPTION:
# Installs the config file <old name> as <new name> in /etc/security/<section>/
newpamsecurity() {
[[ $# -ne 3 ]] && die "newpamsecurity requires three arguments"
@@ -81,8 +92,8 @@
) || die "failed to install $2 as $3"
}
-# getpam_mod_dir
-#
+# @FUNCTION: getpam_mod_dir
+# @DESCRIPTION:
# Returns the pam modules' directory for current implementation
getpam_mod_dir() {
if has_version sys-libs/pam || has_version sys-libs/openpam; then
@@ -95,8 +106,8 @@
echo ${PAM_MOD_DIR}
}
-# pammod_hide_symbols
-#
+# @FUNCTION: pammod_hide_symbols
+# @DESCRIPTION:
# Hide all non-PAM-used symbols from the module; this function creates a
# simple ld version script that hides all the symbols that are not
# necessary for PAM to load the module, then uses append-flags to make
@@ -112,8 +123,9 @@
append-ldflags -Wl,--version-script="${T}"/pam-eclass-pam_symbols.ver
}
-# dopammod <file> [more files]
-#
+# @FUNCTION: dopammod
+# @USAGE: <file> [more files]
+# @DESCRIPTION:
# Install pam module file in the pam modules' dir for current implementation
dopammod() {
[[ -z $1 ]] && die "dopammod requires at least one argument"
@@ -126,8 +138,9 @@
doexe "$@" || die "failed to install $@"
}
-# newpammod <old name> <new name>
-#
+# @FUNCTION: newpammod
+# @USAGE: <old name> <new name>
+# @DESCRIPTION:
# Install pam module file <old name> as <new name> in the pam
# modules' dir for current implementation
newpammod() {
@@ -141,8 +154,9 @@
newexe "$1" "$2" || die "failed to install $1 as $2"
}
-# pamd_mimic_system <pamd file> [auth levels]
-#
+# @FUNCTION: pamd_mimic_system
+# @USAGE: <pamd file> [auth levels]
+# @DESCRIPTION:
# This function creates a pamd file which mimics system-auth file
# for the given levels in the /etc/pam.d directory.
pamd_mimic_system() {
@@ -150,8 +164,9 @@
pamd_mimic system-auth "$@"
}
-# pamd_mimic <stack> <pamd file> [auth levels]
-#
+# @FUNCTION: pamd_mimic
+# @USAGE: <stack> <pamd file> [auth levels]
+# @DESCRIPTION:
# This function creates a pamd file which mimics the given stack
# for the given levels in the /etc/pam.d directory.
pamd_mimic() {
@@ -186,8 +201,9 @@
done
}
-# cleanpamd <pamd file>
-#
+# @FUNCTION: cleanpamd
+# @USAGE: <pamd file>
+# @DESCRIPTION:
# Cleans a pam.d file from modules that might not be present on the system
# where it's going to be installed
cleanpamd() {
@@ -200,6 +216,10 @@
done
}
+# @FUNCTION: pam_epam_expand
+# @USAGE: <pamd file>
+# @DESCRIPTION:
+# Steer clear, deprecated, don't use, bad experiment
pam_epam_expand() {
sed -n -e 's|#%EPAM-\([[:alpha:]-]\+\):\([-+<>=/.![:alnum:]]\+\)%#.*|\1 \2|p' \
"$@" | sort -u | while read condition parameter; do
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: pam.eclass
@ 2011-12-17 4:20 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-17 4:20 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/17 04:20:52
Modified: pam.eclass
Log:
avoid multiple inclusions when possible to speed caching up
Revision Changes Path
1.21 eclass/pam.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?r1=1.20&r2=1.21
Index: pam.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pam.eclass 8 Jul 2011 11:35:01 -0000 1.20
+++ pam.eclass 17 Dec 2011 04:20:52 -0000 1.21
@@ -1,11 +1,14 @@
# Copyright 2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.20 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.21 2011/12/17 04:20:52 vapier Exp $
#
# This eclass contains functions to install pamd configuration files and
# pam modules.
+if [[ ${___ECLASS_ONCE_PAM} != "recur -_+^+_- spank" ]] ; then
+___ECLASS_ONCE_PAM="recur -_+^+_- spank"
+
inherit multilib flag-o-matic
# dopamd <file> [more files]
@@ -235,3 +238,5 @@
#
# eshopts_pop # reset old shell opts
# }
+
+fi
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: pam.eclass
@ 2011-02-05 22:29 Diego Petteno (flameeyes)
0 siblings, 0 replies; 8+ messages in thread
From: Diego Petteno (flameeyes) @ 2011-02-05 22:29 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/02/05 22:29:40
Modified: pam.eclass
Log:
Add a function to make it easier to hide non-pam symbols from modules.
Rather than reinventing the wheel and adding a stupid file to each of
the packages, use a single function to create a temporary file and use
that.
Revision Changes Path
1.19 eclass/pam.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?r1=1.18&r2=1.19
Index: pam.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pam.eclass 11 Dec 2009 20:33:11 -0000 1.18
+++ pam.eclass 5 Feb 2011 22:29:40 -0000 1.19
@@ -1,12 +1,12 @@
# Copyright 2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.18 2009/12/11 20:33:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.19 2011/02/05 22:29:40 flameeyes Exp $
#
# This eclass contains functions to install pamd configuration files and
# pam modules.
-inherit multilib
+inherit multilib flag-o-matic
# dopamd <file> [more files]
#
@@ -92,6 +92,23 @@
echo ${PAM_MOD_DIR}
}
+# pammod_hide_symbols
+#
+# Hide all non-PAM-used symbols from the module; this function creates a
+# simple ld version script that hides all the symbols that are not
+# necessary for PAM to load the module, then uses append-flags to make
+# sure that it gets used.
+pammod_hide_symbols() {
+ cat - > "${T}"/pam-eclass-pam_symbols.ver <<EOF
+{
+ global: pam_sm_*;
+ local: *;
+};
+EOF
+
+ append-ldflags -Wl,--version-script="${T}"/pam-eclass-pam_symbols.ver
+}
+
# dopammod <file> [more files]
#
# Install pam module file in the pam modules' dir for current implementation
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: pam.eclass
@ 2009-12-11 20:33 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2009-12-11 20:33 UTC (permalink / raw
To: gentoo-commits
vapier 09/12/11 20:33:11
Modified: pam.eclass
Log:
use eshopts_{push,pop} helpers
Revision Changes Path
1.18 eclass/pam.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?r1=1.17&r2=1.18
Index: pam.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pam.eclass 28 Jun 2008 19:57:40 -0000 1.17
+++ pam.eclass 11 Dec 2009 20:33:11 -0000 1.18
@@ -1,7 +1,7 @@
# Copyright 2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.17 2008/06/28 19:57:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.18 2009/12/11 20:33:11 vapier Exp $
#
# This eclass contains functions to install pamd configuration files and
# pam modules.
@@ -212,10 +212,9 @@
# Think about it before uncommenting this one, for now run it by hand
# pam_pkg_preinst() {
-# local shopts=$-
-# set -o noglob # so that bash doen't expand "*"
+# eshopts_push -o noglob # so that bash doen't expand "*"
#
# pam_epam_expand "${D}"/etc/pam.d/*
#
-# set +o noglob; set -$shopts # reset old shell opts
+# eshopts_pop # reset old shell opts
# }
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: pam.eclass
@ 2008-06-28 19:57 Fabian Groffen (grobian)
0 siblings, 0 replies; 8+ messages in thread
From: Fabian Groffen (grobian) @ 2008-06-28 19:57 UTC (permalink / raw
To: gentoo-commits
grobian 08/06/28 19:57:40
Modified: pam.eclass
Log:
Not sure where pam would be on ppc-macos, at least for now we don't need
it. To be reconsidered again when/if ppc-macos returns.
Revision Changes Path
1.17 eclass/pam.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?r1=1.16&r2=1.17
Index: pam.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pam.eclass 20 Mar 2008 23:21:37 -0000 1.16
+++ pam.eclass 28 Jun 2008 19:57:40 -0000 1.17
@@ -1,7 +1,7 @@
# Copyright 2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.16 2008/03/20 23:21:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.17 2008/06/28 19:57:40 grobian Exp $
#
# This eclass contains functions to install pamd configuration files and
# pam modules.
@@ -84,9 +84,6 @@
getpam_mod_dir() {
if has_version sys-libs/pam || has_version sys-libs/openpam; then
PAM_MOD_DIR=/$(get_libdir)/security
- elif use ppc-macos; then
- # OSX looks there for pam modules
- PAM_MOD_DIR=/usr/lib/pam
else
# Unable to find PAM implementation... defaulting
PAM_MOD_DIR=/$(get_libdir)/security
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: pam.eclass
@ 2008-02-20 0:00 Diego Petteno (flameeyes)
0 siblings, 0 replies; 8+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-02-20 0:00 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/02/20 00:00:02
Modified: pam.eclass
Log:
Replace pamd_mimic_system with a pamd_mimic function that takes as an
argument the stack that it should mime. pamd_mimic_system is now a
wrapper, which I should deprecated once I'm done with pambase.
Revision Changes Path
1.15 eclass/pam.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?r1=1.14&r2=1.15
Index: pam.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pam.eclass 4 Nov 2007 15:00:27 -0000 1.14
+++ pam.eclass 20 Feb 2008 00:00:01 -0000 1.15
@@ -1,7 +1,7 @@
# Copyright 2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.14 2007/11/04 15:00:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.15 2008/02/20 00:00:01 flameeyes Exp $
#
# This eclass contains functions to install pamd configuration files and
# pam modules.
@@ -130,25 +130,35 @@
# for the given levels in the /etc/pam.d directory.
pamd_mimic_system() {
[[ $# -lt 2 ]] && die "pamd_mimic_system requires at least two argments"
+ pamd_mimic system-auth "$@"
+}
+
+# pamd_mimic <stack> <pamd file> [auth levels]
+#
+# This function creates a pamd file which mimics the given stack
+# for the given levels in the /etc/pam.d directory.
+pamd_mimic() {
+ [[ $# -lt 3 ]] && die "pamd_mimic requires at least three argments"
if hasq pam ${IUSE} && ! use pam; then
return 0;
fi
dodir /etc/pam.d
- pamdfile=${D}/etc/pam.d/$1
- echo -e "# File autogenerated by pamd_mimic_system in pam eclass\n\n" >> \
+ pamdfile=${D}/etc/pam.d/$2
+ echo -e "# File autogenerated by pamd_mimic in pam eclass\n\n" >> \
$pamdfile
+ originalstack=$1
authlevels="auth account password session"
if has_version '<sys-libs/pam-0.78'; then
- mimic="\trequired\t\tpam_stack.so service=system-auth"
+ mimic="\trequired\t\tpam_stack.so service=${originalstack}"
else
- mimic="\tinclude\t\tsystem-auth"
+ mimic="\tinclude\t\t${originalstack}"
fi
- shift
+ shift; shift
while [[ -n $1 ]]; do
hasq $1 ${authlevels} || die "unknown level type"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: pam.eclass
@ 2007-11-04 15:00 Diego Petteno (flameeyes)
0 siblings, 0 replies; 8+ messages in thread
From: Diego Petteno (flameeyes) @ 2007-11-04 15:00 UTC (permalink / raw
To: gentoo-commits
flameeyes 07/11/04 15:00:28
Modified: pam.eclass
Log:
Now that it has been tested, we can remove the EPAM lines that didn't hit, instead of cluttering the pam file.
Revision Changes Path
1.14 eclass/pam.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/pam.eclass?r1=1.13&r2=1.14
Index: pam.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pam.eclass 12 Jul 2007 14:37:40 -0000 1.13
+++ pam.eclass 4 Nov 2007 15:00:27 -0000 1.14
@@ -1,7 +1,7 @@
# Copyright 2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.13 2007/07/12 14:37:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.14 2007/11/04 15:00:27 flameeyes Exp $
#
# This eclass contains functions to install pamd configuration files and
# pam modules.
@@ -177,16 +177,16 @@
sed -n -e 's|#%EPAM-\([[:alpha:]-]\+\):\([-+<>=/.![:alnum:]]\+\)%#.*|\1 \2|p' \
"$@" | sort -u | while read condition parameter; do
- disable="# "
+ disable="yes"
case "$condition" in
If-Has)
message="This can be used only if you have ${parameter} installed"
- has_version "$parameter" && disable=""
+ has_version "$parameter" && disable="no"
;;
Use-Flag)
message="This can be used only if you enabled the ${parameter} USE flag"
- use "$parameter" && disable=""
+ use "$parameter" && disable="no"
;;
*)
eerror "Unknown EPAM condition '${condition}' ('${parameter}')"
@@ -194,11 +194,16 @@
;;
esac
- sed -i -e "s|#%EPAM-${condition}:${parameter}%#|# ${message}\n${disable}|" "$@"
+ if [ "${disable}" = "yes" ]; then
+ sed -i -e "/#%EPAM-${condition}:${parameter/\//\\/}%#/d" "$@"
+ else
+ sed -i -e "s|#%EPAM-${condition}:${parameter}%#||" "$@"
+ fi
+
done
}
-# Think about it before uncommenting this one, for nwo run it by hand
+# Think about it before uncommenting this one, for now run it by hand
# pam_pkg_preinst() {
# local shopts=$-
# set -o noglob # so that bash doen't expand "*"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-08-05 15:34 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-20 23:21 [gentoo-commits] gentoo-x86 commit in eclass: pam.eclass Gilles Dartiguelongue (eva)
-- strict thread matches above, loose matches on Subject: below --
2012-08-05 15:34 Justin Lecher (jlec)
2011-12-17 4:20 Mike Frysinger (vapier)
2011-02-05 22:29 Diego Petteno (flameeyes)
2009-12-11 20:33 Mike Frysinger (vapier)
2008-06-28 19:57 Fabian Groffen (grobian)
2008-02-20 0:00 Diego Petteno (flameeyes)
2007-11-04 15:00 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox