Upgrade to vte-0.38.2

[hvlinux.git] / stage3 / pkg / openssh

diff --git a/stage3/pkg/openssh b/stage3/pkg/openssh
index 726639d..9e2ad46 100644 (file)
--- a/stage3/pkg/openssh
+++ b/stage3/pkg/openssh
@@ -5,11 +5,11 @@ hvconfig_pre()
     install -v -m700 -d /var/lib/sshd
     chown -v root:sys /var/lib/sshd
 
-    groupadd -f sshd
-    hv_useradd -c sshd-privsep -d /var/lib/sshd -g sshd -s /bin/false sshd
+    groupadd --system -f sshd
+    hv_useradd --system -c sshd-privsep -d /var/lib/sshd -g sshd \
+        -s /bin/false sshd
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --sysconfdir=/etc/ssh \
         --datadir=/usr/share/sshd \
         --with-pam \
@@ -20,13 +20,19 @@ hvconfig_pre()
 
 hvbuild_post()
 {
+    install -v -m755 ${SRC_DIR}/contrib/ssh-copy-id /usr/bin
+    install -v -m644 ${SRC_DIR}/contrib/ssh-copy-id.1 /usr/share/man/man1
+
     # Disabling root logins
-    sed -i -e "s!^#PermitRootLogin.*!PermitRootLogin no!g" /etc/ssh/sshd_config
+    sed -i -e "s!^#\(PermitRootLogin\).*!\1 no!g" /etc/ssh/sshd_config
 
     # Enabling X11 forwarding
-    sed -i -e "s!^#X11Forwarding.*!X11Forwarding yes!g" /etc/ssh/sshd_config
+    echo "XAuthLocation /usr/bin/xauth" >> /etc/ssh/sshd_config
+    sed -i -e "s!^#\(X11Forwarding\).*!\1 yes!g" /etc/ssh/sshd_config
+    sed -i -e "s!^#\(ForwardAgent\).*!\1 yes!g" /etc/ssh/ssh_config
+    sed -i -e "s!^#\(ForwardX11\).*!\1 yes!g" /etc/ssh/ssh_config
 
-    # Setting MaxAuthTries to 2
+    # Setting MaxAuthTries to 3
     sed -i -e "s!^[#]*MaxAuthTries.*!MaxAuthTries 3!g" /etc/ssh/sshd_config
 
     install -v -m740 ${SCRDIR}/bootscripts/sshd /etc/rc.d/init.d