summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-26 12:26:21 +1100
committerDamien Miller <djm@mindrot.org>1999-12-26 12:26:21 +1100
commit3688440c4d6b0493823d50f4d46659ecb2121b83 (patch)
tree754fbe832d7158f0c59c5d74e892a8d017a59845
parent32b3cf2c96fd8cee6cb082821a43d3375c850d58 (diff)
- Revised RPM package to include Jim Knoble's <jmknoble@pobox.com>
X11 ssh-askpass program. - Revised RPM package to use conditional building of gnome and X11 askpass packages.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in5
-rw-r--r--packages/redhat/openssh.spec98
3 files changed, 95 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index a89fcdc9c..78a909076 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
119991226 119991226
2 - Enabled utmpx support by default for Solaris 2 - Enabled utmpx support by default for Solaris
3 - Cleanup sshd.c PAM a little more 3 - Cleanup sshd.c PAM a little more
4 - Revised RPM package to include Jim Knoble's <jmknoble@pobox.com>
5 X11 ssh-askpass program.
6 - Revised RPM package to use conditional building of gnome and X11
7 askpass packages.
4 8
519991225 919991225
6 - More fixes from Andre Lucas <andre.lucas@dial.pipex.com> 10 - More fixes from Andre Lucas <andre.lucas@dial.pipex.com>
diff --git a/Makefile.in b/Makefile.in
index fa9a9d815..a13c55195 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,8 @@ mandir=@mandir@
7sysconfdir=@sysconfdir@ 7sysconfdir=@sysconfdir@
8 8
9SSH_PROGRAM=@bindir@/ssh 9SSH_PROGRAM=@bindir@/ssh
10ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass 10ASKPASS_LOCATION=@libexecdir@/ssh
11ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass
11 12
12CC=@CC@ 13CC=@CC@
13PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" 14PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
@@ -107,7 +108,7 @@ install: all
107 if [ ! -z "@GNOME_ASKPASS@" ] ; then \ 108 if [ ! -z "@GNOME_ASKPASS@" ] ; then \
108 $(INSTALL) -d $(libexecdir) ; \ 109 $(INSTALL) -d $(libexecdir) ; \
109 $(INSTALL) -d $(libexecdir)/ssh ; \ 110 $(INSTALL) -d $(libexecdir)/ssh ; \
110 $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_PROGRAM} ; \ 111 $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_LOCATION} ; \
111 fi 112 fi
112 113
113 if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \ 114 if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \
diff --git a/packages/redhat/openssh.spec b/packages/redhat/openssh.spec
index af904c7de..0a2f69ebe 100644
--- a/packages/redhat/openssh.spec
+++ b/packages/redhat/openssh.spec
@@ -1,19 +1,36 @@
1# Version of OpenSSH
2%define oversion 1.2.1pre21
3
4# Version of ssh-askpass
5%define aversion 0.99
6
7# Define if you want to build x11-ssh-askpass
8#%define BUILD_X11_ASKPASS
9
10# Define if you want to build gnome-askpass
11#%define BUILD_GNOME_ASKPASS
12
1Summary: OpenSSH free Secure Shell (SSH) implementation 13Summary: OpenSSH free Secure Shell (SSH) implementation
2Name: openssh 14Name: openssh
3Version: 1.2.1pre21 15Version: %{oversion}
4Release: 1 16Release: 1
5Packager: Damien Miller <djm@ibs.com.au> 17Packager: Damien Miller <djm@ibs.com.au>
6Source0: openssh-%{version}.tar.gz 18Source0: http://violet.ibs.com.au/openssh/files/openssh-%{oversion}.tar.gz
19%ifdef BUILD_X11_ASKPASS
20Source1: http://www.pobox.com/~jmknoble/jmk/x11-ssh-askpass-%{aversion}.tar.gz
21%endif
7Copyright: BSD 22Copyright: BSD
8Group: Applications/Internet 23Group: Applications/Internet
9BuildRoot: /tmp/openssh-%{version}-buildroot 24BuildRoot: /tmp/openssh-%{version}-buildroot
10Obsoletes: ssh 25Obsoletes: ssh
11Requires: openssl >= 0.9.4 26Requires: openssl
12PreReq: openssl >= 0.9.4 27PreReq: openssl
13BuildPreReq: openssl >= 0.9.4 28BuildPreReq: openssl-devel
14BuildPreReq: openssl-devel >= 0.9.4
15BuildPreReq: tcp_wrappers 29BuildPreReq: tcp_wrappers
16BuildPreReq: gnome-libs 30
31%ifdef BUILD_GNOME_ASKPASS
32BuildPreReq: gnome-libs-devel
33%endif
17 34
18%package clients 35%package clients
19Summary: OpenSSH Secure Shell protocol clients 36Summary: OpenSSH Secure Shell protocol clients
@@ -27,12 +44,21 @@ Requires: openssh chkconfig >= 0.9
27Group: System Environment/Daemons 44Group: System Environment/Daemons
28Obsoletes: ssh-server 45Obsoletes: ssh-server
29 46
47%ifdef BUILD_X11_ASKPASS
30%package askpass 48%package askpass
49Summary: OpenSSH X11 passphrase dialog
50Group: Applications/Internet
51Requires: openssh
52Obsoletes: ssh-extras
53%endif
54
55%ifdef BUILD_GNOME_ASKPASS
56%package askpass-gnome
31Summary: OpenSSH GNOME passphrase dialog 57Summary: OpenSSH GNOME passphrase dialog
32Group: Applications/Internet 58Group: Applications/Internet
33Requires: openssh 59Requires: openssh
34Obsoletes: ssh-extras 60Obsoletes: ssh-extras
35Obsoletes: ssh-askpass 61%endif
36 62
37%description 63%description
38Ssh (Secure Shell) a program for logging into a remote machine and for 64Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -78,6 +104,25 @@ This package contains the secure shell daemon. The sshd is the server
78part of the secure shell protocol and allows ssh clients to connect to 104part of the secure shell protocol and allows ssh clients to connect to
79your host. 105your host.
80 106
107%ifdef BUILD_X11_ASKPASS
108%package askpass-gnome
109%description askpass
110Ssh (Secure Shell) a program for logging into a remote machine and for
111executing commands in a remote machine. It is intended to replace
112rlogin and rsh, and provide secure encrypted communications between
113two untrusted hosts over an insecure network. X11 connections and
114arbitrary TCP/IP ports can also be forwarded over the secure channel.
115
116OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it
117up to date in terms of security and features, as well as removing all
118patented algorithms to seperate libraries (OpenSSL).
119
120This package contains Jim Knoble's <jmknoble@pobox.com> X11 passphrase
121dialog.
122%endif
123
124%ifdef BUILD_GNOME_ASKPASS
125%package askpass-gnome
81%description askpass 126%description askpass
82Ssh (Secure Shell) a program for logging into a remote machine and for 127Ssh (Secure Shell) a program for logging into a remote machine and for
83executing commands in a remote machine. It is intended to replace 128executing commands in a remote machine. It is intended to replace
@@ -90,8 +135,12 @@ up to date in terms of security and features, as well as removing all
90patented algorithms to seperate libraries (OpenSSL). 135patented algorithms to seperate libraries (OpenSSL).
91 136
92This package contains the GNOME passphrase dialog. 137This package contains the GNOME passphrase dialog.
138%endif
93 139
94%changelog 140%changelog
141* Sun Dec 26 1999 Damien Miller <djm@mindrot.org>
142- Added Jim Knoble's <jmknoble@pobox.com> askpass
143- Made subpackage building conditional
95* Mon Nov 15 1999 Damien Miller <djm@mindrot.org> 144* Mon Nov 15 1999 Damien Miller <djm@mindrot.org>
96- Split subpackages further based on patch from jim knoble <jmknoble@pobox.com> 145- Split subpackages further based on patch from jim knoble <jmknoble@pobox.com>
97* Sat Nov 13 1999 Damien Miller <djm@mindrot.org> 146* Sat Nov 13 1999 Damien Miller <djm@mindrot.org>
@@ -114,15 +163,31 @@ This package contains the GNOME passphrase dialog.
114 163
115%prep 164%prep
116 165
117%setup -q 166%ifdef BUILD_X11_ASKPASS
167%setup -a 1
168%else
169%setup
170%endif
118 171
119%build 172%build
120 173
174%ifdef BUILD_GNOME_ASKPASS
121CFLAGS="$RPM_OPT_FLAGS" \ 175CFLAGS="$RPM_OPT_FLAGS" \
122 ./configure --prefix=/usr --sysconfdir=/etc/ssh \ 176 ./configure --prefix=/usr --sysconfdir=/etc/ssh \
123 --with-gnome-askpass --with-tcp-wrappers 177 --with-gnome-askpass --with-tcp-wrappers
178%else
179CFLAGS="$RPM_OPT_FLAGS" \
180 ./configure --prefix=/usr --sysconfdir=/etc/ssh --with-tcp-wrappers
181%endif
182
183make
124 184
185%ifdef BUILD_X11_ASKPASS
186cd x11-ssh-askpass-%{aversion}
187xmkmf -a
125make 188make
189cd ..
190%endif
126 191
127%install 192%install
128rm -rf $RPM_BUILD_ROOT 193rm -rf $RPM_BUILD_ROOT
@@ -136,6 +201,11 @@ install -m755 packages/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
136install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config 201install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config
137install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config 202install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config
138 203
204%ifdef BUILD_X11_ASKPASS
205install -s x11-ssh-askpass-%{aversion}/ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass
206ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass
207%endif
208
139%clean 209%clean
140rm -rf $RPM_BUILD_ROOT 210rm -rf $RPM_BUILD_ROOT
141 211
@@ -176,6 +246,7 @@ fi
176%attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config 246%attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config
177%attr(-,root,root) /usr/bin/slogin 247%attr(-,root,root) /usr/bin/slogin
178%attr(-,root,root) /usr/man/man1/slogin.1 248%attr(-,root,root) /usr/man/man1/slogin.1
249%attr(0755,root,root) %dir /usr/libexec/ssh
179 250
180%files server 251%files server
181%defattr(-,root,root) 252%defattr(-,root,root)
@@ -185,8 +256,15 @@ fi
185%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd 256%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
186%attr(0755,root,root) %config /etc/rc.d/init.d/sshd 257%attr(0755,root,root) %config /etc/rc.d/init.d/sshd
187 258
259%ifdef BUILD_X11_ASKPASS
188%files askpass 260%files askpass
189%defattr(-,root,root) 261%defattr(-,root,root)
190%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass 262%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass
191%attr(0755,root,root) %dir /usr/libexec/ssh 263%attr(0755,root,root) /usr/libexec/ssh/x11-ssh-askpass
264%endif
192 265
266%ifdef BUILD_GNOME_ASKPASS
267%files askpass-gnome
268%defattr(-,root,root)
269%attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass
270%endif