From 8714b5a957fd06ecfe09b0780e8dd3928275a224 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 1 Jul 2013 14:59:51 +0200 Subject: [PATCH] Current state --- GeoIP.conf | 13 +- .../usr/share/config/kdm/kdmrc.dist.new | 2 +- cups/printers.conf | 8 +- cups/subscriptions.conf | 4 +- drirc | 3 + gconf/gconf.xml.defaults/%gconf-tree.xml | 240 ++++++++++++------ gconf/schemas/ufraw.schemas | 72 ++++++ local.d/baselayout1.start | 16 ++ local.d/baselayout1.stop | 19 ++ portage/package.keywords | 1 + revdep-rebuild/61-sun-jdk-1.6 | 1 - revdep-rebuild/61-sun-jre-bin-1.6 | 1 - sandbox.d/20sun-jdk-1.6 | 1 - ulogd.conf | 12 +- 14 files changed, 303 insertions(+), 90 deletions(-) create mode 100755 local.d/baselayout1.start create mode 100755 local.d/baselayout1.stop delete mode 100644 revdep-rebuild/61-sun-jdk-1.6 delete mode 100644 revdep-rebuild/61-sun-jre-bin-1.6 delete mode 100644 sandbox.d/20sun-jdk-1.6 diff --git a/GeoIP.conf b/GeoIP.conf index 33f55265..75775cbb 100644 --- a/GeoIP.conf +++ b/GeoIP.conf @@ -2,15 +2,22 @@ # then you will obtain a license key which you can # use to automatically obtain updates. # for more details, please go to -# http://www.maxmind.com/app/products +# http://www.maxmind.com/en/geolocation_landing -# see https://www.maxmind.com/app/license_key_login to obtain License Key, +# HowTo configure geoipupdate +# http://www.maxmind.com/en/license_key + +# customer find the user_id and license key here: +# https://www.maxmind.com/en/my_license_key +# # UserId, and available ProductIds # Enter your license key here +# customers should insert their license key and user_id +# free GeoLite users should use 000000000000 as license key LicenseKey YOUR_LICENSE_KEY_HERE -# Enter your User ID here +# Enter your User ID here ( GeoLite only users should use 999999 as user_id ) UserId YOUR_USER_ID_HERE # Enter the Product ID(s) of the database(s) you would like to update diff --git a/config-archive/usr/share/config/kdm/kdmrc.dist.new b/config-archive/usr/share/config/kdm/kdmrc.dist.new index d1a3973e..c0f8b58d 100644 --- a/config-archive/usr/share/config/kdm/kdmrc.dist.new +++ b/config-archive/usr/share/config/kdm/kdmrc.dist.new @@ -449,7 +449,7 @@ FaceDir=/var/lib/kdm/faces # Random seed for forging saved session types, etc. of unknown users. # This value should be random but constant across the login domain. # Default is 0 -ForgingSeed=1368870185 +ForgingSeed=1371047480 # Specify conversation plugins for the login dialog. Each plugin can be # specified as a base name (which expands to $kde_modulesdir/kgreet_$base) # or as a full pathname. diff --git a/cups/printers.conf b/cups/printers.conf index c7c0df76..d23ebad1 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,13 +1,15 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-06-11 07:49 +# Written by cupsd on 2013-06-28 07:17 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:4fe502f0-362b-3fa2-519f-648848519e5e Info Kyocera_FS-1020D MakeModel Kyocera Mita FS-1020D DeviceURI lpd://10.12.11.32/lp -State Idle -StateTime 1364666766 +State Stopped +StateMessage The printer is not responding. +StateTime 1372396639 +Reason paused Type 8392788 Accepting Yes Shared No diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 3c7b5eb3..e7cd4478 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,3 +1,3 @@ # Subscription configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-06-06 01:18 -NextSubscriptionId 164 +# Written by cupsd on 2013-06-29 07:17 +NextSubscriptionId 167 diff --git a/drirc b/drirc index cf13cdb8..a13941f6 100644 --- a/drirc +++ b/drirc @@ -22,5 +22,8 @@ + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 4d0054c7..c96c380d 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2331,77 +2331,89 @@ + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -17815,255 +17827,339 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled. + + + + + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + + + + + + + + + + + + + + + + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + + + + + + + + + + + + + + + + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + + + + + + + + + + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + - + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + - + + diff --git a/gconf/schemas/ufraw.schemas b/gconf/schemas/ufraw.schemas index b3fa4807..40cf1a63 100644 --- a/gconf/schemas/ufraw.schemas +++ b/gconf/schemas/ufraw.schemas @@ -264,6 +264,30 @@ + + /schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable + /desktop/gnome/thumbnailers/image@x-nikon-nrw/enable + ufraw + bool + true + + + + + + + + /schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/command + /desktop/gnome/thumbnailers/image@x-nikon-nrw/command + ufraw + string + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + + + + + + /schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable /desktop/gnome/thumbnailers/image@x-olympus-orf/enable @@ -312,6 +336,30 @@ + + /schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable + /desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable + ufraw + bool + true + + + + + + + + /schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command + /desktop/gnome/thumbnailers/image@x-panasonic-rw2/command + ufraw + string + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + + + + + + /schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable /desktop/gnome/thumbnailers/image@x-pentax-pef/enable @@ -432,5 +480,29 @@ + + /schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable + /desktop/gnome/thumbnailers/image@x-samsung-srw/enable + ufraw + bool + true + + + + + + + + /schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command + /desktop/gnome/thumbnailers/image@x-samsung-srw/command + ufraw + string + /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o + + + + + + diff --git a/local.d/baselayout1.start b/local.d/baselayout1.start new file mode 100755 index 00000000..29927c06 --- /dev/null +++ b/local.d/baselayout1.start @@ -0,0 +1,16 @@ +#!/bin/bash + +# /etc/conf.d/local.start + +# This is a good place to load any misc programs +# on startup (use &>/dev/null to hide output) + +#echo "Setze Standard-Route IPv6 via fe80::1 dev eth0" +#/sbin/ip -6 route add default via fe80::1 dev eth0 + +#/sbin/ip -6 route add "2a01:238:4225:6e00::/56" dev lo + +echo "Sende Mail wegen Boot ..." +echo "Kiste $(hostname) wird '$(date)' gebootet" | /usr/bin/mailx -s "Boot von $(hostname)" root@localhost + +# vim: ts=4 expandtab diff --git a/local.d/baselayout1.stop b/local.d/baselayout1.stop new file mode 100755 index 00000000..ab762bc9 --- /dev/null +++ b/local.d/baselayout1.stop @@ -0,0 +1,19 @@ +#!/bin/bash + +# /etc/conf.d/local.stop + +# This is a good place to unload any misc. +# programs you started above. +# For example, if you are using OSS and have +# "/usr/local/bin/soundon" above, put +# "/usr/local/bin/soundoff" here. + +echo "Sende Mail wegen Shutdown ..." +echo "Kiste $(hostname) wird '$(date)' ordentlich heruntergefahren" | /usr/bin/mailx -s "Shutdown von $(hostname)" root@localhost + +echo +echo "Warte 5 Sekunden ..." +echo +sleep 5 + +# vim: ts=4 expandtab diff --git a/portage/package.keywords b/portage/package.keywords index 93be4a3b..ab07ac49 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -39,6 +39,7 @@ app-emulation/virtualbox-modules # ~dev-libs/gjs-1.34.0 # ~dev-libs/libzeitgeist-0.3.18 ~dev-libs/nspr-4.9.1 +~dev-libs/nspr-4.9.6 ~dev-libs/nss-3.13.5 ~dev-perl/Email-Sender-0.110.5 diff --git a/revdep-rebuild/61-sun-jdk-1.6 b/revdep-rebuild/61-sun-jdk-1.6 deleted file mode 100644 index c0f7265e..00000000 --- a/revdep-rebuild/61-sun-jdk-1.6 +++ /dev/null @@ -1 +0,0 @@ -SEARCH_DIRS_MASK="/opt/sun-jdk-1.6.0.45" diff --git a/revdep-rebuild/61-sun-jre-bin-1.6 b/revdep-rebuild/61-sun-jre-bin-1.6 deleted file mode 100644 index 2f674fe7..00000000 --- a/revdep-rebuild/61-sun-jre-bin-1.6 +++ /dev/null @@ -1 +0,0 @@ -SEARCH_DIRS_MASK="/opt/sun-jre-bin-1.6.0.45" diff --git a/sandbox.d/20sun-jdk-1.6 b/sandbox.d/20sun-jdk-1.6 deleted file mode 100644 index f1782ed0..00000000 --- a/sandbox.d/20sun-jdk-1.6 +++ /dev/null @@ -1 +0,0 @@ -SANDBOX_PREDICT="/dev/random" diff --git a/ulogd.conf b/ulogd.conf index e9bed91e..b58522d7 100644 --- a/ulogd.conf +++ b/ulogd.conf @@ -51,13 +51,13 @@ plugin="/usr/lib64/ulogd/ulogd_inpflow_NFACCT.so" plugin="/usr/lib64/ulogd/ulogd_output_GRAPHITE.so" # this is a stack for logging packet send by system via LOGEMU -#stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU +stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU # this is a stack for packet-based logging via LOGEMU -#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU +stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU # this is a stack for ULOG packet-based logging via LOGEMU -#stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU +stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU # this is a stack for packet-based logging via LOGEMU with filtering on MARK #stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU @@ -179,15 +179,15 @@ nlgroup=1 socket_path="/run/nuauth_ulogd2.sock" [emu1] -file="/var/log/ulogd/ulogd_syslogemu.log" +file="/var/log/ulogd/syslogemu.log" sync=1 [op1] -file="/var/log/ulogd/ulogd_oprint.log" +file="/var/log/ulogd/oprint.log" sync=1 [gp1] -file="/var/log/ulogd/ulogd_gprint.log" +file="/var/log/ulogd/gprint.log" sync=1 timestamp=1 -- 2.39.5