Update of /cvsroot/leaf/src/bering-uclibc/apps/openssh
In directory sc8-pr-cvs1:/tmp/cvs-serv13683
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
makekey ssh_config sshd sshd_config
Removed Files:
sftp.skel.tgz ssh.skel.tgz sshd.skel.tgz sshkey.skel.tgz
Log Message:
Updated /etc/init.d/sshd so RCDLINKS comform to standard debian setup
moved ssh_config from sshd.lrp to ssh.lrp
removed the need for skeleton files
--- NEW FILE: makekey ---
#!/bin/sh
# Creates openssh keys J. Nilo May 2001
ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N ""
ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ""
ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ""
--- NEW FILE: ssh_config ---
# $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $
# This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for
# users, and the values can be changed in per-user configuration files
# or on the command line.
# Configuration data is parsed as follows:
# 1. command line options
# 2. user-specific file
# 3. system-wide file
# Any configuration value is only changed the first time it is set.
# Thus, host-specific definitions should be at the beginning of the
# configuration file, and defaults at the end.
# Site-wide defaults for various options
# Host *
# ForwardAgent no
# ForwardX11 no
# RhostsAuthentication no
# RhostsRSAAuthentication no
# RSAAuthentication yes
# PasswordAuthentication yes
# HostbasedAuthentication no
# BatchMode no
# CheckHostIP yes
# StrictHostKeyChecking ask
# IdentityFile ~/.ssh/identity
# IdentityFile ~/.ssh/id_rsa
# IdentityFile ~/.ssh/id_dsa
# Port 22
# Protocol 2,1
# Cipher 3des
# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
# EscapeChar ~
--- NEW FILE: sshd ---
#! /bin/sh
# /etc/init.d/ssh: start and stop the OpenBSD "secure shell(tm)" daemon
RCDLINKS="2,S20 3,S20 4,S20 5,S20 0,K20 1,K20 6,K20"
test -x /usr/sbin/sshd || exit 0
( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
# forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
if [ -e /etc/ssh/sshd_not_to_be_run ]; then
echo "OpenBSD Secure Shell server not in use (/etc/ssh/sshd_not_to_be_run)"
exit 0
fi
check_config() {
/usr/sbin/sshd -t || exit 1
}
# Configurable options:
case "$1" in
start)
test -f /etc/ssh/sshd_not_to_be_run && exit 0
#Create the PrivSep empty dir if necessary
if [ ! -d /var/run/sshd ]; then
mkdir /var/run/sshd; chmod 0755 /var/run/sshd
fi
echo -n "Starting OpenBSD Secure Shell server: sshd"
start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec
/usr/sbin/sshd
echo "."
;;
stop)
echo -n "Stopping OpenBSD Secure Shell server: sshd"
start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid
echo "."
;;
reload|force-reload)
test -f /etc/ssh/sshd_not_to_be_run && exit 0
check_config
echo -n "Reloading OpenBSD Secure Shell server's configuration"
start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile
/var/run/sshd.pid --exec /usr/sbin/sshd
echo "."
;;
restart)
test -f /etc/ssh/sshd_not_to_be_run && exit 0
check_config
echo -n "Restarting OpenBSD Secure Shell server: sshd"
start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid
sleep 2
start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec
/usr/sbin/sshd
echo "."
;;
*)
echo "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart}"
exit 1
esac
exit 0
--- NEW FILE: sshd_config ---
# $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.
# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
# The strategy used for options in the default sshd_config shipped with
# OpenSSH is to specify options with their default value where
# possible, but leave them commented. Uncommented options change a
# default value.
#Port 22
#Protocol 2,1
#ListenAddress 0.0.0.0
#ListenAddress ::
# HostKey for protocol version 1
#HostKey /etc/ssh/ssh_host_key
# HostKeys for protocol version 2
#HostKey /etc/ssh/ssh_host_rsa_key
#HostKey /etc/ssh/ssh_host_dsa_key
# Lifetime and size of ephemeral version 1 server key
#KeyRegenerationInterval 3600
#ServerKeyBits 768
# Logging
#obsoletes QuietMode and FascistLogging
#SyslogFacility AUTH
#LogLevel INFO
# Authentication:
#LoginGraceTime 120
#PermitRootLogin yes
#StrictModes yes
#RSAAuthentication yes
#PubkeyAuthentication yes
#AuthorizedKeysFile .ssh/authorized_keys
# rhosts authentication should not be used
#RhostsAuthentication no
# Don't read the user's ~/.rhosts and ~/.shosts files
#IgnoreRhosts yes
# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
#RhostsRSAAuthentication no
# similar for protocol version 2
#HostbasedAuthentication no
# Change to yes if you don't trust ~/.ssh/known_hosts for
# RhostsRSAAuthentication and HostbasedAuthentication
#IgnoreUserKnownHosts no
# To disable tunneled clear text passwords, change to no here!
#PasswordAuthentication yes
#PermitEmptyPasswords no
# Change to no to disable s/key passwords
#ChallengeResponseAuthentication yes
# Kerberos options
#KerberosAuthentication no
#KerberosOrLocalPasswd yes
#KerberosTicketCleanup yes
#AFSTokenPassing no
# Kerberos TGT Passing only works with the AFS kaserver
#KerberosTgtPassing no
# Set this to 'yes' to enable PAM keyboard-interactive authentication
# Warning: enabling this may bypass the setting of 'PasswordAuthentication'
#PAMAuthenticationViaKbdInt no
#X11Forwarding no
#X11DisplayOffset 10
#X11UseLocalhost yes
#PrintMotd yes
#PrintLastLog yes
#KeepAlive yes
#UseLogin no
#UsePrivilegeSeparation yes
#PermitUserEnvironment no
#Compression yes
#MaxStartups 10
# no default banner path
#Banner /some/path
#VerifyReverseMapping no
# override default of no subsystems
Subsystem sftp /usr/libexec/sftp-server
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openssh/buildtool.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.cfg 9 Aug 2003 11:10:41 -0000 1.4
--- buildtool.cfg 25 Aug 2003 13:23:59 -0000 1.5
***************
*** 16,35 ****
Directory = openssh
</File>
! <File ssh.skel.tgz>
Server = cvs-sourceforge
Revision = HEAD
Directory = openssh
</File>
! <File sshd.skel.tgz>
Server = cvs-sourceforge
Revision = HEAD
Directory = openssh
</File>
! <File sshkey.skel.tgz>
Server = cvs-sourceforge
Revision = HEAD
Directory = openssh
</File>
! <File sftp.skel.tgz>
Server = cvs-sourceforge
Revision = HEAD
--- 16,48 ----
Directory = openssh
</File>
! <File openssh_3.6.1p2.orig.tar.gz>
! Server = debian
! envname = OPENSSH_SOURCE
! </File>
!
! <File openssh_3.6.1p2-4.diff.gz>
! Server = debian
! envname = OPENSSH_PATCH2
! </File>
!
! <File sshd>
Server = cvs-sourceforge
Revision = HEAD
Directory = openssh
</File>
!
! <File sshd_config>
Server = cvs-sourceforge
Revision = HEAD
Directory = openssh
</File>
!
! <File ssh_config>
Server = cvs-sourceforge
Revision = HEAD
Directory = openssh
</File>
!
! <File makekey>
Server = cvs-sourceforge
Revision = HEAD
***************
*** 37,58 ****
</File>
-
- <File openssh_3.6.1p1.orig.tar.gz>
- Server = debian
- envname = OPENSSH_SOURCE
- </File>
-
- <File openssh_3.6.1p2-4.diff.gz>
- Server = debian
- envname = OPENSSH_PATCH2
- </File>
-
<Package>
<sshd>
! Version = 3.6.1p2
! Revision = 5
! Skeleton = sshd.skel.tgz
Help <<EOF
--- 50,60 ----
</File>
<Package>
<sshd>
! Version = 3.6.1p2-4
! Revision = 1
! #Skeleton = sshd.skel.tgz
Help <<EOF
***************
*** 90,100 ****
Description = sshd config file
Type = conf
</File>
<File>
! Filename = etc/init.d/sshd
Description = sshd daemon init file
Type = conf
Type = local
Permissions = 755
</File>
--- 92,105 ----
Description = sshd config file
Type = conf
+ Type = binary
</File>
<File>
! Filename = etc/init.d/sshd
! Source = etc/init.d/sshd
Description = sshd daemon init file
Type = conf
Type = local
+ Type = binary
Permissions = 755
</File>
***************
*** 130,137 ****
<ssh>
! Version = 3.6.1p2
! Revision = 5
! Skeleton = ssh.skel.tgz
Help <<EOF
--- 135,142 ----
<ssh>
! Version = 3.6.1p2-4
! Revision = 1
! #Skeleton = ssh.skel.tgz
Help <<EOF
***************
*** 155,160 ****
--- 160,167 ----
<File>
Filename = etc/ssh/ssh_config
+ Source = etc/ssh/ssh_config
Description = ssh config file
Type = conf
+ Type = binary
</File>
***************
*** 170,177 ****
<sftp>
! Version = 3.6.1p2
! Revision = 5
! Skeleton = sftp.skel.tgz
Help <<EOF
--- 177,184 ----
<sftp>
! Version = 3.6.1p2-4
! Revision = 1
! #Skeleton = sftp.skel.tgz
Help <<EOF
***************
*** 212,219 ****
<sshkey>
! Version = 3.6.1p2
! Revision = 5
! Skeleton = sshkey.skel.tgz
Help <<EOF
--- 219,226 ----
<sshkey>
! Version = 3.6.1p2-4
! Revision = 1
! #Skeleton = sshkey.skel.tgz
Help <<EOF
***************
*** 245,249 ****
--- 252,258 ----
<File>
Filename = usr/bin/makekey
+ Source = usr/bin/makekey
Type = list
+ Type = binary
Permissions = 755
</File>
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openssh/buildtool.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.mk 3 Aug 2003 11:43:08 -0000 1.4
--- buildtool.mk 25 Aug 2003 13:23:59 -0000 1.5
***************
*** 8,14 ****
include $(MASTERMAKEFILE)
! OPENSSH_DIR:=openssh-3.6.1p1
OPENSSH_TARGET_DIR:=$(BT_BUILD_DIR)/openssh
!
source:
--- 8,14 ----
include $(MASTERMAKEFILE)
! OPENSSH_DIR:=openssh-3.6.1p2
OPENSSH_TARGET_DIR:=$(BT_BUILD_DIR)/openssh
! STRIP_OPTIONS=-s --remove-section=.note --remove-section=.comment
source:
***************
*** 51,62 ****
#perl -i -p -e 's,#define HAVE_OPENPTY 1,/* #undef HAVE_OPENPTY */,'
$(OPENSSH_DIR)/config.h
make CC=$(TARGET_CC) -C $(OPENSSH_DIR)
! -$(BT_STRIP) --strip-unneeded $(OPENSSH_DIR)/scp
! -$(BT_STRIP) --strip-unneeded $(OPENSSH_DIR)/stfp
! -$(BT_STRIP) --strip-unneeded $(OPENSSH_DIR)/sftp-server
! -$(BT_STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh
! -$(BT_STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh-agent
! -$(BT_STRIP) --strip-unneeded $(OPENSSH_DIR)/sshd
! -$(BT_STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh-keygen
! -$(BT_STRIP) --strip-unneeded $(OPENSSH_DIR)/ssh-keyscan
-make CC=$(TARGET_CC) DESTDIR=$(OPENSSH_TARGET_DIR) -C $(OPENSSH_DIR) install
-mkdir $(BT_STAGING_DIR)/usr/bin
--- 51,62 ----
#perl -i -p -e 's,#define HAVE_OPENPTY 1,/* #undef HAVE_OPENPTY */,'
$(OPENSSH_DIR)/config.h
make CC=$(TARGET_CC) -C $(OPENSSH_DIR)
! -$(BT_STRIP) $(STRIP_OPTIONS) $(OPENSSH_DIR)/scp
! -$(BT_STRIP) $(STRIP_OPTIONS) $(OPENSSH_DIR)/stfp
! -$(BT_STRIP) $(STRIP_OPTIONS) $(OPENSSH_DIR)/sftp-server
! -$(BT_STRIP) $(STRIP_OPTIONS) $(OPENSSH_DIR)/ssh
! -$(BT_STRIP) $(STRIP_OPTIONS) $(OPENSSH_DIR)/ssh-agent
! -$(BT_STRIP) $(STRIP_OPTIONS) $(OPENSSH_DIR)/sshd
! -$(BT_STRIP) $(STRIP_OPTIONS) $(OPENSSH_DIR)/ssh-keygen
! -$(BT_STRIP) $(STRIP_OPTIONS) $(OPENSSH_DIR)/ssh-keyscan
-make CC=$(TARGET_CC) DESTDIR=$(OPENSSH_TARGET_DIR) -C $(OPENSSH_DIR) install
-mkdir $(BT_STAGING_DIR)/usr/bin
***************
*** 64,71 ****
-mkdir $(BT_STAGING_DIR)/usr/libexec
-mkdir $(BT_STAGING_DIR)/etc
cp -f $(OPENSSH_TARGET_DIR)/usr/bin/* $(BT_STAGING_DIR)/usr/bin/
cp -f $(OPENSSH_TARGET_DIR)/usr/sbin/* $(BT_STAGING_DIR)/usr/sbin/
cp -f $(OPENSSH_TARGET_DIR)/usr/libexec/* $(BT_STAGING_DIR)/usr/libexec/
! cp -a -f $(OPENSSH_TARGET_DIR)/etc/* $(BT_STAGING_DIR)/etc/
clean:
--- 64,78 ----
-mkdir $(BT_STAGING_DIR)/usr/libexec
-mkdir $(BT_STAGING_DIR)/etc
+ -mkdir $(BT_STAGING_DIR)/etc/init.d
+ -mkdir $(OPENSSH_TARGET_DIR)/etc/init.d
+ cp sshd $(OPENSSH_TARGET_DIR)/etc/init.d/
+ cp sshd_config $(OPENSSH_TARGET_DIR)/etc/ssh/
+ cp ssh_config $(OPENSSH_TARGET_DIR)/etc/ssh/
+ cp makekey $(OPENSSH_TARGET_DIR)/usr/bin/
+ cp -a -f $(OPENSSH_TARGET_DIR)/etc/* $(BT_STAGING_DIR)/etc/
cp -f $(OPENSSH_TARGET_DIR)/usr/bin/* $(BT_STAGING_DIR)/usr/bin/
cp -f $(OPENSSH_TARGET_DIR)/usr/sbin/* $(BT_STAGING_DIR)/usr/sbin/
cp -f $(OPENSSH_TARGET_DIR)/usr/libexec/* $(BT_STAGING_DIR)/usr/libexec/
!
clean:
--- sftp.skel.tgz DELETED ---
--- ssh.skel.tgz DELETED ---
--- sshd.skel.tgz DELETED ---
--- sshkey.skel.tgz DELETED ---
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0
_______________________________________________
Leaf-cvs-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
