Compare commits

...

355 Commits
main ... 2020Q1

Author SHA1 Message Date
Bryan Drewery
28b4da349d MFH: r529993
- Fix runtime for gcc rpath. [1]
  This is a regression of something that was working in the past. Please
  keep the _GCC_RUNTIME handling even if removing USE_GCC as it may
  come back again in the future and be forgotten.
- Fix build on 11.3 with ports ssl. [2]

PR:		245048 [1]
PR:		243315 [2]
Submitted by:	John Hein <jcfyecrayz at liamekaens.com> [2]

Approved by:	portmgr (implicit)
2020-03-31 17:46:10 +00:00
Bryan Drewery
858f9adf3a MFH: r529134
- Unbreak by using new upstream
  The author restored the working version to github. The version in the
  README is wrong (1.10) but is correct in CHANGELOG (1.10.1).

PR:		243852

Approved by:	portmgr (implicit)
2020-03-31 17:43:04 +00:00
Bryan Drewery
c190484c5c MFH: r529125
- Unbreak
- Bring in latest commit from github which adds 'Bootmethod` display
  and reorders the list slightly.

Approved by:	portmgr (implicit)
2020-03-31 17:42:22 +00:00
Jan Beich
13f187a037 MFH: r529930
emulators/citra: update to s20200329

Changes:	5dbf334ef...680ef64ac
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-03-31 00:56:18 +00:00
Kubilay Kocak
79c1ffd3ae MFH: r529858 security/py-passlib: Update to 1.7.2
- Update COMMENT to match setup.py:description

Changelog:

  https://passlib.readthedocs.io/en/stable/history/1.7.html

Requested by:	bofh (via email)

Approved by:	ports-secteam (blanket: bugfix release)
2020-03-30 05:11:29 +00:00
Palle Girgensohn
d6e9ccd73b MFH: r526063 r527871
The PostgreSQL Global Development Group has released an update to all
supported versions of our database system, including 12.2, 11.7, 10.12,
9.6.17, 9.5.21, and 9.4.26. This release fixes one security issue found
in the PostgreSQL server and over 75 bugs reported over the last three
months.

Users should plan to update as soon as possible.

PostgreSQL 9.4 Now EOL

This is the last release for PostgreSQL 9.4, which will no longer
receive security updates and bug fixes. PostgreSQL 9.4 introduced new
features such as JSONB support, the `ALTER SYSTEM` command, the ability
to stream logical changes to an output plugin, and more:

 https://www.postgresql.org/about/news/1557/
 https://www.postgresql.org/docs/9.4/release-9-4.html

While we are very proud of this release, these features are also found
in newer versions of PostgreSQL. Many of these features have also
received improvements, and, per our versioning policy, it is time to
retire PostgreSQL 9.4.

To receive continued support, we suggest that you make plans to upgrade
to a newer, supported version of PostgreSQL. Please see the PostgreSQL
versioning policy for more information.

Security Issues

* CVE-2020-1720: `ALTER ... DEPENDS ON EXTENSION` is missing
authorization checks.

Versions Affected: 9.6 - 12

The `ALTER ... DEPENDS ON EXTENSION` sub-commands do not perform
authorization checks, which can allow an unprivileged user to  drop any
function, procedure, materialized view, index, or trigger under certain
conditions. This attack is possible if an administrator has installed an
extension and an unprivileged user can `CREATE`, or an extension owner
either executes `DROP EXTENSION` predictably or can be convinced to
execute `DROP EXTENSION`.

Release notes: https://www.postgresql.org/docs/current/release.html

databases/postgresql12-server: fix build on GCC architectures

Use LLVM only if Clang is used.

PR:		244225, 244985
Approved by:	ports-secteam (joneum)
2020-03-29 19:58:13 +00:00
Thomas Zander
a1954f526e Revert r528941. Traefik 1.7.22+ needs Go 1.14 to build.
Approved by:	ports-secteam (riggs)
2020-03-29 10:20:13 +00:00
Jan Beich
70119a3092 MFH: r529287
emulators/citra: update to s20200326

Changes:	480d3aaf1...5dbf334ef
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-03-28 00:04:32 +00:00
Wen Heping
6a9911f330 MFH: r529245
- Update mediawiki to 1.31.7, 1.33.3 and 1.34.1
  (security releases)

Approved by:	ports-secteam@(joneum@)
2020-03-27 23:47:04 +00:00
Jochen Neumeister
1e59d33d93 MFH: r529192
Update to 5.0.2

Changelog: https://www.phpmyadmin.net/news/2020/3/21/phpmyadmin-495-and-502-are-released/

Security:	97fcc60a-6ec0-11ea-a84a-4c72b94353b5
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-03-26 14:48:31 +00:00
Jochen Neumeister
6bd227dacc MFH: r529191
Update to 4.9.5

Changelog: https://www.phpmyadmin.net/news/2020/3/21/phpmyadmin-495-and-502-are-released/

Security:	97fcc60a-6ec0-11ea-a84a-4c72b94353b5
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-03-26 14:47:31 +00:00
Jan Beich
4b20f6cd60 MFH: r529156
emulators/citra: update to s20200325

Changes:	37384174d...480d3aaf1
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-03-26 00:35:12 +00:00
Jan Beich
2eef7fe6f8 MFH: r529155
www/firefox: backport fix for a warning after r527804

JavaScript error: resource:///modules/BrowserGlue.jsm, line 2210: TypeError: Services.profiler is undefined

Approved by:	ports-secteam blanket
2020-03-26 00:29:51 +00:00
Li-Wen Hsu
961c1dbb54 MFH: r529117
- Update to 2.204.6

Approved by:	swils (maintainer, implicitly)
Security:	5bf6ed6d-9002-4f43-ad63-458f59e45384
Sponsored by:	The FreeBSD Foundation

Approved by:	ports-secteam (miwi, implicitly)
2020-03-25 18:39:48 +00:00
Li-Wen Hsu
06656d16d6 MFH: r529116
- Update to 2.228

Security:	5bf6ed6d-9002-4f43-ad63-458f59e45384
Sponsored by:	The FreeBSD Foundation

Approved by:	ports-secteam (miwi, implicitly)
2020-03-25 18:36:27 +00:00
Torsten Zuehlsdorff
4b71035cd9 MFH: r529014
lang/php74: Update from 7.4.3 to 7.4.4

Changelog:

    Core:
        Fixed bug #79329 (get_headers() silently truncates after a null byte) (CVE-2020-7066)
        Fixed bug #79244 (php crashes during parsing INI file).
        Fixed bug #63206 (restore_error_handler does not restore previous errors mask).
    COM:
        Fixed bug #66322 (COMPersistHelper::SaveToFile can save to wrong location).
        Fixed bug #79242 (COM error constants don't match com_exception codes on x86).
        Fixed bug #79247 (Garbage collecting variant objects segfaults).
        Fixed bug #79248 (Traversing empty VT_ARRAY throws com_exception).
        Fixed bug #79299 (com_print_typeinfo prints duplicate variables).
        Fixed bug #79332 (php_istreams are never freed).
        Fixed bug #79333 (com_print_typeinfo() leaks memory).
    CURL:
        Fixed bug #79019 (Copied cURL handles upload empty file).
        Fixed bug #79013 (Content-Length missing when posting a curlFile with curl).
    DOM:
        Fixed bug #77569: (Write Access Violation in DomImplementation).
        Fixed bug #79271 (DOMDocumentType::$childNodes is NULL).
    Enchant:
        Fixed bug #79311 (enchant_dict_suggest() fails on big endian architecture).
    EXIF:
        Fixed bug #79282 (Use-of-uninitialized-value in exif) (CVE-2020-7064).
    Fileinfo:
        Fixed bug #79283 (Segfault in libmagic patch contains a buffer overflow).
    FPM:
        Fixed bug #77653 (operator displayed instead of the real error message).
        Fixed bug #79014 (PHP-FPM & Primary script unknown).
    MBstring:
        Fixed bug #79371 (mb_strtolower (UTF-32LE): stack-buffer-overflow at php_unicode_tolower_full) (CVE-2020-7065).
    MySQLi:
        Fixed bug #64032 (mysqli reports different client_version).
    MySQLnd:
        Implemented FR #79275 (Support auth_plugin_caching_sha2_password on Windows).
    Opcache:
        Fixed bug #79252 (preloading causes php-fpm to segfault during exit).
    PCRE:
        Fixed bug #79188 (Memory corruption in preg_replace/preg_replace_callback and unicode).
        Fixed bug #79241 (Segmentation fault on preg_match()).
        Fixed bug #79257 (Duplicate named groups (?J) prefer last alternative even if not matched).
    PDO_ODBC:
        Fixed bug #79038 (PDOStatement::nextRowset() leaks column values).
    Reflection:
        Fixed bug #79062 (Property with heredoc default value returns false for getDocComment).
    SQLite3:
        Fixed bug #79294 (::columnType() may fail after SQLite3Stmt::reset()).
    Standard:
        Fixed bug #79254 (getenv() w/o arguments not showing changes).
        Fixed bug #79265 (Improper injection of Host header when using fopen for http requests).
    Zip:
        Fixed bug #79315 (ZipArchive::addFile doesn't honor start/length parameters).

Changelog taken from: https://www.php.net/ChangeLog-7.php#7.4.4

Sponsored by:	PHP Update Service

Approved by:	ports-secteam (joneum)
2020-03-25 11:22:19 +00:00
Torsten Zuehlsdorff
d7b1ed0570 MFH: r529012
lang/php73: Update from 7.3.15 to 7.3.16

Changelog:

    Core:
        Fixed bug #63206 (restore_error_handler does not restore previous errors mask).
    COM:
        Fixed bug #66322 (COMPersistHelper::SaveToFile can save to wrong location).
        Fixed bug #79242 (COM error constants don't match com_exception codes on x86).
        Fixed bug #79248 (Traversing empty VT_ARRAY throws com_exception).
        Fixed bug #79299 (com_print_typeinfo prints duplicate variables).
        Fixed bug #79332 (php_istreams are never freed).
        Fixed bug #79333 (com_print_typeinfo() leaks memory).
    DOM:
        Fixed bug #77569: (Write Access Violation in DomImplementation).
        Fixed bug #79271 (DOMDocumentType::$childNodes is NULL).
    Enchant:
        Fixed bug #79311 (enchant_dict_suggest() fails on big endian architecture).
    EXIF:
        Fixed bug #79282 (Use-of-uninitialized-value in exif). (CVE-2020-7064)
    MBstring:
        Fixed bug #79371 (mb_strtolower (UTF-32LE): stack-buffer-overflow at php_unicode_tolower_full). (CVE-2020-7065)
    MySQLi:
        Fixed bug #64032 (mysqli reports different client_version).
    PCRE:
        Fixed bug #79188 (Memory corruption in preg_replace/preg_replace_callback and unicode).
    PDO_ODBC:
        Fixed bug #79038 (PDOStatement::nextRowset() leaks column values).
    Reflection:
        Fixed bug #79062 (Property with heredoc default value returns false for getDocComment).
    SQLite3:
        Fixed bug #79294 (::columnType() may fail after SQLite3Stmt::reset()).
    Standard:
        Fixed bug #79329 (get_headers() silently truncates after a null byte). (CVE-2020-7066)
        Fixed bug #79254 (getenv() w/o arguments not showing changes).
        Fixed bug #79265 (Improper injection of Host header when using fopen for http requests).

Changelog taken from: https://www.php.net/ChangeLog-7.php#7.3.16

Sponsored by:	PHP Update Service

Approved by:	ports-secteam (joneum)
2020-03-25 11:19:09 +00:00
Torsten Zuehlsdorff
69c1fd1645 MFH: r529011
lang/php72: Update from 7.2.28 to 7.2.29

Changelog:

    Core:
        Fixed bug #79329 (get_headers() silently truncates after a null byte) (CVE-2020-7066) (cmb)
    EXIF:
        Fixed bug #79282 (Use-of-uninitialized-value in exif) (CVE-2020-7064) (Nikita)

Changelog taken from: https://www.php.net/ChangeLog-7.php#7.2.29

Sponsored by:	PHP Update Service

Approved by:	ports-secteam (joneum)
2020-03-25 11:15:56 +00:00
Cy Schubert
ac6313a477 MFH: r529056
Unbreak by making fetchable again. This necessitates updating from
3.3.0 to 3.3.3 in order to make fetchable again.

Assume maintainership.

PR:		244998
Submitted by:	cy
Reported by:	cy
Approved by:	maintainer (Adam McDougall <mcdouga9 at egr.msu.edu>)
Approved by:	portmgr (joneum)
2020-03-24 19:53:21 +00:00
Bernard Spil
3c2dbc1701 MFH: r523571 r525962 r528407 r529009
www/nextcloud: Update to 18.0.0

www/nextcloud: Update to 18.0.1

www/nextcloud: Update to 18.0.2

www/nextcloud: Security update to 18.0.3

 - Further vuln info not yet disclosed

PR:		245016
Reported by:	Marko Cupac <marko cupac mimar rs>

Approved by:	ports-secteam (joneum)
2020-03-24 10:49:35 +00:00
Thomas Zander
5a589c5ab4 MFH: r529027
Update to upstream release 0.21.21

Details:
- Bug fixes, see
  https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.21/NEWS

Approved by:	ports-secteam(riggs)
2020-03-24 06:08:53 +00:00
Mark Felder
5d5f559c78 MFH: r528974
net-p2p/sonarr: Update to 2.0.0.5344

Approved by:	portmgr (blanket)
2020-03-23 14:30:15 +00:00
Thomas Zander
d4e7248546 MFH: r528940
Update to upstream release 1.7.22

Details:
- Bug- and doc fixes, see
  https://github.com/containous/traefik/releases/tag/v1.7.22

Approved by:	ports-secteam (riggs)
2020-03-22 22:24:00 +00:00
Antoine Brodin
6d0763bebb MFH: r528170
Mark BROKEN: fails to build

../include/pbcopper/json/internal/json.hpp:1229:9: error: static_assert failed due to requirement 'sizeof(nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer>) == 0' "could not find from_json() method in T's namespace"
        static_assert(sizeof(BasicJsonType) == 0,
        ^             ~~~~~~~~~~~~~~~~~~~~~~~~~~

Reported by:	pkg-fallout
2020-03-22 09:03:58 +00:00
Kai Knoblich
4d9aad2f71 MFH: r524970 r528846
games/scummvm: Unbreak build with FLUIDSYNTH=on

games/scummvm: Update to 2.1.1

Clean-up some stage QA warnings/issues while I'm here:

* Fix pkg-plist issues if the MP3 option is set to off.

* Add "iconv" to USES as scummvm is linked against libiconv.so.

* Also add "--disable-ogg" to VORBIS_CONFIGURE_OFF if the VORBIS option is
  set to off.  Otherwise scummvm is linked against "libogg.so" which is a
  dependency of the VORBIS option but "libogg.so" is already pulled in via
  the non-conditional "libtheoradec.so".

Changelog:

https://www.scummvm.org/news/20200131/

PR:		244272
Approved by:	maintainer timeout (4+ weeks)

Approved by:	ports-secteam build/bugfix blanket
2020-03-21 11:01:45 +00:00
Adam Weinberger
3aa897e008 MFH: r528732
gitea: Remove test that snuck in (no functional change)

Approved by:	portmgr (with hat)
2020-03-19 16:24:05 +00:00
Adam Weinberger
9062b34334 MFH: r528631 r528729
www/gitea: Use OPTIONS_SUB

gitea: Update to 1.11.3

This release fixes three bugs.

Release notes: https://blog.gitea.io/2020/03/gitea-1.11.3-and-1.10.6-released/

Also fix LDFLAGS so that the version number (among other things) is built into
the binary correctly, and make the regexp used in the Makefile work with
bsdgrep (both thanks to adamw).

Will MFH due to bsdgrep build failure and stopwatch panic fix.

PR:		244898
Submitted by:	maintainer

Approved by:	portmgr (with hat)
2020-03-19 16:18:47 +00:00
Yuri Victorovich
bbd40a75e5 MFH: r528658
security/tor-devel: Update 0.4.3.2 -> 0.4.3.3

Bugfix release: https://gitweb.torproject.org/tor.git/tree/ChangeLog?h=tor-0.4.3.3-alpha

Reported by:	upstream notification

Approved by:	ports-secteam
2020-03-19 07:45:26 +00:00
Yuri Victorovich
f23e062e85 MFH: r528657
security/tor: Update 0.4.2.6 -> 0.4.2.7

Bugfix release: https://gitweb.torproject.org/tor.git/tree/ChangeLog?h=tor-0.4.2.7

Reported by:	upstream notification

Approved by:	ports-secteam
2020-03-19 07:36:55 +00:00
Jan Beich
f917261a54 MFH: r528676 r528679
emulators/citra: update to s20200317

Changes:	ad3c464e2...37384174d
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-03-19 00:41:20 +00:00
Kubilay Kocak
87cfa30686 MFH: r528630 www/py-bleach: Update to 3.1.3
Changelog:

  https://github.com/mozilla/bleach/blob/v3.1.3/CHANGES

Security:	3d19c776-68e7-11ea-91db-0050562a4d7b

Approved by:	ports-secteam (joneum)
2020-03-18 08:07:56 +00:00
Kyle Evans
68e0c8c52a MFH: r528547
sysutils/u-boot-rpi{3,4}: Add patch to fix PSCI stub reservation

For the traditional spin table setup, only the lowest page needs
to be reserved.  However, our PSCI stubs are slightly bigger and occupy
a little over one page.  These patches, already sent upstream, allow a
variable number of initial pages to be reserved for the SMP stubs.  We
then set the values for these in our fragment to '2' to reserve the first
and second page.

Approved by:	koobs (mentor)
Approved by:	manu (uboot, maintainer)
Differential Revision:	https://reviews.freebsd.org/D24085

Approved by:	ports-secteam (joneum)
2020-03-18 01:58:08 +00:00
Kubilay Kocak
bab5719cdd MFH: r528619 devel/py-virtualenvwrapper: Fix virtualenvwrapper_lazy.sh wrapper
Fix the virtualenvwrapper_lazy.sh wrapper to invoke the Python
versions-specific virtualenvwrapper.sh script that the port/package was
built with, preventing the following error:

  ERROR: virtualenvwrapper_lazy.sh: Could not find virtualenvwrapper.sh

While I'm here:

  - Update pkg-descr WWW: URL to match setup.py:homepage
  - Update COMMENT to match setup.py:summary

Approved by:	portmgr (blanket: ports (python) compliance, run-time bugfix)

Approved by:	ports-secteam (blanket: ports (python) compliance, run-time bugfix)
2020-03-18 00:51:59 +00:00
Craig Leres
f57f99ffdc MFH: r528508
security/bro: Update to 3.0.3 and address a number of potential
denial of service issues:

   https://github.com/zeek/zeek/releases/tag/v3.0.2
   https://github.com/zeek/zeek/releases/tag/v3.0.3

 - Potential Denial of Service due to memory leak in DNS TSIG message
   parsing.

 - Potential Denial of Service due to memory leak (or assertion
   when compiling with assertions enabled) when receiving a second
   SSH KEX message after a first.

 - Potential Denial of Service due to buffer read overflow and/or
   memory leaks in Kerberos analyzer.  The buffer read overflow
   could occur when the Kerberos message indicates it contains an
   IPv6 address, but does not send enough data to parse out a full
   IPv6 address.  A memory leak could occur when processing KRB_KDC_REQ
   KRB_KDC_REP messages for message types that do not match a
   known/expected type.

 - Potential Denial of Service when sending many zero-length SSL/TLS
   certificate data.  Such messages underwent the full Zeek file
   analysis treatment which is expensive (and meaninguless here)
   compared to how cheaply one can "create" or otherwise indicate
   many zero-length contained in an SSL message.

 - Potential Denial of Service due to buffer read overflow in SMB
   transaction data string handling.  The length of strings being
   parsed from SMB messages was trusted to be whatever the message
   claimed instead of the actual length of data found in the message.

 - Potential Denial of Service due to null pointer dereference in
   FTP ADAT Base64 decoding.

 - Potential Denial of Service due buffer read overflow in FTP
   analyzer word/whitespace handling.  This typically won't be a
   problem in most default deployments of Zeek since the FTP analyzer
   receives data from a ContentLine (NVT) support analyzer which
   first null-terminates the buffer used for further FTP parsing.

Approved by:	ler (mentor, implicit)
Security:	4ae135f7-85cd-4c32-ad94-358271b31f7f

Approved by:	ports-secteam (joneum)
2020-03-18 00:24:50 +00:00
Koichiro Iwao
0e87813769 MFH: r528561
security/softether5: fix build on aarch64

Tested on Amazon EC2 A1 instances with FreeBSD/ARM 12 image[1].
Build on mips also should be fixed (not actually tested).

[1] https://aws.amazon.com/marketplace/pp/B081NF7BY7

Sponsored by:	HAW International

Approved by:	portmgr branket (fix build)
2020-03-17 06:34:24 +00:00
Kubilay Kocak
aa87c0680c MFH: r526348 sysutils/py-diffoscope: Update to 136
Merge ports r526348 (update to 136, bugfix release) which should have
been merged with ports r528329

PR:		244750

Approved by:	ports-secteam (blanket: bugfix release, fix quarterly regression)
2020-03-14 02:20:07 +00:00
Jan Beich
d5c45306b1 MFH: r528394
emulators/citra: update to s20200312

Changes:	2c0bd0f2a...ad3c464e2
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-03-14 00:45:30 +00:00
Kubilay Kocak
94a99eb425 MFH: r528327 sysutils/py-diffoscope: Restore portability of zipinfo call
/dev/stdin is a non-portable non-POSIX extension having different
semantics on different operating systems. zininfo(1) exits with 9 when
/dev/stdin is supplied on FreeBSD. In fact, unzip(1) explicitly documents
that it does not support reading from stdin.

[1] https://lists.reproducible-builds.org/pipermail/diffoscope/2020-March/002632.html

PR:		244750
Submitted by:	Michael Osipov <michael.osipov siemens com>

Approved by:	ports-secteam (blanket: runtime bugfix)
2020-03-13 04:48:57 +00:00
Christoph Moench-Tegeder
e36557295e MFH: r528231
mail/thunderbird: update to 68.6.0

Releasenotes https://www.thunderbird.net/en-US/thunderbird/68.6.0/releasenotes/

Approved by:	portmgr blanket "web browser alike"
2020-03-12 18:58:18 +00:00
Tobias C. Berner
8f6640acbe MFH: r528046
irc/bitlbee-discord: Update to 0.4.2-11

PR:		244392
Submitted by:	Arthur Pirika <arfy32@gmail.com> (maintainer)

Approved by:	ports-secteam (joneum)
2020-03-12 18:46:07 +00:00
Wen Heping
3623518daf MFH: r528261
- Update Django to 3.0.4, 2.2.11 and 1.11.29(security release)
Security:	CVE-2020-9402

Approved by:	ports-secteam@(joneum@)
2020-03-12 08:47:23 +00:00
Jochen Neumeister
25f1ebfadd MFH: r528272
This fix a Problem, when MySQL build with libressl

/var/ports/usr/ports/databases/mysql56-client/work/mysql-5.6.47/vio/viosslfactories.c:230:25: error: use of undeclared identifier 'SSL_OP_NO_TLSv1_3'
                        SSL_OP_NO_TLSv1_3 |
                        ^
/var/ports/usr/ports/databases/mysql56-client/work/mysql-5.6.47/vio/viosslfactories.c:275:12: warning: implicit declaration of function 'SSL_CTX_set_ciphersuites' is invalid in C99 [-Wimplicit-function-declaration]
  if (0 == SSL_CTX_set_ciphersuites(ssl_fd->ssl_context, ""))

Special thanks for his help to: fluffy

PR:		244320
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-03-12 07:47:46 +00:00
Jung-uk Kim
5cfd4e8b48 MFH: r528267
Update to 32.0.0.344.

Approved by:	ports-secteam (blanket)
2020-03-12 03:06:28 +00:00
Kyle Evans
ce97c25da2 MFH: r528258
emulators/virtualbox-ose: use contemporary GCC instead of old llvm

The bug in PR 236616 resulted in virtualbox getting pinned to llvm7. This is
less than ideal, and in-fact has been broken by improvements to
machine/atomic.h
on x86 that require a more modern compiler.

Switch the build to USE_GCC= any. The patches that were previously applied
if COMPILER_TYPE == clang are actually needed by newer GCCs as well, so make
those
standard patches instead, folding the Config.kmk patches together.

We should put some effort into testing llvm10 and working out why llvm
breaks
it, but fixing the build is more important at the moment.

Q/A:
* portlint (pre-existing issues; none in current patch)
* testport (-CURRENT, amd64)
* run testing by madpilot@

PR:		244603
Approved by:	koobs (mentor), bapt (mentor)
Approved by:	portmgr (blanket: build fix)
Differential Revision:	https://reviews.freebsd.org/D23967

Approved by:	ports-secteam (blanket: build fix)
2020-03-12 00:44:44 +00:00
Thomas Zander
70289c0a6e MFH: r528243
Update to upstream version 44.0.0

Details:
- Mostly bugfixes, see
  https://mkvtoolnix.download/doc/NEWS.md
  but also a helpful new feature:
- MKVToolNix GUI: header editor: the attachments can now
  be reordered via drag & drop.

Approved by:	ports-secteam (riggs)
2020-03-11 20:34:49 +00:00
Jan Beich
c105b223bd MFH: r528139
www/firefox: switch to rc3

Changes:	https://hg.mozilla.org/releases/mozilla-release/rev/c6e493873ba5
Approved by:	ports-secteam blanket
2020-03-09 23:43:54 +00:00
Jan Beich
fc27847c1e MFH: r527914
security/nss: update to 3.51

Changes:	https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.51_release_notes
Changes:	https://hg.mozilla.org/projects/nss/shortlog/NSS_3_51_RTM
ABI:		https://abi-laboratory.pro/tracker/timeline/nss/
Approved by:	ports-secteam blanket (required by Firefox 75)
2020-03-09 18:28:05 +00:00
Jan Beich
d314cc9033 MFH: r524792
devel/nspr: update to 4.25

- Only run tests enabled on upstream CI

Changes:	http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-25-Release-td383750.html
ABI:		https://abi-laboratory.pro/tracker/timeline/nspr/
Reported by:	Repology
Approved by:	ports-secteam blanket
2020-03-09 18:25:06 +00:00
Jan Beich
710c86ae3f MFH: r522737 r524737 r525719
devel/rust-cbindgen: update to 0.13.1

Changes:	https://github.com/eqrion/cbindgen/compare/v0.12.1...v0.13.1
Reported by:	GitHub (watch releases)
Approved by:	ports-secteam blanket
2020-03-09 18:23:59 +00:00
Jan Beich
84e9e400f0 MFH: r527890
www/firefox: backport font selection regression fix

Requested by:	Andy New (on gecko@ list)
Approved by:	ports-secteam blanket
2020-03-07 19:07:20 +00:00
Jan Beich
1be80b5578 MFH: r527804
www/firefox: update to 74.0

Changes:	https://www.mozilla.org/firefox/74.0/releasenotes/
PR:		244310
Security:	9f900456-0bfa-4da4-ad59-14b2933259a2
Approved by:	ports-secteam blanket
Differential Revision:	https://reviews.freebsd.org/D23646
2020-03-07 19:06:38 +00:00
Jan Beich
adf4a6332a MFH: r527848
www/firefox-esr: update to 68.6.0

Changes:	https://www.mozilla.org/firefox/68.6.0/releasenotes/
Security:	9f900456-0bfa-4da4-ad59-14b2933259a2
Approved by:	ports-secteam blanket
2020-03-07 19:05:28 +00:00
Adam Weinberger
eee63c5b8b MFH: r526626 r527958
www/gitea: Update to 1.10.4

Changes:	https://github.com/go-gitea/gitea/releases/tag/v1.10.4
PR:		244246
Submitted by:	stb@lassitu.de (maintainer)

gitea: Update to 1.11.2, contains security fixes

https://blog.gitea.io/2020/02/gitea-1.11.0-is-released
https://blog.gitea.io/2020/02/gitea-1.11.1-is-released
https://blog.gitea.io/2020/02/gitea-1.11.2-is-released

PR:		244025
Submitted by:	maintainer
Security:	yes (see links above)

Approved by:	portmgr (with hat)
2020-03-07 18:42:56 +00:00
Jochen Neumeister
a88e27fda8 MFH: r527924
hand over Maintainership to Chris (portmaster@BSDforge.com)

Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-03-07 09:34:50 +00:00
Jochen Neumeister
e2135cee56 MFH: r527889
back to pool

Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-03-07 09:33:42 +00:00
Jochen Neumeister
e9a66f21ea MFH: r527888
hand over Maintainership to miwi

Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-03-07 09:32:46 +00:00
Jochen Neumeister
010eaf694c MFH: r527887
hand over Maintainership to miwi

Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-03-07 09:29:18 +00:00
Jochen Neumeister
c18175a133 MFH: r527886
hand over Maintainership to miwi

Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-03-07 09:25:39 +00:00
Jochen Neumeister
59ab042b01 MFH: r527885
hand over Maintainership to miwi

Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-03-07 09:21:48 +00:00
Antoine Brodin
1877f69536 Revert r527893 and unbreak the quarterly branch 2020-03-07 06:39:16 +00:00
Niclas Zeising
a232a04400 MFH: r527894
graphics/drm-legacy-kmod: Update snapshot

Update the graphics/drm-legacy-kmod port to the latest snapshot, fixing the
build with llvm 10

Approved by:	ports-secteam (implicit, drm-drivers blanket)
2020-03-06 21:46:07 +00:00
Matthias Fechner
dce4c2395b MFH: r527066 r527082
New port required for gitlab-ce 12.8.

New ports required for gitlab-ce 12.8 upgrade.

Approved by:	ports-secteam (joneum)
2020-03-06 19:29:52 +00:00
Jan Beich
5576fb9f4f MFH: r527874
multimedia/dav1d: update to 0.6.0

Changes:	https://code.videolan.org/videolan/dav1d/tags/0.6.0
Changes:	https://code.videolan.org/videolan/dav1d/blob/0.6.0/NEWS
Changes:	https://code.videolan.org/videolan/dav1d/compare/0.5.2...0.6.0
Approved by:	ports-secteam blanket (required by Firefox 76)
2020-03-06 14:22:16 +00:00
Piotr Kubaj
976efb3afa MFH: r527871
databases/postgresql12-server: fix build on GCC architectures

Use LLVM only if Clang is used.

PR:		244225
Approved by:	pgsql (maintainer timeout)

Approved by:	portmgr (fix build blanket)
2020-03-06 10:14:45 +00:00
Kai Knoblich
83eb67cb55 MFH: r527810
textproc/py-textfsm: Update to 1.1.1

This update resolves a package installation conflict with
textproc/py-texttable as both ports installs "texttable.py" into the same
place. [1]

Also while I'm here:

* Switch to GitHub for a while as no sdist tarballs are available at PyPi.

* Make the port concurrent safe because it installs scripts outside of the
  site-lib directory.

* Remove the "testdata" directory to prevent possible package conflicts as
  it's only required for the test suite.

* Add a "do-test" target to make future QA easier.

Changelog:

https://github.com/google/textfsm/releases/tag/v1.1.0
https://github.com/google/textfsm/releases/tag/v1.1.1

PR:		244257
Reported by:	John Hein <jcfyecrayz@liamekaens.com> [1]

Approved by:	ports-secteam (joneum)
2020-03-05 07:32:54 +00:00
Antoine Brodin
925e010fc9 MFH: r527808
Bump after FORBIDDEN
2020-03-05 06:44:42 +00:00
Cy Schubert
0f5ed4b120 MFH: r527758
Flag ntp-devel FORBIDDEN due to
http://support.ntp.org/bin/view/Main/SecurityNotice#\
March_2020_ntp_4_2_8p14_NTP_Rele

Approved by:	portmgr (joneum)
2020-03-05 06:22:47 +00:00
Cy Schubert
085d4c9c98 MFH: r527800
Update ntp-4.2.8p13 --> 4.2.8p14.

The advisory can be found at:
http://support.ntp.org/bin/view/Main/SecurityNotice#\
March_2020_ntp_4_2_8p14_NTP_Rele

No CVEs have been documented yet.

Security:	http://support.ntp.org/bin/view/Main/NtpBug3610
		http://support.ntp.org/bin/view/Main/NtpBug3596
		http://support.ntp.org/bin/view/Main/NtpBug3592

Approved by:	portmgr (joneum)
2020-03-05 06:21:11 +00:00
Koop Mast
2dea593305 MFH: r527732
Update librsvg2 to 2.40.21.

* Add license while here

Security:	b66583ae-5aee-4cd5-bb31-b2d397f8b6b3

Approved by:	ports-secteam@ (joneum@)
2020-03-04 19:04:26 +00:00
Tobias Kortkamp
795f7aa36e MFH: r523512
lang/rust-nightly: Unbreak with lld on 12.1/13.0 i386

 = note: ld: error: relocation R_386_PC32 cannot be used against symbol __rust_probestack; recompile with -fPIC
          >>> defined in /wrkdirs/usr/ports/lang/rust-nightly/work/rustc-nightly-src/build/i686-unknown-freebsd/stage1/lib/rustlib/i686-unknown-freebsd/lib/libcompiler_builtins-6570a75fe85f0e1a.rlib(compiler_builtins-6570a75fe85f0e1a.compiler_builtins.2i519eqi-cgu.15.rcgu.o)
          >>> referenced by std.4xivr03c-cgu.14
          >>>               std-9bd70afd58e204b7.std.4xivr03c-cgu.14.rcgu.o:(_$LT$alloc..boxed..Box$LT$F$GT$$u20$as$u20$core..ops..function..FnOnce$LT$A$GT$$GT$::call_once::h1c78ed6e734a2bfc (.llvm.10122419023709863394)) in archive /wrkdirs/usr/ports/lang/rust-nightly/work/rustc-nightly-src/build/i686-unknown-freebsd/stage1/lib/rustlib/i686-unknown-freebsd/lib/libstd-9bd70afd58e204b7.rlib

          ld: error: relocation R_386_PC32 cannot be used against symbol __rust_probestack; recompile with -fPIC
          >>> defined in /wrkdirs/usr/ports/lang/rust-nightly/work/rustc-nightly-src/build/i686-unknown-freebsd/stage1/lib/rustlib/i686-unknown-freebsd/lib/libcompiler_builtins-6570a75fe85f0e1a.rlib(compiler_builtins-6570a75fe85f0e1a.compiler_builtins.2i519eqi-cgu.15.rcgu.o)
          >>> referenced by std.4xivr03c-cgu.14
          >>>               std-9bd70afd58e204b7.std.4xivr03c-cgu.14.rcgu.o:(std::io::util::copy::h9115f048f2203467) in archive /wrkdirs/usr/ports/lang/rust-nightly/work/rustc-nightly-src/build/i686-unknown-freebsd/stage1/lib/rustlib/i686-unknown-freebsd/lib/libstd-9bd70afd58e204b7.rlib
          clang-cpp: error: linker command failed with exit code 1 (use -v to see invocation)

error: aborting due to previous error

http://beefy17.nyi.freebsd.org/data/head-i386-default/p523508_s356869/logs/rust-nightly-1.42.0.20200118.log
http://beefy4.nyi.freebsd.org/data/121i386-quarterly/527662/logs/rust-nightly-1.42.0.20191222.log

Approved by:	ports-secteam blanket
2020-03-04 17:56:57 +00:00
Kubilay Kocak
2562ff257c MFH: r527737 devel/py-futures: Update to 3.3.0
Changelog:

  https://github.com/agronholm/pythonfutures/blob/3.3.0/CHANGES.rst

Reported by:	ngie

Approved by:	ports-secteam (blanket: bugfix release)
2020-03-04 05:17:11 +00:00
Jan Beich
8a5e18f48c MFH: r527660
emulators/citra: update to s20200301

Changes:	cd46e62ad...2c0bd0f2a
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-03-03 00:46:31 +00:00
Mateusz Piotrowski
f6042aba3a MFH: r527618 r527619
- Update audio/timidity++ to 2.15.0. [1]
- Mark audio/timidity++-tcltk as BROKEN due to build failures.

PR:		244429
Submitted by:	pi [1]
Security:	CVE-2017-11546
Security:	CVE-2017-11547
Security:	CVE-2017-11549

Approved by:	ports-secteam (joneum)
2020-03-02 14:02:08 +00:00
Mateusz Piotrowski
7f6a932a8e MFH: r527232
Add libarc to LIB_DEPENDS for audio/timidity++

Up until now, libarc was only being included in LIB_DEPENDS when
the Makefile of audio/timidity++ was being used by one of its slave ports.
audio/timidity++, however, may be also used as a standalone port in which
case it needs libarc to be available.

Reported by:	hselasky

Approved by:	portmgr blanket (runtime fix)
2020-03-02 09:25:36 +00:00
Christoph Moench-Tegeder
dcd1fe0196 MFH: r527565
switch kicad-doc from source to pre-built docs

The build process is rather unstable on our asciidoc toolchain, but
then the doc files are completely independent of OS and machine
architecture, so there's nothing which stops us from just taking the
ready-built files from upstream. At the same time this enables two
additional documentation languages (polnish and chinese) - their
build process was even more unstable than the rest in my environment.

PR:		241183

Approved by:	ports-secteam (joneum@)
2020-03-01 18:10:41 +00:00
Jan Beich
bbfffc9f42 MFH: r527425
emulators/citra: update to s20200229

Changes:	f106e7613...cd46e62ad
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-02-29 15:54:56 +00:00
Matthias Fechner
b4013ae841 MFH: r527417
textproc/apache-solr: security related update to 8.4.1
Switch java version to current LTS version.

Security:	e59cb761-5ad8-11ea-abb7-001b217b3468

Approved by:	ports-secteam (joneum)
2020-02-29 14:48:12 +00:00
Jochen Neumeister
4f0db06072 MFH: r527391
Fix build on non-x86 and nun-aarch6

PR:		244073
Submitted by:	pkubaj
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (joneum)
2020-02-28 22:07:00 +00:00
Niclas Zeising
d9b554e4ec MFH: r527102
x11/xdm: Fix generation of etc/X11/xdm/Xresources

By some stupidity of autotools, spacing for a sed regexp used to generate
Xresources gets broken, and the sed command doen't match as it should.  This
results in an Xresources file with an extra '#endif /* XPM */', which breaks
the file.
Patch Makefile.in to fix the regexp and have Xresources generated properly.

PR:		244404
Reported by:	olgeni

Approved by:	ports-secteam (joenum)
2020-02-26 20:53:39 +00:00
Tijl Coosemans
c4b69fd407 MFH: r527000
Update to 2.16.5.

Security:	https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2020-02
Approved by:	ports-secteam (joneum)
2020-02-25 10:00:08 +00:00
Dima Panov
8dfa9bdf81 MFH: r527012
mail/opensmtpd: update to 6.6.4p1 security releaase

SECURITY RELEASE

An out of bounds read in smtpd allows an attacker to inject arbitrary commands into the envelope file which are then executed as root. Separately, missing privilege revocation in smtpctl allows arbitrary commands to be run with the _smtpq group.

Approved by:	ports-secteam (joneum)
Security:	CVE-2020-8793, CVE-2020-8794
2020-02-25 03:22:59 +00:00
Dima Panov
5a3400175f MFH: r526973
net/freeradius-client: unbreak fetch, update to 1.1.7 release

Maintainer didn't unbreak the port over 3 months since it was marked unfetchable,
version 1.1.7 was released 26.05.2017

Approved by:	maintainer (timeout)

Approved by:	ports-secteam (joneum)
2020-02-25 03:20:58 +00:00
Bernard Spil
ed9ca44054 MFH: r526689
irc/weechat: Security update to 2.7.1

Security:	8e3f1812-54d9-11ea-8d49-d4c9ef517024

Approved by:	ports-secteam (joneum)
2020-02-22 14:33:32 +00:00
Matthias Andree
212066a9cf MFH: r526760
Update Postfix to 3.4.9 (bugfix-only release)

While here, also strip libexec/postfix/postlogd.

Announcement: http://www.postfix.org/announcements/postfix-3.4.9.html
 Fixed in all supported stable releases:
    Bug (introduced: Postfix 3.1): smtp_dns_resolver_options were broken while adding support for negative DNS response caching in postscreen. Postfix was inadvertently changed to call res_query() instead of res_search(). Reported by Jaroslav Skarvada.

    Bug (introduced: Postfix 2.5): Postfix ignored the CONNECT macro overrides from a Milter application. Postfix now evaluates the Milter macros for an SMTP CONNECT event after the Postfix-to-Milter connection is negotiated. Problem reported by David Bürgin.

    Bug (introduced: Postfix 3.0): sanitize (remote) server responses before storing them in the verify database, to avoid Postfix warnings about malformed UTF8. Found during code maintenance.

PR:		243879
Submitted by:	Juraj Lutter <juraj@lutter.sk>
Approved by:	maintainer timeout 15d (ohauer@)
Differential Revision:	https://reviews.freebsd.org/D23502

Approved by:	ports-secteam (joneum@)
2020-02-22 13:28:58 +00:00
Thomas Zander
8185799a37 MFH: r526761
Update to upstream version 1.7.21

Details:
- Bugfix release, see
  https://github.com/containous/traefik/releases/tag/v1.7.21

Approved by:	ports-secteam (riggs)
2020-02-22 12:18:52 +00:00
Torsten Zuehlsdorff
30f1a3ab92 MFH: r526724
lang/php74: Upgrade from 7.4.2 to 7.4.3

Changelog:

    Core:
        Fixed bug #79146 (cscript can fail to run on some systems).
        Fixed bug #79155 (Property nullability lost when using multiple property definition).
        Fixed bug #78323 (Code 0 is returned on invalid options).
        Fixed bug #78989 (Delayed variance check involving trait segfaults).
        Fixed bug #79174 (cookie values with spaces fail to round-trip).
        Fixed bug #76047 (Use-after-free when accessing already destructed backtrace arguments).
    COM:
        Fixed bug #79247 (Garbage collecting variant objects segfaults).
    CURL:
        Fixed bug #79078 (Hypothetical use-after-free in curl_multi_add_handle()).
    FFI:
        Fixed bug #79096 (FFI Struct Segfault).
    IMAP:
        Fixed bug #79112 (IMAP extension can't find OpenSSL libraries at configure time).
    Intl:
        Fixed bug #79212 (NumberFormatter::format() may detect wrong type).
    Libxml:
        Fixed bug #79191 (Error in SoapClient ctor disables DOMDocument::save()).
    MBString:
        Fixed bug #79149 (SEGV in mb_convert_encoding with non-string encodings).
    MySQLi:
        Fixed bug #78666 (Properties may emit a warning on var_dump()).
    MySQLnd:
        Fixed bug #79084 (mysqlnd may fetch wrong column indexes with MYSQLI_BOTH).
        Fixed bug #79011 (MySQL caching_sha2_password Access denied for password with more than 20 chars).
    Opcache:
        Fixed bug #79114 (Eval class during preload causes class to be only half available).
        Fixed bug #79128 (Preloading segfaults if preload_user is used).
        Fixed bug #79193 (Incorrect type inference for self::$field =& $field).
    OpenSSL:
        Fixed bug #79145 (openssl memory leak).
    Phar:
        Fixed bug #79082 (Files added to tar with Phar::buildFromIterator have all-access permissions). (CVE-2020-7063)
        Fixed bug #79171 (heap-buffer-overflow in phar_extract_file). (CVE-2020-7061)
        Fixed bug #76584 (PharFileInfo::decompress not working).
    Reflection:
        Fixed bug #79115 (ReflectionClass::isCloneable call reflected class __destruct).
    Session:
        Fixed bug #79221 (Null Pointer Dereference in PHP Session Upload Progress). (CVE-2020-7062)
    Standard:
        Fixed bug #78902 (Memory leak when using stream_filter_append).
        Fixed bug #78969 (PASSWORD_DEFAULT should match PASSWORD_BCRYPT instead of being null).
    Testing:
        Fixed bug #78090 (bug45161.phpt takes forever to finish).
    XSL:
        Fixed bug #70078 (XSL callbacks with nodes as parameter leak memory).
    Zip:
        Add ZipArchive::CM_LZMA2 and ZipArchive::CM_XZ constants (since libzip 1.6.0).
        Add ZipArchive::RDONLY (since libzip 1.0.0).
        Add ZipArchive::ER_* missing constants.
        Add ZipArchive::LIBZIP_VERSION constant.
        Fixed bug #73119 (Wrong return for ZipArchive::addEmptyDir Method).

Changelog taken from: https://www.php.net/ChangeLog-7.php#7.4.3

Approved by:	ports-secteam (joneum)
2020-02-21 22:46:19 +00:00
Torsten Zuehlsdorff
63f9998505 MFH: r526723
lang/php73: Upgrade from 7.3.14 to 7.3.15

Changelog:

    Core:
        Fixed bug #71876 (Memory corruption htmlspecialchars(): charset `*' not supported).
        Fixed bug #79146 (cscript can fail to run on some systems).
        Fixed bug #78323 (Code 0 is returned on invalid options).
        Fixed bug #76047 (Use-after-free when accessing already destructed backtrace arguments).
    CURL:
        Fixed bug #79078 (Hypothetical use-after-free in curl_multi_add_handle()).
    Intl:
        Fixed bug #79212 (NumberFormatter::format() may detect wrong type).
    Libxml:
        Fixed bug #79191 (Error in SoapClient ctor disables DOMDocument::save()).
    MBString:
        Fixed bug #79154 (mb_convert_encoding() can modify $from_encoding).
    MySQLnd:
        Fixed bug #79084 (mysqlnd may fetch wrong column indexes with MYSQLI_BOTH).
    OpenSSL:
        Fixed bug #79145 (openssl memory leak).
    Phar:
        Fixed bug #79082 (Files added to tar with Phar::buildFromIterator have all-access permissions). (CVE-2020-7063)
        Fixed bug #79171 (heap-buffer-overflow in phar_extract_file). (CVE-2020-7061)
        Fixed bug #76584 (PharFileInfo::decompress not working).
    Reflection:
        Fixed bug #79115 (ReflectionClass::isCloneable call reflected class __destruct).
    Session:
        Fixed bug #79221 (Null Pointer Dereference in PHP Session Upload Progress). (CVE-2020-7062)
    SPL:
        Fixed bug #79151 (heap use after free caused by spl_dllist_it_helper_move_forward).
    Standard:
        Fixed bug #78902 (Memory leak when using stream_filter_append).
    Testing:
        Fixed bug #78090 (bug45161.phpt takes forever to finish).
    XSL:
        Fixed bug #70078 (XSL callbacks with nodes as parameter leak memory).

Changelog taken from: https://www.php.net/ChangeLog-7.php#7.3.15

Approved by:	ports-secteam (joneum)
2020-02-21 22:43:15 +00:00
Torsten Zuehlsdorff
2dd60a109f MFH: r526722
lang/php72: Upgrade from 7.2.27 to 7.2.28

Changelog:

    DOM:
        Fixed bug #77569: (Write Access Violation in DomImplementation).
    Phar:
        Fixed bug #79082 (Files added to tar with Phar::buildFromIterator have all-access permissions). (CVE-2020-7063)
    Session:
        Fixed bug #79221 (Null Pointer Dereference in PHP Session Upload Progress). (CVE-2020-7062)

Changelog taken from: https://www.php.net/ChangeLog-7.php#7.2.28

Approved by:	ports-secteam (joneum)
2020-02-21 22:41:12 +00:00
Niclas Zeising
198cb5af04 MFH: r526720
Graphics/drm-fbsd11.2-kmod: Update snapshot

Update graphics/drm-fbsd11.2-kmod to the latest snapshot.
Make unsynchronized DRM_IOCTL_I915_GEM_USERPTR work in mesa on 7th
generation Haswell graphics.  This is needed for vulkan.
Add devctl (devd) notification for monitor hotplug.

Approved by:	portmgr (implicit, drm-drivers blanket)
2020-02-21 21:45:31 +00:00
Dimitry Andric
381f709927 MFH: r526608
devel/valgrind(-devel): Fix compiler version detection hopefully forever

Every time a compiler major version is bumped, we run into this exact
same error:

===>  Configuring for valgrind-3.10.1.20160113_7,1
...
checking for a supported version of gcc... no (10.0.0)
configure: error: please use gcc >= 3.0 or clang >= 2.9

Attempt to fix this for all versions in the future.

Other fix included: don't use undefined behavior to implement offsetof,
just use the official builtin function instead.

Approved by:	portmgr (joneum)
PR:		244234
2020-02-21 21:29:58 +00:00
Niclas Zeising
5f0d89e975 MFH: r526717
graphics/drm-fbsd12.0-kmod: Update snapshot

Update the graphics/drm-fbsd12.0-kmod snapshot
Make unsynchronized DRM_IOCTL_I915_GEM_USERPTR work in mesa on 7th
generation Haswell graphics.  This is needed for vulkan.

Approved by:	portmgr (implicit, drm-drivers blanket)
2020-02-21 21:15:07 +00:00
Kyle Evans
a27e36769d MFH: r526604
www/p5-Gantry: correctly escape $

In make(1), "$$" is the escaped version of "$", rather than the expected
"\$". this expression was getting passed through to ${REINPLACE_CMD} as
"s,\NV{..." rathern than the expected "s,$ENV{..." -- bug #229925 makes \N
an illegal expression, as ordinary characters will be disallowed from being
escaped in preparation for future changes to grant some of these escape
sequences GNU-extended behavior.

PR:		240310
Approved by:	koobs (mentor), bapt (mentor)
Approved by:	portmgr (maintainer timeout: 4 months, blanket: bugfix)
Differential Revision:	https://reviews.freebsd.org/D23701

Approved by:	ports-secteam (blanket: bugfix)
2020-02-21 04:01:57 +00:00
Michael Gmelin
6e9ebf3092 MFH: r526586
Fix accidental overwriting of properties on update

See:
https://github.com/iocage/iocage/issues/1130
b47dc2c47f

PR:		244252

Approved by:	portmgr (runtime fix blanket)
2020-02-20 20:38:00 +00:00
Kyle Evans
9dcb5d4edc MFH: r526580
x11-toolkits/p5-Alien-wxWidgets: remove extraneous escapes

post-patch phase of this port uses sed to replace 'wx-config with
'${WX_CONFIG:T}. Previously it escaped the ', but this is not necessary in
this context.

Remove the extraneous escape so that it doesn't get passed through to sed(1)
as an escape of an ordinary character. This is important as the patch in bug
#229925 will make such escapes an error to ease transition into a world
where some escaped-ordinaries will be granted a special meaning.

PR:		240450
Approved by:	koobs (mentor), bapt (mentor)
Approved by:	portmgr (maintainer timeout: 4 months)
Differential Revision:	https://reviews.freebsd.org/D23702

Approved by:	ports-secteam (implicit, future build fix)
2020-02-20 19:08:31 +00:00
Kyle Evans
6557d2de2a MFH: r526579
x11-toolkits/p5-Alien-wxWidgets: add missing file to pkg-plist

This appears to have been overlooked in a previous update, so note its
presence in the pkg-plist.

This fixes Q/A checks run by `poudriere testport`.

Approved by:	koobs (mentor), bapt (mentor)
Differential Revision:	D23702 (included, but not the primary change)

Approved by:	ports-secteam (implicit, packaging fix)
2020-02-20 19:07:24 +00:00
Kyle Evans
4390f2f8c9 MFH: r526577
www/foswiki: remove redundant escape

= does not need to be escaped in this context; bug #229925 will make this
escape as well as the escape of most ordinary characters an error to reduce
friction when some of these ordinary characters are later granted special
GNU-extended behavior.

No functional change, no need to bump PORTREVISION.

PR:		240309
Approved by:	koobs (mentor), bapt (mentor)
Approved by:	portmgr (maintainer timeout: 4 months)
Differential Revision:	https://reviews.freebsd.org/D23698

Approved by:	ports-secteam (implicit, future build fix)
2020-02-20 19:06:39 +00:00
Kyle Evans
c982d9ec47 MFH: r525282
qemu-user-static: revert SSP_CFLAGS workaround (ports r501032)

This was later diagnosed to be a bug in libc, which has since been addressed
in all supported releases and branches. PORTREVISION is bumped as SSP_CFLAGS
will change the output, and for consumers of these two ports it is
imperative that it be rebuilt against the updated libc to avoid high failure
rates. In testing qemu-user-static-devel failed roughly 60% of the time,
rendering it unusable as each fork/exec was yet one more chance to fail.

The bug was fixed in the following patch levels (FreeBSD-EN-20:01.ssp):
- 12.1-p2
- 12.0-p13
- 11.3-p6

PR:		243735
Approved by:	koobs (ports)

Approved by:	ports-secteam (implicit, runtime fix)
2020-02-20 19:05:03 +00:00
Kyle Evans
14f6a85e21 MFH: r525281
glib20: revert SSP_CFLAGS workaround (ports r500819)

This was later diagnosed to be a bug in libc, which has since been addressed
in all supported releases and branches. PORTREVISION is bumped as SSP_CFLAGS
will change the output.

The bug was fixed in the following patch levels (FreeBSD-EN-20:01.ssp):
- 12.1-p2
- 12.0-p13
- 11.3-p6

PR:		243735
Approved by:	kwm (gnome, maintainer via IRC)

Approved by:	ports-secteam (miwi)
2020-02-20 19:02:19 +00:00
Matthias Andree
8d5f33c994 MFH: r526535
mail/fetchmail: mail/fetchmailconf: update to 6.4.2, make Python 3 compatible

Fetchmail updated to new revision 6.4.2
- one bugfix
- manual page updates
- update of Chinese (simplified) translation
- massive fetchmailconf overhaul
  + Python 3 compatible (requires py-future)
  + Supports IPv6 and SSL probing
- remove two patches for fetchmail that are in the upstream release
- add a smoke test to fetchmailconf's post-install,
  and a patch to support that running without X11 $DISPLAY.

PR:		244130
Submitted by:	mandree@
Reviewed by:	Corey Halpin <chalpin@cs.wisc.edu> (maintainer)
Approved by:	Corey Halpin <chalpin@cs.wisc.edu> (maintainer)

Approved by:	ports-secteam@ (joneum@)
2020-02-20 18:51:34 +00:00
Cy Schubert
3f7a774106 MFH: r525497
Fix CVE-2019-14868: certain environment variables interpreted as
arithmetic expressions on startup, leading to code injection.

Submitted by:	Siteshwar Vashisht <svashisht@redhat.com>
Reported by:	Marian Rehak
Security:	CVE-2019-14868
		https://bugzilla.redhat.com/show_bug.cgi?id=1757324
		https://access.redhat.com/security/cve/CVE-2019-14868
Approved by:	portmgr (miwi)
2020-02-20 03:42:57 +00:00
Koop Mast
116296778b MFH: r526526
Update webkit2-gtk3 to 2.26.4.

Security:	1cb0af4e-d641-4f99-9432-297a89447a97

Approved by:	ports-secteam@ (joneum@)
2020-02-19 19:56:32 +00:00
Luca Pizzamiglio
6badd78a50 MFH: r526499
devel/pecl-xdebug: Update to 2.9.2

Bug fix release.
Changelog: https://xdebug.org/updates#x_2_9_2

Sponsored by:	trivago N.V.

Approved by:	portmgr
2020-02-19 12:28:53 +00:00
Kai Knoblich
7b77e19910 MFH: r526491
games/anki: Update to 2.1.16

* Backport two patches from upstream that fix the argument handling with
  multimedia/mpv since r520597.

* Also slightly change the MASTER_SITES as upstream distribute tarballs for
  newer versions only via GitHub.

Although there are already some newer releases available use the 2.1.16
release for a while.  It's mainly because the build process has changed a
lot since the 2.1.17 release and still needs to be investigated a little
more closely.

Changelog:

https://apps.ankiweb.net/docs/changes.html#changes-in-2.1.16

Approved by:	ports-secteam bugfix blanket
2020-02-19 08:22:09 +00:00
Thomas Zander
3bb50ea0bc MFH: r526469
Update to upstream version 0.21.20

Details:
- Bugfix release, see
  https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.20/NEWS
  includes various fixes for seeking

Approved by:	ports-secteam (riggs)
2020-02-18 19:06:36 +00:00
Koichiro Iwao
7b9982600f MFH: r526441
security/softether5: fix build on non-x86 architectures

Tested on: Raspberry Pi 3 Model B+

Sponsored by:	HAW International

Approved by:	portmgr blanket (fix build)
2020-02-18 08:58:14 +00:00
Matthias Andree
4e116cfa29 MFH: r526434
sysutils/e2fsprogs: Fix powerpc32 build/self-tests
libext2fs: avoid array buffer overruns caused by insane directory blocks

PR:		242798
Reported by:	canardo909@gmx.com
Obtained from:	Theodore Y. Ts'o <tytso@mit.edu> (upstream maintainer)

Approved by:	ports-secteam (blanket, fixing broken self-test by small patch)
2020-02-17 22:14:32 +00:00
Jan Beich
cc4e6adc6e MFH: r526430
www/firefox: update to 73.0.1

Changes:	https://www.mozilla.org/firefox/73.0.1/releasenotes/
PR:		243295
Approved by:	ports-secteam blanket
2020-02-17 20:46:22 +00:00
Matthias Fechner
a600a37ee6 MFH: r524831 r525233 r526069
Update to 12.7.5.
Changelog:
https://about.gitlab.com/releases/2020/01/22/gitlab-12-7-released/
https://about.gitlab.com/releases/2020/01/24/gitlab-12-7-2-released/
https://about.gitlab.com/releases/2020/01/30/security-release-gitlab-12-7-4-released/
https://about.gitlab.com/releases/2020/01/31/gitlab-12-7-5-released/

Use the standard RC system available in FreeBSD.
This makes some commands like:
service gitlab rcvar
available. This is required by configuration management tools like Chef, Puppetm, Salt,
Ansible and more.

PR:		243860
Reported by:	amendlik@gmail.com

Security update to 12.7.6.
Changelog:
https://about.gitlab.com/releases/2020/02/13/critical-security-release-gitlab-12-dot-7-dot-6-released/

Security:	1ece5591-4ea9-11ea-86f0-001b217b3468

Approved by:	ports-secteam (joneum)
2020-02-17 19:03:59 +00:00
Matthias Fechner
d70d7f5168 MFH: r525469
Fixed build for aarch64.
This problem was send upstream here:
https://gitlab.com/gitlab-org/gitlab-workhorse/issues/246

And will be corrected with this merge request:
https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/456

After the merge request reached the next stable version the two patches:
gitlab-workhorse/files/patch-go.mod
gitlab-workhorse/files/patch-go.sum

can be removed again.

PR:		243804
Reported by:	mikael@FreeBSD.org

Approved by:	ports-secteam (joneum)
2020-02-17 19:00:48 +00:00
Matthias Fechner
59289087e0 MFH: r524826
Update to 2.7.0 which is required for gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:59:48 +00:00
Matthias Fechner
b8b8997e49 MFH: r524942
Update to 1.2.2 to work with newer rubygem-addressable.

Approved by:	ports-secteam (joneum)
2020-02-17 18:58:57 +00:00
Matthias Fechner
d6d4ae236c MFH: r524941
Update to 1.8.1 to work with newer rubygem-addressable.

Approved by:	ports-secteam (joneum)
2020-02-17 18:58:07 +00:00
Matthias Fechner
cfea37f1e9 MFH: r524940
Update to 0.2.5 to work with newer rubygem-addressable.

Approved by:	ports-secteam (joneum)
2020-02-17 18:57:25 +00:00
Matthias Fechner
e90b327ce4 MFH: r524939
Update to 0.8.1 to work with newer rubygem-addressable.

Approved by:	ports-secteam (joneum)
2020-02-17 18:56:30 +00:00
Matthias Fechner
013fee5959 MFH: r524836
Unbreak INDEX

Approved by:	ports-secteam (joneum)
2020-02-17 18:55:45 +00:00
Matthias Fechner
30be408e5b MFH: r524830
Update to 11.0.0 which is required for gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:53:53 +00:00
Matthias Fechner
66fae808b6 MFH: r524829
Update to 1.83.0 which is required for gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:53:03 +00:00
Matthias Fechner
cca5b2ebe0 MFH: r524828
Update to 4.6.0 which is required for gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:52:19 +00:00
Matthias Fechner
85ca80fb24 MFH: r524827
Update to 2.3.1 which is required for gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:51:35 +00:00
Matthias Fechner
465412db4c MFH: r524825
Update to 4.15.0 which is required for gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:50:52 +00:00
Matthias Fechner
e3180bff88 MFH: r524824
Update to 1.81.0 which is required for gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:50:07 +00:00
Matthias Fechner
f0679ece1f MFH: r524823
Update to 1.2.0 which is required for gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:49:26 +00:00
Matthias Fechner
0fdb5adb20 MFH: r524822
Update to 0.8.0 which is required for gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:48:35 +00:00
Matthias Fechner
519fb01a81 MFH: r524821
Upgraded to version 6.8.1.

Approved by:	ports-secteam (joneum)
2020-02-17 18:47:48 +00:00
Matthias Fechner
d007b665dc MFH: r524820
Added/reviewed ports required by gitlab-ce 12.7.

Approved by:	ports-secteam (joneum)
2020-02-17 18:46:57 +00:00
Kubilay Kocak
475716846e MFH: r526357 devel/py-Faker: Add missing dependencies
None of the packages upstream specified dependencies were declared in the
port. This change adds those missing dependencies.

The issue was identified while QA'ing www/py-freenit via bug 242817

File "/usr/local/lib/python3.7/site-packages/faker/providers/internet/__init__.py", line 4, in <module>
    from text_unidecode import unidecode
ModuleNotFoundError: No module named 'text_unidecode'

While I'm here, level up ports (and Python ports) compliance and add test
target.

Approved by:	portmgr (blanket(s): missing dependencies, ports (Python) compliance)

Approved by:	ports-secteam (blanket(s): missing dependencies, ports (Python) compliance)
2020-02-17 10:46:22 +00:00
Kubilay Kocak
4e3fe60565 MFH: r526349 www/tomcat85,9: Improve port quality
- Don't echo automatic actions unlike other manual actions
  - Don't perform ${RM} -R because the OPTIONS system takes @comment parts
    in pkg-plist into account, poudriere build does not complain.
  - Don't provide samples for XML schema files, these are NOT intended to
    be modified by the user

PR:		243648
Submitted by:	Michael Osipov <michael.osipov siemens com>
Approved by:	VVD <vvd unislabs com>

Approved by:	ports-secteam (blanket: ports compliance, bugfixes)
2020-02-17 10:43:51 +00:00
Kai Knoblich
e7111d1687 MFH: r526351
textproc/py-ocrmypdf: Update to 9.6.0

Changelog since 9.3.0:

https://github.com/jbarlow83/OCRmyPDF/blob/v9.6.0/docs/release_notes.rst

Approved by:	ports-secteam bugfix blanket
2020-02-17 08:43:22 +00:00
Kubilay Kocak
d5c41481d9 MFH: r526346 net-mgmt/netdata: Honour/respect default Python version
PR:		243567
Reviewed by:	mat, koobs (python)
Approved by:	portmgr (blanket: run time bug fix, ports (Python) compliance)
Differential Revision:	D22909

Approved by:	ports-secteam (blanket: run time bug fix, ports (Python) compliance)
2020-02-17 07:00:50 +00:00
Danilo G. Baio
2b059e7583 MFH: r526071
graphics/libexif: Fix security vulnerabilities

 - Fix CVE-2019-9278

  In libexif, there is a possible out of bounds write due to an integer
  overflow. This could lead to remote escalation of privilege in the media
  content provider with no additional execution privileges needed. User
  interaction is needed for exploitation.

 - Fix a buffer read overflow in exif_entry_get_value

 - Fix a buffer overread in exif_mnote_data_olympus_load

PR:		244060
Reported by:	tj@mrsk.me (email)
Approved by:	former maintainer
Security:	00f30cba-4d23-11ea-86ba-641c67a117d8

Approved by:	ports-secteam (blanket, backport of security fixes)
2020-02-15 16:28:41 +00:00
Matthias Andree
a6b5a5cab5 MFH: r526180, to complement r526177 (MFH r526173)
Unbreak fetch of fetchmailconf...

...which inherits MASTER_SITES through .including fetchmail/Makefile

Approved by:	ports-secteam (blanket, unbreak broken port)
2020-02-14 22:23:22 +00:00
Matthias Andree
89024c0869 MFH: r526173
Unbreak. The port had been broken while fetchmail 6.3.26 had
been removed by upstream and before mail/fetchmail had been
updated to 6.4.x - it fetches properly.

Regarding Python 3.x compatibility,
see: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244130

While here, fix TARGET -> ALL_TARGET to avoid building the C stuff,
and drop the unused obsolete distinfo file.

Approved by:	ports-secteam (blanket, unbreaking broken port)
2020-02-14 21:32:23 +00:00
Larry Rosenman
b36d87764e MFH: r526001
mail/dovecot: upgrade to 2.3.9.3

Changelog:
    * CVE-2020-7046: Truncated UTF-8 can be used to DoS
      submission-login and lmtp processes.
    * CVE-2020-7957: Specially crafted mail can crash snippet generation.

Security:	CVE-2020-7046
Security:	CVE-2020-7957
Security:	74db0d02-b140-4c32-aac6-1f1e81e1ad30

Approved by: ports-secteam (zi)
2020-02-14 21:30:24 +00:00
Baptiste Daroussin
ea60da8202 MFH: r525916
sysutils/grub2-bhyve: Neutralize privileged guest commands

GRUB was designed to run in a trusted environment, where anyone with access
to grub2.cfg could also modify grub itself.  In grub2-bhyve, we have
modified it to run in host context, but interpret the commands of guest
grub2.cfg.  This means we have to worry about malicious guests.

This patch addresses two escalation vectors: font-loading, and the direct
'read', 'write', 'in', and 'out' commands (which read/write arbitrary
addresses).  Both reported by Reno Robert.

Disable font-loading by neutering the command.  It is believed to be non-
essential and there is at least one buffer overflow in the font loading
code.

Disable reading and writing host memory and IO ports.  It is believed to be
non-essential.

admbugs:	948
Reported by:	Reno Robert <renorobert AT gmail.com>
Approved by:	bapt
Security:	yes

Approved by:	portmgr (bapt)
2020-02-14 15:41:49 +00:00
Piotr Kubaj
eff95a2608 MFH: r526016
security/nss: fix build with GCC architectures

-Werror=unused-function causes:
verified/kremlin/kremlib/dist/minimal/FStar_UInt128.h:82:37: error: 'FStar_UInt128_mul32' declared 'static' but never defined [-Werror=unused-function]
   82 | inline static FStar_UInt128_uint128 FStar_UInt128_mul32(uint64_t x, uint32_t y);

Add -Wno-error=unused-function to fix build.

Approved by:	portmgr (ports tree compliance)
2020-02-13 14:18:22 +00:00
Jan Beich
0cb6642b4d MFH: r525994
emulators/citra: update to s20200211

Changes:	5d502dfec...f106e7613
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-02-13 00:45:18 +00:00
Jan Beich
c61bf76047 MFH: r525989
mail/thunderbird: update to 68.5.0

Changes:	https://www.thunderbird.net/thunderbird/68.5.0/releasenotes/
Approved by:	ports-secteam blanket (browser inside)
2020-02-13 00:44:40 +00:00
Jan Beich
c0b2600b4f MFH: r525988
security/nss: unbreak on armv6 after r524147

In file included from ../../lib/freebl/gcm-arm32-neon.c:16:
/usr/lib/clang/8.0.1/include/arm_neon.h:28:2: error: "NEON support not enabled"
 #error "NEON support not enabled"
  ^

PR:		243734
Reported by:	garga
Submitted by:	mikael
Approved by:	ports-secteam blanket
2020-02-13 00:44:02 +00:00
Jan Beich
48d23973bc MFH: r525887
emulators/rpcs3: unbreak DEFAULT_VERSIONS=python=2.7 after r521573

CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
  Could NOT find PythonInterp: Found unsuitable version "2.7.17", but
  required is at least "3" (found /usr/local/bin/python)
Call Stack (most recent call first):
  /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:376 (_FPHSA_FAILURE_MESSAGE)
  /usr/local/share/cmake/Modules/FindPythonInterp.cmake:160 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
  Vulkan/glslang/CMakeLists.txt:165 (find_package)

Approved by:	ports-secteam blanket
2020-02-11 19:26:24 +00:00
Dima Panov
cc45a5657f MFH: r525833
mail/opensmtpd: update to 6.6.3p1 release

- switch default configuration to maildir
- allow mbox to deliver to users without requiring privileges in the daemon
- allow lmtp to receive sender/recipient in environment

Approved by:	ports-secteam (joneum)
2020-02-11 16:29:54 +00:00
Jung-uk Kim
bd501794c3 MFH: r525829
Update to 32.0.0.330.

https://helpx.adobe.com/security/products/flash-player/apsb20-06.html

Approved by:	ports-secteam (blanket)
2020-02-11 15:03:50 +00:00
Tobias Kortkamp
4d7312e084 MFH: r525792
www/kanboard: Unbreak MYSQL option after r514556

Unknown extension pdo_mysqli for PHP 72.

Pointy hat:	swills
PR:		241567
Submitted by:	Vikash Badal <vikashb@where-ever.za.net>
Approved by:	bsd@if0.eu (maintainer timeout, 3 months)

Approved by:	ports-secteam blanket
2020-02-11 08:31:42 +00:00
Bernard Spil
11c8e7ed41 security/openssl: Fix Epoch
Reported by:	Dan McGrath <danmcgrath ca gmail com>
Approved by:	ports-secteam (joneum)
2020-02-11 07:19:16 +00:00
Kubilay Kocak
e0bed5b944 MFH: r525691 net-im/prosody: Update to 0.11.4
Changelog:

  https://blog.prosody.im/prosody-0.11.4-released/

PR:		243460
Submitted by:	Thomas Morper <thomas beingboiled info>
Approved by:	portmgr (maintainer timeout: > 14 days)

Approved by:	ports-secteam (blanket: bugfix release)
2020-02-11 03:40:19 +00:00
Kubilay Kocak
e01d5c9ec9 MFH: r525523 misc/brs: Update to 4.3.0
misc/brs currently builds with many warnings and segfaults at runtime,
likely a missing prototypes issue as that's what most of the warnings
are.

A much more recent version (4.30 as opposed to 4.03) of this is
widely available on linux under the name "bible-kjv", which also exists
as an OpenBSD port.

This change updates brs to 4.30, switching upstream to DEBIAN [1], and the
first step commit to renaming the port.

While here:

  - Include the "randverse" program
  - Wordsmith pkg-descr: It's all very well saying that the port
    includes libraries, but it doesn't install them.
  - Remove patches: no longer relevent

[1] Use a temporary MASTER_SITES workaround, instead of 'DEBIAN' directly
    because it does not currently use or support DISTNAME.

PR:		243886
Submitted by:	Andrew <andrew tao11.riddles.org.uk>
Approved by:	<user unknown nu> (implicit, approves maintainer change)
Approved by:	portmgr (blanket: run (crash) fixes)

Approved by:	ports-secteam (blanket: run (crash) fixes)
2020-02-11 03:37:47 +00:00
Jan Beich
72084d1010 MFH: r525766
security/nss: disable AltiVec on 32-bit powerpc

Crypto acceleration is only implemented for powerpc64 but build flags
leak to other powerpc targets. Disable via a variable introduced in 3.50.

PR:		242523
Reported by:	many
Approved by:	ports-secteam blanket
2020-02-10 23:52:08 +00:00
Jan Beich
3bf4987e3f MFH: r523059 r525757
security/nss: update to 3.50

Changes:	https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.50_release_notes
Changes:	https://hg.mozilla.org/projects/nss/shortlog/NSS_3_50_RTM
ABI:		https://abi-laboratory.pro/tracker/timeline/nss/
Reported by:	Repology
Approved by:	ports-secteam blanket (required by Firefox 74)
2020-02-10 22:38:37 +00:00
Jan Beich
0005fb1bf3 MFH: r525179
www/firefox: apply upstream powerpc64 fixes

Many of these are stalled on review for various reasons but the intent
of each seems clear enough to keep rebasing or ask upstream for help.
pkg-fallout@ would identify rebase mistakes while atomic changes would
identify when a particular patch is no longer useful.

Submitted by:	mikael (via D21765)
Approved by:	ports-secteam blanket
2020-02-10 17:04:44 +00:00
Jan Beich
3a80afeba6 MFH: r525108 r525155 r525478 r525512
www/firefox: update to 73.0

Changes:	https://www.mozilla.org/firefox/73.0/releasenotes/
PR:		243295
Security:	802e3138-b8af-4a89-a908-f103107e64b4
Approved by:	ports-secteam blanket
Differential Revision:	https://reviews.freebsd.org/D23146
2020-02-10 17:02:33 +00:00
Jan Beich
581ab60645 MFH: r525107 r525477
www/firefox-esr: update to 68.5.0

Changes:	https://www.mozilla.org/firefox/68.5.0/releasenotes/
Security:	802e3138-b8af-4a89-a908-f103107e64b4
Approved by:	ports-secteam blanket
2020-02-10 16:57:41 +00:00
Jan Beich
8d5e3ae4b2 MFH: r525683
textproc/nuspell: update pkg-descr after r508372

Reported by:	upstream
Approved by:	ports-secteam blanket
2020-02-09 23:28:25 +00:00
Piotr Kubaj
1279313ad8 MFH: r525677
math/flint2: fix build on non-x86

Merge upstream patches for non-x86 architectures.

PR:		243851

Approved by:	portmgr (fix build blanket)
2020-02-09 21:36:43 +00:00
Koop Mast
009633e564 MFH: r524226
Update webkit-gtk3 to 2.26.3.

* Fix issues while trying to play a video on NextCloud.
* Make sure the GL video sink uses a valid WebKit shared GL context.
* Fix vertical alignment of text containing arabic diacritics.
* Fix build with icu 65.1.
* Fix page loading errors with websites using HSTS.
* Fix web process crash when displaying a KaTeX formula.
* Fix several crashes and rendering issues.

This release also fixes 3 CVE's.

Security:	dc8cff4c-4063-11ea-8a94-3497f6939fdd

Approved by:	ports-secteam@ (miwi@)
2020-02-09 17:51:48 +00:00
Emanuel Haupt
f724eefbf1 MFH: r525025
libpcre2 is only needed in combination with ncurses.

PR:		243834 (based on)
Submitted by:	terry-freebsd@glaver.org
Approved by:	ports-secteam (miwi)
2020-02-09 15:44:20 +00:00
Jochen Neumeister
afb0d9cb49 MFH: r525647
Add patch for CVE-2019-20372

NGINX before 1.17.7, with certain error_page configurations,
allows HTTP request smuggling, as demonstrated by the ability
of an attacker to read unauthorized web pages in environments
where NGINX is being fronted by a load balancer.

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-20372

PR:		243952
Reported by:	koobs and many more
Security:	c1202de8-4b29-11ea-9673-4c72b94353b5
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (with hat)
2020-02-09 11:19:01 +00:00
Piotr Kubaj
0dfde32246 MFH: r525644
emulators/higan: unbreak on powerpc64, make ports tree compliant

Builds fine on powerpc64 without -march=native, which shouldn't be enabled anyway.

Approved by:	portmgr (fix build blanket)
2020-02-09 11:09:56 +00:00
Sunpoet Po-Chuan Hsieh
ed9b2e21e4 MFH: r525227 r525228 r525229
Update to 1.11.28

Changes:	https://docs.djangoproject.com/en/1.11/releases/
Security:	5a45649a-4777-11ea-bdec-08002728f74c

Update to 2.2.10

Changes:	https://docs.djangoproject.com/en/2.2/releases/
Security:	5a45649a-4777-11ea-bdec-08002728f74c

Update to 3.0.3

Changes:	https://docs.djangoproject.com/en/3.0/releases/
Security:	5a45649a-4777-11ea-bdec-08002728f74c

Approved by:	ports-secteam (miwi)
2020-02-09 08:37:07 +00:00
Kurt Jaeger
113b2b6186 MFH: r525450
security/clamav: upgrade 0.102.1 -> 0.102.2

- Remove MSPACK option and always use archivers/libmspack in
  accordance with policy about bundled library described in 6.2 of
  Porter's Handbook.
- Remove obsolete and no-op options from CONFIGURE_ARGS.

PR:		243914
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org> (maintainer)
Relnotes:	https://blog.clamav.net/2020/02/clamav-01022-security-patch-released.html
Security:	CVE-2020-3123
Approved by:	portmgr (security blanket)
2020-02-06 21:05:07 +00:00
Piotr Kubaj
2c5ade9925 MFH: r525264
math/libflame: unbreak on powerpc

Builds fine.

Approved by:	portmgr (fix build blanket)
2020-02-05 11:16:51 +00:00
Jan Beich
b51adf52fc MFH: r525255
games/openbor: unbreak build on 13.0 powerpc64

In file included from source/gfxlib/2xSaI.c:10:
source/gamelib/borendian.h:63:60: error: unsupported inline asm: input with type 'int' matching output with type 'UInt16' (aka 'unsigned short')
    __asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
                                            ~~~~~~         ^~~~~~

PR:		243865
Reported by:	pkubaj
Approved by:	ports-secteam blanket
2020-02-05 03:28:55 +00:00
Koichiro Iwao
f600c7ffd8 MFH: r525245
devel/lazygit: Update distinfo

Some entry wasn't updated at r525116.

Approved by:	portmgr blanket
2020-02-05 00:43:57 +00:00
Kai Knoblich
1a9408c24a MFH: r524542
databases/py-redis: Update to 3.3.11

Changelog:

https://github.com/andymccurdy/redis-py/blob/3.3.11/CHANGES

PR:		243459
Approved by:	koobs (maintainer)

Approved by:	ports-secteam (miwi)
2020-02-04 08:47:37 +00:00
Koichiro Iwao
29e5882ff7 MFH: r525116
devel/lazygit: Update to 0.14

This release include a fix for the issue no keyboard input recognized [1].

[1] https://github.com/jesseduffield/lazygit/issues/563

PR:		242432

Approved by:	portmgr (blanket: critical runtime bugfix)
2020-02-04 05:41:34 +00:00
Emanuel Haupt
b6d7d77e11 MFH: r525023
Fix build on aarch64

PR:		243805
Submitted by:	mikael
Approved by:	portmgr blanket
2020-02-03 09:44:52 +00:00
Matthias Fechner
85bd0f8b69 MFH: r524700
Security update to 12.6.6.
Changelog:
https://about.gitlab.com/releases/2020/01/30/security-release-gitlab-12-7-4-released/

Security:	c5bd9068-440f-11ea-9cdb-001b217b3468

Approved by:	ports-secteam (miwi)
2020-02-02 17:37:25 +00:00
Matthias Fechner
cb239440d0 MFH: r524725
Fix breakage after r524697

- Change RUN_DEPENDS from rubygem-rubyzip to rubygem-rubyzip13
- Bump PORTREVISION for dependency change

Approved by:	ports-secteam (miwi)
2020-02-02 17:36:28 +00:00
Matthias Fechner
a95e8cb3af MFH: r524724
Add rubygem-rubyzip13 1.3.0 (copied from rubygem-rubyzip)

- Add PORTSCOUT

Approved by:	ports-secteam (miwi)
2020-02-02 17:35:44 +00:00
Matthias Fechner
0dc4a2796e MFH: r524699
Update to 8.20.0 which is required for gitlab-ce security update.

Approved by:	ports-secteam (miwi)
2020-02-02 17:34:44 +00:00
Matthias Fechner
011ff4d144 MFH: r524697
Update to 2.0.0 which is required for gitlab security update.

Approved by:	ports-secteam (miwi)
2020-02-02 17:33:59 +00:00
Matthias Fechner
45283de9e3 MFH: r524696
Update to 1.3.4 to be able to work with rubygem-rubyzip update which is required for gitlab security update.

Approved by:	ports-secteam (miwi)
2020-02-02 17:33:16 +00:00
Matthias Fechner
e92caf3451 MFH: r524695
Update to 1.0.6 which fixes CVE-2019-18978.

Approved by:	ports-secteam (miwi)
2020-02-02 17:32:32 +00:00
Thomas Zander
60fb222745 MFH: r524978
Update to upstream version 43.0.0

Details:
- Mostly bug fixes and moderate feature changes, see
  https://mkvtoolnix.download/doc/NEWS.md
- Includes fixes for an abort with some opus streams, and
  AVC / H264 parser fixes.

Approved by:	ports-secteam (riggs)
2020-02-02 17:01:02 +00:00
Bernard Spil
7bddf71257 MFH: r524837
databases/mariadb55-server: Security update to 5.5.67

Security:	a6cf65ad-37d2-11ea-a1c7-b499baebfeaf
Security:	CVE-2020-2574

Approved by:	ports-secteam (miwi)
2020-02-02 16:31:36 +00:00
Bernard Spil
e7238f192d MFH: r524833
databases/mariadb102-server: Security update to 10.2.31

Security:	a6cf65ad-37d2-11ea-a1c7-b499baebfeaf
Security: 	CVE-2020-2574

Approved by:	ports-secteam (miwi)
2020-02-02 16:30:50 +00:00
Tobias Kortkamp
db185df49d MFH: r524965
x11-toolkits/libhandy: Move e1c500dd02b1.patch to patch file

Checksum of it changed again.  It changes all the time because
GitLab insists on embedding the version of whatever Git packages
they have installed in the footer.

PR:		243797

Approved by:	ports-secteam blanket
2020-02-02 14:41:51 +00:00
Tobias Kortkamp
fd078d6fcb MFH: r524959
games/bzflag-server: Unbreak after ports r516845

===>  bzflag-server-2.4.10_4 need to specify xorg modules with USE_XORG.
*** Error code 1

PR:		243796

Approved by:	ports-secteam blanket
2020-02-02 14:31:17 +00:00
Tobias Kortkamp
05d12a95e6 MFH: r524960
databases/mongodb40-tools: Unbreak build with MONGOTOP=on, MONGOREPLAY=off

===>  Building package for mongodb40-tools-4.0.8_2
pkg-static: Unable to access file /wrkdirs/usr/ports/databases/mongodb40-tools/work/stage/usr/local/bin/mongoreplay:No such file or directory

PR:		243685

Approved by:	ports-secteam blanket
2020-02-02 14:30:43 +00:00
Bernard Spil
b9f4d16dce MFH: r524607
databases/mariadb103-server: Security update to 10.3.22

Security:	a6cf65ad-37d2-11ea-a1c7-b499baebfeaf
Security:	CVE-2020-2574

Approved by:	ports-secteam (miwi)
2020-02-02 09:07:45 +00:00
Bernard Spil
4ac244808a MFH: r524565
databases/mariadb104-server: Security update to 10.4.12

Security:	a6cf65ad-37d2-11ea-a1c7-b499baebfeaf
Security:	CVE-2020-2574

Approved by:	ports-secteam (joneum)
2020-02-02 09:06:47 +00:00
Danilo G. Baio
d8159ae5e8 MFH: r524702
net-mgmt/zabbix44-*: Update to 4.4.5

Changelog:	https://www.zabbix.com/rn/rn4.4.5

PR:		243732
Approved by:	Pakhom Golynga <pg@pakhom.spb.ru> (maintainer)

Approved by:	ports-secteam (miwi)
2020-02-01 13:41:27 +00:00
Danilo G. Baio
ed165fe78c MFH: r524701
net-mgmt/zabbix4-*: Update to 4.0.17

Changelog:	https://www.zabbix.com/rn/rn4.0.17

PR:		243731
Approved by:	Pakhom Golynga <pg@pakhom.spb.ru> (maintainer)

Approved by:	ports-secteam (miwi)
2020-02-01 13:39:43 +00:00
Cy Schubert
4ccf22b20a MFH: r524707
security/sudo update 1.8.30 --> 1.8.31

PR:		243745
Submitted by:	cy@
Reported by:	cy@
Approved by:	garga@
Security:	CVE-2019-18634

Approved by:	portmgr (miwi@)
2020-02-01 04:13:43 +00:00
Li-Wen Hsu
a20309f39c MFH: r524556
- Update to 2.204.2

Approved by:	swils (maintainer, implicitly)
Security:	a250539d-d1d4-4591-afd3-c8bdfac335d8
Sponsored by:	The FreeBSD Foundation

Approved by:	ports-secteam (miwi)
2020-02-01 01:53:50 +00:00
Li-Wen Hsu
1ef618dcb9 MFH: r524555
- Update to 2.219

Security:	a250539d-d1d4-4591-afd3-c8bdfac335d8
Sponsored by:	The FreeBSD Foundation

Approved by:	ports-secteam (miwi)
2020-02-01 01:52:26 +00:00
Alexandre C. Guimarães
6f4c60df4d MFH: r524632
audio/beets: add missing dependency.

Add devel/py-confuse to the tree since audio/beets needs it.

PR:		243601
Approved by:	portmgr (blanket: missing dependency), tcberner (mentor)
2020-02-01 01:25:05 +00:00
Piotr Kubaj
b8ae656f24 MFH: r524717
games/bastet: fix build on GCC architectures

Boost requires C++11 compiler.

Approved by:	portmgr (fix build blanket)
2020-01-31 15:50:23 +00:00
Dima Panov
07a56aab82 MFH: r524529
mail/opensmtpd: update to 6.6.2p1 relase

This update addressed LPE and RCE vulnerabilities in OpenSMTPD (CVE-2020-7247)
https://www.openwall.com/lists/oss-security/2020/01/28/3

This vulnerability is exploitable since May 2018 (commit a8e222352f, "switch
smtpd to new grammar") and allows an attacker to execute arbitrary shell
commands, as root:

- either locally, in OpenSMTPD's default configuration (which listens on
  the loopback interface and only accepts mail from localhost);

- or locally and remotely, in OpenSMTPD's "uncommented" default
  configuration (which listens on all interfaces and accepts external
  mail).

PR:		243686
Reported by:	authors via irc
Relnotes:	https://www.mail-archive.com/misc@opensmtpd.org/msg04850.html
Security:	CVE-2020-7247
Security:	08f5c27d-4326-11ea-af8b-00155d0a0200

Approved by:	ports-secteam (blanket, security issue)
2020-01-31 09:37:27 +00:00
Dima Panov
3c001379bc MFH: r524682
mail/opensmtpd-extras: extend mysql80 patch to cover fresh mariadb too

PR:		243749
Reported by:	Vikash Badal
Obtained from:	OpenSMTPd repo

Approved by:	ports-secteam (miwi)
2020-01-31 09:31:02 +00:00
Kyle Evans
db6ee0b9ed MFH: r524564
devel/elfutils: fix future build failure w.r.t. stdio _unlocked

Include <stdio.h> early so that the stdio.h function declarations come
first, then redefine fputs/fwrite/fread_unlocked to the locked versions.
fputc_unlocked will be a macro similar to putc_unlocked, so just hide that
one behind an #ifndef since it will be provided as a macro by <stdio.h>. The
other three will be using the technically-incorrect locked variants until
all supported releases provide the needed functions, at which point we can
switch them all at once.

No PORTREVISION bump as this is just a preemptive build fix that doesn't
change the output at all.

QA:
 * portlint not ran, no change outside of a single patch
 * testport (-CURRENT, amd64; 12.1-RELEASE, amd64; -CURRENT+patch, amd64)

Approved by:	koobs (ports), cem (maintainer)

Approved by:	ports-secteam (implicit; build fix)
2020-01-30 04:07:45 +00:00
Brooks Davis
6234c66b3f Fix plist that I somehow botched in the last merge.
This change syncs the plist with head.

Approved by:	ports-secteam (swills)
2020-01-29 18:16:28 +00:00
Baptiste Daroussin
f4ede0e8e3 MFH: r524543
Import the libfetch patch to the bundled libfetch

Approved by:	portmgr (implicit)
2020-01-29 13:10:14 +00:00
Jan Beich
bc3de934a4 MFH: r524531
games/openfodder: unbreak with GCC after r521658

In file included from Source/Utils/SimplexIslands.cpp:2:
Source/Utils/SimplexIslands.hpp:65:16: error: 'int32_t' does not name a type
   65 |  static inline int32_t fastfloor(double fp) {
      |                ^~~~~~~
Source/Utils/SimplexIslands.hpp: In member function 'double SimplexIslands::noise(double, double)':
Source/Utils/SimplexIslands.hpp:79:11: error: 'fastfloor' was not declared in this scope
   79 |   int i = fastfloor(xin + s);
      |           ^~~~~~~~~

PR:		243670
Submitted by:	pkubaj
Approved by:	ports-secteam blanket
2020-01-29 03:38:41 +00:00
Piotr Kubaj
e2bb21bcee MFH: r524448
devel/concurrencykit: Don't build for 32-bits on powerpc64

configure script runs uname -m to check architecture. uname -m prints powerpc on powerpc64. Use uname -p instead.

PR:		243317
Approved by:	koobs (maintainer timeout)

Approved by:	portmgr (fix build blanket)
2020-01-27 22:04:38 +00:00
Bernhard Froehlich
eea671bfae MFH: r523809
net/wireguard:
- Update to 1.0.20200121
- Remove ALL_TARGET now since "all" is available

Approved by:	ports-secteam (joneum)
2020-01-27 12:03:26 +00:00
Bernhard Froehlich
20a4955b25 MFH: r523808
net/wireguard-go: Update to 0.0.20200121

Approved by:	ports-secteam (joneum)
2020-01-27 12:00:10 +00:00
Dave Cottlehuber
9ab218f7eb MFH: r523921 r523923
lang/erlang*: repair 32-bit x86 erlang builds

Having HIPE & NATIVE enabled breaks OTP on 32-bit x86. They have not
built succesfully for quite some time.

Reported by:	pkg fallout
Reviewed by:	olgeni
Sponsored by:	SkunkWerks, GmbH
Differential Revision:	https://reviews.freebsd.org/D23296

lang/erlang*: include serious scheduler bugfixes

OTP-16371

Taking a scheduler offline could cause timers set while executing on
that scheduler to be delayed until the scheduler was put online again.
This bug was introduced in ERTS version 10.0 (OTP 21.0).

OTP-16378 | ERL-1125

The ets:update_counter/4 core dumped when given an ordered_set with
write_concurrency enabled and an invalid position.

OTP-16379

A process calling erlang:system_flag(multi_scheduling, block) could end
up blocked waiting for the operation to complete indefinitely.

Reviewed by:	olgeni
Sponsored by:	SkunkWerks, GmbH
Differential Revision:	https://reviews.freebsd.org/D23313

Approved by:	portmgr
2020-01-26 15:35:44 +00:00
Jan Beich
a8ae7bee0d MFH: r524171
multimedia/vapoursynth: unbreak on non-x86

Approved by:	ports-secteam blanket
2020-01-26 11:42:45 +00:00
Jan Beich
0907dae9c3 MFH: r524147
security/nss: update to 3.49.2

Changes:	https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.49.2_release_notes
Changes:	https://hg.mozilla.org/projects/nss/shortlog/NSS_3_49_2_RTM
ABI:		https://abi-laboratory.pro/tracker/timeline/nss/
Reported by:	Repology
Approved by:	ports-secteam blanket (required by Firefox 73)
2020-01-26 00:21:11 +00:00
Jan Beich
6fb7826578 MFH: r524139
emulators/citra: update to s20200123

Changes:	be17f0851...5d502dfec
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-01-26 00:08:29 +00:00
Jan Beich
6746ef6e81 MFH: r524144
x11-wm/cage: follow up for r522232

Approved by:	ports-secteam blanket (regression fix)
2020-01-26 00:06:56 +00:00
Kai Knoblich
db40193416 MFH: r524023
graphics/py-pillow: Update to 6.2.2

Changelogs since 6.2.0:

https://pillow.readthedocs.io/en/stable/releasenotes/6.2.2.html
https://pillow.readthedocs.io/en/stable/releasenotes/6.2.1.html

PR:		243336
Submitted by:	sunpoet
Approved by:	koobs (maintainer)
Security:	0700e76c-3eb0-11ea-8478-3085a9a95629

Approved by:	ports-secteam (riggs)
2020-01-25 21:35:26 +00:00
Torsten Zuehlsdorff
a3d58833db MFH: r523997
lang/php74: Upgrade from 7.4.1 to 7.4.2

Changelog:

    Core:
        Preloading support on Windows has been disabled.
        Fixed bug #79022 (class_exists returns True for classes that are not ready to be used).
        Fixed bug #78929 (plus signs in cookie values are converted to spaces).
        Fixed bug #78973 (Destructor during CV freeing causes segfault if opline never saved).
        Fixed bug #78776 (Abstract method implementation from trait does not check "static").
        Fixed bug #78999 (Cycle leak when using function result as temporary).
        Fixed bug #79008 (General performance regression with PHP 7.4 on Windows).
        Fixed bug #79002 (Serializing uninitialized typed properties with __sleep makes unserialize throw).
    CURL:
        Fixed bug #79033 (Curl timeout error with specific url and post).
        Fixed bug #79063 (curl openssl does not respect PKG_CONFIG_PATH).
    Date:
        Fixed bug #79015 (undefined-behavior in php_date.c).
    DBA:
        Fixed bug #78808 ([LMDB] MDB_MAP_FULL: Environment mapsize limit reached).
    Exif:
        Fixed bug #79046 (NaN to int cast undefined behavior in exif).
    Fileinfo:
        Fixed bug #74170 (locale information change after mime_content_type).
    GD:
        Fixed bug #79067 (gdTransformAffineCopy() may use unitialized values).
        Fixed bug #79068 (gdTransformAffineCopy() changes interpolation method).
    Libxml:
        Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter).
    Mbstring:
        Fixed bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`). (CVE-2020-7060)
    OPcache:
        Fixed bug #78961 (erroneous optimization of re-assigned $GLOBALS).
        Fixed bug #78950 (Preloading trait method with static variables).
        Fixed bug #78903 (Conflict in RTD key for closures results in crash).
        Fixed bug #78986 (Opcache segfaults when inheriting ctor from immutable into mutable class).
        Fixed bug #79040 (Warning Opcode handlers are unusable due to ASLR).
        Fixed bug #79055 (Typed property become unknown with OPcache file cache).
    Pcntl:
        Fixed bug #78402 (Converting null to string in error message is bad DX).
    PDO_PgSQL:
        Fixed bug #78983 (pdo_pgsql config.w32 cannot find libpq-fe.h).
        Fixed bug #78980 (pgsqlGetNotify() overlooks dead connection).
        Fixed bug #78982 (pdo_pgsql returns dead persistent connection).
    Session:
        Fixed bug #79091 (heap use-after-free in session_create_id()).
        Fixed bug #79031 (Session unserialization problem).
    Shmop:
        Fixed bug #78538 (shmop memory leak).
    Sqlite3:
        Fixed bug #79056 (sqlite does not respect PKG_CONFIG_PATH during compilation).
    Spl:
        Fixed bug #78976 (SplFileObject::fputcsv returns -1 on failure).
    Standard:
        Fixed bug #79099 (OOB read in php_strip_tags_ex). (CVE-2020-7059)
        Fixed bug #79000 (Non-blocking socket stream reports EAGAIN as error).
        Fixed bug #54298 (Using empty additional_headers adding extraneous CRLF).

Changelog taken from: https://www.php.net/ChangeLog-7.php#7.4.2

Approved by:	ports-secteam (joneum)
2020-01-25 19:49:53 +00:00
Jan Beich
25dac7e89c MFH: r524042
multimedia/librav1e: unbreak build WITH_DEBUG

error: Found argument '--debug' which wasn't expected, or isn't valid in this context

PR:		243572
Submitted by:	nimaje+fbz@bureaucracy.de
Approved by:	ports-secteam blanket
2020-01-25 15:44:20 +00:00
Torsten Zuehlsdorff
7dac23f8bb MFH: r523995
lang/php73: Update from 7.3.13 to 7.3.14

Changelog:

    Core:
        Fixed bug #78999 (Cycle leak when using function result as temporary).
    CURL:
        Fixed bug #79033 (Curl timeout error with specific url and post).
    Date:
        Fixed bug #79015 (undefined-behavior in php_date.c).
    DBA:
        Fixed bug #78808 ([LMDB] MDB_MAP_FULL: Environment mapsize limit reached).
    Fileinfo:
        Fixed bug #74170 (locale information change after mime_content_type).
    GD:
        Fixed bug #78923 (Artifacts when convoluting image with transparency).
        Fixed bug #79067 (gdTransformAffineCopy() may use unitialized values).
        Fixed bug #79068 (gdTransformAffineCopy() changes interpolation method).
    Libxml:
        Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter).
    Mbstring:
        Fixed bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`). (CVE-2020-7060)
    OPcache:
        Fixed bug #79040 (Warning Opcode handlers are unusable due to ASLR).
    Pcntl:
        Fixed bug #78402 (Converting null to string in error message is bad DX).
    PDO_PgSQL:
        Fixed bug #78983 (pdo_pgsql config.w32 cannot find libpq-fe.h).
        Fixed bug #78980 (pgsqlGetNotify() overlooks dead connection).
        Fixed bug #78982 (pdo_pgsql returns dead persistent connection).
    Session:
        Fixed bug #79091 (heap use-after-free in session_create_id()).
    Shmop:
        Fixed bug #78538 (shmop memory leak).
    Standard:
        Fixed bug #79099 (OOB read in php_strip_tags_ex). (CVE-2020-7059)
        Fixed bug #54298 (Using empty additional_headers adding extraneous CRLF).

Changelog taken from: https://www.php.net/ChangeLog-7.php#7.3.14

Approved by:	ports-secteam (joneum)
2020-01-25 00:15:08 +00:00
Torsten Zuehlsdorff
62f5e7a63a MFH: r523994
lang/php72: Update from 7.2.26 to 7.2.27

Changelog:

    Mbstring:
        Fixed bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`). (CVE-2020-7060)
    Session:
        Fixed bug #79091 (heap use-after-free in session_create_id()).
    Standard:
        Fixed bug #79099 (OOB read in php_strip_tags_ex). (CVE-2020-7059)

Changelog taken from: https://www.php.net/ChangeLog-7.php#7.2.27

Approved by:	ports-secteam (joenum)
2020-01-25 00:13:51 +00:00
Piotr Kubaj
7f651c5377 MFH: r523990
multimedia/obs-studio: fix packaging on architectures without luajit

The previous patch missed packaging fix. obslua.so is not installed without luajit.

PR:		243562
Approved by:	yuri (maintainer)

Approved by:	portmgr (fix build blanket)
2020-01-24 21:35:26 +00:00
Tobias Kortkamp
652b3ec933 MFH: r523982
sysutils/runit-faster: Fix runsvdir rc script

%%RUNITDIR%% was not replaced with the correct dir leading to
/var/run/runit/runsvdir/current pointing to some bogus location.

Approved by:	ports-secteam runtime fix blanket
2020-01-24 19:26:34 +00:00
Michael Gmelin
ae7ffb545b MFH: r523920
Fix accidental removal of devfs_rulesets on jail stop

Pulls in a bugfix[0] that has been merged upstream[1].

This bug caused manually configured devfs_rulesets to get deleted on jail
stop, causing jails to come up with a default devfs rules on next start,
which can be a nuisance or even dangerous, depending on the specific setup.

Also adds a minimum devfs_ruleset id for dynamically created devfs rulesets
and fixes a devfs_ruleset resource leak when using plugins.

Take maintainership, as suggested by araujo@ (thanks for taking care of that
port for so long!).

[0]https://github.com/iocage/iocage/pull/1106
[1]753b2f3573

PR:		243510
Approved by:	araujo (maintainer)

Approved by:	ports-secteam (joneum)
2020-01-24 11:36:16 +00:00
Dima Panov
d3c8474bc2 MFH: r523958
mail/opensmtpd-extras: Fix building with MySQL 8.0.1

Obtained from:	OpenSMTPd repo

Approved by:	ports-secteam (miwi)
2020-01-24 10:46:44 +00:00
Christoph Moench-Tegeder
a99d4a063c MFH: r523942
mail/thunderbird: update to 68.4.2 (rc2 for now)

Release Notes:
  https://www.thunderbird.net/en-US/thunderbird/68.4.2/releasenotes/

Approved by:	portmgr (blanket: web browser alike)
2020-01-23 21:30:36 +00:00
Christoph Moench-Tegeder
2b54514083 MFH: r523939
www/iridium: copy snappy fix from chromium

just like chromium (from which it was forked), iridium embeds a copy
of snappy (the compression library) and cannot be fully switched to
the system-provided archivers/snappy in an easy way. consider this a
band-aid patch

Reported by:	pkubaj

Approved by:	portmgr (blanket: web browser, build fix)
2020-01-23 21:08:55 +00:00
Jan Beich
ece1717585 MFH: r523507 r523850
emulators/citra: update to s20200122

Changes:	cd86c9b04...be17f0851
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-01-23 00:56:18 +00:00
Christoph Moench-Tegeder
514d795a58 MFH: r523845
fix build

in a 12.1amd64 poudriere, chromium failed:
In file included from ../../third_party/leveldatabase/port/port_chromium.cc:10:
../../third_party/snappy/src/snappy.h:76:59: error: unknown type name 'string'; did you mean 'std::string'?
  size_t Compress(const char* input, size_t input_length, string* output);
                                                          ^~~~~~
                                                          std::string
/usr/include/c++/v1/iosfwd:211:65: note: 'std::string' declared here

instead of trying to muck around with type aliasing (see
snappy-stubs-public.h.in) just reference thy type directly, as there's only
one file requiring patching.

Approved by:	portmgr (blanket: web browser, just fix it)
2020-01-22 20:56:05 +00:00
Rene Ladan
1497f12128 MFH: r523616 r523843
devel/monodevelop: unexpire by updating libgit2 and recalculating the checksums.

PR:		242948
Submitted by:	mavalon
Approved by:	maintainer timeout (mono, 3 weeks)

devel/monodevelop: fix a build_fs_violation error happening with poudriere.

PR:		242948 (followup)
Submitted by:	malavon

Approved by:	ports-secteam (joneum)
2020-01-22 20:46:03 +00:00
Matthias Fechner
0a08ee38c9 MFH: r522891 r522992
Bugfix update to 12.6.3.
Changelog:
https://about.gitlab.com/releases/2020/01/09/gitlab-12-6-3-released/

Security related update to 12.6.4.
Changelog:
https://about.gitlab.com/releases/2020/01/13/critical-security-release-gitlab-12-dot-6-dot-4-released/

Security:	f929b172-369e-11ea-9cdb-001b217b3468

Approved by:	ports-secteam (joneum)
2020-01-21 20:57:45 +00:00
Matthias Fechner
8d71392194 MFH: r522890
Update to 0.10.0 which is required for gitlab-ce 12.6.3.

Approved by:	ports-secteam (joneum)
2020-01-21 20:55:33 +00:00
Rene Ladan
f5e4ec5123 MFH: r523735
www/chromium: update to 79.0.3945.130 [1] and restore path for policies [2].

Submitted by:	Matthias Wolf [1], Landon Fuller [2] via Github
Security:	https://chromereleases.googleblog.com/2020/01/stable-channel-update-for-desktop_16.html

Approved by:	ports-secteam (implicit, browser)
2020-01-21 19:38:23 +00:00
Guido Falsi
1c2bd51a05 MFH: r523643
Fix calibre-server startup script by extending the PATH to include
LOBALBASE/bin.

The server looks in path for the pdftohtml binary, which is used
to render PDF files for viewing in the browser.

Reported by:	Alexander Leidinger <Alexander@leidinger.net>

Approved by:	ports-secteam (joneum)
2020-01-21 17:38:48 +00:00
Larry Rosenman
ade18df41c MFH: r522273 r522545 r522582 r523727
sysutils/lsof: fix build following base r356337.

I took the patch from 243122 as it was more correct.

PR:		243122, 243083
Submitted by:	cy, yasu@utahime.org

sysutils/lsof: fix after  base r356432.

PR:		243172
Submitted by:	mjg
Reported by:	yasu@utahime.org

sysutils/lsof: add a PPC64 work around for needing -lzpool

PR:		242833
Submitted by:	luciano@vespaperitivo.it

sysutils/lsof: fix build on powerpc, powerpc64, powerpcse

PR:		242758
Submitted by:	pkubaj

Approved by:	ports-secteam (joneum)
2020-01-21 16:46:43 +00:00
Kai Knoblich
fac373fbda MFH: r523242
net-mgmt/netbox: Update to 2.6.12

Changelog:

Enhancements:
* Improved NAPALM method documentation in Swagger (OpenAPI)
* Preview image attachments when hovering over the link
* Allow NAPALM driver settings to be changed with request headers
* Toggle the display of child prefixes/IP addresses
* Search by description when assigning IP address to interfaces
* Add tenant filter field for cables
* Enable filtering of interfaces by name on the device view
* Add rack selection field to rack elevations view
* Paginate assigned circuits at the provider details view
* Add total path length to cable trace
* Include content of response on webhook error
* Enable word expansion during interface creation
* Enable searching by DNS name when assigning IP address
* Allow passing initial data to custom script forms
* Add local_context_data filter for virtual machines

Bug Fixes:
* Fix validation on tagged VLANs of an interface
* Fix ordering of models when dumping data to JSON
* Fix device role link on config context view
* Allow filtering VM interfaces by multiple MAC addresses
* Fix rendering of grouped custom links
* Allow filtering device components by multiple device names
* Disallow /0 masks for prefixes and IP addresses
* Paginate related IPs on the IP address view
* Fix minimum/maximum value rendering for site ASN field
* Fix filtering of devices by rack group
* Fix references to deleted cables without a label
* Fix divide-by-zero on power feeds with low power values

https://github.com/netbox-community/netbox/releases

Approved by:	ports-secteam (joneum)
2020-01-21 12:23:31 +00:00
Brooks Davis
d1cf6821ce MFH: r523228 r523234 r523575
Update to a new snapshot (welcome to LLVM 11).

Fix plist when COMPILER_RT is disabled.

PR:		243371

Approved by:	portmgr (implicit: buildfix)
2020-01-21 10:53:51 +00:00
Piotr Kubaj
733278c924 MFH: r523712
net-p2p/c-lightning: fix build on GCC architectures

Needs C11 compiler:
cc1: error: unrecognized command line option "-std=gnu11"

Needs include sys/types.h in fdpass.c:
ccan/ccan/fdpass/fdpass.c: In function 'fdpass_send':
ccan/ccan/fdpass/fdpass.c:16:12: error: 'register_t' undeclared (first use in this function)
   16 |   char buf[CMSG_SPACE(sizeof(fd))];
      |            ^~~~~~~~~~

PR:		243481
Approved by:	vd (maintainer)

Approved by:	portmgr (fix build blanket)
2020-01-21 10:49:59 +00:00
Piotr Kubaj
d0b0a544e1 MFH: r523709
devel/binutils@aarch64: unbreak on powerpc64

Builds fine.

Approved by:	portmgr (fix build blanket)
2020-01-21 09:35:30 +00:00
Piotr Kubaj
209795edd8 MFH: r523692
devel/py-subvertpy: fix build on GCC architectures

Using newer GCC works, alhough the error doesn't suggest it:
Exception: apr-config not found. Please set APR_CONFIG environment variable

Approved by:	portmgr (fix build blanket)
2020-01-20 21:40:17 +00:00
Piotr Kubaj
9fe43da9dd MFH: r523689 r522566
devel/py-libzfs: fix build on GCC architectures

Builds fine with GCC9.

devel/py-libzfs: unbreak on powerpc64 elfv2

Builds fine.

Approved by:	portmgr (fix build blanket)
2020-01-20 20:47:43 +00:00
Piotr Kubaj
940cd246c9 MFH: r523686
www/trafficserver: fix build on powerpc64

This port builds on amd64, but without luajit support since there's no luajit for powerpc64.

Also add USES=localbase instead of LIBS+= and remove unused CONFIGURE_ARGS.

Since files are installed to powerpc-freebsd-thread-multi directory, set proper PLIST_SUB and do-install target.

Don't add -L/usr/lib to LDFLAGS, it breaks when compiling with ports GCC.

PR:		243154
Approved by:	gaod@hychen.org (maintainer)
Approved by:	portmgr (fix build blanket)
2020-01-20 20:18:34 +00:00
Jochen Neumeister
377861851f MFH: r523621
Update to 1.10.3

PR:		243437
Submitted by:	stb@lassitu.de (maintainer)
Security:	a512a412-3a33-11ea-af63-0800274e5f20
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (with hat)
2020-01-20 14:28:39 +00:00
Antoine Brodin
a70ddada23 MFH: r523606
Fix packaging

Reported by:	pkg-fallout
2020-01-20 07:00:35 +00:00
Piotr Kubaj
72ae17de34 MFH: r523594
games/opensurge: fix build on GCC architectures

C++11 compiler is needed for OpenAL:
/usr/local/lib/libopenal.so: undefined reference to `std::overflow_error::overflow_error(char const*)@GLIBCXX_3.4.21'

Approved by:	portmgr (fix build blanket)
2020-01-19 20:57:42 +00:00
Tobias C. Berner
a16a1e99a2 MFH: r523492
lang/spidermonkey60: fix build on i386

Build used to fail with

Unified_cpp_js_src_jsapi-tests0.o: In function `cls_testAtomicOperationsU64::run(JS::Handle<JSObject*>)':
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0x86): undefined reference to `__atomic_load_8'
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0xd0): undefined reference to `__atomic_store_8'
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0x111): undefined reference to `__atomic_exchange_8'
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0x185): undefined reference to `__atomic_compare_exchange_8'
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0x200): undefined reference to `__atomic_compare_exchange_8'
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0x268): undefined reference to `__atomic_fetch_add_8'
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0x2c5): undefined reference to `__atomic_fetch_sub_8'
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0x324): undefined reference to `__atomic_fetch_and_8'
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0x384): undefined reference to `__atomic_fetch_or_8'
...[_ZN27cls_testAtomicOperationsU643runEN2JS6HandleIP8JSObjectEE]+0x3e4): undefined reference to `__atomic_fetch_xor_8'

Switch to using gcc on i386.

Approved by:	ports-secteam (blanket)
2020-01-18 19:58:21 +00:00
Thomas Zander
a9a27fb428 MFH: r523415
Update to upstream version 0.21.19

Details:
- Bugfix release, see
  https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.19/NEWS

Approved by:	ports-secteam (riggs)
2020-01-18 11:30:10 +00:00
Tobias Kortkamp
6df7646cbe MFH: r523400
Fix fetch

repo.maven.apache.org turned off HTTP support on 2020/01/15.

501 HTTPS Required.
Use https://repo.maven.apache.org/maven2/
More information at https://links.sonatype.com/central/501-https-required

Approved by:	ports-secteam blanket
2020-01-18 04:29:06 +00:00
Jan Beich
58d83c1af9 MFH: r523385
multimedia/libva-utils: unbreak X11=off after r520942

../videoprocess/vppscaling_n_out_usrptr.cpp:41:10: fatal error: 'va/va_x11.h' file not found
#include <va/va_x11.h>
         ^~~~~~~~~~~~~

PR:		243418
Reported by:	Igor Pavlov
Approved by:	ports-secteam blanket
2020-01-18 01:12:10 +00:00
Jan Beich
42773bb5ab MFH: r523377
www/firefox: update to 72.0.2

Changes:	https://www.mozilla.org/firefox/72.0.2/releasenotes/
PR:		242605
Approved by:	ports-secteam blanket
2020-01-18 00:12:08 +00:00
Jan Beich
b2c055c0ee MFH: r523376
www/firefox-esr: update to 68.4.2

Changes:	https://www.mozilla.org/firefox/68.4.2/releasenotes/
Approved by:	ports-secteam blanket
2020-01-18 00:11:22 +00:00
Jochen Neumeister
b09b3dcf8d MFH: r523343
Update to 4.9.4

Changelog: https://www.phpmyadmin.net/news/2020/1/8/phpmyadmin-494-and-501-are-released/

Security:	f929b172-369e-11ea-9cdb-001b217b3468
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (with hat)
2020-01-17 18:27:27 +00:00
Jochen Neumeister
e247e347e0 MFH: r523345
Update to 5.0.1

Changelog: https://www.phpmyadmin.net/news/2020/1/8/phpmyadmin-494-and-501-are-released/

Security:	f929b172-369e-11ea-9cdb-001b217b3468
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (with hat)
2020-01-17 18:25:36 +00:00
Jan Beich
b70b475bcb MFH: r523303
multimedia/libva: update to 2.6.1

Changes:	https://github.com/intel/libva/releases/tag/2.6.1
ABI:		https://abi-laboratory.pro/tracker/timeline/libva/
Reported by:	GitHub (watch releases)
Approved by:	ports-secteam blanket (reliability fixes)
2020-01-17 15:34:43 +00:00
Jochen Neumeister
aebbd51893 MFH: r523297
databases/mysql56-{client, server}: Update to latest release 5.6.47

Bugs Fixed:
- Replication: When GTIDs are enabled on a replication master and slave, and the slave connects to the master with the MASTER_AUTO_POSITION=1 option set, the master must send the slave all the transactions that the slave has not already received, committed, or both. If any of the transactions that should be sent by the master have been already purged from the master's binary log, the master sends the error ER_MASTER_HAS_PURGED_REQUIRED_GTIDS (1789) to the slave, and replication does not start.
  The message provided for the error ER_MASTER_HAS_PURGED_REQUIRED_GTIDS has been changed to provide advice on the correct action in this situation, which is for the slave to replicate the missing transactions from another source, or for the slave to be replaced by a new slave created from a more recent backup. The message advises that the master's binary log expiration period can be revised to avoid the situation in future. In addition, the master now identifies the GTIDs of the purged transactions and supplies them in its error log in the warning message ER_FOUND_MISSING_GTIDS (11809), so that you do not need to calculate the missing GTIDs manually.
- With multiple sessions executing concurrent INSERT ... ON DUPLICATE KEY UPDATE statements into a table with an AUTO_INCREMENT column but not specifying the AUTO_INCREMENT value, inserts could fail with a unique index violation.
- A SELECT using a WHERE condition of the form A AND (B OR C [OR ...]) resulting in an impossible range led to an unplanned exit of the server.
- An incomplete connection packet could cause clients not to properly initialize the authentication plugin name.

Approved by:	mmokhi (maintainer, implicit)
Security:	a6cf65ad-37d2-11ea-a1c7-b499baebfeaf
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (with hat)
2020-01-17 14:38:39 +00:00
Jochen Neumeister
a8417e4033 MFH: r523239
databases/mysq56-{client, server}: Update to latest release 5.7.29

Bugs Fixed:
- InnoDB: os_file_get_parent_dir warnings were encountered when compiling MySQL with GCC 9.2.0.
- InnoDB: An internal function (btr_push_update_extern_fields()) used to fetch newly added externally stored fields and update them during a pessimistic update or when going back to a previous version of a record was no longer required. Newly added externally stored fields are updated by a different function. Also, the method used to determine the number of externally stored fields was corrected.
- InnoDB: A comparison function found two records to be equal when attempting to merge non-leaf pages of a spatial index. The function was unable to handle this unexpected condition, which resulted in a long semaphore wait and an eventual assertion failure.
- Replication: A memory leak could occur when a failed replication group member tried to rejoin a minority group and was disallowed from doing so.
- Docker packages were missing the LDAP authentication plugins.

More Infos: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-29.html

Approved by:	mmokhi (maintainer, implicit)
Security:	a6cf65ad-37d2-11ea-a1c7-b499baebfeaf
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (with hat)
2020-01-17 14:37:31 +00:00
Rene Ladan
c0b66fbeb3 MFH: r523259
www/chromium: update to 79.0.3945.117

Submitted by:	Matthias Wolf via GitHub
Pull requests:	169, 170

Approved by:	ports-secteam (implicit, browser)
2020-01-16 21:03:39 +00:00
Ganael LAPLANCHE
4594f6e0b3 MFH: r523101
Fix segmentation fault at startup when IPv6 is enabled

Backport commit 5d34493 from upstream.

PR:		243307
Submitted by:	Victor Sudakov <vas@sibptus.ru>
Obtained from:	Github <5d344937d6>

Approved by:	portmgr
2020-01-16 16:10:50 +00:00
Kai Knoblich
9aab489596 MFH: r523241
textproc/py-tablib: Fix RUN_DEPENDS of devel/py-backports.csv

* The Python version restriction of devel/py-backports.csv was relaxed in
  r519566.  Thus update the RUN_DEPENDS accordingly and remove the
  workaround for setup.py which is no longer needed.

* Bump PORTREVISION for package change.

PR:		243339
Submitted by:	sunpoet

Approved by:	ports-secteam dependency fix blanket
2020-01-16 15:23:33 +00:00
Jan Beich
29f95d4c5c MFH: r523194
emulators/citra: update to s20200115

Changes:	020cd56ad...cd86c9b04
Approved by:	ports-secteam (swills, implicit for snapshots)
2020-01-15 23:21:19 +00:00
Jan Beich
5547da5e50 MFH: r523173
x11-wm/sway: update to 1.3.r3

Changes:	https://github.com/swaywm/sway/releases/tag/1.3-rc3
Reported by:	GitHub (watch releases)
Approved by:	ports-secteam blanket (reliability fixes)
2020-01-15 21:17:51 +00:00
Piotr Kubaj
a023c78bd1 MFH: r523169
emulators/qemu-user-static: unbreak on powerpc64

Builds and works fine.

Approved by:	portmgr (fix build blanket)
2020-01-15 21:10:15 +00:00
Jochen Neumeister
2a0367fb9f MFH: r523155
databases/mysql80-{client, server}: Update to latest release 8.0.19

- New FPROFILE_GENERATE and FPROFILE_USE CMake options are available for experimenting with profile guided optimization (PGO) with GCC. See the cmake/fprofile.cmake in a MySQL source distribution for information about using them. These options have been tested with GCC 8 and 9, and with Clang.
- Enabling FPROFILE_USE also enables WITH_LTO (link time optimization).
- Innodb_system_rows_read, Innodb_system_rows_inserted, Innodb_system_rows_deleted status variables were added for counting row operations on InnoDB tables that belong to system-created schemas. The new status variables are similar to the existing Innodb_rows_read, Innodb_rows_inserted, Innodb_rows_deleted status variables, which count operations on InnoDB tables that belong to both user-created and system-created schemas.
- The new status variables are useful in replication environments where relay_log_info_repository and master_info_repository variables are set to TABLE, resulting in higher row operation counts on slaves due to operations performed on the slave_master_info, slave_replay_log_info, and slave_worker_info tables, which belong to the system-created mysql schema. For a valid comparison of master and slave row operation counts, operations on tables in system-created schemas can now be excluded using the count data provided by the new status variables.

More infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-19.html

Submitted by:	fluffy
Approved by:	mmokhi (maintainer, implicit)
Sponsored by:	Netzkommune GmbH
Security: 	a6cf65ad-37d2-11ea-a1c7-b499baebfeaf

Approved by:	ports-secteam (with hat)
2020-01-15 21:02:12 +00:00
Niclas Zeising
c3a98bbc50 MFH: r523110
graphics/drm-kmod ports: Update snapshots

Update snapshots of all linux KPI based DRM graphics driver ports.
This update fixes an information disclosure security vulnerability.

Please note that only the drivers for intel GPUs are affected.

Security:	d2c2c815-3793-11ea-8be3-54e1ad3d6335

Approved by:	ports-secteam (implicit, security fix, drm-drivers blanket)
2020-01-15 13:56:34 +00:00
Piotr Kubaj
66798c8593 MFH: r523108
games/flightgear-mb339-pan: unbreak on powerpc64

Builds fine on powerpc64, but takes long to package. If it times out, Poudriere limits should be increased.

Approved by:	portmgr (fix build blanket)
2020-01-15 13:49:17 +00:00
Piotr Kubaj
eb6bbe311c MFH: r523099
math/libflame: unbreak on powerpc64

Builds fine on powerpc64.

Approved by:	portmgr (fix build blanket)
2020-01-15 10:51:47 +00:00
Jochen Neumeister
08e48ab0e8 MFH: r523097
Update to 7.69

- https://www.drupal.org/project/drupal/releases/7.69
- https://www.drupal.org/project/drupal/releases/7.68
- https://www.drupal.org/sa-core-2019-012

Security:	3da0352f-2397-11ea-966e-000ffec0b3e1
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (with hat)
2020-01-15 10:47:40 +00:00
Bernard Spil
f511796b61 security/openssl111: Mark deprecation
Approved by:	ports-secteam (adamw)
2020-01-15 10:21:00 +00:00
Piotr Kubaj
da02d1d0f1 MFH: r523068
net/tcpkali: fix build on GCC architectures

Builds fine with C11 compiler.

Approved by:	portmgr (fix build blanket)
2020-01-14 21:30:57 +00:00
Piotr Kubaj
93802f765a MFH: r523060
games/dxx-rebirth: update to 20191227

Allows us to remove the necessary patch and fixes build on i386.

Approved by:	portmgr (fix build blanket)
2020-01-14 19:58:39 +00:00
Mark Felder
292e4ad1c7 MFH: r523056
net-mgmt/xymon-client net-mgmt/xymon-server: Update to 4.3.30

Various crashes and bugs relating to string handling changes have been fixed,
including problems with hostnames with dashes in them.

Combostatus tests propagated up from other combostatus tests should now
display properly.

Approved by:	ports-secteam (blanket)
2020-01-14 17:19:37 +00:00
Jan Beich
ffd5e9e059 MFH: r523023
security/nss: update to 3.49.1

Changes:	https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.49.1_release_notes
Changes:	https://hg.mozilla.org/projects/nss/shortlog/NSS_3_49_1_RTM
ABI:		https://abi-laboratory.pro/tracker/timeline/nss/
Reported by:	Repology
Approved by:	ports-secteam blanket (required by Firefox 73)
2020-01-14 15:27:27 +00:00
Jung-uk Kim
a0b85aa57e MFH: r523019
Update to 32.0.0.314.

Approved by:	ports-secteam (blanket)
2020-01-14 14:52:42 +00:00
Piotr Kubaj
d2ea5f2bf1 MFH: r523016
math/gau2grid: remove -march=native, unbreak on i386 and powerpc64

This port added -march=native, which was against ports tree compliance, broke run-time on some amd64 and broke building on non-x86.

I have verified that it builds correctly on i386 and powerpc64 (provided -march=native is removed). It probably also builds on other architectures.

Reviewed by:	linimon

Approved by:	portmgr (fix build blanket)
2020-01-14 14:20:58 +00:00
Adam Weinberger
183d7d260c MFH: r523013
p5-Template-Toolkit: Update to 3.004

Security:	CVE-2019-19781

Approved by:	portmgr (with hat)
2020-01-14 13:45:27 +00:00
Matthias Andree
079ae21a9d MFH: r522702
e2fsprogs security update to 1.45.5

Release Notes:
http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5

Security:       8b61308b-322a-11ea-b34b-1de6fb24355d
Security:       CVE-2019-5188

Approved by:	ports-secteam@ (riggs)
2020-01-13 21:40:04 +00:00
Piotr Kubaj
77d28647e9 MFH: r522884
textproc/turboxsl: unbreak on powerpc64

Builds fine with patch from PR243317 applied.

Approved by:	portmgr (fix build blanket)
2020-01-13 12:30:31 +00:00
Piotr Kubaj
9f4a4ec67d MFH: r522880
security/modsecurity3-nginx: fix build on GCC architectures

C11 compiler is needed because of typedef redefinitions.

Approved by:	portmgr (fix build blanket)
2020-01-13 12:05:59 +00:00
Piotr Kubaj
ee357bc70e MFH: r522875
sysutils/sformat: fix build on powerpc64

Makefile uses uname -m (which returns powerpc on powerpc64) instead of uname -p (which correctly returns powerpc64).

PR:		243152
Approved by:	marius (maintainer)

Approved by:	portmgr (fix build blanket)
2020-01-13 10:26:46 +00:00
Kubilay Kocak
c9cca3fe0b MFH: r522860 r522861
net/py-suds-jurko: Fix tests installed into shared location [1]

This package installs its 'tests' module into a non-package-specific
location in the root site-packages directory. Python packages should/usually
address this by excluding tests from installation using
setup.py: find_packages(exclude[ "<package-glob>" ]).

Unfortunately the above 'simple' change cannot be used because it doesn't
allow the package to be tested on Python 3.x, as the tests package is not
processed by 2to3, and the tests need to be run on the processed (by 2to3)
sources. This may be the original reason upstream didn't remove them from
the build, not grokking the ramifications.

Accordingly, this change moves the tests into the main package namespace
and runs the tests on the processed sources in the resulting build/*
directory. Remove CONFLICTS_INSTALL (to py-suds) accordingly.

While I'm here:

Patch the tests to support pytest > 4 and hack around the
inability to reference parametrized tests (test[foo]) in pytests -k
expressions. [1][2]

Level up ports compliance: LICENSE_FILE, USE{S} ordering, match COMMENT
to setup.py:description, match pkg-descr WWW URL to setup.py:homepage

QA: All tests pass on Python 2.7-3.8

[1] https://github.com/pytest-dev/pytest/issues/5881
[2] https://github.com/pytest-dev/pytest/issues/6177

PR:		226077
Reported by:	yuri [1]
Approved by:	portmgr (blanket: ports compliance)

net/py-suds-jurko: Bump PORTREVISION missed in ports r522860

PR:	226077

Approved by:	ports-secteam (blanket(s): ports compliance, port bugfixes)
2020-01-13 07:07:36 +00:00
Kubilay Kocak
c029168ac8 MFH: r522848 net-im/prosody: Update to 0.11.3
Changelog:

  https://blog.prosody.im/prosody-0.11.3-released/

PR:		241488
Submitted by:	Thomas Morper <thomas beingboiled info>
Approved by:	portmgr (maintainer timeout: > 1 month)

Approved by:	ports-secteam (blanket: bugfix release)
2020-01-13 03:32:40 +00:00
Piotr Kubaj
2b5f588313 MFH: r522821
math/clp: fix build on non-x86 non-ARM

Only amd64 and i386 have immintrin.h. There's a check for ARM, but not for other architectures.

Building without immintrin.h works fine on amd64.

PR:		242966
Approved by:	co9co9@gmail.com (maintainer timeout)
Approved by:	portmgr (fix build blanket)
2020-01-12 17:28:02 +00:00
Bernard Spil
895a712b25 security/openssl: Resurrect port, update to 1.1.1
- Honoring promise from DEPRECATED message

PR:		243014
Reported by:	<peter larsen larsendata dk>
Approved by:	ports-secteam (adamw)
2020-01-12 17:27:40 +00:00
Matthias Andree
3e8e6c0685 MFH: r522784
databases/db6, db5: fix JAVA-enabled build, suppress sed failed warnings

Add JAVA_VERSION="7 8" to db6
Add REWARNFILE=/dev/null to db6 and db5

Reported by: 	Tommy P <tommyhp2@gmail.com>
PR:             243278

Approved by:	ports-secteam (blanket, unbreaks a broken build under non-default JAVA option)
2020-01-12 12:52:49 +00:00
Kubilay Kocak
88f033168f MFH: r522753 devel/py-generate: Fix MASTER_SITES, Remove BROKEN [1]
While I'm here, address other ports bugs/issues [2]:

  - gmake is not required (build uses distutils/setuptools:Extension)
  - patch setup.py:version (was 2.2) to match PORTVERSION (2.8)
  - Remove unecessary DISTNAME override
  - Strip installed extension/library
  - Correctly declare USES=python:<version-spec>, limited to 2.7. Fails to
    import on Python 3:

      ImportError: ... /site-packages/generate.so: Undefined symbol "PyString_FromString

PR:		241966
Submitted by:	D'Arcy J.M. Cain <darcy druid net> [1]
Approved by:	portmgr (blanket(s): ports compliance, dependencies) [2]

Approved by:	ports-secteam ((blanket(s): build (fetch) fix, ports compliance) [1][2]
2020-01-12 05:35:01 +00:00
Piotr Kubaj
310cd5cd03 MFH: r522745
audio/ardour5: fix build on powerpc64

_POSIX_SOURCE causes some errors in errno.h not to be seen (like EAFNOSUPPORT), so remove it.

On ELFv2 lld can't link it, throws errors like:
ld: error: relocation R_PPC64_ADDR32 cannot be used against local symbol; recompile with -fPIC
>>> defined in libs/ardour/cycle_timer.cc.1.o
>>> referenced by cycle_timer.cc
>>>               libs/ardour/cycle_timer.cc.1.o:(__ftr_fixup+0x8)

Recompiling with -fPIC doesn't help, so use GNU ld there.

PR:		243281
Approved by:	portmgr (blanket: build fix)
2020-01-12 03:00:45 +00:00
Sunpoet Po-Chuan Hsieh
81bc69f68c MFH: r522608
Fix build on powerpc64

PR:		243241
Submitted by:	pkubaj

Approved by:	ports-secteam (blanket)
2020-01-11 12:48:14 +00:00
Dima Panov
fd211d74ad MFH: r522628
net-mgmt/observium: unbreak and update to 19.8 community release

Community edition release 19.8 from 2019-08-22

PR:		243031
Submitted by:	fluffy
Approved by:	maintainer timeout (>1w)

Approved by:	ports-secteam (joneum)
2020-01-11 12:18:08 +00:00
Dima Panov
03fc8c2708 MFH: r522563
security/botan2: update to 2.13.0 release

* Fix a bug introduced in 2.12.0 where TLS::Channel::is_active and TLS::Channel::is_closed
could simultaneously return true. (GH #2174 #2171)
* Use std::shared_ptr instead of boost::shared_ptr in some examples. (GH #2155)
* Add Roughtime client (GH #2143 #1842)
* Add support for XMSS X.509 certificates (GH #2172)
* Add support for X.509 CRLs in FFI layer and Python wrapper (GH #2213)

https://botan.randombit.net/news.html

PR:		243239
Submitted by:	maintainer
Approved by:	maintainer

Approved by:	ports-secteam (joneum)
2020-01-11 12:16:33 +00:00
Rene Ladan
01c6a28f29 MFH: r522674
erlang/cuttlefish: fix build

PR:		238279 [1]
PR:		238676 [2]
Submitted by:	fbsdports@westryn.net [1]
Submitted by:	dewayne@heuristicsystems.com.au [2]

Approved by:	ports-secteam (joneum)
2020-01-11 11:57:18 +00:00
Tobias Kortkamp
ff57b6faa1 MFH: r522642
devel/shfmt: Update to v3.0.1

Changes:	https://github.com/mvdan/sh/releases/tag/v3.0.1

Approved by:	ports-secteam crash fix blanket
2020-01-11 09:57:31 +00:00
Tobias Kortkamp
ede3a3d5fb MFH: r522316 r522638 r522639
lang/rust: Simplify do-configure and garbage collect files/config.toml

lang/rust: fix powerpc64 elfv2 bootstrap

Apparently there were some issues with the previous one.

PR:		243253
Submitted by:	mikael.urankar@gmail.com
Reported by:	jhibbits, pkubaj
Tested by:	pkubaj

lang/rust: increase build verbosity and produce better build logs

Approved by:	ports-secteam blanket
2020-01-11 09:32:58 +00:00
Mark Linimon
7b06501068 MFH: r522323
net-p2p/c-lightning: fix bitcoin-cli exec setup

lightningd does execute bitcoin-cli internally during runtime.

Fix two problems with that:

* The bitcoin-cli executable is usually located in
  /usr/local/bin/bitcoin-cli but service(8) would remove /usr/local/bin
  from PATH before executing our rc script /usr/local/etc/rc.d/lightningd
  and so the lightningd daemon would inherit a PATH that does not contain
  bitcoin-cli. To fix this give the full path to bitcoin-cli to lightningd.

* bitcoin-cli(1) tries to create its datadir when it starts if it does not
  exist. By default that is ${HOME}/.bitcoin. service(8) would set HOME=/
  and if / is mounted read-only, then this creation would fail. Because we
  don't want this directory created (it is not necessary and remains empty)
  tell lightningd to execute
  bitcoin-cli --datadir=/some/directory/that/already/exists.

Also, append ${lightningd_extra_args} to the lightingd arguments. This was
forgotten in the initial commit and setting lightningd_extra_args would have
had no effect.

Reported by:	https://github.com/bitcoin-software

Approved by:	portmgr ("fix broken ports")
2020-01-11 08:00:17 +00:00
Christoph Moench-Tegeder
955bac7527 MFH: r522569
mail/thunderbird: update to 68.4.1

https://www.thunderbird.net/en-US/thunderbird/68.4.1/releasenotes/

Approved by:	portmgr (blanket: web browser alike)
2020-01-10 13:35:46 +00:00
Piotr Kubaj
ecdd0ea790 MFH: r522567
games/arx-libertatis: fix build on GCC architectures

OpenAL needs C++11 compiler:
  /usr/local/lib/libopenal.so: undefined reference to
  `std:🧵:join()@GLIBCXX_3.4.11'

Approved by:	portmgr (fix build blanket)
2020-01-10 12:47:29 +00:00
Jochen Neumeister
879a904a25 MFH: r522436
databases/mysql80-{client, server}: Update to latest release 8.0.18

switch patch-files to mysql80-server to make it easy for maintain.

Bugfix:
- CMake now enables use of fastcov if it is available. fastcov is faster than lcov or gcov. This requires GCC and gcov versions of 9 or higher.
- The DISABLE_SHARED CMake option was unused and has been removed.
- The CMake code to find Protobuf executables now works on platforms that split these into multiple packages.
- The new ADD_GDB_INDEX CMake option determines whether to enable generation of a .gdb_index section in binaries, which makes loading them in a debugger faster. The option is disabled by default. It has no effect if a linker other than lld or GNU gold is used.
- For the INSTALL_LAYOUT CMake option, the SLES and WIN option values were not used and have been removed.
- The max_prepared_stmt_count system variable maximum value has been increased from 1 million (1,048,576) to 4 million (4,194,304). The default value remains unchanged at 16,382.
- MySQL 8.0 no longer supports building using wolfSSL. All MySQL builds now use OpenSSL.
- The RE2 library is no longer used by MySQL. The library is no longer bundled with source distributions and the WITH_RE2 CMake option is obsolete.

More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html

A big thanks to @fluffy for his help with this update

Security:	fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (wit hat)
2020-01-09 06:41:44 +00:00
Jochen Neumeister
ffdf5b4a24 MFH: r521874
databases/mysql56-{client, server}: Update to latest release 5.6.46

Bugfix:
 -  Improper locking during storage engine initialization could cause a server exit.
 - A query with a WHERE clause whose predicate contained a numeric value in scientific notation was not handled correctly.
 - VS2019 produced compilation errors with debug compilation selected due to use of the /ZI flag. Now /Z7 is used instead.
 - For MySQL Community Edition, the cipher order specified by the client was used in preference to the order on the server side, unless the server was confi
 - Password masking was incomplete for SHOW PROCESSLIST and some INFORMATION_SCHEMA and Performance Schema tables.
 - The -DWITH_EXAMPLE_STORAGE_ENGINE=1 CMake option was ignored but should not have been. If -DWITH_EXAMPLE_STORAGE_ENGINE=0 is given, the EXAMPLE storage e

More Info: https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-46.html

Approved by:	mmokhi (maintainer, implicit)
Security:	fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf
Sponsored by:	Netzkommune GmbH

Approved by:	ports-secteam (with hat)
2020-01-09 06:40:26 +00:00
Jan Beich
b7370377d5 MFH: r522462
security/nss: update to 3.49

Changes:	https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.49_release_notes
Changes:	https://hg.mozilla.org/projects/nss/shortlog/NSS_3_49_RTM
ABI:		https://abi-laboratory.pro/tracker/timeline/nss/
Reported by:	Repology
Approved by:	ports-secteam blanket (required by Firefox 73)
2020-01-08 22:53:37 +00:00
Piotr Kubaj
bc0620b247 MFH: r522460
multimedia/obs-studio: fix build on powerpc64

Merge upstream commit to use GCC's SSE->AltiVec translation. Since it depends on compiling with GCC, it only works on ELFv1. Hopefully it will be possible to build it on ELFv2 in the future.

Also use luajit only where it's actually available. Since it's optional, the port builds anyway.

PR:		243199
Approved by:	yuri (maintainer)

Approved by:	portmgr (fix build blanket)
2020-01-08 21:40:19 +00:00
Piotr Kubaj
01a91073ad MFH: r522457
net/xrdp: fix build on GCC architectures

C11 compiler is necessary:
irp.h:33: error: redefinition of typedef 'XFUSE_INFO'
chansrv_fuse.h:47: error: previous declaration of 'XFUSE_INFO' was here

Approved by:	portmgr (fix build blanket)
2020-01-08 19:37:46 +00:00
Jan Beich
942fc88c87 MFH: r522454
www/firefox-esr: update to 68.4.1

Changes:	https://www.mozilla.org/firefox/68.4.1/releasenotes/
Security:	CVE-2019-17026
Approved by:	ports-secteam blanket
2020-01-08 19:19:15 +00:00
Jan Beich
44170b9932 MFH: r522453
www/firefox: update to 72.0.1

Changes:	https://www.mozilla.org/firefox/72.0.1/releasenotes/
PR:		242605
Security:	CVE-2019-17026
Approved by:	ports-secteam blanket
2020-01-08 19:18:45 +00:00
Jan Beich
5763aa5e93 MFH: r522431
x11-wm/sway: update to 1.3.r2

Changes:	https://github.com/swaywm/sway/releases/tag/1.3-rc2
Reported by:	GitHub (watch releases)
Approved by:	ports-secteam blanket (reliability fixes)
2020-01-08 16:03:55 +00:00
Kai Knoblich
87e0efa37e MFH: r522268 r522343
net-mgmt/netbox: Update to 2.6.11

* Remove the patch that fixed a regression when accessing the API
  documentation as it's no longer required. [1]

Changelog since 2.6.9:

Enhancements:
* Add ability to move inventory items between devices
* Extend admin UI to allow deleting old report results
* Add assigned_to_interface filter for IP addresses
* Fail gracefully on custom link rendering exception
* Provide request context when executing custom scripts
* Add date/time picker widgets
* Enable partial search for inventory items
* Optimize size of pages containing a dynamic selection field
* Allow filtering console/power/interface connections by device ID

Bug Fixes:
* Restrict queryset of chained fields when form validation fails
* Include A/Z termination sites for circuits in global search
* Scrolling to target (hash) did not account for the header size
* Fix AttributeError exception in API docs [1]
* Filter platform by manufacturer when editing devices
* Fix filtering of racks by group on device list
* Fix exception when editing a device bay (regression since 2.6.7)
* Fix API-driven filter field rendering (regression since 2.6.10)
* Add missing region filters for multiple objects

https://github.com/netbox-community/netbox/releases/tag/v2.6.11
https://github.com/netbox-community/netbox/releases/tag/v2.6.10

net-mgmt/netbox: Relax RUN_DEPENDS

* The 2020Q1 branch has 0.24.0 of www/py-dj22-django-taggit thus relax
  its version requirement of the RUN_DEPENDS to avoid a build failure there.

  Although net-mgmt/netbox requires the 1.1.0 release of
  www/py-dj22-django-taggit (pinned with "==" by upstream), it runs fine
  with either 0.24.0 (in 2020Q1) or 1.2.0 (since r521999).

Approved by:	ports-secteam (joneum)
		ports-secteam build fix blanket (remaining part)
2020-01-07 16:30:51 +00:00
Jan Beich
31f5db3971 MFH: r522341
emulators/{citra,yuzu}: integrate cubeb patch to simplify updates

Approved by:	ports-secteam blanket
2020-01-07 15:57:23 +00:00
Dan Langille
ee434d2493 MFH: r522307
Add missing dependency: devel/p5-Class-Accessor

re: https://metacpan.org/source/DLO/Proc-BackOff-0.02/Build.PL#L11

Encountered this error:

	Base class package "Class::Accessor" is empty.
	    (Perhaps you need to 'use' the module which defines that package first,
	    or make that module available in @INC (@INC contains: /usr/local/sbin/../lib /usr/local/lib/perl5/site_perl/mach/5.30 /usr/local/lib/perl5/site_perl /usr/local/lib/perl5/5.30/mach /usr/local/lib/perl5/5.30).
	 at /usr/local/lib/perl5/site_perl/Proc/BackOff.pm line 4.

Approved by:	portmgr blanket
2020-01-07 12:38:59 +00:00
Piotr Kubaj
ac8ed628a2 MFH: r522328
x11-wm/compiz: depend on nvidia-settings only on amd64 and i386

Nvidia drivers are not available on other architectures.

PR:		242832
Approved by:	freebsd-ports@dan.me.uk (maintainer timeout)
Approved by:	portmgr (fix build blanket)
2020-01-07 11:49:20 +00:00
Piotr Kubaj
2dc4c0d9f4 MFH: r522326
net-p2p/monero-cli: fix build on non-x86

Architectures that don't have libunwind available should disable stack trace.

Otherwise, the following linking error is encountered:
/usr/local/bin/ld: src/common/libcommon.a(stack_trace.cpp.o): in function `tools::log_stack_trace(char const*)':
stack_trace.cpp:(.text+0x71c): undefined reference to `el::base::debug::StackTrace::generateNew()'
/usr/local/bin/ld: stack_trace.cpp:(.text+0x72c): undefined reference to `el::base::debug::operator<<(std::ostream&, el::base::debug::StackTrace const&)'
collect2: error: ld returned 1 exit status

PR:		242846
Approved by:	vd (maintainer timeout)
Approved by:	portmgr (fix build blanket)
2020-01-07 11:46:24 +00:00
Jan Beich
afdffb3e3a MFH: r522304
multimedia/libvpx: update COMMENT

Only decoder and encoder are installed. Other features are not
maintained by the port. Besides, ffmpeg provides alternative decoder
while svt-vp9 provides alternative encoder.

Approved by:	ports-secteam blanket
2020-01-06 23:18:56 +00:00
Adam Weinberger
e44c39623f MFH: r522297
geoipupdate: Take out unusable URL from instructions

Reported by:	Dewayne Geraghty

Approved by:	portmgr (with hat)
2020-01-06 23:02:30 +00:00
Jan Beich
bccee4402d MFH: r522289
multimedia/libvpx: fix RTCPU=OFF and POSTPROC=off

Approved by:	ports-secteam blanket
2020-01-06 22:39:46 +00:00
Jan Beich
1d680540ad MFH: r522287
multimedia/libvpx: document current Firefox limit

See https://bugzilla.mozilla.org/show_bug.cgi?id=1225221

Approved by:	ports-secteam blanket
2020-01-06 22:39:14 +00:00
Kai Knoblich
9ebeeae36c MFH: r522267
net-mgmt/cacti: Update to 1.2.8

* Sort pkg-plist to make future patching/comparing easier.

While I'm here:

* Use ${COPYTREE_SHARE} to correctly install a whole set of files instead of
  using "cp -R".

* Also remove a very outdated test was required when updating to the 0.8.7a
  release of net-mgmt/cacti.  It was introduced +12 years ago in r203859 and
  is no longer required nowadays.

Changelog:

https://github.com/Cacti/cacti/releases/tag/release%2F1.2.8

PR:		242834
Submitted by:	Michael Muenz <m.muenz@gmail.com> (based on)
Approved by:	maintainer timeout (14 days)
Security:	86224a04-26de-11ea-97f2-001a8c5c04b6

Approved by:	ports-secteam (joneum)
2020-01-06 22:35:01 +00:00
Chris Rees
08dcf78035 MFH: r522277
x11/cde: update to 2.3.1 and unbreak

Merged, as the original CDE in this branch is broken anyway.

PR:		ports/242663
Submitted by:	mikael.urankar@gmail.com

Approved by:	portmgr (blanket, build fixes)
2020-01-06 21:33:52 +00:00
Jan Beich
e4aeb6eddd MFH: r522235
x11-toolkits/wlroots: update to 0.9.1

Changes:	https://github.com/swaywm/wlroots/releases/tag/0.9.1
Reported by:	GitHub (watch releases)
Approved by:	ports-secteam blanket (reliability fixes)
2020-01-06 14:14:20 +00:00
Jan Beich
511dd2b92c MFH: r522232
x11-wm/cage: fix DRM session after r521656

After VT switch nothing was rendered. From debug log before/after:

 [backend/drm/drm.c:1485] Requesting modeset for 'DP-1'
+[backend/drm/drm.c:697] Modesetting 'DP-1' with '3840x2160@60000 mHz'
+[backend/drm/drm.c:592] Initializing renderer on connector 'DP-1'
+[GLES2] FS SIMD8 shader: 5 inst, 0 loops, 24 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes.
+[GLES2] FS SIMD16 shader: 5 inst, 0 loops, 34 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes.
+[GLES2] VS SIMD8 shader: 28 inst, 0 loops, 116 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 448 to 336 bytes.
+[GLES2] FS SIMD16 shader: 2 inst, 0 loops, 0 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 32 to 32 bytes.

Approved by:	ports-secteam blanket
2020-01-06 14:01:22 +00:00
Matthias Fechner
b47bb99222 MFH: r521948
Security upgrade to 12.6.2.
Changelog:
https://about.gitlab.com/blog/2020/01/02/security-release-gitlab-12-6-2-released/

Security:	01bde18a-2e09-11ea-a935-001b217b3468

Approved by:	ports-secteam (joneum)
2020-01-06 10:03:33 +00:00
Ben Woods
8c74977f84 MFH: r522159
security/nmap: Fix build on 11i386, 11arm, 11arm64

Fix patches to configure scripts to only add -libverbs if found in base

PR:		242987
Reported by:	Dries Michiels <driesm.michiels@gmail.com>
Reported by:	garga

Approved by:	ports-secteam (joneum)
2020-01-06 09:48:19 +00:00
Ben Woods
b88854ab53 MFH: r522081
net/remmina: Fix build with NLS option disabled

PR:		242991
Submitted by:	Trond.Endrestol@ximalas.info

Approved by:	ports-secteam (joneum)
2020-01-06 09:46:14 +00:00
Yuri Victorovich
1ca077dcab MFH: r522114 r522170 r522177 r522178
New port: cad/cascade-compiler: Just-In-Time Compiler for Verilog from VMware Research

cad/cascade-compiler: Update g20200104 -> g20200105

Tests now pass.

Fix build on GCC-based systems:

  CMake Error in src/CMakeLists.txt:
  Target "libcascade" requires the language dialect "CXX17" (with compiler
  extensions), but CMake does not know the compile flags to use to enable it.

Approved by:	portmgr (tier-2 blanket)

cad/cascade-compiler: Update g20200105 -> g20200105.1

Approved by:	secteam
2020-01-06 01:52:57 +00:00
Piotr Kubaj
a3f3e81eeb MFH: r522172
games/xmoto: fix build on GCC architectures

Builds fine using new GCC.

Approved by:	portmgr (fix build blanket)
2020-01-05 23:51:06 +00:00
Adam Weinberger
b067e822dc MFH: r522160
geoipupdate: Add instructions for getting account ID/key

MaxMind now requires a (free) registered account to download any
of the databases, including the free ones. Registration and
download remain free--they just require an account now.

Approved by:	portmgr (with hat)
2020-01-05 16:18:25 +00:00
Thomas Zander
c9966ec2fa MFH: r522141
Update to upstream version 42.0.0

Details:
- Bug fixes and enhancements, see
  https://mkvtoolnix.download/doc/NEWS.md
  including segfault in mkv reader and use
  of uninitialised memory in MPEG stream
  parser.

Approved by:	ports-secteam (riggs)
2020-01-05 14:58:06 +00:00
Piotr Kubaj
84fb450cc7 MFH: r522137
mail/rspamd-devel: use luajit only on amd64, armv7, i386 and powerpc to fix build on other architectures

It's possible that there are other architectures that luajit works on, but I couldn't test it.

PR:		243059
Approved by:	vsevolod (maintainer)
Approved by:	portmgr (fix build blanket)
2020-01-05 10:59:19 +00:00
Tobias Kortkamp
32d85a349a MFH: r522111
www/newsboat: Bump openssl-sys crate to fix build with LibreSSL 3.x

libc bump is not really needed but mirrors
d9f143bf5d

PR:		242826
Reported by:	p5B2E9A8F@t-online.de
Submitted by:	mt@markoturk.info (maintainer)
Tested by:	w.schwarzenfeld@utanet.at

Approved by:	ports-secteam build fix blanket
2020-01-05 06:00:05 +00:00
Mark Linimon
d44594ee00 MFH: r522107
Mark as broken on powerpc64:

  src/hwcap.c:20:3: error: #error "Platform not supported (only Linux supported at the moment)"
  src/hwcap.c:23:3: error: #error "Platform not supported (no getauxval())"

Approved by:	portmgr (tier-2 blanket)
2020-01-05 04:49:42 +00:00
Mark Linimon
a53a1fa32a MFH: r522080
Add compiler:c++11-lang to USES to try to fix build on GCC-based
systems:

  CMake Error at CMakeLists.txt:112 (message): GCC version must be at least 6.1!

Unfortunately this merely gets to a failure later on in the build
for powerpc64.

Approved by:	portmgr (tier-2 blanket)
2020-01-05 04:07:04 +00:00
Piotr Kubaj
b3e2a56f24 MFH: r522067
comms/uhd: unbreak on powerpc64

Builds fine.

Approved by:	portmgr (fix build blanket)
2020-01-04 23:35:42 +00:00
Piotr Kubaj
5233b904e8 MFH: r522062
net/asterisk-g72x: fix build of GCC architectures

C11 compiler is necessary:
In file included from codec_g72x.c:26:
/usr/local/include/asterisk/lock.h: In function 'ast_atomic_fetchadd_int':
/usr/local/include/asterisk/lock.h:752: error: '__ATOMIC_RELAXED' undeclared (first use in this function)
/usr/local/include/asterisk/lock.h:752: error: (Each undeclared identifier is reported only once
/usr/local/include/asterisk/lock.h:752: error: for each function it appears in.)
/usr/local/include/asterisk/lock.h: In function 'ast_atomic_dec_and_test':
/usr/local/include/asterisk/lock.h:762: error: '__ATOMIC_RELAXED' undeclared (first use in this function)

Approved by:	portmgr (fix build blanket)
2020-01-04 22:53:45 +00:00
Piotr Kubaj
c342330127 MFH: r522057
games/glest: fix build on GCC architectures

Building with GCC fails:
./mk/linux/glest_game/ai/ai_rule.cpp: In member function 'virtual bool Glest::Game::AiRuleMassiveAttack::test()':
./mk/linux/glest_game/ai/ai_rule.cpp:156:46: error: 'INT_MAX' was not declared in this scope
  156 |   return ai->beingAttacked(attackPos, field, INT_MAX);
      |                                              ^~~~~~~
./mk/linux/glest_game/ai/ai_rule.cpp:19:1: note: 'INT_MAX' is defined in header '<climits>'; did you forget to '#include <climits>'?
   18 | #include "leak_dumper.h"
  +++ |+#include <climits>
   19 |
./mk/linux/glest_game/ai/ai_rule.cpp: In member function 'virtual bool Glest::Game::AiRuleExpand::test()':
./mk/linux/glest_game/ai/ai_rule.cpp:815:22: error: 'INT_MAX' was not declared in this scope
  815 |     int minDistance= INT_MAX;
      |                      ^~~~~~~
./mk/linux/glest_game/ai/ai_rule.cpp:815:22: note: 'INT_MAX' is defined in header '<climits>'; did you forget to '#include <climits>'?
...failed C++ ./build/powerpc64-portbld-freebsd12.1/optimize/glest_game/ai/ai_rule.o ...

Include climits in ai_rule.cpp to fix it.

PR:		242766
Approved by:	mmokhi (maintainer timeout)
Approved by:	portmgr (fix build blanket)
2020-01-04 20:24:19 +00:00
Piotr Kubaj
19ebbd20bb MFH: r522054
net-p2p/namecoin: fix build on GCC architectures

It looks like some update caused src/httpserver.c to need to include deque when building with GCC. Otherwise it fails to compile with:
httpserver.cpp:74:10: error: 'deque' in namespace 'std' does not name a template type
   74 |     std::deque<std::unique_ptr<WorkItem>> queue;
      |          ^~~~~
httpserver.cpp:33:1: note: 'std::deque' is defined in header '<deque>'; did you forget to '#include <deque>'?
   32 | #include <support/events.h>
  +++ |+#include <deque>
   33 |
httpserver.cpp: In member function 'bool WorkQueue<WorkItem>::Enqueue(WorkItem*)':
httpserver.cpp:92:13: error: 'queue' was not declared in this scope; did you mean 'Enqueue'?
   92 |         if (queue.size() >= maxDepth) {
      |             ^~~~~
      |             Enqueue
httpserver.cpp:95:9: error: 'queue' was not declared in this scope; did you mean 'Enqueue'?
   95 |         queue.emplace_back(std::unique_ptr<WorkItem>(item));
      |         ^~~~~
      |         Enqueue
httpserver.cpp: In member function 'void WorkQueue<WorkItem>::Run()':
httpserver.cpp:106:35: error: 'queue' was not declared in this scope; did you mean 'Enqueue'?
  106 |                 while (running && queue.empty())
      |                                   ^~~~~
      |                                   Enqueue
httpserver.cpp:110:31: error: 'queue' was not declared in this scope; did you mean 'Enqueue'?
  110 |                 i = std::move(queue.front());
      |                               ^~~~~
      |                               Enqueue

PR:             242710
Approved by:    milios@ccsys.com (maintainer timeout)
Approved by:	portmgr (fix build blanket)
2020-01-04 20:20:49 +00:00
Piotr Kubaj
a32a6ea187 MFH: r522050
net/asterisk-chan_sccp: fix build on GCC architectures

Use newer GCC:
You need at least gcc > 4.3. While your gcc has version:
4.2.1

Approved by:	portmgr (fix build blanket)
2020-01-04 20:05:07 +00:00
Danilo G. Baio
20f2e26262 MFH: r522048
irc/eggdrop[-devel]: Fix build with ssl other than base

PR:		242988
Submitted by:	wcarson.bugzilla@disillusion.net

Approved by:	portmgr (build fix blanket)
2020-01-04 19:41:42 +00:00
Dima Panov
e377d88a96 MFH: r522041
www/py-django[22|30]: Unbreak with MySQL, switch to py-mysqlclient

According to official docs, mysqlclient >=1.3.13 is the recommended
choice instead of outdated pyMySQLdb

PR:		243077
Submitted by:	fluffy
Approved by:	sunpoet (maintaner, python@)

Approved by:	ports-secteam (joneum)
2020-01-04 17:17:04 +00:00
Tobias Kortkamp
80f7edcf1b MFH: r521983
games/openomf: Unbreak build on i386 (broken in r511074)

warning: unknown warning option '-Wno-unused-but-set-variable'; did you mean '-Wno-unused-const-variable'? [-Wunknown-warning-option]
external/dumb/dumb/src/it/itrender.c:721:11: error: always_inline function '_mm_setzero_ps' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                temp1 = _mm_setzero_ps();
                        ^
external/dumb/dumb/src/it/itrender.c:722:10: error: always_inline function '_mm_cvtsi32_ss' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                data = _mm_cvtsi32_ss( temp1, currsample );
                       ^
external/dumb/dumb/src/it/itrender.c:723:11: error: always_inline function '_mm_cvtsi32_ss' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                temp2 = _mm_cvtsi32_ss( temp1, prevsample );
                        ^
external/dumb/dumb/src/it/itrender.c:724:13: error: always_inline function '_mm_loadu_ps' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                impulse = _mm_loadu_ps( (const float *) &imp );
                          ^
external/dumb/dumb/src/it/itrender.c:728:12: error: always_inline function '_mm_cvtsi32_ss' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                        temp1 = _mm_cvtsi32_ss( data, src [i] );
                                ^
external/dumb/dumb/src/it/itrender.c:729:12: error: always_inline function '_mm_mul_ps' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                        temp1 = _mm_mul_ps( temp1, impulse );
                                ^
external/dumb/dumb/src/it/itrender.c:730:12: error: always_inline function '_mm_movehl_ps' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                        temp2 = _mm_movehl_ps( temp2, temp1 );
                                ^
external/dumb/dumb/src/it/itrender.c:731:12: error: always_inline function '_mm_add_ps' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                        temp1 = _mm_add_ps( temp1, temp2 );
                                ^
external/dumb/dumb/src/it/itrender.c:734:12: error: always_inline function '_mm_add_ps' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                        temp1 = _mm_add_ps( temp1, temp2 );
                                ^
external/dumb/dumb/src/it/itrender.c:737:15: error: always_inline function '_mm_cvtss_si32' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                        dst [i] += _mm_cvtss_si32( temp1 );
                                   ^
external/dumb/dumb/src/it/itrender.c:740:16: error: always_inline function '_mm_cvtss_si32' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                currsample = _mm_cvtss_si32( temp1 );
                             ^
external/dumb/dumb/src/it/itrender.c:742:16: error: always_inline function '_mm_cvtss_si32' requires target feature 'mmx', but would be inlined into function 'it_filter_sse' that is compiled without support for 'mmx'
                prevsample = _mm_cvtss_si32( temp1 );
                             ^
1 warning and 12 errors generated.

http://beefy10.nyi.freebsd.org/data/113i386-default/521788/logs/errors/openomf-0.6.5_6.log
http://beefy5.nyi.freebsd.org/data/120i386-default/521788/logs/errors/openomf-0.6.5_6.log

Approved by:	ports-secteam blanket
2020-01-04 16:31:43 +00:00
Piotr Kubaj
5c1aa96745 MFH: r522036
audio/asterisk-espeak: fix build on GCC architectures

C11 compiler is required:
/usr/local/include/asterisk/lock.h: In function 'ast_atomic_fetchadd_int':
/usr/local/include/asterisk/lock.h:752: error: '__ATOMIC_RELAXED' undeclared (first use in this function)
/usr/local/include/asterisk/lock.h:752: error: (Each undeclared identifier is reported only once
/usr/local/include/asterisk/lock.h:752: error: for each function it appears in.)
/usr/local/include/asterisk/lock.h: In function 'ast_atomic_dec_and_test':
/usr/local/include/asterisk/lock.h:762: error: '__ATOMIC_RELAXED' undeclared (first use in this function)

Approved by:	portmgr (build fix blanket)
2020-01-04 14:08:18 +00:00
Piotr Kubaj
1b942b7ac1 MFH: r522034
net/kamailio: fix build on GCC architectures

C11 compiler is necessary because of -latomic.

Approved by:	portmgr (build fix blanket)
2020-01-04 13:57:51 +00:00
Jan Beich
c51976652f MFH: r521966
www/firefox: switch to rc4

Changes:	https://hg.mozilla.org/releases/mozilla-release/pushloghtml?startdate=2019-12-31&enddate=2020-01-04
Approved by:	ports-secteam blanket
2020-01-03 23:31:39 +00:00
Piotr Kubaj
5d3e3219cb MFH: r521964
audio/ocp: unbreak on powerpc64

Builds fine on 12.1-RELEASE.

Approved by:	portmgr (build fix blanket)
2020-01-03 22:05:51 +00:00
Piotr Kubaj
63423f4472 MFH: r521956
cad/sumo: fix build on GCC architectures

xerces needs C++11 compiler to link to.

Approved by:	portmgr (build fix blanket)
2020-01-03 20:00:10 +00:00
Piotr Kubaj
b637b997f6 MFH: r521945
archivers/py-bup: don't set -Werror

Fixes build with base GCC.

Approved by:	portmgr (ports compliance blanket)
2020-01-03 15:10:30 +00:00
Piotr Kubaj
e3e647de65 MFH: r521937
audio/asterisk-flite: fix build on GCC architectures

C11 compiler is necessary:

In file included from /usr/local/include/asterisk/vector.h:22,
                 from /usr/local/include/asterisk/stringfields.h:178,
                 from /usr/local/include/asterisk/app.h:26,
                 from app_flite.c:42:
/usr/local/include/asterisk/lock.h: In function 'ast_atomic_fetchadd_int':
/usr/local/include/asterisk/lock.h:752: error: '__ATOMIC_RELAXED' undeclared (first use in this function)
/usr/local/include/asterisk/lock.h:752: error: (Each undeclared identifier is reported only once
/usr/local/include/asterisk/lock.h:752: error: for each function it appears in.)
/usr/local/include/asterisk/lock.h: In function 'ast_atomic_dec_and_test':
/usr/local/include/asterisk/lock.h:762: error: '__ATOMIC_RELAXED' undeclared (first use in this function)

Approved by:	portmgr (fix build blanket)
2020-01-03 13:18:18 +00:00
Jan Beich
9a583826f3 MFH: r521930
audio/tagutil: move BROKEN where it belongs

Approved by:	ports-secteam blanket
2020-01-03 11:28:56 +00:00
Jan Beich
4d11f312a4 MFH: r521928
audio/tagutil: mark BROKEN on FreeBSD 11 after r520736

FAILED: tagutil
: && /usr/bin/cc -O2 -pipe  -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing -O2 -pipe  -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing -O0 -g -fsanitize=undefined  -fstack-protector-strong -pie CMakeFiles/tagutil.dir/tagutil.c.o CMakeFiles/tagutil.dir/t_action.c.o CMakeFiles/tagutil.dir/t_renamer.c.o CMakeFiles/tagutil.dir/t_editor.c.o CMakeFiles/tagutil.dir/t_loader.c.o CMakeFiles/tagutil.dir/t_tune.c.o CMakeFiles/tagutil.dir/t_taglist.c.o CMakeFiles/tagutil.dir/t_tag.c.o CMakeFiles/tagutil.dir/t_backend.c.o CMakeFiles/tagutil.dir/t_format.c.o CMakeFiles/tagutil.dir/t_toolkit.c.o CMakeFiles/tagutil.dir/t_fttaglib.c.o CMakeFiles/tagutil.dir/t_ftflac.c.o CMakeFiles/tagutil.dir/t_ftoggvorbis.c.o CMakeFiles/tagutil.dir/t_yaml.c.o  -o tagutil  -lc -lsbuf -L/usr/local/lib -ltag_c -ltag -L/usr/local/lib -lFLAC -L/usr/local/lib -logg -L/usr/local/lib -lvorbis -L/usr/local/lib -lvorbisfile -L/usr/local/lib -lyaml && :
/usr/bin/ld: undefined reference to symbol `__cxa_demangle@@CXXABI_1.3' (try adding -lcxxrt)
//lib/libcxxrt.so.1: could not read symbols: Bad value
cc: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.
*** Error code 1

Reported by:	pkg-fallout
Approved by:	ports-secteam blanket
2020-01-03 11:25:22 +00:00
Jan Beich
235deb1b39 MFH: r521925
misc/freebsd-doc-ja: unbreak after r521437

===>   ja-freebsd-doc-53688,1 depends on file: /usr/local/share/fonts/OTF/ipam.otf - not found
===>   Installing existing package /packages/All/ja-font-ipa-00303_7.txz
Installing ja-font-ipa-00303_7...
Extracting ja-font-ipa-00303_7: .......... done
===>   ja-freebsd-doc-53688,1 depends on file: /usr/local/share/fonts/OTF/ipam.otf - not found
*** Error code 1

Reported by:	pkg-fallout
Approved by:	ports-secteam blanket
2020-01-03 10:35:26 +00:00
Jan Beich
3112c2efa5 MFH: r521921
x11-wm/sway: fix required wlroots version

Subproject directory not found and wlroots.wrap file not found
Subproject  subprojects/wlroots is buildable: NO (disabling)
Dependency wlroots found: NO found '0.10.0' but need: '<0.10.0' ; matched: '>=0.9.0'
Run-time dependency wlroots found: NO (tried cmake)

meson.build:73:1: ERROR: Invalid version of dependency, need 'wlroots' ['<0.10.0'] found '0.10.0'.

Approved by:	ports-secteam blanket
2020-01-03 10:17:24 +00:00
Antoine Brodin
7722d290ad MFH: r521828
Attempt to fix build after removal of Linux c6.

- Replace build dependency on linux-c7-devtools with
  USE_LINUX=devtools:build so it takes into account LINUX_DEFAULT.
- Install libusb.so.3 which is the SONAME of the library.
- Disable -Werror.
- Don't build profiling library.  It's not installed and -pg and
  -fstack-protector are incompatible.
- Don't let the build make parse /etc/make.conf because this may redefine
  *FLAGS.  The file is already handled by the ports tree.
- Create symbolic links instead of hard links.
2020-01-03 10:05:21 +00:00
Piotr Kubaj
078e0c1276 MFH: r521916
security/py-pysha3: unbreak on powerpc64

Now builds fine (tested on 12.1-RELEASE).

Approved by:	portmgr (fix build blanket)
2020-01-03 09:27:32 +00:00
Tobias Kortkamp
10628fe9cc MFH: r521911
devel/py-cfn-lint: Merge the two py27_RUN_DEPENDS

pathlib2 is needed for Python <= 3.4 according to setup.py

- Pet portlint and fix whitespace while here

Reported by:	mat, portscan

Approved by:	ports-secteam blanket
2020-01-03 07:46:31 +00:00
Kai Knoblich
0eb2d0f9f5 MFH: r521868
textproc/py-ocrmypdf: Update to 9.3.0

Changelog since 9.1.1:

In addition to some enhancements, a regression that existed since the 7.x
release, has also been fixed.

https://github.com/jbarlow83/OCRmyPDF/blob/v9.3.0/docs/release_notes.rst

Approved by:	ports-secteam (joneum)
2020-01-02 23:58:27 +00:00
Kai Knoblich
ffaa90de5a MFH: r521755
net-mgmt/netbox: Update to 2.6.9

* Remove two backported patches that are no longer required. [1]
* Backport a patch from upstream that fixes a regression when accessing the
  API documentation.
* Update the WWW field.

Changelog:

Enhancements:
* Include direct link to rack elevations on site view
* Move virtual machine results near devices in global search
* Added copy button for API tokens

Bug Fixes:
* Prevent the deletion of a virtual chassis when a cross-member LAG
  is present
* Respect custom field default values when creating objects via the REST API
* Fix exception on password change page for local users [1]
* Fix unable to assign IP to interface [1]

Approved by:	ports-secteam (joneum)
2020-01-02 23:52:23 +00:00
Kai Knoblich
4194769133 MFH: r521751
www/py-dj22-django-cacheops: Update to 4.2

Changelog:

https://github.com/Suor/django-cacheops/blob/4.2/CHANGELOG

Approved by:	ports-secteam (joneum)
2020-01-02 23:50:36 +00:00
Kai Knoblich
07f0276f2c MFH: r521750
www/py-django-cacheops: Update to 4.2

Changelog:

https://github.com/Suor/django-cacheops/blob/4.2/CHANGELOG

Approved by:	ports-secteam (joneum)
2020-01-02 23:49:29 +00:00
Piotr Kubaj
d9608644fe MFH: r521885
games/eboard: fix build on GCC architectures

Use C++11 compiler and respect CXXFLAGS.

The compiler check is wrong so remove it.

Approved by:	portmgr (fix build blanket)
2020-01-02 23:30:07 +00:00
Adriaan de Groot
088a225af9 MFH: r521876
Fix up file permissions in Qt ports.

Because qt-dist.mk sets EXTRACT_AFTER_ARGS, the framework-standard
--no-same-owner and --no-same-permissions aren't added. That means
that the files end up in packages with the permissions from the tarball,
and in particular that official packages contain group-writable (wheel)
includes (C++ headers) and other files.

This was reported in
	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227027
and fixed in 465911 (18 months ago) but the move from bsd.qt.mk
to Uses/qt-dist.mk lost those settings again. Re-add them to
the Uses/ file to improve package security.

(The problem does not seem to be present in my local poudriere builds)

PR:		227027
Reported by:	grarpamp@gmail.com
Reviewed by:	tcberner
Approved by:	tcberner
Differential Revision:	https://reviews.freebsd.org/D22999

Approved by:	portmgr (joneum)
2020-01-02 22:08:28 +00:00
Jan Beich
5de9b00c53 MFH: r521880
x11-toolkits/wlroots: unbreak nesting after r521656

An example affected use case would be running Cage on Sway in order to
contain multiple fullscreen/kiosk Firefox instances, capitalizing
on minimalistic UI.

Approved by:	ports-secteam blanket
2020-01-02 21:32:23 +00:00
Jan Beich
5ccec322ca MFH: r521835
x11-wm/wayfire: fix DRM session after r521656

After VT switch nothing was rendered. From debug log before/after:

 [backend/drm/drm.c:1485] Requesting modeset for 'DP-1'
-[src/core/output-layout.cpp:844] new output: DP-1
+[src/core/output-layout.cpp:849] new output: DP-1
+[backend/drm/drm.c:697] Modesetting 'DP-1' with '3840x2160@60000 mHz'
+[backend/drm/drm.c:592] Initializing renderer on connector 'DP-1'
+[GLES2] FS SIMD8 shader: 5 inst, 0 loops, 24 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes.
+[GLES2] FS SIMD16 shader: 5 inst, 0 loops, 34 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes.
+[GLES2] VS SIMD8 shader: 28 inst, 0 loops, 116 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 448 to 336 bytes.
+[GLES2] FS SIMD16 shader: 2 inst, 0 loops, 0 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 32 to 32 bytes.

Approved by:	ports-secteam blanket
2020-01-02 14:23:32 +00:00
Jan Beich
eb0e930259 MFH: r521825
multimedia/ffmpeg: update to 4.2.2

Changes:	https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n4.2.2:/Changelog
ABI:		https://abi-laboratory.pro/tracker/timeline/ffmpeg/
Reported by:	portscout
Approved by:	ports-secteam blanket (multiple regression/security fixes)
2020-01-02 10:53:02 +00:00
Piotr Kubaj
237674749a MFH: r521815
ftp/lftp: fix build on GCC architectures

C++11 compiler is necessary:
In file included from FileAccess.cc:1029:
ftpclass.h:123: error: ISO C++ forbids initialization of member 'cepr_supported'
ftpclass.h:123: error: making 'cepr_supported' static
ftpclass.h:123: error: ISO C++ forbids in-class initialization of non-const static member 'cepr_supported'

Approved by:	portmgr (build fix blanket)
2020-01-02 09:29:48 +00:00
Dima Panov
169d3f0c61 MFH: r521796
databases/percona57-*: Fix build for i386

Make build-script assume that FreeBSD's Clang doesn't
have "atomic_*" functions builtin implemented on i386

While here, allow to build on DragonFly BSD and
drop "-fabi-version=2" from C/CXX flags

Reported by:	pkg-fallout
Approved by:	ports-secteam blanket
2020-01-02 09:02:51 +00:00
Jan Beich
132522323a MFH: r521792
japanese/ngraph-fonts: unbreak after r521443

=======================<phase: run-depends    >============================
===>   ja-ngraph-fonts-1.0_3 depends on file: /usr/local/share/fonts/kanji/kanji18.pcf.gz - not found
===>   Installing existing package /packages/All/ja-font-kanji18-1.0_3.txz
Installing ja-font-kanji18-1.0_3...
[...]
===>   ja-ngraph-fonts-1.0_3 depends on file: /usr/local/share/fonts/kanji/kanji18.pcf.gz - not found
*** Error code 1

Reported by:	pkg-fallout
Approved by:	ports-secteam blanket
2020-01-02 02:16:03 +00:00
Jan Beich
da169b21b2 MFH: r521790
japanese/tgif: unbreak after r521438

=======================<phase: run-depends    >============================
===>   ja-tgif-resource-4.2.2_1 depends on executable: tgif - not found
===>   Installing existing package /packages/All/tgif-4.2.5_2.txz
[...]
===>   ja-tgif-resource-4.2.2_1 depends on file: /usr/local/share/fonts/TTF/ipagui.ttf - not found
===>   Installing existing package /packages/All/ja-font-ipa-uigothic-00203_5.txz
[...]
===>   ja-tgif-resource-4.2.2_1 depends on file: /usr/local/share/fonts/TTF/ipagui.ttf - not found
*** Error code 1

Reported by:	pkg-fallout
Approved by:	ports-secteam blanket
2020-01-02 02:10:36 +00:00
Jan Beich
8f540cffa2 MFH: r521788
emulators/rpcs3: update to 0.0.8.9302

Changes:	341fdf7eb...c4e59b511
Approved by:	ports-secteam blanket (reliability/regression fixes)
2020-01-02 00:12:01 +00:00
Piotr Kubaj
2b7ab48bd9 MFH: r521784
math/gretl: fix build on GCC architectures

Since the last upgrade, gretl requires C11:
../lib/src/bhhh_max.c:37: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'Lval'

Fix this by adding USES=compiler:c11 and replacing OPENMP_USES=compiler:openmp with OPENMP_USE=GCC=yes. This sets the correct CC.

PR:		243027
Approved by:	yuri (maintainer)
Approved by:	portmgr (fix build blanket)
2020-01-01 23:09:52 +00:00
Piotr Kubaj
78cb540ce0 MFH: r521783
x11/mate-applets: fix build on non-x86

This is basically the same change to pkg-plist as the one done in r504600, which was later backed out for unknown reasons in r520859.

Already approved via maintainer timeout in the original PR.

Tested to fix packaging on powerpc64 and not break on amd64.

PR:		238323
Approved by:	gnome (maintainer timeout)
Pointy hat:	ericbsd
Approved by:	portmgr (fix packaging blanket)
2020-01-01 23:07:20 +00:00
Tobias C. Berner
981ef1f701 MFH: r521778
net/quiterss: Update to 0.19.2

 Changelog: https://quiterss.org/en/article/1506
    * Added: App style: dark
    * Fixed: Problems with msvcp140.dll and vcruntime140.dll (Windows)
    * Fixed: Images are not displayed in some feeds
    * Fixed: Sometimes news filter did not work when updating feeds

PR:		242904
Submitted by:	Loïc Bartoletti <lbartoletti@tuxfamily.org> (maintainer)

Approved by:	ports-secteam (blanket)
2020-01-01 21:47:39 +00:00
Antoine Brodin
f0e7a56e4c MFH: r521744
Fix build with hdf5 1.10.6
2020-01-01 20:24:02 +00:00
Antoine Brodin
e7fa4bfd1b MFH: r521766
Mark BROKEN

/wrkdirs/usr/ports/comms/cubicsdr/work/CubicSDR-0.2.5/src/AppFrame.cpp:3100:13: error: incomplete type 'wxToolTip' named in nested name specifier

Reported by:	pkg-fallout
2020-01-01 20:22:36 +00:00
Tobias C. Berner
886a567883 MFH: r521756
security/pam_google_authenticator: update to 1.08

Bugfix issue:
	https://github.com/google/google-authenticator-libpam/issues/146

PR:		243003
Submitted by:	Dries Michiels <driesm.michiels@gmail.com>  (maintainer)

Approved by:	ports-secteam (blanket)
2020-01-01 18:55:17 +00:00
Kai Knoblich
8f93153c27 MFH: r521753
www/py-dj22-django-prometheus: Fix RUN_DEPENDS of REDIS option

* Assign the RUN_DEPENDS of the non-default option REDIS to the Django 2.2
  variant of www/py-django-redis.  This was forgotten in r504808.

* Bump PORTREVISION due package change when built with the REDIS option.

Reported by:	sunpoet

Approved by:	ports-secteam dependency fix blanket
2020-01-01 17:51:00 +00:00
Antoine Brodin
d78045dfdf MFH: r521726
Deprecate python2

With hat:	portmgr
2020-01-01 17:47:20 +00:00
1333 changed files with 20659 additions and 10930 deletions

4
MOVED
View File

@ -12970,10 +12970,7 @@ mail/fetchmail64|mail/fetchmail|2019-09-28|mail/fetchmail now provides the same
devel/rubygem-grape_logging181|devel/rubygem-grape_logging|2019-09-29|Obsolete, please use devel/rubygem-grape_logging devel/rubygem-grape_logging181|devel/rubygem-grape_logging|2019-09-29|Obsolete, please use devel/rubygem-grape_logging
devel/py-pip-tools3|devel/py-pip-tools|2019-09-30|Use devel/py-pip-tools instead devel/py-pip-tools3|devel/py-pip-tools|2019-09-30|Use devel/py-pip-tools instead
textproc/py-openpyxl24|textproc/py-openpyxl|2019-09-30|Has expired: Use textproc/py-openpyxl instead textproc/py-openpyxl24|textproc/py-openpyxl|2019-09-30|Has expired: Use textproc/py-openpyxl instead
textproc/rubygem-elasticsearch-api6|textproc/rubygem-elasticsearch-api|2019-09-30|Has expired: Usetextproc/rubygem-elasticsearch-api instead
textproc/rubygem-elasticsearch-transport6|textproc/rubygem-elasticsearch-transport|2019-09-30|Has expired: Usetextproc/rubygem-elasticsearch-transport instead
textproc/rubygem-elasticsearch-xpack6|textproc/rubygem-elasticsearch-xpack|2019-09-30|Has expired: Usetextproc/rubygem-elasticsearch-xpack instead textproc/rubygem-elasticsearch-xpack6|textproc/rubygem-elasticsearch-xpack|2019-09-30|Has expired: Usetextproc/rubygem-elasticsearch-xpack instead
textproc/rubygem-elasticsearch6|textproc/rubygem-elasticsearch|2019-09-30|Has expired: Usetextproc/rubygem-elasticsearch instead
devel/rubygem-sprockets-rails|devel/rubygem-sprockets-rails-rails4|2019-09-30|Rename to match our rubygem- port naming devel/rubygem-sprockets-rails|devel/rubygem-sprockets-rails-rails4|2019-09-30|Rename to match our rubygem- port naming
java/linux-oracle-jdk9|java/openjdk11|2019-09-30|Has expired: No longer maintained upstream, please migrate to openjdk11 java/linux-oracle-jdk9|java/openjdk11|2019-09-30|Has expired: No longer maintained upstream, please migrate to openjdk11
java/linux-oracle-jdk10|java/openjdk11|2019-09-30|Has expired: No longer maintained upstream, please migrate to openjdk11 java/linux-oracle-jdk10|java/openjdk11|2019-09-30|Has expired: No longer maintained upstream, please migrate to openjdk11
@ -13687,7 +13684,6 @@ security/linux-c6-libtasn1|security/linux-c7-libtasn1|2019-12-31|Has expired: Su
security/linux-c6-nss|security/linux-c7-nss|2019-12-31|Has expired: Superseded by CentOS 7 security/linux-c6-nss|security/linux-c7-nss|2019-12-31|Has expired: Superseded by CentOS 7
security/linux-c6-openssl|emulators/linux_base-c7|2019-12-31|Has expired: Superseded by CentOS 7 security/linux-c6-openssl|emulators/linux_base-c7|2019-12-31|Has expired: Superseded by CentOS 7
security/linux-c6-pam||2019-12-31|Has expired: Superseded by CentOS 7 security/linux-c6-pam||2019-12-31|Has expired: Superseded by CentOS 7
security/openssl||2019-12-31|Has expired: OpenSSL 1.0.2 is End-of-Life 2019-12-31 at which time this port will update to 1.1.1 branch
sysutils/eventlog||2019-12-31|Has expired: No longer supported by Balabit sysutils/eventlog||2019-12-31|Has expired: No longer supported by Balabit
sysutils/linux-c6-lttng-ust|sysutils/linux-c7-lttng-ust|2019-12-31|Has expired: Superseded by CentOS 7 sysutils/linux-c6-lttng-ust|sysutils/linux-c7-lttng-ust|2019-12-31|Has expired: Superseded by CentOS 7
sysutils/linux-c6-userspace-rcu|sysutils/linux-c7-userspace-rcu|2019-12-31|Has expired: Superseded by CentOS 7 sysutils/linux-c6-userspace-rcu|sysutils/linux-c7-userspace-rcu|2019-12-31|Has expired: Superseded by CentOS 7

View File

@ -110,7 +110,8 @@ EXTRACT_SUFX?= .tar.xz
# Other ports from other Qt modules will automatically build examples and # Other ports from other Qt modules will automatically build examples and
# tests if the directories exist because of mkspecs/features/qt_parts.prf. # tests if the directories exist because of mkspecs/features/qt_parts.prf.
EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \ EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
${DISTNAME:S,$,/tests,:S,^,--exclude ,} ${DISTNAME:S,$,/tests,:S,^,--exclude ,} \
--no-same-owner --no-same-permissions
. endif # ! ${_QT_VER:M5} . endif # ! ${_QT_VER:M5}
CONFIGURE_ENV+= MAKE="${MAKE:T}" CONFIGURE_ENV+= MAKE="${MAKE:T}"

View File

@ -76,8 +76,8 @@ LDFLAGS+= -Wl,--as-needed
BUNDLE_LIBS= yes BUNDLE_LIBS= yes
BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
rust-cbindgen>=0.8.7:devel/rust-cbindgen \ rust-cbindgen>=0.13.0:devel/rust-cbindgen \
${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ ${RUST_DEFAULT}>=1.39:lang/${RUST_DEFAULT} \
${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
node:www/node node:www/node
MOZ_EXPORT+= ${CONFIGURE_ENV} \ MOZ_EXPORT+= ${CONFIGURE_ENV} \

View File

@ -5,6 +5,15 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades. you update your ports collection, before attempting any port upgrades.
20200229:
AFFECTS: users of textproc/apache-solr
AUTHOR: mfechner@FreeBSD.org
Apache-solr switched to the supported java LTS version 11.
Make sure you update the following files accordingly:
/usr/local/etc/solr.in.sh (see /usr/local/etc/solr.in.sh.sample)
/usr/local/etc/javavm_opts.conf (JAVA_HOME=/usr/local/openjdk11/)
20191226: 20191226:
AFFECTS: users of sysutils/dsbmd AFFECTS: users of sysutils/dsbmd
AUTHOR: mk@freeshell.de AUTHOR: mk@freeshell.de

View File

@ -207,6 +207,7 @@
SUBDIR += rubygem-ruby-xz SUBDIR += rubygem-ruby-xz
SUBDIR += rubygem-rubyzip SUBDIR += rubygem-rubyzip
SUBDIR += rubygem-rubyzip12 SUBDIR += rubygem-rubyzip12
SUBDIR += rubygem-rubyzip13
SUBDIR += rubygem-rubyzip2 SUBDIR += rubygem-rubyzip2
SUBDIR += rubygem-snappy SUBDIR += rubygem-snappy
SUBDIR += rvm SUBDIR += rvm

View File

@ -5,7 +5,7 @@ PORTNAME= File_Archive
PORTVERSION= 1.5.5 PORTVERSION= 1.5.5
CATEGORIES= archivers www pear CATEGORIES= archivers www pear
MAINTAINER= joneum@FreeBSD.org MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR class to manipulate tar, gz, tgz, bz2, tbz, zip, ar (deb) files COMMENT= PEAR class to manipulate tar, gz, tgz, bz2, tbz, zip, ar (deb) files
LICENSE= LGPL3 LICENSE= LGPL3

View File

@ -5,7 +5,7 @@ PORTNAME= PHP_Archive
PORTVERSION= 0.13.0 PORTVERSION= 0.13.0
CATEGORIES= archivers pear CATEGORIES= archivers pear
MAINTAINER= joneum@FreeBSD.org MAINTAINER= miwi@FreeBSD.org
COMMENT= Create and Use PHP Archive files COMMENT= Create and Use PHP Archive files
LICENSE= PHP301 LICENSE= PHP301

View File

@ -6,7 +6,7 @@ PORTVERSION= 1.6.7
CATEGORIES= archivers pear CATEGORIES= archivers pear
DISTNAME= ${PORTNAME:tu}-${PORTVERSION} DISTNAME= ${PORTNAME:tu}-${PORTVERSION}
MAINTAINER= joneum@FreeBSD.org MAINTAINER= miwi@FreeBSD.org
COMMENT= Handles LZF de/compression COMMENT= Handles LZF de/compression
LICENSE= PHP301 LICENSE= PHP301

View File

@ -5,7 +5,7 @@ PORTNAME= rar
PORTVERSION= 4.0.0 PORTVERSION= 4.0.0
CATEGORIES= archivers pear CATEGORIES= archivers pear
MAINTAINER= joneum@FreeBSD.org MAINTAINER= miwi@FreeBSD.org
COMMENT= PECL extension to create and read RAR files COMMENT= PECL extension to create and read RAR files
LICENSE= PHP301 LICENSE= PHP301

View File

@ -6,7 +6,7 @@ PORTVERSION= 0.1.9
CATEGORIES= archivers CATEGORIES= archivers
PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= joneum@FreeBSD.org MAINTAINER= miwi@FreeBSD.org
COMMENT= PHP extension for the snappy compression algorithm COMMENT= PHP extension for the snappy compression algorithm
LICENSE= BSD3CLAUSE PHP301 LICENSE= BSD3CLAUSE PHP301

View File

@ -1,6 +1,15 @@
--- Makefile.orig 2017-03-26 22:24:25 UTC --- Makefile.orig 2019-08-25 17:32:03 UTC
+++ Makefile +++ Makefile
@@ -80,7 +80,7 @@ man_html := $(patsubst %.md,%.html,$(man @@ -25,7 +25,7 @@ current_sampledata := t/sampledata/var/rev/v$(sampleda
os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
os := $(call shout,$(os),Unable to determine OS)
-CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -Wall -O2 -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
SOEXT:=.so
@@ -84,7 +84,7 @@ man_html := $(patsubst %.md,%.html,$(man_md))
INSTALL=install INSTALL=install
PREFIX=/usr/local PREFIX=/usr/local

View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= rubyzip PORTNAME= rubyzip
PORTVERSION= 1.3.0 PORTVERSION= 2.0.0
CATEGORIES= archivers rubygems CATEGORIES= archivers rubygems
MASTER_SITES= RG MASTER_SITES= RG

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1571671545 TIMESTAMP = 1580460290
SHA256 (rubygem/rubyzip-1.3.0.gem) = 149dd90386c5eef837353b21cd9a0cfd4ec5a07b24ab18f734f546cefb17ace3 SHA256 (rubygem/rubyzip-2.0.0.gem) = ff11f68bc936504ee73ad39bf8880b656ec70593de18b7cc3ab90b7541cce0bf
SIZE (rubygem/rubyzip-1.3.0.gem) = 154624 SIZE (rubygem/rubyzip-2.0.0.gem) = 38912

View File

@ -0,0 +1,23 @@
# Created by: Steve Wills <swills@FreeBSD.org>
# $FreeBSD$
PORTNAME= rubyzip
PORTVERSION= 1.3.0
CATEGORIES= archivers rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 13
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Ruby module for reading and writing zip files
LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
USES= gem
USE_RUBY= yes
NO_ARCH= yes
PORTSCOUT= limit:^1\.3\.
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
TIMESTAMP = 1571671545
SHA256 (rubygem/rubyzip-1.3.0.gem) = 149dd90386c5eef837353b21cd9a0cfd4ec5a07b24ab18f734f546cefb17ace3
SIZE (rubygem/rubyzip-1.3.0.gem) = 154624

View File

@ -0,0 +1,3 @@
Ruby module for reading and writing zip files
WWW: https://github.com/rubyzip/rubyzip

View File

@ -49,7 +49,6 @@ USE_LDCONFIG= yes
INSTALLS_ICONS= yes INSTALLS_ICONS= yes
BROKEN_aarch64= fails to configure: Could not find the program gas,as,gcc BROKEN_aarch64= fails to configure: Could not find the program gas,as,gcc
BROKEN_powerpc64= fails to compile: configuration_variable.cc: 'strtof' is not a member of 'std'
PLIST_SUB= ARDOURVERSION=${PORTVERSION} PLIST_SUB= ARDOURVERSION=${PORTVERSION}
@ -104,6 +103,8 @@ post-install:
WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=i386 WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=i386
.elif ${ARCH} == "amd64" .elif ${ARCH} == "amd64"
WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=x86_64 WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=x86_64
.elif ${ARCH} == "powerpc64"
LLD_UNSAFE= yes
.endif .endif
.if defined(WITH_ARCH_FLAGS) .if defined(WITH_ARCH_FLAGS)

View File

@ -0,0 +1,10 @@
--- libs/fst/wscript.orig 2020-01-11 19:16:19 UTC
+++ libs/fst/wscript
@@ -82,7 +82,6 @@ def build(bld):
obj.includes = [ '../pbd/', '../ardour/', '.' ]
obj.defines = [
- '_POSIX_SOURCE',
'USE_WS_PREFIX',
'VST_SCANNER_APP',
'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"',

View File

@ -27,7 +27,7 @@ asterisk16_CONFLICTS_INSTALL= asterisk13-espeak
asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
USES= compiler gmake localbase USES= compiler:c11 gmake localbase
INSTALL_TARGET= install samples INSTALL_TARGET= install samples
USE_GITHUB= yes USE_GITHUB= yes

View File

@ -26,7 +26,7 @@ asterisk16_CONFLICTS_INSTALL= asterisk13-flite
asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
USES= compiler gmake localbase USES= compiler:c11 gmake localbase
INSTALL_TARGET= install samples INSTALL_TARGET= install samples
USE_GITHUB= yes USE_GITHUB= yes

View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= musicpd PORTNAME= musicpd
PORTVERSION= 0.21.18 PORTVERSION= 0.21.21
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/ MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
DISTNAME= mpd-${PORTVERSION} DISTNAME= mpd-${PORTVERSION}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1577281269 TIMESTAMP = 1584881498
SHA256 (mpd-0.21.18.tar.xz) = 8782e66cd5afd6c92860725196b35b6df07d3d127ef70e900e144323089e9442 SHA256 (mpd-0.21.21.tar.xz) = e1bdb15f0e3b62c18e91257a7b41530dc36eb91cc03eabc6e6bffd947ec168ce
SIZE (mpd-0.21.18.tar.xz) = 676084 SIZE (mpd-0.21.21.tar.xz) = 676668

View File

@ -13,7 +13,7 @@ COMMENT= Legendary Open Cubic Player
LICENSE= GPLv2+ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS= amd64 i386 powerpc64
LIB_DEPENDS= libid3tag.so:audio/libid3tag \ LIB_DEPENDS= libid3tag.so:audio/libid3tag \
libmad.so:audio/libmad \ libmad.so:audio/libmad \

View File

@ -5,7 +5,7 @@ PORTNAME= Text_Spell_Audio
PORTVERSION= 0.1.0 PORTVERSION= 0.1.0
CATEGORIES= audio pear CATEGORIES= audio pear
MAINTAINER= joneum@FreeBSD.org MAINTAINER= miwi@FreeBSD.org
COMMENT= Generates a sound clip saying the contents of a string of characters COMMENT= Generates a sound clip saying the contents of a string of characters
LICENSE= PHP301 LICENSE= PHP301

View File

@ -37,6 +37,9 @@ OGG_LIB_DEPENDS=\
libvorbisfile.so:audio/libvorbis \ libvorbisfile.so:audio/libvorbis \
libogg.so:audio/libogg libogg.so:audio/libogg
OGG_CMAKE_OFF= -DWITHOUT_OGGVORBIS=yes OGG_CMAKE_OFF= -DWITHOUT_OGGVORBIS=yes
.if exists(/usr/lib/libc++.so) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
TAGLIB_BROKEN= ld: undefined reference to symbol '__cxa_demangle@@CXXABI_1.3' (try adding -lcxxrt)
.endif
TAGLIB_LIB_DEPENDS= libtag_c.so:audio/taglib TAGLIB_LIB_DEPENDS= libtag_c.so:audio/taglib
TAGLIB_CMAKE_OFF= -DWITHOUT_TAGLIB=yes TAGLIB_CMAKE_OFF= -DWITHOUT_TAGLIB=yes

View File

@ -6,6 +6,8 @@ PKGNAMESUFFIX= -tcltk
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/Tk interface for TiMidity++ COMMENT= Tcl/Tk interface for TiMidity++
BROKEN= fails to build: /bin/sh: tclsh: not found
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
MASTERDIR= ${.CURDIR}/../../audio/timidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++

View File

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= timidity++ PORTNAME= timidity++
PORTVERSION= 2.14.0 PORTVERSION= 2.15.0
PORTREVISION?= 4
CATEGORIES+= audio CATEGORIES+= audio
MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION} MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}
DISTNAME= TiMidity++-${PORTVERSION} DISTNAME= TiMidity++-${PORTVERSION}
@ -13,9 +12,9 @@ COMMENT?= Software MIDI player
LICENSE= GPLv2+ LICENSE= GPLv2+
LIB_DEPENDS= libarc.so:archivers/libarc
.if !defined(PKGNAMESUFFIX) .if !defined(PKGNAMESUFFIX)
LIB_DEPENDS= libarc.so:archivers/libarc \ LIB_DEPENDS+= libvorbis.so:audio/libvorbis \
libvorbis.so:audio/libvorbis \
libogg.so:audio/libogg libogg.so:audio/libogg
RUN_DEPENDS= eawpats>0:audio/eawpats RUN_DEPENDS= eawpats>0:audio/eawpats
.endif .endif

View File

@ -1,2 +1,3 @@
SHA256 (TiMidity++-2.14.0.tar.bz2) = f97fb643f049e9c2e5ef5b034ea9eeb582f0175dce37bc5df843cc85090f6476 TIMESTAMP = 1582712338
SIZE (TiMidity++-2.14.0.tar.bz2) = 1611424 SHA256 (TiMidity++-2.15.0.tar.bz2) = 161fc0395af16b51f7117ad007c3e434c825a308fa29ad44b626ee8f9bb1c8f5
SIZE (TiMidity++-2.15.0.tar.bz2) = 1624751

View File

@ -1,11 +0,0 @@
--- interface/tk_c.c.orig 2011-12-03 15:49:19 UTC
+++ interface/tk_c.c
@@ -913,7 +913,7 @@ static char *v_eval(char *fmt, ...)
vsnprintf(buf, sizeof(buf), fmt, ap);
Tcl_Eval(my_interp, buf);
va_end(ap);
- return my_interp->result;
+ return Tcl_GetStringResult(my_interp);
}
static const char *v_get2(const char *v1, const char *v2)

View File

@ -5,7 +5,7 @@ PORTNAME= Benchmark
PORTVERSION= 1.2.9 PORTVERSION= 1.2.9
CATEGORIES= benchmarks devel www pear CATEGORIES= benchmarks devel www pear
MAINTAINER= joneum@FreeBSD.org MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR framework to benchmark PHP scripts or function calls COMMENT= PEAR framework to benchmark PHP scripts or function calls
LICENSE= BSD2CLAUSE LICENSE= BSD2CLAUSE

View File

@ -13,6 +13,8 @@ COMMENT= Core C++ library for Pacific Biosciences tools
LICENSE= BSD3CLAUSE LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BROKEN= fails to build
LIB_DEPENDS= libboost_regex.so:devel/boost-libs LIB_DEPENDS= libboost_regex.so:devel/boost-libs
# Meson needs BOOST_ROOT=${LOCALBASE} # Meson needs BOOST_ROOT=${LOCALBASE}

View File

@ -18,6 +18,7 @@
SUBDIR += calculix-ccx SUBDIR += calculix-ccx
SUBDIR += caneda SUBDIR += caneda
SUBDIR += cascade SUBDIR += cascade
SUBDIR += cascade-compiler
SUBDIR += chipvault SUBDIR += chipvault
SUBDIR += cura-engine SUBDIR += cura-engine
SUBDIR += digital SUBDIR += digital

View File

@ -0,0 +1,42 @@
# $FreeBSD$
PORTNAME= cascade
PORTVERSION= g20200105.1
CATEGORIES= cad
PKGNAMESUFFIX= -compiler
MAINTAINER= yuri@FreeBSD.org
COMMENT= Just-In-Time Compiler for Verilog from VMware Research
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= flex>0:textproc/flex
RUN_DEPENDS= verilator:cad/verilator
TEST_DEPENDS= benchmark>0:devel/benchmark \
googletest>0:devel/googletest
USES= bison cmake compiler:c++17-lang localbase:ldflags ncurses perl5
USE_GITHUB= yes
GH_ACCOUNT= vmware
GH_TAGNAME= f4f7ae8bd1dd379790c0e58c286df90b8d1cdcde
MAKE_ENV= FREEBSD_WRKSRC=${WRKSRC} FREEBSD_LOCALBASE=${LOCALBASE}
CMAKE_OFF= BUILD_TESTING
BINARY_ALIAS= flex=${FILESDIR}/flex flex.real=${LOCALBASE}/bin/flex bison=${LOCALBASE}/bin/bison
post-patch:
# cascade needs the latest flex, not one from the base system
@${FIND} ${WRKSRC} -name "*.h" | ${XARGS} ${REINPLACE_CMD} -i '' 's|#include <FlexLexer.h>|#include <${LOCALBASE}/include/flex/FlexLexer.h>|'
# don't need bash: https://github.com/vmware/cascade/issues/207
@${FIND} ${WRKSRC} -name "*.sh" | ${XARGS} ${REINPLACE_CMD} -i '' 's|#!/bin/bash|#!/bin/sh|'
do-test:
cd ${BUILD_WRKSRC} && \
${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
TIMESTAMP = 1578272762
SHA256 (vmware-cascade-g20200105.1-f4f7ae8bd1dd379790c0e58c286df90b8d1cdcde_GH0.tar.gz) = b76107bebbe2c9f8737a652ff4e3c8ebf3fcbf13f672b34aa65c9899e7ab8442
SIZE (vmware-cascade-g20200105.1-f4f7ae8bd1dd379790c0e58c286df90b8d1cdcde_GH0.tar.gz) = 12262109

View File

@ -0,0 +1,9 @@
#!/bin/sh
# $FreeBSD$
# call the real flex
flex.real "$@"
# update the FlexLexer.h include that the above command must have created
find ${FREEBSD_WRKSRC} -name "*.cc" | xargs sed -i '' 's|#include <FlexLexer.h>|#include <${FREEBSD_LOCALBASE}/include/flex/FlexLexer.h>|'

View File

@ -0,0 +1,20 @@
--- CMakeLists.txt.orig 2020-01-06 00:29:10 UTC
+++ CMakeLists.txt
@@ -35,7 +35,8 @@ set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-cove
set(CMAKE_C_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
endif()
-include_directories(${FLEX_INCLUDE_DIRS})
+#include_directories(${FLEX_INCLUDE_DIRS}) # cmake always finds base flex header: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=243068
+include_directories(${CMAKE_INSTALL_PREFIX}/include/flex)
include_directories(${CMAKE_BINARY_DIR}/src)
include_directories(.)
include_directories(src/cascade)
@@ -43,5 +44,7 @@ include_directories(src/cascade)
add_subdirectory(include)
add_subdirectory(share)
add_subdirectory(src)
+if(${BUILD_TESTING})
add_subdirectory(test)
+endif()
add_subdirectory(tools)

View File

@ -0,0 +1,11 @@
Cascade is a novel solution to the problem that FPGAs take a long time to
program, with complex programs taking hours to be compiled to run on FPGA.
Cascade is a first just-in-time compiler for Verilog. Cascade executes code
immediately in a software simulator, and performs compilation in the
background. When compilation is finished, the code is moved into hardware, and
from the user's perspective it simply gets faster over time. Cascade's ability
to move code back and forth between software and hardware also makes it the
first platform to provide generic support for the execution of unsynthesizable
Verilog from hardware.
WWW: https://github.com/vmware/cascade

View File

@ -0,0 +1,263 @@
bin/cascade
bin/cascade_slave
bin/quartus_server
bin/sw_fpga
include/cascade.h
include/cascade/cl/arg.h
include/cascade/cl/arg_table.h
include/cascade/cl/args.h
include/cascade/cl/cl.h
include/cascade/cl/comment_stream.h
include/cascade/cl/dir_arg.h
include/cascade/cl/file_arg.h
include/cascade/cl/flag_arg.h
include/cascade/cl/group.h
include/cascade/cl/simple.h
include/cascade/cl/singleton.h
include/cascade/cl/str_arg.h
include/cascade/common/bits.h
include/cascade/common/cachestream.h
include/cascade/common/fdstream.h
include/cascade/common/incstream.h
include/cascade/common/indstream.h
include/cascade/common/log.h
include/cascade/common/serializable.h
include/cascade/common/sockserver.h
include/cascade/common/sockstream.h
include/cascade/common/system.h
include/cascade/common/thread.h
include/cascade/common/thread_pool.h
include/cascade/common/tokenize.h
include/cascade/common/undo_map.h
include/cascade/common/undo_set.h
include/cascade/common/undo_val.h
include/cascade/common/undo_vector.h
include/cascade/common/undoable.h
include/cascade/common/uuid.h
include/cascade/common/vector.h
include/cascade/runtime/data_plane.h
include/cascade/runtime/ids.h
include/cascade/runtime/isolate.h
include/cascade/runtime/module.h
include/cascade/runtime/nullbuf.h
include/cascade/runtime/runtime.h
include/cascade/target/compiler.h
include/cascade/target/compiler/local_compiler.h
include/cascade/target/compiler/local_interface.h
include/cascade/target/compiler/remote_compiler.h
include/cascade/target/compiler/remote_interface.h
include/cascade/target/compiler/rpc.h
include/cascade/target/compiler/stub_core.h
include/cascade/target/core.h
include/cascade/target/core/avmm/avalon/avalon_compiler.h
include/cascade/target/core/avmm/avalon/avalon_logic.h
include/cascade/target/core/avmm/avalon/syncbuf.h
include/cascade/target/core/avmm/avmm_compiler.h
include/cascade/target/core/avmm/avmm_logic.h
include/cascade/target/core/avmm/de10/de10_compiler.h
include/cascade/target/core/avmm/de10/de10_config.h
include/cascade/target/core/avmm/de10/de10_gpio.h
include/cascade/target/core/avmm/de10/de10_led.h
include/cascade/target/core/avmm/de10/de10_logic.h
include/cascade/target/core/avmm/de10/de10_pad.h
include/cascade/target/core/avmm/de10/hps.h
include/cascade/target/core/avmm/de10/io.h
include/cascade/target/core/avmm/de10/quartus_server.h
include/cascade/target/core/avmm/de10/socal.h
include/cascade/target/core/avmm/machinify.h
include/cascade/target/core/avmm/rewrite.h
include/cascade/target/core/avmm/text_mangle.h
include/cascade/target/core/avmm/ulx3s/ulx3s_compiler.h
include/cascade/target/core/avmm/ulx3s/ulx3s_logic.h
include/cascade/target/core/avmm/var_table.h
include/cascade/target/core/avmm/verilator/verilator_compiler.h
include/cascade/target/core/avmm/verilator/verilator_logic.h
include/cascade/target/core/common/interfacestream.h
include/cascade/target/core/common/printf.h
include/cascade/target/core/common/scanf.h
include/cascade/target/core/proxy/proxy_compiler.h
include/cascade/target/core/proxy/proxy_core.h
include/cascade/target/core/sw/monitor.h
include/cascade/target/core/sw/sw_clock.h
include/cascade/target/core/sw/sw_compiler.h
include/cascade/target/core/sw/sw_led.h
include/cascade/target/core/sw/sw_logic.h
include/cascade/target/core/sw/sw_pad.h
include/cascade/target/core/sw/sw_reset.h
include/cascade/target/core_compiler.h
include/cascade/target/engine.h
include/cascade/target/input.h
include/cascade/target/interface.h
include/cascade/target/state.h
include/cascade/verilog/analyze/constant.h
include/cascade/verilog/analyze/evaluate.h
include/cascade/verilog/analyze/indices.h
include/cascade/verilog/analyze/module_info.h
include/cascade/verilog/analyze/navigate.h
include/cascade/verilog/analyze/read_set.h
include/cascade/verilog/analyze/resolve.h
include/cascade/verilog/ast/ast.h
include/cascade/verilog/ast/ast_fwd.h
include/cascade/verilog/ast/types/always_construct.h
include/cascade/verilog/ast/types/arg_assign.h
include/cascade/verilog/ast/types/assign_statement.h
include/cascade/verilog/ast/types/attr_spec.h
include/cascade/verilog/ast/types/attributes.h
include/cascade/verilog/ast/types/binary_expression.h
include/cascade/verilog/ast/types/block_statement.h
include/cascade/verilog/ast/types/blocking_assign.h
include/cascade/verilog/ast/types/case_generate_construct.h
include/cascade/verilog/ast/types/case_generate_item.h
include/cascade/verilog/ast/types/case_item.h
include/cascade/verilog/ast/types/case_statement.h
include/cascade/verilog/ast/types/concatenation.h
include/cascade/verilog/ast/types/conditional_expression.h
include/cascade/verilog/ast/types/conditional_generate_construct.h
include/cascade/verilog/ast/types/conditional_statement.h
include/cascade/verilog/ast/types/construct.h
include/cascade/verilog/ast/types/continuous_assign.h
include/cascade/verilog/ast/types/debug_statement.h
include/cascade/verilog/ast/types/declaration.h
include/cascade/verilog/ast/types/event.h
include/cascade/verilog/ast/types/event_control.h
include/cascade/verilog/ast/types/expression.h
include/cascade/verilog/ast/types/feof_expression.h
include/cascade/verilog/ast/types/fflush_statement.h
include/cascade/verilog/ast/types/finish_statement.h
include/cascade/verilog/ast/types/fopen_expression.h
include/cascade/verilog/ast/types/for_statement.h
include/cascade/verilog/ast/types/fseek_statement.h
include/cascade/verilog/ast/types/generate_block.h
include/cascade/verilog/ast/types/generate_construct.h
include/cascade/verilog/ast/types/generate_region.h
include/cascade/verilog/ast/types/genvar_declaration.h
include/cascade/verilog/ast/types/get_statement.h
include/cascade/verilog/ast/types/id.h
include/cascade/verilog/ast/types/identifier.h
include/cascade/verilog/ast/types/if_generate_clause.h
include/cascade/verilog/ast/types/if_generate_construct.h
include/cascade/verilog/ast/types/initial_construct.h
include/cascade/verilog/ast/types/instantiation.h
include/cascade/verilog/ast/types/localparam_declaration.h
include/cascade/verilog/ast/types/loop_generate_construct.h
include/cascade/verilog/ast/types/loop_statement.h
include/cascade/verilog/ast/types/macro.h
include/cascade/verilog/ast/types/module_declaration.h
include/cascade/verilog/ast/types/module_instantiation.h
include/cascade/verilog/ast/types/module_item.h
include/cascade/verilog/ast/types/multiple_concatenation.h
include/cascade/verilog/ast/types/net_declaration.h
include/cascade/verilog/ast/types/node.h
include/cascade/verilog/ast/types/nonblocking_assign.h
include/cascade/verilog/ast/types/number.h
include/cascade/verilog/ast/types/par_block.h
include/cascade/verilog/ast/types/parameter_declaration.h
include/cascade/verilog/ast/types/port_declaration.h
include/cascade/verilog/ast/types/primary.h
include/cascade/verilog/ast/types/put_statement.h
include/cascade/verilog/ast/types/range_expression.h
include/cascade/verilog/ast/types/reg_declaration.h
include/cascade/verilog/ast/types/repeat_statement.h
include/cascade/verilog/ast/types/restart_statement.h
include/cascade/verilog/ast/types/retarget_statement.h
include/cascade/verilog/ast/types/save_statement.h
include/cascade/verilog/ast/types/scope.h
include/cascade/verilog/ast/types/seq_block.h
include/cascade/verilog/ast/types/statement.h
include/cascade/verilog/ast/types/string.h
include/cascade/verilog/ast/types/system_task_enable_statement.h
include/cascade/verilog/ast/types/timing_control.h
include/cascade/verilog/ast/types/timing_control_statement.h
include/cascade/verilog/ast/types/unary_expression.h
include/cascade/verilog/ast/types/variable_assign.h
include/cascade/verilog/ast/types/while_statement.h
include/cascade/verilog/ast/visitors/builder.h
include/cascade/verilog/ast/visitors/editor.h
include/cascade/verilog/ast/visitors/rewriter.h
include/cascade/verilog/ast/visitors/visitor.h
include/cascade/verilog/build/ast_builder.h
include/cascade/verilog/parse/lexer.h
include/cascade/verilog/parse/parser.h
include/cascade/verilog/print/color.h
include/cascade/verilog/print/print.h
include/cascade/verilog/print/printer.h
include/cascade/verilog/print/term/term_printer.h
include/cascade/verilog/print/text/text_printer.h
include/cascade/verilog/program/elaborate.h
include/cascade/verilog/program/inline.h
include/cascade/verilog/program/program.h
include/cascade/verilog/program/type_check.h
include/cascade/verilog/transform/assign_unpack.h
include/cascade/verilog/transform/block_flatten.h
include/cascade/verilog/transform/constant_prop.h
include/cascade/verilog/transform/control_merge.h
include/cascade/verilog/transform/de_alias.h
include/cascade/verilog/transform/dead_code_eliminate.h
include/cascade/verilog/transform/delete_initial.h
include/cascade/verilog/transform/event_expand.h
include/cascade/verilog/transform/index_normalize.h
include/cascade/verilog/transform/loop_unroll.h
include/cascade_slave.h
lib/libcascade.a
%%DATADIR%%/avalon/avalon32_wrapper.v
%%DATADIR%%/avalon/avalon64_wrapper.v
%%DATADIR%%/de10/DE10_NANO_SOC_GHRD.sdc
%%DATADIR%%/de10/DE10_NANO_SoC_GHRD.qpf
%%DATADIR%%/de10/DE10_NANO_SoC_GHRD.qsf
%%DATADIR%%/de10/DE10_NANO_SoC_GHRD.v
%%DATADIR%%/de10/DE10_NANO_SoC_GHRD_assignment_defaults.qdf
%%DATADIR%%/de10/assemble_de10.sh
%%DATADIR%%/de10/build_de10.sh
%%DATADIR%%/de10/generate_hps_qsys_header.sh
%%DATADIR%%/de10/hps_common_board_info.xml
%%DATADIR%%/de10/hps_sdram_p0_summary.csv
%%DATADIR%%/de10/ip/altsource_probe/hps_reset.qip
%%DATADIR%%/de10/ip/altsource_probe/hps_reset.v
%%DATADIR%%/de10/ip/altsource_probe/hps_reset_bb.v
%%DATADIR%%/de10/program_logic_hw.tcl
%%DATADIR%%/de10/soc_system.dtb
%%DATADIR%%/de10/soc_system.dts
%%DATADIR%%/de10/soc_system.qsys
%%DATADIR%%/de10/soc_system_board_info.xml
%%DATADIR%%/de10/sof2rbf.cof
%%DATADIR%%/de10/software/spl_bsp/Makefile
%%DATADIR%%/de10/software/spl_bsp/generated/build.h
%%DATADIR%%/de10/software/spl_bsp/generated/iocsr_config_cyclone5.c
%%DATADIR%%/de10/software/spl_bsp/generated/iocsr_config_cyclone5.h
%%DATADIR%%/de10/software/spl_bsp/generated/pinmux_config.h
%%DATADIR%%/de10/software/spl_bsp/generated/pinmux_config_cyclone5.c
%%DATADIR%%/de10/software/spl_bsp/generated/pll_config.h
%%DATADIR%%/de10/software/spl_bsp/generated/reset_config.h
%%DATADIR%%/de10/software/spl_bsp/generated/sdram/sdram_config.h
%%DATADIR%%/de10/software/spl_bsp/preloader-mkpimage.bin
%%DATADIR%%/de10/software/spl_bsp/preloader.ds
%%DATADIR%%/de10/software/spl_bsp/settings.bsp
%%DATADIR%%/de10/software/spl_bsp/u-boot.img
%%DATADIR%%/de10/software/spl_bsp/uboot.ds
%%DATADIR%%/march/de10.v
%%DATADIR%%/march/regression/avalon32.v
%%DATADIR%%/march/regression/avalon64.v
%%DATADIR%%/march/regression/concurrent.v
%%DATADIR%%/march/regression/jit.v
%%DATADIR%%/march/regression/minimal.v
%%DATADIR%%/march/regression/no_inline.v
%%DATADIR%%/march/regression/remote.v
%%DATADIR%%/march/regression/verilator32.v
%%DATADIR%%/march/regression/verilator64.v
%%DATADIR%%/march/sw.v
%%DATADIR%%/march/ulx3s.v
%%DATADIR%%/stdlib/iterator.v
%%DATADIR%%/stdlib/memory.v
%%DATADIR%%/stdlib/stdlib.v
%%DATADIR%%/ulx3s/build_ulx3s_32.sh
%%DATADIR%%/ulx3s/harness.v
%%DATADIR%%/ulx3s/root32.v
%%DATADIR%%/ulx3s/uart.v
%%DATADIR%%/ulx3s/uart_rx.v
%%DATADIR%%/ulx3s/uart_tx.v
%%DATADIR%%/ulx3s/ulx3s_v20.lpf
%%DATADIR%%/verilator/build_verilator_32.sh
%%DATADIR%%/verilator/build_verilator_64.sh
%%DATADIR%%/verilator/fake_main.cpp
%%DATADIR%%/verilator/harness_32.cpp
%%DATADIR%%/verilator/harness_64.cpp

View File

@ -3,37 +3,26 @@
PORTNAME= kicad PORTNAME= kicad
PORTVERSION= 5.1.5 PORTVERSION= 5.1.5
PORTREVISION= 1
CATEGORIES= cad CATEGORIES= cad
MASTER_SITES= https://kicad-downloads.s3.cern.ch/docs/
PKGNAMESUFFIX= -doc PKGNAMESUFFIX= -doc
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}
MAINTAINER= cmt@FreeBSD.org MAINTAINER= cmt@FreeBSD.org
COMMENT= KiCad Documentation and Help Files COMMENT= KiCad Documentation and Help Files
LICENSE= GPLv3+ CC-BY-3.0 LICENSE= GPLv3+ CC-BY-3.0
LICENSE_COMB= dual LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE.adoc
BUILD_DEPENDS= ja-font-vlgothic>0:japanese/font-vlgothic \
tex-xetex>0:print/tex-xetex \
asciidoc:textproc/asciidoc \
dblatex:textproc/dblatex \
po4a:textproc/po4a \
source-highlight:textproc/source-highlight \
freefont-ttf>0:x11-fonts/freefont-ttf
RUN_DEPENDS= kicad:cad/kicad RUN_DEPENDS= kicad:cad/kicad
USES= cmake gettext-tools
USE_GITHUB= yes
GH_ACCOUNT= KiCad
GH_PROJECT= kicad-doc
CONFLICTS= kicad-devel-r2* CONFLICTS= kicad-devel-r2*
NO_ARCH= yes NO_ARCH= yes
NO_BUILD= yes
CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ do-install:
-DLANGUAGES="ca;de;en;es;fr;id;it;ja;nl;ru" cd ${WRKSRC}/share/doc/kicad && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR}
INSTALL_TARGET= install
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1574032110 TIMESTAMP = 1583079927
SHA256 (KiCad-kicad-doc-5.1.5_GH0.tar.gz) = 6a36d185cfb4b52540704114ef6fe32138e025c088eb7363c337804c80b828e6 SHA256 (kicad-doc-5.1.5.tar.gz) = 477ad2ac29e70eccf1155cdca887280d1c74767b9444f7d38b5ec701fee17dc5
SIZE (KiCad-kicad-doc-5.1.5_GH0.tar.gz) = 75372826 SIZE (kicad-doc-5.1.5.tar.gz) = 317623098

File diff suppressed because it is too large Load Diff

View File

@ -9,8 +9,6 @@ DISTFILES= ${PORTNAME}-src-${DISTVERSIONFULL}${EXTRACT_SUFX}
MAINTAINER= enriquefynn@gmail.com MAINTAINER= enriquefynn@gmail.com
COMMENT= Traffic simulation suite for road vehicles, public transportation, etc COMMENT= Traffic simulation suite for road vehicles, public transportation, etc
BROKEN_powerpc64= fails to configure: xerces-lib not found in /usr/local/lib
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libFOX-1.6.so:x11-toolkits/fox16 \ libFOX-1.6.so:x11-toolkits/fox16 \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
@ -20,7 +18,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libtiff.so:graphics/tiff \ libtiff.so:graphics/tiff \
libxerces-c.so:textproc/xerces-c3 libxerces-c.so:textproc/xerces-c3
USES= cmake gl jpeg python shebangfix zip xorg USES= compiler:c++11-lang cmake gl jpeg python shebangfix zip xorg
SHEBANG_FILES= tools/*.py tools/*/*.py \ SHEBANG_FILES= tools/*.py tools/*/*.py \
tools/*/*/*.py tools/*/*/*/*.py \ tools/*/*/*.py tools/*/*/*/*.py \
tools/*/*/*/*/*/*.py \ tools/*/*/*/*/*/*.py \

View File

@ -11,6 +11,8 @@ COMMENT= SDR receiver using liquidsdr
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= fails to build
RUN_DEPENDS= ${PYNUMPY} \ RUN_DEPENDS= ${PYNUMPY} \
${LOCALBASE}/lib/libEGL.so:graphics/mesa-libs \ ${LOCALBASE}/lib/libEGL.so:graphics/mesa-libs \
${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri

View File

@ -40,7 +40,6 @@ BROKEN_FreeBSD_12_armv7= fails to configure: Could not find standard set_new_han
BROKEN_FreeBSD_13_aarch64= fails to configure: Could not find standard set_new_handler function BROKEN_FreeBSD_13_aarch64= fails to configure: Could not find standard set_new_handler function
BROKEN_FreeBSD_13_armv6= fails to configure: Could not find standard set_new_handler function BROKEN_FreeBSD_13_armv6= fails to configure: Could not find standard set_new_handler function
BROKEN_FreeBSD_13_armv7= fails to configure: Could not find standard set_new_handler function BROKEN_FreeBSD_13_armv7= fails to configure: Could not find standard set_new_handler function
BROKEN_powerpc64= fails to link: undefined reference to boost function
USE_LDCONFIG= yes USE_LDCONFIG= yes
CMAKE_SOURCE_PATH= ${WRKSRC}/host CMAKE_SOURCE_PATH= ${WRKSRC}/host

View File

@ -5,7 +5,7 @@ PORTNAME= Services_JSON
PORTVERSION= 1.0.3 PORTVERSION= 1.0.3
CATEGORIES= converters www pear CATEGORIES= converters www pear
MAINTAINER= joneum@FreeBSD.org MAINTAINER= miwi@FreeBSD.org
COMMENT= PHP implementation of json_encode/decode COMMENT= PHP implementation of json_encode/decode
LICENSE= BSD2CLAUSE LICENSE= BSD2CLAUSE

View File

@ -38,6 +38,9 @@ USE_LDCONFIG= yes
PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
MAKE_ARGS+= docdir=${DOCSDIR} MAKE_ARGS+= docdir=${DOCSDIR}
CFLAGS+= -Wall -Wextra CFLAGS+= -Wall -Wextra
# we use REINPLACE_CMD with a glob that matches
# too broadly, suppress 'sed failed' warnings:
REWARNFILE= /dev/null
OPTIONS_DEFINE= CRYPTO DEBUG L10N SQL JAVA TCL DOCS OPTIONS_DEFINE= CRYPTO DEBUG L10N SQL JAVA TCL DOCS
OPTIONS_DEFAULT=CRYPTO OPTIONS_DEFAULT=CRYPTO

View File

@ -36,6 +36,9 @@ PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
USE_LDCONFIG= yes USE_LDCONFIG= yes
PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
MAKE_ARGS+= docdir=${DOCSDIR} MAKE_ARGS+= docdir=${DOCSDIR}
# we use REINPLACE_CMD with a glob that matches
# too broadly, suppress 'sed failed' warnings:
REWARNFILE= /dev/null
OPTIONS_DEFINE= CRYPTO DEBUG L10N SQL JAVA TCL DOCS OPTIONS_DEFINE= CRYPTO DEBUG L10N SQL JAVA TCL DOCS
OPTIONS_DEFAULT=CRYPTO OPTIONS_DEFAULT=CRYPTO
@ -54,7 +57,11 @@ L10N_CONFIGURE_ENABLE= localization
SQL_CONFIGURE_ENABLE= sql sql_codegen SQL_CONFIGURE_ENABLE= sql sql_codegen
SQL_VARS= DBLIBS+=libdb_sql SQL_VARS= DBLIBS+=libdb_sql
JAVA_USE= java JAVA_USE= java
JAVA_VARS= DBLIBS+=libdb_java # db6 is only compatible with openjdk 7 or 8,
# openjdk 11 or newer and cause IllegalArgument
# exceptions during build even if the version check
# in dist/configure is disabled or fixed:
JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION="7 8"
JAVA_CONFIGURE_ENABLE= java JAVA_CONFIGURE_ENABLE= java
JAVA_CPPFLAGS= -I"${JAVA_HOME}/include" JAVA_CPPFLAGS= -I"${JAVA_HOME}/include"
JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"

View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME?= mariadb PORTNAME?= mariadb
PORTVERSION= 10.2.30 PORTVERSION= 10.2.31
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
@ -149,7 +149,8 @@ MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy libJudy.so:devel/judy
ROCKSDB_USES= python ROCKSDB_USES= python
SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON
SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
TOKUDB_IMPLIES= SNAPPY TOKUDB_IMPLIES= SNAPPY
TOKUDB_PORTDOCS= README.md TOKUDB_PORTDOCS= README.md

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1576941772 TIMESTAMP = 1580332681
SHA256 (mariadb-10.2.30.tar.gz) = 9bcc7556dfc5d77d78551e2f9a719f45545609f14f8acdf129b99f577e041b38 SHA256 (mariadb-10.2.31.tar.gz) = 321f744c322ecbc06feddd290d5ee0bf7c68e92cb61fd93c9450eb9c05683151
SIZE (mariadb-10.2.30.tar.gz) = 73096027 SIZE (mariadb-10.2.31.tar.gz) = 73134720

View File

@ -0,0 +1,14 @@
--- plugin/auth_pam/mapper/pam_user_map.c.orig 2020-01-26 20:43:53 UTC
+++ plugin/auth_pam/mapper/pam_user_map.c
@@ -39,7 +39,11 @@ and usually end up in /var/log/secure file.
#include <grp.h>
#include <pwd.h>
+#ifdef __FreeBSD__
+#include <security/pam_appl.h>
+#elif
#include <security/pam_ext.h>
+#endif
#include <security/pam_modules.h>
#define FILENAME "/etc/security/user_map.conf"

View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME?= mariadb PORTNAME?= mariadb
PORTVERSION= 10.3.21 PORTVERSION= 10.3.22
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1576430052 TIMESTAMP = 1580324903
SHA256 (mariadb-10.3.21.tar.gz) = f95bd4b670fb86082d1e3f0c4299ebcd40bda856b111e3f02ab647b0e9ba5e8f SHA256 (mariadb-10.3.22.tar.gz) = 3200055dbdc27746981b3bb4bc182e2cb79dcf28ea88014b641a5b81280ccec7
SIZE (mariadb-10.3.21.tar.gz) = 72005618 SIZE (mariadb-10.3.22.tar.gz) = 72050820

View File

@ -0,0 +1,14 @@
--- plugin/auth_pam/mapper/pam_user_map.c.orig 2020-01-26 20:43:53 UTC
+++ plugin/auth_pam/mapper/pam_user_map.c
@@ -39,7 +39,11 @@ and usually end up in /var/log/secure file.
#include <grp.h>
#include <pwd.h>
+#ifdef __FreeBSD__
+#include <security/pam_appl.h>
+#elif
#include <security/pam_ext.h>
+#endif
#include <security/pam_modules.h>
#define FILENAME "/etc/security/user_map.conf"

View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME?= mariadb PORTNAME?= mariadb
PORTVERSION= 10.4.11 PORTVERSION= 10.4.12
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1576075415 TIMESTAMP = 1580199426
SHA256 (mariadb-10.4.11.tar.gz) = 4c076232b99433b09eb3c6d62f607192b3474d022703699b8f6aef4e79de3fb9 SHA256 (mariadb-10.4.12.tar.gz) = fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208
SIZE (mariadb-10.4.11.tar.gz) = 78389909 SIZE (mariadb-10.4.12.tar.gz) = 79120835

View File

@ -0,0 +1,14 @@
--- plugin/auth_pam/mapper/pam_user_map.c.orig 2020-01-26 20:43:53 UTC
+++ plugin/auth_pam/mapper/pam_user_map.c
@@ -39,7 +39,11 @@ and usually end up in /var/log/secure file.
#include <grp.h>
#include <pwd.h>
+#ifdef __FreeBSD__
+#include <security/pam_appl.h>
+#elif
#include <security/pam_ext.h>
+#endif
#include <security/pam_modules.h>
#define FILENAME "/etc/security/user_map.conf"

View File

@ -1,8 +1,8 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME?= mariadb PORTNAME?= mariadb
PORTVERSION= 5.5.66 PORTVERSION= 5.5.67
PORTREVISION?= 1 PORTREVISION?= 0
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1574710698 TIMESTAMP = 1580633911
SHA256 (mariadb-5.5.66.tar.gz) = d7457c6d2edc9c4ca9278deab9812cd28b38e1af4e47911a1590ca532379f6ae SHA256 (mariadb-5.5.67.tar.gz) = a622b2db2f02f5fb97dcd4978366c0b49716dfed3698fe4b826dd910fe7b7b85
SIZE (mariadb-5.5.66.tar.gz) = 45962591 SIZE (mariadb-5.5.67.tar.gz) = 45971908

View File

@ -4,7 +4,7 @@
%%MONGOFILES%%bin/mongofiles %%MONGOFILES%%bin/mongofiles
%%MONGOIMPORT%%bin/mongoimport %%MONGOIMPORT%%bin/mongoimport
%%MONGORESTORE%%bin/mongorestore %%MONGORESTORE%%bin/mongorestore
%%MONGOTOP%%bin/mongoreplay %%MONGOREPLAY%%bin/mongoreplay
%%MONGOSTAT%%bin/mongostat %%MONGOSTAT%%bin/mongostat
%%MONGOTOP%%bin/mongotop %%MONGOTOP%%bin/mongotop
%%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/README.md

View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= mysql PORTNAME= mysql
PORTREVISION= 0 PORTREVISION= 1
PKGNAMESUFFIX= 56-client PKGNAMESUFFIX= 56-client
COMMENT= Multithreaded SQL database (client) COMMENT= Multithreaded SQL database (client)
@ -31,6 +31,5 @@ MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mys
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
CLIENT_ONLY= yes CLIENT_ONLY= yes
EXTRA_PATCHES+= ${MASTERDIR}/files/patch-PR225888.diff
.include "${MASTERDIR}/Makefile" .include "${MASTERDIR}/Makefile"

View File

@ -1,6 +1,6 @@
--- cmake/build_configurations/compiler_options.cmake.orig 2016-03-03 16:35:33.000000000 +0100 --- cmake/build_configurations/compiler_options.cmake.orig 2020-01-01 21:24:49.736077000 +0100
+++ cmake/build_configurations/compiler_options.cmake 2016-04-19 17:30:13.345558666 +0200 +++ cmake/build_configurations/compiler_options.cmake 2020-01-01 21:25:22.307418000 +0100
@@ -25,7 +25,7 @@ IF(UNIX) @@ -32,7 +32,7 @@ IF(UNIX)
# Default GCC flags # Default GCC flags
IF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCC)
@ -9,10 +9,10 @@
# Disable inline optimizations for valgrind testing to avoid false positives # Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND) IF(WITH_VALGRIND)
SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
@@ -34,7 +34,7 @@ IF(UNIX) @@ -47,7 +47,7 @@ IF(UNIX)
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
ENDIF() SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03")
IF(CMAKE_COMPILER_IS_GNUCXX) ENDIF()
- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") - SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
# Disable inline optimizations for valgrind testing to avoid false positives # Disable inline optimizations for valgrind testing to avoid false positives

View File

@ -1,11 +1,25 @@
--- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC --- cmake/ssl.cmake.orig 2019-11-26 16:53:45 UTC
+++ cmake/ssl.cmake +++ cmake/ssl.cmake
@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) @@ -189,13 +189,20 @@ MACRO (MYSQL_CHECK_SSL)
OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
)
ENDIF()
- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
+ IF(HAVE_TLS1_3_VERSION)
ADD_DEFINITIONS(-DHAVE_TLSv13)
ENDIF()
IF(OPENSSL_INCLUDE_DIR AND IF(OPENSSL_INCLUDE_DIR AND
OPENSSL_LIBRARY AND OPENSSL_LIBRARY AND
CRYPTO_LIBRARY AND CRYPTO_LIBRARY AND
- OPENSSL_MAJOR_VERSION STREQUAL "1" - OPENSSL_MAJOR_VERSION STREQUAL "1"
+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" + OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+ )
+ SET(OPENSSL_FOUND TRUE)
+ ELSEIF(OPENSSL_INCLUDE_DIR AND
+ OPENSSL_LIBRARY AND
+ CRYPTO_LIBRARY AND
+ OPENSSL_MAJOR_VERSION STREQUAL "2"
) )
SET(OPENSSL_FOUND TRUE) SET(OPENSSL_FOUND TRUE)
ELSE() ELSE()

View File

@ -0,0 +1,74 @@
--- mysys_ssl/my_aes_openssl.cc.orig 2019-11-26 16:53:45 UTC
+++ mysys_ssl/my_aes_openssl.cc
@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
const unsigned char *key, uint32 key_length,
enum my_aes_opmode mode, const unsigned char *iv)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX stack_ctx;
EVP_CIPHER_CTX *ctx= &stack_ctx;
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_init(ctx);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
const unsigned char *key, uint32 key_length,
enum my_aes_opmode mode, const unsigned char *iv)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX stack_ctx;
EVP_CIPHER_CTX *ctx= &stack_ctx;
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_init(ctx);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);

View File

@ -0,0 +1,15 @@
--- sql-common/client.c.orig 2019-11-26 16:53:45 UTC
+++ sql-common/client.c
@@ -1980,7 +1980,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
goto error;
}
- cn= (char *) ASN1_STRING_data(cn_asn1);
+#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);
+#endif
// There should not be any NULL embedded in the CN
if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))

View File

@ -0,0 +1,65 @@
--- sql/mysqld.cc.orig 2019-11-26 16:53:45 UTC
+++ sql/mysqld.cc
@@ -1258,7 +1258,7 @@ char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ss
*opt_ssl_crlpath= NULL;
#ifdef HAVE_OPENSSL
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#include <openssl/crypto.h>
typedef struct CRYPTO_dynlock_value
{
@@ -2029,7 +2029,7 @@ static void clean_up_mutexes()
mysql_mutex_destroy(&LOCK_connection_count);
#ifdef HAVE_OPENSSL
mysql_mutex_destroy(&LOCK_des_key_file);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
for (int i= 0; i < CRYPTO_num_locks(); ++i)
mysql_rwlock_destroy(&openssl_stdlocks[i].lock);
OPENSSL_free(openssl_stdlocks);
@@ -2768,7 +2768,7 @@ bool one_thread_per_connection_end(THD *thd, bool bloc
// Clean up errors now, before possibly waiting for a new connection.
#ifndef EMBEDDED_LIBRARY
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_thread_state(0);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
#endif
@@ -4252,7 +4252,7 @@ static int init_thread_environment()
#ifdef HAVE_OPENSSL
mysql_mutex_init(key_LOCK_des_key_file,
&LOCK_des_key_file, MY_MUTEX_INIT_FAST);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
openssl_stdlocks= (openssl_lock_t*) OPENSSL_malloc(CRYPTO_num_locks() *
sizeof(openssl_lock_t));
for (int i= 0; i < CRYPTO_num_locks(); ++i)
@@ -4301,7 +4301,7 @@ static int init_thread_environment()
OpenSSL 1.1 supports native platform threads,
so we don't need the following callback functions.
*/
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
static unsigned long openssl_id_function()
{
@@ -4375,7 +4375,7 @@ static void openssl_lock(int mode, openssl_lock_t *loc
static int init_ssl()
{
#ifdef HAVE_OPENSSL
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
CRYPTO_malloc_init();
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
OPENSSL_malloc_init();
@@ -4392,7 +4392,7 @@ static int init_ssl()
opt_ssl_cipher, &error,
opt_ssl_crl, opt_ssl_crlpath);
DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_thread_state(0);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
if (!ssl_acceptor_fd)

View File

@ -0,0 +1,11 @@
--- vio/vio.c.orig 2019-11-26 16:53:45 UTC
+++ vio/vio.c
@@ -394,7 +394,7 @@ void vio_end(void)
{
#if defined(HAVE_OPENSSL)
// This one is needed on the client side
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_thread_state(0);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
ERR_free_strings();

View File

@ -0,0 +1,11 @@
--- vio/viossl.c.orig 2019-11-26 16:53:45 UTC
+++ vio/viossl.c
@@ -403,7 +403,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
for (j = 0; j < n; j++)
{
SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
DBUG_PRINT("info", (" %d: %s\n", c->id, c->name));
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
DBUG_PRINT("info", (" %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));

View File

@ -0,0 +1,20 @@
--- vio/viosslfactories.c.orig 2019-11-26 16:53:45 UTC
+++ vio/viosslfactories.c
@@ -91,7 +91,7 @@ static DH *get_dh2048(void)
DH_free(dh);
return NULL;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
dh->p= p;
dh->g= g;
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
DBUG_RETURN(0);
if (!(ssl_fd->ssl_context= SSL_CTX_new(is_client ?
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
SSLv23_client_method() :
SSLv23_server_method()
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */

View File

@ -2,8 +2,8 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME?= mysql PORTNAME?= mysql
PORTVERSION= 5.6.45 PORTVERSION= 5.6.47
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-5.6 MASTER_SITES= MYSQL/MySQL-5.6
PKGNAMESUFFIX?= 56-server PKGNAMESUFFIX?= 56-server

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1565035854 TIMESTAMP = 1579257087
SHA256 (mysql-5.6.45.tar.gz) = 404d798974dd89aca4a19e67194b534eddc7508489982175978966360607aabb SHA256 (mysql-5.6.47.tar.gz) = 0919096705784c62af831bb607e99345083edd76967c8c65966728742a9127fe
SIZE (mysql-5.6.45.tar.gz) = 32525559 SIZE (mysql-5.6.47.tar.gz) = 32388152

View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 --- CMakeLists.txt.orig 2020-01-01 20:46:13.771078000 +0100
+++ CMakeLists.txt 2014-08-04 14:18:38.795491147 +0000 +++ CMakeLists.txt 2020-01-01 20:49:28.631677000 +0100
@@ -500,12 +500,10 @@ @@ -558,12 +558,10 @@ IF(UNIX)
ENDIF() ENDIF()
IF(NOT WITHOUT_SERVER) IF(NOT WITHOUT_SERVER)
@ -13,7 +13,7 @@
ENDIF(WITH_EMBEDDED_SERVER) ENDIF(WITH_EMBEDDED_SERVER)
ENDIF() ENDIF()
@@ -514,10 +512,7 @@ @@ -572,10 +570,7 @@ ENDIF()
ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(scripts)
IF(NOT WITHOUT_SERVER) IF(NOT WITHOUT_SERVER)
@ -24,18 +24,19 @@
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
ADD_SUBDIRECTORY(internal) ADD_SUBDIRECTORY(internal)
ENDIF() ENDIF()
@@ -572,6 +567,7 @@ @@ -634,6 +629,7 @@ ENDIF()
# #
# RPM installs documentation directly from the source tree # RPM installs documentation directly from the source tree
# #
+IF(FALSE) +IF(FALSE)
IF(NOT INSTALL_LAYOUT MATCHES "RPM") IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql INSTALL(FILES
DESTINATION ${INSTALL_DOCREADMEDIR} README
@@ -597,5 +593,6 @@ @@ -652,6 +648,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
PATTERN "mysql.info" EXCLUDE
PATTERN "sp-imp-spec.txt" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE
) )
ENDIF()
+ENDIF() +ENDIF()
ENDIF()
INCLUDE(CPack) INCLUDE(CPack)

View File

@ -1,302 +0,0 @@
diff --git extra/yassl/include/openssl/ssl.h extra/yassl/include/openssl/ssl.h
index 10fa4913b7e..ff6cb696661 100644
--- extra/yassl/include/openssl/ssl.h.orig
+++ extra/yassl/include/openssl/ssl.h
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -179,7 +179,7 @@ enum { /* X509 Constants */
unsigned long ERR_get_error_line_data(const char**, int*, const char**, int *);
void ERR_print_errors_fp(FILE*);
char* ERR_error_string(unsigned long,char*);
-void ERR_remove_state(unsigned long);
+void ERR_remove_thread_state(const void *);
unsigned long ERR_get_error(void);
unsigned long ERR_peek_error(void);
int ERR_GET_REASON(int);
diff --git extra/yassl/src/ssl.cpp extra/yassl/src/ssl.cpp
index 39244a01b92..c992d446487 100644
--- extra/yassl/src/ssl.cpp.orig
+++ extra/yassl/src/ssl.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1615,7 +1615,7 @@ int SSLeay_add_ssl_algorithms() // compatibility only
}
-void ERR_remove_state(unsigned long)
+void ERR_remove_thread_state(const void *)
{
GetErrors().Remove();
}
diff --git mysys_ssl/my_aes_openssl.cc mysys_ssl/my_aes_openssl.cc
index 261ba8ab732..a0f8c147c7a 100644
--- mysys_ssl/my_aes_openssl.cc.orig
+++ mysys_ssl/my_aes_openssl.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2014 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -122,33 +122,46 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length,
const unsigned char *key, uint32 key_length,
enum my_aes_opmode mode, const unsigned char *iv)
{
- EVP_CIPHER_CTX ctx;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX stack_ctx;
+ EVP_CIPHER_CTX *ctx= &stack_ctx;
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
const EVP_CIPHER *cipher= aes_evp_type(mode);
int u_len, f_len;
/* The real key to be used for encryption */
unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
my_aes_create_key(key, key_length, rkey, mode);
- if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
+ if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
- if (!EVP_EncryptInit(&ctx, cipher, rkey, iv))
+ if (!EVP_EncryptInit(ctx, cipher, rkey, iv))
goto aes_error; /* Error */
- if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
+ if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
goto aes_error; /* Error */
- if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length))
+ if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length))
goto aes_error; /* Error */
- if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len))
+ if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
- EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(ctx);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ EVP_CIPHER_CTX_free(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
return u_len + f_len;
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
- EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(ctx);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ EVP_CIPHER_CTX_free(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
return MY_AES_BAD_DATA;
}
@@ -159,7 +172,12 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
enum my_aes_opmode mode, const unsigned char *iv)
{
- EVP_CIPHER_CTX ctx;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX stack_ctx;
+ EVP_CIPHER_CTX *ctx= &stack_ctx;
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
const EVP_CIPHER *cipher= aes_evp_type(mode);
int u_len, f_len;
@@ -167,27 +185,34 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
my_aes_create_key(key, key_length, rkey, mode);
- if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
+ if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
- EVP_CIPHER_CTX_init(&ctx);
-
- if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv))
+ if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv))
goto aes_error; /* Error */
- if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
+ if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
goto aes_error; /* Error */
- if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length))
+ if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length))
goto aes_error; /* Error */
- if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len))
+ if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
- EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(ctx);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ EVP_CIPHER_CTX_free(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
return u_len + f_len;
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
- EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(ctx);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ EVP_CIPHER_CTX_free(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
return MY_AES_BAD_DATA;
}
diff --git sql-common/client.c sql-common/client.c
index 19faefe8323..f1192306ccb 100644
--- sql-common/client.c.orig
+++ sql-common/client.c
@@ -2744,7 +2744,11 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
goto error;
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
cn= (char *) ASN1_STRING_data(cn_asn1);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ cn= (char *) ASN1_STRING_get0_data(cn_asn1);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
// There should not be any NULL embedded in the CN
if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
diff --git sql/mysqld.cc sql/mysqld.cc
index 4acff4e4d9b..307778771be 100644
--- sql/mysqld.cc.orig
+++ sql/mysqld.cc
@@ -3408,7 +3408,11 @@ static int init_ssl()
{
#ifdef HAVE_OPENSSL
#ifndef HAVE_YASSL
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
CRYPTO_malloc_init();
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ OPENSSL_malloc_init();
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
#endif
ssl_start();
#ifndef EMBEDDED_LIBRARY
@@ -3434,7 +3438,9 @@ static int init_ssl()
opt_ssl_cipher, &error,
opt_ssl_crl, opt_ssl_crlpath, ssl_ctx_flags);
DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
- ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
if (!ssl_acceptor_fd)
{
/*
diff --git sql/rpl_slave.cc sql/rpl_slave.cc
index aee13e12cb2..37a20870bd4 100644
--- sql/rpl_slave.cc.orig
+++ sql/rpl_slave.cc
@@ -6026,7 +6026,9 @@ ignore_log_space_limit=%d",
mysql_mutex_unlock(&mi->run_lock);
DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end();
- ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
pthread_exit(0);
return(0); // Avoid compiler warnings
}
@@ -6256,7 +6258,9 @@ extern "C" void *handle_slave_worker(void *arg)
}
my_thread_end();
- ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
pthread_exit(0);
DBUG_RETURN(0);
}
@@ -7597,7 +7601,9 @@ llstr(rli->get_group_master_log_pos(), llbuff));
DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end();
- ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
pthread_exit(0);
return 0; // Avoid compiler warnings
}
diff --git vio/viossl.c vio/viossl.c
index 5622cb7ee92..f738570f832 100644
--- vio/viossl.c.orig
+++ vio/viossl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -419,7 +421,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
for (j = 0; j < n; j++)
{
SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DBUG_PRINT("info", (" %d: %s\n", c->id, c->name));
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ DBUG_PRINT("info", (" %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
}
}
#endif
diff --git vio/viosslfactories.c vio/viosslfactories.c
index f50678a37b3..d3891fd8b12 100644
--- vio/viosslfactories.c.orig
+++ vio/viosslfactories.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -121,13 +121,21 @@ static DH *get_dh2048(void)
DH *dh;
if ((dh=DH_new()))
{
- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
- if (! dh->p || ! dh->g)
- {
+ BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+ BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
+ if (!p || !g
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ || !DH_set0_pqg(dh, p, NULL, g)
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+ ) {
+ /* DH_free() will free 'p' and 'g' at once. */
DH_free(dh);
- dh=0;
+ return NULL;
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ dh->p= p;
+ dh->g= g;
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
}
return(dh);
}

View File

@ -1,11 +1,25 @@
--- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC --- cmake/ssl.cmake.orig 2019-11-26 16:53:45 UTC
+++ cmake/ssl.cmake +++ cmake/ssl.cmake
@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) @@ -189,13 +189,20 @@ MACRO (MYSQL_CHECK_SSL)
OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
)
ENDIF()
- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
+ IF(HAVE_TLS1_3_VERSION)
ADD_DEFINITIONS(-DHAVE_TLSv13)
ENDIF()
IF(OPENSSL_INCLUDE_DIR AND IF(OPENSSL_INCLUDE_DIR AND
OPENSSL_LIBRARY AND OPENSSL_LIBRARY AND
CRYPTO_LIBRARY AND CRYPTO_LIBRARY AND
- OPENSSL_MAJOR_VERSION STREQUAL "1" - OPENSSL_MAJOR_VERSION STREQUAL "1"
+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" + OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+ )
+ SET(OPENSSL_FOUND TRUE)
+ ELSEIF(OPENSSL_INCLUDE_DIR AND
+ OPENSSL_LIBRARY AND
+ CRYPTO_LIBRARY AND
+ OPENSSL_MAJOR_VERSION STREQUAL "2"
) )
SET(OPENSSL_FOUND TRUE) SET(OPENSSL_FOUND TRUE)
ELSE() ELSE()

View File

@ -1,15 +1,15 @@
--- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200 --- libmysql/CMakeLists.txt.orig 2020-01-01 21:38:55.670126000 +0100
+++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200 +++ libmysql/CMakeLists.txt 2020-01-01 21:47:51.799099000 +0100
@@ -173,7 +173,7 @@ @@ -205,7 +205,7 @@ IF(WIN32)
ENDIF() ENDIF()
# Merge several convenience libraries into one big mysqlclient # Merge several convenience libraries into one big mysqlclient
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
# Visual Studio users need debug static library for debug projects # Visual Studio users need debug static library for debug projects
IF(MSVC) @@ -234,20 +234,23 @@ IF(UNIX)
@@ -200,19 +200,22 @@
ENDMACRO() ENDMACRO()
ENDIF() ENDIF()
@ -25,15 +25,16 @@
IF(NOT DISABLE_SHARED) IF(NOT DISABLE_SHARED)
# Merge several convenience libraries into one big mysqlclient # Merge several convenience libraries into one big mysqlclient
# and link them together into shared library. # and link them together into shared library.
MERGE_LIBRARIES(libmysql SHARED ${LIBS} MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
EXPORTS ${CLIENT_API_FUNCTIONS} EXPORTS ${CLIENT_API_FUNCTIONS}
- COMPONENT SharedLibraries) - COMPONENT SharedLibraries)
+ COMPONENT SharedLibraries NOINSTALL) + COMPONENT SharedLibraries NOINSTALL)
+ IF(FALSE) TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
+ IF(FALSE)
IF(UNIX) IF(UNIX)
# libtool compatability # libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -271,4 +274,5 @@ @@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED)
${INSTALL_LIBDIR} SharedLibraries) ${INSTALL_LIBDIR} SharedLibraries)
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()

View File

@ -0,0 +1,74 @@
--- mysys_ssl/my_aes_openssl.cc.orig 2019-11-26 16:53:45 UTC
+++ mysys_ssl/my_aes_openssl.cc
@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
const unsigned char *key, uint32 key_length,
enum my_aes_opmode mode, const unsigned char *iv)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX stack_ctx;
EVP_CIPHER_CTX *ctx= &stack_ctx;
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_init(ctx);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
const unsigned char *key, uint32 key_length,
enum my_aes_opmode mode, const unsigned char *iv)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX stack_ctx;
EVP_CIPHER_CTX *ctx= &stack_ctx;
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_init(ctx);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);
@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX_cleanup(ctx);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_CIPHER_CTX_free(ctx);

View File

@ -0,0 +1,15 @@
--- sql-common/client.c.orig 2019-11-26 16:53:45 UTC
+++ sql-common/client.c
@@ -1980,7 +1980,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
goto error;
}
- cn= (char *) ASN1_STRING_data(cn_asn1);
+#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);
+#endif
// There should not be any NULL embedded in the CN
if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))

View File

@ -0,0 +1,65 @@
--- sql/mysqld.cc.orig 2019-11-26 16:53:45 UTC
+++ sql/mysqld.cc
@@ -1258,7 +1258,7 @@ char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ss
*opt_ssl_crlpath= NULL;
#ifdef HAVE_OPENSSL
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#include <openssl/crypto.h>
typedef struct CRYPTO_dynlock_value
{
@@ -2029,7 +2029,7 @@ static void clean_up_mutexes()
mysql_mutex_destroy(&LOCK_connection_count);
#ifdef HAVE_OPENSSL
mysql_mutex_destroy(&LOCK_des_key_file);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
for (int i= 0; i < CRYPTO_num_locks(); ++i)
mysql_rwlock_destroy(&openssl_stdlocks[i].lock);
OPENSSL_free(openssl_stdlocks);
@@ -2768,7 +2768,7 @@ bool one_thread_per_connection_end(THD *thd, bool bloc
// Clean up errors now, before possibly waiting for a new connection.
#ifndef EMBEDDED_LIBRARY
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_thread_state(0);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
#endif
@@ -4252,7 +4252,7 @@ static int init_thread_environment()
#ifdef HAVE_OPENSSL
mysql_mutex_init(key_LOCK_des_key_file,
&LOCK_des_key_file, MY_MUTEX_INIT_FAST);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
openssl_stdlocks= (openssl_lock_t*) OPENSSL_malloc(CRYPTO_num_locks() *
sizeof(openssl_lock_t));
for (int i= 0; i < CRYPTO_num_locks(); ++i)
@@ -4301,7 +4301,7 @@ static int init_thread_environment()
OpenSSL 1.1 supports native platform threads,
so we don't need the following callback functions.
*/
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
static unsigned long openssl_id_function()
{
@@ -4375,7 +4375,7 @@ static void openssl_lock(int mode, openssl_lock_t *loc
static int init_ssl()
{
#ifdef HAVE_OPENSSL
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
CRYPTO_malloc_init();
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
OPENSSL_malloc_init();
@@ -4392,7 +4392,7 @@ static int init_ssl()
opt_ssl_cipher, &error,
opt_ssl_crl, opt_ssl_crlpath);
DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_thread_state(0);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
if (!ssl_acceptor_fd)

View File

@ -0,0 +1,11 @@
--- vio/vio.c.orig 2019-11-26 16:53:45 UTC
+++ vio/vio.c
@@ -394,7 +394,7 @@ void vio_end(void)
{
#if defined(HAVE_OPENSSL)
// This one is needed on the client side
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_thread_state(0);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
ERR_free_strings();

View File

@ -0,0 +1,11 @@
--- vio/viossl.c.orig 2019-11-26 16:53:45 UTC
+++ vio/viossl.c
@@ -403,7 +403,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
for (j = 0; j < n; j++)
{
SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
DBUG_PRINT("info", (" %d: %s\n", c->id, c->name));
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
DBUG_PRINT("info", (" %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));

View File

@ -0,0 +1,20 @@
--- vio/viosslfactories.c.orig 2019-11-26 16:53:45 UTC
+++ vio/viosslfactories.c
@@ -91,7 +91,7 @@ static DH *get_dh2048(void)
DH_free(dh);
return NULL;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
dh->p= p;
dh->g= g;
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
DBUG_RETURN(0);
if (!(ssl_fd->ssl_context= SSL_CTX_new(is_client ?
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
SSLv23_client_method() :
SSLv23_server_method()
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */

View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= mysql PORTNAME= mysql
PORTREVISION= 1 PORTREVISION= 0
PKGNAMESUFFIX= 57-client PKGNAMESUFFIX= 57-client
COMMENT= Multithreaded SQL database (client) COMMENT= Multithreaded SQL database (client)

View File

@ -2,8 +2,8 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME?= mysql PORTNAME?= mysql
PORTVERSION= 5.7.28 PORTVERSION= 5.7.29
PORTREVISION= 2 PORTREVISION= 0
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-5.7 MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server PKGNAMESUFFIX?= 57-server

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1574613665 TIMESTAMP = 1579122971
SHA256 (mysql-boost-5.7.28.tar.gz) = f16399315212117c08f9bdf8a0d682728b2ce82d691bcfbf25a770f413b6f2da SHA256 (mysql-boost-5.7.29.tar.gz) = 00f514124de2bad1ba7b380cbbd46e316cae7fc7bc3a5621456cabf352f27978
SIZE (mysql-boost-5.7.28.tar.gz) = 51409668 SIZE (mysql-boost-5.7.29.tar.gz) = 51417554

View File

@ -1,16 +1,18 @@
--- libmysql/authentication_ldap/CMakeLists.txt.orig 2018-10-04 05:48:22 UTC --- libmysql/authentication_ldap/CMakeLists.txt.orig 2020-01-16 09:39:09.585385000 +0100
+++ libmysql/authentication_ldap/CMakeLists.txt +++ libmysql/authentication_ldap/CMakeLists.txt 2020-01-16 09:41:59.054985000 +0100
@@ -106,11 +106,13 @@ ELSE() @@ -47,6 +47,7 @@ IF(NOT WIN32 AND NOT HAVE_LBER_H)
CROAK_AND_RETURN("Required LBER header is missing.")
ENDIF() ENDIF()
MESSAGE(STATUS "SASL_LIBRARY = ${SASL_LIBRARY}")
+IF (WITH_AUTHENTICATION_LDAP) +IF (WITH_AUTHENTICATION_LDAP)
MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
auth_ldap_sasl_client.cc log_client.cc auth_ldap_sasl_client.cc
LINK_LIBRARIES ${SASL_LIBRARY} log_client.cc
CLIENT_ONLY MODULE_ONLY @@ -57,6 +58,7 @@ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") CLIENT_ONLY
MODULE_ONLY
MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
+ENDIF () +ENDIF ()
IF(WIN32) # The plugin may need symbols which are not loaded by the client.
GET_FILENAME_COMPONENT(SASL_DLL_NAME ${SASL_LIBRARY_DLL} NAME) IF(STATIC_SASL_LIBRARY)

View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= mysql PORTNAME= mysql
PORTREVISION= 1 PORTREVISION= 0
PKGNAMESUFFIX= 80-client PKGNAMESUFFIX= 80-client
COMMENT= Multithreaded SQL database (client) COMMENT= Multithreaded SQL database (client)
@ -12,7 +12,7 @@ LICENSE+= LGPL21
MASTERDIR= ${.CURDIR}/../mysql80-server MASTERDIR= ${.CURDIR}/../mysql80-server
PKGMESSAGE= ${.CURDIR}/pkg-message PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${.CURDIR}/files PATCHDIR= ${MASTERDIR}/files
PLIST= ${.CURDIR}/pkg-plist PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql8[1-9]-client-* \ CONFLICTS_INSTALL= mysql8[1-9]-client-* \
@ -24,12 +24,22 @@ CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
USE_LDCONFIG+= ${PREFIX}/lib/mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql
MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
CLIENT_ONLY= yes CLIENT_ONLY= yes
OPTIONS_GROUP+= PLUGINS
PLUGINS_DESC= Default Client Plugins
OPTIONS_GROUP_PLUGINS= SASLCLIENT
SASLCLIENT_DESC= SASL client plugin module
SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
SASLCLIENT_USE= OPENLDAP=yes
OPTIONS_DEFAULT+= SASLCLIENT
OPTIONS_SUB= yes
# issue 166367: adding symlinks for back-compatibility with ${lib}_r # issue 166367: adding symlinks for back-compatibility with ${lib}_r
post-install: post-install:
@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a

View File

@ -1,35 +0,0 @@
--- CMakeLists.txt.orig 2019-01-21 18:42:44 UTC
+++ CMakeLists.txt
@@ -1011,6 +1011,7 @@ ADD_SUBDIRECTORY(extra/regex)
ADD_SUBDIRECTORY(libmysql)
ADD_SUBDIRECTORY(libbinlogevents)
ADD_SUBDIRECTORY(libbinlogstandalone)
+ADD_SUBDIRECTORY(support-files)
IF(NOT WITHOUT_SERVER)
SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
@@ -1146,12 +1147,13 @@ ENDIF()
ADD_SUBDIRECTORY(packaging/WiX)
ADD_SUBDIRECTORY(packaging/solaris)
-IF(UNIX)
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
-ENDIF()
+#IF(UNIX)
+# INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
+#ENDIF()
#
# RPM installs documentation directly from the source tree
#
+IF(FALSE)
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
@@ -1170,6 +1172,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
PATTERN "README.build" EXCLUDE
)
ENDIF()
+ENDIF()
# Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
# we can safely enable ASan on Clang/Win32 if needed.

View File

@ -1,39 +0,0 @@
--- client/CMakeLists.txt.orig 2019-04-13 13:46:31.000000000 +0200
+++ client/CMakeLists.txt 2019-04-30 00:27:10.627236000 +0200
@@ -35,10 +35,12 @@
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
ENDIF(UNIX)
+IF(FALSE)
IF(NOT WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base)
ENDIF()
+ENDIF()
SET(MYSQLTEST_SRC
mysqltest/error_names.cc
@@ -49,10 +51,12 @@
mysqltest/utils.cc
)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test)
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
TARGET_LINK_LIBRARIES(mysqltest mysqlclient)
ADD_DEPENDENCIES(mysqltest GenError GenClientError)
+ENDIF()
ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc)
TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
@@ -108,8 +112,10 @@
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)

View File

@ -1,14 +0,0 @@
--- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC
+++ cmake/ssl.cmake
@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL)
OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
)
ENDIF()
IF(OPENSSL_INCLUDE_DIR AND
OPENSSL_LIBRARY AND
CRYPTO_LIBRARY AND
- OPENSSL_MAJOR_VERSION STREQUAL "1"
+ (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "2")
)
SET(OPENSSL_FOUND TRUE)
FIND_PROGRAM(OPENSSL_EXECUTABLE openssl

View File

@ -1,176 +0,0 @@
--- include/CMakeLists.txt.orig 2017-09-21 15:51:58 UTC
+++ include/CMakeLists.txt
@@ -30,11 +30,173 @@ SET(HEADERS
${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
field_types.h
+ base64.h
+ big_endian.h
+ c_string_less.h
+ crypt_genhash_impl.h
+ decimal.h
+ depth_first_search.h
+ dur_prop.h
+ errmsg.h
+ ft_global.h
+ heap.h
+ keycache.h
+ lex_string.h
+ lf.h
+ little_endian.h
+ m_ctype.h
+ m_string.h
+ map_helpers.h
+ mf_wcomp.h
+ mutex_lock.h
+ my_aes.h
+ my_alloc.h
+ my_atomic.h
+ my_base.h
+ my_bit.h
+ my_bitmap.h
+ my_byteorder.h
+ my_check_opt.h
+ my_command.h
+ my_compare.h
+ my_compare.h.orig
+ my_compiler.h
+ my_dbug.h
+ my_default.h
+ my_dir.h
+ my_double2ulonglong.h
+ my_getopt.h
+ my_hash_combine.h
+ my_icp.h
+ my_inttypes.h
+ my_io.h
+ my_list.h
+ my_loglevel.h
+ my_macros.h
+ my_md5.h
+ my_md5_size.h
+ my_murmur3.h
+ my_pointer_arithmetic.h
+ my_psi_config.h
+ my_rapidjson_size_t.h
+ my_rdtsc.h
+ my_rnd.h
+ my_sharedlib.h
+ my_shm_defaults.h
+ my_sqlcommand.h
+ my_stacktrace.h
+ my_sys.h
+ my_systime.h
+ my_table_map.h
+ my_thread.h
+ my_thread_local.h
+ my_thread_os_id.h
+ my_time.h
+ my_timer.h
+ my_tree.h
+ my_uctype.h
+ my_user.h
+ my_xml.h
+ myisam.h
+ myisammrg.h
+ myisampack.h
+ mysql.h
+ mysql.h.pp
+ mysql_com.h
+ mysql_com_server.h
+ mysql_time.h
+ mysql_version.h.in
+ mysys_err.h
+ nullable.h
+ password.h
+ pfs_cond_provider.h
+ pfs_error_provider.h
+ pfs_file_provider.h
+ pfs_idle_provider.h
+ pfs_memory_provider.h
+ pfs_metadata_provider.h
+ pfs_mutex_provider.h
+ pfs_rwlock_provider.h
+ pfs_socket_provider.h
+ pfs_stage_provider.h
+ pfs_statement_provider.h
+ pfs_table_provider.h
+ pfs_thread_provider.h
+ pfs_transaction_provider.h
+ prealloced_array.h
+ print_version.h
+ priority_queue.h
+ rwlock_scoped_lock.h
+ scope_guard.h
+ service_versions.h
+ sha1.h
+ sha2.h
+ sql_chars.h
+ sql_common.h
+ sql_string.h
+ sslopt-case.h
+ sslopt-longopts.h
+ sslopt-vars.h
+ template_utils.h
+ thr_cond.h
+ thr_lock.h
+ thr_mutex.h
+ thr_rwlock.h
+ typelib.h
+ varlen_sort.h
+ violite.h
+ welcome_copyright_notice.h
)
SET(HEADERS_MYSQL_DIR
mysql/client_plugin.h
mysql/plugin_auth_common.h
mysql/udf_registration_types.h
+ mysql/client_authentication.h
+ mysql/client_plugin.h.pp
+ mysql/com_data.h
+ mysql/get_password.h
+ mysql/group_replication_priv.h
+ mysql/innodb_priv.h
+ mysql/mysql_lex_string.h
+ mysql/plugin.h
+ mysql/plugin_audit.h
+ mysql/plugin_audit.h.pp
+ mysql/plugin_auth.h
+ mysql/plugin_auth.h.pp
+ mysql/plugin_auth_common.h
+ mysql/plugin_ftparser.h
+ mysql/plugin_ftparser.h.pp
+ mysql/plugin_group_replication.h
+ mysql/plugin_keyring.h
+ mysql/plugin_keyring.h.pp
+ mysql/plugin_query_rewrite.h
+ mysql/plugin_trace.h
+ mysql/plugin_validate_password.h
+ mysql/service_command.h
+ mysql/service_locking.h
+ mysql/service_my_plugin_log.h
+ mysql/service_mysql_alloc.h
+ mysql/service_mysql_keyring.h
+ mysql/service_mysql_password_policy.h
+ mysql/service_mysql_string.h
+ mysql/service_parser.h
+ mysql/service_plugin_registry.h
+ mysql/service_rpl_transaction_ctx.h
+ mysql/service_rpl_transaction_write_set.h
+ mysql/service_rules_table.h
+ mysql/service_security_context.h
+ mysql/service_srv_session.h
+ mysql/service_srv_session_info.h
+ mysql/service_ssl_wrapper.h
+ mysql/service_thd_alloc.h
+ mysql/service_thd_engine_lock.h
+ mysql/service_thd_wait.h
+ mysql/service_thread_scheduler.h
+ mysql/services.h
+ mysql/services.h.pp
+ mysql/thread_pool_priv.h
+ mysql/thread_type.h
+ mysql/udf_registration_types.h
)
INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)

View File

@ -1,11 +0,0 @@
--- include/my_compare.h.orig 2018-04-08 06:44:49 UTC
+++ include/my_compare.h
@@ -49,7 +49,7 @@
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
*/
-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
#define HA_MAX_KEY_SEG 16 /* Max segments for key */
#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24 + 6 + 6)

View File

@ -1,11 +0,0 @@
--- include/myisam.h.orig 2018-04-08 06:44:49 UTC
+++ include/myisam.h
@@ -59,7 +59,7 @@
The following defines can be increased if necessary.
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
*/
-#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
#define MI_MAX_KEY_SEG 16 /* Max segments for key */
#define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH + MI_MAX_KEY_SEG * 6 + 8 + 8)

View File

@ -1,23 +0,0 @@
--- libmysql/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC
+++ libmysql/CMakeLists.txt
@@ -181,6 +181,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
)
ENDIF()
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC")
+ENDIF()
+
#
# Include protocol tracing infrastructure and the test
# trace plugin if enabled by build options.
@@ -254,7 +258,7 @@ IF(NOT DISABLE_SHARED)
COMPONENT SharedLibraries)
IF(UNIX)
# libtool compatability
- IF(FREEBSD OR APPLE)
+ IF(FREEBSD OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly")
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
ELSE()
SET(OS_SHARED_LIB_VERSION

View File

@ -1,13 +0,0 @@
--- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC
+++ man/CMakeLists.txt
@@ -22,10 +22,6 @@
# Copy man pages
FILE(GLOB MAN1 *.1)
-FILE(GLOB MAN1_NDB ndb*.1)
-FILE(GLOB MAN1_ROUTER mysqlrouter*.1)
-FILE(GLOB MAN8 *.8)
-FILE(GLOB MAN8_NDB ndb*.8)
IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)
LIST(REMOVE_ITEM MAN1 ${MAN1_NDB})
ENDIF()

View File

@ -1,11 +0,0 @@
--- mysys/my_md5.cc.orig 2018-04-08 06:44:49 UTC
+++ mysys/my_md5.cc
@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d
int compute_md5_hash(char *digest, const char *buf, int len) {
int retval = 0;
int fips_mode = 0;
-#if !defined(HAVE_WOLFSSL)
+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
fips_mode = FIPS_mode();
#endif /* HAVE_WOLFSSL */
/* If fips mode is ON/STRICT restricted method calls will result into abort,

View File

@ -1,37 +0,0 @@
--- plugin/x/client/xconnection_impl.cc.orig 2018-04-08 06:44:49 UTC
+++ plugin/x/client/xconnection_impl.cc
@@ -182,12 +182,12 @@ XError ssl_verify_server_cert(Vio *vio,
return XError{CR_SSL_CONNECTION_ERROR, "Failed to get CN from CN entry"};
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
- const auto cn = reinterpret_cast<char *>(ASN1_STRING_data(cn_asn1));
-#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
const auto cn =
reinterpret_cast<const char *>(ASN1_STRING_get0_data(cn_asn1));
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+#else
+ const auto cn = reinterpret_cast<char *>(ASN1_STRING_data(cn_asn1));
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
const auto cn_len = static_cast<size_t>(ASN1_STRING_length(cn_asn1));
// There should not be any NULL embedded in the CN
@@ -451,7 +451,7 @@ XError Connection_impl::get_ssl_error(co
return XError(CR_SSL_CONNECTION_ERROR, buffer);
}
-#ifndef HAVE_WOLFSSL
+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
/**
Set fips mode in openssl library,
When we set fips mode ON/STRICT, it will perform following operations:
@@ -501,7 +501,7 @@ XError Connection_impl::activate_tls() {
if (!m_context->m_ssl_config.is_configured())
return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED};
-#ifndef HAVE_WOLFSSL
+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
if (set_fips_mode((int)m_context->m_ssl_config.m_ssl_fips_mode, err_string) !=
1) {

View File

@ -1,73 +0,0 @@
--- scripts/CMakeLists.txt.orig 2018-10-07 08:44:22 UTC
+++ scripts/CMakeLists.txt
@@ -80,6 +80,7 @@ ELSE()
MESSAGE(FATAL_ERROR "Cannot concatenate files")
ENDIF()
+IF(FALSE)
# Build mysql_fix_privilege_tables.h
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
@@ -100,6 +101,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
)
+ENDIF()
# If we do not have performance schema compiled in then sys will not work,
# so only create an empty sys database with an auto-generated file,
@@ -204,6 +206,7 @@ IF(NOT WITHOUT_SERVER)
)
ENDIF()
+IF(FALSE)
IF(UNIX)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
@@ -211,6 +214,7 @@ IF(UNIX)
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
)
ENDIF()
+ENDIF()
# TCMalloc hacks
IF(MALLOC_LIB)
@@ -364,7 +368,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
FOREACH(lib ${${target}_LIB_DEPENDS})
# Filter out "general", it is not a library, just CMake hint
- IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ")
+ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")
IF (lib MATCHES "^\\-l")
SET(${var} "${${var}} ${lib} ")
ELSEIF(lib MATCHES "^/")
@@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
SET(${var} "${${var}}-l${lib} " )
+ ELSEIF(lib STREQUAL "-pthread")
+ SET(${var} "${${var}}-pthread " )
ELSE()
SET(${var} "${${var}}-l${lib} " )
ENDIF()
@@ -454,19 +460,7 @@ ELSE()
# On Unix, most of the files end up in the bin directory
SET(mysql_config_COMPONENT COMPONENT Development)
- IF(WITH_SYSTEMD)
- SET(BIN_SCRIPTS
- mysql_config
- mysqldumpslow
- )
- ELSE()
- SET(BIN_SCRIPTS
- mysql_config
- mysqldumpslow
- mysqld_multi
- mysqld_safe
- )
- ENDIF()
+ SET(BIN_SCRIPTS mysql_config)
SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")

View File

@ -1,27 +0,0 @@
--- share/CMakeLists.txt.orig 2017-10-03 10:54:31 UTC
+++ share/CMakeLists.txt
@@ -45,6 +45,7 @@ SET(files
dictionary.txt
)
+IF (FALSE)
FOREACH (dir ${dirs})
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir}
DESTINATION ${INSTALL_MYSQLSHAREDIR}
@@ -57,13 +58,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE
COMPONENT Server
PATTERN "languages.html" EXCLUDE
)
+ENDIF()
# Don't copy if we're building in-source.
IF (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
CONFIGURE_FILE(dictionary.txt ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/dictionary.txt)
ENDIF()
+IF (FALSE)
INSTALL(FILES ${files}
DESTINATION ${INSTALL_MYSQLSHAREDIR}
COMPONENT Server
)
+ENDIF()

View File

@ -1,11 +0,0 @@
--- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC
+++ sql-common/client.cc
@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql,
#endif
break;
case MYSQL_OPT_SSL_FIPS_MODE: {
-#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL)
+#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
ENSURE_EXTENSIONS_PRESENT(&mysql->options);
mysql->options.extension->ssl_fips_mode = *(uint *)arg;

View File

@ -1,11 +0,0 @@
--- sql/auth/sha2_password_common.cc.orig 2018-05-06 18:47:55 UTC
+++ sql/auth/sha2_password_common.cc
@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsi
DBUG_RETURN(true);
}
m_ok = EVP_DigestFinal_ex(md_context, m_digest, NULL);
-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_MD_CTX_cleanup(md_context);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_MD_CTX_reset(md_context);

View File

@ -1,11 +0,0 @@
--- sql/mysqld.cc.orig 2018-05-06 19:15:48 UTC
+++ sql/mysqld.cc
@@ -4321,7 +4321,7 @@ static void init_ssl() {
static void init_ssl() {
#ifdef HAVE_OPENSSL
-#if !defined(HAVE_WOLFSSL) && !defined(__sun)
+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(__sun)
#if defined(HAVE_PSI_MEMORY_INTERFACE)
static PSI_memory_info all_openssl_memory[] = {
{&key_memory_openssl, "openssl_malloc", 0, 0,

Some files were not shown because too many files have changed in this diff Show More