Remove pam.d installation from a number of packages.

diff --git a/pkgs/core/coreutils/coreutils.nm b/pkgs/core/coreutils/coreutils.nm
index 9d9d40968fbf016f06727f6d0795ff68c99430ae..1b3cc4121c82539e636202939a9c404210878e6d 100644 (file)
--- a/pkgs/core/coreutils/coreutils.nm
+++ b/pkgs/core/coreutils/coreutils.nm
@@ -71,7 +71,7 @@ endef
 define STAGE_INSTALL
        cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
 
-       -mkdir -pv $(BUILDROOT)/{bin,etc/{pam,profile}.d,usr/sbin}
+       -mkdir -pv $(BUILDROOT)/{bin,etc/profile.d,usr/sbin}
        mv -v $(BUILDROOT)/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} $(BUILDROOT)/bin
        mv -v $(BUILDROOT)/usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} $(BUILDROOT)/bin
        mv -v $(BUILDROOT)/usr/bin/{rmdir,stty,sync,touch,true,uname} $(BUILDROOT)/bin
@@ -83,7 +83,4 @@ define STAGE_INSTALL
        # Dump /etc/dircolors.
        dircolors -p > $(BUILDROOT)/etc/dircolors
        cp -vf $(DIR_SOURCE)/profile.d/dircolors.sh $(BUILDROOT)/etc/profile.d
-
-       # PAM
-       cp -vf $(DIR_SOURCE)/pam.d/su{,-l} $(BUILDROOT)/etc/pam.d
 endef

diff --git a/pkgs/core/openssh/openssh.nm b/pkgs/core/openssh/openssh.nm
index c5d05146dc33541962365eb0647c1a1055243e0c..5505653042727ebcc3a26da6aab9a08d00a635ff 100644 (file)
--- a/pkgs/core/openssh/openssh.nm
+++ b/pkgs/core/openssh/openssh.nm
@@ -58,9 +58,6 @@ CONFIGURE_OPTIONS += \
        --with-pam
 
 define STAGE_INSTALL_CMDS
-       -mkdir -pv $(BUILDROOT)/etc/pam.d
-       cp -vf $(DIR_SOURCE)/sshd.pam $(BUILDROOT)/etc/pam.d/sshd
-
        -mkdir -pv $(BUILDROOT)/etc/ssh
        cp -vf $(DIR_SOURCE)/sshd_config $(BUILDROOT)/etc/ssh/sshd_config
 endef

diff --git a/pkgs/core/pam/pam.nm b/pkgs/core/pam/pam.nm
index b581ac71aefbeff5b96707f040c3e12ac24caf22..e2c92fc71b72183317b400fe956b57196755bb7b 100644 (file)
--- a/pkgs/core/pam/pam.nm
+++ b/pkgs/core/pam/pam.nm
@@ -80,7 +80,4 @@ define STAGE_INSTALL
        -mkdir -pv $(BUILDROOT)/etc/security
        install -v -m644 $(DIR_SOURCE)/pam_env.conf $(BUILDROOT)/etc/security/pam_env.conf
        cp -vf $(DIR_SOURCE)/{login.defs,securetty} $(BUILDROOT)/etc
-
-       -mkdir -pv $(BUILDROOT)/etc/pam.d
-       cp -vf $(DIR_SOURCE)/pam.d/{other,system-auth} $(BUILDROOT)/etc/pam.d/
 endef

diff --git a/pkgs/core/ppp/ppp.nm b/pkgs/core/ppp/ppp.nm
index 2a2afa92b54b3d97708a1550842d421dab55e146..5df5344f6c7e280e36dd75afef00e81ea9e19113 100644 (file)
--- a/pkgs/core/ppp/ppp.nm
+++ b/pkgs/core/ppp/ppp.nm
@@ -73,7 +73,4 @@ define STAGE_INSTALL
        chmod -v 600 $(BUILDROOT)/etc/ppp/secrets
        ln -svf secrets $(BUILDROOT)/etc/ppp/pap-secrets
        ln -svf secrets $(BUILDROOT)/etc/ppp/chap-secrets
-
-       -mkdir -pv $(BUILDROOT)/etc/pam.d/
-       cp -vf $(DIR_SOURCE)/ppp.pam $(BUILDROOT)/etc/pam.d/
 endef

diff --git a/pkgs/core/screen/screen.nm b/pkgs/core/screen/screen.nm
index d029d34c72eca705cb880f9927a8ea4a71909c4a..c0f90524a200904f627d625487f4cd084037354e 100644 (file)
--- a/pkgs/core/screen/screen.nm
+++ b/pkgs/core/screen/screen.nm
@@ -61,8 +61,4 @@ define STAGE_INSTALL_CMDS
        # Install screenrc
        -mkdir -pv $(BUILDROOT)/etc
        cp -vf $(DIR_SOURCE)/screenrc $(BUILDROOT)/etc/screenrc
-
-       # Install pam file
-       -mkdir -pv $(BUILDROOT)/etc/pam.d/
-       cp -vf $(DIR_SOURCE)/screen.pam $(BUILDROOT)/etc/pam.d/
 endef

diff --git a/pkgs/core/sudo/sudo.nm b/pkgs/core/sudo/sudo.nm
index c5c6edde7a371fc4e1924e4629acadc9e5901b1c..c83dff1bdacf61077981402d3470b88491888e40 100644 (file)
--- a/pkgs/core/sudo/sudo.nm
+++ b/pkgs/core/sudo/sudo.nm
@@ -65,7 +65,4 @@ CONFIGURE_OPTIONS += \
 define STAGE_INSTALL_CMDS
        -mkdir -pv $(BUILDROOT)/etc
        cp -vf $(DIR_SOURCE)/sudoers $(BUILDROOT)/etc/sudoers
-
-       -mkdir -pv $(BUILDROOT)/etc/pam.d
-       cp -vf $(DIR_SOURCE)/sudo.pam $(BUILDROOT)/etc/pam.d/sudo
 endef

diff --git a/pkgs/core/util-linux-ng/util-linux-ng.nm b/pkgs/core/util-linux-ng/util-linux-ng.nm
index 287d1e00b24cfeceb6cb642bb195115c21f1a0d4..2bac513987666acaeb98359f962a07eb49b19f18 100644 (file)
--- a/pkgs/core/util-linux-ng/util-linux-ng.nm
+++ b/pkgs/core/util-linux-ng/util-linux-ng.nm
@@ -95,10 +95,6 @@ define STAGE_INSTALL
        # Remove deprecated commands
        rm -fv $(BUILDROOT)/{sbin,usr/share/man/man*}/{fsck,mkfs}.{bfs,minix}*
 
-       # PAM
-       -mkdir -pv $(BUILDROOT)/etc/pam.d
-       cp -vf $(DIR_SOURCE)/pam.d/login $(BUILDROOT)/etc/pam.d
-
        # Set capabilities
        chmod -v -s $(BUILDROOT)/bin/mount
        setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep $(BUILDROOT)/bin/mount