From c77a3bfda1d28b1c4ac3e64e6a68b84acf0525ef1db5e11fb550cfd4d1670bdc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 Sep 2014 23:23:27 +0000 Subject: [PATCH 1/3] coccinelle-1.0.0~rc21 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=31 --- coccinelle-1.0.0-rc17.tar.xz | 3 --- coccinelle-1.0.0-rc21.tgz | 3 +++ coccinelle.changes | 20 ++++++++++++++++++++ coccinelle.spec | 12 +++++++----- fix-no_prepare_ocamlcocci-arguments.patch | 14 ++++++++++++++ 5 files changed, 44 insertions(+), 8 deletions(-) delete mode 100644 coccinelle-1.0.0-rc17.tar.xz create mode 100644 coccinelle-1.0.0-rc21.tgz create mode 100644 fix-no_prepare_ocamlcocci-arguments.patch diff --git a/coccinelle-1.0.0-rc17.tar.xz b/coccinelle-1.0.0-rc17.tar.xz deleted file mode 100644 index 1074016..0000000 --- a/coccinelle-1.0.0-rc17.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20653f2e3599554bea6cf31c90f85500d5125bd2ab105a2ce13edc97e4c206a1 -size 2286028 diff --git a/coccinelle-1.0.0-rc21.tgz b/coccinelle-1.0.0-rc21.tgz new file mode 100644 index 0000000..975a28c --- /dev/null +++ b/coccinelle-1.0.0-rc21.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6609a1f800f84d058c9b395edd0597171594b685f551a9b9c03728a1b416783 +size 2539510 diff --git a/coccinelle.changes b/coccinelle.changes index 499b5d1..ef9c822 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Sep 9 14:25:25 UTC 2013 - mcgrof@suse.com + +- Update to new upstream release 1.0.0~rc21 +* Support decimal type with the --ibm option +* Support some matching on pragmas +* Initialize and finalize rules contain a metavariable declaration + region. +* Allow some parameters of a function not to have names. +* Eliminate the reliance on grep in most cases for worth trying, + to improve performance. +* Allow multidecls when removing variable names or when modifying + type. +* Take fresh declarations into account when computing + get_constants to create dependencies +* Leave ifdefs-like directives in unparsed code, if they don't have + beginning or ending counterparts. +* Improve type inference performance when many files included by + using maps. + ------------------------------------------------------------------- Thu May 9 17:51:39 UTC 2013 - jengelh@inai.de diff --git a/coccinelle.spec b/coccinelle.spec index 0ceeabd..63c258a 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -1,7 +1,7 @@ # # spec file for package coccinelle # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,24 @@ Name: coccinelle -Version: 1.0.0~rc17 +Version: 1.0.0~rc21 Release: 0 Summary: Semantic patch utility License: GPL-2.0 Group: Productivity/Text/Utilities Url: http://coccinelle.lip6.fr/ -%define rversion 1.0.0-rc17 +%define rversion 1.0.0-rc21 #Git-Clone: git://github.com/coccinelle/coccinelle -Source: %name-%rversion.tar.xz +Source: http://coccinelle.lip6.fr/distrib/%name-%rversion.tgz +Patch1: fix-no_prepare_ocamlcocci-arguments.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.11 BuildRequires: ocaml-camlp4-devel >= 3.11 +BuildRequires: ocaml-findlib BuildRequires: ocaml-ocamldoc >= 3.11 BuildRequires: pkg-config -BuildRequires: xz # Fails to link with PCRE #BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(python) @@ -53,6 +54,7 @@ used (by us and others) for finding and fixing bugs in systems code. %prep %setup -qn %name-%rversion +%patch -P 1 -p1 %build %configure diff --git a/fix-no_prepare_ocamlcocci-arguments.patch b/fix-no_prepare_ocamlcocci-arguments.patch new file mode 100644 index 0000000..d462084 --- /dev/null +++ b/fix-no_prepare_ocamlcocci-arguments.patch @@ -0,0 +1,14 @@ +--- a/ocaml/no_prepare_ocamlcocci.ml ++++ b/ocaml/no_prepare_ocamlcocci.ml +@@ -9,9 +9,9 @@ + function + Ast_cocci.ScriptRule (name,"ocaml",deps,mv,script_vars,code) -> + code :: prev +- | Ast_cocci.InitialScriptRule (name,"ocaml",deps,code) -> ++ | Ast_cocci.InitialScriptRule (name,"ocaml",deps,mvs,code) -> + code :: prev +- | Ast_cocci.FinalScriptRule (name,"ocaml",deps,code) -> ++ | Ast_cocci.FinalScriptRule (name,"ocaml",deps,mvs,code) -> + code :: prev + | _ -> prev) + [] code in From d098821b2f96efd3c8e0a9b9029c9f50fd415e3d32e2e9649d45d755035af366 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 Sep 2014 23:34:31 +0000 Subject: [PATCH 2/3] patch metadata OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=32 --- fix-no_prepare_ocamlcocci-arguments.patch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fix-no_prepare_ocamlcocci-arguments.patch b/fix-no_prepare_ocamlcocci-arguments.patch index d462084..fbe2fd6 100644 --- a/fix-no_prepare_ocamlcocci-arguments.patch +++ b/fix-no_prepare_ocamlcocci-arguments.patch @@ -1,3 +1,10 @@ +From: Luis R. Rodriguez +Date: Tue, 9 Sep 2014 15:10:42 -0700 +X-Upstream: should appear in 1.0.0~rc22 + +The functions do take five arguments, but these two call sites erroneously +just passed four. + --- a/ocaml/no_prepare_ocamlcocci.ml +++ b/ocaml/no_prepare_ocamlcocci.ml @@ -9,9 +9,9 @@ From adf6f059913d204390ae09a72998486612914e077fd3b884b1c55f95285c934f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 Sep 2014 23:35:47 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=33 --- coccinelle.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coccinelle.changes b/coccinelle.changes index ef9c822..c81dcc6 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -17,6 +17,8 @@ Thu Sep 9 14:25:25 UTC 2013 - mcgrof@suse.com beginning or ending counterparts. * Improve type inference performance when many files included by using maps. +- Add fix-no_prepare_ocamlcocci-arguments.patch: fix incorrect + call to two functions ------------------------------------------------------------------- Thu May 9 17:51:39 UTC 2013 - jengelh@inai.de