Re: [UPDATE] security/floss

2020-06-30 Thread Antoine Jacoutot
On Tue, Jun 30, 2020 at 08:05:42AM +0200, Remi Pointel wrote:
> Hi,
> 
> this is the diff to update floss to latest release.
> 
> Ok?

Any chance this can use py3 instead?

> Cheers,
> 
> Remi.

> Index: Makefile
> ===
> RCS file: /cvs/ports/security/floss/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- Makefile  12 Jul 2019 20:49:02 -  1.3
> +++ Makefile  30 Jun 2020 06:05:11 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =FireEye Labs Obfuscated String Solver
>  
> -MODPY_EGG_VERSION =  1.5.0
> +MODPY_EGG_VERSION =  1.6.1
>  PKGNAME =floss-${MODPY_EGG_VERSION}
>  
>  GH_ACCOUNT = fireeye
> @@ -20,6 +20,7 @@ MODULES =   lang/python
>  MODPY_SETUPTOOLS =   Yes
>  
>  RUN_DEPENDS =textproc/py-yaml \
> + devel/py-simplejson \
>   devel/py-tabulate \
>   security/py-vivisect \
>   devel/py-plugnplay \
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/floss/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo  29 Mar 2018 19:45:16 -  1.1.1.1
> +++ distinfo  30 Jun 2020 06:05:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (flare-floss-1.5.0.tar.gz) = 
> yGTfjsXrt/NPyaWehUHU9vBMKgsjhjkSSfn/CTWl4kw=
> -SIZE (flare-floss-1.5.0.tar.gz) = 104759
> +SHA256 (flare-floss-1.6.1.tar.gz) = 
> T6fmLmrF/8rSZ81tiFkkauFDYzYTHep0A9idlCZ1nwQ=
> +SIZE (flare-floss-1.6.1.tar.gz) = 109281
> Index: patches/patch-setup_py
> ===
> RCS file: /cvs/ports/security/floss/patches/patch-setup_py,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-setup_py
> --- patches/patch-setup_py29 Mar 2018 19:45:16 -  1.1.1.1
> +++ patches/patch-setup_py30 Jun 2020 06:05:11 -
> @@ -3,12 +3,13 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2018/
>  Index: setup.py
>  --- setup.py.orig
>  +++ setup.py
> -@@ -11,10 +11,8 @@ except ImportError:
> +@@ -11,11 +11,9 @@ except ImportError:
>   
>   
>   requirements = [
>  -"q",
>   "pyyaml",
> + "simplejson",
>   "tabulate",
>  -"vivisect",
>   "plugnplay",


-- 
Antoine



[UPDATE] security/floss

2020-06-30 Thread Remi Pointel

Hi,

this is the diff to update floss to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/security/floss/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile	12 Jul 2019 20:49:02 -	1.3
+++ Makefile	30 Jun 2020 06:05:11 -
@@ -2,7 +2,7 @@
 
 COMMENT =	FireEye Labs Obfuscated String Solver
 
-MODPY_EGG_VERSION =	1.5.0
+MODPY_EGG_VERSION =	1.6.1
 PKGNAME =	floss-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT =	fireeye
@@ -20,6 +20,7 @@ MODULES =	lang/python
 MODPY_SETUPTOOLS =	Yes
 
 RUN_DEPENDS =	textproc/py-yaml \
+		devel/py-simplejson \
 		devel/py-tabulate \
 		security/py-vivisect \
 		devel/py-plugnplay \
Index: distinfo
===
RCS file: /cvs/ports/security/floss/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo	29 Mar 2018 19:45:16 -	1.1.1.1
+++ distinfo	30 Jun 2020 06:05:11 -
@@ -1,2 +1,2 @@
-SHA256 (flare-floss-1.5.0.tar.gz) = yGTfjsXrt/NPyaWehUHU9vBMKgsjhjkSSfn/CTWl4kw=
-SIZE (flare-floss-1.5.0.tar.gz) = 104759
+SHA256 (flare-floss-1.6.1.tar.gz) = T6fmLmrF/8rSZ81tiFkkauFDYzYTHep0A9idlCZ1nwQ=
+SIZE (flare-floss-1.6.1.tar.gz) = 109281
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/security/floss/patches/patch-setup_py,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-setup_py
--- patches/patch-setup_py	29 Mar 2018 19:45:16 -	1.1.1.1
+++ patches/patch-setup_py	30 Jun 2020 06:05:11 -
@@ -3,12 +3,13 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2018/
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -11,10 +11,8 @@ except ImportError:
+@@ -11,11 +11,9 @@ except ImportError:
  
  
  requirements = [
 -"q",
  "pyyaml",
+ "simplejson",
  "tabulate",
 -"vivisect",
  "plugnplay",