Commit 8fe5ebae authored by Timo Aaltonen's avatar Timo Aaltonen
Browse files

fix-saslpath.diff: Updated to support ppc64el and s390x. (LP: #1764744)

parent 8ba69e02

debian/changelog

+7 −0
Original line number Diff line number Diff line 
389-ds-base (1.3.7.10-2) UNRELEASED; urgency=medium



  * fix-saslpath.diff: Updated to support ppc64el and s390x. (LP:

    #1764744)



 -- Timo Aaltonen <tjaalton@debian.org>  Thu, 19 Apr 2018 10:00:58 +0300



389-ds-base (1.3.7.10-1) unstable; urgency=medium



  * New upstream release.

debian/patches/fix-saslpath.diff

+26 −2
Original line number Diff line number Diff line 
--- a/ldap/servers/slapd/ldaputil.c

+++ b/ldap/servers/slapd/ldaputil.c

@@ -980,10 +980,10 @@ ldaputil_get_saslpath()

@@ -962,10 +962,14 @@ ldaputil_get_saslpath()

         if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) {

 #ifdef CPU_arm

             /* the 64-bit ARMv8 architecture. */

-            saslpath = "/usr/lib/aarch64-linux-gnu";

+            saslpath = "/usr/lib/aarch64-linux-gnu/sasl2";

+#elif defined(CPU_powerpc64le)

+            saslpath = "/usr/lib/powerpc64le-linux-gnu/sasl2";

+#elif defined(CPU_s390x)

+            saslpath = "/usr/lib/s390x-linux-gnu/sasl2";

 #else

             /* Try x86_64 gnu triplet */

-            saslpath = "/usr/lib/x86_64-linux-gnu";
@@ -13,7 +17,7 @@ 
 #endif

         }

 #else

@@ -991,14 +991,14 @@ ldaputil_get_saslpath()

@@ -973,14 +977,14 @@ ldaputil_get_saslpath()

         if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) {

 #ifdef CPU_arm

             /* the latest 32 bit ARM architecture using the hard-float version of EABI. */
@@ -31,3 +35,23 @@ 
 #endif

         }

 #endif

--- a/configure.ac

+++ b/configure.ac

@@ -563,7 +563,8 @@ case $host in

       arm-*-linux*)

         AC_DEFINE([CPU_arm], [], [cpu type arm])

         ;;

-      ppc64le-*-linux*)

+      powerpc64le-*-linux*)

+        AC_DEFINE([CPU_powerpc64le], [], [cpu type powerpc64le])

         ;;

       ppc64-*-linux*)

         ;;

@@ -572,6 +573,7 @@ case $host in

       s390-*-linux*)

         ;;

       s390x-*-linux*)

+        AC_DEFINE([CPU_s390x], [], [cpu type s390x])

         ;;

     esac

     # some programs use the native thread library directly