From 567779a2e738df69a28d4e2bf94281cf4b53d4bd Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 19 Sep 2013 10:34:54 +0200 Subject: [PATCH] Current state --- .etckeeper | 260 +++---- {ImageMagick => ImageMagick-6}/coder.xml | 0 {ImageMagick => ImageMagick-6}/colors.xml | 0 {ImageMagick => ImageMagick-6}/delegates.xml | 35 +- {ImageMagick => ImageMagick-6}/log.xml | 0 {ImageMagick => ImageMagick-6}/magic.xml | 0 {ImageMagick => ImageMagick-6}/mime.xml | 1 + {ImageMagick => ImageMagick-6}/policy.xml | 3 +- ImageMagick-6/quantization-table.xml | 62 ++ {ImageMagick => ImageMagick-6}/thresholds.xml | 0 .../type-dejavu.xml | 0 .../type-ghostscript.xml | 0 .../type-windows.xml | 0 {ImageMagick => ImageMagick-6}/type.xml | 0 ImageMagick/quantization-table.xml | 43 -- autofs/auto.net | 2 +- conf.d/autofs | 136 ---- conf.d/busybox-klogd | 9 + conf.d/busybox-ntpd | 6 + conf.d/busybox-syslogd | 9 + conf.d/busybox-watchdog | 9 + eixrc => eixrc.backup.0000 | 0 eselect/postgresql/active.links | 112 +-- eselect/postgresql/active.links92 | 62 +- etckeeper/commit.d/50vcs-commit | 15 + etckeeper/etckeeper.conf | 2 +- etckeeper/list-installed.d/50list-installed | 2 + etckeeper/pre-commit.d/30store-metadata | 4 +- etckeeper/update-ignore.d/01update-ignore | 2 +- init.d/atd | 22 +- init.d/busybox-klogd | 12 + init.d/busybox-ntpd | 13 + init.d/busybox-syslogd | 13 + init.d/busybox-watchdog | 8 + init.d/gpm | 39 +- init.d/twistd | 2 +- openldap/schema/README | 2 +- openldap/schema/collective.ldif | 2 +- openldap/schema/collective.schema | 2 +- openldap/schema/corba.ldif | 2 +- openldap/schema/corba.schema | 2 +- openldap/schema/core.ldif | 2 +- openldap/schema/core.schema | 2 +- openldap/schema/cosine.ldif | 2 +- openldap/schema/cosine.schema | 2 +- openldap/schema/duaconf.ldif | 2 +- openldap/schema/duaconf.schema | 2 +- openldap/schema/dyngroup.ldif | 2 +- openldap/schema/dyngroup.schema | 2 +- openldap/schema/inetorgperson.ldif | 2 +- openldap/schema/inetorgperson.schema | 2 +- openldap/schema/java.ldif | 2 +- openldap/schema/java.schema | 2 +- openldap/schema/misc.ldif | 2 +- openldap/schema/misc.schema | 2 +- openldap/schema/nis.ldif | 2 +- openldap/schema/nis.schema | 2 +- openldap/schema/openldap.ldif | 2 +- openldap/schema/openldap.schema | 2 +- openldap/schema/pmi.ldif | 2 +- openldap/schema/pmi.schema | 2 +- openldap/schema/ppolicy.ldif | 2 +- openldap/schema/ppolicy.schema | 2 +- openldap/schema/rfc2307bis.schema | 665 ++++++++++-------- php/apache2-php5.5/php.ini | 3 +- php/cgi-php5.5/php.ini | 3 +- php/cli-php5.5/php.ini | 3 +- php/embed-php5.5/php.ini | 3 +- php/fpm-php5.5/php.ini | 3 +- portage/package.use | 17 +- .../{busybox-1.20.2 => busybox-1.21.0} | 32 +- ssl/certs/0d8b9131.0 | 1 - ssl/certs/0f11b315.0 | 1 - ssl/certs/1503d3dd.0 | 1 - ssl/certs/3ee7e181.1 | 1 - ssl/certs/48ef30f1.0 | 1 - ssl/certs/5c67e263.0 | 1 - ssl/certs/6faac4e3.0 | 1 - ssl/certs/972672fc.0 | 1 - ssl/certs/a9603aca.0 | 1 - ssl/certs/ad493b2e.0 | 1 - ssl/certs/b293fb2c.0 | 1 - ssl/certs/b4f0b7e7.0 | 1 - ssl/certs/bccd5223.0 | 1 - ssl/certs/e1213163.0 | 1 - ssl/certs/f15719eb.0 | 1 - udhcpd.conf | 115 +++ 87 files changed, 989 insertions(+), 807 deletions(-) rename {ImageMagick => ImageMagick-6}/coder.xml (100%) rename {ImageMagick => ImageMagick-6}/colors.xml (100%) rename {ImageMagick => ImageMagick-6}/delegates.xml (84%) rename {ImageMagick => ImageMagick-6}/log.xml (100%) rename {ImageMagick => ImageMagick-6}/magic.xml (100%) rename {ImageMagick => ImageMagick-6}/mime.xml (99%) rename {ImageMagick => ImageMagick-6}/policy.xml (97%) create mode 100644 ImageMagick-6/quantization-table.xml rename {ImageMagick => ImageMagick-6}/thresholds.xml (100%) rename {ImageMagick => ImageMagick-6}/type-dejavu.xml (100%) rename {ImageMagick => ImageMagick-6}/type-ghostscript.xml (100%) rename {ImageMagick => ImageMagick-6}/type-windows.xml (100%) rename {ImageMagick => ImageMagick-6}/type.xml (100%) delete mode 100644 ImageMagick/quantization-table.xml delete mode 100644 conf.d/autofs create mode 100644 conf.d/busybox-klogd create mode 100644 conf.d/busybox-ntpd create mode 100644 conf.d/busybox-syslogd create mode 100644 conf.d/busybox-watchdog rename eixrc => eixrc.backup.0000 (100%) create mode 100755 init.d/busybox-klogd create mode 100755 init.d/busybox-ntpd create mode 100755 init.d/busybox-syslogd create mode 100755 init.d/busybox-watchdog rename portage/savedconfig/sys-apps/{busybox-1.20.2 => busybox-1.21.0} (98%) delete mode 120000 ssl/certs/0d8b9131.0 delete mode 120000 ssl/certs/0f11b315.0 delete mode 120000 ssl/certs/1503d3dd.0 delete mode 120000 ssl/certs/3ee7e181.1 delete mode 120000 ssl/certs/48ef30f1.0 delete mode 120000 ssl/certs/5c67e263.0 delete mode 120000 ssl/certs/6faac4e3.0 delete mode 120000 ssl/certs/972672fc.0 delete mode 120000 ssl/certs/a9603aca.0 delete mode 120000 ssl/certs/ad493b2e.0 delete mode 120000 ssl/certs/b293fb2c.0 delete mode 120000 ssl/certs/b4f0b7e7.0 delete mode 120000 ssl/certs/bccd5223.0 delete mode 120000 ssl/certs/e1213163.0 delete mode 120000 ssl/certs/f15719eb.0 create mode 100644 udhcpd.conf diff --git a/.etckeeper b/.etckeeper index 12fc9d5..e23394a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -47,20 +47,20 @@ maybe chmod 0644 './.gitignore' maybe chmod 0600 './.pwd.lock' maybe chmod 0644 './DIR_COLORS' maybe chmod 0644 './GeoIP.conf' -maybe chmod 0755 './ImageMagick' -maybe chmod 0644 './ImageMagick/coder.xml' -maybe chmod 0644 './ImageMagick/colors.xml' -maybe chmod 0644 './ImageMagick/delegates.xml' -maybe chmod 0644 './ImageMagick/log.xml' -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/thresholds.xml' -maybe chmod 0644 './ImageMagick/type-dejavu.xml' -maybe chmod 0644 './ImageMagick/type-ghostscript.xml' -maybe chmod 0644 './ImageMagick/type-windows.xml' -maybe chmod 0644 './ImageMagick/type.xml' +maybe chmod 0755 './ImageMagick-6' +maybe chmod 0644 './ImageMagick-6/coder.xml' +maybe chmod 0644 './ImageMagick-6/colors.xml' +maybe chmod 0644 './ImageMagick-6/delegates.xml' +maybe chmod 0644 './ImageMagick-6/log.xml' +maybe chmod 0644 './ImageMagick-6/magic.xml' +maybe chmod 0644 './ImageMagick-6/mime.xml' +maybe chmod 0644 './ImageMagick-6/policy.xml' +maybe chmod 0644 './ImageMagick-6/quantization-table.xml' +maybe chmod 0644 './ImageMagick-6/thresholds.xml' +maybe chmod 0644 './ImageMagick-6/type-dejavu.xml' +maybe chmod 0644 './ImageMagick-6/type-ghostscript.xml' +maybe chmod 0644 './ImageMagick-6/type-windows.xml' +maybe chmod 0644 './ImageMagick-6/type.xml' maybe chmod 0755 './X11' maybe chmod 0755 './X11/xinit' maybe chmod 0755 './X11/xinit/xinitrc.d' @@ -74,7 +74,7 @@ maybe chmod 0644 './acpi/events/default' maybe chmod 0600 './aiccu.conf' maybe chmod 0755 './alternatives' maybe chmod 0644 './alternatives/README' -maybe chgrp amavis './amavisd.conf' +maybe chgrp 'amavis' './amavisd.conf' maybe chmod 0640 './amavisd.conf' maybe chmod 0755 './apache2' maybe chmod 0644 './apache2/httpd.conf' @@ -115,7 +115,7 @@ maybe chmod 0644 './apache2/vhosts.d/01_egroupware.conf' maybe chmod 0644 './apache2/vhosts.d/02_bilder.conf' maybe chmod 0644 './apache2/vhosts.d/default_vhost.include' maybe chmod 0755 './at' -maybe chgrp at './at/at.deny' +maybe chgrp 'at' './at/at.deny' maybe chmod 0640 './at/at.deny' maybe chmod 0755 './audisp' maybe chmod 0640 './audisp/audisp-remote.conf' @@ -141,20 +141,20 @@ maybe chmod 0755 './bash' maybe chmod 0644 './bash/bash_logout' maybe chmod 0644 './bash/bashrc' maybe chmod 0755 './bash_completion.d' -maybe chown named './bind' +maybe chown 'named' './bind' maybe chmod 0755 './bind' -maybe chgrp named './bind/bind.keys' +maybe chgrp 'named' './bind/bind.keys' maybe chmod 0640 './bind/bind.keys' maybe chmod 0644 './bind/named-acl.conf' maybe chmod 0644 './bind/named-dyn.conf' maybe chmod 0644 './bind/named-log.conf' maybe chmod 0644 './bind/named-pri.conf' maybe chmod 0644 './bind/named-sec.conf' -maybe chgrp named './bind/named.conf' +maybe chgrp 'named' './bind/named.conf' maybe chmod 0640 './bind/named.conf' -maybe chgrp named './bind/named.conf.orig' +maybe chgrp 'named' './bind/named.conf.orig' maybe chmod 0640 './bind/named.conf.orig' -maybe chgrp named './bind/rndc.key' +maybe chgrp 'named' './bind/rndc.key' maybe chmod 0640 './bind/rndc.key' maybe chmod 0755 './ca-certificates' maybe chmod 0644 './ca-certificates.conf' @@ -167,8 +167,11 @@ maybe chmod 0644 './conf.d/acpid' maybe chmod 0644 './conf.d/apache2' maybe chmod 0644 './conf.d/atd' maybe chmod 0644 './conf.d/auditd' -maybe chmod 0644 './conf.d/autofs' maybe chmod 0644 './conf.d/bootmisc' +maybe chmod 0644 './conf.d/busybox-klogd' +maybe chmod 0644 './conf.d/busybox-ntpd' +maybe chmod 0644 './conf.d/busybox-syslogd' +maybe chmod 0644 './conf.d/busybox-watchdog' maybe chmod 0644 './conf.d/clamd' maybe chmod 0644 './conf.d/consolefont' maybe chmod 0644 './conf.d/crypto-loop' @@ -618,8 +621,8 @@ maybe chmod 0755 './config-archive/var' maybe chmod 0755 './config-archive/var/bind' maybe chmod 0640 './config-archive/var/bind/named.cache' maybe chmod 0640 './config-archive/var/bind/named.cache.dist' -maybe chown mail './courier' -maybe chgrp mail './courier' +maybe chown 'mail' './courier' +maybe chgrp 'mail' './courier' maybe chmod 0755 './courier' maybe chmod 0755 './courier-imap' maybe chmod 0600 './courier-imap/imapd' @@ -631,37 +634,37 @@ maybe chmod 0600 './courier-imap/pop3d.cnf' maybe chmod 0444 './courier-imap/quotawarnmsg.example' maybe chmod 0755 './courier-imap/shared' maybe chmod 0755 './courier-imap/shared.tmp' -maybe chown mail './courier/authlib' -maybe chgrp mail './courier/authlib' +maybe chown 'mail' './courier/authlib' +maybe chgrp 'mail' './courier/authlib' maybe chmod 0755 './courier/authlib' maybe chmod 0644 './courier/authlib/.keep_net-libs_courier-authlib-0' -maybe chown mail './courier/authlib/authdaemonrc' -maybe chgrp mail './courier/authlib/authdaemonrc' +maybe chown 'mail' './courier/authlib/authdaemonrc' +maybe chgrp 'mail' './courier/authlib/authdaemonrc' maybe chmod 0660 './courier/authlib/authdaemonrc' -maybe chown mail './courier/authlib/authdaemonrc.dist' -maybe chgrp mail './courier/authlib/authdaemonrc.dist' +maybe chown 'mail' './courier/authlib/authdaemonrc.dist' +maybe chgrp 'mail' './courier/authlib/authdaemonrc.dist' maybe chmod 0660 './courier/authlib/authdaemonrc.dist' -maybe chown mail './courier/authlib/authldaprc' -maybe chgrp mail './courier/authlib/authldaprc' +maybe chown 'mail' './courier/authlib/authldaprc' +maybe chgrp 'mail' './courier/authlib/authldaprc' maybe chmod 0660 './courier/authlib/authldaprc' -maybe chown mail './courier/authlib/authldaprc.dist' -maybe chgrp mail './courier/authlib/authldaprc.dist' +maybe chown 'mail' './courier/authlib/authldaprc.dist' +maybe chgrp 'mail' './courier/authlib/authldaprc.dist' maybe chmod 0660 './courier/authlib/authldaprc.dist' -maybe chown mail './courier/authlib/authmysqlrc' -maybe chgrp mail './courier/authlib/authmysqlrc' +maybe chown 'mail' './courier/authlib/authmysqlrc' +maybe chgrp 'mail' './courier/authlib/authmysqlrc' maybe chmod 0660 './courier/authlib/authmysqlrc' -maybe chown mail './courier/authlib/authmysqlrc.dist' -maybe chgrp mail './courier/authlib/authmysqlrc.dist' +maybe chown 'mail' './courier/authlib/authmysqlrc.dist' +maybe chgrp 'mail' './courier/authlib/authmysqlrc.dist' maybe chmod 0660 './courier/authlib/authmysqlrc.dist' -maybe chown mail './courier/authlib/authpgsqlrc' -maybe chgrp mail './courier/authlib/authpgsqlrc' +maybe chown 'mail' './courier/authlib/authpgsqlrc' +maybe chgrp 'mail' './courier/authlib/authpgsqlrc' maybe chmod 0660 './courier/authlib/authpgsqlrc' -maybe chown mail './courier/authlib/authpgsqlrc.dist' -maybe chgrp mail './courier/authlib/authpgsqlrc.dist' +maybe chown 'mail' './courier/authlib/authpgsqlrc.dist' +maybe chgrp 'mail' './courier/authlib/authpgsqlrc.dist' maybe chmod 0660 './courier/authlib/authpgsqlrc.dist' maybe chmod 0640 './courier/authlib/authsqliterc' -maybe chown mail './courier/authlib/authsqliterc.dist' -maybe chgrp mail './courier/authlib/authsqliterc.dist' +maybe chown 'mail' './courier/authlib/authsqliterc.dist' +maybe chgrp 'mail' './courier/authlib/authsqliterc.dist' maybe chmod 0660 './courier/authlib/authsqliterc.dist' maybe chmod 0755 './cron.d' maybe chmod 0644 './cron.d/.keep_sys-process_vixie-cron-0' @@ -684,19 +687,19 @@ maybe chmod 0750 './cron.weekly' maybe chmod 0644 './cron.weekly/.keep_sys-process_cronbase-0' maybe chmod 0644 './crontab' maybe chmod 0644 './csh.env' -maybe chgrp lp './cups' +maybe chgrp 'lp' './cups' maybe chmod 0755 './cups' maybe chmod 0644 './cups/client.conf' maybe chmod 0644 './cups/cups-browsed.conf' -maybe chgrp lp './cups/cups-files.conf' +maybe chgrp 'lp' './cups/cups-files.conf' maybe chmod 0640 './cups/cups-files.conf' -maybe chgrp lp './cups/cupsd.conf' +maybe chgrp 'lp' './cups/cupsd.conf' maybe chmod 0640 './cups/cupsd.conf' maybe chmod 0755 './cups/interfaces' maybe chmod 0644 './cups/interfaces/.keep_net-print_cups-0' maybe chmod 0755 './cups/ppd' maybe chmod 0644 './cups/ppd/.keep_net-print_cups-0' -maybe chgrp lp './cups/snmp.conf' +maybe chgrp 'lp' './cups/snmp.conf' maybe chmod 0640 './cups/snmp.conf' maybe chmod 0755 './cups/ssl' maybe chmod 0644 './cups/ssl/.keep_net-print_cups-0' @@ -720,7 +723,9 @@ maybe chmod 0644 './e2fsck.conf' maybe chmod 0755 './eclean' maybe chmod 0644 './eclean/distfiles.exclude' maybe chmod 0644 './eclean/packages.exclude' -maybe chmod 0644 './eixrc' +maybe chmod 0755 './eixrc' +maybe chmod 0644 './eixrc.backup.0000' +maybe chmod 0644 './eixrc/00-eixrc' maybe chmod 0755 './elinks' maybe chmod 0644 './elinks/elinks.conf' maybe chmod 0644 './elinks/keybind-full.sample' @@ -921,6 +926,10 @@ maybe chmod 0755 './init.d/atd' maybe chmod 0755 './init.d/auditd' maybe chmod 0755 './init.d/autofs' maybe chmod 0755 './init.d/bootmisc' +maybe chmod 0755 './init.d/busybox-klogd' +maybe chmod 0755 './init.d/busybox-ntpd' +maybe chmod 0755 './init.d/busybox-syslogd' +maybe chmod 0755 './init.d/busybox-watchdog' maybe chmod 0755 './init.d/clamd' maybe chmod 0755 './init.d/consolefont' maybe chmod 0755 './init.d/courier-authlib' @@ -1136,53 +1145,53 @@ maybe chmod 0644 './mutt/mime.types.dist' maybe chmod 0755 './mysql' maybe chmod 0644 './mysql/my.cnf' maybe chmod 0644 './mysql/mysqlaccess.conf' -maybe chown nagios './nagios' -maybe chgrp nagios './nagios' +maybe chown 'nagios' './nagios' +maybe chgrp 'nagios' './nagios' maybe chmod 0750 './nagios' maybe chmod 0644 './nagios/.keep_net-analyzer_nagios-core-0' -maybe chown nagios './nagios/cgi.cfg' -maybe chgrp nagios './nagios/cgi.cfg' +maybe chown 'nagios' './nagios/cgi.cfg' +maybe chgrp 'nagios' './nagios/cgi.cfg' maybe chmod 0664 './nagios/cgi.cfg' -maybe chown nagios './nagios/nagios.cfg' -maybe chgrp nagios './nagios/nagios.cfg' +maybe chown 'nagios' './nagios/nagios.cfg' +maybe chgrp 'nagios' './nagios/nagios.cfg' maybe chmod 0664 './nagios/nagios.cfg' -maybe chown nagios './nagios/ndo2db.cfg-sample' -maybe chgrp nagios './nagios/ndo2db.cfg-sample' +maybe chown 'nagios' './nagios/ndo2db.cfg-sample' +maybe chgrp 'nagios' './nagios/ndo2db.cfg-sample' maybe chmod 0664 './nagios/ndo2db.cfg-sample' -maybe chown nagios './nagios/ndomod.cfg-sample' -maybe chgrp nagios './nagios/ndomod.cfg-sample' +maybe chown 'nagios' './nagios/ndomod.cfg-sample' +maybe chgrp 'nagios' './nagios/ndomod.cfg-sample' maybe chmod 0664 './nagios/ndomod.cfg-sample' -maybe chgrp nagios './nagios/nrpe.cfg' +maybe chgrp 'nagios' './nagios/nrpe.cfg' maybe chmod 0640 './nagios/nrpe.cfg' -maybe chown nagios './nagios/objects' -maybe chgrp nagios './nagios/objects' +maybe chown 'nagios' './nagios/objects' +maybe chgrp 'nagios' './nagios/objects' maybe chmod 0775 './nagios/objects' -maybe chown nagios './nagios/objects/commands.cfg' -maybe chgrp nagios './nagios/objects/commands.cfg' +maybe chown 'nagios' './nagios/objects/commands.cfg' +maybe chgrp 'nagios' './nagios/objects/commands.cfg' maybe chmod 0664 './nagios/objects/commands.cfg' -maybe chown nagios './nagios/objects/contacts.cfg' -maybe chgrp nagios './nagios/objects/contacts.cfg' +maybe chown 'nagios' './nagios/objects/contacts.cfg' +maybe chgrp 'nagios' './nagios/objects/contacts.cfg' maybe chmod 0664 './nagios/objects/contacts.cfg' -maybe chown nagios './nagios/objects/localhost.cfg' -maybe chgrp nagios './nagios/objects/localhost.cfg' +maybe chown 'nagios' './nagios/objects/localhost.cfg' +maybe chgrp 'nagios' './nagios/objects/localhost.cfg' maybe chmod 0664 './nagios/objects/localhost.cfg' -maybe chown nagios './nagios/objects/printer.cfg' -maybe chgrp nagios './nagios/objects/printer.cfg' +maybe chown 'nagios' './nagios/objects/printer.cfg' +maybe chgrp 'nagios' './nagios/objects/printer.cfg' maybe chmod 0664 './nagios/objects/printer.cfg' -maybe chown nagios './nagios/objects/switch.cfg' -maybe chgrp nagios './nagios/objects/switch.cfg' +maybe chown 'nagios' './nagios/objects/switch.cfg' +maybe chgrp 'nagios' './nagios/objects/switch.cfg' maybe chmod 0664 './nagios/objects/switch.cfg' -maybe chown nagios './nagios/objects/templates.cfg' -maybe chgrp nagios './nagios/objects/templates.cfg' +maybe chown 'nagios' './nagios/objects/templates.cfg' +maybe chgrp 'nagios' './nagios/objects/templates.cfg' maybe chmod 0664 './nagios/objects/templates.cfg' -maybe chown nagios './nagios/objects/timeperiods.cfg' -maybe chgrp nagios './nagios/objects/timeperiods.cfg' +maybe chown 'nagios' './nagios/objects/timeperiods.cfg' +maybe chgrp 'nagios' './nagios/objects/timeperiods.cfg' maybe chmod 0664 './nagios/objects/timeperiods.cfg' -maybe chown nagios './nagios/objects/windows.cfg' -maybe chgrp nagios './nagios/objects/windows.cfg' +maybe chown 'nagios' './nagios/objects/windows.cfg' +maybe chgrp 'nagios' './nagios/objects/windows.cfg' maybe chmod 0664 './nagios/objects/windows.cfg' -maybe chown nagios './nagios/resource.cfg' -maybe chgrp nagios './nagios/resource.cfg' +maybe chown 'nagios' './nagios/resource.cfg' +maybe chgrp 'nagios' './nagios/resource.cfg' maybe chmod 0660 './nagios/resource.cfg' maybe chmod 0644 './nail.rc' maybe chmod 0644 './nanorc' @@ -1229,24 +1238,24 @@ maybe chmod 0444 './openldap/schema/ppolicy.schema' maybe chmod 0644 './openldap/schema/quota.schema' maybe chmod 0644 './openldap/schema/rfc2307bis.schema' maybe chmod 0644 './openldap/schema/samba.schema' -maybe chgrp ldap './openldap/slapd.conf' +maybe chgrp 'ldap' './openldap/slapd.conf' maybe chmod 0640 './openldap/slapd.conf' -maybe chgrp ldap './openldap/slapd.conf.default' +maybe chgrp 'ldap' './openldap/slapd.conf.default' maybe chmod 0640 './openldap/slapd.conf.default' maybe chmod 0600 './openldap/slapd.ldif' maybe chmod 0600 './openldap/slapd.ldif.default' maybe chmod 0755 './openldap/ssl' -maybe chown ldap './openldap/ssl/ldap.crt' -maybe chgrp ldap './openldap/ssl/ldap.crt' +maybe chown 'ldap' './openldap/ssl/ldap.crt' +maybe chgrp 'ldap' './openldap/ssl/ldap.crt' maybe chmod 0444 './openldap/ssl/ldap.crt' -maybe chown ldap './openldap/ssl/ldap.csr' -maybe chgrp ldap './openldap/ssl/ldap.csr' +maybe chown 'ldap' './openldap/ssl/ldap.csr' +maybe chgrp 'ldap' './openldap/ssl/ldap.csr' maybe chmod 0444 './openldap/ssl/ldap.csr' -maybe chown ldap './openldap/ssl/ldap.key' -maybe chgrp ldap './openldap/ssl/ldap.key' +maybe chown 'ldap' './openldap/ssl/ldap.key' +maybe chgrp 'ldap' './openldap/ssl/ldap.key' maybe chmod 0400 './openldap/ssl/ldap.key' -maybe chown ldap './openldap/ssl/ldap.pem' -maybe chgrp ldap './openldap/ssl/ldap.pem' +maybe chown 'ldap' './openldap/ssl/ldap.pem' +maybe chgrp 'ldap' './openldap/ssl/ldap.pem' maybe chmod 0400 './openldap/ssl/ldap.pem' maybe chmod 0755 './openvpn' maybe chmod 0644 './openvpn/.keep_net-misc_openvpn-0' @@ -1411,47 +1420,47 @@ maybe chmod 0755 './portage/repos.conf' maybe chmod 0644 './portage/repos.conf/gentoo.conf' maybe chmod 0755 './portage/savedconfig' maybe chmod 0755 './portage/savedconfig/sys-apps' -maybe chmod 0644 './portage/savedconfig/sys-apps/busybox-1.20.2' +maybe chmod 0644 './portage/savedconfig/sys-apps/busybox-1.21.0' maybe chmod 0755 './postfix' maybe chmod 0644 './postfix/.gitignore' maybe chmod 0644 './postfix/.keep_mail-mta_postfix-0' maybe chmod 0644 './postfix/main.cf' maybe chmod 0644 './postfix/main.cf.default' maybe chmod 0644 './postfix/master.cf' -maybe chown frank './postfix/mkpostfixcert' -maybe chgrp users './postfix/mkpostfixcert' +maybe chown 'frank' './postfix/mkpostfixcert' +maybe chgrp 'users' './postfix/mkpostfixcert' maybe chmod 0744 './postfix/mkpostfixcert' -maybe chown frank './postfix/postfix-cert.cnf' -maybe chgrp users './postfix/postfix-cert.cnf' +maybe chown 'frank' './postfix/postfix-cert.cnf' +maybe chgrp 'users' './postfix/postfix-cert.cnf' maybe chmod 0644 './postfix/postfix-cert.cnf' maybe chmod 0600 './postfix/postfix.pem' -maybe chgrp postgrey './postfix/postgrey_whitelist_clients' +maybe chgrp 'postgrey' './postfix/postgrey_whitelist_clients' maybe chmod 0640 './postfix/postgrey_whitelist_clients' -maybe chgrp postgrey './postfix/postgrey_whitelist_recipients' +maybe chgrp 'postgrey' './postfix/postgrey_whitelist_recipients' maybe chmod 0640 './postfix/postgrey_whitelist_recipients' maybe chmod 0600 './postfix/saslpass' maybe chmod 0644 './postfix/smtp_auth' maybe chmod 0644 './postfix/smtp_auth.db' maybe chmod 0755 './postgresql-9.1' -maybe chown postgres './postgresql-9.1/pg_hba.conf' -maybe chgrp postgres './postgresql-9.1/pg_hba.conf' +maybe chown 'postgres' './postgresql-9.1/pg_hba.conf' +maybe chgrp 'postgres' './postgresql-9.1/pg_hba.conf' maybe chmod 0600 './postgresql-9.1/pg_hba.conf' -maybe chown postgres './postgresql-9.1/pg_ident.conf' -maybe chgrp postgres './postgresql-9.1/pg_ident.conf' +maybe chown 'postgres' './postgresql-9.1/pg_ident.conf' +maybe chgrp 'postgres' './postgresql-9.1/pg_ident.conf' maybe chmod 0600 './postgresql-9.1/pg_ident.conf' -maybe chown postgres './postgresql-9.1/postgresql.conf' -maybe chgrp postgres './postgresql-9.1/postgresql.conf' +maybe chown 'postgres' './postgresql-9.1/postgresql.conf' +maybe chgrp 'postgres' './postgresql-9.1/postgresql.conf' maybe chmod 0600 './postgresql-9.1/postgresql.conf' maybe chmod 0755 './postgresql-9.2' maybe chmod 0644 './postgresql-9.2/.keep_dev-db_postgresql-base-9.2' -maybe chown postgres './postgresql-9.2/pg_hba.conf' -maybe chgrp postgres './postgresql-9.2/pg_hba.conf' +maybe chown 'postgres' './postgresql-9.2/pg_hba.conf' +maybe chgrp 'postgres' './postgresql-9.2/pg_hba.conf' maybe chmod 0600 './postgresql-9.2/pg_hba.conf' -maybe chown postgres './postgresql-9.2/pg_ident.conf' -maybe chgrp postgres './postgresql-9.2/pg_ident.conf' +maybe chown 'postgres' './postgresql-9.2/pg_ident.conf' +maybe chgrp 'postgres' './postgresql-9.2/pg_ident.conf' maybe chmod 0600 './postgresql-9.2/pg_ident.conf' -maybe chown postgres './postgresql-9.2/postgresql.conf' -maybe chgrp postgres './postgresql-9.2/postgresql.conf' +maybe chown 'postgres' './postgresql-9.2/postgresql.conf' +maybe chgrp 'postgres' './postgresql-9.2/postgresql.conf' maybe chmod 0600 './postgresql-9.2/postgresql.conf' maybe chmod 0644 './procmailrc' maybe chmod 0644 './profile' @@ -1508,7 +1517,7 @@ maybe chmod 0644 './sandbox.d/10openssl' maybe chmod 0644 './sandbox.d/37fontconfig' maybe chmod 0755 './sasl2' maybe chmod 0644 './sasl2/.keep_dev-libs_cyrus-sasl-2' -maybe chgrp mail './sasl2/sasldb2' +maybe chgrp 'mail' './sasl2/sasldb2' maybe chmod 0640 './sasl2/sasldb2' maybe chmod 0644 './sasl2/smtpd.conf' maybe chmod 0644 './screenrc' @@ -1618,31 +1627,31 @@ maybe chmod 0644 './ssl/openssl.cnf.default' maybe chmod 0755 './ssl/postfix' maybe chmod 0444 './ssl/postfix/server.crt' maybe chmod 0444 './ssl/postfix/server.csr' -maybe chown postfix './ssl/postfix/server.key' -maybe chgrp mail './ssl/postfix/server.key' +maybe chown 'postfix' './ssl/postfix/server.key' +maybe chgrp 'mail' './ssl/postfix/server.key' maybe chmod 0400 './ssl/postfix/server.key' -maybe chown postfix './ssl/postfix/server.pem' -maybe chgrp mail './ssl/postfix/server.pem' +maybe chown 'postfix' './ssl/postfix/server.pem' +maybe chgrp 'mail' './ssl/postfix/server.pem' maybe chmod 0400 './ssl/postfix/server.pem' maybe chmod 0700 './ssl/private' maybe chmod 0644 './ssl/private/.keep_dev-libs_openssl-0' maybe chmod 0755 './stunnel' maybe chmod 0755 './stunnel/old' -maybe chown stunnel './stunnel/old/stunnel.crt' -maybe chgrp stunnel './stunnel/old/stunnel.crt' +maybe chown 'stunnel' './stunnel/old/stunnel.crt' +maybe chgrp 'stunnel' './stunnel/old/stunnel.crt' maybe chmod 0640 './stunnel/old/stunnel.crt' -maybe chown stunnel './stunnel/old/stunnel.csr' -maybe chgrp stunnel './stunnel/old/stunnel.csr' +maybe chown 'stunnel' './stunnel/old/stunnel.csr' +maybe chgrp 'stunnel' './stunnel/old/stunnel.csr' maybe chmod 0640 './stunnel/old/stunnel.csr' -maybe chown stunnel './stunnel/old/stunnel.key' -maybe chgrp stunnel './stunnel/old/stunnel.key' +maybe chown 'stunnel' './stunnel/old/stunnel.key' +maybe chgrp 'stunnel' './stunnel/old/stunnel.key' maybe chmod 0640 './stunnel/old/stunnel.key' -maybe chown stunnel './stunnel/old/stunnel.pem' -maybe chgrp stunnel './stunnel/old/stunnel.pem' +maybe chown 'stunnel' './stunnel/old/stunnel.pem' +maybe chgrp 'stunnel' './stunnel/old/stunnel.pem' maybe chmod 0640 './stunnel/old/stunnel.pem' maybe chmod 0644 './stunnel/stunnel.conf' -maybe chown stunnel './stunnel/stunnel.pem' -maybe chgrp stunnel './stunnel/stunnel.pem' +maybe chown 'stunnel' './stunnel/stunnel.pem' +maybe chgrp 'stunnel' './stunnel/stunnel.pem' maybe chmod 0640 './stunnel/stunnel.pem' maybe chmod 0440 './sudoers' maybe chmod 0750 './sudoers.d' @@ -1725,7 +1734,8 @@ maybe chmod 0755 './udev/rules.d' maybe chmod 0644 './udev/rules.d/70-persistent-cd.rules' maybe chmod 0644 './udev/rules.d/80-net-name-slot.rules' maybe chmod 0644 './udev/udev.conf' -maybe chgrp ulogd './ulogd.conf' +maybe chmod 0644 './udhcpd.conf' +maybe chgrp 'ulogd' './ulogd.conf' maybe chmod 0640 './ulogd.conf' maybe chmod 0755 './unixODBC' maybe chmod 0755 './unixODBC/ODBCDataSources' diff --git a/ImageMagick/coder.xml b/ImageMagick-6/coder.xml similarity index 100% rename from ImageMagick/coder.xml rename to ImageMagick-6/coder.xml diff --git a/ImageMagick/colors.xml b/ImageMagick-6/colors.xml similarity index 100% rename from ImageMagick/colors.xml rename to ImageMagick-6/colors.xml diff --git a/ImageMagick/delegates.xml b/ImageMagick-6/delegates.xml similarity index 84% rename from ImageMagick/delegates.xml rename to ImageMagick-6/delegates.xml index a1135dc..7048d59 100644 --- a/ImageMagick/delegates.xml +++ b/ImageMagick-6/delegates.xml @@ -73,49 +73,56 @@ - - + + - - + + + + - - - + - + + + + - - - + + + - + + + - + + - + + diff --git a/ImageMagick/log.xml b/ImageMagick-6/log.xml similarity index 100% rename from ImageMagick/log.xml rename to ImageMagick-6/log.xml diff --git a/ImageMagick/magic.xml b/ImageMagick-6/magic.xml similarity index 100% rename from ImageMagick/magic.xml rename to ImageMagick-6/magic.xml diff --git a/ImageMagick/mime.xml b/ImageMagick-6/mime.xml similarity index 99% rename from ImageMagick/mime.xml rename to ImageMagick-6/mime.xml index 4dd55f2..c1b61f4 100644 --- a/ImageMagick/mime.xml +++ b/ImageMagick-6/mime.xml @@ -755,6 +755,7 @@ + diff --git a/ImageMagick/policy.xml b/ImageMagick-6/policy.xml similarity index 97% rename from ImageMagick/policy.xml rename to ImageMagick-6/policy.xml index 3be0a4b..e4908b1 100644 --- a/ImageMagick/policy.xml +++ b/ImageMagick-6/policy.xml @@ -45,7 +45,6 @@ exceeds policy maximum so memory limit is 1GB). --> - @@ -55,4 +54,6 @@ + + diff --git a/ImageMagick-6/quantization-table.xml b/ImageMagick-6/quantization-table.xml new file mode 100644 index 0000000..a05552b --- /dev/null +++ b/ImageMagick-6/quantization-table.xml @@ -0,0 +1,62 @@ + + + + + + + + + +]> + + + + Luma Quantization Table + + 16, 16, 16, 18, 25, 37, 56, 85, + 16, 17, 20, 27, 34, 40, 53, 75, + 16, 20, 24, 31, 43, 62, 91, 135, + 18, 27, 31, 40, 53, 74, 106, 156, + 25, 34, 43, 53, 69, 94, 131, 189, + 37, 40, 62, 74, 94, 124, 169, 238, + 56, 53, 91, 106, 131, 169, 226, 311, + 85, 75, 135, 156, 189, 238, 311, 418 + +
+ + + diff --git a/ImageMagick/thresholds.xml b/ImageMagick-6/thresholds.xml similarity index 100% rename from ImageMagick/thresholds.xml rename to ImageMagick-6/thresholds.xml diff --git a/ImageMagick/type-dejavu.xml b/ImageMagick-6/type-dejavu.xml similarity index 100% rename from ImageMagick/type-dejavu.xml rename to ImageMagick-6/type-dejavu.xml diff --git a/ImageMagick/type-ghostscript.xml b/ImageMagick-6/type-ghostscript.xml similarity index 100% rename from ImageMagick/type-ghostscript.xml rename to ImageMagick-6/type-ghostscript.xml diff --git a/ImageMagick/type-windows.xml b/ImageMagick-6/type-windows.xml similarity index 100% rename from ImageMagick/type-windows.xml rename to ImageMagick-6/type-windows.xml diff --git a/ImageMagick/type.xml b/ImageMagick-6/type.xml similarity index 100% rename from ImageMagick/type.xml rename to ImageMagick-6/type.xml diff --git a/ImageMagick/quantization-table.xml b/ImageMagick/quantization-table.xml deleted file mode 100644 index b65555d..0000000 --- a/ImageMagick/quantization-table.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - -]> - - - - Luminance Quantization Table - - 16, 12, 14, 17, 22, 30, 45, 72, - 12, 13, 14, 17, 22, 31, 46, 74, - 14, 14, 16, 19, 25, 35, 52, 83, - 17, 17, 19, 23, 30, 41, 62, 100, - 22, 22, 25, 30, 39, 54, 80, 129, - 30, 31, 35, 41, 54, 74, 111, 178, - 45, 46, 52, 62, 80, 111, 166, 267, - 72, 74, 83, 100, 129, 178, 267, 428 - -
- - - 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, - 193, 207, 253, 355, 570, 1046, 2198, 5289, - 465, 498, 609, 854, 1370, 2516, 5289, 12725 - -
- diff --git a/autofs/auto.net b/autofs/auto.net index ba03447..86b8505 100755 --- a/autofs/auto.net +++ b/autofs/auto.net @@ -35,7 +35,7 @@ done # Newer distributions get this right SHOWMOUNT="$SMNT --no-headers -e $key" -$SHOWMOUNT | LC_ALL=C sort -k 1 | \ +$SHOWMOUNT | LC_ALL=C cut -d' ' -f1 | LC_ALL=C sort -u | \ awk -v key="$key" -v opts="$opts" -- ' BEGIN { ORS=""; first=1 } { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 } diff --git a/conf.d/autofs b/conf.d/autofs deleted file mode 100644 index 6c8d9c7..0000000 --- a/conf.d/autofs +++ /dev/null @@ -1,136 +0,0 @@ -# -# Define default options for autofs. -# -# MASTER_MAP_NAME - default map name for the master map. -# -#MASTER_MAP_NAME="auto.master" -# -# TIMEOUT - set the default mount timeout (default 600). -# -TIMEOUT=300 -# -# NEGATIVE_TIMEOUT - set the default negative timeout for -# failed mount attempts (default 60). -# -#NEGATIVE_TIMEOUT=60 -# -# MOUNT_WAIT - time to wait for a response from umount(8). -# Setting this timeout can cause problems when -# mount would otherwise wait for a server that -# is temporarily unavailable, such as when it's -# restarting. The defailt of waiting for mount(8) -# usually results in a wait of around 3 minutes. -# -#MOUNT_WAIT=-1 -# -# UMOUNT_WAIT - time to wait for a response from umount(8). -# -#UMOUNT_WAIT=12 -# -# BROWSE_MODE - maps are browsable by default. -# -BROWSE_MODE="no" -# -# MOUNT_NFS_DEFAULT_PROTOCOL - specify the default protocol used by -# mount.nfs(8). Since we can't identify -# the default automatically we need to -# set it in our configuration. This will -# only make a difference for replicated -# map entries as availability probing isn't -# used for single host map entries. -# -#MOUNT_NFS_DEFAULT_PROTOCOL=3 -# -# APPEND_OPTIONS - append to global options instead of replace. -# -#APPEND_OPTIONS="yes" -# -# LOGGING - set default log level "none", "verbose" or "debug" -# -#LOGGING="none" -# -# Define server URIs -# -# LDAP_URI - space seperated list of server uris of the form -# ://[/] where can be ldap -# or ldaps. The option can be given multiple times. -# Map entries that include a server name override -# this option. -# -# This configuration option can also be used to -# request autofs lookup SRV RRs for a domain of -# the form :///[]. Note that a -# trailing "/" is not allowed when using this form. -# If the domain dn is not specified the dns domain -# name (if any) is used to construct the domain dn -# for the SRV RR lookup. The server list returned -# from an SRV RR lookup is refreshed according to -# the minimum ttl found in the SRV RR records or -# after one hour, whichever is less. -# -#LDAP_URI="" -# -# LDAP__TIMEOUT - timeout value for the synchronous API calls -# (default is LDAP library default). -# -#LDAP_TIMEOUT=-1 -# -# LDAP_NETWORK_TIMEOUT - set the network response timeout (default 8). -# -#LDAP_NETWORK_TIMEOUT=8 -# -# Define base dn for map dn lookup. -# -# SEARCH_BASE - base dn to use for searching for map search dn. -# Multiple entries can be given and they are checked -# in the order they occur here. -# -#SEARCH_BASE="" -# -# Define the LDAP schema to used for lookups -# -# If no schema is set autofs will check each of the schemas -# below in the order given to try and locate an appropriate -# basdn for lookups. If you want to minimize the number of -# queries to the server set the values here. -# -#MAP_OBJECT_CLASS="nisMap" -#ENTRY_OBJECT_CLASS="nisObject" -#MAP_ATTRIBUTE="nisMapName" -#ENTRY_ATTRIBUTE="cn" -#VALUE_ATTRIBUTE="nisMapEntry" -# -# Other common LDAP nameing -# -#MAP_OBJECT_CLASS="automountMap" -#ENTRY_OBJECT_CLASS="automount" -#MAP_ATTRIBUTE="ou" -#ENTRY_ATTRIBUTE="cn" -#VALUE_ATTRIBUTE="automountInformation" -# -#MAP_OBJECT_CLASS="automountMap" -#ENTRY_OBJECT_CLASS="automount" -#MAP_ATTRIBUTE="automountMapName" -#ENTRY_ATTRIBUTE="automountKey" -#VALUE_ATTRIBUTE="automountInformation" -# -# AUTH_CONF_FILE - set the default location for the SASL -# authentication configuration file. -# -#AUTH_CONF_FILE="/etc/autofs/autofs_ldap_auth.conf" -# -# MAP_HASH_TABLE_SIZE - set the map cache hash table size. -# Should be a power of 2 with a ratio roughly -# between 1:10 and 1:20 for each map. -# -#MAP_HASH_TABLE_SIZE=1024 -# -# General global options -# -# If the kernel supports using the autofs miscellanous device -# and you wish to use it you must set this configuration option -# to "yes" otherwise it will not be used. -USE_MISC_DEVICE="yes" -# -#OPTIONS="" -# diff --git a/conf.d/busybox-klogd b/conf.d/busybox-klogd new file mode 100644 index 0000000..4c16096 --- /dev/null +++ b/conf.d/busybox-klogd @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/busybox-sysklogd + +# run "/sbin/klogd --help" to see all possible options. + +# activate if you need remote logging +#rc_need="net" + +# send warnings and above to the console +KLOGD_OPTS="-c 3" diff --git a/conf.d/busybox-ntpd b/conf.d/busybox-ntpd new file mode 100644 index 0000000..f50d4c2 --- /dev/null +++ b/conf.d/busybox-ntpd @@ -0,0 +1,6 @@ +# Config file for /etc/init.d/busybox-ntpd + +# run "/sbin/ntpd --help" to see all possible options. + +# Get time from specified server and run in background +NTPD_OPTS="-N -p pool.ntp.org" diff --git a/conf.d/busybox-syslogd b/conf.d/busybox-syslogd new file mode 100644 index 0000000..7df6885 --- /dev/null +++ b/conf.d/busybox-syslogd @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/busybox-sysklogd + +# run "/sbin/syslogd --help" to see all possible options. + +# activate if you need remote logging +#rc_need="net" + +# Log to shared mem buffer (use logread to read it) +SYSLOGD_OPTS="-C128" diff --git a/conf.d/busybox-watchdog b/conf.d/busybox-watchdog new file mode 100644 index 0000000..bd6aec0 --- /dev/null +++ b/conf.d/busybox-watchdog @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/busybox-watchdog + +# run "/sbin/watchdog --help" to see all possible options. + +# Periodically write to watchdog device +WATCHDOG_OPTS="/dev/watchdog" + +# optionally set the nice-level +#SSD_NICELEVEL="-20" diff --git a/eixrc b/eixrc.backup.0000 similarity index 100% rename from eixrc rename to eixrc.backup.0000 diff --git a/eselect/postgresql/active.links b/eselect/postgresql/active.links index 0b92d4f..48ff382 100644 --- a/eselect/postgresql/active.links +++ b/eselect/postgresql/active.links @@ -1,56 +1,56 @@ -/usr/include/postgresql -/usr/include/libpq-fe.h -/usr/include/pg_config_manual.h -/usr/include/libpq -/usr/include/postgres_ext.h -/usr/lib64/postgresql -/usr/lib64/libecpg.so.6.4 -/usr/lib64/libecpg_compat.so.3.4 -/usr/lib64/libecpg_compat.so -/usr/lib64/libpgport.a -/usr/lib64/libecpg.so.6 -/usr/lib64/libpgtypes.so.3.3 -/usr/lib64/libpq.so.5.5 -/usr/lib64/libpqwalreceiver.so -/usr/lib64/libpgtypes.so -/usr/lib64/libecpg.a -/usr/lib64/libpgtypes.a -/usr/lib64/libpq.so -/usr/lib64/libpq.a -/usr/lib64/libecpg.so -/usr/lib64/libecpg_compat.so.3 -/usr/lib64/libpgtypes.so.3 -/usr/lib64/libecpg_compat.a -/usr/lib64/libpq.so.5 -/usr/bin/pg_ctl -/usr/bin/psql -/usr/bin/dropdb -/usr/bin/vacuumlo -/usr/bin/vacuumdb -/usr/bin/reindexdb -/usr/bin/pg_archivecleanup -/usr/bin/clusterdb -/usr/bin/pg_restore -/usr/bin/pg_dumpall -/usr/bin/createuser -/usr/bin/pg_dump -/usr/bin/pg_upgrade -/usr/bin/pg_config -/usr/bin/postgres -/usr/bin/pgbench -/usr/bin/pg_resetxlog -/usr/bin/ecpg -/usr/bin/pg_basebackup -/usr/bin/createdb -/usr/bin/postmaster -/usr/bin/initdb -/usr/bin/pg_test_fsync -/usr/bin/dropuser -/usr/bin/pg_controldata -/usr/bin/oid2name -/usr/bin/pg_test_timing -/usr/bin/pg_standby -/usr/bin/createlang -/usr/bin/pg_receivexlog -/usr/bin/droplang -/usr/share/postgresql +usr/include/postgresql +usr/include/libpq-fe.h +usr/include/pg_config_manual.h +usr/include/libpq +usr/include/postgres_ext.h +usr/lib64/postgresql +usr/lib64/libecpg.so.6.4 +usr/lib64/libecpg_compat.so.3.4 +usr/lib64/libecpg_compat.so +usr/lib64/libpgport.a +usr/lib64/libecpg.so.6 +usr/lib64/libpgtypes.so.3.3 +usr/lib64/libpq.so.5.5 +usr/lib64/libpqwalreceiver.so +usr/lib64/libpgtypes.so +usr/lib64/libecpg.a +usr/lib64/libpgtypes.a +usr/lib64/libpq.so +usr/lib64/libpq.a +usr/lib64/libecpg.so +usr/lib64/libecpg_compat.so.3 +usr/lib64/libpgtypes.so.3 +usr/lib64/libecpg_compat.a +usr/lib64/libpq.so.5 +usr/bin/pg_ctl +usr/bin/psql +usr/bin/dropdb +usr/bin/vacuumlo +usr/bin/vacuumdb +usr/bin/reindexdb +usr/bin/pg_archivecleanup +usr/bin/clusterdb +usr/bin/pg_restore +usr/bin/pg_dumpall +usr/bin/createuser +usr/bin/pg_dump +usr/bin/pg_upgrade +usr/bin/pg_config +usr/bin/postgres +usr/bin/pgbench +usr/bin/pg_resetxlog +usr/bin/ecpg +usr/bin/pg_basebackup +usr/bin/createdb +usr/bin/postmaster +usr/bin/initdb +usr/bin/pg_test_fsync +usr/bin/dropuser +usr/bin/pg_controldata +usr/bin/oid2name +usr/bin/pg_test_timing +usr/bin/pg_standby +usr/bin/createlang +usr/bin/pg_receivexlog +usr/bin/droplang +usr/share/postgresql diff --git a/eselect/postgresql/active.links92 b/eselect/postgresql/active.links92 index 55a5e27..694a733 100644 --- a/eselect/postgresql/active.links92 +++ b/eselect/postgresql/active.links92 @@ -1,31 +1,31 @@ -/usr/bin/pg_ctl92 -/usr/bin/psql92 -/usr/bin/dropdb92 -/usr/bin/vacuumlo92 -/usr/bin/vacuumdb92 -/usr/bin/reindexdb92 -/usr/bin/pg_archivecleanup92 -/usr/bin/clusterdb92 -/usr/bin/pg_restore92 -/usr/bin/pg_dumpall92 -/usr/bin/createuser92 -/usr/bin/pg_dump92 -/usr/bin/pg_upgrade92 -/usr/bin/pg_config92 -/usr/bin/postgres92 -/usr/bin/pgbench92 -/usr/bin/pg_resetxlog92 -/usr/bin/ecpg92 -/usr/bin/pg_basebackup92 -/usr/bin/createdb92 -/usr/bin/postmaster92 -/usr/bin/initdb92 -/usr/bin/pg_test_fsync92 -/usr/bin/dropuser92 -/usr/bin/pg_controldata92 -/usr/bin/oid2name92 -/usr/bin/pg_test_timing92 -/usr/bin/pg_standby92 -/usr/bin/createlang92 -/usr/bin/pg_receivexlog92 -/usr/bin/droplang92 +usr/bin/pg_ctl92 +usr/bin/psql92 +usr/bin/dropdb92 +usr/bin/vacuumlo92 +usr/bin/vacuumdb92 +usr/bin/reindexdb92 +usr/bin/pg_archivecleanup92 +usr/bin/clusterdb92 +usr/bin/pg_restore92 +usr/bin/pg_dumpall92 +usr/bin/createuser92 +usr/bin/pg_dump92 +usr/bin/pg_upgrade92 +usr/bin/pg_config92 +usr/bin/postgres92 +usr/bin/pgbench92 +usr/bin/pg_resetxlog92 +usr/bin/ecpg92 +usr/bin/pg_basebackup92 +usr/bin/createdb92 +usr/bin/postmaster92 +usr/bin/initdb92 +usr/bin/pg_test_fsync92 +usr/bin/dropuser92 +usr/bin/pg_controldata92 +usr/bin/oid2name92 +usr/bin/pg_test_timing92 +usr/bin/pg_standby92 +usr/bin/createlang92 +usr/bin/pg_receivexlog92 +usr/bin/droplang92 diff --git a/etckeeper/commit.d/50vcs-commit b/etckeeper/commit.d/50vcs-commit index d484626..3a4c819 100755 --- a/etckeeper/commit.d/50vcs-commit +++ b/etckeeper/commit.d/50vcs-commit @@ -41,6 +41,21 @@ fi if [ "$VCS" = git ] && [ -d .git ]; then if [ -n "$USER" ]; then + # Use user.name and user.email from the gitconfig belonging + # to the user who became root. + USER_HOME="$(perl -e 'print ((getpwnam(shift()))[7])' "$USER")" + if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.gitconfig" ]; then + if [ -z "$GIT_AUTHOR_NAME" ]; then + GIT_AUTHOR_NAME="$(git config -f "$USER_HOME/.gitconfig" user.name)" || true + fi + if [ -z "$GIT_AUTHOR_EMAIL" ]; then + GIT_AUTHOR_EMAIL="$(git config -f "$USER_HOME/.gitconfig" user.email)" || true + fi + fi + if [ -z "$GIT_COMMITTER_EMAIL" ]; then + GIT_COMMITER_EMAIL="$(git config --global user.email)" || true + fi + if [ -z "$GIT_AUTHOR_NAME" ]; then export GIT_AUTHOR_NAME="$USER" fi diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf index 9492c8f..c1da4bf 100644 --- a/etckeeper/etckeeper.conf +++ b/etckeeper/etckeeper.conf @@ -35,7 +35,7 @@ DARCS_COMMIT_OPTIONS="-a" HIGHLEVEL_PACKAGE_MANAGER=emerge # The low-level package manager that's being used. -# (dpkg, rpm, pacman-g2, etc) +# (dpkg, rpm, pacman, pacman-g2, etc) # For gentoo this is qlist LOWLEVEL_PACKAGE_MANAGER=qlist diff --git a/etckeeper/list-installed.d/50list-installed b/etckeeper/list-installed.d/50list-installed index 48278d1..1dcfda1 100755 --- a/etckeeper/list-installed.d/50list-installed +++ b/etckeeper/list-installed.d/50list-installed @@ -7,6 +7,8 @@ if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then egrep '(ok installed|ok config-files)' | cut -f2,3 elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort +elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then + pacman -Q elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then qlist -ICv fi diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata index d445db1..03ce475 100755 --- a/etckeeper/pre-commit.d/30store-metadata +++ b/etckeeper/pre-commit.d/30store-metadata @@ -101,10 +101,10 @@ generate_metadata() { s/^/$q/; s/$/$q/; if ($uid != $>) { - printf "maybe chown %s %s\n", uidname($uid), $_; + printf "maybe chown $q%s$q %s\n", uidname($uid), $_; } if ($gid != $)) { - printf "maybe chgrp %s %s\n", gidname($gid), $_; + printf "maybe chgrp $q%s$q %s\n", gidname($gid), $_; } printf "maybe chmod %04o %s\n", $mode & 07777, $_; ' diff --git a/etckeeper/update-ignore.d/01update-ignore b/etckeeper/update-ignore.d/01update-ignore index d59ad14..caa1759 100755 --- a/etckeeper/update-ignore.d/01update-ignore +++ b/etckeeper/update-ignore.d/01update-ignore @@ -93,7 +93,7 @@ writefile () { comment "new and old versions of conffiles, stored by apt/rpm" ignore "*.rpm*" nl - elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" ]; then + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacman" ]; then comment "new and old versions of conffiles, stored by pacman" ignore "*.pacnew" ignore "*.pacorig" diff --git a/init.d/atd b/init.d/atd index 8c89ad5..4d70ae5 100755 --- a/init.d/atd +++ b/init.d/atd @@ -1,21 +1,13 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc6,v 1.3 2011/09/23 12:04:44 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc7,v 1.1 2013/02/27 13:06:29 polynomial-c Exp $ + +pidfile="/var/run/atd.pid" +command="/usr/sbin/atd" +command_args="${ATD_OPTS}" +start_stop_daemon_args="--pidfile ${pidfile}" depend() { need clock logger } - -start() { - ebegin "Starting atd" - start-stop-daemon --start --quiet --pidfile /var/run/atd.pid \ - --exec /usr/sbin/atd -- ${ATD_OPTS} - eend $? -} - -stop() { - ebegin "Shutting down atd" - start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid - eend $? -} diff --git a/init.d/busybox-klogd b/init.d/busybox-klogd new file mode 100755 index 0000000..4c6dbbc --- /dev/null +++ b/init.d/busybox-klogd @@ -0,0 +1,12 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/klogd.initd,v 1.2 2012/12/21 03:15:28 blueness Exp $ + +command="/bin/busybox klogd" +command_args="${KLOGD_OPTS}" +pidfile="/var/run/klogd.pid" + +depend() { + need clock hostname +} diff --git a/init.d/busybox-ntpd b/init.d/busybox-ntpd new file mode 100755 index 0000000..5a05c31 --- /dev/null +++ b/init.d/busybox-ntpd @@ -0,0 +1,13 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/ntpd.initd,v 1.2 2012/12/21 03:15:28 blueness Exp $ + +command="/bin/busybox ntpd" +command_args="${NTPD_OPTS}" +pidfile="/var/run/ntpd.pid" + +depend() { + use net dns logger + after ntp-client +} diff --git a/init.d/busybox-syslogd b/init.d/busybox-syslogd new file mode 100755 index 0000000..f14224a --- /dev/null +++ b/init.d/busybox-syslogd @@ -0,0 +1,13 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/syslogd.initd,v 1.2 2012/12/21 03:15:28 blueness Exp $ + +command="/bin/busybox syslogd" +command_args="${SYSLOGD_OPTS}" +pidfile="/var/run/syslogd.pid" + +depend() { + need clock hostname + provide logger +} diff --git a/init.d/busybox-watchdog b/init.d/busybox-watchdog new file mode 100755 index 0000000..214468a --- /dev/null +++ b/init.d/busybox-watchdog @@ -0,0 +1,8 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/watchdog.initd,v 1.3 2013/04/27 07:47:23 vapier Exp $ + +command="/bin/busybox watchdog" +command_args="${WATCHDOG_OPTS}" +pidfile="/var/run/watchdog.pid" diff --git a/init.d/gpm b/init.d/gpm index 4792620..1e0aaf3 100755 --- a/init.d/gpm +++ b/init.d/gpm @@ -1,38 +1,29 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6,v 1.12 2004/07/15 01:02:02 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6-2,v 1.2 2012/10/28 11:35:56 vapier Exp $ #NB: Config is in /etc/conf.d/gpm +command=/usr/sbin/gpm +command_args=" + -m ${MOUSEDEV} + -t ${MOUSE} + ${RESPONSIVENESS:+ -r ${RESPONSIVENESS}} + ${REPEAT_TYPE:+ -R${REPEAT_TYPE}} + ${APPEND} +" + +pidfile=/var/run/gpm.pid + depend() { need localmount use hotplug logger } -checkconfig() { - if [ -z "$MOUSEDEV" ] || [ -z "$MOUSE" ] ; then +start_pre() { + if [ -z "${MOUSEDEV}" ] || [ -z "${MOUSE}" ] ; then eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first" return 1 fi } - -start() { - checkconfig || return 1 - - local params="" - [ -n "$RESPONSIVENESS" ] && params="$params -r $RESPONSIVENESS" - [ -n "$REPEAT_TYPE" ] && params="$params -R$REPEAT_TYPE" - [ -n "$APPEND" ] && params="$params $APPEND " - - ebegin "Starting gpm" - start-stop-daemon --start --quiet --exec /usr/sbin/gpm \ - -- -m ${MOUSEDEV} -t ${MOUSE} ${params} - eend ${?} -} - -stop() { - ebegin "Stopping gpm" - start-stop-daemon --stop --quiet --pidfile /var/run/gpm.pid - eend ${?} -} diff --git a/init.d/twistd b/init.d/twistd index 5d4d4e7..e7b29f1 100755 --- a/init.d/twistd +++ b/init.d/twistd @@ -5,7 +5,7 @@ depend() { } start() { - if [[ -z "${TWISTD_OPTS}" ]]; then + if [ -z "${TWISTD_OPTS}" ]; then eerror "TWISTD_OPTS is not set!" eerror "You need to configure twistd in /etc/conf.d/twistd." return 1 diff --git a/openldap/schema/README b/openldap/schema/README index 8702f49..e2e2c76 100644 --- a/openldap/schema/README +++ b/openldap/schema/README @@ -34,7 +34,7 @@ convert schema files in general. This notice applies to all files in this directory. -Copyright 1998-2012 The OpenLDAP Foundation, Redwood City, California, USA +Copyright 1998-2013 The OpenLDAP Foundation, Redwood City, California, USA All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/collective.ldif b/openldap/schema/collective.ldif index 09ef562..49e8d05 100644 --- a/openldap/schema/collective.ldif +++ b/openldap/schema/collective.ldif @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/collective.schema b/openldap/schema/collective.schema index 933aa58..1f0feb6 100644 --- a/openldap/schema/collective.schema +++ b/openldap/schema/collective.schema @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/corba.ldif b/openldap/schema/corba.ldif index f2416ed..285f170 100644 --- a/openldap/schema/corba.ldif +++ b/openldap/schema/corba.ldif @@ -3,7 +3,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/corba.schema b/openldap/schema/corba.schema index dece606..eb0e144 100644 --- a/openldap/schema/corba.schema +++ b/openldap/schema/corba.schema @@ -4,7 +4,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/core.ldif b/openldap/schema/core.ldif index 4f82790..7ea6ae7 100644 --- a/openldap/schema/core.ldif +++ b/openldap/schema/core.ldif @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/core.schema b/openldap/schema/core.schema index 4e57898..8828caa 100644 --- a/openldap/schema/core.schema +++ b/openldap/schema/core.schema @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/cosine.ldif b/openldap/schema/cosine.ldif index 9b437f8..428b7a3 100644 --- a/openldap/schema/cosine.ldif +++ b/openldap/schema/cosine.ldif @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/cosine.schema b/openldap/schema/cosine.schema index c553128..9b16419 100644 --- a/openldap/schema/cosine.schema +++ b/openldap/schema/cosine.schema @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/duaconf.ldif b/openldap/schema/duaconf.ldif index 7749b62..ea05327 100644 --- a/openldap/schema/duaconf.ldif +++ b/openldap/schema/duaconf.ldif @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/duaconf.schema b/openldap/schema/duaconf.schema index ad8b563..06b5ad0 100644 --- a/openldap/schema/duaconf.schema +++ b/openldap/schema/duaconf.schema @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/dyngroup.ldif b/openldap/schema/dyngroup.ldif index 6c96a15..c38cbc0 100644 --- a/openldap/schema/dyngroup.ldif +++ b/openldap/schema/dyngroup.ldif @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/dyngroup.schema b/openldap/schema/dyngroup.schema index 5b1c49c..9c0c2ad 100644 --- a/openldap/schema/dyngroup.schema +++ b/openldap/schema/dyngroup.schema @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/inetorgperson.ldif b/openldap/schema/inetorgperson.ldif index 31a0080..0cf6e14 100644 --- a/openldap/schema/inetorgperson.ldif +++ b/openldap/schema/inetorgperson.ldif @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/inetorgperson.schema b/openldap/schema/inetorgperson.schema index 597287d..bbab287 100644 --- a/openldap/schema/inetorgperson.schema +++ b/openldap/schema/inetorgperson.schema @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/java.ldif b/openldap/schema/java.ldif index fc7d032..862939b 100644 --- a/openldap/schema/java.ldif +++ b/openldap/schema/java.ldif @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/java.schema b/openldap/schema/java.schema index 7be9f29..d1bcfb9 100644 --- a/openldap/schema/java.schema +++ b/openldap/schema/java.schema @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/misc.ldif b/openldap/schema/misc.ldif index cd7d798..e3a7bd0 100644 --- a/openldap/schema/misc.ldif +++ b/openldap/schema/misc.ldif @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/misc.schema b/openldap/schema/misc.schema index f5b82de..76a92a7 100644 --- a/openldap/schema/misc.schema +++ b/openldap/schema/misc.schema @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/nis.ldif b/openldap/schema/nis.ldif index 946051b..13099de 100644 --- a/openldap/schema/nis.ldif +++ b/openldap/schema/nis.ldif @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/nis.schema b/openldap/schema/nis.schema index 87111f5..ec5b32c 100644 --- a/openldap/schema/nis.schema +++ b/openldap/schema/nis.schema @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/openldap.ldif b/openldap/schema/openldap.ldif index 5f0c76a..ffd99b5 100644 --- a/openldap/schema/openldap.ldif +++ b/openldap/schema/openldap.ldif @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/openldap.schema b/openldap/schema/openldap.schema index dba0c23..af6b51e 100644 --- a/openldap/schema/openldap.schema +++ b/openldap/schema/openldap.schema @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/pmi.ldif b/openldap/schema/pmi.ldif index eab4a12..e14948c 100644 --- a/openldap/schema/pmi.ldif +++ b/openldap/schema/pmi.ldif @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/pmi.schema b/openldap/schema/pmi.schema index 65846bb..0ec2478 100644 --- a/openldap/schema/pmi.schema +++ b/openldap/schema/pmi.schema @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2012 The OpenLDAP Foundation. +## Copyright 1998-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/ppolicy.ldif b/openldap/schema/ppolicy.ldif index 9aefd66..677330b 100644 --- a/openldap/schema/ppolicy.ldif +++ b/openldap/schema/ppolicy.ldif @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 2004-2012 The OpenLDAP Foundation. +## Copyright 2004-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/ppolicy.schema b/openldap/schema/ppolicy.schema index 7254174..15bc837 100644 --- a/openldap/schema/ppolicy.schema +++ b/openldap/schema/ppolicy.schema @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 2004-2012 The OpenLDAP Foundation. +## Copyright 2004-2013 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/openldap/schema/rfc2307bis.schema b/openldap/schema/rfc2307bis.schema index d2f57e6..2a2db14 100644 --- a/openldap/schema/rfc2307bis.schema +++ b/openldap/schema/rfc2307bis.schema @@ -1,291 +1,386 @@ # # rfc2307bis.schema # -# Commented out uidNumber/gidNumber because OpenLDAP has these 'built-in' -# Thanks to http://www.neuralbs.com/index.php/OpenLDAP_and_related_stuff -# for reminding me +# Extracted from http://tools.ietf.org/id/draft-howard-rfc2307bis-02.txt +# as of 2012/05/25, by Robin H. Johnson # -#attributetype ( 1.3.6.1.1.1.1.0 NAME 'uidNumber' -# DESC 'An integer uniquely identifying a user in an administrative domain' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 -# SINGLE-VALUE ) +#attributetype ( 1.3.6.1.1.1.1.0 NAME 'uidNumber' +# DESC 'An integer uniquely identifying a user in an +# administrative domain' +# EQUALITY integerMatch +# ORDERING integerOrderingMatch +# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 +# SINGLE-VALUE ) # -#attributetype ( 1.3.6.1.1.1.1.1 NAME 'gidNumber' -# DESC 'An integer uniquely identifying a group in an -# administrative domain' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 -# SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.2 NAME 'gecos' - DESC 'The GECOS field; the common name' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.3 NAME 'homeDirectory' - DESC 'The absolute path to the home directory' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.4 NAME 'loginShell' - DESC 'The path to the login shell' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.5 NAME 'shadowLastChange' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.6 NAME 'shadowMin' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.7 NAME 'shadowMax' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.8 NAME 'shadowWarning' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.9 NAME 'shadowInactive' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.10 NAME 'shadowExpire' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.11 NAME 'shadowFlag' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.12 NAME 'memberUid' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.1.1.1.13 NAME 'memberNisNetgroup' - EQUALITY caseExactIA5Match - SUBSTR caseExactIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.1.1.1.14 NAME 'nisNetgroupTriple' - DESC 'Netgroup triple' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.1.1.1.15 NAME 'ipServicePort' - DESC 'Service port number' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.16 NAME 'ipServiceProtocol' - DESC 'Service protocol name' - SUP name ) - -attributetype ( 1.3.6.1.1.1.1.17 NAME 'ipProtocolNumber' - DESC 'IP protocol number' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.18 NAME 'oncRpcNumber' - DESC 'ONC RPC number' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) -attributetype ( 1.3.6.1.1.1.1.19 NAME 'ipHostNumber' - DESC 'IPv4 addresses as a dotted decimal omitting leading - zeros or IPv6 addresses as defined in RFC2373' - SUP name ) - -attributetype ( 1.3.6.1.1.1.1.20 NAME 'ipNetworkNumber' - DESC 'IP network as a dotted decimal, eg. 192.168, - omitting leading zeros' - SUP name - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.21 NAME 'ipNetmaskNumber' - DESC 'IP netmask as a dotted decimal, eg. 255.255.255.0, - omitting leading zeros' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.22 NAME 'macAddress' - DESC 'MAC address in maximal, colon separated hex - notation, eg. 00:00:92:90:ee:e2' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.1.1.1.23 NAME 'bootParameter' - DESC 'rpc.bootparamd parameter' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.1.1.1.24 NAME 'bootFile' - DESC 'Boot image name' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.1.1.1.26 NAME 'nisMapName' - DESC 'Name of a A generic NIS map' - SUP name ) - -attributetype ( 1.3.6.1.1.1.1.27 NAME 'nisMapEntry' - DESC 'A generic NIS entry' - EQUALITY caseExactIA5Match - SUBSTR caseExactIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.28 NAME 'nisPublicKey' - DESC 'NIS public key' - EQUALITY octetStringMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.29 NAME 'nisSecretKey' - DESC 'NIS secret key' - EQUALITY octetStringMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.30 NAME 'nisDomain' - DESC 'NIS domain' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) - -attributetype ( 1.3.6.1.1.1.1.31 NAME 'automountMapName' - DESC 'automount Map Name' - EQUALITY caseExactIA5Match - SUBSTR caseExactIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.32 NAME 'automountKey' - DESC 'Automount Key value' - EQUALITY caseExactIA5Match - SUBSTR caseExactIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.1.1.1.33 NAME 'automountInformation' - DESC 'Automount information' - EQUALITY caseExactIA5Match - SUBSTR caseExactIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) - -objectclass ( 1.3.6.1.1.1.2.0 NAME 'posixAccount' SUP top AUXILIARY - DESC 'Abstraction of an account with POSIX attributes' - MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory ) - MAY ( userPassword $ loginShell $ gecos $ - description ) ) - -objectclass ( 1.3.6.1.1.1.2.1 NAME 'shadowAccount' SUP top AUXILIARY - DESC 'Additional attributes for shadow passwords' - MUST uid - MAY ( userPassword $ description $ - shadowLastChange $ shadowMin $ shadowMax $ - shadowWarning $ shadowInactive $ - shadowExpire $ shadowFlag ) ) - -objectclass ( 1.3.6.1.1.1.2.2 NAME 'posixGroup' SUP top AUXILIARY - DESC 'Abstraction of a group of accounts' - MUST gidNumber - MAY ( userPassword $ memberUid $ - description ) ) - -objectclass ( 1.3.6.1.1.1.2.3 NAME 'ipService' SUP top STRUCTURAL - DESC 'Abstraction an Internet Protocol service. - Maps an IP port and protocol (such as tcp or udp) - to one or more names; the distinguished value of - the cn attribute denotes the services canonical - name' - MUST ( cn $ ipServicePort $ ipServiceProtocol ) - MAY description ) - -objectclass ( 1.3.6.1.1.1.2.4 NAME 'ipProtocol' SUP top STRUCTURAL - DESC 'Abstraction of an IP protocol. Maps a protocol number - to one or more names. The distinguished value of the cn - attribute denotes the protocols canonical name' - MUST ( cn $ ipProtocolNumber ) - MAY description ) - -objectclass ( 1.3.6.1.1.1.2.5 NAME 'oncRpc' SUP top STRUCTURAL - DESC 'Abstraction of an Open Network Computing (ONC) - [RFC1057] Remote Procedure Call (RPC) binding. - This class maps an ONC RPC number to a name. - The distinguished value of the cn attribute denotes - the RPC services canonical name' - MUST ( cn $ oncRpcNumber ) - MAY description ) - -objectclass ( 1.3.6.1.1.1.2.6 NAME 'ipHost' SUP top AUXILIARY - DESC 'Abstraction of a host, an IP device. The distinguished - value of the cn attribute denotes the hosts canonical - name. Device SHOULD be used as a structural class' - MUST ( cn $ ipHostNumber ) - MAY ( userPassword $ l $ description $ manager ) ) - -objectclass ( 1.3.6.1.1.1.2.7 NAME 'ipNetwork' SUP top STRUCTURAL - DESC 'Abstraction of a network. The distinguished value of - the cn attribute denotes the networks canonical name' - MUST ipNetworkNumber - MAY ( cn $ ipNetmaskNumber $ l $ description $ manager ) ) - -objectclass ( 1.3.6.1.1.1.2.8 NAME 'nisNetgroup' SUP top STRUCTURAL - DESC 'Abstraction of a netgroup. May refer to other netgroups' - MUST cn - MAY ( nisNetgroupTriple $ memberNisNetgroup $ description ) ) - -objectclass ( 1.3.6.1.1.1.2.9 NAME 'nisMap' SUP top STRUCTURAL - DESC 'A generic abstraction of a NIS map' - MUST nisMapName - MAY description ) - -objectclass ( 1.3.6.1.1.1.2.10 NAME 'nisObject' SUP top STRUCTURAL - DESC 'An entry in a NIS map' - MUST ( cn $ nisMapEntry $ nisMapName ) - MAY description ) - -objectclass ( 1.3.6.1.1.1.2.11 NAME 'ieee802Device' SUP top AUXILIARY - DESC 'A device with a MAC address; device SHOULD be - used as a structural class' - MAY macAddress ) - -objectclass ( 1.3.6.1.1.1.2.12 NAME 'bootableDevice' SUP top AUXILIARY - DESC 'A device with boot parameters; device SHOULD be - used as a structural class' - MAY ( bootFile $ bootParameter ) ) - -objectclass ( 1.3.6.1.1.1.2.14 NAME 'nisKeyObject' SUP top AUXILIARY - DESC 'An object with a public and secret key' - MUST ( cn $ nisPublicKey $ nisSecretKey ) - MAY ( uidNumber $ description ) ) - -objectclass ( 1.3.6.1.1.1.2.15 NAME 'nisDomainObject' SUP top AUXILIARY - DESC 'Associates a NIS domain with a naming context' - MUST nisDomain ) - -objectclass ( 1.3.6.1.1.1.2.16 NAME 'automountMap' SUP top STRUCTURAL - MUST ( automountMapName ) - MAY description ) - -objectclass ( 1.3.6.1.1.1.2.17 NAME 'automount' SUP top STRUCTURAL - DESC 'Automount information' - MUST ( automountKey $ automountInformation ) - MAY description ) -## namedObject is needed for groups without members -objectclass ( 1.3.6.1.4.1.5322.13.1.1 NAME 'namedObject' SUP top - STRUCTURAL MAY cn ) +# +#attributetype ( 1.3.6.1.1.1.1.1 NAME 'gidNumber' +# DESC 'An integer uniquely identifying a group in an +# administrative domain' +# EQUALITY integerMatch +# ORDERING integerOrderingMatch +# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 +# SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.2 NAME 'gecos' + DESC 'The GECOS field; the common name' + EQUALITY caseIgnoreMatch + SUBSTRINGS caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.3 NAME 'homeDirectory' + DESC 'The absolute path to the home directory' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.4 NAME 'loginShell' + DESC 'The path to the login shell' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.1.1.1.5 NAME 'shadowLastChange' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.6 NAME 'shadowMin' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.7 NAME 'shadowMax' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.8 NAME 'shadowWarning' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.9 NAME 'shadowInactive' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.10 NAME 'shadowExpire' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.11 NAME 'shadowFlag' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + + + +attributetype ( 1.3.6.1.1.1.1.12 NAME 'memberUid' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + + +attributetype ( 1.3.6.1.1.1.1.13 NAME 'memberNisNetgroup' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + + +attributetype ( 1.3.6.1.1.1.1.14 NAME 'nisNetgroupTriple' + DESC 'Netgroup triple' + EQUALITY caseIgnoreMatch + SUBSTRINGS caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + + +attributetype ( 1.3.6.1.1.1.1.15 NAME 'ipServicePort' + DESC 'Service port number' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.16 NAME 'ipServiceProtocol' + DESC 'Service protocol name' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + + +attributetype ( 1.3.6.1.1.1.1.17 NAME 'ipProtocolNumber' + DESC 'IP protocol number' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.18 NAME 'oncRpcNumber' + DESC 'ONC RPC number' + EQUALITY integerMatch + ORDERING integerOrderingMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + + + + + + + + +attributetype ( 1.3.6.1.1.1.1.19 NAME 'ipHostNumber' + DESC 'IPv4 addresses as a dotted decimal omitting leading + zeros or IPv6 addresses as defined in RFC2373' + EQUALITY caseIgnoreIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) + + +attributetype ( 1.3.6.1.1.1.1.20 NAME 'ipNetworkNumber' + DESC 'IP network omitting leading zeros, eg. 192.168' + EQUALITY caseIgnoreIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.21 NAME 'ipNetmaskNumber' + DESC 'IP netmask omitting leading zeros, eg. 255.255.255.0' + EQUALITY caseIgnoreIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.22 NAME 'macAddress' + DESC 'MAC address in maximal, colon separated hex + notation, eg. 00:00:92:90:ee:e2' + EQUALITY caseIgnoreIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) + + +attributetype ( 1.3.6.1.1.1.1.23 NAME 'bootParameter' + DESC 'rpc.bootparamd parameter' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) + + +attributetype ( 1.3.6.1.1.1.1.24 NAME 'bootFile' + DESC 'Boot image name' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) + + +attributetype ( 1.3.6.1.1.1.1.26 NAME 'nisMapName' + DESC 'Name of a generic NIS map' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{64} ) + + + + + + + + + +attributetype ( 1.3.6.1.1.1.1.27 NAME 'nisMapEntry' + DESC 'A generic NIS entry' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.28 NAME 'nisPublicKey' + DESC 'NIS public key' + EQUALITY octetStringMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.29 NAME 'nisSecretKey' + DESC 'NIS secret key' + EQUALITY octetStringMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.30 NAME 'nisDomain' + DESC 'NIS domain' + EQUALITY caseIgnoreIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + + +attributetype ( 1.3.6.1.1.1.1.31 NAME 'automountMapName' + DESC 'automount Map Name' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.32 NAME 'automountKey' + DESC 'Automount Key value' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + + +attributetype ( 1.3.6.1.1.1.1.33 NAME 'automountInformation' + DESC 'Automount information' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + + + +objectclass ( 1.3.6.1.1.1.2.0 NAME 'posixAccount' SUP top AUXILIARY + DESC 'Abstraction of an account with POSIX attributes' + MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory ) + MAY ( authPassword $ userPassword $ loginShell $ gecos $ + description ) ) + + +objectclass ( 1.3.6.1.1.1.2.1 NAME 'shadowAccount' SUP top AUXILIARY + DESC 'Additional attributes for shadow passwords' + MUST uid + MAY ( authPassword $ userPassword $ description $ + shadowLastChange $ shadowMin $ shadowMax $ + shadowWarning $ shadowInactive $ + shadowExpire $ shadowFlag ) ) + + +objectclass ( 1.3.6.1.1.1.2.2 NAME 'posixGroup' SUP top AUXILIARY + DESC 'Abstraction of a group of accounts' + MUST gidNumber + MAY ( authPassword $ userPassword $ memberUid $ + description ) ) + + +objectclass ( 1.3.6.1.1.1.2.3 NAME 'ipService' SUP top STRUCTURAL + DESC 'Abstraction an Internet Protocol service. + Maps an IP port and protocol (such as tcp or udp) + to one or more names; the distinguished value of + the cn attribute denotes the service's canonical + name' + MUST ( cn $ ipServicePort $ ipServiceProtocol ) + MAY description ) + + +objectclass ( 1.3.6.1.1.1.2.4 NAME 'ipProtocol' SUP top STRUCTURAL + DESC 'Abstraction of an IP protocol. Maps a protocol number + to one or more names. The distinguished value of the cn + attribute denotes the protocol canonical name' + MUST ( cn $ ipProtocolNumber ) + MAY description ) + + + + + +objectclass ( 1.3.6.1.1.1.2.5 NAME 'oncRpc' SUP top STRUCTURAL + DESC 'Abstraction of an Open Network Computing (ONC) + [RFC1057] Remote Procedure Call (RPC) binding. + This class maps an ONC RPC number to a name. + The distinguished value of the cn attribute denotes + the RPC service canonical name' + MUST ( cn $ oncRpcNumber ) + MAY description ) + + +objectclass ( 1.3.6.1.1.1.2.6 NAME 'ipHost' SUP top AUXILIARY + DESC 'Abstraction of a host, an IP device. The distinguished + value of the cn attribute denotes the host's canonical + name. Device SHOULD be used as a structural class' + MUST ( cn $ ipHostNumber ) + MAY ( authPassword $ userPassword $ l $ description $ + manager ) ) + + +objectclass ( 1.3.6.1.1.1.2.7 NAME 'ipNetwork' SUP top STRUCTURAL + DESC 'Abstraction of a network. The distinguished value of + the cn attribute denotes the network canonical name' + MUST ipNetworkNumber + MAY ( cn $ ipNetmaskNumber $ l $ description $ manager ) ) + + +objectclass ( 1.3.6.1.1.1.2.8 NAME 'nisNetgroup' SUP top STRUCTURAL + DESC 'Abstraction of a netgroup. May refer to other + netgroups' + MUST cn + MAY ( nisNetgroupTriple $ memberNisNetgroup $ description ) ) + + +objectclass ( 1.3.6.1.1.1.2.9 NAME 'nisMap' SUP top STRUCTURAL + DESC 'A generic abstraction of a NIS map' + MUST nisMapName + MAY description ) + + +objectclass ( 1.3.6.1.1.1.2.10 NAME 'nisObject' SUP top STRUCTURAL + DESC 'An entry in a NIS map' + MUST ( cn $ nisMapEntry $ nisMapName ) + + +objectclass ( 1.3.6.1.1.1.2.11 NAME 'ieee802Device' SUP top AUXILIARY + DESC 'A device with a MAC address; device SHOULD be + used as a structural class' + MAY macAddress ) + + + + + +objectclass ( 1.3.6.1.1.1.2.12 NAME 'bootableDevice' SUP top AUXILIARY + DESC 'A device with boot parameters; device SHOULD be + used as a structural class' + MAY ( bootFile $ bootParameter ) ) + + +objectclass ( 1.3.6.1.1.1.2.14 NAME 'nisKeyObject' SUP top AUXILIARY + DESC 'An object with a public and secret key' + MUST ( cn $ nisPublicKey $ nisSecretKey ) + MAY ( uidNumber $ description ) ) + + +objectclass ( 1.3.6.1.1.1.2.15 NAME 'nisDomainObject' SUP top AUXILIARY + DESC 'Associates a NIS domain with a naming context' + MUST nisDomain ) + + +objectclass ( 1.3.6.1.1.1.2.16 NAME 'automountMap' SUP top STRUCTURAL + MUST ( automountMapName ) + MAY description ) + + +objectclass ( 1.3.6.1.1.1.2.17 NAME 'automount' SUP top STRUCTURAL + DESC 'Automount information' + MUST ( automountKey $ automountInformation ) + MAY description ) + + +objectclass ( 1.3.6.1.1.1.2.18 NAME 'groupOfMembers' SUP top STRUCTURAL + DESC 'A group with members (DNs)' + MUST cn + MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ + description $ member ) ) + + + + diff --git a/php/apache2-php5.5/php.ini b/php/apache2-php5.5/php.ini index 9911395..5e42c6d 100644 --- a/php/apache2-php5.5/php.ini +++ b/php/apache2-php5.5/php.ini @@ -907,7 +907,6 @@ default_socket_timeout = 60 ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll -;extension=php_zip.dll ;;;;;;;;;;;;;;;;;;; ; Module Settings ; @@ -1640,7 +1639,7 @@ mssql.min_error_severity = 10 mssql.min_message_severity = 10 ; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off +mssql.compatibility_mode = Off ; Connect timeout ;mssql.connect_timeout = 5 diff --git a/php/cgi-php5.5/php.ini b/php/cgi-php5.5/php.ini index 9911395..5e42c6d 100644 --- a/php/cgi-php5.5/php.ini +++ b/php/cgi-php5.5/php.ini @@ -907,7 +907,6 @@ default_socket_timeout = 60 ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll -;extension=php_zip.dll ;;;;;;;;;;;;;;;;;;; ; Module Settings ; @@ -1640,7 +1639,7 @@ mssql.min_error_severity = 10 mssql.min_message_severity = 10 ; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off +mssql.compatibility_mode = Off ; Connect timeout ;mssql.connect_timeout = 5 diff --git a/php/cli-php5.5/php.ini b/php/cli-php5.5/php.ini index 9911395..5e42c6d 100644 --- a/php/cli-php5.5/php.ini +++ b/php/cli-php5.5/php.ini @@ -907,7 +907,6 @@ default_socket_timeout = 60 ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll -;extension=php_zip.dll ;;;;;;;;;;;;;;;;;;; ; Module Settings ; @@ -1640,7 +1639,7 @@ mssql.min_error_severity = 10 mssql.min_message_severity = 10 ; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off +mssql.compatibility_mode = Off ; Connect timeout ;mssql.connect_timeout = 5 diff --git a/php/embed-php5.5/php.ini b/php/embed-php5.5/php.ini index 9911395..5e42c6d 100644 --- a/php/embed-php5.5/php.ini +++ b/php/embed-php5.5/php.ini @@ -907,7 +907,6 @@ default_socket_timeout = 60 ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll -;extension=php_zip.dll ;;;;;;;;;;;;;;;;;;; ; Module Settings ; @@ -1640,7 +1639,7 @@ mssql.min_error_severity = 10 mssql.min_message_severity = 10 ; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off +mssql.compatibility_mode = Off ; Connect timeout ;mssql.connect_timeout = 5 diff --git a/php/fpm-php5.5/php.ini b/php/fpm-php5.5/php.ini index 9911395..5e42c6d 100644 --- a/php/fpm-php5.5/php.ini +++ b/php/fpm-php5.5/php.ini @@ -907,7 +907,6 @@ default_socket_timeout = 60 ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll -;extension=php_zip.dll ;;;;;;;;;;;;;;;;;;; ; Module Settings ; @@ -1640,7 +1639,7 @@ mssql.min_error_severity = 10 mssql.min_message_severity = 10 ; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off +mssql.compatibility_mode = Off ; Connect timeout ;mssql.connect_timeout = 5 diff --git a/portage/package.use b/portage/package.use index e53cd4d..59f31c4 100644 --- a/portage/package.use +++ b/portage/package.use @@ -51,22 +51,23 @@ dev-libs/libmemcached -doc tcmalloc dev-libs/libusb -doc dev-libs/nss utils dev-libs/openssl rfc3779 -dev-libs/yaz icu +dev-libs/yaz icu -dev-perl/Catalyst-Action-REST php xml config-general data-taxi freezethaw json -dev-perl/Catalyst-Model-DBIC-Schema caching catalyst_helper replication +dev-perl/Catalyst-Action-REST php xml config-general data-taxi freezethaw json +dev-perl/Catalyst-Model-DBIC-Schema caching catalyst_helper replication dev-perl/DBIx-Class admin admin_script deploy replicated dev-perl/File-ChangeNotify inotify -dev-perl/GD animgif -dev-perl/JSON-Any json-syck json-xs -dev-perl/PDL badval +dev-perl/GD animgif +dev-perl/JSON-Any json-syck json-xs +dev-perl/PDL badval dev-perl/Sysadm-Install hammer dev-perl/Task-Moose cli async declare instancetype logging other strict traits types utilroles utils -dev-php/PEAR-MDB2 mysqli +dev-php/PEAR-MDB2 mysqli dev-php/pecl-apc lock_pthreadmutex dev-python/ipython smp +#dev-python/jinja -doc dev-python/pb-base -doc dev-python/pb-logging -doc dev-python/pycairo -doc @@ -76,7 +77,7 @@ dev-ruby/rubygems server dev-scheme/guile discouraged networking regex -dev-util/strace aio +dev-util/strace aio dev-vcs/git highlight dev-vcs/subversion -dso extras diff --git a/portage/savedconfig/sys-apps/busybox-1.20.2 b/portage/savedconfig/sys-apps/busybox-1.21.0 similarity index 98% rename from portage/savedconfig/sys-apps/busybox-1.20.2 rename to portage/savedconfig/sys-apps/busybox-1.21.0 index fa342b1..3080cf6 100644 --- a/portage/savedconfig/sys-apps/busybox-1.20.2 +++ b/portage/savedconfig/sys-apps/busybox-1.21.0 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.2 -# Wed Nov 7 23:12:41 2012 +# Busybox version: 1.21.0 +# Wed Sep 18 21:46:45 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/var/run" CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set @@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install" CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_FAST_TOP=y CONFIG_FEATURE_ETC_NETWORKS=y CONFIG_FEATURE_USE_TERMIOS=y @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -375,7 +378,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y CONFIG_FEATURE_AWK_LIBM=y CONFIG_CMP=y @@ -617,9 +619,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_EXFAT=y CONFIG_FEATURE_VOLUMEID_HFS=y CONFIG_FEATURE_VOLUMEID_JFS=y CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_UDF=y @@ -627,6 +631,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y CONFIG_FEATURE_VOLUMEID_OCFS2=y CONFIG_FEATURE_VOLUMEID_LINUXRAID=y @@ -899,6 +904,13 @@ CONFIG_POWERTOP=y CONFIG_PSTREE=y CONFIG_PWDX=y # CONFIG_SMEMCAP is not set +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y CONFIG_UPTIME=y CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y CONFIG_FREE=y @@ -919,13 +931,6 @@ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y CONFIG_RENICE=y CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_SMP_CPU=y -CONFIG_FEATURE_TOP_DECIMALS=y -CONFIG_FEATURE_TOP_SMP_PROCESS=y -CONFIG_FEATURE_TOPMEM=y CONFIG_FEATURE_SHOW_THREADS=y CONFIG_WATCH=y @@ -1020,6 +1025,11 @@ CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_FEATURE_KMSG_SYSLOG=y CONFIG_KLOGD=y + +# +# klogd should not be used together with syslog to kernel printk buffer +# CONFIG_FEATURE_KLOGD_KLOGCTL=y CONFIG_LOGGER=y diff --git a/ssl/certs/0d8b9131.0 b/ssl/certs/0d8b9131.0 deleted file mode 120000 index 253ddb4..0000000 --- a/ssl/certs/0d8b9131.0 +++ /dev/null @@ -1 +0,0 @@ -signet_ocspklasa3_pem.pem \ No newline at end of file diff --git a/ssl/certs/0f11b315.0 b/ssl/certs/0f11b315.0 deleted file mode 120000 index 6362891..0000000 --- a/ssl/certs/0f11b315.0 +++ /dev/null @@ -1 +0,0 @@ -Verisign_Class_2_Public_Primary_Certification_Authority.pem \ No newline at end of file diff --git a/ssl/certs/1503d3dd.0 b/ssl/certs/1503d3dd.0 deleted file mode 120000 index 2a96385..0000000 --- a/ssl/certs/1503d3dd.0 +++ /dev/null @@ -1 +0,0 @@ -signet_ca2_pem.pem \ No newline at end of file diff --git a/ssl/certs/3ee7e181.1 b/ssl/certs/3ee7e181.1 deleted file mode 120000 index aab268e..0000000 --- a/ssl/certs/3ee7e181.1 +++ /dev/null @@ -1 +0,0 @@ -cert_igca_rsa.pem \ No newline at end of file diff --git a/ssl/certs/48ef30f1.0 b/ssl/certs/48ef30f1.0 deleted file mode 120000 index c05de2e..0000000 --- a/ssl/certs/48ef30f1.0 +++ /dev/null @@ -1 +0,0 @@ -TC_TrustCenter__Germany__Class_2_CA.pem \ No newline at end of file diff --git a/ssl/certs/5c67e263.0 b/ssl/certs/5c67e263.0 deleted file mode 120000 index ae00a7f..0000000 --- a/ssl/certs/5c67e263.0 +++ /dev/null @@ -1 +0,0 @@ -signet_ca1_pem.pem \ No newline at end of file diff --git a/ssl/certs/6faac4e3.0 b/ssl/certs/6faac4e3.0 deleted file mode 120000 index 2bc0e95..0000000 --- a/ssl/certs/6faac4e3.0 +++ /dev/null @@ -1 +0,0 @@ -Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem \ No newline at end of file diff --git a/ssl/certs/972672fc.0 b/ssl/certs/972672fc.0 deleted file mode 120000 index 8a40581..0000000 --- a/ssl/certs/972672fc.0 +++ /dev/null @@ -1 +0,0 @@ -TC_TrustCenter__Germany__Class_3_CA.pem \ No newline at end of file diff --git a/ssl/certs/a9603aca.0 b/ssl/certs/a9603aca.0 deleted file mode 120000 index f66b6c0..0000000 --- a/ssl/certs/a9603aca.0 +++ /dev/null @@ -1 +0,0 @@ -signet_pca3_pem.pem \ No newline at end of file diff --git a/ssl/certs/ad493b2e.0 b/ssl/certs/ad493b2e.0 deleted file mode 120000 index 79285f2..0000000 --- a/ssl/certs/ad493b2e.0 +++ /dev/null @@ -1 +0,0 @@ -signet_tsa1_pem.pem \ No newline at end of file diff --git a/ssl/certs/b293fb2c.0 b/ssl/certs/b293fb2c.0 deleted file mode 120000 index d15b13f..0000000 --- a/ssl/certs/b293fb2c.0 +++ /dev/null @@ -1 +0,0 @@ -signet_ocspklasa2_pem.pem \ No newline at end of file diff --git a/ssl/certs/b4f0b7e7.0 b/ssl/certs/b4f0b7e7.0 deleted file mode 120000 index 5105a65..0000000 --- a/ssl/certs/b4f0b7e7.0 +++ /dev/null @@ -1 +0,0 @@ -brasil.gov.br.pem \ No newline at end of file diff --git a/ssl/certs/bccd5223.0 b/ssl/certs/bccd5223.0 deleted file mode 120000 index e9d0765..0000000 --- a/ssl/certs/bccd5223.0 +++ /dev/null @@ -1 +0,0 @@ -signet_pca2_pem.pem \ No newline at end of file diff --git a/ssl/certs/e1213163.0 b/ssl/certs/e1213163.0 deleted file mode 120000 index f1b2520..0000000 --- a/ssl/certs/e1213163.0 +++ /dev/null @@ -1 +0,0 @@ -signet_rootca_pem.pem \ No newline at end of file diff --git a/ssl/certs/f15719eb.0 b/ssl/certs/f15719eb.0 deleted file mode 120000 index 473a041..0000000 --- a/ssl/certs/f15719eb.0 +++ /dev/null @@ -1 +0,0 @@ -signet_ca3_pem.pem \ No newline at end of file diff --git a/udhcpd.conf b/udhcpd.conf new file mode 100644 index 0000000..eca44c0 --- /dev/null +++ b/udhcpd.conf @@ -0,0 +1,115 @@ +# Sample udhcpd configuration file (/etc/udhcpd.conf) +# Values shown are defaults + +# The start and end of the IP lease block +start 192.168.0.20 +end 192.168.0.254 + +# The interface that udhcpd will use +interface eth0 + +# The maximum number of leases (includes addresses reserved +# by OFFER's, DECLINE's, and ARP conflicts). Will be corrected +# if it's bigger than IP lease block, but it ok to make it +# smaller than lease block. +#max_leases 254 + +# The amount of time that an IP will be reserved (leased to nobody) +# if a DHCP decline message is received (seconds) +#decline_time 3600 + +# The amount of time that an IP will be reserved +# if an ARP conflict occurs (seconds) +#conflict_time 3600 + +# How long an offered address is reserved (seconds) +#offer_time 60 + +# If client asks for lease below this value, it will be rounded up +# to this value (seconds) +#min_lease 60 + +# The location of the pid file +#pidfile /var/run/udhcpd.pid + +# The location of the leases file +#lease_file /var/lib/misc/udhcpd.leases + +# The time period at which udhcpd will write out leases file. +# If this is 0, udhcpd will never automatically write leases file. +# Specified in seconds. +#auto_time 7200 + +# Every time udhcpd writes a leases file, the below script will be called +#notify_file # default: no script +#notify_file dumpleases # useful for debugging + +# The following are bootp specific options +# next server to use in bootstrap +#siaddr 192.168.0.22 # default: 0.0.0.0 (none) +# tftp server name +#sname zorak # default: none +# tftp file to download (e.g. kernel image) +#boot_file /var/nfs_root # default: none + +# Static leases map +#static_lease 00:60:08:11:CE:4E 192.168.0.54 +#static_lease 00:60:08:11:CE:3E 192.168.0.44 + +# The remainder of options are DHCP options and can be specified with the +# keyword 'opt' or 'option'. If an option can take multiple items, such +# as the dns option, they can be listed on the same line, or multiple +# lines. +# Examples: +opt dns 192.168.10.2 192.168.10.10 +option subnet 255.255.255.0 +opt router 192.168.10.2 +opt wins 192.168.10.10 +option dns 129.219.13.81 # appended to above DNS servers for a total of 3 +option domain local +option lease 864000 # default: 10 days +option msstaticroutes 10.0.0.0/8 10.127.0.1 # single static route +option staticroutes 10.0.0.0/8 10.127.0.1, 10.11.12.0/24 10.11.12.1 +# Arbitrary option in hex form: +option 0x08 01020304 # option 8: "cookie server IP addr: 1.2.3.4" + +# Currently supported options (for more info, see options.c): +#opt lease NUM +#opt subnet IP +#opt broadcast IP +#opt router IP_LIST +#opt ipttl NUM +#opt mtu NUM +#opt hostname STRING # client's hostname +#opt domain STRING # client's domain suffix +#opt search STRING_LIST # search domains +#opt nisdomain STRING +#opt timezone NUM # (localtime - UTC_time) in seconds. signed +#opt tftp STRING # tftp server name +#opt bootfile STRING # tftp file to download (e.g. kernel image) +#opt bootsize NUM # size of that file +#opt rootpath STRING # (NFS) path to mount as root fs +#opt wpad STRING +#opt serverid IP # default: server's IP +#opt message STRING # error message (udhcpd sends it on success too) +#opt vlanid NUM # 802.1P VLAN ID +#opt vlanpriority NUM # 802.1Q VLAN priority +# Options specifying server(s) +#opt dns IP_LIST +#opt wins IP_LIST +#opt nissrv IP_LIST +#opt ntpsrv IP_LIST +#opt lprsrv IP_LIST +#opt swapsrv IP +# Options specifying routes +#opt routes IP_PAIR_LIST +#opt staticroutes STATIC_ROUTES # RFC 3442 classless static route option +#opt msstaticroutes STATIC_ROUTES # same, using MS option number +# Obsolete options, no longer supported +#opt logsrv IP_LIST # 704/UDP log server (not syslog!) +#opt namesrv IP_LIST # IEN 116 name server, obsolete (August 1979!!!) +#opt cookiesrv IP_LIST # RFC 865 "quote of the day" server, rarely (never?) used +#opt timesrv IP_LIST # RFC 868 time server, rarely (never?) used +# TODO: in development +#opt userclass STRING # RFC 3004. set of LASCII strings. "I am a printer" etc +#opt sipserv STRING LIST # RFC 3361. flag byte, then: 0: domain names, 1: IP addrs -- 2.39.5