diff options
author | Damien Miller <djm@mindrot.org> | 2000-03-15 12:31:18 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-03-15 12:31:18 +1100 |
commit | ddaffa4194d7a25bdaae9c38aa2dadf5712ea3f5 (patch) | |
tree | 7b3abdecb928a7ce625f810d7c3471d9b3e5a507 /contrib | |
parent | 256fdcbec5ee70e69a89e47a360b6091a904f1a6 (diff) |
Updated spec file for new version and locations
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/redhat/openssh.spec | 20 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 16 |
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). | |||
118 | This package contains the GNOME passphrase dialog. | 118 | This 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 | ||
149 | CFLAGS="$RPM_OPT_FLAGS" \ | 152 | CFLAGS="$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 | ||
154 | make | 156 | make |
155 | 157 | ||
@@ -158,18 +160,26 @@ xmkmf -a | |||
158 | make | 160 | make |
159 | cd .. | 161 | cd .. |
160 | 162 | ||
163 | cd contrib | ||
164 | gcc -Og `gnome-config --cflags gnome gnomeui` \ | ||
165 | gnome-ssh-askpass.c -o gnome-ssh-askpass \ | ||
166 | `gnome-config --libs gnome gnomeui` | ||
167 | cd .. | ||
168 | |||
161 | %install | 169 | %install |
162 | rm -rf $RPM_BUILD_ROOT | 170 | rm -rf $RPM_BUILD_ROOT |
163 | make install DESTDIR=$RPM_BUILD_ROOT/ | 171 | make install DESTDIR=$RPM_BUILD_ROOT/ |
164 | 172 | ||
165 | install -d $RPM_BUILD_ROOT/etc/pam.d/ | 173 | install -d $RPM_BUILD_ROOT/etc/pam.d/ |
166 | install -d $RPM_BUILD_ROOT/etc/rc.d/init.d | 174 | install -d $RPM_BUILD_ROOT/etc/rc.d/init.d |
167 | install -m644 packages/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd | 175 | install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd |
168 | install -m755 packages/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd | 176 | install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd |
169 | 177 | ||
170 | install -s x11-ssh-askpass-%{aversion}/ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass | 178 | install -s x11-ssh-askpass-%{aversion}/ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass |
171 | ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass | 179 | ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass |
172 | 180 | ||
181 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass | ||
182 | |||
173 | %clean | 183 | %clean |
174 | rm -rf $RPM_BUILD_ROOT | 184 | rm -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 @@ | |||
1 | Summary: OpenSSH, a free Secure Shell (SSH) implementation | 1 | Summary: OpenSSH, a free Secure Shell (SSH) implementation |
2 | Name: openssh | 2 | Name: openssh |
3 | Version: 1.2.3pre2 | 3 | Version: 1.2.3pre3 |
4 | Release: 1 | 4 | Release: 1 |
5 | Source0: openssh-%{version}.tar.gz | 5 | Source0: openssh-%{version}.tar.gz |
6 | Copyright: BSD | 6 | Copyright: BSD |
@@ -99,6 +99,9 @@ patented algorithms to seperate libraries (OpenSSL). | |||
99 | This package contains the GNOME passphrase dialog. | 99 | This 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 |
149 | make | 152 | make |
150 | 153 | ||
154 | cd contrib | ||
155 | gcc -Og `gnome-config --cflags gnome gnomeui` \ | ||
156 | gnome-ssh-askpass.c -o gnome-ssh-askpass \ | ||
157 | `gnome-config --libs gnome gnomeui` | ||
158 | cd .. | ||
159 | |||
151 | %install | 160 | %install |
152 | rm -rf $RPM_BUILD_ROOT | 161 | rm -rf $RPM_BUILD_ROOT |
153 | make install DESTDIR=$RPM_BUILD_ROOT/ | 162 | make install DESTDIR=$RPM_BUILD_ROOT/ |
@@ -156,10 +165,11 @@ install -d $RPM_BUILD_ROOT/etc/pam.d/ | |||
156 | install -d $RPM_BUILD_ROOT/sbin/init.d/ | 165 | install -d $RPM_BUILD_ROOT/sbin/init.d/ |
157 | install -d $RPM_BUILD_ROOT/var/adm/fillup-templates | 166 | install -d $RPM_BUILD_ROOT/var/adm/fillup-templates |
158 | install -m644 sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd | 167 | install -m644 sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd |
159 | install -m744 packages/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd | 168 | install -m744 contrib/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd |
160 | ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd | 169 | ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd |
170 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass | ||
161 | ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass | 171 | ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass |
162 | install -m744 packages/suse/rc.config.sshd \ | 172 | install -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 |