commit be127028d17a22eee12f6025f166ccf1a0072183
Author: Jakub Bogusz <[email protected]>
Date: Mon Apr 17 11:25:21 2017 +0200
- added ldns patch (fixes ldns detection) and bcond
openssh-ldns.patch | 20 ++++++++++++++++++++
openssh.spec | 21 +++++++++++++--------
2 files changed, 33 insertions(+), 8 deletions(-)
---
diff --git a/openssh.spec b/openssh.spec
index cea9891..e902e0a 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -5,15 +5,16 @@
#
# Conditional build:
%bcond_without audit # sshd audit support
-%bcond_with gnome # with gnome-askpass (GNOME 1.x) utility
-%bcond_without gtk # without GTK+ (2.x)
-%bcond_without ldap # with ldap support
-%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_with gnome # gnome-askpass (GNOME 1.x) utility
+%bcond_without gtk # gnome-askpass (GTK+ 2.x) utility
+%bcond_without ldap # LDAP support
+%bcond_with ldns # DNSSEC support via libldns
+%bcond_without libedit # libedit (editline/history support in sftp
client)
+%bcond_without kerberos5 # Kerberos5 support
+%bcond_without selinux # 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
+%bcond_without tests # test suite
# gtk2-based gnome-askpass means no gnome1-based
%{?with_gtk:%undefine with_gnome}
@@ -64,6 +65,7 @@ Source9: sshd.service
Source10: sshd-keygen
Source11: sshd.socket
Source12: [email protected]
+Patch0: %{name}-ldns.patch
Patch1: %{name}-tests-reuseport.patch
Patch2: %{name}-pam_misc.patch
Patch3: %{name}-sigpipe.patch
@@ -89,6 +91,7 @@ BuildRequires: automake
%{?with_gnome:BuildRequires: gnome-libs-devel}
%{?with_gtk:BuildRequires: gtk+2-devel}
%{?with_kerberos5:BuildRequires: heimdal-devel >= 0.7}
+%{?with_ldns:BuildRequires: ldns-devel}
%{?with_libedit:BuildRequires: libedit-devel}
BuildRequires: libseccomp-devel
%{?with_selinux:BuildRequires: libselinux-devel}
@@ -529,6 +532,7 @@ openldap-a.
%prep
%setup -q
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -558,7 +562,7 @@ 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
+%{__mv} aclocal.m4 acinclude.m4
%build
cp /usr/share/automake/config.sub .
@@ -576,6 +580,7 @@ CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
--with-ipaddr-display \
%{?with_kerberos5:--with-kerberos5=/usr} \
--with-ldap%{!?with_ldap:=no} \
+ %{?with_ldns:--with-ldns} \
%{?with_libedit:--with-libedit} \
--with-mantype=man \
--with-md5-passwords \
diff --git a/openssh-ldns.patch b/openssh-ldns.patch
new file mode 100644
index 0000000..a15c7dd
--- /dev/null
+++ b/openssh-ldns.patch
@@ -0,0 +1,20 @@
+--- openssh-7.5p1/configure.ac.orig 2017-04-17 10:38:47.458291317 +0200
++++ openssh-7.5p1/configure.ac 2017-04-17 11:03:41.491607590 +0200
+@@ -1479,15 +1479,15 @@
+ ldns=""
+ if test "x$withval" = "xyes" ; then
+ AC_PATH_TOOL([LDNSCONFIG], [ldns-config], [no])
+- if test "x$PKGCONFIG" = "xno"; then
++ if test "x$LDNSCONFIG" = "xno"; then
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ LDFLAGS="$LDFLAGS -L${withval}/lib"
+ LIBS="-lldns $LIBS"
+- ldns=yes
+ else
+ LIBS="$LIBS `$LDNSCONFIG --libs`"
+ CPPFLAGS="$CPPFLAGS `$LDNSCONFIG --cflags`"
+ fi
++ ldns=yes
+ elif test "x$withval" != "xno" ; then
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ LDFLAGS="$LDFLAGS -L${withval}/lib"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/be127028d17a22eee12f6025f166ccf1a0072183
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
