Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -14674,7 +14674,6 @@ mail/prayer||2020-05-05|Has expired: Broken for more than 6 months mail/py-cyruslib||2020-05-05|Has expired: Broken for more than 6 months mail/qmail-auditor||2020-05-05|Has expired: Broken for more than 6 months -mail/qmailmrtg7||2020-05-05|Has expired: Broken for more than 6 months mail/qmqtool||2020-05-05|Has expired: Broken for more than 6 months mail/relaydb||2020-05-05|Has expired: Broken for more than 6 months mail/rftp||2020-05-05|Has expired: Broken for more than 6 months Index: devel/rlwrap/Makefile =================================================================== --- devel/rlwrap/Makefile +++ devel/rlwrap/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= rlwrap -PORTVERSION= 0.42 -DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTVERSION= 0.44 CATEGORIES= devel +MASTER_SITES= https://github.com/hanslub42/rlwrap/releases/download/7c1e432/ MAINTAINER= gamato@users.sf.net COMMENT= Readline wrapper @@ -13,13 +12,15 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GITHUB= yes -GH_ACCOUNT= hanslub42 +USES= autoreconf python readline shebangfix +PYTHON_NO_DEPENDS= yes +#USE_GITHUB= yes +#GH_ACCOUNT= hanslub42 +SHEBANG_GLOB= share/rlwrap/filters/*.py -USES= readline autoreconf GNU_CONFIGURE= yes -PORTDOCS= AUTHORS BUGS NEWS PLEA README TODO +PORTDOCS= AUTHORS BUGS NEWS README OPTIONS_DEFINE= DOCS Index: devel/rlwrap/distinfo =================================================================== --- devel/rlwrap/distinfo +++ devel/rlwrap/distinfo @@ -1,2 +1,3 @@ -SHA256 (hanslub42-rlwrap-v0.42_GH0.tar.gz) = fff56c24341f0c717cf3a8f0ebbf2cba415b1952e1591168ca69ed13638b20f3 -SIZE (hanslub42-rlwrap-v0.42_GH0.tar.gz) = 139838 +TIMESTAMP = 1611167981 +SHA256 (rlwrap-0.44.tar.gz) = cd7ff50cde66e443cbea0049b4abf1cca64a74948371fa4f1b5d9a5bbce1e13c +SIZE (rlwrap-0.44.tar.gz) = 321590 Index: devel/rlwrap/files/patch-configure.ac =================================================================== --- devel/rlwrap/files/patch-configure.ac +++ devel/rlwrap/files/patch-configure.ac @@ -1,20 +0,0 @@ ---- configure.ac.orig 2014-11-14 14:48:11 UTC -+++ configure.ac -@@ -212,7 +212,7 @@ AC_CACHE_CHECK(for pty/tty type, ptyttyl - AC_CHECK_HEADERS([pty.h]) - else if test x$ac_cv_func__getpty = xyes; then - ptyttylib_cv_ptys=SGI4 -- else if test -c /dev/ttyp20 -a ! -c /dev/ptmx; then -+ else if test -c /dev/ttyp20 -a ! -c /nonexistent; then - ptyttylib_cv_ptys=SCO - else if test -c /dev/ptym/clone; then - ptyttylib_cv_ptys=HPUX -@@ -222,7 +222,7 @@ AC_CACHE_CHECK(for pty/tty type, ptyttyl - ptyttylib_cv_ptys=PTC - else if test -c /dev/ptc -a -d /dev/pts; then - ptyttylib_cv_ptys=PTC -- else if test -c /dev/ptmx -a -c /dev/pts/0; then -+ else if test -c /nonexistent -a -c /dev/pts/0; then - ptyttylib_cv_ptys=STREAMS - else case "$host_os" in - *cygwin*) ptyttylib_cv_ptys=STREAMS ;; Index: devel/rlwrap/files/patch-src__ptytty.c =================================================================== --- devel/rlwrap/files/patch-src__ptytty.c +++ devel/rlwrap/files/patch-src__ptytty.c @@ -1,27 +0,0 @@ ---- src/ptytty.c.orig 2010-01-24 01:05:53.000000000 -0800 -+++ src/ptytty.c 2010-01-24 01:09:19.000000000 -0800 -@@ -159,11 +159,19 @@ - char pty_name[] = "/dev/pty??"; - char tty_name[] = "/dev/tty??"; - --# ifndef PTYCHAR1 --# define PTYCHAR1 "pqrstuvwxyz" --# endif --# ifndef PTYCHAR2 --# define PTYCHAR2 "0123456789abcdef" -+# ifdef __FreeBSD__ -+/* Auto-detected pty names do not work well with devfs! */ -+# undef PTYCHAR1 -+# define PTYCHAR1 "pqrsPQRS" -+# undef PTYCHAR2 -+# define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv" -+# else -+# ifndef PTYCHAR1 -+# define PTYCHAR1 "pqrstuvwxyz" -+# endif -+# ifndef PTYCHAR2 -+# define PTYCHAR2 "0123456789abcdef" -+# endif - # endif - for (c1 = PTYCHAR1; *c1; c1++) { - pty_name[(sizeof(pty_name) - 3)] = Index: devel/rlwrap/files/patch-src_main.c =================================================================== --- devel/rlwrap/files/patch-src_main.c +++ devel/rlwrap/files/patch-src_main.c @@ -1,11 +0,0 @@ ---- src/main.c.orig 2014-11-14 14:48:11 UTC -+++ src/main.c -@@ -52,7 +52,7 @@ char *filter_command = NULL; /* -z opt - - /* variables for global bookkeeping */ - int master_pty_fd; /* master pty (rlwrap uses this to communicate with client) */ --int slave_pty_sensing_fd; /* slave pty (client uses this to communicate with rlwrap, -+extern int slave_pty_sensing_fd; /* slave pty (client uses this to communicate with rlwrap, - * we keep it open after forking in order to keep track of - * client's terminal settings */ - FILE *debug_fp = NULL; /* filehandle of debugging log */ Index: mail/Makefile =================================================================== --- mail/Makefile +++ mail/Makefile @@ -529,6 +529,7 @@ SUBDIR += qmail-tls SUBDIR += qmailadmin SUBDIR += qmailanalog + SUBDIR += qmailmrtg7 SUBDIR += qmhandle SUBDIR += qpopper SUBDIR += qsf Index: mail/qmailmrtg7/Makefile =================================================================== --- mail/qmailmrtg7/Makefile +++ mail/qmailmrtg7/Makefile @@ -3,28 +3,25 @@ PORTNAME= qmailmrtg7 PORTVERSION= 4.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail net-mgmt -MASTER_SITES= http://www.inter7.com/qmailmrtg7/ +MASTER_SITES= http://www.inter7.com/wp-content/uploads/2014/12/ \ + LOCAL/otis/mail_qmailmrtg7/ MAINTAINER= ale@FreeBSD.org COMMENT= Program to create mrtg graphs for qmail activity -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-05-05 - LICENSE= GPLv2 RUN_DEPENDS= mrtg:net-mgmt/mrtg -OPTIONS_DEFINE= DOCS EXAMPLES - USES= qmail +OPTIONS_DEFINE= DOCS EXAMPLES + post-patch: - @${REINPLACE_CMD} "s|cc|${CC}|g;s|-s -O|${CFLAGS}|g" ${WRKSRC}/Makefile - @${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g;s|/var/qmail|${QMAIL_PREFIX}|g" \ + ${REINPLACE_CMD} "s|cc|${CC}|g;s|-s -O|${CFLAGS}|g" ${WRKSRC}/Makefile + ${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g;s|/var/qmail|${QMAIL_PREFIX}|g" \ ${WRKSRC}/checkq.c ${WRKSRC}/qmail.mrtg.cfg do-install: Index: mail/qmailmrtg7/distinfo =================================================================== --- mail/qmailmrtg7/distinfo +++ mail/qmailmrtg7/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1610559648 SHA256 (qmailmrtg7-4.2.tar.gz) = f1fff89a2969bf6b67535d0412852057b730050fec799229ed5162161b0bb239 SIZE (qmailmrtg7-4.2.tar.gz) = 9690 Index: net-mgmt/unifi6/Makefile =================================================================== --- net-mgmt/unifi6/Makefile +++ net-mgmt/unifi6/Makefile @@ -16,7 +16,12 @@ MAINTAINER= otis@FreeBSD.org COMMENT= UniFi Controller v6 -LICENSE= NONE +LICENSE= EULA +LICENSE_NAME= End User License Agreement +LICENSE_TEXT= ${RESTRICTED} +LICENSE_PERMS= none + +RESTRICTED= License restrictions, see https://www.ubnt.com/eula/ RUN_DEPENDS= mongodb36>0:databases/mongodb36 \ snappyjava>0:archivers/snappy-java Index: net-mgmt/zabbix5-server/Makefile =================================================================== --- net-mgmt/zabbix5-server/Makefile +++ net-mgmt/zabbix5-server/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= zabbix5 -PORTVERSION= 5.0.6 +DISTVERSION= 5.0.7 PORTREVISION?= 0 CATEGORIES= net-mgmt -MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ +MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ PKGNAMESUFFIX?= -server -DISTNAME= zabbix-${PORTVERSION} +DISTNAME= zabbix-${DISTVERSION} MAINTAINER= pg@pakhom.spb.ru COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS @@ -49,7 +49,7 @@ PLIST_SUB+= SERVER="@comment " .endif -PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION} +PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} DISTVERSION=${DISTVERSION} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} MAKE_ARGS+= ARCH=freebsd Index: net-mgmt/zabbix5-server/distinfo =================================================================== --- net-mgmt/zabbix5-server/distinfo +++ net-mgmt/zabbix5-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606981124 -SHA256 (zabbix-5.0.6.tar.gz) = 53c55ae9a0898b7e523712db0fe2daf00d88d6df7188ad14e8ea07d8b3b2cdc8 -SIZE (zabbix-5.0.6.tar.gz) = 19359566 +TIMESTAMP = 1611353161 +SHA256 (zabbix-5.0.7.tar.gz) = d762f8a9aa9e8717d2e85d2a82d27316ea5c2b214eb00aff41b6e9b06107916a +SIZE (zabbix-5.0.7.tar.gz) = 19382483 Index: net-mgmt/zabbix5-server/pkg-plist.java =================================================================== --- net-mgmt/zabbix5-server/pkg-plist.java +++ net-mgmt/zabbix5-server/pkg-plist.java @@ -7,5 +7,5 @@ sbin/zabbix_java/lib/android-json-4.3_r3.1.jar @sample sbin/zabbix_java/settings.sh.sample sbin/zabbix_java/startup.sh -sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar +sbin/zabbix_java/bin/zabbix-java-gateway-%%DISTVERSION%%.jar @dir(zabbix,zabbix,755) /var/run/zabbix Index: net-mgmt/zabbix52-server/Makefile =================================================================== --- net-mgmt/zabbix52-server/Makefile +++ net-mgmt/zabbix52-server/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= zabbix52 -PORTVERSION= 5.2.2 +DISTVERSION= 5.2.3 PORTREVISION?= 0 CATEGORIES= net-mgmt -MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ +MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ PKGNAMESUFFIX?= -server -DISTNAME= zabbix-${PORTVERSION} +DISTNAME= zabbix-${DISTVERSION} MAINTAINER= pg@pakhom.spb.ru COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) @@ -17,22 +17,23 @@ LIB_DEPENDS= libpcre.so:devel/pcre -CONFLICTS_INSTALL= zabbix[0-46-9][0-9]${PKGNAMESUFFIX} \ - zabbix5[0-13-9]${PKGNAMESUFFIX} \ - zabbix[0-9]${PKGNAMESUFFIX} +CONFLICTS_INSTALL= zabbix5[0-13-9]${PKGNAMESUFFIX} \ + zabbix[0-46-9][0-9]${PKGNAMESUFFIX} \ + zabbix[0-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} --cache-file=${WRKSRC}/config.cache -LIB_DEPENDS+= libevent.so:devel/libevent -USE_RC_SUBR= zabbix_${ZABBIX_BUILD} +CONFIGURE_ARGS+= --cache-file=${WRKSRC}/config.cache \ + --with-libevent=${LOCALBASE} +LIB_DEPENDS+= libevent.so:devel/libevent +USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else -USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d +USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif -USES= pkgconfig iconv +USES= iconv pkgconfig USERS= zabbix GROUPS= zabbix @@ -51,14 +52,15 @@ PLIST_SUB+= SERVER="@comment " .endif -PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION} +PLIST_SUB+= DISTVERSION=${DISTVERSION} \ + ZABBIX_BUILD=${ZABBIX_BUILD} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} -MAKE_ARGS+= ARCH=freebsd -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ +MAKE_ARGS+= ARCH=freebsd +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --datadir=${ETCDIR} \ + --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ - --datadir=${ETCDIR} \ --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" @@ -70,22 +72,22 @@ CONFIGURE_ARGS+= --with-net-snmp -OPTIONS_DEFINE= IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC +OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP LIBXML2 NMAP SSH UNIXODBC -OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL +OPTIONS_DEFAULT= CURL FPING MYSQL OPENSSL UNIXODBC OPTIONS_SUB= yes -FPING_DESC= Build/install fping for ping checks -IPMI_DESC= Support for IPMI checks -LDAP_DESC= Support for LDAP server checks -NMAP_DESC= Build/install nmap for o/s detection -SSH_DESC= Support for SSH-based checks -UNIXODBC_DESC= Support for database checks via ODBC -LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) +FPING_DESC= Build/install fping for ping checks +IPMI_DESC= Support for IPMI checks +LDAP_DESC= Support for LDAP server checks +NMAP_DESC= Build/install nmap for o/s detection +SSH_DESC= Support for SSH-based checks +UNIXODBC_DESC= Support for database checks via ODBC +LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) OPTIONS_SINGLE= DB SSL -OPTIONS_SINGLE_DB?= MYSQL PGSQL ORACLE -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS +OPTIONS_SINGLE_DB?= MYSQL ORACLE PGSQL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= compiler:c11 mysql @@ -109,11 +111,11 @@ SSH_CONFIGURE_WITH= ssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 -UNIXODBC_CONFIGURE_WITH=unixodbc -UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +UNIXODBC_CONFIGURE_WITH= unixodbc +UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .elif ${ZABBIX_BUILD} == "agent" -OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" CURL_DESC= Support for web monitoring Index: net-mgmt/zabbix52-server/distinfo =================================================================== --- net-mgmt/zabbix52-server/distinfo +++ net-mgmt/zabbix52-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606982680 -SHA256 (zabbix-5.2.2.tar.gz) = 0f71a623ae801ba493849204415ceae73be078452be86ea8e5914d9c61e9589b -SIZE (zabbix-5.2.2.tar.gz) = 19745101 +TIMESTAMP = 1611337430 +SHA256 (zabbix-5.2.3.tar.gz) = ce36c89bf39e7c88ad36f308cb39883ee10a8707d6643700b5b11f45951c9b72 +SIZE (zabbix-5.2.3.tar.gz) = 19791383 Index: net-mgmt/zabbix52-server/pkg-plist.frontend =================================================================== --- net-mgmt/zabbix52-server/pkg-plist.frontend +++ net-mgmt/zabbix52-server/pkg-plist.frontend @@ -542,6 +542,7 @@ %%WWWDIR%%/include/classes/helpers/CCookieHelper.php %%WWWDIR%%/include/classes/helpers/CDashboardHelper.php %%WWWDIR%%/include/classes/helpers/CDataCacheHelper.php +%%WWWDIR%%/include/classes/helpers/CDateTimeZoneHelper.php %%WWWDIR%%/include/classes/helpers/CElasticsearchHelper.php %%WWWDIR%%/include/classes/helpers/CEncryptHelper.php %%WWWDIR%%/include/classes/helpers/CHousekeepingHelper.php Index: net-mgmt/zabbix52-server/pkg-plist.java =================================================================== --- net-mgmt/zabbix52-server/pkg-plist.java +++ net-mgmt/zabbix52-server/pkg-plist.java @@ -7,5 +7,5 @@ sbin/zabbix_java/lib/android-json-4.3_r3.1.jar @sample sbin/zabbix_java/settings.sh.sample sbin/zabbix_java/startup.sh -sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar +sbin/zabbix_java/bin/zabbix-java-gateway-%%DISTVERSION%%.jar @dir(zabbix,zabbix,755) /var/run/zabbix Index: textproc/elasticsearch6/files/elasticsearch.in =================================================================== --- textproc/elasticsearch6/files/elasticsearch.in +++ textproc/elasticsearch6/files/elasticsearch.in @@ -3,8 +3,7 @@ # $FreeBSD$ # # PROVIDE: elasticsearch -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON +# REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable elasticsearch: Index: textproc/elasticsearch7/files/elasticsearch.in =================================================================== --- textproc/elasticsearch7/files/elasticsearch.in +++ textproc/elasticsearch7/files/elasticsearch.in @@ -3,8 +3,7 @@ # $FreeBSD$ # # PROVIDE: elasticsearch -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON +# REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable elasticsearch: