- up to 7.6p1

[packages/openssh.git] / openssh-ldns.patch

diff --git a/openssh-ldns.patch b/openssh-ldns.patch
index a15c7dd5fec1f1413dfef64c593cc2e6c71c4554..367c5e8847de8b163427ba53229a8b09faf6f5b7 100644 (file)
--- a/openssh-ldns.patch
+++ b/openssh-ldns.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/configure.ac~    2017-10-02 21:34:26.000000000 +0200
++++ b/configure.ac     2017-10-06 08:35:16.756080761 +0200
+@@ -1487,7 +1487,7 @@ AC_ARG_WITH(ldns,
        ldns=""
        if test "x$withval" = "xyes" ; then
                AC_PATH_TOOL([LDNSCONFIG], [ldns-config], [no])
@@ -9,12 +9,4 @@
                        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"
+