From b8eddfe6d61cf0296c4764df5abef3093d32ac2c Mon Sep 17 00:00:00 2001
From: Dylan Hardison <dylan@hardison.net>
Date: Fri, 18 Feb 2022 14:56:49 -0500
Subject: [PATCH] change some defaults for nicer out of the box experience.

---
 Bugzilla/Install/Localconfig.pm           |  6 +++---
 Bugzilla/Localconfig.pm                   |  2 +-
 Makefile.PL                               |  2 +-
 cpanfile                                  | 11 ++---------
 extensions/BugModal/lib/ActivityStream.pm |  5 +++--
 scripts/nagios_blocker_checker.pl         |  3 ++-
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index c4c249709d..c8f8e86d7a 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -56,7 +56,7 @@ use constant LOCALCONFIG_VARS => (
   {name => 'create_htaccess', default => 1,},
   {name => 'webservergroup',  default => \&_sensible_group,},
   {name => 'use_suexec',      default => 0,},
-  {name => 'db_driver',       default => 'mysql',},
+  {name => 'db_driver',       default => 'sqlite',},
   {name => 'db_host',         default => 'localhost',},
   {name => 'db_name',         default => 'bugs',},
   {
@@ -95,7 +95,7 @@ use constant LOCALCONFIG_VARS => (
   {name => 'size_limit',          default => 750000,},
   {name => 'memcached_servers',   default => '',},
   {name => 'memcached_namespace', default => "bugzilla:",},
-  {name => 'urlbase',             default => '',},
+  {name => 'urlbase',             default => 'http://127.0.0.1:3001/'},
   {name => 'canonical_urlbase',   lazy => 1},
   {name => 'nobody_user',         default => 'nobody@mozilla.org'},
   {name => 'attachment_base',     default => '',},
@@ -243,7 +243,7 @@ sub update_localconfig {
     $value = undef
       if ($name eq 'site_wide_secret' and defined $value and length($value) == 256);
 
-    if (!defined $value) {
+    if (!defined $value && $name ne 'canonical_urlbase') {
       push(@new_vars, $name);
       $var->{default} = &{$var->{default}} if ref($var->{default}) eq 'CODE';
       if (exists $answer->{$name}) {
diff --git a/Bugzilla/Localconfig.pm b/Bugzilla/Localconfig.pm
index abbbed0c16..a452ed1a16 100644
--- a/Bugzilla/Localconfig.pm
+++ b/Bugzilla/Localconfig.pm
@@ -26,7 +26,7 @@ has 'basepath' => (is => 'lazy');
 # Use the site's URL as the default Canonical URL
 sub _build_canonical_urlbase {
   my ($self) = @_;
-  $self->urlbase;
+  $self->urlbase // '';
 }
 
 sub _build_basepath {
diff --git a/Makefile.PL b/Makefile.PL
index e5a051d54e..cc4019a91d 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -386,7 +386,7 @@ WriteMakefile(
 
 sub MY::postamble {
   return <<"MAKE";
-GEN_CPANFILE_ARGS = -D better_xff -D mysql -D jsonrpc -D xmlrpc
+GEN_CPANFILE_ARGS = -D better_xff -D sqlite -D jsonrpc -D xmlrpc
 cpanfile: MYMETA.json
 \t\$(PERLRUN) gen-cpanfile.pl \$(GEN_CPANFILE_ARGS)
 
diff --git a/cpanfile b/cpanfile
index 37e6c1bb75..34456a14d9 100644
--- a/cpanfile
+++ b/cpanfile
@@ -1,5 +1,4 @@
 requires 'Algorithm::BloomFilter', '0.02';
-requires 'Bytes::Random::Secure';
 requires 'CGI', '4.31';
 requires 'CGI::Compile';
 requires 'CGI::Emulate::PSGI';
@@ -9,9 +8,7 @@ requires 'Class::XSAccessor', '1.18';
 requires 'Crypt::CBC';
 requires 'Crypt::DES';
 requires 'Crypt::DES_EDE3';
-requires 'Crypt::OpenPGP', '1.12';
-requires 'Crypt::SMIME';
-requires 'DBD::mysql', '4.037';
+requires 'DBD::SQLite', '1.29';
 requires 'DBI', '1.614';
 requires 'DBIx::Class';
 requires 'DBIx::Class::Helpers', '2.034002';
@@ -20,7 +17,7 @@ requires 'Daemon::Generic';
 requires 'Date::Format', '2.23';
 requires 'Date::Parse', '2.31';
 requires 'DateTime', '0.75';
-requires 'DateTime::Format::MySQL', '0.06';
+requires 'DateTime::Format::SQLite', '0.11';
 requires 'DateTime::TimeZone', '2.11';
 requires 'Devel::NYTProf', '6.04';
 requires 'Digest::SHA', '5.47';
@@ -61,7 +58,6 @@ requires 'Net::DNS';
 requires 'Package::Stash', '0.37';
 requires 'Parse::CPAN::Meta', '1.44';
 requires 'PerlX::Maybe';
-requires 'Pod::Coverage::TrustPod';
 requires 'Regexp::Common';
 requires 'Role::Tiny', '2.000003';
 requires 'SOAP::Lite', '0.712';
@@ -70,9 +66,6 @@ requires 'Sereal', '4.004';
 requires 'Sub::Quote', '2.005000';
 requires 'Sys::Syslog';
 requires 'Template', '2.24';
-requires 'Test::CPAN::Meta';
-requires 'Test::Pod';
-requires 'Test::Pod::Coverage';
 requires 'Test::Taint', '1.06';
 requires 'Text::CSV_XS', '1.26';
 requires 'Text::Diff';
diff --git a/extensions/BugModal/lib/ActivityStream.pm b/extensions/BugModal/lib/ActivityStream.pm
index 7a34d49819..80690bc0af 100644
--- a/extensions/BugModal/lib/ActivityStream.pm
+++ b/extensions/BugModal/lib/ActivityStream.pm
@@ -357,8 +357,9 @@ sub _add_duplicates_to_stream {
   my $dbh = Bugzilla->dbh;
 
   my $sth = $dbh->prepare("
-        SELECT longdescs.who,
-               UNIX_TIMESTAMP(bug_when), " . $dbh->sql_date_format('bug_when') . ",
+        SELECT longdescs.who, " 
+               . $dbh->sql_date_format('bug_when', '%s') . ", "
+               . $dbh->sql_date_format('bug_when') . ",
                type,
                extra_data
           FROM longdescs
diff --git a/scripts/nagios_blocker_checker.pl b/scripts/nagios_blocker_checker.pl
index 7d04f01f60..695c7a2839 100755
--- a/scripts/nagios_blocker_checker.pl
+++ b/scripts/nagios_blocker_checker.pl
@@ -183,8 +183,9 @@
     $where .= " AND bug_severity IN ($severities)";
   }
 
+  my $ts_sql = $dbh->sql_date_format('bugs.creation_ts', '%s');
   my $sql = <<"EOF";
-        SELECT bug_id, bug_severity, UNIX_TIMESTAMP(bugs.creation_ts) AS ts
+        SELECT bug_id, bug_severity, $ts_sql AS ts
           FROM bugs
          WHERE $where
                AND COALESCE(resolution, '') = ''