diff options
author | Tim Rice <tim@multitalents.net> | 2001-11-03 11:09:32 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2001-11-03 11:09:32 -0800 |
commit | e589a299a1c1cf26035cddf3996107500242ba1d (patch) | |
tree | 9023b8d5300eab10dde2718cd03db0f7620ac536 /contrib/caldera | |
parent | 14a5c99b5c84ab86b34baf4b9e8f454118164815 (diff) |
[ contrib/caldera/openssh.spec contrib/caldera/sshd.init]
Updates from Raymund Will <ray@caldera.de>
[acconfig.h configure.in] Clean up login checks.
Problem reported by Jim Knoble <jmknoble@pobox.com>
Diffstat (limited to 'contrib/caldera')
-rw-r--r-- | contrib/caldera/openssh.spec | 236 | ||||
-rwxr-xr-x | contrib/caldera/sshd.init | 4 |
2 files changed, 77 insertions, 163 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index d8bea532b..c92699535 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -1,30 +1,39 @@ | |||
1 | %define askpass 1.2.4.1 | 1 | %define use-stable 1 |
2 | %if %{use-stable} | ||
3 | %define version 3.0p1 | ||
4 | %define cvs %{nil} | ||
5 | %define release 1 | ||
6 | %else | ||
7 | %define version 3.0p1 | ||
8 | %define cvs cvs20011102 | ||
9 | %define release 0r1 | ||
10 | %endif | ||
11 | %define xsa x11-ssh-askpass | ||
12 | %define askpass %{xsa}-1.2.4.1 | ||
2 | 13 | ||
3 | Name : openssh | 14 | Name : openssh |
4 | Version : 3.0p1 | 15 | Version : %{version}%{cvs} |
5 | Release : 1 | 16 | Release : %{release} |
6 | Group : System/Network | 17 | Group : System/Network |
7 | 18 | ||
8 | Summary : OpenSSH free Secure Shell (SSH) protocol implementation. | 19 | Summary : OpenSSH free Secure Shell (SSH) implementation. |
9 | Summary(de) : OpenSSH - freie Implementation der Secure Shell (SSH). | ||
10 | Summary(es) : OpenSSH implementación libre de Secure Shell (SSH). | ||
11 | Summary(fr) : Implémentation libre du shell sécurisé OpenSSH (SSH). | ||
12 | Summary(it) : Implementazione gratuita OpenSSH della Secure Shell. | ||
13 | Summary(pt) : Implementação livre OpenSSH do protocolo 'Secure Shell' (SSH). | ||
14 | Summary(pt_BR) : Implementação livre OpenSSH do protocolo Secure Shell (SSH). | ||
15 | 20 | ||
16 | Copyright : BSD | 21 | Copyright : BSD |
17 | Packager : Stephan Seyboth <sps@caldera.de> | 22 | Packager : Raymund Will <ray@caldera.de> |
18 | #Icon : . | ||
19 | URL : http://www.openssh.com/ | 23 | URL : http://www.openssh.com/ |
20 | 24 | ||
21 | Obsoletes : ssh, ssh-clients, openssh-clients | 25 | Obsoletes : ssh, ssh-clients, openssh-clients |
22 | 26 | ||
23 | BuildRoot : /tmp/%{Name}-%{Version} | 27 | BuildRoot : /tmp/%{Name}-%{Version} |
24 | 28 | ||
25 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{Version}.tar.gz | 29 | # %{use-stable}==1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable |
26 | Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{askpass}.tar.gz | 30 | # %{use-stable}==0: :pserver:cvs@bass.directhit.com:/cvs/openssh_cvs |
27 | Source2: http://www.openssh.com/faq.html | 31 | Source0: see-above:/.../openssh-%{Version}.tar.gz |
32 | %if %{use-stable} | ||
33 | Source1: see-above:/.../openssh-%{Version}.tar.gz.sig | ||
34 | %endif | ||
35 | Source2: http://www.ntrnet.net/~jmknoble/software/%{xsa}/%{askpass}.tar.gz | ||
36 | Source3: http://www.openssh.com/faq.html | ||
28 | 37 | ||
29 | 38 | ||
30 | %Package server | 39 | %Package server |
@@ -33,123 +42,23 @@ Requires : openssh = %{Version} | |||
33 | Obsoletes : ssh-server | 42 | Obsoletes : ssh-server |
34 | 43 | ||
35 | Summary : OpenSSH Secure Shell protocol server (sshd). | 44 | Summary : OpenSSH Secure Shell protocol server (sshd). |
36 | Summary(de) : OpenSSH Secure Shell Protocol-Server (sshd). | ||
37 | Summary(es) : Servidor del protocolo OpenSSH Secure Shell (sshd). | ||
38 | Summary(fr) : Serveur de protocole du shell sécurisé OpenSSH (sshd). | ||
39 | Summary(it) : Server OpenSSH per il protocollo Secure Shell (sshd). | ||
40 | Summary(pt) : Servidor do protocolo 'Secure Shell' OpenSSH (sshd). | ||
41 | Summary(pt_BR) : Servidor do protocolo Secure Shell OpenSSH (sshd). | ||
42 | 45 | ||
43 | 46 | ||
44 | %Package askpass | 47 | %Package askpass |
45 | Group : System/Network | 48 | Group : System/Network |
46 | Requires : openssh = %{Version} | 49 | Requires : openssh = %{Version} |
50 | URL : http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/ | ||
47 | Obsoletes : ssh-extras | 51 | Obsoletes : ssh-extras |
48 | 52 | ||
49 | Summary : OpenSSH X11 pass-phrase dialog. | 53 | Summary : OpenSSH X11 pass-phrase dialog. |
50 | Summary(de) : OpenSSH X11 Passwort-Dialog. | ||
51 | Summary(es) : Aplicación de petición de frase clave OpenSSH X11. | ||
52 | Summary(fr) : Dialogue pass-phrase X11 d'OpenSSH. | ||
53 | Summary(it) : Finestra di dialogo X11 per la frase segreta di OpenSSH. | ||
54 | Summary(pt) : Diálogo de pedido de senha para X11 do OpenSSH. | ||
55 | Summary(pt_BR) : Diálogo de pedido de senha para X11 do OpenSSH. | ||
56 | 54 | ||
57 | 55 | ||
58 | %Description | ||
59 | OpenSSH (Secure Shell) provides access to a remote system. It replaces | ||
60 | telnet, rlogin, rexec, and rsh, and provides secure encrypted | ||
61 | communications between two untrusted hosts over an insecure network. | ||
62 | X11 connections and arbitrary TCP/IP ports can also be forwarded over | ||
63 | the secure channel. | ||
64 | |||
65 | %Description -l de | ||
66 | OpenSSH (Secure Shell) stellt den Zugang zu anderen Rechnern her. Es ersetzt | ||
67 | telnet, rlogin, rexec und rsh und stellt eine sichere, verschlüsselte | ||
68 | Verbindung zwischen zwei nicht vertrauenswürdigen Hosts über eine unsicheres | ||
69 | Netzwerk her. X11 Verbindungen und beliebige andere TCP/IP Ports können ebenso | ||
70 | über den sicheren Channel weitergeleitet werden. | ||
71 | |||
72 | %Description -l es | ||
73 | OpenSSH (Secure Shell) proporciona acceso a sistemas remotos. Reemplaza a | ||
74 | telnet, rlogin, rexec, y rsh, y proporciona comunicaciones seguras encriptadas | ||
75 | entre dos equipos entre los que no se ha establecido confianza a través de una | ||
76 | red insegura. Las conexiones X11 y puertos TCP/IP arbitrarios también pueden | ||
77 | ser canalizadas sobre el canal seguro. | ||
78 | |||
79 | %Description -l fr | ||
80 | OpenSSH (Secure Shell) fournit un accès à un système distant. Il remplace | ||
81 | telnet, rlogin, rexec et rsh, tout en assurant des communications cryptées | ||
82 | securisées entre deux hôtes non fiabilisés sur un réseau non sécurisé. Des | ||
83 | connexions X11 et des ports TCP/IP arbitraires peuvent également être | ||
84 | transmis sur le canal sécurisé. | ||
85 | |||
86 | %Description -l it | ||
87 | OpenSSH (Secure Shell) fornisce l'accesso ad un sistema remoto. | ||
88 | Sostituisce telnet, rlogin, rexec, e rsh, e fornisce comunicazioni sicure | ||
89 | e crittate tra due host non fidati su una rete non sicura. Le connessioni | ||
90 | X11 ad una porta TCP/IP arbitraria possono essere inoltrate attraverso | ||
91 | un canale sicuro. | ||
92 | |||
93 | %Description -l pt | ||
94 | OpenSSH (Secure Shell) fornece acesso a um sistema remoto. Substitui o | ||
95 | telnet, rlogin, rexec, e o rsh e fornece comunicações seguras e cifradas | ||
96 | entre duas máquinas sem confiança mútua sobre uma rede insegura. | ||
97 | Ligações X11 e portos TCP/IP arbitrários também poder ser reenviados | ||
98 | pelo canal seguro. | ||
99 | |||
100 | %Description -l pt_BR | ||
101 | O OpenSSH (Secure Shell) fornece acesso a um sistema remoto. Substitui o | ||
102 | telnet, rlogin, rexec, e o rsh e fornece comunicações seguras e criptografadas | ||
103 | entre duas máquinas sem confiança mútua sobre uma rede insegura. | ||
104 | Ligações X11 e portas TCP/IP arbitrárias também podem ser reenviadas | ||
105 | pelo canal seguro. | ||
106 | |||
107 | %Description server | ||
108 | This package installs the sshd, the server portion of OpenSSH. | ||
109 | |||
110 | %Description -l de server | ||
111 | Dieses Paket installiert den sshd, den Server-Teil der OpenSSH. | ||
112 | |||
113 | %Description -l es server | ||
114 | Este paquete instala sshd, la parte servidor de OpenSSH. | ||
115 | |||
116 | %Description -l fr server | ||
117 | Ce paquetage installe le 'sshd', partie serveur de OpenSSH. | ||
118 | |||
119 | %Description -l it server | ||
120 | Questo pacchetto installa sshd, il server di OpenSSH. | ||
121 | |||
122 | %Description -l pt server | ||
123 | Este pacote intala o sshd, o servidor do OpenSSH. | ||
124 | |||
125 | %Description -l pt_BR server | ||
126 | Este pacote intala o sshd, o servidor do OpenSSH. | ||
127 | |||
128 | %Description askpass | ||
129 | This package contains an X11-based passphrase dialog. | ||
130 | |||
131 | %Description -l de askpass | ||
132 | Dieses Paket enthält einen X11-basierten Passwort Dialog. | ||
133 | |||
134 | %Description -l es askpass | ||
135 | Este paquete contiene una aplicación para petición de frases-contraseña basada | ||
136 | en X11. | ||
137 | |||
138 | %Description -l fr askpass | ||
139 | Ce paquetage contient un dialogue de passphrase basé sur X11. | ||
140 | |||
141 | %Description -l it askpass | ||
142 | Questo pacchetto contiene una finestra di X11 che chiede la frase segreta. | ||
143 | |||
144 | %Description -l pt askpass | ||
145 | Este pacote contém um diálogo de senha para o X11. | ||
146 | |||
147 | %Description -l pt_BR askpass | ||
148 | Este pacote contem um diálogo de frase-senha para o X11. | ||
149 | |||
150 | %Prep | 56 | %Prep |
151 | %setup | 57 | %setup %([ -z "%{cvs}" ] || echo "-n %{Name}_cvs") -a2 |
152 | %setup -D -T -a1 | 58 | |
59 | %if ! %{use-stable} | ||
60 | autoreconf | ||
61 | %endif | ||
153 | 62 | ||
154 | 63 | ||
155 | %Build | 64 | %Build |
@@ -158,14 +67,13 @@ CFLAGS="$RPM_OPT_FLAGS" \ | |||
158 | --prefix=/usr \ | 67 | --prefix=/usr \ |
159 | --sysconfdir=/etc/ssh \ | 68 | --sysconfdir=/etc/ssh \ |
160 | --libexecdir=/usr/lib/ssh \ | 69 | --libexecdir=/usr/lib/ssh \ |
161 | --datadir=/usr/share/openssh \ | ||
162 | --with-pam \ | 70 | --with-pam \ |
163 | --with-tcp-wrappers \ | 71 | --with-tcp-wrappers \ |
164 | --with-ipv4-default \ | 72 | --with-ipv4-default \ |
165 | 73 | ||
166 | make | 74 | make |
167 | 75 | ||
168 | cd x11-ssh-askpass-%{askpass} | 76 | cd %{askpass} |
169 | ./configure | 77 | ./configure |
170 | xmkmf | 78 | xmkmf |
171 | make includes | 79 | make includes |
@@ -177,61 +85,51 @@ make | |||
177 | 85 | ||
178 | make DESTDIR="$DESTDIR" install | 86 | make DESTDIR="$DESTDIR" install |
179 | 87 | ||
180 | make -C x11-ssh-askpass-%{askpass} DESTDIR="$DESTDIR" \ | 88 | make -C %{askpass} BINDIR="/usr/lib/ssh" install |
181 | BINDIR="/usr/lib/ssh" install | ||
182 | |||
183 | %{fixManPages} | ||
184 | |||
185 | # install remaining docs | ||
186 | NV="$DESTDIR%{_defaultdocdir}/%{Name}-%{Version}" | ||
187 | mkdir -p $NV | ||
188 | cp -a CREDITS ChangeLog LICENCE OVERVIEW README* TODO $NV | ||
189 | cp %{SOURCE2} $NV/faq.html | ||
190 | mkdir -p $NV/x11-ssh-askpass-%{askpass} | ||
191 | cp -a x11-ssh-askpass-%{askpass}/{README,ChangeLog,TODO,SshAskpass*.ad} \ | ||
192 | $NV/x11-ssh-askpass-%{askpass} | ||
193 | |||
194 | 89 | ||
195 | # OpenLinux specific configuration | 90 | # OpenLinux specific configuration |
196 | mkdir -p $DESTDIR/{etc/pam.d,%{SVIcdir},%{SVIdir}} | 91 | mkdir -p $DESTDIR/{etc/pam.d,%{SVIcdir},%{SVIdir}} |
197 | 92 | ||
198 | # enabling X11 forwarding on the server is convenient and okay, | 93 | # enabling X11 forwarding on the server is convenient and okay, |
199 | # on the client side it's a potential security risk! | 94 | # on the client side we consider it a potential security risk! |
200 | %{fixUP} -vg $DESTDIR/etc/ssh/sshd_config 'X11Forwarding no' \ | 95 | %{fixUP} -vT $DESTDIR/etc/ssh/sshd_config -e ' |
201 | 'X11Forwarding yes' | 96 | s/X11Forwarding no/X11Forwarding yes/i' |
202 | |||
203 | cat <<-EOF >> $DESTDIR/etc/ssh/ssh_config | ||
204 | |||
205 | # This retains the old behaviour of trying the SSH1 protocol | ||
206 | # before the more secure SSH2 one. Note that the SSH2 keys are | ||
207 | # stored in a different format so you will have to generate and | ||
208 | # distribute a new public/private key pair to migrate. See the | ||
209 | # ssh(1) man-page for details | ||
210 | Host * | ||
211 | Protocol 1,2 | ||
212 | EOF | ||
213 | 97 | ||
214 | install -m644 contrib/caldera/sshd.pam $DESTDIR/etc/pam.d/sshd | 98 | install -m644 contrib/caldera/sshd.pam $DESTDIR/etc/pam.d/sshd |
215 | # FIXME: disabled, find out why this doesn't work with nis | 99 | # FIXME: disabled, find out why this doesn't work with NIS |
216 | %{fixUP} -vg $DESTDIR/etc/pam.d/sshd '(.*pam_limits.*)' '#$1' | 100 | %{fixUP} -vT $DESTDIR/etc/pam.d/sshd -e 's/^(.*pam_limits.*)$/#$1/' |
217 | 101 | ||
218 | install -m 0755 contrib/caldera/sshd.init $DESTDIR%{SVIdir}/sshd | 102 | install -m 0755 contrib/caldera/sshd.init $DESTDIR%{SVIdir}/sshd |
219 | %{fixUP} -T $DESTDIR/%{SVIdir} -e 's:\@SVIdir\@:%{SVIdir}:' | 103 | %{fixUP} -vT $DESTDIR/%{SVIdir} -e 's:\@SVIdir\@:%{SVIdir}: + |
220 | %{fixUP} -T $DESTDIR/%{SVIdir} -e 's:\@sysconfdir\@:/etc/ssh:' | 104 | s:\@sysconfdir\@:/etc/ssh:' |
221 | 105 | ||
222 | cat <<-EoD > $DESTDIR%{SVIcdir}/sshd | 106 | cat <<-EoD > $DESTDIR%{SVIcdir}/sshd |
223 | IDENT=sshd | 107 | IDENT=sshd |
224 | DESCRIPTIVE="OpenSSH secure shell daemon" | 108 | DESCRIPTIVE="OpenSSH secure shell daemon" |
225 | # This service will be marked as 'skipped' on boot if there | 109 | # This service will be marked as 'skipped' on boot if there |
226 | # is no host key. Use ssh-host-keygen to generate one | 110 | # is no host key. Use ssh-host-keygen to generate one. |
227 | ONBOOT="yes" | 111 | ONBOOT="yes" |
228 | OPTIONS="" | 112 | OPTIONS="" |
229 | EoD | 113 | EoD |
230 | 114 | ||
231 | SKG=$DESTDIR/usr/sbin/ssh-host-keygen | 115 | SKG=$DESTDIR/usr/sbin/ssh-host-keygen |
232 | install -m 0755 contrib/caldera/ssh-host-keygen $SKG | 116 | install -m 0755 contrib/caldera/ssh-host-keygen $SKG |
233 | %{fixUP} -T $SKG -e 's:\@sysconfdir\@:/etc/ssh:' | 117 | %{fixUP} -T $SKG -e 's:\@sysconfdir\@:/etc/ssh: + |
234 | %{fixUP} -T $SKG -e 's:\@sshkeygen\@:/usr/bin/ssh-keygen:' | 118 | s:\@sshkeygen\@:/usr/bin/ssh-keygen:' |
119 | |||
120 | |||
121 | # install remaining docs | ||
122 | DocD="$DESTDIR%{_defaultdocdir}/%{Name}-%{Version}"; mkdir -p $DocD/00-LEGAL | ||
123 | cp -a LICENCE $DocD/00-LEGAL | ||
124 | cp -a CREDITS ChangeLog OVERVIEW README* TODO $DocD | ||
125 | install -p -m 0444 -o 0 -g 0 %{SOURCE3} $DocD/faq.html | ||
126 | mkdir -p $DocD/%{askpass} | ||
127 | cp -a %{askpass}/{README,ChangeLog,TODO,SshAskpass*.ad} $DocD/%{askpass} | ||
128 | |||
129 | cp -p %{askpass}/%{xsa}.man $DESTDIR/usr/man/man1/%{xsa}.1 | ||
130 | ln -s %{xsa}.1 $DESTDIR/usr/man/man1/ssh-askpass.1 | ||
131 | |||
132 | %{fixManPages} | ||
235 | 133 | ||
236 | 134 | ||
237 | # generate file lists | 135 | # generate file lists |
@@ -245,10 +143,12 @@ askpass askpass | |||
245 | EOF | 143 | EOF |
246 | %{mkLists} -a -f %{Name} << 'EOF' | 144 | %{mkLists} -a -f %{Name} << 'EOF' |
247 | ^/etc * prefix(%%config) | 145 | ^/etc * prefix(%%config) |
248 | /usr/X11R6/lib/X11/app-defaults IGNORED | 146 | /usr/X11R6/lib/X11/app-defaults IGNORED |
147 | Ssh.bin IGNORED # for now | ||
249 | [Aa]skpass askpass | 148 | [Aa]skpass askpass |
250 | %{_defaultdocdir}/%{Name}-%{Version}/ base | 149 | %{_defaultdocdir}/%{Name}-%{Version}/ base |
251 | ssh-keygen base | 150 | ssh-keygen base |
151 | moduli server | ||
252 | sshd server | 152 | sshd server |
253 | sftp-server server | 153 | sftp-server server |
254 | .* base | 154 | .* base |
@@ -306,8 +206,22 @@ fi | |||
306 | %defattr(-,root,root) | 206 | %defattr(-,root,root) |
307 | 207 | ||
308 | 208 | ||
209 | %Description | ||
210 | OpenSSH (Secure Shell) provides access to a remote system. It replaces | ||
211 | telnet, rlogin, rexec, and rsh, and provides secure encrypted | ||
212 | communications between two untrusted hosts over an insecure network. | ||
213 | X11 connections and arbitrary TCP/IP ports can also be forwarded over | ||
214 | the secure channel. | ||
215 | |||
216 | %Description server | ||
217 | This package installs the sshd, the server portion of OpenSSH. | ||
218 | |||
219 | %Description askpass | ||
220 | This package contains an X11-based pass-phrase dialog used per | ||
221 | default by ssh-add(1). It is based on %{askpass} | ||
222 | by Jim Knoble <jmknoble@pobox.com>. | ||
223 | |||
309 | %ChangeLog | 224 | %ChangeLog |
310 | * Mon Jan 01 1998 ... | 225 | * Mon Jan 01 1998 ... |
311 | Template Version: 1.31 | ||
312 | 226 | ||
313 | $Id: openssh.spec,v 1.23 2001/10/24 21:06:08 mouring Exp $ | 227 | $Id: openssh.spec,v 1.24 2001/11/03 19:09:33 tim Exp $ |
diff --git a/contrib/caldera/sshd.init b/contrib/caldera/sshd.init index e60f8afeb..90b36379a 100755 --- a/contrib/caldera/sshd.init +++ b/contrib/caldera/sshd.init | |||
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/bash | 1 | #! /bin/bash |
2 | # | 2 | # |
3 | # $Id: sshd.init,v 1.2 2001/04/27 05:50:50 tim Exp $ | 3 | # $Id: sshd.init,v 1.3 2001/11/03 19:09:33 tim Exp $ |
4 | # | 4 | # |
5 | ### BEGIN INIT INFO | 5 | ### BEGIN INIT INFO |
6 | # Provides: | 6 | # Provides: |
@@ -37,7 +37,7 @@ _status() { | |||
37 | if [ ! -e $SVIlock ]; then | 37 | if [ ! -e $SVIlock ]; then |
38 | # no lock-file => not started == stopped? | 38 | # no lock-file => not started == stopped? |
39 | ret=3 | 39 | ret=3 |
40 | elif { [ -n "$pidf" ] && [ ! -f "$pidf" ] } || [ -z "$pid" ]; then | 40 | elif [ -n "$pidf" -a ! -f "$pidf" ] || [ -z "$pid" ]; then |
41 | # pid-file given but not present or no pid => died, but was not stopped | 41 | # pid-file given but not present or no pid => died, but was not stopped |
42 | ret=2 | 42 | ret=2 |
43 | elif [ -r /proc/$pid/cmdline ] && | 43 | elif [ -r /proc/$pid/cmdline ] && |