From 668ba8cab25046d142f77f20486328cc1caa3b9b Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 2 Jul 2014 21:36:30 +0200 Subject: [PATCH] Current state --- alternatives/README | 2 + apt/apt.conf.d/01autoremove | 26 + apt/sources.list | 8 + bind/named-sec.conf | 33 ++ conf.d/ipmievd | 23 + .../etc/{inittab.dist.new => inittab.dist} | 7 +- cron.daily/apt | 507 ++++++++++++++++++ csh.env | 1 + env.d/01cvs | 1 + init.d/crypto-loop | 70 --- init.d/ipmievd | 25 + inittab | 7 +- logrotate.d/apt | 16 + portage | 2 +- profile.env | 1 + sgml/catalog | 3 + sgml/debiandoc-sgml-1.2.27.cat | 2 + sgml/sgml-data-2.0.8.cat | 13 + sgml/xml-core-0.13_p2.cat | 1 + xinetd.d/cvspserver | 14 - xml/catalog | 13 + xml/sgml-data | 13 + xml/xml-core | 8 + 23 files changed, 703 insertions(+), 93 deletions(-) create mode 100644 alternatives/README create mode 100644 apt/apt.conf.d/01autoremove create mode 100644 apt/sources.list create mode 100644 conf.d/ipmievd rename config-archive/etc/{inittab.dist.new => inittab.dist} (91%) create mode 100644 cron.daily/apt create mode 100644 env.d/01cvs delete mode 100755 init.d/crypto-loop create mode 100755 init.d/ipmievd create mode 100644 logrotate.d/apt create mode 100644 sgml/debiandoc-sgml-1.2.27.cat create mode 100644 sgml/sgml-data-2.0.8.cat create mode 100644 sgml/xml-core-0.13_p2.cat delete mode 100644 xinetd.d/cvspserver create mode 100644 xml/sgml-data create mode 100644 xml/xml-core diff --git a/alternatives/README b/alternatives/README new file mode 100644 index 0000000..54ef740 --- /dev/null +++ b/alternatives/README @@ -0,0 +1,2 @@ +Please read the update-alternatives(8) man page for information on this +directory and its contents. diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove new file mode 100644 index 0000000..c7ad51e --- /dev/null +++ b/apt/apt.conf.d/01autoremove @@ -0,0 +1,26 @@ +APT +{ + NeverAutoRemove + { + "^firmware-linux.*"; + "^linux-firmware$"; + "^linux-image.*"; + "^kfreebsd-image.*"; + "^linux-restricted-modules.*"; + "^linux-ubuntu-modules-.*"; + "^gnumach$"; + "^gnumach-image.*"; + }; + + Never-MarkAuto-Sections + { + "metapackages"; + "restricted/metapackages"; + "universe/metapackages"; + "multiverse/metapackages"; + "oldlibs"; + "restricted/oldlibs"; + "universe/oldlibs"; + "multiverse/oldlibs"; + }; +}; diff --git a/apt/sources.list b/apt/sources.list new file mode 100644 index 0000000..cdb4524 --- /dev/null +++ b/apt/sources.list @@ -0,0 +1,8 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://ftp.us.debian.org/debian wheezy main contrib non-free +deb http://security.debian.org wheezy/updates main contrib non-free + +# Uncomment if you want the apt-get source function to work +#deb-src http://ftp.us.debian.org/debian wheezy main contrib non-free +#deb-src http://security.debian.org wheezy/updates main contrib non-free diff --git a/bind/named-sec.conf b/bind/named-sec.conf index aa3b769..932dfc8 100644 --- a/bind/named-sec.conf +++ b/bind/named-sec.conf @@ -493,6 +493,17 @@ zone "saeger.cc" IN { }; }; +zone "sg-hohh.de" IN { + type slave; + file "sec/sg-hohh.de.zone"; + masters { + 144.76.221.169; + }; + allow-transfer { + common-allow-transfer; + }; +}; + zone "shirlyfcosta.com" IN { type slave; file "sec/shirlyfcosta.com.zone"; @@ -757,6 +768,28 @@ zone "xn--hmato-onkologie-hh-ltb.de" IN { }; }; +zone "zahnpiraten.com" IN { + type slave; + file "sec/zahnpiraten.com.zone"; + masters { + 144.76.221.169; + }; + allow-transfer { + common-allow-transfer; + }; +}; + +zone "zahnpiraten-hamburg.com" IN { + type slave; + file "sec/zahnpiraten-hamburg.com.zone"; + masters { + 144.76.221.169; + }; + allow-transfer { + common-allow-transfer; + }; +}; + #-------------------------------------------------------------------- # Reverse zones ... diff --git a/conf.d/ipmievd b/conf.d/ipmievd new file mode 100644 index 0000000..ee4dd67 --- /dev/null +++ b/conf.d/ipmievd @@ -0,0 +1,23 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd,v 1.1 2007/09/23 06:03:42 robbat2 Exp $ +# /etc/conf.d/ipmievd + +# Interfaces: +# open Linux OpenIPMI Interface +# imb Intel IMB Interface +# bmc IPMI v2.0 BMC interface +# lan IPMI v1.5 LAN Interface +# lanplus IPMI v2.0 RMCP+ LAN Interface + +INTERFACE="open" + +# Commands: +# open Use OpenIPMI for asyncronous notification of events +# sel Poll SEL for notification of events + +COMMAND="open" + +# Options. + +OPTIONS="" diff --git a/config-archive/etc/inittab.dist.new b/config-archive/etc/inittab.dist similarity index 91% rename from config-archive/etc/inittab.dist.new rename to config-archive/etc/inittab.dist index 2f6af66..aa588b6 100644 --- a/config-archive/etc/inittab.dist.new +++ b/config-archive/etc/inittab.dist @@ -9,7 +9,7 @@ # Modified by: Mike Frysinger, # Modified by: Robin H. Johnson, # -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $ # Default runlevel. id:3:initdefault: @@ -44,8 +44,8 @@ c5:2345:respawn:/sbin/agetty 38400 tty5 linux c6:2345:respawn:/sbin/agetty 38400 tty6 linux # SERIAL CONSOLES -#s0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100 -#s1:12345:respawn:/sbin/agetty 115200 ttyS1 vt100 +#s0:12345:respawn:/sbin/agetty -L 115200 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty -L 115200 ttyS1 vt100 # What to do at the "Three Finger Salute". ca:12345:ctrlaltdel:/sbin/shutdown -r now @@ -56,4 +56,3 @@ ca:12345:ctrlaltdel:/sbin/shutdown -r now # extra at boot if /etc/init.d/xdm is not added # to the "default" runlevel. x:a:once:/etc/X11/startDM.sh - diff --git a/cron.daily/apt b/cron.daily/apt new file mode 100644 index 0000000..5c00f22 --- /dev/null +++ b/cron.daily/apt @@ -0,0 +1,507 @@ +#!/bin/sh +#set -e +# +# This file understands the following apt configuration variables: +# Values here are the default. +# Create /etc/apt/apt.conf.d/02periodic file to set your preference. +# +# Dir "/"; +# - RootDir for all configuration files +# +# Dir::Cache "var/cache/apt/"; +# - Set apt package cache directory +# +# Dir::Cache::Archives "archives/"; +# - Set package archive directory +# +# APT::Periodic::Enable "1"; +# - Enable the update/upgrade script (0=disable) +# +# APT::Periodic::BackupArchiveInterval "0"; +# - Backup after n-days if archive contents changed.(0=disable) +# +# APT::Periodic::BackupLevel "3"; +# - Backup level.(0=disable), 1 is invalid. +# +# Dir::Cache::Backup "backup/"; +# - Set periodic package backup directory +# +# APT::Archives::MaxAge "0"; (old, deprecated) +# APT::Periodic::MaxAge "0"; (new) +# - Set maximum allowed age of a cache package file. If a cache +# package file is older it is deleted (0=disable) +# +# APT::Archives::MinAge "2"; (old, deprecated) +# APT::Periodic::MinAge "2"; (new) +# - Set minimum age of a package file. If a file is younger it +# will not be deleted (0=disable). Usefull to prevent races +# and to keep backups of the packages for emergency. +# +# APT::Archives::MaxSize "0"; (old, deprecated) +# APT::Periodic::MaxSize "0"; (new) +# - Set maximum size of the cache in MB (0=disable). If the cache +# is bigger, cached package files are deleted until the size +# requirement is met (the biggest packages will be deleted +# first). +# +# APT::Periodic::Update-Package-Lists "0"; +# - Do "apt-get update" automatically every n-days (0=disable) +# +# APT::Periodic::Download-Upgradeable-Packages "0"; +# - Do "apt-get upgrade --download-only" every n-days (0=disable) +# +# APT::Periodic::Download-Upgradeable-Packages-Debdelta "1"; +# - Use debdelta-upgrade to download updates if available (0=disable) +# +# APT::Periodic::Unattended-Upgrade "0"; +# - Run the "unattended-upgrade" security upgrade script +# every n-days (0=disabled) +# Requires the package "unattended-upgrades" and will write +# a log in /var/log/unattended-upgrades +# +# APT::Periodic::AutocleanInterval "0"; +# - Do "apt-get autoclean" every n-days (0=disable) +# +# APT::Periodic::Verbose "0"; +# - Send report mail to root +# 0: no report (or null string) +# 1: progress report (actually any string) +# 2: + command outputs (remove -qq, remove 2>/dev/null, add -d) +# 3: + trace on + +check_stamp() +{ + stamp="$1" + interval="$2" + + if [ $interval -eq 0 ]; then + debug_echo "check_stamp: interval=0" + # treat as no time has passed + return 1 + fi + + if [ ! -f $stamp ]; then + debug_echo "check_stamp: missing time stamp file: $stamp." + # treat as enough time has passed + return 0 + fi + + # compare midnight today to midnight the day the stamp was updated + stamp_file="$stamp" + stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null) + if [ "$?" != "0" ]; then + # Due to some timezones returning 'invalid date' for midnight on + # certain dates (eg America/Sao_Paulo), if date returns with error + # remove the stamp file and return 0. See coreutils bug: + # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html + rm -f "$stamp_file" + return 0 + fi + + now=$(date --date=$(date --iso-8601) +%s 2>/dev/null) + if [ "$?" != "0" ]; then + # As above, due to some timezones returning 'invalid date' for midnight + # on certain dates (eg America/Sao_Paulo), if date returns with error + # return 0. + return 0 + fi + + delta=$(($now-$stamp)) + + # intervall is in days, convert to sec. + interval=$(($interval*60*60*24)) + debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)" + + # remove timestamps a day (or more) in the future and force re-check + if [ $stamp -gt $(($now+86400)) ]; then + echo "WARNING: file $stamp_file has a timestamp in the future: $stamp" + rm -f "$stamp_file" + return 0 + fi + + if [ $delta -ge $interval ]; then + return 0 + fi + + return 1 +} + +update_stamp() +{ + stamp="$1" + touch $stamp +} + +# we check here if autoclean was enough sizewise +check_size_constraints() +{ + MaxAge=0 + eval $(apt-config shell MaxAge APT::Archives::MaxAge) + eval $(apt-config shell MaxAge APT::Periodic::MaxAge) + + MinAge=2 + eval $(apt-config shell MinAge APT::Archives::MinAge) + eval $(apt-config shell MinAge APT::Periodic::MinAge) + + MaxSize=0 + eval $(apt-config shell MaxSize APT::Archives::MaxSize) + eval $(apt-config shell MaxSize APT::Periodic::MaxSize) + + Cache="/var/cache/apt/archives/" + eval $(apt-config shell Cache Dir::Cache::archives/d) + + # sanity check + if [ -z "$Cache" ]; then + echo "empty Dir::Cache::archives, exiting" + exit + fi + + # check age + if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then + debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge and ctime>$MinAge and mtime>$MinAge" + find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f + elif [ ! $MaxAge -eq 0 ]; then + debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge only" + find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f + else + debug_echo "skip aging since MaxAge is 0" + fi + + # check size + if [ ! $MaxSize -eq 0 ]; then + # maxSize is in MB + MaxSize=$(($MaxSize*1024)) + + #get current time + now=$(date --date=$(date --iso-8601) +%s) + MinAge=$(($MinAge*24*60*60)) + + # reverse-sort by mtime + for file in $(ls -rt $Cache/*.deb 2>/dev/null); do + du=$(du -s $Cache) + size=${du%%/*} + # check if the cache is small enough + if [ $size -lt $MaxSize ]; then + debug_echo "end remove by archive size: size=$size < $MaxSize" + break + fi + + # check for MinAge of the file + if [ $MinAge -ne 0 ]; then + # check both ctime and mtime + mtime=$(stat -c %Y $file) + ctime=$(stat -c %Z $file) + if [ $mtime -gt $ctime ]; then + delta=$(($now-$mtime)) + else + delta=$(($now-$ctime)) + fi + if [ $delta -le $MinAge ]; then + debug_echo "skip remove by archive size: $file, delta=$delta < $MinAgeSec" + break + else + # delete oldest file + debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >= $MaxSize" + rm -f $file + fi + fi + done + fi +} + +# deal with the Apt::Periodic::BackupArchiveInterval +do_cache_backup() +{ + BackupArchiveInterval="$1" + if [ $BackupArchiveInterval -eq 0 ]; then + return + fi + + # Set default values and normalize + CacheDir="/var/cache/apt" + eval $(apt-config shell CacheDir Dir::Cache/d) + CacheDir=${CacheDir%/} + if [ -z "$CacheDir" ]; then + debug_echo "practically empty Dir::Cache, exiting" + return 0 + fi + + Cache="${CacheDir}/archives/" + eval $(apt-config shell Cache Dir::Cache::Archives/d) + if [ -z "$Cache" ]; then + debug_echo "practically empty Dir::Cache::archives, exiting" + return 0 + fi + + BackupLevel=3 + eval $(apt-config shell BackupLevel APT::Periodic::BackupLevel) + if [ $BackupLevel -le 1 ]; then + BackupLevel=2 ; + fi + + Back="${CacheDir}/backup/" + eval $(apt-config shell Back Dir::Cache::Backup/d) + if [ -z "$Back" ]; then + echo "practically empty Dir::Cache::Backup, exiting" 1>&2 + return + fi + + CacheArchive="$(basename "${Cache}")" + test -n "${CacheArchive}" || CacheArchive="archives" + BackX="${Back}${CacheArchive}/" + for x in $(seq 0 1 $((${BackupLevel}-1))); do + eval "Back${x}=${Back}${x}/" + done + + # backup after n-days if archive contents changed. + # (This uses hardlink to save disk space) + BACKUP_ARCHIVE_STAMP=/var/lib/apt/periodic/backup-archive-stamp + if check_stamp $BACKUP_ARCHIVE_STAMP $BackupArchiveInterval; then + if [ $({(cd $Cache 2>/dev/null; find . -name "*.deb"); (cd $Back0 2>/dev/null;find . -name "*.deb") ;}| sort|uniq -u|wc -l) -ne 0 ]; then + mkdir -p $Back + rm -rf $Back$((${BackupLevel}-1)) + for y in $(seq $((${BackupLevel}-1)) -1 1); do + eval BackY=${Back}$y + eval BackZ=${Back}$(($y-1)) + if [ -e $BackZ ]; then + mv -f $BackZ $BackY ; + fi + done + cp -la $Cache $Back ; mv -f $BackX $Back0 + update_stamp $BACKUP_ARCHIVE_STAMP + debug_echo "backup with hardlinks. (success)" + else + debug_echo "skip backup since same content." + fi + else + debug_echo "skip backup since too new." + fi +} + +# sleep for a random interval of time (default 30min) +# (some code taken from cron-apt, thanks) +random_sleep() +{ + RandomSleep=1800 + eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) + if [ $RandomSleep -eq 0 ]; then + return + fi + if [ -z "$RANDOM" ] ; then + # A fix for shells that do not have this bash feature. + RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") + fi + TIME=$(($RANDOM % $RandomSleep)) + debug_echo "sleeping for $TIME seconds" + sleep $TIME +} + + +debug_echo() +{ + # Display message if $VERBOSE >= 1 + if [ "$VERBOSE" -ge 1 ]; then + echo $1 1>&2 + fi +} + +check_power(){ + # laptop check, on_ac_power returns: + # 0 (true) System is on main power + # 1 (false) System is not on main power + # 255 (false) Power status could not be determined + # Desktop systems always return 255 it seems + if which on_ac_power >/dev/null; then + on_ac_power + POWER=$? + if [ $POWER -eq 1 ]; then + debug_echo "exit: system NOT on main power" + return 1 + elif [ $POWER -ne 0 ]; then + debug_echo "power status ($POWER) undetermined, continuing" + fi + debug_echo "system is on main power." + fi + return 0 +} + +# ------------------------ main ---------------------------- + +if test -r /var/lib/apt/extended_states; then + # Backup the 7 last versions of APT's extended_states file + # shameless copy from dpkg cron + if cd /var/backups ; then + if ! cmp -s apt.extended_states.0 /var/lib/apt/extended_states; then + cp -p /var/lib/apt/extended_states apt.extended_states + savelog -c 7 apt.extended_states >/dev/null + fi + fi +fi + +# check apt-config exstance +if ! which apt-config >/dev/null ; then + exit 0 +fi + +# check if the user really wants to do something +AutoAptEnable=1 # default is yes +eval $(apt-config shell AutoAptEnable APT::Periodic::Enable) + +if [ $AutoAptEnable -eq 0 ]; then + exit 0 +fi + +# Set VERBOSE mode from apt-config (or inherit from environment) +VERBOSE=0 +eval $(apt-config shell VERBOSE APT::Periodic::Verbose) +debug_echo "verbose level $VERBOSE" +if [ "$VERBOSE" -le 2 ]; then + # quiet for 0,1,2 + XSTDOUT=">/dev/null" + XSTDERR="2>/dev/null" + XAPTOPT="-qq" + XUUPOPT="" +else + XSTDOUT="" + XSTDERR="" + XAPTOPT="" + XUUPOPT="-d" +fi +if [ "$VERBOSE" -ge 3 ]; then + # trace output + set -x +fi + +check_power || exit 0 + +# check if we can lock the cache and if the cache is clean +if which apt-get >/dev/null && ! eval apt-get check -f $XAPTOPT $XSTDERR ; then + debug_echo "error encountered in cron job with \"apt-get check\"." + exit 0 +fi + +# Global current time in seconds since 1970-01-01 00:00:00 UTC +now=$(date +%s) + +# Support old Archive for compatibility. +# Document only Periodic for all controling parameters of this script. + +UpdateInterval=0 +eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists) + +DownloadUpgradeableInterval=0 +eval $(apt-config shell DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) + +UnattendedUpgradeInterval=0 +eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) + +AutocleanInterval=0 +eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) + +BackupArchiveInterval=0 +eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) + +Debdelta=1 +eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) + +# check if we actually have to do anything that requires locking the cache +if [ $UpdateInterval -eq 0 ] && + [ $DownloadUpgradeableInterval -eq 0 ] && + [ $UnattendedUpgradeInterval -eq 0 ] && + [ $BackupArchiveInterval -eq 0 ] && + [ $AutocleanInterval -eq 0 ]; then + + # check cache size + check_size_constraints + + exit 0 +fi + +# deal with BackupArchiveInterval +do_cache_backup $BackupArchiveInterval + +# sleep random amount of time to avoid hitting the +# mirrors at the same time +random_sleep +check_power || exit 0 + +# include default system language so that "apt-get update" will +# fetch the right translated package descriptions +if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG LANGUAGE LC_MESSAGES LC_ALL +fi + +# update package lists +UPDATED=0 +UPDATE_STAMP=/var/lib/apt/periodic/update-stamp +if check_stamp $UPDATE_STAMP $UpdateInterval; then + if eval apt-get $XAPTOPT -y update $XSTDERR; then + debug_echo "download updated metadata (success)." + if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then + if dbus-send --system / app.apt.dbus.updated boolean:true ; then + debug_echo "send dbus signal (success)" + else + debug_echo "send dbus signal (error)" + fi + else + debug_echo "dbus signal not send (command not available)" + fi + update_stamp $UPDATE_STAMP + UPDATED=1 + else + debug_echo "download updated metadata (error)" + fi +else + debug_echo "download updated metadata (not run)." +fi + +# download all upgradeable packages (if it is requested) +DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp +if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then + if [ $Debdelta -eq 1 ]; then + debdelta-upgrade >/dev/null 2>&1 || true + fi + if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then + update_stamp $DOWNLOAD_UPGRADEABLE_STAMP + debug_echo "download upgradable (success)" + else + debug_echo "download upgradable (error)" + fi +else + debug_echo "download upgradable (not run)" +fi + +# auto upgrade all upgradeable packages +UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp +if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then + if unattended-upgrade $XUUPOPT; then + update_stamp $UPGRADE_STAMP + debug_echo "unattended-upgrade (success)" + else + debug_echo "unattended-upgrade (error)" + fi +else + debug_echo "unattended-upgrade (not run)" +fi + +# autoclean package archive +AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp +if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then + if eval apt-get $XAPTOPT -y autoclean $XSTDERR; then + debug_echo "autoclean (success)." + update_stamp $AUTOCLEAN_STAMP + else + debug_echo "autoclean (error)" + fi +else + debug_echo "autoclean (not run)" +fi + +# check cache size +check_size_constraints + +# +# vim: set sts=4 ai : +# + diff --git a/csh.env b/csh.env index deaf499..473b962 100644 --- a/csh.env +++ b/csh.env @@ -4,6 +4,7 @@ setenv CONFIG_PROTECT '/var/bind /usr/share/gnupg/qualified.txt' setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/fonts/fonts.conf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild' +setenv CVS_RSH 'ssh' setenv EDITOR '/usr/bin/vim' setenv GCC_SPECS '' setenv GUILE_LOAD_PATH '/usr/share/guile/1.8' diff --git a/env.d/01cvs b/env.d/01cvs new file mode 100644 index 0000000..5c89358 --- /dev/null +++ b/env.d/01cvs @@ -0,0 +1 @@ +CVS_RSH="ssh" diff --git a/init.d/crypto-loop b/init.d/crypto-loop deleted file mode 100755 index 853bae2..0000000 --- a/init.d/crypto-loop +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.4 2008/10/26 03:16:48 vapier Exp $ - -depend() { - if [ -x /etc/init.d/root ]; then - need root - else - need checkroot - fi - need modules - before localmount -} - -start() { - local status="0" - - ebegin "Starting crypto loop devices" - - if [ -e /etc/conf.d/crypto-loop ] ; then - egrep "^loop" /etc/conf.d/crypto-loop | \ - while read loopline ; do - eval ${loopline} - - local configured=$(awk -v MOUNT="${device}" \ - '($2 == MOUNT) { print "yes" }' /proc/mounts) - - if [ "${configured}" != "yes" ] ; then - einfo " Loop ${loop} on device ${device} (cipher ${cipher}, key size ${keysize}): " - - if [ -n "${hash}" ] ; then - /usr/sbin/hashalot -n ${keysize} ${hash} /dev/null) ; do - losetup ${loop} > /dev/null 2>&1 - if [ $? -eq 0 ] ; then - ( umount ${loop} || swapoff "${loop}" ) >/dev/null 2>&1 - if ! /sbin/losetup -d ${loop} > /dev/null 2>&1; then - ewarn "Failure deconfiguring ${loop}." - status=1 - fi - fi - done - ewend ${status} -} - - -# vim:ts=4 diff --git a/init.d/ipmievd b/init.d/ipmievd new file mode 100755 index 0000000..5dd4ef1 --- /dev/null +++ b/init.d/ipmievd @@ -0,0 +1,25 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd,v 1.1 2007/09/23 06:03:42 robbat2 Exp $ +# /etc/init.d/ipmievd + +depend() { + use logger +} +PN="ipmievd" + +start() { + /sbin/modprobe -sq ipmi_msghandler + /sbin/modprobe -sq ipmi_devintf + /sbin/modprobe -sq ipmi_si + ebegin "Starting ${PN}" + start-stop-daemon --start --pidfile /var/run/${PN}.pid0 --exec /usr/sbin/${PN} -- -I ${INTERFACE} ${OPTIONS} ${COMMAND} + eend $? +} + +stop() { + ebegin "Stopping ${PN}" + start-stop-daemon --stop --pidfile /var/run/${PN}.pid0 + eend $? +} diff --git a/inittab b/inittab index 3d50dac..a6f1a04 100644 --- a/inittab +++ b/inittab @@ -9,7 +9,7 @@ # Modified by: Mike Frysinger, # Modified by: Robin H. Johnson, # -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $ # Default runlevel. id:3:initdefault: @@ -44,8 +44,8 @@ c5:2345:respawn:/sbin/agetty 38400 tty5 linux c6:2345:respawn:/sbin/agetty 38400 tty6 linux # SERIAL CONSOLES -#s0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100 -#s1:12345:respawn:/sbin/agetty 115200 ttyS1 vt100 +#s0:12345:respawn:/sbin/agetty -L 115200 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty -L 115200 ttyS1 vt100 s0:12345:respawn:/sbin/agetty -L ttyS0 57600 vt100 # What to do at the "Three Finger Salute". @@ -57,4 +57,3 @@ ca:12345:ctrlaltdel:/sbin/shutdown -r now # extra at boot if /etc/init.d/xdm is not added # to the "default" runlevel. x:a:once:/etc/X11/startDM.sh - diff --git a/logrotate.d/apt b/logrotate.d/apt new file mode 100644 index 0000000..9a6e5d1 --- /dev/null +++ b/logrotate.d/apt @@ -0,0 +1,16 @@ +/var/log/apt/term.log { + rotate 12 + monthly + compress + missingok + notifempty +} + +/var/log/apt/history.log { + rotate 12 + monthly + compress + missingok + notifempty +} + diff --git a/portage b/portage index 3bb40ec..50f6a9a 160000 --- a/portage +++ b/portage @@ -1 +1 @@ -Subproject commit 3bb40ec629feac70f346ce3933b44eac4f2eba29 +Subproject commit 50f6a9aa42da61da212be7535a04fb927caa2230 diff --git a/profile.env b/profile.env index 02048ee..d46d90b 100644 --- a/profile.env +++ b/profile.env @@ -4,6 +4,7 @@ export CONFIG_PROTECT='/var/bind /usr/share/gnupg/qualified.txt' export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/fonts/fonts.conf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild' +export CVS_RSH='ssh' export EDITOR='/usr/bin/vim' export GCC_SPECS='' export GUILE_LOAD_PATH='/usr/share/guile/1.8' diff --git a/sgml/catalog b/sgml/catalog index 213a837..5959c84 100644 --- a/sgml/catalog +++ b/sgml/catalog @@ -9,3 +9,6 @@ CATALOG "/etc/sgml/xml-docbook-4.4.cat" CATALOG "/etc/sgml/xml-docbook-4.5.cat" CATALOG "/etc/sgml/linuxdoc.cat" CATALOG "/etc/sgml/openjade-1.3.2.cat" +CATALOG "/etc/sgml/sgml-data-2.0.8.cat" +CATALOG "/etc/sgml/xml-core-0.13_p2.cat" +CATALOG "/etc/sgml/debiandoc-sgml-1.2.27.cat" diff --git a/sgml/debiandoc-sgml-1.2.27.cat b/sgml/debiandoc-sgml-1.2.27.cat new file mode 100644 index 0000000..1c790d3 --- /dev/null +++ b/sgml/debiandoc-sgml-1.2.27.cat @@ -0,0 +1,2 @@ +CATALOG "/usr/share/sgml/debiandoc/dtd/sgml/1.0/catalog" +CATALOG "/usr/share/sgml/debiandoc/entities/catalog" diff --git a/sgml/sgml-data-2.0.8.cat b/sgml/sgml-data-2.0.8.cat new file mode 100644 index 0000000..6c718d4 --- /dev/null +++ b/sgml/sgml-data-2.0.8.cat @@ -0,0 +1,13 @@ +CATALOG "/usr/share/sgml/dtd/catalog" +CATALOG "/usr/share/sgml/entities/ArborText/catalog" +CATALOG "/usr/share/sgml/entities/Hewlett-Packard/catalog" +CATALOG "/usr/share/sgml/entities/sgml-iso-entities-8879.1986/catalog" +CATALOG "/usr/share/sgml/entities/sgml-iso-entities-9573-13.1991/catalog" +CATALOG "/usr/share/sgml/html/dtd/catalog" +CATALOG "/usr/share/sgml/html/dtd/4.0/catalog" +CATALOG "/usr/share/sgml/html/dtd/4.01/catalog" +CATALOG "/usr/share/sgml/html/dtd/iso-15445/catalog" +CATALOG "/usr/share/sgml/html/entities/catalog" +CATALOG "/usr/share/xml/qaml/catalog" +CATALOG "/usr/share/xml/svg/catalog" +CATALOG "/usr/share/xml/entities/xml-iso-entities-8879.1986/catalog" diff --git a/sgml/xml-core-0.13_p2.cat b/sgml/xml-core-0.13_p2.cat new file mode 100644 index 0000000..dc0d903 --- /dev/null +++ b/sgml/xml-core-0.13_p2.cat @@ -0,0 +1 @@ +CATALOG "/usr/share/sgml/dtd/xml-core/catalog" diff --git a/xinetd.d/cvspserver b/xinetd.d/cvspserver deleted file mode 100644 index 0f2edb0..0000000 --- a/xinetd.d/cvspserver +++ /dev/null @@ -1,14 +0,0 @@ -service cvspserver -{ - disable = yes - socket_type = stream - wait = no - user = root - log_type = FILE /var/log/cvspserver - protocol = tcp - env = HOME=/var/cvsroot - log_on_failure += USERID - port = 2401 - server = /usr/bin/cvs - server_args = -f --allow-root=/var/cvsroot pserver -} diff --git a/xml/catalog b/xml/catalog index 70d4112..cce0f70 100644 --- a/xml/catalog +++ b/xml/catalog @@ -12,4 +12,17 @@ + + + + + + + + + + + + + diff --git a/xml/sgml-data b/xml/sgml-data new file mode 100644 index 0000000..7fbc44f --- /dev/null +++ b/xml/sgml-data @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/xml/xml-core b/xml/xml-core new file mode 100644 index 0000000..dd64ebf --- /dev/null +++ b/xml/xml-core @@ -0,0 +1,8 @@ + + + + + + + + -- 2.39.5