From 4311ef5595c00a1fe196a20b51ed60bdaaa78972 Mon Sep 17 00:00:00 2001
From: frank <frank@uhu1.uhu-banane.de>
Date: Mon, 12 Mar 2012 18:32:53 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 .etckeeper                                    |  9 ++--
 .../etc/eselect/postgresql/slots/9.1/base     |  2 +-
 .../etc/eselect/postgresql/slots/9.1/base.1   |  1 +
 .../eselect/postgresql/slots/9.1/base.dist    |  2 +-
 .../etc/eselect/postgresql/slots/9.1/docs     |  2 +-
 .../etc/eselect/postgresql/slots/9.1/docs.1   |  1 +
 .../eselect/postgresql/slots/9.1/docs.dist    |  2 +-
 .../etc/eselect/postgresql/slots/9.1/server   |  2 +-
 .../etc/eselect/postgresql/slots/9.1/server.1 |  1 +
 .../eselect/postgresql/slots/9.1/server.dist  |  2 +-
 config-archive/etc/init.d/dbus                | 51 +++++++++++++++++++
 .../etc/init.d/dbus.dist                      |  0
 eselect/postgresql/slots/9.1/._cfg0000_base   |  1 -
 eselect/postgresql/slots/9.1/._cfg0000_docs   |  1 -
 eselect/postgresql/slots/9.1/._cfg0000_server |  1 -
 eselect/postgresql/slots/9.1/base             |  2 +-
 eselect/postgresql/slots/9.1/docs             |  2 +-
 eselect/postgresql/slots/9.1/server           |  2 +-
 init.d/dbus                                   |  5 +-
 19 files changed, 70 insertions(+), 19 deletions(-)
 create mode 100644 config-archive/etc/eselect/postgresql/slots/9.1/base.1
 create mode 100644 config-archive/etc/eselect/postgresql/slots/9.1/docs.1
 create mode 100644 config-archive/etc/eselect/postgresql/slots/9.1/server.1
 create mode 100755 config-archive/etc/init.d/dbus
 rename init.d/._cfg0000_dbus => config-archive/etc/init.d/dbus.dist (100%)
 delete mode 100644 eselect/postgresql/slots/9.1/._cfg0000_base
 delete mode 100644 eselect/postgresql/slots/9.1/._cfg0000_docs
 delete mode 100644 eselect/postgresql/slots/9.1/._cfg0000_server

diff --git a/.etckeeper b/.etckeeper
index ccbd186..79db5ef 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -231,10 +231,13 @@ maybe chmod 0755 './config-archive/etc/eselect/postgresql'
 maybe chmod 0755 './config-archive/etc/eselect/postgresql/slots'
 maybe chmod 0755 './config-archive/etc/eselect/postgresql/slots/9.1'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/base'
+maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/base.1'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/base.dist'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/docs'
+maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/docs.1'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/docs.dist'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/server'
+maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/server.1'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/server.dist'
 maybe chmod 0644 './config-archive/etc/hosts'
 maybe chmod 0644 './config-archive/etc/hosts.dist.new'
@@ -243,6 +246,8 @@ maybe chmod 0755 './config-archive/etc/init.d/bootmisc'
 maybe chmod 0755 './config-archive/etc/init.d/bootmisc.dist'
 maybe chmod 0755 './config-archive/etc/init.d/consolefont'
 maybe chmod 0755 './config-archive/etc/init.d/consolefont.dist'
+maybe chmod 0755 './config-archive/etc/init.d/dbus'
+maybe chmod 0755 './config-archive/etc/init.d/dbus.dist'
 maybe chmod 0755 './config-archive/etc/init.d/fsck'
 maybe chmod 0755 './config-archive/etc/init.d/fsck.dist'
 maybe chmod 0755 './config-archive/etc/init.d/hwclock'
@@ -536,9 +541,6 @@ maybe chmod 0644 './eselect/postgresql/active.links'
 maybe chmod 0644 './eselect/postgresql/active.links91'
 maybe chmod 0755 './eselect/postgresql/slots'
 maybe chmod 0755 './eselect/postgresql/slots/9.1'
-maybe chmod 0644 './eselect/postgresql/slots/9.1/._cfg0000_base'
-maybe chmod 0644 './eselect/postgresql/slots/9.1/._cfg0000_docs'
-maybe chmod 0644 './eselect/postgresql/slots/9.1/._cfg0000_server'
 maybe chmod 0644 './eselect/postgresql/slots/9.1/base'
 maybe chmod 0644 './eselect/postgresql/slots/9.1/docs'
 maybe chmod 0644 './eselect/postgresql/slots/9.1/server'
@@ -671,7 +673,6 @@ maybe chmod 0644 './idn.conf.sample'
 maybe chmod 0644 './idnalias.conf'
 maybe chmod 0644 './idnalias.conf.sample'
 maybe chmod 0755 './init.d'
-maybe chmod 0755 './init.d/._cfg0000_dbus'
 maybe chmod 0755 './init.d/acpid'
 maybe chmod 0755 './init.d/amavisd'
 maybe chmod 0755 './init.d/apache2'
diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/base b/config-archive/etc/eselect/postgresql/slots/9.1/base
index 25e967a..479bd41 100644
--- a/config-archive/etc/eselect/postgresql/slots/9.1/base
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/base
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.1"
+postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.2"
diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/base.1 b/config-archive/etc/eselect/postgresql/slots/9.1/base.1
new file mode 100644
index 0000000..25e967a
--- /dev/null
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/base.1
@@ -0,0 +1 @@
+postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.1"
diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/base.dist b/config-archive/etc/eselect/postgresql/slots/9.1/base.dist
index 479bd41..34425d9 100644
--- a/config-archive/etc/eselect/postgresql/slots/9.1/base.dist
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/base.dist
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.3"
diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/docs b/config-archive/etc/eselect/postgresql/slots/9.1/docs
index 133932c..8cec4d4 100644
--- a/config-archive/etc/eselect/postgresql/slots/9.1/docs
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/docs
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.1"
+postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.2"
diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/docs.1 b/config-archive/etc/eselect/postgresql/slots/9.1/docs.1
new file mode 100644
index 0000000..133932c
--- /dev/null
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/docs.1
@@ -0,0 +1 @@
+postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.1"
diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/docs.dist b/config-archive/etc/eselect/postgresql/slots/9.1/docs.dist
index 8cec4d4..4b0d9a8 100644
--- a/config-archive/etc/eselect/postgresql/slots/9.1/docs.dist
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/docs.dist
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.3"
diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/server b/config-archive/etc/eselect/postgresql/slots/9.1/server
index cc2c76b..7a0a9c0 100644
--- a/config-archive/etc/eselect/postgresql/slots/9.1/server
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/server
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.1"
+postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.2-r2"
diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/server.1 b/config-archive/etc/eselect/postgresql/slots/9.1/server.1
new file mode 100644
index 0000000..cc2c76b
--- /dev/null
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/server.1
@@ -0,0 +1 @@
+postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.1"
diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/server.dist b/config-archive/etc/eselect/postgresql/slots/9.1/server.dist
index 7a0a9c0..a02e087 100644
--- a/config-archive/etc/eselect/postgresql/slots/9.1/server.dist
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/server.dist
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.2-r2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.3"
diff --git a/config-archive/etc/init.d/dbus b/config-archive/etc/init.d/dbus
new file mode 100755
index 0000000..502f40f
--- /dev/null
+++ b/config-archive/etc/init.d/dbus
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.5 2011/09/23 12:45:03 polynomial-c Exp $
+
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	after bootmisc
+}
+
+start() {
+	ebegin "Starting D-BUS system messagebus"
+
+	/usr/bin/dbus-uuidgen --ensure
+
+	# We need to test if /var/run/dbus exists, since script will fail if it does not
+	[ ! -e /var/run/dbus ] && mkdir /var/run/dbus 
+
+	start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
+	eend $?
+}
+
+stop() {
+	local retval
+
+	ebegin "Stopping D-BUS system messagebus"
+
+	start-stop-daemon --stop --pidfile /var/run/dbus.pid
+	retval=$?
+
+	eend ${retval}
+
+	[ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
+
+	return ${retval}
+}
+
+reload() {
+	local retval
+
+	ebegin "Reloading D-BUS messagebus config"
+	
+	/usr/bin/dbus-send --print-reply --system --type=method_call \
+			--dest=org.freedesktop.DBus \
+			/ org.freedesktop.DBus.ReloadConfig > /dev/null
+	retval=$?
+	eend ${retval}
+	return ${retval}
+}
diff --git a/init.d/._cfg0000_dbus b/config-archive/etc/init.d/dbus.dist
similarity index 100%
rename from init.d/._cfg0000_dbus
rename to config-archive/etc/init.d/dbus.dist
diff --git a/eselect/postgresql/slots/9.1/._cfg0000_base b/eselect/postgresql/slots/9.1/._cfg0000_base
deleted file mode 100644
index 34425d9..0000000
--- a/eselect/postgresql/slots/9.1/._cfg0000_base
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.3"
diff --git a/eselect/postgresql/slots/9.1/._cfg0000_docs b/eselect/postgresql/slots/9.1/._cfg0000_docs
deleted file mode 100644
index 4b0d9a8..0000000
--- a/eselect/postgresql/slots/9.1/._cfg0000_docs
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.3"
diff --git a/eselect/postgresql/slots/9.1/._cfg0000_server b/eselect/postgresql/slots/9.1/._cfg0000_server
deleted file mode 100644
index a02e087..0000000
--- a/eselect/postgresql/slots/9.1/._cfg0000_server
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.3"
diff --git a/eselect/postgresql/slots/9.1/base b/eselect/postgresql/slots/9.1/base
index 479bd41..34425d9 100644
--- a/eselect/postgresql/slots/9.1/base
+++ b/eselect/postgresql/slots/9.1/base
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.3"
diff --git a/eselect/postgresql/slots/9.1/docs b/eselect/postgresql/slots/9.1/docs
index 8cec4d4..4b0d9a8 100644
--- a/eselect/postgresql/slots/9.1/docs
+++ b/eselect/postgresql/slots/9.1/docs
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.3"
diff --git a/eselect/postgresql/slots/9.1/server b/eselect/postgresql/slots/9.1/server
index 7a0a9c0..a02e087 100644
--- a/eselect/postgresql/slots/9.1/server
+++ b/eselect/postgresql/slots/9.1/server
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.2-r2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.3"
diff --git a/init.d/dbus b/init.d/dbus
index 502f40f..65271f6 100755
--- a/init.d/dbus
+++ b/init.d/dbus
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.5 2011/09/23 12:45:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $
 
 extra_started_commands="reload"
 
@@ -12,8 +12,7 @@ depend() {
 
 start() {
 	ebegin "Starting D-BUS system messagebus"
-
-	/usr/bin/dbus-uuidgen --ensure
+	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
 
 	# We need to test if /var/run/dbus exists, since script will fail if it does not
 	[ ! -e /var/run/dbus ] && mkdir /var/run/dbus 
-- 
2.39.5