Date: Tue, 24 May 2016 21:26:12 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415812 - in head/databases/db5: . files Message-ID: <201605242126.u4OLQCPo039645@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Tue May 24 21:26:12 2016 New Revision: 415812 URL: https://svnweb.freebsd.org/changeset/ports/415812 Log: Fix strncat() misuse, and enable TCL option. PR: 209730 Submitted by: gahr@ Added: head/databases/db5/files/patch-lang_tcl_tcl__db.c (contents, props changed) head/databases/db5/files/patch-lang_tcl_tcl__env.c (contents, props changed) head/databases/db5/files/patch-lang_tcl_tcl__seq.c (contents, props changed) Modified: head/databases/db5/Makefile Modified: head/databases/db5/Makefile ============================================================================== --- head/databases/db5/Makefile Tue May 24 20:32:55 2016 (r415811) +++ head/databases/db5/Makefile Tue May 24 21:26:12 2016 (r415812) @@ -32,8 +32,9 @@ PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} MAKE_ARGS+= docdir=${DOCSDIR} +CFLAGS+= -Wall -Wextra -OPTIONS_DEFINE= CRYPTO L10N SQL JAVA DOCS +OPTIONS_DEFINE= CRYPTO L10N SQL JAVA DOCS TCL # WARNING: DO NOT ADD TCL TO OPTIONS: # On FreeBSD 10.3 this causes a heap of warnings of the following kind # and is deemed unsafe. @@ -60,10 +61,10 @@ JAVA_VARS= DBLIBS+=libdb_java JAVA_VERS JAVA_CONFIGURE_ENABLE= java JAVA_CPPFLAGS= -I"${JAVA_HOME}/include" JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" JAVACFLAGS="-Xlint:unchecked" -#TCL_CONFIGURE_ENABLE= tcl -#TCL_USES= tcl:85+ -#TCL_CONFIGURE_WITH= tcl=${TCL_LIBDIR} -#TCL_VARS= DBLIBS+=libdb_tcl +TCL_CONFIGURE_ENABLE= tcl +TCL_USES= tcl:85+ +TCL_CONFIGURE_WITH= tcl=${TCL_LIBDIR} +TCL_VARS= DBLIBS+=libdb_tcl DOCS_INSTALL_TARGET= install_docs .include <bsd.port.options.mk> Added: head/databases/db5/files/patch-lang_tcl_tcl__db.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/db5/files/patch-lang_tcl_tcl__db.c Tue May 24 21:26:12 2016 (r415812) @@ -0,0 +1,30 @@ +--- lang/tcl/tcl_db.c.orig 2013-09-09 15:35:07 UTC ++++ lang/tcl/tcl_db.c +@@ -3708,9 +3708,10 @@ tcl_DbGetFlags(interp, objc, objv, dbp) + for (i = 0; db_flags[i].flag != 0; i++) + if (LF_ISSET(db_flags[i].flag)) { + if (strlen(buf) > 0) +- (void)strncat(buf, " ", sizeof(buf)); +- (void)strncat( +- buf, db_flags[i].arg, sizeof(buf)); ++ (void)strncat(buf, " ", ++ sizeof(buf) - (strlen(buf) + 1)); ++ (void)strncat(buf, db_flags[i].arg, ++ sizeof(buf) - (strlen(buf) + 1)); + } + + res = NewStringObj(buf, strlen(buf)); +@@ -3764,9 +3765,10 @@ tcl_DbGetOpenFlags(interp, objc, objv, d + for (i = 0; open_flags[i].flag != 0; i++) + if (LF_ISSET(open_flags[i].flag)) { + if (strlen(buf) > 0) +- (void)strncat(buf, " ", sizeof(buf)); +- (void)strncat( +- buf, open_flags[i].arg, sizeof(buf)); ++ (void)strncat(buf, " ", ++ sizeof(buf) - (strlen(buf) + 1)); ++ (void)strncat(buf, open_flags[i].arg, ++ sizeof(buf) - (strlen(buf) + 1)); + } + + res = NewStringObj(buf, strlen(buf)); Added: head/databases/db5/files/patch-lang_tcl_tcl__env.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/db5/files/patch-lang_tcl_tcl__env.c Tue May 24 21:26:12 2016 (r415812) @@ -0,0 +1,44 @@ +--- lang/tcl/tcl_env.c.orig 2016-05-24 08:19:08 UTC ++++ lang/tcl/tcl_env.c +@@ -2864,9 +2864,10 @@ env_GetFlags(interp, objc, objv, dbenv) + for (i = 0; open_flags[i].flag != 0; i++) + if (LF_ISSET(open_flags[i].flag)) { + if (strlen(buf) > 0) +- (void)strncat(buf, " ", sizeof(buf)); +- (void)strncat( +- buf, open_flags[i].arg, sizeof(buf)); ++ (void)strncat(buf, " ", ++ sizeof(buf) - (strlen(buf) + 1)); ++ (void)strncat(buf, open_flags[i].arg, ++ sizeof(buf) - (strlen(buf) + 1)); + } + + res = NewStringObj(buf, strlen(buf)); +@@ -2930,9 +2931,10 @@ env_GetOpenFlag(interp, objc, objv, dben + for (i = 0; open_flags[i].flag != 0; i++) + if (LF_ISSET(open_flags[i].flag)) { + if (strlen(buf) > 0) +- (void)strncat(buf, " ", sizeof(buf)); +- (void)strncat( +- buf, open_flags[i].arg, sizeof(buf)); ++ (void)strncat(buf, " ", ++ sizeof(buf) - (strlen(buf) + 1)); ++ (void)strncat(buf, open_flags[i].arg, ++ sizeof(buf) - (strlen(buf) + 1)); + } + + res = NewStringObj(buf, strlen(buf)); +@@ -2982,9 +2984,10 @@ tcl_EnvGetEncryptFlags(interp, objc, obj + for (i = 0; encrypt_flags[i].flag != 0; i++) + if (LF_ISSET(encrypt_flags[i].flag)) { + if (strlen(buf) > 0) +- (void)strncat(buf, " ", sizeof(buf)); +- (void)strncat( +- buf, encrypt_flags[i].arg, sizeof(buf)); ++ (void)strncat(buf, " ", ++ sizeof(buf) - (strlen(buf) + 1)); ++ (void)strncat(buf, encrypt_flags[i].arg, ++ sizeof(buf) - (strlen(buf) + 1)); + } + + res = NewStringObj(buf, strlen(buf)); Added: head/databases/db5/files/patch-lang_tcl_tcl__seq.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/db5/files/patch-lang_tcl_tcl__seq.c Tue May 24 21:26:12 2016 (r415812) @@ -0,0 +1,16 @@ +--- lang/tcl/tcl_seq.c.orig 2016-05-24 08:18:03 UTC ++++ lang/tcl/tcl_seq.c +@@ -555,9 +555,10 @@ tcl_SeqGetFlags(interp, objc, objv, seq) + for (i = 0; seq_flags[i].flag != 0; i++) + if (LF_ISSET(seq_flags[i].flag)) { + if (strlen(buf) > 0) +- (void)strncat(buf, " ", sizeof(buf)); +- (void)strncat( +- buf, seq_flags[i].arg, sizeof(buf)); ++ (void)strncat(buf, " ", ++ sizeof(buf) - (strlen(buf) + 1)); ++ (void)strncat(buf, seq_flags[i].arg, ++ sizeof(buf) - (strlen(buf) + 1)); + } + + res = NewStringObj(buf, strlen(buf));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605242126.u4OLQCPo039645>