mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-06 11:41:52 +00:00
Code Issues Releases Activity

Fix build with json-c 0.14

Browse Source
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2020-05-21 20:44:10 +00:00
parent cdf4f0f718
commit bd85af7cc9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=536150
29 changed files with 772 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/frr5/files/patch-bgpd_bgp__routemap.c Normal file
View File

@ -0,0 +1,16 @@
--- bgpd/bgp_routemap.c.orig 2019-01-08 08:53:23 UTC
+++ bgpd/bgp_routemap.c
@@ -2432,11 +2432,11 @@ route_set_ipv6_nexthop_prefer_global(void *rule, struc
&& peer->su_remote
&& sockunion_family(peer->su_remote) == AF_INET6) {
/* Set next hop preference to global */
- bgp_info->attr->mp_nexthop_prefer_global = TRUE;
+ bgp_info->attr->mp_nexthop_prefer_global = true;
SET_FLAG(bgp_info->attr->rmap_change_flags,
BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
} else {
- bgp_info->attr->mp_nexthop_prefer_global = FALSE;
+ bgp_info->attr->mp_nexthop_prefer_global = false;
SET_FLAG(bgp_info->attr->rmap_change_flags,
BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
}

61
net/frr5/files/patch-bgpd_bgpd.c Normal file
View File

@ -0,0 +1,61 @@
--- bgpd/bgpd.c.orig 2019-01-08 08:53:23 UTC
+++ bgpd/bgpd.c
@@ -243,7 +243,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
/* EVPN uses router id in RD, withdraw them */
if (is_evpn_enabled())
- bgp_evpn_handle_router_id_update(bgp, TRUE);
+ bgp_evpn_handle_router_id_update(bgp, true);
IPV4_ADDR_COPY(&bgp->router_id, id);
@@ -260,7 +260,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
/* EVPN uses router id in RD, update them */
if (is_evpn_enabled())
- bgp_evpn_handle_router_id_update(bgp, FALSE);
+ bgp_evpn_handle_router_id_update(bgp, false);
return 0;
}
@@ -3098,7 +3098,7 @@ int bgp_handle_socket(struct bgp *bgp, struct vrf *vrf
/*
* suppress vrf socket
*/
- if (create == FALSE) {
+ if (create == false) {
bgp_close_vrf_socket(bgp);
return 0;
}
@@ -6861,8 +6861,8 @@ static void bgp_config_write_peer_global(struct vty *v
struct peer *g_peer = NULL;
char buf[SU_ADDRSTRLEN];
char *addr;
- int if_pg_printed = FALSE;
- int if_ras_printed = FALSE;
+ int if_pg_printed = false;
+ int if_ras_printed = false;
/* Skip dynamic neighbors. */
if (peer_dynamic_neighbor(peer))
@@ -6884,16 +6884,16 @@ static void bgp_config_write_peer_global(struct vty *v
if (peer_group_active(peer)) {
vty_out(vty, " peer-group %s", peer->group->name);
- if_pg_printed = TRUE;
+ if_pg_printed = true;
} else if (peer->as_type == AS_SPECIFIED) {
vty_out(vty, " remote-as %u", peer->as);
- if_ras_printed = TRUE;
+ if_ras_printed = true;
} else if (peer->as_type == AS_INTERNAL) {
vty_out(vty, " remote-as internal");
- if_ras_printed = TRUE;
+ if_ras_printed = true;
} else if (peer->as_type == AS_EXTERNAL) {
vty_out(vty, " remote-as external");
- if_ras_printed = TRUE;
+ if_ras_printed = true;
}
vty_out(vty, "\n");

110
net/frr5/files/patch-ospfd_ospf__vty.c Normal file
View File

@ -0,0 +1,110 @@
--- ospfd/ospf_vty.c.orig 2019-01-08 08:53:23 UTC
+++ ospfd/ospf_vty.c
@@ -3267,7 +3267,7 @@ DEFUN (show_ip_ospf,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -3940,7 +3940,7 @@ DEFUN (show_ip_ospf_interface,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL, *intf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0, idx_intf = 0;
@@ -4067,7 +4067,7 @@ DEFUN (show_ip_ospf_interface_traffic,
struct ospf *ospf = NULL;
struct listnode *node = NULL;
char *vrf_name = NULL, *intf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int inst = 0;
int idx_vrf = 0, idx_intf = 0;
uint8_t uj = use_json(argc, argv);
@@ -4322,7 +4322,7 @@ DEFUN (show_ip_ospf_neighbor,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -4535,7 +4535,7 @@ DEFUN (show_ip_ospf_neighbor_all,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -5233,7 +5233,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -5422,7 +5422,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -6305,7 +6305,7 @@ DEFUN (show_ip_ospf_database_max,
struct ospf *ospf = NULL;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -6362,7 +6362,7 @@ DEFUN (show_ip_ospf_instance_database,
unsigned short instance = 0;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx = 0;
@@ -6512,7 +6512,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
unsigned short instance = 0;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx = 0, idx_vrf = 0;
@@ -9299,7 +9299,7 @@ DEFUN (show_ip_ospf_border_routers,
struct ospf *ospf = NULL;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -9425,7 +9425,7 @@ DEFUN (show_ip_ospf_route,
struct ospf *ospf = NULL;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;

16
net/frr6/files/patch-bgpd_bgp__routemap.c Normal file
View File

@ -0,0 +1,16 @@
--- bgpd/bgp_routemap.c.orig 2019-01-08 08:29:22 UTC
+++ bgpd/bgp_routemap.c
@@ -2452,11 +2452,11 @@ route_set_ipv6_nexthop_prefer_global(void *rule, const
&& peer->su_remote
&& sockunion_family(peer->su_remote) == AF_INET6) {
/* Set next hop preference to global */
- bgp_info->attr->mp_nexthop_prefer_global = TRUE;
+ bgp_info->attr->mp_nexthop_prefer_global = true;
SET_FLAG(bgp_info->attr->rmap_change_flags,
BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
} else {
- bgp_info->attr->mp_nexthop_prefer_global = FALSE;
+ bgp_info->attr->mp_nexthop_prefer_global = false;
SET_FLAG(bgp_info->attr->rmap_change_flags,
BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
}

61
net/frr6/files/patch-bgpd_bgpd.c Normal file
View File

@ -0,0 +1,61 @@
--- bgpd/bgpd.c.orig 2019-01-08 08:29:22 UTC
+++ bgpd/bgpd.c
@@ -245,7 +245,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
/* EVPN uses router id in RD, withdraw them */
if (is_evpn_enabled())
- bgp_evpn_handle_router_id_update(bgp, TRUE);
+ bgp_evpn_handle_router_id_update(bgp, true);
IPV4_ADDR_COPY(&bgp->router_id, id);
@@ -262,7 +262,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
/* EVPN uses router id in RD, update them */
if (is_evpn_enabled())
- bgp_evpn_handle_router_id_update(bgp, FALSE);
+ bgp_evpn_handle_router_id_update(bgp, false);
return 0;
}
@@ -2949,7 +2949,7 @@ int bgp_handle_socket(struct bgp *bgp, struct vrf *vrf
/*
* suppress vrf socket
*/
- if (create == FALSE) {
+ if (create == false) {
bgp_close_vrf_socket(bgp);
return 0;
}
@@ -6741,8 +6741,8 @@ static void bgp_config_write_peer_global(struct vty *v
struct peer *g_peer = NULL;
char buf[SU_ADDRSTRLEN];
char *addr;
- int if_pg_printed = FALSE;
- int if_ras_printed = FALSE;
+ int if_pg_printed = false;
+ int if_ras_printed = false;
/* Skip dynamic neighbors. */
if (peer_dynamic_neighbor(peer))
@@ -6764,16 +6764,16 @@ static void bgp_config_write_peer_global(struct vty *v
if (peer_group_active(peer)) {
vty_out(vty, " peer-group %s", peer->group->name);
- if_pg_printed = TRUE;
+ if_pg_printed = true;
} else if (peer->as_type == AS_SPECIFIED) {
vty_out(vty, " remote-as %u", peer->as);
- if_ras_printed = TRUE;
+ if_ras_printed = true;
} else if (peer->as_type == AS_INTERNAL) {
vty_out(vty, " remote-as internal");
- if_ras_printed = TRUE;
+ if_ras_printed = true;
} else if (peer->as_type == AS_EXTERNAL) {
vty_out(vty, " remote-as external");
- if_ras_printed = TRUE;
+ if_ras_printed = true;
}
vty_out(vty, "\n");

110
net/frr6/files/patch-ospfd_ospf__vty.c Normal file
View File

@ -0,0 +1,110 @@
--- ospfd/ospf_vty.c.orig 2019-01-08 08:29:22 UTC
+++ ospfd/ospf_vty.c
@@ -3244,7 +3244,7 @@ DEFUN (show_ip_ospf,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -3917,7 +3917,7 @@ DEFUN (show_ip_ospf_interface,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL, *intf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0, idx_intf = 0;
@@ -4044,7 +4044,7 @@ DEFUN (show_ip_ospf_interface_traffic,
struct ospf *ospf = NULL;
struct listnode *node = NULL;
char *vrf_name = NULL, *intf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int inst = 0;
int idx_vrf = 0, idx_intf = 0;
uint8_t uj = use_json(argc, argv);
@@ -4299,7 +4299,7 @@ DEFUN (show_ip_ospf_neighbor,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -4512,7 +4512,7 @@ DEFUN (show_ip_ospf_neighbor_all,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -5213,7 +5213,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -5402,7 +5402,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
uint8_t uj = use_json(argc, argv);
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -6285,7 +6285,7 @@ DEFUN (show_ip_ospf_database_max,
struct ospf *ospf = NULL;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -6342,7 +6342,7 @@ DEFUN (show_ip_ospf_instance_database,
unsigned short instance = 0;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx = 0;
@@ -6492,7 +6492,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
unsigned short instance = 0;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx = 0, idx_vrf = 0;
@@ -9260,7 +9260,7 @@ DEFUN (show_ip_ospf_border_routers,
struct ospf *ospf = NULL;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;
@@ -9386,7 +9386,7 @@ DEFUN (show_ip_ospf_route,
struct ospf *ospf = NULL;
struct listnode *node = NULL;
char *vrf_name = NULL;
- bool all_vrf = FALSE;
+ bool all_vrf = false;
int ret = CMD_SUCCESS;
int inst = 0;
int idx_vrf = 0;

29
net/frr7/files/patch-bgpd_bgp__route.c Normal file
View File

@ -0,0 +1,29 @@
--- bgpd/bgp_route.c.orig 2020-02-14 14:03:09 UTC
+++ bgpd/bgp_route.c
@@ -9922,7 +9922,7 @@ static int bgp_show_route_in_table(struct vty *vty, st
}
} else if (safi == SAFI_EVPN) {
struct bgp_node *longest_pfx;
- bool is_exact_pfxlen_match = FALSE;
+ bool is_exact_pfxlen_match = false;
for (rn = bgp_table_top(rib); rn; rn = bgp_route_next(rn)) {
if (prd && memcmp(rn->p.u.val, prd->val, 8) != 0)
@@ -9932,7 +9932,7 @@ static int bgp_show_route_in_table(struct vty *vty, st
continue;
longest_pfx = NULL;
- is_exact_pfxlen_match = FALSE;
+ is_exact_pfxlen_match = false;
/*
* Search through all the prefixes for a match. The
* pfx's are enumerated in ascending order of pfxlens.
@@ -9951,7 +9951,7 @@ static int bgp_show_route_in_table(struct vty *vty, st
int type5_pfxlen =
bgp_evpn_get_type5_prefixlen(&rm->p);
if (type5_pfxlen == match.prefixlen) {
- is_exact_pfxlen_match = TRUE;
+ is_exact_pfxlen_match = true;
bgp_unlock_node(rm);
break;
}

12
net/zmap/files/patch-CMakeLists.txt
View File

@ -1,6 +1,14 @@
--- CMakeLists.txt.orig 2016-04-20 05:20:38 UTC
--- CMakeLists.txt.orig 2015-09-11 15:30:41 UTC
+++ CMakeLists.txt
@@ -135,11 +135,7 @@ message(STATUS "Default ZMap configurati
@@ -72,6 +72,7 @@ if(WITH_JSON)
endif()
add_definitions("-DJSON")
+ string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
endif()
@@ -135,11 +136,7 @@ message(STATUS "Default ZMap configuration file locati
foreach(EACH_CONF ${CONF_FILES})
get_filename_component(CONF_BASENAME ${EACH_CONF} NAME)
message(STATUS "Checking if ${CONF_BASENAME} exists there...")

29
security/libu2f-host/files/patch-u2f-host-u2fmisc.c Normal file
View File

@ -0,0 +1,29 @@
--- u2f-host/u2fmisc.c.orig 2019-05-15 11:54:11 UTC
+++ u2f-host/u2fmisc.c
@@ -30,7 +30,7 @@
#define u2fh_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value)
#else
typedef int json_bool;
-#define u2fh_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE
+#define u2fh_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? 0 : 1
#endif
static void
@@ -114,7 +114,7 @@ prepare_origin (const char *jsonstr, unsigned char *p)
if (debug)
fprintf (stderr, "JSON: %s\n", json_object_to_json_string (jo));
- if (u2fh_json_object_object_get (jo, "appId", k) == FALSE)
+ if (u2fh_json_object_object_get (jo, "appId", k) == 0)
return U2FH_JSON_ERROR;
app_id = json_object_get_string (k);
@@ -390,7 +390,7 @@ get_fixed_json_data (const char *jsonstr, const char *
if (debug)
fprintf (stderr, "JSON: %s\n", json_object_to_json_string (jo));
- if (u2fh_json_object_object_get (jo, key, k) == FALSE)
+ if (u2fh_json_object_object_get (jo, key, k) == 0)
return U2FH_JSON_ERROR;
urlb64 = json_object_get_string (k);

3
security/razorback-api/files/patch-include__razorback__json_buffer.h
View File

@ -1,12 +1,11 @@
--- include/razorback/json_buffer.h.orig 2012-01-09 19:40:46 UTC
+++ include/razorback/json_buffer.h
@@ -9,6 +9,7 @@
@@ -9,6 +9,6 @@
#include <razorback/messages.h>
#include <razorback/ntlv.h>
-#include <json/json.h>
+#include <json-c/json.h>
+#include <json-c/bits.h>
#ifdef __cplusplus
extern "C" {

11
security/razorback-api/files/patch-src_messages_alert__child.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/alert_child.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/alert_child.c
@@ -106,7 +106,7 @@ AlertChild_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg) )
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
alert = message->message;

11
security/razorback-api/files/patch-src_messages_alert__primary.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/alert_primary.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/alert_primary.c
@@ -126,7 +126,7 @@ AlertPrimary_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
alert = message->message;

11
security/razorback-api/files/patch-src_messages_block__submit.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/block_submit.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/block_submit.c
@@ -127,7 +127,7 @@ BlockSubmission_Deserialize_Json(struct Message *messa
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
submit = message->message;

11
security/razorback-api/files/patch-src_messages_cache__req.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/cache_req.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/cache_req.c
@@ -131,7 +131,7 @@ CacheReq_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
submit = message->message;

11
security/razorback-api/files/patch-src_messages_cache__resp.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/cache_resp.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/cache_resp.c
@@ -143,7 +143,7 @@ CacheResp_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
submit = message->message;

11
security/razorback-api/files/patch-src_messages_cnc_config__ack.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/cnc/config_ack.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/cnc/config_ack.c
@@ -99,7 +99,7 @@ ConfigAck_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
configAck = message->message;

11
security/razorback-api/files/patch-src_messages_cnc_config__update.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/cnc/config_update.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/cnc/config_update.c
@@ -137,7 +137,7 @@ ConfigUpdate_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
configUpdate = message->message;

11
security/razorback-api/files/patch-src_messages_cnc_error.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/cnc/error.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/cnc/error.c
@@ -96,7 +96,7 @@ Error_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
error = message->message;

11
security/razorback-api/files/patch-src_messages_cnc_hello.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/cnc/hello.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/cnc/hello.c
@@ -121,7 +121,7 @@ Hello_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
hello = message->message;

11
security/razorback-api/files/patch-src_messages_cnc_reg__req.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/cnc/reg_req.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/cnc/reg_req.c
@@ -183,7 +183,7 @@ RegistrationRequest_Deserialize_Json(struct Message *m
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
regReq = message->message;

11
security/razorback-api/files/patch-src_messages_cnc_term.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/cnc/term.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/cnc/term.c
@@ -127,7 +127,7 @@ Terminate_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
term = message->message;

11
security/razorback-api/files/patch-src_messages_inspection.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/inspection.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/inspection.c
@@ -192,7 +192,7 @@ InspectionSubmission_Deserialize_Json(struct Message *
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
submit = message->message;

11
security/razorback-api/files/patch-src_messages_judgment.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/judgment.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/judgment.c
@@ -119,7 +119,7 @@ JudgmentSubmission_Deserialize_Json(struct Message *me
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
submit = message->message;

11
security/razorback-api/files/patch-src_messages_log.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/log.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/log.c
@@ -167,7 +167,7 @@ Log_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
submit = message->message;

11
security/razorback-api/files/patch-src_messages_output__event.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/output_event.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/output_event.c
@@ -89,7 +89,7 @@ OutputEvent_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
event = message->message;

11
security/razorback-api/files/patch-src_messages_output__inspection.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/output_inspection.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/output_inspection.c
@@ -102,7 +102,7 @@ OutputInspection_Deserialize_Json(struct Message *mess
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
event = message->message;

11
security/razorback-api/files/patch-src_messages_output__log.c Normal file
View File

@ -0,0 +1,11 @@
--- src/messages/output_log.c.orig 2012-04-19 15:47:21 UTC
+++ src/messages/output_log.c
@@ -96,7 +96,7 @@ OutputLog_Deserialize_Json(struct Message *message)
if (message == NULL)
return false;
- if ((msg = json_tokener_parse((char *)message->serialized)) == NULL || is_error(msg))
+ if ((msg = json_tokener_parse((char *)message->serialized)) == NULL)
return false;
log = message->message;

69
security/ykpers/files/patch-ykpers-json.c Normal file
View File

@ -0,0 +1,69 @@
--- ykpers-json.c.orig 2014-04-28 09:53:50 UTC
+++ ykpers-json.c
@@ -40,7 +40,7 @@
#define yk_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value)
#else
typedef int json_bool;
-#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE
+#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? 0 : 1
#endif
static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) {
@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode,
if(p->mode && (mode & p->mode) == mode) {
json_object *joption;
json_bool ret = yk_json_object_object_get(options, p->json_text, joption);
- if(ret == TRUE && json_object_get_type(joption) == json_type_boolean) {
+ if(ret == 1 && json_object_get_type(joption) == json_type_boolean) {
int value = json_object_get_boolean(joption);
if(value == 1) {
p->setter(cfg, true);
@@ -227,20 +227,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *
ykp_errno = YKP_EINVAL;
goto out;
}
- if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == FALSE) {
+ if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == 0) {
ykp_errno = YKP_EINVAL;
goto out;
}
- if(yk_json_object_object_get(yprod_json, "mode", jmode) == FALSE) {
+ if(yk_json_object_object_get(yprod_json, "mode", jmode) == 0) {
ykp_errno = YKP_EINVAL;
goto out;
}
- if(yk_json_object_object_get(yprod_json, "options", options) == FALSE) {
+ if(yk_json_object_object_get(yprod_json, "options", options) == 0) {
ykp_errno = YKP_EINVAL;
goto out;
}
- if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == TRUE) {
+ if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == 1) {
int target_config = json_object_get_int(jtarget);
int command;
if(target_config == 1) {
@@ -272,20 +272,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *
if(mode == MODE_OATH_HOTP) {
json_object *jdigits, *jrandom;
ykp_set_tktflag_OATH_HOTP(cfg, true);
- if(yk_json_object_object_get(options, "oathDigits", jdigits) == TRUE) {
+ if(yk_json_object_object_get(options, "oathDigits", jdigits) == 1) {
int digits = json_object_get_int(jdigits);
if(digits == 8) {
ykp_set_cfgflag_OATH_HOTP8(cfg, true);
}
}
- if(yk_json_object_object_get(options, "randomSeed", jrandom) == TRUE) {
+ if(yk_json_object_object_get(options, "randomSeed", jrandom) == 1) {
int random = json_object_get_boolean(jrandom);
int seed = 0;
if(random == 1) {
/* XXX: add random seed.. */
} else {
json_object *jseed;
- if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == TRUE) {
+ if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == 1) {
seed = json_object_get_int(jseed);
}
}

73
www/newsboat/files/patch-src-newsblurapi.cpp Normal file
View File

@ -0,0 +1,73 @@
--- src/newsblurapi.cpp.orig 2020-03-22 18:54:24 UTC
+++ src/newsblurapi.cpp
@@ -165,7 +165,7 @@ void NewsBlurApi::add_custom_headers(curl_slist** /* c
bool request_successfull(json_object* payload)
{
json_object* result{};
- if (json_object_object_get_ex(payload, "result", &result) == FALSE) {
+ if (json_object_object_get_ex(payload, "result", &result) == 0) {
return false;
} else {
return !strcmp("ok", json_object_get_string(result));
@@ -241,7 +241,7 @@ rsspp::Feed NewsBlurApi::fetch_feed(const std::string&
json_object* stories{};
if (json_object_object_get_ex(
- query_result, "stories", &stories) == FALSE) {
+ query_result, "stories", &stories) == 0) {
LOG(Level::ERROR,
"NewsBlurApi::fetch_feed: request returned no "
"stories");
@@ -270,37 +270,37 @@ rsspp::Feed NewsBlurApi::fetch_feed(const std::string&
json_object* node{};
if (json_object_object_get_ex(
- item_obj, "story_title", &node) == TRUE) {
+ item_obj, "story_title", &node) == 1) {
item.title = json_object_get_string(node);
}
if (json_object_object_get_ex(
- item_obj, "story_authors", &node) == TRUE) {
+ item_obj, "story_authors", &node) == 1) {
item.author = json_object_get_string(node);
}
if (json_object_object_get_ex(item_obj,
"story_permalink",
- &node) == TRUE) {
+ &node) == 1) {
item.link = json_object_get_string(node);
}
if (json_object_object_get_ex(
- item_obj, "story_content", &node) == TRUE) {
+ item_obj, "story_content", &node) == 1) {
item.content_encoded =
json_object_get_string(node);
}
const char* article_id{};
if (json_object_object_get_ex(item_obj, "id", &node) ==
- TRUE) {
+ 1) {
article_id = json_object_get_string(node);
}
item.guid = id + ID_SEPARATOR +
(article_id ? article_id : "");
if (json_object_object_get_ex(
- item_obj, "read_status", &node) == TRUE) {
+ item_obj, "read_status", &node) == 1) {
if (!static_cast<bool>(
json_object_get_int(node))) {
item.labels.push_back(
@@ -311,7 +311,7 @@ rsspp::Feed NewsBlurApi::fetch_feed(const std::string&
}
if (json_object_object_get_ex(
- item_obj, "story_date", &node) == TRUE) {
+ item_obj, "story_date", &node) == 1) {
const char* pub_date =
json_object_get_string(node);
item.pubDate_ts = parse_date(pub_date);