ports/85915: Update port: net/libnss-mysql to 1.5
Vasil Dimov
vd at datamax.bg
Fri Sep 9 17:20:13 UTC 2005
>Number: 85915
>Category: ports
>Synopsis: Update port: net/libnss-mysql to 1.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 09 17:20:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Vasil Dimov
>Release: FreeBSD 5.4-STABLE i386
>Organization:
DataMax
>Environment:
>Description:
Update libnss-mysql from 1.4 to 1.5
This is a bugfix release mainly fixing the "timeout bug", discovered by
Oliver Dumat (ports/82476) and fixed with ports/82731, so we do not need
files/patch-src::mysql.c and files/patch-src::nss_mysql.h anymore.
Other changes I have made to the port:
* circumvent configure's "WARNING: you should use --build, --host, --target"
by defining CONFIGURE_TARGET appropriately
* fix/sync with 1.5 files/patch-Makefile.in
>How-To-Repeat:
>Fix:
--- libnss-mysql_1.4-1.5.diff begins here ---
diff -urN --exclude=CVS libnss-mysql-1.4_1/Makefile libnss-mysql/Makefile
--- libnss-mysql-1.4_1/Makefile Fri Sep 9 19:43:06 2005
+++ libnss-mysql/Makefile Fri Sep 9 19:23:35 2005
@@ -6,8 +6,7 @@
#
PORTNAME= libnss-mysql
-PORTVERSION= 1.4
-PORTREVISION= 1
+PORTVERSION= 1.5
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= libnss-mysql
@@ -16,6 +15,7 @@
COMMENT= NSS module using a MySQL database for backend
GNU_CONFIGURE= yes
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-mysql-lib=${LOCALBASE}/lib/mysql \
--with-mysql-inc=${LOCALBASE}/include/mysql
INSTALLS_SHLIB= yes
diff -urN --exclude=CVS libnss-mysql-1.4_1/distinfo libnss-mysql/distinfo
--- libnss-mysql-1.4_1/distinfo Sun May 22 16:14:09 2005
+++ libnss-mysql/distinfo Fri Sep 9 19:07:45 2005
@@ -1,2 +1,2 @@
-MD5 (libnss-mysql-1.4.tar.gz) = 262f03df6edc0b5b8f2abc81a619eb6d
-SIZE (libnss-mysql-1.4.tar.gz) = 323660
+MD5 (libnss-mysql-1.5.tar.gz) = a34d41a38e426ba26ffde07d03beef8e
+SIZE (libnss-mysql-1.5.tar.gz) = 333385
diff -urN --exclude=CVS libnss-mysql-1.4_1/files/patch-Makefile.in libnss-mysql/files/patch-Makefile.in
--- libnss-mysql-1.4_1/files/patch-Makefile.in Sun Nov 14 12:26:48 2004
+++ libnss-mysql/files/patch-Makefile.in Fri Sep 9 19:40:06 2005
@@ -1,21 +1,22 @@
---- Makefile.in.orig Sat Nov 13 17:22:34 2004
-+++ Makefile.in Sun Nov 14 11:23:31 2004
-@@ -456,16 +456,12 @@
+--- Makefile.in.orig Sun Sep 4 06:34:39 2005
++++ Makefile.in Fri Sep 9 19:39:38 2005
+@@ -617,16 +617,11 @@
install-data-hook:
- @if test ! -f ${DESTDIR}${sysconfdir}/libnss-mysql.cfg; then \
- ${srcdir}/aux/mkinstalldirs ${DESTDIR}${sysconfdir}; \
+- ${srcdir}/aux/mkinstalldirs ${DESTDIR}${sysconfdir}; \
++ ${mkinstalldirs} ${DESTDIR}${sysconfdir}; \
${INSTALL_DATA} ${srcdir}/sample/@OS@/libnss-mysql.cfg \
- ${DESTDIR}${sysconfdir}/libnss-mysql.cfg; \
- fi
- @if test ! -f ${DESTDIR}${sysconfdir}/libnss-mysql-root.cfg; then \
+- ${srcdir}/aux/mkinstalldirs ${DESTDIR}${sysconfdir}; \
+ ${DESTDIR}${sysconfdir}/libnss-mysql.cfg-dist; \
- ${srcdir}/aux/mkinstalldirs ${DESTDIR}${sysconfdir}; \
${INSTALL_DATA} -m 600 ${srcdir}/sample/@OS@/libnss-mysql-root.cfg \
- ${DESTDIR}${sysconfdir}/libnss-mysql-root.cfg; \
- fi
-+ ${DESTDIR}${sysconfdir}/libnss-mysql-root.cfg-dist; \
++ ${DESTDIR}${sysconfdir}/libnss-mysql-root.cfg-dist;
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS libnss-mysql-1.4_1/files/patch-src::mysql.c libnss-mysql/files/patch-src::mysql.c
--- libnss-mysql-1.4_1/files/patch-src::mysql.c Sun Jul 31 00:48:56 2005
+++ libnss-mysql/files/patch-src::mysql.c Thu Jan 1 02:00:00 1970
@@ -1,15 +0,0 @@
---- src/mysql.c.orig Tue Jun 28 16:05:53 2005
-+++ src/mysql.c Tue Jun 28 16:18:17 2005
-@@ -137,10 +137,11 @@
- _nss_mysql_set_options (sql_server_t *server)
- {
- DN ("_nss_mysql_set_options")
-+ static const unsigned def_timeout = DEF_TIMEOUT;
-
- DENTER
-
-- mysql_options(&ci.link, MYSQL_OPT_CONNECT_TIMEOUT, DEF_TIMEOUT);
-+ mysql_options(&ci.link, MYSQL_OPT_CONNECT_TIMEOUT, &def_timeout);
- mysql_options(&ci.link, MYSQL_READ_DEFAULT_GROUP, "libnss-mysql");
-
- DEXIT
diff -urN --exclude=CVS libnss-mysql-1.4_1/files/patch-src::nss_mysql.h libnss-mysql/files/patch-src::nss_mysql.h
--- libnss-mysql-1.4_1/files/patch-src::nss_mysql.h Sun Jul 31 00:48:56 2005
+++ libnss-mysql/files/patch-src::nss_mysql.h Thu Jan 1 02:00:00 1970
@@ -1,11 +0,0 @@
---- src/nss_mysql.h.orig Tue Jun 28 16:06:14 2005
-+++ src/nss_mysql.h Tue Jun 28 16:17:30 2005
-@@ -70,7 +70,7 @@
- #define MAX_QUERY_ATTEMPTS 3 /* # of query retries */
-
- /* Default initializers */
--#define DEF_TIMEOUT "3"
-+#define DEF_TIMEOUT 3
-
- #ifdef DEBUG
- void _nss_mysql_debug (char *fmt, ...);
--- libnss-mysql_1.4-1.5.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list