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

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Tue Dec 18 15:03:08 UTC 2007 

Author: ps-guest
Date: 2007-12-18 15:03:08 +0000 (Tue, 18 Dec 2007)
New Revision: 2084

Added:
   trunk/freebsd-libs/debian/libdevstat-dev.install
   trunk/freebsd-libs/debian/libdevstat5.install
   trunk/freebsd-libs/debian/patches/08_devstat.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-libs/fetch
Log:
* freebsd-libs: new binary packages libdevstat5 and libdevstat-dev



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2007-12-18 14:20:20 UTC (rev 2083)
+++ trunk/freebsd-libs/debian/changelog	2007-12-18 15:03:08 UTC (rev 2084)
@@ -2,6 +2,7 @@
 
   [ Petr Salinger ]
   * based on FreeBSD 6.3
+  * new binary packages libdevstat5 and libdevstat-dev
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 03 Dec 2007 21:19:42 +0100
 

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2007-12-18 14:20:20 UTC (rev 2083)
+++ trunk/freebsd-libs/debian/control	2007-12-18 15:03:08 UTC (rev 2084)
@@ -88,6 +88,20 @@
  This package contains the header files and static library needed to
  compile applications that use libkvm.
 
+Package: libdevstat5
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Description: FreeBSD devstat (kernel interface) library
+ The devstat library provides a uniform interface for accessing kernel devstat interface.
+
+Package: libdevstat-dev
+Section: libdevel
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}, libdevstat5 (>= ${Source-Version}), libkvm-dev, libc0.1-dev | libc-dev, libfreebsd-dev, libbsd-dev
+Description: Development files for libdevstat
+ This package contains the header files and static library needed to
+ compile applications that use libdevstat.
+
 Package: libipx2
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}

Added: trunk/freebsd-libs/debian/libdevstat-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libdevstat-dev.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libdevstat-dev.install	2007-12-18 15:03:08 UTC (rev 2084)
@@ -0,0 +1,4 @@
+usr/lib/libdevstat*.so
+usr/lib/libdevstat*.a
+usr/include/devstat.h
+usr/share/man/man3/devstat*3.gz

Added: trunk/freebsd-libs/debian/libdevstat5.install
===================================================================
--- trunk/freebsd-libs/debian/libdevstat5.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libdevstat5.install	2007-12-18 15:03:08 UTC (rev 2084)
@@ -0,0 +1 @@
+usr/lib/libdevstat*.so.*

Added: trunk/freebsd-libs/debian/patches/08_devstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_devstat.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/08_devstat.diff	2007-12-18 15:03:08 UTC (rev 2084)
@@ -0,0 +1,53 @@
+diff -u lib.old/libdevstat/Makefile lib/libdevstat/Makefile
+--- lib.old/libdevstat/Makefile	2007-12-18 15:47:44.000000000 +0100
++++ lib/libdevstat/Makefile	2007-12-18 16:11:58.000000000 +0100
+@@ -8,7 +8,7 @@
+ INCS=	devstat.h
+ 
+ DPADD=	${LIBKVM}
+-LDADD+=	-lkvm
++LDADD+=	-lrt ../libkvm/libkvm.so.0
+ 
+ MAN=	devstat.3
+ 
+@@ -31,7 +31,7 @@
+ MLINKS+=devstat.3 compute_stats.3
+ MLINKS+=devstat.3 compute_etime.3
+ 
+-CFLAGS+=-I${.CURDIR}
++CFLAGS+=-I. -I../libkvm
+ 
+ WARNS?=	2
+ 
+diff -u lib.old/libdevstat/devstat.c lib/libdevstat/devstat.c
+--- lib.old/libdevstat/devstat.c	2007-12-18 15:47:44.000000000 +0100
++++ lib/libdevstat/devstat.c	2007-12-18 15:57:12.000000000 +0100
+@@ -44,6 +44,7 @@
+ #include <stdarg.h>
+ #include <kvm.h>
+ #include <nlist.h>
++#include <time.h>
+ 
+ #include "devstat.h"
+ 
+@@ -1588,6 +1589,7 @@
+ 	struct devstatlist dhead;
+ 	int num_devs;
+ 	char *rv = NULL;
++	char *oldrv;
+ 
+ 	if ((num_devs = devstat_getnumdevs(kd)) <= 0)
+ 		return(NULL);
+@@ -1616,9 +1618,11 @@
+ 			return(NULL);
+ 		}
+ 		nds = &ds;
+-		rv = (char *)reallocf(rv, sizeof(gen) + 
++		oldrv = rv;
++		rv = (char *)realloc(rv, sizeof(gen) + 
+ 				      sizeof(ds) * (i + 1));
+ 		if (rv == NULL) {
++			free(oldrv);		
+ 			snprintf(devstat_errbuf, sizeof(devstat_errbuf), 
+ 				 "%s: out of memory (malloc failed)",
+ 				 __func__);

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2007-12-18 14:20:20 UTC (rev 2083)
+++ trunk/freebsd-libs/debian/rules	2007-12-18 15:03:08 UTC (rev 2084)
@@ -21,7 +21,7 @@
 KERNEL_SRC=kfreebsd-source-6.3
 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)
+PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
 export LDADD=-lbsd -lfreebsd
 export SHLIB_MAJOR=0
 export SHLIBDIR=/usr/lib
@@ -47,7 +47,7 @@
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid
+build-arch-stamp: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-devstat
 	touch build-arch-stamp
 
 build-cam: build-sbuf $(SRC_DIR)
@@ -65,6 +65,9 @@
 build-kvm: $(SRC_DIR)
 	cd $(SRC_DIR)/lib/libkvm && $(PMAKE)
 
+build-devstat: $(SRC_DIR) build-kvm
+	cd $(SRC_DIR)/lib/libdevstat && $(PMAKE)
+
 build-sbuf: $(SRC_DIR)
 	cd $(SRC_DIR)/lib/libsbuf && $(PMAKE)
 
@@ -101,6 +104,7 @@
 	cd $(SRC_DIR)/lib/libipx && $(PMAKE) install
 	cd $(SRC_DIR)/lib/libkiconv && $(PMAKE) install
 	cd $(SRC_DIR)/lib/libkvm && $(PMAKE) install
+	cd $(SRC_DIR)/lib/libdevstat && $(PMAKE) install
 	cd $(SRC_DIR)/lib/libusbhid && $(PMAKE) install
 
 	dh_install -s --list-missing --sourcedir=debian/tmp

Modified: trunk/freebsd-libs/fetch
===================================================================
--- trunk/freebsd-libs/fetch	2007-12-18 14:20:20 UTC (rev 2083)
+++ trunk/freebsd-libs/fetch	2007-12-18 15:03:08 UTC (rev 2084)
@@ -15,7 +15,7 @@
 fi
 
 for i in \
-    src/lib/lib{cam,geom,ipx,kiconv,kvm,sbuf,usbhid} \
+    src/lib/lib{cam,devstat,geom,ipx,kiconv,kvm,sbuf,usbhid} \
   ; do
   cvs -d $ANONCVS ${action} -r $RELENG $i
   test -e $i

More information about the Glibc-bsd-commits mailing list