head 1.5; access; symbols pkgsrc-2019Q2:1.4.0.64 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.62 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.60 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.58 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.56 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.54 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.52 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.50 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.46 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.44 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.42 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.40 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.38 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.36 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.34 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.32 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.30 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.28 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.26 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.24 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.22 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.20 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.18 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.16 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.14 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.12 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.10 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.8 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.6 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.4 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.2 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.3.0.14 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.12 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.10 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.8 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.6 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.4 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.2 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.2.0.26 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.24 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.22 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.20 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.18 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.16 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.14 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.1.0.6 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.4 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.2 pkgsrc-2005Q3-base:1.1; locks; strict; comment @# @; 1.5 date 2019.09.26.08.34.03; author wiz; state dead; branches; next 1.4; commitid Yiq30Hm7ZZvfXuEB; 1.4 date 2011.10.25.19.38.10; author spz; state Exp; branches; next 1.3; 1.3 date 2010.03.14.13.12.04; author spz; state Exp; branches 1.3.14.1; next 1.2; 1.2 date 2006.05.01.09.38.08; author cube; state dead; branches; next 1.1; 1.1 date 2005.09.21.21.23.46; author cube; state Exp; branches; next ; 1.3.14.1 date 2011.11.02.22.52.22; author tron; state Exp; branches; next ; desc @@ 1.5 log @rt3, p5-libapreq: remove p5-libapreq depends on mod_perl 1.x, which was removed in June. rt3 uses p5-libapreq. @ text @$NetBSD: patch-ab,v 1.4 2011/10/25 19:38:10 spz Exp $ - add sanity checks for the pgp program call - make the pgp program path configurable instead of assuming it in the (smallish) path - perl 5.14 qw() in for* fixes --- lib/RT/Crypt/GnuPG.pm.orig 2011-04-14 00:32:21.000000000 +0000 +++ lib/RT/Crypt/GnuPG.pm @@@@ -434,6 +434,7 @@@@ sub SignEncryptRFC3156 { ); my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); # handling passphrase in GnuPGOptions @@@@ -484,12 +485,12 @@@@ sub SignEncryptRFC3156 { waitpid $pid, 0; }; my $err = $@@; - my @@signature = readline $handle{'stdout'}; + my @@signature = readline $handle{'stdout'} if $handle{'stdout'}->opened ; close $handle{'stdout'}; $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -545,7 +546,7 @@@@ sub SignEncryptRFC3156 { $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -616,6 +617,7 @@@@ sub _SignEncryptTextInline { return unless $args{'Sign'} || $args{'Encrypt'}; my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); # handling passphrase in GnupGOptions @@@@ -670,7 +672,7 @@@@ sub _SignEncryptTextInline { my $err = $@@; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -704,6 +706,7 @@@@ sub _SignEncryptAttachmentInline { return unless $args{'Sign'} || $args{'Encrypt'}; my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); # handling passphrase in GnupGOptions @@@@ -757,7 +760,7 @@@@ sub _SignEncryptAttachmentInline { my $err = $@@; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -806,6 +809,7 @@@@ sub SignEncryptContent { return unless $args{'Sign'} || $args{'Encrypt'}; my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); # handling passphrase in GnupGOptions @@@@ -858,7 +862,7 @@@@ sub SignEncryptContent { my $err = $@@; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -1093,6 +1097,7 @@@@ sub VerifyAttachment { my %args = ( Data => undef, Signature => undef, Top => undef, @@_ ); my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); $opt{'digest-algo'} ||= 'SHA1'; $gnupg->options->hash_init( @@@@ -1130,7 +1135,7 @@@@ sub VerifyAttachment { }; $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -1147,6 +1152,7 @@@@ sub VerifyRFC3156 { my %args = ( Data => undef, Signature => undef, Top => undef, @@_ ); my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); $opt{'digest-algo'} ||= 'SHA1'; $gnupg->options->hash_init( @@@@ -1177,7 +1183,7 @@@@ sub VerifyRFC3156 { }; $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -1200,6 +1206,7 @@@@ sub DecryptRFC3156 { ); my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); # handling passphrase in GnupGOptions @@@@ -1242,7 +1249,7 @@@@ sub DecryptRFC3156 { }; $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -1253,6 +1260,11 @@@@ sub DecryptRFC3156 { # if the decryption is fine but the signature is bad, then without this # status check we lose the decrypted text # XXX: add argument to the function to control this check + if ( !defined $res{'status'} ) { + $res{'message'} = $@@? $@@: "gpg failed ". ($? >> 8); + seek $tmp_fh, 0, 0; + return ($tmp_fh, $tmp_fn, %res); + } if ( $res{'status'} !~ /DECRYPTION_OKAY/ ) { if ( $@@ || $? ) { $res{'message'} = $@@? $@@: "gpg exitted with error code ". ($? >> 8); @@@@ -1278,6 +1290,7 @@@@ sub DecryptInline { ); my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); # handling passphrase in GnuPGOptions @@@@ -1406,7 +1419,7 @@@@ sub _DecryptInlineBlock { }; $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -1417,6 +1430,11 @@@@ sub _DecryptInlineBlock { # if the decryption is fine but the signature is bad, then without this # status check we lose the decrypted text # XXX: add argument to the function to control this check + if ( !defined $res{'status'} ) { + $res{'message'} = $@@? $@@: "gpg failed ". ($? >> 8); + seek $tmp_fh, 0, 0; + return ($tmp_fh, $tmp_fn, %res); + } if ( $res{'status'} !~ /DECRYPTION_OKAY/ ) { if ( $@@ || $? ) { $res{'message'} = $@@? $@@: "gpg exitted with error code ". ($? >> 8); @@@@ -1437,6 +1455,7 @@@@ sub DecryptAttachment { ); my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); # handling passphrase in GnuPGOptions @@@@ -1488,6 +1507,7 @@@@ sub DecryptContent { ); my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); # handling passphrase in GnupGOptions @@@@ -1526,7 +1546,7 @@@@ sub DecryptContent { }; $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -1537,6 +1557,11 @@@@ sub DecryptContent { # if the decryption is fine but the signature is bad, then without this # status check we lose the decrypted text # XXX: add argument to the function to control this check + if ( !defined $res{'status'} ) { + $res{'message'} = $@@? $@@: "gpg failed ". ($? >> 8); + seek $tmp_fh, 0, 0; + return ($tmp_fh, $tmp_fn, %res); + } if ( $res{'status'} !~ /DECRYPTION_OKAY/ ) { if ( $@@ || $? ) { $res{'message'} = $@@? $@@: "gpg exitted with error code ". ($? >> 8); @@@@ -2077,6 +2102,7 @@@@ sub GetKeysInfo { } my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); $opt{'digest-algo'} ||= 'SHA1'; $opt{'with-colons'} = undef; # parseable format @@@@ -2101,12 +2127,12 @@@@ sub GetKeysInfo { waitpid $pid, 0; }; - my @@info = readline $handle{'stdout'}; + my @@info = readline $handle{'stdout'} if $handle{'stdout'}->opened ; close $handle{'stdout'}; $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -2158,7 +2184,7 @@@@ sub ParseKeysInfo { @@info{qw(OwnerTrust OwnerTrustTerse OwnerTrustLevel)} = _ConvertTrustChar( $info{'OwnerTrustChar'} ); $info{ $_ } = _ParseDate( $info{ $_ } ) - foreach qw(Created Expire); + foreach ( qw(Created Expire) ); push @@res, \%info; } elsif ( $tag eq 'sec' ) { @@@@ -2171,7 +2197,7 @@@@ sub ParseKeysInfo { @@info{qw(OwnerTrust OwnerTrustTerse OwnerTrustLevel)} = _ConvertTrustChar( $info{'OwnerTrustChar'} ); $info{ $_ } = _ParseDate( $info{ $_ } ) - foreach qw(Created Expire); + foreach ( qw(Created Expire) ); push @@res, \%info; } elsif ( $tag eq 'uid' ) { @@@@ -2179,7 +2205,7 @@@@ sub ParseKeysInfo { @@info{ qw(Trust Created Expire String) } = (split /:/, $line)[0,4,5,8]; $info{ $_ } = _ParseDate( $info{ $_ } ) - foreach qw(Created Expire); + foreach ( qw(Created Expire) ); push @@{ $res[-1]{'User'} ||= [] }, \%info; } elsif ( $tag eq 'fpr' ) { @@@@ -2276,6 +2302,7 @@@@ sub DeleteKey { my $key = shift; my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); $gnupg->options->hash_init( _PrepareGnuPGOptions( %opt ), @@@@ -2307,7 +2334,7 @@@@ sub DeleteKey { my %res; $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -2324,6 +2351,7 @@@@ sub ImportKey { my $key = shift; my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); $gnupg->options->hash_init( _PrepareGnuPGOptions( %opt ), @@@@ -2350,7 +2378,7 @@@@ sub ImportKey { my %res; $res{'exit_code'} = $?; foreach ( qw(stderr logger status) ) { - $res{$_} = do { local $/; readline $handle{$_} }; + $res{$_} = do { local $/; readline $handle{$_} if $handle{$_}->opened }; delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s; close $handle{$_}; } @@@@ -2407,6 +2435,7 @@@@ properly (and false otherwise). sub Probe { my $gnupg = new GnuPG::Interface; + $gnupg->call(RT->Config->Get('GnuPG')->{'Call'}) if RT->Config->Get('GnuPG')->{'Call'}; my %opt = RT->Config->Get('GnuPGOptions'); $gnupg->options->hash_init( _PrepareGnuPGOptions( %opt ), @ 1.4 log @make rt deal with perl 5.14 @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2010/03/14 13:12:04 spz Exp $ @ 1.3 log @improve gnupg handling @ text @d1 1 a1 1 $NetBSD$ d3 6 a8 1 --- lib/RT/Crypt/GnuPG.pm.orig 2009-12-11 17:27:20.000000000 +0000 d93 1 a93 1 @@@@ -1077,6 +1081,7 @@@@ sub VerifyAttachment { d101 1 a101 1 @@@@ -1114,7 +1119,7 @@@@ sub VerifyAttachment { d110 1 a110 1 @@@@ -1131,6 +1136,7 @@@@ sub VerifyRFC3156 { d118 1 a118 1 @@@@ -1161,7 +1167,7 @@@@ sub VerifyRFC3156 { d127 1 a127 1 @@@@ -1184,6 +1190,7 @@@@ sub DecryptRFC3156 { d135 1 a135 1 @@@@ -1226,7 +1233,7 @@@@ sub DecryptRFC3156 { d144 1 a144 1 @@@@ -1237,6 +1244,11 @@@@ sub DecryptRFC3156 { d156 1 a156 1 @@@@ -1262,6 +1274,7 @@@@ sub DecryptInline { d164 1 a164 1 @@@@ -1369,7 +1382,7 @@@@ sub _DecryptInlineBlock { d173 1 a173 1 @@@@ -1380,6 +1393,11 @@@@ sub _DecryptInlineBlock { d185 1 a185 1 @@@@ -1400,6 +1418,7 @@@@ sub DecryptAttachment { d193 1 a193 1 @@@@ -1451,6 +1470,7 @@@@ sub DecryptContent { d201 1 a201 1 @@@@ -1489,7 +1509,7 @@@@ sub DecryptContent { d210 1 a210 1 @@@@ -1500,6 +1520,11 @@@@ sub DecryptContent { d222 1 a222 1 @@@@ -2040,6 +2065,7 @@@@ sub GetKeysInfo { d230 1 a230 1 @@@@ -2064,12 +2090,12 @@@@ sub GetKeysInfo { d245 28 a272 1 @@@@ -2239,6 +2265,7 @@@@ sub DeleteKey { d280 1 a280 1 @@@@ -2270,7 +2297,7 @@@@ sub DeleteKey { d289 1 a289 1 @@@@ -2287,6 +2314,7 @@@@ sub ImportKey { d297 1 a297 1 @@@@ -2313,7 +2341,7 @@@@ sub ImportKey { d306 1 a306 1 @@@@ -2370,6 +2398,7 @@@@ properly (and false otherwise). @ 1.3.14.1 log @Pullup ticket #3589 - requested by spz devel/rt3: fix compatibility with "lang/perl5" Revisions pulled up: - devel/rt3/Makefile 1.48 - devel/rt3/distinfo 1.21 - devel/rt3/patches/patch-aa 1.3 - devel/rt3/patches/patch-ab 1.4 - devel/rt3/patches/patch-lib_RT.pm 1.1 - devel/rt3/patches/patch-lib_RT_Action_CreateTickets.pm 1.1 - devel/rt3/patches/patch-lib_RT_CustomFieldValues_External.pm 1.1 - devel/rt3/patches/patch-lib_RT_Interface_Email.pm 1.1 - devel/rt3/patches/patch-lib_RT_Interface_Email_Auth_GnuPG.pm 1.1 - devel/rt3/patches/patch-lib_RT_Ticket__Overlay.pm 1.1 - devel/rt3/patches/patch-lib_RT_Transaction__Overlay.pm 1.1 - devel/rt3/patches/patch-sbin_rt-attributes-viewer 1.1 - devel/rt3/patches/patch-sbin_rt-attributes-viewer.in 1.1 - devel/rt3/patches/patch-share_html_Admin_CustomFields_Modify.html 1.1 - devel/rt3/patches/patch-share_html_Helpers_CalPopup.html 1.1 - devel/rt3/patches/patch-share_html_Search_Bulk.html 1.1 - devel/rt3/patches/patch-share_html_Search_Elements_SelectChartType 1.1 - devel/rt3/patches/patch-share_html_Ticket_Elements_PreviewScrips 1.1 - devel/rt3/patches/patch-t_approval_admincc.t 1.1 - devel/rt3/patches/patch-t_approval_basic.t 1.1 --- Module Name: pkgsrc Committed By: spz Date: Tue Oct 25 19:38:10 UTC 2011 Modified Files: pkgsrc/devel/rt3: Makefile distinfo pkgsrc/devel/rt3/patches: patch-aa patch-ab Added Files: pkgsrc/devel/rt3/patches: patch-lib_RT.pm patch-lib_RT_Action_CreateTickets.pm patch-lib_RT_CustomFieldValues_External.pm patch-lib_RT_Interface_Email.pm patch-lib_RT_Interface_Email_Auth_GnuPG.pm patch-lib_RT_Ticket__Overlay.pm patch-lib_RT_Transaction__Overlay.pm patch-sbin_rt-attributes-viewer patch-sbin_rt-attributes-viewer.in patch-share_html_Admin_CustomFields_Modify.html patch-share_html_Helpers_CalPopup.html patch-share_html_Search_Bulk.html patch-share_html_Search_Elements_SelectChartType patch-share_html_Ticket_Elements_PreviewScrips patch-t_approval_admincc.t patch-t_approval_basic.t Log Message: make rt deal with perl 5.14 @ text @d3 1 a3 6 - add sanity checks for the pgp program call - make the pgp program path configurable instead of assuming it in the (smallish) path - perl 5.14 qw() in for* fixes --- lib/RT/Crypt/GnuPG.pm.orig 2011-04-14 00:32:21.000000000 +0000 d88 1 a88 1 @@@@ -1093,6 +1097,7 @@@@ sub VerifyAttachment { d96 1 a96 1 @@@@ -1130,7 +1135,7 @@@@ sub VerifyAttachment { d105 1 a105 1 @@@@ -1147,6 +1152,7 @@@@ sub VerifyRFC3156 { d113 1 a113 1 @@@@ -1177,7 +1183,7 @@@@ sub VerifyRFC3156 { d122 1 a122 1 @@@@ -1200,6 +1206,7 @@@@ sub DecryptRFC3156 { d130 1 a130 1 @@@@ -1242,7 +1249,7 @@@@ sub DecryptRFC3156 { d139 1 a139 1 @@@@ -1253,6 +1260,11 @@@@ sub DecryptRFC3156 { d151 1 a151 1 @@@@ -1278,6 +1290,7 @@@@ sub DecryptInline { d159 1 a159 1 @@@@ -1406,7 +1419,7 @@@@ sub _DecryptInlineBlock { d168 1 a168 1 @@@@ -1417,6 +1430,11 @@@@ sub _DecryptInlineBlock { d180 1 a180 1 @@@@ -1437,6 +1455,7 @@@@ sub DecryptAttachment { d188 1 a188 1 @@@@ -1488,6 +1507,7 @@@@ sub DecryptContent { d196 1 a196 1 @@@@ -1526,7 +1546,7 @@@@ sub DecryptContent { d205 1 a205 1 @@@@ -1537,6 +1557,11 @@@@ sub DecryptContent { d217 1 a217 1 @@@@ -2077,6 +2102,7 @@@@ sub GetKeysInfo { d225 1 a225 1 @@@@ -2101,12 +2127,12 @@@@ sub GetKeysInfo { d240 1 a240 28 @@@@ -2158,7 +2184,7 @@@@ sub ParseKeysInfo { @@info{qw(OwnerTrust OwnerTrustTerse OwnerTrustLevel)} = _ConvertTrustChar( $info{'OwnerTrustChar'} ); $info{ $_ } = _ParseDate( $info{ $_ } ) - foreach qw(Created Expire); + foreach ( qw(Created Expire) ); push @@res, \%info; } elsif ( $tag eq 'sec' ) { @@@@ -2171,7 +2197,7 @@@@ sub ParseKeysInfo { @@info{qw(OwnerTrust OwnerTrustTerse OwnerTrustLevel)} = _ConvertTrustChar( $info{'OwnerTrustChar'} ); $info{ $_ } = _ParseDate( $info{ $_ } ) - foreach qw(Created Expire); + foreach ( qw(Created Expire) ); push @@res, \%info; } elsif ( $tag eq 'uid' ) { @@@@ -2179,7 +2205,7 @@@@ sub ParseKeysInfo { @@info{ qw(Trust Created Expire String) } = (split /:/, $line)[0,4,5,8]; $info{ $_ } = _ParseDate( $info{ $_ } ) - foreach qw(Created Expire); + foreach ( qw(Created Expire) ); push @@{ $res[-1]{'User'} ||= [] }, \%info; } elsif ( $tag eq 'fpr' ) { @@@@ -2276,6 +2302,7 @@@@ sub DeleteKey { d248 1 a248 1 @@@@ -2307,7 +2334,7 @@@@ sub DeleteKey { d257 1 a257 1 @@@@ -2324,6 +2351,7 @@@@ sub ImportKey { d265 1 a265 1 @@@@ -2350,7 +2378,7 @@@@ sub ImportKey { d274 1 a274 1 @@@@ -2407,6 +2435,7 @@@@ properly (and false otherwise). @ 1.2 log @Update rt3 to version 3.4.5. This is _not_ an easy update, although the changes are apparently minor to a end user (but not for the site administrator). It'd very hard and very long to provide a full list of changes. The main changes in RT 3.4 are a complete rework of how Custom Fields are handled, which means there is a lot more flexibility in that area now (including Custom Fields for users, per-queue, per-transaction). RT 3.4 is also supposed to be faster, which certainly is no bad news. Another bonus of RT 3.4 are the availability of extensions, and I will commit RTx::Shredder and RTx::RightsMatrix very soon. Updating RT is not an easy task, be sure to backup your database, and don't forget to grant the new rights to relevant people. In pkgsrc, rt3 is also seeing a few changes. The main one is the situation of the "local" path, which is now set to /var/rt3, which seems less lame to me than the previous value. It could be debated, though. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2005/09/21 21:23:46 cube Exp $ d3 173 a175 28 --- html/Elements/Callback.orig 2004-07-29 02:08:11.000000000 +0200 +++ html/Elements/Callback @@@@ -49,7 +49,7 @@@@ my (%cache, $check); <%init> # checks for inode change time for each callback directory my $new_check = join( - $;, map { $_->[1] => (stat("$_->[1]/Callbacks"))[10] } $m->interp->resolver->comp_root_array + $;, map { $_->[1] => (stat("$_->[1]/Callbacks"))[10] } $m->interp->comp_root_array ) or return; $Page = $m->callers(1)->path unless ($Page); @@@@ -64,8 +64,18 @@@@ else { if (!$callbacks) { my $path = "/Callbacks/*$Page/$_CallbackName"; - $callbacks = [ $m->interp->resolver->glob_path($path) ]; - @@$callbacks = grep !/^\.|~$/, @@$callbacks; #skip backup files + + my @@roots = map { $_->[1] } $m->interp->comp_root_array; + my %seen; + + for my $root (@@roots) { + push @@$callbacks, + # Skip backup files, files without a leading package name, + # and files we've already seen + grep { !/^\.|~$/ + and not $seen{$_}++ } + $m->interp->resolver->glob_path($path, $root); d177 98 d276 6 a281 2 #skip files without a package my $invalid_base = "/Callbacks/$Page/$_CallbackName"; @ 1.1 log @Mason API has changed after version 1.28. Add a patch to catch up with the change (it breaks for callbacks). Inspired from the commit to solve the same issue on the 3.4 branch of RT. Bump PKGREVISION and Mason version requirement. @ text @d1 1 a1 1 $NetBSD$ @