diff --git a/openssh-5.9p1-blocksigalrm.diff b/openssh-5.9p1-blocksigalrm.diff index a6293f9..08ef58c 100644 --- a/openssh-5.9p1-blocksigalrm.diff +++ b/openssh-5.9p1-blocksigalrm.diff @@ -18,7 +18,6 @@ Index: log.c int saved_errno = errno; log_handler_fn *tmp_handler; - if (level > log_level) @@ -387,6 +389,14 @@ do_log(LogLevel level, const char *fmt, snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf); write(STDERR_FILENO, msgbuf, strlen(msgbuf)); diff --git a/openssh-askpass-gnome.changes b/openssh-askpass-gnome.changes index 52793eb..3d90489 100644 --- a/openssh-askpass-gnome.changes +++ b/openssh-askpass-gnome.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 21 10:31:42 UTC 2011 - coolo@suse.com + +- remove call to suse_update_config (very old work around) + ------------------------------------------------------------------- Wed Oct 19 00:40:15 UTC 2011 - pcerny@suse.com diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index fc9e97d..e8738de 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -15,17 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: openssh-askpass-gnome -BuildRequires: gtk2-devel krb5-devel openssh openssl-devel pam-devel tcpd-devel update-desktop-files -License: BSD3c(or similar) -Group: Productivity/Networking/SSH +BuildRequires: gtk2-devel +BuildRequires: krb5-devel +BuildRequires: openssh +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: tcpd-devel +BuildRequires: update-desktop-files Version: 5.9p1 -Release: 1 +Release: 0 Requires: openssh = %{version} openssh-askpass = %{version} -AutoReqProv: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH +License: BSD-3-Clause +Group: Productivity/Networking/SSH Url: http://www.openssh.com/ %define _name openssh Source: %{_name}-%{version}.tar.bz2 @@ -56,7 +59,6 @@ GNOME-based passphrase dialog for OpenSSH. %patch7 %build -%{?suse_update_config:%{suse_update_config}} aclocal autoheader autoconf diff --git a/openssh.changes b/openssh.changes index 04e610c..0b1430f 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Dec 23 08:27:08 UTC 2011 - brian@aljex.com + +- Fix building for OS 11.0, 10.3, 10.2 +* Don't require selinux on OS 11.0 or lower + +------------------------------------------------------------------- +Fri Dec 23 06:34:28 UTC 2011 - brian@aljex.com + +- Fix building for OS 11.2 and 11.1 +- Cleanup remove remaining litteral /etc/init.d 's + +------------------------------------------------------------------- +Wed Dec 21 10:38:59 UTC 2011 - coolo@suse.com + +- add autoconf as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Tue Nov 29 19:48:29 UTC 2011 - crrodriguez@opensuse.org diff --git a/openssh.spec b/openssh.spec index 86b2197..c37b15b 100644 --- a/openssh.spec +++ b/openssh.spec @@ -16,22 +16,29 @@ # - Name: openssh %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define _appdefdir %{_prefix}/share/X11/app-defaults -BuildRequires: audit-devel krb5-devel openssl-devel pam-devel tcpd-devel xorg-x11-devel -BuildRequires: libselinux-devel +BuildRequires: audit-devel +BuildRequires: autoconf +BuildRequires: krb5-devel BuildRequires: libedit-devel -License: BSD3c(or similar) ; MIT License (or similar) -Group: Productivity/Networking/SSH +%if 0%{suse_version} > 1100 +BuildRequires: libselinux-devel +%endif +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 Version: 5.9p1 -Release: 1 +Release: 0 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) +License: BSD-3-Clause ; MIT +Group: Productivity/Networking/SSH Url: http://www.openssh.com/ Source: %{name}-%{version}.tar.bz2 Source1: sshd.init @@ -72,12 +79,13 @@ BuildRequires: systemd %define has_systemd 1 %endif +%{!?_initddir:%global _initddir %{_initrddir}} + %package askpass -License: BSD3c(or similar) ; MIT License (or similar) Summary: A passphrase dialog for OpenSSH and the X Window System +Group: Productivity/Networking/SSH Requires: openssh = %{version} Provides: openssh:%{_libexecdir}/ssh/ssh-askpass -Group: Productivity/Networking/SSH %description SSH (Secure Shell) is a program for logging into and executing commands @@ -136,7 +144,9 @@ export LDFLAGS="-pie" --sysconfdir=%{_sysconfdir}/ssh \ --libexecdir=%{_libexecdir}/ssh \ --with-tcp-wrappers \ +%if 0%{suse_version} > 1100 --with-selinux \ +%endif --with-pam \ --with-kerberos5=/usr \ --with-privsep-path=/var/lib/empty \ @@ -163,9 +173,9 @@ install -d -m 755 %{buildroot}/var/lib/sshd install -m 644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/sshd install -d -m 755 %{buildroot}%{_sysconfdir}/slp.reg.d/ install -m 644 %{S:7} %{buildroot}%{_sysconfdir}/slp.reg.d/ -install -d -m 755 %{buildroot}/etc/init.d -install -m 755 %{S:1} %{buildroot}/etc/init.d/sshd -ln -vs ../../etc/init.d/sshd %{buildroot}/usr/sbin/rcsshd +install -d -m 755 %{buildroot}%{_initddir} +install -m 755 %{S:1} %{buildroot}%{_initddir}/sshd +ln -vs ../..%{_initddir}/sshd %{buildroot}%{_sbindir}/rcsshd install -d -m 755 %{buildroot}/var/adm/fillup-templates 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