Index: trunk/packages/sipb-xen-console/config.todo =================================================================== --- trunk/packages/sipb-xen-console/config.todo (revision 1060) +++ (revision ) @@ -1,1 +1,0 @@ -files/etc/lots: could benefit from config-package-dev TRANSFORM for upgradeability Index: trunk/packages/sipb-xen-console/debian/changelog =================================================================== --- trunk/packages/sipb-xen-console/debian/changelog (revision 1060) +++ trunk/packages/sipb-xen-console/debian/changelog (revision 1062) @@ -1,2 +1,8 @@ +sipb-xen-console (8.0) unstable; urgency=low + + * Update config files to work with Hardy + + -- Evan Broder Sun, 05 Oct 2008 04:45:21 -0400 + sipb-xen-console (7.8) unstable; urgency=low Index: trunk/packages/sipb-xen-console/debian/control =================================================================== --- trunk/packages/sipb-xen-console/debian/control (revision 1060) +++ trunk/packages/sipb-xen-console/debian/control (revision 1062) @@ -1,7 +1,7 @@ Source: sipb-xen-console Section: servers -Priority: important -Maintainer: sipb-xen@mit.edu -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~) +Priority: extra +Maintainer: SIPB Xen Project +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~), nscd, openssh-server, debathena-ssh-server-config, initscripts Standards-Version: 3.7.2 @@ -10,5 +10,5 @@ Provides: ${diverted-files} Conflicts: ${diverted-files} -Depends: sipb-xen-base, ${shlibs:Depends}, ${misc:Depends}, conserver-client, daemon, debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd, openssh-server, python-fuse, sipb-xen-chrony-config, sipb-xen-database-common, remctl-server +Depends: sipb-xen-base, ${shlibs:Depends}, ${misc:Depends}, conserver-client, daemon, debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd, openssh-server, python, python-fuse, sipb-xen-chrony-config, sipb-xen-database-common, remctl-server Description: SIPB Xen serial console server This package should be installed on sipb-xen-console Index: trunk/packages/sipb-xen-console/debian/control.in =================================================================== --- trunk/packages/sipb-xen-console/debian/control.in (revision 1060) +++ (revision ) @@ -1,15 +1,0 @@ -Source: sipb-xen-console -Section: servers -Priority: important -Maintainer: sipb-xen@mit.edu -Build-Depends: @cdbs@ -Standards-Version: 3.7.2 - -Package: sipb-xen-console -Architecture: all -Provides: ${diverted-files} -Conflicts: ${diverted-files} -Depends: sipb-xen-base, ${shlibs:Depends}, ${misc:Depends}, conserver-client, daemon, debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd, openssh-server, python-fuse, sipb-xen-chrony-config, sipb-xen-database-common, remctl-server -Description: SIPB Xen serial console server - This package should be installed on sipb-xen-console - It makes sure that necessary tools are available. Index: trunk/packages/sipb-xen-console/debian/rules =================================================================== --- trunk/packages/sipb-xen-console/debian/rules (revision 1060) +++ trunk/packages/sipb-xen-console/debian/rules (revision 1062) @@ -1,14 +1,20 @@ #!/usr/bin/make -f -DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1 DEB_DIVERT_EXTENSION = .sipb-xen +DEB_TRANSFORM_FILES_sipb-xen-console += \ + /etc/init.d/bootmisc.sh.sipb-xen \ + /etc/nsswitch.conf.sipb-xen \ + /etc/nscd.conf.sipb-xen \ + /etc/pam.d/sshd.sipb-xen \ + /etc/ssh/sshd_config.debathena.sipb-xen + +ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),) + DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.sipb-xen = \ + /usr/share/base-files/nsswitch.conf +endif + DEB_DIVERT_FILES_sipb-xen-console += \ - /etc/init.d/bootmisc.sh \ - /etc/conserver/conserver.cf \ - /etc/motd \ - /etc/nscd.conf \ - /etc/nsswitch.conf \ - /etc/pam.d/ssh \ - /etc/ssh/sshd_config + /etc/conserver/conserver.cf.sipb-xen \ + /etc/motd.sipb-xen include /usr/share/cdbs/1/rules/debhelper.mk Index: trunk/packages/sipb-xen-console/debian/transform_bootmisc.sh.sipb-xen =================================================================== --- trunk/packages/sipb-xen-console/debian/transform_bootmisc.sh.sipb-xen (revision 1062) +++ trunk/packages/sipb-xen-console/debian/transform_bootmisc.sh.sipb-xen (revision 1062) @@ -0,0 +1,14 @@ +#!/bin/bash +patch -p0 -o /dev/fd/4 3<&0 4>&1 1>/dev/null < /var/run/motd +- [ -f /etc/motd.tail ] && cat /etc/motd.tail >> /var/run/motd ++ # Do not update motd ++ cp /etc/motd /var/run/motd Index: trunk/packages/sipb-xen-console/debian/transform_nscd.conf.sipb-xen =================================================================== --- trunk/packages/sipb-xen-console/debian/transform_nscd.conf.sipb-xen (revision 1062) +++ trunk/packages/sipb-xen-console/debian/transform_nscd.conf.sipb-xen (revision 1062) @@ -0,0 +1,6 @@ +#!/usr/bin/perl -0p +s/^(\s*negative-time-to-live\s*passwd\s*).*$/\13/m or die; +s/^(\s*negative-time-to-live\s*group\s*).*$/\13/m or die; +s/^(\s*persistent\s*passwd\s*).*$/\1no/m or die; +s/^(\s*persistent\s*group\s*).*$/\1no/m or die; + Index: trunk/packages/sipb-xen-console/debian/transform_nsswitch.conf.sipb-xen =================================================================== --- trunk/packages/sipb-xen-console/debian/transform_nsswitch.conf.sipb-xen (revision 1062) +++ trunk/packages/sipb-xen-console/debian/transform_nsswitch.conf.sipb-xen (revision 1062) @@ -0,0 +1,3 @@ +#!/usr/bin/perl -0p +s/^(passwd: .*)$/$1 pgsql/m or die; +s/^(group: .*)$/$1 pgsql/m or die; Index: trunk/packages/sipb-xen-console/debian/transform_sshd.sipb-xen =================================================================== --- trunk/packages/sipb-xen-console/debian/transform_sshd.sipb-xen (revision 1062) +++ trunk/packages/sipb-xen-console/debian/transform_sshd.sipb-xen (revision 1062) @@ -0,0 +1,11 @@ +#!/bin/sh +echo "# If they're not root, but their user exists (success)," +echo 'auth [success=ignore ignore=ignore default=1 module_unknown=die] pam_succeed_if.so uid > 0' +echo "# print the \"You don\'t have tickets\" error:" +echo 'auth [success=die ignore=reset default=die module_unknown=die] pam_echo.so file=/etc/issue.net.no_tkt' +echo "# If !(they are root)," +echo 'auth [success=1 ignore=ignore default=ignore module_unknown=die] pam_succeed_if.so uid eq 0' +echo "# print the \"your account doesn't exist\" error:" +echo 'auth [success=die ignore=reset default=die module_unknown=die] pam_echo.so file=/etc/issue.net.no_user' +echo +exec cat Index: trunk/packages/sipb-xen-console/debian/transform_sshd_config.debathena.sipb-xen =================================================================== --- trunk/packages/sipb-xen-console/debian/transform_sshd_config.debathena.sipb-xen (revision 1062) +++ trunk/packages/sipb-xen-console/debian/transform_sshd_config.debathena.sipb-xen (revision 1062) @@ -0,0 +1,2 @@ +#!/usr/bin/perl -0p +s/^#?PrintLastLog .*$/PrintLastLog no/m or die; Index: trunk/packages/sipb-xen-console/files/etc/init.d/bootmisc.sh.sipb-xen =================================================================== --- trunk/packages/sipb-xen-console/files/etc/init.d/bootmisc.sh.sipb-xen (revision 1060) +++ (revision ) @@ -1,92 +1,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: bootmisc -# Required-Start: $local_fs hostname $remote_fs -# Required-Stop: $local_fs -# Default-Start: S -# Default-Stop: -# Short-Description: Miscellaneous things to be done during bootup. -# Description: -### END INIT INFO - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -[ "$DELAYLOGIN" ] || DELAYLOGIN=yes -. /lib/init/vars.sh - -do_start () { - # - # If login delaying is enabled then create the flag file - # which prevents logins before startup is complete - # - case "$DELAYLOGIN" in - Y*|y*) - echo "System bootup in progress - please wait" > /var/lib/initscripts/nologin - ;; - esac - - # Create /var/run/utmp so we can login. - : > /var/run/utmp - if grep -q ^utmp: /etc/group - then - chmod 664 /var/run/utmp - chgrp utmp /var/run/utmp - fi - - # Set pseudo-terminal access permissions. - if [ ! -e /dev/.devfsd ] && [ -c /dev/ttyp0 ] - then - chmod -f 666 /dev/tty[p-za-e][0-9a-f] - chown -f root:tty /dev/tty[p-za-e][0-9a-f] - fi - - # Do not update motd - #uname -snrvm > /var/run/motd - #[ -f /etc/motd.tail ] && cat /etc/motd.tail >> /var/run/motd - cp /etc/motd /var/run/motd - - # Save kernel messages in /var/log/dmesg - if which dmesg >/dev/null 2>&1 - then - savelog -q -p -c 5 /var/log/dmesg - dmesg -s 524288 > /var/log/dmesg - chgrp adm /var/log/dmesg || : - elif [ -c /dev/klog ] - then - savelog -q -p -c 5 /var/log/dmesg - dd if=/dev/klog of=/var/log/dmesg & - sleep 1 - kill $! - [ -f /var/log/dmesg ] && { chgrp adm /var/log/dmesg || : ; } - fi - - # - # Save udev log in /var/log/udev - # - if [ -e /dev/.udev.log ] - then - mv -f /dev/.udev.log /var/log/udev - fi - - # Remove bootclean's flag files. - # Don't run bootclean again after this! - rm -f /tmp/.clean /var/run/.clean /var/lock/.clean -} - -case "$1" in - start|"") - do_start - ;; - restart|reload|force-reload) - echo "Error: argument '$1' not supported" >&2 - exit 3 - ;; - stop) - # No-op - ;; - *) - echo "Usage: bootmisc.sh [start|stop]" >&2 - exit 3 - ;; -esac - -: Index: trunk/packages/sipb-xen-console/files/etc/nscd.conf.sipb-xen =================================================================== --- trunk/packages/sipb-xen-console/files/etc/nscd.conf.sipb-xen (revision 1060) +++ (revision ) @@ -1,67 +1,0 @@ -# -# /etc/nscd.conf -# -# An example Name Service Cache config file. This file is needed by nscd. -# -# Legal entries are: -# -# logfile -# debug-level -# threads -# max-threads -# server-user -# server-user is ignored if nscd is started with -S parameters -# stat-user -# reload-count unlimited| -# paranoia -# restart-interval