diff --git a/debian/changelog b/debian/changelog index ebc5970..890f41e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +orafce (3.0.7-3) UNRELEASED; urgency=medium + + * Fix invocation of orafce_sql_yyerror. Patch taken from upstream git. + (Closes: #749804) + + -- Martin Pitt Tue, 26 Aug 2014 19:03:01 +0200 + orafce (3.0.7-2) unstable; urgency=medium * Add missing net-tools test dependency. diff --git a/debian/patches/git-sqy_yyerror.patch b/debian/patches/git-sqy_yyerror.patch new file mode 100644 index 0000000..b3e8464 --- /dev/null +++ b/debian/patches/git-sqy_yyerror.patch @@ -0,0 +1,34 @@ +From a525592a848cda759053a63e99b4463b1a00a892 Mon Sep 17 00:00:00 2001 +From: Pavel Stehule +Date: Mon, 25 Aug 2014 15:09:42 +0200 +Subject: [PATCH] fix broken definition of orafce_sql_yyerror function + +--- + plvlex.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plvlex.c b/plvlex.c +index ce8b66b..1da3179 100644 +--- a/plvlex.c ++++ b/plvlex.c +@@ -37,7 +37,7 @@ typedef struct { + PG_FUNCTION_INFO_V1(plvlex_tokens); + + extern int orafce_sql_yyparse(); +-extern void orafce_sql_yyerror(const char *message); ++extern void orafce_sql_yyerror(List **result, const char *message); + extern void orafce_sql_scanner_init(const char *str); + extern void orafce_sql_scanner_finish(void); + +@@ -207,7 +207,7 @@ plvlex_tokens(PG_FUNCTION_ARGS) + + orafce_sql_scanner_init(CSTRING(src)); + if (orafce_sql_yyparse(&lexems) != 0) +- orafce_sql_yyerror("bogus input"); ++ orafce_sql_yyerror(NULL, "bogus input"); + + orafce_sql_scanner_finish(); + +-- +2.1.0 + diff --git a/debian/patches/series b/debian/patches/series index 6b97040..1f1089c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ git-to_date-conversion +git-sqy_yyerror.patch regress-no-alert