X-Git-Url: http://git.jankratochvil.net/?p=enbrace.git;a=blobdiff_plain;f=enbrace.bash;h=0ddb2c95eaf8993e4ce044f2b04537f8e12e4e9d;hp=bd4d44d85cd4ec73e614a4e5a4a04e9afff67983;hb=50185365a8c62036d3472ce1a4accbd7ceacf8a0;hpb=187f2893dbf88a6230e7b19537c5e529da11a858

diff --git a/enbrace.bash b/enbrace.bash
index bd4d44d..0ddb2c9 100755
--- a/enbrace.bash
+++ b/enbrace.bash
@@ -2,7 +2,7 @@
 #
 # $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
+# cd;echo 'default login anonymous password short@' >~/.netrc;echo -e 'bi\nhash\npass\ncd pub/priv/short/enbrace\nget enbrace.bash\nquit'|ftp vellum.cz;/usr/local/bin/bash enbrace.bash
 
 function fatal
 {
@@ -10,10 +10,10 @@ function fatal
 	exit 1
 }
 
-if [ "$USER" != "root"         ];then fatal "This script must be run as 'root'"               ;fi
-if [ "$PWD"  != "/root"        ];then fatal "This script must be run from directory '/root'"  ;fi
-if [ "$0"    != "enbrace.bash" ];then fatal "This script must be named 'enbrace.bash'"        ;fi
-if [ -e "enbrace"              ];then fatal "'/root/enbrace' directory already exists"        ;fi
+if [ "$USER" != "root"                   ];then fatal "This script must be run as 'root'"               ;fi
+if [ "$PWD"  != "/root"                  ];then fatal "This script must be run from directory '/root'"  ;fi
+if [ "`basename "$0"`" != "enbrace.bash" ];then fatal "This script must be named 'enbrace.bash'"        ;fi
+if [ -e "enbrace"                        ];then fatal "'/root/enbrace' directory already exists"        ;fi
 
 function ftpget
 {
@@ -24,6 +24,7 @@ default
 		prom
 		bi
 		hash
+		pass
 
 EOF
 	if [ $# != 1 ];then fatal "ftpget(): (arg1=URL) required!";fi
@@ -36,17 +37,38 @@ EOF
 		echo -n "Using already downloaded file \"$1\": ";ls -l "$file"
 		return 0
 		fi
-	echo -e "cd \"$dir\"\\nget \"$file\"\\nquit"|ftp "$host"
+	echo -e "cd \"$dir\"\\nget \"$file\"\\nquit"|ftp -v "$host"
 	return 0
 }
 
+function dopatch
+{
+	cat >/root/enbrace/dopatch.diff
+	(
+		echo "### $*";shift
+		if [ -d "$1" ];then
+			cd "$1";shift
+		fi
+		rev="$1"
+		[ "$rev" = rev ] && shift
+		forw="$1"
+		[ "$forw" = forw ] && shift
+		set +e
+		[ "$forw" != forw ] && while patch -RsNEp0 $* </root/enbrace/dopatch.diff;do
+			echo "--- successful reverse patch"
+			done
+		[ "$rev" != rev ] && patch -sNEp0 $* </root/enbrace/dopatch.diff
+	) 2>&1|tee -a /root/enbrace/dopatch.log
+	rm -f /root/enbrace/dopatch.diff
+}
+
 
 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-3.0p1.tar.gz"
+	openssl="ftp://ftp.openssl.org/source/openssl-0.9.6c.tar.gz"
+	openssh="ftp://ftp1.se.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.1p1.tar.gz"
 
 # Init
 	chmod +x enbrace.bash
@@ -92,20 +114,51 @@ EOF
  echo ""
  echo ""
 EOF
-	cat >root-cshrc.diff <<EOF
+	sed 's/jan.kolar@jklabs.cz/videoprogress@mbox.cz/g' <rc.local.diff >rc.local.diffrev
+	cat >root-cshrc.diffremoveold <<EOF
 --- root/.cshrc-orig	Fri Feb 26 21:11:13 1999
 +++ root/.cshrc	Mon Sep 10 22:37:31 2001
-@@ -25,4 +25,7 @@
+@@ -25,4 +25,3 @@
  
  set local=\`ifconfig -a |grep inet |awk 'NR<2 {print \$2}'\`
  set prompt="\`echo \$local\` [\`whoami\`] -\\! # "
 -/root/status/message/hint
+EOF
+	cat >root-cshrc.diffremovenew <<EOF
+--- root/.cshrc-orig	Fri Feb 26 21:11:13 1999
++++ root/.cshrc	Mon Sep 10 22:37:31 2001
+@@ -25,4 +25,3 @@
+ 
+ set local=\`ifconfig -a |grep inet |awk 'NR<2 {print \$2}'\`
+ set prompt="\`echo \$local\` [\`whoami\`] -\\! # "
+-/root/status/result/hint
+EOF
+	cat >root-cshrc.diffrev1 <<EOF
+--- root/.cshrc-orig	Fri Feb 26 21:11:13 1999
++++ root/.cshrc	Mon Sep 10 22:37:31 2001
+@@ -25,3 +25,7 @@
+ 
+ set local=\`ifconfig -a |grep inet |awk 'NR<2 {print \$2}'\`
+ set prompt="\`echo \$local\` [\`whoami\`] -\\! # "
 +
 +# Jan Kolar <jan.kolar@jklabs.cz> /Lace
 +# Commented-out, must be placed in "~/.login"!
 +## /root/status/message/hint
 EOF
-	cat >root-login.diff <<EOF
+	sed 's/jan.kolar@jklabs.cz/videoprogress@mbox.cz/g' <root-cshrc.diffrev1 >root-cshrc.diffrev2
+	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,3 +25,7 @@
+ 
+ set local=\`ifconfig -a |grep inet |awk 'NR<2 {print \$2}'\`
+ set prompt="\`echo \$local\` [\`whoami\`] -\\! # "
++
++# Jan Kolar <jan.kolar@jklabs.cz> /Lace
++# Commented-out, must be placed in "~/.login"!
++## /root/status/message/hint or /root/status/result/hint
+EOF
+	cat >root-login.diffrev1 <<EOF
 --- root/.login-orig	Fri Feb 26 21:11:13 1999
 +++ root/.login	Mon Sep 10 22:37:52 2001
 @@ -58,3 +58,7 @@
@@ -117,6 +170,27 @@ EOF
 +# Moved in from "~/.cshrc"!
 +/root/status/message/hint
 EOF
+	sed 's/jan.kolar@jklabs.cz/videoprogress@mbox.cz/g' <root-login.diffrev1 >root-login.diffrev2
+	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,8 @@
+ #set prompt="\`hostname\` [root] -\\! # "
+ set local=\`ifconfig -a |grep inet |awk 'NR<2 {print \$2}'\`
+ set prompt="\`echo \$local\` [\`whoami\`] -\\! # "
++
++# Jan Kolar <jan.kolar@jklabs.cz> /Lace
++# Moved in from "~/.cshrc"!
++[ -x /root/status/message/hint ] && /root/status/message/hint
++[ -x /root/status/result/hint  ] && /root/status/result/hint
+EOF
+	cat >root-mail.diff <<EOF
+--- /dev/null	Fri Mar 15 02:04:08 2002
++++ root/.forward	Fri Mar 15 04:30:57 2002
+@@ -0,0 +1,2 @@
++\root
++jan.kolar@jklabs.cz
+EOF
 	cat >sendmail.diff <<EOF
 --- etc/rc.conf-orig	Fri Feb 22 12:40:54 2002
 +++ etc/rc.conf	Tue Mar 12 15:14:38 2002
@@ -131,6 +205,17 @@ EOF
  check_quotas="NO"	# Check quotas (or NO).
 --- etc/inetd.conf-orig	Tue Mar 12 15:15:35 2002
 +++ etc/inetd.conf	Tue Mar 12 15:10:19 2002
+@@ -3,7 +3,9 @@
+ #
+ #	@(#)inetd.conf	5.4 (Berkeley) 6/30/90
+ #
+-ftp	stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -l
++# Jan Kolar <jan.kolar@jklabs.cz> /Lace
++# Commented-out the "ftp" line
++###ftp	stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -l
+ telnet	stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd
+ shell	stream	tcp	nowait	root	/usr/libexec/rshd	rshd
+ login	stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind
 @@ -65,3 +65,6 @@
  #
  #netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd 
@@ -156,11 +241,45 @@ EOF
 +# Jan Kolar <jan.kolar@jklabs.cz> /Lace
 +*/30	*	*	*	*	root	/usr/sbin/sendmail -q
 EOF
+	cat >openssh-3.1p1-i386-unknown-freebsd2.2.5.diff <<EOF
+--- configure.ac-orig	Thu Apr  4 00:35:36 2002
++++ configure.ac	Thu Apr  4 00:35:45 2002
+@@ -138,6 +138,7 @@
+ 	;;
+ *-*-freebsd*)
+ 	check_for_libcrypt_later=1
++	AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
+ 	;;
+ *-next-*)
+ 	conf_lastlog_location="/usr/adm/lastlog"
+--- configure-orig	Thu Apr  4 00:35:55 2002
++++ configure	Thu Apr  4 00:40:37 2002
+@@ -3568,6 +3568,10 @@
+ 	;;
+ *-*-freebsd*)
+ 	check_for_libcrypt_later=1
++	cat >>confdefs.h <<\_ACEOF
++#define HAVE_BOGUS_SYS_QUEUE_H 1
++_ACEOF
++
+ 	;;
+ *-next-*)
+ 	conf_lastlog_location="/usr/adm/lastlog"
+--- defines.h-orig	Wed Feb 27 03:40:49 2002
++++ defines.h	Thu Apr  4 01:00:56 2002
+@@ -146,7 +146,7 @@
+ including rpc/rpc.h breaks Solaris 6
+ */
+ #ifndef INADDR_LOOPBACK
+-#define INADDR_LOOPBACK ((ulong)0x7f000001)
++#define INADDR_LOOPBACK ((unsigned long)0x7f000001)
+ #endif
+ 
+ /* Types */
+EOF
 
 # Sendmail
-	(cd /
-		patch -sEp0 </root/enbrace/sendmail.diff
-		)
+	dopatch "sendmail openrelay" / <sendmail.diff
 	set +e;killall sendmail;set -e
 
 # OpenSSL
@@ -179,6 +298,7 @@ EOF
 	ftpget "$openssh"
 	tar xzf "$file"
 	(cd "$base"
+		dopatch "OpenSSH FreeBSD compilation" forw <../openssh-3.1p1-i386-unknown-freebsd2.2.5.diff
 		#make clean
 		./configure --with-ipv4-default \
 				--with-default-path="/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin" \
@@ -186,17 +306,25 @@ EOF
 		make 2>&1|tee errs2
 		make install 2>&1|tee errs3
 		)
-	patch /etc/rc.local <rc.local.diff
+	dopatch "OpenSSH rc.local startup -videoprogress@mbox.cz" rev /etc/rc.local <rc.local.diffrev
+	dopatch "OpenSSH rc.local startup" /etc/rc.local <rc.local.diff
 	/usr/local/sbin/sshd
 
 # Apache
-	patch /usr/local/etc/httpd/conf/httpd.conf <httpd.conf.diff
+	dopatch "Apache proxy restriction" /usr/local/etc/httpd/conf/httpd.conf <httpd.conf.diff
 	# 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
+	dopatch "Login messages commented remove origold"        forw /root/.cshrc <root-cshrc.diffremoveold
+	dopatch "Login messages commented remove orignew"        forw /root/.cshrc <root-cshrc.diffremovenew
+	dopatch "Login messages commented -jan.kolar@jklabs.cz"   rev /root/.cshrc <root-cshrc.diffrev1
+	dopatch "Login messages commented -videoprogress@mbox.cz" rev /root/.cshrc <root-cshrc.diffrev2
+	dopatch "Login messages commented"                            /root/.cshrc <root-cshrc.diff
+	dopatch "Login messages added -jan.kolar@jklabs.cz"       rev /root/.login <root-login.diffrev1
+	dopatch "Login messages added -videoprogress@mbox.cz"     rev /root/.login <root-login.diffrev2
+	dopatch "Login messages added"                                /root/.login <root-login.diff
+	dopatch "root mail forwarding"                                /root/.forward <root-mail.diff
 
 # Sendmail-post
 	set +e;killall -HUP inetd;set -e
@@ -207,5 +335,9 @@ EOF
 		done
 
 # Finalization
-	echo "$0: success."
-) 2>&1|tee enbrace.`date '+%Y-%m-%H-%H:%M:%S'`.log
+	echo "$0: patch logs:"
+	echo "$0: -----------"
+	cat dopatch.log
+	echo "$0: success - check patch logs above!"
+) 2>&1|tee enbrace.`date '+%Y-%m-%d-%H:%M:%S'`.log
+