From 5039859f07ab61147da3421ffb7fc226e071f9da Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 19 Jan 2018 15:11:14 +0100 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- .../py-borgbackup/files/patch-setup_lz4.py | 11 + astro/boinc-setiathome/Makefile | 4 +- astro/p5-Astro-SpaceTrack/Makefile | 2 +- astro/p5-Astro-SpaceTrack/distinfo | 6 +- audio/xanalyser/Makefile | 5 + audio/xanalyser/files/patch-src_Analyser.cc | 128 +++ audio/xanalyser/files/patch-src_Scope.cc | 29 + audio/xanalyser/files/patch-src_control.cc | 29 + audio/xanalyser/pkg-plist | 3 - benchmarks/sysbench/Makefile | 2 +- benchmarks/sysbench/distinfo | 6 +- benchmarks/sysbench/pkg-plist | 1 + comms/aprsd/files/patch-admin_aprsd.conf | 10 +- comms/aprsd/files/patch-src_aprsString.h | 6 +- comms/aprsd/files/patch-src_aprsd.cpp | 16 +- comms/aprsd/files/patch-src_osdep.h | 6 +- comms/aprsd/files/patch-src_queryResp.cpp | 8 +- comms/aprsd/files/patch-src_servers.cpp | 35 +- comms/aprsd/files/patch-src_servers.h | 10 +- comms/aprsd/files/patch-src_utils.cpp | 12 +- comms/aprsd/files/patch-src_validate.cpp | 69 +- comms/flrig/files/patch-configure | 4 +- comms/flrig/files/patch-src_main.cxx | 11 + comms/flwrap/files/patch-src_flwrap.cxx | 11 + comms/splat/Makefile | 6 +- comms/splat/distinfo | 5 +- comms/splat/files/patch-splat.cpp | 20 + comms/splat/files/patch-utils_fontdata.c | 12 - comms/splat/files/patch-utils_postdownload | 4 +- databases/mariadb55-server/Makefile | 4 +- databases/mariadb55-server/distinfo | 6 +- .../files/patch-sql_sql__view.cc | 63 -- databases/p5-MongoDB/Makefile | 2 +- databases/p5-MongoDB/distinfo | 6 +- .../files/patch-sql-common_client.c | 38 + .../files/patch-vio_viosslfactories.c | 11 + .../files/patch-sql-common_client.c | 38 + .../files/patch-vio_viosslfactories.c | 11 + devel/cpprestsdk/Makefile | 2 - devel/cpprestsdk/files/patch-git_6b2e048001 | 34 + devel/elixir-lager_logger/files/patch-mix.exs | 2 +- devel/elixir-tzdata/Makefile | 2 +- devel/elixir-tzdata/distinfo | 6 +- devel/gcc-arm-embedded/Makefile | 2 +- .../files/patch-src_gdb_gdb_common_selftest.h | 10 + devel/lfcbase/Makefile | 2 +- devel/lfcbase/distinfo | 6 +- devel/libfwnt/Makefile | 24 +- devel/libfwnt/distinfo | 6 +- devel/libfwnt/pkg-plist | 6 +- devel/mdb/Makefile | 4 +- devel/mdb/distinfo | 6 +- devel/p5-PkgConfig-LibPkgConf/Makefile | 4 +- devel/p5-PkgConfig-LibPkgConf/distinfo | 6 +- devel/pecl-grpc/Makefile | 2 +- devel/pecl-grpc/distinfo | 6 +- devel/py-coloredlogs/Makefile | 4 +- devel/py-coloredlogs/distinfo | 6 +- devel/py-ipykernel/Makefile | 2 +- devel/py-ipykernel/distinfo | 6 +- devel/py-urwid/Makefile | 3 +- devel/py-urwid/distinfo | 5 +- devel/rubygem-aws-sdk-core/Makefile | 2 +- devel/rubygem-aws-sdk-core/distinfo | 6 +- devel/rubygem-aws-sdk-resources/Makefile | 2 +- devel/rubygem-aws-sdk-resources/distinfo | 6 +- devel/rubygem-aws-sdk/Makefile | 2 +- devel/rubygem-aws-sdk/distinfo | 6 +- devel/rubygem-bson/Makefile | 2 +- devel/rubygem-bson/distinfo | 6 +- devel/rubygem-jasmine-core/Makefile | 2 +- devel/rubygem-jasmine-core/distinfo | 6 +- devel/rubygem-mongo/Makefile | 4 +- devel/rubygem-mongo/distinfo | 6 +- devel/tbb/Makefile | 11 +- devel/tbb/distinfo | 6 +- devel/tbb/pkg-plist | 3 + dns/bind9-devel/Makefile | 2 +- dns/bind9-devel/files/named.root | 52 +- dns/bind910/Makefile | 2 +- dns/bind910/files/named.root | 52 +- dns/bind912/Makefile | 2 +- dns/bind912/files/named.root | 52 +- dns/bind99/Makefile | 2 +- dns/bind99/files/named.root | 52 +- ...atch-sdk_codelite__cppcheck_CMakeLists.txt | 14 + editors/openoffice-devel/Makefile | 3 + .../patch-solenv_gbuild_platform_freebsd.mk | 10 + .../files/patch-solenv_inc_unxfbsd.mk | 11 + ...ntime_common_err_RTErrConvertFromErrno.cpp | 11 + french/wordpress/Makefile | 2 +- french/wordpress/distinfo | 6 +- games/balazar/Makefile | 3 - games/eduke32/Makefile | 3 +- games/netpanzer/Makefile | 31 +- games/netpanzer/distinfo | 5 +- games/netpanzer/files/patch-SConstruct | 20 +- .../patch-src_Lib_ArrayUtil_QueueTemplate.hpp | 11 - .../files/patch-src_Lib_Network_Address.hpp | 6 +- .../patch-src_Lib_Network_SocketBase.cpp | 11 + ... patch-src_Lib_optionmm_command__line.hpp} | 6 +- games/netpanzer/pkg-plist | 5 - games/xboard/Makefile | 22 +- german/wordpress/Makefile | 2 +- german/wordpress/distinfo | 6 +- graphics/Makefile | 1 + graphics/icc-profiles-adobe-cs4/Makefile | 32 + graphics/icc-profiles-adobe-cs4/distinfo | 3 + graphics/icc-profiles-adobe-cs4/pkg-descr | 7 + graphics/icc-profiles-adobe-cs4/pkg-plist | 25 + graphics/iccexamin/Makefile | 5 +- graphics/silgraphite/Makefile | 3 +- graphics/silgraphite/pkg-descr | 14 +- japanese/wordpress/Makefile | 2 +- japanese/wordpress/distinfo | 6 +- java/openjdk8/Makefile | 2 +- ...tspot_src_share_vm_services_memTracker.cpp | 13 + lang/gcc6-devel/Makefile | 2 +- lang/gcc6-devel/distinfo | 6 +- mail/rubygem-email_reply_trimmer/Makefile | 2 +- mail/rubygem-email_reply_trimmer/distinfo | 6 +- multimedia/libvpx/Makefile | 2 + multimedia/vdr-plugin-sleeptimer/pkg-descr | 2 +- net-im/licq/Makefile | 2 +- net-mgmt/icinga2/Makefile | 3 +- net-mgmt/icinga2/distinfo | 6 +- net-mgmt/icinga2/pkg-plist | 36 +- net-mgmt/icingaweb2-module-grafana/Makefile | 2 +- net-mgmt/icingaweb2-module-grafana/distinfo | 6 +- net-mgmt/icingaweb2-module-grafana/pkg-plist | 11 + net-mgmt/kismet/Makefile | 1 + net-mgmt/kismet/files/patch-alertracker.cc | 2 +- .../kismet/files/patch-kis_panel_widgets.cc | 11 + net-mgmt/kismet/files/patch-tcpclient.cc | 20 + net-mgmt/kismet/files/patch-tcpserver.cc | 11 + .../kismet/files/patch-unixdomainserver.cc | 11 + net-mgmt/librenms/Makefile | 63 +- net-mgmt/librenms/distinfo | 6 +- .../files/patch-LibreNMS_Util_FileLock.php | 11 + .../files/patch-LibreNMS_Validations_User.php | 33 + .../librenms/files/patch-config.php.default | 2 +- .../librenms/files/patch-html_install.php | 20 + .../files/patch-includes_defaults.inc.php | 10 +- .../librenms/files/patch-poller-wrapper.py | 8 +- net-mgmt/librenms/files/patch-poller.php | 8 - net-mgmt/netdata/Makefile | 3 + .../files/patch-fixes-issue-3276-upstream | 295 +++++++ net-p2p/libtorrent-rasterbar/Makefile | 8 +- net-p2p/libtorrent-rasterbar/distinfo | 8 +- .../files/patch-include_libtorrent_config.hpp | 15 - net/guacamole-server/Makefile | 25 +- net/guacamole-server/distinfo | 6 +- net/guacamole-server/pkg-plist | 3 +- net/norm/Makefile | 9 +- net/norm/pkg-descr | 6 +- net/ntopng/Makefile | 5 +- net/ntopng/distinfo | 6 +- net/ntopng/files/patch-Makefile.in | 4 +- net/ntopng/files/patch-configure.seed | 8 +- .../files/patch-src_DivertInterface.cpp | 11 + net/ntopng/files/patch-src_Utils.cpp | 11 + .../patch-third-party_mongoose_mongoose.c | 29 + net/ntopng/files/patch-third-party_snmp_net.c | 11 + net/p5-GeoIP2/Makefile | 2 +- net/p5-GeoIP2/distinfo | 6 +- net/p5-Net-Twitter/Makefile | 2 +- net/p5-Net-Twitter/distinfo | 6 +- net/rubygem-gitaly-proto/Makefile | 2 +- net/rubygem-gitaly-proto/distinfo | 6 +- russian/wordpress/Makefile | 2 +- russian/wordpress/distinfo | 6 +- security/Makefile | 1 + security/minisign/Makefile | 22 + security/minisign/distinfo | 3 + security/minisign/pkg-descr | 6 + security/py-dfdatetime/Makefile | 2 +- security/py-dfdatetime/distinfo | 6 +- textproc/htmltolatex/Makefile | 2 +- textproc/htmltolatex/files/patch-CH2L.cpp | 13 +- textproc/idnits/Makefile | 2 +- textproc/idnits/distinfo | 6 +- textproc/py-yapf/Makefile | 2 +- textproc/py-yapf/distinfo | 6 +- textproc/rubygem-rouge/Makefile | 2 + www/firefox-esr-i18n/Makefile | 2 +- www/firefox-esr/Makefile | 3 +- www/firefox-esr/distinfo | 6 +- www/firefox-i18n/Makefile | 3 +- www/firefox-i18n/distinfo | 6 +- www/firefox/Makefile | 3 +- www/firefox/distinfo | 6 +- www/gohugo/Makefile | 33 +- www/gohugo/distinfo | 68 +- www/guacamole-client/Makefile | 8 +- www/guacamole-client/distinfo | 10 +- www/guacamole-client/pkg-plist | 1 + www/phpbb3/Makefile | 2 +- www/phpbb3/distinfo | 6 +- www/phpbb3/pkg-plist | 242 +++++- www/py-django-statici18n/Makefile | 4 +- www/py-django-statici18n/distinfo | 6 +- www/rubygem-cuba/Makefile | 2 +- www/rubygem-cuba/distinfo | 6 +- www/rubygem-geminabox/Makefile | 2 +- www/rubygem-geminabox/distinfo | 6 +- www/waterfox/Makefile | 2 +- www/waterfox/files/patch-bug1331209 | 571 +++++++++++++ www/waterfox/files/patch-bug1389561 | 758 ++++++++++++++++++ www/waterfox/files/patch-bug1425612 | 85 ++ www/waterfox/files/patch-bug1426783 | 38 + www/waterfox/files/patch-bug1429764 | 207 +++++ www/waterfox/files/patch-bug1430508 | 56 ++ www/wordpress/Makefile | 2 +- www/wordpress/distinfo | 6 +- www/xist/Makefile | 2 +- www/xist/distinfo | 6 +- 216 files changed, 3677 insertions(+), 745 deletions(-) create mode 100644 archivers/py-borgbackup/files/patch-setup_lz4.py create mode 100644 audio/xanalyser/files/patch-src_Analyser.cc create mode 100644 audio/xanalyser/files/patch-src_Scope.cc create mode 100644 audio/xanalyser/files/patch-src_control.cc delete mode 100644 audio/xanalyser/pkg-plist create mode 100644 comms/flrig/files/patch-src_main.cxx create mode 100644 comms/flwrap/files/patch-src_flwrap.cxx create mode 100644 comms/splat/files/patch-splat.cpp delete mode 100644 comms/splat/files/patch-utils_fontdata.c delete mode 100644 databases/mysql57-server/files/patch-sql_sql__view.cc create mode 100644 databases/percona56-client/files/patch-sql-common_client.c create mode 100644 databases/percona56-client/files/patch-vio_viosslfactories.c create mode 100644 databases/percona56-server/files/patch-sql-common_client.c create mode 100644 databases/percona56-server/files/patch-vio_viosslfactories.c create mode 100644 devel/cpprestsdk/files/patch-git_6b2e048001 create mode 100644 devel/gcc-arm-embedded/files/patch-src_gdb_gdb_common_selftest.h create mode 100644 editors/codelite/files/patch-sdk_codelite__cppcheck_CMakeLists.txt create mode 100644 editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk create mode 100644 editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk create mode 100644 emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp delete mode 100644 games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp create mode 100644 games/netpanzer/files/patch-src_Lib_Network_SocketBase.cpp rename games/netpanzer/files/{patch-src_Lib_optionmm_command_line.hpp => patch-src_Lib_optionmm_command__line.hpp} (64%) delete mode 100644 games/netpanzer/pkg-plist create mode 100644 graphics/icc-profiles-adobe-cs4/Makefile create mode 100644 graphics/icc-profiles-adobe-cs4/distinfo create mode 100644 graphics/icc-profiles-adobe-cs4/pkg-descr create mode 100644 graphics/icc-profiles-adobe-cs4/pkg-plist create mode 100644 java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp create mode 100644 net-mgmt/kismet/files/patch-kis_panel_widgets.cc create mode 100644 net-mgmt/kismet/files/patch-tcpclient.cc create mode 100644 net-mgmt/kismet/files/patch-tcpserver.cc create mode 100644 net-mgmt/kismet/files/patch-unixdomainserver.cc create mode 100644 net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php create mode 100644 net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php create mode 100644 net-mgmt/librenms/files/patch-html_install.php delete mode 100644 net-mgmt/librenms/files/patch-poller.php create mode 100644 net-mgmt/netdata/files/patch-fixes-issue-3276-upstream delete mode 100644 net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp create mode 100644 net/ntopng/files/patch-src_DivertInterface.cpp create mode 100644 net/ntopng/files/patch-src_Utils.cpp create mode 100644 net/ntopng/files/patch-third-party_mongoose_mongoose.c create mode 100644 net/ntopng/files/patch-third-party_snmp_net.c create mode 100644 security/minisign/Makefile create mode 100644 security/minisign/distinfo create mode 100644 security/minisign/pkg-descr create mode 100644 www/waterfox/files/patch-bug1331209 create mode 100644 www/waterfox/files/patch-bug1389561 create mode 100644 www/waterfox/files/patch-bug1425612 create mode 100644 www/waterfox/files/patch-bug1426783 create mode 100644 www/waterfox/files/patch-bug1429764 create mode 100644 www/waterfox/files/patch-bug1430508 diff --git a/archivers/py-borgbackup/files/patch-setup_lz4.py b/archivers/py-borgbackup/files/patch-setup_lz4.py new file mode 100644 index 00000000000..d387ca1101a --- /dev/null +++ b/archivers/py-borgbackup/files/patch-setup_lz4.py @@ -0,0 +1,11 @@ +--- setup_lz4.py.orig 2017-12-30 09:14:25 UTC ++++ setup_lz4.py +@@ -24,7 +24,7 @@ def lz4_system_prefix(prefixes): + for prefix in prefixes: + filename = os.path.join(prefix, 'include', 'lz4.h') + if os.path.exists(filename): +- with open(filename, 'r') as fd: ++ with open(filename, 'r', encoding='utf-8') as fd: + if 'LZ4_compress_default' in fd.read(): # requires lz4 >= 1.7.0 (r129) + return prefix + diff --git a/astro/boinc-setiathome/Makefile b/astro/boinc-setiathome/Makefile index fbeffcfd83a..78ce8147b47 100644 --- a/astro/boinc-setiathome/Makefile +++ b/astro/boinc-setiathome/Makefile @@ -14,6 +14,8 @@ COMMENT= Setiathome Enhanced for BOINC LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_powerpc64= does not compile: analyzeFuncs_altivec.cpp: CoreServices/CoreServices.h: No such file or directory +BROKEN_FreeBSD_10_i386= does not compile: vector/x86_ops.h:149:9: error: unknown type name '__m128i'; did you mean '__m128'? BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 RUN_DEPENDS= boinc_client:net/boinc-client LIB_DEPENDS= libfftw3f.so:math/fftw3-float @@ -83,8 +85,6 @@ PLIST_SUB+= PREFIX=${PREFIX} \ BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} -BROKEN_powerpc64= does not compile: analyzeFuncs_altivec.cpp: CoreServices/CoreServices.h: No such file or directory - # str_replace.h is included in newer versions of net/boinc-client, # but it is not needed on FreeBSD post-patch: diff --git a/astro/p5-Astro-SpaceTrack/Makefile b/astro/p5-Astro-SpaceTrack/Makefile index 7f5b2fe04a0..8255ab5e4c5 100644 --- a/astro/p5-Astro-SpaceTrack/Makefile +++ b/astro/p5-Astro-SpaceTrack/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Astro-SpaceTrack -PORTVERSION= 0.102 +PORTVERSION= 0.103 CATEGORIES= astro perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/astro/p5-Astro-SpaceTrack/distinfo b/astro/p5-Astro-SpaceTrack/distinfo index 140b1071a0b..b70b07cad65 100644 --- a/astro/p5-Astro-SpaceTrack/distinfo +++ b/astro/p5-Astro-SpaceTrack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514730601 -SHA256 (Astro-SpaceTrack-0.102.tar.gz) = dfa1ca0fd44511f53d016b99617acd2ecf0f852a81395afdb49b8412ee7d412d -SIZE (Astro-SpaceTrack-0.102.tar.gz) = 170403 +TIMESTAMP = 1516280951 +SHA256 (Astro-SpaceTrack-0.103.tar.gz) = 52561d3370218ba3c1293cb8a8e24ffdee02778a2cb53b70ec42a362dad75c78 +SIZE (Astro-SpaceTrack-0.103.tar.gz) = 170610 diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile index 3212edd3341..c4e2c173835 100644 --- a/audio/xanalyser/Makefile +++ b/audio/xanalyser/Makefile @@ -11,9 +11,14 @@ MASTER_SITES= http://arvin.schnell-web.net/xanalyser/ \ MAINTAINER= db@FreeBSD.org COMMENT= Spectrum analyser +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + USES= gmake libtool motif tar:bzip2 GNU_CONFIGURE= yes +PLIST_FILES= bin/xanalyser lib/X11/app-defaults/XAnalyser man/man1/xanalyser.1.gz + post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%MOTIFLIB%%|${MOTIFLIB} |g' \ diff --git a/audio/xanalyser/files/patch-src_Analyser.cc b/audio/xanalyser/files/patch-src_Analyser.cc new file mode 100644 index 00000000000..bc2d119ff92 --- /dev/null +++ b/audio/xanalyser/files/patch-src_Analyser.cc @@ -0,0 +1,128 @@ +--- src/Analyser.cc.orig 2018-01-19 00:36:36 UTC ++++ src/Analyser.cc +@@ -146,7 +146,7 @@ Analyser::resize (bool redraw) + marker[1] = f2sx (f[1]); + + if (redraw) { +- XRectangle rect = { 0, 0, width, height }; ++ XRectangle rect = { 0, 0, static_cast(width), static_cast(height) }; + draw (rect); + } + } +@@ -169,7 +169,7 @@ Analyser::clear (bool drawit) + calcfoo (); + + if (drawit) { +- XRectangle rect = { 0, 0, width, height }; ++ XRectangle rect = { 0, 0, static_cast(width), static_cast(height) }; + draw (rect); + } + } +@@ -188,7 +188,7 @@ Analyser::drawpeaktext (bool showit) + + snprintf (peak_text, 10, "%i", (int) peak_f); + +- peak_sx = f2sx (peak_f) - (strlen (peak_text) * font_width) / 2; ++ peak_sx = f2sx (peak_f) - (strlen (peak_text) * font_width) / 2; + peak_sy = db2sy (peak_db) - 6; + + XSetForeground (display, gc, xanalyser.markercolor); +@@ -203,7 +203,7 @@ void + Analyser::drawpeakmarker () + { + for (int m = 0; m < 2; m++) { +- XRectangle rect = { marker[m], 0, 1, height }; ++ XRectangle rect = { static_cast(marker[m]), 0, 1, static_cast(height) }; + draw (rect); + } + } +@@ -251,13 +251,13 @@ Analyser::drawgrid (bool withtext) + else + XSetForeground (display, gc, xanalyser.minorgridcolor); + +- XDrawLine (display, window, gc, 0, sy, width - 1, sy); ++ XDrawLine (display, window, gc, 0, sy, static_cast(width) - 1, sy); + + if (withtext) { + const int size = 10; + char buffer[size]; + snprintf (buffer, size, "%+d", db); +- XDrawString (display, window, gc, width - 2 - font_width * ++ XDrawString (display, window, gc, static_cast(width) - 2 - font_width * + strlen (buffer), sy - 2, buffer, strlen (buffer)); + } + } +@@ -280,7 +280,7 @@ Analyser::draw (XRectangle rect, bool complete) + if (complete) { + + XSetForeground (display, gc, xanalyser.backgroundcolor); +- XFillRectangle (display, window, gc, 0, 0, width, height); ++ XFillRectangle (display, window, gc, 0, 0, static_cast(width), height); + + XSetForeground (display, gc, xanalyser.datacolor); + for (int sx = first; sx <= last; sx++) { +@@ -344,7 +344,7 @@ Analyser::realize (Display* display, Window window) + + gc = XCreateGC (display, window, gc_mask, &gc_values); + +- // get width and height ++ // get static_cast(width) and height + + myXGetDrawableSize (display, window, &width, &height); + +@@ -382,8 +382,8 @@ Analyser::realize (Display* display, Window window) + envelope (); + + marker[0] = 0; +- // note: it might be that width - 1 != num_fft - 1 +- marker[1] = width - 1; ++ // note: it might be that static_cast(width) - 1 != num_fft - 1 ++ marker[1] = static_cast(width) - 1; + + return true; + } +@@ -427,7 +427,7 @@ Analyser::shot (const int32_t* buffer, int channel, bo + analyse (buffer, channel); + + if (drawit) { +- XRectangle rect = { 0, 0, width, height }; ++ XRectangle rect = { 0, 0, static_cast(width), static_cast(height) }; + draw (rect, false); + } + +@@ -608,7 +608,7 @@ Analyser::set_search (bool search) + drawpeaktext (true); + + for (int m = 0; m < 2; m++) { +- XRectangle rect = { marker[m], 0, 1, height }; ++ XRectangle rect = { static_cast(marker[m]), 0, 1, static_cast(height) }; + draw (rect); + } + +@@ -618,7 +618,7 @@ Analyser::set_search (bool search) + drawpeaktext (false); + + for (int m = 0; m < 2; m++) { +- XRectangle rect = { marker[m], 0, 1, height }; ++ XRectangle rect = { static_cast(marker[m]), 0, 1, static_cast(height) }; + draw (rect); + } + +@@ -647,7 +647,7 @@ Analyser::set_marker (short sx) + + // remove old marker and text + +- XRectangle rect = { old, 0, 1, height }; ++ XRectangle rect = { old, 0, 1, static_cast(height) }; + draw (rect); + + XSetClipMask (display, gc, None); +@@ -662,7 +662,7 @@ Analyser::set_marker (short sx) + peaksearch (true); + + for (int m = 0; m < 2; m++) { +- XRectangle rect = { marker[m], 0, 1, height }; ++ XRectangle rect = { static_cast(marker[m]), 0, 1, static_cast(height) }; + draw (rect); + } + diff --git a/audio/xanalyser/files/patch-src_Scope.cc b/audio/xanalyser/files/patch-src_Scope.cc new file mode 100644 index 00000000000..99f9ed408ed --- /dev/null +++ b/audio/xanalyser/files/patch-src_Scope.cc @@ -0,0 +1,29 @@ +--- src/Scope.cc.orig 2018-01-19 00:47:02 UTC ++++ src/Scope.cc +@@ -132,7 +132,7 @@ Scope::resize (bool redraw) + clearbuffer (); + + if (redraw) { +- XRectangle rect = { 0, 0, width, height }; ++ XRectangle rect = { 0, 0, static_cast(width), static_cast(height) }; + draw (rect); + } + } +@@ -193,7 +193,7 @@ Scope::clear (bool drawit) + clearbuffer (); + + if (drawit) { +- XRectangle rect = { 0, 0, width, height }; ++ XRectangle rect = { 0, 0, static_cast(width), static_cast(height) }; + draw (rect); + } + } +@@ -310,7 +310,7 @@ Scope::shot (const int32_t* buffer, bool drawit) + } + + if (drawit && sample.frame_count % num_count == num_count - 1) { +- XRectangle rect = { 0, 0, width, height }; ++ XRectangle rect = { 0, 0, static_cast(width), static_cast(height) }; + draw (rect); + } + diff --git a/audio/xanalyser/files/patch-src_control.cc b/audio/xanalyser/files/patch-src_control.cc new file mode 100644 index 00000000000..fdfd997a990 --- /dev/null +++ b/audio/xanalyser/files/patch-src_control.cc @@ -0,0 +1,29 @@ +--- src/control.cc.orig 2018-01-19 00:48:36 UTC ++++ src/control.cc +@@ -566,7 +566,7 @@ analyser_callback (Widget, XtPointer client_data, XtPo + XtWindow (analyser_drawing_w[n])); + + XExposeEvent* e = (XExposeEvent*) c->event; +- XRectangle rect = { e->x, e->y, e->width, e->height }; ++ XRectangle rect = { static_cast(e->x), static_cast(e->y), static_cast(e->width), static_cast(e->height) }; + analyser[n].draw (rect); + + } break; +@@ -585,7 +585,7 @@ analyser_callback (Widget, XtPointer client_data, XtPo + case ButtonPress: + case MotionNotify: { + XButtonPressedEvent* e = (XButtonPressedEvent*) c->event; +- XPoint point = { e->x, e->y }; ++ XPoint point = { static_cast(e->x),static_cast(e->y) }; + + analyser[0].set_marker (point.x); + analyser[1].set_marker (point.x); +@@ -709,7 +709,7 @@ scope_callback (Widget, XtPointer, XtPointer call_data + scope.realize (XtDisplay (scope_drawing_w), XtWindow (scope_drawing_w)); + + XExposeEvent* e = (XExposeEvent*) c->event; +- XRectangle rect = { e->x, e->y, e->width, e->height }; ++ XRectangle rect = { static_cast(e->x),static_cast(e->y), static_cast(e->width), static_cast(e->height) }; + scope.draw (rect); + + } break; diff --git a/audio/xanalyser/pkg-plist b/audio/xanalyser/pkg-plist deleted file mode 100644 index ef7d5355329..00000000000 --- a/audio/xanalyser/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/xanalyser -lib/X11/app-defaults/XAnalyser -man/man1/xanalyser.1.gz diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile index a3bd649ec47..77872edd780 100644 --- a/benchmarks/sysbench/Makefile +++ b/benchmarks/sysbench/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sysbench -PORTVERSION= 1.0.11 +PORTVERSION= 1.0.12 CATEGORIES= benchmarks databases MAINTAINER= sunpoet@FreeBSD.org diff --git a/benchmarks/sysbench/distinfo b/benchmarks/sysbench/distinfo index 26cb61015be..cbeca542444 100644 --- a/benchmarks/sysbench/distinfo +++ b/benchmarks/sysbench/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512927021 -SHA256 (akopytov-sysbench-1.0.11_GH0.tar.gz) = 2621d274d9103496e22c57863faec11f855f25db838fae0248be6e825a426dbe -SIZE (akopytov-sysbench-1.0.11_GH0.tar.gz) = 1498802 +TIMESTAMP = 1516280814 +SHA256 (akopytov-sysbench-1.0.12_GH0.tar.gz) = 1d730b4619eb5d92cb3d2e642ed55f84b3fca8ec5d2acb5ca09b52a73d6831b4 +SIZE (akopytov-sysbench-1.0.12_GH0.tar.gz) = 1506013 diff --git a/benchmarks/sysbench/pkg-plist b/benchmarks/sysbench/pkg-plist index d6f3fd42d0c..d4632c3294b 100644 --- a/benchmarks/sysbench/pkg-plist +++ b/benchmarks/sysbench/pkg-plist @@ -14,6 +14,7 @@ bin/sysbench %%DATADIR%%/tests/include/api_sql_common.sh %%DATADIR%%/tests/include/config.sh %%DATADIR%%/tests/include/drv_common.sh +%%DATADIR%%/tests/include/inspect.lua %%DATADIR%%/tests/include/mysql_common.sh %%DATADIR%%/tests/include/oltp_legacy/bulk_insert.lua %%DATADIR%%/tests/include/oltp_legacy/common.lua diff --git a/comms/aprsd/files/patch-admin_aprsd.conf b/comms/aprsd/files/patch-admin_aprsd.conf index 0a5437a4b47..86bd9d4f435 100644 --- a/comms/aprsd/files/patch-admin_aprsd.conf +++ b/comms/aprsd/files/patch-admin_aprsd.conf @@ -1,6 +1,6 @@ ---- admin/aprsd.conf.orig 2008-01-22 20:08:12.000000000 -0500 -+++ admin/aprsd.conf 2008-01-22 20:12:45.000000000 -0500 -@@ -46,7 +46,7 @@ +--- admin/aprsd.conf.orig 2003-10-01 16:57:16 UTC ++++ admin/aprsd.conf +@@ -46,7 +46,7 @@ NetBeacon 10 !3802.21NI07830.61W& APRS Server #Define the TNC beacon. The TNC will supply the ax25 path header. #It's optional and you may use the TNC BTEXT in the INIT.TNC file instead. # @@ -9,7 +9,7 @@ # # #Send 2 extra message acks is addition to each received ack to TNC -@@ -65,12 +65,12 @@ +@@ -65,12 +65,12 @@ expire 35 #If undefined all TNC related functions are disabled. #Permissable baud rates are 1200,2400,4800,9600 and 19200. # @@ -24,7 +24,7 @@ #For the TNC, set this in INIT.TNC. Note the format is #slightly different to the TNC command. aprspath APRS v WIDE -@@ -97,7 +97,7 @@ +@@ -97,7 +97,7 @@ Trace no logAllRF no # # Allow the insecure aprs passcodes to be used diff --git a/comms/aprsd/files/patch-src_aprsString.h b/comms/aprsd/files/patch-src_aprsString.h index 981efc52fdd..7a6d41a096a 100644 --- a/comms/aprsd/files/patch-src_aprsString.h +++ b/comms/aprsd/files/patch-src_aprsString.h @@ -1,6 +1,6 @@ ---- src/aprsString.h.orig 2008-01-12 18:11:00.000000000 -0500 -+++ src/aprsString.h 2008-01-12 18:11:35.000000000 -0500 -@@ -196,7 +196,8 @@ +--- src/aprsString.h.orig 2003-10-01 16:58:27 UTC ++++ src/aprsString.h +@@ -196,7 +196,8 @@ class aprsString: public string (public) void parseLogon(void); bool parseCommand(void); bool parsePortFilter(void); diff --git a/comms/aprsd/files/patch-src_aprsd.cpp b/comms/aprsd/files/patch-src_aprsd.cpp index 60ae52f0a92..8e4e26aa383 100644 --- a/comms/aprsd/files/patch-src_aprsd.cpp +++ b/comms/aprsd/files/patch-src_aprsd.cpp @@ -1,16 +1,16 @@ ---- src/aprsd.cpp.orig 2003-05-28 23:09:39.000000000 -0400 -+++ src/aprsd.cpp 2008-01-24 01:13:26.000000000 -0500 -@@ -98,7 +98,8 @@ +--- src/aprsd.cpp.orig 2003-05-29 03:09:39 UTC ++++ src/aprsd.cpp +@@ -98,7 +98,8 @@ string szAprsPath; int msgsn; const string HOMEDIR("/home/aprsd2"); -const string CONFPATH(""); -+const string LOGPATH("%%LOGPATH%%"); -+const string CONFPATH("%%CONFPATH%%"); ++const string LOGPATH("/var/log/aprsd/"); ++const string CONFPATH("/usr/local/etc/aprsd/"); const string CONFFILE("aprsd.conf"); const string MAINLOG("aprsd.log"); const string STSMLOG("thirdparty.log"); -@@ -126,7 +127,7 @@ +@@ -126,7 +127,7 @@ void serverQuit(void) /* Invoked by console 'q' q WriteLog(string("Server Shutdown"), MAINLOG); tcsetattr(fileno(stdin),TCSANOW,&initial_settings); //restore terminal mode @@ -19,7 +19,7 @@ outFile += SAVE_HISTORY; int n = SaveHistory(outFile); -@@ -872,8 +873,8 @@ +@@ -872,8 +873,8 @@ int daemonInit(void) if (f.is_open()) { f.read(s, 10); xx = atoi(s); @@ -30,7 +30,7 @@ cout << "aprsd already running" << endl; cout << "PID: " << pid_file << endl; exit(1); -@@ -977,7 +978,7 @@ +@@ -977,7 +978,7 @@ int main(int argc, char *argv[]) //fdump = fopen("dump.txt","w+"); //debug diff --git a/comms/aprsd/files/patch-src_osdep.h b/comms/aprsd/files/patch-src_osdep.h index 69b2ffe64a8..58b3ea1ae88 100644 --- a/comms/aprsd/files/patch-src_osdep.h +++ b/comms/aprsd/files/patch-src_osdep.h @@ -1,5 +1,5 @@ ---- src/osdep.h.orig 2003-04-20 14:34:47.000000000 -0400 -+++ src/osdep.h 2008-01-23 23:29:47.000000000 -0500 +--- src/osdep.h.orig 2003-04-20 18:34:47 UTC ++++ src/osdep.h @@ -32,6 +32,14 @@ extern "C" { @@ -15,7 +15,7 @@ #if TIME_WITH_SYS_TIME # include -@@ -63,10 +71,27 @@ +@@ -63,10 +71,27 @@ namespace aprsd char *buf, size_t buflen, struct hostent **result, int *h_errnop) { diff --git a/comms/aprsd/files/patch-src_queryResp.cpp b/comms/aprsd/files/patch-src_queryResp.cpp index 94d0ce44ed9..198bb8be57d 100644 --- a/comms/aprsd/files/patch-src_queryResp.cpp +++ b/comms/aprsd/files/patch-src_queryResp.cpp @@ -1,5 +1,5 @@ ---- src/queryResp.cpp.orig 2003-03-30 23:49:40.000000000 -0500 -+++ src/queryResp.cpp 2008-01-23 22:12:30.000000000 -0500 +--- src/queryResp.cpp.orig 2003-03-31 04:49:40 UTC ++++ src/queryResp.cpp @@ -40,6 +40,9 @@ #include @@ -10,7 +10,7 @@ #include "constant.h" #include "utils.h" -@@ -84,7 +87,6 @@ +@@ -84,7 +87,6 @@ void queryResp(int source, const aprsString* pkt) if ((rc = gethostname(hostname,80)) != 0) strcpy(hostname, "Host_Unknown"); else { @@ -18,7 +18,7 @@ //Thread-Safe verison of gethostbyname() h = NULL; rc = gethostbyname_r(hostname, -@@ -94,12 +96,10 @@ +@@ -94,12 +96,10 @@ void queryResp(int source, const aprsString* pkt) &h, &h_err); diff --git a/comms/aprsd/files/patch-src_servers.cpp b/comms/aprsd/files/patch-src_servers.cpp index 783b15b13da..ab4439c0722 100644 --- a/comms/aprsd/files/patch-src_servers.cpp +++ b/comms/aprsd/files/patch-src_servers.cpp @@ -1,19 +1,20 @@ ---- src/servers.cpp.orig 2003-10-01 12:58:27.000000000 -0400 -+++ src/servers.cpp 2008-01-23 23:26:01.000000000 -0500 -@@ -2627,7 +2627,6 @@ - &hostinfo, - &h_err); +--- src/servers.cpp.orig 2003-10-01 16:58:27 UTC ++++ src/servers.cpp +@@ -2283,7 +2283,7 @@ void *TCPServerThread(void *p) + server.sin_addr.s_addr = INADDR_ANY; + server.sin_port = htons(sp->ServerPort); -- - if (rc || (hostinfo == NULL)){ - char* cp = new char[256]; - memset(cp, 0, 256); -@@ -3277,7 +3276,7 @@ +- if (bind(s, (struct sockaddr *)&server, sizeof(server)) < 0) { ++ if (::bind(s, (struct sockaddr *)&server, sizeof(server)) < 0) { + perror("TCPServerThread bind error"); + ShutDownServer = true; + return NULL; +@@ -2382,7 +2382,7 @@ void *UDPServerThread(void *p) + server.sin_port = htons(UDP_Port) ;/* 0 = Use any available port */ + server.sin_addr.s_addr = INADDR_ANY; /* Server's Internet Address */ - //---------------------------------------------------------------------- - --inline string convertUpTime(int dTime) -+string convertUpTime(int dTime) - { - std::ostringstream ostr; - int x; +- if (bind(s, (struct sockaddr *)&server, sizeof(server)) < 0) { ++ if (::bind(s, (struct sockaddr *)&server, sizeof(server)) < 0) { + perror("Datagram socket bind error"); + ShutDownServer = true; + return NULL; diff --git a/comms/aprsd/files/patch-src_servers.h b/comms/aprsd/files/patch-src_servers.h index 1812f1abf99..dd3db658e67 100644 --- a/comms/aprsd/files/patch-src_servers.h +++ b/comms/aprsd/files/patch-src_servers.h @@ -1,5 +1,5 @@ ---- src/servers.h.orig 2008-01-12 18:18:53.000000000 -0500 -+++ src/servers.h 2008-01-12 18:36:15.000000000 -0500 +--- src/servers.h.orig 2003-10-01 16:58:27 UTC ++++ src/servers.h @@ -28,6 +28,12 @@ #include @@ -13,17 +13,17 @@ #include "aprsd.h" #include "mutex.h" -@@ -135,11 +141,17 @@ +@@ -135,11 +141,17 @@ struct pidList{ //Stuff for trusted UDP source IPs +#ifdef BSD -+struct sTrusted { + struct sTrusted { + struct in_addr sin_addr; //ip address + struct in_addr sin_mask; //subnet mask +}; +#else - struct sTrusted { ++struct sTrusted { in_addr sin_addr; //ip address in_addr sin_mask; //subnet mask }; diff --git a/comms/aprsd/files/patch-src_utils.cpp b/comms/aprsd/files/patch-src_utils.cpp index 42e7150ab10..05a5df9f834 100644 --- a/comms/aprsd/files/patch-src_utils.cpp +++ b/comms/aprsd/files/patch-src_utils.cpp @@ -1,14 +1,14 @@ ---- src/utils.cpp.orig 2003-10-01 12:58:27.000000000 -0400 -+++ src/utils.cpp 2008-01-22 21:54:44.000000000 -0500 -@@ -41,6 +41,7 @@ +--- src/utils.cpp.orig 2003-10-01 16:58:27 UTC ++++ src/utils.cpp +@@ -41,6 +41,7 @@ int CountDefault = 7; //Max of 7 instances of one static RecursiveMutex pmtxLog; -+const string LOGPATH("%%LOGPATH%%"); ++const string LOGPATH("/var/log/aprsd/"); int WriteLog(const string& sp, const string& LogFile) { -@@ -50,11 +51,12 @@ +@@ -50,11 +51,12 @@ int WriteLog(const string& sp, const string& LogFile) static Lock locker(pmtxLog, false); locker.get(); @@ -23,7 +23,7 @@ time(<ime); // Timestamp ctime_r(<ime, szTime); // "threadsafe" ctime -@@ -91,8 +93,8 @@ +@@ -91,8 +93,8 @@ int WriteLog(const char* pch, const char* LogFile) pthread_mutex_lock(pmtxLog); diff --git a/comms/aprsd/files/patch-src_validate.cpp b/comms/aprsd/files/patch-src_validate.cpp index 51894c79abf..7e49caed7cf 100644 --- a/comms/aprsd/files/patch-src_validate.cpp +++ b/comms/aprsd/files/patch-src_validate.cpp @@ -1,5 +1,5 @@ ---- src/validate.cpp.orig 2008-01-13 20:00:27.000000000 -0500 -+++ src/validate.cpp 2008-01-13 20:45:17.000000000 -0500 +--- src/validate.cpp.orig 2003-03-31 04:49:41 UTC ++++ src/validate.cpp @@ -34,6 +34,10 @@ #include #include @@ -11,7 +11,7 @@ using namespace std; -@@ -47,11 +51,17 @@ +@@ -47,11 +51,17 @@ struct user_info { const string group; }; #else @@ -29,19 +29,19 @@ #include "validate.h" -@@ -140,12 +150,21 @@ +@@ -140,12 +150,21 @@ int checkSystemPass(const string szUser, const string pam_end(pamh, PAM_SUCCESS); return 0; #else +#ifdef BSD -+ passwd *ppw = NULL; + passwd *ppw = NULL; + struct group *pgrp = NULL; + struct spwd *pspwd = NULL; + char *member = NULL; + struct group grp; + struct passwd pwd; +#else - passwd *ppw = NULL; ++ passwd *ppw = NULL; group *pgrp = NULL; spwd *pspwd = NULL; char *member = NULL; @@ -51,7 +51,7 @@ int i; char salt[16]; int usrfound = 0 ; -@@ -158,7 +177,11 @@ +@@ -158,7 +177,11 @@ int checkSystemPass(const string szUser, const string #endif @@ -63,8 +63,12 @@ char *buffer1 = new char[bufsize]; //Thread-Safe getgrnam() getgrnam_r(szGroup.c_str(), /* Does group name szGroup exist? */ -@@ -171,9 +194,11 @@ - delete buffer1; +@@ -168,12 +191,14 @@ int checkSystemPass(const string szUser, const string + &pgrp); + + if (pgrp == NULL) { +- delete buffer1; ++ delete[] buffer1; return rc; /* return BADGROUP if not */ } - @@ -77,7 +81,29 @@ char *buffer2 = new char[bufsize]; //Thread-Safe getpwnam() getpwnam_r(szUser.c_str(), -@@ -214,6 +239,7 @@ +@@ -183,8 +208,8 @@ int checkSystemPass(const string szUser, const string + &ppw); + + if (ppw == NULL){ +- delete buffer2; +- delete buffer1; ++ delete[] buffer2; ++ delete[] buffer1; + return BADUSER ; /* return BADUSER if no such user */ + } + +@@ -200,8 +225,8 @@ int checkSystemPass(const string szUser, const string + } + + if (usrfound == 0) { +- delete buffer1; +- delete buffer2; ++ delete[] buffer1; ++ delete[] buffer2; + return BADGROUP; /* return BADGROUP if user not in group */ + } + +@@ -214,6 +239,7 @@ int checkSystemPass(const string szUser, const string pwLength = strlen(ppw->pw_passwd); @@ -85,7 +111,7 @@ if (ppw->pw_passwd[0] != '$') { /* DES salt */ strncpy(salt,ppw->pw_passwd,2); -@@ -230,15 +256,18 @@ +@@ -230,15 +256,18 @@ int checkSystemPass(const string szUser, const string salt[i++] = '$'; salt[i] = '\0'; } @@ -105,11 +131,26 @@ if ((rc == BADPASSWD) && (strcmp("x",ppw->pw_passwd) == 0)) { #ifdef DEBUG cout << "Shadow passwords enabled\n"; -@@ -288,6 +317,7 @@ +@@ -246,8 +275,8 @@ int checkSystemPass(const string szUser, const string + pspwd = getspnam(szUser.c_str()); //Get shadow password file data for user + if (pspwd == NULL) { + cout << "validate: Can't read shadowed password file. This program must run as root\n"; +- delete buffer1; +- delete buffer2; ++ delete[] buffer1; ++ delete[] buffer2; + return MUSTRUNROOT; + } + pwLength = strlen(pspwd->sp_pwdp); +@@ -288,8 +317,9 @@ int checkSystemPass(const string szUser, const string << endl; #endif } +- delete buffer1; +- delete buffer2; +#endif - delete buffer1; - delete buffer2; ++ delete[] buffer1; ++ delete[] buffer2; return rc; + #endif + } diff --git a/comms/flrig/files/patch-configure b/comms/flrig/files/patch-configure index 5468fa7dd84..9ad954fe924 100644 --- a/comms/flrig/files/patch-configure +++ b/comms/flrig/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2017-04-01 02:21:18 UTC +--- configure.orig 2018-01-14 19:21:15 UTC +++ configure -@@ -6143,7 +6143,7 @@ $as_echo "$FLTK_CONFIG" >&6; } +@@ -6166,7 +6166,7 @@ $as_echo "$FLTK_CONFIG" >&6; } FLTK_LIBS=`$FLTK_CONFIG --ldflags --use-images` if test "x$target_mingw32" != "xyes"; then if test "x$target_darwin" != "xyes"; then diff --git a/comms/flrig/files/patch-src_main.cxx b/comms/flrig/files/patch-src_main.cxx new file mode 100644 index 00000000000..52bc4e57df3 --- /dev/null +++ b/comms/flrig/files/patch-src_main.cxx @@ -0,0 +1,11 @@ +--- src/main.cxx.orig 2018-01-18 20:38:50 UTC ++++ src/main.cxx +@@ -514,7 +514,7 @@ int parse_args(int argc, char **argv, int& idx) + exit(0); + } + if (strcasecmp("--version", argv[idx]) == 0) { +- printf("Version: "VERSION"\n"); ++ printf("Version: %s\n",VERSION); + exit (0); + } + if (strcasecmp("--rig_debug", argv[idx]) == 0) { diff --git a/comms/flwrap/files/patch-src_flwrap.cxx b/comms/flwrap/files/patch-src_flwrap.cxx new file mode 100644 index 00000000000..315e838faf8 --- /dev/null +++ b/comms/flwrap/files/patch-src_flwrap.cxx @@ -0,0 +1,11 @@ +--- src/flwrap.cxx.orig 2018-01-18 20:57:00 UTC ++++ src/flwrap.cxx +@@ -547,7 +547,7 @@ int parse_args(int argc, char **argv, int& idx) + exit(0); + } + if (strcasecmp("--version", argv[idx]) == 0) { +- printf("Version: "VERSION"\n"); ++ printf("Version: %s\n",VERSION); + exit(0); + } + diff --git a/comms/splat/Makefile b/comms/splat/Makefile index d262753acd8..626dcc757c0 100644 --- a/comms/splat/Makefile +++ b/comms/splat/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= splat -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.2 CATEGORIES= comms hamradio -MASTER_SITES= SUNSITE/apps/ham - +MASTER_SITES= http://www.qsl.net/kd2bd/ +#http://www.qsl.net/kd2bd/splat-1.4.2.tar.bz2 MAINTAINER= hamradio@FreeBSD.org COMMENT= Used in calculating path losses, useful to ham radio and others diff --git a/comms/splat/distinfo b/comms/splat/distinfo index 4c0fa193a5e..0c872a36eae 100644 --- a/comms/splat/distinfo +++ b/comms/splat/distinfo @@ -1,2 +1,3 @@ -SHA256 (splat-1.4.0.tar.bz2) = f081951c68577234668ac2a1e6eff86e60e57e17c470d765900e9d1461058678 -SIZE (splat-1.4.0.tar.bz2) = 357433 +TIMESTAMP = 1516294940 +SHA256 (splat-1.4.2.tar.bz2) = 39b0b314e2e927bdf00d1eda4b9865efd128ba850305f987aec049c4fd58a29c +SIZE (splat-1.4.2.tar.bz2) = 356823 diff --git a/comms/splat/files/patch-splat.cpp b/comms/splat/files/patch-splat.cpp new file mode 100644 index 00000000000..0912c8c5280 --- /dev/null +++ b/comms/splat/files/patch-splat.cpp @@ -0,0 +1,20 @@ +--- splat.cpp.orig 2018-01-18 17:04:01 UTC ++++ splat.cpp +@@ -567,7 +567,7 @@ double ElevationAngle(struct site source, struct site + (downtilt), as referenced to a normal to the center of + the earth. */ + +- register double a, b, dx; ++ double a, b, dx; + + a=GetElevation(destination)+destination.alt+earthradius; + b=GetElevation(source)+source.alt+earthradius; +@@ -2727,7 +2727,7 @@ void PlotPath(struct site source, struct site destinat + + char block; + int x, y; +- register double cos_xmtr_angle, cos_test_angle, test_alt; ++ double cos_xmtr_angle, cos_test_angle, test_alt; + double distance, rx_alt, tx_alt; + + ReadPath(source,destination); diff --git a/comms/splat/files/patch-utils_fontdata.c b/comms/splat/files/patch-utils_fontdata.c deleted file mode 100644 index 4bc8afc2855..00000000000 --- a/comms/splat/files/patch-utils_fontdata.c +++ /dev/null @@ -1,12 +0,0 @@ ---- utils/fontdata.c.orig 2012-11-05 15:44:52.000000000 -0500 -+++ utils/fontdata.c 2012-11-05 15:42:54.000000000 -0500 -@@ -39,7 +39,8 @@ - { - int x; - unsigned char line, input; -- FILE *infile, *outfile; -+ gzFile infile; -+ FILE *outfile; - - if (argc==2) - infile=gzopen(argv[1],"rb"); diff --git a/comms/splat/files/patch-utils_postdownload b/comms/splat/files/patch-utils_postdownload index be6818c9959..259543c93a6 100644 --- a/comms/splat/files/patch-utils_postdownload +++ b/comms/splat/files/patch-utils_postdownload @@ -1,5 +1,5 @@ ---- utils/postdownload.orig 2012-11-03 03:56:52.000000000 -0500 -+++ utils/postdownload 2012-11-03 03:57:09.000000000 -0500 +--- utils/postdownload.orig 2009-03-01 17:37:04 UTC ++++ utils/postdownload @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index 54211045e4d..c6e5e2bb20c 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.58 -PORTREVISION?= 1 +PORTVERSION= 5.5.59 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo index e990802c325..5db8fc798ba 100644 --- a/databases/mariadb55-server/distinfo +++ b/databases/mariadb55-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508325537 -SHA256 (mariadb-5.5.58.tar.gz) = 26fdf8784a51e5d6f7624c0f4528433a6188065dd1bf92ef69e27db6b0a41002 -SIZE (mariadb-5.5.58.tar.gz) = 45784323 +TIMESTAMP = 1516351401 +SHA256 (mariadb-5.5.59.tar.gz) = c3269ce20b45b177239fd1e3d6d9428a94131711f12758ebf5f65222278bb110 +SIZE (mariadb-5.5.59.tar.gz) = 45804920 diff --git a/databases/mysql57-server/files/patch-sql_sql__view.cc b/databases/mysql57-server/files/patch-sql_sql__view.cc deleted file mode 100644 index acafed2aede..00000000000 --- a/databases/mysql57-server/files/patch-sql_sql__view.cc +++ /dev/null @@ -1,63 +0,0 @@ ---- sql/sql_view.cc.orig 2016-03-28 18:06:12 UTC -+++ sql/sql_view.cc -@@ -773,46 +773,46 @@ static const int required_view_parameter - */ - static File_option view_parameters[]= - {{{ C_STRING_WITH_LEN("query")}, -- my_offsetof(TABLE_LIST, select_stmt), -+ static_cast(my_offsetof(TABLE_LIST, select_stmt)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("md5")}, -- my_offsetof(TABLE_LIST, md5), -+ static_cast(my_offsetof(TABLE_LIST, md5)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("updatable")}, -- my_offsetof(TABLE_LIST, updatable_view), -+ static_cast(my_offsetof(TABLE_LIST, updatable_view)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("algorithm")}, -- my_offsetof(TABLE_LIST, algorithm), -+ static_cast(my_offsetof(TABLE_LIST, algorithm)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("definer_user")}, -- my_offsetof(TABLE_LIST, definer.user), -+ static_cast(my_offsetof(TABLE_LIST, definer.user)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("definer_host")}, -- my_offsetof(TABLE_LIST, definer.host), -+ static_cast(my_offsetof(TABLE_LIST, definer.host)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("suid")}, -- my_offsetof(TABLE_LIST, view_suid), -+ static_cast(my_offsetof(TABLE_LIST, view_suid)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("with_check_option")}, -- my_offsetof(TABLE_LIST, with_check), -+ static_cast(my_offsetof(TABLE_LIST, with_check)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("timestamp")}, -- my_offsetof(TABLE_LIST, timestamp), -+ static_cast(my_offsetof(TABLE_LIST, timestamp)), - FILE_OPTIONS_TIMESTAMP}, - {{ C_STRING_WITH_LEN("create-version")}, -- my_offsetof(TABLE_LIST, file_version), -+ static_cast(my_offsetof(TABLE_LIST, file_version)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("source")}, -- my_offsetof(TABLE_LIST, source), -+ static_cast(my_offsetof(TABLE_LIST, source)), - FILE_OPTIONS_ESTRING}, - {{(char*) STRING_WITH_LEN("client_cs_name")}, -- my_offsetof(TABLE_LIST, view_client_cs_name), -+ static_cast(my_offsetof(TABLE_LIST, view_client_cs_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("connection_cl_name")}, -- my_offsetof(TABLE_LIST, view_connection_cl_name), -+ static_cast(my_offsetof(TABLE_LIST, view_connection_cl_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("view_body_utf8")}, -- my_offsetof(TABLE_LIST, view_body_utf8), -+ static_cast(my_offsetof(TABLE_LIST, view_body_utf8)), - FILE_OPTIONS_ESTRING}, - {{NullS, 0}, 0, - FILE_OPTIONS_STRING} diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile index d2085d2c84c..fcb447ff8a9 100644 --- a/databases/p5-MongoDB/Makefile +++ b/databases/p5-MongoDB/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MongoDB -PORTVERSION= 1.8.0 +PORTVERSION= 1.8.1 DISTVERSIONPREFIX= v CATEGORIES= databases perl5 MASTER_SITES= CPAN diff --git a/databases/p5-MongoDB/distinfo b/databases/p5-MongoDB/distinfo index 69022dfb981..1dbc782a0d6 100644 --- a/databases/p5-MongoDB/distinfo +++ b/databases/p5-MongoDB/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491898004 -SHA256 (MongoDB-v1.8.0.tar.gz) = 6772215b863baa685e23cda10492f536738d45281f7ae136d426d221b743b5fc -SIZE (MongoDB-v1.8.0.tar.gz) = 521237 +TIMESTAMP = 1516280989 +SHA256 (MongoDB-v1.8.1.tar.gz) = dbe30920ccbf261686c562f3dd66d93d2341f47e6aa71a284ed18d1e3974dfd8 +SIZE (MongoDB-v1.8.1.tar.gz) = 528885 diff --git a/databases/percona56-client/files/patch-sql-common_client.c b/databases/percona56-client/files/patch-sql-common_client.c new file mode 100644 index 00000000000..2a6f3fe1a37 --- /dev/null +++ b/databases/percona56-client/files/patch-sql-common_client.c @@ -0,0 +1,38 @@ +--- sql-common/client.c.orig 2018-01-17 11:39:51.315029000 +0000 ++++ sql-common/client.c 2018-01-17 11:44:53.493273000 +0000 +@@ -1884,7 +1884,7 @@ + *errptr= "Failed to get DNS name from SAN list item"; + DBUG_RETURN(1); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + cn= (const char *)ASN1_STRING_data(dns_name); + #else + cn= (const char *)ASN1_STRING_get0_data(dns_name); +@@ -1946,7 +1946,7 @@ + *errptr= "Invalid IP address embedded in the certificate SAN IP address"; + DBUG_RETURN(1); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ip= ASN1_STRING_data(ip_address); + #else + ip= ASN1_STRING_get0_data(ip_address); +@@ -2111,7 +2111,7 @@ + if(server_ip_address != NULL) + { + iplen= ASN1_STRING_length(server_ip_address); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address); + #else + ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address); +@@ -2163,7 +2163,7 @@ + goto error; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + cn= (const char *) ASN1_STRING_data(cn_asn1); + #else + cn= (const char *) ASN1_STRING_get0_data(cn_asn1); diff --git a/databases/percona56-client/files/patch-vio_viosslfactories.c b/databases/percona56-client/files/patch-vio_viosslfactories.c new file mode 100644 index 00000000000..267a2fd82d0 --- /dev/null +++ b/databases/percona56-client/files/patch-vio_viosslfactories.c @@ -0,0 +1,11 @@ +--- vio/viosslfactories.c.orig 2018-01-17 11:42:33.764076000 +0000 ++++ vio/viosslfactories.c 2018-01-17 11:43:21.072238000 +0000 +@@ -125,7 +125,7 @@ + { + BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); + BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER ) + dh->p= p; + dh->g= g; + if (! dh->p || ! dh->g) diff --git a/databases/percona56-server/files/patch-sql-common_client.c b/databases/percona56-server/files/patch-sql-common_client.c new file mode 100644 index 00000000000..2a6f3fe1a37 --- /dev/null +++ b/databases/percona56-server/files/patch-sql-common_client.c @@ -0,0 +1,38 @@ +--- sql-common/client.c.orig 2018-01-17 11:39:51.315029000 +0000 ++++ sql-common/client.c 2018-01-17 11:44:53.493273000 +0000 +@@ -1884,7 +1884,7 @@ + *errptr= "Failed to get DNS name from SAN list item"; + DBUG_RETURN(1); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + cn= (const char *)ASN1_STRING_data(dns_name); + #else + cn= (const char *)ASN1_STRING_get0_data(dns_name); +@@ -1946,7 +1946,7 @@ + *errptr= "Invalid IP address embedded in the certificate SAN IP address"; + DBUG_RETURN(1); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ip= ASN1_STRING_data(ip_address); + #else + ip= ASN1_STRING_get0_data(ip_address); +@@ -2111,7 +2111,7 @@ + if(server_ip_address != NULL) + { + iplen= ASN1_STRING_length(server_ip_address); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address); + #else + ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address); +@@ -2163,7 +2163,7 @@ + goto error; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + cn= (const char *) ASN1_STRING_data(cn_asn1); + #else + cn= (const char *) ASN1_STRING_get0_data(cn_asn1); diff --git a/databases/percona56-server/files/patch-vio_viosslfactories.c b/databases/percona56-server/files/patch-vio_viosslfactories.c new file mode 100644 index 00000000000..267a2fd82d0 --- /dev/null +++ b/databases/percona56-server/files/patch-vio_viosslfactories.c @@ -0,0 +1,11 @@ +--- vio/viosslfactories.c.orig 2018-01-17 11:42:33.764076000 +0000 ++++ vio/viosslfactories.c 2018-01-17 11:43:21.072238000 +0000 +@@ -125,7 +125,7 @@ + { + BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); + BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER ) + dh->p= p; + dh->g= g; + if (! dh->p || ! dh->g) diff --git a/devel/cpprestsdk/Makefile b/devel/cpprestsdk/Makefile index 6d8434675ba..1c5ec307aea 100644 --- a/devel/cpprestsdk/Makefile +++ b/devel/cpprestsdk/Makefile @@ -12,8 +12,6 @@ COMMENT= Microsoft C++ REST SDK LICENSE= MIT LICENSE_FILE= ${WRKSRC}/../license.txt -BROKEN= fails to build with boost 1.66, see bug 224093 - LIB_DEPENDS= libboost_system.so:devel/boost-libs USE_GITHUB= yes diff --git a/devel/cpprestsdk/files/patch-git_6b2e048001 b/devel/cpprestsdk/files/patch-git_6b2e048001 new file mode 100644 index 00000000000..b4add9d42c8 --- /dev/null +++ b/devel/cpprestsdk/files/patch-git_6b2e048001 @@ -0,0 +1,34 @@ +This fixes the build against Boost 1.66 + +In file included from src/websockets/client/ws_client_wspp.cpp:28: +In file included from libs/websocketpp/websocketpp/config/asio_client.hpp:32: +In file included from libs/websocketpp/websocketpp/transport/asio/endpoint.hpp:32: +libs/websocketpp/websocketpp/transport/asio/connection.hpp:425:24: error: no matching function for call to 'make_shared' + m_strand = lib::make_shared( + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/c++/v1/memory:4642:1: note: candidate template ignored: invalid explicitly-specified argument for template parameter '_Tp' +make_shared(_Args&& ...__args) +^ + +From 6b2e0480018530b616f61d5cdc786c92ba148bb7 Mon Sep 17 00:00:00 2001 +From: John Hruby +Date: Tue, 26 Dec 2017 16:52:13 +0100 +Subject: [PATCH] fixed strand + +--- + Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp +index 0be40f6b..395632c3 100644 +--- libs/websocketpp/websocketpp/transport/asio/connection.hpp ++++ libs/websocketpp/websocketpp/transport/asio/connection.hpp +@@ -422,7 +422,7 @@ class connection : public config::socket_type::socket_con_type { + m_io_service = io_service; + + if (config::enable_multithreading) { +- m_strand = lib::make_shared( ++ m_strand = lib::make_shared( + lib::ref(*io_service)); + + m_async_read_handler = m_strand->wrap(lib::bind( diff --git a/devel/elixir-lager_logger/files/patch-mix.exs b/devel/elixir-lager_logger/files/patch-mix.exs index 8063acfd1b9..4c2977a2e40 100644 --- a/devel/elixir-lager_logger/files/patch-mix.exs +++ b/devel/elixir-lager_logger/files/patch-mix.exs @@ -5,7 +5,7 @@ [app: :lager_logger, version: "1.0.4", - elixir: ">= 1.1.0 and < 1.5.0", -+ elixir: ">= 1.1.0 and < 1.6.0", ++ elixir: ">= 1.1.0 and < 1.7.0", package: package(), - description: description(), - deps: deps()] diff --git a/devel/elixir-tzdata/Makefile b/devel/elixir-tzdata/Makefile index d2565dc5f78..56744aa1a8f 100644 --- a/devel/elixir-tzdata/Makefile +++ b/devel/elixir-tzdata/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tzdata -PORTVERSION= 0.5.15 +PORTVERSION= 0.5.16 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-tzdata/distinfo b/devel/elixir-tzdata/distinfo index 74856c9d3a8..f42e2e84a53 100644 --- a/devel/elixir-tzdata/distinfo +++ b/devel/elixir-tzdata/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515403369 -SHA256 (lau-tzdata-v0.5.15_GH0.tar.gz) = 56a06065108ae745b04eb43ddb751b9ec2f70760d5ff6f53b9591f51b8fb0df3 -SIZE (lau-tzdata-v0.5.15_GH0.tar.gz) = 833263 +TIMESTAMP = 1516289426 +SHA256 (lau-tzdata-v0.5.16_GH0.tar.gz) = 5d8f93bfe7722dd674a7481608f6584e770590ca0e652d5b7bed8c1c304c8b2b +SIZE (lau-tzdata-v0.5.16_GH0.tar.gz) = 833296 diff --git a/devel/gcc-arm-embedded/Makefile b/devel/gcc-arm-embedded/Makefile index 6aed33258ff..8bbed6e2f22 100644 --- a/devel/gcc-arm-embedded/Makefile +++ b/devel/gcc-arm-embedded/Makefile @@ -2,7 +2,7 @@ PORTNAME= gcc-arm-embedded PORTVERSION= 7.2.20171218 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4/ DISTNAME= ${ORIGINAL_PACKAGE_NAME}-src diff --git a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_common_selftest.h b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_common_selftest.h new file mode 100644 index 00000000000..3e25550d5db --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_common_selftest.h @@ -0,0 +1,10 @@ +--- src/gdb/gdb/common/selftest.h.orig 2018-01-18 18:38:13.161295000 +0300 ++++ src/gdb/gdb/common/selftest.h 2018-01-18 18:38:29.032519000 +0300 +@@ -31,6 +31,7 @@ + + struct selftest + { ++ virtual ~selftest() {} + virtual void operator() () const = 0; + }; + diff --git a/devel/lfcbase/Makefile b/devel/lfcbase/Makefile index 2ce5246b061..e4b34050e95 100644 --- a/devel/lfcbase/Makefile +++ b/devel/lfcbase/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= lfcbase -PORTVERSION= 1.11.5 +PORTVERSION= 1.11.6 CATEGORIES= devel MASTER_SITES= http://www.lemke-it.com/ diff --git a/devel/lfcbase/distinfo b/devel/lfcbase/distinfo index 231b826f10c..dcd5b6d99c8 100644 --- a/devel/lfcbase/distinfo +++ b/devel/lfcbase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513797882 -SHA256 (lfcbase-1.11.5.tar.gz) = 95d91a75d309c3aab3bbbca29ac5b3c4689e2d343d3da7118e212b9269f34d07 -SIZE (lfcbase-1.11.5.tar.gz) = 639476 +TIMESTAMP = 1516294233 +SHA256 (lfcbase-1.11.6.tar.gz) = ac81ea65c02876a96ccb4e88717d5d1b5a52a3c43d38ca658f368870e157aa06 +SIZE (lfcbase-1.11.6.tar.gz) = 639449 diff --git a/devel/libfwnt/Makefile b/devel/libfwnt/Makefile index d661575e3bd..90dbabe3c13 100644 --- a/devel/libfwnt/Makefile +++ b/devel/libfwnt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libfwnt -PORTVERSION= 20170115 +PORTVERSION= 20180117 DISTVERSIONPREFIX= alpha- CATEGORIES= devel MASTER_SITES= https://github.com/libyal/libfwnt/releases/download/${PORTVERSION}/ \ @@ -14,23 +14,27 @@ COMMENT= Library for Windows NT data types LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= python${PYTHON2_DEFAULT}:lang/python${PYTHON2_DEFAULT:S/.//} \ + python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//} +RUN_DEPENDS= python${PYTHON2_DEFAULT}:lang/python${PYTHON2_DEFAULT:S/.//} \ + python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//} + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-python -USES= libtool pathfix python +CONFIGURE_ARGS= --enable-python2 --enable-python3 +CONFIGURE_ENV= PYTHON2_CONFIG=${LOCALBASE}/bin/python${PYTHON2_DEFAULT}-config \ + PYTHON3=${LOCALBASE}/bin/python${PYTHON3_DEFAULT} \ + PYTHON3_CONFIG=${LOCALBASE}/bin/python${PYTHON3_DEFAULT}-config +USES= libtool pathfix USE_LDCONFIG= yes INSTALL_TARGET= install-strip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +PLIST_SUB= PYTHON2_SITELIBDIR=lib/python${PYTHON2_DEFAULT}/site-packages \ + PYTHON3_SITELIBDIR=lib/python${PYTHON3_DEFAULT}/site-packages -OPTIONS_DEFINE= DOCS NLS +OPTIONS_DEFINE= NLS NLS_USES= gettext NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE} NLS_CONFIGURE_OFF= --disable-nls -PORTDOCS= AUTHORS ChangeLog - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - .include diff --git a/devel/libfwnt/distinfo b/devel/libfwnt/distinfo index a945360de7a..f13e9f8b6fe 100644 --- a/devel/libfwnt/distinfo +++ b/devel/libfwnt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484548573 -SHA256 (libfwnt-alpha-20170115.tar.gz) = 010990789656a4a17537a68d625e5ba1f7243dffe4d1b993a64f10036fd40de1 -SIZE (libfwnt-alpha-20170115.tar.gz) = 696120 +TIMESTAMP = 1516286616 +SHA256 (libfwnt-alpha-20180117.tar.gz) = d968bbbf900b5dbd8a19458986967b7e4715fe6019b6c85a57ae3a962c138096 +SIZE (libfwnt-alpha-20180117.tar.gz) = 695519 diff --git a/devel/libfwnt/pkg-plist b/devel/libfwnt/pkg-plist index b61a5cea6fa..2de8cf85806 100644 --- a/devel/libfwnt/pkg-plist +++ b/devel/libfwnt/pkg-plist @@ -8,7 +8,9 @@ lib/libfwnt.a lib/libfwnt.so lib/libfwnt.so.1 lib/libfwnt.so.1.0.0 -%%PYTHON_SITELIBDIR%%/pyfwnt.a -%%PYTHON_SITELIBDIR%%/pyfwnt.so +%%PYTHON2_SITELIBDIR%%/pyfwnt.a +%%PYTHON2_SITELIBDIR%%/pyfwnt.so +%%PYTHON3_SITELIBDIR%%/pyfwnt.a +%%PYTHON3_SITELIBDIR%%/pyfwnt.so libdata/pkgconfig/libfwnt.pc man/man3/libfwnt.3.gz diff --git a/devel/mdb/Makefile b/devel/mdb/Makefile index 2b22a269a1d..f553abb95b2 100644 --- a/devel/mdb/Makefile +++ b/devel/mdb/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mdb -PORTVERSION= 0.1 +PORTVERSION= 0.2 CATEGORIES= devel MAINTAINER= jhb@FreeBSD.org @@ -14,7 +14,7 @@ USES= uidfix USE_GITHUB= yes GH_ACCOUNT= bsdjhb GH_PROJECT= illumos-gate -GH_TAGNAME= b8a73a7590 +GH_TAGNAME= 291c37a43d ONLY_FOR_ARCHS= amd64 diff --git a/devel/mdb/distinfo b/devel/mdb/distinfo index 68981bbeb3e..1f102386b7a 100644 --- a/devel/mdb/distinfo +++ b/devel/mdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500586203 -SHA256 (bsdjhb-illumos-gate-0.1-b8a73a7590_GH0.tar.gz) = 6fe907ac8c107400ccf68ed4dc240b35361e14e18ddac571e554c261d46f758c -SIZE (bsdjhb-illumos-gate-0.1-b8a73a7590_GH0.tar.gz) = 115104723 +TIMESTAMP = 1516319136 +SHA256 (bsdjhb-illumos-gate-0.2-291c37a43d_GH0.tar.gz) = e155a771d37a1e597cd783f4977734361c18b89456947a5a6ce44e5d2faf087f +SIZE (bsdjhb-illumos-gate-0.2-291c37a43d_GH0.tar.gz) = 115105258 diff --git a/devel/p5-PkgConfig-LibPkgConf/Makefile b/devel/p5-PkgConfig-LibPkgConf/Makefile index 4b891e0d45e..48b6d8edde1 100644 --- a/devel/p5-PkgConfig-LibPkgConf/Makefile +++ b/devel/p5-PkgConfig-LibPkgConf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= PkgConfig-LibPkgConf -PORTVERSION= 0.07 +PORTVERSION= 0.08 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:PLICEASE @@ -15,7 +15,7 @@ LICENSE= ART10 GPLv1 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= pkgconf>=1.3.0:devel/pkgconf +BUILD_DEPENDS= pkgconf>=1.3.90:devel/pkgconf LIB_DEPENDS= libpkgconf.so:devel/pkgconf CFLAGS+= -I${LOCALBASE}/include/pkgconf diff --git a/devel/p5-PkgConfig-LibPkgConf/distinfo b/devel/p5-PkgConfig-LibPkgConf/distinfo index a1a9540ff8f..2102de8e6cb 100644 --- a/devel/p5-PkgConfig-LibPkgConf/distinfo +++ b/devel/p5-PkgConfig-LibPkgConf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514410141 -SHA256 (PkgConfig-LibPkgConf-0.07.tar.gz) = aa82677cb3097d804a52fbb5578cfac0d8bb75a5328410b69af3ed8a11242afb -SIZE (PkgConfig-LibPkgConf-0.07.tar.gz) = 26692 +TIMESTAMP = 1516297294 +SHA256 (PkgConfig-LibPkgConf-0.08.tar.gz) = 0ec629deefa0c12c6df7bd621862ada9a40fa70ce33629986e5e4691268a0fea +SIZE (PkgConfig-LibPkgConf-0.08.tar.gz) = 26307 diff --git a/devel/pecl-grpc/Makefile b/devel/pecl-grpc/Makefile index 4ce792dd92c..b092c2d301e 100644 --- a/devel/pecl-grpc/Makefile +++ b/devel/pecl-grpc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.8.0 +PORTVERSION= 1.8.3 CATEGORIES= devel net MAINTAINER= vanilla@FreeBSD.org diff --git a/devel/pecl-grpc/distinfo b/devel/pecl-grpc/distinfo index 35354f5905a..350aeb52dff 100644 --- a/devel/pecl-grpc/distinfo +++ b/devel/pecl-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513349287 -SHA256 (PECL/grpc-1.8.0.tgz) = cec11452d2938da8d7c5a5b11bc7df6c11469ece18c0954fd12edd34a3321dab -SIZE (PECL/grpc-1.8.0.tgz) = 2304860 +TIMESTAMP = 1516288477 +SHA256 (PECL/grpc-1.8.3.tgz) = f115b9dd4d0156eabe795ec493271bd33775bb388e90677535a6d21eb63aa842 +SIZE (PECL/grpc-1.8.3.tgz) = 2304400 diff --git a/devel/py-coloredlogs/Makefile b/devel/py-coloredlogs/Makefile index 0f5ee109fe0..0797bbb419d 100644 --- a/devel/py-coloredlogs/Makefile +++ b/devel/py-coloredlogs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= coloredlogs -PORTVERSION= 8.0 +PORTVERSION= 9.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ COMMENT= Colored terminal output for Python logging module LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=3.7:textproc/py-humanfriendly@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=4.7:textproc/py-humanfriendly@${FLAVOR} NO_ARCH= yes USES= python diff --git a/devel/py-coloredlogs/distinfo b/devel/py-coloredlogs/distinfo index 71e74543878..fb46cd662c6 100644 --- a/devel/py-coloredlogs/distinfo +++ b/devel/py-coloredlogs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515425025 -SHA256 (coloredlogs-8.0.tar.gz) = 2701dc90cada3a78afe4d7b5245026c355e083ca248f6a8a13696b2c6e0ddb16 -SIZE (coloredlogs-8.0.tar.gz) = 289746 +TIMESTAMP = 1516281042 +SHA256 (coloredlogs-9.0.tar.gz) = e3b19320bd21bde506444601a71397cf5215f040df06503013697c6261b05de9 +SIZE (coloredlogs-9.0.tar.gz) = 261750 diff --git a/devel/py-ipykernel/Makefile b/devel/py-ipykernel/Makefile index 028da1b64f8..549d41b04ac 100644 --- a/devel/py-ipykernel/Makefile +++ b/devel/py-ipykernel/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ipykernel -PORTVERSION= 4.7.0 +PORTVERSION= 4.8.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ipykernel/distinfo b/devel/py-ipykernel/distinfo index 9650e94cf05..09251fb4efc 100644 --- a/devel/py-ipykernel/distinfo +++ b/devel/py-ipykernel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512745188 -SHA256 (ipykernel-4.7.0.tar.gz) = 354986612a38f0555c43d5af2425e2a67506b63b313a0325e38904003b9d977b -SIZE (ipykernel-4.7.0.tar.gz) = 92549 +TIMESTAMP = 1516281067 +SHA256 (ipykernel-4.8.0.tar.gz) = dedc199df6a38725c732986dfa606c245fb8fe0fe999b33a0c305b73d80c6774 +SIZE (ipykernel-4.8.0.tar.gz) = 95005 diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile index 066c7bc7d0b..98e929e5249 100644 --- a/devel/py-urwid/Makefile +++ b/devel/py-urwid/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= urwid -PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-urwid/distinfo b/devel/py-urwid/distinfo index b2d76a376f2..224c7548c0c 100644 --- a/devel/py-urwid/distinfo +++ b/devel/py-urwid/distinfo @@ -1,2 +1,3 @@ -SHA256 (urwid-1.3.1.tar.gz) = cfcec03e36de25a1073e2e35c2c7b0cc6969b85745715c3a025a31d9786896a1 -SIZE (urwid-1.3.1.tar.gz) = 588549 +TIMESTAMP = 1516281099 +SHA256 (urwid-2.0.0.tar.gz) = 2ec42d29cd173a7126817174468614a17bcd9bafc0bdd47918f4e473301b4761 +SIZE (urwid-2.0.0.tar.gz) = 603825 diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index 0b469e2967c..148f8df3ff9 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.10.119 +DISTVERSION= 2.10.120 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index 7b1ebad026d..a74cd82f232 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516191403 -SHA256 (rubygem/aws-sdk-core-2.10.119.gem) = ff56d904974a18c7abdb672b83e197a9096222d1a848e901486996bb0d7210de -SIZE (rubygem/aws-sdk-core-2.10.119.gem) = 1191424 +TIMESTAMP = 1516281165 +SHA256 (rubygem/aws-sdk-core-2.10.120.gem) = 15c97742623cd88039e7cb4487f86acd83ea90a9c680b8e9933b44c98d182202 +SIZE (rubygem/aws-sdk-core-2.10.120.gem) = 1191424 diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index 6265a7c2ac9..0e4bda19286 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.10.119 +DISTVERSION= 2.10.120 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index 8ee54acb2de..51640b26b38 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516191411 -SHA256 (rubygem/aws-sdk-resources-2.10.119.gem) = 194d6826ee5e84a34e1a5a740654f9fe7a02bec33c4f44a729e8db2ec5a045e0 -SIZE (rubygem/aws-sdk-resources-2.10.119.gem) = 48640 +TIMESTAMP = 1516281177 +SHA256 (rubygem/aws-sdk-resources-2.10.120.gem) = 29808b87693716bc5328076b9dfdc36a300fdf24408d24cdf19817b858c8aa4e +SIZE (rubygem/aws-sdk-resources-2.10.120.gem) = 48640 diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index 7a3aba6ef8b..e980da9cfeb 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.10.119 +DISTVERSION= 2.10.120 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index f078d2de587..ab887c37c47 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516191419 -SHA256 (rubygem/aws-sdk-2.10.119.gem) = aa30484c6b9ca293d707a47947d6e927208b8dd5d3f8b8164a2e9b31afb682d4 -SIZE (rubygem/aws-sdk-2.10.119.gem) = 4608 +TIMESTAMP = 1516281190 +SHA256 (rubygem/aws-sdk-2.10.120.gem) = 4e5593cf98dcd8fc68a0007ff5da439f51824917c36ec4ad00129f1e2956b091 +SIZE (rubygem/aws-sdk-2.10.120.gem) = 4608 diff --git a/devel/rubygem-bson/Makefile b/devel/rubygem-bson/Makefile index c3157ff06a8..1d39ceecf33 100644 --- a/devel/rubygem-bson/Makefile +++ b/devel/rubygem-bson/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bson -PORTVERSION= 4.2.2 +PORTVERSION= 4.3.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-bson/distinfo b/devel/rubygem-bson/distinfo index 7bc121faba2..6346e15cd80 100644 --- a/devel/rubygem-bson/distinfo +++ b/devel/rubygem-bson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499142326 -SHA256 (rubygem/bson-4.2.2.gem) = 860f4d888aafd11ae4120023a2796c783054c8b4cfffc2696e766af4b3595285 -SIZE (rubygem/bson-4.2.2.gem) = 80896 +TIMESTAMP = 1516281203 +SHA256 (rubygem/bson-4.3.0.gem) = ca0a6fd3614888fb255f219ce0cc81915f86e55401c2b3b57b6565d4b2ec6a1d +SIZE (rubygem/bson-4.3.0.gem) = 87552 diff --git a/devel/rubygem-jasmine-core/Makefile b/devel/rubygem-jasmine-core/Makefile index 695fb987665..a0d206ba1b8 100644 --- a/devel/rubygem-jasmine-core/Makefile +++ b/devel/rubygem-jasmine-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jasmine-core -PORTVERSION= 2.8.0 +PORTVERSION= 2.9.0 CATEGORIES= devel ruby MASTER_SITES= RG diff --git a/devel/rubygem-jasmine-core/distinfo b/devel/rubygem-jasmine-core/distinfo index ad3bfdc1741..02ec201bc50 100644 --- a/devel/rubygem-jasmine-core/distinfo +++ b/devel/rubygem-jasmine-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503678480 -SHA256 (rubygem/jasmine-core-2.8.0.gem) = e148f4b054a2265ed80746b0ab0dcb2c5554d7a100171f460f404848c041f3a4 -SIZE (rubygem/jasmine-core-2.8.0.gem) = 118272 +TIMESTAMP = 1516281217 +SHA256 (rubygem/jasmine-core-2.9.0.gem) = 34026320f521ce66b2774fda3611ba9bdf472c3d3380c4cf06ced6045aa8c7e8 +SIZE (rubygem/jasmine-core-2.9.0.gem) = 121856 diff --git a/devel/rubygem-mongo/Makefile b/devel/rubygem-mongo/Makefile index 76ffd2f9757..f0900a35b18 100644 --- a/devel/rubygem-mongo/Makefile +++ b/devel/rubygem-mongo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mongo -PORTVERSION= 2.4.3 +PORTVERSION= 2.5.0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,7 +12,7 @@ COMMENT= Ruby driver for MongoDB LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-bson>=${PORTVERSION}:devel/rubygem-bson +RUN_DEPENDS= rubygem-bson>=4.3.0:devel/rubygem-bson NO_ARCH= yes USE_RUBY= yes diff --git a/devel/rubygem-mongo/distinfo b/devel/rubygem-mongo/distinfo index 5f6553d2705..68860f89fbd 100644 --- a/devel/rubygem-mongo/distinfo +++ b/devel/rubygem-mongo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500990068 -SHA256 (rubygem/mongo-2.4.3.gem) = 9101d1ad2d75cce8a6120ef20db1e02f0cf147394020ce9550c8a698e376e3d1 -SIZE (rubygem/mongo-2.4.3.gem) = 287232 +TIMESTAMP = 1516281242 +SHA256 (rubygem/mongo-2.5.0.gem) = b367f69e3fd6df97aca119ce7c82157c21caba384ace72213fd196097fd75b6f +SIZE (rubygem/mongo-2.5.0.gem) = 337920 diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile index 71d6f4c99a9..60207447b39 100644 --- a/devel/tbb/Makefile +++ b/devel/tbb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tbb -PORTVERSION= 2018 +PORTVERSION= 2018.2 CATEGORIES= devel MAINTAINER= martymac@FreeBSD.org @@ -10,6 +10,11 @@ COMMENT= Library that provides thread building blocks LICENSE= APACHE20 +ONLY_FOR_ARCHS= amd64 armv6 i386 +ONLY_FOR_ARCHS_REASON= has not been ported to this platform + +USES= compiler gmake tar:tgz + USE_GITHUB= yes GH_ACCOUNT= 01org GH_TAGNAME= ${PORTVERSION:S/./_U/} @@ -23,11 +28,7 @@ SUB_LIST= prefix="${PREFIX}" \ OPTIONS_DEFINE= DOCS PORTDOCS= * -ONLY_FOR_ARCHS= amd64 armv6 i386 -ONLY_FOR_ARCHS_REASON= has not been ported to this platform - USE_LDCONFIG= yes -USES= compiler gmake tar:tgz ALL_TARGET= default CC_BASENAME= ${CC:C,^.*/,,} diff --git a/devel/tbb/distinfo b/devel/tbb/distinfo index 5d05a9f5657..ba5038ab256 100644 --- a/devel/tbb/distinfo +++ b/devel/tbb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505454798 -SHA256 (01org-tbb-2018_GH0.tar.gz) = 94f643f1edfaccb57d64b503c7c96f00dec64e8635c054bbaa33855d72c5822d -SIZE (01org-tbb-2018_GH0.tar.gz) = 2889943 +TIMESTAMP = 1515705707 +SHA256 (01org-tbb-2018.2-2018_U2_GH0.tar.gz) = 78bb9bae474736d213342f01fe1a6d00c6939d5c75b367e2e43e7bf29a6d8eca +SIZE (01org-tbb-2018.2-2018_U2_GH0.tar.gz) = 2905393 diff --git a/devel/tbb/pkg-plist b/devel/tbb/pkg-plist index 126fe23c7bc..b82a15cebfb 100644 --- a/devel/tbb/pkg-plist +++ b/devel/tbb/pkg-plist @@ -29,6 +29,8 @@ include/tbb/internal/_aggregator_impl.h include/tbb/internal/_concurrent_queue_impl.h include/tbb/internal/_concurrent_unordered_impl.h include/tbb/internal/_flow_graph_async_msg_impl.h +include/tbb/internal/_flow_graph_body_impl.h +include/tbb/internal/_flow_graph_cache_impl.h include/tbb/internal/_flow_graph_impl.h include/tbb/internal/_flow_graph_indexer_impl.h include/tbb/internal/_flow_graph_item_buffer_impl.h @@ -42,6 +44,7 @@ include/tbb/internal/_mutex_padding.h include/tbb/internal/_range_iterator.h include/tbb/internal/_tbb_hash_compare_impl.h include/tbb/internal/_tbb_strings.h +include/tbb/internal/_tbb_trace_impl.h include/tbb/internal/_tbb_windef.h include/tbb/internal/_template_helpers.h include/tbb/internal/_x86_eliding_mutex_impl.h diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 6a26a997e00..507df3af985 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} PORTREVISION= 0 .else # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= LOCAL/mat/bind diff --git a/dns/bind9-devel/files/named.root b/dns/bind9-devel/files/named.root index 70d2d9f7d35..8e3bac373eb 100644 --- a/dns/bind9-devel/files/named.root +++ b/dns/bind9-devel/files/named.root @@ -2,92 +2,92 @@ ; $FreeBSD$ ; -; This file holds the information on root name servers needed to +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; +; configuration file of BIND domain name servers). +; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.cache +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET -; -; last update: April 11, 2017 -; related version of root zone: 2017041101 -; -; formerly NS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET ; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 -; -; FORMERLY NS1.ISI.EDU +; +; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b -; -; FORMERLY C.PSI.NET +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c -; -; FORMERLY TERP.UMD.EDU +; +; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 -; +; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile index c995beec0bc..529d4fb1a4e 100644 --- a/dns/bind910/Makefile +++ b/dns/bind910/Makefile @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 910 diff --git a/dns/bind910/files/named.root b/dns/bind910/files/named.root index 70d2d9f7d35..8e3bac373eb 100644 --- a/dns/bind910/files/named.root +++ b/dns/bind910/files/named.root @@ -2,92 +2,92 @@ ; $FreeBSD$ ; -; This file holds the information on root name servers needed to +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; +; configuration file of BIND domain name servers). +; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.cache +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET -; -; last update: April 11, 2017 -; related version of root zone: 2017041101 -; -; formerly NS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET ; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 -; -; FORMERLY NS1.ISI.EDU +; +; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b -; -; FORMERLY C.PSI.NET +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c -; -; FORMERLY TERP.UMD.EDU +; +; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 -; +; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. diff --git a/dns/bind912/Makefile b/dns/bind912/Makefile index 3fb7cd19c46..c3dea7eee4d 100644 --- a/dns/bind912/Makefile +++ b/dns/bind912/Makefile @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} PORTREVISION= 0 .else # dns/bind912 here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} diff --git a/dns/bind912/files/named.root b/dns/bind912/files/named.root index 70d2d9f7d35..8e3bac373eb 100644 --- a/dns/bind912/files/named.root +++ b/dns/bind912/files/named.root @@ -2,92 +2,92 @@ ; $FreeBSD$ ; -; This file holds the information on root name servers needed to +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; +; configuration file of BIND domain name servers). +; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.cache +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET -; -; last update: April 11, 2017 -; related version of root zone: 2017041101 -; -; formerly NS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET ; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 -; -; FORMERLY NS1.ISI.EDU +; +; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b -; -; FORMERLY C.PSI.NET +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c -; -; FORMERLY TERP.UMD.EDU +; +; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 -; +; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index d959bc709e5..85a948142ef 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 diff --git a/dns/bind99/files/named.root b/dns/bind99/files/named.root index 70d2d9f7d35..8e3bac373eb 100644 --- a/dns/bind99/files/named.root +++ b/dns/bind99/files/named.root @@ -2,92 +2,92 @@ ; $FreeBSD$ ; -; This file holds the information on root name servers needed to +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; +; configuration file of BIND domain name servers). +; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.cache +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET -; -; last update: April 11, 2017 -; related version of root zone: 2017041101 -; -; formerly NS.INTERNIC.NET +; +; last update: November 16, 2017 +; related version of root zone: 2017111601 +; +; FORMERLY NS.INTERNIC.NET ; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 -; -; FORMERLY NS1.ISI.EDU +; +; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b -; -; FORMERLY C.PSI.NET +B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +; +; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c -; -; FORMERLY TERP.UMD.EDU +; +; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 -; +; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. diff --git a/editors/codelite/files/patch-sdk_codelite__cppcheck_CMakeLists.txt b/editors/codelite/files/patch-sdk_codelite__cppcheck_CMakeLists.txt new file mode 100644 index 00000000000..33ec9aaf736 --- /dev/null +++ b/editors/codelite/files/patch-sdk_codelite__cppcheck_CMakeLists.txt @@ -0,0 +1,14 @@ +--- sdk/codelite_cppcheck/CMakeLists.txt.orig 2018-01-17 21:37:24 UTC ++++ sdk/codelite_cppcheck/CMakeLists.txt +@@ -5,8 +5,10 @@ cmake_minimum_required(VERSION 2.6.2) + # visual studio, and in our makefiles. + project(codelitegcc) + ++set (CMAKE_INCLUDE_DIRECTORIES ON) ++ + # Include paths +-include_directories("${CL_SRC_ROOT}/sdk/codelite_cppcheck/lib" "${CL_SRC_ROOT}/sdk/codelite_cppcheck/cli") ++include_directories(BEFORE "${CL_SRC_ROOT}/sdk/codelite_cppcheck/lib" "${CL_SRC_ROOT}/sdk/codelite_cppcheck/cli") + + set( ADDITIONAL_LIBRARIES "" ) + diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index eac87ce875e..cde745d9e89 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -450,6 +450,9 @@ do-build: fi ; \ cd ${WRKSRC}/instsetoo_native ; \ . ../${FREEBSD_ENV_SET} ; \ + if [ -n "${HOME}" -a ! -w "${HOME}" ]; then \ + export HOME=/tmp ; \ + fi ; \ build.pl --all -P$${numproc} -- -P$${dmproc} do-install: diff --git a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk new file mode 100644 index 00000000000..acee2d1a51e --- /dev/null +++ b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk @@ -0,0 +1,10 @@ +--- solenv/gbuild/platform/freebsd.mk.orig 2017-11-27 13:50:25 UTC ++++ solenv/gbuild/platform/freebsd.mk +@@ -94,6 +94,7 @@ gb_CXXFLAGS := \ + -fno-use-cxa-atexit \ + -fvisibility-inlines-hidden \ + -fvisibility=hidden \ ++ -std=gnu++98 \ + -pipe + ifeq ($(COM),CLANG) + gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH diff --git a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk new file mode 100644 index 00000000000..f91d88004b2 --- /dev/null +++ b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk @@ -0,0 +1,11 @@ +--- solenv/inc/unxfbsd.mk.orig 2017-11-27 13:50:28 UTC ++++ solenv/inc/unxfbsd.mk +@@ -96,7 +96,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs + CFLAGS_NO_EXCEPTIONS=-fno-exceptions + + # -fpermissive should be removed as soon as possible +-CFLAGSCXX= -pipe $(ARCH_FLAGS) ++CFLAGSCXX= -pipe $(ARCH_FLAGS) -std=gnu++98 + .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + CFLAGSCXX += -fvisibility-inlines-hidden + .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp new file mode 100644 index 00000000000..928bf1fdac5 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp @@ -0,0 +1,11 @@ +--- src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp.orig 2018-01-15 14:56:07 UTC ++++ src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp +@@ -302,7 +302,7 @@ RTDECL(int) RTErrConvertFromErrno(unsigned uNativeCod + case EILSEQ: return VERR_NO_TRANSLATION; + #endif + #ifdef ERESTART +- case ERESTART: return VERR_INTERRUPTED;/** @todo fix duplicate error?*/ ++ case (unsigned)ERESTART: return VERR_INTERRUPTED;/** @todo fix duplicate error?*/ + #endif + #ifdef ESTRPIPE + //case ESTRPIPE 86 /* Streams pipe error */ diff --git a/french/wordpress/Makefile b/french/wordpress/Makefile index aa663d73842..541e63ec786 100644 --- a/french/wordpress/Makefile +++ b/french/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 DISTVERSIONSUFFIX= -fr_FR PORTEPOCH= 1 CATEGORIES= french www diff --git a/french/wordpress/distinfo b/french/wordpress/distinfo index adb866e6ada..5fdd31ff6c8 100644 --- a/french/wordpress/distinfo +++ b/french/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203685 -SHA256 (wordpress-4.9.1-fr_FR.tar.gz) = 981e36d4d9aff1f67f49f78ee904f1ac7e2f1d0e5e12bfa1dd219c0ebb2f09cb -SIZE (wordpress-4.9.1-fr_FR.tar.gz) = 10147920 +TIMESTAMP = 1516345612 +SHA256 (wordpress-4.9.2-fr_FR.tar.gz) = ca78c1aad69db1ab0dbcaeff82a9505c311554776ef98d056fe9e9ad4ef10a23 +SIZE (wordpress-4.9.2-fr_FR.tar.gz) = 9307544 diff --git a/games/balazar/Makefile b/games/balazar/Makefile index 61acf0db9c0..ff734f85b5c 100644 --- a/games/balazar/Makefile +++ b/games/balazar/Makefile @@ -22,9 +22,6 @@ RUN_DEPENDS= soya_editor:graphics/py-soya3d@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} -BROKEN= fails to package: pkg-static: py27-twisted-17.5.0_1 conflicts with py27-twistedCore-15.2.1 (installs files into the same place) -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2018-01-27 NO_ARCH= yes USES= gettext python:2.7 tar:bzip2 diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile index 3cb5c2fb6fe..08bbda4dd89 100644 --- a/games/eduke32/Makefile +++ b/games/eduke32/Makefile @@ -29,7 +29,6 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ libpng.so:graphics/png BROKEN_aarch64= fails to compile: polymost.cpp:2403:18: non-constant-expression cannot be narrowed from type 'long' to 'int32_t' (aka 'int') in initializer list -BROKEN_sparc64= fails to compile USES= gmake pkgconfig tar:xz USE_GL= gl glu @@ -48,6 +47,8 @@ PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES GCC HRP OFFENSIVE SHAREWARE VOXEL OPTIONS_DEFINE_i386= ASM OPTIONS_DEFAULT_i386= ASM +OPTIONS_DEFAULT_powerpc= GCC +OPTIONS_DEFAULT_sparc64= GCC ASM_BUILD_DEPENDS= nasm:devel/nasm ASM_MAKE_ARGS_OFF= NOASM=1 diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile index 4200b3a058a..4d4e912cb0e 100644 --- a/games/netpanzer/Makefile +++ b/games/netpanzer/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= netpanzer -PORTVERSION= 0.8.4 -PORTREVISION= 4 +PORTVERSION= 0.8.7 +DISTVERSIONSUFFIX= -source CATEGORIES= games -MASTER_SITES= LOCAL/madpilot/netpanzer +MASTER_SITES= http://www.netpanzer.info/Download/NetPanzer/Releases/${PORTVERSION}/ MAINTAINER= madpilot@FreeBSD.org COMMENT= Real time, isometric view, tank multiplayer strategy game @@ -14,11 +14,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING LDFLAGS+= -lpthreads -USES= scons tar:bzip2 +USES= scons zip USE_SDL= sdl mixer image USE_GNOME= libxml2 -SCONS_ARGS+= datadir="${DATADIR}" -SCONS_BUILDENV= ${SCONS_ENV} +MAKE_ARGS+= datadir="${DATADIR}" +NO_WRKSUBDIR= yes + +PLIST_FILES= bin/netpanzer \ + share/applications/netpanzer.desktop \ + share/pixmaps/netpanzer.png \ + share/pixmaps/netpanzer.xpm PORTDOCS= * PORTDATA= * @@ -29,13 +34,15 @@ post-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/netpanzer ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} "cache maps pics powerups scripts sound units wads" ${STAGEDIR}${DATADIR}) - ${INSTALL_MAN} ${WRKSRC}/docs/netpanzer.6 ${STAGEDIR}${MANPREFIX}/man/man6 - ${INSTALL_DATA} ${WRKSRC}/netpanzer.desktop ${STAGEDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/netpanzer.png ${WRKSRC}/netpanzer.xpm ${STAGEDIR}${PREFIX}/share/pixmaps + (cd ${WRKSRC} && ${COPYTREE_SHARE} "cache maps pics powerups scripts sound units wads" \ + ${STAGEDIR}${DATADIR}) + ${INSTALL_DATA} ${WRKSRC}/support/win32/netpanzer.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/netpanzer.png ${WRKSRC}/support/icon/netpanzer.xpm \ + ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} COPYING ChangeLog README RELNOTES TODO ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC}/docs && ${INSTALL_DATA} Doxyfile code-notes.txt coding.txt serverhowto.html tipofday.txt ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} COPYING README ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/docs && ${INSTALL_DATA} code-notes.txt coding.txt old/serverhowto.html \ + ${STAGEDIR}${DOCSDIR}) do-fetch-svn: svn export svn://svn.berlios.de/${PORTNAME}/tags/${PORTNAME}/${PORTVERSION} ${PORTNAME}-${PORTVERSION} diff --git a/games/netpanzer/distinfo b/games/netpanzer/distinfo index 037452969df..0b7f77bf3ba 100644 --- a/games/netpanzer/distinfo +++ b/games/netpanzer/distinfo @@ -1,2 +1,3 @@ -SHA256 (netpanzer-0.8.4.tar.bz2) = 96ee69fbe0f84cd46647e35f0983c9ef8869ad2f2b9e244a82d34d8ea6279712 -SIZE (netpanzer-0.8.4.tar.bz2) = 11731818 +TIMESTAMP = 1516265645 +SHA256 (netpanzer-0.8.7-source.zip) = 90e2b78d43cc32fb3f6af027788162dc9d272941f9630b43fc34f203a55c86a7 +SIZE (netpanzer-0.8.7-source.zip) = 13466285 diff --git a/games/netpanzer/files/patch-SConstruct b/games/netpanzer/files/patch-SConstruct index 5e2f83c7bce..a4bf784e5ad 100644 --- a/games/netpanzer/files/patch-SConstruct +++ b/games/netpanzer/files/patch-SConstruct @@ -1,19 +1,19 @@ ---- SConstruct.orig 2011-12-22 19:32:06.000000000 +0100 -+++ SConstruct 2012-04-24 23:49:38.000000000 +0200 -@@ -69,7 +69,7 @@ - ('crossmingwsdlconfig','sets the sdl-config full path for mingw cross compiler', 'sdl-config') +--- SConstruct.orig 2016-04-09 13:14:00 UTC ++++ SConstruct +@@ -95,7 +95,7 @@ opts.AddVariables( + ('compilerprefix', 'sets the prefix for the cross linux compiler, example: i686-pc-linux-gnu-', ''), ) -env = Environment(ENV = os.environ, options = opts) +env = Environment(ENV = os.environ, options = opts, CC = os.environ['CC'], CXX = os.environ['CXX']) Help(opts.GenerateHelpText(env)) - ################################################################ -@@ -240,6 +240,7 @@ - SetupSpawn(env) + env.Append( CCFLAGS = [ '-DPACKAGE_VERSION=\\"' + NPVERSION + '\\"' ] ) +@@ -202,6 +202,7 @@ elif thisplatform == 'win32': else: + networkenv.ParseConfig(env['sdlconfig'] + ' --cflags --libs') env.ParseConfig(env['sdlconfig'] + ' --cflags --libs') + env.Append( _LIBFLAGS = [ '-L%%LOCALBASE%%/lib' ] ) - env.Append( NPLIBS = [ 'SDL_mixer' ] ) - - # for crossmingw platform + # note: for some magic reason, now doesn't need to put the full path for + # SDL_mixer when using mingw crosscompilation + env.Append( LIBS = ['SDL_mixer' ] ) diff --git a/games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp b/games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp deleted file mode 100644 index 4063a78da49..00000000000 --- a/games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Lib/ArrayUtil/QueueTemplate.hpp.orig 2012-04-24 23:51:05.000000000 +0200 -+++ src/Lib/ArrayUtil/QueueTemplate.hpp 2012-04-24 23:51:15.000000000 +0200 -@@ -42,7 +42,7 @@ - - bool enqueue(const TYPE& object ) - { -- add( object, (rear + 1) % this->size ); -+ this->add( object, (rear + 1) % this->size ); - rear = (rear + 1) % this->size; - - if ( front == rear ) diff --git a/games/netpanzer/files/patch-src_Lib_Network_Address.hpp b/games/netpanzer/files/patch-src_Lib_Network_Address.hpp index 28e7e1810bc..64e303d095c 100644 --- a/games/netpanzer/files/patch-src_Lib_Network_Address.hpp +++ b/games/netpanzer/files/patch-src_Lib_Network_Address.hpp @@ -1,6 +1,6 @@ ---- src/Lib/Network/Address.hpp.orig 2010-01-19 17:08:17.000000000 +0100 -+++ src/Lib/Network/Address.hpp 2012-04-20 17:34:26.306480287 +0200 -@@ -47,7 +47,7 @@ +--- src/Lib/Network/Address.hpp.orig 2016-04-09 13:14:00 UTC ++++ src/Lib/Network/Address.hpp +@@ -62,7 +62,7 @@ class Address (public) struct sockaddr * getSockaddr() const { return (struct sockaddr *)&ss; }; socklen_t getSockaddrLen() const { diff --git a/games/netpanzer/files/patch-src_Lib_Network_SocketBase.cpp b/games/netpanzer/files/patch-src_Lib_Network_SocketBase.cpp new file mode 100644 index 00000000000..e73e49b5f30 --- /dev/null +++ b/games/netpanzer/files/patch-src_Lib_Network_SocketBase.cpp @@ -0,0 +1,11 @@ +--- src/Lib/Network/SocketBase.cpp.orig 2016-04-09 13:14:00 UTC ++++ src/Lib/Network/SocketBase.cpp +@@ -147,7 +147,7 @@ SocketBase::bindSocketTo(const Address& toaddr) throw( + { + if ( state == CONFIGURED ) + { +- int res = bind(sockfd, toaddr.getSockaddr(), toaddr.getSockaddrLen()); ++ int res = ::bind(sockfd, toaddr.getSockaddr(), toaddr.getSockaddrLen()); + if(res == SOCKET_ERROR) { + lastError = GET_NET_ERROR(); + doClose(); diff --git a/games/netpanzer/files/patch-src_Lib_optionmm_command_line.hpp b/games/netpanzer/files/patch-src_Lib_optionmm_command__line.hpp similarity index 64% rename from games/netpanzer/files/patch-src_Lib_optionmm_command_line.hpp rename to games/netpanzer/files/patch-src_Lib_optionmm_command__line.hpp index f61f3f3041c..f3fd7b70465 100644 --- a/games/netpanzer/files/patch-src_Lib_optionmm_command_line.hpp +++ b/games/netpanzer/files/patch-src_Lib_optionmm_command__line.hpp @@ -1,6 +1,6 @@ ---- src/Lib/optionmm/command_line.hpp.orig 2013-09-27 10:31:25.000000000 +0200 -+++ src/Lib/optionmm/command_line.hpp 2013-09-27 10:38:10.000000000 +0200 -@@ -212,7 +212,13 @@ +--- src/Lib/optionmm/command_line.hpp.orig 2007-04-16 13:36:42 UTC ++++ src/Lib/optionmm/command_line.hpp +@@ -212,7 +212,13 @@ struct toggle_value { x = !x; } diff --git a/games/netpanzer/pkg-plist b/games/netpanzer/pkg-plist deleted file mode 100644 index 60ed8d0115e..00000000000 --- a/games/netpanzer/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/netpanzer -man/man6/netpanzer.6.gz -share/applications/netpanzer.desktop -share/pixmaps/netpanzer.png -share/pixmaps/netpanzer.xpm diff --git a/games/xboard/Makefile b/games/xboard/Makefile index a32ff684883..ee50b4ab237 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -26,6 +26,7 @@ OPTIONS_RADIO?= SOUND OPTIONS_RADIO_SOUND?= SOX ALSA OPTIONS_DEFAULT?= XAW OPTIONS_SUB?= yes + ZIPPY_DESC= Add Zippy capability (computer player on ICS) ENGINES_DESC= Chess Engines CRAFTY_DESC= Install crafty engine @@ -37,16 +38,17 @@ FRONTEND_DESC= Front End XAW_DESC= Xaw GUI toolkit support (default) XAW3D_DESC= Xaw3d GUI toolkit support (not fully supported) GTK2_DESC= GTK+ 2 GUI toolkit support (experimental) -SOUND_DESC= Sound Output (optional) +SOUND_DESC= Sound output (optional) SOX_DESC= SoX audio support -CRAFTY_RUN_DEPENDS+= crafty:games/crafty -FAIRYMAX_RUN_DEPENDS+= fairymax:games/fairymax -GNUCHESS_RUN_DEPENDS+= gnuchess:games/gnuchess -KNIGHTCAP_RUN_DEPENDS+= KnightCap:games/KnightCap -PHALANX_RUN_DEPENDS+= phalanx:games/phalanx -XAW3D_DEPENDS+= libXaw3d.so:x11-toolkits/Xaw3d -SOX_RUN_DEPENDS+= play:audio/sox -ALSA_RUN_DEPENDS+= aplay:audio/alsa-utils + +CRAFTY_RUN_DEPENDS= crafty:games/crafty +FAIRYMAX_RUN_DEPENDS= fairymax:games/fairymax +GNUCHESS_RUN_DEPENDS= gnuchess:games/gnuchess +KNIGHTCAP_RUN_DEPENDS= KnightCap:games/KnightCap +PHALANX_RUN_DEPENDS= phalanx:games/phalanx +XAW3D_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +SOX_RUN_DEPENDS= play:audio/sox +ALSA_RUN_DEPENDS= aplay:audio/alsa-utils NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls ZIPPY_CONFIGURE_ENABLE= zippy @@ -80,8 +82,6 @@ XBOARDCONF?= ${WRKSRC}/xboard.conf PORTDOCS= AUTHORS COPYING COPYRIGHT ChangeLog DIFFSTAT FAQ.html NEWS README SHORTLOG TODO -BROKEN_sparc64= Does not install on sparc64 - .if ${PORT_OPTIONS:MZIPPY} USES+= shebangfix SHEBANG_FILES+= ./texi2man diff --git a/german/wordpress/Makefile b/german/wordpress/Makefile index 2d579bb2c64..02a889bcf2d 100644 --- a/german/wordpress/Makefile +++ b/german/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ diff --git a/german/wordpress/distinfo b/german/wordpress/distinfo index 334bdfe6314..01cb17ea0d8 100644 --- a/german/wordpress/distinfo +++ b/german/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203646 -SHA256 (wordpress-4.9.1-de_DE.tar.gz) = 6a9374103a8e895b37ed4abf4b2a68d61434c440d0eaf8aa7fc2e388cf8f0e11 -SIZE (wordpress-4.9.1-de_DE.tar.gz) = 10151519 +TIMESTAMP = 1516345576 +SHA256 (wordpress-4.9.2-de_DE.tar.gz) = fcd2765701dfec50aa57c05d8942407f9e832dea6cf0067c7073b7d67c48290f +SIZE (wordpress-4.9.2-de_DE.tar.gz) = 9309673 diff --git a/graphics/Makefile b/graphics/Makefile index 3c34d86ecf0..18c7078a7d1 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -356,6 +356,7 @@ SUBDIR += hs-svgcairo SUBDIR += hugin SUBDIR += icat + SUBDIR += icc-profiles-adobe-cs4 SUBDIR += icc-profiles-basiccolor SUBDIR += icc-profiles-openicc SUBDIR += iccexamin diff --git a/graphics/icc-profiles-adobe-cs4/Makefile b/graphics/icc-profiles-adobe-cs4/Makefile new file mode 100644 index 00000000000..2554d291c6f --- /dev/null +++ b/graphics/icc-profiles-adobe-cs4/Makefile @@ -0,0 +1,32 @@ +# $FreeBSD$ + +PORTNAME= icc-profiles-adobe-cs4 +PORTVERSION= 1 +CATEGORIES= graphics +MASTER_SITES= http://download.adobe.com/pub/adobe/iccprofiles/win/ +DISTNAME= AdobeICCProfilesCS4Win_end-user + +MAINTAINER= bsam@FreeBSD.org +COMMENT= Adobe ICC CMYK and RGB profiles for graphics professionals + +LICENSE= ADOBEEULA.pdf +LICENSE_NAME= Adobe End-User License Agreement +LICENSE_FILE= ${WRKDIR}/Adobe\ ICC\ Profiles\ \(end-user\)/Color\ Profile\ EULA.pdf +LICENSE_PERMS= dist-mirror pkg-mirror auto-accept + +USES= zip +NO_BUILD= yes +NO_ARCH= yes + +SYSCOLORDIR= share/color +PLIST_SUB= SYSCOLORDIR=${SYSCOLORDIR} + +do-install: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKDIR}/Adobe\ ICC\ Profiles\ \(end-user\) && ${COPYTREE_SHARE} \*.pdf ${STAGEDIR}${DOCSDIR}) +.for d in CMYK RGB + @${MKDIR} ${STAGEDIR}${PREFIX}/${SYSCOLORDIR}/Adobe/${d} + (cd ${WRKDIR}/Adobe\ ICC\ Profiles\ \(end-user\)/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SYSCOLORDIR}/Adobe/${d}) +.endfor + +.include diff --git a/graphics/icc-profiles-adobe-cs4/distinfo b/graphics/icc-profiles-adobe-cs4/distinfo new file mode 100644 index 00000000000..f70d2b13338 --- /dev/null +++ b/graphics/icc-profiles-adobe-cs4/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1516286129 +SHA256 (AdobeICCProfilesCS4Win_end-user.zip) = 92043b7c3ca5a25a0f6975d0cdc57db60a67dcb9ebdfb15b16267311beb58f94 +SIZE (AdobeICCProfilesCS4Win_end-user.zip) = 6475520 diff --git a/graphics/icc-profiles-adobe-cs4/pkg-descr b/graphics/icc-profiles-adobe-cs4/pkg-descr new file mode 100644 index 00000000000..df04666f924 --- /dev/null +++ b/graphics/icc-profiles-adobe-cs4/pkg-descr @@ -0,0 +1,7 @@ +Adobe wants to enable consistent, high-quality color workflows. For +color workflows to succeed, color information must be shared by +many people, from original creator to final publisher. For this +reason, Adobe is supplying ICC profiles as a free download for +graphics professionals to use across their workflows. + +WWW: http://supportdownloads.adobe.com/detail.jsp?ftpID=4075 diff --git a/graphics/icc-profiles-adobe-cs4/pkg-plist b/graphics/icc-profiles-adobe-cs4/pkg-plist new file mode 100644 index 00000000000..dc37c537f96 --- /dev/null +++ b/graphics/icc-profiles-adobe-cs4/pkg-plist @@ -0,0 +1,25 @@ +%%SYSCOLORDIR%%/Adobe/CMYK/CoatedFOGRA27.icc +%%SYSCOLORDIR%%/Adobe/CMYK/CoatedFOGRA39.icc +%%SYSCOLORDIR%%/Adobe/CMYK/CoatedGRACoL2006.icc +%%SYSCOLORDIR%%/Adobe/CMYK/JapanColor2001Coated.icc +%%SYSCOLORDIR%%/Adobe/CMYK/JapanColor2001Uncoated.icc +%%SYSCOLORDIR%%/Adobe/CMYK/JapanColor2002Newspaper.icc +%%SYSCOLORDIR%%/Adobe/CMYK/JapanColor2003WebCoated.icc +%%SYSCOLORDIR%%/Adobe/CMYK/JapanWebCoated.icc +%%SYSCOLORDIR%%/Adobe/CMYK/USWebCoatedSWOP.icc +%%SYSCOLORDIR%%/Adobe/CMYK/USWebUncoated.icc +%%SYSCOLORDIR%%/Adobe/CMYK/UncoatedFOGRA29.icc +%%SYSCOLORDIR%%/Adobe/CMYK/WebCoatedFOGRA28.icc +%%SYSCOLORDIR%%/Adobe/CMYK/WebCoatedSWOP2006Grade3.icc +%%SYSCOLORDIR%%/Adobe/CMYK/WebCoatedSWOP2006Grade5.icc +%%SYSCOLORDIR%%/Adobe/RGB/AdobeRGB1998.icc +%%SYSCOLORDIR%%/Adobe/RGB/AppleRGB.icc +%%SYSCOLORDIR%%/Adobe/RGB/ColorMatchRGB.icc +%%SYSCOLORDIR%%/Adobe/RGB/PAL_SECAM.icc +%%SYSCOLORDIR%%/Adobe/RGB/SMPTE-C.icc +%%SYSCOLORDIR%%/Adobe/RGB/VideoHD.icc +%%SYSCOLORDIR%%/Adobe/RGB/VideoNTSC.icc +%%SYSCOLORDIR%%/Adobe/RGB/VideoPAL.icc +%%PORTDOCS%%%%DOCSDIR%%/Color Profile EULA.pdf +%%PORTDOCS%%%%DOCSDIR%%/Profile Information.pdf +%%PORTDOCS%%%%DOCSDIR%%/Trademark Information.pdf diff --git a/graphics/iccexamin/Makefile b/graphics/iccexamin/Makefile index db3682cfdcd..e497cc41c96 100644 --- a/graphics/iccexamin/Makefile +++ b/graphics/iccexamin/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libtiff.so:graphics/tiff \ libXcm.so:x11/libXcm -USE_GITHUB= yes -GH_ACCOUNT= oyranos-cms +USE_GITHUB= yes +GH_ACCOUNT= oyranos-cms MAKE_JOBS_UNSAFE= yes USES= desktop-file-utils gettext iconv jpeg pkgconfig @@ -30,6 +30,7 @@ INSTALLS_ICONS= yes USE_GL= gl glu USE_XORG= x11 xcursor xext xfixes xft xinerama xpm xrandr xxf86vm CONFIGURE_ARGS+=--mandir=${PREFIX}/man --disable-openmp +USE_CXXSTD= c++98 post-patch: @${REINPLACE_CMD} 's:\\$$(iconv):${ICONV_LIB}:' \ diff --git a/graphics/silgraphite/Makefile b/graphics/silgraphite/Makefile index 45802897c4e..1979cc52130 100644 --- a/graphics/silgraphite/Makefile +++ b/graphics/silgraphite/Makefile @@ -24,6 +24,7 @@ OPTIONS_SUB= yes CONFIGURE_ARGS= --without-xft --without-pangographite GNU_CONFIGURE= yes INSTALL_TARGET= install-strip +USE_CXXSTD= c++98 USE_LDCONFIG= yes USES= libtool pathfix pkgconfig @@ -31,6 +32,4 @@ FREETYPE_CONFIGURE_WITH=freetype FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_USES= iconv -CXXFLAGS+= -std=c++98 - .include diff --git a/graphics/silgraphite/pkg-descr b/graphics/silgraphite/pkg-descr index 8ef411b8f2e..32dbd64ca04 100644 --- a/graphics/silgraphite/pkg-descr +++ b/graphics/silgraphite/pkg-descr @@ -1,9 +1,9 @@ -Graphite is a project under development within SIL'ss Non-Roman Script -Initiative and Language Software Development groups to provide rendering -capabilities for complex non-Roman writing systems. The original goal was a -system for the Windows platform; the system has also been ported to Linux. -Graphite can be used to create "smart fonts" capable of displaying writing -systems with various complex behaviors. With respect to the Text Encoding -Model, Graphite handles the "Rendering" aspect of writing system implementation. +Graphite is a project under development within SIL's Non-Roman Script Initiative +and Language Software Development groups to provide rendering capabilities for +complex non-Roman writing systems. The original goal was a system for the +Windows platform; the system has also been ported to Linux. Graphite can be used +to create "smart fonts" capable of displaying writing systems with various +complex behaviors. With respect to the Text Encoding Model, Graphite handles the +"Rendering" aspect of writing system implementation. WWW: http://silgraphite.sourceforge.net/ diff --git a/japanese/wordpress/Makefile b/japanese/wordpress/Makefile index 74f0d10595d..c3984927124 100644 --- a/japanese/wordpress/Makefile +++ b/japanese/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 DISTVERSIONSUFFIX= -ja CATEGORIES= japanese www MASTER_SITES= http://ja.wordpress.org/ diff --git a/japanese/wordpress/distinfo b/japanese/wordpress/distinfo index 4a004c78f09..a36126b7a6d 100644 --- a/japanese/wordpress/distinfo +++ b/japanese/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203598 -SHA256 (wordpress-4.9.1-ja.tar.gz) = 1f56744c660366c88499f74c682ef887622e355ca2320e5ae4db4f3c3558ce75 -SIZE (wordpress-4.9.1-ja.tar.gz) = 10141950 +TIMESTAMP = 1516345636 +SHA256 (wordpress-4.9.2-ja.tar.gz) = 521343d4c5da63832ed969976823349f3ee540c8c4626286f329cad7a36513cf +SIZE (wordpress-4.9.2-ja.tar.gz) = 9291158 diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 6359d66976f..11d49aaeba3 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp new file mode 100644 index 00000000000..ac002a41f88 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp @@ -0,0 +1,13 @@ +--- hotspot/src/share/vm/services/memTracker.cpp.orig ++++ hotspot/src/share/vm/services/memTracker.cpp +@@ -67,10 +67,6 @@ NMT_TrackingLevel MemTracker::init_tracking_level() { + os::unsetenv(buf); + } + +- // Construct NativeCallStack::EMPTY_STACK. It may get constructed twice, +- // but it is benign, the results are the same. +- ::new ((void*)&NativeCallStack::EMPTY_STACK) NativeCallStack(0, false); +- + if (!MallocTracker::initialize(level) || + !VirtualMemoryTracker::initialize(level)) { + level = NMT_off; diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile index 90102040156..961c74652dd 100644 --- a/lang/gcc6-devel/Makefile +++ b/lang/gcc6-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 6.4.1.s20180110 +PORTVERSION= 6.4.1.s20180117 CATEGORIES= lang java MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc6-devel/distinfo b/lang/gcc6-devel/distinfo index 9314efd6d43..b377c368127 100644 --- a/lang/gcc6-devel/distinfo +++ b/lang/gcc6-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515713938 -SHA256 (gcc-6-20180110.tar.xz) = 570cfc8d6aa21bf39d5508038dfb1a79f9f1bff14f07099c375ba130f1b001f4 -SIZE (gcc-6-20180110.tar.xz) = 72610660 +TIMESTAMP = 1516279569 +SHA256 (gcc-6-20180117.tar.xz) = 3b7c86114dfa6d6595142d1d1d3f44c2fe9aff02861dd95bbe3868d17db0aea5 +SIZE (gcc-6-20180117.tar.xz) = 72615944 diff --git a/mail/rubygem-email_reply_trimmer/Makefile b/mail/rubygem-email_reply_trimmer/Makefile index 38118a314af..3274beff025 100644 --- a/mail/rubygem-email_reply_trimmer/Makefile +++ b/mail/rubygem-email_reply_trimmer/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= email_reply_trimmer -PORTVERSION= 0.1.8 +PORTVERSION= 0.1.9 CATEGORIES= mail rubygems MASTER_SITES= RG diff --git a/mail/rubygem-email_reply_trimmer/distinfo b/mail/rubygem-email_reply_trimmer/distinfo index 95f13470d60..a70f5bcafd6 100644 --- a/mail/rubygem-email_reply_trimmer/distinfo +++ b/mail/rubygem-email_reply_trimmer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505452143 -SHA256 (rubygem/email_reply_trimmer-0.1.8.gem) = 8967bc4f64c4aa7b0f4919de22f0155eaac431aaf735dedc60717d432fb24d20 -SIZE (rubygem/email_reply_trimmer-0.1.8.gem) = 40448 +TIMESTAMP = 1516280905 +SHA256 (rubygem/email_reply_trimmer-0.1.9.gem) = ec446ad9710c031c5974efc25fb447e8f802a5e807fd6d8fcd91294c8aaaa6bc +SIZE (rubygem/email_reply_trimmer-0.1.9.gem) = 41472 diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile index fce97e81052..6a2c8e162d4 100644 --- a/multimedia/libvpx/Makefile +++ b/multimedia/libvpx/Makefile @@ -82,6 +82,8 @@ THREADS_CONFIGURE_OFF= --disable-multithread post-patch: @${REINPLACE_CMD} 's|\(link_with_cc\)=gcc|\1=$${CC}|' \ ${WRKSRC}/build/make/configure.sh + @${REINPLACE_CMD} 's|sparc-solaris-gcc|sparc-linux-gcc|' \ + ${WRKSRC}/configure post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vpx* diff --git a/multimedia/vdr-plugin-sleeptimer/pkg-descr b/multimedia/vdr-plugin-sleeptimer/pkg-descr index 526205cc0f0..d4ccf0d456d 100644 --- a/multimedia/vdr-plugin-sleeptimer/pkg-descr +++ b/multimedia/vdr-plugin-sleeptimer/pkg-descr @@ -3,4 +3,4 @@ http://www.linuxtv.org/vdrwiki/index.php/Sleeptimer-plugin Shutdown vdr, mute or execute a custom command after a configurable timespan. User keys and keymacros.conf are supported. -WWW: http://projects.vdr-developer.org/projects/plg-sleeptimer +WWW: https://projects.vdr-developer.org/projects/plg-sleeptimer diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index 5d94135e0c9..e26a299c6c6 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -4,7 +4,7 @@ PORTNAME= base PORTVERSION= ${LICQ_VER} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-im PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2} diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile index be4985eafaf..0d7fa49e69a 100644 --- a/net-mgmt/icinga2/Makefile +++ b/net-mgmt/icinga2/Makefile @@ -2,8 +2,7 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.8.0 -PORTREVISION= 1 +DISTVERSION= 2.8.1 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo index be25389b955..b37aaeb8cbe 100644 --- a/net-mgmt/icinga2/distinfo +++ b/net-mgmt/icinga2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511186179 -SHA256 (icinga-icinga2-v2.8.0_GH0.tar.gz) = bdb1434dc1f502f350c659371c0920d68eeb982add0c5e94b5c16068dbef8fd0 -SIZE (icinga-icinga2-v2.8.0_GH0.tar.gz) = 2497043 +TIMESTAMP = 1516362862 +SHA256 (icinga-icinga2-v2.8.1_GH0.tar.gz) = 83930bf95a5c6562cc31c37ddb01b361665497ef7001e9cc8763fd499a4d709d +SIZE (icinga-icinga2-v2.8.1_GH0.tar.gz) = 2501182 diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist index c5ac5ef37ef..aa6b37ae0f7 100644 --- a/net-mgmt/icinga2/pkg-plist +++ b/net-mgmt/icinga2/pkg-plist @@ -38,39 +38,39 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/zones.conf.sample %%ETCDIR%%/zones.d/README lib/icinga2/libbase.so -lib/icinga2/libbase.so.2.8.0 +lib/icinga2/libbase.so.2.8.1 lib/icinga2/libchecker.so -lib/icinga2/libchecker.so.2.8.0 +lib/icinga2/libchecker.so.2.8.1 lib/icinga2/libcli.so -lib/icinga2/libcli.so.2.8.0 +lib/icinga2/libcli.so.2.8.1 lib/icinga2/libcompat.so -lib/icinga2/libcompat.so.2.8.0 +lib/icinga2/libcompat.so.2.8.1 lib/icinga2/libconfig.so -lib/icinga2/libconfig.so.2.8.0 +lib/icinga2/libconfig.so.2.8.1 %%DBBACKEND%%lib/icinga2/libdb_ido.so -%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.8.0 +%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.8.1 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so -%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.8.0 +%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.8.1 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so -%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.8.0 +%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.8.1 lib/icinga2/libexecvpe.so -lib/icinga2/libexecvpe.so.2.8.0 +lib/icinga2/libexecvpe.so.2.8.1 lib/icinga2/libicinga.so -lib/icinga2/libicinga.so.2.8.0 +lib/icinga2/libicinga.so.2.8.1 lib/icinga2/liblivestatus.so -lib/icinga2/liblivestatus.so.2.8.0 +lib/icinga2/liblivestatus.so.2.8.1 lib/icinga2/libmethods.so -lib/icinga2/libmethods.so.2.8.0 +lib/icinga2/libmethods.so.2.8.1 lib/icinga2/libmmatch.so -lib/icinga2/libmmatch.so.2.8.0 +lib/icinga2/libmmatch.so.2.8.1 lib/icinga2/libnotification.so -lib/icinga2/libnotification.so.2.8.0 +lib/icinga2/libnotification.so.2.8.1 lib/icinga2/libperfdata.so -lib/icinga2/libperfdata.so.2.8.0 +lib/icinga2/libperfdata.so.2.8.1 lib/icinga2/libremote.so -lib/icinga2/libremote.so.2.8.0 +lib/icinga2/libremote.so.2.8.1 lib/icinga2/libsocketpair.so -lib/icinga2/libsocketpair.so.2.8.0 +lib/icinga2/libsocketpair.so.2.8.1 lib/icinga2/sbin/icinga2 libexec/nagios/check_nscp_api man/man8/icinga2.8.gz @@ -156,6 +156,7 @@ sbin/icinga2 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.5.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.6.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.8.0.sql +%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.8.1.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/pgsql.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql @@ -165,6 +166,7 @@ sbin/icinga2 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.5.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.6.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.8.0.sql +%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.8.1.sql %%DATADIR%%/include/command-icinga.conf %%DATADIR%%/include/command-nscp-local.conf %%DATADIR%%/include/command-plugins-manubulon.conf diff --git a/net-mgmt/icingaweb2-module-grafana/Makefile b/net-mgmt/icingaweb2-module-grafana/Makefile index f965427036a..a21ba86827b 100644 --- a/net-mgmt/icingaweb2-module-grafana/Makefile +++ b/net-mgmt/icingaweb2-module-grafana/Makefile @@ -2,7 +2,7 @@ PORTNAME= icingaweb2-module-grafana DISTVERSIONPREFIX= v -DISTVERSION= 1.1.8 +DISTVERSION= 1.1.10 CATEGORIES= net-mgmt www MAINTAINER= lme@FreeBSD.org diff --git a/net-mgmt/icingaweb2-module-grafana/distinfo b/net-mgmt/icingaweb2-module-grafana/distinfo index 20ffb37a180..8a258937119 100644 --- a/net-mgmt/icingaweb2-module-grafana/distinfo +++ b/net-mgmt/icingaweb2-module-grafana/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501178110 -SHA256 (mikesch-mp-icingaweb2-module-grafana-v1.1.8_GH0.tar.gz) = 0e6a328fbb37c63b6f6bba0016c949336300d6b4dd7b97e62610bd6dd6dcfb5e -SIZE (mikesch-mp-icingaweb2-module-grafana-v1.1.8_GH0.tar.gz) = 459896 +TIMESTAMP = 1516366748 +SHA256 (mikesch-mp-icingaweb2-module-grafana-v1.1.10_GH0.tar.gz) = dd88db88be6330216b775e69c5b796d4002dbd3102760973879211e5898fc8de +SIZE (mikesch-mp-icingaweb2-module-grafana-v1.1.10_GH0.tar.gz) = 577718 diff --git a/net-mgmt/icingaweb2-module-grafana/pkg-plist b/net-mgmt/icingaweb2-module-grafana/pkg-plist index 7db34fbfb6b..470749b39e0 100644 --- a/net-mgmt/icingaweb2-module-grafana/pkg-plist +++ b/net-mgmt/icingaweb2-module-grafana/pkg-plist @@ -16,12 +16,23 @@ %%WWWDIR%%/configuration.php %%WWWDIR%%/dashboards/graphite/base-metrics.json %%WWWDIR%%/dashboards/graphite/icinga2-default.json +%%WWWDIR%%/dashboards/influxdb/auto-repeat-disk.json %%WWWDIR%%/dashboards/influxdb/base-metrics.json +%%WWWDIR%%/dashboards/influxdb/icinga2-default-multimetrics.json %%WWWDIR%%/dashboards/influxdb/icinga2-default.json %%WWWDIR%%/doc/01-about.md %%WWWDIR%%/doc/02-installation.md %%WWWDIR%%/doc/03-module-configuration.md %%WWWDIR%%/doc/04-graph-configuration.md +%%WWWDIR%%/doc/05-update.md +%%WWWDIR%%/doc/images/02-installation-01.png +%%WWWDIR%%/doc/images/04-graph.configuration-01.png +%%WWWDIR%%/doc/images/04-graph.configuration-02.png +%%WWWDIR%%/doc/images/04-graph.configuration-03.png +%%WWWDIR%%/doc/images/04-graph.configuration-04.png +%%WWWDIR%%/doc/images/04-graph.configuration-05.png +%%WWWDIR%%/doc/images/04-graph.configuration-06.png +%%WWWDIR%%/doc/images/04-graph.configuration-07.png %%WWWDIR%%/doc/images/grafana-datasource-graphite.png %%WWWDIR%%/doc/images/grafana-datasource-influxdb.png %%WWWDIR%%/doc/images/grafana-import-base-metrics-dashboard.png diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile index 1cd466bb43d..7c334a7f648 100644 --- a/net-mgmt/kismet/Makefile +++ b/net-mgmt/kismet/Makefile @@ -3,6 +3,7 @@ PORTNAME= kismet DISTVERSION= 2016-07-R1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.kismetwireless.net/code/ diff --git a/net-mgmt/kismet/files/patch-alertracker.cc b/net-mgmt/kismet/files/patch-alertracker.cc index 980f49d681b..00fe8511581 100644 --- a/net-mgmt/kismet/files/patch-alertracker.cc +++ b/net-mgmt/kismet/files/patch-alertracker.cc @@ -1,6 +1,6 @@ --- alertracker.cc.orig 2016-07-02 18:06:10 UTC +++ alertracker.cc -@@ -405,6 +405,7 @@ int Alertracker::ParseAlertConfig(Config +@@ -405,6 +405,7 @@ int Alertracker::ParseAlertConfig(ConfigFile *in_conf) &(rec->limit_burst)) < 0) { _MSG("Invalid alert line in config file: " + clines[x], MSGFLAG_FATAL); globalreg->fatal_condition = 1; diff --git a/net-mgmt/kismet/files/patch-kis_panel_widgets.cc b/net-mgmt/kismet/files/patch-kis_panel_widgets.cc new file mode 100644 index 00000000000..a5982133e00 --- /dev/null +++ b/net-mgmt/kismet/files/patch-kis_panel_widgets.cc @@ -0,0 +1,11 @@ +--- kis_panel_widgets.cc.orig 2016-07-02 18:06:10 UTC ++++ kis_panel_widgets.cc +@@ -2582,7 +2582,7 @@ int Kis_Single_Input::KeyPress(int in_key) { + // and if we have room, insert it and scroll to the right + if ((int) text.length() < max_len && + filter_map.find(in_key) != filter_map.end()) { +- char ins[2] = { in_key, 0 }; ++ char ins[2] = { (char) in_key, (char) 0 }; + text.insert(inp_pos, ins); + inp_pos++; + diff --git a/net-mgmt/kismet/files/patch-tcpclient.cc b/net-mgmt/kismet/files/patch-tcpclient.cc new file mode 100644 index 00000000000..f68c11a7ad9 --- /dev/null +++ b/net-mgmt/kismet/files/patch-tcpclient.cc @@ -0,0 +1,20 @@ +--- tcpclient.cc.orig 2016-07-02 18:06:10 UTC ++++ tcpclient.cc +@@ -75,7 +75,7 @@ int TcpClient::Connect(const char *in_remotehost, shor + local_sock.sin_addr.s_addr = htonl(INADDR_ANY); + local_sock.sin_port = htons(0); + +- if (bind(cli_fd, (struct sockaddr *) &local_sock, sizeof(local_sock)) < 0) { ++ if (::bind(cli_fd, (struct sockaddr *) &local_sock, sizeof(local_sock)) < 0) { + snprintf(errstr, 1024, "TCP client bind() failed: %s", strerror(errno)); + globalreg->messagebus->InjectMessage(errstr, MSGFLAG_ERROR); + close(cli_fd); +@@ -170,7 +170,7 @@ int TcpClient::ConnectSync(const char *in_remotehost, + local_sock.sin_addr.s_addr = htonl(INADDR_ANY); + local_sock.sin_port = htons(0); + +- if (bind(cli_fd, (struct sockaddr *) &local_sock, sizeof(local_sock)) < 0) { ++ if (::bind(cli_fd, (struct sockaddr *) &local_sock, sizeof(local_sock)) < 0) { + snprintf(errstr, 1024, "TCP client bind() failed: %s", strerror(errno)); + globalreg->messagebus->InjectMessage(errstr, MSGFLAG_ERROR); + close(cli_fd); diff --git a/net-mgmt/kismet/files/patch-tcpserver.cc b/net-mgmt/kismet/files/patch-tcpserver.cc new file mode 100644 index 00000000000..1112199d201 --- /dev/null +++ b/net-mgmt/kismet/files/patch-tcpserver.cc @@ -0,0 +1,11 @@ +--- tcpserver.cc.orig 2016-07-02 18:06:10 UTC ++++ tcpserver.cc +@@ -84,7 +84,7 @@ int TcpServer::EnableServer() { + } + + // Bind the socket +- if (bind(serv_fd, (struct sockaddr *) &serv_sock, sizeof(serv_sock)) < 0) { ++ if (::bind(serv_fd, (struct sockaddr *) &serv_sock, sizeof(serv_sock)) < 0) { + snprintf(errstr, STATUS_MAX, "TCP server bind() failed: %s", + strerror(errno)); + globalreg->messagebus->InjectMessage(errstr, MSGFLAG_ERROR); diff --git a/net-mgmt/kismet/files/patch-unixdomainserver.cc b/net-mgmt/kismet/files/patch-unixdomainserver.cc new file mode 100644 index 00000000000..d448b1bea0a --- /dev/null +++ b/net-mgmt/kismet/files/patch-unixdomainserver.cc @@ -0,0 +1,11 @@ +--- unixdomainserver.cc.orig 2016-07-02 18:06:10 UTC ++++ unixdomainserver.cc +@@ -64,7 +64,7 @@ int UnixDomainServer::EnableServer() { + } + + // Bind the socket +- if (bind(serv_fd, (struct sockaddr *) &serv_sock, sizeof(serv_sock)) < 0) { ++ if (::bind(serv_fd, (struct sockaddr *) &serv_sock, sizeof(serv_sock)) < 0) { + _MSG("Unix domain server bind() failed: " + string(strerror(errno)), + MSGFLAG_ERROR); + return -1; diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index 8df5ef9f628..f55c9b14d68 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 1.33.01 -PORTREVISION= 1 +PORTVERSION= 1.35 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= net-mgmt @@ -15,7 +15,7 @@ LICENSE= GPLv3 USE_GITHUB= yes GH_ACCOUNT= librenms -USES= php:cli python${PY_MYSQL} shebangfix +USES= python${PY_MYSQL} shebangfix SHEBANG_FILES= scripts/auth_test.php scripts/deploy-docs.sh scripts/github-remove \ scripts/Migration/Standard_Conversion/convert_no_xml.sh \ scripts/Migration/Standard_Conversion/destwork_no_xml.sh \ @@ -40,9 +40,10 @@ SHEBANG_FILES= scripts/auth_test.php scripts/deploy-docs.sh scripts/github-remov vendor/ezyang/htmlpurifier/maintenance/rename-config.php \ vendor/ezyang/htmlpurifier/maintenance/remove-trailing-whitespace.php \ vendor/ezyang/htmlpurifier/maintenance/update-config.php \ - vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php + vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php \ + poller.php poller-wrapper.py -USE_PHP= ctype curl filter gd hash json ldap mcrypt mysqli openssl session simplexml snmp tokenizer xml +USE_PHP= ctype curl filter gd hash json ldap mcrypt mysqli openssl posix session simplexml snmp tokenizer xml NO_BUILD= yes @@ -83,80 +84,68 @@ SUB_FILES+= pkg-message SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD} ROOT_FILES= addhost.php adduser.php alerts.php build-base.php build.sql \ - billing-calculate.php \ - check-services.php composer.json config_to_json.php cronic daily.php daily.sh \ + billing-calculate.php check-services.php composer.json \ + config.php.default config_to_json.php cronic daily.php daily.sh \ delhost.php discovery-wrapper.py discovery.php dist-pollers.php irc.php \ mkdocs.yml pbin.sh phpunit.xml poll-billing.php poller.php poller-service.py \ poller-wrapper.py readmegen.yml renamehost.php services-wrapper.py \ snmptrap.php syslog.php validate.php -ROOT_DIRS= LibreNMS contrib doc html includes lib mibs misc scripts sql-schema tests vendor +ROOT_DIRS= LibreNMS contrib doc html includes lib logs mibs misc rrd scripts sql-schema tests vendor DOCS= AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md PORTDOCS= * PORTEXAMPLES= snmp.conf.example snmpd.conf.example NO_ARCH= yes -.if !defined(PACKAGE_BUILDING) -APACHEMOD_VARS_ON= WANT_PHP_MOD=yes +APACHEMOD_USES= php:mod +APACHEMOD_USES_OFF= php:web APACHEMOD_USE= APACHE_RUN=22+ -.else -# Package builder doesn't create php5 with module -USES+= php:web -.endif post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php ${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' \ ${WRKSRC}/includes/common.php + ${REINPLACE_CMD} -e 's|/opt/librenms|${WWWDIR}|' \ + ${WRKSRC}/html/install.php + ${RM} ${WRKSRC}/LibreNMS/Validations/Updates.php do-install: - @${MKDIR} ${STAGEDIR}/${WWWDIR} + ${MKDIR} ${STAGEDIR}/${WWWDIR} .for dir in ${ROOT_DIRS} - @${MKDIR} ${STAGEDIR}/${WWWDIR}/${dir} - @cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/${dir} + ${MKDIR} ${STAGEDIR}/${WWWDIR}/${dir} + (cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/${dir}) .endfor .for f in ${ROOT_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR} .endfor -# Create empty rrd dir writable by www - @${MKDIR} ${STAGEDIR}/${WWWDIR}/rrd - @${CHMOD} 0775 ${STAGEDIR}/${WWWDIR}/rrd -# Create empty logs dir - @${MKDIR} ${STAGEDIR}/${WWWDIR}/logs # Make daily.sh executable - @${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh + ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh # Files in scripts dir should be executable - @${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \; + ${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \; # Ensure PHP and Python scripts are executable - @${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \ + ${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \ '*.php' -exec ${CHMOD} +x {} \; do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}/${DOCSDIR} + ${MKDIR} ${STAGEDIR}/${DOCSDIR} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR} .endfor - @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} do-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR} .endfor post-install: - @${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST} - @${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST} + @${FIND} -s ${STAGEDIR}${WWWDIR} -type f '(' -name '*.orig' -or -name '*.bak' ')' -delete @${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} - @${FIND} -s ${STAGEDIR}${WWWDIR} -type d | \ - ${SED} -e 's#^${STAGEDIR}#@dir #' >> ${TMPPLIST} - ${INSTALL_DATA} ${WRKSRC}/config.php.default \ - ${STAGEDIR}/${WWWDIR}/config.php.sample - @${ECHO} @sample ${WWWDIR}/config.php.sample >> ${TMPPLIST} - @${ECHO_CMD} "@group" >> ${TMPPLIST} - @${ECHO_CMD} "@owner" >> ${TMPPLIST} + @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/logs" >> ${TMPPLIST} + @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/rrd" >> ${TMPPLIST} .include diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index 1a32f00e457..5248eebb4f9 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511119483 -SHA256 (librenms-librenms-1.33.01_GH0.tar.gz) = ca5f3d5a606efd445291c14126c9216d1a595dc37f330cc00284d5d42f6bf5e9 -SIZE (librenms-librenms-1.33.01_GH0.tar.gz) = 60473613 +TIMESTAMP = 1515895316 +SHA256 (librenms-librenms-1.35_GH0.tar.gz) = 6ac5d1164642cdef589487a2d599b774081a6e82e59f5fffca2c566b69d98850 +SIZE (librenms-librenms-1.35_GH0.tar.gz) = 62664279 diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php b/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php new file mode 100644 index 00000000000..ac1e6a1fad6 --- /dev/null +++ b/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php @@ -0,0 +1,11 @@ +--- LibreNMS/Util/FileLock.php.orig 2018-01-14 15:32:35 UTC ++++ LibreNMS/Util/FileLock.php +@@ -45,7 +45,7 @@ class FileLock implements Lock + global $config; + + $this->name = $lock_name; +- $this->file = "$config[install_dir]/.$lock_name.lock"; ++ $this->file = "/tmp/.$lock_name.lock"; + $this->handle = fopen($this->file, "w+"); + } + diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php new file mode 100644 index 00000000000..bd1081d060f --- /dev/null +++ b/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php @@ -0,0 +1,33 @@ +--- LibreNMS/Validations/User.php.orig 2017-12-31 20:48:36 UTC ++++ LibreNMS/Validations/User.php +@@ -62,29 +62,7 @@ class User implements ValidationGroup + + + // Let's test the user configured if we have it +- if (Config::has('user')) { +- $dir = Config::get('install_dir'); +- +- $find_result = rtrim(`find $dir \! -user $lnms_username -o \! -group $lnms_groupname &> /dev/null`); +- if (!empty($find_result)) { +- // Ignore the two logs that may be created by the +- $files = array_diff(explode(PHP_EOL, $find_result), array( +- "$dir/logs/error_log", +- "$dir/logs/access_log", +- )); +- +- if (!empty($files)) { +- $result = ValidationResult::fail( +- "We have found some files that are owned by a different user than $lnms_username, this " . +- 'will stop you updating automatically and / or rrd files being updated causing graphs to fail.' +- ) +- ->setFix("chown -R $lnms_username:$lnms_groupname $dir") +- ->setList('Files', $files); +- +- $validator->result($result); +- } +- } +- } else { ++ if (!Config::has('user')) { + $validator->warn("You don't have \$config['user'] set, this most likely needs to be set to librenms"); + } + diff --git a/net-mgmt/librenms/files/patch-config.php.default b/net-mgmt/librenms/files/patch-config.php.default index c10b1cdda1e..c1eaa777ad1 100644 --- a/net-mgmt/librenms/files/patch-config.php.default +++ b/net-mgmt/librenms/files/patch-config.php.default @@ -1,4 +1,4 @@ ---- config.php.default.orig 2017-04-11 17:32:28 UTC +--- config.php.default.orig 2017-12-31 20:48:36 UTC +++ config.php.default @@ -10,7 +10,7 @@ $config['db_name'] = 'librenms'; diff --git a/net-mgmt/librenms/files/patch-html_install.php b/net-mgmt/librenms/files/patch-html_install.php new file mode 100644 index 00000000000..9973465e2a3 --- /dev/null +++ b/net-mgmt/librenms/files/patch-html_install.php @@ -0,0 +1,20 @@ +--- html/install.php.orig 2017-12-31 20:48:36 UTC ++++ html/install.php +@@ -364,7 +364,7 @@ $config_file = <<<"EOD" + + // This is the user LibreNMS will run as + //Please ensure this user is created and has the correct permissions to your install +-\$config['user'] = 'librenms'; ++\$config['user'] = 'www'; + + ### Memcached config - We use this to store realtime usage + \$config\['memcached'\]\['enable'\] = FALSE; +@@ -395,7 +395,7 @@ $config_file = <<<"EOD" + #\$config\['nets'\]\[\] = "192.168.0.0/16"; + + # Uncomment the next line to disable daily updates +-#\$config\['update'\] = 0; ++\$config\['update'\] = 0; + EOD; + + if (!file_exists("../config.php")) { diff --git a/net-mgmt/librenms/files/patch-includes_defaults.inc.php b/net-mgmt/librenms/files/patch-includes_defaults.inc.php index 27ade5e35b2..7921bfa94df 100644 --- a/net-mgmt/librenms/files/patch-includes_defaults.inc.php +++ b/net-mgmt/librenms/files/patch-includes_defaults.inc.php @@ -1,6 +1,6 @@ ---- includes/defaults.inc.php.orig 2017-11-01 17:55:06.000000000 +0000 -+++ includes/defaults.inc.php 2017-11-20 23:16:29.419902000 +0000 -@@ -48,19 +48,21 @@ +--- includes/defaults.inc.php.orig 2017-12-31 20:48:36 UTC ++++ includes/defaults.inc.php +@@ -48,19 +48,21 @@ $config['fping_options']['retries'] = 3; $config['fping_options']['timeout'] = 500; $config['fping_options']['count'] = 3; $config['fping_options']['millisec'] = 200; @@ -30,5 +30,5 @@ +$config['dot'] = '/usr/local/bin/dot'; +$config['sfdp'] = '/usr/local/bin/sfdp'; - // Memcached - Keep immediate statistics - $config['memcached']['enable'] = false; + $config['slow_statistics'] = true; + // THIS WILL CHANGE TO FALSE IN FUTURE diff --git a/net-mgmt/librenms/files/patch-poller-wrapper.py b/net-mgmt/librenms/files/patch-poller-wrapper.py index ea7640349fc..d0ab95987a6 100644 --- a/net-mgmt/librenms/files/patch-poller-wrapper.py +++ b/net-mgmt/librenms/files/patch-poller-wrapper.py @@ -1,11 +1,5 @@ ---- poller-wrapper.py.orig 2017-05-28 21:54:20 UTC +--- poller-wrapper.py.orig 2018-01-14 15:32:19 UTC +++ poller-wrapper.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python2 -+#! %%LOCALBASE%%/bin/python - """ - poller-wrapper A small tool which wraps around the poller and tries to - guide the polling process with a more modern approach with a @@ -36,6 +36,8 @@ except: print "threading, Queue, sys, subprocess, time, os, json" sys.exit(2) diff --git a/net-mgmt/librenms/files/patch-poller.php b/net-mgmt/librenms/files/patch-poller.php deleted file mode 100644 index 2633bb84463..00000000000 --- a/net-mgmt/librenms/files/patch-poller.php +++ /dev/null @@ -1,8 +0,0 @@ ---- poller.php.orig 2015-05-27 15:48:33 UTC -+++ poller.php -@@ -1,4 +1,4 @@ --#!/usr/bin/env php -+#!%%LOCALBASE%%/bin/php - /dev/null | grep ^hw.ncpu | cut -d ' ' -f 2) ++ fi ++ [ -z "${SYSTEM_CPUS}" -o $(( SYSTEM_CPUS )) -lt 1 ] && SYSTEM_CPUS=1 ++} ++portable_find_processors ++ ++# ----------------------------------------------------------------------------- ++ + run_ok() { + printf >&2 "${TPUT_BGGREEN}${TPUT_WHITE}${TPUT_BOLD} OK ${TPUT_RESET} ${*} \n\n" + } +--- makeself/functions.sh.orig ++++ makeself/functions.sh +@@ -8,8 +8,6 @@ + [ -z "${NETDATA_MAKESELF_PATH}" ] && export NETDATA_MAKESELF_PATH="$(dirname "${0}")/.." + [ "${NETDATA_MAKESELF_PATH:0:1}" != "/" ] && export NETDATA_MAKESELF_PATH="$(pwd)/${NETDATA_MAKESELF_PATH}" + [ -z "${NETDATA_SOURCE_PATH}" ] && export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.." +-[ -z "${PROCESSORS}" ] && export PROCESSORS=$(grep -c ^processor /proc/cpuinfo) +-[ -z "${PROCESSORS}" -o $((PROCESSORS)) -lt 1 ] && export PROCESSORS=1 + export NULL= + + # make sure the path does not end with / +@@ -21,14 +19,7 @@ fi + # find the parent directory + export NETDATA_INSTALL_PARENT="$(dirname "${NETDATA_INSTALL_PATH}")" + +- +-# debug +-echo "ME=${0}" +-echo "NETDATA_INSTALL_PARENT=${NETDATA_INSTALL_PARENT}" +-echo "NETDATA_INSTALL_PATH=${NETDATA_INSTALL_PATH}" +-echo "NETDATA_MAKESELF_PATH=${NETDATA_MAKESELF_PATH}" +-echo "NETDATA_SOURCE_PATH=${NETDATA_SOURCE_PATH}" +-echo "PROCESSORS=${PROCESSORS}" ++# ----------------------------------------------------------------------------- + + # bash strict mode + set -euo pipefail +@@ -58,3 +49,13 @@ fetch() { + + # load the functions of the netdata-installer.sh + . "${NETDATA_SOURCE_PATH}/installer/functions.sh" ++ ++# ----------------------------------------------------------------------------- ++ ++# debug ++echo "ME=${0}" ++echo "NETDATA_INSTALL_PARENT=${NETDATA_INSTALL_PARENT}" ++echo "NETDATA_INSTALL_PATH=${NETDATA_INSTALL_PATH}" ++echo "NETDATA_MAKESELF_PATH=${NETDATA_MAKESELF_PATH}" ++echo "NETDATA_SOURCE_PATH=${NETDATA_SOURCE_PATH}" ++echo "PROCESSORS=${SYSTEM_CPUS}" +--- makeself/jobs/50-bash-4.4.install.sh.orig ++++ makeself/jobs/50-bash-4.4.install.sh +@@ -34,7 +34,7 @@ run ./configure \ + + + run make clean +-run make -j${PROCESSORS} ++run make -j${SYSTEM_CPUS} + + cat >examples/loadables/Makefile </dev/null 2>/dev/null + +-processors=$(grep -c ^processor /proc/cpuinfo) +-[ $(( processors )) -lt 1 ] && processors=1 +- + # you can set CFLAGS before running installer + CFLAGS="${CFLAGS--O2}" + [ "z${CFLAGS}" = "z-O3" ] && CFLAGS="-O2" +@@ -495,7 +492,7 @@ progress "Cleanup compilation directory" + # ----------------------------------------------------------------------------- + progress "Compile netdata" + +-run make -j${processors} || exit 1 ++run make -j${SYSTEM_CPUS} || exit 1 + + + # ----------------------------------------------------------------------------- +--- src/apps_plugin.c.orig ++++ src/apps_plugin.c +@@ -715,19 +715,35 @@ static inline int managed_log(struct pid_stat *p, uint32_t log, int status) { + p->log_thrown |= log; + switch(log) { + case PID_LOG_IO: ++ #ifdef __FreeBSD__ ++ error("Cannot fetch process %d I/O info (command '%s')", p->pid, p->comm); ++ #else + error("Cannot process %s/proc/%d/io (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); ++ #endif + break; + + case PID_LOG_STATM: ++ #ifdef __FreeBSD__ ++ error("Cannot fetch process %d memory info (command '%s')", p->pid, p->comm); ++ #else + error("Cannot process %s/proc/%d/statm (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); ++ #endif + break; + + case PID_LOG_CMDLINE: ++ #ifdef __FreeBSD__ ++ error("Cannot fetch process %d command line (command '%s')", p->pid, p->comm); ++ #else + error("Cannot process %s/proc/%d/cmdline (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); ++ #endif + break; + + case PID_LOG_FDS: ++ #ifdef __FreeBSD__ ++ error("Cannot fetch process %d files (command '%s')", p->pid, p->comm); ++ #else + error("Cannot process entries in %s/proc/%d/fd (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); ++ #endif + break; + + case PID_LOG_STAT: +@@ -955,7 +971,7 @@ static inline int read_proc_pid_stat(struct pid_stat *p, void *ptr) { + pid_incremental_rate(stat, p->utime, (kernel_uint_t)proc_info->ki_rusage.ru_utime.tv_sec * 100 + proc_info->ki_rusage.ru_utime.tv_usec / 10000); + pid_incremental_rate(stat, p->stime, (kernel_uint_t)proc_info->ki_rusage.ru_stime.tv_sec * 100 + proc_info->ki_rusage.ru_stime.tv_usec / 10000); + pid_incremental_rate(stat, p->cutime, (kernel_uint_t)proc_info->ki_rusage_ch.ru_utime.tv_sec * 100 + proc_info->ki_rusage_ch.ru_utime.tv_usec / 10000); +- pid_incremental_rate(stat, p->cstime, (kernel_uint_t)proc_info->ki_rusage_ch.ru_stime.tv_sec * 100 + proc_info->ki_rusage_ch.ru_utime.tv_usec / 10000); ++ pid_incremental_rate(stat, p->cstime, (kernel_uint_t)proc_info->ki_rusage_ch.ru_stime.tv_sec * 100 + proc_info->ki_rusage_ch.ru_stime.tv_usec / 10000); + + p->num_threads = proc_info->ki_numthreads; + +@@ -2006,8 +2022,8 @@ static int compar_pid(const void *pid1, const void *pid2) { + #endif + + static inline int collect_data_for_pid(pid_t pid, void *ptr) { +- if(unlikely(pid < INIT_PID || pid > pid_max)) { +- error("Invalid pid %d read (expected %d to %d). Ignoring process.", pid, INIT_PID, pid_max); ++ if(unlikely(pid < 0 || pid > pid_max)) { ++ error("Invalid pid %d read (expected %d to %d). Ignoring process.", pid, 0, pid_max); + return 0; + } + +@@ -2069,28 +2085,46 @@ static int collect_data_for_all_processes(void) { + + #ifdef __FreeBSD__ + int i, procnum; +- size_t procbase_size; +- static struct kinfo_proc *procbase; + +- int mib[3]; ++ static size_t procbase_size = 0; ++ static struct kinfo_proc *procbase = NULL; + +- mib[0] = CTL_KERN; +- mib[1] = KERN_PROC; +- mib[2] = KERN_PROC_PROC; +- if (unlikely(sysctl(mib, 3, NULL, &procbase_size, NULL, 0))) { ++ size_t new_procbase_size; ++ ++ int mib[3] = { CTL_KERN, KERN_PROC, KERN_PROC_PROC }; ++ if (unlikely(sysctl(mib, 3, NULL, &new_procbase_size, NULL, 0))) { + error("sysctl error: Can't get processes data size"); + return 0; + } +- procbase = reallocz(procbase, procbase_size); +- if (unlikely(sysctl(mib, 3, procbase, &procbase_size, NULL, 0))) { ++ ++ // give it some air for processes that may be started ++ // during this little time. ++ new_procbase_size += 100 * sizeof(struct kinfo_proc); ++ ++ // increase the buffer if needed ++ if(new_procbase_size > procbase_size) { ++ procbase_size = new_procbase_size; ++ procbase = reallocz(procbase, procbase_size); ++ } ++ ++ // sysctl() gets from new_procbase_size the buffer size ++ // and also returns to it the amount of data filled in ++ new_procbase_size = procbase_size; ++ ++ // get the processes from the system ++ if (unlikely(sysctl(mib, 3, procbase, &new_procbase_size, NULL, 0))) { + error("sysctl error: Can't get processes data"); + return 0; + } +- procnum = procbase_size / sizeof(struct kinfo_proc); ++ ++ // based on the amount of data filled in ++ // calculate the number of processes we got ++ procnum = new_procbase_size / sizeof(struct kinfo_proc); ++ + #endif + + if(all_pids_count) { +-#ifndef __FreeBSD__ ++#if (ALL_PIDS_ARE_READ_INSTANTLY == 0) + size_t slc = 0; + #endif + for(p = root_of_pids; p ; p = p->next) { +@@ -2107,7 +2141,7 @@ static int collect_data_for_all_processes(void) { + + #if (ALL_PIDS_ARE_READ_INSTANTLY == 0) + if(unlikely(slc != all_pids_count)) { +- error("Internal error: I was thinking I had %zu processes in my arrays, but it seems there are more.", all_pids_count); ++ error("Internal error: I was thinking I had %zu processes in my arrays, but it seems there are %zu.", all_pids_count, slc); + all_pids_count = slc; + } + +@@ -2130,7 +2164,7 @@ static int collect_data_for_all_processes(void) { + } + + #ifdef __FreeBSD__ +- for (i = INIT_PID; i < procnum - INIT_PID; ++i) { ++ for (i = 0 ; i < procnum ; ++i) { + pid_t pid = procbase[i].ki_pid; + collect_data_for_pid(pid, &procbase[i]); + } +@@ -2258,21 +2292,17 @@ static void apply_apps_groups_targets_inheritance(void) { + if(unlikely(!p->sortlist && !p->children_count)) + p->sortlist = sortlist++; + +- // if this process does not have any children +- // and is not already merged +- // and has a parent +- // and its parent has children +- // and the target of this process and its parent is the same, or the parent does not have a target +- // and its parent is not init +- // then, mark them as merged. + if(unlikely( +- !p->children_count +- && !p->merged +- && p->parent +- && p->parent->children_count ++ !p->children_count // if this process does not have any children ++ && !p->merged // and is not already merged ++ && p->parent // and has a parent ++ && p->parent->children_count // and its parent has children ++ // and the target of this process and its parent is the same, ++ // or the parent does not have a target + && (p->target == p->parent->target || !p->parent->target) +- && p->ppid != INIT_PID ++ && p->ppid != INIT_PID // and its parent is not init + )) { ++ // mark it as merged + p->parent->children_count--; + p->merged = 1; + +@@ -2296,6 +2326,10 @@ static void apply_apps_groups_targets_inheritance(void) { + if(all_pids[INIT_PID]) + all_pids[INIT_PID]->target = apps_groups_default_target; + ++ // pid 0 goes always to default target ++ if(all_pids[0]) ++ all_pids[0]->target = apps_groups_default_target; ++ + // give a default target on all top level processes + if(unlikely(debug)) loops++; + for(p = root_of_pids; p ; p = p->next) { diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile index 2c24a1f2943..057d6a2398f 100644 --- a/net-p2p/libtorrent-rasterbar/Makefile +++ b/net-p2p/libtorrent-rasterbar/Makefile @@ -2,14 +2,10 @@ # $FreeBSD$ PORTNAME= libtorrent-rasterbar -PORTVERSION= 1.1.4 -PORTREVISION= 4 +PORTVERSION= 1.1.6 CATEGORIES?= net-p2p ipv6 MASTER_SITES= https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/ -PATCH_SITES= https://github.com/arvidn/libtorrent/commit/ -PATCHFILES= 7eb3cf6bc6db.patch:-p1 - MAINTAINER= rezny@FreeBSD.org COMMENT?= C++ library implementing a BitTorrent client @@ -19,7 +15,6 @@ LIB_DEPENDS+= libboost_chrono.so:devel/boost-libs \ libboost_random.so:devel/boost-libs \ libboost_system.so:devel/boost-libs -BROKEN= fails to build with boost 1.66, see bug 224060 BROKEN_powerpc64= fails to build: client_test.cpp: undefined reference to std::__cxx11::basic_string USES+= compiler:c++11-lib iconv:wchar_t libtool pathfix pkgconfig ssl @@ -45,6 +40,7 @@ PORTDOCS= ${DOCFILES} docs/* PORTEXAMPLES= *.cpp OPTIONS_DEFINE= DEBUG DOCS EXAMPLES LOGGING TEST +OPTIONS_DEFAULT=LOGGING OPTIONS_SUB= yes LOGGING_DESC= Enable disk stat logging and logging to disk diff --git a/net-p2p/libtorrent-rasterbar/distinfo b/net-p2p/libtorrent-rasterbar/distinfo index 2d828f4a25c..f09149f4752 100644 --- a/net-p2p/libtorrent-rasterbar/distinfo +++ b/net-p2p/libtorrent-rasterbar/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1500241161 -SHA256 (libtorrent-rasterbar-1.1.4.tar.gz) = ccf42367803a6df7edcf4756d1f7d0a9ce6158ec33b851b3b58fd470ac4eeba6 -SIZE (libtorrent-rasterbar-1.1.4.tar.gz) = 3917557 -SHA256 (7eb3cf6bc6db.patch) = d343654786f02112b0787d999f3c569bcb9bb31dfc2be52aa26007b5f5e3ca0b -SIZE (7eb3cf6bc6db.patch) = 1180 +TIMESTAMP = 1514730099 +SHA256 (libtorrent-rasterbar-1.1.6.tar.gz) = b7c74d004bd121bd6e9f8975ee1fec3c95c74044c6a6250f6b07f259f55121ef +SIZE (libtorrent-rasterbar-1.1.6.tar.gz) = 3846476 diff --git a/net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp b/net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp deleted file mode 100644 index 1bfab5affcf..00000000000 --- a/net-p2p/libtorrent-rasterbar/files/patch-include_libtorrent_config.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- include/libtorrent/config.hpp.orig 2017-07-02 16:18:10 UTC -+++ include/libtorrent/config.hpp -@@ -195,12 +195,6 @@ POSSIBILITY OF SUCH DAMAGE. - #define TORRENT_USE_EXECINFO 1 - #endif - --#else // __APPLE__ --// FreeBSD has a reasonable iconv signature --// unless we're on glibc --#ifndef __GLIBC__ --# define TORRENT_ICONV_ARG(x) (x) --#endif - #endif // __APPLE__ - - #define TORRENT_HAVE_MMAP 1 diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index e5f5e6675d4..06bd4431154 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= guacamole-server -PORTVERSION= 0.9.13 -DISTVERSIONSUFFIX= -incubating -PORTREVISION= 1 +DISTVERSION= 0.9.14 CATEGORIES= net MAINTAINER= ultima@FreeBSD.org @@ -19,11 +17,10 @@ LIB_DEPENDS= libossp-uuid.so:misc/ossp-uuid \ CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_* USES= autoreconf jpeg libtool localbase \ - pkgconfig shebangfix ssl + pkgconfig shebangfix USE_GITHUB= yes GH_ACCOUNT= apache -GH_PROJECT= incubator-guacamole-server USE_GNOME= cairo USE_LDCONFIG= yes @@ -40,8 +37,8 @@ GROUPS= guacamole SUB_LIST= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} -OPTIONS_DEFINE= WEBP GUACENC NLS -OPTIONS_DEFAULT= RDP SSH VNC VORBIS PULSEAUDIO WEBP GUACENC +OPTIONS_DEFINE= GUACENC NLS SSL WEBP +OPTIONS_DEFAULT= RDP SSH SSL VNC VORBIS PULSEAUDIO WEBP GUACENC OPTIONS_GROUP= SP AUDIO OPTIONS_GROUP_SP= RDP SSH VNC OPTIONS_GROUP_AUDIO= VORBIS PULSEAUDIO @@ -49,26 +46,36 @@ OPTIONS_SUB= yes AUDIO_DESC= Audio Support GUACENC_DESC= Video Encoding Utility -PULSEAUDIO_DESC= VNC audio support (Experimental) RDP_DESC= RDP protocol support SP_DESC= Supported Protocols VNC_DESC= VNC protocol support +GUACENC_CONFIGURE_ENABLE= guacenc +GUACENC_CONFIGURE_WITH= libavcodec libavutil libswscale GUACENC_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg NLS_USES= gettext-runtime +PULSEAUDIO_CONFIGURE_WITH= pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +RDP_CONFIGURE_WITH= rdp RDP_LIB_DEPENDS= libfreerdp1.so:net/freerdp1 +SSH_CONFIGURE_WITH= pango ssh terminal +SSH_IMPLIES= SSL SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSH_USE= GNOME=pango +SSL_CONFIGURE_WITH= ssl +SSL_USES= ssl +VNC_CONFIGURE_WITH= vnc VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver +VORBIS_CONFIGURE_WITH= vorbis VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg +WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp post-patch: @${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \ s|/etc/guacamole|${PREFIX}/etc/guacd|g' \ - ${WRKSRC}/src/guacd/man/guacd.conf.5 + ${WRKSRC}/src/guacd/man/guacd.conf.5.in post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo index cdefbf0a5aa..b0b05aa6359 100644 --- a/net/guacamole-server/distinfo +++ b/net/guacamole-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501623757 -SHA256 (apache-incubator-guacamole-server-0.9.13-incubating_GH0.tar.gz) = 09338af682ac966394eb79ac3c1422a38a58c1d77139b06a90fef195f7ec69b8 -SIZE (apache-incubator-guacamole-server-0.9.13-incubating_GH0.tar.gz) = 396012 +TIMESTAMP = 1516318156 +SHA256 (apache-guacamole-server-0.9.14_GH0.tar.gz) = 3a4e3f856ebf3daacaf08b93b45a013f919530a11d86cc5c41f858b3bc2984b6 +SIZE (apache-guacamole-server-0.9.14_GH0.tar.gz) = 412667 diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist index f64663739eb..79a7f5dd525 100644 --- a/net/guacamole-server/pkg-plist +++ b/net/guacamole-server/pkg-plist @@ -24,6 +24,7 @@ include/guacamole/protocol-types.h include/guacamole/protocol.h include/guacamole/socket-constants.h include/guacamole/socket-fntypes.h +%%SSL%%include/guacamole/socket-ssl.h include/guacamole/socket-types.h include/guacamole/socket.h include/guacamole/stream-types.h @@ -54,7 +55,7 @@ include/guacamole/user.h lib/libguac.a lib/libguac.so lib/libguac.so.12 -lib/libguac.so.12.2.0 +lib/libguac.so.12.3.0 man/man5/guacd.conf.5.gz man/man8/guacd.8.gz %%GUACENC%%man/man1/guacenc.1.gz diff --git a/net/norm/Makefile b/net/norm/Makefile index c6021c83647..41c710ee0a4 100644 --- a/net/norm/Makefile +++ b/net/norm/Makefile @@ -9,11 +9,6 @@ DISTNAME= src-norm-${DISTVERSION} MAINTAINER= hd@oc.dk COMMENT= NACK-Oriented Reliable Multicast (NORM) -BROKEN_mips= Does not build: named return values are no longer supported -BROKEN_mips64= Does not build: named return values are no longer supported -BROKEN_powerpc64= Does not build: named return values are no longer supported -BROKEN_sparc64= Does not build: named return values are no longer supported - WRKSRC= ${WRKDIR}/norm-${DISTVERSION} USES= waf tar:tgz libtool @@ -21,6 +16,10 @@ USE_LDCONFIG= yes PLIST_FILES= include/normApi.h lib/libnorm.so lib/libnorm.so.1 \ lib/libnorm.so.1.0.0 +post-patch: + @${REINPLACE_CMD} -e '92s,r.*;,{&},' \ + ${WRKSRC}/protolib/include/protoSpace.h + post-install: ${INSTALL_DATA} ${WRKSRC}/include/normApi.h ${STAGEDIR}${PREFIX}/include/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnorm.so.1.0.0 diff --git a/net/norm/pkg-descr b/net/norm/pkg-descr index a194199424e..5f5ce7228c0 100644 --- a/net/norm/pkg-descr +++ b/net/norm/pkg-descr @@ -1,4 +1,6 @@ -This a port of NACK-Oriented Reliable Multicast (N.O.R.M.), -as specified in RFC5740. +This a port of NACK-Oriented Reliable Multicast (NORM) Transport Protocol +implementation, as specified in RFC 5740. This protocol can provide end- +to-end reliable transport of bulk data objects or streams over generic IP +multicast routing and forwarding services. WWW: http://www.nrl.navy.mil/itd/ncs/products/norm diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 1cfe92116b5..2169cba4e7a 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 3.2.2017.12.27 -PORTREVISION= 1 +PORTVERSION= 3.2.2018.01.12 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org @@ -32,7 +31,7 @@ GROUPS= ntopng USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= ecd5336 +GH_TAGNAME= b16f3e2 CPE_VENDOR= ntop diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo index 7610a4aef1c..c8230a38b3d 100644 --- a/net/ntopng/distinfo +++ b/net/ntopng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514728301 -SHA256 (ntop-ntopng-3.2.2017.12.27-ecd5336_GH0.tar.gz) = e7b8660c4a6aff1c13d1d85aa64b486588d9977cdcb48ffce4e15757129d2fc6 -SIZE (ntop-ntopng-3.2.2017.12.27-ecd5336_GH0.tar.gz) = 24195373 +TIMESTAMP = 1516263485 +SHA256 (ntop-ntopng-3.2.2018.01.12-b16f3e2_GH0.tar.gz) = b72672c91d4805c3388774cd7e412f643e0c4cd0379be702f3b01bb450a76a26 +SIZE (ntop-ntopng-3.2.2018.01.12-b16f3e2_GH0.tar.gz) = 24195410 diff --git a/net/ntopng/files/patch-Makefile.in b/net/ntopng/files/patch-Makefile.in index e97ef69aad7..f200d6e34a2 100644 --- a/net/ntopng/files/patch-Makefile.in +++ b/net/ntopng/files/patch-Makefile.in @@ -1,10 +1,10 @@ ---- Makefile.in.orig 2017-12-06 11:11:19 UTC +--- Makefile.in.orig 2018-01-12 09:48:20 UTC +++ Makefile.in @@ -34,7 +34,8 @@ LIBPCAP=-lpcap MONGOOSE_HOME=${PWD}/third-party/mongoose MONGOOSE_INC=-I$(MONGOOSE_HOME) ###### --HAS_LUAJIT=$(shell pkg-config --exists luajit; echo $$?) +-HAS_LUAJIT=$(shell pkg-config --atleast-version=2.1.0 luajit; echo $$?) +# Force using embedded luajit +HAS_LUAJIT=1 ifeq ($(HAS_LUAJIT), 0) diff --git a/net/ntopng/files/patch-configure.seed b/net/ntopng/files/patch-configure.seed index 6e240f77f37..4311d91ce34 100644 --- a/net/ntopng/files/patch-configure.seed +++ b/net/ntopng/files/patch-configure.seed @@ -1,6 +1,6 @@ ---- configure.seed.orig 2017-06-01 07:18:57 UTC +--- configure.seed.orig 2018-01-12 09:48:20 UTC +++ configure.seed -@@ -19,26 +19,8 @@ SYSTEM=`uname -s` +@@ -29,26 +29,8 @@ fi # On CentOS 6 `git rev-list HEAD --count` does not work # # @@ -28,7 +28,7 @@ if [ test -f /usr/bin/lsb_release ]; then CODENAME=`/usr/bin/lsb_release -c|cut -f 2` if [[ $CODENAME == "wheezy" ]]; then : -@@ -54,26 +36,7 @@ GIT_BRANCH="@GIT_BRANCH@" +@@ -64,26 +46,7 @@ GIT_BRANCH="@GIT_BRANCH@" PRO_GIT_RELEASE="@PRO_GIT_RELEASE@" PRO_GIT_DATE="@PRO_GIT_DATE@" @@ -56,7 +56,7 @@ if test -d "/usr/include/openssl"; then : AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -@@ -378,18 +341,6 @@ GMAKE=`which gmake` +@@ -438,18 +401,6 @@ GMAKE=`which gmake` if test x$GMAKE = x then GMAKE="make" diff --git a/net/ntopng/files/patch-src_DivertInterface.cpp b/net/ntopng/files/patch-src_DivertInterface.cpp new file mode 100644 index 00000000000..49a18aa2471 --- /dev/null +++ b/net/ntopng/files/patch-src_DivertInterface.cpp @@ -0,0 +1,11 @@ +--- src/DivertInterface.cpp.orig 2018-01-18 14:31:32 UTC ++++ src/DivertInterface.cpp +@@ -101,7 +101,7 @@ DivertInterface::DivertInterface(const char *name) : N + sin.sin_family = AF_INET, sin.sin_port = htons(port); + sin_len = sizeof(struct sockaddr_in); + +- if(bind(sock, (struct sockaddr *) &sin, sin_len) == -1) { ++ if(::bind(sock, (struct sockaddr *) &sin, sin_len) == -1) { + ntop->getTrace()->traceEvent(TRACE_ERROR, "Unable to bind divert socket to port %d", port); + throw 1; + } diff --git a/net/ntopng/files/patch-src_Utils.cpp b/net/ntopng/files/patch-src_Utils.cpp new file mode 100644 index 00000000000..69a8de0d3f7 --- /dev/null +++ b/net/ntopng/files/patch-src_Utils.cpp @@ -0,0 +1,11 @@ +--- src/Utils.cpp.orig 2018-01-12 09:48:20 UTC ++++ src/Utils.cpp +@@ -2370,7 +2370,7 @@ int Utils::bindSockToDevice(int sock, int family, cons + + if(pAdapterFound != NULL) { + int addrsize = (family == AF_INET6) ? sizeof(sockaddr_in6) : sizeof(sockaddr_in); +- bindresult = bind(sock, pAdapterFound->ifa_addr, addrsize); ++ bindresult = ::bind(sock, pAdapterFound->ifa_addr, addrsize); + } + + freeifaddrs(pList); diff --git a/net/ntopng/files/patch-third-party_mongoose_mongoose.c b/net/ntopng/files/patch-third-party_mongoose_mongoose.c new file mode 100644 index 00000000000..1b879234f11 --- /dev/null +++ b/net/ntopng/files/patch-third-party_mongoose_mongoose.c @@ -0,0 +1,29 @@ +--- third-party/mongoose/mongoose.c.orig 2018-01-12 09:48:20 UTC ++++ third-party/mongoose/mongoose.c +@@ -730,7 +730,7 @@ struct mg_request_info *mg_get_request_info(struct mg_ + return &conn->request_info; + } + +-static void mg_strlcpy(register char *dst, register const char *src, size_t n) { ++static void mg_strlcpy(char *dst, const char *src, size_t n) { + for (; *src != '\0' && n > 1; n--) { + *dst++ = *src++; + } +@@ -2139,7 +2139,7 @@ static void MD5Init(MD5_CTX *ctx) { + } + + static void MD5Transform(uint32_t buf[4], uint32_t const in[16]) { +- register uint32_t a, b, c, d; ++ uint32_t a, b, c, d; + + a = buf[0]; + b = buf[1]; +@@ -4511,7 +4511,7 @@ static int set_ports_option(struct mg_context *ctx) { + (void *) + #endif + &on, sizeof(on))) != 0 || +- (rc_bind = bind(so.sock, ++ (rc_bind = ::bind(so.sock, + &sa->sa, + (sa->sa.sa_family == AF_INET) ? sizeof(sa->sin) : sizeof(sa->sin6)) + ) != 0 || diff --git a/net/ntopng/files/patch-third-party_snmp_net.c b/net/ntopng/files/patch-third-party_snmp_net.c new file mode 100644 index 00000000000..dd810946cf7 --- /dev/null +++ b/net/ntopng/files/patch-third-party_snmp_net.c @@ -0,0 +1,11 @@ +--- third-party/snmp/net.c.orig 2018-01-12 09:48:20 UTC ++++ third-party/snmp/net.c +@@ -64,7 +64,7 @@ int open_udp_socket(int port) + si_me.sin_family = AF_INET; + si_me.sin_port = htons(port); + si_me.sin_addr.s_addr = htonl(INADDR_ANY); +- if (bind(s, (struct sockaddr *) &si_me, sizeof(si_me)) != 0) ++ if (::bind(s, (struct sockaddr *) &si_me, sizeof(si_me)) != 0) + return(-1); //diep("bind"); + + return s; diff --git a/net/p5-GeoIP2/Makefile b/net/p5-GeoIP2/Makefile index b935faecf98..be9ea056f64 100644 --- a/net/p5-GeoIP2/Makefile +++ b/net/p5-GeoIP2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= GeoIP2 -PORTVERSION= 2.004000 +PORTVERSION= 2.005000 CATEGORIES= net perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MAXMIND diff --git a/net/p5-GeoIP2/distinfo b/net/p5-GeoIP2/distinfo index 93a750b9f78..9ed41a7b402 100644 --- a/net/p5-GeoIP2/distinfo +++ b/net/p5-GeoIP2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1509205967 -SHA256 (GeoIP2-2.004000.tar.gz) = d70851f277842cde0346cc646cdcd3214831893c48623ae5c618aed89fcfc76e -SIZE (GeoIP2-2.004000.tar.gz) = 231989 +TIMESTAMP = 1516280880 +SHA256 (GeoIP2-2.005000.tar.gz) = d3e5dd754499a698846acde89b98fb8ab74e62ed7912c425a12efc4265cbc474 +SIZE (GeoIP2-2.005000.tar.gz) = 256917 diff --git a/net/p5-Net-Twitter/Makefile b/net/p5-Net-Twitter/Makefile index 02a60b2a1d7..e8ce9484e09 100644 --- a/net/p5-Net-Twitter/Makefile +++ b/net/p5-Net-Twitter/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Net-Twitter -PORTVERSION= 4.01042 +PORTVERSION= 4.01043 CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/net/p5-Net-Twitter/distinfo b/net/p5-Net-Twitter/distinfo index 2ad22605461..e69d7265b2f 100644 --- a/net/p5-Net-Twitter/distinfo +++ b/net/p5-Net-Twitter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486591856 -SHA256 (Net-Twitter-4.01042.tar.gz) = ed85de266392ac3c53f0d2c0ff04bd81949546ba2b44b4fd82980a82e01582e4 -SIZE (Net-Twitter-4.01042.tar.gz) = 139311 +TIMESTAMP = 1516281020 +SHA256 (Net-Twitter-4.01043.tar.gz) = 6198ad602374e0b82c09bc336e795035fc286c86346cde1c1c2ddde70d49e7cb +SIZE (Net-Twitter-4.01043.tar.gz) = 140431 diff --git a/net/rubygem-gitaly-proto/Makefile b/net/rubygem-gitaly-proto/Makefile index 26b1ead485d..f78907c83c3 100644 --- a/net/rubygem-gitaly-proto/Makefile +++ b/net/rubygem-gitaly-proto/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitaly-proto -PORTVERSION= 0.74.0 +PORTVERSION= 0.75.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitaly-proto/distinfo b/net/rubygem-gitaly-proto/distinfo index ed56860d2e0..e750b7437f3 100644 --- a/net/rubygem-gitaly-proto/distinfo +++ b/net/rubygem-gitaly-proto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516114886 -SHA256 (rubygem/gitaly-proto-0.74.0.gem) = 17dc16e04c7ecbb46b670d00746c6b2370b6aaad0b610fc47eca9a316b607d47 -SIZE (rubygem/gitaly-proto-0.74.0.gem) = 14848 +TIMESTAMP = 1516280933 +SHA256 (rubygem/gitaly-proto-0.75.0.gem) = 6064c8bd4c7fb15559ce7163d01a818f73999d9001e725af6926ceefbf93fe61 +SIZE (rubygem/gitaly-proto-0.75.0.gem) = 14848 diff --git a/russian/wordpress/Makefile b/russian/wordpress/Makefile index 02c89dbefb7..48fd08c1aba 100644 --- a/russian/wordpress/Makefile +++ b/russian/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ diff --git a/russian/wordpress/distinfo b/russian/wordpress/distinfo index bccfc9191b1..74957929297 100644 --- a/russian/wordpress/distinfo +++ b/russian/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203474 -SHA256 (wordpress-4.9.1-ru_RU.tar.gz) = dd66717c5610fe4cee1701202bafa42cdb10873c9d9a63e6ac82585a4ccecd2f -SIZE (wordpress-4.9.1-ru_RU.tar.gz) = 10187859 +TIMESTAMP = 1516344183 +SHA256 (wordpress-4.9.2-ru_RU.tar.gz) = 5aa603105ed7e583ba1be6b6d75de4ef1fa9f69a7995a16f6027111d915895b2 +SIZE (wordpress-4.9.2-ru_RU.tar.gz) = 9348255 diff --git a/security/Makefile b/security/Makefile index ff7410e41fb..4194e034e10 100644 --- a/security/Makefile +++ b/security/Makefile @@ -409,6 +409,7 @@ SUBDIR += metasploit SUBDIR += mhash SUBDIR += mindterm-binary + SUBDIR += minisign SUBDIR += monkeysphere SUBDIR += morphis SUBDIR += munge diff --git a/security/minisign/Makefile b/security/minisign/Makefile new file mode 100644 index 00000000000..7752c7730f3 --- /dev/null +++ b/security/minisign/Makefile @@ -0,0 +1,22 @@ +# Created by: Mark Felder +# $FreeBSD$ + +PORTNAME= minisign +PORTVERSION= 0.7 +CATEGORIES= security + +MAINTAINER= feld@FreeBSD.org +COMMENT= Simple tool to sign files and verify signatures + +LICENSE= ISCL + +LIB_DEPENDS= libsodium.so:security/libsodium + +USES= cmake localbase + +USE_GITHUB= yes +GH_ACCOUNT= jedisct1 + +PLIST_FILES= bin/minisign man/man1/minisign.1.gz + +.include diff --git a/security/minisign/distinfo b/security/minisign/distinfo new file mode 100644 index 00000000000..58b0952ad06 --- /dev/null +++ b/security/minisign/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1516287856 +SHA256 (jedisct1-minisign-0.7_GH0.tar.gz) = 0c9f25ae647b6ba38cf7e6aea1da4e8fb20e1bc64ef0c679da737a38c8ad43ef +SIZE (jedisct1-minisign-0.7_GH0.tar.gz) = 13229 diff --git a/security/minisign/pkg-descr b/security/minisign/pkg-descr new file mode 100644 index 00000000000..57be5202bfc --- /dev/null +++ b/security/minisign/pkg-descr @@ -0,0 +1,6 @@ +Minisign is a dead simple tool to sign files and verify signatures. + +It is portable, lightweight, and uses the highly secure Ed25519 +public-key signature system. + +WWW: https://github.com/jedisct1/minisign diff --git a/security/py-dfdatetime/Makefile b/security/py-dfdatetime/Makefile index aa3911b676f..9f903ef4e06 100644 --- a/security/py-dfdatetime/Makefile +++ b/security/py-dfdatetime/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dfdatetime -PORTVERSION= 20171228 +PORTVERSION= 20180110 CATEGORIES= security devel python MASTER_SITES= CHEESESHOP \ https://github.com/log2timeline/dfdatetime/releases/download/${PORTVERSION}/ diff --git a/security/py-dfdatetime/distinfo b/security/py-dfdatetime/distinfo index 77ac5b7a76a..cd33aa8278c 100644 --- a/security/py-dfdatetime/distinfo +++ b/security/py-dfdatetime/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514727417 -SHA256 (dfdatetime-20171228.tar.gz) = 989ef3ac121f51eb3bc42689508486f7f78a76f78608ea76932c9504b952a561 -SIZE (dfdatetime-20171228.tar.gz) = 33238 +TIMESTAMP = 1515623650 +SHA256 (dfdatetime-20180110.tar.gz) = 6ab41d588a9ed946c79885c3b0f24d77999c695f1d536433c5ff1af309fbc8a1 +SIZE (dfdatetime-20180110.tar.gz) = 36075 diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile index 5687a02c2df..838a195d394 100644 --- a/textproc/htmltolatex/Makefile +++ b/textproc/htmltolatex/Makefile @@ -3,7 +3,7 @@ PORTNAME= htmltolatex PORTVERSION= 1 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= textproc MASTER_SITES= http://people.FreeBSD.org/~foxfair/distfiles/ DISTNAME= ${PORTNAME} diff --git a/textproc/htmltolatex/files/patch-CH2L.cpp b/textproc/htmltolatex/files/patch-CH2L.cpp index 4ea26e4eeca..4585cef9732 100644 --- a/textproc/htmltolatex/files/patch-CH2L.cpp +++ b/textproc/htmltolatex/files/patch-CH2L.cpp @@ -1,5 +1,5 @@ ---- CH2L.cpp.orig Sun Nov 11 21:03:19 2001 -+++ CH2L.cpp Fri Feb 21 03:08:09 2003 +--- CH2L.cpp.orig 2001-11-11 21:03:19.000000000 +0100 ++++ CH2L.cpp 2018-01-19 07:07:05.786197000 +0100 @@ -18,6 +18,9 @@ * Boston, MA 02111-1307, USA. * @@ -45,3 +45,12 @@ { bool did_something = false; bool alignment_changed = false; +@@ -3945,7 +3947,7 @@ + + mTableDimensionsFileName = tsp; + mTableDimensionsFile.open(tsp.c_str()); +- return mTableDimensionsFile; ++ return true; + } + else + { diff --git a/textproc/idnits/Makefile b/textproc/idnits/Makefile index d649a8809d4..9fffc5d7c0a 100644 --- a/textproc/idnits/Makefile +++ b/textproc/idnits/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= idnits -PORTVERSION= 2.15.00 +PORTVERSION= 2.15.01 CATEGORIES= textproc MASTER_SITES= https://tools.ietf.org/tools/idnits/ \ LOCAL/sunpoet diff --git a/textproc/idnits/distinfo b/textproc/idnits/distinfo index c00c9c8b373..14b8c3646e5 100644 --- a/textproc/idnits/distinfo +++ b/textproc/idnits/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505828461 -SHA256 (idnits-2.15.00.tgz) = f655d06e7d3b1c35d7ca55f91243115359ae4fdd17553ea58a301091a07ed7ac -SIZE (idnits-2.15.00.tgz) = 59593 +TIMESTAMP = 1516280832 +SHA256 (idnits-2.15.01.tgz) = b5a7a946d5d76ab7e3797871b64d1f904214ecdf94daa13c1c8da400980ea6b5 +SIZE (idnits-2.15.01.tgz) = 59630 diff --git a/textproc/py-yapf/Makefile b/textproc/py-yapf/Makefile index 0a81499053a..4950af6bd11 100644 --- a/textproc/py-yapf/Makefile +++ b/textproc/py-yapf/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= yapf -PORTVERSION= 0.20.0 +PORTVERSION= 0.20.1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-yapf/distinfo b/textproc/py-yapf/distinfo index 8c83234e80e..522d2fad79f 100644 --- a/textproc/py-yapf/distinfo +++ b/textproc/py-yapf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510746025 -SHA256 (yapf-0.20.0.tar.gz) = ff28f8839a9a105854a099026a33f4cbec8bd933554bfed658aec359bfc88ae8 -SIZE (yapf-0.20.0.tar.gz) = 124452 +TIMESTAMP = 1516084696 +SHA256 (yapf-0.20.1.tar.gz) = bd19f246be7193ad2acdc04702b92315f1ae28d49c82f6671afdeefe9d32f468 +SIZE (yapf-0.20.1.tar.gz) = 127222 diff --git a/textproc/rubygem-rouge/Makefile b/textproc/rubygem-rouge/Makefile index 5b526e0c1d1..9123f10df02 100644 --- a/textproc/rubygem-rouge/Makefile +++ b/textproc/rubygem-rouge/Makefile @@ -12,6 +12,8 @@ LICENSE= BSD2CLAUSE MIT LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE +CONFLICTS_INSTALL= rubygems-rouge2 + NO_ARCH= yes USES= gem USE_RUBY= yes diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile index bf6719abb86..f4cc7441a52 100644 --- a/www/firefox-esr-i18n/Makefile +++ b/www/firefox-esr-i18n/Makefile @@ -5,7 +5,7 @@ PORTNAME= firefox PORTVERSION= 52.6.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}esr/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build1/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi PKGNAMEPREFIX= PKGNAMESUFFIX= -esr-i18n DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index f840998d3ed..bcdeab1f318 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -4,10 +4,11 @@ PORTNAME= firefox DISTVERSION= 52.6.0 DISTVERSIONSUFFIX=esr +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source PKGNAMESUFFIX= -esr DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index 77af0d2137a..ea33ba19b40 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516224795 -SHA256 (firefox-52.6.0esr.source.tar.xz) = 8f8ca86a2f5f749b1d49b45bc90370df0d740c72dea5a20467e82e30f11c7e0c -SIZE (firefox-52.6.0esr.source.tar.xz) = 214228800 +TIMESTAMP = 1516314845 +SHA256 (firefox-52.6.0esr.source.tar.xz) = 587cd94a315f5a94bf5c1f85e4a0ea92c9103503b51d649a3c4a4a122d691e42 +SIZE (firefox-52.6.0esr.source.tar.xz) = 211735240 diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index 7ff51fc5cd0..7c880117753 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -3,9 +3,10 @@ PORTNAME= firefox-i18n PORTVERSION= 58.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build6/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo index 103ec91e84e..c434c22459e 100644 --- a/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1516028155 +TIMESTAMP = 1516319766 SHA256 (xpi/firefox-i18n-58.0/ach.xpi) = 2927ffaed1c67d844e36c61a735508341b4da5ae062e87ef6bb728ea6252c120 SIZE (xpi/firefox-i18n-58.0/ach.xpi) = 445610 SHA256 (xpi/firefox-i18n-58.0/af.xpi) = 56398a4ea260c26c5d1a5722a17e3ae4946a25aca36bc21e7f8146f56078b31f @@ -43,8 +43,8 @@ SHA256 (xpi/firefox-i18n-58.0/el.xpi) = 321b7f69e2db2f794604fa5dd085e4deccec1c67 SIZE (xpi/firefox-i18n-58.0/el.xpi) = 540701 SHA256 (xpi/firefox-i18n-58.0/en-GB.xpi) = c969f4e459b719e292fd1674ae90191b0e6b1262c86fcd26d9a96d12673c3abe SIZE (xpi/firefox-i18n-58.0/en-GB.xpi) = 443432 -SHA256 (xpi/firefox-i18n-58.0/en-US.xpi) = 557551671ba00a923723de024e7e52336fc7fad436fe2eef0df43341a5ca363d -SIZE (xpi/firefox-i18n-58.0/en-US.xpi) = 440001 +SHA256 (xpi/firefox-i18n-58.0/en-US.xpi) = fcf9498e7303362fae71ae7848b806503ae598e70ad9c55e5045ced0cff76acf +SIZE (xpi/firefox-i18n-58.0/en-US.xpi) = 440002 SHA256 (xpi/firefox-i18n-58.0/en-ZA.xpi) = 21ff6c58a514b0b05b137196096f2711105f4b15c27a9dbadeff6ad111e14747 SIZE (xpi/firefox-i18n-58.0/en-ZA.xpi) = 434818 SHA256 (xpi/firefox-i18n-58.0/eo.xpi) = 628b4c660141ab9c6056e087c200929d2d850668d7d8b625aee2413be1f70120 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index b79614f9283..53d58b8779b 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,10 +3,11 @@ PORTNAME= firefox DISTVERSION= 58.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build6/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org diff --git a/www/firefox/distinfo b/www/firefox/distinfo index a156f05234a..761d6b45339 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516028155 -SHA256 (firefox-58.0.source.tar.xz) = 657f049cde85d649cec249ae246fa14bd90201fce0c64ac2764b769eb44e5820 -SIZE (firefox-58.0.source.tar.xz) = 248957120 +TIMESTAMP = 1516319766 +SHA256 (firefox-58.0.source.tar.xz) = 0e0a39caabf94d7467d8bb4008fa9e7340a7be57b8c78ccf0cf98791a3bfaaff +SIZE (firefox-58.0.source.tar.xz) = 247185892 diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile index f32ad50cb6f..464e4f7ce4e 100644 --- a/www/gohugo/Makefile +++ b/www/gohugo/Makefile @@ -2,7 +2,7 @@ PORTNAME= hugo DISTVERSIONPREFIX= v -DISTVERSION= 0.32.4 +DISTVERSION= 0.33 CATEGORIES= www PKGNAMEPREFIX= go DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} @@ -19,7 +19,7 @@ GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} GH_TUPLE= BurntSushi:toml:a368813:toml/src/github.com/BurntSushi/toml \ PuerkitoBio:purell:0bcb03f:purell/src/github.com/PuerkitoBio/purell \ PuerkitoBio:urlesc:de5bf2a:urlesc/src/github.com/PuerkitoBio/urlesc \ - alecthomas:chroma:d08da05:chroma/src/github.com/alecthomas/chroma \ + alecthomas:chroma:e0f32fb:chroma/src/github.com/alecthomas/chroma \ bep:gitmap:de8030e:gitmap/src/github.com/bep/gitmap \ chaseadamsio:goorgeous:dcf1ef8:goorgeous/src/github.com/chaseadamsio/goorgeous \ cpuguy83:go-md2man:1d903dc:go_md2man/src/github.com/cpuguy83/go-md2man \ @@ -29,43 +29,42 @@ GH_TUPLE= BurntSushi:toml:a368813:toml/src/github.com/BurntSushi/toml \ dlclark:regexp2:487489b:regexp2/src/github.com/dlclark/regexp2 \ eknkc:amber:cdade1c:amber/src/github.com/eknkc/amber \ fortytw2:leaktest:7dad533:leaktest/src/github.com/fortytw2/leaktest \ - fsnotify:fsnotify:629574c:fsnotify/src/github.com/fsnotify/fsnotify \ + fsnotify:fsnotify:c282820:fsnotify/src/github.com/fsnotify/fsnotify \ gorilla:websocket:ea4d1f6:websocket/src/github.com/gorilla/websocket \ hashicorp:go-immutable-radix:8aac270:go_immutable_radix/src/github.com/hashicorp/go-immutable-radix \ hashicorp:golang-lru:0a025b7:golang_lru/src/github.com/hashicorp/golang-lru \ hashicorp:hcl:23c074d:hcl/src/github.com/hashicorp/hcl \ inconshreveable:mousetrap:76626ae:mousetrap/src/github.com/inconshreveable/mousetrap \ jdkato:prose:20d3663:prose/src/github.com/jdkato/prose \ - kardianos:osext:ae77be6:osext/src/github.com/kardianos/osext \ kyokomi:emoji:7e06b23:emoji/src/github.com/kyokomi/emoji \ magefile:mage:2f97430:mage/src/github.com/magefile/mage \ - magiconair:properties:be5ece7:properties/src/github.com/magiconair/properties \ - markbates:inflect:54ffb37:inflect/src/github.com/markbates/inflect \ + magiconair:properties:d419a98:properties/src/github.com/magiconair/properties \ + markbates:inflect:a12c3ae:inflect/src/github.com/markbates/inflect \ mattn:go-runewidth:9e777a8:go_runewidth/src/github.com/mattn/go-runewidth \ miekg:mmark:fd2f6c1:mmark/src/github.com/miekg/mmark \ - mitchellh:mapstructure:06020f8:mapstructure/src/github.com/mitchellh/mapstructure \ + mitchellh:mapstructure:b4575ee:mapstructure/src/github.com/mitchellh/mapstructure \ nicksnyder:go-i18n:0dc1626:go_i18n/src/github.com/nicksnyder/go-i18n \ - olekukonko:tablewriter:65fec0d:tablewriter/src/github.com/olekukonko/tablewriter \ + olekukonko:tablewriter:96aac99:tablewriter/src/github.com/olekukonko/tablewriter \ pelletier:go-toml:16398ba:go_toml/src/github.com/pelletier/go-toml \ pmezard:go-difflib:792786c:go_difflib/src/github.com/pmezard/go-difflib \ russross:blackfriday:4048872:blackfriday/src/github.com/russross/blackfriday \ shurcooL:sanitized_anchor_name:86672fc:sanitized_anchor_name/src/github.com/shurcooL/sanitized_anchor_name \ - spf13:afero:ec3a311:afero/src/github.com/spf13/afero \ + spf13:afero:bb8f192:afero/src/github.com/spf13/afero \ spf13:cast:acbeb36:cast/src/github.com/spf13/cast \ - spf13:cobra:7b2c5ac:cobra/src/github.com/spf13/cobra \ + spf13:cobra:b95ab73:cobra/src/github.com/spf13/cobra \ spf13:fsync:12a01e6:fsync/src/github.com/spf13/fsync \ - spf13:jWalterWeatherman:12bd96e:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \ + spf13:jWalterWeatherman:7c0cea3:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \ spf13:nitro:24d7ef3:nitro/src/github.com/spf13/nitro \ spf13:pflag:e57e3ee:pflag/src/github.com/spf13/pflag \ spf13:viper:25b30aa:viper/src/github.com/spf13/viper \ - stretchr:testify:69483b4:testify/src/github.com/stretchr/testify \ + stretchr:testify:b91bfb9:testify/src/github.com/stretchr/testify \ yosssi:ace:ea038f4:ace/src/github.com/yosssi/ace \ - golang:image:f7e31b4:image/src/golang.org/x/image \ - golang:net:cd69bc3:net/src/golang.org/x/net \ + golang:image:12117c1:image/src/golang.org/x/image \ + golang:net:5ccada7:net/src/golang.org/x/net \ golang:sync:fd80eb9:sync/src/golang.org/x/sync \ - golang:sys:8dbc5d0:sys/src/golang.org/x/sys \ - golang:text:c01e476:text/src/golang.org/x/text \ - go-yaml:yaml:eb3733d:yaml/src/gopkg.in/yaml.v2 + golang:sys:810d700:sys/src/golang.org/x/sys \ + golang:text:e19ae14:text/src/golang.org/x/text \ + go-yaml:yaml:d670f94:yaml/src/gopkg.in/yaml.v2 OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT= MANPAGES diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo index c1f44d424db..6a10d737df7 100644 --- a/www/gohugo/distinfo +++ b/www/gohugo/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1515696307 -SHA256 (gohugo/gohugoio-hugo-v0.32.4_GH0.tar.gz) = 044c6214d53aaefb86deeca7305bef189efc9c624485d9b737e1a566ab34d02b -SIZE (gohugo/gohugoio-hugo-v0.32.4_GH0.tar.gz) = 21977192 +TIMESTAMP = 1516307911 +SHA256 (gohugo/gohugoio-hugo-v0.33_GH0.tar.gz) = 689164eaaf5c7016574036d8977a35bed58a7fbd2b178e8205a426116e5b94d0 +SIZE (gohugo/gohugoio-hugo-v0.33_GH0.tar.gz) = 22042950 SHA256 (gohugo/BurntSushi-toml-a368813_GH0.tar.gz) = 68dc067c4105cd20a642ddf1f4acaada7474c1b58e5b249d4bd9b0d7e8edebc2 SIZE (gohugo/BurntSushi-toml-a368813_GH0.tar.gz) = 42252 SHA256 (gohugo/PuerkitoBio-purell-0bcb03f_GH0.tar.gz) = ade9e6e2a5d1d79daaf2d729f450c482ff0aa316ea0a1d9e5e3f7a753d05c49c SIZE (gohugo/PuerkitoBio-purell-0bcb03f_GH0.tar.gz) = 11654 SHA256 (gohugo/PuerkitoBio-urlesc-de5bf2a_GH0.tar.gz) = 0d4b469d8d1dfe12e740661d242df9f49779e6f07a31361231d5314979391df5 SIZE (gohugo/PuerkitoBio-urlesc-de5bf2a_GH0.tar.gz) = 6796 -SHA256 (gohugo/alecthomas-chroma-d08da05_GH0.tar.gz) = 9a5eea139c724955fe52a990d6fa9549580f7ea5c2bc12a320d5a551227becf6 -SIZE (gohugo/alecthomas-chroma-d08da05_GH0.tar.gz) = 277315 +SHA256 (gohugo/alecthomas-chroma-e0f32fb_GH0.tar.gz) = 9575da1602dafeba6044a0a6d538d67cbd46d26c215d7c729cc5e470359a84e5 +SIZE (gohugo/alecthomas-chroma-e0f32fb_GH0.tar.gz) = 280495 SHA256 (gohugo/bep-gitmap-de8030e_GH0.tar.gz) = c418e80c4ca2cce9199d36d7c36f940a1768a1caa0003d0a4aad3be02562111e SIZE (gohugo/bep-gitmap-de8030e_GH0.tar.gz) = 4489 SHA256 (gohugo/chaseadamsio-goorgeous-dcf1ef8_GH0.tar.gz) = 6dbf5f61257fc8c71ec6ae533f477f351c1b0fa11774cf6e8abf27edc7d90d61 @@ -27,8 +27,8 @@ SHA256 (gohugo/eknkc-amber-cdade1c_GH0.tar.gz) = 3e2f7d217f104aa055cd9544cc3181d SIZE (gohugo/eknkc-amber-cdade1c_GH0.tar.gz) = 22601 SHA256 (gohugo/fortytw2-leaktest-7dad533_GH0.tar.gz) = b732d88c9f7c475d4282d96812cb49726cbc736603bc5e1aeda5062be75838f3 SIZE (gohugo/fortytw2-leaktest-7dad533_GH0.tar.gz) = 3677 -SHA256 (gohugo/fsnotify-fsnotify-629574c_GH0.tar.gz) = c8da466b460ded4f23bef2b75fc7646d6ccfac3643b0cd2eaeb57de21889576b -SIZE (gohugo/fsnotify-fsnotify-629574c_GH0.tar.gz) = 29554 +SHA256 (gohugo/fsnotify-fsnotify-c282820_GH0.tar.gz) = 85d31bf25f43a66fbaf0799ce8993a038694e65312bef96441a83556abaff73a +SIZE (gohugo/fsnotify-fsnotify-c282820_GH0.tar.gz) = 31139 SHA256 (gohugo/gorilla-websocket-ea4d1f6_GH0.tar.gz) = 980d6ea5f968a1a7aa30541d78dbc4120c8c25d7c41f56e69b46c4e1d50bd18a SIZE (gohugo/gorilla-websocket-ea4d1f6_GH0.tar.gz) = 42985 SHA256 (gohugo/hashicorp-go-immutable-radix-8aac270_GH0.tar.gz) = 647d43f36e28f0422e8b061668634ba225c50e613ada1e98abc1a4d1ef9cc6f6 @@ -41,26 +41,24 @@ SHA256 (gohugo/inconshreveable-mousetrap-76626ae_GH0.tar.gz) = d56204c0067e12a89 SIZE (gohugo/inconshreveable-mousetrap-76626ae_GH0.tar.gz) = 2288 SHA256 (gohugo/jdkato-prose-20d3663_GH0.tar.gz) = 53f23648aaac68bd8d532dbecb2a33a5ac83b9e2264c60e8d7caebcfacc65460 SIZE (gohugo/jdkato-prose-20d3663_GH0.tar.gz) = 4569668 -SHA256 (gohugo/kardianos-osext-ae77be6_GH0.tar.gz) = 539367f48ed1d4f1b8bec4cf742ac7bce7c5b9319f4338a12310edddec005213 -SIZE (gohugo/kardianos-osext-ae77be6_GH0.tar.gz) = 4851 SHA256 (gohugo/kyokomi-emoji-7e06b23_GH0.tar.gz) = 5fa5d5b3122fe8e37b55e02f85e3196d5b5977df91c9379ba51e2a2893d2b1ec SIZE (gohugo/kyokomi-emoji-7e06b23_GH0.tar.gz) = 32552 SHA256 (gohugo/magefile-mage-2f97430_GH0.tar.gz) = 0608cd90a2b51c6cffe8bc0763f437a8a08c18a7c02d144510726706933008a9 SIZE (gohugo/magefile-mage-2f97430_GH0.tar.gz) = 8764988 -SHA256 (gohugo/magiconair-properties-be5ece7_GH0.tar.gz) = ec40448e2e63301527519ba2ffea379645a8e884490116fb1b9784b1af85aea7 -SIZE (gohugo/magiconair-properties-be5ece7_GH0.tar.gz) = 27511 -SHA256 (gohugo/markbates-inflect-54ffb37_GH0.tar.gz) = 1dadb2d2c5f869c2d38bd627a1dc5ae068460035826dd5d6c4deba8f4495ca5e -SIZE (gohugo/markbates-inflect-54ffb37_GH0.tar.gz) = 10752 +SHA256 (gohugo/magiconair-properties-d419a98_GH0.tar.gz) = 88c65ec8e417bfbfced038dcc0d368ddacf767aebb2d992dd7f397e51f98a3cd +SIZE (gohugo/magiconair-properties-d419a98_GH0.tar.gz) = 27710 +SHA256 (gohugo/markbates-inflect-a12c3ae_GH0.tar.gz) = f2849b7cd73f15d391ccc1375e0430f7c3ed32fb612f5a2834015450d0d0491a +SIZE (gohugo/markbates-inflect-a12c3ae_GH0.tar.gz) = 10753 SHA256 (gohugo/mattn-go-runewidth-9e777a8_GH0.tar.gz) = 4249ccc1fa807f20a7034e8e8f792fbd939509ff52e8488c6e1d173f7dd3c41e SIZE (gohugo/mattn-go-runewidth-9e777a8_GH0.tar.gz) = 22363 SHA256 (gohugo/miekg-mmark-fd2f6c1_GH0.tar.gz) = 5651c08280f6d8468b30c53368f23722b868206427c905c3d6ac6022e7185945 SIZE (gohugo/miekg-mmark-fd2f6c1_GH0.tar.gz) = 198722 -SHA256 (gohugo/mitchellh-mapstructure-06020f8_GH0.tar.gz) = d2aea9fa20b0d1ee75a1e2745e07e11e1b00e224c6b8fb407d0c52c3144bf505 -SIZE (gohugo/mitchellh-mapstructure-06020f8_GH0.tar.gz) = 15602 +SHA256 (gohugo/mitchellh-mapstructure-b4575ee_GH0.tar.gz) = 8a270916744ad1946404252571ee6d4fddddca3b122fc1a313599769f2e2f89c +SIZE (gohugo/mitchellh-mapstructure-b4575ee_GH0.tar.gz) = 16269 SHA256 (gohugo/nicksnyder-go-i18n-0dc1626_GH0.tar.gz) = 85469070e822c4102fb3d60f30c099d3aa0675cb7e0109448958324b904d38f0 SIZE (gohugo/nicksnyder-go-i18n-0dc1626_GH0.tar.gz) = 39643 -SHA256 (gohugo/olekukonko-tablewriter-65fec0d_GH0.tar.gz) = 01d2d40a65082b35fad4075bf3ea71a6f71eac1a46bbd2ece1c0f3e90b783aab -SIZE (gohugo/olekukonko-tablewriter-65fec0d_GH0.tar.gz) = 15181 +SHA256 (gohugo/olekukonko-tablewriter-96aac99_GH0.tar.gz) = 56fdc7f22f517b0f00666030e43cac8e18382820b9162f7566e483eba9625229 +SIZE (gohugo/olekukonko-tablewriter-96aac99_GH0.tar.gz) = 15412 SHA256 (gohugo/pelletier-go-toml-16398ba_GH0.tar.gz) = 3311e22c1ca1e67a116eceaf5e03931cb9295168231ae7a57c1fd691c71a8f1f SIZE (gohugo/pelletier-go-toml-16398ba_GH0.tar.gz) = 52288 SHA256 (gohugo/pmezard-go-difflib-792786c_GH0.tar.gz) = 7c2a6d7ea0700411ba7d13865230c03bd6734d3ff6c213357bda121f5bb707fb @@ -69,35 +67,35 @@ SHA256 (gohugo/russross-blackfriday-4048872_GH0.tar.gz) = 74cc38a29545e088d15e8b SIZE (gohugo/russross-blackfriday-4048872_GH0.tar.gz) = 74249 SHA256 (gohugo/shurcooL-sanitized_anchor_name-86672fc_GH0.tar.gz) = 01ba94d077da9cac1a008e46dcb77ec36b83c96712fbedfe77cdef7818899996 SIZE (gohugo/shurcooL-sanitized_anchor_name-86672fc_GH0.tar.gz) = 2059 -SHA256 (gohugo/spf13-afero-ec3a311_GH0.tar.gz) = 05a99c3481e88d388abdf9f25f2c0bd2019bd7c5c7ac34ed3b2199f6788fc0ba -SIZE (gohugo/spf13-afero-ec3a311_GH0.tar.gz) = 43586 +SHA256 (gohugo/spf13-afero-bb8f192_GH0.tar.gz) = e8d475de6caaf29d1303dcdc116315c623fdbc399bb879f53bc332c9eaebf15f +SIZE (gohugo/spf13-afero-bb8f192_GH0.tar.gz) = 43565 SHA256 (gohugo/spf13-cast-acbeb36_GH0.tar.gz) = 403d9ba0ea7655ad375cf31e9ff1fece4425b3795fc47eb86e824ab6ac6ef620 SIZE (gohugo/spf13-cast-acbeb36_GH0.tar.gz) = 9588 -SHA256 (gohugo/spf13-cobra-7b2c5ac_GH0.tar.gz) = 766e8adfe04c68578303c0458d6336b89538cbc9456cad07c26bd70bbca8837c -SIZE (gohugo/spf13-cobra-7b2c5ac_GH0.tar.gz) = 101517 +SHA256 (gohugo/spf13-cobra-b95ab73_GH0.tar.gz) = 39c7bc9003be9f639dee311288745d7972d0701d83a2a0e99c89cd684dc535a1 +SIZE (gohugo/spf13-cobra-b95ab73_GH0.tar.gz) = 99104 SHA256 (gohugo/spf13-fsync-12a01e6_GH0.tar.gz) = f3d5520a8dba6d57618db9a869abeb23f349ec20c177f5fa8957588bb987e0aa SIZE (gohugo/spf13-fsync-12a01e6_GH0.tar.gz) = 4840 -SHA256 (gohugo/spf13-jWalterWeatherman-12bd96e_GH0.tar.gz) = 58740d954bd3cb9c3f3e34581a62403d8d32bab3491422276bc2b1c339f6ec85 -SIZE (gohugo/spf13-jWalterWeatherman-12bd96e_GH0.tar.gz) = 6342 +SHA256 (gohugo/spf13-jWalterWeatherman-7c0cea3_GH0.tar.gz) = ee1fa0fb1f9a9df8b93a15f67a42322eccfe1e314f489cf1909a7c3ac37dcc7d +SIZE (gohugo/spf13-jWalterWeatherman-7c0cea3_GH0.tar.gz) = 6345 SHA256 (gohugo/spf13-nitro-24d7ef3_GH0.tar.gz) = e64c8d195990c3aa57c47cc4f090b1f575fa712b8b2fa3f8bdb2dc1b76ec440a SIZE (gohugo/spf13-nitro-24d7ef3_GH0.tar.gz) = 6741 SHA256 (gohugo/spf13-pflag-e57e3ee_GH0.tar.gz) = 16556b4873f12211cffec75aa4d3a6332efa26e64ff0476fdbd99f672ca37d51 SIZE (gohugo/spf13-pflag-e57e3ee_GH0.tar.gz) = 38998 SHA256 (gohugo/spf13-viper-25b30aa_GH0.tar.gz) = 1c122475eae91ebeeb20e799f8eaec0e4ae3f3dce18cfbe244dc9292dbf2373a SIZE (gohugo/spf13-viper-25b30aa_GH0.tar.gz) = 30808 -SHA256 (gohugo/stretchr-testify-69483b4_GH0.tar.gz) = 4f0aa4ed2d03c2c844fb8913a720e03473b8bf439cd906302a53af0aae6c14e8 -SIZE (gohugo/stretchr-testify-69483b4_GH0.tar.gz) = 83325 +SHA256 (gohugo/stretchr-testify-b91bfb9_GH0.tar.gz) = 2399ef1836af6e6d54140946f4c6a8edd7fbf6c971799829da4ed4db051a857f +SIZE (gohugo/stretchr-testify-b91bfb9_GH0.tar.gz) = 136577 SHA256 (gohugo/yosssi-ace-ea038f4_GH0.tar.gz) = 0d8da272af4618613b62f6f28fff6142d285c70de0658b8c328f588a690e4b85 SIZE (gohugo/yosssi-ace-ea038f4_GH0.tar.gz) = 23269 -SHA256 (gohugo/golang-image-f7e31b4_GH0.tar.gz) = 6966bd2043666678b1a25cc903c266fd83f90c547f7c50e95e2386a845573cab -SIZE (gohugo/golang-image-f7e31b4_GH0.tar.gz) = 4813633 -SHA256 (gohugo/golang-net-cd69bc3_GH0.tar.gz) = 276bc9b5781cce0af006eeaa18403b35e3c2212457ddcd6554ebe386d28dba81 -SIZE (gohugo/golang-net-cd69bc3_GH0.tar.gz) = 923070 +SHA256 (gohugo/golang-image-12117c1_GH0.tar.gz) = f5e9ceef0e58238388a7c75083c436ec93781829923de5ee9b8848364887bfaf +SIZE (gohugo/golang-image-12117c1_GH0.tar.gz) = 4816520 +SHA256 (gohugo/golang-net-5ccada7_GH0.tar.gz) = d00aa81bae40d42ff74f2127dd1c5425324858d9422eebe87b0124aad4474c04 +SIZE (gohugo/golang-net-5ccada7_GH0.tar.gz) = 929708 SHA256 (gohugo/golang-sync-fd80eb9_GH0.tar.gz) = bae73bd7b81336d67b38c72e55b185bcb5a3e194f1210dc475fc811d32afaff4 SIZE (gohugo/golang-sync-fd80eb9_GH0.tar.gz) = 16385 -SHA256 (gohugo/golang-sys-8dbc5d0_GH0.tar.gz) = c7feac70988df0be4fcc9d135b50be8cc7f8cd34b046dcb38fa8709933ecc917 -SIZE (gohugo/golang-sys-8dbc5d0_GH0.tar.gz) = 770027 -SHA256 (gohugo/golang-text-c01e476_GH0.tar.gz) = a9cfeb85a04742d267ec4417364b97f9a47258ba8df3b5d9c0d5f330fdfbbae7 -SIZE (gohugo/golang-text-c01e476_GH0.tar.gz) = 4624513 -SHA256 (gohugo/go-yaml-yaml-eb3733d_GH0.tar.gz) = d2ae44f0e31f3a13a1b89a55ceaabcbab4d588d41951fd2243739b60b10146bb -SIZE (gohugo/go-yaml-yaml-eb3733d_GH0.tar.gz) = 64686 +SHA256 (gohugo/golang-sys-810d700_GH0.tar.gz) = a7bc0063d364a72c71ac9348c9ebb41d7aa8c5f09f7bfa0504eee42991816232 +SIZE (gohugo/golang-sys-810d700_GH0.tar.gz) = 791077 +SHA256 (gohugo/golang-text-e19ae14_GH0.tar.gz) = 1b1c7609e3a77300547de282a6693b1d779bbfd051c3d98ae3af73c7a9a4958d +SIZE (gohugo/golang-text-e19ae14_GH0.tar.gz) = 6113358 +SHA256 (gohugo/go-yaml-yaml-d670f94_GH0.tar.gz) = 4463e4d645c426bafeb6ad3b479bd16b7245637609cb5da27b89fca40ebf87a5 +SIZE (gohugo/go-yaml-yaml-d670f94_GH0.tar.gz) = 64752 diff --git a/www/guacamole-client/Makefile b/www/guacamole-client/Makefile index c89ac8a72d1..2460282d1c4 100644 --- a/www/guacamole-client/Makefile +++ b/www/guacamole-client/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= guacamole-client -PORTVERSION= 0.9.13 -DISTVERSIONSUFFIX= -incubating +DISTVERSION= 0.9.14 CATEGORIES= www java MASTER_SITES+= https://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo \ http://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo -DISTFILES= repository-${PORTVERSION}${EXTRACT_SUFX}:repo +DISTFILES= repository-${DISTVERSION}${EXTRACT_SUFX}:repo DIST_SUBDIR= ${PORTNAME} MAINTAINER= ultima@FreeBSD.org @@ -24,7 +23,6 @@ JAVA_VERSION= 1.8+ USE_GITHUB= yes GH_ACCOUNT= apache -GH_PROJECT= incubator-guacamole-client MVN= mvn MVN_ARGS= package -Duser.home=${WRKDIR} @@ -43,7 +41,7 @@ TOMCAT_DESC= Use Tomcat as your servlet TOMCAT_RUN_DEPENDS= ${LOCALBASE}/apache-tomcat-8.0/bin/bootstrap.jar:www/tomcat8 SERVER_RUN_DEPENDS= guacd:net/guacamole-server -AUTH_EXTENSION= duo cas header ldap noauth +AUTH_EXTENSION= cas duo header ldap noauth openid .include diff --git a/www/guacamole-client/distinfo b/www/guacamole-client/distinfo index 7dcb4e9cabe..b5db388296b 100644 --- a/www/guacamole-client/distinfo +++ b/www/guacamole-client/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1501628487 -SHA256 (guacamole-client/repository-0.9.13.tar.xz) = 2e35f8dc60ba5cc38efe9e44155cd80d48f27418989edc56a4dc95eaf198368d -SIZE (guacamole-client/repository-0.9.13.tar.xz) = 51868452 -SHA256 (guacamole-client/apache-incubator-guacamole-client-0.9.13-incubating_GH0.tar.gz) = ca5e0ddf952dea3faff2b41e87f5b47b2bf235c8640d4193dcd6b3611b9d8ebd -SIZE (guacamole-client/apache-incubator-guacamole-client-0.9.13-incubating_GH0.tar.gz) = 5766007 +TIMESTAMP = 1516328642 +SHA256 (guacamole-client/repository-0.9.14.tar.xz) = e43889aec0a36c799283d935f4dc3889a62862c9cd68ef25f9ca930c0a113d5d +SIZE (guacamole-client/repository-0.9.14.tar.xz) = 48252548 +SHA256 (guacamole-client/apache-guacamole-client-0.9.14_GH0.tar.gz) = 2b2df9ee951696c29a2c1d9b0415c7d5742f3dee33da6dea4b52082bd8e04db0 +SIZE (guacamole-client/apache-guacamole-client-0.9.14_GH0.tar.gz) = 5821042 diff --git a/www/guacamole-client/pkg-plist b/www/guacamole-client/pkg-plist index e01eca042c0..79ef9554fdd 100644 --- a/www/guacamole-client/pkg-plist +++ b/www/guacamole-client/pkg-plist @@ -9,4 +9,5 @@ %%DATADIR%%/guacamole-auth-jdbc.tar.gz %%DATADIR%%/guacamole-auth-ldap.tar.gz %%DATADIR%%/guacamole-auth-noauth.tar.gz +%%DATADIR%%/guacamole-auth-openid.tar.gz %%DATADIR%%/guacamole.war diff --git a/www/phpbb3/Makefile b/www/phpbb3/Makefile index 7e3c316d8c8..bd092a76859 100644 --- a/www/phpbb3/Makefile +++ b/www/phpbb3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpbb -PORTVERSION= 3.2.1 +DISTVERSION= 3.2.2 CATEGORIES= www MASTER_SITES= https://www.phpbb.com/files/release/ PKGNAMESUFFIX= 3 diff --git a/www/phpbb3/distinfo b/www/phpbb3/distinfo index 62bdbfe4e05..4ef0961748f 100644 --- a/www/phpbb3/distinfo +++ b/www/phpbb3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500308139 -SHA256 (phpBB-3.2.1.tar.bz2) = ea1c7e08aa3466aa325deca5d8998a24d103bfecf23826ce61fe5390b6a09f71 -SIZE (phpBB-3.2.1.tar.bz2) = 4251107 +TIMESTAMP = 1516367024 +SHA256 (phpBB-3.2.2.tar.bz2) = bab64dbd79f6f1bf2c0c306b33cea460ffe58c56ff1e81aac87ee10545291302 +SIZE (phpBB-3.2.2.tar.bz2) = 4306763 diff --git a/www/phpbb3/pkg-plist b/www/phpbb3/pkg-plist index bc6cb83da66..bfc581e94d6 100644 --- a/www/phpbb3/pkg-plist +++ b/www/phpbb3/pkg-plist @@ -663,6 +663,7 @@ %%PHPBBDIR%%/phpbb/avatar/driver/upload.php %%PHPBBDIR%%/phpbb/avatar/manager.php %%PHPBBDIR%%/phpbb/cache/driver/apc.php +%%PHPBBDIR%%/phpbb/cache/driver/apcu.php %%PHPBBDIR%%/phpbb/cache/driver/base.php %%PHPBBDIR%%/phpbb/cache/driver/driver_interface.php %%PHPBBDIR%%/phpbb/cache/driver/dummy.php @@ -940,6 +941,7 @@ %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v3110rc1.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v3111.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v3111rc1.php +%%PHPBBDIR%%/phpbb/db/migration/data/v31x/v3112.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v312.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v312rc1.php %%PHPBBDIR%%/phpbb/db/migration/data/v31x/v313.php @@ -985,7 +987,12 @@ %%PHPBBDIR%%/phpbb/db/migration/data/v320/v320rc2.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/.htaccess %%PHPBBDIR%%/phpbb/db/migration/data/v32x/cookie_notice_p2.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/email_force_sender.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/f_list_topics_permission_add.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/fix_user_styles.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/load_user_activity_limit.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/merge_duplicate_bbcodes.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/update_prosilver_bitfield.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/user_notifications_table_index_p1.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/user_notifications_table_index_p3.php @@ -995,6 +1002,8 @@ %%PHPBBDIR%%/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/v321.php %%PHPBBDIR%%/phpbb/db/migration/data/v32x/v321rc1.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/v322.php +%%PHPBBDIR%%/phpbb/db/migration/data/v32x/v322rc1.php %%PHPBBDIR%%/phpbb/db/migration/exception.php %%PHPBBDIR%%/phpbb/db/migration/helper.php %%PHPBBDIR%%/phpbb/db/migration/migration.php @@ -1068,6 +1077,7 @@ %%PHPBBDIR%%/phpbb/feed/news.php %%PHPBBDIR%%/phpbb/feed/overall.php %%PHPBBDIR%%/phpbb/feed/post_base.php +%%PHPBBDIR%%/phpbb/feed/quote_helper.php %%PHPBBDIR%%/phpbb/feed/topic.php %%PHPBBDIR%%/phpbb/feed/topic_base.php %%PHPBBDIR%%/phpbb/feed/topics.php @@ -1356,6 +1366,7 @@ %%PHPBBDIR%%/phpbb/textformatter/data_access.php %%PHPBBDIR%%/phpbb/textformatter/parser_interface.php %%PHPBBDIR%%/phpbb/textformatter/renderer_interface.php +%%PHPBBDIR%%/phpbb/textformatter/s9e/bbcode_merger.php %%PHPBBDIR%%/phpbb/textformatter/s9e/factory.php %%PHPBBDIR%%/phpbb/textformatter/s9e/link_helper.php %%PHPBBDIR%%/phpbb/textformatter/s9e/parser.php @@ -1850,6 +1861,7 @@ %%PHPBBDIR%%/vendor/marc1706/fast-image-size/lib/Type/TypePsd.php %%PHPBBDIR%%/vendor/marc1706/fast-image-size/lib/Type/TypeTif.php %%PHPBBDIR%%/vendor/marc1706/fast-image-size/lib/Type/TypeWbmp.php +%%PHPBBDIR%%/vendor/marc1706/fast-image-size/lib/Type/TypeWebp.php %%PHPBBDIR%%/vendor/ocramius/proxy-manager/.gitignore %%PHPBBDIR%%/vendor/ocramius/proxy-manager/.scrutinizer.yml %%PHPBBDIR%%/vendor/ocramius/proxy-manager/.travis.install.sh @@ -2421,6 +2433,7 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/RangeFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/RegexpFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/SimpletextFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/TimestampFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributeFilters/UintFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/AttributePreprocessor.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Items/TemplateDocument.php @@ -2436,10 +2449,8 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/ClosureCompilerApplication.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/ClosureCompilerService.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/FirstAvailable.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/HostedMinifier.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/MatthiasMullieMinify.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/Noop.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/Minifiers/RemoteCache.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/OnlineMinifier.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/RegexpConvertor.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/JavaScript/StylesheetCompressor.php @@ -2448,7 +2459,7 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RendererGenerators/Unformatted.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RendererGenerators/XSLT.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RendererGenerators/XSLT/Optimizer.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RulesGenerators/BlockElementsCloseFormattingElements.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RulesGenerators/AllowAll.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/RulesGenerators/ManageParagraphs.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/TemplateChecks/DisallowElement.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/TemplateChecks/DisallowFlashFullScreen.php @@ -2464,8 +2475,24 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Configurator/Validators/TemplateParameterName.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/BuiltInFilters.js -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/BuiltInFilters.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/EmailFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/EmailFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/FalseFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/FalseFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/HashmapFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/HashmapFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/MapFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/MapFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/NetworkFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/NetworkFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/NumericFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/NumericFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/RegexpFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/RegexpFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/TimestampFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/TimestampFilter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/UrlFilter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/AttributeFilters/UrlFilter.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/Logger.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/Logger.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Parser/NullLogger.js @@ -2525,8 +2552,34 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Keywords/Parser.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Keywords/Parser.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Configurator.php -%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/LinkAttributesSetter.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/LinkAttributesSetter.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/ParsedText.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/ParsedText.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/AbstractPass.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/AbstractScript.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/AbstractScript.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Blocks.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Blocks.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Emphasis.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Emphasis.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/ForcedLineBreaks.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/ForcedLineBreaks.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Images.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Images.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/InlineCode.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/InlineCode.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/LinkReferences.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/LinkReferences.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Links.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Links.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Strikethrough.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Strikethrough.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Subscript.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Subscript.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Superscript.js +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Litedown/Parser/Passes/Superscript.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/MediaEmbed/Configurator.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/MediaEmbed/Configurator/Collections/CachedDefinitionCollection.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/MediaEmbed/Configurator/Collections/SiteCollection.php @@ -2549,6 +2602,7 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Preg/Parser.js %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Plugins/Preg/Parser.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Renderer.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Renderers/PHP.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Renderers/Unformatted.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Renderers/XSLT.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Unparser.php @@ -2557,6 +2611,7 @@ %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Utils/Http/Client.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Utils/Http/Clients/Curl.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/Utils/Http/Clients/Native.php +%%PHPBBDIR%%/vendor/s9e/text-formatter/src/Utils/XPath.php %%PHPBBDIR%%/vendor/s9e/text-formatter/src/render.js %%PHPBBDIR%%/vendor/symfony/config/ConfigCache.php %%PHPBBDIR%%/vendor/symfony/config/ConfigCacheFactory.php @@ -3091,7 +3146,10 @@ %%PHPBBDIR%%/vendor/symfony/polyfill-php55/bootstrap.php %%PHPBBDIR%%/vendor/symfony/polyfill-php55/composer.json %%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LICENSE +%%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/Instantiator/LazyLoadingValueHolderFactoryV1.php +%%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/Instantiator/LazyLoadingValueHolderFactoryV2.php %%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/Instantiator/RuntimeInstantiator.php +%%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/PhpDumper/LazyLoadingValueHolderGenerator.php %%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/LazyProxy/PhpDumper/ProxyDumper.php %%PHPBBDIR%%/vendor/symfony/proxy-manager-bridge/composer.json %%PHPBBDIR%%/vendor/symfony/routing/Annotation/Route.php @@ -3346,6 +3404,7 @@ %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Parser.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/ParserInterface.php +%%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Profiler/Dumper/Base.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php @@ -3404,6 +3463,177 @@ %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/TokenStream.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php %%PHPBBDIR%%/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php +%%PHPBBDIR%%/vendor/twig/twig/src/Cache/CacheInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Cache/FilesystemCache.php +%%PHPBBDIR%%/vendor/twig/twig/src/Cache/NullCache.php +%%PHPBBDIR%%/vendor/twig/twig/src/Compiler.php +%%PHPBBDIR%%/vendor/twig/twig/src/Environment.php +%%PHPBBDIR%%/vendor/twig/twig/src/Error/Error.php +%%PHPBBDIR%%/vendor/twig/twig/src/Error/LoaderError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Error/RuntimeError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Error/SyntaxError.php +%%PHPBBDIR%%/vendor/twig/twig/src/ExpressionParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/AbstractExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/CoreExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/DebugExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/EscaperExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/ExtensionInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/GlobalsInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/InitRuntimeInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/OptimizerExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/ProfilerExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/SandboxExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/StagingExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/Extension/StringLoaderExtension.php +%%PHPBBDIR%%/vendor/twig/twig/src/FileExtensionEscapingStrategy.php +%%PHPBBDIR%%/vendor/twig/twig/src/Lexer.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/ArrayLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/ChainLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/ExistsLoaderInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/FilesystemLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/LoaderInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Loader/SourceContextLoaderInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Markup.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/AutoEscapeNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/BlockNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/BlockReferenceNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/BodyNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/CheckSecurityNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/DoNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/EmbedNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/AbstractExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/ArrayExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/AssignNameExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/AbstractBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/AddBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/AndBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BitwiseAndBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BitwiseOrBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BitwiseXorBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/ConcatBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/DivBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/EqualBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/FloorDivBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/GreaterBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/GreaterEqualBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/InBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/LessBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/LessEqualBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/MatchesBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/ModBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/MulBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/NotInBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/OrBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/PowerBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/RangeBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Binary/SubBinary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/BlockReferenceExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/CallExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/ConstantExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/FilterExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/FunctionExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/MethodCallExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/NameExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/ParentExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/TempNameExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/ConstantTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/DivisiblebyTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/EvenTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/NullTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/OddTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Test/SameasTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/TestExpression.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Unary/AbstractUnary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Unary/NegUnary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Unary/NotUnary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Expression/Unary/PosUnary.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/FlushNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/ForLoopNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/ForNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/IfNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/ImportNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/IncludeNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/MacroNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/ModuleNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/Node.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/NodeCaptureInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/NodeOutputInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/PrintNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SandboxNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SandboxedPrintNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SetNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SetTempNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/SpacelessNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/TextNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Node/WithNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeTraverser.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/SafeAnalysisNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/Parser.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Dumper/BaseDumper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Dumper/BlackfireDumper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Dumper/TextDumper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Node/EnterProfileNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Node/LeaveProfileNode.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php +%%PHPBBDIR%%/vendor/twig/twig/src/Profiler/Profile.php +%%PHPBBDIR%%/vendor/twig/twig/src/RuntimeLoader/ContainerRuntimeLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/RuntimeLoader/FactoryRuntimeLoader.php +%%PHPBBDIR%%/vendor/twig/twig/src/RuntimeLoader/RuntimeLoaderInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFilterError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFunctionError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedMethodError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedPropertyError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityNotAllowedTagError.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityPolicy.php +%%PHPBBDIR%%/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/Source.php +%%PHPBBDIR%%/vendor/twig/twig/src/Template.php +%%PHPBBDIR%%/vendor/twig/twig/src/TemplateWrapper.php +%%PHPBBDIR%%/vendor/twig/twig/src/Test/IntegrationTestCase.php +%%PHPBBDIR%%/vendor/twig/twig/src/Test/NodeTestCase.php +%%PHPBBDIR%%/vendor/twig/twig/src/Token.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/AutoEscapeTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/BlockTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/DoTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/EmbedTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/FilterTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/FlushTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/ForTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/FromTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/IfTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/ImportTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/IncludeTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/MacroTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/SandboxTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/SetTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/SpacelessTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/TokenParserInterface.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/UseTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenParser/WithTokenParser.php +%%PHPBBDIR%%/vendor/twig/twig/src/TokenStream.php +%%PHPBBDIR%%/vendor/twig/twig/src/TwigFilter.php +%%PHPBBDIR%%/vendor/twig/twig/src/TwigFunction.php +%%PHPBBDIR%%/vendor/twig/twig/src/TwigTest.php +%%PHPBBDIR%%/vendor/twig/twig/src/Util/DeprecationCollector.php +%%PHPBBDIR%%/vendor/twig/twig/src/Util/TemplateDirIterator.php %%PHPBBDIR%%/vendor/zendframework/zend-code/LICENSE.md %%PHPBBDIR%%/vendor/zendframework/zend-code/composer.json %%PHPBBDIR%%/vendor/zendframework/zend-code/src/Annotation/AnnotationCollection.php diff --git a/www/py-django-statici18n/Makefile b/www/py-django-statici18n/Makefile index 63ff50d5172..f9b9128ec79 100644 --- a/www/py-django-statici18n/Makefile +++ b/www/py-django-statici18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django-statici18n -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf@${FLAVOR} -USES= python:2.7-3.5 +USES= python:2.7-3.6 USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/www/py-django-statici18n/distinfo b/www/py-django-statici18n/distinfo index a55cc249459..ac9008b1c4f 100644 --- a/www/py-django-statici18n/distinfo +++ b/www/py-django-statici18n/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513039190 -SHA256 (django-statici18n-1.5.0.tar.gz) = b39792c5c52c20d36fd6300d19c51d3bf659fcdc58598c81846552503296ffbb -SIZE (django-statici18n-1.5.0.tar.gz) = 7106 +TIMESTAMP = 1516335484 +SHA256 (django-statici18n-1.6.0.tar.gz) = c0771cbcc1122138cd0d2566b33e6b22f23b80977708fd0c3c907a86500bd43b +SIZE (django-statici18n-1.6.0.tar.gz) = 7249 diff --git a/www/rubygem-cuba/Makefile b/www/rubygem-cuba/Makefile index 4308e9cb809..9e8b487148c 100644 --- a/www/rubygem-cuba/Makefile +++ b/www/rubygem-cuba/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cuba -PORTVERSION= 3.9.1 +PORTVERSION= 3.9.2 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-cuba/distinfo b/www/rubygem-cuba/distinfo index 4f3c738ae7e..ae00dd38007 100644 --- a/www/rubygem-cuba/distinfo +++ b/www/rubygem-cuba/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514465262 -SHA256 (rubygem/cuba-3.9.1.gem) = 00c2bec3d6e68783207baf2cad8aa6273f63f3cb6b41789849f9a13998d08cd7 -SIZE (rubygem/cuba-3.9.1.gem) = 24576 +TIMESTAMP = 1516281265 +SHA256 (rubygem/cuba-3.9.2.gem) = 7039124aafe8ec0bcc5e6c8a68d6511f2905cf2ede2d1878bbd1382dc32629fc +SIZE (rubygem/cuba-3.9.2.gem) = 24576 diff --git a/www/rubygem-geminabox/Makefile b/www/rubygem-geminabox/Makefile index d96b316ebac..a39e1193252 100644 --- a/www/rubygem-geminabox/Makefile +++ b/www/rubygem-geminabox/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= geminabox -PORTVERSION= 0.13.11 +PORTVERSION= 0.13.13 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-geminabox/distinfo b/www/rubygem-geminabox/distinfo index 39bf3ae6a7f..2dc0e09551b 100644 --- a/www/rubygem-geminabox/distinfo +++ b/www/rubygem-geminabox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510941565 -SHA256 (rubygem/geminabox-0.13.11.gem) = fd92494eedb016fe52cd342e753363441039cad12ccf460df028a65d1366313e -SIZE (rubygem/geminabox-0.13.11.gem) = 51200 +TIMESTAMP = 1516203838 +SHA256 (rubygem/geminabox-0.13.13.gem) = d693e8791d3434a201834e36c0965d9f5f278c0c373ec576d7ab6a4d1bfb2456 +SIZE (rubygem/geminabox-0.13.13.gem) = 51200 diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index dee2316db55..de97bdea077 100644 --- a/www/waterfox/Makefile +++ b/www/waterfox/Makefile @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org diff --git a/www/waterfox/files/patch-bug1331209 b/www/waterfox/files/patch-bug1331209 new file mode 100644 index 00000000000..e210d467a5e --- /dev/null +++ b/www/waterfox/files/patch-bug1331209 @@ -0,0 +1,571 @@ +commit b7088851d6e8 +Author: Jan Varga +Date: Sat Nov 4 23:13:20 2017 +0100 + + Bug 1331209 - Part 2: Fix incorrect FailOnNonOwningThread() calls; r=asuth +--- + dom/asmjscache/AsmJSCache.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index 227bf80f2ac4..ec1e3531fb4f 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -560,13 +560,13 @@ private: + // If shutdown just started, the QuotaManager may have been deleted. + QuotaManager* qm = QuotaManager::Get(); + if (!qm) { +- FailOnNonOwningThread(); ++ Fail(); + return; + } + + nsresult rv = qm->IOThread()->Dispatch(this, NS_DISPATCH_NORMAL); + if (NS_FAILED(rv)) { +- FailOnNonOwningThread(); ++ Fail(); + return; + } + } + +commit ea39dafe977a +Author: Jan Varga +Date: Sat Nov 4 23:13:41 2017 +0100 + + Bug 1331209 - Part 3: Allow sending of the __delete__ message in one direction only; r=asuth +--- + dom/asmjscache/AsmJSCache.cpp | 141 +++++++++++++++++++++++------------ + dom/asmjscache/PAsmJSCacheEntry.ipdl | 20 ++++- + 2 files changed, 111 insertions(+), 50 deletions(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index ec1e3531fb4f..2216149cd762 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -445,7 +445,6 @@ public: + mWriteParams(aWriteParams), + mState(eInitial), + mResult(JS::AsmJSCache_InternalError), +- mDeleteReceived(false), + mActorDestroyed(false), + mOpened(false) + { +@@ -493,12 +492,17 @@ private: + { + AssertIsOnOwningThread(); + MOZ_ASSERT(mState == eOpened); ++ MOZ_ASSERT(mResult == JS::AsmJSCache_Success); + + mState = eFinished; + + MOZ_ASSERT(mOpened); + + FinishOnOwningThread(); ++ ++ if (!mActorDestroyed) { ++ Unused << Send__delete__(this, mResult); ++ } + } + + // This method is called upon any failure that prevents the eventual opening +@@ -508,6 +512,7 @@ private: + { + AssertIsOnOwningThread(); + MOZ_ASSERT(mState != eFinished); ++ MOZ_ASSERT(mResult != JS::AsmJSCache_Success); + + mState = eFinished; + +@@ -515,7 +520,7 @@ private: + + FinishOnOwningThread(); + +- if (!mDeleteReceived && !mActorDestroyed) { ++ if (!mActorDestroyed) { + Unused << Send__delete__(this, mResult); + } + } +@@ -579,26 +584,6 @@ private: + DirectoryLockFailed() override; + + // IPDL methods. +- mozilla::ipc::IPCResult +- Recv__delete__(const JS::AsmJSCacheResult& aResult) override +- { +- AssertIsOnOwningThread(); +- MOZ_ASSERT(mState != eFinished); +- MOZ_ASSERT(!mDeleteReceived); +- +- mDeleteReceived = true; +- +- if (mOpened) { +- Close(); +- } else { +- Fail(); +- } +- +- MOZ_ASSERT(mState == eFinished); +- +- return IPC_OK(); +- } +- + void + ActorDestroy(ActorDestroyReason why) override + { +@@ -624,17 +609,59 @@ private: + } + + mozilla::ipc::IPCResult +- RecvSelectCacheFileToRead(const uint32_t& aModuleIndex) override ++ RecvSelectCacheFileToRead(const OpenMetadataForReadResponse& aResponse) ++ override + { + AssertIsOnOwningThread(); + MOZ_ASSERT(mState == eWaitingToOpenCacheFileForRead); + MOZ_ASSERT(mOpenMode == eOpenForRead); ++ MOZ_ASSERT(!mOpened); ++ ++ switch (aResponse.type()) { ++ case OpenMetadataForReadResponse::TAsmJSCacheResult: { ++ MOZ_ASSERT(aResponse.get_AsmJSCacheResult() != JS::AsmJSCache_Success); ++ ++ mResult = aResponse.get_AsmJSCacheResult(); ++ ++ // This ParentRunnable can only be held alive by the IPDL. Fail() ++ // clears that last reference. So we need to add a self reference here. ++ RefPtr kungFuDeathGrip = this; ++ ++ Fail(); ++ ++ break; ++ } ++ ++ case OpenMetadataForReadResponse::Tuint32_t: ++ // A cache entry has been selected to open. ++ mModuleIndex = aResponse.get_uint32_t(); ++ ++ mState = eReadyToOpenCacheFileForRead; ++ ++ DispatchToIOThread(); ++ ++ break; + +- // A cache entry has been selected to open. ++ default: ++ MOZ_CRASH("Should never get here!"); ++ } ++ ++ return IPC_OK(); ++ } ++ ++ mozilla::ipc::IPCResult ++ RecvClose() override ++ { ++ AssertIsOnOwningThread(); ++ MOZ_ASSERT(mState == eOpened); + +- mModuleIndex = aModuleIndex; +- mState = eReadyToOpenCacheFileForRead; +- DispatchToIOThread(); ++ // This ParentRunnable can only be held alive by the IPDL. Close() clears ++ // that last reference. So we need to add a self reference here. ++ RefPtr kungFuDeathGrip = this; ++ ++ Close(); ++ ++ MOZ_ASSERT(mState == eFinished); + + return IPC_OK(); + } +@@ -675,7 +702,6 @@ private: + State mState; + JS::AsmJSCacheResult mResult; + +- bool mDeleteReceived; + bool mActorDestroyed; + bool mOpened; + }; +@@ -1021,10 +1047,6 @@ ParentRunnable::Run() + + mState = eOpened; + +- // The entry is now open. +- MOZ_ASSERT(!mOpened); +- mOpened = true; +- + FileDescriptor::PlatformHandleType handle = + FileDescriptor::PlatformHandleType(PR_FileDesc2NativeHandle(mFileDesc)); + if (!SendOnOpenCacheFile(mFileSize, FileDescriptor(handle))) { +@@ -1032,6 +1054,12 @@ ParentRunnable::Run() + return NS_OK; + } + ++ // The entry is now open. ++ MOZ_ASSERT(!mOpened); ++ mOpened = true; ++ ++ mResult = JS::AsmJSCache_Success; ++ + return NS_OK; + } + +@@ -1291,15 +1319,16 @@ private: + MOZ_ASSERT(mState == eOpening); + + uint32_t moduleIndex; +- if (!FindHashMatch(aMetadata, mReadParams, &moduleIndex)) { +- Fail(JS::AsmJSCache_InternalError); +- Send__delete__(this, JS::AsmJSCache_InternalError); +- return IPC_OK(); ++ bool ok; ++ if (FindHashMatch(aMetadata, mReadParams, &moduleIndex)) { ++ ok = SendSelectCacheFileToRead(moduleIndex); ++ } else { ++ ok = SendSelectCacheFileToRead(JS::AsmJSCache_InternalError); + } +- +- if (!SendSelectCacheFileToRead(moduleIndex)) { ++ if (!ok) { + return IPC_FAIL_NO_REASON(this); + } ++ + return IPC_OK(); + } + +@@ -1327,9 +1356,20 @@ private: + Recv__delete__(const JS::AsmJSCacheResult& aResult) override + { + MOZ_ASSERT(NS_IsMainThread()); +- MOZ_ASSERT(mState == eOpening); ++ MOZ_ASSERT(mState == eOpening || mState == eFinishing); ++ MOZ_ASSERT_IF(mState == eOpening, aResult != JS::AsmJSCache_Success); ++ MOZ_ASSERT_IF(mState == eFinishing, aResult == JS::AsmJSCache_Success); + +- Fail(aResult); ++ if (mState == eOpening) { ++ Fail(aResult); ++ } else { ++ // Match the AddRef in BlockUntilOpen(). The IPDL still holds an ++ // outstanding ref which will keep 'this' alive until ActorDestroy() ++ // is executed. ++ Release(); ++ ++ mState = eFinished; ++ } + return IPC_OK(); + } + +@@ -1395,6 +1435,7 @@ private: + eOpening, // Waiting for the parent process to respond + eOpened, // Parent process opened the entry and sent it back + eClosing, // Waiting to be dispatched to the main thread to Send__delete__ ++ eFinishing, // Waiting for the parent process to close + eFinished // Terminal state + }; + State mState; +@@ -1454,28 +1495,32 @@ ChildRunnable::Run() + + // Per FileDescriptorHolder::Finish()'s comment, call before + // releasing the directory lock (which happens in the parent upon receipt +- // of the Send__delete__ message). ++ // of the Close message). + FileDescriptorHolder::Finish(); + + MOZ_ASSERT(mOpened); + mOpened = false; + +- // Match the AddRef in BlockUntilOpen(). The main thread event loop still +- // holds an outstanding ref which will keep 'this' alive until returning to +- // the event loop. +- Release(); ++ if (mActorDestroyed) { ++ // Match the AddRef in BlockUntilOpen(). The main thread event loop ++ // still holds an outstanding ref which will keep 'this' alive until ++ // returning to the event loop. ++ Release(); + +- if (!mActorDestroyed) { +- Unused << Send__delete__(this, JS::AsmJSCache_Success); ++ mState = eFinished; ++ } else { ++ Unused << SendClose(); ++ ++ mState = eFinishing; + } + +- mState = eFinished; + return NS_OK; + } + + case eBackgroundChildPending: + case eOpening: + case eOpened: ++ case eFinishing: + case eFinished: { + MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("Shouldn't Run() in this state"); + } +diff --git dom/asmjscache/PAsmJSCacheEntry.ipdl dom/asmjscache/PAsmJSCacheEntry.ipdl +index d16c9284ff9d..bb88a25b5615 100644 +--- dom/asmjscache/PAsmJSCacheEntry.ipdl ++++ dom/asmjscache/PAsmJSCacheEntry.ipdl +@@ -11,6 +11,12 @@ namespace mozilla { + namespace dom { + namespace asmjscache { + ++union OpenMetadataForReadResponse ++{ ++ AsmJSCacheResult; ++ uint32_t; ++}; ++ + protocol PAsmJSCacheEntry + { + manager PBackground; +@@ -21,14 +27,24 @@ protocol PAsmJSCacheEntry + child: + async OnOpenMetadataForRead(Metadata metadata); + parent: +- async SelectCacheFileToRead(uint32_t moduleIndex); ++ async SelectCacheFileToRead(OpenMetadataForReadResponse response); + + child: + // Once the cache file has been opened, the child is notified and sent an + // open file descriptor. + async OnOpenCacheFile(int64_t fileSize, FileDescriptor fileDesc); + +-both: ++parent: ++ // When the child process is done with the cache entry, the parent process ++ // is notified (via Close). ++ async Close(); ++ ++child: ++ // When there's an error during the opening phase, the child process is ++ // notified (via __delete__) and sent an error result. ++ // When the parent process receives the Close message, it closes the cache ++ // entry on the parent side and the child is notified (via __delete__). ++ // The protocol is destroyed in both cases. + async __delete__(AsmJSCacheResult result); + }; + + +commit 04d80fd8932a +Author: Jan Varga +Date: Sat Nov 4 23:13:51 2017 +0100 + + Bug 1331209 - Part 4: Prevent the state machine from continuing if QM is shutting down or the actor has been destroyed; r=asuth +--- + dom/asmjscache/AsmJSCache.cpp | 97 +++++++++++++++++++++++++++++++++++++------ + 1 file changed, 84 insertions(+), 13 deletions(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index 2216149cd762..7c96bc71ac0a 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -443,6 +443,7 @@ public: + mPrincipalInfo(aPrincipalInfo), + mOpenMode(aOpenMode), + mWriteParams(aWriteParams), ++ mOperationMayProceed(true), + mState(eInitial), + mResult(JS::AsmJSCache_InternalError), + mActorDestroyed(false), +@@ -485,6 +486,22 @@ private: + MOZ_ASSERT(!IsOnOwningThread()); + } + ++ bool ++ IsActorDestroyed() const ++ { ++ AssertIsOnOwningThread(); ++ ++ return mActorDestroyed; ++ } ++ ++ // May be called on any thread, but you should call IsActorDestroyed() if ++ // you know you're on the background thread because it is slightly faster. ++ bool ++ OperationMayProceed() const ++ { ++ return mOperationMayProceed; ++ } ++ + // This method is called on the owning thread when the JS engine is finished + // reading/writing the cache entry. + void +@@ -497,6 +514,7 @@ private: + mState = eFinished; + + MOZ_ASSERT(mOpened); ++ mOpened = false; + + FinishOnOwningThread(); + +@@ -562,13 +580,15 @@ private: + { + AssertIsOnOwningThread(); + +- // If shutdown just started, the QuotaManager may have been deleted. +- QuotaManager* qm = QuotaManager::Get(); +- if (!qm) { ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { + Fail(); + return; + } + ++ QuotaManager* qm = QuotaManager::Get(); ++ MOZ_ASSERT(qm); ++ + nsresult rv = qm->IOThread()->Dispatch(this, NS_DISPATCH_NORMAL); + if (NS_FAILED(rv)) { + Fail(); +@@ -589,23 +609,30 @@ private: + { + AssertIsOnOwningThread(); + MOZ_ASSERT(!mActorDestroyed); ++ MOZ_ASSERT(mOperationMayProceed); + + mActorDestroyed = true; ++ mOperationMayProceed = false; + +- // Assume ActorDestroy can happen at any time, so probe the current state to +- // determine what needs to happen. +- +- if (mState == eFinished) { +- return; +- } ++ // Assume ActorDestroy can happen at any time, so we can't probe the ++ // current state since mState can be modified on any thread (only one ++ // thread at a time based on the state machine). ++ // However we can use mOpened which is only touched on the owning thread. ++ // If mOpened is true, we can also modify mState since we are guaranteed ++ // that there are no pending runnables which would probe mState to decide ++ // what code needs to run (there shouldn't be any running runnables on ++ // other threads either). + + if (mOpened) { + Close(); +- } else { +- Fail(); ++ ++ MOZ_ASSERT(mState == eFinished); + } + +- MOZ_ASSERT(mState == eFinished); ++ // We don't have to call Fail() if mOpened is not true since it means that ++ // either nothing has been initialized yet, so nothing to cleanup or there ++ // are pending runnables that will detect that the actor has been destroyed ++ // and call Fail(). + } + + mozilla::ipc::IPCResult +@@ -617,6 +644,11 @@ private: + MOZ_ASSERT(mOpenMode == eOpenForRead); + MOZ_ASSERT(!mOpened); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread())) { ++ Fail(); ++ return IPC_OK(); ++ } ++ + switch (aResponse.type()) { + case OpenMetadataForReadResponse::TAsmJSCacheResult: { + MOZ_ASSERT(aResponse.get_AsmJSCacheResult() != JS::AsmJSCache_Success); +@@ -682,6 +714,8 @@ private: + nsCOMPtr mMetadataFile; + Metadata mMetadata; + ++ Atomic mOperationMayProceed; ++ + // State initialized during eWaitingToOpenCacheFileForRead + unsigned mModuleIndex; + +@@ -942,6 +976,12 @@ ParentRunnable::Run() + case eInitial: { + MOZ_ASSERT(NS_IsMainThread()); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnNonBackgroundThread()) || ++ !OperationMayProceed()) { ++ FailOnNonOwningThread(); ++ return NS_OK; ++ } ++ + rv = InitOnMainThread(); + if (NS_FAILED(rv)) { + FailOnNonOwningThread(); +@@ -957,7 +997,8 @@ ParentRunnable::Run() + case eWaitingToFinishInit: { + AssertIsOnOwningThread(); + +- if (QuotaManager::IsShuttingDown()) { ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { + Fail(); + return NS_OK; + } +@@ -976,6 +1017,12 @@ ParentRunnable::Run() + case eWaitingToOpenDirectory: { + AssertIsOnOwningThread(); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { ++ Fail(); ++ return NS_OK; ++ } ++ + if (NS_WARN_IF(!QuotaManager::Get())) { + Fail(); + return NS_OK; +@@ -988,6 +1035,12 @@ ParentRunnable::Run() + case eReadyToReadMetadata: { + AssertIsOnIOThread(); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnNonBackgroundThread()) || ++ !OperationMayProceed()) { ++ FailOnNonOwningThread(); ++ return NS_OK; ++ } ++ + rv = ReadMetadata(); + if (NS_FAILED(rv)) { + FailOnNonOwningThread(); +@@ -1016,6 +1069,12 @@ ParentRunnable::Run() + AssertIsOnOwningThread(); + MOZ_ASSERT(mOpenMode == eOpenForRead); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { ++ Fail(); ++ return NS_OK; ++ } ++ + mState = eWaitingToOpenCacheFileForRead; + + // Metadata is now open. +@@ -1031,6 +1090,12 @@ ParentRunnable::Run() + AssertIsOnIOThread(); + MOZ_ASSERT(mOpenMode == eOpenForRead); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnNonBackgroundThread()) || ++ !OperationMayProceed()) { ++ FailOnNonOwningThread(); ++ return NS_OK; ++ } ++ + rv = OpenCacheFileForRead(); + if (NS_FAILED(rv)) { + FailOnNonOwningThread(); +@@ -1045,6 +1110,12 @@ ParentRunnable::Run() + case eSendingCacheFile: { + AssertIsOnOwningThread(); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread()) || ++ IsActorDestroyed()) { ++ Fail(); ++ return NS_OK; ++ } ++ + mState = eOpened; + + FileDescriptor::PlatformHandleType handle = diff --git a/www/waterfox/files/patch-bug1389561 b/www/waterfox/files/patch-bug1389561 new file mode 100644 index 00000000000..392628d98f1 --- /dev/null +++ b/www/waterfox/files/patch-bug1389561 @@ -0,0 +1,758 @@ +commit 06e22a681925 +Author: Shawn Huang +Date: Thu Oct 26 16:59:18 2017 +0800 + + Bug 1389561 - Part 1: Ensure origin initialized in Maintenance::DirectoryWork. r=janv + + Make sure origins had been initialized in Maintenance::DirectoryWork before getting + QuotaObject. It's possible that DatabaseMaintenance::Run before origins initialized. +--- + dom/indexedDB/ActorsParent.cpp | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git dom/indexedDB/ActorsParent.cpp dom/indexedDB/ActorsParent.cpp +index de613cc4eec0..06ffc9df84fa 100644 +--- dom/indexedDB/ActorsParent.cpp ++++ dom/indexedDB/ActorsParent.cpp +@@ -18602,6 +18602,7 @@ Maintenance::DirectoryWork() + continue; + } + ++ nsCString suffix; + nsCString group; + nsCString origin; + nsTArray databasePaths; +@@ -18659,17 +18660,17 @@ Maintenance::DirectoryWork() + + // Found a database. + if (databasePaths.IsEmpty()) { ++ MOZ_ASSERT(suffix.IsEmpty()); + MOZ_ASSERT(group.IsEmpty()); + MOZ_ASSERT(origin.IsEmpty()); + + int64_t dummyTimeStamp; + bool dummyPersisted; +- nsCString dummySuffix; + if (NS_WARN_IF(NS_FAILED( + quotaManager->GetDirectoryMetadata2(originDir, + &dummyTimeStamp, + &dummyPersisted, +- dummySuffix, ++ suffix, + group, + origin)))) { + // Not much we can do here... +@@ -18687,6 +18688,21 @@ Maintenance::DirectoryWork() + group, + origin, + Move(databasePaths))); ++ ++ nsCOMPtr directory; ++ ++ // Idle maintenance may occur before origin is initailized. ++ // Ensure origin is initialized first. It will initialize all origins ++ // for temporary storage including IDB origins. ++ rv = quotaManager->EnsureOriginIsInitialized(persistenceType, ++ suffix, ++ group, ++ origin, ++ getter_AddRefs(directory)); ++ ++ if (NS_WARN_IF(NS_FAILED(rv))) { ++ return rv; ++ } + } + } + } +commit a9f850009e15 +Author: Shawn Huang +Date: Thu Nov 2 14:54:07 2017 +0800 + + Bug 1389561 - Part 2: Wait for idle maintenance releasing DirectoryLock when finished. r=janv +--- + dom/indexedDB/ActorsParent.cpp | 68 +++++++++++++++++++++++++++++++----------- + 1 file changed, 51 insertions(+), 17 deletions(-) + +diff --git dom/indexedDB/ActorsParent.cpp dom/indexedDB/ActorsParent.cpp +index 47d621909119..cf3d32ef8fff 100644 +--- dom/indexedDB/ActorsParent.cpp ++++ dom/indexedDB/ActorsParent.cpp +@@ -17984,11 +17984,22 @@ QuotaClient::ShutdownWorkThreads() + + mShutdownRequested = true; + ++ // Shutdown maintenance thread pool (this spins the event loop until all ++ // threads are gone). This should release any maintenance related quota ++ // objects. + if (mMaintenanceThreadPool) { + mMaintenanceThreadPool->Shutdown(); + mMaintenanceThreadPool = nullptr; + } + ++ // Let any runnables dispatched from dying maintenance threads to be ++ // processed. This should release any maintenance related directory locks. ++ if (mCurrentMaintenance) { ++ MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { ++ return !mCurrentMaintenance; ++ })); ++ } ++ + RefPtr connectionPool = gConnectionPool.get(); + if (connectionPool) { + connectionPool->Shutdown(); +@@ -18312,7 +18323,8 @@ Maintenance::Start() + AssertIsOnBackgroundThread(); + MOZ_ASSERT(mState == State::Initial); + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18336,7 +18348,8 @@ Maintenance::CreateIndexedDatabaseManager() + MOZ_ASSERT(NS_IsMainThread()); + MOZ_ASSERT(mState == State::CreateIndexedDatabaseManager); + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18361,7 +18374,8 @@ Maintenance::OpenDirectory() + MOZ_ASSERT(!mDirectoryLock); + MOZ_ASSERT(QuotaManager::Get()); + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18385,7 +18399,8 @@ Maintenance::DirectoryOpen() + MOZ_ASSERT(mState == State::DirectoryOpenPending); + MOZ_ASSERT(mDirectoryLock); + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18415,7 +18430,8 @@ Maintenance::DirectoryWork() + // We have to find all database files that match any persistence type and any + // origin. We ignore anything out of the ordinary for now. + +- if (IsAborted()) { ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ IsAborted()) { + return NS_ERROR_ABORT; + } + +@@ -18754,6 +18770,11 @@ Maintenance::BeginDatabaseMaintenance() + } + }; + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) || ++ IsAborted()) { ++ return NS_ERROR_ABORT; ++ } ++ + RefPtr threadPool; + + for (DirectoryInfo& directoryInfo : mDirectoryInfos) { +@@ -18940,6 +18961,11 @@ DatabaseMaintenance::PerformMaintenanceOnDatabase() + } + }; + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return; ++ } ++ + nsCOMPtr databaseFile = GetFileForPath(mDatabasePath); + MOZ_ASSERT(databaseFile); + +@@ -18956,10 +18982,6 @@ DatabaseMaintenance::PerformMaintenanceOnDatabase() + + AutoClose autoClose(connection); + +- if (mMaintenance->IsAborted()) { +- return; +- } +- + AutoProgressHandler progressHandler(mMaintenance); + if (NS_WARN_IF(NS_FAILED(progressHandler.Register(connection)))) { + return; +@@ -18978,20 +19000,12 @@ DatabaseMaintenance::PerformMaintenanceOnDatabase() + return; + } + +- if (mMaintenance->IsAborted()) { +- return; +- } +- + MaintenanceAction maintenanceAction; + rv = DetermineMaintenanceAction(connection, databaseFile, &maintenanceAction); + if (NS_WARN_IF(NS_FAILED(rv))) { + return; + } + +- if (mMaintenance->IsAborted()) { +- return; +- } +- + switch (maintenanceAction) { + case MaintenanceAction::Nothing: + break; +@@ -19018,6 +19032,11 @@ DatabaseMaintenance::CheckIntegrity(mozIStorageConnection* aConnection, + MOZ_ASSERT(aConnection); + MOZ_ASSERT(aOk); + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return NS_ERROR_ABORT; ++ } ++ + nsresult rv; + + // First do a full integrity_check. Scope statements tightly here because +@@ -19135,6 +19154,11 @@ DatabaseMaintenance::DetermineMaintenanceAction( + MOZ_ASSERT(aDatabaseFile); + MOZ_ASSERT(aMaintenanceAction); + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return NS_ERROR_ABORT; ++ } ++ + int32_t schemaVersion; + nsresult rv = aConnection->GetSchemaVersion(&schemaVersion); + if (NS_WARN_IF(NS_FAILED(rv))) { +@@ -19344,6 +19368,11 @@ DatabaseMaintenance::IncrementalVacuum(mozIStorageConnection* aConnection) + MOZ_ASSERT(!IsOnBackgroundThread()); + MOZ_ASSERT(aConnection); + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return; ++ } ++ + nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( + "PRAGMA incremental_vacuum;" + )); +@@ -19361,6 +19390,11 @@ DatabaseMaintenance::FullVacuum(mozIStorageConnection* aConnection, + MOZ_ASSERT(aConnection); + MOZ_ASSERT(aDatabaseFile); + ++ if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) || ++ mMaintenance->IsAborted()) { ++ return; ++ } ++ + nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( + "VACUUM;" + )); +commit 5d30f2130fd9 +Author: Shawn Huang +Date: Wed Nov 1 11:14:20 2017 +0800 + + Bug 1389561 - Part 3: Wait for releasing all AsmJSCache parent actors in Client::ShutdownWorkThreads(). r=janv + + This patch implements Client::ShutdownWorkThreads for taking care of unreleased DirectoryLock and QuotaObject objects. +--- + dom/asmjscache/AsmJSCache.cpp | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index 22ab3dbf0136..49a7d6974134 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -67,6 +67,8 @@ namespace asmjscache { + + namespace { + ++class ParentRunnable; ++ + // Anything smaller should compile fast enough that caching will just add + // overhead. + static const size_t sMinCachedModuleLength = 10000; +@@ -74,6 +76,10 @@ static const size_t sMinCachedModuleLength = 10000; + // The number of characters to hash into the Metadata::Entry::mFastHash. + static const unsigned sNumFastHashChars = 4096; + ++// Track all live parent actors. ++typedef nsTArray ParentActorArray; ++StaticAutoPtr sLiveParentActors; ++ + nsresult + WriteMetadataFile(nsIFile* aMetadataFile, const Metadata& aMetadata) + { +@@ -802,6 +808,13 @@ ParentRunnable::FinishOnOwningThread() + FileDescriptorHolder::Finish(); + + mDirectoryLock = nullptr; ++ ++ MOZ_ASSERT(sLiveParentActors); ++ sLiveParentActors->RemoveElement(this); ++ ++ if (sLiveParentActors->IsEmpty()) { ++ sLiveParentActors = nullptr; ++ } + } + + NS_IMETHODIMP +@@ -1039,6 +1052,12 @@ AllocEntryParent(OpenMode aOpenMode, + RefPtr runnable = + new ParentRunnable(aPrincipalInfo, aOpenMode, aWriteParams); + ++ if (!sLiveParentActors) { ++ sLiveParentActors = new ParentActorArray(); ++ } ++ ++ sLiveParentActors->AppendElement(runnable); ++ + nsresult rv = NS_DispatchToMainThread(runnable); + NS_ENSURE_SUCCESS(rv, nullptr); + +@@ -1687,7 +1706,15 @@ public: + + void + ShutdownWorkThreads() override +- { } ++ { ++ AssertIsOnBackgroundThread(); ++ ++ if (sLiveParentActors) { ++ MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { ++ return !sLiveParentActors; ++ })); ++ } ++ } + + private: + nsAutoRefCnt mRefCnt; +commit 0693fefe1317 +Author: Jan Varga +Date: Thu Nov 2 14:54:18 2017 +0800 + + Bug 1389561 - Part 4: Split AsmJSCache's Client implementation into declaration and definition; r=luke +--- + dom/asmjscache/AsmJSCache.cpp | 271 +++++++++++++++++++++++++----------------- + 1 file changed, 165 insertions(+), 106 deletions(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index 49a7d6974134..1ba4f66085a1 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -240,6 +240,60 @@ EvictEntries(nsIFile* aDirectory, const nsACString& aGroup, + } + } + ++/******************************************************************************* ++ * Client ++ ******************************************************************************/ ++ ++class Client ++ : public quota::Client ++{ ++public: ++ NS_INLINE_DECL_REFCOUNTING(Client, override) ++ ++ Type ++ GetType() override; ++ ++ nsresult ++ InitOrigin(PersistenceType aPersistenceType, ++ const nsACString& aGroup, ++ const nsACString& aOrigin, ++ const AtomicBool& aCanceled, ++ UsageInfo* aUsageInfo) override; ++ ++ nsresult ++ GetUsageForOrigin(PersistenceType aPersistenceType, ++ const nsACString& aGroup, ++ const nsACString& aOrigin, ++ const AtomicBool& aCanceled, ++ UsageInfo* aUsageInfo) override; ++ ++ void ++ OnOriginClearCompleted(PersistenceType aPersistenceType, ++ const nsACString& aOrigin) ++ override; ++ ++ void ++ ReleaseIOThreadObjects() override; ++ ++ void ++ AbortOperations(const nsACString& aOrigin) override; ++ ++ void ++ AbortOperationsForProcess(ContentParentId aContentParentId) override; ++ ++ void ++ StartIdleMaintenance() override; ++ ++ void ++ StopIdleMaintenance() override; ++ ++ void ++ ShutdownWorkThreads() override; ++ ++private: ++ ~Client() override = default; ++}; ++ + // FileDescriptorHolder owns a file descriptor and its memory mapping. + // FileDescriptorHolder is derived by two runnable classes (that is, + // (Parent|Child)Runnable. +@@ -1593,136 +1647,141 @@ CloseEntryForWrite(size_t aSize, + } + } + +-class Client : public quota::Client +-{ +- ~Client() override = default; ++/******************************************************************************* ++ * Client ++ ******************************************************************************/ + +-public: +- NS_IMETHOD_(MozExternalRefCountType) +- AddRef() override; +- +- NS_IMETHOD_(MozExternalRefCountType) +- Release() override; +- +- Type +- GetType() override +- { +- return ASMJS; +- } ++Client::Type ++Client::GetType() ++{ ++ return ASMJS; ++} + +- nsresult +- InitOrigin(PersistenceType aPersistenceType, +- const nsACString& aGroup, +- const nsACString& aOrigin, +- const AtomicBool& aCanceled, +- UsageInfo* aUsageInfo) override +- { +- if (!aUsageInfo) { +- return NS_OK; +- } +- return GetUsageForOrigin(aPersistenceType, +- aGroup, +- aOrigin, +- aCanceled, +- aUsageInfo); ++nsresult ++Client::InitOrigin(PersistenceType aPersistenceType, ++ const nsACString& aGroup, ++ const nsACString& aOrigin, ++ const AtomicBool& aCanceled, ++ UsageInfo* aUsageInfo) ++{ ++ if (!aUsageInfo) { ++ return NS_OK; + } ++ return GetUsageForOrigin(aPersistenceType, ++ aGroup, ++ aOrigin, ++ aCanceled, ++ aUsageInfo); ++} + +- nsresult +- GetUsageForOrigin(PersistenceType aPersistenceType, +- const nsACString& aGroup, +- const nsACString& aOrigin, +- const AtomicBool& aCanceled, +- UsageInfo* aUsageInfo) override +- { +- QuotaManager* qm = QuotaManager::Get(); +- MOZ_ASSERT(qm, "We were being called by the QuotaManager"); +- +- nsCOMPtr directory; +- nsresult rv = qm->GetDirectoryForOrigin(aPersistenceType, aOrigin, +- getter_AddRefs(directory)); +- NS_ENSURE_SUCCESS(rv, rv); +- MOZ_ASSERT(directory, "We're here because the origin directory exists"); ++nsresult ++Client::GetUsageForOrigin(PersistenceType aPersistenceType, ++ const nsACString& aGroup, ++ const nsACString& aOrigin, ++ const AtomicBool& aCanceled, ++ UsageInfo* aUsageInfo) ++{ ++ QuotaManager* qm = QuotaManager::Get(); ++ MOZ_ASSERT(qm, "We were being called by the QuotaManager"); + +- rv = directory->Append(NS_LITERAL_STRING(ASMJSCACHE_DIRECTORY_NAME)); +- NS_ENSURE_SUCCESS(rv, rv); ++ nsCOMPtr directory; ++ nsresult rv = qm->GetDirectoryForOrigin(aPersistenceType, aOrigin, ++ getter_AddRefs(directory)); ++ if (NS_WARN_IF(NS_FAILED(rv))) { ++ return rv; ++ } + +- DebugOnly exists; +- MOZ_ASSERT(NS_SUCCEEDED(directory->Exists(&exists)) && exists); ++ MOZ_ASSERT(directory, "We're here because the origin directory exists"); + +- nsCOMPtr entries; +- rv = directory->GetDirectoryEntries(getter_AddRefs(entries)); +- NS_ENSURE_SUCCESS(rv, rv); ++ rv = directory->Append(NS_LITERAL_STRING(ASMJSCACHE_DIRECTORY_NAME)); ++ if (NS_WARN_IF(NS_FAILED(rv))) { ++ return rv; ++ } + +- bool hasMore; +- while (NS_SUCCEEDED((rv = entries->HasMoreElements(&hasMore))) && +- hasMore && !aCanceled) { +- nsCOMPtr entry; +- rv = entries->GetNext(getter_AddRefs(entry)); +- NS_ENSURE_SUCCESS(rv, rv); ++ DebugOnly exists; ++ MOZ_ASSERT(NS_SUCCEEDED(directory->Exists(&exists)) && exists); + +- nsCOMPtr file = do_QueryInterface(entry); +- NS_ENSURE_TRUE(file, NS_NOINTERFACE); ++ nsCOMPtr entries; ++ rv = directory->GetDirectoryEntries(getter_AddRefs(entries)); ++ if (NS_WARN_IF(NS_FAILED(rv))) { ++ return rv; ++ } + +- int64_t fileSize; +- rv = file->GetFileSize(&fileSize); +- NS_ENSURE_SUCCESS(rv, rv); ++ bool hasMore; ++ while (NS_SUCCEEDED((rv = entries->HasMoreElements(&hasMore))) && ++ hasMore && !aCanceled) { ++ nsCOMPtr entry; ++ rv = entries->GetNext(getter_AddRefs(entry)); ++ if (NS_WARN_IF(NS_FAILED(rv))) { ++ return rv; ++ } + +- MOZ_ASSERT(fileSize >= 0, "Negative size?!"); ++ nsCOMPtr file = do_QueryInterface(entry); ++ if (NS_WARN_IF(!file)) { ++ return NS_NOINTERFACE; ++ } + +- // Since the client is not explicitly storing files, append to database +- // usage which represents implicit storage allocation. +- aUsageInfo->AppendToDatabaseUsage(uint64_t(fileSize)); ++ int64_t fileSize; ++ rv = file->GetFileSize(&fileSize); ++ if (NS_WARN_IF(NS_FAILED(rv))) { ++ return rv; + } +- NS_ENSURE_SUCCESS(rv, rv); + +- return NS_OK; +- } ++ MOZ_ASSERT(fileSize >= 0, "Negative size?!"); + +- void +- OnOriginClearCompleted(PersistenceType aPersistenceType, +- const nsACString& aOrigin) +- override +- { } ++ // Since the client is not explicitly storing files, append to database ++ // usage which represents implicit storage allocation. ++ aUsageInfo->AppendToDatabaseUsage(uint64_t(fileSize)); ++ } ++ if (NS_WARN_IF(NS_FAILED(rv))) { ++ return rv; ++ } + +- void +- ReleaseIOThreadObjects() override +- { } ++ return NS_OK; ++} + +- void +- AbortOperations(const nsACString& aOrigin) override +- { } ++void ++Client::OnOriginClearCompleted(PersistenceType aPersistenceType, ++ const nsACString& aOrigin) ++{ ++} + +- void +- AbortOperationsForProcess(ContentParentId aContentParentId) override +- { } ++void ++Client::ReleaseIOThreadObjects() ++{ ++} + +- void +- StartIdleMaintenance() override +- { } ++void ++Client::AbortOperations(const nsACString& aOrigin) ++{ ++} + +- void +- StopIdleMaintenance() override +- { } ++void ++Client::AbortOperationsForProcess(ContentParentId aContentParentId) ++{ ++} + +- void +- ShutdownWorkThreads() override +- { +- AssertIsOnBackgroundThread(); ++void ++Client::StartIdleMaintenance() ++{ ++} + +- if (sLiveParentActors) { +- MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { +- return !sLiveParentActors; +- })); +- } +- } ++void ++Client::StopIdleMaintenance() ++{ ++} + +-private: +- nsAutoRefCnt mRefCnt; +- NS_DECL_OWNINGTHREAD +-}; ++void ++Client::ShutdownWorkThreads() ++{ ++ AssertIsOnBackgroundThread(); + +-NS_IMPL_ADDREF(asmjscache::Client) +-NS_IMPL_RELEASE(asmjscache::Client) ++ if (sLiveParentActors) { ++ MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { ++ return !sLiveParentActors; ++ })); ++ } ++} + + quota::Client* + CreateClient() +commit 58e99f59ab54 +Author: Jan Varga +Date: Thu Nov 2 14:54:29 2017 +0800 + + Bug 1389561 - Part 5: Prevent allocation of parent actors if quota manager is shutting down; r=luke +--- + dom/asmjscache/AsmJSCache.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 58 insertions(+), 1 deletion(-) + +diff --git dom/asmjscache/AsmJSCache.cpp dom/asmjscache/AsmJSCache.cpp +index 1ba4f66085a1..1d73c1c9546c 100644 +--- dom/asmjscache/AsmJSCache.cpp ++++ dom/asmjscache/AsmJSCache.cpp +@@ -247,7 +247,41 @@ EvictEntries(nsIFile* aDirectory, const nsACString& aGroup, + class Client + : public quota::Client + { ++ static Client* sInstance; ++ ++ bool mShutdownRequested; ++ + public: ++ Client(); ++ ++ static bool ++ IsShuttingDownOnBackgroundThread() ++ { ++ AssertIsOnBackgroundThread(); ++ ++ if (sInstance) { ++ return sInstance->IsShuttingDown(); ++ } ++ ++ return QuotaManager::IsShuttingDown(); ++ } ++ ++ static bool ++ IsShuttingDownOnNonBackgroundThread() ++ { ++ MOZ_ASSERT(!IsOnBackgroundThread()); ++ ++ return QuotaManager::IsShuttingDown(); ++ } ++ ++ bool ++ IsShuttingDown() const ++ { ++ AssertIsOnBackgroundThread(); ++ ++ return mShutdownRequested; ++ } ++ + NS_INLINE_DECL_REFCOUNTING(Client, override) + + Type +@@ -291,7 +325,7 @@ public: + ShutdownWorkThreads() override; + + private: +- ~Client() override = default; ++ ~Client() override; + }; + + // FileDescriptorHolder owns a file descriptor and its memory mapping. +@@ -1098,6 +1132,10 @@ AllocEntryParent(OpenMode aOpenMode, + { + AssertIsOnBackgroundThread(); + ++ if (NS_WARN_IF(Client::IsShuttingDownOnBackgroundThread())) { ++ return nullptr; ++ } ++ + if (NS_WARN_IF(aPrincipalInfo.type() == PrincipalInfo::TNullPrincipalInfo)) { + MOZ_ASSERT(false); + return nullptr; +@@ -1651,6 +1689,25 @@ CloseEntryForWrite(size_t aSize, + * Client + ******************************************************************************/ + ++Client* Client::sInstance = nullptr; ++ ++Client::Client() ++ : mShutdownRequested(false) ++{ ++ AssertIsOnBackgroundThread(); ++ MOZ_ASSERT(!sInstance, "We expect this to be a singleton!"); ++ ++ sInstance = this; ++} ++ ++Client::~Client() ++{ ++ AssertIsOnBackgroundThread(); ++ MOZ_ASSERT(sInstance == this, "We expect this to be a singleton!"); ++ ++ sInstance = nullptr; ++} ++ + Client::Type + Client::GetType() + { diff --git a/www/waterfox/files/patch-bug1425612 b/www/waterfox/files/patch-bug1425612 new file mode 100644 index 00000000000..95a6b3df58c --- /dev/null +++ b/www/waterfox/files/patch-bug1425612 @@ -0,0 +1,85 @@ +commit 64e13f47e70c +Author: Jason Orendorff +Date: Wed Jan 10 20:45:39 2018 -0600 + + Bug 1425612 - Better error messages for invalid structured clone data. r=sfink, a=gchang. + + --HG-- + extra : source : 462f41ca6771fa573e6550509e78dddc8bd8d102 + extra : intermediate-source : a2cf3f843d0b5d99c9603d6d4c83146719634a4a + extra : histedit_source : d6a121b9aaa78c385a368667606126b4aaa6d8b2 +--- + js/src/vm/StructuredClone.cpp | 32 +++++++++++++++++++++++++++++--- + 1 file changed, 29 insertions(+), 3 deletions(-) + +diff --git js/src/vm/StructuredClone.cpp js/src/vm/StructuredClone.cpp +index e6623058459f..8d5f22a0f90b 100644 +--- js/src/vm/StructuredClone.cpp ++++ js/src/vm/StructuredClone.cpp +@@ -1873,6 +1873,12 @@ JSStructuredCloneReader::readTypedArray(uint32_t arrayType, uint32_t nelems, Mut + return false; + byteOffset = n; + } ++ if (!v.isObject() || !v.toObject().is()) { ++ JS_ReportErrorNumberASCII(context(), GetErrorMessage, nullptr, JSMSG_SC_BAD_SERIALIZED_DATA, ++ "typed array must be backed by an ArrayBuffer"); ++ return false; ++ } ++ + RootedObject buffer(context(), &v.toObject()); + RootedObject obj(context(), nullptr); + +@@ -1930,6 +1936,11 @@ JSStructuredCloneReader::readDataView(uint32_t byteLength, MutableHandleValue vp + RootedValue v(context()); + if (!startRead(&v)) + return false; ++ if (!v.isObject() || !v.toObject().is()) { ++ JS_ReportErrorNumberASCII(context(), GetErrorMessage, nullptr, JSMSG_SC_BAD_SERIALIZED_DATA, ++ "DataView must be backed by an ArrayBuffer"); ++ return false; ++ } + + // Read byteOffset. + uint64_t n; +@@ -1980,8 +1991,11 @@ JSStructuredCloneReader::readSharedArrayBuffer(uint32_t nbytes, MutableHandleVal + + // We must not transfer buffer pointers cross-process. The cloneDataPolicy + // in the sender should guard against this; check that it does. +- +- MOZ_RELEASE_ASSERT(storedScope <= JS::StructuredCloneScope::SameProcessDifferentThread); ++ if (storedScope > JS::StructuredCloneScope::SameProcessDifferentThread) { ++ JS_ReportErrorNumberASCII(context(), GetErrorMessage, nullptr, JSMSG_SC_BAD_SERIALIZED_DATA, ++ "can't transfer SharedArrayBuffer cross-process"); ++ return false; ++ } + + // The new object will have a new reference to the rawbuf. + +@@ -2009,7 +2023,11 @@ bool + JSStructuredCloneReader::readV1ArrayBuffer(uint32_t arrayType, uint32_t nelems, + MutableHandleValue vp) + { +- MOZ_ASSERT(arrayType <= Scalar::Uint8Clamped); ++ if (arrayType > Scalar::Uint8Clamped) { ++ JS_ReportErrorNumberASCII(context(), GetErrorMessage, nullptr, JSMSG_SC_BAD_SERIALIZED_DATA, ++ "invalid TypedArray type"); ++ return false; ++ } + + mozilla::CheckedInt nbytes = + mozilla::CheckedInt(nelems) * +@@ -2276,6 +2294,14 @@ JSStructuredCloneReader::readHeader() + } + + MOZ_ALWAYS_TRUE(in.readPair(&tag, &data)); ++ if (data != uint32_t(JS::StructuredCloneScope::SameProcessSameThread) && ++ data != uint32_t(JS::StructuredCloneScope::SameProcessDifferentThread) && ++ data != uint32_t(JS::StructuredCloneScope::DifferentProcess)) ++ { ++ JS_ReportErrorNumberASCII(context(), GetErrorMessage, nullptr, JSMSG_SC_BAD_SERIALIZED_DATA, ++ "invalid structured clone scope"); ++ return false; ++ } + storedScope = JS::StructuredCloneScope(data); + if (storedScope < allowedScope) { + JS_ReportErrorNumberASCII(context(), GetErrorMessage, nullptr, JSMSG_SC_BAD_SERIALIZED_DATA, diff --git a/www/waterfox/files/patch-bug1426783 b/www/waterfox/files/patch-bug1426783 new file mode 100644 index 00000000000..9af341358dd --- /dev/null +++ b/www/waterfox/files/patch-bug1426783 @@ -0,0 +1,38 @@ +commit bd6f4255ac32 +Author: Jason Orendorff +Date: Fri Jan 5 15:17:35 2018 -0600 + + Bug 1426783 - Fix error handling in deserialization of invalid typed arrays. r=sfink, a=gchang. + + --HG-- + extra : source : f10263c3babef5f70e1e8fdb9e52c2de15cf22e1 + extra : intermediate-source : 3bda6eb9e8469ac4347bb9738d720ea81c358aea + extra : histedit_source : 9d203779ff057ed4e857fe31ba5b51d38f1547e5 +--- + js/src/vm/StructuredClone.cpp | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git js/src/vm/StructuredClone.cpp js/src/vm/StructuredClone.cpp +index c18cd232a192..e6623058459f 100644 +--- js/src/vm/StructuredClone.cpp ++++ js/src/vm/StructuredClone.cpp +@@ -2011,8 +2011,17 @@ JSStructuredCloneReader::readV1ArrayBuffer(uint32_t arrayType, uint32_t nelems, + { + MOZ_ASSERT(arrayType <= Scalar::Uint8Clamped); + +- uint32_t nbytes = nelems << TypedArrayShift(static_cast(arrayType)); +- JSObject* obj = ArrayBufferObject::create(context(), nbytes); ++ mozilla::CheckedInt nbytes = ++ mozilla::CheckedInt(nelems) * ++ TypedArrayElemSize(static_cast(arrayType)); ++ if (!nbytes.isValid() || nbytes.value() > UINT32_MAX) { ++ JS_ReportErrorNumberASCII(context(), GetErrorMessage, nullptr, ++ JSMSG_SC_BAD_SERIALIZED_DATA, ++ "invalid typed array size"); ++ return false; ++ } ++ ++ JSObject* obj = ArrayBufferObject::create(context(), nbytes.value()); + if (!obj) + return false; + vp.setObject(*obj); diff --git a/www/waterfox/files/patch-bug1429764 b/www/waterfox/files/patch-bug1429764 new file mode 100644 index 00000000000..112692fd51e --- /dev/null +++ b/www/waterfox/files/patch-bug1429764 @@ -0,0 +1,207 @@ +commit 6a927d435699 +Author: Tom Ritter +Date: Fri Jan 12 13:36:04 2018 -0600 + + Bug 1429764 - Do not call ReduceTimerPrecision twice for DOM Navigation timers. r=bkelly, r=timhuang, a=jcristau + + Bug 1429764 details a test failure that was asserting that the performance navigation + timers were strictly increasing (or equal). fetchStart should have a timestamp before + domainLookupStart. But it didn't. + + The problem is two-fold. This corrects the test and the issue by addressing one part + of the problem, the second part of the problem needs to be written up in a new bug + and addressed there. (That bug is not yet filed at writing, but see dependencies of + 1429764 in the future to find it.) + + The second, and underlying, problem is that calling ReduceTimerPrecision with the + same value multiple times may continually reduce it. Meaning that the first you call + it with, say, .75, (and a precision of .20), it will be reduced to .6. The second time + you call it (with .6), instead of staying at .6 it will be reduced to .4. This is + because floats are fuzzy. Inside ReduceTimerPrecision we are multiplying a decimal by + a decimal, so while floor(.6 / .20) should equal 3, sometimes it's actually 2.999... + which gets floors to 2, gets multiplied again by .2, and which results in .4 + + If that's the underlying problem, the first, and surface, problem is - why are we + calling ReduceTimerPrecision multiple times? We shouldn't be. That's what this + patch fixes. + + TimeStampToDOMHighResOrFetchStart will return either TimeStampToDOMHighRes() or + FetchStartHighRes(). FetchStartHighRes() internally calls TimeStampToDOMHighRes + and then ReduceTimerPrecision - this is where (some of) the two reduction calls + happen - because TimeStampToDOMHighRes itself calls ReduceTimerPrecision also. + + I remove the ReduceTimerPrecision from TimeStampToDOMHighRes. FetchStartHighRes + will now only call ReduceTimerPrecision once, at the end of the return. + + But we have to fix places we call TimeStampToDOMHighResOrFetchStart, because the + callers of that function also call ReduceTimerPrecision. So if + TimeStampToDOMHighResOrFetchStart returned FetchStartHighRes, we'd be calling + ReduceTimerPrecision twice for those callers. + + So inside first off, we remove the outer call to ReduceTimerPrecision. that + surrounds the 5 or so callsites of TimeStampToDOMHighResOrFetchStart. Then + inside of TimeStampToDOMHighResOrFetchStart we return either FetchStartHighRes + (which is has already called ReduceTimerPrecision) or we call + ReduceTimerPrecision with the value. + + Now. TimeStampToDOMHighRes was used in more places than just FetchStartHighRes - + there were several other places where we were doing double rounding, and this + fixed those as well. AsyncOpenHighRes, WorkerStartHighRes, DomainLookupEndHighRes, + ConnectStartHighRes, SecureConnectionStartHighRes, ConnectEndHighRes, and + ResponseEndHighRes. + + MozReview-Commit-ID: K5nHql135rb + + --HG-- + extra : source : 17bf5819b42fa3b656f2d3c565bc4fb0ca050066 +--- + dom/performance/PerformanceTiming.cpp | 15 +++------ + dom/performance/PerformanceTiming.h | 7 ++-- + .../resistfingerprinting/nsRFPService.cpp | 38 +++++++++++++++++++--- + 3 files changed, 42 insertions(+), 18 deletions(-) + +diff --git dom/performance/PerformanceTiming.cpp dom/performance/PerformanceTiming.cpp +index 3d7e55a0c80f..f80d7f509a40 100644 +--- dom/performance/PerformanceTiming.cpp ++++ dom/performance/PerformanceTiming.cpp +@@ -222,7 +222,7 @@ PerformanceTiming::RedirectStartHighRes() + nsContentUtils::ShouldResistFingerprinting()) { + return mZeroTime; + } +- return TimeStampToDOMHighResOrFetchStart(mRedirectStart); ++ return TimeStampToReducedDOMHighResOrFetchStart(mRedirectStart); + } + + DOMTimeMilliSec +@@ -256,7 +256,7 @@ PerformanceTiming::RedirectEndHighRes() + nsContentUtils::ShouldResistFingerprinting()) { + return mZeroTime; + } +- return TimeStampToDOMHighResOrFetchStart(mRedirectEnd); ++ return TimeStampToReducedDOMHighResOrFetchStart(mRedirectEnd); + } + + DOMTimeMilliSec +@@ -280,7 +280,7 @@ PerformanceTiming::DomainLookupStartHighRes() + nsContentUtils::ShouldResistFingerprinting()) { + return mZeroTime; + } +- return TimeStampToDOMHighResOrFetchStart(mDomainLookupStart); ++ return TimeStampToReducedDOMHighResOrFetchStart(mDomainLookupStart); + } + + DOMTimeMilliSec +@@ -366,7 +366,7 @@ PerformanceTiming::RequestStartHighRes() + nsContentUtils::ShouldResistFingerprinting()) { + return mZeroTime; + } +- return TimeStampToDOMHighResOrFetchStart(mRequestStart); ++ return TimeStampToReducedDOMHighResOrFetchStart(mRequestStart); + } + + DOMTimeMilliSec +@@ -386,7 +386,7 @@ PerformanceTiming::ResponseStartHighRes() + (!mCacheReadStart.IsNull() && mCacheReadStart < mResponseStart)) { + mResponseStart = mCacheReadStart; + } +- return TimeStampToDOMHighResOrFetchStart(mResponseStart); ++ return TimeStampToReducedDOMHighResOrFetchStart(mResponseStart); + } + + DOMTimeMilliSec +diff --git dom/performance/PerformanceTiming.h dom/performance/PerformanceTiming.h +index 0558fc11d64e..9fba3210ef1d 100644 +--- dom/performance/PerformanceTiming.h ++++ dom/performance/PerformanceTiming.h +@@ -68,10 +68,10 @@ public: + * page), if the given TimeStamp is valid. Otherwise, it will return + * the FetchStart timing value. + */ +- inline DOMHighResTimeStamp TimeStampToDOMHighResOrFetchStart(TimeStamp aStamp) ++ inline DOMHighResTimeStamp TimeStampToReducedDOMHighResOrFetchStart(TimeStamp aStamp) + { + return (!aStamp.IsNull()) +- ? TimeStampToDOMHighRes(aStamp) ++ ? nsRFPService::ReduceTimePrecisionAsMSecs(TimeStampToDOMHighRes(aStamp)) + : FetchStartHighRes(); + } + +diff --git toolkit/components/resistfingerprinting/nsRFPService.cpp toolkit/components/resistfingerprinting/nsRFPService.cpp +index 51552da69923..98857a764721 100644 +--- toolkit/components/resistfingerprinting/nsRFPService.cpp ++++ toolkit/components/resistfingerprinting/nsRFPService.cpp +@@ -8,6 +8,7 @@ + #include + + #include "mozilla/ClearOnShutdown.h" ++#include "mozilla/Logging.h" + #include "mozilla/Preferences.h" + #include "mozilla/Services.h" + #include "mozilla/StaticPtr.h" +@@ -28,6 +29,10 @@ + + using namespace mozilla; + ++#ifdef DEBUG ++static mozilla::LazyLogModule gResistFingerprintingLog("nsResistFingerprinting"); ++#endif ++ + #define RESIST_FINGERPRINTING_PREF "privacy.resistFingerprinting" + #define PROFILE_INITIALIZED_TOPIC "profile-initial-state" + +@@ -66,7 +71,13 @@ nsRFPService::ReduceTimePrecisionAsMSecs(double aTime) + return aTime; + } + const double resolutionMSec = kResolutionUSec / 1000.0; +- return floor(aTime / resolutionMSec) * resolutionMSec; ++ double ret = floor(aTime / resolutionMSec) * resolutionMSec; ++#if defined(DEBUG) ++ MOZ_LOG(gResistFingerprintingLog, LogLevel::Verbose, ++ ("Given: %.*f, Rounding with %.*f, Intermediate: %.*f, Got: %.*f", ++ DBL_DIG-1, aTime, DBL_DIG-1, resolutionMSec, DBL_DIG-1, floor(aTime / resolutionMSec), DBL_DIG-1, ret)); ++#endif ++ return ret; + } + + /* static */ +@@ -76,7 +87,14 @@ nsRFPService::ReduceTimePrecisionAsUSecs(double aTime) + if (!IsResistFingerprintingEnabled()) { + return aTime; + } +- return floor(aTime / kResolutionUSec) * kResolutionUSec; ++ double ret = floor(aTime / kResolutionUSec) * kResolutionUSec; ++#if defined(DEBUG) ++ double tmp_kResolutionUSec = kResolutionUSec; ++ MOZ_LOG(gResistFingerprintingLog, LogLevel::Verbose, ++ ("Given: %.*f, Rounding with %.*f, Intermediate: %.*f, Got: %.*f", ++ DBL_DIG-1, aTime, DBL_DIG-1, tmp_kResolutionUSec, DBL_DIG-1, floor(aTime / tmp_kResolutionUSec), DBL_DIG-1, ret)); ++#endif ++ return ret; + } + + /* static */ +@@ -90,10 +108,22 @@ nsRFPService::ReduceTimePrecisionAsSecs(double aTime) + // The resolution is smaller than one sec. Use the reciprocal to avoid + // floating point error. + const double resolutionSecReciprocal = 1000000.0 / kResolutionUSec; +- return floor(aTime * resolutionSecReciprocal) / resolutionSecReciprocal; ++ double ret = floor(aTime * resolutionSecReciprocal) / resolutionSecReciprocal; ++#if defined(DEBUG) ++ MOZ_LOG(gResistFingerprintingLog, LogLevel::Verbose, ++ ("Given: %.*f, Reciprocal Rounding with %.*f, Intermediate: %.*f, Got: %.*f", ++ DBL_DIG-1, aTime, DBL_DIG-1, resolutionSecReciprocal, DBL_DIG-1, floor(aTime * resolutionSecReciprocal), DBL_DIG-1, ret)); ++#endif ++ return ret; + } + const double resolutionSec = kResolutionUSec / 1000000.0; +- return floor(aTime / resolutionSec) * resolutionSec; ++ double ret = floor(aTime / resolutionSec) * resolutionSec; ++#if defined(DEBUG) ++ MOZ_LOG(gResistFingerprintingLog, LogLevel::Verbose, ++ ("Given: %.*f, Rounding with %.*f, Intermediate: %.*f, Got: %.*f", ++ DBL_DIG-1, aTime, DBL_DIG-1, resolutionSec, DBL_DIG-1, floor(aTime / resolutionSec), DBL_DIG-1, ret)); ++#endif ++ return ret; + } + + nsresult diff --git a/www/waterfox/files/patch-bug1430508 b/www/waterfox/files/patch-bug1430508 new file mode 100644 index 00000000000..25d3f962d0e --- /dev/null +++ b/www/waterfox/files/patch-bug1430508 @@ -0,0 +1,56 @@ +commit 47e68af6bce1 +Author: Kris Maglione +Date: Sun Jan 14 17:40:09 2018 -0800 + + Bug 1430508 - Return 0 for ProcessId() when channel IPC is closed. r=dragana, a=jcristau + + There are some corner cases where we try to attach StreamFilter endpoints to a + channel after its IPC has been closed from from the other side, but request + listeners haven't been notified. This causes crashes in any of several places. + + This patch changes nsHttpChannel::ProcessId to return 0 when IPC is closed, so + callers can detect that it's no longer possible to attach endpoints to it. + + MozReview-Commit-ID: BZTOqezih0P + + --HG-- + extra : source : 06f766e7640a3cd180f7da7c092823e500a3d674 +--- + netwerk/protocol/http/HttpChannelParent.cpp | 9 +++++++++ + netwerk/protocol/http/HttpChannelParent.h | 2 ++ + toolkit/components/extensions/webrequest/StreamFilterParent.cpp | 5 ++++- + 3 files changed, 15 insertions(+), 1 deletion(-) + +diff --git netwerk/protocol/http/HttpChannelParent.cpp netwerk/protocol/http/HttpChannelParent.cpp +index db5f441e53c1..ab332ca1a587 100644 +--- netwerk/protocol/http/HttpChannelParent.cpp ++++ netwerk/protocol/http/HttpChannelParent.cpp +@@ -265,6 +265,15 @@ HttpChannelParent::CleanupBackgroundChannel() + } + } + ++base::ProcessId ++HttpChannelParent::OtherPid() const ++{ ++ if (mIPCClosed) { ++ return 0; ++ } ++ return Manager()->OtherPid(); ++} ++ + //----------------------------------------------------------------------------- + // HttpChannelParent::nsISupports + //----------------------------------------------------------------------------- +diff --git netwerk/protocol/http/HttpChannelParent.h netwerk/protocol/http/HttpChannelParent.h +index 19e6fca40bff..fbbad6c2f994 100644 +--- netwerk/protocol/http/HttpChannelParent.h ++++ netwerk/protocol/http/HttpChannelParent.h +@@ -120,6 +120,8 @@ public: + // Callback while background channel is destroyed. + void OnBackgroundParentDestroyed(); + ++ base::ProcessId OtherPid() const override; ++ + protected: + // used to connect redirected-to channel in parent with just created + // ChildChannel. Used during redirects. diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile index 1b85d792405..32d890cd6b8 100644 --- a/www/wordpress/Makefile +++ b/www/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 4.9.1 +DISTVERSION= 4.9.2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo index a4a0efeee97..8d6eef8b025 100644 --- a/www/wordpress/distinfo +++ b/www/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512203392 -SHA256 (wordpress-4.9.1.tar.gz) = a94ae99cda7666bfd482b36f268ad240a3bde2a66724e1312dabf068a9555100 -SIZE (wordpress-4.9.1.tar.gz) = 9638827 +TIMESTAMP = 1516345663 +SHA256 (wordpress-4.9.2.tar.gz) = 1f6e9d16cb6b3cd77b754ad806ee67cd4b58a4c15b3a7ddf30b4237e359a437b +SIZE (wordpress-4.9.2.tar.gz) = 8807744 diff --git a/www/xist/Makefile b/www/xist/Makefile index 97f08f501ba..d8095faf292 100644 --- a/www/xist/Makefile +++ b/www/xist/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xist -PORTVERSION= 5.29 +PORTVERSION= 5.30 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ http://ftp.livinglogic.de/xist/ diff --git a/www/xist/distinfo b/www/xist/distinfo index 3cb7235ffc8..12d6b712b73 100644 --- a/www/xist/distinfo +++ b/www/xist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512165444 -SHA256 (ll-xist-5.29.tar.bz2) = 9829c596fc42286dcbe516ec8f0b9be0b4d0fc91b5b2b32cace5b745c672bd60 -SIZE (ll-xist-5.29.tar.bz2) = 564141 +TIMESTAMP = 1516281122 +SHA256 (ll-xist-5.30.tar.bz2) = 23fb84a2576020aa9824e55efadb5cf8e85928fff4b72eba401b02354696b01a +SIZE (ll-xist-5.30.tar.bz2) = 566999