Hello community, here is the log from the commit of package openssh for openSUSE:Factory checked in at 2012-06-25 14:19:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssh (Old) and /work/SRC/openSUSE:Factory/.openssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openssh", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/openssh/openssh.changes 2012-05-31 17:07:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openssh.new/openssh.changes 2012-06-25 14:29:39.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 18 11:34:51 UTC 2012 - [email protected] + +- do not buildrequire xorg-x11, the askpass is an extra package + and should build from a different package + +------------------------------------------------------------------- Old: ---- openssh-5.9p1-askpass-fix.diff x11-ssh-askpass-1.2.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.fCaB2T/_old 2012-06-25 14:29:41.000000000 +0200 +++ /var/tmp/diff_new_pack.fCaB2T/_new 2012-06-25 14:29:41.000000000 +0200 @@ -29,7 +29,6 @@ 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 @@ 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 @@ 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 @@ %{!?_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 @@ 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 @@ %patch21 cp -v %{SOURCE4} . cp -v %{SOURCE6} . -cd ../x11-ssh-askpass-%{xversion} -%patch1 %build autoreconf -fiv @@ -160,13 +144,6 @@ # --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 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 @@ %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 @@ %{_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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
