From 23372258dbf62ab6977dce8e8998c3f666e5c9b7 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 18 Sep 2012 09:03:03 +0200 Subject: [PATCH] Current state --- .etckeeper | 2 - ImageMagick/delegates.xml | 15 +++- ImageMagick/quantization-table.xml | 14 +-- ImageMagick/sRGB.icc | Bin 6922 -> 0 bytes X11/gdm/custom.conf | 2 +- cups/printers.conf | 10 +-- cups/printers.conf.O | 8 +- cups/subscriptions.conf | 4 +- cups/subscriptions.conf.O | 10 +-- gconf/gconf.xml.defaults/%gconf-tree.xml | 108 ++++++++++------------- hosts | 2 + passwd- | 1 + php/cgi-php5.3/php.ini | 6 +- php/cli-php5.3/php.ini | 6 +- php/embed-php5.3/php.ini | 6 +- php/fpm-php5.3/php.ini | 6 +- portage/bashrc | 1 - portage/etckeeper | 14 --- portage/package.keywords | 2 + qemu/target-x86_64.conf | 86 ------------------ shadow | 2 +- shadow- | 3 +- 22 files changed, 104 insertions(+), 204 deletions(-) delete mode 100644 ImageMagick/sRGB.icc delete mode 100755 portage/etckeeper diff --git a/.etckeeper b/.etckeeper index 754f6fb..2bf064d 100755 --- a/.etckeeper +++ b/.etckeeper @@ -56,7 +56,6 @@ maybe chmod 0644 './ImageMagick/magic.xml' maybe chmod 0644 './ImageMagick/mime.xml' maybe chmod 0644 './ImageMagick/policy.xml' maybe chmod 0644 './ImageMagick/quantization-table.xml' -maybe chmod 0644 './ImageMagick/sRGB.icc' maybe chmod 0644 './ImageMagick/thresholds.xml' maybe chmod 0644 './ImageMagick/type-dejavu.xml' maybe chmod 0644 './ImageMagick/type-ghostscript.xml' @@ -1628,7 +1627,6 @@ maybe chmod 0755 './portage/env/x11-libs' maybe chmod 0644 './portage/env/x11-libs/cairo' maybe chmod 0755 './portage/env/x11-misc' maybe chmod 0644 './portage/env/x11-misc/google-gadgets' -maybe chmod 0755 './portage/etckeeper' maybe chmod 0644 './portage/package.keywords' maybe chmod 0644 './portage/package.use' maybe chmod 0755 './portage/postsync.d' diff --git a/ImageMagick/delegates.xml b/ImageMagick/delegates.xml index a21e0e7..a1135dc 100644 --- a/ImageMagick/delegates.xml +++ b/ImageMagick/delegates.xml @@ -58,15 +58,24 @@ Set option delegate:bimodal=true to process bimodal delegates otherwise they are ignored. + + If stealth="True" the delegate is not listed in user requested + "-list delegate" listings. These are typically special internal delegates. + + If spawn="True" ImageMagick will not way for the delegate to finish, + nor will it read any output image. It will only wait for either the input + file to be removed (See "ephemeral:" coder) indicating that the input file + has been read, or a maximum time limit of 2 seconds. --> - + + @@ -79,7 +88,7 @@ - + @@ -89,7 +98,7 @@ - + diff --git a/ImageMagick/quantization-table.xml b/ImageMagick/quantization-table.xml index 9688f25..b65555d 100644 --- a/ImageMagick/quantization-table.xml +++ b/ImageMagick/quantization-table.xml @@ -30,14 +30,14 @@ Chrominance Quantization Table - 17, 18, 22, 31, 50, 92, 193, 465, - 18, 19, 24, 33, 54, 98, 207, 498, - 22, 24, 29, 41, 66, 120, 253, 609, - 31, 33, 41, 57, 92, 169, 355, 854, - 50, 54, 66, 92, 148, 271, 570, 1370, - 92, 98, 120, 169, 271, 498, 1046, 2516, + 17, 18, 22, 31, 50, 92, 193, 465, + 18, 19, 24, 33, 54, 98, 207, 498, + 22, 24, 29, 41, 66, 120, 253, 609, + 31, 33, 41, 57, 92, 169, 355, 854, + 50, 54, 66, 92, 148, 271, 570, 1370, + 92, 98, 120, 169, 271, 498, 1046, 2516, 193, 207, 253, 355, 570, 1046, 2198, 5289, - 465, 498, 609, 854, 1370,2516, 5289, 12725 + 465, 498, 609, 854, 1370, 2516, 5289, 12725
diff --git a/ImageMagick/sRGB.icc b/ImageMagick/sRGB.icc deleted file mode 100644 index 6f3efbf02db0a9b7e9b0f0696a81c77d2d3042da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6922 zcmeI1XH-~($xKc5@^=mZ{2|B{-2XY=O#ny`xu+|b&p%6w zEqSkNbac-3(VMB(&Hv2(uO}iaiNgW_qVi|rS?p9MpLg;(mX*X3#ODQ^nUB@2{`5(mwwF&@N?kj90dSNjQPs=Qv#0q%H&=FGh?|)0LTpT^HrJ2 zTz-8SK`*6mYv2 zKpH3j6`%=pfe|nRmcSM`0e9dH0zfF(0+=8cBmpkS1bJW=C;}y*92^9-paC?4R?q>? zfF5ujTn5*`EpQi%gDJoRv*0CI0`I^o1VI>x1W_PqND)$lbRZ*$0a-&%kSF8^g+dWf z48(!bp*(0eR035%wNN9}3jG9~gDyiipi$@{Gz~34e?lK&1Wbgfuso~|>%$D#4)%Zp z;LUIhoC4>-h44PO8g7D5!QJp>_!c}4^Wc~8G6En72pU2Op^IQ391z}!Fhn$hi`aoE zMpPl15FLm<#1P^hf`?c{d_ba+6eJy~i?l?#A_I|3WD0TzvJ_d1Jc;Z^4kGU%r;$s@ zFDMd94yA*#K)InpP%)@XR1vBQ)q?6mT}6$fW>N3ZXfzG2fi^?CqC?T~=v;Iu`Y^f^ zeF;5^oVWg>A$3 zW5=*_*j1buP7P;)^Tx4o*|;)XGp-MJ2RDmb#f#%L@K*Q$d^~;^z8c?wzlwj1e?uS; zlnLepUqT#VC!v~fnsA*kP53}06SavB#BgFdaUbyn@e=VN@ePSYQYYDx!boYPeWX^> z71C4Edl8C=o`{UPNZ98Oyrd)PE<|QPIQZCj%bzWS^h zWy%)Io{@bd2g_;8`N`$V9g`cDTb5Ulcacw)uaUnZzo+tCy0)$~F7l9HT~t5UjBqtb}dsWuEMC#`p0pTE9$ z{cB?#W47@T;|C@b6EBlJCIcp)P0dWXrX8jWW~ycpX7y&13@XEiQOdY(jxx75&o@7B z{=vf3BF*BA#UGZsmI;<^mh&4lHn2A|Z?BeZC*}bwiu;gxw@5Xd%bz5>bbKmYh=t1=G_o(%F=Be$;_3ZP4z1+PHcs<^z zwvn^3#~XONc^~k8;-le{;`56y+SkXo&iA>Wp zZ3^46wv8t1Bo`&~QY=yqrYvzixGkwr>gLqmG%EimJ)EwY{$2WXhIK|=#{0~m%(GeI zS)8olZ0+p5*>gG0ImdI6xy;;wJf*x{dDGkNwm0s8c0}zM$XCfP%%9!qvh(CF{H}yu zw+jpkDhl524&L2YC||g-W~|{Zh;-zFA^W zQdRP)lv#T72g4t#e^}cWy>Fz>6OKmZx3!g zc%#a=s^Jj+Q2HTWwP$s2jcQGK&8OPf+VML3y3TsJ`n~llhgpZmj@TaQXpnCxY4~_F z?&yO?m&WcU^`@$0=wlhjo;L?I4;^P5Z*7rjDQWq9f^&j*((mM8t66Jnn_OF2JKUb$ zzHlo1)ZHH)f9&nh?P%6ElVER`;;UaMx{<+g&53Bi(n* z?)2U@zuPyuVYGkDX6*7k$9vcAyWPJvzHxkXB5>ltWcVcS0qep1!^DTLA7wmRo!a>r z^|<(n*psTKa!;Fn)%vxQXUe-U?KnOB%>UWc40Gn?Z>hh1nk{@zdR{fBIM+IFG=F}< zdExGhO)q9&Ccj)=Ec#vi_xe|wuYUf+_K)GEkfqtz+}CS=mcEgGbK+ks`D<)`nG z-mR__zn6Z0@&n_;(8u79bE}!3FrTVFYkltf;_>D2TGHB@PzwmPfKUqvwSZ6y2(^Gv z3kbD<&=(N;0zzLv=nDva0iiD-^acKpeSxp%ID9pL5GaCUlK=$d0^oTYfSOtW)T8<5 m3*l+(EdKcp0Gw@f=C UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be Info Dell 2330dn Laser Printer -Location Office R+I +Location Office Support MakeModel Dell 2330dn Laser Printer DeviceURI socket://192.168.178.6 State Idle -StateTime 1340967781 +StateTime 1346678481 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 100,87,-1 +Attribute marker-levels 80,85,-1 Attribute marker-names Black Toner,Fuser,Maintenance Kit Attribute marker-types toner,other,other -Attribute marker-change-time 1340967781 +Attribute marker-change-time 1346678481 diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 783d367..c7025ee 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-06-29 13:00 +# Written by cupsd on 2012-09-03 15:21 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be @@ -8,7 +8,7 @@ Location Office R+I MakeModel Dell 2330dn Laser Printer DeviceURI socket://192.168.178.6 State Idle -StateTime 1331554954 +StateTime 1346678481 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 30,88,0 +Attribute marker-levels 80,85,-1 Attribute marker-names Black Toner,Fuser,Maintenance Kit Attribute marker-types toner,other,other -Attribute marker-change-time 1331554954 +Attribute marker-change-time 1346678481 diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 94cc3a1..d0021a7 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 2012-06-30 13:03 -NextSubscriptionId 3 +# Written by cupsd on 2012-09-04 15:21 +NextSubscriptionId 5 diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O index 28faff1..78f0b21 100644 --- 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-06-29 13:03 -NextSubscriptionId 3 - +# Written by cupsd on 2012-09-03 15:24 +NextSubscriptionId 5 + 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 1341054160 -NextEventId 23 +ExpirationTime 1346764880 +NextEventId 5 diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index f6e938a..eedde8b 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2911,39 +2911,39 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3011,9 +3011,9 @@ - - - + + + @@ -19061,13 +19061,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -19077,13 +19075,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -19093,13 +19089,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -19109,13 +19103,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -19125,13 +19117,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -19141,13 +19131,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -19762,13 +19750,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19776,7 +19764,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "ymsgr" URLs, if enabled. - + True if the command specified in the "command" key should handle "ymsgr" URLs. @@ -19784,13 +19772,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19798,7 +19786,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "xmpp" URLs, if enabled. - + True if the command specified in the "command" key should handle "xmpp" URLs. @@ -19806,13 +19794,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19820,7 +19808,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "sip" URLs, if enabled. - + True if the command specified in the "command" key should handle "sip" URLs. @@ -19828,13 +19816,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19842,7 +19830,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "msnim" URLs, if enabled. - + True if the command specified in the "command" key should handle "msnim" URLs. @@ -19850,13 +19838,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19864,7 +19852,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "irc" URLs, if enabled. - + True if the command specified in the "command" key should handle "irc" URLs. @@ -19872,13 +19860,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19886,7 +19874,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "icq" URLs, if enabled. - + True if the command specified in the "command" key should handle "icq" URLs. @@ -19894,13 +19882,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19908,7 +19896,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "gg" URLs, if enabled. - + True if the command specified in the "command" key should handle "gg" URLs. @@ -20172,13 +20160,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20186,7 +20174,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. diff --git a/hosts b/hosts index fa611a4..e52dbf0 100644 --- a/hosts +++ b/hosts @@ -31,3 +31,5 @@ # from your network provider (if any) or from your regional registry (ARIN, # APNIC, LACNIC, RIPE NCC, or AfriNIC.) # + +10.251.1.1 mgmt1.pbb251.de.profitbricks.net mgmt-dev diff --git a/passwd- b/passwd- index 7e4a8d0..5fe7b8f 100644 --- a/passwd- +++ b/passwd- @@ -41,3 +41,4 @@ postfix:x:207:207:added by portage for postfix:/var/spool/postfix:/sbin/nologin ppd:x:999:100:added by portage for ppd:/var/lib/py-provisioning-daemon/home:/bin/bash colord:x:113:982:added by portage for colord:/var/lib/colord:/sbin/nologin qemu:x:77:984:added by portage for libvirt:/dev/null:/sbin/nologin +memcached:x:114:2:added by portage for memcached:/dev/null:/sbin/nologin diff --git a/php/cgi-php5.3/php.ini b/php/cgi-php5.3/php.ini index 69d58d4..24e78a6 100644 --- a/php/cgi-php5.3/php.ini +++ b/php/cgi-php5.3/php.ini @@ -842,7 +842,7 @@ enable_dl = Off ; will look for to know it is OK to continue execution. Setting this variable MAY ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ; http://php.net/cgi.redirect-status-env -;cgi.redirect_status_env = ; +;cgi.redirect_status_env = ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok @@ -859,7 +859,7 @@ enable_dl = Off ; does not currently support this feature (03/17/2002) ; Set to 1 if running under IIS. Default is zero. ; http://php.net/fastcgi.impersonate -;fastcgi.impersonate = 1; +;fastcgi.impersonate = 1 ; Disable logging through FastCGI connection. PHP's default behavior is to enable ; this feature. @@ -1909,7 +1909,7 @@ ldap.max_links = -1 [xsl] ; Write operations from within XSLT are disabled by default. -; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44 +; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44 ; Set it to 0 to allow all operations ;xsl.security_prefs = 44 diff --git a/php/cli-php5.3/php.ini b/php/cli-php5.3/php.ini index 69d58d4..24e78a6 100644 --- a/php/cli-php5.3/php.ini +++ b/php/cli-php5.3/php.ini @@ -842,7 +842,7 @@ enable_dl = Off ; will look for to know it is OK to continue execution. Setting this variable MAY ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ; http://php.net/cgi.redirect-status-env -;cgi.redirect_status_env = ; +;cgi.redirect_status_env = ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok @@ -859,7 +859,7 @@ enable_dl = Off ; does not currently support this feature (03/17/2002) ; Set to 1 if running under IIS. Default is zero. ; http://php.net/fastcgi.impersonate -;fastcgi.impersonate = 1; +;fastcgi.impersonate = 1 ; Disable logging through FastCGI connection. PHP's default behavior is to enable ; this feature. @@ -1909,7 +1909,7 @@ ldap.max_links = -1 [xsl] ; Write operations from within XSLT are disabled by default. -; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44 +; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44 ; Set it to 0 to allow all operations ;xsl.security_prefs = 44 diff --git a/php/embed-php5.3/php.ini b/php/embed-php5.3/php.ini index 69d58d4..24e78a6 100644 --- a/php/embed-php5.3/php.ini +++ b/php/embed-php5.3/php.ini @@ -842,7 +842,7 @@ enable_dl = Off ; will look for to know it is OK to continue execution. Setting this variable MAY ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ; http://php.net/cgi.redirect-status-env -;cgi.redirect_status_env = ; +;cgi.redirect_status_env = ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok @@ -859,7 +859,7 @@ enable_dl = Off ; does not currently support this feature (03/17/2002) ; Set to 1 if running under IIS. Default is zero. ; http://php.net/fastcgi.impersonate -;fastcgi.impersonate = 1; +;fastcgi.impersonate = 1 ; Disable logging through FastCGI connection. PHP's default behavior is to enable ; this feature. @@ -1909,7 +1909,7 @@ ldap.max_links = -1 [xsl] ; Write operations from within XSLT are disabled by default. -; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44 +; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44 ; Set it to 0 to allow all operations ;xsl.security_prefs = 44 diff --git a/php/fpm-php5.3/php.ini b/php/fpm-php5.3/php.ini index 69d58d4..24e78a6 100644 --- a/php/fpm-php5.3/php.ini +++ b/php/fpm-php5.3/php.ini @@ -842,7 +842,7 @@ enable_dl = Off ; will look for to know it is OK to continue execution. Setting this variable MAY ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ; http://php.net/cgi.redirect-status-env -;cgi.redirect_status_env = ; +;cgi.redirect_status_env = ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok @@ -859,7 +859,7 @@ enable_dl = Off ; does not currently support this feature (03/17/2002) ; Set to 1 if running under IIS. Default is zero. ; http://php.net/fastcgi.impersonate -;fastcgi.impersonate = 1; +;fastcgi.impersonate = 1 ; Disable logging through FastCGI connection. PHP's default behavior is to enable ; this feature. @@ -1909,7 +1909,7 @@ ldap.max_links = -1 [xsl] ; Write operations from within XSLT are disabled by default. -; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44 +; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44 ; Set it to 0 to allow all operations ;xsl.security_prefs = 44 diff --git a/portage/bashrc b/portage/bashrc index d1a2cef..8798ee9 100644 --- a/portage/bashrc +++ b/portage/bashrc @@ -1,6 +1,5 @@ #!/bin/bash -source /etc/portage/etckeeper for conf in ${PN} ${PN}:${SLOT} ${PN}-${PV} ${PN}-${PV}-${PR}; do e=/etc/portage/env/${CATEGORY}/${conf} diff --git a/portage/etckeeper b/portage/etckeeper deleted file mode 100755 index 9ce5ac3..0000000 --- a/portage/etckeeper +++ /dev/null @@ -1,14 +0,0 @@ -case "$EBUILD_PHASE" in - - "preinst" | "prerm" ) - if [ -x /usr/bin/etckeeper ]; then - etckeeper pre-install - fi - ;; - - "postinst" | "postrm" ) - if [ -x /usr/bin/etckeeper ]; then - etckeeper post-install - fi - ;; - esac diff --git a/portage/package.keywords b/portage/package.keywords index 1d216d5..cdfd374 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -15,6 +15,8 @@ app-emulation/virtualbox-modules ~app-misc/g15stats-1.9.7 ~app-text/dblatex-0.3 +app-text/docbook2odf +app-text/docbook2odf-xsl-stylesheets ~dev-vcs/gitg-0.2.5 diff --git a/qemu/target-x86_64.conf b/qemu/target-x86_64.conf index 43ad282..e69de29 100644 --- a/qemu/target-x86_64.conf +++ b/qemu/target-x86_64.conf @@ -1,86 +0,0 @@ -# x86 CPU MODELS - -[cpudef] - name = "Conroe" - level = "2" - vendor = "GenuineIntel" - family = "6" - model = "2" - stepping = "3" - feature_edx = "sse2 sse fxsr mmx pat cmov pge sep apic cx8 mce pae msr tsc pse de fpu mtrr clflush mca pse36" - feature_ecx = "sse3 ssse3" - extfeature_edx = "fxsr mmx pat cmov pge apic cx8 mce pae msr tsc pse de fpu lm syscall nx" - extfeature_ecx = "lahf_lm" - xlevel = "0x8000000A" - model_id = "Intel Celeron_4x0 (Conroe/Merom Class Core 2)" - -[cpudef] - name = "Penryn" - level = "2" - vendor = "GenuineIntel" - family = "6" - model = "2" - stepping = "3" - feature_edx = "sse2 sse fxsr mmx pat cmov pge sep apic cx8 mce pae msr tsc pse de fpu mtrr clflush mca pse36" - feature_ecx = "sse3 cx16 ssse3 sse4.1" - extfeature_edx = "fxsr mmx pat cmov pge apic cx8 mce pae msr tsc pse de fpu lm syscall nx" - extfeature_ecx = "lahf_lm" - xlevel = "0x8000000A" - model_id = "Intel Core 2 Duo P9xxx (Penryn Class Core 2)" - -[cpudef] - name = "Nehalem" - level = "2" - vendor = "GenuineIntel" - family = "6" - model = "2" - stepping = "3" - feature_edx = "sse2 sse fxsr mmx pat cmov pge sep apic cx8 mce pae msr tsc pse de fpu mtrr clflush mca pse36" - feature_ecx = "sse3 cx16 ssse3 sse4.1 sse4.2 popcnt" - extfeature_edx = "fxsr mmx pat cmov pge apic cx8 mce pae msr tsc pse de fpu lm syscall nx" - extfeature_ecx = "lahf_lm" - xlevel = "0x8000000A" - model_id = "Intel Core i7 9xx (Nehalem Class Core i7)" - -[cpudef] - name = "Opteron_G1" - level = "5" - vendor = "AuthenticAMD" - family = "15" - model = "6" - stepping = "1" - feature_edx = "sse2 sse fxsr mmx pat cmov pge sep apic cx8 mce pae msr tsc pse de fpu mtrr clflush mca pse36" - feature_ecx = "sse3" - extfeature_edx = "fxsr mmx pat cmov pge apic cx8 mce pae msr tsc pse de fpu lm syscall nx" -# extfeature_ecx = "" - xlevel = "0x80000008" - model_id = "AMD Opteron 240 (Gen 1 Class Opteron)" - -[cpudef] - name = "Opteron_G2" - level = "5" - vendor = "AuthenticAMD" - family = "15" - model = "6" - stepping = "1" - feature_edx = "sse2 sse fxsr mmx pat cmov pge sep apic cx8 mce pae msr tsc pse de fpu mtrr clflush mca pse36" - feature_ecx = "sse3 cx16" - extfeature_edx = "fxsr mmx pat cmov pge apic cx8 mce pae msr tsc pse de fpu lm syscall nx rdtscp" - extfeature_ecx = "svm lahf_lm" - xlevel = "0x80000008" - model_id = "AMD Opteron 22xx (Gen 2 Class Opteron)" - -[cpudef] - name = "Opteron_G3" - level = "5" - vendor = "AuthenticAMD" - family = "15" - model = "6" - stepping = "1" - feature_edx = "sse2 sse fxsr mmx pat cmov pge sep apic cx8 mce pae msr tsc pse de fpu mtrr clflush mca pse36" - feature_ecx = "sse3 cx16 monitor popcnt" - extfeature_edx = "fxsr mmx pat cmov pge apic cx8 mce pae msr tsc pse de fpu lm syscall nx rdtscp" - extfeature_ecx = "svm sse4a abm misalignsse lahf_lm" - xlevel = "0x80000008" - model_id = "AMD Opteron 23xx (Gen 3 Class Opteron)" - diff --git a/shadow b/shadow index b780dca..9b3a6b7 100644 --- a/shadow +++ b/shadow @@ -37,7 +37,7 @@ gpsd:!:15390:::::: kdm:!:15390:::::: apache:!:15391:::::: postfix:!:15391:::::: -ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15566:::::: +ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15586:::::: colord:!:15426:::::: qemu:!:15538:::::: memcached:!:15566:::::: diff --git a/shadow- b/shadow- index 5b4a64d..9b3a6b7 100644 --- a/shadow- +++ b/shadow- @@ -37,6 +37,7 @@ gpsd:!:15390:::::: kdm:!:15390:::::: apache:!:15391:::::: postfix:!:15391:::::: -ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15566:::::: +ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15586:::::: colord:!:15426:::::: qemu:!:15538:::::: +memcached:!:15566:::::: -- 2.39.5