Index: databases/mariadb105-server/Makefile =================================================================== --- databases/mariadb105-server/Makefile +++ databases/mariadb105-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mariadb PORTVERSION= 10.5.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -152,7 +152,9 @@ CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER CMAKE_OFF+= WITH_CLIENT SUB_FILES+= server.cnf.sample -SUB_LIST+= MARIADB_GROUP="${MARIADB_GROUP}" \ +SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \ + MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ + MARIADB_GROUP="${MARIADB_GROUP}" \ MARIADB_LOGDIR="${MARIADB_LOGDIR}" PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" Index: databases/percona55-server/Makefile =================================================================== --- databases/percona55-server/Makefile +++ databases/percona55-server/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.5.61-38.13 -PORTREVISION?= 4 +DISTVERSION= 5.5.62-38.14 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 55-server Index: databases/percona55-server/distinfo =================================================================== --- databases/percona55-server/distinfo +++ databases/percona55-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536515459 -SHA256 (percona-server-5.5.61-38.13.tar.gz) = 2c52ce68b68b0a460d193845498a6e42ab196d6bc4260c0dc8a042e31abb4f8b -SIZE (percona-server-5.5.61-38.13.tar.gz) = 22332795 +TIMESTAMP = 1554492507 +SHA256 (percona-server-5.5.62-38.14.tar.gz) = 78f79a9f903d01bd3ec381cc9f793c448fc6fb2abee21d8f86d9398649f188f8 +SIZE (percona-server-5.5.62-38.14.tar.gz) = 22427467 Index: mail/dbmail/files/patch-010-mysql57-workaround =================================================================== --- /dev/null +++ mail/dbmail/files/patch-010-mysql57-workaround @@ -0,0 +1,100 @@ +diff --git src/clientbase.c src/clientbase.c +index a8804876..663b233b 100644 +--- src/clientbase.c ++++ src/clientbase.c +@@ -515,9 +515,13 @@ void ci_authlog_init(ClientBase_T *client, const char *service, const char *user + db_stmt_set_int(s, 6, atoi(client->dst_port)); + db_stmt_set_str(s, 7, status); + +- r = db_stmt_query(s); +- +- if(strcmp(AUTHLOG_ERR,status)!=0) client->authlog_id = db_insert_result(c, r); ++ if (db_params.db_driver == DM_DRIVER_ORACLE || db_params.db_driver == DM_DRIVER_MYSQL) { ++ db_stmt_exec(s); ++ if(strcmp(AUTHLOG_ERR,status)!=0) client->authlog_id = db_get_pk(c, "authlog"); ++ } else { ++ r = db_stmt_query(s); ++ if(strcmp(AUTHLOG_ERR,status)!=0) client->authlog_id = db_insert_result(c, r); ++ } + CATCH(SQLException) + LOG_SQLERROR; + FINALLY +diff --git src/dm_db.c src/dm_db.c +index 429d0aef..1250bcf0 100644 +--- src/dm_db.c ++++ src/dm_db.c +@@ -516,6 +516,11 @@ inline gboolean db_stmt_exec(PreparedStatement_T s) + + inline ResultSet_T db_stmt_query(PreparedStatement_T s) + { ++ // with prepared INSERT statements and mysql 5.7.? ++ // better stick to db_stmt_exec() and db_get_pk() ++ // due to CURSOR_TYPE_READ_ONLY issue ++ // (see mysql bug #85105 and libzdb issue #21) ++ + return PreparedStatement_executeQuery(s); + } + +@@ -587,7 +592,11 @@ uint64_t db_get_pk(Connection_T c, const char *table) + { + ResultSet_T r; + uint64_t id = 0; +- r = db_query(c, "SELECT sq_%s%s.CURRVAL FROM DUAL", DBPFX, table); ++ if (db_params.db_driver == DM_DRIVER_MYSQL) { ++ r = db_query(c, "SELECT LAST_INSERT_ID()"); ++ } else { ++ r = db_query(c, "SELECT sq_%s%s.CURRVAL FROM DUAL", DBPFX, table); ++ } + if (db_result_next(r)) + id = db_result_get_u64(r, 0); + assert(id); +@@ -2637,7 +2646,7 @@ int db_createmailbox(const char * name, uint64_t owner_idnr, uint64_t * mailbox_ + db_stmt_set_str(s,1,simple_name); + db_stmt_set_u64(s,2,owner_idnr); + +- if (db_params.db_driver == DM_DRIVER_ORACLE) { ++ if (db_params.db_driver == DM_DRIVER_ORACLE || db_params.db_driver == DM_DRIVER_MYSQL) { + db_stmt_exec(s); + *mailbox_idnr = db_get_pk(c, "mailboxes"); + } else { +@@ -3974,7 +3983,7 @@ int db_user_create(const char *username, const char *password, const char *encty + db_stmt_set_str(s, 6, encoding); + } + g_free(frag); +- if (db_params.db_driver == DM_DRIVER_ORACLE) { ++ if (db_params.db_driver == DM_DRIVER_ORACLE || db_params.db_driver == DM_DRIVER_MYSQL) { + db_stmt_exec(s); + id = db_get_pk(c, "users"); + } else { +diff --git src/dm_message.c src/dm_message.c +index 82b0656b..0082d4c9 100644 +--- src/dm_message.c ++++ src/dm_message.c +@@ -191,7 +191,7 @@ static uint64_t blob_insert(const char *buf, const char *hash) + db_stmt_set_str(s, 1, hash); + db_stmt_set_blob(s, 2, buf, l); + db_stmt_set_int(s, 3, l); +- if (db_params.db_driver == DM_DRIVER_ORACLE) { ++ if (db_params.db_driver == DM_DRIVER_ORACLE || db_params.db_driver == DM_DRIVER_MYSQL) { + db_stmt_exec(s); + id = db_get_pk(c, "mimeparts"); + } else { +@@ -1451,7 +1451,7 @@ static int _header_name_get_id(const DbmailMessage *self, const char *header, ui + + db_stmt_set_str(s,1,safe_header); + +- if (db_params.db_driver == DM_DRIVER_ORACLE) { ++ if (db_params.db_driver == DM_DRIVER_ORACLE || db_params.db_driver == DM_DRIVER_MYSQL) { + db_stmt_exec(s); + *tmp = db_get_pk(c, "headername"); + } else { +@@ -1534,7 +1534,7 @@ static uint64_t _header_value_insert(Connection_T c, const char *value, const ch + if (datesize) + db_stmt_set_str(s, 4, datefield); + +- if (db_params.db_driver == DM_DRIVER_ORACLE) { ++ if (db_params.db_driver == DM_DRIVER_ORACLE || db_params.db_driver == DM_DRIVER_MYSQL) { + db_stmt_exec(s); + id = db_get_pk(c, "headervalue"); + } else { + Index: multimedia/tautulli/Makefile =================================================================== --- multimedia/tautulli/Makefile +++ multimedia/tautulli/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tautulli -PORTVERSION= 2.2.4 +DISTVERSION= 2.5.2 DISTVERSIONPREFIX=v CATEGORIES= multimedia python @@ -12,14 +12,11 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -USES= python:2.7 shebangfix +USES= python shebangfix USE_GITHUB= yes USE_RC_SUBR= ${PORTNAME} @@ -50,7 +47,7 @@ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - ${RLN} ${STAGEDIR}${DOCSDIR}/CHANGELOG.md ${STAGEDIR}${WWWDIR}/CHANGELOG.md + #${RLN} ${STAGEDIR}${DOCSDIR}/CHANGELOG.md ${STAGEDIR}${WWWDIR}/CHANGELOG.md post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -type d -empty -delete Index: multimedia/tautulli/distinfo =================================================================== --- multimedia/tautulli/distinfo +++ multimedia/tautulli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592821409 -SHA256 (Tautulli-Tautulli-v2.2.4_GH0.tar.gz) = 92b68c98070ef5a55b18d738439a95c6a20546bb336a0149259bb3bb956efc5c -SIZE (Tautulli-Tautulli-v2.2.4_GH0.tar.gz) = 12307350 +TIMESTAMP = 1593722717 +SHA256 (Tautulli-Tautulli-v2.5.2_GH0.tar.gz) = f11c3093ea21b0712c94e603388e4e4c987386c2db54b2dd8ecfab4f3009e574 +SIZE (Tautulli-Tautulli-v2.5.2_GH0.tar.gz) = 13084917 Index: multimedia/tautulli/files/patch-Tautulli.py =================================================================== --- multimedia/tautulli/files/patch-Tautulli.py +++ /dev/null @@ -1,11 +0,0 @@ ---- Tautulli.py.orig 2018-03-17 14:15:36 UTC -+++ Tautulli.py -@@ -1,8 +1,4 @@ - #!/usr/local/bin/python2.7 --''''which python >/dev/null 2>&1 && exec python "$0" "$@" # ''' --''''which python2 >/dev/null 2>&1 && exec python2 "$0" "$@" # ''' --''''which python2.7 >/dev/null 2>&1 && exec python2.7 "$0" "$@" # ''' --''''exec echo "Error: Python not found!" # ''' - - # -*- coding: utf-8 -*- - Index: multimedia/tautulli/pkg-plist =================================================================== --- multimedia/tautulli/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%WWWDIR%%/CHANGELOG.md Index: net-mgmt/librenms/Makefile =================================================================== --- net-mgmt/librenms/Makefile +++ net-mgmt/librenms/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 1.63 -PORTREVISION= 2 +PORTVERSION= 1.64 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -61,8 +60,6 @@ LIBVIRT_RUN_DEPENDS= virsh:devel/libvirt NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NMAP_RUN_DEPENDS= nmap:security/nmap -PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${PY_FLAVOR} -PYPOLLER_USES= python:2.7 PYSERVICE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-dotenv>0:www/py-python-dotenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR} PYSERVICE_USES= python:3.6+ Index: net-mgmt/monitoring-plugins/Makefile =================================================================== --- net-mgmt/monitoring-plugins/Makefile +++ net-mgmt/monitoring-plugins/Makefile @@ -65,7 +65,7 @@ ac_cv_path_PATH_TO_PING=/sbin/ping \ ac_cv_path_PATH_TO_PING6=/sbin/ping6 \ --with-ping-command="/sbin/ping -n -t %d -c %d %s" \ - --with-ping6-command="/sbin/ping6 -n -X %d -c %d %s" \ + --with-ping6-command="/sbin/ping6 -n -t %d -c %d %s" \ ac_cv_path_PATH_TO_SUDO=${LOCALBASE}/bin/sudo \ ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient Index: net-mgmt/nrpe3/Makefile =================================================================== --- net-mgmt/nrpe3/Makefile +++ net-mgmt/nrpe3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nrpe -PORTVERSION= 3.2.1 +PORTVERSION= 4.0.3 DISTVERSIONPREFIX= nrpe- PORTREVISION?= 0 CATEGORIES= net-mgmt Index: net-mgmt/nrpe3/distinfo =================================================================== --- net-mgmt/nrpe3/distinfo +++ net-mgmt/nrpe3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507746408 -SHA256 (NagiosEnterprises-nrpe-nrpe-3.2.1_GH0.tar.gz) = b1bb0a0cbbd0f6c438ce7260db600cd45612c61ae7e3bd59a309262dc4d70b81 -SIZE (NagiosEnterprises-nrpe-nrpe-3.2.1_GH0.tar.gz) = 518035 +TIMESTAMP = 1591655246 +SHA256 (NagiosEnterprises-nrpe-nrpe-4.0.3_GH0.tar.gz) = 82266911b895ed84f6ecac63d2d1356581e7961376ea0ac5f772ec5a7dba3d21 +SIZE (NagiosEnterprises-nrpe-nrpe-4.0.3_GH0.tar.gz) = 524202 Index: net-mgmt/nsca/Makefile =================================================================== --- net-mgmt/nsca/Makefile +++ net-mgmt/nsca/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= nsca -PORTVERSION= 2.9.2 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= net-mgmt MASTER_SITES= SF/nagios/nsca-2.x/nsca-${PORTVERSION} @@ -49,7 +48,7 @@ PLIST_SUB+= CLIENT="@comment " .endif -DOCS= Changelog LEGAL README SECURITY +DOCS= CHANGELOG.md LICENSE.md README.md SECURITY.md do-install: .if defined(_BUILDING_NSCA_CLIENT) Index: net-mgmt/nsca/distinfo =================================================================== --- net-mgmt/nsca/distinfo +++ net-mgmt/nsca/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485550249 -SHA256 (nsca-2.9.2.tar.gz) = 96eb04ef695873ce462e3f8db08e8a49456ff9595d11acf70a3dd8a2c4af3b5e -SIZE (nsca-2.9.2.tar.gz) = 117299 +TIMESTAMP = 1592293463 +SHA256 (nsca-2.10.0.tar.gz) = 80a6a266134e408013d66d1f7ec980a99ebc7d9a3b888f73a8165a3d3c941cfb +SIZE (nsca-2.10.0.tar.gz) = 124136 Index: net-mgmt/nsca/files/patch-src_nsca.c =================================================================== --- net-mgmt/nsca/files/patch-src_nsca.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/nsca.c.orig 2017-04-20 16:25:28 UTC -+++ src/nsca.c -@@ -917,7 +917,7 @@ static void accept_connection(int sock, - return; - - /* try and handle temporary errors */ -- if(errno==EWOULDBLOCK || errno==EINTR || errno==ECHILD){ -+ if(errno==EWOULDBLOCK || errno==EINTR || errno==ECHILD || errno==ECONNABORTED){ - if(mode==MULTI_PROCESS_DAEMON) - sleep(1); - else Index: net-mgmt/nsca/pkg-plist =================================================================== --- net-mgmt/nsca/pkg-plist +++ net-mgmt/nsca/pkg-plist @@ -1,7 +1,7 @@ -%%PORTDOCS%%%%DOCSDIR%%/Changelog -%%PORTDOCS%%%%DOCSDIR%%/LEGAL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/SECURITY +%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md +%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%%%DOCSDIR%%/SECURITY.md %%SERVER%%etc/nagios/nsca.cfg-sample %%SERVER%%sbin/nsca %%CLIENT%%etc/nagios/send_nsca.cfg-sample Index: net/corosync3/Makefile =================================================================== --- net/corosync3/Makefile +++ net/corosync3/Makefile @@ -1,7 +1,7 @@ # Created by: David Shane Holden # $FreeBSD$ -PORTVERSION= 2.99.5 +PORTVERSION= 3.0.3 PORTREVISION= 1 PKGNAMESUFFIX= 3 Index: net/corosync3/distinfo =================================================================== --- net/corosync3/distinfo +++ net/corosync3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1571826514 -SHA256 (corosync-2.99.5.tar.gz) = f65329afcff2908c8f23070d59fea15068ea60eccf2fbc3b5e6706eee29a77ab -SIZE (corosync-2.99.5.tar.gz) = 1051014 +TIMESTAMP = 1582580691 +SHA256 (corosync-3.0.3.tar.gz) = 20eb903eb984f6a728282c199825e442e8bba869acefd22390076ef3a33a4ded +SIZE (corosync-3.0.3.tar.gz) = 1089466 Index: net/corosync3/pkg-plist =================================================================== --- net/corosync3/pkg-plist +++ net/corosync3/pkg-plist @@ -76,10 +76,10 @@ man/man3/cpg_join.3.gz man/man3/cpg_leave.3.gz man/man3/cpg_local_get.3.gz +man/man3/cpg_overview.3.gz man/man3/cpg_mcast_joined.3.gz man/man3/cpg_membership_get.3.gz man/man3/cpg_model_initialize.3.gz -man/man3/cpg_overview.3.gz man/man3/cpg_zcb_alloc.3.gz man/man3/cpg_zcb_free.3.gz man/man3/cpg_zcb_mcast_joined.3.gz Index: net/glusterfs/Makefile =================================================================== --- net/glusterfs/Makefile +++ net/glusterfs/Makefile @@ -1,61 +1,68 @@ # $FreeBSD$ PORTNAME= glusterfs -PORTVERSION= 3.11.1 -PORTREVISION= 7 +PORTVERSION= 8.0 CATEGORIES= net MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/ -MAINTAINER= craig001@lerwick.hopto.org +MAINTAINER= ports@FreeBSD.org COMMENT= GlusterFS distributed file system LICENSE= GPLv2 LGPL3 LICENSE_COMB= dual -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 +LIB_DEPENDS= libargp.so:devel/argp-standalone \ + libcurl.so:ftp/curl \ + liburcu-bp.so:sysutils/liburcu \ + libuuid.so:misc/e2fsprogs-libuuid -LIB_DEPENDS= libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu +RUN_DEPENDS= bash:shells/bash -USES= bison gettext gnome libtool pkgconfig python:2.7 readline \ - shebangfix sqlite ssl - BROKEN_SSL= libressl -SHEBANG_FILES= extras/peer_add_secret_pub.in \ - events/src/glustereventsd.py \ - events/src/peer_eventsapi.py \ - tools/glusterfind/src/nodeagent.py \ - tools/glusterfind/src/brickfind.py \ - tools/glusterfind/src/changelog.py \ - tools/glusterfind/glusterfind.in \ - tools/gfind_missing_files/gfid_to_path.py \ - extras/pre-upgrade-script-for-quota.sh \ - events/tools/eventsdash.py \ +USES= autoreconf bison gettext gnome libtool pkgconfig python \ + readline shebangfix sqlite ssl + +SHEBANG_FILES= events/src/glustereventsd.py events/src/peer_eventsapi.py \ + events/tools/eventsdash.py extras/ganesha/ocf/ganesha_grace \ + extras/ganesha/ocf/ganesha_mon extras/ganesha/ocf/ganesha_nfsd \ + extras/ganesha/scripts/create-export-ganesha.sh \ + extras/ganesha/scripts/dbus-send.sh \ + extras/ganesha/scripts/ganesha-ha.sh \ + extras/ganesha/scripts/generate-epoch.py \ + extras/peer_add_secret_pub.in \ extras/post-upgrade-script-for-quota.sh \ + extras/pre-upgrade-script-for-quota.sh \ extras/snap_scheduler/gcron.py \ extras/snap_scheduler/snap_scheduler.py \ - events/src/peer_eventsapi.py \ - events/src/glustereventsd.py \ - tools/glusterfind/S57glusterfind-delete-post.py + extras/stop-all-gluster-processes.sh \ + extras/thin-arbiter/setup-thin-arbiter.sh \ + tools/gfind_missing_files/gfid_to_path.py \ + tools/glusterfind/glusterfind.in \ + tools/glusterfind/S57glusterfind-delete-post.py \ + tools/glusterfind/src/brickfind.py \ + tools/glusterfind/src/changelog.py \ + tools/glusterfind/src/nodeagent.py USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes USE_RC_SUBR= glusterd GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ - --with-mountutildir=${PREFIX}/sbin \ - --localstatedir=/var \ - --disable-epoll \ - --enable-glupy \ +CONFIGURE_ARGS= --disable-epoll \ --disable-georeplication \ - ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \ - ac_cv_func_setfsuid=no ac_cv_func_fdatasync=no \ - ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no + --localstatedir=/var \ + --with-mountutildir=${PREFIX}/sbin \ + --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ + ac_cv_func_fallocate=no \ + ac_cv_func_fdatasync=no \ + ac_cv_func_llistxattr=no \ + ac_cv_func_malloc_stats=no \ + ac_cv_func_setfsuid=no \ + ac_cv_lib_aio_io_setup=no CPPFLAGS+= -I"${LOCALBASE}/include" LDFLAGS+= -L"${LOCALBASE}/lib" -largp INSTALL_TARGET= install-strip -PLIST_SUB= GLUSTERLIBDIR="lib/${PORTNAME}/${PORTVERSION}" +PLIST_SUB= GLUSTERLIBDIR="lib/${PORTNAME}" KMODDIR?= /boot/modules OPTIONS_DEFINE= DOCS Index: net/glusterfs/distinfo =================================================================== --- net/glusterfs/distinfo +++ net/glusterfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499632037 -SHA256 (glusterfs-3.11.1.tar.gz) = c7e0502631c9bc9da05795b666b74ef40a30a0344f5a2e205e65bd2faefe1442 -SIZE (glusterfs-3.11.1.tar.gz) = 9155001 +TIMESTAMP = 1594844267 +SHA256 (glusterfs-8.0.tar.gz) = bc0215380175a7d94c9ea90e3a7e0ca92a3ac691336e8b43da8a560f8e3c0169 +SIZE (glusterfs-8.0.tar.gz) = 7800370 Index: net/glusterfs/files/patch-configure =================================================================== --- net/glusterfs/files/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.orig 2017-06-27 15:25:15 UTC -+++ configure -@@ -13475,6 +13475,9 @@ case $host_os in - linux*) - #do nothing - ;; -+ freebsd*) -+#do nothing -+ ;; - netbsd*) - #do nothing - ;; Index: net/glusterfs/files/patch-configure.ac =================================================================== --- /dev/null +++ net/glusterfs/files/patch-configure.ac @@ -0,0 +1,23 @@ +--- configure.ac.orig 2020-07-06 01:22:37 UTC ++++ configure.ac +@@ -731,6 +731,9 @@ AC_ARG_ENABLE([georeplication], + + BUILD_SYNCDAEMON=no + case $host_os in ++ freebsd*) ++#do nothing ++ ;; + linux*) + #do nothing + ;; +@@ -1207,10 +1210,6 @@ case $host_os in + ;; + *freebsd*) + GF_HOST_OS="GF_BSD_HOST_OS" +- GF_CFLAGS="${GF_CFLAGS} -O0" +- GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_BASENAME" +- GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_DIRNAME" +- GF_CFLAGS="${GF_CFLAGS} -D_LIBGEN_H_" + GF_CFLAGS="${GF_CFLAGS} -DO_DSYNC=0" + GF_CFLAGS="${GF_CFLAGS} -Dxdr_quad_t=xdr_longlong_t" + GF_CFLAGS="${GF_CFLAGS} -Dxdr_u_quad_t=xdr_u_longlong_t" Index: net/glusterfs/files/patch-contrib_fuse-lib_mount.c =================================================================== --- net/glusterfs/files/patch-contrib_fuse-lib_mount.c +++ net/glusterfs/files/patch-contrib_fuse-lib_mount.c @@ -1,6 +1,6 @@ ---- contrib/fuse-lib/mount.c.orig 2017-06-27 15:25:12 UTC +--- contrib/fuse-lib/mount.c.orig 2020-07-06 01:22:37 UTC +++ contrib/fuse-lib/mount.c -@@ -382,6 +382,7 @@ fuse_mount_sys (const char *mountpoint, +@@ -390,6 +390,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname, build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1); build_iovec (&iov, &iovlen, "volname", source, -1); build_iovec (&iov, &iovlen, "fd", fdstr, -1); Index: net/glusterfs/files/patch-extras_Makefile.in =================================================================== --- net/glusterfs/files/patch-extras_Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ ---- extras/Makefile.in.orig 2017-06-27 15:25:17 UTC -+++ extras/Makefile.in -@@ -637,8 +637,8 @@ install-volDATA: $(vol_DATA) - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)" || exit $$?; \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)/$${files}.sample'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)/$${files}.sample" || exit $$?; \ - done - - uninstall-volDATA: -@@ -937,7 +937,7 @@ install-data-local: - fi - $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups - $(INSTALL_DATA) $(top_srcdir)/extras/group-virt.example \ -- $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt -+ $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt.sample - $(INSTALL_DATA) $(top_srcdir)/extras/group-metadata-cache \ - $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/metadata-cache - $(INSTALL_DATA) $(top_srcdir)/extras/group-gluster-block \ Index: net/glusterfs/files/patch-libglusterfs_src_common-utils.c =================================================================== --- /dev/null +++ net/glusterfs/files/patch-libglusterfs_src_common-utils.c @@ -0,0 +1,11 @@ +--- libglusterfs/src/common-utils.c.orig 2020-05-18 20:57:54 UTC ++++ libglusterfs/src/common-utils.c +@@ -3067,7 +3067,7 @@ get_mem_size() + memsize = page_size * num_pages; + #endif + +-#if defined GF_DARWIN_HOST_OS ++#if defined GF_DARWIN_HOST_OS || defined __FreeBSD__ + + size_t len = sizeof(memsize); + int name[] = {CTL_HW, HW_PHYSMEM}; Index: net/glusterfs/files/patch-libglusterfs_src_syscall.c =================================================================== --- /dev/null +++ net/glusterfs/files/patch-libglusterfs_src_syscall.c @@ -0,0 +1,20 @@ +--- libglusterfs/src/syscall.c.orig 2020-05-18 20:57:54 UTC ++++ libglusterfs/src/syscall.c +@@ -485,7 +485,7 @@ sys_lsetxattr(const char *path, const char *name, cons + #endif + + #ifdef GF_BSD_HOST_OS +- return FS_RET_CHECK0( ++ return FS_RET_CHECK( + extattr_set_link(path, EXTATTR_NAMESPACE_USER, name, value, size), + errno); + #endif +@@ -603,7 +603,7 @@ sys_fsetxattr(int filedes, const char *name, const voi + #endif + + #ifdef GF_BSD_HOST_OS +- return FS_RET_CHECK0( ++ return FS_RET_CHECK( + extattr_set_fd(filedes, EXTATTR_NAMESPACE_USER, name, value, size), + errno); + #endif Index: net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am =================================================================== --- /dev/null +++ net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am @@ -0,0 +1,18 @@ +--- xlators/mgmt/glusterd/src/Makefile.am.orig 2020-07-16 17:28:50 UTC ++++ xlators/mgmt/glusterd/src/Makefile.am +@@ -25,12 +25,14 @@ glusterd_la_SOURCES = glusterd.c glusterd-handler.c gl + glusterd-conn-helper.c glusterd-snapd-svc.c glusterd-snapd-svc-helper.c \ + glusterd-bitd-svc.c glusterd-scrub-svc.c glusterd-server-quorum.c \ + glusterd-reset-brick.c glusterd-shd-svc.c glusterd-shd-svc-helper.c \ +- glusterd-gfproxyd-svc.c glusterd-gfproxyd-svc-helper.c glusterd-ganesha.c ++ glusterd-gfproxyd-svc.c glusterd-gfproxyd-svc-helper.c glusterd-ganesha.c \ ++ $(CONTRIBDIR)/mount/mntent.c + + glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/libglusterd/src/libglusterd.la \ + $(top_builddir)/rpc/xdr/src/libgfxdr.la \ + $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ ++ $(CONTRIBDIR)/mount/mntent_compat.h \ + $(XML_LIBS) -lcrypto $(URCU_LIBS) $(URCU_CDS_LIBS) $(LIB_DL) + + noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \ Index: net/glusterfs/pkg-plist =================================================================== --- net/glusterfs/pkg-plist +++ net/glusterfs/pkg-plist @@ -1,17 +1,23 @@ bin/glusterfind +@sample %%ETCDIR%%/ganesha/ganesha-ha.conf.sample %%ETCDIR%%/eventsconfig.json %%ETCDIR%%/gluster-rsyslog-5.8.conf %%ETCDIR%%/gluster-rsyslog-7.2.conf -@sample %%ETCDIR%%/glusterd.vol.sample +%%ETCDIR%%/glusterd.vol %%ETCDIR%%/glusterfs-georep-logrotate %%ETCDIR%%/glusterfs-logrotate +%%ETCDIR%%/group-db-workload +%%ETCDIR%%/group-distributed-virt %%ETCDIR%%/group-gluster-block %%ETCDIR%%/group-metadata-cache %%ETCDIR%%/group-nl-cache -%%ETCDIR%%/group-virt.example -%%ETCDIR%%/logger.conf.example +%%ETCDIR%%/group-samba +@sample %%ETCDIR%%/group-virt.example +@sample %%ETCDIR%%/logger.conf.example +%%ETCDIR%%/thin-arbiter.vol include/glusterfs/api/glfs-handles.h include/glusterfs/api/glfs.h +include/glusterfs/async.h include/glusterfs/atomic.h include/glusterfs/byte-order.h include/glusterfs/call-stub.h @@ -23,28 +29,23 @@ include/glusterfs/compat-errno.h include/glusterfs/compat-uuid.h include/glusterfs/compat.h -include/glusterfs/compound-fop-utils.h include/glusterfs/daemon.h include/glusterfs/default-args.h include/glusterfs/defaults.h include/glusterfs/dict.h include/glusterfs/event-history.h -include/glusterfs/event.h include/glusterfs/events.h include/glusterfs/fd-lk.h include/glusterfs/fd.h +include/glusterfs/gd-common-utils.h include/glusterfs/gf-dirent.h +include/glusterfs/gf-event.h include/glusterfs/gfchangelog/changelog.h -include/glusterfs/gfdb/gfdb_data_store.h -include/glusterfs/gfdb/gfdb_data_store_helper.h -include/glusterfs/gfdb/gfdb_data_store_types.h -include/glusterfs/gfdb/gfdb_mem-types.h -include/glusterfs/gfdb/gfdb_sqlite3.h -include/glusterfs/gfdb/gfdb_sqlite3_helper.h include/glusterfs/gidcache.h include/glusterfs/glfs-message-id.h include/glusterfs/globals.h include/glusterfs/glusterfs-acl.h +include/glusterfs/glusterfs-fops.h include/glusterfs/glusterfs.h include/glusterfs/graph-utils.h include/glusterfs/hashfn.h @@ -60,6 +61,7 @@ include/glusterfs/lvm-defaults.h include/glusterfs/mem-pool.h include/glusterfs/mem-types.h +include/glusterfs/monitoring.h include/glusterfs/options.h include/glusterfs/parse-utils.h include/glusterfs/quota-common-utils.h @@ -67,17 +69,12 @@ include/glusterfs/refcount.h include/glusterfs/revision.h include/glusterfs/rot-buffs.h -include/glusterfs/rpc/acl3-xdr.h include/glusterfs/rpc/changelog-xdr.h include/glusterfs/rpc/cli1-xdr.h include/glusterfs/rpc/glusterd1-xdr.h -include/glusterfs/rpc/glusterfs-fops.h include/glusterfs/rpc/glusterfs3-xdr.h include/glusterfs/rpc/glusterfs3.h -include/glusterfs/rpc/mount3udp.h -include/glusterfs/rpc/msg-nfs3.h -include/glusterfs/rpc/nlm4-xdr.h -include/glusterfs/rpc/nsm-xdr.h +include/glusterfs/rpc/glusterfs4-xdr.h include/glusterfs/rpc/portmap-xdr.h include/glusterfs/rpc/protocol-common.h include/glusterfs/rpc/rpc-clnt-ping.h @@ -91,7 +88,6 @@ include/glusterfs/rpc/rpcsvc.h include/glusterfs/rpc/xdr-common.h include/glusterfs/rpc/xdr-generic.h -include/glusterfs/rpc/xdr-nfs3.h include/glusterfs/rpc/xdr-rpc.h include/glusterfs/rpc/xdr-rpcclnt.h include/glusterfs/run.h @@ -118,7 +114,7 @@ include/glusterfs/y.tab.h %%GLUSTERLIBDIR%%/auth/addr.so %%GLUSTERLIBDIR%%/auth/login.so -%%GLUSTERLIBDIR%%/rpc-transport/rdma.so +%%GLUSTERLIBDIR%%/cloudsync-plugins/cloudsyncs3.so %%GLUSTERLIBDIR%%/rpc-transport/socket.so %%GLUSTERLIBDIR%%/xlator/cluster/afr.so %%GLUSTERLIBDIR%%/xlator/cluster/dht.so @@ -127,15 +123,12 @@ %%GLUSTERLIBDIR%%/xlator/cluster/ec.so %%GLUSTERLIBDIR%%/xlator/cluster/nufa.so %%GLUSTERLIBDIR%%/xlator/cluster/replicate.so -%%GLUSTERLIBDIR%%/xlator/cluster/stripe.so %%GLUSTERLIBDIR%%/xlator/cluster/switch.so -%%GLUSTERLIBDIR%%/xlator/cluster/tier.so +%%GLUSTERLIBDIR%%/xlator/debug/delay-gen.so %%GLUSTERLIBDIR%%/xlator/debug/error-gen.so %%GLUSTERLIBDIR%%/xlator/debug/io-stats.so %%GLUSTERLIBDIR%%/xlator/debug/sink.so %%GLUSTERLIBDIR%%/xlator/debug/trace.so -%%GLUSTERLIBDIR%%/xlator/encryption/crypt.so -%%GLUSTERLIBDIR%%/xlator/encryption/rot-13.so %%GLUSTERLIBDIR%%/xlator/features/access-control.so %%GLUSTERLIBDIR%%/xlator/features/arbiter.so %%GLUSTERLIBDIR%%/xlator/features/barrier.so @@ -143,39 +136,32 @@ %%GLUSTERLIBDIR%%/xlator/features/bitrot-stub.so %%GLUSTERLIBDIR%%/xlator/features/cdc.so %%GLUSTERLIBDIR%%/xlator/features/changelog.so -%%GLUSTERLIBDIR%%/xlator/features/changetimerecorder.so +%%GLUSTERLIBDIR%%/xlator/features/cloudsync.so %%GLUSTERLIBDIR%%/xlator/features/gfid-access.so -%%GLUSTERLIBDIR%%/xlator/features/glupy.so -%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.py -%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.pyc -%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.pyo -%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.py -%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.pyc -%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.pyo -%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.py -%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.pyc -%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.pyo %%GLUSTERLIBDIR%%/xlator/features/index.so %%GLUSTERLIBDIR%%/xlator/features/leases.so %%GLUSTERLIBDIR%%/xlator/features/locks.so %%GLUSTERLIBDIR%%/xlator/features/marker.so +%%GLUSTERLIBDIR%%/xlator/features/namespace.so %%GLUSTERLIBDIR%%/xlator/features/posix-locks.so %%GLUSTERLIBDIR%%/xlator/features/quiesce.so %%GLUSTERLIBDIR%%/xlator/features/quota.so %%GLUSTERLIBDIR%%/xlator/features/quotad.so %%GLUSTERLIBDIR%%/xlator/features/read-only.so +%%GLUSTERLIBDIR%%/xlator/features/sdfs.so %%GLUSTERLIBDIR%%/xlator/features/selinux.so %%GLUSTERLIBDIR%%/xlator/features/shard.so %%GLUSTERLIBDIR%%/xlator/features/snapview-client.so %%GLUSTERLIBDIR%%/xlator/features/snapview-server.so +%%GLUSTERLIBDIR%%/xlator/features/thin-arbiter.so %%GLUSTERLIBDIR%%/xlator/features/trash.so %%GLUSTERLIBDIR%%/xlator/features/upcall.so +%%GLUSTERLIBDIR%%/xlator/features/utime.so %%GLUSTERLIBDIR%%/xlator/features/worm.so %%GLUSTERLIBDIR%%/xlator/meta.so %%GLUSTERLIBDIR%%/xlator/mgmt/glusterd.so %%GLUSTERLIBDIR%%/xlator/mount/api.so %%GLUSTERLIBDIR%%/xlator/mount/fuse.so -%%GLUSTERLIBDIR%%/xlator/performance/decompounder.so %%GLUSTERLIBDIR%%/xlator/performance/io-cache.so %%GLUSTERLIBDIR%%/xlator/performance/io-threads.so %%GLUSTERLIBDIR%%/xlator/performance/md-cache.so @@ -186,95 +172,102 @@ %%GLUSTERLIBDIR%%/xlator/performance/readdir-ahead.so %%GLUSTERLIBDIR%%/xlator/performance/stat-prefetch.so %%GLUSTERLIBDIR%%/xlator/performance/write-behind.so +%%GLUSTERLIBDIR%%/xlator/playground/template.so %%GLUSTERLIBDIR%%/xlator/protocol/client.so %%GLUSTERLIBDIR%%/xlator/protocol/server.so %%GLUSTERLIBDIR%%/xlator/storage/posix.so %%GLUSTERLIBDIR%%/xlator/system/posix-acl.so -%%GLUSTERLIBDIR%%/xlator/testing/features/template.so -%%GLUSTERLIBDIR%%/xlator/testing/performance/symlink-cache.so lib/libgfapi.so lib/libgfapi.so.0 lib/libgfapi.so.0.0.0 lib/libgfchangelog.so lib/libgfchangelog.so.0 lib/libgfchangelog.so.0.0.1 -lib/libgfdb.so -lib/libgfdb.so.0 -lib/libgfdb.so.0.0.1 lib/libgfrpc.so lib/libgfrpc.so.0 lib/libgfrpc.so.0.0.1 lib/libgfxdr.so lib/libgfxdr.so.0 lib/libgfxdr.so.0.0.1 +lib/libglusterd.so +lib/libglusterd.so.0 +lib/libglusterd.so.0.0.1 lib/libglusterfs.so lib/libglusterfs.so.0 lib/libglusterfs.so.0.0.1 lib/ocf/resource.d/glusterfs/glusterd lib/ocf/resource.d/glusterfs/volume +lib/ocf/resource.d/heartbeat/ganesha_grace +lib/ocf/resource.d/heartbeat/ganesha_mon +lib/ocf/resource.d/heartbeat/ganesha_nfsd %%PYTHON_SITELIBDIR%%/gluster/__init__.py -%%PYTHON_SITELIBDIR%%/gluster/__init__.pyc -%%PYTHON_SITELIBDIR%%/gluster/__init__.pyo +%%PYTHON_SITELIBDIR%%/gluster/__pycache__/__init__.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/gluster/__pycache__/__init__.cpython-37.pyc %%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.py -%%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.pyc -%%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.pyo +%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/__init__.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/__init__.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/cliutils.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/cliutils.cpython-37.pyc %%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.py -%%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.pyc -%%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.pyo -%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.py -%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyc -%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyo libdata/pkgconfig/glusterfs-api.pc libdata/pkgconfig/libgfchangelog.pc -libdata/pkgconfig/libgfdb.pc -libexec/glusterfs/events/__init__.py -libexec/glusterfs/events/__init__.pyc -libexec/glusterfs/events/__init__.pyo -libexec/glusterfs/events/eventsapiconf.py -libexec/glusterfs/events/eventsapiconf.pyc -libexec/glusterfs/events/eventsapiconf.pyo -libexec/glusterfs/events/eventtypes.py -libexec/glusterfs/events/eventtypes.pyc -libexec/glusterfs/events/eventtypes.pyo -libexec/glusterfs/events/gf_event.py -libexec/glusterfs/events/gf_event.pyc -libexec/glusterfs/events/gf_event.pyo -libexec/glusterfs/events/glustereventsd.py -libexec/glusterfs/events/handlers.py -libexec/glusterfs/events/handlers.pyc -libexec/glusterfs/events/handlers.pyo -libexec/glusterfs/events/utils.py -libexec/glusterfs/events/utils.pyc -libexec/glusterfs/events/utils.pyo +libexec/ganesha/create-export-ganesha.sh +libexec/ganesha/dbus-send.sh +libexec/ganesha/ganesha-ha.sh +libexec/ganesha/generate-epoch.py +libexec/glusterfs/gfevents/__init__.py +libexec/glusterfs/gfevents/__pycache__/__init__.cpython-37.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/__init__.cpython-37.pyc +libexec/glusterfs/gfevents/__pycache__/eventsapiconf.cpython-37.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/eventsapiconf.cpython-37.pyc +libexec/glusterfs/gfevents/__pycache__/eventtypes.cpython-37.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/eventtypes.cpython-37.pyc +libexec/glusterfs/gfevents/__pycache__/gf_event.cpython-37.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/gf_event.cpython-37.pyc +libexec/glusterfs/gfevents/__pycache__/handlers.cpython-37.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/handlers.cpython-37.pyc +libexec/glusterfs/gfevents/__pycache__/utils.cpython-37.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/utils.cpython-37.pyc +libexec/glusterfs/gfevents/eventsapiconf.py +libexec/glusterfs/gfevents/eventtypes.py +libexec/glusterfs/gfevents/gf_event.py +libexec/glusterfs/gfevents/glustereventsd.py +libexec/glusterfs/gfevents/handlers.py +libexec/glusterfs/gfevents/utils.py libexec/glusterfs/gfind_missing_files/gcrawler libexec/glusterfs/gfind_missing_files/gfid_to_path.py libexec/glusterfs/gfind_missing_files/gfid_to_path.sh libexec/glusterfs/gfind_missing_files/gfind_missing_files.sh +libexec/glusterfs/glfsheal libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py libexec/glusterfs/glusterfind/__init__.py -libexec/glusterfs/glusterfind/__init__.pyc -libexec/glusterfs/glusterfind/__init__.pyo +libexec/glusterfs/glusterfind/__pycache__/__init__.cpython-37.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/__init__.cpython-37.pyc +libexec/glusterfs/glusterfind/__pycache__/changelogdata.cpython-37.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/changelogdata.cpython-37.pyc +libexec/glusterfs/glusterfind/__pycache__/conf.cpython-37.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/conf.cpython-37.pyc +libexec/glusterfs/glusterfind/__pycache__/gfind_py2py3.cpython-37.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/gfind_py2py3.cpython-37.pyc +libexec/glusterfs/glusterfind/__pycache__/libgfchangelog.cpython-37.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/libgfchangelog.cpython-37.pyc +libexec/glusterfs/glusterfind/__pycache__/main.cpython-37.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/main.cpython-37.pyc +libexec/glusterfs/glusterfind/__pycache__/utils.cpython-37.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/utils.cpython-37.pyc libexec/glusterfs/glusterfind/brickfind.py libexec/glusterfs/glusterfind/changelog.py libexec/glusterfs/glusterfind/changelogdata.py -libexec/glusterfs/glusterfind/changelogdata.pyc -libexec/glusterfs/glusterfind/changelogdata.pyo libexec/glusterfs/glusterfind/conf.py -libexec/glusterfs/glusterfind/conf.pyc -libexec/glusterfs/glusterfind/conf.pyo +libexec/glusterfs/glusterfind/gfind_py2py3.py libexec/glusterfs/glusterfind/libgfchangelog.py -libexec/glusterfs/glusterfind/libgfchangelog.pyc -libexec/glusterfs/glusterfind/libgfchangelog.pyo libexec/glusterfs/glusterfind/main.py -libexec/glusterfs/glusterfind/main.pyc -libexec/glusterfs/glusterfind/main.pyo libexec/glusterfs/glusterfind/nodeagent.py libexec/glusterfs/glusterfind/tool.conf libexec/glusterfs/glusterfind/utils.py -libexec/glusterfs/glusterfind/utils.pyc -libexec/glusterfs/glusterfind/utils.pyo libexec/glusterfs/peer_add_secret_pub libexec/glusterfs/peer_eventsapi.py +man/man8/gluster-setgfid2path.8.gz man/man8/gluster.8.gz man/man8/glusterd.8.gz man/man8/glusterfs.8.gz @@ -284,9 +277,9 @@ sbin/gcron.py sbin/gf_attach sbin/gfind_missing_files -sbin/glfsheal sbin/gluster sbin/gluster-eventsapi +sbin/gluster-setgfid2path sbin/glusterd sbin/glustereventsd sbin/glusterfs @@ -304,11 +297,17 @@ %%DATADIR%%/scripts/eventsdash.py %%DATADIR%%/scripts/post-upgrade-script-for-quota.sh %%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh +%%DATADIR%%/scripts/setup-thin-arbiter.sh %%DATADIR%%/scripts/stop-all-gluster-processes.sh +/var/db/glusterd/groups/db-workload +/var/db/glusterd/groups/distributed-virt /var/db/glusterd/groups/gluster-block /var/db/glusterd/groups/metadata-cache /var/db/glusterd/groups/nl-cache -@sample /var/db/glusterd/groups/virt.sample +/var/db/glusterd/groups/samba +/var/db/glusterd/groups/virt +/var/db/glusterd/hooks/1/add-brick/post/S10selinux-label-brick.sh +/var/db/glusterd/hooks/1/add-brick/post/S13create-subdir-mounts.sh /var/db/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh /var/db/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh /var/db/glusterd/hooks/1/delete/post/S57glusterfind-delete-post @@ -316,6 +315,7 @@ /var/db/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh /var/db/glusterd/hooks/1/start/post/S29CTDBsetup.sh /var/db/glusterd/hooks/1/start/post/S30samba-start.sh +/var/db/glusterd/hooks/1/start/post/S31ganesha-start.sh /var/db/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh /var/db/glusterd/hooks/1/stop/pre/S30samba-stop.sh @dir /var/db/glusterd/events Index: net/pecl-smbclient/files/patch-smbclient.c =================================================================== --- /dev/null +++ net/pecl-smbclient/files/patch-smbclient.c @@ -0,0 +1,74 @@ +--- smbclient.c.orig 2017-02-10 17:03:19 UTC ++++ smbclient.c +@@ -889,10 +889,7 @@ PHP_FUNCTION(smbclient_readdir) + } + RETURN_FALSE; + } +- if (array_init(return_value) != SUCCESS) { +- php_error(E_WARNING, "Couldn't initialize array"); +- RETURN_FALSE; +- } ++ array_init(return_value); + #if PHP_MAJOR_VERSION >= 7 + add_assoc_string(return_value, "type", type_to_string(dirent->smbc_type)); + add_assoc_stringl(return_value, "comment", dirent->comment, dirent->commentlen); +@@ -1108,10 +1105,7 @@ PHP_FUNCTION(smbclient_stat) + } + RETURN_FALSE; + } +- if (array_init(return_value) != SUCCESS) { +- php_error(E_WARNING, "Couldn't initialize array"); +- RETURN_FALSE; +- } ++ array_init(return_value); + add_index_long(return_value, 0, statbuf.st_dev); + add_index_long(return_value, 1, statbuf.st_ino); + add_index_long(return_value, 2, statbuf.st_mode); +@@ -1170,10 +1164,7 @@ PHP_FUNCTION(smbclient_fstat) + } + RETURN_FALSE; + } +- if (array_init(return_value) != SUCCESS) { +- php_error(E_WARNING, "Couldn't initialize array"); +- RETURN_FALSE; +- } ++ array_init(return_value); + add_index_long(return_value, 0, statbuf.st_dev); + add_index_long(return_value, 1, statbuf.st_ino); + add_index_long(return_value, 2, statbuf.st_mode); +@@ -1608,10 +1599,7 @@ PHP_FUNCTION(smbclient_listxattr) + * Because this list is static, we can get away with using a fixed + * buffer size.*/ + if (smbc_listxattr(state->ctx, url, values, sizeof(values)) >= 0) { +- if (array_init(return_value) != SUCCESS) { +- php_error(E_WARNING, "Couldn't initialize array"); +- RETURN_FALSE; +- } ++ array_init(return_value); + /* Each attribute is null-separated, the list itself terminates + * with an empty element (i.e. two null bytes in a row). */ + for (s = c = values; c < values + sizeof(values); c++) { +@@ -1986,10 +1974,7 @@ PHP_FUNCTION(smbclient_statvfs) + } + RETURN_FALSE; + } +- if (array_init(return_value) != SUCCESS) { +- php_error(E_WARNING, "Couldn't initialize array"); +- RETURN_FALSE; +- } ++ array_init(return_value); + add_assoc_long(return_value, "bsize", st.f_bsize); + add_assoc_long(return_value, "frsize", st.f_frsize); + add_assoc_long(return_value, "blocks", st.f_blocks); +@@ -2031,10 +2016,7 @@ PHP_FUNCTION(smbclient_fstatvfs) + } + RETURN_FALSE; + } +- if (array_init(return_value) != SUCCESS) { +- php_error(E_WARNING, "Couldn't initialize array"); +- RETURN_FALSE; +- } ++ array_init(return_value); + add_assoc_long(return_value, "bsize", st.f_bsize); + add_assoc_long(return_value, "frsize", st.f_frsize); + add_assoc_long(return_value, "blocks", st.f_blocks); Index: news/sabnzbdplus/Makefile =================================================================== --- news/sabnzbdplus/Makefile +++ news/sabnzbdplus/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sabnzbdplus -PORTVERSION= 2.3.9 +DISTVERSION= 3.0.0RC1 CATEGORIES= news MAINTAINER= joshruehlig@gmail.com @@ -10,15 +10,17 @@ LICENSE= BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL LICENSE_COMB= multi -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 +RUN_DEPENDS= cheetah:devel/py-cheetah3@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/configobj.py:devel/py-configobj@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}portend>=0:net/py-portend@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} + -RUN_DEPENDS= cheetah:devel/py-cheetah@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} +USES= python shebangfix -USES= python:2.7 shebangfix - USE_GITHUB= yes GH_ACCOUNT= sabnzbd GH_PROJECT= sabnzbd @@ -48,7 +50,7 @@ PAR2CMDLINE_RUN_DEPENDS= par2repair:archivers/par2cmdline-tbb FEEDPARSER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} -YENC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sabyenc>=3.3.1:news/py-sabyenc@${PY_FLAVOR} +YENC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sabyenc3>=3.3.1:news/py-sabyenc3@${PY_FLAVOR} SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} UNRAR_RUN_DEPENDS= unrar:archivers/unrar 7ZIP_RUN_DEPENDS= 7za:archivers/p7zip @@ -66,7 +68,7 @@ @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd @${MKDIR} ${STAGEDIR}${DATADIR} -.for i in cherrypy gntp interfaces locale po tools util +.for i in interfaces locale po tools @${MKDIR} ${STAGEDIR}${DATADIR}/${i} cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i} .endfor Index: news/sabnzbdplus/distinfo =================================================================== --- news/sabnzbdplus/distinfo +++ news/sabnzbdplus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559445969 -SHA256 (sabnzbd-sabnzbd-2.3.9_GH0.tar.gz) = e5071e66e06e9d10f5d04695cb63aba3e77b0c89deb6dd0f80246218d7940b3c -SIZE (sabnzbd-sabnzbd-2.3.9_GH0.tar.gz) = 4610937 +TIMESTAMP = 1593814425 +SHA256 (sabnzbd-sabnzbd-3.0.0RC1_GH0.tar.gz) = 4dcc6bb8011db21cf26f9f81eeeb875ff4238fc780cbdfdaab4cb1cedc6dd37b +SIZE (sabnzbd-sabnzbd-3.0.0RC1_GH0.tar.gz) = 4374516 Index: news/sabnzbdplus/files/patch-SABnzbd.py =================================================================== --- news/sabnzbdplus/files/patch-SABnzbd.py +++ news/sabnzbdplus/files/patch-SABnzbd.py @@ -1,17 +1,17 @@ ---- SABnzbd.py.orig 2016-06-04 11:45:01 UTC +--- SABnzbd.py.orig 2020-04-28 18:33:05 UTC +++ SABnzbd.py -@@ -51,6 +51,9 @@ except: - print "The Python module Cheetah is required" - sys.exit(1) - +@@ -39,6 +39,9 @@ try: + import six + import feedparser + import configobj +# Force python to load the patched version of cherrypy included with the port, +# instead of any version that may be installed otherwise. -+sys.path.insert(0,%%DATADIR%%) - import cherrypy - if [int(n) for n in cherrypy.__version__.split('.')] < [3, 8, 0]: - print 'Sorry, requires Python module Cherrypy 3.8.0+ (use the included version)' -@@ -1006,7 +1009,7 @@ def main(): - ++ sys.path.insert(0,%%DATADIR%%) + import cherrypy + import portend + import cryptography +@@ -883,7 +886,7 @@ def main(): + sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME)) sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME) - sabnzbd.DIR_PROG = os.path.dirname(sabnzbd.MY_FULLNAME) Index: news/sabnzbdplus/pkg-plist =================================================================== --- news/sabnzbdplus/pkg-plist +++ news/sabnzbdplus/pkg-plist @@ -15,6 +15,7 @@ %%PYTHON_SITELIBDIR%%/sabnzbd/downloader.py %%PYTHON_SITELIBDIR%%/sabnzbd/emailer.py %%PYTHON_SITELIBDIR%%/sabnzbd/encoding.py +%%PYTHON_SITELIBDIR%%/sabnzbd/filesystem.py %%PYTHON_SITELIBDIR%%/sabnzbd/getipaddress.py %%PYTHON_SITELIBDIR%%/sabnzbd/interface.py %%PYTHON_SITELIBDIR%%/sabnzbd/lang.py @@ -22,6 +23,7 @@ %%PYTHON_SITELIBDIR%%/sabnzbd/newsunpack.py %%PYTHON_SITELIBDIR%%/sabnzbd/newswrapper.py %%PYTHON_SITELIBDIR%%/sabnzbd/notifier.py +%%PYTHON_SITELIBDIR%%/sabnzbd/nzbparser.py %%PYTHON_SITELIBDIR%%/sabnzbd/nzbqueue.py %%PYTHON_SITELIBDIR%%/sabnzbd/nzbstuff.py %%PYTHON_SITELIBDIR%%/sabnzbd/osxmenu.py @@ -38,83 +40,24 @@ %%PYTHON_SITELIBDIR%%/sabnzbd/sorting.py %%PYTHON_SITELIBDIR%%/sabnzbd/urlgrabber.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/__init__.py +%%PYTHON_SITELIBDIR%%/sabnzbd/utils/apireg.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/certgen.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/checkdir.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/configobj.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/diskspeed.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/feedparser.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/getperformance.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/happyeyeballs.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/json.py +%%PYTHON_SITELIBDIR%%/sabnzbd/utils/internetspeed.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/kronos.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pathbrowser.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pybonjour.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pystone.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/rarfile.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rsslib.py +%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rarvolinfo.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/servertests.py +%%PYTHON_SITELIBDIR%%/sabnzbd/utils/sleepless.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/systrayiconthread.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/upload.py %%PYTHON_SITELIBDIR%%/sabnzbd/version.py %%PYTHON_SITELIBDIR%%/sabnzbd/zconfig.py -%%DATADIR%%/cherrypy/VERSION.txt -%%DATADIR%%/cherrypy/__init__.py -%%DATADIR%%/cherrypy/__main__.py -%%DATADIR%%/cherrypy/_cpchecker.py -%%DATADIR%%/cherrypy/_cpcompat.py -%%DATADIR%%/cherrypy/_cpconfig.py -%%DATADIR%%/cherrypy/_cpdispatch.py -%%DATADIR%%/cherrypy/_cperror.py -%%DATADIR%%/cherrypy/_cplogging.py -%%DATADIR%%/cherrypy/_cpmodpy.py -%%DATADIR%%/cherrypy/_cpnative_server.py -%%DATADIR%%/cherrypy/_cpreqbody.py -%%DATADIR%%/cherrypy/_cprequest.py -%%DATADIR%%/cherrypy/_cpserver.py -%%DATADIR%%/cherrypy/_cptools.py -%%DATADIR%%/cherrypy/_cptree.py -%%DATADIR%%/cherrypy/_cpwsgi.py -%%DATADIR%%/cherrypy/_cpwsgi_server.py -%%DATADIR%%/cherrypy/_helper.py -%%DATADIR%%/cherrypy/cherryd -%%DATADIR%%/cherrypy/daemon.py -%%DATADIR%%/cherrypy/favicon.ico -%%DATADIR%%/cherrypy/lib/__init__.py -%%DATADIR%%/cherrypy/lib/auth.py -%%DATADIR%%/cherrypy/lib/auth_basic.py -%%DATADIR%%/cherrypy/lib/auth_digest.py -%%DATADIR%%/cherrypy/lib/caching.py -%%DATADIR%%/cherrypy/lib/covercp.py -%%DATADIR%%/cherrypy/lib/cpstats.py -%%DATADIR%%/cherrypy/lib/cptools.py -%%DATADIR%%/cherrypy/lib/encoding.py -%%DATADIR%%/cherrypy/lib/gctools.py -%%DATADIR%%/cherrypy/lib/httpauth.py -%%DATADIR%%/cherrypy/lib/httputil.py -%%DATADIR%%/cherrypy/lib/jsontools.py -%%DATADIR%%/cherrypy/lib/lockfile.py -%%DATADIR%%/cherrypy/lib/locking.py -%%DATADIR%%/cherrypy/lib/profiler.py -%%DATADIR%%/cherrypy/lib/reprconf.py -%%DATADIR%%/cherrypy/lib/sessions.py -%%DATADIR%%/cherrypy/lib/static.py -%%DATADIR%%/cherrypy/lib/xmlrpcutil.py -%%DATADIR%%/cherrypy/process/__init__.py -%%DATADIR%%/cherrypy/process/plugins.py -%%DATADIR%%/cherrypy/process/servers.py -%%DATADIR%%/cherrypy/process/win32.py -%%DATADIR%%/cherrypy/process/wspbus.py -%%DATADIR%%/cherrypy/wsgiserver/__init__.py -%%DATADIR%%/cherrypy/wsgiserver/ssl_builtin.py -%%DATADIR%%/cherrypy/wsgiserver/ssl_pyopenssl.py -%%DATADIR%%/gntp/__init__.py -%%DATADIR%%/gntp/cli.py -%%DATADIR%%/gntp/config.py -%%DATADIR%%/gntp/core.py -%%DATADIR%%/gntp/errors.py -%%DATADIR%%/gntp/notifier.py -%%DATADIR%%/gntp/shim.py -%%DATADIR%%/gntp/version.py %%DATADIR%%/interfaces/Config/README.txt %%DATADIR%%/interfaces/Config/templates/_inc_footer_uc.tmpl %%DATADIR%%/interfaces/Config/templates/_inc_header_uc.tmpl @@ -152,7 +95,7 @@ %%DATADIR%%/interfaces/Config/templates/staticcfg/images/logo-small.svg %%DATADIR%%/interfaces/Config/templates/staticcfg/js/chartist.min.js %%DATADIR%%/interfaces/Config/templates/staticcfg/js/filesize.min.js -%%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery-3.2.1.min.js +%%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery-3.5.1.min.js %%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery-ui.min.js %%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery.tablesort.min.js %%DATADIR%%/interfaces/Config/templates/staticcfg/js/script.js @@ -181,11 +124,11 @@ %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.main.js %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.queue.js %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery-ui.min.js -%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery.min.js +%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery-3.5.1.min.js %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery.peity.min.js %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/knockout-extensions.js -%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/knockout-latest.js -%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/moment.min.js +%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/knockout-3.5.1.min.js +%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/moment-2.26.0.min.js %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/momentjs_locale/da.js %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/momentjs_locale/de.js %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/momentjs_locale/es.js @@ -271,44 +214,6 @@ %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/rateit.css %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/star.gif %%DATADIR%%/interfaces/Plush/templates/status.tmpl -%%DATADIR%%/interfaces/smpl/CreativeCommons2-5.txt -%%DATADIR%%/interfaces/smpl/CreativeCommons3-0.txt -%%DATADIR%%/interfaces/smpl/GPL2.txt -%%DATADIR%%/interfaces/smpl/GPL3.txt -%%DATADIR%%/interfaces/smpl/LICENCE-silk_icons.txt -%%DATADIR%%/interfaces/smpl/LICENSE.txt -%%DATADIR%%/interfaces/smpl/License-ExCanvas.txt -%%DATADIR%%/interfaces/smpl/License-MochiKit.txt -%%DATADIR%%/interfaces/smpl/License-Nuvola.txt -%%DATADIR%%/interfaces/smpl/License-PlotKit.txt -%%DATADIR%%/interfaces/smpl/License-getElementPosition.txt -%%DATADIR%%/interfaces/smpl/README.txt -%%DATADIR%%/interfaces/smpl/templates/history.tmpl -%%DATADIR%%/interfaces/smpl/templates/main.tmpl -%%DATADIR%%/interfaces/smpl/templates/nzo.tmpl -%%DATADIR%%/interfaces/smpl/templates/queue.tmpl -%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/MochiKit.js -%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/__package__.js -%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/PlotKit.js -%%DATADIR%%/interfaces/smpl/templates/static/excanvas/excanvas.js -%%DATADIR%%/interfaces/smpl/templates/static/feed-icon-14x14.png -%%DATADIR%%/interfaces/smpl/templates/static/images/browser.png -%%DATADIR%%/interfaces/smpl/templates/static/images/bullet_arrow_down.png -%%DATADIR%%/interfaces/smpl/templates/static/images/control_pause.png -%%DATADIR%%/interfaces/smpl/templates/static/images/control_play.png -%%DATADIR%%/interfaces/smpl/templates/static/images/down.gif -%%DATADIR%%/interfaces/smpl/templates/static/images/drive.png -%%DATADIR%%/interfaces/smpl/templates/static/images/drive_go.png -%%DATADIR%%/interfaces/smpl/templates/static/images/favicon.ico -%%DATADIR%%/interfaces/smpl/templates/static/images/key_enter.png -%%DATADIR%%/interfaces/smpl/templates/static/images/messagebox_critical.png -%%DATADIR%%/interfaces/smpl/templates/static/images/nuvola/kgpg.png -%%DATADIR%%/interfaces/smpl/templates/static/images/up.gif -%%DATADIR%%/interfaces/smpl/templates/static/sabnzbd_small4.png -%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/colorschemes/black.css -%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/colorschemes/white.css -%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/smpl.css -%%DATADIR%%/interfaces/smpl/templates/status.tmpl %%DATADIR%%/interfaces/wizard/README.TXT %%DATADIR%%/interfaces/wizard/inc_bottom.tmpl %%DATADIR%%/interfaces/wizard/inc_top.tmpl @@ -387,6 +292,4 @@ %%DATADIR%%/tools/extract_pot.py %%DATADIR%%/tools/make_mo.py %%DATADIR%%/tools/msgfmt.py -%%DATADIR%%/util/__init__.py -%%DATADIR%%/util/apireg.py -%%DATADIR%%/util/mailslot.py +%%DATADIR%%/tools/pygettext.py Index: print/pecl-pdflib/Makefile =================================================================== --- print/pecl-pdflib/Makefile +++ print/pecl-pdflib/Makefile @@ -13,11 +13,6 @@ USES= php:pecl -LICENSE= PDFlib -LICENSE_NAME= PDFlib GmbH General License -LICENSE_PERMS= none -LICENSE_FILE= ${WRKSRC}/LICENSE - USE_PHP= gd:build PHP_MODNAME= pdf Index: www/joomla3/Makefile =================================================================== --- www/joomla3/Makefile +++ www/joomla3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= joomla -DISTVERSION= 3-9-6 +DISTVERSION= 3-9-18 CATEGORIES= www MASTER_SITES= https://downloads.joomla.org/cms/joomla3/${DISTVERSION}/ PKGNAMESUFFIX= 3 Index: www/joomla3/distinfo =================================================================== --- www/joomla3/distinfo +++ www/joomla3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557608394 -SHA256 (Joomla_3-9-6-Stable-Full_Package.tar.bz2?format=bz2.tar.bz2) = b9c3b455acf71ab4cf14b77ec29a8afb9493123d2c3c6019e203adb9bbdc0f26 -SIZE (Joomla_3-9-6-Stable-Full_Package.tar.bz2?format=bz2.tar.bz2) = 7946091 +TIMESTAMP = 1589738191 +SHA256 (Joomla_3-9-18-Stable-Full_Package.tar.bz2?format=bz2.tar.bz2) = 779b494fe54304f2b47e00886a1e5e189f1b00ca7603961ee6ec7cd7da2a20c4 +SIZE (Joomla_3-9-18-Stable-Full_Package.tar.bz2?format=bz2.tar.bz2) = 7951329 Index: www/joomla3/pkg-plist =================================================================== --- www/joomla3/pkg-plist +++ www/joomla3/pkg-plist @@ -166,8 +166,14 @@ %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-15.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-20.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-10-21.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.10-2019-07-09.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.3-2019-01-12.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.3-2019-02-07.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.7-2019-04-23.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.7-2019-04-26.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.7-2019-05-16.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.8-2019-06-11.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/mysql/3.9.8-2019-06-15.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.0.0.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.0.1.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.0.2.sql @@ -267,8 +273,15 @@ %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-15.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-20.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-10-21.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.10-2019-07-09.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.3-2019-01-12.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.3-2019-02-07.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.7-2019-04-23.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.7-2019-04-26.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.7-2019-05-16.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.8-2019-06-11.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.8-2019-06-15.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/postgresql/3.9.15-2020-01-08.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/2.5.2-2012-03-05.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/2.5.3-2012-03-13.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql @@ -374,9 +387,15 @@ %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.0-2018-10-15.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.0-2018-10-20.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.0-2018-10-21.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.10-2019-07-09.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.3-2019-01-12.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.3-2019-02-07.sql %%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.4-2019-03-06.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.7-2019-04-23.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.7-2019-04-26.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.7-2019-05-16.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.8-2019-06-11.sql +%%WWWDIR%%/administrator/components/com_admin/sql/updates/sqlazure/3.9.8-2019-06-15.sql %%WWWDIR%%/administrator/components/com_admin/views/help/tmpl/default.php %%WWWDIR%%/administrator/components/com_admin/views/help/tmpl/default.xml %%WWWDIR%%/administrator/components/com_admin/views/help/tmpl/langforum.php @@ -830,7 +849,6 @@ %%WWWDIR%%/administrator/components/com_installer/views/warnings/tmpl/default.php %%WWWDIR%%/administrator/components/com_installer/views/warnings/tmpl/default.xml %%WWWDIR%%/administrator/components/com_installer/views/warnings/view.html.php -%%WWWDIR%%/administrator/components/com_joomlaupdate/access.xml %%WWWDIR%%/administrator/components/com_joomlaupdate/config.xml %%WWWDIR%%/administrator/components/com_joomlaupdate/controller.php %%WWWDIR%%/administrator/components/com_joomlaupdate/controllers/update.php @@ -845,6 +863,7 @@ %%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default.php %%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml %%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php +%%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_noupdate.php %%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php %%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php %%WWWDIR%%/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php @@ -1324,7 +1343,6 @@ %%WWWDIR%%/administrator/components/com_users/controllers/mail.php %%WWWDIR%%/administrator/components/com_users/controllers/note.php %%WWWDIR%%/administrator/components/com_users/controllers/notes.php -%%WWWDIR%%/administrator/components/com_users/controllers/profile.json.php %%WWWDIR%%/administrator/components/com_users/controllers/user.php %%WWWDIR%%/administrator/components/com_users/controllers/users.php %%WWWDIR%%/administrator/components/com_users/helpers/debug.php @@ -2658,9 +2676,7 @@ %%WWWDIR%%/components/com_tags/views/tags/view.feed.php %%WWWDIR%%/components/com_tags/views/tags/view.html.php %%WWWDIR%%/components/com_users/controller.php -%%WWWDIR%%/components/com_users/controllers/profile.json.php %%WWWDIR%%/components/com_users/controllers/profile.php -%%WWWDIR%%/components/com_users/controllers/profile_base_json.php %%WWWDIR%%/components/com_users/controllers/registration.php %%WWWDIR%%/components/com_users/controllers/remind.php %%WWWDIR%%/components/com_users/controllers/reset.php @@ -3981,6 +3997,7 @@ %%WWWDIR%%/libraries/src/Form/Rule/OptionsRule.php %%WWWDIR%%/libraries/src/Form/Rule/PasswordRule.php %%WWWDIR%%/libraries/src/Form/Rule/RulesRule.php +%%WWWDIR%%/libraries/src/Form/Rule/SubFormRule.php %%WWWDIR%%/libraries/src/Form/Rule/TelRule.php %%WWWDIR%%/libraries/src/Form/Rule/UrlRule.php %%WWWDIR%%/libraries/src/Form/Rule/UsernameRule.php @@ -4443,7 +4460,6 @@ %%WWWDIR%%/libraries/vendor/phpmailer/phpmailer/class.phpmaileroauthgoogle.php %%WWWDIR%%/libraries/vendor/phpmailer/phpmailer/class.pop3.php %%WWWDIR%%/libraries/vendor/phpmailer/phpmailer/class.smtp.php -%%WWWDIR%%/libraries/vendor/phpmailer/phpmailer/composer.lock %%WWWDIR%%/libraries/vendor/phpmailer/phpmailer/extras/EasyPeasyICS.php %%WWWDIR%%/libraries/vendor/phpmailer/phpmailer/extras/htmlfilter.php %%WWWDIR%%/libraries/vendor/phpmailer/phpmailer/extras/ntlm_sasl_client.php