diff --git a/net/echoping/Makefile b/net/echoping/Makefile index f0edfac1fb28..b9c3e52f89d0 100644 --- a/net/echoping/Makefile +++ b/net/echoping/Makefile @@ -1,51 +1,51 @@ # Created by: peter PORTNAME= echoping PORTVERSION= 6.0.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MAINTAINER= ports@FreeBSD.org COMMENT= Ping-like program that uses TCP and/or HTTP LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpopt.so:devel/popt \ libidn.so:dns/libidn USES= autoreconf cpe libtool pkgconfig ssl CPE_VENDOR= echoping_project GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-http --enable-icp --enable-smtp --with-ssl \ --enable-ttcp --enable-tos --with-libidn=${LOCALBASE} \ --enable-plugin="${PING_PLUGINS}" INSTALL_TARGET= install-strip PING_PLUGINS= dns random whois USE_GITLAB= yes GL_SITE= https://framagit.org GL_ACCOUNT= bortzmeyer GL_COMMIT= ccf3c95d9249d3065db3853486f41c852d20101e WRKSRC_SUBDIR= SRC OPTIONS_DEFINE= LDAP PGSQL OPTIONS_DEFAULT=LDAP OPTIONS_SUB= yes LDAP_USE= OPENLDAP=yes LDAP_VARS= PING_PLUGINS+=ldap PGSQL_USES= pgsql PGSQL_VARS= PING_PLUGINS+=postgresql pre-configure: ${FIND} ${WRKSRC} -name configure.ac -execdir ${SH} -c '\ ${CAT} ${WRKSRC}/configure-common.ac > configure.ac.tmp && \ ${SED} '/configure-common\.ac/d' configure.ac >> configure.ac.tmp && \ ${MV} configure.ac.tmp configure.ac' \; ${REINPLACE_CMD} '/^echoping_LDADD =/s/$$/ -lm/' ${WRKSRC}/Makefile.am .include diff --git a/net/echoping/files/patch-echoping.h b/net/echoping/files/patch-echoping.h index 6614c1d56d6e..f411f7383f8e 100644 --- a/net/echoping/files/patch-echoping.h +++ b/net/echoping/files/patch-echoping.h @@ -1,45 +1,53 @@ --- echoping.h.orig 2020-08-20 15:39:43 UTC +++ echoping.h @@ -121,7 +121,6 @@ struct result struct timeval timevalue; }; -boolean timeout_flag; struct echoping_struct { boolean udp; /* Use the UDP protocol (TCP is the default) */ @@ -136,21 +135,15 @@ typedef struct echoping_struct echoping_options; /* Initializes the plugin with its arguments. Returns the port name or number or NULL if the plugin wants to use the raw interface. */ typedef char *(*init_f) (const int argc, const char **argv, const echoping_options global_options); -init_f plugin_init; typedef void (*start_f) (struct addrinfo *); -start_f plugin_start; typedef void (*start_raw_f) (); -start_raw_f plugin_raw_start; typedef int (*execute_f) (); -execute_f plugin_execute; typedef void (*terminate_f) (); -terminate_f plugin_terminate; #endif #endif -struct timeval null_timeval; -struct timeval max_timeval; +extern struct timeval null_timeval; #define ECHO_TCP_PORT "echo" #define DISCARD_TCP_PORT "discard" @@ -172,11 +165,6 @@ struct timeval max_timeval; #define USE_SMTP 6 #define CHARGENERATED " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefg"; - -char *server; -#ifdef LIBIDN -char *locale_server, *ace_server, *utf8_server; -#endif /* My functions */ +@@ -198,6 +186,7 @@ int TLS_readline (); + #endif + /* util.c */ + char *random_string (); ++char *to_upper(char *); + void tvsub (); + void tvadd (); + void tvavg ();