From owner-svn-ports-head@freebsd.org Mon Jan 29 08:33:19 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1899EDD635; Mon, 29 Jan 2018 08:33:18 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7F553852A6; Mon, 29 Jan 2018 08:33:18 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A32D25BF0; Mon, 29 Jan 2018 08:33:18 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0T8XI1B082790; Mon, 29 Jan 2018 08:33:18 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0T8XIig082786; Mon, 29 Jan 2018 08:33:18 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201801290833.w0T8XIig082786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Mon, 29 Jan 2018 08:33:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460244 - in head/editors/openoffice-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in head/editors/openoffice-devel: . files X-SVN-Commit-Revision: 460244 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jan 2018 08:33:19 -0000 Author: truckman Date: Mon Jan 29 08:33:17 2018 New Revision: 460244 URL: https://svnweb.freebsd.org/changeset/ports/460244 Log: Upgrade to upstream svn revision r1822069, which includes the fixes that were in files/patch-security. Follow upstream and disable GNOMEVFS by default, using gio instead. Don't enable crashdumps by default. This build knob causes the build to be done with debug symbols, which greatly increase the size of the build, but this is all in vain because the executables and libraries are subsequently stripped. Build with debug symbols if WITH_DEBUG is set. Build with -fstack-protector. Only fetch unowinreg.dll when building the SDK. Remove tomcat from distinfo. It was leftover from an earlier experiment. Add three new options: dd three new options: CRASHDUMP - Enable crashdumps and set WITH_DEBUG. DBGUTIL - Enable assertions, object counting, and other non-production runtime debugging. DEBUG - Compile with -O0 for better debugability. The ports framework also sets WITH_DEBUG. Deleted: head/editors/openoffice-devel/files/patch-security Modified: head/editors/openoffice-devel/Makefile head/editors/openoffice-devel/distinfo head/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk head/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Mon Jan 29 07:43:47 2018 (r460243) +++ head/editors/openoffice-devel/Makefile Mon Jan 29 08:33:17 2018 (r460244) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 3 +PORTREVISION= 0 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -16,7 +16,7 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}- PKGNAMESUFFIX= -${LANG_SUFFIX} .endif PKGNAMESUFFIX= -devel -DISTFILES= ${AOOSRC}${AOODISTTAG} unowinreg.dll:unoreg ${EXTSRC}:extsrc +DISTFILES= ${AOOSRC}${AOODISTTAG} ${EXTSRC}:extsrc DIST_SUBDIR= openoffice EXTRACT_ONLY= ${AOOSRC} @@ -105,7 +105,7 @@ AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m1\(Build:9800\) -SVNREVISION= 1810071 +SVNREVISION= 1822069 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz @@ -150,11 +150,14 @@ WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache -OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA MYSQL PDFIMPORT \ - REPORT_BUILDER SDK WIKI_PUBLISHER -OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT WIKI_PUBLISHER +OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \ + MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER +OPTIONS_DEFAULT= CUPS GNOME MMEDIA PDFIMPORT WIKI_PUBLISHER +CRASHDUMP_DESC= Enable crashdumps, sets WITH_DEBUG +DBGUTIL_DESC= Enable assertions, object counting. (non-production) +DEBUG_DESC= Compile with -O0, sets WITH_DEBUG GNOME_DESC= GConf + screensaver presentation control via DBUS -GNOMEVFS_DESC= GNOME Virtual File System +GNOMEVFS_DESC= Use GNOME Virtual File System instead of gio MMEDIA_DESC= Multimedia backend for impress MYSQL_DESCR= Build MySQL Connector extension PDFIMPORT_DESC= Build and install PDF import extension @@ -162,9 +165,16 @@ REPORT_BUILDER_DESC= Build and install Report builder SDK_DESC= Build and install software development kit WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension +CRASHDUMP_CONFIGURE_ENABLE= crashdump +CRASHDUMP_VARS= WITH_DEBUG=yes + CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups +DBGUTIL_CONFIGURE_ENABLE= dbgutil + +DEBUG_CONFIGURE_ENABLE= debug + GNOME_CONFIGURE_ENABLE= dbus gconf lockdown GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib @@ -185,6 +195,7 @@ MYSQL_LIB_DEPENDS= libmysqlcppconn.so:databases/mysql MYSQL_USES= mysql SDK_CONFIGURE_ENABLE= odk +SDK_DISTFILES= unowinreg.dll:unoreg PDFIMPORT_CONFIGURE_ENABLE= pdfimport PDFIMPORT_CONFIGURE_WITH= system-poppler @@ -211,6 +222,10 @@ TARGET_ORDER_OVERRIDE= 710:gnome-post-icons .include +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-symbols +.endif + .if ${PORT_OPTIONS:MREPORT_BUILDER} || ${PORT_OPTIONS:MWIKI_PUBLISHER} BUILD_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging RUN_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging @@ -266,7 +281,6 @@ CONFIGURE_ARGS+= \ --with-system-cairo --enable-cairo \ --with-system-coinmp \ --with-system-curl \ - --enable-crashdump \ --with-system-dicts \ --with-epm=${LOCALBASE}/bin/epm \ --with-system-expat \ @@ -331,9 +345,11 @@ pre-everything:: ${TOUCH} ${BUILD_COOKIE} .endif +do-extract-SDK-on: + ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ + post-extract: ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ ${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png \ ${WRKSRC}/default_images/introabout/intro.png ${CP} ${FILESDIR}/freebsd-aoo-about-developer.png \ @@ -444,7 +460,9 @@ do-build: do-install: @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \ ${STAGEDIR}${PREFIX}/share/mime/packages - @cd ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \ + @cd ${WRKSRC} ; \ + . ${FREEBSD_ENV_SET} ; \ + cd instsetoo_native/$${INPATH}/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \ for i in *.tar.?z ; do \ ${ECHO_CMD} "extracting $$i" ; \ ${TAR} -s '|./[^/]*/||' -xz -f $$i \ @@ -468,7 +486,9 @@ do-install: done @${ECHO_CMD} "adding desktop support" @${LN} -sf ${XDGREL} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} - @cd ${WRKSRC}/sysui/unxfbsd*.pro/misc/openoffice ; \ + @cd ${WRKSRC} ; \ + . ${FREEBSD_ENV_SET} ; \ + cd sysui/$${INPATH}/misc/openoffice ; \ DESTDIR=${STAGEDIR} \ GNOMEDIR=${PREFIX} \ ICON_PREFIX=openoffice${AOOVERSION1} \ Modified: head/editors/openoffice-devel/distinfo ============================================================================== --- head/editors/openoffice-devel/distinfo Mon Jan 29 07:43:47 2018 (r460243) +++ head/editors/openoffice-devel/distinfo Mon Jan 29 08:33:17 2018 (r460244) @@ -1,9 +1,7 @@ -TIMESTAMP = 1506752342 -SHA256 (openoffice/apache-openoffice-r1810071-src.tar.xz) = d5ed9637367081e03433f3a8cc2d39d84a64d7068b730f5c170d282784c6dd10 -SIZE (openoffice/apache-openoffice-r1810071-src.tar.xz) = 216675892 +TIMESTAMP = 1517014366 +SHA256 (openoffice/apache-openoffice-r1822069-src.tar.xz) = af0d92d8b1a860ea2f32c75db5848d022c4d38d089d937364300bb80ce6366cc +SIZE (openoffice/apache-openoffice-r1822069-src.tar.xz) = 216331420 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 -SHA256 (openoffice/apache-tomcat-5.5.36-src.tar.gz) = 0f83d54e093c0a2383ba185ca928be0ee87148d5d98569470120690ac6c2008f -SIZE (openoffice/apache-tomcat-5.5.36-src.tar.gz) = 3743113 Modified: head/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk ============================================================================== --- head/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk Mon Jan 29 07:43:47 2018 (r460243) +++ head/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk Mon Jan 29 08:33:17 2018 (r460244) @@ -1,6 +1,6 @@ ---- solenv/gbuild/platform/freebsd.mk.orig 2017-11-27 13:50:25 UTC +--- solenv/gbuild/platform/freebsd.mk.orig 2018-01-25 18:01:47 UTC +++ solenv/gbuild/platform/freebsd.mk -@@ -94,6 +94,7 @@ gb_CXXFLAGS := \ +@@ -95,6 +95,7 @@ gb_CXXFLAGS := \ -fno-use-cxa-atexit \ -fvisibility-inlines-hidden \ -fvisibility=hidden \ @@ -8,3 +8,16 @@ -pipe ifeq ($(COM),CLANG) gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH +@@ -143,6 +144,12 @@ gb_LinkTarget_LDFLAGS += \ + -Wl,--dynamic-list-cpp-typeinfo \ + -Wl,-Bsymbolic-functions \ + ++endif ++ ++ifneq ($(filter $(CPUNAME),INTEL X86_64),) ++gb_CFLAGS += -fstack-protector ++gb_CXXFLAGS += -fstack-protector ++gb_LinkTarget_LDFLAGS += -fstack-protector + endif + + ifeq ($(gb_DEBUGLEVEL),2) Modified: head/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk ============================================================================== --- head/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk Mon Jan 29 07:43:47 2018 (r460243) +++ head/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk Mon Jan 29 08:33:17 2018 (r460244) @@ -1,6 +1,6 @@ ---- solenv/inc/unxfbsd.mk.orig 2017-11-27 13:50:28 UTC +--- solenv/inc/unxfbsd.mk.orig 2017-01-23 03:29:47 UTC +++ solenv/inc/unxfbsd.mk -@@ -96,7 +96,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +@@ -105,10 +105,15 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible @@ -9,3 +9,11 @@ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGSCXX += -fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" ++ ++.IF "$(CPUNAME)" == "INTEL" || "$(CPUNAME)" == "X86_64" ++CFLAGSCC += -fstack-protector ++CFLAGSCXX += -fstack-protector ++.ENDIF + + # Compiler flags for compiling static object in multi threaded environment with graphical user interface + CFLAGSOBJGUIMT=