summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/redhat/openssh.spec20
-rw-r--r--contrib/suse/openssh.spec16
2 files changed, 28 insertions, 8 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index ad4835403..4d3cf5282 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,5 +1,5 @@
1# Version of OpenSSH 1# Version of OpenSSH
2%define oversion 1.2.3pre2 2%define oversion 1.2.3pre3
3 3
4# Version of ssh-askpass 4# Version of ssh-askpass
5%define aversion 0.99 5%define aversion 0.99
@@ -118,6 +118,9 @@ patented algorithms to seperate libraries (OpenSSL).
118This package contains the GNOME passphrase dialog. 118This package contains the GNOME passphrase dialog.
119 119
120%changelog 120%changelog
121* Wed Mar 15 2000 Damien Miller <djm@ibs.com.au>
122- Updated for new location
123- Updated for new gnome-ssh-askpass build
121* Sun Dec 26 1999 Damien Miller <djm@mindrot.org> 124* Sun Dec 26 1999 Damien Miller <djm@mindrot.org>
122- Added Jim Knoble's <jmknoble@pobox.com> askpass 125- Added Jim Knoble's <jmknoble@pobox.com> askpass
123* Mon Nov 15 1999 Damien Miller <djm@mindrot.org> 126* Mon Nov 15 1999 Damien Miller <djm@mindrot.org>
@@ -148,8 +151,7 @@ This package contains the GNOME passphrase dialog.
148 151
149CFLAGS="$RPM_OPT_FLAGS" \ 152CFLAGS="$RPM_OPT_FLAGS" \
150 ./configure --prefix=/usr --sysconfdir=/etc/ssh \ 153 ./configure --prefix=/usr --sysconfdir=/etc/ssh \
151 --with-gnome-askpass --with-tcp-wrappers \ 154 --with-tcp-wrappers --with-ipv4-default
152 --with-ipv4-default
153 155
154make 156make
155 157
@@ -158,18 +160,26 @@ xmkmf -a
158make 160make
159cd .. 161cd ..
160 162
163cd contrib
164gcc -Og `gnome-config --cflags gnome gnomeui` \
165 gnome-ssh-askpass.c -o gnome-ssh-askpass \
166 `gnome-config --libs gnome gnomeui`
167cd ..
168
161%install 169%install
162rm -rf $RPM_BUILD_ROOT 170rm -rf $RPM_BUILD_ROOT
163make install DESTDIR=$RPM_BUILD_ROOT/ 171make install DESTDIR=$RPM_BUILD_ROOT/
164 172
165install -d $RPM_BUILD_ROOT/etc/pam.d/ 173install -d $RPM_BUILD_ROOT/etc/pam.d/
166install -d $RPM_BUILD_ROOT/etc/rc.d/init.d 174install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
167install -m644 packages/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd 175install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
168install -m755 packages/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd 176install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
169 177
170install -s x11-ssh-askpass-%{aversion}/ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass 178install -s x11-ssh-askpass-%{aversion}/ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass
171ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass 179ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass
172 180
181install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass
182
173%clean 183%clean
174rm -rf $RPM_BUILD_ROOT 184rm -rf $RPM_BUILD_ROOT
175 185
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index ab16c40ba..9588173e6 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -1,6 +1,6 @@
1Summary: OpenSSH, a free Secure Shell (SSH) implementation 1Summary: OpenSSH, a free Secure Shell (SSH) implementation
2Name: openssh 2Name: openssh
3Version: 1.2.3pre2 3Version: 1.2.3pre3
4Release: 1 4Release: 1
5Source0: openssh-%{version}.tar.gz 5Source0: openssh-%{version}.tar.gz
6Copyright: BSD 6Copyright: BSD
@@ -99,6 +99,9 @@ patented algorithms to seperate libraries (OpenSSL).
99This package contains the GNOME passphrase dialog. 99This package contains the GNOME passphrase dialog.
100 100
101%changelog 101%changelog
102* Wed Mar 15 2000 Damien Miller <djm@ibs.com.au>
103- Updated for new location
104- Updated for new gnome-ssh-askpass build
102* Sun Dec 26 1999 Chris Saia <csaia@wtower.com> 105* Sun Dec 26 1999 Chris Saia <csaia@wtower.com>
103- Made symlink to gnome-ssh-askpass called ssh-askpass 106- Made symlink to gnome-ssh-askpass called ssh-askpass
104* Wed Nov 24 1999 Chris Saia <csaia@wtower.com> 107* Wed Nov 24 1999 Chris Saia <csaia@wtower.com>
@@ -148,6 +151,12 @@ CFLAGS="$RPM_OPT_FLAGS" \
148 --with-tcp-wrappers --with-ipv4-default 151 --with-tcp-wrappers --with-ipv4-default
149make 152make
150 153
154cd contrib
155gcc -Og `gnome-config --cflags gnome gnomeui` \
156 gnome-ssh-askpass.c -o gnome-ssh-askpass \
157 `gnome-config --libs gnome gnomeui`
158cd ..
159
151%install 160%install
152rm -rf $RPM_BUILD_ROOT 161rm -rf $RPM_BUILD_ROOT
153make install DESTDIR=$RPM_BUILD_ROOT/ 162make install DESTDIR=$RPM_BUILD_ROOT/
@@ -156,10 +165,11 @@ install -d $RPM_BUILD_ROOT/etc/pam.d/
156install -d $RPM_BUILD_ROOT/sbin/init.d/ 165install -d $RPM_BUILD_ROOT/sbin/init.d/
157install -d $RPM_BUILD_ROOT/var/adm/fillup-templates 166install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
158install -m644 sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd 167install -m644 sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd
159install -m744 packages/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd 168install -m744 contrib/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd
160ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd 169ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd
170install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass
161ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass 171ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass
162install -m744 packages/suse/rc.config.sshd \ 172install -m744 contrib/suse/rc.config.sshd \
163 $RPM_BUILD_ROOT/var/adm/fillup-templates 173 $RPM_BUILD_ROOT/var/adm/fillup-templates
164 174
165%clean 175%clean