Changeset 2775

Timestamp:

Dec 24, 2009, 2:03:25 AM (14 years ago)

Author:

gdb

Message:

Removed debathena dependencies from invirt-console

Location:

package_branches/invirt-console/hvirt/debian

Files:

• changelog (modified) (1 diff)
• control (modified) (2 diffs)
• rules (modified) (2 diffs)
• transform_krb5.conf.invirt (added)
• transform_sshd_config.invirt (moved) (moved from package_branches/invirt-console/hvirt/debian/transform_sshd_config.debathena.invirt) (1 diff)

package_branches/invirt-console/hvirt/debian/changelog

@@ +1 @@
+invirt-console (0.2.12) unstable; urgency=low
+
+  * Removed dependency on debathena pkgs
+
+ -- Greg Brockman <gdb@mit.edu>  Thu, 24 Dec 2009 01:54:32 -0500
+
 invirt-console (0.2.11) unstable; urgency=low
 

package_branches/invirt-console/hvirt/debian/control

@@ -3 +3 @@
 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, debathena-ssh-server-config, initscripts
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~), nscd, openssh-server, initscripts, krb5-config, krb5-user, krb5-clients
 Standards-Version: 3.7.2
 
@@ -12 +12 @@
 Depends: invirt-base, ${shlibs:Depends}, ${misc:Depends},
  conserver-client, conserver-server, daemon,
- debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd,
+ fuse-utils, libnss-pgsql1, nscd, krb5-config, krb5-user, krb5-clients,
  openssh-server, python, python-routefs, invirt-database,
- remctl-server, debathena-ssh-server-config
+ remctl-server
 Description: Invirt serial-console proxy server
  This is the software for the serial-console proxy server.

package_branches/invirt-console/hvirt/debian/rules

@@ -7 +7 @@
         /etc/nscd.conf.invirt \
         /etc/pam.d/sshd.invirt \
-        /etc/ssh/sshd_config.debathena.invirt
+        /etc/ssh/sshd_config.invirt
 
 ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
@@ -16 +16 @@
 DEB_DIVERT_FILES_invirt-console-server += \
         /etc/conserver/conserver.cf.invirt \
-        /etc/motd.invirt
+        /etc/krb5.conf \
+        /etc/motd.invirt \
+        /etc/ssh/sshd_config
 DEB_DIVERT_FILES_invirt-console-host += \
         /etc/conserver/conserver.cf.invirt \

package_branches/invirt-console/hvirt/debian/transform_sshd_config.invirt

@@ -1 +1 @@
 #!/usr/bin/perl -0p
+# Debathena rules (from debathena-ssh-server-config)
+s/^#?GSSAPIAuthentication .*$/GSSAPIAuthentication yes\nGSSAPIKeyExchange yes\nGSSAPIStrictAcceptorCheck no/m or die;
+s/^#?GSSAPICleanupCredentials .*$/GSSAPICleanupCredentials yes/m or die;
+s/^#?ChallengeResponseAuthentication .*$/ChallengeResponseAuthentication yes/m or die;
+## In Debathena, privilege separation is configurable.
+s/^#?UsePrivilegeSeparation .*$/UsePrivilegeSeparation yes/m or die;
+s/^#?PasswordAuthentication .*$/PasswordAuthentication no/m or die;
+
+# Invirt rules
 s/^#?PrintLastLog .*$/PrintLastLog no/m or die;
 s/$/\nAllowTcpForwarding no/ or die;
 s/^#?X11Forwarding .*$/X11Forwarding no/m or die;
 s/^#?Subsystem sftp.*$//m or die;
+
+