[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-womb] gnumaint Makefile gm gnupackages.txt
From: |
Karl Berry |
Subject: |
[commit-womb] gnumaint Makefile gm gnupackages.txt |
Date: |
Sun, 02 Jan 2011 18:57:51 +0000 |
CVSROOT: /sources/womb
Module name: gnumaint
Changes by: Karl Berry <karl> 11/01/02 18:57:50
Modified files:
. : Makefile gm gnupackages.txt
Log message:
routine to check package list against ftp.gnu.org:gnu
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm?cvsroot=womb&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.81&r2=1.82
Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- Makefile 17 Dec 2010 18:31:18 -0000 1.30
+++ Makefile 2 Jan 2011 18:57:50 -0000 1.31
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.30 2010/12/17 18:31:18 karl Exp $
+# $Id: Makefile,v 1.31 2011/01/02 18:57:50 karl Exp $
# Copyright 2007-2010 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
@@ -40,6 +40,9 @@
test-checkactivity:
gm check activityfile
+test-checkftp ftp:
+ gm check ftplisting
+
test-checkmaint:
gm check maintainers
Index: gm
===================================================================
RCS file: /sources/womb/gnumaint/gm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- gm 25 Dec 2010 18:15:55 -0000 1.36
+++ gm 2 Jan 2011 18:57:50 -0000 1.37
@@ -1,8 +1,8 @@
#!/usr/bin/env perl
-# $Id: gm,v 1.36 2010/12/25 18:15:55 karl Exp $
+# $Id: gm,v 1.37 2011/01/02 18:57:50 karl Exp $
# GNU maintainer-related operations.
#
-# Copyright 2007, 2008, 2009, 2010 Free Software Foundation Inc.
+# Copyright 2007, 2008, 2009, 2010, 2011 Free Software Foundation Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
$ACTIVITY_FILE = "activity-report.txt";
$COPYRIGHT_LIST_FILE = "copyright.list";
$DOC_CATEGORIES_FILE = "doc-categories.txt";
+$FTPLISTING_FILE = "ftplisting.txt";
$GNUPACKAGES_FILE = "gnupackages.txt";
$HTMLXREF_FILE = "htmlxref.cnf";
$MAINTAINERS_FILE = "maintainers";
@@ -47,6 +48,7 @@
Here are the possibilities:
check activityfile verify activity-report.txt
+check ftp verify consistency: ftplisting.txt
check maintainers verify consistency: gnupackages/maintainers
check savannah verify consistency: gnupackages/savannah
@@ -64,8 +66,8 @@
list packages unanswered packages we've had no contact about
The idea is that "check" actions do consistency checking,
-"generate" actions write output that's intended to be used directly,
-and "list" actions are for information and further consumption.
+"generate" actions write output that's intended to be used directly, and
+"list" actions are for information and further consumption.
Correspondence to address@hidden
END_USAGE
@@ -124,6 +126,39 @@
+# Return list of entries in the ftp listing that are not in the official
+# list of packages.
+#
+sub check_ftplisting_
+{
+ my @ret = ();
+
+ my %pkgs = &read_gnupackages ();
+ my @ftp = &read_ftplisting ();
+
+ # known-unusual entries or aliases under ftp.gnu.org:gnu/.
+ my @special = qw(GNUinfo GNUsBulletins Licenses MailingListArchives
+ MicrosPorts aspell- commonc\+\+ dotgnu flex git glibc
+ non-gnu phantom queue savannah speedx windows);
+
+ # old releases of now-gone packages to move to old-gnu or otherwise settle.
+ my @old = qw(calc clx cpp2html erc g77 gcide-0.46 ghostview
+ gictionary-0.41 gictionary-0.43 gnotary gnu-0.2 gnu-f2
+ gnufsdb gstep info java java2html para webbase winboard
+ windows32api xmorph zlibc);
+
+ for my $f (sort @ftp) {
+ next if exists $pkgs{$f};
+ next if grep { $f =~ /^$_/ } @special;
+ next if grep { $f =~ /^$_/ } @old;
+ push (@ret, $f);
+ }
+
+ return @ret;
+}
+
+
+
# Return list of packages in the gnupackages file that are not in the
# maintainers file, and vice versa.
#
@@ -679,7 +714,7 @@
my $gplv3 = $p{"gplv3-status"};
my $contact = $p{"last-contact"};
next if $gplv3 =~ /^(done|doc|not-applicable|notgpl|ok|see)/;
- push (@ret, &gnupkgs_msg ($gplv3 . ($contact ? " [$contact]" : "")));
+ push (@ret, &gnupkgs_msg ($gplv3 . ($contact ? " [$contact]" : ""), %p));
}
return @ret;
@@ -917,6 +952,35 @@
+# Look at an rsync listing of ftp.gnu.org, with entries like this:
+#
+# drwxr-xr-x 4096 2004/01/16 12:20:08 gnu/3dldf
+# lrwxrwxrwx 5 2010/12/29 13:30:03 gnu/libc -> glibc
+#
+# Return list of directories and symlinks under gnu/.
+#
+sub read_ftplisting
+{
+ my @ret;
+
+ open (FTPLISTING_FILE) || die "open($FTPLISTING_FILE) failed: $!";
+ my %keys;
+ while (<FTPLISTING_FILE>) {
+ chomp;
+ next unless /^[dl].*[0-9] gnu[^+]/; # the 0-9 is the seconds
+ my $orig = $_;
+ s,^.* gnu/,,; # rm through the gnu/
+ s,[ /].*$,,; # rm all following components or symlink target
+ push (@ret, $_) unless exists $keys{$_};
+ $keys{$_} = 1;
+ warn "keeping $_ from $orig\n" if /^drw/;
+ }
+ close (FTPLISTING_FILE) || warn "close($FTPLISTING_FILE) failed: $!";
+
+ return @ret;
+}
+
+
# Read doc-categories.txt file for info about SHORT_CAT, and return a
# reference to a two-element array. The first element in the array is
# the long category name; the second element is a url to the category in
@@ -1304,6 +1368,8 @@
sub gnupkgs_msg
{
my ($msg, %p) = @_;
+ warn "gnupkgs_msg: no lineno/package elements in %p hash"
+ unless $p{"lineno"} && $p{"package"};
return sprintf ("$GNUPACKAGES_FILE:%4d:%-16s $msg",
$p{"lineno"}, $p{"package"});
}
Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- gnupackages.txt 25 Dec 2010 18:15:56 -0000 1.81
+++ gnupackages.txt 2 Jan 2011 18:57:50 -0000 1.82
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.81 2010/12/25 18:15:56 karl Exp $
+# $Id: gnupackages.txt,v 1.82 2011/01/02 18:57:50 karl Exp $
# Public domain.
#
# This file records information on a per-package basis, *not* including
@@ -184,7 +184,7 @@
doc-category: Business
doc-summary: Convert text strings to printed bars in various standards
doc-url: none
-gplv3-status: under-discussion-with-maintainer (3nov09)
+gplv3-status: under-discussion (3nov09)
activity-status: stale 20020303 (0.98)
last-contact: 22nov10 newmaint, 15nov10 wrote, 26jul09 replied
@@ -245,7 +245,7 @@
doc-url: /software/bison/manual/
doc-shop: The Bison Manual
doc-shop: http://shop.fsf.org/product/bison-manual/
-gplv3-status: needs-exception-#502111 (but-gplv3-in-2.4)
+gplv3-status: done-in-2.4-without-exception-#502111
activity-status: ok 20100805 (2.4.3)
package: bool
@@ -389,7 +389,7 @@
doc-summary: (u)Common C++ framework
doc-url: none
gplv3-status: not-done-commoncpp2-1.6.3.tar.gz, done-ucommon-1.9.1
-activity-status: ok commoncpp2-1.8.0/20100224 (ucommon-4.0.4/20101209)
+activity-status: ok commoncpp2-1.8.0/20100224 (ucommon-4.0.5/20101231)
last-contact: 8jun10 wrote
package: config
@@ -854,8 +854,8 @@
activity-status: ok 20081102 (0.7.0)
package: gg-network
-gplv3-status: n/a
-activity-status: n/a
+gplv3-status: not-applicable
+activity-status: not-applicable
note: first gnu group
package: ggradebook
@@ -958,7 +958,7 @@
doc-url: none
#download-url-of-xmorph:
http://sourceforge.net/project/showfiles.php?group_id=11808
gplv3-status: not-done-since-stale
-activity-status: stale new-maint 20060817 (20060817)
+activity-status: stale newmaint 20060817 (20060817)
note: renamed from xmorph, which continues to be non-GNU.
package: gmp
@@ -1476,7 +1476,7 @@
doc-url: htmlxref
logo: /graphics/groff-head.png
gplv3-status: done-in-1.20.1
-activity-status: ok 20090109 (1.20.1)
+activity-status: ok 20101230 (1.21)
package: grub
mundane-name: GRUB
@@ -1658,7 +1658,7 @@
doc-summary: Automatically generate man pages from program output
doc-url: none
gplv3-status: done-in-1.37.1
-activity-status: ok 20100427 (1.38.2)
+activity-status: ok 20101227 (1.38.4)
package: hp2xx
copyright-holder: not-fsf
@@ -1745,10 +1745,9 @@
doc-category: Mathematics
doc-summary: Symbolic mathematics system
doc-url: http://people.csail.mit.edu/jaffer/jacal_toc.html
-gplv3-status: needs-guile-licensing-exception? (licensing 341651 20 Aug 2007
21:32:09)
-# jacal is done, but scm and wb (fsf assigned?) aren't, needed guile.
+gplv3-status: done-without-guile-licensing-exception (licensing 341651 20 Aug
2007 21:32:09)
download-url: http://groups.csail.mit.edu/mac/ftpdir/scm/
-activity-status: ok 20080206 (1b9-1)
+activity-status: ok 20100703 (1c2)
package: java-getopt
language: java
@@ -1897,7 +1896,7 @@
doc-url: /software/libmicrohttpd/#using
doc-url: htmlxref
gplv3-status: depends-on-gnunet-lgplv2.1+
-activity-status: ok 20101123 (0.9.3)
+activity-status: ok 20101225 (0.9.4)
package: libredwg
language: c
@@ -2145,7 +2144,7 @@
doc-category: Text
doc-summary: Data files for airport codes, zip codes, a dictionary, and more
doc-url: none
-gplv3-status: under-discussion (gnumaint-reply 02 Oct 2007 20:11:47)
+gplv3-status: not-applicable (gnumaint-reply 02 Oct 2007 20:11:47)
activity-status: ok 20101116 (1.4.2)
last-contact: 17nov10 replied
@@ -2611,8 +2610,8 @@
doc-category: Software
doc-summary: Scheme implementation
doc-url: http://people.csail.mit.edu/jaffer/scm_toc.html
-download-ur: http://people.csail.mit.edu/jaffer/SCM.html
-gplv3-status: needs-exception-#502112-lgpl-but-done-in-scm-5e5 (info-gnu 4 Feb
2008 00:27:30)
+download-url: http://people.csail.mit.edu/jaffer/SCM.html
+gplv3-status: done-without-exception-#502112-lgpl-but-done-in-scm-5e5
(info-gnu 4 Feb 2008 00:27:30)
activity-status: ok 20100630 (5e7)
package: screen
@@ -3005,7 +3004,7 @@
doc-category: Video
doc-summary: Authoring, disassembling and analyzing (super and) video CDs
doc-url: none
-gplv3-status: under-discussion-with-maintainer (4nov07)
+gplv3-status: under-discussion (4nov07)
activity-status: moribund 20050711 (0.7.23) # 26feb09 replied
package: vera
@@ -3047,7 +3046,7 @@
doc-summary: Disk-based associative array B-tree database library
doc-url: http://people.csail.mit.edu/jaffer/wb_toc.html
download-url: http://groups.csail.mit.edu/mac/ftpdir/scm/
-gplv3-status: needs-exception-#502112-but-done-in-wb2a2 (info-gnu 4 Feb 2008
00:29:22)
+gplv3-status: done-without-exception-#502112-but-done-in-wb2a2 (info-gnu 4 Feb
2008 00:29:22)
activity-status: ok 20100703 (2b1)
package: wdiff
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [commit-womb] gnumaint Makefile gm gnupackages.txt,
Karl Berry <=