- Update to 1.5

PR:		ports/85915
Submitted by:	Vasil Dimov <vd@datamax.bg> (maintainer)
This commit is contained in:
Pav Lucistnik 2005-09-10 21:50:10 +00:00
parent 3081658de5
commit 166f8a40eb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=142390
5 changed files with 11 additions and 36 deletions

View file

@ -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 @@ MAINTAINER= vd@datamax.bg
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

View file

@ -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

View file

@ -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:

View file

@ -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

View file

@ -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, ...);