X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FConfig.pm;h=87e61a2f54de7efabac7526b12fda83529065a79;hb=3ba6064542c75036f956ab24c7fccbd9bb6fcf29;hp=2b34c664b0954a32b72bfa54decac34bae4930fe;hpb=5f3ce2e1a82c0ca1373c79f40f464bbc8a10d4f7;p=debbugs.git diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm index 2b34c66..87e61a2 100644 --- a/Debbugs/Config.pm +++ b/Debbugs/Config.pm @@ -59,7 +59,9 @@ BEGIN { qw($gMaintainerFileOverride $gPseudoMaintFile $gPseudoDescFile $gPackageSource), qw($gVersionPackagesDir $gVersionIndex $gBinarySourceMap $gSourceBinaryMap), qw($gVersionTimeIndex), - qw($gSendmail $gLibPath $gSpamScan @gExcludeFromControl), + qw($gSimpleVersioning), + qw($gCVETracker), + qw($gSendmail @gSendmailArguments $gLibPath $gSpamScan @gExcludeFromControl), qw(%gSeverityDisplay @gTags @gSeverityList @gStrongSeverities), qw(%gTagsSingleLetter), qw(%gSearchEstraier), @@ -67,6 +69,7 @@ BEGIN { qw(%gObsoleteSeverities), qw(@gPostProcessall @gRemovalDefaultDistributionTags @gRemovalDistributionTags @gRemovalArchitectures), qw(@gRemovalStrongSeverityDefaultDistributionTags), + qw(@gAffectsDistributionTags), qw(@gDefaultArchitectures), qw($gMachineName), qw($gTemplateDir), @@ -100,13 +103,15 @@ use Safe; # untaint $ENV{DEBBUGS_CONFIG_FILE} if it's owned by us # This enables us to test things that are -T. if (exists $ENV{DEBBUGS_CONFIG_FILE}) { - if (${[stat($ENV{DEBBUGS_CONFIG_FILE})]}[4] = $<) { +# This causes all sorts of problems for mirrors of debbugs; disable +# it. +# if (${[stat($ENV{DEBBUGS_CONFIG_FILE})]}[4] == $<) { $ENV{DEBBUGS_CONFIG_FILE} =~ /(.+)/; $ENV{DEBBUGS_CONFIG_FILE} = $1; - } - else { - die "Environmental variable DEBBUGS_CONFIG_FILE set, and $ENV{DEBBUGS_CONFIG_FILE} is not owned by the user running this script."; - } +# } +# else { +# die "Environmental variable DEBBUGS_CONFIG_FILE set, and $ENV{DEBBUGS_CONFIG_FILE} is not owned by the user running this script."; +# } } read_config(exists $ENV{DEBBUGS_CONFIG_FILE}?$ENV{DEBBUGS_CONFIG_FILE}:'/etc/debbugs/config'); @@ -203,9 +208,21 @@ Domain where subscriptions to package lists happen =cut - set_default(\%config,'subscription_domain',undef); + +=item cve_tracker $gCVETracker + +URI to CVE security tracker; in bugreport.cgi, CVE-2001-0002 becomes +linked to http://$config{cve_tracker}CVE-2001-002 + +Default: security-tracker.debian.org/tracker/ + +=cut + +set_default(\%config,'cve_tracker','security-tracker.debian.org/tracker/'); + + =back =cut @@ -271,8 +288,6 @@ Email address where packages with an unknown maintainer will be sent Default: $config{maintainer_email} -=back - =cut set_default(\%config,'unknown_maintainer_email',$config{maintainer_email}); @@ -290,7 +305,9 @@ Default: qx(hostname --fqdn) my $_old_path = $ENV{PATH}; $ENV{PATH} = '/bin:/usr/bin:/usr/local/bin'; -set_default(\%config,'machine_name',qx(hostname --fqdn)); +my $temp_hostname = qx(hostname --fqdn); +chomp $temp_hostname; +set_default(\%config,'machine_name',$temp_hostname); $ENV{PATH} = $_old_path; =head2 BTS Mailing Lists @@ -351,11 +368,39 @@ set_default(\%config,'bug_subscription_domain',$config{list_domain}); =over +=item mailer + +Name of the mailer to use + +Default: exim + =cut set_default(\%config,'mailer','exim'); + + +=item bug + +Default: bug + +=item ubug + +Default: ucfirst($config{bug}); + +=item bugs + +Default: bugs + +=item ubugs + +Default: ucfirst($config{ubugs}); + +=cut + set_default(\%config,'bug','bug'); +set_default(\%config,'ubug',ucfirst($config{bug})); set_default(\%config,'bugs','bugs'); +set_default(\%config,'ubugs',ucfirst($config{bugs})); =item remove_age @@ -726,11 +771,24 @@ set_default(\%config,'template_dir','/usr/share/debbugs/templates'); set_default(\%config,'maintainer_file',$config{config_dir}.'/Maintainers'); set_default(\%config,'maintainer_file_override',$config{config_dir}.'/Maintainers.override'); -set_default(\%config,'pseudo_maint_file',$config{config_dir}.'/pseudo-packages.maint'); +set_default(\%config,'source_maintainer_file',$config{config_dir}.'/Source_maintainers'); +set_default(\%config,'source_maintainer_file_override',undef); +set_default(\%config,'pseudo_maint_file',$config{config_dir}.'/pseudo-packages.maintainers'); set_default(\%config,'pseudo_desc_file',$config{config_dir}.'/pseudo-packages.description'); set_default(\%config,'package_source',$config{config_dir}.'/indices/sources'); +=item simple_versioning + +If true this causes debbugs to ignore version information and just +look at whether a bug is done or not done. Primarily of interest for +debbugs installs which don't track versions. defaults to false. + +=cut + +set_default(\%config,'simple_versioning',0); + + =item version_packages_dir Location where the version package information is kept; defaults to @@ -793,6 +851,14 @@ Sets the sendmail binary to execute; defaults to /usr/lib/sendmail set_default(\%config,'sendmail','/usr/lib/sendmail'); +=item sendmail_arguments + +Default arguments to pass to sendmail. Defaults to C. + +=cut + +set_default(\%config,'sendmail_arguments',[qw(-oem -oi)]); + =item spam_scan Whether or not spamscan is being used; defaults to 0 (not being used @@ -960,6 +1026,10 @@ set_default(\%config,'html_expire_note', sub read_config{ my ($conf_file) = @_; + if (not -e $conf_file) { + print STDERR "configuration file '$conf_file' doesn't exist; skipping it\n" if $DEBUG; + return; + } # first, figure out what type of file we're reading in. my $fh = new IO::File $conf_file,'r' or die "Unable to open configuration file $conf_file for reading: $!"; @@ -1017,7 +1087,7 @@ sub __convert_name{ $hash_name =~ s/^([\$\%\@])g//; my $glob_type = $1; my $glob_name = 'g'.$hash_name; - $hash_name =~ s/(HTML|CGI)/ucfirst(lc($1))/ge; + $hash_name =~ s/(HTML|CGI|CVE)/ucfirst(lc($1))/ge; $hash_name =~ s/^([A-Z]+)/lc($1)/e; $hash_name =~ s/([A-Z]+)/'_'.lc($1)/ge; return $hash_name unless wantarray;