Re: [UPDATE] ropper et filebytes

2020-03-21 Thread Jeremie Courreges-Anglas
On Sat, Mar 21 2020, Bjorn Ketelaars  wrote:
> On Sat 21/03/2020 16:12, Remi Pointel wrote:
>> On 2020-03-10 10:19, Jeremie Courreges-Anglas wrote:
>> > On Mon, Mar 09 2020, Paco Esteban  wrote:
>> > > Hi Remi,
>> > > 
>> > > On Sun, 08 Mar 2020, Remi Pointel wrote:
>> > > 
>> > > > Hi,
>> > > > 
>> > > > these are the diff to update filebytes and ropper to latest releases.
>> > > > 
>> > > > Ok?
>> > 
>> > LGTM and appears to work fine in my tests on amd64, ok jca@
>> > 
>> > > ropper has no consumers and filebytes only has ropper.  I gess those are
>> > > perfect candidates to go py3 only, don't you think ?
>> > 
>> > It appears so indeed.
>> > 
>> 
>> 
>> Hi,
>> 
>> these are the diff to use Python 3 only.
>> 
>> Ok?
>
> Is there a reason that you are not using @conflict markers in PLIST?

Same question.  Assuming there is no reason to avoid the conflict
marker, please add @conflict py-pkgname-* to the PLIST of both ports,
and don't forget to drop "SUBDIR += py-pkgname" from ../Makefile.

With this, ok jca@ for the python3-only bits, I did not test the ropper
update (you probably can get enough coverage without my simple tests).

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Re: [UPDATE] ropper et filebytes

2020-03-21 Thread Bjorn Ketelaars
On Sat 21/03/2020 16:12, Remi Pointel wrote:
> On 2020-03-10 10:19, Jeremie Courreges-Anglas wrote:
> > On Mon, Mar 09 2020, Paco Esteban  wrote:
> > > Hi Remi,
> > > 
> > > On Sun, 08 Mar 2020, Remi Pointel wrote:
> > > 
> > > > Hi,
> > > > 
> > > > these are the diff to update filebytes and ropper to latest releases.
> > > > 
> > > > Ok?
> > 
> > LGTM and appears to work fine in my tests on amd64, ok jca@
> > 
> > > ropper has no consumers and filebytes only has ropper.  I gess those are
> > > perfect candidates to go py3 only, don't you think ?
> > 
> > It appears so indeed.
> > 
> 
> 
> Hi,
> 
> these are the diff to use Python 3 only.
> 
> Ok?

Is there a reason that you are not using @conflict markers in PLIST?



Re: [UPDATE] ropper et filebytes

2020-03-21 Thread Remi Pointel

On 2020-03-10 10:19, Jeremie Courreges-Anglas wrote:

On Mon, Mar 09 2020, Paco Esteban  wrote:

Hi Remi,

On Sun, 08 Mar 2020, Remi Pointel wrote:


Hi,

these are the diff to update filebytes and ropper to latest releases.

Ok?


LGTM and appears to work fine in my tests on amd64, ok jca@


ropper has no consumers and filebytes only has ropper.  I gess those are
perfect candidates to go py3 only, don't you think ?


It appears so indeed.




Hi,

these are the diff to use Python 3 only.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-filebytes/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile	27 Sep 2019 05:46:30 -	1.7
+++ Makefile	21 Mar 2020 15:10:28 -
@@ -2,7 +2,7 @@
 
 COMMENT =	python module to read and write ELF, PE, MachO or OAT
 
-MODPY_EGG_VERSION =	0.9.21
+MODPY_EGG_VERSION =	0.10.2
 DISTNAME =	filebytes-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 
@@ -20,6 +20,6 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PI =		Yes
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-filebytes/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo	27 Sep 2019 05:46:30 -	1.5
+++ distinfo	21 Mar 2020 15:10:28 -
@@ -1,2 +1,2 @@
-SHA256 (filebytes-0.9.21.tar.gz) = CeMG/q/UNeJAtsoi5jGc5Rhi2+meNIE2j8mi0V0iY9U=
-SIZE (filebytes-0.9.21.tar.gz) = 19174
+SHA256 (filebytes-0.10.2.tar.gz) = dkIC901551h/BLatRvfFBIXY8yxK7d0CIA8WUaCJJ0E=
+SIZE (filebytes-0.10.2.tar.gz) = 20358
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-filebytes/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST	4 Apr 2018 19:00:45 -	1.1.1.1
+++ pkg/PLIST	21 Mar 2020 15:10:28 -
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/04 19:00:45 rpointel Exp $
+@pkgpath devel/py-filebytes
 lib/python${MODPY_VERSION}/site-packages/filebytes/
 lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/filebytes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /cvs/ports/security/py-ropper/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile	27 Sep 2019 05:48:12 -	1.6
+++ Makefile	21 Mar 2020 15:10:27 -
@@ -2,7 +2,7 @@
 
 COMMENT =	rop gadget finder and binary information tool
 
-MODPY_EGG_VERSION =	1.12.5
+MODPY_EGG_VERSION =	1.13.3
 DISTNAME =	ropper-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 
@@ -24,10 +24,6 @@ RUN_DEPENDS =	devel/py-filebytes${MODPY_
 		devel/keystone/python${MODPY_FLAVOR}
 
 FLAVORS =	python3
-FLAVOR ?=
-
-# permit installing py- and py3- on same machine
-post-install:
-	mv ${PREFIX}/bin/ropper ${PREFIX}/bin/ropper${MODPY_BIN_SUFFIX}
+FLAVOR =	python3
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/security/py-ropper/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo	27 Sep 2019 05:48:12 -	1.3
+++ distinfo	21 Mar 2020 15:10:27 -
@@ -1,2 +1,2 @@
-SHA256 (ropper-1.12.5.tar.gz) = DevhcizzVtgjyravsr632K1sZEFHl4wf9UpbNEicdBg=
-SIZE (ropper-1.12.5.tar.gz) = 68836
+SHA256 (ropper-1.13.3.tar.gz) = 38h0d8D1PT0oNqOEwQY3PXYcxDXq/Ed/KZUj5UBN2kM=
+SIZE (ropper-1.13.3.tar.gz) = 68927
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/py-ropper/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST	2 Jan 2019 06:33:17 -	1.2
+++ pkg/PLIST	21 Mar 2020 15:10:27 -
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2019/01/02 06:33:17 rpointel Exp $
-bin/ropper${MODPY_BIN_SUFFIX}
+@pkgpath security/py-ropper
+bin/ropper
 lib/python${MODPY_VERSION}/site-packages/ropper/
 lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.892
diff -u -p -u -p -r1.892 Makefile
--- Makefile	20 Mar 2020 14:46:47 -	1.892
+++ Makefile	21 Mar 2020 15:10:20 -
@@ -5,7 +5,7 @@ CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-3.283
+PKGNAME =	quirks-3.284
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie 
 
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.910
diff -u -p -u -p -r1.910 Quirks.pm
--- files/Quirks.pm	20 Mar 2020 14:46:47 -	1.910

Re: [UPDATE] ropper et filebytes

2020-03-10 Thread Jeremie Courreges-Anglas
On Mon, Mar 09 2020, Paco Esteban  wrote:
> Hi Remi,
>
> On Sun, 08 Mar 2020, Remi Pointel wrote:
>
>> Hi,
>> 
>> these are the diff to update filebytes and ropper to latest releases.
>> 
>> Ok?

LGTM and appears to work fine in my tests on amd64, ok jca@

> ropper has no consumers and filebytes only has ropper.  I gess those are
> perfect candidates to go py3 only, don't you think ?

It appears so indeed.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Re: [UPDATE] ropper et filebytes

2020-03-09 Thread Paco Esteban
Hi Remi,

On Sun, 08 Mar 2020, Remi Pointel wrote:

> Hi,
> 
> these are the diff to update filebytes and ropper to latest releases.
> 
> Ok?

ropper has no consumers and filebytes only has ropper.  I gess those are
perfect candidates to go py3 only, don't you think ?

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03



[UPDATE] ropper et filebytes

2020-03-08 Thread Remi Pointel

Hi,

these are the diff to update filebytes and ropper to latest releases.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/security/py-ropper/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile	27 Sep 2019 05:48:12 -	1.6
+++ Makefile	8 Mar 2020 19:35:00 -
@@ -2,7 +2,7 @@
 
 COMMENT =	rop gadget finder and binary information tool
 
-MODPY_EGG_VERSION =	1.12.5
+MODPY_EGG_VERSION =	1.13.3
 DISTNAME =	ropper-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 
Index: distinfo
===
RCS file: /cvs/ports/security/py-ropper/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo	27 Sep 2019 05:48:12 -	1.3
+++ distinfo	8 Mar 2020 19:35:00 -
@@ -1,2 +1,2 @@
-SHA256 (ropper-1.12.5.tar.gz) = DevhcizzVtgjyravsr632K1sZEFHl4wf9UpbNEicdBg=
-SIZE (ropper-1.12.5.tar.gz) = 68836
+SHA256 (ropper-1.13.3.tar.gz) = 38h0d8D1PT0oNqOEwQY3PXYcxDXq/Ed/KZUj5UBN2kM=
+SIZE (ropper-1.13.3.tar.gz) = 68927
Index: Makefile
===
RCS file: /cvs/ports/devel/py-filebytes/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile	27 Sep 2019 05:46:30 -	1.7
+++ Makefile	8 Mar 2020 19:34:44 -
@@ -2,7 +2,7 @@
 
 COMMENT =	python module to read and write ELF, PE, MachO or OAT
 
-MODPY_EGG_VERSION =	0.9.21
+MODPY_EGG_VERSION =	0.10.2
 DISTNAME =	filebytes-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-filebytes/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo	27 Sep 2019 05:46:30 -	1.5
+++ distinfo	8 Mar 2020 19:34:44 -
@@ -1,2 +1,2 @@
-SHA256 (filebytes-0.9.21.tar.gz) = CeMG/q/UNeJAtsoi5jGc5Rhi2+meNIE2j8mi0V0iY9U=
-SIZE (filebytes-0.9.21.tar.gz) = 19174
+SHA256 (filebytes-0.10.2.tar.gz) = dkIC901551h/BLatRvfFBIXY8yxK7d0CIA8WUaCJJ0E=
+SIZE (filebytes-0.10.2.tar.gz) = 20358