Index: head/databases/db5/Makefile =================================================================== --- head/databases/db5/Makefile (revision 425812) +++ head/databases/db5/Makefile (revision 425813) @@ -1,119 +1,119 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= db5 PORTVERSION= 5.3.28 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= # # the distfiles aren't named db5-* but db-*: DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb MAINTAINER= mandree@FreeBSD.org COMMENT= Oracle Berkeley DB, revision ${BDBVER} LICENSE_NAME= Sleepycat LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE= ${WRKSRC}/../LICENSE LICENSE_GROUPS= FSF GPL OSI BDBVER= ${PORTVERSION:R} BDBMAJ= ${BDBVER:R} CONFIGURE_ARGS= --enable-cxx --enable-stl \ --enable-compat185 --enable-dump185 \ --includedir=${PREFIX}/include/${PORTNAME} \ --libdir=${PREFIX}/lib/${PORTNAME} \ --bindir=${PREFIX}/bin/${PORTNAME} CONFIGURE_SCRIPT= ../dist/configure GNU_CONFIGURE= yes USES= gmake libtool INSTALL_TARGET= install_include install_lib install_utilities WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix 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 TCL DOCS OPTIONS_DEFAULT=CRYPTO OPTIONS_SUB= yes CRYPTO_DESC= Cryptography support L10N_DESC= Localization support (EXPERIMENTAL) SQL_DESC= Enable SQL API (EXPERIMENTAL) PORTDOCS= * DBLIBS= libdb libdb_cxx libdb_stl DEBUG_CONFIGURE_ENABLE= debug umrw CRYPTO_CONFIGURE_WITH= cryptography=yes L10N_CONFIGURE_ENABLE= localization SQL_CONFIGURE_ENABLE= sql sql_codegen SQL_VARS= DBLIBS+=libdb_sql JAVA_USE= java # db5 is incompatible with openjdk8 and causes IllegalArgument # exceptions during build JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION="1.6 1.7" 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 DOCS_INSTALL_TARGET= install_docs .include .if ${ARCH} == "aarch64" || ${ARCH:Marmv6*} # db5 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 # and also bug#205001 CONFIGURE_ARGS+= --enable-posixmutexes . if ${OSVERSION} > 1100100 # ^ leave that as ">" it really is greater than but NOT equal # force POSIX mutexes - the OS supports PTHREAD_PROCESS_SHARED CONFIGURE_ARGS+= --with-mutex=POSIX/pthreads . endif .endif post-patch: ${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in ${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* post-install: .for i in ${DBLIBS} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib ${LN} -s -f ${PORTNAME}/${i}-${BDBMAJ}.so ${STAGEDIR}${PREFIX}/lib ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBMAJ}.so.0 ${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a .endfor cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \ for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; \ ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done post-install-JAVA-off: ${RM} -r ${STAGEDIR}${DOCSDIR}/java .for i in gsg gsg_db_rep gsg_txn ${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA .endfor post-install-SQL-off: ${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql post-install-TCL-on: echo "package ifneeded Db_tcl ${BDBVER} \ [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \ " > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl post-install-TCL-off: .for i in api_reference/TCL ${RM} -r ${STAGEDIR}${DOCSDIR}/${i} .endfor .include Index: head/databases/db5/files/patch-lang_tcl_tcl__env.c =================================================================== --- head/databases/db5/files/patch-lang_tcl_tcl__env.c (revision 425812) +++ head/databases/db5/files/patch-lang_tcl_tcl__env.c (revision 425813) @@ -1,44 +1,44 @@ ---- lang/tcl/tcl_env.c.orig 2016-05-24 08:19:08 UTC +--- lang/tcl/tcl_env.c.orig 2013-09-09 15:35:07 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)); Index: head/databases/db5/files/patch-lang_tcl_tcl__seq.c =================================================================== --- head/databases/db5/files/patch-lang_tcl_tcl__seq.c (revision 425812) +++ head/databases/db5/files/patch-lang_tcl_tcl__seq.c (revision 425813) @@ -1,16 +1,16 @@ ---- lang/tcl/tcl_seq.c.orig 2016-05-24 08:18:03 UTC +--- lang/tcl/tcl_seq.c.orig 2013-09-09 15:35:07 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)); Index: head/databases/db5/files/patch-src_heap_heap__verify.c =================================================================== --- head/databases/db5/files/patch-src_heap_heap__verify.c (nonexistent) +++ head/databases/db5/files/patch-src_heap_heap__verify.c (revision 425813) @@ -0,0 +1,11 @@ +--- src/heap/heap_verify.c.orig 2013-09-09 15:35:08 UTC ++++ src/heap/heap_verify.c +@@ -122,7 +122,7 @@ __heap_vrfy(dbp, vdp, h, pgno, flags) + { + HEAPHDR *hdr; + int cnt, i, j, ret; +- db_indx_t *offsets, *offtbl, end; ++ db_indx_t *offsets = NULL, *offtbl, end; + + if ((ret = __db_vrfy_datapage(dbp, vdp, h, pgno, flags)) != 0) + goto err; Property changes on: head/databases/db5/files/patch-src_heap_heap__verify.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property