Index: head/devel/upp/Makefile
===================================================================
--- head/devel/upp/Makefile	(revision 474698)
+++ head/devel/upp/Makefile	(revision 474699)
@@ -1,139 +1,141 @@
 # Created by: Matthias Sund <m.sund@arcor.de>
 # $FreeBSD$
 
 PORTNAME=	upp
-DISTVERSION=	11540
+DISTVERSION=	11873
 CATEGORIES=	devel x11-toolkits
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2017.2/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2018.1/
 DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
 
 MAINTAINER=	m.sund@arcor.de
 COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${BUILD_WRKSRC}/Core/Copying
 
 BROKEN_aarch64=		Does not compile on ${ARCH}: error Unknown CPU architecture
 BROKEN_powerpc=		Does not compile on ${ARCH}: error Unknown CPU architecture
 BROKEN_powerpc64=	Does not compile on ${ARCH}: error Unknown CPU architecture
 BROKEN_sparc64=		Does not compile on ${ARCH}
 
 USES=		compiler:c++11-lib
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 BUILD_WRKSRC=	${WRKSRC}/uppsrc
 
 MACRO_FLAGS=	-DflagBSD -Dflag${OPSYS:tu}
 CINC_GUI=	-I. -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
 		-I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/include/atk-1.0 \
 		-I${LOCALBASE}/include/cairo -I${LOCALBASE}/include/gdk-pixbuf-2.0 \
 		-I${LOCALBASE}/include/pango-1.0 -I${LOCALBASE}/include/glib-2.0 \
 		-I${LOCALBASE}/lib/glib-2.0/include -I/usr/include
 CINC_CONSOLE=	-I. -I${LOCALBASE}/include -I/usr/include
 
 PORTDATA=	bazaar examples reference tutorial uppsrc *.bm
 
 OPTIONS_DEFINE=	MYSQL OPENGL PGSQL SCD SDL USEMALLOC
 OPTIONS_DEFAULT=	IDE SCD UMK
 OPTIONS_MULTI=	BUILD
 OPTIONS_MULTI_BUILD=	IDE UMK
 BUILD_DESC=	Build/install
 IDE_DESC=	Build/install TheIDE (integrated development environment)
 IDE_DESKTOP_ENTRIES=	"TheIDE" "IDE for cross-platform C++ development" \
 		"${DATADIR}/uppsrc/ide/theide-48.png" "theide" \
 		"Development;IDE;GTK;" false
 IDE_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libnotify.so:devel/libnotify \
 		libpng.so:graphics/png
 IDE_PLIST_FILES=	bin/theide ${MANPREFIX}/man/man1/theide.1.gz
 IDE_USE=	XORG=x11,xau,xcb,xcursor,xdmcp,xext,xfixes,xft,xi,xinerama,xrandr,xrender \
 		GNOME=cairo,gdkpixbuf2,gtk20
 UMK_DESC=	Build/install UMK (U++ MaKe command line utility)
 UMK_PLIST_FILES=	bin/umk ${MANPREFIX}/man/man1/umk.1.gz
 USEMALLOC_DESC=	Compile without U++ heap allocator
 USEMALLOC_VARS=	MACRO_FLAGS+=-DflagUSEMALLOC
 SCD_DESC=	Install spelling dictionaries (*.scd files)
 SCD_VARS=	PORTDATA+=*.scd
 # SDL/OPENGL/MYSQL/PGSQL dependencies are only for run-time for use by executables built by the IDE
 SDL_USE=	SDL=sdl
 OPENGL_USE=	GL=gl,glu
 MYSQL_USES=	mysql
 PGSQL_USES=	pgsql
 LLD_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 # Disable some warnings for Clang
 CXXFLAGS+=	-Wno-logical-op-parentheses
 .endif
 
+CXXFLAGS_i386+=	-msse2
+
 post-patch: .SILENT
 	${CP} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile
 	${CP} ${BUILD_WRKSRC}/uMakefile.in ${BUILD_WRKSRC}/uMakefile
 	${REINPLACE_CMD} -i '' -e '/^CXX[[:blank:]]*=/d; /^CFLAGS[[:blank:]]*=/d; \
 		/^LDFLAGS[[:blank:]]*=/d ; \
 		/^Macro[[:blank:]]*=/s|-DflagLINUX|${MACRO_FLAGS}| ; \
 		s|\(^CXXFLAGS\)[[:blank:]]*=.*\(-std=.*\)|\1 += \2| ; \
 		s|\(^LIBPATH\)[[:blank:]]*=.*|\1 = -L${LOCALBASE}/lib -L/usr/lib|' \
 		${BUILD_WRKSRC}/Makefile \
 		${BUILD_WRKSRC}/uMakefile
 	${REINPLACE_CMD} -i '' -e 's|\(^CINC\)[[:blank:]]*=.*|\1 = ${CINC_GUI}| ; \
 		/^OutDir_/s|-Gui-Linux|| ; \
 		s|-ldl|-lXau -lXdmcp -lxcb -lexecinfo|' \
 		${BUILD_WRKSRC}/Makefile
 	${REINPLACE_CMD} -i '' -e 's|\(^CINC\)[[:blank:]]*=.*|\1 = ${CINC_CONSOLE}| ; \
 		/^OutDir_/s|-Linux|| ; \
 		s|-ldl|-lexecinfo|' \
 		${BUILD_WRKSRC}/uMakefile
 
 do-build: .SILENT
 	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "COMMON_CPP_OPTIONS = \"-std=c++11\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUG_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUG_OPTIONS = \"-O0\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUG_FLAGS = \"\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUG_LINK = \"\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "RELEASE_OPTIONS = \"-O2 -ffunction-sections -fdata-sections\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "RELEASE_FLAGS = \"\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "RELEASE_LINK = \"-Wl,--gc-sections\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "INCLUDE = \"${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/atk-1.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/gdk-pixbuf-2.0;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/lib/glib-2.0/include;/usr/include\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "LIB = \"${LOCALBASE}/lib;/usr/lib\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "LINKMODE_LOCK = \"0\";" >> ${WRKSRC}/GCC.bm
 # Also create CLANG build method, based on GCC with some changes
 	(cd ${WRKSRC} && ${CP} GCC.bm CLANG.bm && \
 		${SED} -i '' -e '/^BUILDER/s|GCC|CLANG| ; s| -fdata-sections||' \
 		CLANG.bm)
 	${ECHO_CMD} "COMMON_OPTIONS = \"-Wno-logical-op-parentheses\";" >> ${WRKSRC}/CLANG.bm
 	${ECHO_CMD} "ALLOW_PRECOMPILED_HEADERS = \"0\";" >> ${WRKSRC}/CLANG.bm
 
 do-build-IDE-on:
 	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} Makefile ${_MAKE_JOBS} UPPOUT="../_out/" OutFile="../theide")
 
 do-build-UMK-on:
 	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} uMakefile ${_MAKE_JOBS} UPPOUT="../_out/" OutFile="../umk")
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR} \
-		"-not ( -type d -empty )")
+		"-not ( -type d -empty ) -o -name '*.orig'")
 	(cd ${STAGEDIR}${DATADIR}/uppsrc && ${RM} build_info.h *Makefile*)
 
 do-install-IDE-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${BUILD_WRKSRC}/ide/theide.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-install-UMK-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/umk ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${BUILD_WRKSRC}/umk/umk.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.post.mk>
Index: head/devel/upp/distinfo
===================================================================
--- head/devel/upp/distinfo	(revision 474698)
+++ head/devel/upp/distinfo	(revision 474699)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512832900
-SHA256 (upp-x11-src-11540.tar.gz) = 85707d7b545f262b58bdd783c27aff2357548a3db01bf0f9287a10c90ae01420
-SIZE (upp-x11-src-11540.tar.gz) = 56513312
+TIMESTAMP = 1522479324
+SHA256 (upp-x11-src-11873.tar.gz) = 0231b768830db96257ebf7a9cc1aaff05017aa40a2ea6dfa577de7232c1cd07b
+SIZE (upp-x11-src-11873.tar.gz) = 56167504
Index: head/devel/upp/files/patch-uppsrc_plugin_sqlite3_lib_sqlite3.c
===================================================================
--- head/devel/upp/files/patch-uppsrc_plugin_sqlite3_lib_sqlite3.c	(nonexistent)
+++ head/devel/upp/files/patch-uppsrc_plugin_sqlite3_lib_sqlite3.c	(revision 474699)
@@ -0,0 +1,36 @@
+# Fix for CVE-2018-8740: https://nvd.nist.gov/vuln/detail/CVE-2018-8740
+# Detect databases whose schema is corrupted using a CREATE TABLE AS statement and issue an appropriate error message.
+# Commit [d75e6765]: https://www.sqlite.org/src/info/d75e67654aa9620b
+# Description: https://bugs.launchpad.net/ubuntu/+source/sqlite3/+bug/1756349
+
+--- uppsrc/plugin/sqlite3/lib/sqlite3.c.orig	2018-03-31 06:10:16 UTC
++++ uppsrc/plugin/sqlite3/lib/sqlite3.c
+@@ -103474,8 +103474,6 @@ SQLITE_PRIVATE void sqlite3EndTable(
+   p = pParse->pNewTable;
+   if( p==0 ) return;
+ 
+-  assert( !db->init.busy || !pSelect );
+-
+   /* If the db->init.busy is 1 it means we are reading the SQL off the
+   ** "sqlite_master" or "sqlite_temp_master" table on the disk.
+   ** So do not write to the disk again.  Extract the root page number
+@@ -103486,6 +103484,10 @@ SQLITE_PRIVATE void sqlite3EndTable(
+   ** table itself.  So mark it read-only.
+   */
+   if( db->init.busy ){
++    if( pSelect ){
++      sqlite3ErrorMsg(pParse, "");
++      return;
++    }
+     p->tnum = db->init.newTnum;
+     if( p->tnum==1 ) p->tabFlags |= TF_Readonly;
+   }
+@@ -117813,7 +117815,7 @@ static void corruptSchema(
+     char *z;
+     if( zObj==0 ) zObj = "?";
+     z = sqlite3MPrintf(db, "malformed database schema (%s)", zObj);
+-    if( zExtra ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra);
++    if( zExtra && zExtra[0] ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra);
+     sqlite3DbFree(db, *pData->pzErrMsg);
+     *pData->pzErrMsg = z;
+   }

Property changes on: head/devel/upp/files/patch-uppsrc_plugin_sqlite3_lib_sqlite3.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