From 3688440c4d6b0493823d50f4d46659ecb2121b83 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 26 Dec 1999 12:26:21 +1100 Subject: - Revised RPM package to include Jim Knoble's X11 ssh-askpass program. - Revised RPM package to use conditional building of gnome and X11 askpass packages. --- ChangeLog | 4 ++ Makefile.in | 5 ++- packages/redhat/openssh.spec | 98 +++++++++++++++++++++++++++++++++++++++----- 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 @@ 19991226 - Enabled utmpx support by default for Solaris - Cleanup sshd.c PAM a little more + - Revised RPM package to include Jim Knoble's + X11 ssh-askpass program. + - Revised RPM package to use conditional building of gnome and X11 + askpass packages. 19991225 - More fixes from Andre Lucas diff --git a/Makefile.in b/Makefile.in index fa9a9d815..a13c55195 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,7 +7,8 @@ mandir=@mandir@ sysconfdir=@sysconfdir@ SSH_PROGRAM=@bindir@/ssh -ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass +ASKPASS_LOCATION=@libexecdir@/ssh +ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass CC=@CC@ PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" @@ -107,7 +108,7 @@ install: all if [ ! -z "@GNOME_ASKPASS@" ] ; then \ $(INSTALL) -d $(libexecdir) ; \ $(INSTALL) -d $(libexecdir)/ssh ; \ - $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_PROGRAM} ; \ + $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_LOCATION} ; \ fi 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 @@ +# Version of OpenSSH +%define oversion 1.2.1pre21 + +# Version of ssh-askpass +%define aversion 0.99 + +# Define if you want to build x11-ssh-askpass +#%define BUILD_X11_ASKPASS + +# Define if you want to build gnome-askpass +#%define BUILD_GNOME_ASKPASS + Summary: OpenSSH free Secure Shell (SSH) implementation Name: openssh -Version: 1.2.1pre21 +Version: %{oversion} Release: 1 Packager: Damien Miller -Source0: openssh-%{version}.tar.gz +Source0: http://violet.ibs.com.au/openssh/files/openssh-%{oversion}.tar.gz +%ifdef BUILD_X11_ASKPASS +Source1: http://www.pobox.com/~jmknoble/jmk/x11-ssh-askpass-%{aversion}.tar.gz +%endif Copyright: BSD Group: Applications/Internet BuildRoot: /tmp/openssh-%{version}-buildroot Obsoletes: ssh -Requires: openssl >= 0.9.4 -PreReq: openssl >= 0.9.4 -BuildPreReq: openssl >= 0.9.4 -BuildPreReq: openssl-devel >= 0.9.4 +Requires: openssl +PreReq: openssl +BuildPreReq: openssl-devel BuildPreReq: tcp_wrappers -BuildPreReq: gnome-libs + +%ifdef BUILD_GNOME_ASKPASS +BuildPreReq: gnome-libs-devel +%endif %package clients Summary: OpenSSH Secure Shell protocol clients @@ -27,12 +44,21 @@ Requires: openssh chkconfig >= 0.9 Group: System Environment/Daemons Obsoletes: ssh-server +%ifdef BUILD_X11_ASKPASS %package askpass +Summary: OpenSSH X11 passphrase dialog +Group: Applications/Internet +Requires: openssh +Obsoletes: ssh-extras +%endif + +%ifdef BUILD_GNOME_ASKPASS +%package askpass-gnome Summary: OpenSSH GNOME passphrase dialog Group: Applications/Internet Requires: openssh Obsoletes: ssh-extras -Obsoletes: ssh-askpass +%endif %description Ssh (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 part of the secure shell protocol and allows ssh clients to connect to your host. +%ifdef BUILD_X11_ASKPASS +%package askpass-gnome +%description askpass +Ssh (Secure Shell) a program for logging into a remote machine and for +executing commands in a remote machine. It is intended to replace +rlogin and rsh, and provide secure encrypted communications between +two untrusted hosts over an insecure network. X11 connections and +arbitrary TCP/IP ports can also be forwarded over the secure channel. + +OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it +up to date in terms of security and features, as well as removing all +patented algorithms to seperate libraries (OpenSSL). + +This package contains Jim Knoble's X11 passphrase +dialog. +%endif + +%ifdef BUILD_GNOME_ASKPASS +%package askpass-gnome %description askpass Ssh (Secure Shell) a program for logging into a remote machine and for executing 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 patented algorithms to seperate libraries (OpenSSL). This package contains the GNOME passphrase dialog. +%endif %changelog +* Sun Dec 26 1999 Damien Miller +- Added Jim Knoble's askpass +- Made subpackage building conditional * Mon Nov 15 1999 Damien Miller - Split subpackages further based on patch from jim knoble * Sat Nov 13 1999 Damien Miller @@ -114,15 +163,31 @@ This package contains the GNOME passphrase dialog. %prep -%setup -q +%ifdef BUILD_X11_ASKPASS +%setup -a 1 +%else +%setup +%endif %build +%ifdef BUILD_GNOME_ASKPASS CFLAGS="$RPM_OPT_FLAGS" \ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ --with-gnome-askpass --with-tcp-wrappers +%else +CFLAGS="$RPM_OPT_FLAGS" \ + ./configure --prefix=/usr --sysconfdir=/etc/ssh --with-tcp-wrappers +%endif + +make +%ifdef BUILD_X11_ASKPASS +cd x11-ssh-askpass-%{aversion} +xmkmf -a make +cd .. +%endif %install rm -rf $RPM_BUILD_ROOT @@ -136,6 +201,11 @@ install -m755 packages/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config +%ifdef BUILD_X11_ASKPASS +install -s x11-ssh-askpass-%{aversion}/ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass +ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -176,6 +246,7 @@ fi %attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config %attr(-,root,root) /usr/bin/slogin %attr(-,root,root) /usr/man/man1/slogin.1 +%attr(0755,root,root) %dir /usr/libexec/ssh %files server %defattr(-,root,root) @@ -185,8 +256,15 @@ fi %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd %attr(0755,root,root) %config /etc/rc.d/init.d/sshd +%ifdef BUILD_X11_ASKPASS %files askpass %defattr(-,root,root) %attr(0755,root,root) /usr/libexec/ssh/ssh-askpass -%attr(0755,root,root) %dir /usr/libexec/ssh +%attr(0755,root,root) /usr/libexec/ssh/x11-ssh-askpass +%endif +%ifdef BUILD_GNOME_ASKPASS +%files askpass-gnome +%defattr(-,root,root) +%attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass +%endif -- cgit v1.2.3