The issue occurs because the package tries to use the res_n* functions (specifically res_ninit, res_nsearch and res_nclose) from resolv.h which do not exist when using musl. The issue does not exist with version 8.0.21, which I had installed previously. Reproducible: Always Steps to Reproduce: 1. Use musl libc 2. Emerge dev-db/mysql-connector-c-8.0.22 Actual Results: libmysql/dns_srv.cc fails to compile. Expected Results: The package should compile. Portage 3.0.9 (python 3.8.6-final-0, default/linux/amd64/17.0/musl, gcc-9.3.0, musl-1.2.1-r1, 5.4.80-gentoo-r1 x86_64) ================================================================= System Settings ================================================================= System uname: Linux-5.4.80-gentoo-r1-x86_64-Intel_Xeon_Processor_-Skylake,_IBRS-with-libc KiB Mem: 1989232 total, 331508 free KiB Swap: 0 total, 0 free Timestamp of repository gentoo: Wed, 23 Dec 2020 04:30:01 +0000 Head commit of repository gentoo: 953c7fc11cf56146a6a606a20bdea6867eafddf5 Head commit of repository 2xsaiko: 0e21cf74267d98ff102802544d4a3e891cc4df57 Timestamp of repository musl: Tue, 22 Dec 2020 23:05:07 +0000 Head commit of repository musl: ba943b6255a1e8673c54438be295ccf89ea2e0bc sh bash 5.0_p18 ld GNU ld (Gentoo 2.34 p6) 2.34.0 app-shells/bash: 5.0_p18::gentoo dev-lang/perl: 5.30.3::gentoo dev-lang/python: 3.8.6::gentoo, 3.9.0::gentoo dev-util/cmake: 3.17.4-r1::gentoo sys-apps/baselayout: 2.7::gentoo sys-apps/openrc: 0.42.1::gentoo sys-apps/sandbox: 2.20::gentoo sys-devel/autoconf: 2.69-r5::gentoo sys-devel/automake: 1.16.2-r1::gentoo sys-devel/binutils: 2.34-r2::gentoo sys-devel/gcc: 9.3.0-r2::musl sys-devel/gcc-config: 2.3.2-r1::gentoo sys-devel/libtool: 2.4.6-r6::gentoo sys-devel/make: 4.3::gentoo sys-kernel/linux-headers: 5.4-r1::gentoo (virtual/os-headers) sys-libs/musl: 1.2.1-r1::gentoo Repositories: gentoo location: /var/db/repos/gentoo sync-type: rsync sync-uri: rsync://rsync.gentoo.org/gentoo-portage priority: -1000 sync-rsync-extra-opts: sync-rsync-verify-jobs: 1 sync-rsync-verify-metamanifest: yes sync-rsync-verify-max-age: 24 2xsaiko location: /var/db/repos/2xsaiko sync-type: git sync-uri: https://git.sr.ht/~dblsaiko/ebuilds masters: gentoo musl location: /var/db/repos/musl sync-type: git sync-uri: https://github.com/gentoo-mirror/musl.git masters: gentoo ACCEPT_KEYWORDS="amd64" ACCEPT_LICENSE="@FREE" CBUILD="x86_64-gentoo-linux-musl" CFLAGS="-O2 -pipe -march=native" CHOST="x86_64-gentoo-linux-musl" CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo" CXXFLAGS="-O2 -pipe -march=native" DISTDIR="/var/cache/distfiles" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR" FCFLAGS="-O2 -pipe -march=native" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync network-sandbox news noinfo parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-O2 -pipe -march=native" GENTOO_MIRRORS="https://mirror.eu.oneandone.net/linux/distributions/gentoo/gentoo/ https://mirror.netcologne.de/gentoo/ https://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ https://ftp.halifax.rwth-aachen.de/gentoo/ https://ftp.fau.de/gentoo https://ftp-stud.hs-esslingen.de/pub/Mirrors/gentoo/" INSTALL_MASK="charset.alias locale.alias" LANG="C.UTF8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" PKGDIR="/var/cache/binpkgs" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp" USE="acl amd64 bzip2 cli crypt dri fortran iconv ipv6 libglvnd libtirpc ncurses nls nptl openmp pam pcre readline seccomp split-usr ssl tcpd unicode vhosts xattr zlib" ABI_X86="64" ADA_TARGET="gnat_2018" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="mmx mmxext sse sse2" ELIBC="musl" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="libinput" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-2 php7-3 php7-4" POSTGRES_TARGETS="postgres10 postgres11" PYTHON_SINGLE_TARGET="python3_8" PYTHON_TARGETS="python2_7 python3_8" RUBY_TARGETS="ruby25 ruby26" USERLAND="GNU" VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa dummy v4l" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, LC_ALL, LINGUAS, MAKEOPTS, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Created attachment 679302 [details] build.log
Created attachment 710094 [details, diff] mysql-connector-c musl patch This is harder to solve, it requires detection for availability of the res_n* suite of functions. As a workaround to make this somewhat operational you can apply this (conditional) patch
Nice, that at least makes it compile. Unfortunately I can't test how well it works since I don't actually use mysql on this box. Thanks!
My attempt at upstreaming a fix: https://github.com/mysql/mysql-server/pull/385
hmmm, is res_ninit supposed to be defined as macro? At least on solaris it's a function, so this patch wouldn't work there
*** This bug has been marked as a duplicate of bug 713370 ***
*** Bug 713370 has been marked as a duplicate of this bug. ***
(In reply to Fabian Groffen from comment #5) > hmmm, is res_ninit supposed to be defined as macro? At least on solaris > it's a function, so this patch wouldn't work there Fabian do you think something like this would be okay? I modified Stijn Tintel's PR a little bit. diff --git a/libmysql/dns_srv.cc b/libmysql/dns_srv.cc index dec43644..3223274a 100644 --- a/libmysql/dns_srv.cc +++ b/libmysql/dns_srv.cc @@ -41,14 +41,21 @@ static bool get_dns_srv(Dns_srv_data &data, const char *dnsname, int &error) { struct __res_state state {}; +#if defined(__GLIBC__) res_ninit(&state); +#endif unsigned char query_buffer[NS_PACKETSZ]; bool ret = true; data.clear(); +#if defined(__GLIBC__) int res = res_nsearch(&state, dnsname, ns_c_in, ns_t_srv, query_buffer, sizeof(query_buffer)); +#else + int res = res_search(dnsname, ns_c_in, ns_t_srv, query_buffer, + sizeof(query_buffer)); +#endif if (res >= 0) { ns_msg msg; @@ -84,7 +91,9 @@ static bool get_dns_srv(Dns_srv_data &data, const char *dnsname, int &error) { error = h_errno; } +#if defined(__GLIBC__) res_nclose(&state); +#endif return ret; }
I personally feel you better take a look at my patch in that case, since it would allow easier/more localised updating of the defines. Darwin and Solaris for instance defines the n* variants as well, so disabling there because musl doesn't have them is a waste.
(In reply to Fabian Groffen from comment #9) > I personally feel you better take a look at my patch in that case, since it > would allow easier/more localised updating of the defines. Darwin and > Solaris for instance defines the n* variants as well, so disabling there > because musl doesn't have them is a waste. Can you make a version which can be applied unconditionally?
no: (In reply to Fabian Groffen from comment #2) > Created attachment 710094 [details, diff] [details, diff] > mysql-connector-c musl patch > > This is harder to solve, it requires detection for availability of the > res_n* suite of functions. > > As a workaround to make this somewhat operational you can apply this > (conditional) patch I don't know how to do AC_CHECK_FUNCS with cmake.
(In reply to Fabian Groffen from comment #11) > I don't know how to do AC_CHECK_FUNCS with cmake. Oh, right. I didn't take your original comment to say that you didn't know how, I thought it was more as a proof of concept pending comment from maintainers.
(In reply to Fabian Groffen from comment #9) > I personally feel you better take a look at my patch in that case, since it > would allow easier/more localised updating of the defines. Darwin and > Solaris for instance defines the n* variants as well, so disabling there > because musl doesn't have them is a waste. Okay, got you Fabian, and sorry for late reply was not in cc list. I couldn't you configure.ac, but used CMake to add in your patch conditionally. See if it looks any better diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 1bd8bd54..ac0d0937 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -423,6 +423,10 @@ 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) + # Verify that libmysql_api_test runs OK ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD COMMAND libmysql_api_test diff --git a/libmysql/dns_srv.cc b/libmysql/dns_srv.cc index dec43644..f5c8f6f6 100644 --- a/libmysql/dns_srv.cc +++ b/libmysql/dns_srv.cc @@ -37,6 +37,16 @@ #include <netdb.h> #include <resolv.h> +#if !defined(HAVE_RES_NINIT_FUNCTION) +#define res_ninit(X) (void)X +#endif +#if !defined(HAVE_RES_NSEARCH_FUNCTION) +#define res_nsearch(X,D,I,S,B,L) res_search(D,I,S,B,L) +#endif +#if !define(HAVE_RES_NCLOSE_FUNCTION) +#define res_nclose(X) (void)X +#endif + // POSIX version static bool get_dns_srv(Dns_srv_data &data, const char *dnsname, int &error) {
If that does the trick of setting the define when necessary, then this is most likely the best way, and perhaps acceptable upstream. I'm not in the position to test at this point, but I'll try to remember to do so. Thanks!
(In reply to Fabian Groffen from comment #14) > If that does the trick of setting the define when necessary, then this is > most likely the best way, and perhaps acceptable upstream. I'm not in the > position to test at this point, but I'll try to remember to do so. Thanks! I'm doing the test :)
(In reply to Fabian Groffen from comment #14) > If that does the trick of setting the define when necessary, then this is > most likely the best way, and perhaps acceptable upstream. I'm not in the > position to test at this point, but I'll try to remember to do so. Thanks! Yep, built fine.
However it would be very helpful if someone explained a bit what the macro "#define res_nclose(X) (void)X" is doing
(In reply to listout from comment #17) > However it would be very helpful if someone explained a bit what the macro > "#define res_nclose(X) (void)X" is doing There is nothing to close when no state is being used, so could have also defined it empty, but to avoid a compiler warning about an unused variable, I do a (void)-cast, which is a common way to pacify the compiler.
(In reply to Fabian Groffen from comment #18) > (In reply to listout from comment #17) > > However it would be very helpful if someone explained a bit what the macro > > "#define res_nclose(X) (void)X" is doing > > There is nothing to close when no state is being used, so could have also > defined it empty, but to avoid a compiler warning about an unused variable, > I do a (void)-cast, which is a common way to pacify the compiler. Thanks!
There is flaw in this patch. Works fines on musl, but complains on glibc about redefinition. The way I was doing checking through CMakeLists.txt is wrong. I'll have to update.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7808b289d1eb16cef25c2de6411cc580b97c5c commit 0f7808b289d1eb16cef25c2de6411cc580b97c5c Author: brahmajit das <brahmajit.xyz@gmail.com> AuthorDate: 2022-07-15 05:52:59 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2022-07-15 07:10:07 +0000 dev-db/mysql-connector-c: Use res_n* functions only on GLIBC The issue occurs because the package tries to use the res_n* functions (specifically res_ninit, res_nsearch and res_nclose) from resolv.h which do not exist when using musl. So we are falling back to non-thread-safe functions from resolv.h Closes: https://bugs.gentoo.org/761352 Signed-off-by: brahmajit das <brahmajit.xyz@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/26353 Signed-off-by: Sam James <sam@gentoo.org> .../files/mysql-connector-c-8.0.27-res_n.patch | 49 ++++++++ .../mysql-connector-c-8.0.27-r1.ebuild | 123 +++++++++++++++++++++ 2 files changed, 172 insertions(+)
