diff --git a/net-mgmt/send/Makefile b/net-mgmt/send/Makefile index de0eca556f63..e6f0884a2dfb 100644 --- a/net-mgmt/send/Makefile +++ b/net-mgmt/send/Makefile @@ -1,47 +1,44 @@ PORTNAME= send PORTVERSION= 0.3 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MAINTAINER= hrs@FreeBSD.org COMMENT= Secure Neighbor Discovery implementation for IPv6 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_13= ld: error: duplicate symbol: params_linecnt -BROKEN_FreeBSD_14= ld: error: duplicate symbol: params_linecnt - LIB_DEPENDS= libdnet.so:net/libdnet -USES= gmake readline ssl +USES= gmake ncurses readline ssl USE_GITHUB= yes GH_ACCOUNT= hrs-allbsd USE_RC_SUBR= sendd SUB_FILES= pkg-message PORTDOCS= README UserGuide.pdf MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DOCS post-extract: ${INSTALL_DATA} ${WRKSRC}/examples/ipext/ipext_verify.conf \ ${WRKSRC}/examples/ipext/ca/ipext.conf \ ${WRKSRC}/examples/ ${INSTALL_DATA} ${WRKSRC}/docs/UserGuide.pdf \ ${WRKSRC}/UserGuide.pdf post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/sendd for F in sendd.conf params.conf ipext.conf ipext_verify.conf; do \ ${INSTALL_DATA} ${WRKSRC}/examples/$$F \ ${STAGEDIR}${PREFIX}/etc/sendd/$${F}-dist; \ done post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/net-mgmt/send/files/patch-libs-libpkixipext-pkixip_ext_gram.y b/net-mgmt/send/files/patch-libs-libpkixipext-pkixip_ext_gram.y index ed0ac3a3a9b3..ef68ee80da79 100644 --- a/net-mgmt/send/files/patch-libs-libpkixipext-pkixip_ext_gram.y +++ b/net-mgmt/send/files/patch-libs-libpkixipext-pkixip_ext_gram.y @@ -1,31 +1,40 @@ --- libs/libpkixipext/pkixip_ext_gram.y.orig 2019-02-27 16:25:45 UTC +++ libs/libpkixipext/pkixip_ext_gram.y +@@ -42,7 +42,7 @@ + #include "pkixip_ext.h" + #include "pkixip_local.h" + +-int linecnt; ++extern int linecnt; + + extern char *pkixip_text; + extern int pkixip_lex(void); @@ -350,7 +350,7 @@ new_aor(void) if (!ipc->u.addressesOrRanges && !(ipc->u.addressesOrRanges = - sk_new(pkixip_aor_cmp))) { + sk_IPAddressOrRange_new(pkixip_aor_cmp))) { applog(LOG_CRIT, "no memory"); return (-1); } @@ -361,7 +361,7 @@ new_aor(void) applog(LOG_CRIT, "%s: no memory", __FUNCTION__); return (-1); } - if (!sk_push(ipc->u.addressesOrRanges, (char *)aor)) { + if (!sk_IPAddressOrRange_push(ipc->u.addressesOrRanges, (char *)aor)) { applog(LOG_CRIT, "sk_push() failed"); return (-1); } @@ -459,8 +459,8 @@ af_already_exists(void) int i; IPAddressFamily *e_ipf; - for (i = 0; i < sk_num(parse_ipb); i++) { - e_ipf = (IPAddressFamily *)sk_value(parse_ipb, i); + for (i = 0; i < sk_IPAddressFamily_num(parse_ipb); i++) { + e_ipf = sk_IPAddressFamily_value(parse_ipb, i); if (af_match(ipf, e_ipf)) { return (1); } diff --git a/net-mgmt/send/files/patch-sendd_params__gram.y b/net-mgmt/send/files/patch-sendd_params__gram.y new file mode 100644 index 000000000000..21547a0d94b1 --- /dev/null +++ b/net-mgmt/send/files/patch-sendd_params__gram.y @@ -0,0 +1,11 @@ +--- sendd/params_gram.y.orig 2023-04-11 00:49:19 UTC ++++ sendd/params_gram.y +@@ -77,7 +77,7 @@ static void yyerror(char *); + extern char *params_text; + extern int params_lex(void); + +-int params_linecnt; ++extern int params_linecnt; + + static const char *derfile; + static const char *keyfile;