From owner-freebsd-www@FreeBSD.ORG Sun Jun 15 10:47:16 2003
Return-Path:
Delivered-To: freebsd-www@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 5D98C37B401
for ; Sun, 15 Jun 2003 10:47:16 -0700 (PDT)
Received: from brugere.aub.dk (fw.aub.dk [195.24.1.195])
by mx1.FreeBSD.org (Postfix) with ESMTP id 53B7443F93
for ; Sun, 15 Jun 2003 10:47:15 -0700 (PDT)
(envelope-from jacob@aub.dk)
Received: by brugere.aub.dk (Postfix, from userid 1858)
id D9A44C5E5; Sun, 15 Jun 2003 19:49:42 +0200 (CEST)
Received: from 4-39.aub.dk (4-39.aub.dk [10.0.4.39])
by mail.aub.dk (IMP) with HTTP
for ; Sun, 15 Jun 2003 19:49:42 +0200
Message-ID: <1055699382.3eecb1b6d238c@mail.aub.dk>
Date: Sun, 15 Jun 2003 19:49:42 +0200
From: jacob@aub.dk
To: www@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
User-Agent: Internet Messaging Program (IMP) 3.2.1
X-Originating-IP: 10.0.4.39
Subject: Error on the FreeBSD website
X-BeenThere: freebsd-www@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: FreeBSD Project Webmasters
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 15 Jun 2003 17:47:16 -0000
Hi,
Searching for the mod_php port on www.freebsd.org:
Gets me to a page where two ports are listed. Clicking on the "Description"
link of mod_php4-4.3.1 gets me an error page:
The port specified does not exist, or has an invalid name:
ports/www/mod_php4/pkg-descr
You are coming from
http://www%2efreebsd%2eorg/cgi/ports%2ecgi?query=mod%5fphp&stype=all.
Please contact www@freebsd.org
--
Cheers
- Jacob Atzen
-------------------------------------------------
This mail sent through IMP: http://horde.org/imp/
From owner-freebsd-www@FreeBSD.ORG Sun Jun 15 11:56:52 2003
Return-Path:
Delivered-To: freebsd-www@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 042F237B401
for ; Sun, 15 Jun 2003 11:56:52 -0700 (PDT)
Received: from ms-dienst.rz.rwth-aachen.de (ms-1.rz.RWTH-Aachen.DE
[134.130.3.130])
by mx1.FreeBSD.org (Postfix) with ESMTP id DC7C443FAF
for ; Sun, 15 Jun 2003 11:56:49 -0700 (PDT)
(envelope-from chris@unixpages.org)
Received: from ms-1 (ms-dienst.rz.RWTH-Aachen.DE [134.130.3.132])
by ms-dienst.rz.rwth-aachen.de
(iPlanet Messaging Server 5.2 HotFix 1.12 (built Feb 13 2003))
with ESMTP id <0HGJ00LIVDRVPY@ms-dienst.rz.rwth-aachen.de> for
www@freebsd.org; Sun, 15 Jun 2003 20:52:44 +0200 (MEST)
Received: from relay.RWTH-Aachen.DE ([134.130.3.1])
by ms-1 (MailMonitor for SMTP v1.2.2 ) ;
Sun, 15 Jun 2003 20:52:43 +0200 (MEST)
Received: from haakonia.hitnet.rwth-aachen.de
(postfix@haakonia.hitnet.RWTH-Aachen.DE [137.226.181.92])
h5FIqgNY027305; Sun, 15 Jun 2003 20:52:42 +0200 (MEST)
Received: from gondor.middleearth (gondor.middleearth [192.168.1.42])
by haakonia.hitnet.rwth-aachen.de (Postfix) with ESMTP id 54C6D32;
Sun, 15 Jun 2003 20:53:28 +0000 (GMT)
Received: by gondor.middleearth (Postfix, from userid 1001) id ACB234744; Sun,
15 Jun 2003 20:52:42 +0200 (CEST)
Date: Sun, 15 Jun 2003 20:52:42 +0200
From: Christian Brueffer
In-reply-to: <1055699382.3eecb1b6d238c@mail.aub.dk>
To: jacob@aub.dk
Message-id: <20030615185241.GV4002@unixpages.org>
MIME-version: 1.0
Content-type: multipart/signed; boundary=rHeCoQbvuHTnkkIZ;
protocol="application/pgp-signature"; micalg=pgp-sha1
Content-disposition: inline
User-Agent: Mutt/1.4.1i
X-Operating-System: FreeBSD 5.1-CURRENT
X-PGP-Key: http://people.freebsd.org/~brueffer/brueffer.key.asc
X-PGP-Fingerprint: A5C8 2099 19FF AACA F41B B29B 6C76 178C A0ED 982D
References: <1055699382.3eecb1b6d238c@mail.aub.dk>
cc: www@freebsd.org
Subject: Re: Error on the FreeBSD website
X-BeenThere: freebsd-www@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: FreeBSD Project Webmasters
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 15 Jun 2003 18:56:52 -0000
--rHeCoQbvuHTnkkIZ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, Jun 15, 2003 at 07:49:42PM +0200, jacob@aub.dk wrote:
> Hi,
>=20
> Searching for the mod_php port on www.freebsd.org:=20
>
>=20
> Gets me to a page where two ports are listed. Clicking on the "Descriptio=
n"=20
> link of mod_php4-4.3.1 gets me an error page:
>=20
>
> The port specified does not exist, or has an invalid name:=20
>=20
> ports/www/mod_php4/pkg-descr
>=20
> You are coming from=20
>=20
> http://www%2efreebsd%2eorg/cgi/ports%2ecgi?query=3Dmod%5fphp&stype=3Dall.=
=20
>=20
> Please contact www@freebsd.org=20
>
>=20
Hi,
thanks for the notice. To see the pkg-descr of the port, please look at
the one from the lang/php4 port, which is the masterport for www/mod_php4.
- Christian
--=20
Christian Brueffer chris@unixpages.org brueffer@FreeBSD.org
GPG Key: http://people.freebsd.org/~brueffer/brueffer.key.asc
GPG Fingerprint: A5C8 2099 19FF AACA F41B B29B 6C76 178C A0ED 982D
--rHeCoQbvuHTnkkIZ
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE+7MB5bHYXjKDtmC0RAtirAKDSfzENXI+FDntSlRjVQ0KZA6v34QCg+ekH
x2iy/8CYtpRD717mRNfkN34=
=rnLa
-----END PGP SIGNATURE-----
--rHeCoQbvuHTnkkIZ--
From owner-freebsd-www@FreeBSD.ORG Mon Jun 16 10:50:16 2003
Return-Path:
Delivered-To: freebsd-www@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 945E037B401
for ;
Mon, 16 Jun 2003 10:50:16 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
by mx1.FreeBSD.org (Postfix) with ESMTP id 7375C43FAF
for ;
Mon, 16 Jun 2003 10:50:15 -0700 (PDT)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5GHoFUp032183
for ;
Mon, 16 Jun 2003 10:50:15 -0700 (PDT)
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5GHoFhW032182;
Mon, 16 Jun 2003 10:50:15 -0700 (PDT)
Resent-Date: Mon, 16 Jun 2003 10:50:15 -0700 (PDT)
Resent-Message-Id: <200306161750.h5GHoFhW032182@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-www@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
"Simon L.Nielsen"
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id CB04F37B401
for ;
Mon, 16 Jun 2003 10:40:17 -0700 (PDT)
Received: from arthur.nitro.dk (port324.ds1-khk.adsl.cybercity.dk
[212.242.113.79])
by mx1.FreeBSD.org (Postfix) with ESMTP id CF8D843F75
for ;
Mon, 16 Jun 2003 10:40:16 -0700 (PDT)
(envelope-from simon@arthur.nitro.dk)
Received: by arthur.nitro.dk (Postfix, from userid 1000)
id 51C1910BF8B; Mon, 16 Jun 2003 19:40:15 +0200 (CEST)
Message-Id: <20030616174015.51C1910BF8B@arthur.nitro.dk>
Date: Mon, 16 Jun 2003 19:40:15 +0200 (CEST)
From: "Simon L.Nielsen"
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: www/53381: [patch] Bring ports.cgi up to date with new releases
X-BeenThere: freebsd-www@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: "Simon L.Nielsen"
List-Id: FreeBSD Project Webmasters
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 16 Jun 2003 17:50:16 -0000
>Number: 53381
>Category: www
>Synopsis: [patch] Bring ports.cgi up to date with new releases
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-www
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 16 10:50:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Simon L. Nielsen
>Release: FreeBSD 5.1-BETA i386
>Organization:
>Environment:
>Description:
This patch fixes several things in ports.cgi :
* Make the script know about FreeBSD 4.8-REL and 5.1-REL.
* s/5.0-CURRENT/5.1-CURRENT/
* s/4.7-STABLE/4.8-STABLE/
* Fix odd link to http://www.FreeBSD.org/ports/ instead of
mailto:www@freebsd.org (this was reported some time ago on the
www@freebsd.org list)
* Use INDEX-5 for FreeBSD 5.x release
* Use .tbz packages for FreeBSD 5.x release
* Use tags to find the correct INDEX version. This also makes
maintenance of this script simpler, since it does not have to know
about release dates.
* Do not use revision / date for -STABLE and -CURRENT (HEAD will contain
the needed version).
Note: Only tested on 5.1 with perl v5.6.1, since I only have 5.x
development servers, but I do not see any reason that it should not
work on 4.x with perl 5.0.
>How-To-Repeat:
>Fix:
--- www-portscgi.patch begins here ---
Index: ports.cgi
===================================================================
RCS file: /home/ncvs/www/en/cgi/ports.cgi,v
retrieving revision 1.66
diff -u -d -r1.66 ports.cgi
--- ports.cgi 15 May 2003 12:08:05 -0000 1.66
+++ ports.cgi 16 Jun 2003 17:25:30 -0000
@@ -58,57 +58,36 @@
local($pia64) = 'ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ia64';
local($psparc64) = 'ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/sparc64';
- $remotePrefixFtpPackagesDefault = '4.7-STABLE/i386';
+ $remotePrefixFtpPackagesDefault = '4.8-STABLE/i386';
%remotePrefixFtpPackages =
(
- '5.0-CURRENT/i386', "$p/packages-current/All",
- '4.7-STABLE/i386', " $p/packages-4-stable/All",
+ '5.1-CURRENT/i386', "$p/packages-current/All",
+ '4.8-STABLE/i386', " $p/packages-4-stable/All",
+ '5.1-RELEASE/i386', "$p/packages-5.1-release/All",
'5.0-RELEASE/i386', "$p/packages-5.0-release/All",
+ '4.8-RELEASE/i386', "$p/packages-4.8-release/All",
'4.7-RELEASE/i386', "$p/packages-4.7-release/All",
- '4.6-RELEASE/i386', "$p/packages-4.6-release/All",
- '5.0-CURRENT/alpha', "$palpha/packages-current/All",
- '4.7-STABLE/alpha', "$palpha/packages-4-stable/All",
+ '5.1-CURRENT/alpha', "$palpha/packages-current/All",
+ '4.8-STABLE/alpha', "$palpha/packages-4-stable/All",
+ '5.1-RELEASE/alpha', "$palpha/packages-5.1-release/All",
'5.0-RELEASE/alpha', "$palpha/packages-5.0-release/All",
+ '4.8-RELEASE/alpha', "$palpha/packages-4.8-release/All",
'4.7-RELEASE/alpha', "$palpha/packages-4.7-release/All",
- '4.6-RELEASE/alpha', "$palpha/packages-4.6-release/All",
- '5.0-CURRENT/ia64', "$pia64/packages-current/All",
+ '5.1-CURRENT/ia64', "$pia64/packages-current/All",
+ '5.1-RELEASE/ia64', "$pia64/packages-5.1-release/All",
'5.0-RELEASE/ia64', "$pia64/packages-5.0-release/All",
- '5.0-CURRENT/sparc64', "$psparc64/packages-current/All",
+ '5.1-CURRENT/sparc64', "$psparc64/packages-current/All",
+ '5.1-RELEASE/sparc64', "$psparc64/packages-5.1-release/All",
'5.0-RELEASE/sparc64', "$psparc64/packages-5.0-release/All",
);
- %relDate =
- (
- '5.0-CURRENT/i386', 'today',
- '4.7-STABLE/i386', 'today',
-
- '5.0-RELEASE/i386', '2003-01-19 17:34:28 UTC',
- '4.7-RELEASE/i386', '2002-10-10 14:47:54 UTC',
- '4.6-RELEASE/i386', '2002-06-15 23:01:20 UTC',
-
- '5.0-CURRENT/alpha', 'today',
- '4.7-STABLE/alpha', 'today',
-
- '5.0-RELEASE/alpha', '2003-01-19 17:34:28 UTC',
- '4.7-RELEASE/alpha', '2002-10-10 14:47:54 UTC',
- '4.6-RELEASE/alpha', '2002-06-15 23:01:20 UTC',
-
- '5.0-CURRENT/ia64', 'today',
-
- '5.0-RELEASE/ia64', '2003-01-19 17:34:28 UTC',
-
- '5.0-CURRENT/sparc64', 'today',
-
- '5.0-RELEASE/sparc64', '2003-01-19 17:34:28 UTC',
- );
-
$remotePrefixHtml =
'../ports';
@@ -132,7 +111,6 @@
$mailtoAdvanced = 'yes';
# the URL if you click at the E-Mail address (see below)
- $mailtoURL = 'http://www.FreeBSD.org/ports/';
$mailtoURL = "mailto:$mailto" if !$mailtoURL;
# security
@@ -144,11 +122,42 @@
# make plain text URLs clickable cgi script
$url = 'url.cgi';
+ # extension type for packages
+ $packageExt = 'tgz';
+
local($packageDB) = '../ports/packages.exists';
&packages_exist($packageDB, *packages) if -f $packageDB;
}
+# Parse selected version string and set version dependend settings
+sub parse_release {
+ if($release =~ /^(\d+)\.(\d+)(\.(\d+))?-(CURRENT|STABLE|RELEASE)\/(i386|alpha|ia64|sparc64|amd64)$/) {
+ $release_major = $1;
+ $release_minor = $2;
+ $release_patch = $4;
+ if($release_patch eq "") {
+ $release_patch = "0";
+ }
+ $release_type = $5;
+ $release_arch = $6;
+ if($release_type eq "RELEASE") {
+ $release_tag = "RELEASE_" . $release_major . "_" . $release_minor .
+ "_" . $release_patch;
+ }
+ } else {
+ &header;
+ print "Internal error: Could not parse release string ('$release')
\n";
+ &footer; &footer2; &exit(0);
+ }
+
+ if($release_major == 5) {
+ $packageExt = 'tbz';
+ $ports_database = 'ports/INDEX-5';
+ }
+}
+
+
sub packages_exist {
local($file, *p) = @_;
@@ -171,6 +180,8 @@
sub last_update {
local($file) = "$cvsroot/$ports_database,v";
local($date) = 'unknown';
+ local($filebasename) = $ports_database;
+ $filebasename =~ s/ports\///;
open(DB, $file) || do {
&warn("$file: $!\n"); &exit;
@@ -184,7 +195,7 @@
}
}
close DB;
- return $date . "; based on revision " . $head;
+ return $date . "; based on " . $filebasename . " revision " . $head;
}
sub last_update_message {
@@ -240,9 +251,12 @@
local($date, *var, *msec) = @_;
local(@co) = ('co', '-p');
- if ($date =~ /^rev([1-9]+\.[0-9]+)$/) {
+ if ($date =~ /^rev([1-9]+\.[0-9]+)$/ ||
+ $date =~ /^(RELEASE_\d+_\d+_\d+)$/) {
# diff by revision
push(@co, ('-r', $1));
+ } elsif ($date eq "") {
+ # Get HEAD, no date or revision
} else {
# diff by date
push(@co, ('-D', $date));
@@ -403,7 +417,7 @@
$packages{"$version.tgz"}) ||
$release ne $remotePrefixFtpPackagesDefault
) {
- print qq[Package :\n];
+ print qq[Package :\n];
}
print qq[Changes :
Download
@@ -682,6 +696,8 @@
if !$release || !defined($remotePrefixFtpPackages{$release});
$script_name = &env('SCRIPT_NAME');
+&parse_release;
+
if ($path_info eq "/source") {
print "Content-type: text/plain\n\n";
open(R, $0) || do { print "ick!\n"; &exit; };
@@ -729,7 +745,7 @@
# search
if ($query) {
- &readindex($relDate{$release}, *today, *msec);
+ &readindex($release_tag, *today, *msec);
$query =~ s/([^\w\^])/\\$1/g;
&search_ports;
}
Index: ports.cgi
--- www-portscgi.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
From owner-freebsd-www@FreeBSD.ORG Mon Jun 16 15:30:16 2003
Return-Path:
Delivered-To: freebsd-www@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id C257737B401
for ;
Mon, 16 Jun 2003 15:30:16 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
by mx1.FreeBSD.org (Postfix) with ESMTP id C186C43FAF
for ;
Mon, 16 Jun 2003 15:30:15 -0700 (PDT)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5GMUFUp071301
for ;
Mon, 16 Jun 2003 15:30:15 -0700 (PDT)
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5GMUFRM071300;
Mon, 16 Jun 2003 15:30:15 -0700 (PDT)
Resent-Date: Mon, 16 Jun 2003 15:30:15 -0700 (PDT)
Resent-Message-Id: <200306162230.h5GMUFRM071300@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-www@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
"Simon L. Nielsen"
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 2909537B401
for ;
Mon, 16 Jun 2003 15:22:02 -0700 (PDT)
Received: from arthur.nitro.dk (port324.ds1-khk.adsl.cybercity.dk
[212.242.113.79])
by mx1.FreeBSD.org (Postfix) with ESMTP id 8462243FB1
for ;
Mon, 16 Jun 2003 15:21:59 -0700 (PDT)
(envelope-from simon@arthur.nitro.dk)
Received: by arthur.nitro.dk (Postfix, from userid 1000)
id 01C5510BF8B; Tue, 17 Jun 2003 00:21:57 +0200 (CEST)
Message-Id: <20030616222157.01C5510BF8B@arthur.nitro.dk>
Date: Tue, 17 Jun 2003 00:21:57 +0200 (CEST)
From: "Simon L. Nielsen"
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: www/53386: [patch] Fix url.cgi problem with deleted pkg-descr files
X-BeenThere: freebsd-www@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: "Simon L. Nielsen"
List-Id: FreeBSD Project Webmasters
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 16 Jun 2003 22:30:17 -0000
>Number: 53386
>Category: www
>Synopsis: [patch] Fix url.cgi problem with deleted pkg-descr files
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-www
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 16 15:30:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Simon L. Nielsen
>Release: FreeBSD 5.1-BETA i386
>Organization:
>Environment:
>Description:
When a port's is pkg-descr file is deleted (cvs rm'ed), e.g. if the
port is changed into a slave port, it can occour that the description
link in ports.cgi does not work. This is due to url.cgi not looking
for the description file in Attic/.
The next time INDEX is regenerated the problem should go away, since
the INDEX generation should correct the path to the real pkg-desc
file.
This has been reported for different ports a few times on the www
mailing list, last time by Jacob Atzen with regards to
the mod_php4 port, which has been changed into a slave port.
The attach patch fixes this by making url.cgi look for pkg-descr in
Attic/ if it can't find the file in the expected directory.
This has been tested on 5.1-BETA with perl v5.6.1 and 4.8-STABLE with
perl v5.005_03.
>How-To-Repeat:
Go to
http://www.freebsd.org/cgi/ports.cgi?query=mod_php4&stype=all
and click the Description link.
>Fix:
--- www-urlcgi-attic.patch begins here ---
Index: url.cgi
===================================================================
RCS file: /home/ncvs/www/en/cgi/url.cgi,v
retrieving revision 1.31
diff -u -d -r1.31 url.cgi
--- url.cgi 2 May 2002 14:21:40 -0000 1.31
+++ url.cgi 16 Jun 2003 21:32:51 -0000
@@ -69,15 +69,26 @@
print &short_html_header($file);
}
+my $validfilename = $file =~ m%^ports/[\w-]+/\w[\w-+.]*/pkg-descr%;
+my $atticfile = $file;
+$atticfile =~ s%^(.*)/([^/]+)$%$1/Attic/$2%;
+
# do cvs checkout
my($cvsroot) = '/usr/local/www/cvsroot/FreeBSD';
-if ($file =~ m%^ports/[\w-]+/\w[\w-+.]*/pkg-descr% && -f "$cvsroot/$file,v") {
- open(CO, "-|") ||
- exec ('/usr/bin/co', '-p', '-q', "$cvsroot/$file,v") ||
- die "exec co -pq $cvsroot/$file,v: $!\n";
-}
+my $realfile;
+if ($validfilename && -f "$cvsroot/$file,v") {
+ $realfile = $file;
+} elsif ($validfilename && -f "$cvsroot/$atticfile,v") {
+ $realfile = $atticfile;
+} else {
+ $validfilename = 0;
+}
-else {
+if($validfilename) {
+ open(CO, "-|") ||
+ exec ('/usr/bin/co', '-p', '-q', "$cvsroot/$realfile,v") ||
+ die "exec co -pq $cvsroot/$realfile,v: $!\n";
+} else {
print "The port specified does not exist, or has an invalid name:
",
"
$file
\n";
--- www-urlcgi-attic.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
From owner-freebsd-www@FreeBSD.ORG Tue Jun 17 15:20:15 2003
Return-Path:
Delivered-To: freebsd-www@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 419C537B401
for ;
Tue, 17 Jun 2003 15:20:15 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
by mx1.FreeBSD.org (Postfix) with ESMTP id 0B6F743FA3
for ;
Tue, 17 Jun 2003 15:20:13 -0700 (PDT)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5HMKCUp025685
for ;
Tue, 17 Jun 2003 15:20:12 -0700 (PDT)
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5HMKCa9025684;
Tue, 17 Jun 2003 15:20:12 -0700 (PDT)
Resent-Date: Tue, 17 Jun 2003 15:20:12 -0700 (PDT)
Resent-Message-Id: <200306172220.h5HMKCa9025684@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-www@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
"Simon L. Nielsen"
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 734BF37B401
for ;
Tue, 17 Jun 2003 15:10:47 -0700 (PDT)
Received: from arthur.nitro.dk (port324.ds1-khk.adsl.cybercity.dk
[212.242.113.79])
by mx1.FreeBSD.org (Postfix) with ESMTP id 798DC43F3F
for ;
Tue, 17 Jun 2003 15:10:46 -0700 (PDT)
(envelope-from simon@arthur.nitro.dk)
Received: by arthur.nitro.dk (Postfix, from userid 1000)
id E697E10BFA9; Wed, 18 Jun 2003 00:10:44 +0200 (CEST)
Message-Id: <20030617221044.E697E10BFA9@arthur.nitro.dk>
Date: Wed, 18 Jun 2003 00:10:44 +0200 (CEST)
From: "Simon L. Nielsen"
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: www/53429: [patch] Remove http://www.freebsd.org/availability.html
X-BeenThere: freebsd-www@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: "Simon L. Nielsen"
List-Id: FreeBSD Project Webmasters
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 17 Jun 2003 22:20:15 -0000
>Number: 53429
>Category: www
>Synopsis: [patch] Remove http://www.freebsd.org/availability.html
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-www
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 17 15:20:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Simon L. Nielsen
>Release: FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
>Description:
The page http://www.freebsd.org/availability.html is out of date with
regards to supported architectures, and it has several broken links.
The important content on the page is now in /index.html. Therefor I
don't think there is a reason to keep availability.html, in it's
current form, since it will just get out of date - like it is now.
The availability.html page is only referenced from the site index, and
from news/webchanges.sgml, which isn't connected to the build at the
moment.
Since availability.html is still referenced from some other websites,
most notably http://www.highpoint-tech.com/home.htm , I don't think
availability.html should just disapear, but should redirect to the
front page.
The attached patch removes the links from the site index, and add's a
dummy redirect page based on vendors.html.
>How-To-Repeat:
>Fix:
--- www-availability.patch begins here ---
Index: availability.sgml
===================================================================
RCS file: /home/ncvs/www/en/availability.sgml,v
retrieving revision 1.32
diff -u -d -r1.32 availability.sgml
--- availability.sgml 29 Jun 2002 09:07:07 -0000 1.32
+++ availability.sgml 17 Jun 2003 22:08:57 -0000
@@ -5,71 +5,19 @@
]>
- &header;
-
- Availability of FreeBSD
-
-
- FreeBSD is free and is available for downloading over the Internet or
- on CDROM for a small fee.
-
-
-
Hardware requirements.
-
-
- FreeBSD runs on a variety of PC and Alpha hardware. Please review
- the supported
- configurations section of the FreeBSD
- Handbook for more information.
-
-
-
Where to get it.
-
-
- FreeBSD can be downloaded over the Internet for free, using a variety
- of different protocols (FTP, CVS, AFS, and more). If bandwidth is
- expensive for you then it can also be purchased on CDROM from a
- variety of vendors.
-
- For more information on obtaining FreeBSD, please see the Handbook Chapter on obtaining
- FreeBSD.
-
- For more information on installing FreeBSD, please see the Handbook Chapter on
- installing FreeBSD.
-
-
-
About the FreeBSD Project.
+
+
+
+ &title;
+
-
- FreeBSD is developed and supported by a worldwide team of
- programmers. Jordan Hubbard, one
- of the project's founders, has written a brief history
- of the FreeBSD project. Information about who's responsible for what
- is also available. If you are curious, take a look at some pictures of
- the team members. A more complete listing of contributors is
- available in the Contributors section of the
- FreeBSD Handbook. FreeBSD is
- an open project, and welcomes the help of individuals who have time and or
- skills to offer.
-
- This "about" section was created by Sean Kelly.
-
+
+ The content of this page has been integrated into the main FreeBSD webpage. You should
+ be automatically redirected there in a few seconds. If not,
+ please follow the link and update your bookmarks.
- Inside your PC is a
- daemon waiting to be unleashed. Free it with
- FreeBSD.
-
- &footer;
+ We apologize for the inconvenience.
Index: search/site.map
===================================================================
RCS file: /home/ncvs/www/en/search/site.map,v
retrieving revision 1.20
diff -u -d -r1.20 site.map
--- search/site.map 6 Jul 2002 09:56:43 -0000 1.20
+++ search/site.map 17 Jun 2003 20:52:36 -0000
@@ -9,7 +9,6 @@
# $FreeBSD: www/en/search/site.map,v 1.20 2002/07/06 09:56:43 blackend Exp $
|Software
-../availability.html|About FreeBSD
../features.html|Features
../releases/index.html|Releases
../doc/en_US.ISO8859-1/books/handbook/install.html|Installation
Index: search/web.atoz
===================================================================
RCS file: /home/ncvs/www/en/search/web.atoz,v
retrieving revision 1.59
diff -u -d -r1.59 web.atoz
--- search/web.atoz 22 May 2003 12:59:14 -0000 1.59
+++ search/web.atoz 17 Jun 2003 20:54:30 -0000
@@ -34,14 +34,6 @@
Security, Auditors|../auditors.html
Auditors|../auditors.html
-# ../availability.sgml
-Availability of FreeBSD|../availability.html
-Hardware requirements|../availability.html
-Where to get it|../availability.html
-About the FreeBSD Project|../availability.html
-BSDi, address|../availability.html
-Kelly, Sean|../availability.html
-
# ../gallery/cgallery.sgml
Gallery, Commercial|../gallery/cgallery.html
Commercial, Gallery|../gallery/cgallery.html
--- www-availability.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
From owner-freebsd-www@FreeBSD.ORG Wed Jun 18 03:30:24 2003
Return-Path:
Delivered-To: freebsd-www@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id EF99237B401
for ;
Wed, 18 Jun 2003 03:30:23 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
by mx1.FreeBSD.org (Postfix) with ESMTP id 345C343FA3
for ;
Wed, 18 Jun 2003 03:30:22 -0700 (PDT)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5IAUBUp013287
for ;
Wed, 18 Jun 2003 03:30:11 -0700 (PDT)
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5IAUBgQ013286;
Wed, 18 Jun 2003 03:30:11 -0700 (PDT)
Resent-Date: Wed, 18 Jun 2003 03:30:11 -0700 (PDT)
Resent-Message-Id: <200306181030.h5IAUBgQ013286@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-www@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
Cejka Rudolf
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP
id A96E937B401; Wed, 18 Jun 2003 03:22:42 -0700 (PDT)
Received: from kazi.fit.vutbr.cz (kazi.fit.vutbr.cz [147.229.8.12])
by mx1.FreeBSD.org (Postfix) with ESMTP
id 80A5C43FB1; Wed, 18 Jun 2003 03:22:41 -0700 (PDT)
(envelope-from cejkar@fit.vutbr.cz)
Received: from kazi.fit.vutbr.cz (localhost [127.0.0.1])
by kazi.fit.vutbr.cz (8.12.9/8.12.9) with ESMTP id h5IAMQoD057001
(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO);
Wed, 18 Jun 2003 12:22:26 +0200 (CEST)
Received: (from cejkar@localhost)
by kazi.fit.vutbr.cz (8.12.9/8.12.5/Submit) id h5IAMJ7F056964;
Wed, 18 Jun 2003 12:22:19 +0200 (CEST)
Message-Id: <200306181022.h5IAMJ7F056964@kazi.fit.vutbr.cz>
Date: Wed, 18 Jun 2003 12:22:19 +0200 (CEST)
From: Cejka Rudolf
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
cc: keramida@ceid.upatras.gr
cc: trhodes@FreeBSD.org
Subject: www/53443: Malaysia/www.MyBSD.org.my is twice since
support.sgml:1.288
X-BeenThere: freebsd-www@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Cejka Rudolf
List-Id: FreeBSD Project Webmasters
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Wed, 18 Jun 2003 10:30:24 -0000
>Number: 53443
>Category: www
>Synopsis: Malaysia/www.MyBSD.org.my is twice since support.sgml:1.288
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-www
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: doc-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 18 03:30:11 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Rudolf Cejka
>Release: FreeBSD 4.8-STABLE i386
>Organization:
FIT, Brno University of Technology, Czech Republic
>Environment:
>Description:
Since www/en/support.sgml:1.288 commit, there are two Malaysia
www.MyBSD.org.my records, furthermore the second with extra "/"
after Malysia word. Why? www.MyBSD.org.my is once MyBSD Malaysia
Project, once BSD Malaysia - which is the correct info?
# Malaysia The MyBSD Malaysia Project is a Kuala Lumpur based usergroup for
BSD users and open-source in general, promoting and supporting FreeBSD,
OpenBSD, NetBSD and open source usage. We meet once a month, usually at
Universiti Malaya or Restaurant Bahadur Shah. One of our projects is to
develop a Unix file manager. Visit our website or contact info@MyBSD.org.my
for more information.
# Malaysia/ The BSD Malaysia web pages aim to be a central site for users
of *BSD UNIX variants (including FreeBSD, NetBSD, and OpenBSD). BSD support
forums, technical BSD-related articles, and recent news items are published
online. Both English and Malaysian can be used as the language on this site.
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:
From owner-freebsd-www@FreeBSD.ORG Wed Jun 18 17:20:14 2003
Return-Path:
Delivered-To: freebsd-www@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id CBCEA37B401
for ;
Wed, 18 Jun 2003 17:20:14 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
by mx1.FreeBSD.org (Postfix) with ESMTP id D8D8243FBF
for ;
Wed, 18 Jun 2003 17:20:13 -0700 (PDT)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5J0KDUp099400
for ;
Wed, 18 Jun 2003 17:20:13 -0700 (PDT)
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5J0KDBI099399;
Wed, 18 Jun 2003 17:20:13 -0700 (PDT)
Resent-Date: Wed, 18 Jun 2003 17:20:13 -0700 (PDT)
Resent-Message-Id: <200306190020.h5J0KDBI099399@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-www@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
"Simon L. Nielsen"
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 5B69A37B401
for ;
Wed, 18 Jun 2003 17:17:18 -0700 (PDT)
Received: from arthur.nitro.dk (port324.ds1-khk.adsl.cybercity.dk
[212.242.113.79])
by mx1.FreeBSD.org (Postfix) with ESMTP id C3ABC43F3F
for ;
Wed, 18 Jun 2003 17:17:17 -0700 (PDT)
(envelope-from simon@arthur.nitro.dk)
Received: by arthur.nitro.dk (Postfix, from userid 1000)
id DB08610BF8B; Thu, 19 Jun 2003 02:17:16 +0200 (CEST)
Message-Id: <20030619001716.DB08610BF8B@arthur.nitro.dk>
Date: Thu, 19 Jun 2003 02:17:16 +0200 (CEST)
From: "Simon L. Nielsen"
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: www/53473: [patch] Fix typos in www/en/vendors.html
X-BeenThere: freebsd-www@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: "Simon L. Nielsen"
List-Id: FreeBSD Project Webmasters
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Thu, 19 Jun 2003 00:20:15 -0000
>Number: 53473
>Category: www
>Synopsis: [patch] Fix typos in www/en/vendors.html
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-www
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 18 17:20:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Simon L. Nielsen
>Release: FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
>Description:
Fix two typos in www/en/vendors.html : missing "=" in the refresh
header, and a tag which should be a
. While I'm here, make
the page valid xhtml 1.0, according to validator.w3.org.
>How-To-Repeat:
>Fix:
--- www-vendors.patch begins here ---
Index: vendors.html
===================================================================
RCS file: /home/ncvs/www/en/vendors.html,v
retrieving revision 1.2
diff -u -d -r1.2 vendors.html
--- vendors.html 19 Jan 2003 16:36:27 -0000 1.2
+++ vendors.html 19 Jun 2003 00:07:11 -0000
@@ -1,6 +1,9 @@
+
-
+
+
Vendors who provide FreeBSD
@@ -9,6 +12,6 @@
href="doc/en_US.ISO8859-1/books/handbook/mirrors.html">as part of
the FreeBSD Handbook. You should be automatically redirected
there in a few seconds. If not, please follow the link and update
- your bookmarks. We apologize for the inconvenience.
+ your bookmarks. We apologize for the inconvenience.