saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 36c376b43d67233a1c9a5ba91fafb7ef1bbcd811..32b721fc89b9892e17c0c30870f6765d18031a07 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -84,6 +84,9 @@ maybe chmod 0644 './config-archive/etc/bash/bashrc'
 maybe chmod 0644 './config-archive/etc/bash/bashrc.dist.new'
 maybe chmod 0644 './config-archive/etc/man.conf'
 maybe chmod 0644 './config-archive/etc/man.conf.dist'
+maybe chmod 0755 './config-archive/etc/pam.d'
+maybe chmod 0644 './config-archive/etc/pam.d/system-login'
+maybe chmod 0644 './config-archive/etc/pam.d/system-login.dist'
 maybe chmod 0755 './cron.d'
 maybe chmod 0644 './cron.d/.keep_sys-process_vixie-cron-0'
 maybe chmod 0750 './cron.daily'
@@ -434,7 +437,6 @@ maybe chmod 0755 './openldap'
 maybe chmod 0644 './openldap/ldap.conf'
 maybe chmod 0644 './openldap/ldap.conf.default'
 maybe chmod 0755 './pam.d'
-maybe chmod 0644 './pam.d/._cfg0000_system-login'
 maybe chmod 0644 './pam.d/chage'
 maybe chmod 0644 './pam.d/chfn'
 maybe chmod 0644 './pam.d/chgpasswd'

diff --git a/config-archive/etc/pam.d/system-login b/config-archive/etc/pam.d/system-login
new file mode 100644 (file)
index 0000000..a20e8f9
--- /dev/null
+++ b/config-archive/etc/pam.d/system-login
@@ -0,0 +1,19 @@
+auth           required        pam_tally2.so onerr=succeed
+auth           required        pam_shells.so 
+auth           required        pam_nologin.so 
+auth           include         system-auth
+                               
+account                required        pam_access.so 
+account                required        pam_nologin.so 
+account                include         system-auth
+account                required        pam_tally2.so onerr=succeed 
+ 
+password       include         system-auth
+ 
+session         optional        pam_loginuid.so
+session                required        pam_env.so 
+session                optional        pam_lastlog.so 
+session                include         system-auth
+session                optional        pam_motd.so motd=/etc/motd
+session                optional        pam_mail.so
+  

diff --git a/config-archive/etc/pam.d/system-login.dist b/config-archive/etc/pam.d/system-login.dist
new file mode 100644 (file)
index 0000000..2345bb0
--- /dev/null
+++ b/config-archive/etc/pam.d/system-login.dist
@@ -0,0 +1,23 @@
+auth           required        pam_tally2.so onerr=succeed
+auth           required        pam_shells.so 
+auth           required        pam_nologin.so 
+auth           include         system-auth
+auth           optional        pam_gnome_keyring.so
+                               
+account                required        pam_access.so 
+account                required        pam_nologin.so 
+account                include         system-auth
+account                required        pam_tally2.so onerr=succeed 
+ 
+password       include         system-auth
+password       optional        pam_gnome_keyring.so
+ 
+session         optional        pam_loginuid.so
+session                required        pam_env.so 
+session                optional        pam_lastlog.so 
+session                include         system-auth
+session                optional        pam_ck_connector.so nox11
+session                optional        pam_gnome_keyring.so auto_start
+session                optional        pam_motd.so motd=/etc/motd
+session                optional        pam_mail.so
+  

diff --git a/dispatch-conf.conf b/dispatch-conf.conf
index 7eea44c8e46a1730b071906728cd25ef1d56a020..d0e216efc627059a7a18ced4a7798dbe286dd16f 100644 (file)
--- a/dispatch-conf.conf
+++ b/dispatch-conf.conf
@@ -22,7 +22,8 @@ use-rcs=no
 # %s new file
 # If using colordiff instead of diff, the less -R option may be required
 # for correct display.
-diff="diff -Nu '%s' '%s'"
+#diff="diff -Nu '%s' '%s'"
+diff="diff -Nu '%s' '%s'" | colordiff
 
 # Set the pager for use with diff commands (this will
 # cause the PAGER environment variable to be ignored).
@@ -44,18 +45,18 @@ replace-cvs=yes
 
 # Automerge files comprising only whitespace and/or comments
 # (yes or no)
-replace-wscomments=no
+replace-wscomments=yes
 
 # Automerge files that the user hasn't modified
 # (yes or no)
-replace-unmodified=no
+replace-unmodified=yes
 
 # Ignore a version that is identical to the previously merged version,
 # even though it is different from the current user modified version
 # Note that emerge already has a similar feature enabled by default,
 # which can be disabled by the emerge --noconfmem option.
 # (yes or no)
-ignore-previously-merged=no
+ignore-previously-merged=yes
 
 # Per-session log file of changes made to configuration files
 #log-file=/var/log/dispatch-conf.log

diff --git a/make.conf b/make.conf
index c4852d04b356c2a3c8f0a9868c9389766e9592f1..fedba6b7c4d5d55e1557fe9f10a54c987130a11f 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -70,7 +70,7 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards
      mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp
      musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis
      nptl nsplugin odbc ogg openal openexr opengl pango par pch pcntl pcre pdf perl
-     perlsuid plasma plotutils png policykit posix ppds projectm pulseaudio python quicktime real
+     perlsuid plasma plotutils png policykit portage posix ppds projectm pulseaudio python quicktime real
      rdesktop rle samba sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp
      sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh
      subversion svg sysvipc tetex theora thumbnail tidy timidity tiff

diff --git a/pam.d/._cfg0000_system-login b/pam.d/._cfg0000_system-login
deleted file mode 100644 (file)
index 2345bb0..0000000
--- a/pam.d/._cfg0000_system-login
+++ /dev/null
@@ -1,23 +0,0 @@
-auth           required        pam_tally2.so onerr=succeed
-auth           required        pam_shells.so 
-auth           required        pam_nologin.so 
-auth           include         system-auth
-auth           optional        pam_gnome_keyring.so
-                               
-account                required        pam_access.so 
-account                required        pam_nologin.so 
-account                include         system-auth
-account                required        pam_tally2.so onerr=succeed 
- 
-password       include         system-auth
-password       optional        pam_gnome_keyring.so
- 
-session         optional        pam_loginuid.so
-session                required        pam_env.so 
-session                optional        pam_lastlog.so 
-session                include         system-auth
-session                optional        pam_ck_connector.so nox11
-session                optional        pam_gnome_keyring.so auto_start
-session                optional        pam_motd.so motd=/etc/motd
-session                optional        pam_mail.so
-  

diff --git a/pam.d/system-login b/pam.d/system-login
index a20e8f9d5ee5a342f83ec23771e47783ab1b088d..2345bb0fa8f0f51a383fbf2bfd24632ec7e6e6ef 100644 (file)
--- a/pam.d/system-login
+++ b/pam.d/system-login
@@ -2,6 +2,7 @@ auth            required        pam_tally2.so onerr=succeed
 auth           required        pam_shells.so 
 auth           required        pam_nologin.so 
 auth           include         system-auth
+auth           optional        pam_gnome_keyring.so
                                
 account                required        pam_access.so 
 account                required        pam_nologin.so 
@@ -9,11 +10,14 @@ account              include         system-auth
 account                required        pam_tally2.so onerr=succeed 
  
 password       include         system-auth
+password       optional        pam_gnome_keyring.so
  
 session         optional        pam_loginuid.so
 session                required        pam_env.so 
 session                optional        pam_lastlog.so 
 session                include         system-auth
+session                optional        pam_ck_connector.so nox11
+session                optional        pam_gnome_keyring.so auto_start
 session                optional        pam_motd.so motd=/etc/motd
 session                optional        pam_mail.so