[Glibc-bsd-commits] r1646 - in trunk/freebsd-libs: . debian debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2006-08-25 10:29:49 +0000 (Fri, 25 Aug 2006)
New Revision: 1646

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-libs/fetch
Log:
* freebsd-libs based on FreeBSD 6.1



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2006-08-25 10:28:35 UTC (rev 1645)
+++ trunk/freebsd-libs/debian/changelog	2006-08-25 10:29:49 UTC (rev 1646)
@@ -1,3 +1,10 @@
+freebsd-libs (6.1-0.1) UNRELEASED; urgency=low
+  
+  [ Petr Salinger ]
+  * based on FreeBSD 6.1
+
+ -- Robert Millan <rmh at aybabtu.com>  Fri, 25 Aug 2006 09:46:47 +0200
+
 freebsd-libs (5.4+1-3) UNRELEASED; urgency=low
 
   * Add libkiconv (patch from Andraz).

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2006-08-25 10:28:35 UTC (rev 1645)
+++ trunk/freebsd-libs/debian/control	2006-08-25 10:29:49 UTC (rev 1646)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-5.4, freebsd5-buildutils, libbsd-dev, libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.17) [kfreebsd-amd64], libexpat-dev
+Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-6.1, freebsd6-buildutils, libbsd-dev, libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.20), libexpat-dev
 # libexpat-dev: aka bsdxml. needed by libgeom
 Standards-Version: 3.6.2
 

Modified: trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff	2006-08-25 10:28:35 UTC (rev 1645)
+++ trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff	2006-08-25 10:29:49 UTC (rev 1646)
@@ -121,22 +121,21 @@
 diff -ur lib.old/libkvm/kvm_private.h lib/libkvm/kvm_private.h
 --- lib.old/libkvm/kvm_private.h	2006-04-19 09:43:10.000000000 +0200
 +++ lib/libkvm/kvm_private.h	2006-04-19 09:38:34.000000000 +0200
-@@ -70,14 +70,12 @@
- /*
+@@ -71,7 +71,7 @@
   * Functions used internally by kvm, but across kvm modules.
   */
--void	 _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...)
+ void	 _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...)
 -	    __printflike(3, 4);
-+void	 _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...);
++	    __attribute__((format(printf,3,4)));
  void	 _kvm_freeprocs(kvm_t *kd);
  void	 _kvm_freevtop(kvm_t *);
  int	 _kvm_initvtop(kvm_t *);
- int	 _kvm_kvatop(kvm_t *, u_long, u_long *);
+@@ -79,5 +79,5 @@
  void	*_kvm_malloc(kvm_t *kd, size_t);
  void	*_kvm_realloc(kvm_t *kd, void *, size_t);
--void	 _kvm_syserr (kvm_t *kd, const char *program, const char *fmt, ...)
+ void	 _kvm_syserr (kvm_t *kd, const char *program, const char *fmt, ...)
 -	    __printflike(3, 4);
-+void	 _kvm_syserr (kvm_t *kd, const char *program, const char *fmt, ...);
++	    __attribute__((format(printf,3,4)));
  int	 _kvm_uvatop(kvm_t *, const struct proc *, u_long, u_long *);
 diff -ur lib.old/libkvm/kvm_proc.c lib/libkvm/kvm_proc.c
 --- lib.old/libkvm/kvm_proc.c	2006-04-19 09:43:10.000000000 +0200

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2006-08-25 10:28:35 UTC (rev 1645)
+++ trunk/freebsd-libs/debian/rules	2006-08-25 10:29:49 UTC (rev 1646)
@@ -18,6 +18,7 @@
 endif
 
 SRC_DIR=src
+KERNEL_SRC=kfreebsd-source-6.1
 PATH:=/usr/lib/freebsd:$(PATH)
 DESTDIR=$(CURDIR)/debian/tmp
 PMAKE=make COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR)
@@ -27,8 +28,8 @@
 
 $(SRC_DIR):
 	tar -xzf $(CURDIR)/src.tar.gz
-	tar -C $(SRC_DIR)/lib -xjf /usr/src/kfreebsd-source-5.4.tar.bz2 kfreebsd-source-5.4/sys/kern/subr_sbuf.c kfreebsd-source-5.4/sys/cam
-	mv $(SRC_DIR)/lib/kfreebsd-source-5.4 $(SRC_DIR)/lib/kernel
+	tar -C $(SRC_DIR)/lib -xjf /usr/src/$(KERNEL_SRC).tar.bz2 $(KERNEL_SRC)/sys/kern/subr_sbuf.c $(KERNEL_SRC)/sys/cam
+	mv $(SRC_DIR)/lib/$(KERNEL_SRC) $(SRC_DIR)/lib/kernel
 
 	find $(SRC_DIR) -type f | (set -e ; while read i ; do sed -i $$i \
 		-e "/^__FBSDID/d" \

Modified: trunk/freebsd-libs/fetch
===================================================================
--- trunk/freebsd-libs/fetch	2006-08-25 10:28:35 UTC (rev 1645)
+++ trunk/freebsd-libs/fetch	2006-08-25 10:29:49 UTC (rev 1646)
@@ -15,7 +15,7 @@
 for i in \
     src/lib/lib{cam,geom,ipx,kiconv,kvm,sbuf,usbhid} \
   ; do
-  cvs ${action} -r RELENG_5_4_0_RELEASE $i
+  cvs ${action} -r RELENG_6_1_0_RELEASE $i
   test -e $i
 done