[Glibc-bsd-commits] r5471 - in trunk/kfreebsd-11/debian: . installer/modules

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-05-04 22:39:40 +0000 (Sun, 04 May 2014)
New Revision: 5471

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/control.in
   trunk/kfreebsd-11/debian/installer/modules/scsi-modules
Log:
    - Adapt to upstream removal of eisa module (r264654).
      - B-D on freebsd-mk with MK_EISA support.
      - debian/installer/modules/scsi-modules: Disable ahc_eisa.

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2014-05-04 22:16:14 UTC (rev 5470)
+++ trunk/kfreebsd-11/debian/changelog	2014-05-04 22:39:40 UTC (rev 5471)
@@ -1,9 +1,12 @@
-kfreebsd-11 (11.0~svn265310-1) UNRELEASED; urgency=medium
+kfreebsd-11 (11.0~svn265310-1) experimental; urgency=medium
 
   * New upstream snapshot.
     - Fix for SA-14:08 / CVE-2014-3000 (TCP reassembly vulnerability).
       (Closes: #746954)
     - 904_dev_full.diff: Remove (superceded by upstream).
+    - Adapt to upstream removal of eisa module (r264654).
+      - B-D on freebsd-mk with MK_EISA support.
+      - debian/installer/modules/scsi-modules: Disable ahc_eisa.
 
   [ Christoph Egger ]
   * Increase firmware size limit to 1MiB. This should be enough for at

Modified: trunk/kfreebsd-11/debian/control.in
===================================================================
--- trunk/kfreebsd-11/debian/control.in	2014-05-04 22:16:14 UTC (rev 5470)
+++ trunk/kfreebsd-11/debian/control.in	2014-05-04 22:39:40 UTC (rev 5471)
@@ -9,6 +9,7 @@
  freebsd-buildutils (>= 10.0-3~),
  freebsd-glue (>= 0.2.15~),
  bmake (>= 20131001-1~),
+ freebsd-mk (>= 10.0-4~),
  byacc,
  @cc_pkg@, libdb-dev,
  libsbuf-dev (>= 9.0+ds1-2),

Modified: trunk/kfreebsd-11/debian/installer/modules/scsi-modules
===================================================================
--- trunk/kfreebsd-11/debian/installer/modules/scsi-modules	2014-05-04 22:16:14 UTC (rev 5470)
+++ trunk/kfreebsd-11/debian/installer/modules/scsi-modules	2014-05-04 22:39:40 UTC (rev 5471)
@@ -1,5 +1,4 @@
 aha ?
-ahc_eisa
 ahc_isa
 ahc_pci
 iscsi_initiator