[Pkg-freeipa-devel] [Git][freeipa-team/389-ds-base][master] fix-saslpath.diff: Updated to support ppc64el and s390x. (LP: #1764744)

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at FreeIPA packaging / 389-ds-base


Commits:
8fe5ebae by Timo Aaltonen at 2018-04-19T10:01:04+03:00
fix-saslpath.diff: Updated to support ppc64el and s390x. (LP: #1764744)

- - - - -


2 changed files:

- debian/changelog
- debian/patches/fix-saslpath.diff


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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 at 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
=====================================
--- a/debian/patches/fix-saslpath.diff
+++ b/debian/patches/fix-saslpath.diff
@@ -1,11 +1,15 @@
 --- 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



View it on GitLab: https://salsa.debian.org/freeipa-team/389-ds-base/commit/8fe5ebae52c24a7d1f0ba567daba17e4d0ee34b7

---
View it on GitLab: https://salsa.debian.org/freeipa-team/389-ds-base/commit/8fe5ebae52c24a7d1f0ba567daba17e4d0ee34b7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20180419/40be631c/attachment-0001.html>