Package: libsmi
Version: 0.4.8+dfsg2-8
Followup-For: Bug #733361
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following to
fix an FTBFS:
* lib/parser/smi{,ng}.y: follow change from *_PARAM to %*-param.
* lib/parser/smi{,ng}.y: follow yyerror() parameterisation changes.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: jessie/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libsmi-0.4.8+dfsg2/debian/changelog libsmi-0.4.8+dfsg2/debian/changelog
diff -Nru libsmi-0.4.8+dfsg2/debian/patches/bison-follow-parameter-handling-changes.patch libsmi-0.4.8+dfsg2/debian/patches/bison-follow-parameter-handling-changes.patch
--- libsmi-0.4.8+dfsg2/debian/patches/bison-follow-parameter-handling-changes.patch 1970-01-01 01:00:00.000000000 +0100
+++ libsmi-0.4.8+dfsg2/debian/patches/bison-follow-parameter-handling-changes.patch 2014-04-17 00:43:27.000000000 +0100
@@ -0,0 +1,75 @@
+Description: follow flex parameter specification change
+ Follow change from *_PARAM to %*-param after deprecation in flex.
+ Follow yyerror() parameterisation changes.
+Author: Andy Whitcroft <a...@canonical.com>
+
+Index: libsmi-0.4.8+dfsg2/lib/parser-smi.y
+===================================================================
+--- libsmi-0.4.8+dfsg2.orig/lib/parser-smi.y 2014-04-16 23:49:33.000000000 +0100
++++ libsmi-0.4.8+dfsg2/lib/parser-smi.y 2014-04-17 00:31:50.152357333 +0100
+@@ -11,6 +11,9 @@
+ * @(#) $Id: parser-smi.y 8090 2008-04-18 12:56:29Z strauss $
+ */
+
++%parse-param { struct Parser *parserPtr }
++%lex-param { struct Parser *parserPtr }
++
+ %{
+
+ #include <config.h>
+@@ -43,14 +46,6 @@
+
+
+
+-/*
+- * These arguments are passed to yyparse() and yylex().
+- */
+-#define YYPARSE_PARAM parserPtr
+-#define YYLEX_PARAM parserPtr
+-
+-
+-
+ #define thisParserPtr ((Parser *)parserPtr)
+ #define thisModulePtr (((Parser *)parserPtr)->modulePtr)
+
+Index: libsmi-0.4.8+dfsg2/lib/parser-sming.y
+===================================================================
+--- libsmi-0.4.8+dfsg2.orig/lib/parser-sming.y 2014-04-16 23:49:33.000000000 +0100
++++ libsmi-0.4.8+dfsg2/lib/parser-sming.y 2014-04-17 00:31:41.288357640 +0100
+@@ -11,6 +11,9 @@
+ * @(#) $Id: parser-sming.y 7966 2008-03-27 21:25:52Z schoenw $
+ */
+
++%parse-param { struct Parser *parserPtr }
++%lex-param { struct Parser *parserPtr }
++
+ %{
+
+ #include <config.h>
+@@ -48,13 +51,6 @@
+ #endif
+
+
+-/*
+- * These arguments are passed to yyparse() and yylex().
+- */
+-#define YYPARSE_PARAM parserPtr
+-#define YYLEX_PARAM parserPtr
+-
+-
+
+ #define thisParserPtr ((Parser *)parserPtr)
+ #define thisModulePtr (((Parser *)parserPtr)->modulePtr)
+Index: libsmi-0.4.8+dfsg2/lib/error.h
+===================================================================
+--- libsmi-0.4.8+dfsg2.orig/lib/error.h 2014-04-17 00:36:14.684348162 +0100
++++ libsmi-0.4.8+dfsg2/lib/error.h 2014-04-17 00:36:31.740347571 +0100
+@@ -22,7 +22,7 @@
+ #ifdef yyerror
+ #undef yyerror
+ #endif
+-#define yyerror(msg) smiyyerror(msg, parserPtr)
++#define yyerror(parserPtr, msg) smiyyerror(msg, parserPtr)
+
+
+ extern int smiErrorLevel; /* Higher levels produce more warnings */
diff -Nru libsmi-0.4.8+dfsg2/debian/patches/series libsmi-0.4.8+dfsg2/debian/patches/series
--- libsmi-0.4.8+dfsg2/debian/patches/series 2013-10-27 21:27:03.000000000 +0000
+++ libsmi-0.4.8+dfsg2/debian/patches/series 2014-04-17 00:44:37.000000000 +0100
@@ -3,3 +3,4 @@
cve-2010-2891.patch
libsmi-format.patch
segfault-bug600076.patch
+bison-follow-parameter-handling-changes.patch
