Page MenuHomeFreeBSD
Files F133094787

D17300.id48483.diff
No OneTemporary
Actions

D17300.id48483.diff
View Options

Index: head/en_US.ISO8859-1/htdocs/cgi/Makefile
===================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/Makefile
+++ head/en_US.ISO8859-1/htdocs/cgi/Makefile
@@ -18,7 +18,6 @@
CGI+= man.cgi
CGI+= mid.cgi
CGI+= mirror.cgi
-CGI+= monthly.cgi
CGI+= ports.cgi
.SUFFIXES: .C .cgi
Index: head/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
===================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
+++ head/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
@@ -1,275 +0,0 @@
-#!/usr/bin/perl -w
-# $FreeBSD$
-
-require "./cgi-style.pl";
-
-use CGI qw(:all);
-use strict;
-
-my $Submit = param("Submit");
-my $debug = param("debug") || "";
-
-my $NumDevelopers = 3;
-my $NumLinks = 4;
-my $NumSponsors = 2;
-my $NumTasks = 5;
-
-my @messages;
-
-#
-# Routine to format some xml nicely
-#
-sub xml
-{
- my($Indent, $TagEtc, @Text) = @_;
-
- my($Tag, $Etc) = split(' ', $TagEtc, 2);
-
- my $Spaces = " " x ($Indent*2);
- if (!@Text)
- {
- # No text in the tag
- return ("$Spaces<$TagEtc />\n");
- }
- elsif (@Text == 1)
- {
- # Bottom level tag - output on one line
- return ("$Spaces<$TagEtc>@Text</$Tag>\n");
- }
- else
- {
- # This is not a bottom level tag - output a new line after
- # starting tag
- return ("$Spaces<$TagEtc>\n",
- @Text,
- "$Spaces</$Tag>\n");
- }
-}
-
-#
-# As above to format indented text but no tag
-#
-sub xmltext
-{
- my($Indent, @Text) = @_;
-
- my $Spaces = " " x ($Indent*2);
-
- return map { "$Spaces$_\n" } @Text;
-}
-
-if ($Submit)
-{
- my $errors = 0;
-
- my @hidden;
-
- my $Project = param("Project") || "";
- my $Category = param("Category") || "misc";
- push(@hidden, hidden("Project"));
-
- my @contacts;
- foreach my $Num (1..$NumDevelopers)
- {
- my $fname = param("FirstName$Num") || "";
- my $lname = param("LastName$Num") || "";
- my $email = param("Email$Num") || "";
-
- push(@hidden, hidden("FirstName$Num"));
- push(@hidden, hidden("LastName$Num"));
- push(@hidden, hidden("Email$Num"));
-
- next unless $fname || $lname || $email;
-
- my @name;
- push(@name, xml(4, 'given', $fname)) if $fname;
- push(@name, xml(4, 'common', $lname)) if $lname;
-
- my @person;
- push(@person, xml(3, 'name', "", @name)) if @name;
- push(@person, xml(3, 'email', $email)) if $email;
-
- push(@contacts, xml(2, 'person', "", @person));
- }
-
- if (!@contacts)
- {
- ++$errors;
- push(@messages, b("Please specify at least one contact"));
- }
-
- my @links;
- foreach my $Num (1..$NumLinks)
- {
- my $url = param("Url$Num") || "";
- my $desc = param("Desc$Num") || "";
-
- push(@hidden, hidden("Url$Num"));
- push(@hidden, hidden("Desc$Num"));
-
- next unless $url;
- my @link;
- if ($desc)
- {
- push(@links, xml(2, "url href=\"$url\"", $desc));
- }
- else
- {
- push(@links, xml(2, "url href=\"$url\""));
- }
- }
-
- my @sponsors;
- foreach my $Num (1..$NumSponsors)
- {
- my $sponsor = param("Sponsor$Num") || "";
- push(@hidden, hidden("Sponsor$Num"));
-
- next unless $sponsor;
- push(@sponsors, xml(1, "sponsor", "", xmltext(2, $sponsor)));
- }
-
- if (@sponsors)
- {
- push(@sponsors, "\n");
- }
-
- my @tasks;
- foreach my $Num (1..$NumTasks)
- {
- my $desc = param("Task$Num") || "";
- $desc =~ s/\r//g;
- my @desc = split("\n", $desc);
-
- push(@hidden, hidden("Task$Num"));
-
- next unless $desc;
- push(@tasks, xml(2, "task", "",xmltext(3, @desc)));
- }
-
- my $info = param("SubmittedInfo") || "";
- push(@hidden, hidden("SubmittedInfo"));
-
- $info =~ s/\r//g;
- my @info = split("\n", $info);
-
- my $title = "FreeBSD project submission output";
-
- my @contents = xml(0, "project cat=\'$Category\'",
- xml(1, "title", $Project),
- "\n",
- xml(1, "contact", "", @contacts),
- "\n",
- xml(1, "links", "", @links),
- "\n",
- xml(1, "body",
- xml(2, "p", "", xmltext(3, @info))),
- "\n",
- @sponsors,
- xml(1, "help", "", @tasks),
- );
- my $contents = join('', @contents);
-
- $contents = "<!-- Mail as an attachment to: monthly\@freebsd.org -->\n$contents";
-
- if (!$errors)
- {
- print "Content-Type: text/plain\n\n";
- print $contents;
- exit;
- }
-}
-
-my @DeveloperTable;
-foreach my $Num (1..$NumDevelopers)
-{
- push(@DeveloperTable,
- TR(td(textfield(-name => "FirstName$Num", -size => 20)),
- td(textfield(-name => "LastName$Num", -size => 20)),
- td(textfield(-name => "Email$Num", -size => 32))));
-}
-
-my @LinksTable;
-foreach my $Num (1..$NumLinks)
-{
- push(@LinksTable,
- TR(td(textfield(-name => "Url$Num", -size => 55)),
- td(textfield(-name => "Desc$Num", -size => 20))));
-}
-
-my @SponsorTable;
-foreach my $Num (1..$NumSponsors)
-{
- push(@SponsorTable,
- TR(td(textarea(-name => "Sponsor$Num", -rows => 1, -cols => 60))));
-}
-
-my @TaskTable;
-foreach my $Num (1..$NumTasks)
-{
- push(@TaskTable,
- TR(td(textarea(-name => "Task$Num", -rows => 3, -cols => 60))));
-}
-
-print
- (html_header("Submitting a FreeBSD Project Status Report"),
- hr,
- join("<BR>\n", @messages, ""),
- p("To submit status information about a FreeBSD project, fill out the",
- " following:"),
- start_form(),
-
- h3("Project:"),
- textfield(-name => "Project", -size => "32"),
-
- h3("Category:"),
- popup_menu(-name => "Category",
- -values => ['proj', 'doc', 'kern', 'bin', 'arch', 'ports', 'vendor',
- 'misc', 'soc', 'team'], -default => 'proj'),
-
- h3("Developers:"),
- blockquote(table({"BORDER" => 0,
- "COLS" => 3,
- "NOSAVE" => 1},
- TR(td("First Name"),
- td("Family Name"),
- td("Email address")),
- @DeveloperTable)),
-
- h3("Links:"),
- blockquote(table({"BORDER" => 0,
- "COLS" => 2,
- "NOSAVE" => 1},
- TR(td("Url"),
- td("Description")),
- @LinksTable)),
-
- h3("Present status:"),
- p("You can use &quot;simple&quot; HTML tags (e.g. &lt;p&gt;, ",
- "&lt;em&gt;, &lt;strong&gt; and &lt;a href=... &gt;) to format."),
- blockquote(textarea(-name => "SubmittedInfo",
- -rows => 7,
- -cols => 60)),
-
- h3("Sponsors (optional):"),
- blockquote(table({"BORDER" => 0,
- "COLS" => 1,
- "NOSAVE" => 1},
- TR(td("Name")),
- @SponsorTable)),
-
- h3("Open tasks (optional):"),
- blockquote(table({"BORDER" => 0,
- "COLS" => 5,
- "NOSAVE" => 1},
- TR(td("Description")),
- @TaskTable)),
-
-
- submit(-name => "Submit", -label => "Download XML"),
- reset(-value => "Reset"),
- br,
- end_form(),
- html_footer());
-
-__END__
Index: head/en_US.ISO8859-1/htdocs/news/status/README
===================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/README
+++ head/en_US.ISO8859-1/htdocs/news/status/README
@@ -18,9 +18,8 @@
developers@ as well. Also ping individuals which are known to have
something cooking.
- The xml-template is at:
- https://www.freebsd.org/news/status/report-sample.xml and the generator
- CGI at: https://www.freebsd.org/cgi/monthly.cgi at the time of this
- writing. Make sure to keep them up to date with regard to categories
+ https://www.freebsd.org/news/status/report-sample.xml at the time of this
+ writing. Make sure to keep it up to date with regard to categories
to pick from and place them prominently in the CFR - otherwise people
submit plain text reports and you have to format them yourself.
- Reporting howto is at: https://www.freebsd.org/news/status/howto.html.
Index: head/en_US.ISO8859-1/htdocs/news/status/howto.xml
===================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/howto.xml
+++ head/en_US.ISO8859-1/htdocs/news/status/howto.xml
@@ -21,7 +21,7 @@
Chisnall</a>, experienced in technical writing.</p>
<p><em>Do not worry if you are not a native English speaker. The team
- handling status reports, <tt>monthly@FreeBSD.org</tt>, will check
+ handling status reports, <tt>quarterly@FreeBSD.org</tt>, will check
your entries for spelling and grammar, and fix it for you.</em></p>
<h2>Introduce Your Work</h2>
Index: head/en_US.ISO8859-1/htdocs/news/status/status.xml
===================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/status.xml
+++ head/en_US.ISO8859-1/htdocs/news/status/status.xml
@@ -13,14 +13,13 @@
<body class="navinclude.about">
- <h2>Next Quarterly Status Report submissions (July &ndash;
- September) due: January 14th, 2018</h2>
+ <h2>Next Quarterly Status Report submissions (October, 2017 &ndash;
+ September, 2018) due: October 31th, 2018</h2>
- <p>Use the <a href="https://www.FreeBSD.org/cgi/monthly.cgi">xml
- generator</a> or download and edit the <a href="report-sample.xml">
- xml-template</a>. Submissions should be submitted by e-mail to
- <a href="mailto:monthly@FreeBSD.org">monthly@FreeBSD.org</a>.</p>
-
+ <p>Submit your entries as Pull Requests from your fork of
+ <a href="https://github.com/freebsd/freebsd-quarterly">FreeBSD
+ Quarterly Status Reports GitHub repo</a> or submit them via e-mail to
+ <a href="mailto:quarterly@FreeBSD.org">quarterly@FreeBSD.org</a>.</p>
<hr/>
<p>One of the benefits of the FreeBSD development model is a focus on
Index: head/en_US.ISO8859-1/htdocs/robots.txt
===================================================================
--- head/en_US.ISO8859-1/htdocs/robots.txt
+++ head/en_US.ISO8859-1/htdocs/robots.txt
@@ -11,7 +11,6 @@
Disallow: /cgi/mid.cgi
Disallow: /cgi/mirror.cgi
Disallow: /cgi/missing_handler.cgi
-Disallow: /cgi/monthly.cgi
Disallow: /cgi/ports.cgi
Disallow: /cgi/query-pr-summary.cgi
Disallow: /cgi/query-pr.cgi

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 23, 10:30 PM (12 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24093813
Default Alt Text
D17300.id48483.diff (9 KB)

Event Timeline