Accepting request 98019 from home:aljex

Fix building for openSUSE targets back to 10.2

OBS-URL: https://build.opensuse.org/request/show/98019
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=19
This commit is contained in:
Stephan Kulow 2011-12-26 07:09:33 +00:00 committed by Git OBS Bridge
parent 5a09a92856
commit 4095c0743d
3 changed files with 23 additions and 4 deletions

View File

@ -18,7 +18,6 @@ Index: log.c
int saved_errno = errno; int saved_errno = errno;
log_handler_fn *tmp_handler; log_handler_fn *tmp_handler;
if (level > log_level)
@@ -387,6 +389,14 @@ do_log(LogLevel level, const char *fmt, @@ -387,6 +389,14 @@ do_log(LogLevel level, const char *fmt,
snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf); snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf);
write(STDERR_FILENO, msgbuf, strlen(msgbuf)); write(STDERR_FILENO, msgbuf, strlen(msgbuf));

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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 Wed Dec 21 10:38:59 UTC 2011 - coolo@suse.com

View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: openssh Name: openssh
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
%define _appdefdir %{_prefix}/share/X11/app-defaults %define _appdefdir %{_prefix}/share/X11/app-defaults
@ -22,7 +23,9 @@ BuildRequires: audit-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libedit-devel BuildRequires: libedit-devel
%if 0%{suse_version} > 1100
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
%endif
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: tcpd-devel BuildRequires: tcpd-devel
@ -76,8 +79,11 @@ BuildRequires: systemd
%define has_systemd 1 %define has_systemd 1
%endif %endif
%{!?_initddir:%global _initddir %{_initrddir}}
%package askpass %package askpass
Summary: A passphrase dialog for OpenSSH and the X Window System Summary: A passphrase dialog for OpenSSH and the X Window System
Group: Productivity/Networking/SSH
Requires: openssh = %{version} Requires: openssh = %{version}
Provides: openssh:%{_libexecdir}/ssh/ssh-askpass Provides: openssh:%{_libexecdir}/ssh/ssh-askpass
@ -138,7 +144,9 @@ export LDFLAGS="-pie"
--sysconfdir=%{_sysconfdir}/ssh \ --sysconfdir=%{_sysconfdir}/ssh \
--libexecdir=%{_libexecdir}/ssh \ --libexecdir=%{_libexecdir}/ssh \
--with-tcp-wrappers \ --with-tcp-wrappers \
%if 0%{suse_version} > 1100
--with-selinux \ --with-selinux \
%endif
--with-pam \ --with-pam \
--with-kerberos5=/usr \ --with-kerberos5=/usr \
--with-privsep-path=/var/lib/empty \ --with-privsep-path=/var/lib/empty \
@ -165,9 +173,9 @@ install -d -m 755 %{buildroot}/var/lib/sshd
install -m 644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/sshd install -m 644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/sshd
install -d -m 755 %{buildroot}%{_sysconfdir}/slp.reg.d/ install -d -m 755 %{buildroot}%{_sysconfdir}/slp.reg.d/
install -m 644 %{S:7} %{buildroot}%{_sysconfdir}/slp.reg.d/ install -m 644 %{S:7} %{buildroot}%{_sysconfdir}/slp.reg.d/
install -d -m 755 %{buildroot}/etc/init.d install -d -m 755 %{buildroot}%{_initddir}
install -m 755 %{S:1} %{buildroot}/etc/init.d/sshd install -m 755 %{S:1} %{buildroot}%{_initddir}/sshd
ln -vs ../../etc/init.d/sshd %{buildroot}/usr/sbin/rcsshd ln -vs ../..%{_initddir}/sshd %{buildroot}%{_sbindir}/rcsshd
install -d -m 755 %{buildroot}/var/adm/fillup-templates install -d -m 755 %{buildroot}/var/adm/fillup-templates
install -m 644 %{S:10} %{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 # install shell script to automate the process of adding your public key to a remote machine