]> Frank Brehm's Git Trees - config/helga/etc.git/commitdiff
Current state
authorFrank Brehm <frank@brehm-online.com>
Wed, 2 Jul 2014 19:36:30 +0000 (21:36 +0200)
committerFrank Brehm <frank@brehm-online.com>
Wed, 2 Jul 2014 19:36:30 +0000 (21:36 +0200)
24 files changed:
alternatives/README [new file with mode: 0644]
apt/apt.conf.d/01autoremove [new file with mode: 0644]
apt/sources.list [new file with mode: 0644]
bind/named-sec.conf
conf.d/ipmievd [new file with mode: 0644]
config-archive/etc/inittab.dist [new file with mode: 0644]
config-archive/etc/inittab.dist.new [deleted file]
cron.daily/apt [new file with mode: 0644]
csh.env
env.d/01cvs [new file with mode: 0644]
init.d/crypto-loop [deleted file]
init.d/ipmievd [new file with mode: 0755]
inittab
logrotate.d/apt [new file with mode: 0644]
portage
profile.env
sgml/catalog
sgml/debiandoc-sgml-1.2.27.cat [new file with mode: 0644]
sgml/sgml-data-2.0.8.cat [new file with mode: 0644]
sgml/xml-core-0.13_p2.cat [new file with mode: 0644]
xinetd.d/cvspserver [deleted file]
xml/catalog
xml/sgml-data [new file with mode: 0644]
xml/xml-core [new file with mode: 0644]

diff --git a/alternatives/README b/alternatives/README
new file mode 100644 (file)
index 0000000..54ef740
--- /dev/null
@@ -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 (file)
index 0000000..c7ad51e
--- /dev/null
@@ -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 (file)
index 0000000..cdb4524
--- /dev/null
@@ -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
index aa3b7690ed9c749c17f3dd171966f42fdb7e6120..932dfc8be5ed578626b1a63b57d8b12f04048bb3 100644 (file)
@@ -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 (file)
index 0000000..ee4dd67
--- /dev/null
@@ -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 b/config-archive/etc/inittab.dist
new file mode 100644 (file)
index 0000000..aa588b6
--- /dev/null
@@ -0,0 +1,58 @@
+#
+# /etc/inittab:  This file describes how the INIT process should set up
+#                the system in a certain run-level.
+#
+# Author:  Miquel van Smoorenburg, <miquels@cistron.nl>
+# Modified by:  Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
+# Modified by:  Daniel Robbins, <drobbins@gentoo.org>
+# Modified by:  Martin Schlemmer, <azarah@gentoo.org>
+# Modified by:  Mike Frysinger, <vapier@gentoo.org>
+# Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
+#
+# $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:
+
+# System initialization, mount local filesystems, etc.
+si::sysinit:/sbin/rc sysinit
+
+# Further system initialization, brings up the boot runlevel.
+rc::bootwait:/sbin/rc boot
+
+l0:0:wait:/sbin/rc shutdown 
+l0s:0:wait:/sbin/halt -dhp
+l1:1:wait:/sbin/rc single
+l2:2:wait:/sbin/rc nonetwork
+l3:3:wait:/sbin/rc default
+l4:4:wait:/sbin/rc default
+l5:5:wait:/sbin/rc default
+l6:6:wait:/sbin/rc reboot
+l6r:6:wait:/sbin/reboot -dk
+#z6:6:respawn:/sbin/sulogin
+
+# new-style single-user
+su0:S:wait:/sbin/rc single
+su1:S:wait:/sbin/sulogin
+
+# TERMINALS
+c1:12345:respawn:/sbin/agetty 38400 tty1 linux
+c2:2345:respawn:/sbin/agetty 38400 tty2 linux
+c3:2345:respawn:/sbin/agetty 38400 tty3 linux
+c4:2345:respawn:/sbin/agetty 38400 tty4 linux
+c5:2345:respawn:/sbin/agetty 38400 tty5 linux
+c6:2345:respawn:/sbin/agetty 38400 tty6 linux
+
+# SERIAL CONSOLES
+#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
+
+# Used by /etc/init.d/xdm to control DM startup.
+# Read the comments in /etc/init.d/xdm for more
+# info. Do NOT remove, as this will start nothing
+# 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/config-archive/etc/inittab.dist.new b/config-archive/etc/inittab.dist.new
deleted file mode 100644 (file)
index 2f6af66..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# /etc/inittab:  This file describes how the INIT process should set up
-#                the system in a certain run-level.
-#
-# Author:  Miquel van Smoorenburg, <miquels@cistron.nl>
-# Modified by:  Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by:  Daniel Robbins, <drobbins@gentoo.org>
-# Modified by:  Martin Schlemmer, <azarah@gentoo.org>
-# Modified by:  Mike Frysinger, <vapier@gentoo.org>
-# Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $
-
-# Default runlevel.
-id:3:initdefault:
-
-# System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/rc sysinit
-
-# Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/rc boot
-
-l0:0:wait:/sbin/rc shutdown 
-l0s:0:wait:/sbin/halt -dhp
-l1:1:wait:/sbin/rc single
-l2:2:wait:/sbin/rc nonetwork
-l3:3:wait:/sbin/rc default
-l4:4:wait:/sbin/rc default
-l5:5:wait:/sbin/rc default
-l6:6:wait:/sbin/rc reboot
-l6r:6:wait:/sbin/reboot -dk
-#z6:6:respawn:/sbin/sulogin
-
-# new-style single-user
-su0:S:wait:/sbin/rc single
-su1:S:wait:/sbin/sulogin
-
-# TERMINALS
-c1:12345:respawn:/sbin/agetty 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty 38400 tty4 linux
-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
-
-# What to do at the "Three Finger Salute".
-ca:12345:ctrlaltdel:/sbin/shutdown -r now
-
-# Used by /etc/init.d/xdm to control DM startup.
-# Read the comments in /etc/init.d/xdm for more
-# info. Do NOT remove, as this will start nothing
-# 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 (file)
index 0000000..5c00f22
--- /dev/null
@@ -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 deaf4997649239b2240e1e4e7329185d4c506ea1..473b9628f8a23f175dd6a695d0212f827ebd8602 100644 (file)
--- 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 (file)
index 0000000..5c89358
--- /dev/null
@@ -0,0 +1 @@
+CVS_RSH="ssh"
diff --git a/init.d/crypto-loop b/init.d/crypto-loop
deleted file mode 100755 (executable)
index 853bae2..0000000
+++ /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/tty|\
-                                       /sbin/losetup -p 0 -e ${cipher}-${keysize} ${loop} ${device} ${other}
-                               else
-                                       /sbin/losetup -e ${cipher}-${keysize} ${loop} ${device} ${other}
-                               fi
-
-                               if [ $? -ne 0 ] ; then
-                                       ewarn "Failure configuring ${loop}.  Skipping."
-                                       status=1
-                               fi
-                       else
-                               ewarn "  Loop ${loop} on device ${device} are already configured"
-                       fi
-               done
-       fi
-       ewend ${status} "Failed to start some loop devices."
-
-       # We do not fail if some loop devices did not start ...
-       return 0
-}
-
-stop() {
-       local status="0"
-       for loop in $(ls /dev/loop[0-9] 2>/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 (executable)
index 0000000..5dd4ef1
--- /dev/null
@@ -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 3d50dace346411d6bf0b3fb4dc4ccc17ff35c83b..a6f1a0408a9ce02d1f89f8cf69539384cd3ba23a 100644 (file)
--- a/inittab
+++ b/inittab
@@ -9,7 +9,7 @@
 # Modified by:  Mike Frysinger, <vapier@gentoo.org>
 # Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
 #
-# $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 (file)
index 0000000..9a6e5d1
--- /dev/null
@@ -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 3bb40ec629feac70f346ce3933b44eac4f2eba29..50f6a9aa42da61da212be7535a04fb927caa2230 160000 (submodule)
--- a/portage
+++ b/portage
@@ -1 +1 @@
-Subproject commit 3bb40ec629feac70f346ce3933b44eac4f2eba29
+Subproject commit 50f6a9aa42da61da212be7535a04fb927caa2230
index 02048eea6876f90ea199cb3cb7c4e9282540e7d8..d46d90b094df1ff4a5a770c732c755a1ec1c6561 100644 (file)
@@ -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'
index 213a83779e1f9734b031df48368ee95dff77ab15..5959c84695d83fa726beadba9b752078cb72c99f 100644 (file)
@@ -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 (file)
index 0000000..1c790d3
--- /dev/null
@@ -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 (file)
index 0000000..6c718d4
--- /dev/null
@@ -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 (file)
index 0000000..dc0d903
--- /dev/null
@@ -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 (file)
index 0f2edb0..0000000
+++ /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
-}
index 70d4112ba8777b93ad09693a38927a7a559393e2..cce0f70b7641035952cec8aad9d9623740187740 100644 (file)
   <delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook"/>
   <delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook"/>
   <system systemId="http://glade.gnome.org/glade-2.0.dtd" uri="/usr/share/xml/libglade/glade-2.0.dtd"/>
+  <public publicId="+//IDN faq.org//DTD Frequently Asked Questions" uri="/etc/xml/sgml-data"/>
+  <system systemId="http://xml.ascc.net/xml/resource/qaml-xml" uri="/etc/xml/sgml-data"/>
+  <public publicId="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" uri="/etc/xml/sgml-data"/>
+  <system systemId="/usr/share/sgml/dtd/qaml-xml.dtd" uri="/etc/xml/sgml-data"/>
+  <public publicId="-//W3C//DTD SVG" uri="/etc/xml/sgml-data"/>
+  <system systemId="http://www.w3.org/TR/2001/REC-SVG-20010904/" uri="/etc/xml/sgml-data"/>
+  <system systemId="http://www.w3.org/Graphics/SVG/1.1/" uri="/etc/xml/sgml-data"/>
+  <system systemId="/usr/share/sgml/dtd/svg" uri="/etc/xml/sgml-data"/>
+  <public publicId="ISO 8879:1986//ENTITIES" uri="/etc/xml/sgml-data"/>
+  <system systemId="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" uri="/etc/xml/xml-core"/>
+  <public publicId="-//OASIS//DTD XML Catalogs V1.0//EN" uri="/etc/xml/xml-core"/>
+  <system systemId="http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" uri="/etc/xml/xml-core"/>
+  <public publicId="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" uri="/etc/xml/xml-core"/>
 </catalog>
diff --git a/xml/sgml-data b/xml/sgml-data
new file mode 100644 (file)
index 0000000..7fbc44f
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <public publicId="+//IDN faq.org//DTD Frequently Asked Questions" uri="/usr/share/xml/qaml/catalog.xml"/>
+  <system systemId="http://xml.ascc.net/xml/resource/qaml-xml" uri="/usr/share/xml/qaml/catalog.xml"/>
+  <public publicId="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" uri="/usr/share/xml/qaml/catalog.xml"/>
+  <system systemId="/usr/share/sgml/dtd/qaml-xml.dtd" uri="/usr/share/xml/qaml/catalog.xml"/>
+  <public publicId="-//W3C//DTD SVG" uri="/usr/share/xml/svg/catalog.xml"/>
+  <system systemId="http://www.w3.org/TR/2001/REC-SVG-20010904/" uri="/usr/share/xml/svg/catalog.xml"/>
+  <system systemId="http://www.w3.org/Graphics/SVG/1.1/" uri="/usr/share/xml/svg/catalog.xml"/>
+  <system systemId="/usr/share/sgml/dtd/svg" uri="/usr/share/xml/svg/catalog.xml"/>
+  <public publicId="ISO 8879:1986//ENTITIES" uri="/usr/share/xml/entities/xml-iso-entities-8879.1986/catalog.xml"/>
+</catalog>
diff --git a/xml/xml-core b/xml/xml-core
new file mode 100644 (file)
index 0000000..dd64ebf
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <system systemId="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
+  <public publicId="-//OASIS//DTD XML Catalogs V1.0//EN" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
+  <system systemId="http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
+  <public publicId="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
+</catalog>