Date: Thu, 5 Aug 2010 17:09:14 -0700 (PDT) From: Matthew Ekstrand-Abueg <mattea@rescomp.berkeley.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/149349: Update www/rt38 from 3.8.6 to 3.8.8 to match upstream Message-ID: <20100806000914.90682F3C@dev-stingray.rescomp.berkeley.edu> Resent-Message-ID: <201008060030.o760U9gs060619@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149349 >Category: ports >Synopsis: Update www/rt38 from 3.8.6 to 3.8.8 to match upstream >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Aug 06 00:30:08 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Matthew Ekstrand-Abueg >Release: FreeBSD 7.1-RELEASE-p13 amd64 >Organization: Network and Infrastructure Services, RSSP-IT, UC Berkeley >Environment: >Description: Request Tracker is currently 3.8.6 in ports, but the newest version is 3.8.8. 3.8.8 provides many security improvements as well as new features, as noted on the release page [1]. I have included what I believe to be all necessary changes to the port to bring it to 3.8.8. The changes to the port are not major, and the package builds and installs (and upgrades) fine in my environment. [1] http://blog.bestpractical.com/2010/05/rt-388-released.html >How-To-Repeat: >Fix: See attached set of patches. --- rt38.patch begins here --- --- rt38.old/Makefile 2010-07-26 07:57:11.000000000 -0700 +++ rt38/Makefile 2010-08-05 17:03:11.000000000 -0700 @@ -12,8 +12,8 @@ # o install a sample into etc/apache22/Includes PORTNAME= rt -PORTVERSION= 3.8.6 -PORTREVISION= 2 +PORTVERSION= 3.8.8 +PORTREVISION= CATEGORIES= www MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ \ ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/ @@ -133,7 +133,7 @@ IGNORE= options WITH_MODPERL and WITH_MODPERL2 are mutually exclusive .endif -RT_ETC_PATH?= ${LOCALBASE}/etc/${PORTNAME}38 +RT_ETC_PATH?= ${PREFIX}/etc/${PORTNAME}38 RT_LAYOUT= FreeBSD DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}38 --- rt38.old/Makefile.cpan 2009-12-09 07:09:52.000000000 -0800 +++ rt38/Makefile.cpan 2010-08-05 17:03:11.000000000 -0700 @@ -5,6 +5,8 @@ ### Pod::Usage 1.33 core ### Scalar::Util 1.18 core ### Text::ParseWords 3.24 core +### Term::ReadLine core +### Term::ReadKey core CLI_DEPS= p5-Term-ReadKey>=2.30:${PORTSDIR}/devel/p5-Term-ReadKey \ p5-Getopt-Long>=2.24:${PORTSDIR}/devel/p5-Getopt-Long \ @@ -12,7 +14,7 @@ p5-ReadLine-Perl>=1.0302:${PORTSDIR}/devel/p5-ReadLine-Perl \ p5-Net-SSLeay>=1.35:${PORTSDIR}/security/p5-Net-SSLeay -CORE_DEPS= p5-Encode>=2.13:${PORTSDIR}/converters/p5-Encode \ +CORE_DEPS= p5-Encode>=2.21:${PORTSDIR}/converters/p5-Encode \ p5-Class-ReturnValue>=0.55:${PORTSDIR}/devel/p5-Class-ReturnValue \ p5-Text-Quoted>=2.05:${PORTSDIR}/textproc/p5-Text-Quoted \ p5-CSS-Squish>=0.07:${PORTSDIR}/textproc/p5-CSS-Squish \ @@ -22,18 +24,18 @@ p5-File-Temp>=0.18:${PORTSDIR}/devel/p5-File-Temp \ p5-Tree-Simple>=1.04:${PORTSDIR}/devel/p5-Tree-Simple \ p5-HTML-Scrubber>=0.08:${PORTSDIR}/www/p5-HTML-Scrubber \ - p5-DBIx-SearchBuilder>=1.53:${PORTSDIR}/databases/p5-DBIx-SearchBuilder \ + p5-DBIx-SearchBuilder>=1.54:${PORTSDIR}/databases/p5-DBIx-SearchBuilder \ p5-Mail-Tools>=1.57:${PORTSDIR}/mail/p5-Mail-Tools \ p5-File-ShareDir>=1.00:${PORTSDIR}/devel/p5-File-ShareDir \ p5-Cache-Simple-TimedExpiry>=0.27:${PORTSDIR}/devel/p5-Cache-Simple-TimedExpiry \ - ${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch \ + p5-Text-Template>=1.44:${PORTSDIR}/textproc/p5-Text-Template \ + p5-Log-Dispatch>=2.0:${PORTSDIR}/devel/p5-Log-Dispatch \ + p5-Locale-Maketext>=1.06:${PORTSDIR}/devel/p5-Locale-Maketext \ + p5-Locale-Maketext-Lexicon>=0.32:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \ + p5-MIME-Tools>=5.425:${PORTSDIR}/mail/p5-MIME-Tools \ ${SITE_PERL}/Email/Address.pm:${PORTSDIR}/mail/p5-Email-Address \ ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \ - ${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \ - ${SITE_PERL}/Locale/Maketext/Lexicon.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \ ${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules \ - ${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext \ - ${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \ ${SITE_PERL}/Calendar/Simple.pm:${PORTSDIR}/devel/p5-Calendar-Simple \ ${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common \ ${SITE_PERL}/Locale/Maketext/Fuzzy.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Fuzzy \ @@ -57,7 +59,11 @@ ${SITE_PERL}/Test/Expect.pm>=0.31:${PORTSDIR}/devel/p5-Test-Expect \ ${SITE_PERL}/Test/WWW/Mechanize.pm>=1.04:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \ ${SITE_PERL}/Test/HTTP/Server/Simple.pm>=0.09:${PORTSDIR}/www/p5-Test-HTTP-Server-Simple \ - ${SITE_PERL}/Test/Simple.pm>=0.77:${PORTSDIR}/devel/p5-Test-Simple + ${SITE_PERL}/Test/Simple.pm>=0.77:${PORTSDIR}/devel/p5-Test-Simple \ + ${SITE_PERL}/${PERL_ARCH}/HTML/TokeParser.pm:${PORTSDIR}/www/p5-HTML-Parser \ + ${SITE_PERL}/Test/Warn.pm:${PORTSDIR}/devel/p5-Test-Warn \ + ${SITE_PERL}/Test/MockTime.pm:${PORTSDIR}/devel/p5-Test-MockTime \ + ${SITE_PERL}/HTTP/Server/Simple/Mason.pm:${PORTSDIR}/www/p5-HTTP-Server-Simple-Mason GD_DEPS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \ ${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil \ @@ -67,6 +73,7 @@ ${SITE_PERL}/GnuPG/Interface.pm:${PORTSDIR}/security/p5-GnuPG-Interface GRAPHVIZ_DEPS= ${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run \ + ${SITE_PERL}/IPC/Run/SafeHandles.pm:${PORTSDIR}/devel/p5-IPC-Run-SafeHandles \ ${SITE_PERL}/GraphViz.pm:${PORTSDIR}/graphics/p5-GraphViz ICAL_DEPS= ${SITE_PERL}/Data/ICal.pm:${PORTSDIR}/deskutils/p5-Data-ICal @@ -84,7 +91,6 @@ p5-Apache-Session>=1.53:${PORTSDIR}/www/p5-Apache-Session \ p5-Devel-StackTrace>=1.19:${PORTSDIR}/devel/p5-Devel-StackTrace \ p5-CGI.pm>=1.20:${PORTSDIR}/www/p5-CGI.pm \ - p5-Text-WikiFormat>=0.76:${PORTSDIR}/textproc/p5-Text-WikiFormat \ p5-XML-RSS>=1.05:${PORTSDIR}/textproc/p5-XML-RSS \ p5-HTML-Mason>=1.36:${PORTSDIR}/www/p5-HTML-Mason --- rt38.old/distinfo 2009-12-09 07:09:52.000000000 -0800 +++ rt38/distinfo 2010-08-05 17:03:11.000000000 -0700 @@ -1,3 +1,3 @@ -MD5 (rt-3.8.6.tar.gz) = 522f93e39c6978ba9f49efa00eb5621e -SHA256 (rt-3.8.6.tar.gz) = d909c9695958c5fd020c3454a92730517e74c4fff1484ff291ad1eaebd746112 -SIZE (rt-3.8.6.tar.gz) = 3363499 +MD5 (rt-3.8.8.tar.gz) = de062840ce6e2fdb323d77dddf8ff485 +SHA256 (rt-3.8.8.tar.gz) = d3932febc5b3fa1da1168713f305a095ea6b40dd22d508849471e6637ba04c02 +SIZE (rt-3.8.8.tar.gz) = 5109734 --- rt38.old/files/patch-Makefile.in 2009-12-09 07:09:52.000000000 -0800 +++ rt38/files/patch-Makefile.in 2010-08-05 17:03:11.000000000 -0700 @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2009-12-04 17:30:18.000000000 -0500 -+++ Makefile.in 2009-12-04 17:33:01.000000000 -0500 +--- Makefile.in.orig 2010-05-05 13:09:21.000000000 -0700 ++++ Makefile.in 2010-08-05 13:11:47.000000000 -0700 @@ -58,7 +58,7 @@ CONFIG_FILE_PATH = @CONFIG_FILE_PATH_R@ @@ -9,28 +9,28 @@ RT_VERSION_MAJOR = @RT_VERSION_MAJOR@ -@@ -107,7 +107,7 @@ - RT_VAR_PATH = @RT_VAR_PATH_R@ +@@ -108,7 +108,7 @@ RT_DOC_PATH = @RT_DOC_PATH_R@ + RT_FONT_PATH = @RT_FONT_PATH_R@ RT_LOCAL_PATH = @RT_LOCAL_PATH_R@ -LOCAL_PLUGIN_PATH = @RT_LOCAL_PATH_R@/plugins +LOCAL_PLUGIN_PATH = @RT_LOCAL_PATH_R@/share/rt38/plugins LOCAL_ETC_PATH = @LOCAL_ETC_PATH_R@ LOCAL_LIB_PATH = @LOCAL_LIB_PATH_R@ LOCAL_LEXICON_PATH = @LOCAL_LEXICON_PATH_R@ -@@ -282,9 +282,9 @@ +@@ -286,9 +286,9 @@ @echo " $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action upgrade" -upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct +upgrade: config-install dirs files-install fixperms upgrade-instruct --upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install fixperms -+upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install +-upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install font-install fixperms ++upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install font-install # {{{ dependencies -@@ -302,13 +302,6 @@ +@@ -306,13 +306,6 @@ # {{{ fixperms fixperms: @@ -44,15 +44,15 @@ chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH) chmod 0755 $(DESTDIR)$(RT_ETC_PATH) -@@ -362,9 +355,9 @@ +@@ -367,9 +360,9 @@ $(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH) # }}} -install: testdeps config-install dirs files-install fixperms instruct +install: config-install dirs files-install fixperms instruct --files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install -+files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install +-files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install font-install ++files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install font-install config-install: @COMMENT_INPLACE_LAYOUT@ $(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH) --- rt38.old/files/patch-config.layout 2009-01-22 12:58:49.000000000 -0800 +++ rt38/files/patch-config.layout 2010-08-05 17:03:11.000000000 -0700 @@ -1,6 +1,6 @@ ---- config.layout.orig 2008-08-18 11:13:57.000000000 -0400 -+++ config.layout 2009-01-21 10:35:34.000000000 -0500 -@@ -85,25 +85,26 @@ +--- config.layout.orig 2010-05-05 13:09:21.000000000 -0700 ++++ config.layout 2010-08-05 13:44:18.000000000 -0700 +@@ -91,27 +91,28 @@ </Layout> <Layout FreeBSD> @@ -11,11 +11,13 @@ sbindir: ${exec_prefix}/sbin sysconfdir: ${prefix}/etc+ mandir: ${prefix}/man + plugindir: ${prefix}/plugins - libdir: ${prefix}/lib+ + libdir: %%SITE_PERL%% datadir: ${prefix}/share+ htmldir: ${datadir}/html + sharedir: ${prefix}/share+ + fontdir: ${datadir}/fonts manualdir: ${prefix}/share/doc+ logfiledir: /var/log localstatedir: /var/run+ --- rt38.old/pkg-plist 2009-12-09 07:09:52.000000000 -0800 +++ rt38/pkg-plist 2010-08-05 17:03:11.000000000 -0700 @@ -1,6 +1,7 @@ @comment $FreeBSD: ports/www/rt38/pkg-plist,v 1.9 2009/12/09 15:09:52 skreuzer Exp $ @unexec if cmp -s %D/etc/rt38/RT_SiteConfig.pm %D/etc/rt38/RT_SiteConfig.pm-dist; then rm -f %D/etc/rt38/RT_SiteConfig.pm; fi @exec [ -f %D/etc/rt38/RT_SiteConfig.pm ] || cp %D/rt38/RT_SiteConfig.pm-dist %D/etc/rt38/RT_SiteConfig.pm +bin/fastcgi_server bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc @@ -125,9 +126,11 @@ %%SITE_PERL%%/RT/I18N/ja.po %%SITE_PERL%%/RT/I18N/nb.po %%SITE_PERL%%/RT/I18N/nl.po +%%SITE_PERL%%/RT/I18N/nn.po %%SITE_PERL%%/RT/I18N/pl.po %%SITE_PERL%%/RT/I18N/pt.po %%SITE_PERL%%/RT/I18N/pt_BR.po +%%SITE_PERL%%/RT/I18N/pt_PT.po %%SITE_PERL%%/RT/I18N/rt.pot %%SITE_PERL%%/RT/I18N/ru.pm %%SITE_PERL%%/RT/I18N/ru.po @@ -274,6 +277,9 @@ sbin/rt-test-dependencies sbin/rt-validator %%PORTDOCS%%%%DOCSDIR%%/README +share/rt38/fonts/Droid.README +share/rt38/fonts/DroidSans.ttf +share/rt38/fonts/DroidSansFallback.ttf share/rt38/html/Admin/CustomFields/GroupRights.html share/rt38/html/Admin/CustomFields/Modify.html share/rt38/html/Admin/CustomFields/Objects.html @@ -421,7 +427,6 @@ share/rt38/html/Elements/ColumnMap share/rt38/html/Elements/CreateTicket share/rt38/html/Elements/Dashboards -share/rt38/html/Elements/DashboardTabs share/rt38/html/Elements/EditCustomField share/rt38/html/Elements/EditCustomFieldAutocomplete share/rt38/html/Elements/EditCustomFieldBinary @@ -432,6 +437,7 @@ share/rt38/html/Elements/EditCustomFieldText share/rt38/html/Elements/EditCustomFieldWikitext share/rt38/html/Elements/EditLinks +share/rt38/html/Elements/EditPassword share/rt38/html/Elements/EditTimeValue share/rt38/html/Elements/EmailInput share/rt38/html/Elements/Error @@ -463,6 +469,7 @@ share/rt38/html/Elements/QueueSummary share/rt38/html/Elements/QuickCreate share/rt38/html/Elements/Quicksearch +share/rt38/html/Elements/RT__CustomField/ColumnMap share/rt38/html/Elements/RT__Group/ColumnMap share/rt38/html/Elements/RT__Queue/ColumnMap share/rt38/html/Elements/RT__Scrip/ColumnMap @@ -487,13 +494,13 @@ share/rt38/html/Elements/SelectMatch share/rt38/html/Elements/SelectNewTicketQueue share/rt38/html/Elements/SelectOwner +share/rt38/html/Elements/SelectPriority share/rt38/html/Elements/SelectQueue share/rt38/html/Elements/SelectResultsPerPage share/rt38/html/Elements/SelectSortOrder share/rt38/html/Elements/SelectStatus share/rt38/html/Elements/SelectTicketSortBy share/rt38/html/Elements/SelectTicketTypes -share/rt38/html/Elements/SelectPriority share/rt38/html/Elements/SelectTimeUnits share/rt38/html/Elements/SelectTimezone share/rt38/html/Elements/SelectUsers @@ -507,6 +514,7 @@ share/rt38/html/Elements/ShowLink share/rt38/html/Elements/ShowLinks share/rt38/html/Elements/ShowMemberships +share/rt38/html/Elements/ShowRelationLabel share/rt38/html/Elements/ShowSearch share/rt38/html/Elements/ShowUser share/rt38/html/Elements/ShowUserConcise @@ -908,12 +916,14 @@ share/rt38/html/NoAuth/css/3.5-default/titlebox.css share/rt38/html/NoAuth/css/3.5-default/transactions.css share/rt38/html/NoAuth/css/autohandler +share/rt38/html/NoAuth/css/base/misc.css share/rt38/html/NoAuth/css/dhandler share/rt38/html/NoAuth/css/print.css share/rt38/html/NoAuth/css/web2/InHeader share/rt38/html/NoAuth/css/web2/admin.css share/rt38/html/NoAuth/css/web2/base.css share/rt38/html/NoAuth/css/web2/boxes.css +share/rt38/html/NoAuth/css/web2/collection.css share/rt38/html/NoAuth/css/web2/forms.css share/rt38/html/NoAuth/css/web2/images/dhandler share/rt38/html/NoAuth/css/web2/images/source/background-gradient.png @@ -976,6 +986,7 @@ share/rt38/html/NoAuth/js/scriptaculous/scriptaculous.js share/rt38/html/NoAuth/js/titlebox-state.js share/rt38/html/NoAuth/js/util.js +share/rt38/html/NoAuth/rss/dhandler share/rt38/html/Prefs/Elements/Tabs share/rt38/html/Prefs/MyRT.html share/rt38/html/Prefs/Other.html @@ -1027,6 +1038,7 @@ share/rt38/html/Search/Elements/PickCFs share/rt38/html/Search/Elements/PickCriteria share/rt38/html/Search/Elements/ResultViews +share/rt38/html/Search/Elements/ResultsRSSView share/rt38/html/Search/Elements/SearchPrivacy share/rt38/html/Search/Elements/SearchesForObject share/rt38/html/Search/Elements/SelectAndOr @@ -1146,10 +1158,11 @@ share/rt38/html/dhandler share/rt38/html/index.html share/rt38/html/l -@dirrm share/rt38/etc +@dirrmtry www/rt38 +@dirrm share/rt38/po @exec mkdir -p %D/share/rt38/plugins @dirrm share/rt38/plugins -@dirrm share/rt38/po +@dirrm share/rt38/lib @dirrm share/rt38/html/Widgets/Form @dirrm share/rt38/html/Widgets @dirrm share/rt38/html/User/Groups @@ -1184,6 +1197,7 @@ @dirrm share/rt38/html/REST @dirrm share/rt38/html/Prefs/Elements @dirrm share/rt38/html/Prefs +@dirrm share/rt38/html/NoAuth/rss @dirrm share/rt38/html/NoAuth/js/scriptaculous @dirrm share/rt38/html/NoAuth/js/prototype @dirrm share/rt38/html/NoAuth/js/IE7 @@ -1194,9 +1208,11 @@ @dirrm share/rt38/html/NoAuth/css/web2/images/source @dirrm share/rt38/html/NoAuth/css/web2/images @dirrm share/rt38/html/NoAuth/css/web2 +@dirrm share/rt38/html/NoAuth/css/base @dirrm share/rt38/html/NoAuth/css/3.5-default @dirrm share/rt38/html/NoAuth/css/3.4-compat @dirrm share/rt38/html/NoAuth/css +@dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/wsc @dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/skins/silver/images @dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/skins/silver @dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/skins/office2003/images @@ -1237,7 +1253,6 @@ @dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/css/images @dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/css/behaviors @dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/css -@dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/wsc @dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/_source/internals @dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/_source/commandclasses @dirrm share/rt38/html/NoAuth/RichText/FCKeditor/editor/_source/classes @@ -1257,6 +1272,7 @@ @dirrm share/rt38/html/Elements/RT__Scrip @dirrm share/rt38/html/Elements/RT__Queue @dirrm share/rt38/html/Elements/RT__Group +@dirrm share/rt38/html/Elements/RT__CustomField @dirrm share/rt38/html/Elements/GnuPG @dirrm share/rt38/html/Elements/CollectionAsTable @dirrm share/rt38/html/Elements @@ -1283,7 +1299,8 @@ @dirrm share/rt38/html/Admin/CustomFields @dirrm share/rt38/html/Admin @dirrm share/rt38/html -@dirrm share/rt38/lib +@dirrm share/rt38/fonts +@dirrm share/rt38/etc @dirrm share/rt38 %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/RT/URI @@ -1312,4 +1329,3 @@ @dirrm %%SITE_PERL%%/RT/Action @dirrm %%SITE_PERL%%/RT @dirrm etc/rt38 -@dirrmtry www/rt38 --- rt38.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100806000914.90682F3C>