From b692ce87a488ebf774a2db862748a05376cbef05 Mon Sep 17 00:00:00 2001
From: short <>
Date: Sat, 10 Nov 2001 00:28:54 +0000
Subject: [PATCH] Updated for new vellum.cz ftp path Updated openssh-2.9p2 ->
 openssh-3.0p1 root rc files (~root/.cshrc & ~root/.login) are now patch-fixed
 OpenSSH has now proper "--with-default-path" option to fix /usr/local/
 problem "killall -HUP httpd" is now run in "set +e" to fix bogus script abort
 (why?) Script tested on machine from mail <01C16970.F651E3A0.jenda.kolar@.*>

---
 enbrace-rc.diff | 32 --------------------------------
 enbrace.bash    | 42 ++++++++++++++++++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 36 deletions(-)
 delete mode 100644 enbrace-rc.diff

diff --git a/enbrace-rc.diff b/enbrace-rc.diff
deleted file mode 100644
index 72eac38..0000000
--- a/enbrace-rc.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- root/.cshrc-orig	Fri Feb 26 21:11:13 1999
-+++ root/.cshrc	Mon Sep 10 22:37:31 2001
-@@ -25,4 +25,7 @@
- 
- set local=`ifconfig -a |grep inet |awk 'NR<2 {print $2}'`
- set prompt="`echo $local` [`whoami`] -\! # "
--/root/status/message/hint
-+
-+# Jan Kolar <videoprogress@mbox.cz> /Lace
-+# Commented-out, must be placed in "~/.login"!
-+## /root/status/message/hint
---- root/.login-orig	Fri Feb 26 21:11:13 1999
-+++ root/.login	Mon Sep 10 22:37:52 2001
-@@ -58,3 +58,7 @@
- #set prompt="`hostname` [root] -\! # "
- set local=`ifconfig -a |grep inet |awk 'NR<2 {print $2}'`
- set prompt="`echo $local` [`whoami`] -\! # "
-+
-+# Jan Kolar <videoprogress@mbox.cz> /Lace
-+# Moved in from "~/.cshrc"!
-+/root/status/message/hint
---- etc/rc.local-orig	Mon Sep 10 22:39:22 2001
-+++ etc/rc.local	Mon Sep 10 22:23:30 2001
-@@ -56,7 +56,7 @@
- 
- # Jan Kolar <videoprogress@mbox.cz> /Lace
- echo "Starting OpenSSH service...."
--/usr/local/sbin/sshd
-+PATH="$PATH:/usr/local/bin" /usr/local/sbin/sshd
- echo "OpenSSH service started...."
- 
- 
diff --git a/enbrace.bash b/enbrace.bash
index b5c1ba9..725a648 100755
--- a/enbrace.bash
+++ b/enbrace.bash
@@ -1,6 +1,8 @@
 #! /usr/local/bin/bash
 #
-# cd;echo 'default login anonymous password short@' >~/.netrc;echo -e 'bi\nhash\ncd pub/priv\nget enbrace.bash\nquit'|ftp atrey.karlin.mff.cuni.cz;/usr/local/bin/bash enbrace.bash
+# $Id$
+#
+# cd;echo 'default login anonymous password short@' >~/.netrc;echo -e 'bi\nhash\ncd pub/priv/short/enbrace\nget enbrace.bash\nquit'|ftp vellum.cz;/usr/local/bin/bash enbrace.bash
 
 function fatal
 {
@@ -44,7 +46,7 @@ set -ex
 
 # Config
 	openssl="ftp://ftp.openssl.org/source/openssl-0.9.6b.tar.gz"
-	openssh="ftp://ftp1.se.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-2.9p2.tar.gz"
+	openssh="ftp://ftp1.se.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.0p1.tar.gz"
 
 # Init
 	chmod +x enbrace.bash
@@ -90,6 +92,31 @@ EOF
  echo ""
  echo ""
 EOF
+	cat >root-cshrc.diff <<EOF
+--- root/.cshrc-orig	Fri Feb 26 21:11:13 1999
++++ root/.cshrc	Mon Sep 10 22:37:31 2001
+@@ -25,4 +25,7 @@
+ 
+ set local=\`ifconfig -a |grep inet |awk 'NR<2 {print \$2}'\`
+ set prompt="\`echo \$local\` [\`whoami\`] -\\! # "
+-/root/status/message/hint
++
++# Jan Kolar <videoprogress@mbox.cz> /Lace
++# Commented-out, must be placed in "~/.login"!
++## /root/status/message/hint
+EOF
+	cat >root-login.diff <<EOF
+--- root/.login-orig	Fri Feb 26 21:11:13 1999
++++ root/.login	Mon Sep 10 22:37:52 2001
+@@ -58,3 +58,7 @@
+ #set prompt="\`hostname\` [root] -\\! # "
+ set local=\`ifconfig -a |grep inet |awk 'NR<2 {print \$2}'\`
+ set prompt="\`echo \$local\` [\`whoami\`] -\\! # "
++
++# Jan Kolar <videoprogress@mbox.cz> /Lace
++# Moved in from "~/.cshrc"!
++/root/status/message/hint
+EOF
 
 # OpenSSL
 	ftpget "$openssl"
@@ -108,7 +135,9 @@ EOF
 	tar xzf "$file"
 	(cd "$base"
 		#make clean
-		./configure --with-ipv4-default 2>&1|tee errs1
+		./configure --with-ipv4-default \
+				--with-default-path="/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin" \
+				2>&1|tee errs1
 		make 2>&1|tee errs2
 		make install 2>&1|tee errs3
 		)
@@ -117,7 +146,12 @@ EOF
 
 # Apache
 	patch /usr/local/etc/httpd/conf/httpd.conf <httpd.conf.diff
-	killall -HUP httpd
+	# We need to temporarily disable error checking as killall(1) MAY fail (why?)
+	set +e;killall -HUP httpd;set -e
+
+# Root rcs
+	patch /root/.cshrc <root-cshrc.diff
+	patch /root/.login <root-login.diff
 
 # OpenSSH-post
 	for i in /usr/local/etc/*_key;do
-- 
1.8.3.1