Received: by mail.netbsd.org (Postfix, from userid 605) id 8FF7E84EDD; Sun, 6 Jan 2019 09:09:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 15E0A84D8A for ; Sun, 6 Jan 2019 09:09:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id qbbt0j_1a-ND for ; Sun, 6 Jan 2019 09:09:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7158284CD8 for ; Sun, 6 Jan 2019 09:09:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6AFF7FB16; Sun, 6 Jan 2019 09:09:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154676575653970" MIME-Version: 1.0 Date: Sun, 6 Jan 2019 09:09:16 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/databases/p5-DBD-mysql To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20190106090916.6AFF7FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154676575653970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Sun Jan 6 09:09:16 UTC 2019 Modified Files: pkgsrc/databases/p5-DBD-mysql: Makefile distinfo Added Files: pkgsrc/databases/p5-DBD-mysql/patches: patch-dbdimp.c Log Message: p5-DBD-mysql: Fix SQL syntax for statements that have "...limit = ?" from upstream commit 7805e828fad02d37f913228019cf352636fcfe36 To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 pkgsrc/databases/p5-DBD-mysql/Makefile cvs rdiff -u -r1.33 -r1.34 pkgsrc/databases/p5-DBD-mysql/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/databases/p5-DBD-mysql/patches/patch-dbdimp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154676575653970 Content-Disposition: inline Content-Length: 2725 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/p5-DBD-mysql/Makefile diff -u pkgsrc/databases/p5-DBD-mysql/Makefile:1.75 pkgsrc/databases/p5-DBD-mysql/Makefile:1.76 --- pkgsrc/databases/p5-DBD-mysql/Makefile:1.75 Sat Nov 24 04:14:05 2018 +++ pkgsrc/databases/p5-DBD-mysql/Makefile Sun Jan 6 09:09:16 2019 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.75 2018/11/24 04:14:05 wen Exp $ +# $NetBSD: Makefile,v 1.76 2019/01/06 09:09:16 markd Exp $ DISTNAME= DBD-mysql-4.049 PKGNAME= p5-${DISTNAME} +PKGREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DBD/} Index: pkgsrc/databases/p5-DBD-mysql/distinfo diff -u pkgsrc/databases/p5-DBD-mysql/distinfo:1.33 pkgsrc/databases/p5-DBD-mysql/distinfo:1.34 --- pkgsrc/databases/p5-DBD-mysql/distinfo:1.33 Sat Nov 24 04:14:05 2018 +++ pkgsrc/databases/p5-DBD-mysql/distinfo Sun Jan 6 09:09:16 2019 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.33 2018/11/24 04:14:05 wen Exp $ +$NetBSD: distinfo,v 1.34 2019/01/06 09:09:16 markd Exp $ SHA1 (DBD-mysql-4.049.tar.gz) = 97566ab690f09a50c3b995eaed1068aa8bacac46 RMD160 (DBD-mysql-4.049.tar.gz) = 1948629385701f60fe2e1ed33af734c2da4b2b12 SHA512 (DBD-mysql-4.049.tar.gz) = e0e1376927be3afd366e3fff4e221e8ecc57339644c8e420e34b9e45a802e2a2a2c294fdd7ca0c59a84d6236f7d0e8fd2000b5da8f6839444d3318e3b7d9b422 Size (DBD-mysql-4.049.tar.gz) = 160889 bytes +SHA1 (patch-dbdimp.c) = ee2bb85eab5b25f088b655e0ff47f1af6a7d16d0 Added files: Index: pkgsrc/databases/p5-DBD-mysql/patches/patch-dbdimp.c diff -u /dev/null pkgsrc/databases/p5-DBD-mysql/patches/patch-dbdimp.c:1.1 --- /dev/null Sun Jan 6 09:09:16 2019 +++ pkgsrc/databases/p5-DBD-mysql/patches/patch-dbdimp.c Sun Jan 6 09:09:16 2019 @@ -0,0 +1,28 @@ +$NetBSD: patch-dbdimp.c,v 1.1 2019/01/06 09:09:16 markd Exp $ + +Fix SQL syntax for statements that have "...limit = ?" +commit 7805e828fad02d37f913228019cf352636fcfe36 + +--- dbdimp.c.orig 2018-11-17 18:49:08.000000000 +0000 ++++ dbdimp.c +@@ -604,9 +604,9 @@ static char *parse_params( + /* + it would be good to be able to handle any number of cases and orders + */ +- if ((*statement_ptr == 'l' || *statement_ptr == 'L') && +- (!strncmp(statement_ptr+1, "imit ", 5) || +- !strncmp(statement_ptr+1, "IMIT ", 5))) ++ if (((*statement_ptr == ' ') || (*statement_ptr == '\n') || (*statement_ptr == '\t')) && ++ (!strncmp(statement_ptr+1, "limit ", 5) || ++ !strncmp(statement_ptr+1, "LIMIT ", 5))) + { + limit_flag = 1; + } +@@ -780,6 +780,7 @@ static char *parse_params( + + /* in case this is a nested LIMIT */ + case ')': ++ case '=': + limit_flag = 0; + *ptr++ = *statement_ptr++; + break; --_----------=_154676575653970--