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
--- Makefile    3 Sep 2020 17:11:10 -0000       1.34
+++ Makefile    19 Dec 2020 06:35:01 -0000
@@ -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 =          zstd    3.2     # 1.4.5
+SHARED_LIBS =          zstd    4.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
--- distinfo    28 May 2020 19:31:56 -0000      1.20
+++ distinfo    19 Dec 2020 06:35:01 -0000
@@ -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 -0000       1.9
+++ patches/patch-lib_Makefile  19 Dec 2020 06:35:01 -0000
@@ -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 -0000       1.5
+++ patches/patch-programs_Makefile     19 Dec 2020 06:35:01 -0000
@@ -5,12 +5,12 @@ Some compilers don't have -Wvla
 Index: programs/Makefile
 --- programs/Makefile.orig
 +++ programs/Makefile
-@@ -51,7 +51,7 @@ CFLAGS  ?= -O3
+@@ -59,7 +59,7 @@ CFLAGS   ?= -O3
  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) $(LDFLAGS)
+ CFLAGS   += $(DEBUGFLAGS) $(MOREFLAGS)
+ FLAGS     = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
Index: patches/patch-tests_Makefile
===================================================================
RCS file: /cvs/ports/archivers/zstd/patches/patch-tests_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tests_Makefile
--- patches/patch-tests_Makefile        3 Sep 2020 17:11:10 -0000       1.1
+++ patches/patch-tests_Makefile        19 Dec 2020 06:35:01 -0000
@@ -5,7 +5,7 @@ Some compilers don't have -Wvla
 Index: tests/Makefile
 --- tests/Makefile.orig
 +++ tests/Makefile
-@@ -35,7 +35,7 @@ CFLAGS     ?= -O3
+@@ -36,7 +36,7 @@ CFLAGS     ?= -O3
  CFLAGS     += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow                 
\
                -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement 
\
                -Wstrict-prototypes -Wundef                                     
\
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/archivers/zstd/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   8 Dec 2019 18:41:48 -0000       1.6
+++ pkg/PLIST   19 Dec 2020 06:35:01 -0000
@@ -5,7 +5,6 @@ bin/zstdcat
 bin/zstdgrep
 bin/zstdless
 bin/zstdmt
-include/zbuff.h
 include/zdict.h
 include/zstd.h
 include/zstd_errors.h

Reply via email to