Merge changes between r17050 and r17194 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@17195 7b3dc134-2b1b-0410-93df-9e9f96275f8d

17 files changed, 31 insertions, 49 deletions

diff --git a/libc/crypt/Makefile b/libc/crypt/Makefile
index 2585e393b..51dcb3822 100644
--- a/libc/crypt/Makefile
+++ b/libc/crypt/Makefile
@@ -12,9 +12,8 @@
 # Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 #
 #	Sub-makefile for crypt() portion of the library.
diff --git a/libc/crypt/crypt-entry.c b/libc/crypt/crypt-entry.c
index 49f62ab17..b6c446cd6 100644
--- a/libc/crypt/crypt-entry.c
+++ b/libc/crypt/crypt-entry.c
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the GNU C Library; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
+ * License along with the GNU C Library; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * crypt entry points
  *
diff --git a/libc/crypt/crypt-private.h b/libc/crypt/crypt-private.h
index d79dade4f..b4bfa8b4a 100644
--- a/libc/crypt/crypt-private.h
+++ b/libc/crypt/crypt-private.h
@@ -14,9 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the GNU C Library; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
+ * License along with the GNU C Library; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * @(#)crypt-private.h	1.4 12/20/96
  */
diff --git a/libc/crypt/crypt.c b/libc/crypt/crypt.c
index d878ff909..336063913 100644
--- a/libc/crypt/crypt.c
+++ b/libc/crypt/crypt.c
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * @(#)crypt.c	2.25 12/20/96
  *
diff --git a/libc/crypt/crypt.h b/libc/crypt/crypt.h
index e4ceff431..adc3a9e09 100644
--- a/libc/crypt/crypt.h
+++ b/libc/crypt/crypt.h
@@ -15,9 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the GNU C Library; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
+ * License along with the GNU C Library; if not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * @(#)crypt.h	1.5 12/20/96
  *
diff --git a/libc/crypt/crypt_util.c b/libc/crypt/crypt_util.c
index 7fcbd8f11..a1ff88b0d 100644
--- a/libc/crypt/crypt_util.c
+++ b/libc/crypt/crypt_util.c
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * @(#)crypt_util.c	2.56 12/20/96
  *
diff --git a/libc/crypt/md5-crypt.c b/libc/crypt/md5-crypt.c
index 403cb2be5..ba606bb8a 100644
--- a/libc/crypt/md5-crypt.c
+++ b/libc/crypt/md5-crypt.c
@@ -16,9 +16,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
 #include <errno.h>
diff --git a/libc/crypt/md5.c b/libc/crypt/md5.c
index 9bdb8e6aa..292bee184 100644
--- a/libc/crypt/md5.c
+++ b/libc/crypt/md5.c
@@ -15,9 +15,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
diff --git a/libc/crypt/md5.h b/libc/crypt/md5.h
index 21cfc5df2..84de1db1e 100644
--- a/libc/crypt/md5.h
+++ b/libc/crypt/md5.h
@@ -15,9 +15,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _MD5_H
 #define _MD5_H 1
diff --git a/libc/crypt/sha256-crypt.c b/libc/crypt/sha256-crypt.c
index 0131c803c..eb2585b52 100644
--- a/libc/crypt/sha256-crypt.c
+++ b/libc/crypt/sha256-crypt.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
 #include <errno.h>
diff --git a/libc/crypt/sha256.c b/libc/crypt/sha256.c
index c00cfe215..61be6bce2 100644
--- a/libc/crypt/sha256.c
+++ b/libc/crypt/sha256.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */
 
diff --git a/libc/crypt/sha256.h b/libc/crypt/sha256.h
index 05f2db57e..0e51a168e 100644
--- a/libc/crypt/sha256.h
+++ b/libc/crypt/sha256.h
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _SHA256_H
 #define _SHA256_H 1
diff --git a/libc/crypt/sha512-crypt.c b/libc/crypt/sha512-crypt.c
index 523659e0c..8f8ed3328 100644
--- a/libc/crypt/sha512-crypt.c
+++ b/libc/crypt/sha512-crypt.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
 #include <errno.h>
diff --git a/libc/crypt/sha512.c b/libc/crypt/sha512.c
index 0720b0903..6e531c58e 100644
--- a/libc/crypt/sha512.c
+++ b/libc/crypt/sha512.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */
 
diff --git a/libc/crypt/sha512.h b/libc/crypt/sha512.h
index 28d63fcfd..157c577ef 100644
--- a/libc/crypt/sha512.h
+++ b/libc/crypt/sha512.h
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _SHA512_H
 #define _SHA512_H 1
diff --git a/libc/crypt/ufc-crypt.h b/libc/crypt/ufc-crypt.h
index 1e7ed4a97..63fbb76f2 100644
--- a/libc/crypt/ufc-crypt.h
+++ b/libc/crypt/ufc-crypt.h
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <stdint.h>
 
diff --git a/libc/crypt/ufc.c b/libc/crypt/ufc.c
index 6d0e790d6..b00093b93 100644
--- a/libc/crypt/ufc.c
+++ b/libc/crypt/ufc.c
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with the GNU C Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  *
  * @(#)ufc.c	2.7 9/10/96
  *
@@ -53,4 +52,3 @@ main(argc, argv)
     }
     exit(0);
   }
-