Merged iannucci into precise dev

diff --git a/debian/changelog b/debian/changelog
index 9836e76..9df10ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,48 @@
-invirt-console (0.2.16) unstable; urgency=low
+invirt-console (0.2.17) unstable; urgency=low
 
   * invirt-console-update now doesn't depend on remctld setting REMOTE_HOST
 
  -- Peter Iannucci <iannucci@mit.edu>  Mon, 01 Jul 2013 21:22:00 -0400
 
+invirt-console (0.2.16~glasgall5achernya1) precise; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+  * Correct diversions for dependency on debathena-ssh-server-config
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Fri, 31 May 2013 03:21:30 -0400
+
+invirt-console (0.2.16~glasgall5) precise; urgency=low
+
+  * pyroutefs API changes.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Mon, 29 Apr 2013 23:15:45 -0400
+
+invirt-console (0.2.16~glasgall4) precise; urgency=low
+
+  * Depend on debathena-ssh-server-config instead of invirt-ssh-config.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Mon, 29 Apr 2013 22:58:03 -0400
+
+invirt-console (0.2.16~glasgall3) precise; urgency=low
+
+  * Update for newer pyroutefs API (paths start with / now)
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sat, 20 Apr 2013 17:23:56 -0400
+
+invirt-console (0.2.16~glasgall2) precise; urgency=low
+
+  * Disable MOTD updating by transforming pam config to run pam_motd with
+    noupdate.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sat, 20 Apr 2013 16:25:24 -0400
+
+invirt-console (0.2.16~glasgall1) precise; urgency=low
+
+  * No-change rebuild for Precise
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sat, 20 Apr 2013 14:56:32 -0400
+
 invirt-console (0.2.15) unstable; urgency=low
 
   * Divert /etc/conserver/console.cf in the right binary package.

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7

diff --git a/debian/control b/debian/control
index 130125b..d10d978 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: invirt-console
 Section: servers
 Priority: extra
 Maintainer: Invirt project <invirt@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~), nscd, openssh-server, invirt-ssh-config, initscripts
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7), config-package-dev (>= 5.0~), nscd, openssh-server, debathena-ssh-server-config, initscripts
+Standards-Version: 3.9.3
 
 Package: invirt-console-server
 Architecture: all
@@ -13,7 +13,7 @@ Depends: invirt-base, ${shlibs:Depends}, ${misc:Depends},
  conserver-client, conserver-server, daemon,
  invirt-kerberos-config, fuse-utils, libnss-pgsql1, nscd,
  openssh-server, python, python-routefs, invirt-database,
- remctl-server, invirt-ssh-config
+ remctl-server, debathena-ssh-server-config
 Description: Invirt serial-console proxy server
  This is the software for the serial-console proxy server.
 

diff --git a/debian/invirt-console-host.displace b/debian/invirt-console-host.displace
new file mode 100644 (file)
index 0000000..cc427df
--- /dev/null
+++ b/debian/invirt-console-host.displace
@@ -0,0 +1,2 @@
+/etc/conserver/conserver.cf.invirt
+/etc/conserver/server.conf.invirt

diff --git a/debian/invirt-console-host.undisplace b/debian/invirt-console-host.undisplace
new file mode 100644 (file)
index 0000000..15ed3fb
--- /dev/null
+++ b/debian/invirt-console-host.undisplace
@@ -0,0 +1,2 @@
+/etc/conserver/console.cf.invirt
+

diff --git a/debian/invirt-console-server.displace b/debian/invirt-console-server.displace
new file mode 100644 (file)
index 0000000..53b71d7
--- /dev/null
+++ b/debian/invirt-console-server.displace
@@ -0,0 +1,3 @@
+/etc/conserver/conserver.cf.invirt
+/etc/conserver/console.cf.invirt
+/etc/motd.invirt

diff --git a/debian/invirt-console-server.transform b/debian/invirt-console-server.transform
new file mode 100644 (file)
index 0000000..61ceace
--- /dev/null
+++ b/debian/invirt-console-server.transform
@@ -0,0 +1,5 @@
+/etc/nsswitch.conf.invirt </usr/share/base-files/nsswitch.conf debian/transform_nsswitch.conf.invirt
+/etc/nscd.conf.invirt debian/transform_nscd.conf.invirt
+/etc/pam.d/sshd.invirt debian/transform_sshd.invirt
+/etc/pam.d/login.invirt debian/transform_login.invirt
+/etc/ssh/sshd_config.debathena.invirt debian/transform_sshd_config.invirt.invirt

diff --git a/debian/rules b/debian/rules
index 5117948..3c8e24d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,34 +1,3 @@
 #!/usr/bin/make -f
-
-DEB_DIVERT_EXTENSION = .invirt
-DEB_TRANSFORM_FILES_invirt-console-server += \
-       /etc/init.d/bootmisc.sh.invirt \
-       /etc/nsswitch.conf.invirt \
-       /etc/nscd.conf.invirt \
-       /etc/pam.d/sshd.invirt \
-       /etc/ssh/sshd_config.invirt.invirt
-
-DEB_UNDIVERT_FILES_invirt-console-server += \
-       /etc/ssh/sshd_config.debathena.invirt
-
-DEB_UNDIVERT_VERSION_/etc/ssh/sshd_config.debathena.invirt = 0.2.12~
-
-ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
-    DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.invirt = \
-        /usr/share/base-files/nsswitch.conf
-endif
-
-DEB_DIVERT_FILES_invirt-console-server += \
-       /etc/conserver/conserver.cf.invirt \
-       /etc/conserver/console.cf.invirt \
-       /etc/motd.invirt
-DEB_DIVERT_FILES_invirt-console-host += \
-       /etc/conserver/conserver.cf.invirt \
-       /etc/conserver/server.conf.invirt
-
-DEB_UNDIVERT_FILES_invirt-console-host += \
-       /etc/conserver/console.cf.invirt
-DEB_UNDIVERT_VERSION_/etc/conserver/console.cf.invirt = 0.2.15~
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
+%:
+       dh $@ --with config-package

diff --git a/debian/transform_bootmisc.sh.invirt b/debian/transform_bootmisc.sh.invirt
deleted file mode 100755 (executable)
index b6a4b6d..0000000
--- a/debian/transform_bootmisc.sh.invirt
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-patch -p0 -o /dev/fd/4 3<&0 4>&1 1>/dev/null <<EOF
-
-# Yes, I there's no context. But the lines being replaced are less
-# likely to change than the lines around them
-
---- Ignored
-+++ /dev/fd/3
-@@ -42,3 +42,2 @@
--      # Update motd
--      uname -snrvm > /var/run/motd
--      [ -f /etc/motd.tail ] && cat /etc/motd.tail >> /var/run/motd
-+      # Do not update motd
-+      cp /etc/motd /var/run/motd

diff --git a/debian/transform_login.invirt b/debian/transform_login.invirt
new file mode 100755 (executable)
index 0000000..00d4a43
--- /dev/null
+++ b/debian/transform_login.invirt
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec sed -e 's/pam_motd.so/pam_motd.so noupdate/g'

diff --git a/debian/transform_sshd.invirt b/debian/transform_sshd.invirt
index 951a589..9813498 100755 (executable)
--- a/debian/transform_sshd.invirt
+++ b/debian/transform_sshd.invirt
@@ -8,4 +8,4 @@ echo 'auth    [success=1 ignore=ignore default=ignore module_unknown=die]   pam_
 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
+exec sed -e 's/pam_motd.so/pam_motd.so noupdate/g'

diff --git a/server/usr/bin/invirt-consolefs b/server/usr/bin/invirt-consolefs
index a23ae5c..5c7a1b3 100755 (executable)
--- a/server/usr/bin/invirt-consolefs
+++ b/server/usr/bin/invirt-consolefs
@@ -36,10 +36,10 @@ class ConsoleFS(routefs.RouteFS):
     
     def make_map(self):
         m = Mapper()
-        m.connect('', controller='getMachines')
-        m.connect(':machine', controller='getMirror')
-        m.connect(':machine/.k5login', controller='getK5login')
-        m.connect(':machine/*(path)', controller='getMirror')
+        m.connect('/', controller='getMachines')
+        m.connect('/:machine', controller='getMirror')
+        m.connect('/:machine/.k5login', controller='getK5login')
+        m.connect('/:machine/*(path)', controller='getMirror')
         return m
     
     def recache(self):
@@ -63,7 +63,7 @@ class ConsoleFS(routefs.RouteFS):
         elif os.path.islink(real):
             return routefs.Symlink(os.readlink(real))
         elif os.path.isfile(real):
-            return open(real).read()
+            return routefs.File(open(real).read())
         else:
             return -errno.EINVAL
     
@@ -75,7 +75,7 @@ class ConsoleFS(routefs.RouteFS):
         users.append('daemon/%s@%s' % (config.web.hostname,
                                        config.kerberos.realm))
         users.append('')
-        return "\n".join(users)
+        return routefs.File("\n".join(users))
     
     def mirrorPath(self, path):
         """Translate a virtual path to its real path counterpart"""