Re: UPDATE: archivers/makeself 2.3.1 => 2.4.0

2018-09-09 Thread Brian Callahan



On 09/09/18 11:45, Stuart Henderson wrote:

On 2018/09/09 11:32, Brian Callahan wrote:

On 09/09/18 10:56, Stuart Henderson wrote:

On 2018/09/09 10:20, Brian Callahan wrote:

On 09/09/18 07:49, Stuart Henderson wrote:

On 2018/09/08 23:12, Brian Callahan wrote:

* OpenSSL improvements.

Any more details about what they changed here?


Had to find it -- the commit was simply called "OpenSSL improvements" :)
It's this:

* Add support for alternate password source for openssl encryption

* OpenSSL decrypt works on Solaris 10 with default openssl install

https://github.com/megastep/makeself/commit/d3232ec6e1b02bea6792b19de1f4b5d7be217d9f


Thanks, that should be alright. But then rereading your mail I noticed this,...


* Added new --sha256 argument to use a SHA256 checksum to verify the integrity
of archives. The shasum or sha256sum commands need to be available on the
targeted systems.

...which doesn't match our usual sha256 binary.


You're right! We can go this sed -i method or I can make a patch, whichever
seems more maintainable long-term. I re-ran a simple archive creation with
--sha256 and it generates a checksum now.

~Brian


OK.

sed is useful when a whole bunch of files need the same simple change,
but it's easy to get out of sync with upstream changes in future
versions - so generally I'd prefer a patch as it's much easier to spot
if upstream change something within patch context ... but that can be
changed later, so either OK as-is and we can change that later, or I'm
also OK with the same change made via patching instead of sed.


I went ahead and committed with a patch. That way it's done and we don't 
have to worry about it later.


~Brian




Index: Makefile
===
RCS file: /cvs/ports/archivers/makeself/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile3 Nov 2017 14:21:04 -   1.14
+++ Makefile9 Sep 2018 15:30:56 -
@@ -2,7 +2,7 @@
  
  COMMENT=		script generating a self-extractible .tgz from a directory
  
-V=			2.3.1

+V= 2.4.0
  DISTNAME= makeself-${V}
  
  GH_PROJECT=		makeself

@@ -19,6 +19,9 @@ PERMIT_PACKAGE_CDROM= Yes
  NO_BUILD= Yes
  NO_TEST=  Yes
  PKG_ARCH= *
+
+pre-configure:
+   sed -i 's,sha256sum,sha256,g' ${WRKSRC}/makeself.sh
  
  do-install:

${INSTALL_SCRIPT} ${WRKSRC}/makeself.sh ${PREFIX}/bin/makeself.sh
Index: distinfo
===
RCS file: /cvs/ports/archivers/makeself/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo3 Nov 2017 14:21:04 -   1.7
+++ distinfo9 Sep 2018 15:30:56 -
@@ -1,2 +1,2 @@
-SHA256 (makeself-2.3.1.tar.gz) = ciEfq45uNOwWrN7UcgPJ//Kj8TE8nr1DMPbJT/6kOZM=
-SIZE (makeself-2.3.1.tar.gz) = 25013
+SHA256 (makeself-2.4.0.tar.gz) = dqjD8/rRtVw5uikEoZ50liFR+Ugd8DCR1OVJOL3RP1A=
+SIZE (makeself-2.4.0.tar.gz) = 26735




Re: UPDATE: archivers/makeself 2.3.1 => 2.4.0

2018-09-09 Thread Brian Callahan


On 09/09/18 10:56, Stuart Henderson wrote:

On 2018/09/09 10:20, Brian Callahan wrote:

On 09/09/18 07:49, Stuart Henderson wrote:

On 2018/09/08 23:12, Brian Callahan wrote:

* OpenSSL improvements.

Any more details about what they changed here?


Had to find it -- the commit was simply called "OpenSSL improvements" :)
It's this:

* Add support for alternate password source for openssl encryption

* OpenSSL decrypt works on Solaris 10 with default openssl install

https://github.com/megastep/makeself/commit/d3232ec6e1b02bea6792b19de1f4b5d7be217d9f


Thanks, that should be alright. But then rereading your mail I noticed this,...


* Added new --sha256 argument to use a SHA256 checksum to verify the integrity
of archives. The shasum or sha256sum commands need to be available on the
targeted systems.

...which doesn't match our usual sha256 binary.



You're right! We can go this sed -i method or I can make a patch, 
whichever seems more maintainable long-term. I re-ran a simple archive 
creation with --sha256 and it generates a checksum now.


~Brian

Index: Makefile
===
RCS file: /cvs/ports/archivers/makeself/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile	3 Nov 2017 14:21:04 -	1.14
+++ Makefile	9 Sep 2018 15:30:56 -
@@ -2,7 +2,7 @@
 
 COMMENT=		script generating a self-extractible .tgz from a directory
 
-V=			2.3.1
+V=			2.4.0
 DISTNAME=		makeself-${V}
 
 GH_PROJECT=		makeself
@@ -19,6 +19,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 NO_BUILD=		Yes
 NO_TEST=		Yes
 PKG_ARCH=		*
+
+pre-configure:
+	sed -i 's,sha256sum,sha256,g' ${WRKSRC}/makeself.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/makeself.sh ${PREFIX}/bin/makeself.sh
Index: distinfo
===
RCS file: /cvs/ports/archivers/makeself/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo	3 Nov 2017 14:21:04 -	1.7
+++ distinfo	9 Sep 2018 15:30:56 -
@@ -1,2 +1,2 @@
-SHA256 (makeself-2.3.1.tar.gz) = ciEfq45uNOwWrN7UcgPJ//Kj8TE8nr1DMPbJT/6kOZM=
-SIZE (makeself-2.3.1.tar.gz) = 25013
+SHA256 (makeself-2.4.0.tar.gz) = dqjD8/rRtVw5uikEoZ50liFR+Ugd8DCR1OVJOL3RP1A=
+SIZE (makeself-2.4.0.tar.gz) = 26735


Re: UPDATE: archivers/makeself 2.3.1 => 2.4.0

2018-09-09 Thread Stuart Henderson
On 2018/09/09 10:20, Brian Callahan wrote:
> 
> On 09/09/18 07:49, Stuart Henderson wrote:
> > On 2018/09/08 23:12, Brian Callahan wrote:
> > > * OpenSSL improvements.
> > Any more details about what they changed here?
> > 
> 
> Had to find it -- the commit was simply called "OpenSSL improvements" :)
> It's this:
> 
> * Add support for alternate password source for openssl encryption
> 
> * OpenSSL decrypt works on Solaris 10 with default openssl install
> 
> https://github.com/megastep/makeself/commit/d3232ec6e1b02bea6792b19de1f4b5d7be217d9f
> 

Thanks, that should be alright. But then rereading your mail I noticed this,...

> * Added new --sha256 argument to use a SHA256 checksum to verify the integrity
> of archives. The shasum or sha256sum commands need to be available on the
> targeted systems.

...which doesn't match our usual sha256 binary.



Re: UPDATE: archivers/makeself 2.3.1 => 2.4.0

2018-09-09 Thread Brian Callahan



On 09/09/18 07:49, Stuart Henderson wrote:

On 2018/09/08 23:12, Brian Callahan wrote:

* OpenSSL improvements.

Any more details about what they changed here?



Had to find it -- the commit was simply called "OpenSSL improvements" :)
It's this:

* Add support for alternate password source for openssl encryption

* OpenSSL decrypt works on Solaris 10 with default openssl install

https://github.com/megastep/makeself/commit/d3232ec6e1b02bea6792b19de1f4b5d7be217d9f



Re: UPDATE: archivers/makeself 2.3.1 => 2.4.0

2018-09-09 Thread Stuart Henderson
On 2018/09/08 23:12, Brian Callahan wrote:
> * OpenSSL improvements.

Any more details about what they changed here?



UPDATE: archivers/makeself 2.3.1 => 2.4.0

2018-09-08 Thread Brian Callahan

Hi ports --

Attached is a trivial update to archivers/makeself. Upstream changelog 
in its entirety is reproduced below:
* Added new --sha256 argument to use a SHA256 checksum to verify the 
integrity of archives. The shasum or sha256sum commands need to be 
available on the targeted systems.

* Fixes for extracting to directories containing spaces.
* OpenSSL improvements.
* Base64 decoding support on macOS.
* Various documentation updates.

A simple test works here. Not taking MAINTAINER since I can't see myself 
using it; again just taking another maintainer-less item off the 
portroach queue.


OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/archivers/makeself/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile	3 Nov 2017 14:21:04 -	1.14
+++ Makefile	9 Sep 2018 03:10:36 -
@@ -2,7 +2,7 @@
 
 COMMENT=		script generating a self-extractible .tgz from a directory
 
-V=			2.3.1
+V=			2.4.0
 DISTNAME=		makeself-${V}
 
 GH_PROJECT=		makeself
Index: distinfo
===
RCS file: /cvs/ports/archivers/makeself/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo	3 Nov 2017 14:21:04 -	1.7
+++ distinfo	9 Sep 2018 03:10:36 -
@@ -1,2 +1,2 @@
-SHA256 (makeself-2.3.1.tar.gz) = ciEfq45uNOwWrN7UcgPJ//Kj8TE8nr1DMPbJT/6kOZM=
-SIZE (makeself-2.3.1.tar.gz) = 25013
+SHA256 (makeself-2.4.0.tar.gz) = dqjD8/rRtVw5uikEoZ50liFR+Ugd8DCR1OVJOL3RP1A=
+SIZE (makeself-2.4.0.tar.gz) = 26735