From eb26eaff3c07bf47c5ef585cf2a760653a17c7aa Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 20 Dec 2016 14:21:41 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 3 + config-archive/etc/layman/layman.cfg | 201 ++++++++++++++++++ config-archive/etc/layman/layman.cfg.dist.new | 200 +++++++++++++++++ dispatch-conf.conf | 4 +- portage/make.conf | 13 +- 5 files changed, 419 insertions(+), 2 deletions(-) create mode 100644 config-archive/etc/layman/layman.cfg create mode 100644 config-archive/etc/layman/layman.cfg.dist.new diff --git a/.etckeeper b/.etckeeper index 46dbead..65f5433 100755 --- a/.etckeeper +++ b/.etckeeper @@ -77,6 +77,9 @@ maybe chmod 0644 'conf.d/udev' maybe chmod 0644 'conf.d/urandom' maybe chmod 0700 'config-archive' maybe chmod 0755 'config-archive/etc' +maybe chmod 0755 'config-archive/etc/layman' +maybe chmod 0644 'config-archive/etc/layman/layman.cfg' +maybe chmod 0644 'config-archive/etc/layman/layman.cfg.dist.new' maybe chmod 0755 'config-archive/etc/rsyslog.d' maybe chmod 0644 'config-archive/etc/rsyslog.d/50-default.conf' maybe chmod 0644 'config-archive/etc/rsyslog.d/50-default.conf.dist.new' diff --git a/config-archive/etc/layman/layman.cfg b/config-archive/etc/layman/layman.cfg new file mode 100644 index 0000000..cfa0169 --- /dev/null +++ b/config-archive/etc/layman/layman.cfg @@ -0,0 +1,201 @@ +[MAIN] +#----------------------------------------------------------- +# Defines the directory where overlays should be installed + +storage : /var/lib/layman + +#----------------------------------------------------------- +# Remote overlay lists will be stored here +# layman will append _md5(url).xml to each filename + +cache : %(storage)s/cache + +#----------------------------------------------------------- +# The list of locally installed overlays + +installed: %(storage)s/installed.xml + +# This has been renamed from the following +# old name : value use it for updating to new one above +# local_list: %(storage)s/overlays.xml +# either rename the overlays.xml file to installed.xml +# or edit the value above to the current name of your +# installed overlay(s) file. + +#----------------------------------------------------------- +# Path to the make.conf file that should be modified by +# layman + +make_conf : %(storage)s/make.conf + +#----------------------------------------------------------- +# URLs of the remote lists of overlays (one per line) or +# local overlay definitions +# +#overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml +# http://dev.gentoo.org/~wrobel/layman/global-overlays.xml +# http://mydomain.org/my-layman-list.xml +# file:///var/lib/layman/my-list.xml + +overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml + http://www.uhu-banane.de/gentoo/overlay-repos.xml + +#----------------------------------------------------------- +# The directory to scan for xml overlay definition files to include +# in the list of available overlays. They are automatically added to the +# "overlays" parameter above. Use either method, but do not add the same +# definition in both. +# + +#overlay_defs : /etc/layman/overlays + +#----------------------------------------------------------- +# Proxy support +# If unset, layman will use the http_proxy environment variable. +# +#proxy : http://[user:pass@]www.my-proxy.org:3128 + +#----------------------------------------------------------- +# Strict checking of overlay definitions +# +# The nocheck option is a bit confusing, for historical reasons. +# Hopefully this description eases the double negation trouble: +# +# nocheck : yes +# - Accepts complete overlay entries without warnings +# - Lists overlays of type foo (say Git) even with no foo installed +# +# nocheck : no +# - Checks overlay entries for missing description or contact +# information and issue warnings as needed +# - Hides overlays of type foo (say Git) if foo not not installed +# +nocheck : yes + +#----------------------------------------------------------- +# Umask settings +# +# layman should usually work with a umask of 0022. You should +# only change this setting if you are absolutely certain that +# you know what you are doing. +# +#umask : 0022 + +#----------------------------------------------------------- +# News reporting settings +# +# This is for when layman is adding/syncing overlays. +# It is required for GLEP 42. +# Currently there are 3 possible values: +# portage, pkgcore, custom +# +# portage: uses portage to report news only from overlay(s) in +# versions >=2.2.0_alpha72 or >=2.1.10.32 +# or all repositories (including gentoo) for older portage versions. +# pkgcore: does not yet support glep 42, no news is reported +# custom: requires that you provide a suitable python function +# to 'custom_news_func' using the api's config.set_option() +# or define the python package to import it from in custom_news_pkg + +news_reporter: portage + +#----------------------------------------------------------- +# News reporting custom function setting +# +# the pkg name that contains the layman_news_function() +# for it to import and use. It must be found in PYTHONPATH + +#custom_news_pkg : + +#----------------------------------------------------------- +# Command overrides +# +# You can have commands point to either a binary at a different +# location, e.g. +# +# /home/you/local/bin/git +# +# or just the command, e.g. +# +# git +# +# to use PATH-based resolution of the binary to call. +# +#bzr_command : /usr/bin/bzr +#cvs_command : /usr/bin/cvs +#darcs_command : /usr/bin/darcs +#git_command : /usr/bin/git +#mercurial_command : /usr/bin/hg +#rsync_command : /usr/bin/rsync +#svn_command : /usr/bin/svn +#tar_command : /bin/tar +#g-common_command : /usr/bin/g-common + + +#----------------------------------------------------------- +# Command additional options +# +# These commnad options will be added to the above commands +# when the overlay is added or synced. +# +# note: there are some options hardcoded in the backend +# scripts already. All VCS types listed here are +# for general consistency. Options may not be available +# or recommended for all VCS types and/or add/sync operations. +# Any options defined here are deemed: +# "Use at your own risk" +# and are not supported. +# +# eg: +# svn_addopts : --config-option=config:miscellany:use-commit-times=yes +# + +#bzr_addopts : +#bzr_syncopts : +#cvs_addopts : +#cvs_syncopts : +#darcs_addopts : +#darcs_syncopts : +#git_addopts : +#git_syncopts : +#mercurial_addopts : +#mercurial_syncopts : +#rsync_syncopts : +#svn_addopts : +#svn_syncopts : +#g-common_generateopts : +#g-common_syncopts : + + +#----------------------------------------------------------- +# Per VCS Post Sync/Add hooks +# +# The listed commands will be run after every add/sync operation. +# All on one line If the repo path is needed, use a %cwd= in +# where you want the path substituted in. It will be detected +# and replaced with the correct path. +# +# eg: git_postsync : git-set-file-times +# eg: git_postsync : git-set-file-times %cwd= +# eg: git_postsync : git-set-file-times path=%cwd= +# +#bzr_postsync : +#cvs_postsync : +#darcs_postsync : +#git_postsync : +#mercurial_postsync : +#rsync_postsync : +#svn_postsync : +#tar_postsync : +#g-common_postsync : + + +#----------------------------------------------------------- +# Layman user info +# +# The user name and email to use when adding new repos +# +#git_user : layman +#git_email : layman@localhost + + diff --git a/config-archive/etc/layman/layman.cfg.dist.new b/config-archive/etc/layman/layman.cfg.dist.new new file mode 100644 index 0000000..e5c7c72 --- /dev/null +++ b/config-archive/etc/layman/layman.cfg.dist.new @@ -0,0 +1,200 @@ +[MAIN] +#----------------------------------------------------------- +# Defines the directory where overlays should be installed + +storage : /var/lib/layman + +#----------------------------------------------------------- +# Remote overlay lists will be stored here +# layman will append _md5(url).xml to each filename + +cache : %(storage)s/cache + +#----------------------------------------------------------- +# The list of locally installed overlays + +installed: %(storage)s/installed.xml + +# This has been renamed from the following +# old name : value use it for updating to new one above +# local_list: %(storage)s/overlays.xml +# either rename the overlays.xml file to installed.xml +# or edit the value above to the current name of your +# installed overlay(s) file. + +#----------------------------------------------------------- +# Path to the make.conf file that should be modified by +# layman + +make_conf : %(storage)s/make.conf + +#----------------------------------------------------------- +# URLs of the remote lists of overlays (one per line) or +# local overlay definitions +# +#overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml +# http://dev.gentoo.org/~wrobel/layman/global-overlays.xml +# http://mydomain.org/my-layman-list.xml +# file:///var/lib/layman/my-list.xml + +overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml + +#----------------------------------------------------------- +# The directory to scan for xml overlay definition files to include +# in the list of available overlays. They are automatically added to the +# "overlays" parameter above. Use either method, but do not add the same +# definition in both. +# + +#overlay_defs : /etc/layman/overlays + +#----------------------------------------------------------- +# Proxy support +# If unset, layman will use the http_proxy environment variable. +# +#proxy : http://[user:pass@]www.my-proxy.org:3128 + +#----------------------------------------------------------- +# Strict checking of overlay definitions +# +# The nocheck option is a bit confusing, for historical reasons. +# Hopefully this description eases the double negation trouble: +# +# nocheck : yes +# - Accepts complete overlay entries without warnings +# - Lists overlays of type foo (say Git) even with no foo installed +# +# nocheck : no +# - Checks overlay entries for missing description or contact +# information and issue warnings as needed +# - Hides overlays of type foo (say Git) if foo not not installed +# +nocheck : yes + +#----------------------------------------------------------- +# Umask settings +# +# layman should usually work with a umask of 0022. You should +# only change this setting if you are absolutely certain that +# you know what you are doing. +# +#umask : 0022 + +#----------------------------------------------------------- +# News reporting settings +# +# This is for when layman is adding/syncing overlays. +# It is required for GLEP 42. +# Currently there are 3 possible values: +# portage, pkgcore, custom +# +# portage: uses portage to report news only from overlay(s) in +# versions >=2.2.0_alpha72 or >=2.1.10.32 +# or all repositories (including gentoo) for older portage versions. +# pkgcore: does not yet support glep 42, no news is reported +# custom: requires that you provide a suitable python function +# to 'custom_news_func' using the api's config.set_option() +# or define the python package to import it from in custom_news_pkg + +news_reporter: portage + +#----------------------------------------------------------- +# News reporting custom function setting +# +# the pkg name that contains the layman_news_function() +# for it to import and use. It must be found in PYTHONPATH + +#custom_news_pkg : + +#----------------------------------------------------------- +# Command overrides +# +# You can have commands point to either a binary at a different +# location, e.g. +# +# /home/you/local/bin/git +# +# or just the command, e.g. +# +# git +# +# to use PATH-based resolution of the binary to call. +# +#bzr_command : /usr/bin/bzr +#cvs_command : /usr/bin/cvs +#darcs_command : /usr/bin/darcs +#git_command : /usr/bin/git +#mercurial_command : /usr/bin/hg +#rsync_command : /usr/bin/rsync +#svn_command : /usr/bin/svn +#tar_command : /bin/tar +#g-common_command : /usr/bin/g-common + + +#----------------------------------------------------------- +# Command additional options +# +# These commnad options will be added to the above commands +# when the overlay is added or synced. +# +# note: there are some options hardcoded in the backend +# scripts already. All VCS types listed here are +# for general consistency. Options may not be available +# or recommended for all VCS types and/or add/sync operations. +# Any options defined here are deemed: +# "Use at your own risk" +# and are not supported. +# +# eg: +# svn_addopts : --config-option=config:miscellany:use-commit-times=yes +# + +#bzr_addopts : +#bzr_syncopts : +#cvs_addopts : +#cvs_syncopts : +#darcs_addopts : +#darcs_syncopts : +#git_addopts : +#git_syncopts : +#mercurial_addopts : +#mercurial_syncopts : +#rsync_syncopts : +#svn_addopts : +#svn_syncopts : +#g-common_generateopts : +#g-common_syncopts : + + +#----------------------------------------------------------- +# Per VCS Post Sync/Add hooks +# +# The listed commands will be run after every add/sync operation. +# All on one line If the repo path is needed, use a %cwd= in +# where you want the path substituted in. It will be detected +# and replaced with the correct path. +# +# eg: git_postsync : git-set-file-times +# eg: git_postsync : git-set-file-times %cwd= +# eg: git_postsync : git-set-file-times path=%cwd= +# +#bzr_postsync : +#cvs_postsync : +#darcs_postsync : +#git_postsync : +#mercurial_postsync : +#rsync_postsync : +#svn_postsync : +#tar_postsync : +#g-common_postsync : + + +#----------------------------------------------------------- +# Layman user info +# +# The user name and email to use when adding new repos +# +#git_user : layman +#git_email : layman@localhost + + diff --git a/dispatch-conf.conf b/dispatch-conf.conf index 7efce8a..8f4f6a1 100644 --- a/dispatch-conf.conf +++ b/dispatch-conf.conf @@ -23,7 +23,9 @@ 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). diff --git a/portage/make.conf b/portage/make.conf index 41c59db..1ccb92d 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -46,7 +46,18 @@ CPU_FLAGS_X86="mmx sse sse2 sse3 ssse3" # These are the USE flags that were used in addition to what is provided by the # profile used for building. #USE="bindist mmx sse sse2" -USE="acpi bash-completion bazaar bzip2 git gpm idn ipv6 jpeg json lz4 lzma md5sum mmx \ +#USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl dane \ +# djvu doc examples expat fam fastcgi fontconfig ftp gd geoip gif git gmp gnome-keyring \ +# gnutls gost gpg gpm graphviz gs gsl gsm gtk guile hscolour html i18n icu idn imagemagick imap ipv6 ithreads \ +# jadetex java javascript jbig jpeg jpeg2k json kerberos lasi ldap libwww lua lz4 \ +# lzma lzo maildir mailwrapper mercurial mmx mmxext modperl modplug motif mp3 mysql \ +# nis nss numpy odbc ogg openexr openldap openssl pam pch pcre pdf perl pic png php postgres postscript python rar samba sasl \ +# sctp session smtp snmp soap spamassassin speex spell sqlite sqlite3 sse sse2 ssh \ +# subversion svg syslog theora tiff tk truetype unicode vhosts vim-syntax \ +# vorbis webp wmf x264 xattr xml xmlrpc xpm xsl xslt xvid zlib +# -development -rdoc" + +USE="acl acpi audit bash-completion bazaar bzip2 git gpm idn ipv6 jpeg json lz4 lzma md5sum mmx \ mercurial python python2 python3 smtp sse sse2 ssse3 subversion tiff vim-syntax -X xattr unicode" GENTOO_MIRRORS="http://mirror.netcologne.de/gentoo/" -- 2.39.5