Merge branch 'master' into bug459868-rra

diff --git a/debian/changelog b/debian/changelog
index c5e5f89c3bcc7f9783b25af779d9d5a832c564ca..400c0633164549108677ab6940f4f7cdb194c067 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,11 @@ debian-policy (3.9.1.0) UNRELEASED; urgency=low
     Seconded: Kurt Roeckx <kurt@roeckx.be>
     Seconded: Giacomo A. Catenazzi <cate@debian.org>
     Closes: #475101
+  * Policy: Allow subdirectories of /usr/lib/cgi-bin to be used
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Andrew McMillan <andrew@morphoss.com>
+    Seconded: Charles Plessy <plessy@debian.org>
+    Closes: #104373
   * Set the version of the Perl Policy to match the version of the Policy
     package.
   * Explain the Perl module package naming policy more explicitly and

diff --git a/policy.sgml b/policy.sgml
index 065c300ba1eb4a214553d4e63cbc316195bbc8bb..74426b66c58037ba7aae54791750481c04e73b6a 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -8365,11 +8365,13 @@ done
                <example compact="compact">
 /usr/lib/cgi-bin/<var>cgi-bin-name</var>
                </example>
-               and should be referred to as
+               or a subdirectory of that directory, and should be
+               referred to as
                <example compact="compact">
 http://localhost/cgi-bin/<var>cgi-bin-name</var>
                </example>
-
+               (possibly with a subdirectory name
+               before <var>cgi-bin-name</var>).
            </item>
 
            <item>

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 5e2868b01c3282c339b733be62dddf383c6a0847..964672c4629e503731f073da9a840b7e6bc1f66a 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -78,6 +78,11 @@ Not yet released.
   that libraries should be built with threading support and to be
   thread-safe if the library supports this.
   </item>
+<tag>11.5</tag>
+  <item>Cgi-bin executable files may be installed in subdirectories
+  of <file>/usr/lib/cgi-bin</file> and web servers should serve out
+  executables in those subdirectories.
+  </item>
 <tag>12.5</tag>
   <item>The GPL version 1 is now included in common-licenses and should be
   referenced from there instead of included in the <file>copyright</file>