X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=4855506e6105556bc6db756e712ed4f849dcbc68;hb=3c725b9d2af39ac3a7e24b7d9eb374a48c5b6893;hp=bd9eb73a188f7891bc70eb5276f456dc91334ecc;hpb=b7625d36911ace5e97bb52cc48ae1487b62b32ce;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index bd9eb73..4855506 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -3673,7 +3673,7 @@ Files:
 	  <p>
 	    The special value <tt>byhand</tt> for the section in a
 	    <tt>.changes</tt> file indicates that the file in question
-	    is not an ordinary package file and must by installed by
+	    is not an ordinary package file and must be installed by
 	    hand by the distribution maintainers.  If the section is
 	    <tt>byhand</tt> the priority should be <tt>-</tt>.
 	  </p>
@@ -6976,6 +6976,17 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
                     <tt>multiarch</tt>.
                   </footnote>
                 </p>
+                <p>
+                  The requirement for C and C++ headers files to be
+                  accessible through the search path
+                  <file>/usr/include/</file> is amended, permitting files to
+                  be accessible through the search path
+                  <file>/usr/include/<var>triplet</var></file> where
+                  <tt><var>triplet</var></tt> is as above.  <footnote>
+                    This is necessary for architecture-dependant headers
+                    file to coexist in a <tt>multiarch</tt> setup.
+                  </footnote>
+                </p>
                 <p>
                   Applications may also use a single subdirectory under
                   <file>/usr/lib/<var>triplet</var></file>.
@@ -8455,7 +8466,17 @@ fi
 	  renamed.  If a consensus cannot be reached, <em>both</em>
 	  programs must be renamed.
 	</p>
-
+	<p>
+          Binary executables must not be statically linked with the GNU C
+          library, since this prevents the binary from benefiting from
+          fixes and improvements to the C library without being rebuilt
+          and complicates security updates.  This requirement may be
+          relaxed for binary executables whose intended purpose is to
+          diagnose and fix the system in situations where the GNU C
+          library may not be usable (such as system recovery shells or
+          utilities like ldconfig) or for binary executables where the
+          security benefits of static linking outweigh the drawbacks.
+	</p>
 	<p>
          By default, when a package is being built, any binaries
          created should include debugging information, as well as