From c2b4b2a1512f8cf8c1a5a56adcc577267e04cc0c Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Tue, 16 Apr 2024 16:54:15 +0200
Subject: [PATCH] After-release version bump and use r2y version in plugin
 struct

---
 configure       | 10 +++++-----
 configure.acr   |  2 +-
 src/core_yara.c |  7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 7ddc913..b96ff1c 100755
--- a/configure
+++ b/configure
@@ -112,12 +112,12 @@ done
 : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -m 755 -c}
- PKGNAME='r2yara' ; VERSION='1.2.2' ; VERSION_MAJOR=1; VERSION_MINOR=2; VERSION_PATCH=2; VERSION_NUMBER=10202; CONTACT_MAIL="judy.frankowski@gmail.com" ; CONTACT_NAME="jfrankowski" ; CONTACT="jfrankowski <judy.frankowski@gmail.com>" ;
+ PKGNAME='r2yara' ; VERSION='1.2.3' ; VERSION_MAJOR=1; VERSION_MINOR=2; VERSION_PATCH=3; VERSION_NUMBER=10203; CONTACT_MAIL="judy.frankowski@gmail.com" ; CONTACT_NAME="jfrankowski" ; CONTACT="jfrankowski <judy.frankowski@gmail.com>" ;
 }
 
 show_usage() {
 cat <<EOF2
-'configure' configures r2yara-1.2.2 to adapt to many kinds of systems.
+'configure' configures r2yara-1.2.3 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -194,10 +194,10 @@ ocho() {
 
 show_version() {
 if [ "$QUIET" = 1 ]; then
-	echo "1.2.2"
+	echo "1.2.3"
 	exit 0
 fi
-echo "r2yara-1.2.2 configuration script done with acr v2.1.2.
+echo "r2yara-1.2.3 configuration script done with acr v2.1.2.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <nopcode.org>."
 exit 0
@@ -226,7 +226,7 @@ case $flag in
 	show_version ; ;;
 -r|--r|--report)
 echo "PKGNAME:     r2yara"
-echo "VERSION:     1.2.2"
+echo "VERSION:     1.2.3"
 echo "AUTHOR:      jfrankowski"
 echo "EMAIL:       judy.frankowski@gmail.com"
 echo "DESCRIPTION: yara plugin for radare2"
diff --git a/configure.acr b/configure.acr
index bca938f..2f0518a 100644
--- a/configure.acr
+++ b/configure.acr
@@ -1,5 +1,5 @@
 PKGNAME r2yara
-VERSION 1.2.2
+VERSION 1.2.3
 DESCRIPTION yara plugin for radare2 ;
 CONTACT jfrankowski ; judy.frankowski@gmail.com
 
diff --git a/src/core_yara.c b/src/core_yara.c
index 1c43637..5d13dd2 100644
--- a/src/core_yara.c
+++ b/src/core_yara.c
@@ -2,6 +2,7 @@
 
 #include <r_core.h>
 #include <yara.h>
+#include "config.h"
 
 #if R2_VERSION_NUMBER < 50809
 static inline char *r_str_after(char *s, char c) {
@@ -595,7 +596,7 @@ static int cmd_yara_init(void *user, const char *cmd) {
 	return true;
 }
 
-static int cmd_yara_fini() {
+static int cmd_yara_fini(void *user, const char *cmd) {
 	if (initialized) {
 		r_list_free (rules_list);
 		yr_finalize ();
@@ -609,13 +610,13 @@ RCorePlugin r_core_plugin_yara = {
 	.name = "yara",
 	.desc = "YARA integration",
 	.license = "LGPL",
-	.version = "0.1.2",
+	.version = R2Y_VERSION,
 #else
 	.meta = {
 		.name = "yara",
 		.desc = "YARA integration",
 		.license = "LGPL",
-		.version = "0.1.2",
+		.version = R2Y_VERSION,
 	},
 #endif
 	.call = cmd_yara_call,