From bd8ca999980e9c0c9ae40a11789c858bb58769e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Jul 2022 13:42:19 +0100 Subject: gentoo auto-resync : 15:07:2022 - 13:42:19 --- dev-db/Manifest.gz | Bin 15916 -> 15913 bytes dev-db/mysql-connector-c/Manifest | 2 + .../files/mysql-connector-c-8.0.27-res_n.patch | 49 ++++++++ .../mysql-connector-c-8.0.27-r1.ebuild | 123 +++++++++++++++++++++ dev-db/sqldeveloper/Manifest | 4 +- .../sqldeveloper-21.4.3.063.0100.ebuild | 100 ----------------- .../sqldeveloper-22.2.0.173.2018.ebuild | 100 +++++++++++++++++ 7 files changed, 276 insertions(+), 102 deletions(-) create mode 100644 dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch create mode 100644 dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild delete mode 100644 dev-db/sqldeveloper/sqldeveloper-21.4.3.063.0100.ebuild create mode 100644 dev-db/sqldeveloper/sqldeveloper-22.2.0.173.2018.ebuild (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index a58e31f0bef7..f6bfc6656f49 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index 5508c3f3a437..1c9ee68dbf50 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -1,6 +1,8 @@ AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d4fb9a38ac418476f4b7738caa1f2a5dc633ad5921859793983c7b42acd87263ce2703df5a8c7d3bc3d7a60efb28a3ff17c311d89cc7b12edd22574f SHA512 cbb9be24a67a649b68230fe3482063d2d16fb629233e070289eb1ab0011bd8c43b0c056e4b6ca430a62ce0e8f47bb9490cb6746b7dc3fe06a05670b078cd084f AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B 15bef04f750b5f373d8c5f39690e90be482bfea66430234befc777e9d84d0060d20e1290798ddacbf0e9f0f8db45ba0318d88b61aec3fd1e859285cefff446ef SHA512 7ae81f4fe020c12e45eba041dcca921fa93f42a12d8c8d840b1bec819c00de8b780a792e99cdc3cae55eef74c911de3087b6583d6213913b36428b96f0e1c3af AUX mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch 11508 BLAKE2B 1fe2341c938ce580611bb1f2ded279d02d4f1130b719c43d0c70942e9954214cc4392b86a18dfd0f88082c6b72fdf270e076647dd1600d7ebb8eb437ca10bb64 SHA512 1b7b1bf471ad6cab6c86dbfb7f6ffe506e3d20a51efcc1df503a9d65976fedb8dbcd67993897241fc0dd9e1f7356670bf3ec80c5b7f66c9246a44b4aa3eee3cc +AUX mysql-connector-c-8.0.27-res_n.patch 1635 BLAKE2B f75811958a6415bf45aa571a8da14c371500216a197602dec19b8b565bc219f98e8feb9bc660d81e32c4af7f39abb626af405d33a7f478617c8ee96c5b4453b8 SHA512 bb6315f0ac540d0723dffd9f8c2bdad9b9b1c0a3d706f80fd3bbdc9c7f276a8dda2754df94f6cb4ffecb0c3b0e65edc96c90b171eb0a4e5032fe6583e56ade85 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891 +EBUILD mysql-connector-c-8.0.27-r1.ebuild 3269 BLAKE2B 7dd57e4dfd1136904170b50ce3310063ca8283cb2b188d9b4a3025bd449d62f59db76d8f3f143c51c7882b2affce51b15caa2907d4d058ae3fdb9708bf05ff25 SHA512 a54b8fe93d921a2e67efcf638014584eb33ffe234ec6ea7164d59ec2dc575e08e18c40536561705121c7467c9f26a45933cd5d0fdfa4a102ef2287ea7ba375d8 EBUILD mysql-connector-c-8.0.27.ebuild 3222 BLAKE2B 3b8888fe231a27fd07f29ebe1fddabc215ccd9337af0b7f7b30cfab64f2c98b3af06d4840b19fb7a8dbe47fb3699bbfd7a2be39bf8d39ca9eb8d704e92eedc51 SHA512 60c9a2f43d481b51d1334dc92dc9f2f056efb8217f381503b8253ad8b54e570dda98f5b79c0b2ceb272a1b4de84157bbb14a99da3998bed428dce8196734d924 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27 diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch new file mode 100644 index 000000000000..34961b8ad9e2 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch @@ -0,0 +1,49 @@ +# Musl doesn't have res_n* functions so we are falling back to the not +# thread safe ones. Patch made with help from developer Fabian Groffen +# . +# +# Closes: https://bugs.gentoo.org/761352 +# See also: https://github.com/mysql/mysql-server/pull/385 +# See also: https://bugs.mysql.com/bug.php?id=106034 +--- a/libmysql/CMakeLists.txt ++++ b/libmysql/CMakeLists.txt +@@ -423,6 +423,19 @@ IF(HAS_WARN_FLAG) + ) + ENDIF() + ++check_symbol_exists(res_ninit "resolv.h" HAVE_RES_NINIT_FUNCTION) ++check_symbol_exists(res_nsearch "resolv.h" HAVE_RES_NSEARCH_FUNCTION) ++check_symbol_exists(res_nclose "resolv.h" HAVE_RES_NCLOSE_FUNCTION) ++IF (HAVE_RES_NINIT_FUNCTION) ++ add_compile_definitions(HAVE_RES_NINIT) ++ENDIF(HAVE_RES_NINIT_FUNCTION) ++IF (HAVE_RES_NSEARCH_FUNCTION) ++ add_compile_definitions(HAVE_RES_NSEARCH) ++ENDIF(HAVE_RES_NSEARCH_FUNCTION) ++IF (HAVE_RES_NCLOSE_FUNCTION) ++ add_compile_definitions(HAVE_RES_NCLOSE) ++ENDIF(HAVE_RES_NCLOSE_FUNCTION) ++ + # Verify that libmysql_api_test runs OK + ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD + COMMAND libmysql_api_test +--- a/libmysql/dns_srv.cc ++++ b/libmysql/dns_srv.cc +@@ -37,6 +37,17 @@ + #include + #include + ++/* we don't have anything else but the non-thread-safe variants */ ++#if !defined(HAVE_RES_NINIT) ++#define res_ninit(X) (void)X ++#endif ++#if !defined(HAVE_RES_NSEARCH) ++#define res_nsearch(X,D,I,S,B,L) res_search(D,I,S,B,L) ++#endif ++#if !defined(HAVE_RES_NCLOSE) ++#define res_nclose(X) (void)X ++#endif ++ + // POSIX version + + static bool get_dns_srv(Dns_srv_data &data, const char *dnsname, int &error) { diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild new file mode 100644 index 000000000000..7058ba6c50ed --- /dev/null +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib flag-o-matic + +# wrap the config script +MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) + +DESCRIPTION="C client library for MariaDB/MySQL" +HOMEPAGE="https://dev.mysql.com/downloads/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/mysql/mysql-server.git" + + inherit git-r3 +else + SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + + S="${WORKDIR}/mysql-${PV}" +fi + +LICENSE="GPL-2" +SLOT="0/21" +IUSE="ldap static-libs" + +RDEPEND=" + >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] + app-arch/zstd:=[${MULTILIB_USEDEP}] + sys-libs/zlib:=[${MULTILIB_USEDEP}] + ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" + +# Avoid file collisions, #692580 +RDEPEND+=" ! client/CMakeLists.txt || die + + # Forcefully disable auth plugin + if ! use ldap ; then + sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die + echo > libmysql/authentication_ldap/CMakeLists.txt || die + fi + + cmake_src_prepare +} + +multilib_src_configure() { + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08 + append-cxxflags -std=c++17 + + local mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DINSTALL_LAYOUT=RPM + -DINSTALL_LIBDIR=$(get_libdir) + -DWITH_DEFAULT_COMPILER_OPTIONS=OFF + -DENABLED_LOCAL_INFILE=ON + -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" + -DWITH_LZ4=system + -DWITH_NUMA=OFF + -DWITH_SSL=system + -DWITH_ZLIB=system + -DWITH_ZSTD=system + -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient + -DSHARED_LIB_PATCH_VERSION="0" + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DWITHOUT_SERVER=ON + ) + + cmake_src_configure +} + +multilib_src_install_all() { + doman \ + man/my_print_defaults.1 \ + man/perror.1 \ + man/zlib_decompress.1 + + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest index 121f9bd9440a..7054e5ad5b80 100644 --- a/dev-db/sqldeveloper/Manifest +++ b/dev-db/sqldeveloper/Manifest @@ -1,4 +1,4 @@ AUX sqldeveloper-r1 407 BLAKE2B 26bf826e6ccf1cd45b52e7cdf6e694d88570118c0e98cab83f66f078ed79fea36fb3fa6df67dc271a74faad4307996c4968f6d316d9fc71d1a5360804f39782e SHA512 cf089f58c9de3677dbaa7b0c4bdd81e234bffac4c25f5a433c7854068ca33b5a4165d8a5d24188890d5d8c60c209adee5267a255505b978a5a7f73646fd1dfbe -DIST sqldeveloper-21.4.3.063.0100-no-jre.zip 469919055 BLAKE2B 402fbb25c44c2205db1f8ecf3649028aee01d00f73c8f45cf4f415f42d1c507f9f4b5b23b6068165d7667897e1c314272f583dc6da02e70660c64422acee08c9 SHA512 4ab25d596ad383c4d09f315f3a9c43c285a36528e544b8052b8cc5cbed0c13fcd68ad12f660dc66ec087c7044accde6cdfac48518a86bc9c4cb2b89a8bb621fd -EBUILD sqldeveloper-21.4.3.063.0100.ebuild 2955 BLAKE2B 7893bd2fc18ef046b472e1439f4d0215e1d5cefae041bde716bfa355119522a039a94aa37f834ce9b03522d16d01b2be39fbe31468afc1c0c2c11bfc0be5c948 SHA512 de14aa3347e6d1be732dc87be906a735b96da3a311cf9cc189ef67acefaeb31204b47af68c04657becab4f5d8e019094f548029a671b5dd6aa89699c3c86306a +DIST sqldeveloper-22.2.0.173.2018-no-jre.zip 507930198 BLAKE2B 51c22825b7774d61ca5006150fa8566f35f03a64a755a2602c1aba9613f1d22e5efe9c46aa9b0d8295f349e980e9a0af115e39e8faa9bded4e154d8619f9b5f8 SHA512 daa3be1d20ed7a44e1f2a5e3e86166c6ea27050aceb0fe2ec46ade8557d68c8fc2c56c19e2d7a37c80005a0ac8040f3f7b0f9fd8345284e6615c616d36462627 +EBUILD sqldeveloper-22.2.0.173.2018.ebuild 2996 BLAKE2B a3942a8ebd42dc6d54192d188f2ba45312124784573b6e1d303f59d30cbba3ffdcf6262406299c64113a31cd8e659c5d322714149ec914c07c553651149d5fae SHA512 d650856919087b8e7d45a6e5bf9ac34f1dd4e8f35ec3c7e0e611dab1a72dc46387b752d7430e2020e869abf5f148cca5e3cd0003ebb0ca8a0e776c0ba73b683c MISC metadata.xml 496 BLAKE2B 46b421a2174ce825577a96c41ad103162b6b11127fa1512b12946e46e9698fbe24d1338e38e553ed49f28474497c4acfe2834dd70dee92ce4f34bad01f64ef5f SHA512 0cf75c543496d84e707cbfd146e95ba46ec3dc2779bfff990e2844200ff223d747fb30a6f90a988dd9d07efd060ecc27f9b5c3edcda15c51d3a23ccbd3abb3e8 diff --git a/dev-db/sqldeveloper/sqldeveloper-21.4.3.063.0100.ebuild b/dev-db/sqldeveloper/sqldeveloper-21.4.3.063.0100.ebuild deleted file mode 100644 index a6c582ff187f..000000000000 --- a/dev-db/sqldeveloper/sqldeveloper-21.4.3.063.0100.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop java-pkg-2 - -DESCRIPTION="Oracle SQL Developer is a graphical tool for database development" -HOMEPAGE="https://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html" -SRC_URI="${P}-no-jre.zip" -S="${WORKDIR}/${PN}" - -RESTRICT="bindist fetch" - -LICENSE="OTN" -SLOT="0" -KEYWORDS="-* ~amd64" - -IUSE="mssql mysql postgres sybase" - -RDEPEND=" - =virtual/jre-1.8:* - mssql? ( dev-java/jtds:1.3 ) - mysql? ( dev-java/jdbc-mysql:0 ) - postgres? ( dev-java/jdbc-postgresql:0 ) - sybase? ( dev-java/jtds:1.3 ) -" -BDEPEND="app-arch/unzip" - -S="${WORKDIR}/${PN}" - -QA_PREBUILT=" - opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so -" - -pkg_nofetch() { - einfo "Please go to" - einfo " ${HOMEPAGE}" - einfo "and download" - einfo " Oracle SQL Developer for other platforms" - einfo " ${SRC_URI}" - einfo "and move it to /var/cache/distfiles" -} - -src_prepare() { - default - find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} + || die - sed -i 's|"`dirname $0`"|/opt/sqldeveloper|' sqldeveloper.sh || die - - rm -r netbeans/platform/modules/lib/i386 || die - rm -r modules/javafx || die - - # they both use jtds, enabling one of them also enables the other one - if use mssql && ! use sybase; then - einfo "You requested MSSQL support, this also enables Sybase support." - fi - if use sybase && ! use mssql; then - einfo "You requested Sybase support, this also enables MSSQL support." - fi - - if use mssql || use sybase; then - echo "AddJavaLibFile $(java-pkg_getjars jtds-1.3)" >> sqldeveloper/bin/sqldeveloper.conf || die - fi - - if use mysql; then - echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf || die - fi - - if use postgres; then - echo "AddJavaLibFile $(java-pkg_getjars jdbc-postgresql)" >> sqldeveloper/bin/sqldeveloper.conf || die - fi -} - -src_install() { - insinto /opt/${PN} - doins -r {configuration,d{ataminer,ropins},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,orakafka,rdbms,s{leepycat,ql{developer,j},vnkit}} - fperms +x /opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so - - dodir /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log - fperms 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log - - newbin "${FILESDIR}"/${PN}-r1 ${PN} - - newicon icon.png ${PN}-32x32.png - make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32 - - # This is normally called automatically by java-pkg_dojar, which - # hasn't been used above. We need to create package.env to help the - # launcher select the correct VM. - java-pkg_do_write_ -} - -pkg_postinst() { - echo - einfo "If you want to use the TNS connection type you need to set up the" - einfo "TNS_ADMIN environment variable to point to the directory your" - einfo "tnsnames.ora resides in." - echo -} diff --git a/dev-db/sqldeveloper/sqldeveloper-22.2.0.173.2018.ebuild b/dev-db/sqldeveloper/sqldeveloper-22.2.0.173.2018.ebuild new file mode 100644 index 000000000000..98ac3b355667 --- /dev/null +++ b/dev-db/sqldeveloper/sqldeveloper-22.2.0.173.2018.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop java-pkg-2 + +DESCRIPTION="Oracle SQL Developer is a graphical tool for database development" +HOMEPAGE="https://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html" +SRC_URI="${P}-no-jre.zip" +S="${WORKDIR}/${PN}" + +RESTRICT="bindist fetch" + +LICENSE="OTN" +SLOT="0" +KEYWORDS="-* ~amd64" + +IUSE="mssql mysql postgres sybase" + +RDEPEND=" + dev-java/openjdk:11[javafx] + virtual/jre:11 + mssql? ( dev-java/jtds:1.3 ) + mysql? ( dev-java/jdbc-mysql:0 ) + postgres? ( dev-java/jdbc-postgresql:0 ) + sybase? ( dev-java/jtds:1.3 ) +" +BDEPEND="app-arch/unzip" + +S="${WORKDIR}/${PN}" + +QA_PREBUILT=" + opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so +" + +pkg_nofetch() { + einfo "Please go to" + einfo " https://www.oracle.com/tools/downloads/sqldev-downloads.html" + einfo "and download" + einfo " Oracle SQL Developer for other platforms" + einfo " ${SRC_URI}" + einfo "and move it to /var/cache/distfiles" +} + +src_prepare() { + default + find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} + || die + sed -i 's|"`dirname $0`"|/opt/sqldeveloper|' sqldeveloper.sh || die + + rm -r netbeans/platform/modules/lib/i386 || die + rm -r modules/javafx || die + + # they both use jtds, enabling one of them also enables the other one + if use mssql && ! use sybase; then + einfo "You requested MSSQL support, this also enables Sybase support." + fi + if use sybase && ! use mssql; then + einfo "You requested Sybase support, this also enables MSSQL support." + fi + + if use mssql || use sybase; then + echo "AddJavaLibFile $(java-pkg_getjars jtds-1.3)" >> sqldeveloper/bin/sqldeveloper.conf || die + fi + + if use mysql; then + echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf || die + fi + + if use postgres; then + echo "AddJavaLibFile $(java-pkg_getjars jdbc-postgresql)" >> sqldeveloper/bin/sqldeveloper.conf || die + fi +} + +src_install() { + insinto /opt/${PN} + doins -r {configuration,d{ataminer,ropins},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,orakafka,rdbms,s{leepycat,ql{developer,j},vnkit}} + fperms +x /opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so + + dodir /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log + fperms 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log + + newbin "${FILESDIR}"/${PN}-r1 ${PN} + + newicon icon.png ${PN}-32x32.png + make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32 + + # This is normally called automatically by java-pkg_dojar, which + # hasn't been used above. We need to create package.env to help the + # launcher select the correct VM. + java-pkg_do_write_ +} + +pkg_postinst() { + echo + einfo "If you want to use the TNS connection type you need to set up the" + einfo "TNS_ADMIN environment variable to point to the directory your" + einfo "tnsnames.ora resides in." + echo +} -- cgit v1.2.3