major update to rt-4.2.12

This commit is contained in:
robert 2015-10-14 17:45:44 +00:00
parent 7dfc582fe4
commit 685885b4b6
6 changed files with 1024 additions and 746 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.32 2015/09/16 06:55:39 kirby Exp $
# $OpenBSD: Makefile,v 1.33 2015/10/14 17:45:44 robert Exp $
COMMENT= industrial-grade ticketing system
DISTNAME= rt-4.0.23
DISTNAME= rt-4.2.12
CATEGORIES= www
REVISION= 0
MAINTAINER= Robert Nagy <robert@openbsd.org>
@ -14,13 +13,17 @@ MASTER_SITES= https://download.bestpractical.com/pub/rt/release/ \
http://www.fsck.com/pub/rt/release/
RUN_DEPENDS= converters/p5-Convert-Color \
converters/p5-DateManip \
converters/p5-JSON \
databases/p5-DBD-mysql \
databases/p5-DBI \
databases/p5-DBIx-SearchBuilder \
devel/p5-Class-ReturnValue \
devel/p5-Data-GUID \
devel/p5-Data-ICal \
devel/p5-Date-Extract \
devel/p5-DateTime \
devel/p5-DateTime-Format-Natural \
devel/p5-Devel-GlobalDestruction \
devel/p5-Devel-StackTrace \
devel/p5-File-ShareDir \
@ -30,9 +33,12 @@ RUN_DEPENDS= converters/p5-Convert-Color \
devel/p5-Locale-Maketext-Fuzzy \
devel/p5-Locale-Maketext-Lexicon \
devel/p5-Log-Dispatch \
devel/p5-Module-Refresh \
devel/p5-Module-Versions-Report \
devel/p5-PerlIO-eol \
devel/p5-Regexp-IPv6 \
devel/p5-Role-Basic \
devel/p5-Symbol-Global-Name \
devel/p5-Term-ReadKey \
devel/p5-Time-modules \
devel/p5-Tree-Simple \
@ -40,6 +46,8 @@ RUN_DEPENDS= converters/p5-Convert-Color \
graphics/gd \
graphics/p5-GD-Graph \
mail/p5-Email-Address \
mail/p5-Email-Address-List \
mail/p5-Mail-Tools \
mail/p5-MIME-Types \
mail/p5-MIME-tools \
math/graphviz,-main \
@ -47,10 +55,14 @@ RUN_DEPENDS= converters/p5-Convert-Color \
net/p5-Net-CIDR \
net/p5-Regexp-Common-net-CIDR \
security/gnupg \
security/p5-Crypt-Eksblowfish \
security/p5-Crypt-X509 \
security/p5-GnuPG-Interface \
security/p5-Text-Password-Pronounceable \
sysutils/p5-File-Which \
textproc/p5-List-UtilsBy \
textproc/p5-Regexp-Common \
textproc/p5-String-ShellQuote \
textproc/p5-Text-Quoted \
textproc/p5-Text-Quoted \
textproc/p5-Text-Template \
@ -63,6 +75,8 @@ RUN_DEPENDS= converters/p5-Convert-Color \
www/p5-CGI-PSGI \
www/p5-CSS-Squish \
www/p5-HTML-Format \
www/p5-HTML-FormatText-WithLinks \
www/p5-HTML-FormatText-WithLinks-AndTables \
www/p5-HTML-Mason-PSGIHandler \
www/p5-HTML-Quoted \
www/p5-HTML-RewriteAttributes \

View File

@ -1,2 +1,2 @@
SHA256 (rt-4.0.23.tar.gz) = OeHRYaGD09lxiMh0k0ZTMdWTMv+Hj6Mox2QrxPdd+ck=
SIZE (rt-4.0.23.tar.gz) = 6939622
SHA256 (rt-4.2.12.tar.gz) = 4hIgxglwbcmXehMwnXik2RcUVa6CPPVJMRNCzt2DcmQ=
SIZE (rt-4.2.12.tar.gz) = 7537620

View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Mon Oct 19 21:55:31 2009
+++ Makefile.in Sun Nov 8 12:37:59 2009
@@ -56,7 +56,13 @@ INSTALL = @INSTALL@
--- Makefile.in.orig Tue Jul 28 21:37:33 2015
+++ Makefile.in Mon Oct 5 20:40:02 2015
@@ -57,7 +57,13 @@ CC = @CC@
RT_LAYOUT = @rt_layout_name@
@ -15,7 +15,7 @@
CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_Config.pm
SITE_CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_SiteConfig.pm
@@ -311,13 +317,13 @@ fixperms:
@@ -283,13 +289,13 @@ fixperms:
chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH)
@ -33,16 +33,25 @@
chmod 0440 $(DESTDIR)$(CONFIG_FILE)
chmod 0640 $(DESTDIR)$(SITE_CONFIG_FILE)
@@ -362,7 +368,7 @@ dirs:
$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH)
# }}}
@@ -304,7 +310,7 @@ fixperms:
#
# Note that we use the deprecated (by GNU/POSIX find) -perm +0NNN syntax
# instead of -perm /0NNN since BSD find doesn't support the latter.
- ( cd etc/upgrade && find . -type f -not -name '*.in' -perm +0111 -print ) | while read file ; do \
+ ( cd etc/upgrade && find . -type f \! -name '*.in' -perm +0111 -print ) | while read file ; do \
chmod a+x "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$file" ; \
done
@@ -359,7 +365,7 @@ clean-mason-cache:
rm -rf $(DESTDIR)$(MASON_DATA_PATH)/etc/*
rm -rf $(DESTDIR)$(MASON_DATA_PATH)/obj/*
-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 font-install po-install static-install
@@ -370,6 +376,7 @@ config-install:
@@ -367,6 +373,7 @@ config-install:
@COMMENT_INPLACE_LAYOUT@ $(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
@COMMENT_INPLACE_LAYOUT@ -$(INSTALL) -m 0440 -o $(BIN_OWNER) -g $(RTGROUP) etc/RT_Config.pm $(DESTDIR)$(CONFIG_FILE)
@COMMENT_INPLACE_LAYOUT@ [ -f $(DESTDIR)$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 -o $(BIN_OWNER) -g $(RTGROUP) etc/RT_SiteConfig.pm $(DESTDIR)$(SITE_CONFIG_FILE)
@ -50,8 +59,8 @@
@COMMENT_INPLACE_LAYOUT@ @echo "Installed configuration. About to install RT in $(RT_PATH)"
test:
@@ -434,9 +441,9 @@ doc-install:
# {{{ etc-install
@@ -453,15 +460,15 @@ doc-install:
etc-install:
-@COMMENT_INPLACE_LAYOUT@ [ -d $(DESTDIR)$(RT_ETC_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_ETC_PATH)
@ -60,5 +69,12 @@
-@COMMENT_INPLACE_LAYOUT@ $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(RT_ETC_PATH)/" ; \
+@COMMENT_INPLACE_LAYOUT@ $(INSTALL) -m 0644 -o root -g wheel "etc/$$file" "$(DESTDIR)$(CONFIG_FILE_PATH)/" ; \
@COMMENT_INPLACE_LAYOUT@ done
# }}}
@COMMENT_INPLACE_LAYOUT@ [ -d $(DESTDIR)$(RT_ETC_PATH)/upgrade ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_ETC_PATH)/upgrade
@COMMENT_INPLACE_LAYOUT@ -( cd etc/upgrade && find . -type d -print ) | while read dir ; do \
@COMMENT_INPLACE_LAYOUT@ $(INSTALL) -m 0755 -d "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$dir" ; \
@COMMENT_INPLACE_LAYOUT@ done
-@COMMENT_INPLACE_LAYOUT@ -( cd etc/upgrade && find . -type f -not -name '*.in' -print ) | while read file ; do \
+@COMMENT_INPLACE_LAYOUT@ -( cd etc/upgrade && find . -type f \! -name '*.in' -print ) | while read file ; do \
@COMMENT_INPLACE_LAYOUT@ $(INSTALL) -m 0644 "etc/upgrade/$$file" "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$file" ; \
@COMMENT_INPLACE_LAYOUT@ done

View File

@ -1,30 +1,36 @@
$OpenBSD: patch-config_layout,v 1.2 2010/05/29 13:25:06 robert Exp $
--- config.layout.orig Mon Oct 19 21:55:31 2009
+++ config.layout Sun Nov 8 12:37:59 2009
@@ -84,6 +84,28 @@
customlibdir: ${customdir}/lib
$OpenBSD: patch-config_layout,v 1.3 2015/10/14 17:45:44 robert Exp $
--- config.layout.orig Mon Oct 5 20:51:14 2015
+++ config.layout Mon Oct 5 20:52:13 2015
@@ -102,6 +102,34 @@
customplugindir: ${customdir}/plugins
</Layout>
+<Layout OpenBSD>
+ prefix: /usr/local
+ exec_prefix: /usr/local
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ sysconfdir: /etc+
+ mandir: ${prefix}/man
+ libdir: ${prefix}/libdata/perl5/site_perl
+ datadir: ${prefix}/share+
+ htmldir: ${datadir}/html
+ manualdir: ${prefix}/share/doc+
+ logfiledir: /var/log
+ localstatedir: /var/www+
+ masonstatedir: ${localstatedir}/mason_data
+ sessionstatedir: ${localstatedir}/session_data
+ customdir: ${datadir}/local
+ custometcdir: ${sysconfdir}/local
+ customhtmldir: ${customdir}/html
+ customlexdir: ${customdir}/po
+ customlibdir: ${libdir}
+ prefix: /usr/local
+ exec_prefix: /usr/local
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ sysconfdir: /etc+
+ mandir: ${prefix}/man
+ plugindir: ${prefix}/plugins
+ libdir: ${prefix}/libdata/perl5/site_perl
+ datadir: ${prefix}/share+
+ htmldir: ${datadir}/html
+ fontdir: ${datadir}/fonts
+ lexdir: ${datadir}/po
+ staticdir: ${datadir}/static
+ manualdir: ${prefix}/share/doc+
+ localstatedir: /var/www+
+ logfiledir: /var/log
+ masonstatedir: ${localstatedir}/mason_data
+ sessionstatedir: ${localstatedir}/session_data
+ customdir: ${datadir}/local
+ custometcdir: ${sysconfdir}/local
+ customhtmldir: ${customdir}/html
+ customlexdir: ${customdir}/po
+ customstaticdir: ${customdir}/static
+ customlibdir: ${libdir}
+ customplugindir: ${customdir}/plugins
+</Layout>
+
<Layout FreeBSD>

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-sbin_rt-test-dependencies_in,v 1.1 2015/10/14 17:45:44 robert Exp $
--- sbin/rt-test-dependencies.in.orig Tue Jul 28 21:37:33 2015
+++ sbin/rt-test-dependencies.in Sun Oct 4 12:05:58 2015
@@ -208,7 +208,7 @@ Digest::MD5 2.27
Digest::SHA
Email::Address 1.897
Email::Address::List 0.02
-Encode 2.64
+Encode 2.60
Errno
File::Glob
File::ShareDir
@@ -306,7 +306,7 @@ XML::Simple
.
$deps{'FASTCGI'} = [ text_to_hash( << '.') ];
-FCGI 0.74
+FCGI 0.67
FCGI::ProcManager
.

File diff suppressed because it is too large Load Diff