Accepting request 282170 from network:utilities
1 OBS-URL: https://build.opensuse.org/request/show/282170 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsmi?expand=0&rev=21
This commit is contained in:
commit
b0855b83d2
84
libsmi-bison-3.0.patch
Normal file
84
libsmi-bison-3.0.patch
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
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/lib/parser-smi.y
|
||||||
|
===================================================================
|
||||||
|
--- libsmi-0.4.8.orig/lib/parser-smi.y
|
||||||
|
+++ libsmi-0.4.8/lib/parser-smi.y
|
||||||
|
@@ -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/lib/parser-sming.y
|
||||||
|
===================================================================
|
||||||
|
--- libsmi-0.4.8.orig/lib/parser-sming.y
|
||||||
|
+++ libsmi-0.4.8/lib/parser-sming.y
|
||||||
|
@@ -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)
|
||||||
|
@@ -1556,7 +1552,7 @@ identityStatement: identityKeyword sep l
|
||||||
|
referenceStatement_stmtsep_01
|
||||||
|
{
|
||||||
|
setIdentityReference(identityPtr, $14,
|
||||||
|
- thisParserPtr)
|
||||||
|
+ thisParserPtr);
|
||||||
|
}
|
||||||
|
'}' optsep ';'
|
||||||
|
{
|
||||||
|
Index: libsmi-0.4.8/lib/error.h
|
||||||
|
===================================================================
|
||||||
|
--- libsmi-0.4.8.orig/lib/error.h
|
||||||
|
+++ libsmi-0.4.8/lib/error.h
|
||||||
|
@@ -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 */
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 20 14:17:06 UTC 2015 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Add libsmi-bison-3.0.patch: Fix build with bison 3.0.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 15 13:54:52 UTC 2013 - mmeister@suse.com
|
Mon Apr 15 13:54:52 UTC 2013 - mmeister@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package libsmi
|
# spec file for package libsmi
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -28,6 +28,7 @@ Patch0: libsmi-0.4.8-parser.patch
|
|||||||
Patch1: libsmi-0.4.8-gnu-source.patch
|
Patch1: libsmi-0.4.8-gnu-source.patch
|
||||||
Patch2: libsmi-CVE-2010-2891.patch
|
Patch2: libsmi-CVE-2010-2891.patch
|
||||||
Patch3: libsmi-flex.patch
|
Patch3: libsmi-flex.patch
|
||||||
|
Patch4: libsmi-bison-3.0.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
@ -80,6 +81,7 @@ libsmi.
|
|||||||
%if 0%{?suse_version} > 1220
|
%if 0%{?suse_version} > 1220
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%endif
|
%endif
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf --force --install
|
autoreconf --force --install
|
||||||
|
Loading…
Reference in New Issue
Block a user