From a327b3d8aebc172e385ec5265cfac47fe60fa88f Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mar 05 2018 11:45:05 +0000 Subject: Removed non-applicable patch for PPC --- diff --git a/cyrus-sasl-2.1.26-ppc.patch b/cyrus-sasl-2.1.26-ppc.patch deleted file mode 100644 index 0ebba70..0000000 --- a/cyrus-sasl-2.1.26-ppc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up cyrus-sasl-2.1.26/config/ltconfig.ppc cyrus-sasl-2.1.26/config/ltconfig ---- cyrus-sasl-2.1.26/config/ltconfig.ppc 2012-10-12 16:05:48.000000000 +0200 -+++ cyrus-sasl-2.1.26/config/ltconfig 2013-06-04 15:38:53.695401296 +0200 -@@ -2040,7 +2040,7 @@ linux-gnu*) - else - # Only the GNU ld.so supports shared libraries on MkLinux. - case "$host_cpu" in -- powerpc*) dynamic_linker=no ;; -+# powerpc*) dynamic_linker=no ;; - *) dynamic_linker='Linux ld.so' ;; - esac - fi -diff -up cyrus-sasl-2.1.26/saslauthd/config/ltconfig.ppc cyrus-sasl-2.1.26/saslauthd/config/ltconfig ---- cyrus-sasl-2.1.26/saslauthd/config/ltconfig.ppc 2013-06-04 15:39:49.849463707 +0200 -+++ cyrus-sasl-2.1.26/saslauthd/config/ltconfig 2013-06-04 15:39:12.826741036 +0200 -@@ -2040,7 +2040,7 @@ linux-gnu*) - else - # Only the GNU ld.so supports shared libraries on MkLinux. - case "$host_cpu" in -- powerpc*) dynamic_linker=no ;; -+ #powerpc*) dynamic_linker=no ;; - *) dynamic_linker='Linux ld.so' ;; - esac - fi diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index cc9667f..b6aa68f 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -29,8 +29,6 @@ Patch11: cyrus-sasl-2.1.25-no_rpath.patch Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch Patch23: cyrus-sasl-2.1.23-man.patch Patch24: cyrus-sasl-2.1.21-sizes.patch -# disable incorrect check for MkLinux -Patch47: cyrus-sasl-2.1.26-ppc.patch #Patch49: cyrus-sasl-2.1.26-md5global.patch # revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 (#984079) # https://bugzilla.cyrusimap.org/show_bug.cgi?id=3480 @@ -164,7 +162,6 @@ the GS2 authentication scheme. %patch15 -p1 -b .path %patch23 -p1 -b .man %patch24 -p1 -b .sizes -#%patch47 -p1 -b .ppc #%patch49 -p1 -b .md5global.h %patch50 -p1 -b .gssapi