From 715fe113e813e6a4eb57b60e0ac0ab1c7248c1db Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Sun, 5 Jun 2005 23:51:21 +0000
Subject: [PATCH] updated openssh, openssl, zlib

---
 doc/CHANGELOG                           |  4 ++++
 packages/base/zlib/zlib                 | 14 +++++++-------
 packages/security/openssh/openssh       | 20 +++-----------------
 packages/security/openssh/openssh.setup |  6 ++++++
 packages/security/openssl/openssl       |  4 ++--
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 56345ee..26d9885 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,7 @@
+*) 2005-06-06
+
+- updated openssh, openssl, zlib
+
 *) 2005-06-05
 
 - added pcre and gpsdrive package
diff --git a/packages/base/zlib/zlib b/packages/base/zlib/zlib
index 1e1037c..0947431 100644
--- a/packages/base/zlib/zlib
+++ b/packages/base/zlib/zlib
@@ -2,21 +2,21 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 1.2.1
+# [V] 1.2.2
 # [S] 2-6
-# [D] zlib-1.2.1.tar.bz2 http://unc.dl.sourceforge.net/sourceforge/libpng/
+# [D] zlib-1.2.2.tar.bz2 http://www.gzip.org/zlib/
 
-confopt="--prefix=$root/usr --shared"
+confopt="--prefix=$root/usr --shared --libdir=$root/lib"
 export CFLAGS="$CFLAGS -fPIC"
+flist_pruned="$flist_pruned|etc/ld.so.cache"
 
 post_install()	{
-	unset AR
 	# build static libs
 	make clean &&
 	./configure --prefix=$root/usr
 	make && make install
 	chmod 644 $prefix/lib/libz.a
-	# move shared to corect location
-	mv $prefix/lib/libz.so.* $root/lib
-	ln -sf ../../lib/libz.so.1 $prefix/lib/libz.so
+	# corect location
+	rm $root/lib/libz.so
+	ln -svf ../../lib/libz.so.1 $prefix/lib/libz.so
 		}
diff --git a/packages/security/openssh/openssh b/packages/security/openssh/openssh
index bb751ad..5690e8e 100644
--- a/packages/security/openssh/openssh
+++ b/packages/security/openssh/openssh
@@ -3,28 +3,14 @@
 # author: hackbard
 
 # [S] 3-2
-# [V] 3.8p1
-# [D] openssh-3.8p1.tar.gz ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
+# [V] 4.1p1
+# [D] openssh-4.1p1.tar.gz ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
 
 flist_pruned="${flist_pruned}|etc/shadow|etc/passwd|etc/group"
-
-pre_install()	{
-	export LD=gcc
-	useradd -u 1025 -c 'sshd server' sshd || true
-		}
+flist_pruned="${flist_pruned}|etc/ssh/ssh_host"
 
 confopt="$confopt --with-md5-passwords --without-pam --with-tcp-wrappers \
 		--disable-suid-ssh --with-xauth=/usr/X11R6/bin/xauth \
 		--sysconfdir=$root/etc/ssh"
 
 install_conf="$install_conf install-nokeys"
-
-post_install()	{
-	# ssh host key
-	echo "creating ssh host keys ..."
-	[ ! -f $root/etc/ssh_host_dsa_key ] && \
-	$root/usr/bin/ssh-keygen -d -b 1024 -f $root//etc/ssh_host_dsa_key -N ""
-	[ ! -f $root/etc/ssh_host_key ] && \
-	$root/usr/bin/ssh-keygen -d -b 1024 -f $root/etc/ssh_host_key -N ""
-	echo "done. "
-		}
diff --git a/packages/security/openssh/openssh.setup b/packages/security/openssh/openssh.setup
index 603bbb1..aff725c 100644
--- a/packages/security/openssh/openssh.setup
+++ b/packages/security/openssh/openssh.setup
@@ -1,5 +1,11 @@
 setup_block()	{
 	useradd -u 1025 -c 'sshd server' sshd || true
+	echo "creating ssh host keys ..."
+	/usr/bin/ssh-keygen -t dsa -b 1024 \
+		-f /etc/ssh/ssh_host_dsa_key -N ""
+	/usr/bin/ssh-keygen -t rsa -b 1024 \
+		-f /etc/ssh/ssh_host_rsa_key -N ""
+	echo "done. "
 		}
 
 uninstall_block()	{
diff --git a/packages/security/openssl/openssl b/packages/security/openssl/openssl
index b55a8b2..bd8f4dd 100644
--- a/packages/security/openssl/openssl
+++ b/packages/security/openssl/openssl
@@ -3,8 +3,8 @@
 # author: hackbard
 
 # [S] 3-1
-# [V] 0.9.7d
-# [D] openssl-0.9.7d.tar.gz http://www.openssl.org/source/
+# [V] 0.9.7g
+# [D] openssl-0.9.7g.tar.gz http://www.openssl.org/source/
 
 build_main()	{
 	case "$hdw_arch_opt" in
-- 
2.39.2