diff --git a/openssh-5.9p1-askpass-fix.diff b/openssh-5.9p1-askpass-fix.diff deleted file mode 100644 index 31f6d0c..0000000 --- a/openssh-5.9p1-askpass-fix.diff +++ /dev/null @@ -1,76 +0,0 @@ -Index: x11-ssh-askpass.c -=================================================================== ---- x11-ssh-askpass.c.orig -+++ x11-ssh-askpass.c -@@ -1301,7 +1301,7 @@ void handleKeyPress(AppInfo *app, XEvent - } - } - --Bool eventIsInsideButton(AppInfo *app, XEvent *event, ButtonInfo button) -+Bool eventIsInsideButton(AppInfo *app, ButtonInfo button, XEvent *event) - { - /* 'gcc -Wall' complains about 'app' being an unused parameter. - * Tough. We might want to use it later, and then we don't have -@@ -1343,11 +1343,11 @@ void handleButtonPress(AppInfo *app, XEv - return; - } - if (ButtonPress == event->type) { -- if (eventIsInsideButton(app, event, d->okButton)) { -+ if (eventIsInsideButton(app, d->okButton, event)) { - d->pressedButton = OK_BUTTON; - d->okButton.pressed = True; - paintButton(app, d->dialogWindow, d->okButton); -- } else if (eventIsInsideButton(app, event, d->cancelButton)) { -+ } else if (eventIsInsideButton(app, d->cancelButton, event)) { - d->pressedButton = CANCEL_BUTTON; - d->cancelButton.pressed = True; - paintButton(app, d->dialogWindow, d->cancelButton); -@@ -1356,7 +1356,7 @@ void handleButtonPress(AppInfo *app, XEv - } - } else if (ButtonRelease == event->type) { - if (OK_BUTTON == d->pressedButton) { -- if (eventIsInsideButton(app, event, d->okButton)) { -+ if (eventIsInsideButton(app, d->okButton, event)) { - acceptAction(app); - } else { - if (d->okButton.pressed) { -@@ -1365,7 +1365,7 @@ void handleButtonPress(AppInfo *app, XEv - } - } - } else if (CANCEL_BUTTON == d->pressedButton) { -- if (eventIsInsideButton(app, event, d->cancelButton)) { -+ if (eventIsInsideButton(app, d->cancelButton, event)) { - cancelAction(app); - } else { - if (d->cancelButton.pressed) { -@@ -1385,7 +1385,7 @@ void handlePointerMotion(AppInfo *app, X - if (NO_BUTTON == d->pressedButton) { - return; - } else if (OK_BUTTON == d->pressedButton) { -- if (eventIsInsideButton(app, event, d->okButton)) { -+ if (eventIsInsideButton(app, d->okButton, event)) { - if (!(d->okButton.pressed)) { - d->okButton.pressed = True; - paintButton(app, d->dialogWindow, d->okButton); -@@ -1397,7 +1397,7 @@ void handlePointerMotion(AppInfo *app, X - } - } - } else if (CANCEL_BUTTON == d->pressedButton) { -- if (eventIsInsideButton(app, event, d->cancelButton)) { -+ if (eventIsInsideButton(app, d->cancelButton, event)) { - if (!(d->cancelButton.pressed)) { - d->cancelButton.pressed = True; - paintButton(app, d->dialogWindow, d->cancelButton); -Index: x11-ssh-askpass.h -=================================================================== ---- x11-ssh-askpass.h.orig -+++ x11-ssh-askpass.h -@@ -258,7 +258,7 @@ void erasePassphrase(AppInfo *app); - void addToPassphrase(AppInfo *app, char c); - - void handleKeyPress(AppInfo *app, XEvent *event); --Bool eventIsInsideButton(AppInfo *app, XEvent *event, ButtonInfo button); -+Bool eventIsInsideButton(AppInfo *app, ButtonInfo button, XEvent *event); - void handleButtonPress(AppInfo *app, XEvent *event); - void handlePointerMotion(AppInfo *app, XEvent *event); - diff --git a/openssh.changes b/openssh.changes index 4af5b53..8569493 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 18 11:34:51 UTC 2012 - coolo@suse.com + +- do not buildrequire xorg-x11, the askpass is an extra package + and should build from a different package + ------------------------------------------------------------------- Tue May 29 07:14:36 UTC 2012 - meissner@suse.com diff --git a/openssh.spec b/openssh.spec index 5a45fa9..d1ff6fe 100644 --- a/openssh.spec +++ b/openssh.spec @@ -29,7 +29,6 @@ BuildRequires: libselinux-devel BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: tcpd-devel -BuildRequires: xorg-x11-devel Requires: /bin/netstat PreReq: pwdutils %{insserv_prereq} %{fillup_prereq} coreutils Conflicts: nonfreessh @@ -43,7 +42,6 @@ Url: http://www.openssh.com/ Source: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz Source1: sshd.init Source2: sshd.pamd -Source3: x11-ssh-askpass-%{xversion}.tar.bz2 Source4: README.SuSE Source5: converter.tar.bz2 Source6: README.kerberos @@ -54,7 +52,6 @@ Source10: sysconfig.ssh Source11: sshd-gen-keys-start Source12: sshd.service Patch: %{name}-5.9p1-sshd_config.diff -Patch1: %{name}-5.9p1-askpass-fix.diff Patch2: %{name}-5.9p1-pam-fix2.diff Patch3: %{name}-5.9p1-saveargv-fix.diff Patch4: %{name}-5.9p1-pam-fix3.diff @@ -82,12 +79,6 @@ BuildRequires: systemd %{!?_initddir:%global _initddir %{_initrddir}} -%package askpass -Summary: A passphrase dialog for OpenSSH and the X Window System -Group: Productivity/Networking/SSH -Requires: openssh = %{version} -Provides: openssh:%{_libexecdir}/ssh/ssh-askpass - %description SSH (Secure Shell) is a program for logging into and executing commands on a remote machine. It is intended to replace rsh (rlogin and rsh) and @@ -97,13 +88,8 @@ hosts over an insecure network. xorg-x11 (X Window System) connections and arbitrary TCP/IP ports can also be forwarded over the secure channel. -%description askpass -Ssh (Secure Shell) is a program for logging into a remote machine and -for executing commands on a remote machine. This package contains an X -Window System passphrase dialog for OpenSSH. - %prep -%setup -q -b 3 -a 5 +%setup -q -a 5 %patch %patch2 %patch3 @@ -125,8 +111,6 @@ Window System passphrase dialog for OpenSSH. %patch21 cp -v %{SOURCE4} . cp -v %{SOURCE6} . -cd ../x11-ssh-askpass-%{xversion} -%patch1 %build autoreconf -fiv @@ -160,13 +144,6 @@ export LDFLAGS="-pie" # --with-afs=/usr \ make %{?_smp_mflags} (cd converter; make %{?_smp_mflags}) -cd contrib -cd ../../x11-ssh-askpass-%{xversion} -%configure \ - --libexecdir=%{_libdir}/ssh -xmkmf -make includes USRLIBDIR=%{_libdir} -make %{?_smp_mflags} USRLIBDIR=%{_libdir} CCOPTIONS="%{optflags}" %install make DESTDIR=%{buildroot}/ install @@ -183,11 +160,8 @@ install -m 644 %{S:10} %{buildroot}/var/adm/fillup-templates # install shell script to automate the process of adding your public key to a remote machine install -m 755 contrib/ssh-copy-id %{buildroot}%{_bindir} install -m 644 contrib/ssh-copy-id.1 %{buildroot}%{_mandir}/man1 -( cd converter; make install DESTDIR=%{buildroot} ) -cd ../x11-ssh-askpass-%{xversion} -make BINDIR=%{_libexecdir}/ssh DESTDIR=%{buildroot} install install.man -rm -rf %{buildroot}%{_libexecdir}/ssh/ssh-askpass sed -e "s,@LIBEXEC@,%{_libexecdir},g" < %{S:8} > %{buildroot}%{_libexecdir}/ssh/ssh-askpass +( cd converter; make install DESTDIR=%{buildroot} ) rm -f %{buildroot}%{_datadir}/Ssh.bin sed -i -e s@/usr/libexec@%{_libexecdir}@g %{buildroot}%{_sysconfdir}/ssh/sshd_config #install firewall definitions format is described here: @@ -257,6 +231,7 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd %attr(0755,root,root) %{_libexecdir}/ssh/sftp-server %attr(0755,root,root) %{_libexecdir}/ssh/ssh-keysign %attr(0755,root,root) %{_libexecdir}/ssh/ssh-pkcs11-helper +%attr(0755,root,root) %{_libexecdir}/ssh/ssh-askpass %dir %{_sysconfdir}/slp.reg.d %config %{_sysconfdir}/slp.reg.d/ssh.reg /var/adm/fillup-templates/sysconfig.ssh @@ -266,13 +241,4 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd %{_unitdir}/sshd.service %endif -%files askpass -%defattr(-,root,root) -%attr(0755,root,root) %{_libexecdir}/ssh/ssh-askpass -%attr(0755,root,root) %{_libexecdir}/ssh/x11-ssh-askpass -%doc %{_mandir}/man1/ssh-askpass.1x.gz -%doc %{_mandir}/man1/x11-ssh-askpass.1x.gz -%dir %{_appdefdir} -%{_appdefdir}/SshAskpass - %changelog diff --git a/x11-ssh-askpass-1.2.4.1.tar.bz2 b/x11-ssh-askpass-1.2.4.1.tar.bz2 deleted file mode 100644 index f4b12b3..0000000 --- a/x11-ssh-askpass-1.2.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59352a27a324ae70cabb82e769aa6fbfc997ef8566fe8f12226388dcfe0f685f -size 27590