mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-13 20:42:58 +02:00
cyrus-sasl: Fix compiling with GCC 4.4.
This commit is contained in:
@@ -82,6 +82,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
|
||||
cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
|
||||
cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.in
|
||||
|
||||
|
||||
21
src/patches/cyrus-sasl-2.1.22-bad-elif.patch
Normal file
21
src/patches/cyrus-sasl-2.1.22-bad-elif.patch
Normal file
@@ -0,0 +1,21 @@
|
||||
diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c
|
||||
--- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif 2009-01-23 09:40:31.000000000 +0100
|
||||
+++ cyrus-sasl-2.1.22/plugins/digestmd5.c 2009-02-06 15:20:15.000000000 +0100
|
||||
@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv
|
||||
"DIGEST-MD5", /* mech_name */
|
||||
#ifdef WITH_RC4
|
||||
128, /* max_ssf */
|
||||
-#elif WITH_DES
|
||||
+#elif defined(WITH_DES)
|
||||
112,
|
||||
#else
|
||||
1,
|
||||
@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie
|
||||
"DIGEST-MD5",
|
||||
#ifdef WITH_RC4 /* mech_name */
|
||||
128, /* max ssf */
|
||||
-#elif WITH_DES
|
||||
+#elif defined(WITH_DES)
|
||||
112,
|
||||
#else
|
||||
1,
|
||||
Reference in New Issue
Block a user