From f204b02d6dcefb91393ebeac39b3b6741b9ae5b1 Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio" Date: Tue, 2 Jan 2018 23:31:56 +0000 Subject: MFH: r451469 r457648 www/otrs: Update to 5.0.23 - Update to 5.0.23 - Add missing deps [1] - Fix plist - Convert to options framework PR: 222410, 221002 [1] Approved by: m.tsatsenko@gmail.com (maintainer) www/otrs: Update to 5.0.26, Fixes multiple security vulnerabilities Changes: https://www.otrs.com/release-notes-otrs-5s-patch-level-24/ https://www.otrs.com/release-notes-otrs-5s-patch-level-25/ https://www.otrs.com/release-notes-otrs-5s-patch-level-26/ PR: 224729 Submitted by: Vidar Karlsen Approved by: Mikhail Tsatsenko (maintainer) Security: cebd05d6-ed7b-11e7-95f2-005056925db4 Approved by: ports-secteam (zi) --- www/otrs/Makefile | 21 +++++++++------------ www/otrs/distinfo | 6 +++--- www/otrs/pkg-plist | 6 +++++- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/www/otrs/Makefile b/www/otrs/Makefile index 2e9714919d9b..bafff6beb7c3 100644 --- a/www/otrs/Makefile +++ b/www/otrs/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= otrs -PORTVERSION= 5.0.18 -PORTREVISION= 1 +PORTVERSION= 5.0.26 CATEGORIES= www MASTER_SITES= http://ftp.otrs.org/pub/otrs/ \ ftp://ftp.samurai.com/pub/otrs/ \ @@ -44,6 +43,9 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ p5-SOAP-Lite>=0:net/p5-SOAP-Lite \ p5-Class-Inspector>=0:devel/p5-Class-Inspector \ p5-Mozilla-CA>=0:www/p5-Mozilla-CA \ + p5-CGI>=0:www/p5-CGI \ + p5-Lingua-Translit>=0:devel/p5-Lingua-Translit \ + p5-Pod-Strip>=0:textproc/p5-Pod-Strip \ p5-Template-Toolkit>=0:www/p5-Template-Toolkit RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -98,6 +100,7 @@ SSL_RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay APACHE_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2 \ p5-Apache-DBI>0:www/p5-Apache-DBI +APACHE_USE= apache_run=22+ REPORTS_RUN_DEPENDS= p5-GD>=0:graphics/p5-GD \ p5-GD-Graph>=0:graphics/p5-GD-Graph \ @@ -124,10 +127,6 @@ GNUPG_RUN_DEPENDS= gpg:security/gnupg1 .include -.if ${PORT_OPTIONS:MAPACHE} -USE_APACHE_RUN= 22+ -.endif - post-patch: @${FIND} ${WRKSRC} -name "*.pm" | \ ${XARGS} ${REINPLACE_CMD} -i '' \ @@ -141,18 +140,16 @@ do-build: @${FIND} ${WRKSRC}/Kernel -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \ -e "s=/opt/=${PREFIX}/=g;s=wwwrun=${WWWOWN}=g;" -.if ${PORT_OPTIONS:MISPELL} + +do-build-ISPELL-on: @${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \ -e "s=/usr/bin/ispell=${PREFIX}/bin/ispell=g" -.endif -.if ${PORT_OPTIONS:MASPELL} +do-build-ASPELL-on: @${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \ -e "s=/usr/bin/ispell=${PREFIX}/bin/aspell=g" -.endif -.if ${PORT_OPTIONS:MGNUPG} +do-build-GNUPG-on: @${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \ -e "s=/usr/bin/gpg=${PREFIX}/bin/gpg=g" -.endif do-install: .for D in ${ROOT_DIRS_LIST:S!^!${OTRSDIR}/!} ${BIN_DIRS_LIST:S!^!${OTRSDIR}/bin/!} ${SCRIPTS_DIRS_LIST:S!^!${OTRSDIR}/scripts/!} diff --git a/www/otrs/distinfo b/www/otrs/distinfo index 190cf4671254..b60b9f45b0ec 100644 --- a/www/otrs/distinfo +++ b/www/otrs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491412917 -SHA256 (otrs-5.0.18.tar.bz2) = 32d2a17996a882fb8965e52d92589be1a9a8fb1a15cd47689919e6d1302fe1b4 -SIZE (otrs-5.0.18.tar.bz2) = 20401943 +TIMESTAMP = 1514582654 +SHA256 (otrs-5.0.26.tar.bz2) = d4f765b8520f441588d4dbd6366f68ccbd0cf95cf3aab92ec33bc99bf164145a +SIZE (otrs-5.0.26.tar.bz2) = 20672840 diff --git a/www/otrs/pkg-plist b/www/otrs/pkg-plist index e3fbe7d36160..e9bd74557b7c 100644 --- a/www/otrs/pkg-plist +++ b/www/otrs/pkg-plist @@ -5,7 +5,7 @@ otrs/.mailfilter.dist otrs/.procmailrc.dist otrs/ARCHIVE @sample otrs/Kernel/Config.pm.dist otrs/Kernel/Config.pm -otrs/Kernel/Config.pod.dist +@sample otrs/Kernel/Config.pod.dist otrs/Kernel/Config.pod otrs/Kernel/Config/Defaults.pm otrs/Kernel/Config/Files/CloudServices.xml otrs/Kernel/Config/Files/Daemon.xml @@ -518,6 +518,7 @@ otrs/Kernel/Output/HTML/Templates/Standard/InstallerLicenseText.tt otrs/Kernel/Output/HTML/Templates/Standard/InstallerSystem.tt otrs/Kernel/Output/HTML/Templates/Standard/LinkObject.tt otrs/Kernel/Output/HTML/Templates/Standard/Login.tt +otrs/Kernel/Output/HTML/Templates/Standard/MetaFloater.tt otrs/Kernel/Output/HTML/Templates/Standard/MobileNotAvailableWidget.tt otrs/Kernel/Output/HTML/Templates/Standard/Motd.tt otrs/Kernel/Output/HTML/Templates/Standard/NoPermission.tt @@ -926,6 +927,8 @@ otrs/Kernel/System/SupportDataCollector/Plugin/OTRS/Ticket/OpenTickets.pm otrs/Kernel/System/SupportDataCollector/Plugin/OTRS/Ticket/SearchIndexModule.pm otrs/Kernel/System/SupportDataCollector/Plugin/OTRS/Ticket/StaticDBOrphanedRecords.pm otrs/Kernel/System/SupportDataCollector/Plugin/OTRS/TimeSettings.pm +otrs/Kernel/System/SupportDataCollector/Plugin/OTRS/UI/AgentSkinUsage.pm +otrs/Kernel/System/SupportDataCollector/Plugin/OTRS/UI/AgentThemeUsage.pm otrs/Kernel/System/SupportDataCollector/Plugin/OTRS/Version.pm otrs/Kernel/System/SupportDataCollector/Plugin/Webserver/Apache/LoadedModules.pm otrs/Kernel/System/SupportDataCollector/Plugin/Webserver/Apache/MPMModel.pm @@ -992,6 +995,7 @@ otrs/Kernel/System/Ticket/TicketSearch.pm otrs/Kernel/System/Time.pm otrs/Kernel/System/Type.pm otrs/Kernel/System/UnitTest.pm +otrs/Kernel/System/UnitTest/Driver.pm otrs/Kernel/System/UnitTest/Helper.pm otrs/Kernel/System/UnitTest/Selenium.pm otrs/Kernel/System/UnitTest/Selenium/WebElement.pm -- cgit v1.2.3