Skip to content

Commit

Permalink
After-release version bump and use r2y version in plugin struct
Browse files Browse the repository at this point in the history
  • Loading branch information
radare committed Apr 16, 2024
1 parent 020feba commit c2b4b2a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
10 changes: 5 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]" ; CONTACT_NAME="jfrankowski" ; CONTACT="jfrankowski <[email protected]>" ;
PKGNAME='r2yara' ; VERSION='1.2.3' ; VERSION_MAJOR=1; VERSION_MINOR=2; VERSION_PATCH=3; VERSION_NUMBER=10203; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="jfrankowski" ; CONTACT="jfrankowski <[email protected]>" ;
}

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]...
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: [email protected]"
echo "DESCRIPTION: yara plugin for radare2"
Expand Down
2 changes: 1 addition & 1 deletion configure.acr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKGNAME r2yara
VERSION 1.2.2
VERSION 1.2.3
DESCRIPTION yara plugin for radare2 ;
CONTACT jfrankowski ; [email protected]

Expand Down
7 changes: 4 additions & 3 deletions src/core_yara.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 ();
Expand All @@ -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,
Expand Down

0 comments on commit c2b4b2a

Please sign in to comment.