Re: UPDATE: par2cmdline 0.7.4

2017-12-11 Thread Jeremie Courreges-Anglas 
On Sat, Dec 09 2017, Mikolaj Kucharski  wrote:
> On Thu, Dec 07, 2017 at 11:12:29PM +0100, Jeremie Courreges-Anglas wrote:
>> On Wed, Nov 29 2017, Mikolaj Kucharski  wrote:
>> > Hi,
>> >
>> > Update to the latest release on GitHub. Ports changes:
>> >
>> > - drop patches included by upstream
>> > - adapt pledge(2) patches after files moved into src/ subdir
>> > - use GitHub variables
>> > - drop uneeded variables after previous
>> >
>> > The biggest change which I'm aware from user perspective is author
>> > inversed the behaviour of -N option in version 0.7.0. If you are
>> > using par2cmdline with that option, you should drop it after attached
>> > update. If you want to bring back behaviour of par2cmdline from before
>> > version 0.7.0, then you need to add -N to your scripts or apps. I
>> > personally was relaying on -N, so now I can remove it.
>> >
>> > Changes between versions by upstream can be seen at:
>> >
>> >https://github.com/Parchive/par2cmdline/releases
>> >
>> > I personally didn't had a chance to test this release properly yet, but
>> > posting if someone else is using par2cmdline too.
>> >
>> > Regress tests pass on amd64:
>> >
>> > # TOTAL: 28
>> > # PASS:  28
>> > # SKIP:  0
>> > # XFAIL: 0
>> > # FAIL:  0
>> > # XPASS: 0
>> > # ERROR: 0
>> 
>> This update looks good, just one question: why switch to
>> github-generated tarballs?  Upstream still provides tarballs as usual.
>
> It looks like a mistake. I don't remember why I did it. Thanks for
> catching this. Updated diff below, switching back to a release
> tarball.

Committed, thanks.

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

Re: UPDATE: par2cmdline 0.7.4

2017-12-09 Thread Mikolaj Kucharski 
On Thu, Dec 07, 2017 at 11:12:29PM +0100, Jeremie Courreges-Anglas wrote:
> On Wed, Nov 29 2017, Mikolaj Kucharski  wrote:
> > Hi,
> >
> > Update to the latest release on GitHub. Ports changes:
> >
> > - drop patches included by upstream
> > - adapt pledge(2) patches after files moved into src/ subdir
> > - use GitHub variables
> > - drop uneeded variables after previous
> >
> > The biggest change which I'm aware from user perspective is author
> > inversed the behaviour of -N option in version 0.7.0. If you are
> > using par2cmdline with that option, you should drop it after attached
> > update. If you want to bring back behaviour of par2cmdline from before
> > version 0.7.0, then you need to add -N to your scripts or apps. I
> > personally was relaying on -N, so now I can remove it.
> >
> > Changes between versions by upstream can be seen at:
> >
> > https://github.com/Parchive/par2cmdline/releases
> >
> > I personally didn't had a chance to test this release properly yet, but
> > posting if someone else is using par2cmdline too.
> >
> > Regress tests pass on amd64:
> >
> > # TOTAL: 28
> > # PASS:  28
> > # SKIP:  0
> > # XFAIL: 0
> > # FAIL:  0
> > # XPASS: 0
> > # ERROR: 0
> 
> This update looks good, just one question: why switch to
> github-generated tarballs?  Upstream still provides tarballs as usual.

It looks like a mistake. I don't remember why I did it. Thanks for
catching this. Updated diff below, switching back to a release
tarball.



Index: Makefile
===
RCS file: /cvs/ports/archivers/par2cmdline/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- Makefile26 Jul 2017 22:45:14 -  1.16
+++ Makefile9 Dec 2017 16:40:01 -
@@ -2,10 +2,8 @@
 
 COMMENT =  command line implementation of the PAR v2.0 specification
 
-V =0.6.14
+V =0.7.4
 DISTNAME = par2cmdline-$V
-DISTFILES =${DISTNAME}{v$V}.tar.gz
-REVISION = 2
 
 CATEGORIES =   archivers
 
@@ -19,7 +17,7 @@ WANTLIB = c m ${COMPILER_LIBCXX}
 
 MAINTAINER =   Mikolaj Kucharski 
 
-MASTER_SITES = ${HOMEPAGE}archive/
+MASTER_SITES = ${HOMEPAGE}releases/download/v$V/
 
 BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@@ -41,8 +39,5 @@ post-patch:
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/par2cmdline
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/par2cmdline
-
-pre-test:
-   sed -i -e 's,^tar -xf,tar -xzf,' ${WRKSRC}/tests/test*
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/archivers/par2cmdline/distinfo,v
retrieving revision 1.6
diff -u -p -u -r1.6 distinfo
--- distinfo5 Oct 2015 16:50:14 -   1.6
+++ distinfo9 Dec 2017 16:40:01 -
@@ -1,2 +1,2 @@
-SHA256 (par2cmdline-0.6.14.tar.gz) = 
L9gxupJNnw7NkkLKRVUbaZXt4e0oGveaow50kNVZbno=
-SIZE (par2cmdline-0.6.14.tar.gz) = 3539262
+SHA256 (par2cmdline-0.7.4.tar.gz) = 
uPHju+cs0pgigzLmfTU3BsPaFsxFI8Yvb9BT9JxUsdA=
+SIZE (par2cmdline-0.7.4.tar.gz) = 3617577
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/archivers/par2cmdline/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-configure_ac
--- patches/patch-configure_ac  13 Jun 2016 17:32:27 -  1.1
+++ patches/patch-configure_ac  9 Dec 2017 16:40:01 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-configure_ac,v 1.1 2016/06/13 17:32:27 semarie Exp $
 configure.ac.orig  Wed Jun  8 23:30:46 2016
-+++ configure.ac   Wed Jun  8 23:31:20 2016
-@@ -56,6 +56,7 @@ dnl Checks for library functions.
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -60,6 +60,7 @@ dnl Checks for library functions.
  AC_FUNC_MEMCMP
  AC_CHECK_FUNCS([stricmp] [strcasecmp])
  AC_CHECK_FUNCS([strchr] [memcpy])
Index: patches/patch-par1repairer_cpp
===
RCS file: patches/patch-par1repairer_cpp
diff -N patches/patch-par1repairer_cpp
--- patches/patch-par1repairer_cpp  13 Jun 2016 17:32:27 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-par1repairer_cpp,v 1.3 2016/06/13 17:32:27 semarie Exp $
-
-pledge:
-'par2 repair' with par1 files - stdio rpath cpath
-once the target files have been opened for writing, wpath is no
-longer required, cpath must be kept to delete partial files in
-case of an error
-
 par1repairer.cpp.orig  Wed Jun  8 23:41:11 2016
-+++ par1repairer.cpp   Wed Jun  8 23:42:01 2016
-@@ -157,6 +157,14 @@ Result Par1Repairer::Process(const CommandLine 
- if (!CreateTargetFiles())
-   return eFileIOError;
- 
-+#ifdef HAVE_PLEDGE
-+if (pledge("stdio rpath cpath", NULL) == -1)
-+{
-+  cerr << "pledge failed" << endl;

Re: UPDATE: par2cmdline 0.7.4

2017-12-07 Thread Jeremie Courreges-Anglas 
On Wed, Nov 29 2017, Mikolaj Kucharski  wrote:
> Hi,
>
> Update to the latest release on GitHub. Ports changes:
>
> - drop patches included by upstream
> - adapt pledge(2) patches after files moved into src/ subdir
> - use GitHub variables
> - drop uneeded variables after previous
>
> The biggest change which I'm aware from user perspective is author
> inversed the behaviour of -N option in version 0.7.0. If you are
> using par2cmdline with that option, you should drop it after attached
> update. If you want to bring back behaviour of par2cmdline from before
> version 0.7.0, then you need to add -N to your scripts or apps. I
> personally was relaying on -N, so now I can remove it.
>
> Changes between versions by upstream can be seen at:
>
>   https://github.com/Parchive/par2cmdline/releases
>
> I personally didn't had a chance to test this release properly yet, but
> posting if someone else is using par2cmdline too.
>
> Regress tests pass on amd64:
>
> # TOTAL: 28
> # PASS:  28
> # SKIP:  0
> # XFAIL: 0
> # FAIL:  0
> # XPASS: 0
> # ERROR: 0

This update looks good, just one question: why switch to
github-generated tarballs?  Upstream still provides tarballs as usual.

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

Re: UPDATE: par2cmdline 0.7.4

2017-11-29 Thread Mikolaj Kucharski 
On Wed, Nov 29, 2017 at 12:56:05AM +, Mikolaj Kucharski wrote:
> I personally didn't had a chance to test this release properly yet, but
> posting if someone else is using par2cmdline too.

Tested with content from the Internet. Verify and repair seems to work.

Diff at https://marc.info/?l=openbsd-ports=151191699530103=2

-- 
best regards
q#

UPDATE: par2cmdline 0.7.4

2017-11-28 Thread Mikolaj Kucharski 
Hi,

Update to the latest release on GitHub. Ports changes:

- drop patches included by upstream
- adapt pledge(2) patches after files moved into src/ subdir
- use GitHub variables
- drop uneeded variables after previous

The biggest change which I'm aware from user perspective is author
inversed the behaviour of -N option in version 0.7.0. If you are
using par2cmdline with that option, you should drop it after attached
update. If you want to bring back behaviour of par2cmdline from before
version 0.7.0, then you need to add -N to your scripts or apps. I
personally was relaying on -N, so now I can remove it.

Changes between versions by upstream can be seen at:

https://github.com/Parchive/par2cmdline/releases

I personally didn't had a chance to test this release properly yet, but
posting if someone else is using par2cmdline too.

Regress tests pass on amd64:

# TOTAL: 28
# PASS:  28
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0


Index: Makefile
===
RCS file: /cvs/ports/archivers/par2cmdline/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile26 Jul 2017 22:45:14 -  1.16
+++ Makefile28 Nov 2017 23:16:16 -
@@ -2,15 +2,12 @@
 
 COMMENT =  command line implementation of the PAR v2.0 specification
 
-V =0.6.14
-DISTNAME = par2cmdline-$V
-DISTFILES =${DISTNAME}{v$V}.tar.gz
-REVISION = 2
+GH_ACCOUNT =BlackIkeEagle
+GH_PROJECT =par2cmdline
+GH_TAGNAME =v0.7.4
 
 CATEGORIES =   archivers
 
-HOMEPAGE = https://github.com/BlackIkeEagle/par2cmdline/
-
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
@@ -19,8 +16,6 @@ WANTLIB = c m ${COMPILER_LIBCXX}
 
 MAINTAINER =   Mikolaj Kucharski 
 
-MASTER_SITES = ${HOMEPAGE}archive/
-
 BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
 
@@ -41,8 +36,5 @@ post-patch:
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/par2cmdline
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/par2cmdline
-
-pre-test:
-   sed -i -e 's,^tar -xf,tar -xzf,' ${WRKSRC}/tests/test*
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/archivers/par2cmdline/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo5 Oct 2015 16:50:14 -   1.6
+++ distinfo28 Nov 2017 23:16:16 -
@@ -1,2 +1,2 @@
-SHA256 (par2cmdline-0.6.14.tar.gz) = 
L9gxupJNnw7NkkLKRVUbaZXt4e0oGveaow50kNVZbno=
-SIZE (par2cmdline-0.6.14.tar.gz) = 3539262
+SHA256 (par2cmdline-0.7.4.tar.gz) = 
6iYPqAS7IFFBI96gagrUBmJgzVx22wh3FUaMp+LUnEc=
+SIZE (par2cmdline-0.7.4.tar.gz) = 3549893
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/archivers/par2cmdline/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_ac
--- patches/patch-configure_ac  13 Jun 2016 17:32:27 -  1.1
+++ patches/patch-configure_ac  28 Nov 2017 23:16:16 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-configure_ac,v 1.1 2016/06/13 17:32:27 semarie Exp $
 configure.ac.orig  Wed Jun  8 23:30:46 2016
-+++ configure.ac   Wed Jun  8 23:31:20 2016
-@@ -56,6 +56,7 @@ dnl Checks for library functions.
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -60,6 +60,7 @@ dnl Checks for library functions.
  AC_FUNC_MEMCMP
  AC_CHECK_FUNCS([stricmp] [strcasecmp])
  AC_CHECK_FUNCS([strchr] [memcpy])
Index: patches/patch-par1repairer_cpp
===
RCS file: patches/patch-par1repairer_cpp
diff -N patches/patch-par1repairer_cpp
--- patches/patch-par1repairer_cpp  13 Jun 2016 17:32:27 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-par1repairer_cpp,v 1.3 2016/06/13 17:32:27 semarie Exp $
-
-pledge:
-'par2 repair' with par1 files - stdio rpath cpath
-once the target files have been opened for writing, wpath is no
-longer required, cpath must be kept to delete partial files in
-case of an error
-
 par1repairer.cpp.orig  Wed Jun  8 23:41:11 2016
-+++ par1repairer.cpp   Wed Jun  8 23:42:01 2016
-@@ -157,6 +157,14 @@ Result Par1Repairer::Process(const CommandLine 
- if (!CreateTargetFiles())
-   return eFileIOError;
- 
-+#ifdef HAVE_PLEDGE
-+if (pledge("stdio rpath cpath", NULL) == -1)
-+{
-+  cerr << "pledge failed" << endl;
-+  return eLogicError;
-+}
-+#endif
-+
- // Work out which data blocks are available, which need to be 
recreated, 
- // and compute the appropriate Reed Solomon matrix.
- if (!ComputeRSmatrix())
Index: patches/patch-par2cmdline_cpp
===
RCS file: patches/patch-par2cmdline_cpp
diff -N patches/patch-par2cmdline_cpp
---