rpms/cyrus-sasl
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Restore the md5global patch to prevent multilib issues (#1577675)

Browse Source
This commit is contained in:
Jakub Jelen 2018-05-17 14:05:11 +02:00
parent d434eb7634
commit 20d2e818f9
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cyrus-sasl-2.1.26-md5global.patch
View File

@ -1,17 +1,21 @@
diff -up cyrus-sasl-2.1.27/include/Makefile.am.md5global.h cyrus-sasl-2.1.27/include/Makefile.am diff -up cyrus-sasl-2.1.27/include/Makefile.am.md5global.h cyrus-sasl-2.1.27/include/Makefile.am
--- cyrus-sasl-2.1.27/include/Makefile.am.md5global.h 2015-10-15 15:44:43.000000000 +0200 --- cyrus-sasl-2.1.27/include/Makefile.am.md5global.h 2018-05-17 13:33:49.588368350 +0200
+++ cyrus-sasl-2.1.27/include/Makefile.am 2015-11-20 15:28:25.930263088 +0100 +++ cyrus-sasl-2.1.27/include/Makefile.am 2018-05-17 13:38:19.377316869 +0200
@@ -47,16 +47,7 @@ noinst_HEADERS = gai.h exits.h @@ -49,20 +49,7 @@ saslinclude_HEADERS = hmac-md5.h md5.h m
saslincludedir = $(includedir)/sasl
saslinclude_HEADERS = hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h prop.h noinst_PROGRAMS = makemd5
-noinst_PROGRAMS = makemd5
-
-makemd5_SOURCES = makemd5.c -makemd5_SOURCES = makemd5.c
- -
-md5global.h: makemd5 -makemd5$(BUILD_EXEEXT) $(makemd5_OBJECTS): CC=$(CC_FOR_BUILD)
- -rm -f md5global.h -makemd5$(BUILD_EXEEXT) $(makemd5_OBJECTS): CFLAGS=$(CFLAGS_FOR_BUILD)
- ./makemd5 md5global.h -makemd5$(BUILD_EXEEXT): LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
-md5global.h: makemd5$(BUILD_EXEEXT) Makefile
- -rm -f $@
- ./$< $@
-
-BUILT_SOURCES = md5global.h
- -
EXTRA_DIST = NTMakefile EXTRA_DIST = NTMakefile
-DISTCLEANFILES = md5global.h -DISTCLEANFILES = md5global.h

5
cyrus-sasl.spec
View File

@ -28,7 +28,8 @@ Patch11: cyrus-sasl-2.1.25-no_rpath.patch
Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
Patch23: cyrus-sasl-2.1.23-man.patch Patch23: cyrus-sasl-2.1.23-man.patch
Patch24: cyrus-sasl-2.1.21-sizes.patch Patch24: cyrus-sasl-2.1.21-sizes.patch
#Patch49: cyrus-sasl-2.1.26-md5global.patch # The 64 bit *INT8 type is not used anywhere and other types match
Patch49: cyrus-sasl-2.1.26-md5global.patch
# revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 (#984079) # revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 (#984079)
# https://bugzilla.cyrusimap.org/show_bug.cgi?id=3480 # https://bugzilla.cyrusimap.org/show_bug.cgi?id=3480
Patch50: cyrus-sasl-2.1.26-revert-upstream-080e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch Patch50: cyrus-sasl-2.1.26-revert-upstream-080e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch
@ -161,7 +162,7 @@ the GS2 authentication scheme.
%patch15 -p1 -b .path %patch15 -p1 -b .path
%patch23 -p1 -b .man %patch23 -p1 -b .man
%patch24 -p1 -b .sizes %patch24 -p1 -b .sizes
#%patch49 -p1 -b .md5global.h %patch49 -p1 -b .md5global.h
%patch50 -p1 -b .gssapi %patch50 -p1 -b .gssapi
%build %build