Browse Source

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lang/swi-pl/Makefile (unresolved)
master
Shawn Webb 1 month ago
parent
commit
247aff8cd3
100 changed files with 143 additions and 3205 deletions
  1. +4
    -0
      MOVED
  2. +1
    -1
      archivers/zoo/Makefile
  3. +14
    -0
      archivers/zoo/files/patch-zoodel.c
  4. +14
    -0
      archivers/zoo/files/patch-zoopack.c
  5. +1
    -1
      audio/jamulus/Makefile
  6. +3
    -3
      audio/jamulus/distinfo
  7. +3
    -8
      audio/kid3-qt5/Makefile
  8. +3
    -3
      audio/kid3-qt5/distinfo
  9. +7
    -7
      audio/kid3-qt5/files/patch-src_app_kde_kdemainwindow.cpp
  10. +35
    -0
      audio/kid3-qt5/files/patch-src_plugins_oggflacmetadata_CMakeLists.txt
  11. +7
    -7
      audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp
  12. +49
    -4
      audio/kid3-qt5/pkg-plist
  13. +1
    -1
      biology/bamtools/Makefile
  14. +1
    -1
      converters/cl-babel-sbcl/Makefile
  15. +0
    -4
      databases/Makefile
  16. +0
    -14
      databases/mariadb101-client/Makefile
  17. +0
    -27
      databases/mariadb101-client/files/patch-CMakeLists.txt
  18. +0
    -58
      databases/mariadb101-client/files/patch-client_CMakeLists.txt
  19. +0
    -31
      databases/mariadb101-client/files/patch-cmake_ssl.cmake
  20. +0
    -34
      databases/mariadb101-client/files/patch-extra_CMakeLists.txt
  21. +0
    -22
      databases/mariadb101-client/files/patch-include_CMakeLists.txt
  22. +0
    -11
      databases/mariadb101-client/files/patch-include_my__compare.h
  23. +0
    -14
      databases/mariadb101-client/files/patch-include_mysql_service__encryption.h
  24. +0
    -11
      databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt
  25. +0
    -9
      databases/mariadb101-client/files/patch-libservices_CMakeLists.txt
  26. +0
    -16
      databases/mariadb101-client/files/patch-man_CMakeLists.txt
  27. +0
    -60
      databases/mariadb101-client/files/patch-mysys_my__default.c
  28. +0
    -11
      databases/mariadb101-client/files/patch-pcre_CMakeLists.txt
  29. +0
    -64
      databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
  30. +0
    -12
      databases/mariadb101-client/files/patch-scripts_mysql__config.sh
  31. +0
    -14
      databases/mariadb101-client/files/patch-sql_CMakeLists.txt
  32. +0
    -34
      databases/mariadb101-client/files/patch-support-files_CMakeLists.txt
  33. +0
    -9
      databases/mariadb101-client/files/pkg-message.in
  34. +0
    -121
      databases/mariadb101-client/pkg-plist
  35. +0
    -224
      databases/mariadb101-server/Makefile
  36. +0
    -3
      databases/mariadb101-server/distinfo
  37. +0
    -11
      databases/mariadb101-server/files/extra-patch-include_my__compare.h
  38. +0
    -140
      databases/mariadb101-server/files/mysql-server.in
  39. +0
    -26
      databases/mariadb101-server/files/patch-CMakeLists.txt
  40. +0
    -46
      databases/mariadb101-server/files/patch-MDEV-15961
  41. +0
    -72
      databases/mariadb101-server/files/patch-client_CMakeLists.txt
  42. +0
    -31
      databases/mariadb101-server/files/patch-cmake_ssl.cmake
  43. +0
    -13
      databases/mariadb101-server/files/patch-extra_CMakeLists.txt
  44. +0
    -26
      databases/mariadb101-server/files/patch-include_CMakeLists.txt
  45. +0
    -41
      databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt
  46. +0
    -11
      databases/mariadb101-server/files/patch-libservices_CMakeLists.txt
  47. +0
    -14
      databases/mariadb101-server/files/patch-man_CMakeLists.txt
  48. +0
    -20
      databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
  49. +0
    -60
      databases/mariadb101-server/files/patch-mysys_my__default.c
  50. +0
    -40
      databases/mariadb101-server/files/patch-oqgraph-MDEV-15291
  51. +0
    -13
      databases/mariadb101-server/files/patch-pcre_CMakeLists.txt
  52. +0
    -12
      databases/mariadb101-server/files/patch-scripts_mysql__config.sh
  53. +0
    -24
      databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh
  54. +0
    -11
      databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh
  55. +0
    -30
      databases/mariadb101-server/files/patch-sql_CMakeLists.txt
  56. +0
    -52
      databases/mariadb101-server/files/patch-sql_sql__trigger.cc
  57. +0
    -65
      databases/mariadb101-server/files/patch-sql_sql__view.cc
  58. +0
    -40
      databases/mariadb101-server/files/patch-sql_sys__vars.cc
  59. +0
    -11
      databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt
  60. +0
    -15
      databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
  61. +0
    -12
      databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt
  62. +0
    -11
      databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
  63. +0
    -36
      databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
  64. +0
    -16
      databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
  65. +0
    -14
      databases/mariadb101-server/files/patch-support-files_CMakeLists.txt
  66. +0
    -17
      databases/mariadb101-server/files/pkg-message.in
  67. +0
    -14
      databases/mariadb101-server/pkg-descr
  68. +0
    -271
      databases/mariadb101-server/pkg-plist
  69. +0
    -14
      databases/mariadb102-client/Makefile
  70. +0
    -27
      databases/mariadb102-client/files/patch-CMakeLists.txt
  71. +0
    -11
      databases/mariadb102-client/files/patch-MDEV-20463
  72. +0
    -62
      databases/mariadb102-client/files/patch-client_CMakeLists.txt
  73. +0
    -35
      databases/mariadb102-client/files/patch-extra_CMakeLists.txt
  74. +0
    -17
      databases/mariadb102-client/files/patch-include_CMakeLists.txt
  75. +0
    -11
      databases/mariadb102-client/files/patch-include_my__compare.h
  76. +0
    -14
      databases/mariadb102-client/files/patch-include_mysql_service__encryption.h
  77. +0
    -16
      databases/mariadb102-client/files/patch-man_CMakeLists.txt
  78. +0
    -52
      databases/mariadb102-client/files/patch-mysys_my__default.c
  79. +0
    -49
      databases/mariadb102-client/files/patch-scripts_CMakeLists.txt
  80. +0
    -12
      databases/mariadb102-client/files/patch-scripts_mysql__config.sh
  81. +0
    -33
      databases/mariadb102-client/files/patch-support-files_CMakeLists.txt
  82. +0
    -9
      databases/mariadb102-client/files/pkg-message.in
  83. +0
    -93
      databases/mariadb102-client/pkg-plist
  84. +0
    -243
      databases/mariadb102-server/Makefile
  85. +0
    -3
      databases/mariadb102-server/distinfo
  86. +0
    -11
      databases/mariadb102-server/files/extra-patch-include_my__compare.h
  87. +0
    -140
      databases/mariadb102-server/files/mysql-server.in
  88. +0
    -27
      databases/mariadb102-server/files/patch-CMakeLists.txt
  89. +0
    -47
      databases/mariadb102-server/files/patch-MDEV-15961
  90. +0
    -13
      databases/mariadb102-server/files/patch-MDEV-20248
  91. +0
    -16
      databases/mariadb102-server/files/patch-extra_CMakeLists.txt
  92. +0
    -10
      databases/mariadb102-server/files/patch-extra_mariabackup_CMakeLists.txt
  93. +0
    -38
      databases/mariadb102-server/files/patch-include_CMakeLists.txt
  94. +0
    -11
      databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt
  95. +0
    -15
      databases/mariadb102-server/files/patch-libmariadb_include_CMakeLists.txt
  96. +0
    -14
      databases/mariadb102-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
  97. +0
    -31
      databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
  98. +0
    -11
      databases/mariadb102-server/files/patch-libservices_CMakeLists.txt
  99. +0
    -14
      databases/mariadb102-server/files/patch-man_CMakeLists.txt
  100. +0
    -52
      databases/mariadb102-server/files/patch-mysys_my__default.c

+ 4
- 0
MOVED View File

@@ -15145,3 +15145,7 @@ www/py-dj22-jsonfield2|www/py-jsonfield2|2020-06-30|Has expired: Obsolete, pleas
www/py-dj22-swapper|www/py-swapper|2020-06-30|Has expired: Obsolete, please use www/py-swapper instead
www/rubygem-heroics00|www/rubygem-heroics|2020-06-30|Has expired: Use www/rubygem-heroics instead
www/typo3-8|www/typo3-9|2020-06-30|Has expired: Upstream support ended in April 2020
databases/mariadb101-client|databases/mariadb103-client|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version
databases/mariadb101-server|databases/mariadb103-server|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version
databases/mariadb102-server|databases/mariadb103-server|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version
databases/mariadb102-client|databases/mariadb103-client|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version

+ 1
- 1
archivers/zoo/Makefile View File

@@ -3,7 +3,7 @@

PORTNAME= zoo
PORTVERSION= 2.10.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/ \
LOCAL/ehaupt

+ 14
- 0
archivers/zoo/files/patch-zoodel.c View File

@@ -0,0 +1,14 @@
--- zoodel.c.orig 1991-07-16 15:58:46 UTC
+++ zoodel.c
@@ -138,7 +138,11 @@ if (*option == 'g') {
/* read archive header */
frd_zooh (&zoo_header, zoo_file);
+#ifdef __LP64__
+ if ((int)(zoo_header.zoo_start + zoo_header.zoo_minus) != 0)
+#else
if ((zoo_header.zoo_start + zoo_header.zoo_minus) != 0L)
+#endif
prterror ('f', failed_consistency);
if (ver_too_high (&zoo_header))
prterror ('f', wrong_version, zoo_header.major_ver, zoo_header.minor_ver);

+ 14
- 0
archivers/zoo/files/patch-zoopack.c View File

@@ -0,0 +1,14 @@
--- zoopack.c.orig 1993-05-01 03:59:21 UTC
+++ zoopack.c
@@ -139,7 +139,11 @@ if (zoo_file == NOFILE)
/* Read the header of the old archive. */
frd_zooh(&old_zoo_header, zoo_file);
+#ifdef __LP64__
+if ((int)(old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0) {
+#else
if ((old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0L) {
+#endif
prterror ('w', failed_consistency);
++bad_header; /* remember for future error message */
}

+ 1
- 1
audio/jamulus/Makefile View File

@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= jamulus
DISTVERSION= 3.5.5
DISTVERSION= 3.5.7
CATEGORIES= audio
MASTER_SITES= SF/llcon/${NAME}/${DISTVERSION}/
DISTNAME= ${NAME}-${PORTVERSION}

+ 3
- 3
audio/jamulus/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1590566034
SHA256 (Jamulus-3.5.5.tar.gz) = 711fe59a54abecb76900e422261e33971b392386a86ab38c386a01511274507b
SIZE (Jamulus-3.5.5.tar.gz) = 1699201
TIMESTAMP = 1593541957
SHA256 (Jamulus-3.5.7.tar.gz) = 2791c582fadb308cd8c9c5b78896ed53145381ec66daddae8aa2076528d7a918
SIZE (Jamulus-3.5.7.tar.gz) = 1937214

+ 3
- 8
audio/kid3-qt5/Makefile View File

@@ -1,8 +1,8 @@
# $FreeBSD$

PORTNAME= kid3
PORTVERSION= 3.7.1
PORTREVISION?= 4
PORTVERSION= 3.8.3
PORTREVISION?= 0
CATEGORIES= audio kde
MASTER_SITES= SF
PKGNAMESUFFIX= -${SLAVE}
@@ -65,6 +65,7 @@ CLI_VARS= KID3_APPS+=CLI

FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
FLAC_CMAKE_BOOL= WITH_FLAC
FLAC_IMPLIES= VORBIS

MP3_LIB_DEPENDS= libid3.so:audio/id3lib
MP3_CMAKE_BOOL= WITH_ID3LIB
@@ -86,12 +87,6 @@ VORBIS_CMAKE_BOOL= WITH_VORBIS

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MFLAC} || ${PORT_OPTIONS:MVORBIS}
PLIST_SUB+= OGGFLAC=""
.else
PLIST_SUB+= OGGFLAC="@comment "
.endif

pre-test:
@${CP} ${WRKSRC}/src/test/*.py ${TEST_WRKSRC}


+ 3
- 3
audio/kid3-qt5/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1552963155
SHA256 (kid3-3.7.1.tar.gz) = a82db841d023a28636652086905f29678d8c041dc238099165e88fbcb2d47976
SIZE (kid3-3.7.1.tar.gz) = 1486532
TIMESTAMP = 1593542051
SHA256 (kid3-3.8.3.tar.gz) = 6a1aa06d2f225f6d8a139cfd3c3d382f82170fa17196517690d28caaeb220c44
SIZE (kid3-3.8.3.tar.gz) = 3091795

+ 7
- 7
audio/kid3-qt5/files/patch-src_app_kde_kdemainwindow.cpp View File

@@ -5,27 +5,27 @@ Shortcut for action "reload" "Re&load" set with QAction::setShortcut()! Use KAc
Shortcut for action "filelist_rename" "&Rename" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead.
Shortcut for action "filelist_delete" "&Move to Trash" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead.

--- src/app/kde/kdemainwindow.cpp.orig 2018-12-21 05:40:14 UTC
--- src/app/kde/kdemainwindow.cpp.orig 2020-05-09 12:12:37 UTC
+++ src/app/kde/kdemainwindow.cpp
@@ -180,7 +180,7 @@ void KdeMainWindow::initActions()
@@ -189,7 +189,7 @@ void KdeMainWindow::initActions()
action = new QAction(QIcon::fromTheme(QLatin1String("document-open")),
tr("O&pen Directory..."), this);
action->setStatusTip(tr("Opens a directory"));
tr("O&pen Folder..."), this);
action->setStatusTip(tr("Opens a folder"));
- action->setShortcut(QKeySequence(QLatin1String("Ctrl+D")));
+ collection->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::Key_D));
collection->addAction(QLatin1String("open_directory"), action);
connect(action, &QAction::triggered,
impl(), &BaseMainWindowImpl::slotFileOpenDirectory);
@@ -188,7 +188,7 @@ void KdeMainWindow::initActions()
@@ -197,7 +197,7 @@ void KdeMainWindow::initActions()
action = new QAction(QIcon::fromTheme(QLatin1String("view-refresh")),
tr("Re&load"), this);
action->setStatusTip(tr("Reload directory"));
action->setStatusTip(tr("Reload folder"));
- action->setShortcut(QKeySequence::Refresh);
+ collection->setDefaultShortcut(action, QKeySequence::Refresh);
collection->addAction(QLatin1String("reload"), action);
connect(action, &QAction::triggered,
impl(), &BaseMainWindowImpl::slotFileReload);
@@ -401,13 +401,13 @@ void KdeMainWindow::initActions()
@@ -415,13 +415,13 @@ void KdeMainWindow::initActions()
collection->addAction(QLatin1String("filelist_focus"), action);
connect(action, &QAction::triggered, form(), &Kid3Form::setFocusFileList);
action = new QAction(tr("&Rename"), this);

+ 35
- 0
audio/kid3-qt5/files/patch-src_plugins_oggflacmetadata_CMakeLists.txt View File

@@ -0,0 +1,35 @@
Make FLAC support optional

--- src/plugins/oggflacmetadata/CMakeLists.txt.orig 2019-08-23 09:52:05 UTC
+++ src/plugins/oggflacmetadata/CMakeLists.txt
@@ -1,8 +1,12 @@
-if(WITH_VORBIS)
+if(WITH_VORBIS OR WITH_FLAC)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
- find_package(Vorbis REQUIRED)
- find_package(FLAC)
+ if(WITH_VORBIS)
+ find_package(Vorbis REQUIRED)
+ endif()
+ if(WITH_FLAC)
+ find_package(FLAC REQUIRED)
+ endif()
configure_file(oggflacconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/oggflacconfig.h)
@@ -28,7 +32,13 @@ if(WITH_VORBIS)
target_include_directories(${plugin_TARGET} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
- target_link_libraries(${plugin_TARGET} kid3-core VorbisFile::VorbisFile FLACPP::FLACPP Kid3Plugin)
+ target_link_libraries(${plugin_TARGET} kid3-core Kid3Plugin)
+ if(HAVE_VORBIS)
+ target_link_libraries(${plugin_TARGET} VorbisFile::VorbisFile)
+ endif()
+ if(HAVE_FLAC)
+ target_link_libraries(${plugin_TARGET} FLACPP::FLACPP)
+ endif()
target_compile_definitions(${plugin_TARGET} PRIVATE HAVE_CONFIG_H)

+ 7
- 7
audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp View File

@@ -1,17 +1,17 @@
Fix test to reflect the current data in the MusicBrainz database.

--- src/test/testmusicbrainzreleaseimporter.cpp.orig 2018-12-21 05:40:14 UTC
--- src/test/testmusicbrainzreleaseimporter.cpp.orig 2019-08-23 09:52:05 UTC
+++ src/test/testmusicbrainzreleaseimporter.cpp
@@ -38,7 +38,7 @@ void TestMusicBrainzReleaseImporter::testQueryAlbums()
{
queryAlbums(QLatin1String("Wizard"), QLatin1String("Odin"));
QStandardItemModel* albumModel = m_importer->getAlbumListModel();
AlbumListModel* albumModel = m_importer->getAlbumListModel();
- QCOMPARE(albumModel->rowCount(), 3);
+ QCOMPARE(albumModel->rowCount(), 4);
auto item = static_cast<AlbumListItem*>(albumModel->item(0, 0));
QVERIFY(item);
QVERIFY(item->type() == AlbumListItem::Type);
@@ -54,9 +54,9 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
QString text, category, id;
albumModel->getItem(0, text, category, id);
QCOMPARE(text, QString(QLatin1String("Wizard - Odin")));
@@ -53,9 +53,9 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
QStringList titles;
titles << QLatin1String("The Prophecy") << QLatin1String("Betrayer")
<< QLatin1String("Dead Hope") << QLatin1String("Dark God")
@@ -23,7 +23,7 @@ Fix test to reflect the current data in the MusicBrainz database.
<< QLatin1String("Hall of Odin") << QLatin1String("The Powergod")
<< QLatin1String("March of the Einheriers")
<< QLatin1String("End of All");
@@ -66,7 +66,7 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
@@ -65,7 +65,7 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
<< QLatin1String("5:08") << QLatin1String("4:01")
<< QLatin1String("5:01") << QLatin1String("5:06")
<< QLatin1String("5:21") << QLatin1String("5:40")

+ 49
- 4
audio/kid3-qt5/pkg-plist View File

@@ -11,22 +11,58 @@ lib/kid3/libfreedbimport.so
%%MP3%%lib/kid3/libid3libmetadata.so
%%MP4%%lib/kid3/libmp4v2metadata.so
lib/kid3/libmusicbrainzimport.so
%%OGGFLAC%%lib/kid3/liboggflacmetadata.so
%%VORBIS%%lib/kid3/liboggflacmetadata.so
%%TAGLIB%%lib/kid3/libtaglibmetadata.so
%%CLI%%man/ca/man1/kid3-cli.1.gz
%%QT%%man/ca/man1/kid3-qt.1.gz
man/ca/man1/kid3.1.gz
%%CLI%%man/de/man1/kid3-cli.1.gz
%%QT%%man/de/man1/kid3-qt.1.gz
man/de/man1/kid3.1.gz
%%CLI%%man/it/man1/kid3-cli.1.gz
%%QT%%man/it/man1/kid3-qt.1.gz
man/it/man1/kid3.1.gz
%%CLI%%man/man1/kid3-cli.1.gz
%%QT%%man/man1/kid3-qt.1.gz
man/man1/kid3.1.gz
share/applications/net.sourceforge.kid3%%QT_SUFX%%.desktop
%%KF5%%share/dbus-1/interfaces/net.sourceforge.Kid3.xml
%%CLI%%man/nl/man1/kid3-cli.1.gz
%%QT%%man/nl/man1/kid3-qt.1.gz
man/nl/man1/kid3.1.gz
%%CLI%%man/pt/man1/kid3-cli.1.gz
%%QT%%man/pt/man1/kid3-qt.1.gz
man/pt/man1/kid3.1.gz
%%CLI%%man/sv/man1/kid3-cli.1.gz
%%QT%%man/sv/man1/kid3-qt.1.gz
man/sv/man1/kid3.1.gz
%%CLI%%man/uk/man1/kid3-cli.1.gz
%%QT%%man/uk/man1/kid3-qt.1.gz
man/uk/man1/kid3.1.gz
share/applications/org.kde.kid3%%QT_SUFX%%.desktop
%%KF5%%share/dbus-1/interfaces/org.kde.Kid3.xml
%%KF5%%share/doc/HTML/ca/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/ca/kid3/index.docbook
%%KF5%%share/doc/HTML/de/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/de/kid3/index.docbook
%%KF5%%share/doc/HTML/en/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/en/kid3/index.docbook
%%KF5%%share/doc/HTML/it/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/it/kid3/index.docbook
%%KF5%%share/doc/HTML/nl/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/nl/kid3/index.docbook
%%KF5%%share/doc/HTML/pt/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/pt/kid3/index.docbook
%%KF5%%share/doc/HTML/sv/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/sv/kid3/index.docbook
%%KF5%%share/doc/HTML/uk/kid3/index.cache.bz2
%%KF5%%share/doc/HTML/uk/kid3/index.docbook
%%QT%%share/doc/kid3-qt/kid3_ca.html
%%QT%%share/doc/kid3-qt/kid3_de.html
%%QT%%share/doc/kid3-qt/kid3_en.html
%%QT%%share/doc/kid3-qt/kid3_it.html
%%QT%%share/doc/kid3-qt/kid3_nl.html
%%QT%%share/doc/kid3-qt/kid3_pt.html
%%QT%%share/doc/kid3-qt/kid3_sv.html
%%QT%%share/doc/kid3-qt/kid3_uk.html
share/icons/hicolor/128x128/apps/kid3%%QT_SUFX%%.png
share/icons/hicolor/16x16/apps/kid3%%QT_SUFX%%.png
share/icons/hicolor/32x32/apps/kid3%%QT_SUFX%%.png
@@ -35,22 +71,31 @@ share/icons/hicolor/64x64/apps/kid3%%QT_SUFX%%.png
%%QT%%share/icons/hicolor/scalable/apps/kid3-qt.svg
%%KF5%%share/icons/hicolor/scalable/apps/kid3.svgz
%%KF5%%share/kxmlgui5/kid3/kid3ui.rc
%%DATADIR%%/translations/kid3_ca.qm
%%DATADIR%%/translations/kid3_ca@valencia.qm
%%DATADIR%%/translations/kid3_cs.qm
%%DATADIR%%/translations/kid3_da.qm
%%DATADIR%%/translations/kid3_de.qm
%%DATADIR%%/translations/kid3_el.qm
%%DATADIR%%/translations/kid3_en.qm
%%DATADIR%%/translations/kid3_en_GB.qm
%%DATADIR%%/translations/kid3_es.qm
%%DATADIR%%/translations/kid3_et.qm
%%DATADIR%%/translations/kid3_fi.qm
%%DATADIR%%/translations/kid3_fr.qm
%%DATADIR%%/translations/kid3_it.qm
%%DATADIR%%/translations/kid3_ko.qm
%%DATADIR%%/translations/kid3_nl.qm
%%DATADIR%%/translations/kid3_pl.qm
%%DATADIR%%/translations/kid3_pt.qm
%%DATADIR%%/translations/kid3_ru.qm
%%DATADIR%%/translations/kid3_sr.qm
%%DATADIR%%/translations/kid3_sr@ijekavian.qm
%%DATADIR%%/translations/kid3_sr@ijekavianlatin.qm
%%DATADIR%%/translations/kid3_sr@latin.qm
%%DATADIR%%/translations/kid3_sv.qm
%%DATADIR%%/translations/kid3_tr.qm
%%DATADIR%%/translations/kid3_uk.qm
%%DATADIR%%/translations/kid3_zh_CN.qm
%%DATADIR%%/translations/kid3_zh_TW.qm
share/metainfo/net.sourceforge.kid3%%QT_SUFX%%.appdata.xml
share/metainfo/org.kde.kid3%%QT_SUFX%%.appdata.xml

+ 1
- 1
biology/bamtools/Makefile View File

@@ -3,7 +3,7 @@
PORTNAME= bamtools
DISTVERSIONPREFIX= v
DISTVERSION= 2.5.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= biology

MAINTAINER= jwb@FreeBSD.org

+ 1
- 1
converters/cl-babel-sbcl/Makefile View File

@@ -2,7 +2,7 @@

PORTNAME= babel
PORTVERSION= 2010.01.16
PORTREVISION= 44
PORTREVISION= 45
CATEGORIES= converters lisp
PKGNAMEPREFIX= cl-
DISTFILES= # none

+ 0
- 4
databases/Makefile View File

@@ -174,10 +174,6 @@
SUBDIR += mantis
SUBDIR += mariadb-connector-c
SUBDIR += mariadb-connector-odbc
SUBDIR += mariadb101-client
SUBDIR += mariadb101-server
SUBDIR += mariadb102-client
SUBDIR += mariadb102-server
SUBDIR += mariadb103-client
SUBDIR += mariadb103-server
SUBDIR += mariadb104-client

+ 0
- 14
databases/mariadb101-client/Makefile View File

@@ -1,14 +0,0 @@
# $FreeBSD$

PORTNAME= mariadb
PKGNAMESUFFIX= 101-client

COMMENT= Multithreaded SQL database (client)

MASTERDIR= ${.CURDIR}/../mariadb101-server

FILESDIR= ${.CURDIR}/files
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist

.include "${MASTERDIR}/Makefile"

+ 0
- 27
databases/mariadb101-client/files/patch-CMakeLists.txt View File

@@ -1,27 +0,0 @@
--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC
+++ CMakeLists.txt
@@ -385,7 +385,7 @@ ADD_SUBDIRECTORY(libmysql)
ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(libservices)
-ADD_SUBDIRECTORY(sql/share)
+#ADD_SUBDIRECTORY(sql/share)
IF(NOT WITHOUT_SERVER)
ADD_SUBDIRECTORY(tests)
@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
+IF(FALSE)
INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty
EXCEPTIONS-CLIENT COMPONENT Readme)
@@ -476,6 +477,7 @@ IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
ENDIF()
+ENDIF()
INCLUDE(CPack)

+ 0
- 58
databases/mariadb101-client/files/patch-client_CMakeLists.txt View File

@@ -1,58 +0,0 @@
--- client/CMakeLists.txt.orig 2019-02-04 17:02:08 UTC
+++ client/CMakeLists.txt
@@ -39,12 +39,13 @@ IF(UNIX)
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
ENDIF(UNIX)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre)
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
+ENDIF()
-
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
@@ -55,21 +56,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
+tARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
@@ -81,10 +86,12 @@ IF(WIN32)
ENDIF(WIN32)
# async_example is just a code example, do not install it.
+IF(FALSE)
ADD_EXECUTABLE(async_example async_example.c)
TARGET_LINK_LIBRARIES(async_example mysqlclient)
+ENDIF()
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
PROPERTIES HAS_CXX TRUE)
ADD_DEFINITIONS(-DHAVE_DLOPEN)

+ 0
- 31
databases/mariadb101-client/files/patch-cmake_ssl.cmake View File

@@ -1,31 +0,0 @@
MariaDB prefers static libraries, breaks builds with
ports' OpenSSL libs

--- cmake/ssl.cmake.orig 2016-03-24 09:12:10 UTC
+++ cmake/ssl.cmake
@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
# On mac this list is <.dylib;.so;.a>
# We prefer static libraries, so we revert it here.
- IF (WITH_SSL_PATH)
- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
- ENDIF()
+# IF (WITH_SSL_PATH)
+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+# ENDIF()
FIND_LIBRARY(OPENSSL_LIBRARIES
NAMES ssl ssleay32 ssleay32MD
HINTS ${OPENSSL_ROOT_DIR}/lib)
@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL)
HINTS ${OPENSSL_ROOT_DIR}/lib)
MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR
OPENSSL_INCLUDE_DIR)
- IF (WITH_SSL_PATH)
- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
- ENDIF()
+# IF (WITH_SSL_PATH)
+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+# ENDIF()
INCLUDE(CheckSymbolExists)
SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})

+ 0
- 34
databases/mariadb101-client/files/patch-extra_CMakeLists.txt View File

@@ -1,34 +0,0 @@
--- extra/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
+++ extra/CMakeLists.txt
@@ -46,6 +46,7 @@ ADD_CUSTOM_TARGET(GenError
DEPENDS
${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
TARGET_LINK_LIBRARIES(my_print_defaults mysys)
@@ -88,18 +89,23 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_
)
ENDIF()
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
ADD_DEPENDENCIES(innochecksum GenError)
ENDIF()
+ENDIF()
MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
TARGET_LINK_LIBRARIES(replace mysys)
+ENDIF()
IF(UNIX)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
ENDIF()
+ENDIF()

+ 0
- 22
databases/mariadb101-client/files/patch-include_CMakeLists.txt View File

@@ -1,22 +0,0 @@
--- include/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
+++ include/CMakeLists.txt
@@ -66,13 +66,18 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I
FOREACH(f ${HEADERS_GEN_CONFIGURE})
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
ENDFOREACH(f)
-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development
+ FILES_MATCHING PATTERN "*.h"
+ PATTERN "psi_abi*" EXCLUDE
+)
STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
+IF(FALSE)
INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
FILES_MATCHING PATTERN "*.h"
PATTERN CMakeFiles EXCLUDE
PATTERN mysql EXCLUDE
REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+ENDIF()

+ 0
- 11
databases/mariadb101-client/files/patch-include_my__compare.h View File

@@ -1,11 +0,0 @@
--- include/my_compare.h.orig 2015-12-23 15:33:29 UTC
+++ include/my_compare.h
@@ -40,7 +40,7 @@ extern "C" {
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 32 /* Max segments for key */
#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)

+ 0
- 14
databases/mariadb101-client/files/patch-include_mysql_service__encryption.h View File

@@ -1,14 +0,0 @@
--- include/mysql/service_encryption.h.orig 2015-12-23 15:33:29 UTC
+++ include/mysql/service_encryption.h
@@ -37,9 +37,11 @@ extern "C" {
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <stdlib.h>
#else
+#ifndef __FreeBSD__
#include <alloca.h>
#endif
#endif
+#endif
/* returned from encryption_key_get_latest_version() */
#define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0)

+ 0
- 11
databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt View File

@@ -1,11 +0,0 @@
--- libmysql/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
+++ libmysql/CMakeLists.txt
@@ -441,6 +441,8 @@ IF(NOT DISABLE_SHARED)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
+ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
ELSE()

+ 0
- 9
databases/mariadb101-client/files/patch-libservices_CMakeLists.txt View File

@@ -1,9 +0,0 @@
--- libservices/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
+++ libservices/CMakeLists.txt
@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES
logger_service.c)
ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
+IF(FALSE)
INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
+ENDIF()

+ 0
- 16
databases/mariadb101-client/files/patch-man_CMakeLists.txt View File

@@ -1,16 +0,0 @@
--- man/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
+++ man/CMakeLists.txt
@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1)
SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
mysqltest_embedded.1 mysql_client_test_embedded.1)
+IF(FALSE)
INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
+ENDIF()
INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
+IF(FALSE)
INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
+ENDIF()

+ 0
- 60
databases/mariadb101-client/files/patch-mysys_my__default.c View File

@@ -1,60 +0,0 @@
--- mysys/my_default.c.orig 2017-01-17 19:38:25 UTC
+++ mysys/my_default.c
@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
{
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(0)))
- return 1;
+ return 0;
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
@@ -803,6 +803,22 @@ static int search_default_file_with_ext(
if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
return 1; /* Ignore wrong files */
+ if (strstr(name, "/etc") == name)
+ {
+ fprintf(stderr,
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
+ name,name);
+ goto err;
+ }
+
+ if (strstr(name, "/etc") == name)
+ {
+ fprintf(stderr,
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
+ name,name);
+ goto err;
+ }
+
while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
{
line++;
@@ -1067,7 +1083,8 @@ void my_print_default_files(const char *
if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
*end++= '.';
strxmov(end, conf_file, *ext, " ", NullS);
- fputs(name, stdout);
+ if (strstr(name, "/etc") != name)
+ fputs(name, stdout);
}
}
}
@@ -1228,13 +1245,10 @@ static const char **init_default_directo
#else
-#if defined(DEFAULT_SYSCONFDIR)
- if (DEFAULT_SYSCONFDIR[0])
- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-#else
errors += add_directory(alloc, "/etc/", dirs);
errors += add_directory(alloc, "/etc/mysql/", dirs);
-#endif /* DEFAULT_SYSCONFDIR */
+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
#endif

+ 0
- 11
databases/mariadb101-client/files/patch-pcre_CMakeLists.txt View File

@@ -1,11 +0,0 @@
--- pcre/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC
+++ pcre/CMakeLists.txt
@@ -508,6 +508,8 @@ IF(PCRE_SHOW_REPORT)
MESSAGE(STATUS "")
ENDIF(PCRE_SHOW_REPORT)
+IF(FALSE)
INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
+ENDIF()
# end CMakeLists.txt

+ 0
- 64
databases/mariadb101-client/files/patch-scripts_CMakeLists.txt View File

@@ -1,64 +0,0 @@
--- scripts/CMakeLists.txt.orig 2016-07-14 01:10:23 UTC
+++ scripts/CMakeLists.txt
@@ -45,6 +45,7 @@ ELSE()
MESSAGE(FATAL_ERROR "Cannot concatenate files")
ENDIF()
+IF(FALSE)
# Build mysql_fix_privilege_tables.c
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
@@ -65,6 +66,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
)
+ENDIF()
IF(UNIX)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
@@ -164,6 +166,7 @@ ENDIF()
SET(HOSTNAME "hostname")
SET(MYSQLD_USER "mysql")
+IF(FALSE)
# Required for mysqlbug until autotools are deprecated, once done remove these
# and expand default cmake variables
SET(CC ${CMAKE_C_COMPILER})
@@ -198,6 +201,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
DESTINATION ${INSTALL_BINDIR}
COMPONENT Server
)
+ENDIF()
ENDIF(UNIX)
@@ -228,6 +232,7 @@ SET(mysqld_locations "$basedir/${INSTALL
SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql")
+IF()
IF(UNIX)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
@@ -241,6 +246,7 @@ INSTALL_SCRIPT(
COMPONENT Server
)
ENDIF()
+ENDIF()
SET(prefix "${CMAKE_INSTALL_PREFIX}")
IF(INSTALL_SYSCONFDIR)
@@ -333,13 +339,8 @@ ELSE()
SET(BIN_SCRIPTS
msql2mysql
mysql_config
- mysql_setpermission
- mysql_secure_installation
mysqlaccess
- mysql_convert_table_format
mysql_find_rows
- mytop
- mysqlhotcopy
${SERVER_SCRIPTS}
${WSREP_SCRIPTS}
${SYSTEMD_SCRIPTS}

+ 0
- 12
databases/mariadb101-client/files/patch-scripts_mysql__config.sh View File

@@ -1,12 +0,0 @@
--- scripts/mysql_config.sh.orig 2016-01-14 20:12:38 UTC
+++ scripts/mysql_config.sh
@@ -106,7 +106,9 @@ fi
# Create options
libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
+libs="$libs -L%%LOCALBASE%%/lib "
embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
include="-I$pkgincludedir"
if [ "$basedir" != "/usr" ]; then

+ 0
- 14
databases/mariadb101-client/files/patch-sql_CMakeLists.txt View File

@@ -1,14 +0,0 @@
--- sql/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC
+++ sql/CMakeLists.txt
@@ -275,9 +275,9 @@ RUN_BISON(
)
# Gen_lex_hash
-IF(NOT CMAKE_CROSSCOMPILING)
+
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-ENDIF()
+
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h

+ 0
- 34
databases/mariadb101-client/files/patch-support-files_CMakeLists.txt View File

@@ -1,34 +0,0 @@
--- support-files/CMakeLists.txt.orig 2015-12-23 15:33:33 UTC
+++ support-files/CMakeLists.txt
@@ -59,6 +59,7 @@ ENDIF()
IF(UNIX)
SET(prefix ${CMAKE_INSTALL_PREFIX})
+ IF(FALSE)
FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
@@ -88,12 +89,14 @@ IF(UNIX)
ENDFOREACH()
ENDIF()
ENDIF()
+ ENDIF()
CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-
+
+IF(FALSE)
SET(bindir ${INSTALL_BINDIRABS})
SET(sbindir ${INSTALL_SBINDIRABS})
SET(scriptdir ${INSTALL_SCRIPTDIRABS})
@@ -160,6 +163,7 @@ IF(UNIX)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server
DESTINATION ${INSTALL_SYSCONFDIR}/init.d
RENAME mysql COMPONENT SupportFiles)
+ ENDIF()
INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
COMPONENT Common)

+ 0
- 9
databases/mariadb101-client/files/pkg-message.in View File

@@ -1,9 +0,0 @@
[
{ type: install
message: <<EOM
MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
my.cnf. Please move existing my.cnf files from those paths to
%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
EOM
}
]

+ 0
- 121
databases/mariadb101-client/pkg-plist View File

@@ -1,121 +0,0 @@
bin/msql2mysql
bin/mysql
bin/mysql_find_rows
bin/mysqlaccess
bin/mysqladmin
bin/mysqlbinlog
bin/mysqlcheck
bin/mysqldump
bin/mysqlimport
bin/mysqlshow
bin/mysqlslap
bin/mysql_config
include/mysql/auth_dialog_client.h
include/mysql/big_endian.h
include/mysql/byte_order_generic.h
include/mysql/byte_order_generic_x86.h
include/mysql/byte_order_generic_x86_64.h
include/mysql/client_plugin.h
include/mysql/decimal.h
include/mysql/errmsg.h
include/mysql/handler_ername.h
include/mysql/handler_state.h
include/mysql/keycache.h
include/mysql/little_endian.h
include/mysql/m_ctype.h
include/mysql/m_string.h
include/mysql/ma_dyncol.h
include/mysql/my_alloc.h
include/mysql/my_attribute.h
include/mysql/my_byteorder.h
include/mysql/my_compiler.h
include/mysql/my_config.h
include/mysql/my_dbug.h
include/mysql/my_decimal_limits.h
include/mysql/my_dir.h
include/mysql/my_getopt.h
include/mysql/my_global.h
include/mysql/my_list.h
include/mysql/my_net.h
include/mysql/my_pthread.h
include/mysql/my_sys.h
include/mysql/my_valgrind.h
include/mysql/my_xml.h
include/mysql/mysql.h
include/mysql/mysql_com.h
include/mysql/mysql_com_server.h
include/mysql/mysql_embed.h
include/mysql/mysql_time.h
include/mysql/mysql_version.h
include/mysql/mysqld_ername.h
include/mysql/mysqld_error.h
include/mysql/plugin.h
include/mysql/plugin_audit.h
include/mysql/plugin_auth.h
include/mysql/plugin_auth_common.h
include/mysql/plugin_encryption.h
include/mysql/plugin_ftparser.h
include/mysql/plugin_password_validation.h
include/mysql/psi/mysql_file.h
include/mysql/psi/mysql_idle.h
include/mysql/psi/mysql_socket.h
include/mysql/psi/mysql_stage.h
include/mysql/psi/mysql_statement.h
include/mysql/psi/mysql_table.h
include/mysql/psi/mysql_thread.h
include/mysql/psi/psi.h
include/mysql/service_base64.h
include/mysql/service_debug_sync.h
include/mysql/service_encryption.h
include/mysql/service_encryption_scheme.h
include/mysql/service_kill_statement.h
include/mysql/service_logger.h
include/mysql/service_md5.h
include/mysql/service_my_crypt.h
include/mysql/service_my_print_error.h
include/mysql/service_my_snprintf.h
include/mysql/service_progress_report.h
include/mysql/service_sha1.h
include/mysql/service_sha2.h
include/mysql/service_thd_alloc.h
include/mysql/service_thd_autoinc.h
include/mysql/service_thd_error_context.h
include/mysql/service_thd_rnd.h
include/mysql/service_thd_specifics.h
include/mysql/service_thd_timezone.h
include/mysql/service_thd_wait.h
include/mysql/service_wsrep.h
include/mysql/services.h
include/mysql/sql_common.h
include/mysql/sql_state.h
include/mysql/sslopt-case.h
include/mysql/sslopt-longopts.h
include/mysql/sslopt-vars.h
include/mysql/typelib.h
lib/mysql/libmysqlclient.a
lib/mysql/libmysqlclient.so
lib/mysql/libmysqlclient.so.18
lib/mysql/libmysqlclient_r.a
lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqlclient_r.so.18
%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
lib/mysql/plugin/client_ed25519.so
lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/dialog.so
lib/mysql/plugin/mysql_clear_password.so
man/man1/msql2mysql.1.gz
man/man1/mysql.1.gz
man/man1/mysql_config.1.gz
man/man1/mysql_embedded.1.gz
man/man1/mysql_find_rows.1.gz
man/man1/mysql_plugin.1.gz
man/man1/mysql_waitpid.1.gz
man/man1/mysqlaccess.1.gz
man/man1/mysqladmin.1.gz
man/man1/mysqlbinlog.1.gz
man/man1/mysqlcheck.1.gz
man/man1/mysqldump.1.gz
man/man1/mysqlimport.1.gz
man/man1/mysqlshow.1.gz
man/man1/mysqlslap.1.gz
@comment %%DATADIR%%/wsrep.cnf

+ 0
- 224
databases/mariadb101-server/Makefile View File

@@ -1,224 +0,0 @@
# $FreeBSD$

PORTNAME?= mariadb
PORTVERSION= 10.1.45
PORTREVISION= 0
CATEGORIES= databases
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
http://gd.tuwien.ac.at/db/${SITESDIR}/ \
http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
http://mirror.layerjet.com/${SITESDIR}/ \
http://mirror.switch.ch/mirror/${SITESDIR}/
PKGNAMESUFFIX?= 101-server

DEPRECATED= Port will be removed when 10.5 is added, please\
switch to a newer version
EXPIRATION_DATE= 2020-07-01

MAINTAINER= brnrd@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)

LICENSE= GPLv2
LICENSE_NAME_PerconaFT= PerconaFT patents license
LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

SUB_FILES= pkg-message

USES= bison:build cmake:insource,noninja cpe libedit ncurses \
shebangfix ssl
USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES= scripts/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
DOCSDIR= ${PREFIX}/share/doc/mysql

OPTIONS_DEFINE= FASTMTX
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_DEFAULT= GSSAPI_BASE

FASTMTX_DESC= Replace mutexes with spinlocks

.if ${PKGNAMESUFFIX:M*-server}
# MySQL-Server options
OPTIONS_DEFINE+= CONNECT_EXTRA MAXKEY DOCS
OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER
OPTIONS_GROUP= COMPRESSION ENGINES GROONGA
OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY
OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB
OPTIONS_GROUP_GROONGA= ZMQ MSGPACK
OPTIONS_EXCLUDE_i386= TOKUDB

CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine
COMPRESSION_DESC= Optional page compression
ENGINES_DESC= Optional MariaDB storage engines
GROONGA_DESC= Optional Mroonga features
INNOBASE_DESC= Build InnoDB engine next to XtraDB
MAXKEY_DESC= Change max key length from 1000 to 4000
MROONGA_DESC= Mroonga Full Text Search engine
MSGPACK_DESC= MsgPack support
OQGRAPH_DESC= Open Query Graph Computation engine
SPHINX_DESC= SphinxSE engine
SPIDER_DESC= Partitioning and XA-transactions engine
TOKUDB_DESC= Fractal tree index tree data structure engine
ZMQ_DESC= ZeroMQ support
.endif

CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-DINSTALL_INCLUDEDIR="include/mysql" \
-DINSTALL_INFODIR="info" \
-DINSTALL_LIBDIR="lib/mysql" \
-DINSTALL_MANDIR="man" \
-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-DINSTALL_MYSQLTESTDIR= \
-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-DINSTALL_SBINDIR="libexec" \
-DINSTALL_SCRIPTDIR="bin" \
-DINSTALL_SHAREDIR="share" \
-DINSTALL_SQLBENCHDIR= \
-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-DWITH_SSL=${OPENSSLBASE} \
-DKRB5_CONFIG=${KRB5CONFIG} \
-DCOMPILATION_COMMENT="FreeBSD Ports"
CMAKE_ON+= WITH_LIBWRAP
CMAKE_OFF+= WITH_UNIT_TESTS

DATADIR= ${PREFIX}/share/mysql

.ifdef USE_MYSQL
.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again.
.endif

CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mariadb10[02-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*

FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES
GSSAPI_BASE_USES= gssapi
GSSAPI_HEIMDAL_USES= gssapi:heimdal
GSSAPI_MIT_USES= gssapi:mit
OPTIONS_SUB= yes

.if ${PKGNAMESUFFIX:M*-client}
# MySQL-Client part
USES+= readline
USE_LDCONFIG= ${PREFIX}/lib/mysql
CMAKE_ON+= WITHOUT_SERVER
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
.else
# MySQL-Server part
USES+= gnome mysql:101m
USE_GNOME= libxml2
USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
USE_RC_SUBR= mysql-server
USERS= mysql
GROUPS= mysql
CMAKE_ARGS+= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
CMAKE_ON+= WITH_EMBEDDED_SERVER CMAKE_SKIP_BUILD_RPATH WITHOUT_EXAMPLE_STORAGE_ENGINE

.for ENGINE in ${OPTIONS_GROUP_ENGINES}
${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO
${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
.endfor

CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
CONNECT_EXTRA_USES= gnome
CONNECT_EXTRA_USE= gnome=libxml2
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO
LZ4_BROKEN= LZ4 compression broken in 10.1, use a newer release
LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON
LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF
LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
LZO_BROKEN= LZO compression broken in 10.1, use a newer release
LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON
LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF
LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4
MROONGA_VARS= LICENSE+=LGPL20 LICENSE_COMB=multi
MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy
SNAPPY_BROKEN= Snappy compression broken in 10.1, use a newer release
SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON
SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF
SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
TOKUDB_PORTDOCS= README.md
TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi
ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
.endif # ${PKGNAMESUFFIX:M*-client}

.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""
.else
SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
.endif

.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
USES+= compiler:gcc-c++11-lib
.else
USES+= compiler:c++11-lib
.endif

.include <bsd.port.pre.mk>

.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
.endif

.if ${OPSYS} == FreeBSD
CMAKE_ARGS+= -DWITH_JEMALLOC="system"
.endif

post-patch:
@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
@${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
.if ${OPSYS} == DragonFly
${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
${WRKSRC}/cmake/os/DragonFly.cmake
.endif


.if ${PKGNAMESUFFIX:M*-client}
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/wsrep*
${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper
${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
.else
post-install:
# Remove programs to avoid conflict with mariadb101-client
# These are "client" components, so there should be a switch that
# prevents them from being installed but it's unknown right now
${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \
${STAGEDIR}${PREFIX}/bin/mysql_config \
${STAGEDIR}${PREFIX}/bin/mysql_find_rows \
${STAGEDIR}${PREFIX}/bin/mysqlaccess \
${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so \
${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql/lgpl-2.0.txt \
${STAGEDIR}${PREFIX}/share/groonga/COPYING \
${STAGEDIR}${DATADIR}/mroonga/COPYING
${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
${STAGEDIR}${PREFIX}/share/pkgconfig \
${STAGEDIR}${PREFIX}/mysql/mysql-test \
${STAGEDIR}${PREFIX}/mysql/sql-bench

post-install-MROONGA-on:
${MV} ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql \
${STAGEDIR}${PREFIX}/share/groonga \
${STAGEDIR}${PREFIX}/share/mysql
.endif # ${PKGNAMESUFFIX:M*-client}

.include <bsd.port.post.mk>

+ 0
- 3
databases/mariadb101-server/distinfo View File

@@ -1,3 +0,0 @@
TIMESTAMP = 1589725786
SHA256 (mariadb-10.1.45.tar.gz) = 9d8f0f71f9613b2028ffc5c5be8b98948ec955eb0d89600d18ed7cc04807dad5
SIZE (mariadb-10.1.45.tar.gz) = 63673824

+ 0
- 11
databases/mariadb101-server/files/extra-patch-include_my__compare.h View File

@@ -1,11 +0,0 @@
--- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200
+++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200
@@ -40,7 +40,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 32 /* Max segments for key */
#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)

+ 0
- 140
databases/mariadb101-server/files/mysql-server.in View File

@@ -1,140 +0,0 @@
#!/bin/sh

# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $
#
# PROVIDE: mysql
# REQUIRE: LOGIN
# KEYWORD: shutdown
#
# Add the following line to /etc/rc.conf to enable mysql:
# mysql_(instance_)?enable (bool): Set to "NO" by default.
# Set it to "YES" to enable MySQL.
%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default.
%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
%%LEGACY_LIMITS%%# just before mysql starts.
# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql"
# Base database directory.
# mysql_(instance_)?args (str): Custom additional arguments to be passed
# to mysqld_safe (default empty).
# mysql_(instance_)?pidfile (str): Custum PID file path and name.
# Default to "${mysql_dbdir}/${hostname}.pid".
# mysql_(instance_)?user (str): User to run mysqld as
# Default to "mysql" created by the port
# mysql_(instance_)?optfile (str): Server-specific option file.
# Default to "${mysql_dbdir}/my.cnf".
# mysql_instances (str): Set to "" by default.
# If defined, list of instances to enable

. /etc/rc.subr

name="mysql"
rcvar=mysql_enable

load_rc_config $name

: ${mysql_enable="NO"}
%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
: ${mysql_user="mysql"}
%%LEGACY_LIMITS%%: ${mysql_limits_args="-e -U $mysql_user"}
: ${mysql_dbdir="/var/db/mysql"}
: ${mysql_optfile="${mysql_dbdir}/my.cnf"}

command="/usr/sbin/daemon"
procname="%%PREFIX%%/libexec/mysqld"
start_precmd="${name}_prestart"
start_postcmd="${name}_poststart"

if [ -n "$2" ]; then
instance="$2"
load_rc_config ${name}_${instance}
case "$mysql_instances" in
"$2 "*|*" $2 "*|*" $2"|"$2")
eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
%%LEGACY_LIMITS%% eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
%%LEGACY_LIMITS%% eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
;;
*)
err 1 "$2 not found in mysql_instances" ;;
esac
else
if [ -n "${mysql_instances}" -a -n "$1" ]; then
for instance in ${mysql_instances}; do
eval _enable="\${mysql_${instance}_enable}"
case "${_enable:-${mysql_enable}}" in
[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
continue
;;
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
;;
*)
if [ -z "$_enable" ]; then
_var=mysql_enable
else
_var=mysql_${instance}_enable
fi
warn "Bad value" \
"'${_enable:-${mysql_enable}}'" \
"for ${_var}. " \
"Instance ${instance} skipped."
continue
;;
esac
echo "===> mysql instance: ${instance}"
if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
success="${instance} ${success}"
else
failed="${instance} (${retcode}) ${failed}"
fi
done
exit 0
else
mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
fi
fi

pidfile=$mysql_pidfile
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"

mysql_create_auth_tables()
{
eval $mysql_install_db $mysql_install_db_args
[ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
}

mysql_prestart()
{
local dir
for dir in /etc /etc/mysql; do
if [ -f "${dir}/my.cnf" ]; then
echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
return 1
fi
done
if [ ! -d "${mysql_dbdir}/mysql/." ]; then
mysql_create_auth_tables || return 1
fi
%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null
%%LEGACY_LIMITS%% else
%%LEGACY_LIMITS%% return 0
%%LEGACY_LIMITS%% fi
%%MODERN_LIMITS%% return 0
}

mysql_poststart()
{
local timeout=15
while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
timeout=$(( timeout - 1 ))
sleep 1
done
return 0
}

run_rc_command "$1"

+ 0
- 26
databases/mariadb101-server/files/patch-CMakeLists.txt View File

@@ -1,26 +0,0 @@
--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC
+++ CMakeLists.txt
@@ -388,7 +388,6 @@ ADD_SUBDIRECTORY(libservices)
ADD_SUBDIRECTORY(sql/share)
IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
ADD_SUBDIRECTORY(sql)
OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
IF(WITH_EMBEDDED_SERVER)
@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
+IF(FALSE)
INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty
EXCEPTIONS-CLIENT COMPONENT Readme)
@@ -476,6 +477,7 @@ IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
ENDIF()
+ENDIF()
INCLUDE(CPack)

+ 0
- 46
databases/mariadb101-server/files/patch-MDEV-15961 View File

@@ -1,46 +0,0 @@
--- mysys/stacktrace.c.orig 2018-03-26 14:18:03 UTC
+++ mysys/stacktrace.c
@@ -34,19 +34,19 @@
#include <execinfo.h>
#endif
+#ifdef __linux__
#define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
-
static char *heap_start;
-
-#ifdef HAVE_BSS_START
extern char *__bss_start;
-#endif
+#else
+#define PTR_SANE(p) (p)
+#endif /* __linux */
void my_init_stacktrace()
{
-#ifdef HAVE_BSS_START
+#ifdef __linux__
heap_start = (char*) &__bss_start;
-#endif
+#endif /* __linux__ */
}
#ifdef __linux__
@@ -149,15 +149,15 @@ static int safe_print_str(const char *ad
int my_safe_print_str(const char* val, int max_len)
{
+#ifdef __linux__
char *heap_end;
-#ifdef __linux__
// Try and make use of /proc filesystem to safely print memory contents.
if (!safe_print_str(val, max_len))
return 0;
-#endif
heap_end= (char*) sbrk(0);
+#endif
if (!PTR_SANE(val))
{

+ 0
- 72
databases/mariadb101-server/files/patch-client_CMakeLists.txt View File

@@ -1,72 +0,0 @@
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options

--- client/CMakeLists.txt.orig 2015-10-15 15:43:35 UTC
+++ client/CMakeLists.txt
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
COPY_OPENSSL_DLLS(copy_openssl_client)
ADD_DEFINITIONS(${SSL_DEFINES})
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
TARGET_LINK_LIBRARIES(mysql mysqlclient)
@@ -37,6 +38,7 @@ IF(UNIX)
TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
ENDIF(UNIX)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
@@ -53,17 +56,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
@@ -73,17 +80,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
+ENDIF()
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
IF(WIN32)
MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
ENDIF(WIN32)
+IF(FALSE)
# async_example is just a code example, do not install it.
ADD_EXECUTABLE(async_example async_example.c)
TARGET_LINK_LIBRARIES(async_example mysqlclient)
+ENDIF()
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
PROPERTIES HAS_CXX TRUE)
ADD_DEFINITIONS(-DHAVE_DLOPEN)

+ 0
- 31
databases/mariadb101-server/files/patch-cmake_ssl.cmake View File

@@ -1,31 +0,0 @@
MariaDB prefers static libraries, breaks builds with
ports' OpenSSL libs

--- cmake/ssl.cmake.orig 2016-03-24 09:12:10 UTC
+++ cmake/ssl.cmake
@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
# On mac this list is <.dylib;.so;.a>
# We prefer static libraries, so we revert it here.
- IF (WITH_SSL_PATH)
- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
- ENDIF()
+# IF (WITH_SSL_PATH)
+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+# ENDIF()
FIND_LIBRARY(OPENSSL_LIBRARIES
NAMES ssl ssleay32 ssleay32MD
HINTS ${OPENSSL_ROOT_DIR}/lib)
@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL)
HINTS ${OPENSSL_ROOT_DIR}/lib)
MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR
OPENSSL_INCLUDE_DIR)
- IF (WITH_SSL_PATH)
- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
- ENDIF()
+# IF (WITH_SSL_PATH)
+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+# ENDIF()
INCLUDE(CheckSymbolExists)
SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})

+ 0
- 13
databases/mariadb101-server/files/patch-extra_CMakeLists.txt View File

@@ -1,13 +0,0 @@
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options

--- extra/CMakeLists.txt.orig 2015-10-15 15:43:36 UTC
+++ extra/CMakeLists.txt
@@ -100,6 +100,8 @@ IF(UNIX)
MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
ENDIF()
+ENDIF()

+ 0
- 26
databases/mariadb101-server/files/patch-include_CMakeLists.txt View File

@@ -1,26 +0,0 @@
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options

--- include/CMakeLists.txt.orig 2015-10-15 15:43:36 UTC
+++ include/CMakeLists.txt
@@ -62,17 +62,21 @@ SET(HEADERS
handler_ername.h
)
+IF(FALSE)
INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
FOREACH(f ${HEADERS_GEN_CONFIGURE})
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
ENDFOREACH(f)
INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
+ENDIF()
STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
+IF(FALSE)
INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
FILES_MATCHING PATTERN "*.h"
PATTERN CMakeFiles EXCLUDE
PATTERN mysql EXCLUDE
REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+ENDIF()

+ 0
- 41
databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt View File

@@ -1,41 +0,0 @@
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options

--- libmysql/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC
+++ libmysql/CMakeLists.txt
@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy
# Merge several convenience libraries into one big mysqlclient
# and link them together into shared library.
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
# Visual Studio users need debug static library for debug projects
IF(MSVC)
@@ -418,6 +418,7 @@ IF(MSVC)
INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
ENDIF()
+IF(FALSE)
IF(UNIX)
MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
SET(DOT_VERSION ".${VERSION}")
@@ -432,11 +433,13 @@ IF(UNIX)
ENDMACRO()
INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
ENDIF()
+ENDIF()
IF(NOT DISABLE_SHARED)
MERGE_LIBRARIES(libmysql SHARED ${LIBS}
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
- COMPONENT SharedLibraries)
+ COMPONENT SharedLibraries NOINSTALL)
+IF(FALSE)
IF(UNIX)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED)
ENDFOREACH()
ENDIF()
ENDIF()
+ENDIF()

+ 0
- 11
databases/mariadb101-server/files/patch-libservices_CMakeLists.txt View File

@@ -1,11 +0,0 @@
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options

--- libservices/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC
+++ libservices/CMakeLists.txt
@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES
logger_service.c)
ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
+IF(FALSE)
INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
+ENDIF()

+ 0
- 14
databases/mariadb101-server/files/patch-man_CMakeLists.txt View File

@@ -1,14 +0,0 @@
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options

--- man/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC
+++ man/CMakeLists.txt
@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
+IF(FALSE)
INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
-
+ENDIF()

+ 0
- 20
databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc View File

@@ -1,20 +0,0 @@
--- mysys_ssl/my_crypt.cc.orig 2018-02-04 02:30:31 UTC
+++ mysys_ssl/my_crypt.cc
@@ -27,6 +27,7 @@
#include <openssl/aes.h>
#include <openssl/err.h>
#include <openssl/rand.h>
+#include <openssl/opensslv.h>
#ifdef HAVE_ERR_remove_thread_state
#define ERR_remove_state(X) ERR_remove_thread_state(NULL)
@@ -295,6 +296,9 @@ unsigned int my_aes_ctx_size(enum my_aes
int my_random_bytes(uchar *buf, int num)
{
+#ifdef LIBRESSL_VERSION_NUMBER
+ arc4random_buf(buf, num);
+#endif
if (RAND_bytes(buf, num) != 1)
return MY_AES_OPENSSL_ERROR;
return MY_AES_OK;

+ 0
- 60
databases/mariadb101-server/files/patch-mysys_my__default.c View File

@@ -1,60 +0,0 @@
--- mysys/my_default.c.orig 2017-01-17 19:38:25 UTC
+++ mysys/my_default.c
@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
{
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(0)))
- return 1;
+ return 0;
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
@@ -803,6 +803,22 @@ static int search_default_file_with_ext(
if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
return 1; /* Ignore wrong files */
+ if (strstr(name, "/etc") == name)
+ {
+ fprintf(stderr,
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
+ name,name);
+ goto err;
+ }
+
+ if (strstr(name, "/etc") == name)
+ {
+ fprintf(stderr,
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
+ name,name);
+ goto err;
+ }
+
while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
{
line++;
@@ -1067,7 +1083,8 @@ void my_print_default_files(const char *
if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
*end++= '.';
strxmov(end, conf_file, *ext, " ", NullS);
- fputs(name, stdout);
+ if (strstr(name, "/etc") != name)
+ fputs(name, stdout);
}
}
}
@@ -1228,13 +1245,10 @@ static const char **init_default_directo
#else
-#if defined(DEFAULT_SYSCONFDIR)
- if (DEFAULT_SYSCONFDIR[0])
- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-#else
errors += add_directory(alloc, "/etc/", dirs);
errors += add_directory(alloc, "/etc/mysql/", dirs);
-#endif /* DEFAULT_SYSCONFDIR */
+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
#endif

+ 0
- 40
databases/mariadb101-server/files/patch-oqgraph-MDEV-15291 View File

@@ -1,40 +0,0 @@
--- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC
+++ storage/oqgraph/oqgraph_judy.cc
@@ -27,7 +27,7 @@
/*
Currently the only active code that can return error is:
judy_bitset::reset()/J1U()
- judy_bitset::setbit()/J1S()
+ judy_bitset::jsetbit()/J1S()
In most cases errors are either about wrong parameters passed to Judy
functions or internal structures corruption. These definitely deserve
@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
return rc == 1;
}
-open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
{
int rc;
J1S(rc, array, n);
--- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC
+++ storage/oqgraph/oqgraph_judy.h
@@ -63,7 +63,7 @@ namespace open_query
if (!val)
return reset(n);
else
- return setbit(n);
+ return jsetbit(n);
}
judy_bitset& set(const judy_bitset& src);
@@ -115,7 +115,7 @@ namespace open_query
private:
mutable void* array;
- judy_bitset& setbit(size_type n);
+ judy_bitset& jsetbit(size_type n);
};
}

+ 0
- 13
databases/mariadb101-server/files/patch-pcre_CMakeLists.txt View File

@@ -1,13 +0,0 @@
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options

--- pcre/CMakeLists.txt.orig 2016-03-24 09:12:11 UTC
+++ pcre/CMakeLists.txt
@@ -508,6 +508,8 @@ IF(PCRE_SHOW_REPORT)
MESSAGE(STATUS "")
ENDIF(PCRE_SHOW_REPORT)
+IF(FALSE)
INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
+ENDIF()
# end CMakeLists.txt

+ 0
- 12
databases/mariadb101-server/files/patch-scripts_mysql__config.sh View File

@@ -1,12 +0,0 @@
--- scripts/mysql_config.sh.orig 2016-01-14 20:12:38 UTC
+++ scripts/mysql_config.sh
@@ -106,7 +106,9 @@ fi
# Create options
libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
+libs="$libs -L%%LOCALBASE%%/lib "
embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
include="-I$pkgincludedir"
if [ "$basedir" != "/usr" ]; then

+ 0
- 24
databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh View File

@@ -1,24 +0,0 @@
--- scripts/mysqld_safe.sh.orig 2017-01-18 20:11:42 UTC
+++ scripts/mysqld_safe.sh
@@ -581,10 +581,10 @@ fi
if test -z "$MYSQL_HOME"
then
- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
then
log_error "WARNING: Found two instances of my.cnf -
-$MY_BASEDIR_VERSION/my.cnf and
+$MY_BASEDIR_VERSION/etc/my.cnf and
$DATADIR/my.cnf
IGNORING $DATADIR/my.cnf"
@@ -593,7 +593,7 @@ IGNORING $DATADIR/my.cnf"
then
log_error "WARNING: Found $DATADIR/my.cnf
The data directory is a deprecated location for my.cnf, please move it to
-$MY_BASEDIR_VERSION/my.cnf"
+$MY_BASEDIR_VERSION/etc/my.cnf"
unsafe_my_cnf=1
MYSQL_HOME=$DATADIR
else

+ 0
- 11
databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh View File

@@ -1,11 +0,0 @@
--- scripts/wsrep_sst_mariabackup.sh.orig 2019-12-11 19:29:57 UTC
+++ scripts/wsrep_sst_mariabackup.sh
@@ -605,7 +605,7 @@ recv_joiner()
set +e
if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then
- if timeout --help | grep -q -- '-k';then
+ if timeout --help 2>&1 | grep -q -- '-k';then
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
else
ltcmd="timeout -s9 $tmt $tcmd"

+ 0
- 30
databases/mariadb101-server/files/patch-sql_CMakeLists.txt View File

@@ -1,30 +0,0 @@
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options

--- sql/CMakeLists.txt.orig 2015-10-15 15:43:45 UTC
+++ sql/CMakeLists.txt
@@ -340,6 +340,7 @@ ADD_CUSTOM_TARGET(distclean
VERBATIM
)
+IF(FALSE)
IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
# Copy db.opt into data/test/
@@ -383,6 +384,7 @@ ELSE()
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
+ENDIF()
IF(WIN32)
SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
@@ -425,7 +427,9 @@ IF(WIN32)
TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
ENDIF(WIN32)
+IF(FALSE)
INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
FILES_MATCHING PATTERN "*.h"
PATTERN share EXCLUDE
PATTERN CMakeFiles EXCLUDE)
+ENDIF()

+ 0
- 52
databases/mariadb101-server/files/patch-sql_sql__trigger.cc View File

@@ -1,52 +0,0 @@
Fix clang build error

--- sql/sql_trigger.cc.orig 2015-10-15 15:43:47 UTC
+++ sql/sql_trigger.cc
@@ -192,32 +192,32 @@ static File_option triggers_file_paramet
{
{
{ C_STRING_WITH_LEN("triggers") },
- my_offsetof(class Table_triggers_list, definitions_list),
+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
FILE_OPTIONS_STRLIST
},
{
{ C_STRING_WITH_LEN("sql_modes") },
- my_offsetof(class Table_triggers_list, definition_modes_list),
+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
FILE_OPTIONS_ULLLIST
},
{
{ C_STRING_WITH_LEN("definers") },
- my_offsetof(class Table_triggers_list, definers_list),
+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
FILE_OPTIONS_STRLIST
},
{
{ C_STRING_WITH_LEN("client_cs_names") },
- my_offsetof(class Table_triggers_list, client_cs_names),
+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
FILE_OPTIONS_STRLIST
},
{
{ C_STRING_WITH_LEN("connection_cl_names") },
- my_offsetof(class Table_triggers_list, connection_cl_names),
+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
FILE_OPTIONS_STRLIST
},
{
{ C_STRING_WITH_LEN("db_cl_names") },
- my_offsetof(class Table_triggers_list, db_cl_names),
+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
FILE_OPTIONS_STRLIST
},
{ { 0, 0 }, 0, FILE_OPTIONS_STRING }
@@ -226,7 +226,7 @@ static File_option triggers_file_paramet
File_option sql_modes_parameters=
{
{ C_STRING_WITH_LEN("sql_modes") },
- my_offsetof(class Table_triggers_list, definition_modes_list),
+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
FILE_OPTIONS_ULLLIST
};

+ 0
- 65
databases/mariadb101-server/files/patch-sql_sql__view.cc View File

@@ -1,65 +0,0 @@
Fix clang build error

--- sql/sql_view.cc.orig 2015-10-15 15:43:47 UTC
+++ sql/sql_view.cc
@@ -720,46 +720,46 @@ static const int required_view_parameter
*/
static File_option view_parameters[]=
{{{ C_STRING_WITH_LEN("query")},
- my_offsetof(TABLE_LIST, select_stmt),
+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
FILE_OPTIONS_ESTRING},
{{ C_STRING_WITH_LEN("md5")},
- my_offsetof(TABLE_LIST, md5),
+ static_cast<int>(my_offsetof(TABLE_LIST, md5)),
FILE_OPTIONS_STRING},
{{ C_STRING_WITH_LEN("updatable")},
- my_offsetof(TABLE_LIST, updatable_view),
+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
FILE_OPTIONS_ULONGLONG},
{{ C_STRING_WITH_LEN("algorithm")},
- my_offsetof(TABLE_LIST, algorithm),
+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
FILE_OPTIONS_VIEW_ALGO},
{{ C_STRING_WITH_LEN("definer_user")},
- my_offsetof(TABLE_LIST, definer.user),
+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
FILE_OPTIONS_STRING},
{{ C_STRING_WITH_LEN("definer_host")},
- my_offsetof(TABLE_LIST, definer.host),
+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
FILE_OPTIONS_STRING},
{{ C_STRING_WITH_LEN("suid")},
- my_offsetof(TABLE_LIST, view_suid),
+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
FILE_OPTIONS_ULONGLONG},
{{ C_STRING_WITH_LEN("with_check_option")},
- my_offsetof(TABLE_LIST, with_check),
+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
FILE_OPTIONS_ULONGLONG},
{{ C_STRING_WITH_LEN("timestamp")},
- my_offsetof(TABLE_LIST, timestamp),
+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
FILE_OPTIONS_TIMESTAMP},
{{ C_STRING_WITH_LEN("create-version")},
- my_offsetof(TABLE_LIST, file_version),
+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)),