CVS commit: pkgsrc/textproc/jsoncpp

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Sep 29 16:49:16 UTC 2020

Modified Files:
        pkgsrc/textproc/jsoncpp: Makefile distinfo
        pkgsrc/textproc/jsoncpp/patches: patch-CMakeLists.txt

Log Message:
jsoncpp: updated to 1.9.4

1.9.4:
Security and build system fixes


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/jsoncpp/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/jsoncpp/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/textproc/jsoncpp/Makefile
diff -u pkgsrc/textproc/jsoncpp/Makefile:1.14 pkgsrc/textproc/jsoncpp/Makefile:1.15
--- pkgsrc/textproc/jsoncpp/Makefile:1.14       Sat May 30 06:09:47 2020
+++ pkgsrc/textproc/jsoncpp/Makefile    Tue Sep 29 16:49:15 2020
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2020/05/30 06:09:47 adam Exp $
+# $NetBSD: Makefile,v 1.15 2020/09/29 16:49:15 adam Exp $
 
-DISTNAME=      jsoncpp-1.9.3
+DISTNAME=      jsoncpp-1.9.4
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=open-source-parsers/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/open-source-parsers/jsoncpp
@@ -12,7 +11,8 @@ LICENSE=      public-domain OR mit
 
 USE_CMAKE=             yes
 USE_LANGUAGES=         c c++
-CMAKE_ARGS+=           -DBUILD_SHARED_LIBS=ON
+CMAKE_ARGS+=           -DBUILD_STATIC_LIBS=OFF
+CMAKE_ARGS+=           -DBUILD_OBJECT_LIBS=OFF
 CMAKE_ARGS+=           -DJSONCPP_WITH_TESTS=OFF
 PKGCONFIG_OVERRIDE=    pkg-config/jsoncpp.pc.in
 

Index: pkgsrc/textproc/jsoncpp/distinfo
diff -u pkgsrc/textproc/jsoncpp/distinfo:1.13 pkgsrc/textproc/jsoncpp/distinfo:1.14
--- pkgsrc/textproc/jsoncpp/distinfo:1.13       Sat May 30 06:09:47 2020
+++ pkgsrc/textproc/jsoncpp/distinfo    Tue Sep 29 16:49:15 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2020/05/30 06:09:47 adam Exp $
+$NetBSD: distinfo,v 1.14 2020/09/29 16:49:15 adam Exp $
 
-SHA1 (jsoncpp-1.9.3.tar.gz) = df04d765d24d98e18f70bf8588d3df48697c4ba7
-RMD160 (jsoncpp-1.9.3.tar.gz) = 50fb22e9c86db230e558ffa7476d3c3f0cc94e76
-SHA512 (jsoncpp-1.9.3.tar.gz) = f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
-Size (jsoncpp-1.9.3.tar.gz) = 212922 bytes
-SHA1 (patch-CMakeLists.txt) = 9a1847d15b168d8025c8a7040e8f89ffe1435569
+SHA1 (jsoncpp-1.9.4.tar.gz) = d0cceda7df8d6e77d6acde6b9dea0ff604be6b36
+RMD160 (jsoncpp-1.9.4.tar.gz) = c35709d6cc3de960003efdfb06909640bb1da2f9
+SHA512 (jsoncpp-1.9.4.tar.gz) = adfd4afbdf6b79bd37edcf0e248f07864994f1c4bcb7431f3b44102490ce467f72381908066655fa486dec12f467af0a11f42f859bbf719895974c7339db7d22
+Size (jsoncpp-1.9.4.tar.gz) = 214057 bytes
+SHA1 (patch-CMakeLists.txt) = 8f7ca8b24647eb28de220796b2721051bc4f49ec

Index: pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt
diff -u pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.4 pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.4    Sat May 30 06:09:47 2020
+++ pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt        Tue Sep 29 16:49:15 2020
@@ -1,20 +1,20 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2020/05/30 06:09:47 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2020/09/29 16:49:15 adam Exp $
 
 Make so version match symlink versions.
 Remove -Werror=conversion.
 
---- CMakeLists.txt.orig        2020-05-29 13:50:26.000000000 +0000
+--- CMakeLists.txt.orig        2020-09-26 02:19:16.000000000 +0000
 +++ CMakeLists.txt
-@@ -71,7 +71,7 @@ project(JSONCPP
+@@ -73,7 +73,7 @@ project(jsoncpp
          LANGUAGES CXX)
  
- message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}")
--set(JSONCPP_SOVERSION 24)
-+set(JSONCPP_SOVERSION ${JSONCPP_VERSION_MAJOR})
+ message(STATUS "JsonCpp Version: ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+-set(PROJECT_SOVERSION 24)
++set(PROJECT_SOVERSION ${PROJECT_VERSION_MAJOR})
  
  option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON)
  option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON)
-@@ -120,7 +120,7 @@ endif()
+@@ -124,7 +124,7 @@ endif()
  
  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
      # using regular Clang or AppleClang