CVS commit: pkgsrc/textproc/raptor2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar  7 10:42:16 UTC 2023

Modified Files:
        pkgsrc/textproc/raptor2: Makefile PLIST distinfo
        pkgsrc/textproc/raptor2/patches: patch-src_sort__r.h

Log Message:
raptor2: update to 2.0.16.

2023-03-01 Raptor2 Version 2.0.16 Released

   Fixes CVE-2017-18926 and CVE-2020-25713
   Multiple Appveyor Windows and CMake build fixes by 0u812. (Note: the
   resulting binaries and libraries were not tested on Windows)
   Turtle parser now reads input in chunks so can handle huge files. Patch
   by Sebastian Freundt
   Added a serializer for the mKR language. Patch by Richard H.
   McCullough.
   Rapper utility now counts triples using longs
   Several smaller portability fixes for OpenBSD and cross building


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/textproc/raptor2/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/raptor2/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/raptor2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/raptor2/Makefile
diff -u pkgsrc/textproc/raptor2/Makefile:1.44 pkgsrc/textproc/raptor2/Makefile:1.45
--- pkgsrc/textproc/raptor2/Makefile:1.44       Wed Nov 23 16:19:03 2022
+++ pkgsrc/textproc/raptor2/Makefile    Tue Mar  7 10:42:15 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2022/11/23 16:19:03 adam Exp $
+# $NetBSD: Makefile,v 1.45 2023/03/07 10:42:15 wiz Exp $
 
-DISTNAME=      raptor2-2.0.15
-PKGREVISION=   26
+DISTNAME=      raptor2-2.0.16
 CATEGORIES=    textproc
 MASTER_SITES=  http://download.librdf.org/source/
 
@@ -24,5 +23,4 @@ TEST_TARGET=          check
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/raptor2/PLIST
diff -u pkgsrc/textproc/raptor2/PLIST:1.8 pkgsrc/textproc/raptor2/PLIST:1.9
--- pkgsrc/textproc/raptor2/PLIST:1.8   Sun Nov  2 17:40:36 2014
+++ pkgsrc/textproc/raptor2/PLIST       Tue Mar  7 10:42:15 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/11/02 17:40:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2023/03/07 10:42:15 wiz Exp $
 bin/rapper
 include/raptor2/raptor.h
 include/raptor2/raptor2.h
@@ -8,9 +8,9 @@ man/man1/rapper.1
 man/man3/libraptor2.3
 share/doc/raptor2/home.png
 share/doc/raptor2/index.html
-share/doc/raptor2/index.sgml
 share/doc/raptor2/introduction.html
 share/doc/raptor2/ix01.html
+share/doc/raptor2/left-insensitive.png
 share/doc/raptor2/left.png
 share/doc/raptor2/parser-grddl.html
 share/doc/raptor2/parser-guess.html
@@ -32,6 +32,7 @@ share/doc/raptor2/raptor2-changes-2-0-10
 share/doc/raptor2/raptor2-changes-2-0-11-to-2-0-12.html
 share/doc/raptor2/raptor2-changes-2-0-13-to-2-0-14.html
 share/doc/raptor2/raptor2-changes-2-0-14-to-2-0-15.html
+share/doc/raptor2/raptor2-changes-2-0-15-to-2-0-16.html
 share/doc/raptor2/raptor2-changes-2-0-3-to-2-0-4.html
 share/doc/raptor2/raptor2-changes-2-0-4-to-2-0-5.html
 share/doc/raptor2/raptor2-changes-2-0-5-to-2-0-6.html
@@ -62,10 +63,12 @@ share/doc/raptor2/raptor2-section-xml.ht
 share/doc/raptor2/raptor2.devhelp2
 share/doc/raptor2/reference-manual.html
 share/doc/raptor2/restrict-parser-network-access.html
+share/doc/raptor2/right-insensitive.png
 share/doc/raptor2/right.png
 share/doc/raptor2/serializer-atom.html
 share/doc/raptor2/serializer-dot.html
 share/doc/raptor2/serializer-json.html
+share/doc/raptor2/serializer-mkr.html
 share/doc/raptor2/serializer-nquads.html
 share/doc/raptor2/serializer-ntriples.html
 share/doc/raptor2/serializer-rdfxml-abbrev.html
@@ -102,4 +105,5 @@ share/doc/raptor2/tutorial-serializer-se
 share/doc/raptor2/tutorial-serializer-to-destination.html
 share/doc/raptor2/tutorial-serializing.html
 share/doc/raptor2/tutorial.html
+share/doc/raptor2/up-insensitive.png
 share/doc/raptor2/up.png

Index: pkgsrc/textproc/raptor2/distinfo
diff -u pkgsrc/textproc/raptor2/distinfo:1.14 pkgsrc/textproc/raptor2/distinfo:1.15
--- pkgsrc/textproc/raptor2/distinfo:1.14       Tue Apr 12 13:20:05 2022
+++ pkgsrc/textproc/raptor2/distinfo    Tue Mar  7 10:42:15 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2022/04/12 13:20:05 tnn Exp $
+$NetBSD: distinfo,v 1.15 2023/03/07 10:42:15 wiz Exp $
 
-BLAKE2s (raptor2-2.0.15.tar.gz) = c24882035b615e21fd5ece74be5a565ee7a2dcd6f17619f18143e28727447759
-SHA512 (raptor2-2.0.15.tar.gz) = 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-Size (raptor2-2.0.15.tar.gz) = 1886657 bytes
-SHA1 (patch-src_sort__r.h) = 88d24885b841afe13c509870ed9f16229e8badc4
+BLAKE2s (raptor2-2.0.16.tar.gz) = 7c1b8ff3e0e4cba0bbb23e16b910227edb3913022417ae91b9344379755d44bc
+SHA512 (raptor2-2.0.16.tar.gz) = 9bd5cff36390e1e0ef15ac56e5413ecfceb4018cb531a4da8850d3623615f12a93690a78be61f9d9ae7a24e16f6446e356bc2b7f34051ddc077761d85a9b7c44
+Size (raptor2-2.0.16.tar.gz) = 1750726 bytes
+SHA1 (patch-src_sort__r.h) = c246a89706975344521f4ecf07a36624643ce08c

Index: pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h
diff -u pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h:1.1 pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h:1.2
--- pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h:1.1     Tue Apr 12 13:20:05 2022
+++ pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h Tue Mar  7 10:42:16 2023
@@ -1,19 +1,19 @@
-$NetBSD: patch-src_sort__r.h,v 1.1 2022/04/12 13:20:05 tnn Exp $
+$NetBSD: patch-src_sort__r.h,v 1.2 2023/03/07 10:42:16 wiz Exp $
 
 SunOS support
 
---- src/sort_r.h.orig  2014-10-09 23:00:44.000000000 +0000
+--- src/sort_r.h.orig  2017-07-01 20:53:27.000000000 +0000
 +++ src/sort_r.h
-@@ -29,6 +29,8 @@ void sort_r(void *base, size_t nel, size
- #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \
-        defined __linux__ || defined __MINGW32__ || defined __GLIBC__)
+@@ -30,6 +30,8 @@ void sort_r(void *base, size_t nel, size
+        defined __linux__ || defined __MINGW32__ || defined __GLIBC__ || \
+        defined __CYGWIN__)
  #  define _SORT_R_LINUX
 +#elif defined __sun
 +#  define _SORT_R_SUN
  #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
  #  define _SORT_R_WINDOWS
  #else
-@@ -86,6 +88,11 @@ void sort_r(void *base, size_t nel, size
+@@ -87,6 +89,11 @@ void sort_r(void *base, size_t nel, size
                          __compar_d_fn_t __compar, void *arg)
        __attribute__((nonnull (1, 4)));
  
@@ -25,7 +25,7 @@ SunOS support
    #endif
  
    /* implementation */
-@@ -105,6 +112,10 @@ void sort_r(void *base, size_t nel, size
+@@ -106,6 +113,10 @@ void sort_r(void *base, size_t nel, size
        tmp.compar = compar;
        qsort_r(base, nel, width, &tmp, sort_r_arg_swap);
  
@@ -36,7 +36,7 @@ SunOS support
      #else /* defined _SORT_R_WINDOWS */
  
        struct sort_r_data tmp;
-@@ -120,5 +131,6 @@ void sort_r(void *base, size_t nel, size
+@@ -121,5 +132,6 @@ void sort_r(void *base, size_t nel, size
  #undef _SORT_R_WINDOWS
  #undef _SORT_R_LINUX
  #undef _SORT_R_BSD