diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-16 13:35:19 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-16 13:35:19 +1100 |
commit | ff649d888076a94033ebce016c85c5419a2c290b (patch) | |
tree | b40d6fda73dc3f7bd983517450ff41edf089d42f /contrib/redhat/openssh.spec | |
parent | 2b2cf52471efcff7d5cef4bbf6d724f8c84b0f39 (diff) |
- (djm) Merge some of Nalin Dahyabhai <nalin@redhat.com> changes from the
Redhat 7.0 spec file
Diffstat (limited to 'contrib/redhat/openssh.spec')
-rw-r--r-- | contrib/redhat/openssh.spec | 156 |
1 files changed, 85 insertions, 71 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 95be389c8..5792aa811 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -24,16 +24,15 @@ BuildRoot: /tmp/openssh-%{version}-buildroot | |||
24 | Obsoletes: ssh | 24 | Obsoletes: ssh |
25 | PreReq: openssl >= 0.9.5a | 25 | PreReq: openssl >= 0.9.5a |
26 | Requires: openssl >= 0.9.5a | 26 | Requires: openssl >= 0.9.5a |
27 | BuildPreReq: perl | 27 | BuildPreReq: perl, openssl-devel, tcp_wrappers, gnome-libs-devel |
28 | BuildPreReq: openssl-devel | 28 | BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h |
29 | BuildPreReq: tcp_wrappers | ||
30 | %if ! %{no_gnome_askpass} | 29 | %if ! %{no_gnome_askpass} |
31 | BuildPreReq: gnome-libs-devel | 30 | BuildPreReq: gnome-libs-devel |
32 | %endif | 31 | %endif |
33 | 32 | ||
34 | %package clients | 33 | %package clients |
35 | Summary: OpenSSH Secure Shell protocol clients | 34 | Summary: OpenSSH Secure Shell protocol clients |
36 | Requires: openssh | 35 | Requires: openssh = %{version}-%{release} |
37 | Group: Applications/Internet | 36 | Group: Applications/Internet |
38 | Obsoletes: ssh-clients | 37 | Obsoletes: ssh-clients |
39 | 38 | ||
@@ -41,19 +40,19 @@ Obsoletes: ssh-clients | |||
41 | Summary: OpenSSH Secure Shell protocol server (sshd) | 40 | Summary: OpenSSH Secure Shell protocol server (sshd) |
42 | Group: System Environment/Daemons | 41 | Group: System Environment/Daemons |
43 | Obsoletes: ssh-server | 42 | Obsoletes: ssh-server |
44 | PreReq: openssh chkconfig >= 0.9 | 43 | PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9 |
45 | Requires: initscripts >= 4.16 | 44 | Requires: initscripts >= 4.16 |
46 | 45 | ||
47 | %package askpass | 46 | %package askpass |
48 | Summary: OpenSSH X11 passphrase dialog | 47 | Summary: OpenSSH X11 passphrase dialog |
49 | Group: Applications/Internet | 48 | Group: Applications/Internet |
50 | Requires: openssh | 49 | Requires: openssh = %{version}-%{release} |
51 | Obsoletes: ssh-extras | 50 | Obsoletes: ssh-extras |
52 | 51 | ||
53 | %package askpass-gnome | 52 | %package askpass-gnome |
54 | Summary: OpenSSH GNOME passphrase dialog | 53 | Summary: OpenSSH GNOME passphrase dialog |
55 | Group: Applications/Internet | 54 | Group: Applications/Internet |
56 | Requires: openssh | 55 | Requires: openssh = %{version}-%{release} |
57 | Obsoletes: ssh-extras | 56 | Obsoletes: ssh-extras |
58 | 57 | ||
59 | %description | 58 | %description |
@@ -65,7 +64,7 @@ arbitrary TCP/IP ports can also be forwarded over the secure channel. | |||
65 | 64 | ||
66 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | 65 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it |
67 | up to date in terms of security and features, as well as removing all | 66 | up to date in terms of security and features, as well as removing all |
68 | patented algorithms to seperate libraries (OpenSSL). | 67 | patented algorithms to separate libraries (OpenSSL). |
69 | 68 | ||
70 | This package includes the core files necessary for both the OpenSSH | 69 | This package includes the core files necessary for both the OpenSSH |
71 | client and server. To make this package useful, you should also | 70 | client and server. To make this package useful, you should also |
@@ -80,7 +79,7 @@ arbitrary TCP/IP ports can also be forwarded over the secure channel. | |||
80 | 79 | ||
81 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | 80 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it |
82 | up to date in terms of security and features, as well as removing all | 81 | up to date in terms of security and features, as well as removing all |
83 | patented algorithms to seperate libraries (OpenSSL). | 82 | patented algorithms to separate libraries (OpenSSL). |
84 | 83 | ||
85 | This package includes the clients necessary to make encrypted connections | 84 | This package includes the clients necessary to make encrypted connections |
86 | to SSH servers. | 85 | to SSH servers. |
@@ -94,7 +93,7 @@ arbitrary TCP/IP ports can also be forwarded over the secure channel. | |||
94 | 93 | ||
95 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | 94 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it |
96 | up to date in terms of security and features, as well as removing all | 95 | up to date in terms of security and features, as well as removing all |
97 | patented algorithms to seperate libraries (OpenSSL). | 96 | patented algorithms to separate libraries (OpenSSL). |
98 | 97 | ||
99 | This package contains the secure shell daemon. The sshd is the server | 98 | This package contains the secure shell daemon. The sshd is the server |
100 | part of the secure shell protocol and allows ssh clients to connect to | 99 | part of the secure shell protocol and allows ssh clients to connect to |
@@ -109,7 +108,7 @@ arbitrary TCP/IP ports can also be forwarded over the secure channel. | |||
109 | 108 | ||
110 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | 109 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it |
111 | up to date in terms of security and features, as well as removing all | 110 | up to date in terms of security and features, as well as removing all |
112 | patented algorithms to seperate libraries (OpenSSL). | 111 | patented algorithms to separate libraries (OpenSSL). |
113 | 112 | ||
114 | This package contains Jim Knoble's <jmknoble@pobox.com> X11 passphrase | 113 | This package contains Jim Knoble's <jmknoble@pobox.com> X11 passphrase |
115 | dialog. | 114 | dialog. |
@@ -123,78 +122,52 @@ arbitrary TCP/IP ports can also be forwarded over the secure channel. | |||
123 | 122 | ||
124 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it | 123 | OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it |
125 | up to date in terms of security and features, as well as removing all | 124 | up to date in terms of security and features, as well as removing all |
126 | patented algorithms to seperate libraries (OpenSSL). | 125 | patented algorithms to separate libraries (OpenSSL). |
127 | 126 | ||
128 | This package contains the GNOME passphrase dialog. | 127 | This package contains the GNOME passphrase dialog. |
129 | 128 | ||
130 | %changelog | ||
131 | * Tue Sep 05 2000 Damien Miller <djm@mindrot.org> | ||
132 | - Use RPM configure macro | ||
133 | * Tue Aug 08 2000 Damien Miller <djm@mindrot.org> | ||
134 | - Some surgery to sshd.init (generate keys at runtime) | ||
135 | - Cleanup of groups and removal of keygen calls | ||
136 | * Wed Jul 12 2000 Damien Miller <djm@mindrot.org> | ||
137 | - Make building of X11-askpass and gnome-askpass optional | ||
138 | * Mon Jun 12 2000 Damien Miller <djm@mindrot.org> | ||
139 | - Glob manpages to catch compressed files | ||
140 | * Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> | ||
141 | - Updated for new location | ||
142 | - Updated for new gnome-ssh-askpass build | ||
143 | * Sun Dec 26 1999 Damien Miller <djm@mindrot.org> | ||
144 | - Added Jim Knoble's <jmknoble@pobox.com> askpass | ||
145 | * Mon Nov 15 1999 Damien Miller <djm@mindrot.org> | ||
146 | - Split subpackages further based on patch from jim knoble <jmknoble@pobox.com> | ||
147 | * Sat Nov 13 1999 Damien Miller <djm@mindrot.org> | ||
148 | - Added 'Obsoletes' directives | ||
149 | * Tue Nov 09 1999 Damien Miller <djm@ibs.com.au> | ||
150 | - Use make install | ||
151 | - Subpackages | ||
152 | * Mon Nov 08 1999 Damien Miller <djm@ibs.com.au> | ||
153 | - Added links for slogin | ||
154 | - Fixed perms on manpages | ||
155 | * Sat Oct 30 1999 Damien Miller <djm@ibs.com.au> | ||
156 | - Renamed init script | ||
157 | * Fri Oct 29 1999 Damien Miller <djm@ibs.com.au> | ||
158 | - Back to old binary names | ||
159 | * Thu Oct 28 1999 Damien Miller <djm@ibs.com.au> | ||
160 | - Use autoconf | ||
161 | - New binary names | ||
162 | * Wed Oct 27 1999 Damien Miller <djm@ibs.com.au> | ||
163 | - Initial RPMification, based on Jan "Yenya" Kasprzak's <kas@fi.muni.cz> spec. | ||
164 | |||
165 | %prep | 129 | %prep |
166 | 130 | ||
167 | %setup -q -a 1 | 131 | %setup -q -a 1 |
168 | 132 | ||
169 | %build | 133 | %build |
170 | 134 | ||
171 | %configure --sysconfdir=/etc/ssh --libexecdir=/usr/libexec/openssh \ | 135 | %configure \ |
172 | --with-tcp-wrappers --with-rsh=/usr/bin/rsh | 136 | --sysconfdir=%{_sysconfdir}/ssh \ |
137 | --libexecdir=%{_libexecdir}/openssh \ | ||
138 | --with-tcp-wrappers \ | ||
139 | --with-ipv4-default \ | ||
140 | --with-rsh=/usr/bin/rsh \ | ||
141 | --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin | ||
173 | 142 | ||
174 | make | 143 | make |
175 | 144 | ||
176 | %if ! %{no_x11_askpass} | 145 | %if ! %{no_x11_askpass} |
177 | cd x11-ssh-askpass-%{aversion} | 146 | pushd x11-ssh-askpass-%{aversion} |
178 | xmkmf -a | 147 | xmkmf -a |
179 | make | 148 | make |
180 | cd .. | 149 | popd |
181 | %endif | 150 | %endif |
182 | 151 | ||
183 | %if ! %{no_gnome_askpass} | 152 | %if ! %{no_gnome_askpass} |
184 | cd contrib | 153 | pushd contrib |
185 | gcc -O -g `gnome-config --cflags gnome gnomeui` \ | 154 | gcc -O -g `gnome-config --cflags gnome gnomeui` \ |
186 | gnome-ssh-askpass.c -o gnome-ssh-askpass \ | 155 | gnome-ssh-askpass.c -o gnome-ssh-askpass \ |
187 | `gnome-config --libs gnome gnomeui` | 156 | `gnome-config --libs gnome gnomeui` |
188 | cd .. | 157 | popd |
189 | %endif | 158 | %endif |
190 | 159 | ||
191 | %install | 160 | %install |
192 | rm -rf $RPM_BUILD_ROOT | 161 | rm -rf $RPM_BUILD_ROOT |
193 | make install DESTDIR=$RPM_BUILD_ROOT/ | 162 | %{makeinstall} \ |
163 | sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/ssh \ | ||
164 | libexecdir=$RPM_BUILD_ROOT%{_libexecdir}/openssh \ | ||
165 | DESTDIR=/ # Hack to disable key generation | ||
166 | |||
194 | 167 | ||
195 | install -d $RPM_BUILD_ROOT/etc/pam.d/ | 168 | install -d $RPM_BUILD_ROOT/etc/pam.d/ |
196 | install -d $RPM_BUILD_ROOT/etc/rc.d/init.d | 169 | install -d $RPM_BUILD_ROOT/etc/rc.d/init.d |
197 | install -d $RPM_BUILD_ROOT/usr/libexec/openssh | 170 | install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh |
198 | install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd | 171 | install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd |
199 | install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd | 172 | install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd |
200 | 173 | ||
@@ -207,6 +180,8 @@ ln -s /usr/libexec/openssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/s | |||
207 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/gnome-ssh-askpass | 180 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/gnome-ssh-askpass |
208 | %endif | 181 | %endif |
209 | 182 | ||
183 | perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/* | ||
184 | |||
210 | %clean | 185 | %clean |
211 | rm -rf $RPM_BUILD_ROOT | 186 | rm -rf $RPM_BUILD_ROOT |
212 | 187 | ||
@@ -225,33 +200,33 @@ fi | |||
225 | %files | 200 | %files |
226 | %defattr(-,root,root) | 201 | %defattr(-,root,root) |
227 | %doc ChangeLog OVERVIEW COPYING.Ylonen README* INSTALL | 202 | %doc ChangeLog OVERVIEW COPYING.Ylonen README* INSTALL |
228 | %doc CREDITS UPGRADING LICENSE | 203 | %doc CREDITS UPGRADING LICENCE |
229 | %attr(0755,root,root) /usr/bin/ssh-keygen | 204 | %attr(0755,root,root) %{_bindir}/ssh-keygen |
230 | %attr(0755,root,root) /usr/bin/scp | 205 | %attr(0755,root,root) %{_bindir}/scp |
231 | %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* | 206 | %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* |
232 | %attr(0644,root,root) %{_mandir}/man1/scp.1* | 207 | %attr(0644,root,root) %{_mandir}/man1/scp.1* |
233 | %attr(0755,root,root) %dir /etc/ssh | 208 | %attr(0755,root,root) %dir %{_sysconfdir}/ssh |
234 | %attr(0755,root,root) %dir /usr/libexec/openssh | 209 | %attr(0755,root,root) %dir %{_libexecdir}/openssh |
235 | 210 | ||
236 | %files clients | 211 | %files clients |
237 | %defattr(-,root,root) | 212 | %defattr(-,root,root) |
238 | %attr(4755,root,root) /usr/bin/ssh | 213 | %attr(4755,root,root) %{_bindir}/ssh |
239 | %attr(0755,root,root) /usr/bin/ssh-agent | 214 | %attr(0755,root,root) %{_bindir}/ssh-agent |
240 | %attr(0755,root,root) /usr/bin/ssh-add | 215 | %attr(0755,root,root) %{_bindir}/ssh-add |
241 | %attr(0644,root,root) %{_mandir}/man1/ssh.1* | 216 | %attr(0644,root,root) %{_mandir}/man1/ssh.1* |
242 | %attr(0644,root,root) %{_mandir}/man1/ssh-agent.1* | 217 | %attr(0644,root,root) %{_mandir}/man1/ssh-agent.1* |
243 | %attr(0644,root,root) %{_mandir}/man1/ssh-add.1* | 218 | %attr(0644,root,root) %{_mandir}/man1/ssh-add.1* |
244 | %attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config | 219 | %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config |
245 | %attr(-,root,root) /usr/bin/slogin | 220 | %attr(-,root,root) %{_bindir}/slogin |
246 | %attr(-,root,root) %{_mandir}/man1/slogin.1* | 221 | %attr(-,root,root) %{_mandir}/man1/slogin.1* |
247 | 222 | ||
248 | %files server | 223 | %files server |
249 | %defattr(-,root,root) | 224 | %defattr(-,root,root) |
250 | %attr(0755,root,root) /usr/sbin/sshd | 225 | %attr(0755,root,root) %{_sbindir}/sshd |
251 | %attr(0755,root,root) /usr/libexec/openssh/sftp-server | 226 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server |
252 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* | 227 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* |
253 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* | 228 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* |
254 | %attr(0600,root,root) %config(noreplace) /etc/ssh/sshd_config | 229 | %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config |
255 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd | 230 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd |
256 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd | 231 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd |
257 | 232 | ||
@@ -261,12 +236,51 @@ fi | |||
261 | %doc x11-ssh-askpass-%{aversion}/README | 236 | %doc x11-ssh-askpass-%{aversion}/README |
262 | %doc x11-ssh-askpass-%{aversion}/ChangeLog | 237 | %doc x11-ssh-askpass-%{aversion}/ChangeLog |
263 | %doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad | 238 | %doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad |
264 | %attr(0755,root,root) /usr/libexec/openssh/ssh-askpass | 239 | %attr(0755,root,root) %{_libexecdir}/openssh/ssh-askpass |
265 | %attr(0755,root,root) /usr/libexec/openssh/x11-ssh-askpass | 240 | %attr(0755,root,root) %{_libexecdir}/openssh/x11-ssh-askpass |
266 | %endif | 241 | %endif |
267 | 242 | ||
268 | %if ! %{no_gnome_askpass} | 243 | %if ! %{no_gnome_askpass} |
269 | %files askpass-gnome | 244 | %files askpass-gnome |
270 | %defattr(-,root,root) | 245 | %defattr(-,root,root) |
271 | %attr(0755,root,root) /usr/libexec/openssh/gnome-ssh-askpass | 246 | %attr(0755,root,root) %{_libexecdir}/openssh/gnome-ssh-askpass |
272 | %endif | 247 | %endif |
248 | |||
249 | %changelog | ||
250 | * Mon Oct 18 2000 Damien Miller <djm@mindrot.org> | ||
251 | - Merge some of Nalin Dahyabhai <nalin@redhat.com> changes from the | ||
252 | Redhat 7.0 spec file | ||
253 | * Tue Sep 05 2000 Damien Miller <djm@mindrot.org> | ||
254 | - Use RPM configure macro | ||
255 | * Tue Aug 08 2000 Damien Miller <djm@mindrot.org> | ||
256 | - Some surgery to sshd.init (generate keys at runtime) | ||
257 | - Cleanup of groups and removal of keygen calls | ||
258 | * Wed Jul 12 2000 Damien Miller <djm@mindrot.org> | ||
259 | - Make building of X11-askpass and gnome-askpass optional | ||
260 | * Mon Jun 12 2000 Damien Miller <djm@mindrot.org> | ||
261 | - Glob manpages to catch compressed files | ||
262 | * Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> | ||
263 | - Updated for new location | ||
264 | - Updated for new gnome-ssh-askpass build | ||
265 | * Sun Dec 26 1999 Damien Miller <djm@mindrot.org> | ||
266 | - Added Jim Knoble's <jmknoble@pobox.com> askpass | ||
267 | * Mon Nov 15 1999 Damien Miller <djm@mindrot.org> | ||
268 | - Split subpackages further based on patch from jim knoble <jmknoble@pobox.com> | ||
269 | * Sat Nov 13 1999 Damien Miller <djm@mindrot.org> | ||
270 | - Added 'Obsoletes' directives | ||
271 | * Tue Nov 09 1999 Damien Miller <djm@ibs.com.au> | ||
272 | - Use make install | ||
273 | - Subpackages | ||
274 | * Mon Nov 08 1999 Damien Miller <djm@ibs.com.au> | ||
275 | - Added links for slogin | ||
276 | - Fixed perms on manpages | ||
277 | * Sat Oct 30 1999 Damien Miller <djm@ibs.com.au> | ||
278 | - Renamed init script | ||
279 | * Fri Oct 29 1999 Damien Miller <djm@ibs.com.au> | ||
280 | - Back to old binary names | ||
281 | * Thu Oct 28 1999 Damien Miller <djm@ibs.com.au> | ||
282 | - Use autoconf | ||
283 | - New binary names | ||
284 | * Wed Oct 27 1999 Damien Miller <djm@ibs.com.au> | ||
285 | - Initial RPMification, based on Jan "Yenya" Kasprzak's <kas@fi.muni.cz> spec. | ||
286 | |||