Browse Source

Remove trailing whitespace

tags/popcon-1.62
Bill Allombert 6 years ago
parent
commit
d75ffacb09
10 changed files with 71 additions and 71 deletions
  1. +5
    -5
      README
  2. +1
    -1
      clean-filter
  3. +31
    -31
      debian/changelog
  4. +7
    -7
      debian/popcon-largest-unused.8
  5. +6
    -6
      debian/popularity-contest.8
  6. +5
    -5
      examples/bin/popanal.py
  7. +1
    -1
      examples/bin/popcon-stat.pl
  8. +9
    -9
      examples/bin/popcon.pl
  9. +1
    -1
      examples/cgi-bin/popcon.cgi
  10. +5
    -5
      popcon-upload

+ 5
- 5
README View File

@@ -5,7 +5,7 @@ DEBIAN PACKAGE POPULARITY CONTEST - Avery Pennarun <apenwarr@debian.org>
This package contains a script, /usr/sbin/popularity-contest, which
generates a list of the packages installed on your system, in order of
most-recently-used to least-recently-used. The simplest way to use this
information is to help clean up your hard drive by removing unused packages.
information is to help clean up your hard drive by removing unused packages.

For example,
popularity-contest | grep '<OLD>'
@@ -34,13 +34,13 @@ installed on your system. They have the format:

<atime> <ctime> <package-name> <mru-program> <tag>

<package-name> is the name of the Debian package that contains <mru-program>.
<package-name> is the name of the Debian package that contains <mru-program>.
<mru-program> is the most recently used program, static library, or header
(.h) file in the package.

<atime> and <ctime> are the access time and creation time of the
<mru-program> on your disk, respectively, represented as the number of
seconds since midnight GMT on January 1, 1970 (i.e. in Unix time_t format).
seconds since midnight GMT on January 1, 1970 (i.e. in Unix time_t format).
Linux updates <atime> whenever you open the file; <ctime> was set when you
first installed the package.

@@ -73,7 +73,7 @@ to keep.
!!!!

SECURITY NOTE: it's impossible to make a submission completely anonymous,
since Internet servers tend to add headers and log messages along the way.
since Internet servers tend to add headers and log messages along the way.
Our receiver program at debian throws away this information as soon as
possible so no one will see it, but if you're really paranoid you might not
want to participate.
@@ -97,7 +97,7 @@ RELATED PROJECTS
================

There are several projects trying to count users and machines. First and
foremost is the Linux Counter at http://counter.li.org/. It tries to
foremost is the Linux Counter at http://counter.li.org/. It tries to
estimate the amount of Linux users worldwide.

There are some popcon installations for other distributions:


+ 1
- 1
clean-filter View File

@@ -29,7 +29,7 @@ sub fuzzy_timestamp {
}

while (my $line = <STDIN>) {
if ($line =~ m/^POPULARITY-CONTEST-0/i) {
$foundentry = 1;
$ignorecount = 0;


+ 31
- 31
debian/changelog View File

@@ -28,7 +28,7 @@ popularity-contest (1.61) unstable; urgency=low
- New popcon.debian.org layout by Stéphane Blondon
* debian/control:
- Updated Standards-Version from 3.9.4 to 3.9.5. No change needed.
- Add Vcs-Browser and Vcs-Git fields. Closes: #729024.
- Add Vcs-Browser and Vcs-Git fields. Closes: #729024.
Thanks Yaroslav Halchenko.
- Petter has retired as popcon maintainer. Adjust Uploaders field.
* Allow derivatives to set up their own public keys in addition to Debian.
@@ -36,7 +36,7 @@ popularity-contest (1.61) unstable; urgency=low
+ debian/cron.daily:
- Add support for /etc/popularity-contest.d/
- Allow multiple keyrings and keys to be set.
+ FAQ: Add section for derivative distributions
+ FAQ: Add section for derivative distributions
- Document /etc/popularity-contest.d/

-- Bill Allombert <ballombe@debian.org> Mon, 17 Mar 2014 20:37:27 +0100
@@ -85,7 +85,7 @@ popularity-contest (1.58) unstable; urgency=low
- Accept encrypted report.
+ examples/bin/prepop.pl, examples/bin/popcon-process.sh
- Add support for decrypting encrypted report
* popularity-contest:
* popularity-contest:
- truncate reported atime and ctime to multiple of 12 hours to reduce
information leak. Closes: #707951 Thanks Bernhard R. Link
* debian/control:
@@ -101,7 +101,7 @@ popularity-contest (1.57) unstable; urgency=low
* popcon.pl:
- add popcon version of wheezy
[ Christian Perrier ]
[ Debconf translations ]
[ Debconf translations ]
* Kannada (Mallikarjuna). Closes: #694411

-- Bill Allombert <ballombe@debian.org> Sun, 05 May 2013 21:21:15 +0200
@@ -109,7 +109,7 @@ popularity-contest (1.57) unstable; urgency=low
popularity-contest (1.56) unstable; urgency=low

[ Christian Perrier ]
[ Debconf translations ]
[ Debconf translations ]
* Latvian (Rūdolfs Mazurs). Closes: #674661
* Lithuanian (Rimas Kudelis). Closes: #675629
* Galician (Jorge Barreiro). Closes: #676988
@@ -135,7 +135,7 @@ popularity-contest (1.54) unstable; urgency=low

[ Bill Allombert ]
* README: mention move to subversion.
* popanal.py: sync with popcon.debian.org version:
* popanal.py: sync with popcon.debian.org version:
- sort packages by name in all-popcon-results to prevent data leak.
Closes: #634474 Thanks Timo Juhani Lindfors for finding this issue.
- add support for generating stats for stable reports.
@@ -148,21 +148,21 @@ popularity-contest (1.54) unstable; urgency=low
* debian/control:
- Updated Standards-Version from 3.9.2 to 3.9.3. No change needed.
* popcon-largest-unused:
- Do not fail when there are no OLD packages.
- Do not fail when there are no OLD packages.
Closes: #666771 Thanks Jeffrey Sheinberg

[ Debconf translations ]
* Sinhala; (Danishka Navin). Closes: #640757
* Icelandic (Sveinn í Felli).
* Icelandic (Sveinn í Felli).
* Kannada (Vikram Vincent). Closes: #659342

-- Bill Allombert <ballombe@debian.org> Wed, 09 May 2012 00:03:32 +0200

popularity-contest (1.53) unstable; urgency=low

* popularity-contest:
* popularity-contest:
- Find package files lists by running dpkg -L by batches. Closes: #622322
This fix an issues with multiarch packages. (sorry for the delay)
This fix an issues with multiarch packages. (sorry for the delay)
* debian/control:
- Updated Standards-Version from 3.9.1 to 3.9.2. No change needed.

@@ -171,8 +171,8 @@ popularity-contest (1.53) unstable; urgency=low
popularity-contest (1.52) unstable; urgency=low

* Please note when reading stats that squeeze was released with 1.49.
* Allow cron.daily to run if last run was more than 7 day ago.
Patch from Vagrant Cascadian. Closes: #610876
* Allow cron.daily to run if last run was more than 7 day ago.
Patch from Vagrant Cascadian. Closes: #610876
* FAQ: document how to disable sending report by email. Closes: #502159
Thanks, Ryo Furue.
* prepop.pl popcon-stat.pl popcon-process.sh popcon.pl:
@@ -212,7 +212,7 @@ popularity-contest (1.49) unstable; urgency=low
[ Bill Allombert ]
* popcon.pl:
- sync with popcon.debian.org version: add source (max) ratings.
* debian/control:
* debian/control:
- Build-Depends: raise debhelper version to (>=5) to match compat.
- Updated Standards-Version from 3.8.1 to 3.9.1. No change needed.

@@ -233,10 +233,10 @@ popularity-contest (1.48) unstable; urgency=low
[ Bill Allombert ]
* popcon.pl:
- sync with popcon.debian.org version: add release names.
* popularity-contest:
- use "dpkg --print-architecture" instead of
* popularity-contest:
- use "dpkg --print-architecture" instead of
"dpkg --print-installation-architecture". Closes: #529393
* debian/control:
* debian/control:
- Updated Standards-Version from 3.8.0 to 3.8.1. No change needed.
* debian/compat:
- Set debhelper compatibility level to 5
@@ -561,7 +561,7 @@ popularity-contest (1.33) unstable; urgency=low
to fit a decision taken in -i18n

[Bill Allombert]
* FAQ:
* FAQ:
- Apply spelling fix by Thijs Kinkhorst, thanks! (Closes: #348329)
- Remove paragraph about 'valid sender domain' since popcon.debian.org
mail-server no more requires it.
@@ -736,7 +736,7 @@ popularity-contest (1.28) unstable; urgency=low

* Update example server-side scripts to popcon.d.o version:
- popcon.pl: Fix typos in index.html header text.
+ Output timings to stdout.
+ Output timings to stdout.
- popanal.py: Catch broken date field in reports.
- popcon-process.sh: redirect popcon.pl output to popcon.log
* Translations (Done by Christian Perrier)
@@ -765,7 +765,7 @@ popularity-contest (1.26) unstable; urgency=low
* popcon.pl: Accomodate with kfreebsd-gnu new URL.
+ Add popcon release stats.
* popcon-stat.pl: Unclutter the graph.
+ Generate the popcon release graph.
+ Generate the popcon release graph.
* FAQ: Document how to not send popcon email by root. Closes: #264593
Thanks Martin Dickopp.
+ Document when popularity-contest run and recommends anacron.
@@ -1024,7 +1024,7 @@ popularity-contest (1.12) unstable; urgency=low
to report the platform.
* Update server-side scripts to current popcon.debian.org version.
* Fix sh scripts to avoid non POSIX test options. (Closes: #231958).
* Update French debconf translation, thanks Christian Perrier.
* Update French debconf translation, thanks Christian Perrier.
(Closes: #231294)
* Update Dutch debconf translation, thanks Bart Cornelis. (Closes: #229752)

@@ -1148,7 +1148,7 @@ popularity-contest (1.4) unstable; urgency=low
popularity-contest (1.3-1.3) unstable; urgency=low

* NMU again
* Removed the "Accept here" sentence in debconf templates
* Removed the "Accept here" sentence in debconf templates
as suggested by Joey Hess.

-- Christian Perrier <bubulle@debian.org> Fri, 29 Aug 2003 11:54:13 +0200
@@ -1212,13 +1212,13 @@ popularity-contest (1.1-1) unstable; urgency=low

* Allow overriding the From: and Sender: headers in outgoing mail by
adding a new MAIL_FROM variable in /etc/popularity-contest.conf. Also
drop to user "nobody" before running. Closes: #89530, #39501, #69823,
drop to user "nobody" before running. Closes: #89530, #39501, #69823,
#74809, #57257, #57709, #65218. Okay, this was obviously a popular
request, but if people would just configure their mailers not to use
invalid From: lines by default, they would be a lot happier.
* Added a popularity-contest.8 manpage. Closes: #39501.
* Updated README. Closes: #105668.

-- Avery Pennarun <apenwarr@debian.org> Tue, 6 Nov 2001 21:19:38 -0500
@@ -1226,15 +1226,15 @@ popularity-contest (1.1-1) unstable; urgency=low
popularity-contest (1.0-1) unstable; urgency=low

* Now runs only once a week instead of once a day. Fixes bug#53768.
* Let sendmail auto-generate the From header. Fixes bug#48195, bug#48200.
* Warnings about Received and Message-Id e-mail lines that may reveal the
sender. Fixes bug#31205.
* Actually even version 0.1-2 saved the popcon results to a log file, so
that fixes bug#44801.
* Uses a more unique ID string than just the hostname, and it persists
across hostname changes.

@@ -1249,12 +1249,12 @@ popularity-contest (0.1-2) frozen unstable; urgency=low
popularity-contest (0.1) frozen unstable; urgency=low

* Use a valid From_ address for sendmail; fixes bug#30341.
* popularity-contest.8 is a link to the undocumented(8) man page, and we
provide a README file in /usr/doc; downgrades bug#28745.
* Include my post-processing scripts in /usr/doc/popularity-contest/examples
* No longer tries to report on packages that aren't installed.

-- Avery Pennarun <apenwarr@debian.org> Sun, 20 Dec 1998 16:11:02 -0500


+ 7
- 7
debian/popcon-largest-unused.8 View File

@@ -1,22 +1,22 @@
.TH "popcon-largest-unused" "8" "" "Yann Dirson" ""
.SH "NAME"
.LP
.LP
popcon\-largest\-unused \- List size of unused packages
.SH "SYNTAX"
.LP
.LP
popcon\-largest\-unused
.SH "DESCRIPTION"
.LP
.LP
Based on the list of unused packages reported by
popularity\-contest, this program extract the package size
from the APT cache, and list the unused packages sorted
by size.
.SH "FILES"
.LP
\fI/var/log/popularity\-contest\fP
.LP
\fI/var/log/popularity\-contest\fP
.SH "AUTHORS"
.LP
.LP
Yann Dirson <dirson@debian.org>
.SH "SEE ALSO"
.LP
.LP
popularity\-contest(8)

+ 6
- 6
debian/popularity-contest.8 View File

@@ -1,6 +1,6 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
.\"
.\"
.\"
.\"
.TH "POPULARITY-CONTEST" "8" "November 2001" "Debian/GNU Linux" ""
.SH "NAME"
popularity\-contest \- list the most popular Debian packages
@@ -13,17 +13,17 @@ command gathers information about Debian packages installed on the system,
and prints the name of the most recently used executable program in that
package as well as its last\-accessed time (atime) and last\-attribute\-changed
time (ctime) to stdout.
.PP
.PP
When aggregated with the output of
.B popularity\-contest
from many other systems, this information is valuable because it can be used
to determine which Debian packages are commonly installed, used, or
installed and never used. This helps Debian maintainers make decisions such
as which packages should be installed by default on new systems.
.PP
.PP
The resulting statistic is available from the project home page
.BR http://popcon.debian.org/ .
.PP
.PP
Normally,
.B popularity\-contest
is run from a
@@ -37,7 +37,7 @@ and
.BR /usr/share/popularity-contest/default.conf .
.SH "SEE ALSO"
The popularity\-contest FAQ at
.BR /usr/share/doc/popularity\-contest/FAQ
.BR /usr/share/doc/popularity\-contest/FAQ
.BR popcon\-largest\-unused (8),
.BR cron (8)
.LP


+ 5
- 5
examples/bin/popanal.py View File

@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python
#
# Read Debian popularity-contest submission data on stdin and produce
# some statistics about it.
@@ -107,9 +107,9 @@ def read_depends(filename):
dep = dep + parse_depends(split[1])
elif split[0]=='Provides':
prov = parse_depends(split[1])
if not line: break

class Entry:
atime = 0;
@@ -233,7 +233,7 @@ def read_submissions(stream):
e.release = 'unknown'
else:
e.release = header['POPCONVER']
if header.has_key('ARCH'):
if header['ARCH']=='x86_64':
e.arch = 'amd64'
@@ -249,7 +249,7 @@ def read_submissions(stream):
if header.has_key('TIME'):
try:
date = long(header['TIME'])
except:
except:
ewrite('Invalid date: ' + header['TIME'])
continue
e.done(date,stat)


+ 1
- 1
examples/bin/popcon-stat.pl View File

@@ -124,7 +124,7 @@ for $arch (@arch)
$obj->set ('pt_size' => 1);
$obj->set ('x_ticks' => 'vertical');
$obj->set ('skip_x_ticks' => 105);
$obj->set ('composite_info' => [ ['LinesPoints', [1]], ['LinesPoints', [2] ] ]);
$obj->set ('composite_info' => [ ['LinesPoints', [1]], ['LinesPoints', [2] ] ]);
$obj->png ("$dirpng/sub-$arch.png", \@data);
}



+ 9
- 9
examples/bin/popcon.pl View File

@@ -11,7 +11,7 @@ my %popfile=('all' => "all-popcon-results.gz", 'stable' => "stable-popcon-result
my %poptext=('all' => "All reports", 'stable' => "Stable reports");
my $mirrorbase = "/srv/mirrors/debian";
my $docurlbase = "/";
my %popconver=("1.28" => "sarge", "1.41" => "etch", "1.46" => "lenny",
my %popconver=("1.28" => "sarge", "1.41" => "etch", "1.46" => "lenny",
"1.49" => "squeeze", "1.56" => "wheezy", "1.61" => "jessie");
my %popver=();
my @dists=("main","contrib","non-free","non-US");
@@ -110,11 +110,11 @@ sub popconintro
package. This package sends every week the list of packages installed and the
access time of relevant files to the server via email. Every day the server
anonymizes the result and publishes this survey.
For more information, read the <a href="${docurlbase}README">README</a> and the
For more information, read the <a href="${docurlbase}README">README</a> and the
<a href="${docurlbase}FAQ">FAQ</a>.
</em>
<p><em>To participate in this survey, install the <a href="http://packages.debian.org/popularity-contest">popularity-contest</a> package.</em> </p>
<p></p>
<p></p>
<form method="GET" action="http://qa.debian.org/popcon.php">Popcon statistics
for source package <input type="text" size="30" maxlength="80" name="package">
<input type="submit" value="Go">
@@ -147,7 +147,7 @@ for source package <input type="text" size="30" maxlength="80" name="package">
.legend dt{
margin: 0;
}
dt {
float: left;
clear: left;
@@ -255,11 +255,11 @@ sub make_by
print DAT $list_header{$sec};
$me="";
}
else
else
{
print DAT <<"EOF";
#Format
#
#
#<name> is the package name;
EOF
$me="(maintainer)";
@@ -310,7 +310,7 @@ my %source=();

#Format
#<name> <vote> <old> <recent> <no-files>
#
#
#<name> is the package name;
#<vote> is the number of people who use this package regularly;
#<old> is the number of people who installed, but don't use this package
@@ -343,7 +343,7 @@ sub read_result
$maintpkg{$maint{$name}}->{$f}+=$v;
$sourcepkg{$source{$name}}->{$f}+=$v;
my($sm)=$sourcemax{$source{$name}}->{$f};
$sourcemax{$source{$name}}->{$f}=$v
$sourcemax{$source{$name}}->{$f}=$v
if (!defined($sm) || $sm < $v);
}
}
@@ -612,7 +612,7 @@ sub read_packages
while(<AVAIL>)
{
/^Package: (.+)/ and do {$p=$1;$maint{$p}="bug";$source{$p}=$p;next;};
/^Version: (.+)/ && $p eq "popularity-contest"
/^Version: (.+)/ && $p eq "popularity-contest"
and do { $popver{$dist}=$1; next;};
/^Maintainer: ([^()]+) (\(.+\) )*<.+>/
and do { $maint{$p}=join(' ',map{ucfirst($_)} split(' ',lc $1));next;};


+ 1
- 1
examples/cgi-bin/popcon.cgi View File

@@ -73,7 +73,7 @@ if (exists $ENV{CONTENT_TYPE} && $ENV{CONTENT_TYPE} =~ m%multipart/form-data%){
@entry = <GZIP>;
}

if ($entry[0] =~ m/POPULARITY-CONTEST-0/
if ($entry[0] =~ m/POPULARITY-CONTEST-0/
|| $entry[0] =~ m/-----BEGIN PGP MESSAGE-----/)
{
if ($directsave) {


+ 5
- 5
popcon-upload View File

@@ -45,11 +45,11 @@ my ($http_proxy,$proxy,$port,$remote);
$http_proxy=$ENV{'http_proxy'};
if (defined($http_proxy))
{
$http_proxy =~ m{http://([^:]*)(?::([0-9]+))?}
$http_proxy =~ m{http://([^:]*)(?::([0-9]+))?}
or die ("unrecognized http_proxy");
$proxy=$1; $port=$2;
}
$proxy=$host unless (defined($proxy));
$port=80 unless (defined($port));

@@ -63,7 +63,7 @@ if ($compressed) {
open FILE, "< $file" or die "reading from '$file'";
$encoding = "identity";
}
$str .= $_ while(<FILE>);
$str .= $_ while(<FILE>);
close(FILE);
$len = length($str);

@@ -72,8 +72,8 @@ $SIG{ALRM} = sub { die "timeout in popcon-upload\n" };
alarm(30);

# Connect to server
$remote = IO::Socket::IP->new(Proto => "tcp", PeerAddr => $proxy,
PeerPort => $port);
$remote = IO::Socket::IP->new(Proto => "tcp", PeerAddr => $proxy,
PeerPort => $port);
unless ($remote) { die "cannot connect to $proxy:$port" }

my $boundary = "----------ThIs_Is_tHe_bouNdaRY_\$";


Loading…
Cancel
Save