X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FModules%2FDebian.pl;h=8afaa86a029fd16b42837e11535cbe77068c172c;hb=a8442ab91d6134757304faf5df27bb5dd641ec66;hp=eb7f2e0c217549d6bb23d28847cae60c14709b3d;hpb=626da38d992b33bb84f6f697d13fff7215976f10;p=infobot.git diff --git a/src/Modules/Debian.pl b/src/Modules/Debian.pl index eb7f2e0..8afaa86 100644 --- a/src/Modules/Debian.pl +++ b/src/Modules/Debian.pl @@ -8,59 +8,54 @@ package Debian; use strict; +no strict 'refs'; # FIXME dstats aborts if set -# format: "alias=real". my $announce = 0; my $defaultdist = "sid"; my $refresh = &::getChanConfDefault("debianRefreshInterval",7) * 60 * 60 * 24; my $debug = 0; my $debian_dir = "$::bot_state_dir/debian"; +my $country = "us"; # well .config it yourself then. ;-) +my $protocol = "http"; -### ... old -#my %dists = ( -# "sid" => "unstable", -# "woody" => "testing", # new since 20001219. -# "potato" => "stable", -# "incoming" => "incoming", -#); - -### new... the right way. +# format: "alias=real". my %dists = ( "unstable" => "sid", - "testing" => "woody", # new since 20001219. - "stable" => "potato", + "testing" => "sarge", + "stable" => "woody", + "oldstable" => "potato", "incoming" => "incoming", ); my %urlcontents = ( "Contents-##DIST-i386.gz" => - "ftp://ftp.us.debian.org". + "$protocol://ftp.$country.debian.org". "/debian/dists/##DIST/Contents-i386.gz", "Contents-##DIST-i386-non-US.gz" => - "ftp://non-us.debian.org". + "$protocol://non-us.debian.org". "/debian-non-US/dists/##DIST/non-US/Contents-i386.gz", ); my %urlpackages = ( "Packages-##DIST-main-i386.gz" => - "ftp://ftp.us.debian.org". + "$protocol://ftp.$country.debian.org". "/debian/dists/##DIST/main/binary-i386/Packages.gz", "Packages-##DIST-contrib-i386.gz" => - "ftp://ftp.us.debian.org". + "$protocol://ftp.$country.debian.org". "/debian/dists/##DIST/contrib/binary-i386/Packages.gz", "Packages-##DIST-non-free-i386.gz" => - "ftp://ftp.us.debian.org". + "$protocol://ftp.$country.debian.org". "/debian/dists/##DIST/non-free/binary-i386/Packages.gz", "Packages-##DIST-non-US-main-i386.gz" => - "ftp://non-us.debian.org". + "$protocol://non-us.debian.org". "/debian-non-US/dists/##DIST/non-US/main/binary-i386/Packages.gz", "Packages-##DIST-non-US-contrib-i386.gz" => - "ftp://non-us.debian.org". + "$protocol://non-us.debian.org". "/debian-non-US/dists/##DIST/non-US/contrib/binary-i386/Packages.gz", "Packages-##DIST-non-US-non-free-i386.gz" => - "ftp://non-us.debian.org". + "$protocol://non-us.debian.org". "/debian-non-US/dists/##DIST/non-US/non-free/binary-i386/Packages.gz", ); @@ -69,7 +64,7 @@ my %urlpackages = ( ####################### #### -# Usage: &DebianDownload(%hash); +# Usage: &DebianDownload($dist, %hash); sub DebianDownload { my ($dist, %urls) = @_; my $bad = 0; @@ -89,7 +84,7 @@ sub DebianDownload { $file =~ s/##DIST/$dist/g; my $update = 0; - if ( -f $file) { + if ( -f $file ) { my $last_refresh = (stat $file)[9]; $update++ if (time() - $last_refresh > $refresh); } else { @@ -114,41 +109,46 @@ sub DebianDownload { if ($url =~ /^ftp:\/\/(.*?)\/(\S+)\/(\S+)$/) { my ($host,$path,$thisfile) = ($1,$2,$3); -### HACK 1 -# if ($file =~ /Contents-woody-i386-non-US/) { -# &::DEBUG("Skipping Contents-woody-i386-non-US."); -# $file =~ s/woody/potato/; -# $path =~ s/woody/potato/; -# next; -# } - if (!&::ftpGet($host,$path,$thisfile,$file)) { &::WARN("deb: down: $file == BAD."); $bad++; next; } - if (! -f $file) { - &::WARN("deb: down: ftpGet: !file"); + } elsif ($url =~ /^http:\/\/\S+\/\S+$/) { + + if (!&::getURLAsFile($url,$file)) { + &::WARN("deb: down: http: $file == BAD."); $bad++; next; } -### HACK2 -# if ($file =~ /Contents-potato-i386-non-US/) { -# &::DEBUG("hack: using potato's non-US contents for woody."); -# system("cp debian/Contents-potato-i386-non-US.gz debian/Contents-woody-i386-non-US.gz"); -# } - - &::DEBUG("deb: download: good.") if ($debug); - $good++; } else { &::ERROR("Debian: invalid format of url => ($url)."); $bad++; next; } + + if (! -f $file) { + &::WARN("deb: down: http: !file"); + $bad++; + next; + } + + my $exit = CORE::system("/bin/gzip -t $file >/dev/null 2>&1"); + if ($exit) { + &::WARN("deb: $file is corrupted :/"); + unlink $file; + next; + } + + &::DEBUG("deb: download: good.") if ($debug); + $good++; } + # ok... lets just run this. + &::miscCheck() if (&::whatInterface() =~ /IRC/); + if ($good) { &generateIndex($dist); return 1; @@ -218,8 +218,8 @@ sub searchContents { foreach (keys %urlcontents) { s/##DIST/$dist/g; - next unless ( -f $_); - push(@files,$_); + next unless ( -f "$debian_dir/$_" ); + push(@files, "$debian_dir/$_"); } if (!scalar @files) { @@ -236,26 +236,27 @@ sub searchContents { $regex =~ s/\?/./g; open(IN,"zegrep -h '$grepRE' $files |"); + # wonderful abuse of if, last, next, return, and, unless ;) while () { - if (/^\.?\/?(.*?)[\t\s]+(\S+)\n$/) { - my ($file,$package) = ("/".$1,$2); - if ($query =~ /[\/\*\\]/) { - next unless (eval { $file =~ /$regex/ }); - return unless &checkEval($@); - } else { - my ($basename) = $file =~ /^.*\/(.*)$/; - next unless (eval { $basename =~ /$regex/ }); - return unless &checkEval($@); - } - next if ($query !~ /\.\d\.gz/ and $file =~ /\/man\//); - next if ($front and eval { $file !~ /^\/$query/ }); - return unless &checkEval($@); + last if ($found > 100); - $contents{$package}{$file} = 1; - $found++; + next unless (/^\.?\/?(.*?)[\t\s]+(\S+)\n$/); + my ($file,$package) = ("/".$1,$2); + + if ($query =~ /[\/\*\\]/) { + next unless (eval { $file =~ /$regex/ }); + return unless &checkEval($@); + } else { + my ($basename) = $file =~ /^.*\/(.*)$/; + next unless (eval { $basename =~ /$regex/ }); + return unless &checkEval($@); } + next if ($query !~ /\.\d\.gz/ and $file =~ /\/man\//); + next if ($front and eval { $file !~ /^\/$query/ }); + return unless &checkEval($@); - last if ($found > 100); + $contents{$package}{$file} = 1; + $found++; } close IN; @@ -274,7 +275,7 @@ sub searchContents { } my $file = "$::param{tempDir}/$::who.txt"; - if (!open(OUT,">$file")) { + if (!open OUT, ">$file") { &::ERROR("Debian: cannot write file for dcc send."); return; } @@ -314,23 +315,24 @@ sub searchContents { my $prefix = "Debian Search of '$query' "; if (scalar @list) { # @list. &::pSReply( &::formListReply(0, $prefix, @list) ); + return; + } - } else { # !@list. - &::DEBUG("deb: ok, !\@list, searching desc for '$query'.") if ($debug); - my @list = &searchDesc($query); + # !@list. + &::DEBUG("deb: ok, !\@list, searching desc for '$query'.") if ($debug); + @list = &searchDesc($query); - if (!scalar @list) { - my $prefix = "Debian Package/File/Desc Search of '$query' "; - &::pSReply( &::formListReply(0, $prefix, ) ); + if (!scalar @list) { + my $prefix = "Debian Package/File/Desc Search of '$query' "; + &::pSReply( &::formListReply(0, $prefix, ) ); - } elsif (scalar @list == 1) { # list = 1. - &::DEBUG("deb: list == 1; showing package info of '$list[0]'."); - &infoPackages("info", $list[0]); + } elsif (scalar @list == 1) { # list = 1. + &::DEBUG("deb: list == 1; showing package info of '$list[0]'."); + &infoPackages("info", $list[0]); - } else { # list > 1. - my $prefix = "Debian Desc Search of '$query' "; - &::pSReply( &::formListReply(0, $prefix, @list) ); - } + } else { # list > 1. + my $prefix = "Debian Desc Search of '$query' "; + &::pSReply( &::formListReply(0, $prefix, @list) ); } } @@ -352,7 +354,7 @@ sub searchAuthor { foreach (keys %urlpackages) { s/##DIST/$dist/g; - if (! -f $_) { + if (! -f "$debian_dir/$_" ) { $bad++; next; } @@ -390,7 +392,8 @@ sub searchAuthor { $package = ""; } else { - &::WARN("invalid line: '$_'."); + chop; + &::WARN("debian: invalid line: '$_' (1)."); } } close IN; @@ -454,13 +457,13 @@ sub searchDesc { foreach (keys %urlpackages) { s/##DIST/$dist/g; - if (! -f $_) { + if (! -f "$debian_dir/$_" ) { $bad++; next; } $good++; - $files .= " ".$_; + $files .= " $debian_dir/$_"; } &::DEBUG("deb(2): good = $good, bad = $bad...") if ($debug); @@ -494,10 +497,13 @@ sub searchDesc { &::WARN("sD: package == NULL?"); next; } + $desc{$package} = $desc; $package = ""; + } else { - &::WARN("invalid line: '$_'."); + chop; + &::WARN("debian: invalid line: '$_'. (2)"); } } close IN; @@ -512,7 +518,7 @@ sub searchDesc { #### # Usage: &generateIncoming(); sub generateIncoming { - my $pkgfile = "debian/Packages-incoming"; + my $pkgfile = $debian_dir."/Packages-incoming"; my $idxfile = $pkgfile.".idx"; my $stale = 0; $stale++ if (&::isStale($pkgfile.".gz", $refresh)); @@ -523,11 +529,11 @@ sub generateIncoming { ### STATIC URL. my %ftp = &::ftpList("llug.sep.bnl.gov", "/pub/debian/Incoming/"); - if (!open(PKG,">$pkgfile")) { + if (!open PKG, ">$pkgfile") { &::ERROR("cannot write to pkg $pkgfile."); return 0; } - if (!open(IDX,">$idxfile")) { + if (!open IDX, ">$idxfile") { &::ERROR("cannot write to idx $idxfile."); return 0; } @@ -572,7 +578,7 @@ sub getPackageInfo { my $found = 0; my (%pkg, $pkg); - open(IN, "zcat $file 2>&1 |"); + open(IN, "/bin/zcat $file 2>&1 |"); my $done = 0; while (!eof IN) { @@ -583,7 +589,7 @@ sub getPackageInfo { # package line. if (/^Package: (.*)\n$/) { $pkg = $1; - if ($pkg =~ /^$package$/i) { + if ($pkg =~ /^\Q$package\E$/i) { $found++; # we can use pkg{'package'} instead. $pkg{'package'} = $pkg; } @@ -667,6 +673,7 @@ sub infoPackages { if (!scalar @files) { &::status("Debian: no valid package found; checking incoming."); @files = &validPackage($package, "incoming"); + if (scalar @files) { &::status("Debian: cool, it exists in incoming."); $incoming++; @@ -705,26 +712,7 @@ sub infoPackages { # 'fm'-like output. if ($query eq "info") { - if (scalar keys %pkg > 5) { - $pkg{'info'} = "\002(\002". $pkg{'desc'} ."\002)\002"; - $pkg{'info'} .= ", section ".$pkg{'section'}; - $pkg{'info'} .= ", is ".$pkg{'priority'}; -# $pkg{'info'} .= ". Version: \002$pkg{'version'}\002"; - $pkg{'info'} .= ". Version: \002$pkg{'version'}\002 ($dist)"; - $pkg{'info'} .= ", Packaged size: \002". int($pkg{'size'}/1024) ."\002 kB"; - $pkg{'info'} .= ", Installed size: \002$pkg{'installed'}\002 kB"; - - if ($incoming) { - &::status("iP: info requested and pkg is in incoming, too."); - my %incpkg = &getPackageInfo($query, "debian/Packages-incoming"); - - if (scalar keys %incpkg) { - $pkg{'info'} .= ". Is in incoming ($incpkg{'file'})."; - } else { - &::ERROR("iP: pkg $query is in incoming but we couldn't get any info?"); - } - } - } else { + if (scalar keys %pkg <= 5) { &::DEBUG("deb: running debianCheck() due to problems (".scalar(keys %pkg).")."); &debianCheck(); &::DEBUG("deb: end of debianCheck()"); @@ -732,7 +720,26 @@ sub infoPackages { &::msg($::who,"Debian: Package appears to exist but I could not retrieve info about it..."); return; } - } + + $pkg{'info'} = "\002(\002". $pkg{'desc'} ."\002)\002"; + $pkg{'info'} .= ", section ".$pkg{'section'}; + $pkg{'info'} .= ", is ".$pkg{'priority'}; +# $pkg{'info'} .= ". Version: \002$pkg{'version'}\002"; + $pkg{'info'} .= ". Version: \002$pkg{'version'}\002 ($dist)"; + $pkg{'info'} .= ", Packaged size: \002". int($pkg{'size'}/1024) ."\002 kB"; + $pkg{'info'} .= ", Installed size: \002$pkg{'installed'}\002 kB"; + + if ($incoming) { + &::status("iP: info requested and pkg is in incoming, too."); + my %incpkg = &getPackageInfo($query, $debian_dir ."/Packages-incoming"); + + if (scalar keys %incpkg) { + $pkg{'info'} .= ". Is in incoming ($incpkg{'file'})."; + } else { + &::ERROR("iP: pkg $query is in incoming but we couldn't get any info?"); + } + } + } if ($dist eq "incoming") { $pkg{'info'} .= "Version: \002$pkg{'version'}\002"; @@ -775,7 +782,7 @@ sub infoStats { } my %stats; - my %total; + my %total = (count => 0, maint => 0, isize => 0, csize => 0); my $file; foreach $file (keys %urlpackages) { $file =~ s/##DIST/$dist/g; # won't work for incoming. @@ -785,10 +792,10 @@ sub infoStats { next; } - open(IN,"zcat $file 2>&1 |"); + open(IN, "zcat $debian_dir/$file 2>&1 |"); - if (! -e $file) { - &::DEBUG("deb: iS: $file does not exist."); + if (! -e "$debian_dir/$file") { + &::DEBUG("deb: iS: $debian_dir/$file does not exist."); next; } @@ -843,7 +850,7 @@ sub infoStats { # Usage: &generateIndex(); sub generateIndex { my (@dists) = @_; - &::status("Debian: !!! generateIndex($dists[0]) called !!!"); + &::DEBUG("D: generateIndex($dists[0]) called!"); if (!scalar @dists or $dists[0] eq '') { &::ERROR("gI: no dists to generate index."); return 1; @@ -851,7 +858,7 @@ sub generateIndex { foreach (@dists) { my $dist = &getDistro($_); # incase the alias is returned, possible? - my $idx = "debian/Packages-$dist.idx"; + my $idx = $debian_dir."/Packages-$dist.idx"; # TODO: check if any of the Packages file have been updated then # regenerate it, even if it's not stale. @@ -870,11 +877,11 @@ sub generateIndex { system("cp $idx $idx-old"); } - &::DEBUG("deb: gIndex: calling DebianDownload($dist, ...)."); - &DebianDownload($dist, %urlpackages); + &::DEBUG("deb: gIndex: calling DebianDownload($dist, ...).") if ($debug); + &DebianDownload($dist, &fixDist($dist, %urlpackages) ); &::status("Debian: generating index for '$dist'."); - if (!open(OUT,">$idx")) { + if (!open OUT, ">$idx") { &::ERROR("cannot write to $idx."); return 0; } @@ -882,6 +889,7 @@ sub generateIndex { my $packages; foreach $packages (keys %urlpackages) { $packages =~ s/##DIST/$dist/; + $packages = "$debian_dir/$packages"; if (! -e $packages) { &::ERROR("gIndex: '$packages' does not exist?"); @@ -917,7 +925,7 @@ sub validPackage { &::DEBUG("deb: validPackage($package, $dist) called.") if ($debug); my $error = 0; - while (!open(IN, "debian/Packages-$dist.idx")) { + while (!open IN, $debian_dir."/Packages-$dist.idx") { if ($error) { &::ERROR("Packages-$dist.idx does not exist (#1)."); return; @@ -949,26 +957,22 @@ sub validPackage { sub searchPackage { my ($dist, $query) = &getDistroFromStr($_[0]); - my $file = "debian/Packages-$dist.idx"; - my @files; + my $file = $debian_dir."/Packages-$dist.idx"; + my $warn = ($query =~ tr/A-Z/a-z/) ? 1 : 0; my $error = 0; - my $warn = 0; - - if ($query =~ tr/A-Z/a-z/) { - $warn++; - } + my @files; &::status("Debian: Search package matching '$query' in '$dist'."); - unlink $file if ( -z $file); + unlink $file if ( -z $file ); - while (!open(IN, $file)) { + while (!open IN, $file) { if ($dist eq "incoming") { &::DEBUG("deb: sP: dist == incoming; calling gI()."); &generateIncoming(); } if ($error) { - &::ERROR("could not generate index ($file)!!!"); + &::ERROR("could not generate index ($file)!"); return; } @@ -1061,11 +1065,12 @@ sub fixDist { ### TODO: what should we do if the sar wasn't done. $new{$debian_dir."/".$key} = $val; } + return %new; } sub DebianFind { - ### H-H-H-HACK HACK HACK :) + # HACK! HACK! HACK! my ($str) = @_; my ($dist, $query) = &getDistroFromStr($str); my @results = sort &searchPackage($str); @@ -1082,19 +1087,20 @@ sub DebianFind { } sub debianCheck { - my $dir = "debian/"; my $error = 0; &::status("debianCheck() called."); ### TODO: remove the following loop (check if dir exists before) while (1) { - last if (opendir(DEBIAN, $dir)); + last if (opendir(DEBIAN, $debian_dir)); + if ($error) { &::ERROR("dC: cannot opendir debian."); return; } - mkdir $dir, 0755; + + mkdir $debian_dir, 0755; $error++; } @@ -1103,14 +1109,15 @@ sub debianCheck { while (defined($file = readdir DEBIAN)) { next unless ($file =~ /(gz|bz2)$/); - my $exit = system("gzip -t '$dir/$file'"); + # todo: add bzip2 support (debian doesn't do .bz2 anyway) + my $exit = system("/bin/gzip -t '$debian_dir/$file'"); next unless ($exit); &::DEBUG("deb: hmr... => ".(time() - (stat($file))[8])."'."); next unless (time() - (stat($file))[8] > 3600); &::DEBUG("deb: dC: exit => '$exit'."); - &::WARN("dC: '$dir/$file' corrupted? deleting!"); - unlink $dir."/".$file; + &::WARN("dC: '$debian_dir/$file' corrupted? deleting!"); + unlink $debian_dir."/".$file; $retval++; } @@ -1129,7 +1136,7 @@ sub checkEval { } sub searchDescFE { - &::DEBUG("deb: FE called for searchDesc"); +# &::DEBUG("deb: FE called for searchDesc"); my ($query) = @_; my @list = &searchDesc($query);