diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-15 17:19:24 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-15 17:19:24 +1100 |
commit | 3668206da4cb71a75863e6eaecc718849062bcef (patch) | |
tree | bb2a0d5c0e14fd6e3f31f20a3d8dd03d394630d7 | |
parent | 3f905872b0d15be24078c4db131f0ecdb5ebb5e6 (diff) |
- Split subpackages further based on patch from jim knoble <jmknoble@pobox.com>
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | openssh.spec | 52 |
3 files changed, 42 insertions, 12 deletions
@@ -26,6 +26,7 @@ | |||
26 | - Merged more Solaris compability from Marc G. Fournier | 26 | - Merged more Solaris compability from Marc G. Fournier |
27 | <marc.fournier@acadiau.ca> | 27 | <marc.fournier@acadiau.ca> |
28 | - Wrote autoconf tests for __progname symbol | 28 | - Wrote autoconf tests for __progname symbol |
29 | - RPM spec file fixes from Jim Knoble <jmknoble@pobox.com> | ||
29 | 30 | ||
30 | 19991114 | 31 | 19991114 |
31 | - Solaris compilation fixes (still imcomplete) | 32 | - Solaris compilation fixes (still imcomplete) |
@@ -53,6 +53,7 @@ Phil Hands <phil@hands.com> - Debian scripts, assorted patches | |||
53 | Niels Kristian Bech Jensen <nkbj@image.dk> - Makefile patches | 53 | Niels Kristian Bech Jensen <nkbj@image.dk> - Makefile patches |
54 | Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches | 54 | Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches |
55 | Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords | 55 | Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords |
56 | Jim Knoble <jmknoble@pobox.com> - RPM spec file fixes | ||
56 | 57 | ||
57 | Miscellania - | 58 | Miscellania - |
58 | 59 | ||
diff --git a/openssh.spec b/openssh.spec index 9cb388644..b9d7b568e 100644 --- a/openssh.spec +++ b/openssh.spec | |||
@@ -8,19 +8,24 @@ Copyright: BSD | |||
8 | Group: Applications/Internet | 8 | Group: Applications/Internet |
9 | BuildRoot: /tmp/openssh-%{version}-buildroot | 9 | BuildRoot: /tmp/openssh-%{version}-buildroot |
10 | Obsoletes: ssh | 10 | Obsoletes: ssh |
11 | |||
12 | %package clients | ||
13 | Summary: OpenSSH Secure Shell protocol clients | ||
14 | Requires: openssh | ||
15 | Group: System Environment/Daemons | ||
11 | Obsoletes: ssh-clients | 16 | Obsoletes: ssh-clients |
12 | Obsoletes: ssh-extras | ||
13 | 17 | ||
14 | %package server | 18 | %package server |
15 | Summary: Secure Shell protocol server (sshd) | 19 | Summary: OpenSSH Secure Shell protocol server (sshd) |
16 | Requires: openssh chkconfig >= 0.9 | 20 | Requires: openssh chkconfig >= 0.9 |
17 | Group: System Environment/Daemons | 21 | Group: System Environment/Daemons |
18 | Obsoletes: ssh-server | 22 | Obsoletes: ssh-server |
19 | 23 | ||
20 | %package askpass | 24 | %package askpass |
21 | Summary: GNOME passphrase dialog | 25 | Summary: OpenSSH GNOME passphrase dialog |
22 | Group: Applications/Internet | 26 | Group: Applications/Internet |
23 | Requires: openssh | 27 | Requires: openssh |
28 | Obsoletes: ssh-extras | ||
24 | Obsoletes: ssh-askpass | 29 | Obsoletes: ssh-askpass |
25 | 30 | ||
26 | %description | 31 | %description |
@@ -34,6 +39,21 @@ OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | |||
34 | up to date in terms of security and features, as well as removing all | 39 | up to date in terms of security and features, as well as removing all |
35 | patented algorithms to seperate libraries (OpenSSL). | 40 | patented algorithms to seperate libraries (OpenSSL). |
36 | 41 | ||
42 | This package includes the core files necessary for both the OpenSSH | ||
43 | client and server. To make this package useful, you should also | ||
44 | install openssh-clients, openssh-server, or both. | ||
45 | |||
46 | %description clients | ||
47 | Ssh (Secure Shell) a program for logging into a remote machine and for | ||
48 | executing commands in a remote machine. It is intended to replace | ||
49 | rlogin and rsh, and provide secure encrypted communications between | ||
50 | two untrusted hosts over an insecure network. X11 connections and | ||
51 | arbitrary TCP/IP ports can also be forwarded over the secure channel. | ||
52 | |||
53 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | ||
54 | up to date in terms of security and features, as well as removing all | ||
55 | patented algorithms to seperate libraries (OpenSSL). | ||
56 | |||
37 | This package includes the clients necessary to make encrypted connections | 57 | This package includes the clients necessary to make encrypted connections |
38 | to SSH servers. | 58 | to SSH servers. |
39 | 59 | ||
@@ -48,9 +68,9 @@ OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | |||
48 | up to date in terms of security and features, as well as removing all | 68 | up to date in terms of security and features, as well as removing all |
49 | patented algorithms to seperate libraries (OpenSSL). | 69 | patented algorithms to seperate libraries (OpenSSL). |
50 | 70 | ||
51 | This package contains the secure shell daemon and its documentation. | 71 | This package contains the secure shell daemon. The sshd is the server |
52 | The sshd is the server part of the secure shell protocol and allows | 72 | part of the secure shell protocol and allows ssh clients to connect to |
53 | ssh clients to connect to your host. | 73 | your host. |
54 | 74 | ||
55 | %description askpass | 75 | %description askpass |
56 | Ssh (Secure Shell) a program for logging into a remote machine and for | 76 | Ssh (Secure Shell) a program for logging into a remote machine and for |
@@ -66,6 +86,8 @@ patented algorithms to seperate libraries (OpenSSL). | |||
66 | This package contains the GNOME passphrase dialog. | 86 | This package contains the GNOME passphrase dialog. |
67 | 87 | ||
68 | %changelog | 88 | %changelog |
89 | * Mon Nov 15 1999 Damien Miller <djm@mindrot.org> | ||
90 | - Split subpackages further based on patch from jim knoble <jmknoble@pobox.com> | ||
69 | * Sat Nov 13 1999 Damien Miller <djm@mindrot.org> | 91 | * Sat Nov 13 1999 Damien Miller <djm@mindrot.org> |
70 | - Added 'Obsoletes' directives | 92 | - Added 'Obsoletes' directives |
71 | * Tue Nov 09 1999 Damien Miller <djm@ibs.com.au> | 93 | * Tue Nov 09 1999 Damien Miller <djm@ibs.com.au> |
@@ -131,19 +153,23 @@ fi | |||
131 | %defattr(-,root,root) | 153 | %defattr(-,root,root) |
132 | %doc COPYING.Ylonen ChangeLog ChangeLog.Ylonen OVERVIEW | 154 | %doc COPYING.Ylonen ChangeLog ChangeLog.Ylonen OVERVIEW |
133 | %doc README README.Ylonen | 155 | %doc README README.Ylonen |
156 | %attr(0755,root,root) /usr/bin/ssh-keygen | ||
157 | %attr(0755,root,root) /usr/bin/scp | ||
158 | %attr(0644,root,root) /usr/man/man1/ssh-keygen.1 | ||
159 | %attr(0644,root,root) /usr/man/man1/scp.1 | ||
160 | %attr(0755,root,root) %dir /etc/ssh | ||
161 | |||
162 | %files clients | ||
163 | %defattr(-,root,root) | ||
134 | %attr(4755,root,root) /usr/bin/ssh | 164 | %attr(4755,root,root) /usr/bin/ssh |
135 | %attr(0755,root,root) /usr/bin/ssh-agent | 165 | %attr(0755,root,root) /usr/bin/ssh-agent |
136 | %attr(0755,root,root) /usr/bin/ssh-keygen | ||
137 | %attr(0755,root,root) /usr/bin/ssh-add | 166 | %attr(0755,root,root) /usr/bin/ssh-add |
138 | %attr(0755,root,root) /usr/bin/scp | ||
139 | %attr(-,root,root) /usr/bin/slogin | ||
140 | %attr(0644,root,root) /usr/man/man1/ssh.1 | 167 | %attr(0644,root,root) /usr/man/man1/ssh.1 |
141 | %attr(0644,root,root) /usr/man/man1/ssh-agent.1 | 168 | %attr(0644,root,root) /usr/man/man1/ssh-agent.1 |
142 | %attr(0644,root,root) /usr/man/man1/ssh-keygen.1 | ||
143 | %attr(0644,root,root) /usr/man/man1/ssh-add.1 | 169 | %attr(0644,root,root) /usr/man/man1/ssh-add.1 |
144 | %attr(0644,root,root) /usr/man/man1/scp.1 | ||
145 | %attr(-,root,root) /usr/man/man1/slogin.1 | ||
146 | %attr(0644,root,root) %config /etc/ssh/ssh_config | 170 | %attr(0644,root,root) %config /etc/ssh/ssh_config |
171 | %attr(-,root,root) /usr/bin/slogin | ||
172 | %attr(-,root,root) /usr/man/man1/slogin.1 | ||
147 | 173 | ||
148 | %files server | 174 | %files server |
149 | %defattr(-,root,root) | 175 | %defattr(-,root,root) |
@@ -156,3 +182,5 @@ fi | |||
156 | %files askpass | 182 | %files askpass |
157 | %defattr(-,root,root) | 183 | %defattr(-,root,root) |
158 | %attr(0755,root,root) /usr/lib/ssh/ssh-askpass | 184 | %attr(0755,root,root) /usr/lib/ssh/ssh-askpass |
185 | %attr(0755,root,root) %dir /usr/lib/ssh | ||
186 | |||