diff options
author | spz <spz@pkgsrc.org> | 2017-03-12 19:55:49 +0000 |
---|---|---|
committer | spz <spz@pkgsrc.org> | 2017-03-12 19:55:49 +0000 |
commit | fc6ab99e1f4ac400750758bca0b24372a9c5b38d (patch) | |
tree | ea703886cda1a33b4ad36ebe995985bc2c6d8ee6 /devel | |
parent | 8b52637f9828d28c663fb98722712744883b3bde (diff) | |
download | pkgsrc-fc6ab99e1f4ac400750758bca0b24372a9c5b38d.tar.gz |
fix a few warnings
This is likely the last change for devel/rt3, consider updating to
devel/rt4 eventually
Diffstat (limited to 'devel')
-rw-r--r-- | devel/rt3/Makefile | 4 | ||||
-rw-r--r-- | devel/rt3/distinfo | 6 | ||||
-rw-r--r-- | devel/rt3/patches/patch-lib_RT.pm | 13 | ||||
-rw-r--r-- | devel/rt3/patches/patch-lib_RT_Date.pm | 13 | ||||
-rw-r--r-- | devel/rt3/patches/patch-lib_RT_Interface_Web.pm | 13 |
5 files changed, 44 insertions, 5 deletions
diff --git a/devel/rt3/Makefile b/devel/rt3/Makefile index 9221a27425d..a07fc6c091a 100644 --- a/devel/rt3/Makefile +++ b/devel/rt3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2017/03/11 23:28:54 maya Exp $ +# $NetBSD: Makefile,v 1.63 2017/03/12 19:55:49 spz Exp $ DISTNAME= rt-3.8.17 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= devel MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ diff --git a/devel/rt3/distinfo b/devel/rt3/distinfo index d9ecaddf9e0..3018942fbfb 100644 --- a/devel/rt3/distinfo +++ b/devel/rt3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2015/11/03 03:29:20 agc Exp $ +$NetBSD: distinfo,v 1.27 2017/03/12 19:55:49 spz Exp $ SHA1 (rt-3.8.17.tar.gz) = 4765c68f91a0e8e21ed0fd39397cd8e3970ca992 RMD160 (rt-3.8.17.tar.gz) = 6da8fca56976233417bd47b26e1a7326fde5d2d0 @@ -6,10 +6,12 @@ SHA512 (rt-3.8.17.tar.gz) = 8ea1069c54572393192ef7785aaefa05e321af8d64214d309fad Size (rt-3.8.17.tar.gz) = 5728368 bytes SHA1 (patch-aa) = 6f78710f4460a25c75afbdf7128c0fe34914927c SHA1 (patch-ab) = ee455dd683c84d3a745a29a132e28903ba03144d -SHA1 (patch-lib_RT.pm) = 4a4b56128c266aeadde8f254210aa1942430744a +SHA1 (patch-lib_RT.pm) = 6544ae59a8da37b1fe41df69ab459c85e67756d0 SHA1 (patch-lib_RT_CustomFieldValues_External.pm) = 4404ca98c9e50687323892df1aa95c8b5a6dedd9 +SHA1 (patch-lib_RT_Date.pm) = 09d454c7ee81baa49b7c0452e52df4dba839c78c SHA1 (patch-lib_RT_Interface_Email.pm) = 60d0c2c46ac3dc8172bdf16bbf43099b7dd87542 SHA1 (patch-lib_RT_Interface_Email_Auth_GnuPG.pm) = 60d53a4dcda8f3cda14350f34f74fddc6091c3ce +SHA1 (patch-lib_RT_Interface_Web.pm) = 4a53145b10bb2e6c1a3999542f348713bbfcf6ab SHA1 (patch-sbin_rt-attributes-viewer) = e1c963800b76282cda4ca46e006f30d9abfc29c9 SHA1 (patch-sbin_rt-attributes-viewer.in) = 99a15cca9a394b5743edc3929f43593f1384c8da SHA1 (patch-share_html_Helpers_CalPopup.html) = 3920ac6448d1d21c7ff32ef67344b19aa53616a4 diff --git a/devel/rt3/patches/patch-lib_RT.pm b/devel/rt3/patches/patch-lib_RT.pm index 1f7b6a2cb60..32f5b7bed88 100644 --- a/devel/rt3/patches/patch-lib_RT.pm +++ b/devel/rt3/patches/patch-lib_RT.pm @@ -1,7 +1,8 @@ -$NetBSD: patch-lib_RT.pm,v 1.2 2015/03/01 22:45:26 spz Exp $ +$NetBSD: patch-lib_RT.pm,v 1.3 2017/03/12 19:55:49 spz Exp $ perl 5.14 qw() in for* fixes Fix for CVE-2014-9472 taken from the patch for RT 4.0.0 +Be more defensive about Cwd::realpath($_) actually existing. --- lib/RT.pm.orig 2013-05-22 19:04:26.000000000 +0000 +++ lib/RT.pm @@ -32,3 +33,13 @@ Fix for CVE-2014-9472 taken from the patch for RT 4.0.0 if ( $args{'Heavy'} ) { # load scrips' modules +@@ -641,7 +643,8 @@ sub InitPluginPaths { + my @tmp_inc; + my $added; + for (@INC) { +- if ( Cwd::realpath($_) eq $RT::LocalLibPath) { ++ if ( defined Cwd::realpath($_) && Cwd::realpath($_) eq $RT::LocalLibPat ++h) { + push @tmp_inc, $_, @lib_dirs; + $added = 1; + } else { diff --git a/devel/rt3/patches/patch-lib_RT_Date.pm b/devel/rt3/patches/patch-lib_RT_Date.pm new file mode 100644 index 00000000000..09c1d2dec81 --- /dev/null +++ b/devel/rt3/patches/patch-lib_RT_Date.pm @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_RT_Date.pm,v 1.1 2017/03/12 19:55:49 spz Exp $ + +--- lib/RT/Date.pm.orig 2013-05-22 19:03:04.000000000 +0000 ++++ lib/RT/Date.pm +@@ -753,7 +753,7 @@ sub ISO { + my $res = ''; + $res .= sprintf("%04d-%02d-%02d", $year, $mon, $mday) if $args{'Date'}; + $res .= sprintf(' %02d:%02d', $hour, $min) if $args{'Time'}; +- $res .= sprintf(':%02d', $sec, $min) if $args{'Time'} && $args{'Seconds'}; ++ $res .= sprintf(':%02d', $sec) if $args{'Time'} && $args{'Seconds'}; + $res =~ s/^\s+//; + + return $res; diff --git a/devel/rt3/patches/patch-lib_RT_Interface_Web.pm b/devel/rt3/patches/patch-lib_RT_Interface_Web.pm new file mode 100644 index 00000000000..5a5a805d53e --- /dev/null +++ b/devel/rt3/patches/patch-lib_RT_Interface_Web.pm @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_RT_Interface_Web.pm,v 1.1 2017/03/12 19:55:49 spz Exp $ + +--- lib/RT/Interface/Web.pm.orig 2013-05-22 19:03:04.000000000 +0000 ++++ lib/RT/Interface/Web.pm +@@ -2591,7 +2591,7 @@ sub GetColumnMapEntry { + } + + # complex things +- elsif ( my ( $mainkey, $subkey ) = $args{'Name'} =~ /^(.*?)\.{(.+)}$/ ) { ++ elsif ( my ( $mainkey, $subkey ) = $args{'Name'} =~ /^(.*?)\.\{(.+)}$/ ) { + return undef unless $args{'Map'}->{$mainkey}; + return $args{'Map'}{$mainkey}{ $args{'Attribute'} } + unless ref $args{'Map'}{$mainkey}{ $args{'Attribute'} } eq 'CODE'; |