Add patch for Flex 2.6 compile failure (yyunput)

3 files changed, 21 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a5f0ecd2ca0..7f1c06f88f39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Dec  7 18:32:32 UTC 2015
 pkgbase = openchange
 	pkgdesc = A portable, open source implementation of Microsoft Exchange server and Exchange protocols.
 	pkgver = 2.3
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.openchange.org
 	arch = i686
 	arch = x86_64
@@ -32,12 +34,14 @@ pkgbase = openchange
 	source = openchange-issue-249.patch
 	source = openchange-remove-server_id_str-1.patch
 	source = openchange-add_SizedXid-1.patch
+	source = yyunput_flex2.6.patch
 	sha256sums = 46ffdc779bb7bf6a823f6d1a78c5ca3f5548b981ad90164214a68279b403a05e
 	sha256sums = 45bd19e2a5725a94692ae606086be6d57423375c9b1c0eb5322c6e09ef2b5fb3
 	sha256sums = 067d25b0442ab233f47fbfd32a56042fa161b3d0aa65081f222fddde3648c439
 	sha256sums = e3cfd2455a52d4b68153b3d546c70edbde5cf024ebcec1088a923aedaa938834
 	sha256sums = 1281c59a5d0490d9b2091535191a0aac1ae04ebc6b48cf56bd4fca656c23b25b
 	sha256sums = f8012d91b1c1c382e6d480dd015230e59f07d9958ac63d57f65801b1dfc6b54a
+	sha256sums = 569385a8666ef95a7aa024b52ea47ee308be5eee73a3d973207df43439c2c1e7
 
 pkgname = openchange
 
diff --git a/PKGBUILD b/PKGBUILD
index 4bdacce2ae46..8ea44c400ce0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=openchange
 _codename=VULCAN
 pkgver=2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A portable, open source implementation of Microsoft Exchange server \
 and Exchange protocols."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -25,14 +25,16 @@ source=("https://github.com/openchange/openchange/archive/${pkgname}-${pkgver}-$
         "openchange-provision-type-error.patch"
         "openchange-issue-249.patch"
         "openchange-remove-server_id_str-1.patch"
-        "openchange-add_SizedXid-1.patch")
+        "openchange-add_SizedXid-1.patch"
+        "yyunput_flex2.6.patch")
 
 sha256sums=('46ffdc779bb7bf6a823f6d1a78c5ca3f5548b981ad90164214a68279b403a05e'
             '45bd19e2a5725a94692ae606086be6d57423375c9b1c0eb5322c6e09ef2b5fb3'
             '067d25b0442ab233f47fbfd32a56042fa161b3d0aa65081f222fddde3648c439'
             'e3cfd2455a52d4b68153b3d546c70edbde5cf024ebcec1088a923aedaa938834'
             '1281c59a5d0490d9b2091535191a0aac1ae04ebc6b48cf56bd4fca656c23b25b'
-            'f8012d91b1c1c382e6d480dd015230e59f07d9958ac63d57f65801b1dfc6b54a')
+            'f8012d91b1c1c382e6d480dd015230e59f07d9958ac63d57f65801b1dfc6b54a'
+            '569385a8666ef95a7aa024b52ea47ee308be5eee73a3d973207df43439c2c1e7')
 
 # Used to be pkgname-pkgver-codename, but now we have two openchanges. WAT
 _srcsubdir="${pkgname}-${pkgname}-${pkgver}-${_codename}"
@@ -44,6 +46,7 @@ build() {
     patch -p1 < "${srcdir}/openchange-issue-249.patch"
     patch -p1 < "${srcdir}/openchange-remove-server_id_str-1.patch"
     patch -p1 < "${srcdir}/openchange-add_SizedXid-1.patch"
+    patch -p1 < "${srcdir}/yyunput_flex2.6.patch"
 
     PYTHON_CALLERS="$(find ${srcdir}/${_srcsubdir} -name '*.py')
                     $(find ${srcdir}/${_srcsubdir} -name 'configure.ac')
diff --git a/yyunput_flex2.6.patch b/yyunput_flex2.6.patch
new file mode 100644
index 000000000000..c9bd20239142
--- /dev/null
+++ b/yyunput_flex2.6.patch
@@ -0,0 +1,10 @@
+--- a/libocpf/lex.l	2015-05-16 08:22:04.000000000 -0700
++++ b/libocpf/lex.l	2015-12-07 10:25:28.545736920 -0800
+@@ -29,7 +29,6 @@
+ #include "libocpf/lex.h"
+ 
+ #define	YY_EXTRA_TYPE	struct ocpf_context *
+-#define	YY_NO_UNPUT
+ 
+ static void unterminated(struct ocpf_context *, const char *, unsigned int);
+