Current state

diff --git a/cups/printers.conf b/cups/printers.conf
index 1ccffadfcb28bcb8fa44d07cad398e790694bf54..ce7f9e57c1a8c2ecdc6f648b6c9bf8103c0c7187 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2012-11-21 10:21
+# Written by cupsd on 2012-12-17 11:19
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dell_2330dn_Laser_Printer>
 UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
@@ -8,7 +8,7 @@ Location Office Support
 MakeModel Dell 2330dn Laser Printer
 DeviceURI socket://192.168.178.6
 State Idle
-StateTime 1353489672
+StateTime 1355739545
 Type 8425692
 Accepting Yes
 Shared No
@@ -19,8 +19,8 @@ KLimit 0
 OpPolicy default
 ErrorPolicy stop-printer
 Attribute marker-colors \#000000,none,none
-Attribute marker-levels 60,84,-1
+Attribute marker-levels 50,83,-1
 Attribute marker-names Black Toner,Fuser,Maintenance Kit
 Attribute marker-types toner,other,other
-Attribute marker-change-time 1353489672
+Attribute marker-change-time 1355739545
 </Printer>

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 66014cb3fda33b307265f44786177f328445070b..1ccffadfcb28bcb8fa44d07cad398e790694bf54 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -8,7 +8,7 @@ Location Office Support
 MakeModel Dell 2330dn Laser Printer
 DeviceURI socket://192.168.178.6
 State Idle
-StateTime 1353489603
+StateTime 1353489672
 Type 8425692
 Accepting Yes
 Shared No
@@ -22,5 +22,5 @@ Attribute marker-colors \#000000,none,none
 Attribute marker-levels 60,84,-1
 Attribute marker-names Black Toner,Fuser,Maintenance Kit
 Attribute marker-types toner,other,other
-Attribute marker-change-time 1353489663
+Attribute marker-change-time 1353489672
 </Printer>

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index f9828aa946d336708ef6ca41944e398205e3d1da..c7e3299975f1177fb8ebb532327501d1d834b561 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,3 +1,3 @@
 # Subscription configuration file for CUPS v1.5.2
-# Written by cupsd on 2012-11-22 10:15
-NextSubscriptionId 7
+# Written by cupsd on 2012-12-18 11:19
+NextSubscriptionId 8

diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O
index 8dd074d132a0d9a78354cfb9ef3f2a18392c9951..08a5e93265b03b29da6067d4b7b03ffd0e8234ed 100644 (file)
--- a/cups/subscriptions.conf.O
+++ b/cups/subscriptions.conf.O
@@ -1,11 +1,11 @@
 # Subscription configuration file for CUPS v1.5.2
-# Written by cupsd on 2012-11-21 10:21
-NextSubscriptionId 7
-<Subscription 6>
+# Written by cupsd on 2012-12-17 11:19
+NextSubscriptionId 8
+<Subscription 7>
 Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
 Owner fbrehm
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1353575671
-NextEventId 96
+ExpirationTime 1355825944
+NextEventId 4
 </Subscription>

diff --git a/portage/package.use b/portage/package.use
index c34467caefe41b432a007778125d2f7963454039..6e73fd65043b169ceff76fbfac15eb87acfa2c79 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -266,6 +266,7 @@ sys-block/parted                        device-mapper
 sys-devel/gcc                           libffi mudflap objc objc-gc objc++
 sys-devel/libperl                       ithreads
 
+=sys-fs/mdadm-3.2.6*                   development
 sys-fs/udev                             devfs-compat edd extras hwdb
 
 sys-kernel/gentoo-sources               -doc

diff --git a/shadow b/shadow
index ffa33180a5d4e1aad67987ec982290bf97b4ba69..066763fa7ca8f09051786b827861ccb30d5b9645 100644 (file)
--- a/shadow
+++ b/shadow
@@ -37,7 +37,7 @@ gpsd:!:15390::::::
 kdm:!:15390::::::
 apache:!:15391::::::
 postfix:!:15391::::::
-ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15637::::::
+ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15686::::::
 colord:!:15426::::::
 qemu:!:15538::::::
 memcached:!:15566::::::

diff --git a/shadow- b/shadow-
index ffa33180a5d4e1aad67987ec982290bf97b4ba69..066763fa7ca8f09051786b827861ccb30d5b9645 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -37,7 +37,7 @@ gpsd:!:15390::::::
 kdm:!:15390::::::
 apache:!:15391::::::
 postfix:!:15391::::::
-ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15637::::::
+ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15686::::::
 colord:!:15426::::::
 qemu:!:15538::::::
 memcached:!:15566::::::

diff --git a/ssh/sshd_config b/ssh/sshd_config
index 2006bd5c4957009e4cffb15d2aab35d8f6fe4076..c2dcc3b4c76b3a5f0c38f095d7e81c43f9498ec6 100644 (file)
--- a/ssh/sshd_config
+++ b/ssh/sshd_config
@@ -162,7 +162,7 @@ UsePAM yes
 #X11UseLocalhost yes
 PrintMotd no
 PrintLastLog no
-#TCPKeepAlive yes
+TCPKeepAlive yes
 #UseLogin no
 #UsePrivilegeSeparation yes
 #PermitUserEnvironment no