[Glibc-bsd-commits] r2476 - trunk/kfreebsd-8/debian

Petr Salinger ps-guest at alioth.debian.org
Tue Apr 21 08:00:49 UTC 2009 

Author: ps-guest
Date: 2009-04-21 08:00:49 +0000 (Tue, 21 Apr 2009)
New Revision: 2476

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/compat
   trunk/kfreebsd-8/debian/control.flavor.in
   trunk/kfreebsd-8/debian/control.in
   trunk/kfreebsd-8/debian/rules
Log:
* merge debian changes from kfreebsd-7 into kfreebsd-8


Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2009-04-21 07:20:40 UTC (rev 2475)
+++ trunk/kfreebsd-8/debian/changelog	2009-04-21 08:00:49 UTC (rev 2476)
@@ -1,4 +1,4 @@
-kfreebsd-8 (8.0~cvs20090206-1) EXPERIMENTAL; urgency=low
+kfreebsd-8 (8.0~cvs20090421-1) EXPERIMENTAL; urgency=low
 
   [ Luca Favatella ]
   * New upstream snapshot of HEAD
@@ -15,8 +15,37 @@
   * Drop kfreebsd-7 only transitional packages
   * Alter Build-depends as freebsd-buildutils 7.0 is still sufficent
 
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 06 Feb 2009 10:00:00 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 21 Apr 2009 12:00:00 +0200
 
+kfreebsd-7 (7.2~cvs20090421-1) EXPERIMENTAL; urgency=low
+
+  [ Petr Salinger ]
+  * New upstream snapshot (RELENG_7_2)
+     - update of some patches
+     - refresh all patches
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 21 Apr 2009 12:00:00 +0200
+
+kfreebsd-7 (7.1-4) unstable; urgency=low
+
+  * debian/control.flavor.in: depends on kldutils instead of 
+    module-init-tools. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 13 Apr 2009 21:27:55 +0200
+
+kfreebsd-7 (7.1-3) unstable; urgency=low
+
+  * debian/control.{flavor.,}in: change the section to kernel.
+  * debian/control.in: bump Standards-Version to 3.8.1 (no changes).
+  * debian/control.in, debian/compat: switch to debhelper 5.
+  * debian/rules: make sure ~/.quiltrc or /etc/quilt.quiltrc is not used.
+  * 000_ktimer.diff: fix local privilege escalation (CVE-2009-1041 /
+    FreeBSD-SA-09:06.ktimer).
+  * 000_kenv.diff: fix kernel panic when dumping environment 
+    (FreeBSD-EN-09:01.kenv).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 23 Mar 2009 19:00:14 +0100
+
 kfreebsd-7 (7.1-2) unstable; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/kfreebsd-8/debian/compat
===================================================================
--- trunk/kfreebsd-8/debian/compat	2009-04-21 07:20:40 UTC (rev 2475)
+++ trunk/kfreebsd-8/debian/compat	2009-04-21 08:00:49 UTC (rev 2476)
@@ -1 +1 @@
-4
+5

Modified: trunk/kfreebsd-8/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-8/debian/control.flavor.in	2009-04-21 07:20:40 UTC (rev 2475)
+++ trunk/kfreebsd-8/debian/control.flavor.in	2009-04-21 08:00:49 UTC (rev 2476)
@@ -1,7 +1,6 @@
 Package: kfreebsd-image- at version@- at abiname@- at flavor@
 Architecture: kfreebsd- at arch@
-Section: admin
-Depends: freebsd-utils (>= 5), module-init-tools (>= 6.1-6)
+Depends: freebsd-utils (>= 5), kldutils (>= 7.1)
 Conflicts: kfreebsd-loader (<< 5.4-1.3)
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@
@@ -22,7 +21,6 @@
 
 Package: kfreebsd-image- at major@- at flavor@
 Architecture: kfreebsd- at arch@
-Section: admin
 Depends: kfreebsd-image- at version@- at abiname@- at flavor@
 Description: kernel of FreeBSD @major@ image
  This package depends on the latest binary image for kernel of FreeBSD @major@ on
@@ -30,7 +28,6 @@
 
 Package: kfreebsd-headers- at version@- at abiname@- at flavor@
 Architecture: kfreebsd- at arch@
-Section: devel
 Provides: kfreebsd-headers- at major@
 Depends: kfreebsd-headers- at version@- at abiname@ (= ${binary:Version})
 Description: header files for kernel of FreeBSD @version@
@@ -42,7 +39,6 @@
 
 Package: kfreebsd-headers- at major@- at flavor@
 Architecture: kfreebsd- at arch@
-Section: devel
 Depends: kfreebsd-headers- at version@- at abiname@- at flavor@
 Description: header files for kernel of FreeBSD @major@
  This package depends on the latest header files for kernel of FreeBSD @major@ on

Modified: trunk/kfreebsd-8/debian/control.in
===================================================================
--- trunk/kfreebsd-8/debian/control.in	2009-04-21 07:20:40 UTC (rev 2475)
+++ trunk/kfreebsd-8/debian/control.in	2009-04-21 08:00:49 UTC (rev 2476)
@@ -1,16 +1,15 @@
 Source: kfreebsd- at major@
-Section: devel
+Section: kernel
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
-Build-Depends: debhelper (>= 4.1.0), bzip2, quilt, freebsd-buildutils (>= 7) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, freebsd-buildutils (>= 7) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
+Standards-Version: 3.8.1
 
 Package: kfreebsd-source- at version@
 Architecture: all
-Section: devel
 Recommends: freebsd-buildutils (>= 7)
 Provides: kfreebsd-source- at major@, kfreebsd-source
 Description: source code for kernel of FreeBSD @version@ with Debian patches
@@ -19,7 +18,6 @@
 
 Package: kfreebsd-headers- at version@- at abiname@
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Section: devel
 Description: Common architecture-specific header files for kernel of FreeBSD @version@
  This package provides the architecture-specific common kernel header files for 
  kernel of FreeBSD @version@, generally used for building out-of-tree kernel 

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2009-04-21 07:20:40 UTC (rev 2475)
+++ trunk/kfreebsd-8/debian/rules	2009-04-21 08:00:49 UTC (rev 2476)
@@ -71,7 +71,7 @@
 		-e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)pflog.h\(>\|"\),,g' \
 	; done)
 
-	set -e ; cd $(CURDIR)/src ; QUILT_PC=$(CURDIR)/.pc QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a ; cd $(CURDIR)
+	set -e ; cd $(CURDIR)/src ; QUILT_PC=$(CURDIR)/.pc QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a ; cd $(CURDIR)
 	install debian/gen-ld-u-options src/usr.sbin/config
 	grep -v ^__FBSDID src/sys/kern/subr_sbuf.c > src/usr.sbin/config/sbuf.c

More information about the Glibc-bsd-commits mailing list