summaryrefslogtreecommitdiff
path: root/testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
diff options
context:
space:
mode:
authorJoshua Ismael Haase Hernandez <hahj87@gmail.com>2011-05-19 12:44:24 -0500
committerJoshua Ismael Haase Hernandez <hahj87@gmail.com>2011-05-19 12:44:24 -0500
commit071445e6a2bb31ddf638e6f2e5362953b47e72dc (patch)
tree9ec266d72aaa5971dee2d1abbe2de511d971de87 /testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
parentc14218d562c03601d6d23666f77ed0c2f0025c1b (diff)
parentb8ea4461e461f0e1782e28b5810eb811423afa79 (diff)
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el into pre
Conflicts: core/heimdal/PKGBUILD extra/apache-ant/PKGBUILD extra/aria2/PKGBUILD extra/bs/PKGBUILD extra/dosbox/PKGBUILD extra/ettercap-gtk/PKGBUILD extra/gqmpeg/PKGBUILD extra/gtk-theme-switch2/PKGBUILD extra/icecast/PKGBUILD extra/kmldonkey/PKGBUILD extra/kmplayer/PKGBUILD extra/libbtctl/PKGBUILD extra/libx86/PKGBUILD extra/mc/PKGBUILD extra/monotone/PKGBUILD extra/nbsmtp/PKGBUILD extra/nickle/PKGBUILD extra/nppangband/PKGBUILD extra/numlockx/PKGBUILD extra/python-gtkglext/PKGBUILD extra/speedcrunch/PKGBUILD extra/vbetool/PKGBUILD libre/xchat-gnome-libre/PKGBUILD libre/xchat-gnome-libre/gtk2-2.20.patch libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch libre/xchat-gnome-libre/xchat-gnome.install
Diffstat (limited to 'testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch')
-rw-r--r--testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
deleted file mode 100644
index 0d8627b1f..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c
---- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c 2009-04-28 08:09:17.000000000 -0700
-+++ cyrus-sasl-2.1.23/plugins/digestmd5.c 2011-05-02 07:56:55.375403814 -0700
-@@ -2715,7 +2715,7 @@
- "DIGEST-MD5", /* mech_name */
- #ifdef WITH_RC4
- 128, /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
-@@ -4034,7 +4034,7 @@
- "DIGEST-MD5",
- #ifdef WITH_RC4 /* mech_name */
- 128, /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,