[SCM] Debian GNU Hurd packaging branch, master, updated. upstream/20111030-505-gf85108c

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 24337a41895e308c15fda8a2165e048d6762b62f
Author: Samuel Thibault <address@hidden>
Date:   Sun Oct 30 21:36:24 2011 +0100

    Use native random server
    
      * debian/control, debian/local/setup-translators: Use native random server
        set on /dev/u?random-hurd instead of random-egd on /dev/u?random.
      * debian/hurd.{postinst,prerm}: Handle alternative for /dev/u?random,
        default to u?random-hurd.
      * debian/hurd.lintian-overrides: Override warnings about the /dev/u?random
        mangling.
      * debian/copyright: Fix copyright notice.
      * debian/control:
        - Drop article from synopsis.
        - Tighten hurd-dev dependency on hurd to the same version.

diff --git a/debian/changelog b/debian/changelog
index 8c7dfd9..44c25c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,11 +14,19 @@ hurd (20111030-1) UNRELEASED; urgency=low
     /tmp, as the latter is world-writable.
   * patches/libpthread_procfs.patch: Add random server.
   * debian/control, debian/local/setup-translators: Use native random server
-    instead of random-egd.
+    set on /dev/u?random-hurd instead of random-egd on /dev/u?random.
+  * debian/hurd.{postinst,prerm}: Handle alternative for /dev/u?random,
+    default to u?random-hurd.
+  * debian/hurd.lintian-overrides: Override warnings about the /dev/u?random
+    mangling.
   * debian/local/cdrom.h: Add header for basic CD-ROM ioctl support.
   * debian/patches/libpthread_globsigdisp.patch,posix-sigcodes.patch: New
     patches from Jeremie Koenig to enable global signal support.
   * debian/patches/libpthread_sigmask.patch: Update to global signal support.
+  * debian/copyright: Fix copyright notice.
+  * debian/control:
+    - Drop article from synopsis.
+    - Tighten hurd-dev dependency on hurd to the same version.
 
  -- Samuel Thibault <address@hidden>  Thu, 18 Aug 2011 01:15:04 +0000
 
diff --git a/debian/control b/debian/control
index 969dc9e..96b4ae1 100644
--- a/debian/control
+++ b/debian/control
@@ -19,11 +19,11 @@ Essential: yes
 Depends: ${misc:Depends}, sysv-rc, ${shlibs:Depends}
 Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.11.2-12)
 Suggests: hurd-doc
-Provides: makedev, login, random-egd
+Provides: makedev, login
 Replaces: makedev, login, random-egd
-Conflicts: makedev, login, random-egd
+Conflicts: makedev, login
 Architecture: hurd-i386
-Description: The GNU Hurd
+Description: GNU Hurd
  This is the GNU Hurd package. It contains essential system software and
  libraries.
 
@@ -31,11 +31,11 @@ Package: hurd-dev
 Priority: standard
 Section: libdevel
 Architecture: hurd-i386
-Depends: ${misc:Depends}, hurd
+Depends: ${misc:Depends}, hurd (= ${binary:Version})
 Provides: libsem-dev
 Replaces: libsem-dev
 Conflicts: libsem-dev
-Description: The GNU Hurd (development files)
+Description: GNU Hurd (development files)
  This package includes the header files and the static libraries.
 
 Package: hurd-dbg
@@ -43,7 +43,7 @@ Priority: extra
 Section: debug
 Architecture: hurd-i386
 Depends: ${misc:Depends}, hurd (= ${binary:Version})
-Description: The GNU Hurd (debugging files)
+Description: GNU Hurd (debugging files)
  This package includes the unstripped binaries and libraries.
 
 Package: hurd-doc
@@ -52,7 +52,7 @@ Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: hurd (>= ${source:Version})
-Description: The GNU Hurd manual
+Description: GNU Hurd manual
  This package includes the manual in info and HTML format.
 
 Package: hurd-udeb
@@ -62,6 +62,6 @@ Section: debian-installer
 Architecture: hurd-i386
 Depends: ${misc:Depends}
 Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules, 
loop-modules, mouse-modules, nfs-modules, socket-modules, ufs-modules
-Description: The GNU Hurd - udeb
+Description: GNU Hurd - udeb
  This is the GNU Hurd udeb package. It contains essential system software and
  libraries.
diff --git a/debian/copyright b/debian/copyright
index e222a53..f624df3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,9 +6,7 @@ reached via <address@hidden>.
 
 Sources are available from http://savannah.gnu.org/projects/hurd
 
-Copyright statement:
-
-The GNU Hurd is copyrighted by the Free Software Foundation, Inc.
+Copyright 1992-2011 the Free Software Foundation, Inc.
 
 Note that the libraries distributed with the GNU Hurd are placed under
 the standard GNU General Public License (*not* the Library General
diff --git a/debian/hurd.lintian-overrides b/debian/hurd.lintian-overrides
index 3404bed..6ab5a37 100644
--- a/debian/hurd.lintian-overrides
+++ b/debian/hurd.lintian-overrides
@@ -4,3 +4,6 @@ setuid-binary bin/ids 4755 root/root
 setuid-binary bin/login 4755 root/root
 setuid-binary bin/ps-hurd 4755 root/root
 setuid-binary usr/bin/w-hurd 4755 root/root
+possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:65
+maintainer-script-removes-device-files postinst:69
+maintainer-script-removes-device-files postinst:71
diff --git a/debian/hurd.postinst b/debian/hurd.postinst
index ba855fa..f796a39 100644
--- a/debian/hurd.postinst
+++ b/debian/hurd.postinst
@@ -61,8 +61,12 @@ if [ "$1" = configure ] && [ "$2" ]; then
        then
                # old random-egd translator, remove
                settrans -go /dev/random
+               rm -f /dev/random
                settrans -go /dev/urandom
+               rm -f /dev/urandom
        fi
        /usr/lib/hurd/setup-translators -K
+       update-alternatives --install /dev/random random /dev/random-hurd 10 \
+                           --slave /dev/urandom urandom /dev/urandom-hurd
 fi
 
diff --git a/debian/hurd.prerm b/debian/hurd.prerm
new file mode 100644
index 0000000..78105cd
--- /dev/null
+++ b/debian/hurd.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = remove ]; then
+       update-alternatives --remove random /dev/random-hurd
+fi
+
+#DEBHELPER#
diff --git a/debian/local/setup-translators b/debian/local/setup-translators
index 554944f..cd1a78d 100755
--- a/debian/local/setup-translators
+++ b/debian/local/setup-translators
@@ -146,8 +146,8 @@ else
        md ptyq
        md lprX 0123
        md comX 0123
-       st random 'random --seed-file /var/run/random-seed --fast' random
-       st urandom 'random --seed-file /var/run/random-seed --fast' urandom
+       st random-hurd 'random --seed-file /var/run/random-seed --fast' random
+       st urandom-hurd 'random --seed-file /var/run/random-seed --fast' urandom
 fi
 
 st kbd 'symlink cons/kbd' kbd

-- 
Debian GNU Hurd packaging