summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--contrib/redhat/openssh.spec22
2 files changed, 24 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f2f0e632..f79728ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
9 disable FallBackToRsh by default 9 disable FallBackToRsh by default
10 - (djm) Replace in_addr_t with u_int32_t in bsd-inet_aton.c. Report from 10 - (djm) Replace in_addr_t with u_int32_t in bsd-inet_aton.c. Report from
11 Ben Lindstrom <mouring@pconline.com> 11 Ben Lindstrom <mouring@pconline.com>
12 - (djm) Make building of X11-Askpass and GNOME-Askpass optional in RPM
13 spec file.
12 14
1320000711 1520000711
14 - (djm) Fixup for AIX getuserattr() support from Tom Bertelson 16 - (djm) Fixup for AIX getuserattr() support from Tom Bertelson
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index b52ced3c4..6587a38b3 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -4,6 +4,12 @@
4# Version of ssh-askpass 4# Version of ssh-askpass
5%define aversion 1.0 5%define aversion 1.0
6 6
7# Do we want to disable building of x11-askpass? (1=yes 0=no)
8%define no_x11_askpass 0
9
10# Do we want to disable building of gnome-askpass? (1=yes 0=no)
11%define no_gnome_askpass 0
12
7Summary: OpenSSH free Secure Shell (SSH) implementation 13Summary: OpenSSH free Secure Shell (SSH) implementation
8Name: openssh 14Name: openssh
9Version: %{oversion} 15Version: %{oversion}
@@ -21,7 +27,9 @@ Requires: openssl >= 0.9.5a
21BuildPreReq: perl 27BuildPreReq: perl
22BuildPreReq: openssl-devel 28BuildPreReq: openssl-devel
23BuildPreReq: tcp_wrappers 29BuildPreReq: tcp_wrappers
30%if %{no_x11_askpass}
24BuildPreReq: gnome-libs-devel 31BuildPreReq: gnome-libs-devel
32%endif
25 33
26%package clients 34%package clients
27Summary: OpenSSH Secure Shell protocol clients 35Summary: OpenSSH Secure Shell protocol clients
@@ -119,6 +127,8 @@ patented algorithms to seperate libraries (OpenSSL).
119This package contains the GNOME passphrase dialog. 127This package contains the GNOME passphrase dialog.
120 128
121%changelog 129%changelog
130* Wed Jul 12 2000 Damien Miller <djm@mindrot.org>
131- Make building of X11-askpass and gnome-askpass optional
122* Mon Jun 12 2000 Damien Miller <djm@mindrot.org> 132* Mon Jun 12 2000 Damien Miller <djm@mindrot.org>
123- Glob manpages to catch compressed files 133- Glob manpages to catch compressed files
124* Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> 134* Wed Mar 15 2000 Damien Miller <djm@ibs.com.au>
@@ -159,16 +169,20 @@ CFLAGS="$RPM_OPT_FLAGS" \
159 169
160make 170make
161 171
172%if ! %{no_x11_askpass}
162cd x11-ssh-askpass-%{aversion} 173cd x11-ssh-askpass-%{aversion}
163xmkmf -a 174xmkmf -a
164make 175make
165cd .. 176cd ..
177%endif
166 178
179%if ! %{no_gnome_askpass}
167cd contrib 180cd contrib
168gcc -O -g `gnome-config --cflags gnome gnomeui` \ 181gcc -O -g `gnome-config --cflags gnome gnomeui` \
169 gnome-ssh-askpass.c -o gnome-ssh-askpass \ 182 gnome-ssh-askpass.c -o gnome-ssh-askpass \
170 `gnome-config --libs gnome gnomeui` 183 `gnome-config --libs gnome gnomeui`
171cd .. 184cd ..
185%endif
172 186
173%install 187%install
174rm -rf $RPM_BUILD_ROOT 188rm -rf $RPM_BUILD_ROOT
@@ -180,10 +194,14 @@ install -d $RPM_BUILD_ROOT/usr/libexec/ssh
180install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd 194install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
181install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd 195install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
182 196
197%if ! %{no_x11_askpass}
183install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass 198install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass
184ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass 199ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass
200%endif
185 201
202%if ! %{no_gnome_askpass}
186install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass 203install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass
204%endif
187 205
188%clean 206%clean
189rm -rf $RPM_BUILD_ROOT 207rm -rf $RPM_BUILD_ROOT
@@ -239,6 +257,7 @@ fi
239%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd 257%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
240%attr(0755,root,root) %config /etc/rc.d/init.d/sshd 258%attr(0755,root,root) %config /etc/rc.d/init.d/sshd
241 259
260%if ! %{no_x11_askpass}
242%files askpass 261%files askpass
243%defattr(-,root,root) 262%defattr(-,root,root)
244%doc x11-ssh-askpass-%{aversion}/README 263%doc x11-ssh-askpass-%{aversion}/README
@@ -246,8 +265,11 @@ fi
246%doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad 265%doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad
247%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass 266%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass
248%attr(0755,root,root) /usr/libexec/ssh/x11-ssh-askpass 267%attr(0755,root,root) /usr/libexec/ssh/x11-ssh-askpass
268%endif
249 269
270%if ! %{no_gnome_askpass}
250%files askpass-gnome 271%files askpass-gnome
251%defattr(-,root,root) 272%defattr(-,root,root)
252%attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass 273%attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass
274%endif
253 275