X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openssh.spec;h=0321a22cb8946e21b851e14e0dfb38477ecec879;hb=cc5b05fadaed564abb5cd9180643d91e5f4b56d8;hp=d7b5036ac9779709bbe6e93b7fbb42ec42a4f2d6;hpb=a46537e77b7bf4bc5bb87d8e4123cab18fb33687;p=packages%2Fopenssh.git diff --git a/openssh.spec b/openssh.spec index d7b5036..0321a22 100644 --- a/openssh.spec +++ b/openssh.spec @@ -11,16 +11,23 @@ %bcond_without libedit # without libedit (editline/history support in sftp client) %bcond_without kerberos5 # without kerberos5 support %bcond_without selinux # build without SELinux support +%bcond_without libseccomp # use libseccomp for seccomp privsep (requires 3.5 kernel) %bcond_with hpn # High Performance SSH/SCP - HPN-SSH including Cipher NONE (broken too often) %bcond_without tests # gtk2-based gnome-askpass means no gnome1-based %{?with_gtk:%undefine with_gnome} +%define sandbox %{?with_libseccomp:lib}seccomp_filter + +%ifarch x32 +%{!?with_libseccomp:%error openssh seccomp implementation is broken! do not disable libseccomp on x32} +%endif + %if "%{pld_release}" == "ac" %define pam_ver 0.79.0 %else -%define pam_ver 1:1.1.5-5 +%define pam_ver 1:1.1.8-5 %endif Summary: OpenSSH free Secure Shell (SSH) implementation Summary(de.UTF-8): OpenSSH - freie Implementation der Secure Shell (SSH) @@ -33,13 +40,13 @@ Summary(pt_BR.UTF-8): Implementação livre do SSH Summary(ru.UTF-8): OpenSSH - свободная реализация протокола Secure Shell (SSH) Summary(uk.UTF-8): OpenSSH - вільна реалізація протоколу Secure Shell (SSH) Name: openssh -Version: 6.6p1 -Release: 2 +Version: 6.8p1 +Release: 6 Epoch: 2 License: BSD Group: Applications/Networking Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz -# Source0-md5: 3e9800e6bca1fbac0eea4d41baa7f239 +# Source0-md5: 08f72de6751acfbd0892b5f003922701 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 66943d481cc422512b537bcc2c7400d1 Source2: %{name}d.init @@ -48,7 +55,6 @@ Source4: %{name}.sysconfig Source5: ssh-agent.sh Source6: ssh-agent.conf Source7: %{name}-lpk.schema -Source8: %{name}d.upstart Source9: sshd.service Source10: sshd-keygen Source11: sshd.socket @@ -70,9 +76,9 @@ Patch11: %{name}-chroot.patch Patch14: %{name}-bind.patch Patch15: %{name}-disable_ldap.patch +Patch16: libseccomp-sandbox.patch URL: http://www.openssh.com/portable.html BuildRequires: %{__perl} -%{?with_tests:BuildRequires: %{name}-server} %{?with_audit:BuildRequires: audit-libs-devel} BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -80,16 +86,23 @@ BuildRequires: automake %{?with_gtk:BuildRequires: gtk+2-devel} %{?with_kerberos5:BuildRequires: heimdal-devel >= 0.7} %{?with_libedit:BuildRequires: libedit-devel} +BuildRequires: libseccomp-devel %{?with_selinux:BuildRequires: libselinux-devel} -BuildRequires: libwrap-devel %{?with_ldap:BuildRequires: openldap-devel} -BuildRequires: openssl-devel >= 0.9.7d +BuildRequires: openssl-devel >= 0.9.8f BuildRequires: pam-devel %{?with_gtk:BuildRequires: pkgconfig} BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.627 BuildRequires: sed >= 4.0 BuildRequires: zlib-devel >= 1.2.3 +%if %{with tests} && 0%(id -u sshd >/dev/null 2>&1; echo $?) +BuildRequires: %{name}-server +%endif +%if %{with tests} && %{with libseccomp} +# libseccomp based sandbox requires NO_NEW_PRIVS prctl flag +BuildRequires: uname(release) >= 3.5 +%endif Requires: zlib >= 1.2.3 %if "%{pld_release}" == "ac" Requires: filesystem >= 2.0-1 @@ -99,6 +112,7 @@ Requires: filesystem >= 3.0-11 Requires: pam >= %{pam_ver} Suggests: xorg-app-xauth %endif +%{?with_libseccomp:Requires: uname(release) >= 3.5} Obsoletes: ssh BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -432,20 +446,6 @@ among the servers in the network. Backend LDAP dla OpenSSH to metoda rozprowadzania autoryzowanych tokenów między serwerami w sieci. -%package server-upstart -Summary: Upstart job description for OpenSSH server -Summary(pl.UTF-8): Opis zadania Upstart dla serwera OpenSSH -Group: Daemons -Requires: %{name}-server = %{epoch}:%{version}-%{release} -Requires: upstart >= 0.6 -Conflicts: syslog-ng < 3.2.4-1 - -%description server-upstart -Upstart job description for OpenSSH. - -%description server-upstart -l pl.UTF-8 -Opis zadania Upstart dla OpenSSH. - %package gnome-askpass Summary: OpenSSH GNOME passphrase dialog Summary(de.UTF-8): OpenSSH GNOME Passwort-Dialog @@ -540,10 +540,11 @@ openldap-a. %patch14 -p1 %{!?with_ldap:%patch15 -p1} +%{?with_libseccomp:%patch16 -p1} %if "%{pld_release}" == "ac" # fix for missing x11.pc -%{__sed} -i -e '/pkg-config/s/ x11//' contrib/Makefile +%{__sed} -i -e 's/\(`$(PKG_CONFIG) --libs gtk+-2.0\) x11`/\1` -lX11/' contrib/Makefile %endif # hack since arc4random from openbsd-compat needs symbols from libssh and vice versa @@ -552,12 +553,15 @@ sed -i -e 's#-lssh -lopenbsd-compat#-lssh -lopenbsd-compat -lssh#g' Makefile* grep -rl /usr/libexec/openssh/ssh-ldap-helper . | xargs \ %{__sed} -i -e 's,/usr/libexec/openssh/ssh-ldap-helper,%{_libexecdir}/ssh-ldap-helper,' +# prevent being ovewritten by aclocal calls +mv aclocal.m4 acinclude.m4 + %build cp /usr/share/automake/config.sub . %{__aclocal} %{__autoconf} %{__autoheader} -CPPFLAGS="-DCHROOT" +CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99" %configure \ PERL=%{__perl} \ --disable-strip \ @@ -574,14 +578,12 @@ CPPFLAGS="-DCHROOT" --with-pam \ --with-pid-dir=%{_localstatedir}/run \ --with-privsep-path=%{_privsepdir} \ -%if "%{pld_release}" != "ac" - --with-sandbox=seccomp_filter \ -%endif + --with-privsep-user=sshd \ %{?with_selinux:--with-selinux} \ - --with-tcp-wrappers \ %if "%{pld_release}" == "ac" --with-xauth=/usr/X11R6/bin/xauth %else + --with-sandbox=%{sandbox} \ --with-xauth=%{_bindir}/xauth %endif @@ -589,7 +591,7 @@ echo '#define LOGIN_PROGRAM "/bin/login"' >>config.h %{__make} -%{?with_tests:%{__make} tests} +%{?with_tests:%{__make} -j1 tests} cd contrib %if %{with gnome} @@ -603,7 +605,7 @@ cd contrib %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{init,pam.d,rc.d/init.d,sysconfig,security,env.d}} \ +install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security,env.d}} \ $RPM_BUILD_ROOT{%{_libexecdir}/ssh,%{schemadir},%{systemdunitdir}} install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d} @@ -612,35 +614,20 @@ install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d} bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} -cp -p %{SOURCE3} sshd.pam -install -p %{SOURCE2} sshd.init - -%if "%{pld_release}" == "ac" -# not present in ac, no point searching it -%{__sed} -i -e '/pam_keyinit.so/d' sshd.pam -# openssl on ac does not have OPENSSL_HAS_ECC -%{__sed} -i -e '/ecdsa/d' sshd.init -%endif - -%if %{without audit} -# remove recording user's login uid to the process attribute -%{__sed} -i -e '/pam_loginuid.so/d' sshd.pam -%endif - -install -p sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd -cp -p sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd +install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd +cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/sshd cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/sshd cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/profile.d -ln -sf /etc/profile.d/ssh-agent.sh $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/ssh-agent.sh +ln -sf /etc/profile.d/ssh-agent.sh $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/ssh-agent.sh cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir} cp -p %{SOURCE7} $RPM_BUILD_ROOT%{schemadir} -cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/sshd.conf -%{__sed} -e 's|@@LIBEXECDIR@@|%{_libexecdir}|g' %{SOURCE9} >$RPM_BUILD_ROOT%{systemdunitdir}/sshd.service -cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen +cp -p %{SOURCE9} %{SOURCE11} %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir} +install -p %{SOURCE10} $RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen -cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir} -cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir} +%{__sed} -e 's|@@LIBEXECDIR@@|%{_libexecdir}|g' \ + $RPM_BUILD_ROOT%{systemdunitdir}/sshd.service \ + $RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen %if %{with gnome} install -p contrib/gnome-ssh-askpass1 $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass @@ -670,6 +657,18 @@ cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/SSH_ASKPASS #SSH_ASKPASS="%{_libexecdir}/ssh-askpass" EOF +%if "%{pld_release}" == "ac" +# not present in ac, no point searching it +%{__sed} -i -e '/pam_keyinit.so/d' $RPM_BUILD_ROOT/etc/pam.d/sshd +# openssl on ac does not have OPENSSL_HAS_ECC +%{__sed} -i -e '/ecdsa/d' $RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen +%endif + +%if %{without audit} +# remove recording user's login uid to the process attribute +%{__sed} -i -e '/pam_loginuid.so/d' $RPM_BUILD_ROOT/etc/pam.d/sshd +%endif + %{__rm} $RPM_BUILD_ROOT%{_mandir}/README.openssh-non-english-man-pages %{?with_ldap:%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/ldap.conf} @@ -744,12 +743,6 @@ if [ -x /bin/systemd_booted ] && /bin/systemd_booted; then EOF fi -%post server-upstart -%upstart_post sshd - -%postun server-upstart -%upstart_postun sshd - %post -n openldap-schema-openssh-lpk %openldap_schema_register %{schemadir}/openssh-lpk.schema %service -q ldap restart @@ -854,9 +847,3 @@ fi %defattr(644,root,root,755) %{schemadir}/openssh-lpk.schema %endif - -%if "%{pld_release}" != "ti" -%files server-upstart -%defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) /etc/init/sshd.conf -%endif