Attachment #214171 for bug #246145




# Created by: gno@yahoo-inc.com
# $FreeBSD$

PORTNAME=	json-c
PORTVERSION=	0.14
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	https://s3.amazonaws.com/json-c_releases/releases/ \
		https://ftp.osuosl.org/pub/blfs/conglomeration/jsonc/

MAINTAINER=	sunpoet@FreeBSD.org
COMMENT=	JSON (JavaScript Object Notation) implementation in C

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cmake compiler:c11 cpe pkgconfig

TEST_TARGET=	test
INSTALL_TARGET=	install-strip
TEST_TARGET=	check
USE_LDCONFIG=	yes

CPE_VENDOR=	json-c_project

OPTIONS_DEFINE=	STATIC TEST
OPTIONS_SUB=	yes
STATIC_CMAKE_BOOL_OFF=	BUILD_SHARED_LIBS
TEST_CMAKE_BOOL=	BUILD_TESTING

.include <bsd.port.options.mk>
.if ! ${PORT_OPTIONS:MSTATIC}
USE_LDCONFIG=	yes
.endif

post-install:
	${INSTALL_DATA} ${WRKSRC}/json_object_private.h ${STAGEDIR}${PREFIX}/include/json-c/
	# Reference: https://github.com/json-c/json-c/pull/585
	${RM} ${STAGEDIR}${PREFIX}/include/json-c/config.h

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/json-c/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1520527097	1	TIMESTAMP = 1588452653
2	SHA256 (json-c-0.13.1.tar.gz) = b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873	2	SHA256 (json-c-0.14.tar.gz) = b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870
3	SIZE (json-c-0.13.1.tar.gz) = 639425	3	SIZE (json-c-0.14.tar.gz) = 321677




--- json_object.c.orig	2020-02-18 20:12:20 UTC
+++ json_object.c
@@ -698,9 +698,9 @@ int64_t json_object_get_int64(const struct json_object
 	case json_type_int:
 		return jso->o.c_int64;
 	case json_type_double:
-		if (jso->o.c_double >= INT64_MAX)
+		if (jso->o.c_double >= (double)INT64_MAX)
 			return INT64_MAX;
-		if (jso->o.c_double <= INT64_MIN)
+		if (jso->o.c_double <= (double)INT64_MIN)
 			return INT64_MIN;
 		return (int64_t)jso->o.c_double;
 	case json_type_boolean:




--- tests/test_parse.c.orig	2018-01-16 04:33:49 UTC
+++ tests/test_parse.c
@@ -253,11 +253,11 @@ struct incremental_step {
 	   the next few tests check that parsing multiple sequential
        json objects in the input works as expected */
 	{ "null123",           9, 4, json_tokener_success, 0 },
-	{ "null123" + 4,       4, 3, json_tokener_success, 1 },
+	{ &"null123"[4],       4, 3, json_tokener_success, 1 },
 	{ "nullx",             5, 4, json_tokener_success, 0 },
-	{ "nullx" + 4,         2, 0, json_tokener_error_parse_unexpected, 1 },
+	{ &"nullx"[4],         2, 0, json_tokener_error_parse_unexpected, 1 },
 	{ "{\"a\":1}{\"b\":2}",15, 7, json_tokener_success, 0 },
-	{ "{\"a\":1}{\"b\":2}" + 7,
+	{ &"{\"a\":1}{\"b\":2}"[7],
 	                       8, 7, json_tokener_success, 1 },
 
 	/* Some bad formatting. Check we get the correct error status */




include/json-c/arraylist.h
include/json-c/bits.h
include/json-c/debug.h
include/json-c/json.h
include/json-c/json_c_version.h
include/json-c/json_config.h
include/json-c/json_inttypes.h
include/json-c/json_object.h
include/json-c/json_object_iterator.h
include/json-c/json_object_private.h
include/json-c/json_pointer.h
include/json-c/json_tokener.h
include/json-c/json_types.h
include/json-c/json_util.h
include/json-c/json_visit.h
include/json-c/linkhash.h
include/json-c/printbuf.h
lib/cmake/json-c/json-c-config.cmake
lib/cmake/json-c/json-c-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/json-c/json-c-targets.cmake
%%STATIC%%lib/libjson-c.a
%%NO_STATIC%%lib/libjson-c.so
%%NO_STATIC%%lib/libjson-c.so.5
%%NO_STATIC%%lib/libjson-c.so.5.0.0
libdata/pkgconfig/json-c.pc

Return to bug 246145

Lines 1-32 Link Here

(-)b/devel/json-c/Makefile (-10 / +15 lines)
1	# Created by: gno@yahoo-inc.com	1	# Created by: gno@yahoo-inc.com
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= json-c	4	PORTNAME= json-c
5	PORTVERSION= 0.13.1	5	PORTVERSION= 0.14
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= https://s3.amazonaws.com/json-c_releases/releases/ \	7	MASTER_SITES= https://s3.amazonaws.com/json-c_releases/releases/ \
9	LOCAL/sunpoet	8	https://ftp.osuosl.org/pub/blfs/conglomeration/jsonc/
10		9
11	MAINTAINER= sunpoet@FreeBSD.org	10	MAINTAINER= sunpoet@FreeBSD.org
12	COMMENT= JSON (JavaScript Object Notation) implementation in C	11	COMMENT= JSON (JavaScript Object Notation) implementation in C
13		12
14	LICENSE= MIT	13	LICENSE= MIT
15	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
16		15
17	USES= autoreconf compiler:c11 cpe libtool pathfix pkgconfig	16	USES= cmake compiler:c11 cpe pkgconfig
18		17
19	GNU_CONFIGURE= yes	18	TEST_TARGET= test
20	INSTALL_TARGET= install-strip
21	TEST_TARGET= check
22	USE_LDCONFIG= yes
23		19
24	CPE_VENDOR= json-c_project	20	CPE_VENDOR= json-c_project
25		21
26	post-patch:	22	OPTIONS_DEFINE= STATIC TEST
27	@${REINPLACE_CMD} -e 's\| -Werror\|\|g' ${WRKSRC}/Makefile.in	23	OPTIONS_SUB= yes
		24	STATIC_CMAKE_BOOL_OFF= BUILD_SHARED_LIBS
		25	TEST_CMAKE_BOOL= BUILD_TESTING
		26
		27	.include <bsd.port.options.mk>
		28	.if ! ${PORT_OPTIONS:MSTATIC}
		29	USE_LDCONFIG= yes
		30	.endif
28		31
29	post-install:	32	post-install:
30	${INSTALL_DATA} ${WRKSRC}/json_object_private.h ${STAGEDIR}${PREFIX}/include/json-c/	33	${INSTALL_DATA} ${WRKSRC}/json_object_private.h ${STAGEDIR}${PREFIX}/include/json-c/
		34	# Reference: https://github.com/json-c/json-c/pull/585
		35	${RM} ${STAGEDIR}${PREFIX}/include/json-c/config.h
31		36
32	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Removed Link Here

(-)a/devel/json-c/files/patch-json_object.c (-14 lines)
1	--- json_object.c.orig 2020-02-18 20:12:20 UTC
2	+++ json_object.c
3	@@ -698,9 +698,9 @@ int64_t json_object_get_int64(const struct json_object
4	case json_type_int:
5	return jso->o.c_int64;
6	case json_type_double:
7	- if (jso->o.c_double >= INT64_MAX)
8	+ if (jso->o.c_double >= (double)INT64_MAX)
9	return INT64_MAX;
10	- if (jso->o.c_double <= INT64_MIN)
11	+ if (jso->o.c_double <= (double)INT64_MIN)
12	return INT64_MIN;
13	return (int64_t)jso->o.c_double;
14	case json_type_boolean:

Removed Link Here

(-)a/devel/json-c/files/patch-tests-test_parse.c (-17 lines)
1	--- tests/test_parse.c.orig 2018-01-16 04:33:49 UTC
2	+++ tests/test_parse.c
3	@@ -253,11 +253,11 @@ struct incremental_step {
4	the next few tests check that parsing multiple sequential
5	json objects in the input works as expected */
6	{ "null123", 9, 4, json_tokener_success, 0 },
7	- { "null123" + 4, 4, 3, json_tokener_success, 1 },
8	+ { &"null123"[4], 4, 3, json_tokener_success, 1 },
9	{ "nullx", 5, 4, json_tokener_success, 0 },
10	- { "nullx" + 4, 2, 0, json_tokener_error_parse_unexpected, 1 },
11	+ { &"nullx"[4], 2, 0, json_tokener_error_parse_unexpected, 1 },
12	{ "{\"a\":1}{\"b\":2}",15, 7, json_tokener_success, 0 },
13	- { "{\"a\":1}{\"b\":2}" + 7,
14	+ { &"{\"a\":1}{\"b\":2}"[7],
15	8, 7, json_tokener_success, 1 },
16
17	/* Some bad formatting. Check we get the correct error status */

Lines 1-21 Link Here

(-)b/devel/json-c/pkg-plist (-5 / +8 lines)
1	include/json-c/arraylist.h	1	include/json-c/arraylist.h
2	include/json-c/bits.h
3	include/json-c/debug.h	2	include/json-c/debug.h
4	include/json-c/json.h	3	include/json-c/json.h
5	include/json-c/json_c_version.h	4	include/json-c/json_c_version.h
6	include/json-c/json_config.h	5	include/json-c/json_config.h
7	include/json-c/json_inttypes.h	6	include/json-c/json_inttypes.h
8	include/json-c/json_object.h	7	include/json-c/json_object.h
9	include/json-c/json_object_iterator.h	8	include/json-c/json_object_iterator.h
10	include/json-c/json_object_private.h	9	include/json-c/json_object_private.h
11	include/json-c/json_pointer.h	10	include/json-c/json_pointer.h
12	include/json-c/json_tokener.h	11	include/json-c/json_tokener.h
		12	include/json-c/json_types.h
13	include/json-c/json_util.h	13	include/json-c/json_util.h
14	include/json-c/json_visit.h	14	include/json-c/json_visit.h
15	include/json-c/linkhash.h	15	include/json-c/linkhash.h
16	include/json-c/printbuf.h	16	include/json-c/printbuf.h
17	lib/libjson-c.a	17	lib/cmake/json-c/json-c-config.cmake
18	lib/libjson-c.so	18	lib/cmake/json-c/json-c-targets-%%CMAKE_BUILD_TYPE%%.cmake
19	lib/libjson-c.so.4	19	lib/cmake/json-c/json-c-targets.cmake
20	lib/libjson-c.so.4.0.0	20	%%STATIC%%lib/libjson-c.a
		21	%%NO_STATIC%%lib/libjson-c.so
		22	%%NO_STATIC%%lib/libjson-c.so.5
		23	%%NO_STATIC%%lib/libjson-c.so.5.0.0
21	libdata/pkgconfig/json-c.pc	24	libdata/pkgconfig/json-c.pc