projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Quick fix to catch some instances of XSS vulnerability, there will be more probably...
[koha.git]
/
Makefile.PL
diff --git
a/Makefile.PL
b/Makefile.PL
index
670e8e2
..
5e576d8
100644
(file)
--- a/
Makefile.PL
+++ b/
Makefile.PL
@@
-279,7
+279,6
@@
my $target_map = {
'./reviews' => 'INTRANET_CGI_DIR',
'./rewrite-config.PL' => 'NONE',
'./reviews' => 'INTRANET_CGI_DIR',
'./reviews' => 'INTRANET_CGI_DIR',
'./rewrite-config.PL' => 'NONE',
'./reviews' => 'INTRANET_CGI_DIR',
- './rss' => 'MISC_DIR',
'./serials' => 'INTRANET_CGI_DIR',
'./skel' => 'NONE',
'./skel/var/log/koha' => { target => 'LOG_DIR', trimdir => -1 },
'./serials' => 'INTRANET_CGI_DIR',
'./skel' => 'NONE',
'./skel/var/log/koha' => { target => 'LOG_DIR', trimdir => -1 },
@@
-415,7
+414,7
@@
my %config_defaults = (
'PATH_TO_ZEBRA' => '',
);
'PATH_TO_ZEBRA' => '',
);
-# set some default configuratio options based on OS
+# set some default configuratio
n
options based on OS
# more conditions need to be added for other OS's
# this should probably also incorporate usage of Win32::GetOSName() and/or Win32::GetOSVersion()
# to allow for more granular decisions based on which Win32 platform
# more conditions need to be added for other OS's
# this should probably also incorporate usage of Win32::GetOSName() and/or Win32::GetOSVersion()
# to allow for more granular decisions based on which Win32 platform
@@
-526,23
+525,24
@@
my %test_suite_override_dirs = (
WriteMakefile(
NAME => 'koha',
WriteMakefile(
NAME => 'koha',
-
#VERSION => strftime('2.9.%Y%m%d%H',gmtime)
,
- VERSION_FROM => 'kohaversion.pl',
+
VERSION => '3.00.03'
,
+
#
VERSION_FROM => 'kohaversion.pl',
ABSTRACT => 'Award-winning integrated library system (ILS) and Web OPAC',
ABSTRACT => 'Award-winning integrated library system (ILS) and Web OPAC',
- AUTHOR => 'Koha Developers <koha-devel@
nongnu
.org>',
+ AUTHOR => 'Koha Developers <koha-devel@
lists.koha
.org>',
NO_META => 1,
PREREQ_PM => {
NO_META => 1,
PREREQ_PM => {
- 'Algorithm::CheckDigits' => 0.50,
+ 'Algorithm::CheckDigits'
=> 0.50,
'Biblio::EndnoteStyle' => 0.05,
'CGI' => 3.15,
'CGI::Carp' => 1.29,
'Biblio::EndnoteStyle' => 0.05,
'CGI' => 3.15,
'CGI::Carp' => 1.29,
- 'CGI::Session' => '4.10',
+ 'CGI::Session' => 4.20,
+ 'CGI::Session::Serialize::yaml' => 4.20,
'Class::Factory::Util' => 1.6,
'Class::Accessor' => 0.30,
'DBD::mysql' => 4.004,
'DBI' => 1.53,
'Class::Factory::Util' => 1.6,
'Class::Accessor' => 0.30,
'DBD::mysql' => 4.004,
'DBI' => 1.53,
- 'Data::ICal' => 0.13,
'Data::Dumper' => 2.121,
'Data::Dumper' => 2.121,
+ 'Data::ICal' => 0.13,
'Date::Calc' => 5.4,
'Date::ICal' => 1.72,
'Date::Manip' => 5.44,
'Date::Calc' => 5.4,
'Date::ICal' => 1.72,
'Date::Manip' => 5.44,
@@
-556,7
+556,9
@@
WriteMakefile(
'HTML::Template::Pro' => 0.69,
'HTML::Scrubber' => 0.08,
'HTTP::Cookies' => 1.39,
'HTML::Template::Pro' => 0.69,
'HTML::Scrubber' => 0.08,
'HTTP::Cookies' => 1.39,
+ 'HTTP::OAI' => 3.20,
'HTTP::Request::Common' => 1.26,
'HTTP::Request::Common' => 1.26,
+ 'JSON' => 2.07, # Needed by admin/item_circulation_alerts.pl
'LWP::Simple' => 1.41,
'LWP::UserAgent' => 2.033,
'Lingua::Stem' => 0.82,
'LWP::Simple' => 1.41,
'LWP::UserAgent' => 2.033,
'Lingua::Stem' => 0.82,
@@
-598,6
+600,7
@@
WriteMakefile(
'XML::LibXML' => 1.59,
'XML::LibXSLT' => 1.59,
'XML::SAX::ParserFactory' => 1.01,
'XML::LibXML' => 1.59,
'XML::LibXSLT' => 1.59,
'XML::SAX::ParserFactory' => 1.01,
+ 'XML::SAX::Writer' => 0.44,
'XML::Simple' => 2.14,
'XML::RSS' => 1.31,
'YAML::Syck' => 0.71,
'XML::Simple' => 2.14,
'XML::RSS' => 1.31,
'YAML::Syck' => 0.71,
@@
-1413,7
+1416,7
@@
sub install {
# installation and uninstallation targets.
# If installation is on Win32, we need to do permissions different from *nix
# installation and uninstallation targets.
# If installation is on Win32, we need to do permissions different from *nix
- if ( $^O =~ /darwin|linux|cygwin|freebsd/ ) { # this value needs to be verified for each platform and modified accordingly
+ if ( $^O =~ /darwin|linux|cygwin|freebsd
|solaris
/ ) { # this value needs to be verified for each platform and modified accordingly
foreach my $key (sort keys %$target_directories) {
$install .= qq(
KOHA_INST_$key = blib/$key
foreach my $key (sort keys %$target_directories) {
$install .= qq(
KOHA_INST_$key = blib/$key
@@
-1586,7
+1589,7
@@
sub postamble {
# these directories will be relocated to the 't' directory
foreach my $dirname ( keys %$target_directories ) {
# these directories will be relocated to the 't' directory
foreach my $dirname ( keys %$target_directories ) {
- my $dir =
$target_directories->{$dirname}
;
+ my $dir =
main::_strip_destdir( $target_directories->{$dirname} )
;
if ( exists $test_suite_override_dirs{$dirname} ) {
$dir = main::get_test_dir($dirname);
}
if ( exists $test_suite_override_dirs{$dirname} ) {
$dir = main::get_test_dir($dirname);
}