Re: UPDATE archivers/zstd-1.5.6

2024-04-16 Thread Bjorn Ketelaars
On Wed 27/03/2024 22:39, Bjorn Ketelaars wrote:
> Diff below updates zstd to 1.5.6. Release notes can be found at
> https://github.com/facebook/zstd/releases/tag/v1.5.6. Minor of shared
> lib has been bumped because of the addition of a symbol.
> 
> Passes all tests, and run tested with several tools from ports.
> 
> I did not build-test all consumers (~70), but looking at the changelog I
> expect that this update will not cause an issue.
> 
> Comments/OK?

Ping...

Diff enclosed again.


diff --git Makefile Makefile
index 65affa06e14..3b6d18883ae 100644
--- Makefile
+++ Makefile
@@ -1,9 +1,9 @@
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.5.5
+V =1.5.6
 DISTNAME = zstd-${V}
 
-SHARED_LIBS =  zstd6.3 # 1.5.5
+SHARED_LIBS =  zstd6.4 # 1.5.6
 
 CATEGORIES =   archivers
 
diff --git distinfo distinfo
index bd76eb4b7f4..aecd777277e 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.5.5.tar.gz) = nEOWzIKc+uMZpuJhUgLoKq1BNyBzSC/OKG+seGRtPuQ=
-SIZE (zstd-1.5.5.tar.gz) = 2368543
+SHA256 (zstd-1.5.6.tar.gz) = jCngbPQqrMHq/EB3ri7Gxvy5amJhV+BZPV6Co0/UA8E=
+SIZE (zstd-1.5.6.tar.gz) = 2406875
diff --git patches/patch-lib_libzstd_mk patches/patch-lib_libzstd_mk
index c2272b3b354..d853a6303ce 100644
--- patches/patch-lib_libzstd_mk
+++ patches/patch-lib_libzstd_mk
@@ -3,7 +3,7 @@ Some compilers don't have -Wvla.
 Index: lib/libzstd.mk
 --- lib/libzstd.mk.orig
 +++ lib/libzstd.mk
-@@ -100,7 +100,7 @@ endif
+@@ -113,7 +113,7 @@ endif
  DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
  -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
  -Wstrict-prototypes -Wundef -Wpointer-arith \



Re: UPDATE archivers/zstd-1.5.5

2023-04-04 Thread Bjorn Ketelaars
On Wed 05/04/2023 06:45, Stuart Henderson wrote:
> On 2023/04/05 06:47, Bjorn Ketelaars wrote:
> > ztsd-1.5.5 has been released. Primary focus is to correct a rare
> > corruption bug in high compression mode. Overview on changes can be
> > found at https://github.com/facebook/zstd/releases/tag/v1.5.5.
> > 
> > Bumped minor of libzstd because of additions of symbols. Dropped a patch
> > as it has been addressed upstream.
> > 
> > Build- and run-tested on amd64, 'make test' passes all tests, and build
> > tested several consumers.
> > 
> > Comments/OK?
> 
> OK. More info on the bug at https://github.com/facebook/zstd/pull/3517
> 
> Despite the rarity it probably makes sense to go to -stable (fortunately
> only a minor bump), do you agree?

Yes, this makes sense. I will prepare a diff for -stable.



Re: UPDATE archivers/zstd-1.5.5

2023-04-04 Thread Stuart Henderson
On 2023/04/05 06:47, Bjorn Ketelaars wrote:
> ztsd-1.5.5 has been released. Primary focus is to correct a rare
> corruption bug in high compression mode. Overview on changes can be
> found at https://github.com/facebook/zstd/releases/tag/v1.5.5.
> 
> Bumped minor of libzstd because of additions of symbols. Dropped a patch
> as it has been addressed upstream.
> 
> Build- and run-tested on amd64, 'make test' passes all tests, and build
> tested several consumers.
> 
> Comments/OK?

OK. More info on the bug at https://github.com/facebook/zstd/pull/3517

Despite the rarity it probably makes sense to go to -stable (fortunately
only a minor bump), do you agree?



Re: UPDATE archivers/zstd-1.5.4

2023-02-11 Thread Stuart Henderson
On 2023/02/11 07:50, Bjorn Ketelaars wrote:
> zstd-1.5.4 is a pretty big release benefiting from one year of work. It
> offers performance improvements, as well as new features, and it fixes
> some bugs. Details can be found at
> https://github.com/facebook/zstd/releases/tag/v1.5.4
> 
> Bumped minor because of addition of symbols.
> 
> 'make test' passes all tests, run tested with several consumers on
> amd64, and build tested about half of the consumers.
> 
> Comments/OK?

OK. Tests look good on aarch64.



Re: UPDATE archivers/zstd-1.5.2

2022-01-23 Thread Bjorn Ketelaars
On Sun 23/01/2022 14:35, Stuart Henderson wrote:
> On 2022/01/21 05:40, Bjorn Ketelaars wrote:
> >  --- lib/libzstd.mk.orig
> >  +++ lib/libzstd.mk
> > -@@ -79,7 +79,7 @@ endif
> > +@@ -81,7 +81,7 @@ endif
> > CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
> >   -DDYNAMIC_BMI2=0 -DNDEBUG
> >   else
> > --  CFLAGS += -O3
> > -+  CFLAGS +=
> > +-  CFLAGS ?= -O3
> > ++  CFLAGS ?=
> 
> is there any need to patch this now that upstream changed it to "?=" ?

There is no need, thank you for noticing this. New diff:


diff --git Makefile Makefile
index 9c9e26b1911..edc7e0bbb80 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.5.1
+V =1.5.2
 DISTNAME = zstd-${V}
 
 SHARED_LIBS =  zstd6.1 # 1.5.1
diff --git distinfo distinfo
index a4aad9aef0e..25b30205e17 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.5.1.tar.gz) = 4osvLtVxDqDToeysP2qUegFrlyud0wJCNpAQ5fU9cAI=
-SIZE (zstd-1.5.1.tar.gz) = 1934669
+SHA256 (zstd-1.5.2.tar.gz) = fELVb6wSaSmmqF28c/8dskEdBPEE+um96lEwVmOoP9A=
+SIZE (zstd-1.5.2.tar.gz) = 1936664
diff --git patches/patch-lib_libzstd_mk patches/patch-lib_libzstd_mk
index 1cf669345a6..f88a8fea02c 100644
--- patches/patch-lib_libzstd_mk
+++ patches/patch-lib_libzstd_mk
@@ -1,21 +1,11 @@
 $OpenBSD: patch-lib_libzstd_mk,v 1.1 2021/12/25 13:28:13 bket Exp $
 
-Don't set compiler optimisation level.
 Some compilers don't have -Wvla.
 
 Index: lib/libzstd.mk
 --- lib/libzstd.mk.orig
 +++ lib/libzstd.mk
-@@ -79,7 +79,7 @@ endif
-   CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
- -DDYNAMIC_BMI2=0 -DNDEBUG
- else
--  CFLAGS += -O3
-+  CFLAGS +=
- endif
- 
- DEBUGLEVEL ?= 0
-@@ -90,7 +90,7 @@ endif
+@@ -92,7 +92,7 @@ endif
  DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
  -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
  -Wstrict-prototypes -Wundef -Wpointer-arith \
@@ -23,4 +13,4 @@ Index: lib/libzstd.mk
 +-Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
  -Wredundant-decls -Wmissing-prototypes -Wc++-compat
  CFLAGS   += $(DEBUGFLAGS) $(MOREFLAGS)
- LDFLAGS  += $(MOREFLAGS)
+ ASFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS) $(CFLAGS)



Re: UPDATE archivers/zstd-1.5.2

2022-01-23 Thread Stuart Henderson
On 2022/01/21 05:40, Bjorn Ketelaars wrote:
>  --- lib/libzstd.mk.orig
>  +++ lib/libzstd.mk
> -@@ -79,7 +79,7 @@ endif
> +@@ -81,7 +81,7 @@ endif
> CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
>   -DDYNAMIC_BMI2=0 -DNDEBUG
>   else
> --  CFLAGS += -O3
> -+  CFLAGS +=
> +-  CFLAGS ?= -O3
> ++  CFLAGS ?=

is there any need to patch this now that upstream changed it to "?=" ?



Re: UPDATE archivers/zstd-1.5.1

2021-12-25 Thread Klemens Nanni
On Wed, Dec 22, 2021 at 06:58:06AM +0100, Bjorn Ketelaars wrote:
> zstd-1.5.1 is a maintenance release, bringing small refinements. Release
> notes and changelog can be found at
> https://github.com/facebook/zstd/releases/tag/v1.5.1.
> 
> Shared lib needs a minor bump because of two additions.
> 
> All tests pass, and successfully build tested several consumers.
> 
> Comments/OK?

OK kn

If you @comment the symlinks in PLIST patch-lib_Makefile could go.



Re: UPDATE archivers/zstd-1.5.0

2021-06-06 Thread Daniel Jakots
On Wed, 26 May 2021 06:09:24 +0200, Bjorn Ketelaars 
wrote:

> Diff below updates zstd to 1.5.0

ok danj



Re: UPDATE archivers/zstd-1.5.0

2021-05-25 Thread Bjorn Ketelaars
On Sun 16/05/2021 11:51, Bjorn Ketelaars wrote:
> Diff below updates zstd to 1.5.0, which is a major release featuring
> large performance improvements as well as API changes. Overview on
> changes can be found at
> https://github.com/facebook/zstd/releases/tag/v1.5.0.
> 
> Changes to the port:
> - Bumped major of libzstd because of removal of symbols
> - Synced patches
> 
> Testing:
> - 'make test' runs successful
> - Run with several consumers
> - Build tested consumers listed by:
> 
> echo "select fullpkgpath from depends where dependspath='archivers/zstd'" | 
> sqlite3 /usr/local/share/sqlports


Pingany takers?

Diff enclosed again for your convenience.


diff --git Makefile Makefile
index 5d870dca9ef..063fcc3cb1a 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,10 @@
 
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.4.9
+V =1.5.0
 DISTNAME = zstd-${V}
 
-SHARED_LIBS =  zstd5.0 # 1.4.9
+SHARED_LIBS =  zstd6.0 # 1.5.0
 
 CATEGORIES =   archivers
 
diff --git distinfo distinfo
index 1560e8c4b44..6753a634ff2 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.4.9.tar.gz) = Kax04Z6ihlkBc2GXYkDEtcXCTbO4kzhzGm/rl8A40pM=
-SIZE (zstd-1.4.9.tar.gz) = 1821109
+SHA256 (zstd-1.5.0.tar.gz) = UZT7+ngfz0W5jF6EllGqezsKAIxrctSg23YPMAIpHpQ=
+SIZE (zstd-1.5.0.tar.gz) = 1851389
diff --git patches/patch-lib_Makefile patches/patch-lib_Makefile
index 07e5f754160..0ea7011ec09 100644
--- patches/patch-lib_Makefile
+++ patches/patch-lib_Makefile
@@ -7,7 +7,7 @@ $OpenBSD: patch-lib_Makefile,v 1.11 2021/03/06 19:31:22 bket 
Exp $
 Index: lib/Makefile
 --- lib/Makefile.orig
 +++ lib/Makefile
-@@ -52,7 +52,7 @@ endif
+@@ -55,7 +55,7 @@ endif
CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
  -DDYNAMIC_BMI2=0 -DNDEBUG
  else
@@ -16,7 +16,7 @@ Index: lib/Makefile
  endif
  
  DEBUGLEVEL ?= 0
-@@ -63,7 +63,7 @@ endif
+@@ -66,7 +66,7 @@ endif
  DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
  -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
  -Wstrict-prototypes -Wundef -Wpointer-arith \
@@ -25,12 +25,12 @@ Index: lib/Makefile
  -Wredundant-decls -Wmissing-prototypes -Wc++-compat
  CFLAGS   += $(DEBUGFLAGS) $(MOREFLAGS)
  FLAGS = $(CPPFLAGS) $(CFLAGS)
-@@ -428,8 +428,6 @@ install-shared:
+@@ -456,8 +456,6 @@ install-shared:
[ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
@echo Installing shared library
$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
 -  ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
 -  ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
  
+ .PHONY: install-includes
  install-includes:
-   [ -e $(DESTDIR)$(INCLUDEDIR) ] || $(INSTALL) -d -m 755 
$(DESTDIR)$(INCLUDEDIR)/
diff --git patches/patch-tests_Makefile patches/patch-tests_Makefile
index e353a9d57ee..11cd4ef92f7 100644
--- patches/patch-tests_Makefile
+++ patches/patch-tests_Makefile
@@ -5,12 +5,12 @@ Some compilers don't have -Wvla
 Index: tests/Makefile
 --- tests/Makefile.orig
 +++ tests/Makefile
-@@ -36,7 +36,7 @@ CFLAGS ?= -O3
+@@ -37,7 +37,7 @@ CFLAGS ?= -O3
  CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow 
\
-Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement 
\
-Wstrict-prototypes -Wundef 
\
 -  -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings  
\
 +  -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings  \
-   -Wredundant-decls -Wmissing-prototypes
+   -Wredundant-decls -Wmissing-prototypes 
-Wno-deprecated-declarations
  CFLAGS += $(DEBUGFLAGS)
  CPPFLAGS   += $(MOREFLAGS)



Re: UPDATE archivers/zstd-1.4.9

2021-03-06 Thread Stuart Henderson
On 2021/03/05 06:18, Bjorn Ketelaars wrote:
> Diff below updates zstd to 1.4.9, which is a bugfix release. Changelog
> can be found at [0].
> 
> Visibility of symbols in shared library has been fixed [1] resulting in
> check_sym reporting removal of several symbols. The latter warrants a
> major bump of SHARED_LIBS.
> 
> Regression tests pass on amd64, and build tested consumers.

I think a minor bump for the added function would actually be enough,
it doesn't seem likely that other software would be directly calling the
internal functions which are now hidden (especially as deps built ok),
but major bump doesn't hurt either.

> Do we need to test this update in a bulk? If not, comments/OK?

No need for that I think.

OK


> 
> [0] https://github.com/facebook/zstd/blob/v1.4.9/CHANGELOG
> [1] 
> https://github.com/facebook/zstd/commit/821d9acd17f251a8ee548eadbc3c5bccdfca7691
> 
> 
> diff --git Makefile Makefile
> index dd086cd73c5..2cf83bebb9b 100644
> --- Makefile
> +++ Makefile
> @@ -2,10 +2,10 @@
>  
>  COMMENT =zstandard fast real-time compression algorithm
>  
> -V =  1.4.8
> +V =  1.4.9
>  DISTNAME =   zstd-${V}
>  
> -SHARED_LIBS =zstd4.0 # 1.4.7
> +SHARED_LIBS =zstd5.0 # 1.4.9
>  
>  CATEGORIES = archivers
>  
> diff --git distinfo distinfo
> index 4ee8dd4cb1c..1560e8c4b44 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zstd-1.4.8.tar.gz) = MkeCl8oVACEQCNWWJ29TZ8VBmElc9nfpQ59HkaTGnyQ=
> -SIZE (zstd-1.4.8.tar.gz) = 1803550
> +SHA256 (zstd-1.4.9.tar.gz) = Kax04Z6ihlkBc2GXYkDEtcXCTbO4kzhzGm/rl8A40pM=
> +SIZE (zstd-1.4.9.tar.gz) = 1821109
> diff --git patches/patch-lib_Makefile patches/patch-lib_Makefile
> index f95960697f1..e9190f82814 100644
> --- patches/patch-lib_Makefile
> +++ patches/patch-lib_Makefile
> @@ -25,7 +25,7 @@ Index: lib/Makefile
>   -Wredundant-decls -Wmissing-prototypes -Wc++-compat
>   CFLAGS   += $(DEBUGFLAGS) $(MOREFLAGS)
>   FLAGS = $(CPPFLAGS) $(CFLAGS)
> -@@ -427,8 +427,6 @@ install-shared:
> +@@ -428,8 +428,6 @@ install-shared:
>   [ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
>   @echo Installing shared library
>   $(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
> diff --git patches/patch-programs_Makefile patches/patch-programs_Makefile
> index 012a78ef64b..5c3c731488c 100644
> --- patches/patch-programs_Makefile
> +++ patches/patch-programs_Makefile
> @@ -12,5 +12,5 @@ Index: programs/Makefile
>  --Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
>  +-Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
>   -Wredundant-decls -Wmissing-prototypes -Wc++-compat
> - CFLAGS   += $(DEBUGFLAGS) $(MOREFLAGS)
> - FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
> + CFLAGS   += $(DEBUGFLAGS)
> + CPPFLAGS += $(MOREFLAGS)
> diff --git patches/patch-tests_Makefile patches/patch-tests_Makefile
> index b76add422ac..f00f0b5f39c 100644
> --- patches/patch-tests_Makefile
> +++ patches/patch-tests_Makefile
> @@ -12,5 +12,5 @@ Index: tests/Makefile
>  -  -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings
>   \
>  +  -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings  \
> -Wredundant-decls -Wmissing-prototypes
> - CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
> - FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
> + CFLAGS += $(DEBUGFLAGS)
> + CPPFLAGS   += $(MOREFLAGS)
> 



Re: UPDATE archivers/zstd-1.4.7

2020-12-25 Thread Bjorn Ketelaars
On Sat 19/12/2020 07:39, Bjorn Ketelaars wrote:
> On Fri 18/12/2020 07:27, Bjorn Ketelaars wrote:
> > Diff below updates zstd to 1.4.7, which unleashes several months of
> > improvements across many axis, from performance to various fixes, to new
> > capabilities. Overview on changes can be found at
> > https://github.com/facebook/zstd/releases/tag/v1.4.7.
> > 
> > Major of SHARED_LIBS needs to be bumped as a symbol has been removed.
> > 
> > Testing (amd64 only)
> > - 'make test' runs successfully
> > - run tested as part of my borgbackup setup
> > - build tested consumers. That is all ports found with:
> > 
> > echo "select fullpkgpath from depends where dependspath like 
> > 'archivers/zstd'" | sqlite3 /usr/local/share/sqlports
> 
> Upstream released 1.4.8, which fixes an internal buffer unalignment bug.
> The issue is of no consequence for x64 and arm64 targets, but could
> become a problem for cpus relying on strict alignment, such as mips or
> older arm designs. Additional information can be found at
> https://github.com/facebook/zstd/releases/tag/v1.4.8
> 
> New diff, OK?

Ping...

Diff enclosed again for your convenience.


Index: Makefile
===
RCS file: /cvs/ports/archivers/zstd/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile3 Sep 2020 17:11:10 -   1.34
+++ Makefile19 Dec 2020 06:35:01 -
@@ -2,11 +2,10 @@
 
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.4.5
-REVISION = 0
+V =1.4.8
 DISTNAME = zstd-${V}
 
-SHARED_LIBS =  zstd3.2 # 1.4.5
+SHARED_LIBS =  zstd4.0 # 1.4.7
 
 CATEGORIES =   archivers
 
Index: distinfo
===
RCS file: /cvs/ports/archivers/zstd/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo28 May 2020 19:31:56 -  1.20
+++ distinfo19 Dec 2020 06:35:01 -
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.4.5.tar.gz) = mOkcfGvxYr+Q5OcP28QagYi5+o3lrYQMQBGYAUQGzp4=
-SIZE (zstd-1.4.5.tar.gz) = 1973695
+SHA256 (zstd-1.4.8.tar.gz) = MkeCl8oVACEQCNWWJ29TZ8VBmElc9nfpQ59HkaTGnyQ=
+SIZE (zstd-1.4.8.tar.gz) = 1803550
Index: patches/patch-lib_Makefile
===
RCS file: /cvs/ports/archivers/zstd/patches/patch-lib_Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 patch-lib_Makefile
--- patches/patch-lib_Makefile  3 Sep 2020 17:11:10 -   1.9
+++ patches/patch-lib_Makefile  19 Dec 2020 06:35:01 -
@@ -7,30 +7,30 @@ $OpenBSD: patch-lib_Makefile,v 1.9 2020/
 Index: lib/Makefile
 --- lib/Makefile.orig
 +++ lib/Makefile
-@@ -38,7 +38,7 @@ endif
+@@ -52,7 +52,7 @@ endif
+   CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
+ -DDYNAMIC_BMI2=0 -DNDEBUG
+ else
+-  CFLAGS += -O3
++  CFLAGS +=
+ endif
+ 
+ DEBUGLEVEL ?= 0
+@@ -63,7 +63,7 @@ endif
  DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
  -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
  -Wstrict-prototypes -Wundef -Wpointer-arith \
 --Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
 +-Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
  -Wredundant-decls -Wmissing-prototypes -Wc++-compat
- CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
- FLAGS= $(CPPFLAGS) $(CFLAGS)
-@@ -81,7 +81,7 @@ ifneq ($(ZSTD_LIB_MINIFY), 0)
-   CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
- -DDYNAMIC_BMI2=0 -DNDEBUG
- else
--  CFLAGS += -O3
-+  CFLAGS +=
- endif
- 
- # Modules
-@@ -328,8 +328,6 @@ install-shared: libzstd
+ CFLAGS   += $(DEBUGFLAGS) $(MOREFLAGS)
+ FLAGS = $(CPPFLAGS) $(CFLAGS)
+@@ -427,8 +427,6 @@ install-shared:
+   [ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
@echo Installing shared library
-   $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
-   $(Q)$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
--  $(Q)ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
--  $(Q)ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+   $(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
+-  ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+-  ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
  
  install-includes:
-   @echo Installing includes
+   [ -e $(DESTDIR)$(INCLUDEDIR) ] || $(INSTALL) -d -m 755 
$(DESTDIR)$(INCLUDEDIR)/
Index: patches/patch-programs_Makefile
===
RCS file: /cvs/ports/archivers/zstd/patches/patch-programs_Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-programs_Makefile
--- patches/patch-programs_Makefile 3 Sep 2020 17:11:10 -   1.5
+++ patches/patch-programs_Makefile 19 

Re: UPDATE archivers/zstd-1.4.7

2020-12-18 Thread Bjorn Ketelaars
On Fri 18/12/2020 07:27, Bjorn Ketelaars wrote:
> Diff below updates zstd to 1.4.7, which unleashes several months of
> improvements across many axis, from performance to various fixes, to new
> capabilities. Overview on changes can be found at
> https://github.com/facebook/zstd/releases/tag/v1.4.7.
> 
> Major of SHARED_LIBS needs to be bumped as a symbol has been removed.
> 
> Testing (amd64 only)
> - 'make test' runs successfully
> - run tested as part of my borgbackup setup
> - build tested consumers. That is all ports found with:
> 
> echo "select fullpkgpath from depends where dependspath like 
> 'archivers/zstd'" | sqlite3 /usr/local/share/sqlports

Upstream released 1.4.8, which fixes an internal buffer unalignment bug.
The issue is of no consequence for x64 and arm64 targets, but could
become a problem for cpus relying on strict alignment, such as mips or
older arm designs. Additional information can be found at
https://github.com/facebook/zstd/releases/tag/v1.4.8

New diff, OK?


Index: Makefile
===
RCS file: /cvs/ports/archivers/zstd/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile3 Sep 2020 17:11:10 -   1.34
+++ Makefile19 Dec 2020 06:35:01 -
@@ -2,11 +2,10 @@
 
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.4.5
-REVISION = 0
+V =1.4.8
 DISTNAME = zstd-${V}
 
-SHARED_LIBS =  zstd3.2 # 1.4.5
+SHARED_LIBS =  zstd4.0 # 1.4.7
 
 CATEGORIES =   archivers
 
Index: distinfo
===
RCS file: /cvs/ports/archivers/zstd/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo28 May 2020 19:31:56 -  1.20
+++ distinfo19 Dec 2020 06:35:01 -
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.4.5.tar.gz) = mOkcfGvxYr+Q5OcP28QagYi5+o3lrYQMQBGYAUQGzp4=
-SIZE (zstd-1.4.5.tar.gz) = 1973695
+SHA256 (zstd-1.4.8.tar.gz) = MkeCl8oVACEQCNWWJ29TZ8VBmElc9nfpQ59HkaTGnyQ=
+SIZE (zstd-1.4.8.tar.gz) = 1803550
Index: patches/patch-lib_Makefile
===
RCS file: /cvs/ports/archivers/zstd/patches/patch-lib_Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 patch-lib_Makefile
--- patches/patch-lib_Makefile  3 Sep 2020 17:11:10 -   1.9
+++ patches/patch-lib_Makefile  19 Dec 2020 06:35:01 -
@@ -7,30 +7,30 @@ $OpenBSD: patch-lib_Makefile,v 1.9 2020/
 Index: lib/Makefile
 --- lib/Makefile.orig
 +++ lib/Makefile
-@@ -38,7 +38,7 @@ endif
+@@ -52,7 +52,7 @@ endif
+   CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
+ -DDYNAMIC_BMI2=0 -DNDEBUG
+ else
+-  CFLAGS += -O3
++  CFLAGS +=
+ endif
+ 
+ DEBUGLEVEL ?= 0
+@@ -63,7 +63,7 @@ endif
  DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
  -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
  -Wstrict-prototypes -Wundef -Wpointer-arith \
 --Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
 +-Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
  -Wredundant-decls -Wmissing-prototypes -Wc++-compat
- CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
- FLAGS= $(CPPFLAGS) $(CFLAGS)
-@@ -81,7 +81,7 @@ ifneq ($(ZSTD_LIB_MINIFY), 0)
-   CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
- -DDYNAMIC_BMI2=0 -DNDEBUG
- else
--  CFLAGS += -O3
-+  CFLAGS +=
- endif
- 
- # Modules
-@@ -328,8 +328,6 @@ install-shared: libzstd
+ CFLAGS   += $(DEBUGFLAGS) $(MOREFLAGS)
+ FLAGS = $(CPPFLAGS) $(CFLAGS)
+@@ -427,8 +427,6 @@ install-shared:
+   [ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
@echo Installing shared library
-   $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
-   $(Q)$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
--  $(Q)ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
--  $(Q)ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+   $(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
+-  ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+-  ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
  
  install-includes:
-   @echo Installing includes
+   [ -e $(DESTDIR)$(INCLUDEDIR) ] || $(INSTALL) -d -m 755 
$(DESTDIR)$(INCLUDEDIR)/
Index: patches/patch-programs_Makefile
===
RCS file: /cvs/ports/archivers/zstd/patches/patch-programs_Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-programs_Makefile
--- patches/patch-programs_Makefile 3 Sep 2020 17:11:10 -   1.5
+++ patches/patch-programs_Makefile 19 Dec 2020 06:35:01 -
@@ -5,12 +5,12 @@ Some compilers don't have -Wvla
 Index: programs/Makefile
 --- programs/Makefile.orig
 +++ 

Re: UPDATE archivers/zstd

2018-04-04 Thread Klemens Nanni
On Wed, Apr 04, 2018 at 03:19:48PM +0200, Björn Ketelaars wrote:
> New diff. zstd requires a stable sort, which libc's qsort() is not
> guaranteed to be. Upstream proposed to use mergesort().
> 
> https://github.com/facebook/zstd/issues/1088
Nice work!

> Diff below brings zstd to 1.3.4.
> 
> I ran 'make test' a couple of times. All runs were successful.
> 
> OK?
OK kn.



Re: UPDATE archivers/zstd

2018-04-04 Thread Björn Ketelaars
On Fri 30/03/2018 23:18, Stuart Henderson wrote:
> On 2018/03/30 20:19, Björn Ketelaars wrote:
> > On Fri 30/03/2018 18:22, Stuart Henderson wrote:
> > > On 2018/03/30 19:01, Björn Ketelaars wrote:
> > > > On Fri 30/03/2018 13:45, Klemens Nanni wrote:
> > > > > On Fri, Mar 30, 2018 at 05:30:55AM +0200, Björn Ketelaars wrote:
> > > > > > zstd received an update, which focuses on performance. Changelog 
> > > > > > can be
> > > > > > found at https://github.com/facebook/zstd/blob/dev/NEWS. The major
> > > > > > number of the shared lib has been bumped as a couple of symbols have
> > > > > > been removed, and new ones have been added.
> > > > > > 
> > > > > > I've been running with this update for a couple of days on AMD64 
> > > > > > using
> > > > > > its only customer: borgbackup.
> > > > > > 
> > > > > > OK?
> > > > > Has anyone contacted upstream already to merge the trivial
> > > > > detection/support bits we're carrying in our patches? Would be nice to
> > > > > get those in, effectively limiting required patches on our site to
> > > > > library version handling.
> > > > > 
> > > > > Tests fail with a bunch of "use of undeclared identifier", did they 
> > > > > pass
> > > > > before?
> > > > > 
> > > > >   fatal error: too many errors emitted, stopping now 
> > > > > [-ferror-limit=]
> > > > >   2 warnings and 20 errors generated.
> > > > >   2 warnings and 20 errors generated.
> > > > 
> > > > 
> > > > I'm having a deja vu [0] ;-)
> > > > 
> > > > Could you send me your test.log?
> > > > 
> > > > [0] https://marc.info/?l=openbsd-ports=151473111522358=2
> > > > 
> > > 
> > > I don't see that here.  kn, do you have anything funny in 
> > > CFLAGS/CDIAGFLAGS/etc?
> > > 
> > > I have a different problem with tests though:
> > > 
> > > - Compress without dictID
> > > tmp  : 21.56%   ( 42430 =>   9148 bytes, tmp.zst) 
> > >  
> > > tmp.zst : Decoding error (36) : Restored data doesn't match checksum 
> > > gmake[1]: *** [Makefile:307: zstd-playTests] Error 1
> > > gmake[1]: Leaving directory '/usr/obj/ports/zstd-1.3.4/zstd-1.3.4/tests'
> > 
> > I ran 'make clean && make test' 3 times, one of which gave the same
> > error. The other 2 runs were ok. Included a test.log of one of the
> > successful runs.
> > 
> > Any suggestions on how to debug this issue?
> 
> Oh, the in-tree one does the same - since it's not worse than that
> I'm OK with updating, but maybe see if upstream have any suggestions
> about the "without dictID" test?

New diff. zstd requires a stable sort, which libc's qsort() is not
guaranteed to be. Upstream proposed to use mergesort().

https://github.com/facebook/zstd/issues/1088

Diff below brings zstd to 1.3.4.

I ran 'make test' a couple of times. All runs were successful.

OK?


Index: Makefile
===
RCS file: /cvs/ports/archivers/zstd/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile14 Jan 2018 10:30:28 -  1.15
+++ Makefile4 Apr 2018 13:03:53 -
@@ -4,9 +4,8 @@ COMMENT =   zstandard fast real-time comp
 
 GH_ACCOUNT =   facebook
 GH_PROJECT =   zstd
-GH_TAGNAME =   v1.3.3
-REVISION = 0
-SHARED_LIBS =  zstd0.0 #1.3.3
+GH_TAGNAME =   v1.3.4
+SHARED_LIBS =  zstd1.0 # 1.3.4
 
 CATEGORIES =   archivers
 
@@ -17,7 +16,7 @@ MAINTAINER =  Bjorn Ketelaars https://github.com/facebook/zstd/issues/1088
+
+Index: lib/dictBuilder/cover.c
+--- lib/dictBuilder/cover.c.orig
 lib/dictBuilder/cover.c
+@@ -583,7 +583,7 @@ static int COVER_ctx_init(COVER_ctx_t *ctx, const void
+ }
+ /* qsort doesn't take an opaque pointer, so pass as a global */
+ g_ctx = ctx;
+-qsort(ctx->suffix, ctx->suffixSize, sizeof(U32),
++mergesort(ctx->suffix, ctx->suffixSize, sizeof(U32),
+   (ctx->d <= 8 ? _strict_cmp8 : _strict_cmp));
+   }
+   DISPLAYLEVEL(2, "Computing frequencies\n");
Index: patches/patch-tests_playTests_sh
===
RCS file: /cvs/ports/archivers/zstd/patches/patch-tests_playTests_sh,v
retrieving revision 1.8
diff -u -p -r1.8 patch-tests_playTests_sh
--- patches/patch-tests_playTests_sh4 Jan 2018 14:47:20 -   1.8
+++ patches/patch-tests_playTests_sh4 Apr 2018 13:03:53 -
@@ -10,7 +10,7 @@ Index: tests/playTests.sh
*) MD5SUM="md5sum" ;;
  esac
  
-@@ -237,7 +238,7 @@ rm ./*.tmp ./*.zstd
+@@ -258,7 +259,7 @@ rm ./*.tmp ./*.zstd
  $ECHO "frame concatenation tests completed"
  
  



Re: UPDATE archivers/zstd

2018-03-30 Thread Stuart Henderson
On 2018/03/30 20:19, Björn Ketelaars wrote:
> On Fri 30/03/2018 18:22, Stuart Henderson wrote:
> > On 2018/03/30 19:01, Björn Ketelaars wrote:
> > > On Fri 30/03/2018 13:45, Klemens Nanni wrote:
> > > > On Fri, Mar 30, 2018 at 05:30:55AM +0200, Björn Ketelaars wrote:
> > > > > zstd received an update, which focuses on performance. Changelog can 
> > > > > be
> > > > > found at https://github.com/facebook/zstd/blob/dev/NEWS. The major
> > > > > number of the shared lib has been bumped as a couple of symbols have
> > > > > been removed, and new ones have been added.
> > > > > 
> > > > > I've been running with this update for a couple of days on AMD64 using
> > > > > its only customer: borgbackup.
> > > > > 
> > > > > OK?
> > > > Has anyone contacted upstream already to merge the trivial
> > > > detection/support bits we're carrying in our patches? Would be nice to
> > > > get those in, effectively limiting required patches on our site to
> > > > library version handling.
> > > > 
> > > > Tests fail with a bunch of "use of undeclared identifier", did they pass
> > > > before?
> > > > 
> > > > fatal error: too many errors emitted, stopping now 
> > > > [-ferror-limit=]
> > > > 2 warnings and 20 errors generated.
> > > > 2 warnings and 20 errors generated.
> > > 
> > > 
> > > I'm having a deja vu [0] ;-)
> > > 
> > > Could you send me your test.log?
> > > 
> > > [0] https://marc.info/?l=openbsd-ports=151473111522358=2
> > > 
> > 
> > I don't see that here.  kn, do you have anything funny in 
> > CFLAGS/CDIAGFLAGS/etc?
> > 
> > I have a different problem with tests though:
> > 
> > - Compress without dictID
> > tmp  : 21.56%   ( 42430 =>   9148 bytes, tmp.zst)   
> >
> > tmp.zst : Decoding error (36) : Restored data doesn't match checksum 
> > gmake[1]: *** [Makefile:307: zstd-playTests] Error 1
> > gmake[1]: Leaving directory '/usr/obj/ports/zstd-1.3.4/zstd-1.3.4/tests'
> 
> I ran 'make clean && make test' 3 times, one of which gave the same
> error. The other 2 runs were ok. Included a test.log of one of the
> successful runs.
> 
> Any suggestions on how to debug this issue?

Oh, the in-tree one does the same - since it's not worse than that
I'm OK with updating, but maybe see if upstream have any suggestions
about the "without dictID" test?



Re: UPDATE archivers/zstd

2018-03-30 Thread Björn Ketelaars
On Fri 30/03/2018 18:22, Stuart Henderson wrote:
> On 2018/03/30 19:01, Björn Ketelaars wrote:
> > On Fri 30/03/2018 13:45, Klemens Nanni wrote:
> > > On Fri, Mar 30, 2018 at 05:30:55AM +0200, Björn Ketelaars wrote:
> > > > zstd received an update, which focuses on performance. Changelog can be
> > > > found at https://github.com/facebook/zstd/blob/dev/NEWS. The major
> > > > number of the shared lib has been bumped as a couple of symbols have
> > > > been removed, and new ones have been added.
> > > > 
> > > > I've been running with this update for a couple of days on AMD64 using
> > > > its only customer: borgbackup.
> > > > 
> > > > OK?
> > > Has anyone contacted upstream already to merge the trivial
> > > detection/support bits we're carrying in our patches? Would be nice to
> > > get those in, effectively limiting required patches on our site to
> > > library version handling.
> > > 
> > > Tests fail with a bunch of "use of undeclared identifier", did they pass
> > > before?
> > > 
> > >   fatal error: too many errors emitted, stopping now [-ferror-limit=]
> > >   2 warnings and 20 errors generated.
> > >   2 warnings and 20 errors generated.
> > 
> > 
> > I'm having a deja vu [0] ;-)
> > 
> > Could you send me your test.log?
> > 
> > [0] https://marc.info/?l=openbsd-ports=151473111522358=2
> > 
> 
> I don't see that here.  kn, do you have anything funny in 
> CFLAGS/CDIAGFLAGS/etc?
> 
> I have a different problem with tests though:
> 
> - Compress without dictID
> tmp  : 21.56%   ( 42430 =>   9148 bytes, tmp.zst) 
>  
> tmp.zst : Decoding error (36) : Restored data doesn't match checksum 
> gmake[1]: *** [Makefile:307: zstd-playTests] Error 1
> gmake[1]: Leaving directory '/usr/obj/ports/zstd-1.3.4/zstd-1.3.4/tests'

I ran 'make clean && make test' 3 times, one of which gave the same
error. The other 2 runs were ok. Included a test.log of one of the
successful runs.

Any suggestions on how to debug this issue?


test.log.gz
Description: application/gunzip


Re: UPDATE archivers/zstd

2018-03-30 Thread Klemens Nanni
On Fri, Mar 30, 2018 at 08:07:31PM +0200, Klemens Nanni wrote:
> No, happens with an empty/missing mk.conf(5).
> 
> Pruned archivers/zstd, fetched from cvs.openbsd.org, applied the patch,
> ran make build... still getting errors. See attched `make build' log.
> 
> Running "(GENERIC.MP) #92: Wed Mar 21 15:23:36 MDT 2018" with
> zstd-1.3.3p0 xz-5.2.3p0 lz4-1.8.1.2 installed.
Ah, as bket already guessed right off-list, the build picks up installed
headers.

Removing zstd before building fixes this (`make build' still running).



Re: UPDATE archivers/zstd

2018-03-30 Thread Klemens Nanni
On Fri, Mar 30, 2018 at 06:22:47PM +0100, Stuart Henderson wrote:
> On 2018/03/30 19:01, Björn Ketelaars wrote:
> > On Fri 30/03/2018 13:45, Klemens Nanni wrote:
> > > On Fri, Mar 30, 2018 at 05:30:55AM +0200, Björn Ketelaars wrote:
> > > > zstd received an update, which focuses on performance. Changelog can be
> > > > found at https://github.com/facebook/zstd/blob/dev/NEWS. The major
> > > > number of the shared lib has been bumped as a couple of symbols have
> > > > been removed, and new ones have been added.
> > > > 
> > > > I've been running with this update for a couple of days on AMD64 using
> > > > its only customer: borgbackup.
> > > > 
> > > > OK?
> > > Has anyone contacted upstream already to merge the trivial
> > > detection/support bits we're carrying in our patches? Would be nice to
> > > get those in, effectively limiting required patches on our site to
> > > library version handling.
> > > 
> > > Tests fail with a bunch of "use of undeclared identifier", did they pass
> > > before?
> > > 
> > >   fatal error: too many errors emitted, stopping now [-ferror-limit=]
> > >   2 warnings and 20 errors generated.
> > >   2 warnings and 20 errors generated.
> > 
> > 
> > I'm having a deja vu [0] ;-)
> > 
> > Could you send me your test.log?
> > 
> > [0] https://marc.info/?l=openbsd-ports=151473111522358=2
> > 
> 
> I don't see that here.  kn, do you have anything funny in 
> CFLAGS/CDIAGFLAGS/etc?
No, happens with an empty/missing mk.conf(5).

Pruned archivers/zstd, fetched from cvs.openbsd.org, applied the patch,
ran make build... still getting errors. See attched `make build' log.

Running "(GENERIC.MP) #92: Wed Mar 21 15:23:36 MDT 2018" with
zstd-1.3.3p0 xz-5.2.3p0 lz4-1.8.1.2 installed.

> I have a different problem with tests though:
> 
> - Compress without dictID
> tmp  : 21.56%   ( 42430 =>   9148 bytes, tmp.zst) 
>  
> tmp.zst : Decoding error (36) : Restored data doesn't match checksum 
> gmake[1]: *** [Makefile:307: zstd-playTests] Error 1
> gmake[1]: Leaving directory '/usr/obj/ports/zstd-1.3.4/zstd-1.3.4/tests'


build.log.gz
Description: Binary data


Re: UPDATE archivers/zstd

2018-03-30 Thread Stuart Henderson
On 2018/03/30 19:01, Björn Ketelaars wrote:
> On Fri 30/03/2018 13:45, Klemens Nanni wrote:
> > On Fri, Mar 30, 2018 at 05:30:55AM +0200, Björn Ketelaars wrote:
> > > zstd received an update, which focuses on performance. Changelog can be
> > > found at https://github.com/facebook/zstd/blob/dev/NEWS. The major
> > > number of the shared lib has been bumped as a couple of symbols have
> > > been removed, and new ones have been added.
> > > 
> > > I've been running with this update for a couple of days on AMD64 using
> > > its only customer: borgbackup.
> > > 
> > > OK?
> > Has anyone contacted upstream already to merge the trivial
> > detection/support bits we're carrying in our patches? Would be nice to
> > get those in, effectively limiting required patches on our site to
> > library version handling.
> > 
> > Tests fail with a bunch of "use of undeclared identifier", did they pass
> > before?
> > 
> > fatal error: too many errors emitted, stopping now [-ferror-limit=]
> > 2 warnings and 20 errors generated.
> > 2 warnings and 20 errors generated.
> 
> 
> I'm having a deja vu [0] ;-)
> 
> Could you send me your test.log?
> 
> [0] https://marc.info/?l=openbsd-ports=151473111522358=2
> 

I don't see that here.  kn, do you have anything funny in CFLAGS/CDIAGFLAGS/etc?

I have a different problem with tests though:

- Compress without dictID
tmp  : 21.56%   ( 42430 =>   9148 bytes, tmp.zst)  
tmp.zst : Decoding error (36) : Restored data doesn't match checksum 
gmake[1]: *** [Makefile:307: zstd-playTests] Error 1
gmake[1]: Leaving directory '/usr/obj/ports/zstd-1.3.4/zstd-1.3.4/tests'



Re: UPDATE archivers/zstd

2018-03-30 Thread Björn Ketelaars
On Fri 30/03/2018 13:45, Klemens Nanni wrote:
> On Fri, Mar 30, 2018 at 05:30:55AM +0200, Björn Ketelaars wrote:
> > zstd received an update, which focuses on performance. Changelog can be
> > found at https://github.com/facebook/zstd/blob/dev/NEWS. The major
> > number of the shared lib has been bumped as a couple of symbols have
> > been removed, and new ones have been added.
> > 
> > I've been running with this update for a couple of days on AMD64 using
> > its only customer: borgbackup.
> > 
> > OK?
> Has anyone contacted upstream already to merge the trivial
> detection/support bits we're carrying in our patches? Would be nice to
> get those in, effectively limiting required patches on our site to
> library version handling.
> 
> Tests fail with a bunch of "use of undeclared identifier", did they pass
> before?
> 
>   fatal error: too many errors emitted, stopping now [-ferror-limit=]
>   2 warnings and 20 errors generated.
>   2 warnings and 20 errors generated.


I'm having a deja vu [0] ;-)

Could you send me your test.log?

[0] https://marc.info/?l=openbsd-ports=151473111522358=2



Re: UPDATE: archivers/zstd

2017-10-23 Thread Juan Francisco Cantero Hurtado
On Sun, Oct 22, 2017 at 11:59:48AM +0200, Rafael Sadowski wrote:
> Hi All,
> 
> please find below a simple update to 1.3.2.
> 
> - Adjust COMPILER
> - https://github.com/facebook/zstd/issues/335 is closed.
>   "Wanted to let the community know that we’ve released zstd v1.3.1
>earlier today, which adjusts it to be dual licensed as BSD and GPLv2."
> 
> All tests/benchmarks looks okay on amd64.
> 
> OK? Comments?
> 
> Best regards,
> 
> Rafael Sadowski
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/archivers/zstd/Makefile,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 Makefile
> --- Makefile  19 Jul 2017 22:16:30 -  1.11
> +++ Makefile  22 Oct 2017 09:59:11 -
> @@ -4,21 +4,19 @@ COMMENT =   zstandard fast real-time comp
>  
>  GH_ACCOUNT = facebook
>  GH_PROJECT = zstd
> -GH_TAGNAME = v1.3.0
> +GH_TAGNAME = v1.3.2
>  
>  CATEGORIES = archivers
>  
>  HOMEPAGE =   https://facebook.github.io/zstd/
>  
> -# BSD 3 clauses. zstd doesn't use known patented code or algorithms, however
> -# the project includes an additional patent grant in the file PATENTS.
> -# https://github.com/facebook/zstd/issues/335
> +# BSD 3 + GPLv2
>  PERMIT_PACKAGE_CDROM =   Yes

Don't remove the comment about the patents or the link. I prefer "BSD 3
clauses + GPLv2" instead of "BSD 3 + GPLv2".

>  
> -WANTLIB =c lzma pthread z
> +WANTLIB =c pthread z
>  LIB_DEPENDS =archivers/xz

Remove LIB_DEPENDS. We only needed xz for the lzma functionality.

With those changes, OK juanfra@


>  
> -COMPILER =   gcc
> +COMPILER =   base-clang ports-clang ports-gcc
>  COMPILER_LANGS = c
>  
>  MAKE_ENV =   CC="${CC}" CXX="${CXX}" \
> Index: distinfo
> ===
> RCS file: /cvs/ports/archivers/zstd/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 distinfo
> --- distinfo  19 Jul 2017 22:16:30 -  1.7
> +++ distinfo  22 Oct 2017 09:59:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (zstd-1.3.0.tar.gz) = D9umQ7Q4t8vOcA3MDns+PabYKQiMY3V6WYSTDi9ws0g=
> -SIZE (zstd-1.3.0.tar.gz) = 1469911
> +SHA256 (zstd-1.3.2.tar.gz) = rFBUo8ZOZRC8GuiQ0F49JxzDPO68nQasnwgQV2bSeYo=
> +SIZE (zstd-1.3.2.tar.gz) = 1618939
> Index: patches/patch-tests_playTests_sh
> ===
> RCS file: /cvs/ports/archivers/zstd/patches/patch-tests_playTests_sh,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 patch-tests_playTests_sh
> --- patches/patch-tests_playTests_sh  5 May 2017 18:16:53 -   1.6
> +++ patches/patch-tests_playTests_sh  22 Oct 2017 09:59:11 -
> @@ -1,7 +1,8 @@
>  $OpenBSD: patch-tests_playTests_sh,v 1.6 2017/05/05 18:16:53 juanfra Exp $
>  tests/playTests.sh.orig  Thu May  4 20:18:24 2017
> -+++ tests/playTests.sh   Fri May  5 17:04:40 2017
> -@@ -58,6 +58,7 @@ UNAME=$(uname)
> +Index: tests/playTests.sh
> +--- tests/playTests.sh.orig
>  tests/playTests.sh
> +@@ -67,6 +67,7 @@ UNAME=$(uname)
>   case "$UNAME" in
> Darwin) MD5SUM="md5 -r" ;;
> FreeBSD) MD5SUM="gmd5sum" ;;
> @@ -9,7 +10,7 @@ $OpenBSD: patch-tests_playTests_sh,v 1.6
> *) MD5SUM="md5sum" ;;
>   esac
>   
> -@@ -193,7 +194,7 @@ rm ./*.tmp ./*.zstd
> +@@ -209,7 +210,7 @@ rm ./*.tmp ./*.zstd
>   $ECHO "frame concatenation tests completed"
>   
>   
> 

-- 
Juan Francisco Cantero Hurtado http://juanfra.info