commit: 8063b7feb133c7faa07bd1028f553a102ac0d968 Author: Jaco Kroon <jkroon <AT> gentoo <DOT> org> AuthorDate: Wed Jan 28 03:11:41 2026 +0000 Commit: Jaco Kroon <jkroon <AT> gentoo <DOT> org> CommitDate: Wed Jan 28 03:11:41 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8063b7fe
sys-auth/libnss-mysql: drop 1.5_p20060915-r5 Signed-off-by: Jaco Kroon <jkroon <AT> gentoo.org> sys-auth/libnss-mysql/Manifest | 1 - .../libnss-mysql-1.5_p20060915-mariadb10.2.patch | 35 ------------ .../libnss-mysql-1.5_p20060915-multiarch.patch | 21 -------- ...nss-mysql-1.5_p20060915-no-automagic-debug.diff | 14 ----- .../libnss-mysql-1.5_p20060915-r5.ebuild | 62 ---------------------- 5 files changed, 133 deletions(-) diff --git a/sys-auth/libnss-mysql/Manifest b/sys-auth/libnss-mysql/Manifest index ecf5436ba25d..e92fa7de70cd 100644 --- a/sys-auth/libnss-mysql/Manifest +++ b/sys-auth/libnss-mysql/Manifest @@ -1,2 +1 @@ DIST libnss-mysql-1.7.1.tar.gz 388255 BLAKE2B bf3a83a5f50b0979bd189bd9a6068c4899991c5c7c78b3725d610b40570007c8a9e2f99f63c66d7807fdad6b7c6bae9fd277e6bec5163ab42bced31f8e9a1d09 SHA512 0b633558f865dc9aa2f9353cee112c1ce336c951a554b0f5dd74cbd03c3675a0dffb711471d418fb8808180f95f9d2e052ae73d528c197c9585320fd2f77bee7 -DIST libnss-mysql-20060915.tgz 689970 BLAKE2B 147b5bb6c2fb53ca18f6db87054fa6665829671e9abdd7aa439287e301fc2d5ed4c9e2e5968ce6dacb4f74d86debb0c26d5cda56c6fe8f64e92ff3c9eba26a85 SHA512 fc92438b413b175b9bcead222013eab3bf63088a33ece0c4b6cc69edbefb9cc9145138ce786059acf502c2378a2af45588a5a506e45928b9ac600fe05e62e0c7 diff --git a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch deleted file mode 100644 index b669d01c79f3..000000000000 --- a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-mariadb10.2.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/src/mysql.c -+++ b/src/mysql.c -@@ -196,6 +196,7 @@ - int retval; - sql_server_t *server = &conf.sql.server; - unsigned int port; -+ my_bool reconnect = 1; - - DENTER - -@@ -238,8 +239,9 @@ - DSRETURN (NSS_UNAVAIL) - } - ci.valid = ntrue; -- ci.link.reconnect = 0; /* Safety: We can't let MySQL assume socket is -- still valid; see _nss_mysql_validate_socket */ -+ /* Safety: We can't let MySQL assume socket is still valid; -+ see _nss_mysql_validate_socket */ -+ mysql_options(&ci.link, MYSQL_OPT_RECONNECT, &reconnect); - DSRETURN (NSS_SUCCESS) - } - _nss_mysql_log (LOG_ALERT, "Connection to server '%s' failed: %s", ---- a/src/nss_mysql.h -+++ b/src/nss_mysql.h -@@ -72,6 +72,10 @@ typedef nss_status_t NSS_STATUS; - /* Default initializers */ - #define DEF_TIMEOUT 3 - -+#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001 -+#define my_bool bool -+#endif -+ - #ifdef DEBUG - void _nss_mysql_debug (char *fmt, ...); - #define DEBUG_FILE "/tmp/libnss-mysql-debug.log" diff --git a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-multiarch.patch b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-multiarch.patch deleted file mode 100644 index 3a85b601b7e6..000000000000 --- a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-multiarch.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- libnss-mysql-1.5/acinclude.m4 -+++ libnss-mysql-1.5.sal/acinclude.m4 -@@ -80,6 +80,18 @@ - fi - done - -+dnl Test also $libdir path -+if test -f "$libdir/libmysqlclient.so" -+then -+ MYSQL_LIB_DIR="$libdir" -+ break -+fi -+if test -f "$libdir/mysql/libmysqlclient.so" -+then -+ MYSQL_LIB_DIR="$libdir/mysql" -+ break -+fi -+ - if test -n "$MYSQL_LIB_DIR" - then - AC_MSG_RESULT([$MYSQL_LIB_DIR]) diff --git a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-no-automagic-debug.diff b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-no-automagic-debug.diff deleted file mode 100644 index 292ae9e19476..000000000000 --- a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-no-automagic-debug.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -NuarwPbB libnss-mysql.orig/configure.in libnss-mysql/configure.in ---- libnss-mysql.orig/configure.in 2005-09-04 03:34:00.000000000 +0000 -+++ libnss-mysql/configure.in 2010-09-08 18:12:24.577317098 +0000 -@@ -38,7 +38,9 @@ - AC_ARG_WITH(mysql, - [ --with-mysql=DIR Location of your MySQL installation]) - AC_ARG_ENABLE(debug, -- [ --enable-debug Enable debug (see DEBUGGING)], -+ [ --enable-debug Enable debug (see DEBUGGING)]) -+ -+AS_IF([test "x$enable_debug" = "xyes"], - [AC_DEFINE([DEBUG], 1, [Enable debug])]) - - case "$target_os" in diff --git a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r5.ebuild b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r5.ebuild deleted file mode 100644 index ddac7e2b335e..000000000000 --- a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r5.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -KEYWORDS="amd64 ~ppc ~sparc x86" - -DESCRIPTION="NSS MySQL Library" -HOMEPAGE="http://libnss-mysql.sourceforge.net/"; -SRC_URI="http://libnss-mysql.sourceforge.net/snapshot/${PN}-${PV/1.5_p/}.tgz"; -LICENSE="GPL-2" -SLOT="0" -IUSE="debug" - -DEPEND="dev-db/mysql-connector-c:=" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}" - -DOCS=( AUTHORS DEBUGGING FAQ INSTALL NEWS README THANKS - TODO UPGRADING ChangeLog -) - -PATCHES=( - "${FILESDIR}"/${P}-no-automagic-debug.diff - "${FILESDIR}"/${PN}-1.5_p20060915-multiarch.patch - "${FILESDIR}"/${PN}-1.5_p20060915-mariadb10.2.patch -) - -src_prepare() { - default - - mv configure.{in,ac} || die - - eautoreconf -} - -src_configure() { - # Usually, authentication libraries don't belong into usr. - # But here, it's required that the lib is in the same dir - # as libmysql, because else failures may occur on boot if - # udev tries to access a user / group that doesn't exist - # on the system before /usr is mounted. - econf --libdir="/usr/$(get_libdir)" \ - $(use_enable debug) -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - newdoc sample/README README.sample - - local subdir - for subdir in sample/{linux,freebsd,complex,minimal} ; do - docinto "${subdir}" - dodoc "${subdir}/"{*.sql,*.cfg} - done -}
