[Glibc-bsd-commits] r3429 - in trunk/freebsd-libs/debian: . patches
Guillem Jover
guillem at alioth.debian.org
Wed Jun 8 01:25:46 UTC 2011
Author: guillem
Date: 2011-06-08 01:25:46 +0000 (Wed, 08 Jun 2011)
New Revision: 3429
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/patches/01_sys_cam.diff
trunk/freebsd-libs/debian/patches/02_libcam.diff
trunk/freebsd-libs/debian/patches/04_libkvm.diff
trunk/freebsd-libs/debian/patches/06_libgeom.diff
trunk/freebsd-libs/debian/patches/08_libdevstat.diff
trunk/freebsd-libs/debian/patches/10_memstat.diff
trunk/freebsd-libs/debian/patches/11_netgraph.diff
trunk/freebsd-libs/debian/rules
Log:
Switch to use the libbsd-overlay
Bump libbsd-dev Build-Depends to (>= 0.3.0).
Add pkg-config to Build-Depends.
Remove some now obsolete porting code.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/changelog 2011-06-08 01:25:46 UTC (rev 3429)
@@ -1,3 +1,12 @@
+freebsd-libs (8.2-2) UNRELEASED; urgency=low
+
+ * Switch to use the libbsd-overlay:
+ - Bump libbsd-dev Build-Depends to (>= 0.3.0).
+ - Add pkg-config to Build-Depends.
+ - Remove some now obsolete porting code.
+
+ -- Guillem Jover <guillem at debian.org> Wed, 08 Jun 2011 03:17:34 +0200
+
freebsd-libs (8.2-1) unstable; urgency=low
[ Petr Salinger ]
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/control 2011-06-08 01:25:46 UTC (rev 3429)
@@ -3,8 +3,8 @@
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>
-Build-Depends: debhelper (>= 7), freebsd-buildutils,
- libbsd-dev (>= 0.1.4) [kfreebsd-any],
+Build-Depends: debhelper (>= 7), pkg-config, freebsd-buildutils,
+ libbsd-dev (>= 0.3.0) [kfreebsd-any],
libc0.1-dev (>= 2.10) [kfreebsd-any],
libgdbm-dev [kfreebsd-any],
kfreebsd-kernel-headers (>= 0.54) [kfreebsd-any],
Modified: trunk/freebsd-libs/debian/patches/01_sys_cam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2011-06-08 01:25:46 UTC (rev 3429)
@@ -48,14 +48,3 @@
#endif /* _KERNEL */
/*
---- a/sys/cam/ata/ata_all.c
-+++ b/sys/cam/ata/ata_all.c
-@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
- #include <sys/ata.h>
- #include <cam/ata/ata_all.h>
- #include <sys/sbuf.h>
--#include <sys/endian.h>
-+#include <endian.h>
-
- int
- ata_version(int ver)
Modified: trunk/freebsd-libs/debian/patches/02_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_libcam.diff 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/patches/02_libcam.diff 2011-06-08 01:25:46 UTC (rev 3429)
@@ -44,13 +44,3 @@
int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
int (*arg_get)(void *hook, char *field_name),
void *gethook);
---- a/lib/libcam/camlib.c
-+++ b/lib/libcam/camlib.c
-@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
- #include <unistd.h>
- #include <errno.h>
- #include <ctype.h>
-+#include <bsd/string.h>
-
- #include <cam/cam.h>
- #include <cam/scsi/scsi_all.h>
Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff 2011-06-08 01:25:46 UTC (rev 3429)
@@ -1,22 +1,20 @@
---
lib/libkvm/Makefile | 2 +-
- lib/libkvm/kvm.c | 16 ++++++++++++----
- lib/libkvm/kvm_amd64.c | 9 +++++----
- lib/libkvm/kvm_cptime.c | 5 +++--
- lib/libkvm/kvm_file.c | 8 +++++++-
- lib/libkvm/kvm_getloadavg.c | 14 ++++++++++----
- lib/libkvm/kvm_getswapinfo.c | 13 +++++++++----
- lib/libkvm/kvm_minidump_amd64.c | 10 ++++++++++
+ lib/libkvm/kvm.c | 23 +++++++++++++++++++----
+ lib/libkvm/kvm_cptime.c | 4 ++--
+ lib/libkvm/kvm_file.c | 7 ++++++-
+ lib/libkvm/kvm_getloadavg.c | 12 +++++++++---
+ lib/libkvm/kvm_getswapinfo.c | 8 +++++---
+ lib/libkvm/kvm_minidump_amd64.c | 9 +++++++++
lib/libkvm/kvm_minidump_i386.c | 10 ++++++++++
lib/libkvm/kvm_pcpu.c | 6 +++---
- lib/libkvm/kvm_private.h | 4 ++--
- lib/libkvm/kvm_proc.c | 19 +++++++++++--------
- 12 files changed, 83 insertions(+), 33 deletions(-)
+ lib/libkvm/kvm_private.h | 6 ++++--
+ lib/libkvm/kvm_proc.c | 5 ++++-
+ lib/libkvm/kvm_vnet.c | 14 +++++++-------
+ 12 files changed, 79 insertions(+), 27 deletions(-)
-Index: freebsd-libs/lib/libkvm/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libkvm/Makefile 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/Makefile 2009-11-14 09:09:01.000000000 +0000
+--- a/lib/libkvm/Makefile
++++ b/lib/libkvm/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
@@ -27,19 +25,9 @@
.if ${MACHINE} == "sun4v"
CFLAGS+=-DSUN4V
-Index: freebsd-libs/lib/libkvm/kvm.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm.c 2009-11-14 09:09:01.000000000 +0000
-@@ -50,6 +50,7 @@
- #include <sys/stat.h>
- #include <sys/sysctl.h>
- #include <sys/linker.h>
-+#include <sys/sysctl.h>
-
- #include <net/vnet.h>
-
-@@ -70,6 +71,10 @@
+--- a/lib/libkvm/kvm.c
++++ b/lib/libkvm/kvm.c
+@@ -70,6 +71,10 @@ static char sccsid[] = "@(#)kvm.c 8.2 (B
#include <strings.h>
#include <unistd.h>
@@ -50,7 +38,7 @@
#include "kvm_private.h"
/* from src/lib/libc/gen/nlist.c */
-@@ -151,6 +156,7 @@
+@@ -151,6 +156,7 @@ _kvm_open(kd, uf, mf, flag, errout)
char *errout;
{
struct stat st;
@@ -58,7 +46,7 @@
kd->vmfd = -1;
kd->pmfd = -1;
-@@ -160,8 +166,17 @@
+@@ -160,8 +166,17 @@ _kvm_open(kd, uf, mf, flag, errout)
kd->argspc = 0;
kd->argv = 0;
@@ -78,7 +66,7 @@
else if (strlen(uf) >= MAXPATHLEN) {
_kvm_err(kd, kd->program, "exec file name too long");
goto failed;
-@@ -244,7 +259,7 @@
+@@ -244,7 +259,7 @@ kvm_t *
kvm_openfiles(uf, mf, sf, flag, errout)
const char *uf;
const char *mf;
@@ -87,7 +75,7 @@
int flag;
char *errout;
{
-@@ -262,7 +277,7 @@
+@@ -262,7 +277,7 @@ kvm_t *
kvm_open(uf, mf, sf, flag, errstr)
const char *uf;
const char *mf;
@@ -96,11 +84,9 @@
int flag;
const char *errstr;
{
-Index: freebsd-libs/lib/libkvm/kvm_file.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_file.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_file.c 2009-11-14 09:09:01.000000000 +0000
-@@ -59,7 +59,7 @@
+--- a/lib/libkvm/kvm_file.c
++++ b/lib/libkvm/kvm_file.c
+@@ -59,7 +59,7 @@ static char sccsid[] = "@(#)kvm_file.c 8
#include <sys/sysctl.h>
#include <limits.h>
@@ -109,7 +95,7 @@
#include <paths.h>
#include <stdlib.h>
-@@ -80,6 +80,7 @@
+@@ -80,6 +80,7 @@ kvm_deadfiles(kd, op, arg, allproc_o, np
int op, arg, nprocs;
long allproc_o;
{
@@ -117,7 +103,7 @@
struct proc proc;
struct filedesc filed;
int buflen = kd->arglen, ocnt = 0, n = 0, once = 0, i;
-@@ -151,6 +152,7 @@
+@@ -151,6 +152,7 @@ kvm_deadfiles(kd, op, arg, allproc_o, np
return (n);
fail:
free(ofiles);
@@ -125,7 +111,7 @@
return (0);
}
-@@ -166,6 +168,7 @@
+@@ -166,6 +168,7 @@ kvm_getfiles(kd, op, arg, cnt)
_kvm_syserr(kd, kd->program, "kvm_getfiles has been broken for years");
return (0);
@@ -133,18 +119,16 @@
if (ISALIVE(kd)) {
size = 0;
mib[0] = CTL_KERN;
-@@ -228,4 +231,6 @@
+@@ -228,4 +231,6 @@ kvm_getfiles(kd, op, arg, cnt)
}
*cnt = nfiles;
return (kd->argspc);
+#endif
+ return 0;
}
-Index: freebsd-libs/lib/libkvm/kvm_getloadavg.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_getloadavg.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_getloadavg.c 2009-11-14 09:09:01.000000000 +0000
-@@ -44,15 +44,21 @@
+--- a/lib/libkvm/kvm_getloadavg.c
++++ b/lib/libkvm/kvm_getloadavg.c
+@@ -44,15 +44,21 @@ static char sccsid[] = "@(#)kvm_getloada
#include <limits.h>
#include <nlist.h>
#include <kvm.h>
@@ -169,18 +153,9 @@
};
/*
-Index: freebsd-libs/lib/libkvm/kvm_getswapinfo.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_getswapinfo.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_getswapinfo.c 2009-11-14 09:09:01.000000000 +0000
-@@ -47,13 +47,16 @@
- #include <string.h>
- #include <unistd.h>
- #include <limits.h>
-+#include <bsd/string.h>
-+
-+
-
+--- a/lib/libkvm/kvm_getswapinfo.c
++++ b/lib/libkvm/kvm_getswapinfo.c
+@@ -51,9 +51,9 @@ __FBSDID("$FreeBSD$");
#include "kvm_private.h"
static struct nlist kvm_swap_nl[] = {
@@ -193,7 +168,7 @@
};
#define NL_SWTAILQ 0
-@@ -210,8 +213,10 @@
+@@ -210,8 +210,10 @@ kvm_getswapinfo_sysctl(
swap_ary[unswdev].ksw_total = ttl;
swap_ary[unswdev].ksw_used = xsd.xsw_used;
swap_ary[unswdev].ksw_flags = xsd.xsw_flags;
@@ -204,11 +179,9 @@
}
tot.ksw_total += ttl;
tot.ksw_used += xsd.xsw_used;
-Index: freebsd-libs/lib/libkvm/kvm_minidump_amd64.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_minidump_amd64.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_minidump_amd64.c 2009-11-14 09:09:01.000000000 +0000
-@@ -100,6 +100,15 @@
+--- a/lib/libkvm/kvm_minidump_amd64.c
++++ b/lib/libkvm/kvm_minidump_amd64.c
+@@ -100,6 +100,15 @@ hpt_find(kvm_t *kd, vm_paddr_t pa)
return (-1);
}
@@ -224,11 +197,9 @@
static int
inithash(kvm_t *kd, uint64_t *base, int len, off_t off)
{
-Index: freebsd-libs/lib/libkvm/kvm_minidump_i386.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_minidump_i386.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_minidump_i386.c 2009-11-14 09:09:01.000000000 +0000
-@@ -102,6 +102,16 @@
+--- a/lib/libkvm/kvm_minidump_i386.c
++++ b/lib/libkvm/kvm_minidump_i386.c
+@@ -102,6 +102,16 @@ hpt_find(kvm_t *kd, uint64_t pa)
return (-1);
}
@@ -245,10 +216,8 @@
static int
inithash(kvm_t *kd, uint32_t *base, int len, off_t off)
{
-Index: freebsd-libs/lib/libkvm/kvm_private.h
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_private.h 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_private.h 2009-11-14 09:09:01.000000000 +0000
+--- a/lib/libkvm/kvm_private.h
++++ b/lib/libkvm/kvm_private.h
@@ -34,6 +34,8 @@
* $FreeBSD$
*/
@@ -258,29 +227,9 @@
struct __kvm {
/*
* a string to be prepended to error messages
-@@ -74,7 +76,7 @@
- * Functions used internally by kvm, but across kvm modules.
- */
- void _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...)
-- __printflike(3, 4);
-+ __attribute__((format(printf,3,4)));
- void _kvm_freeprocs(kvm_t *kd);
- void _kvm_freevtop(kvm_t *);
- int _kvm_initvtop(kvm_t *);
-@@ -83,7 +85,7 @@
- int _kvm_nlist(kvm_t *, struct nlist *, int);
- void *_kvm_realloc(kvm_t *kd, void *, size_t);
- void _kvm_syserr (kvm_t *kd, const char *program, const char *fmt, ...)
-- __printflike(3, 4);
-+ __attribute__((format(printf,3,4)));
- int _kvm_uvatop(kvm_t *, const struct proc *, u_long, u_long *);
- int _kvm_vnet_selectpid(kvm_t *, pid_t);
- int _kvm_vnet_initialized(kvm_t *, int);
-Index: freebsd-libs/lib/libkvm/kvm_proc.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_proc.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_proc.c 2009-11-14 09:09:01.000000000 +0000
-@@ -54,7 +54,7 @@
+--- a/lib/libkvm/kvm_proc.c
++++ b/lib/libkvm/kvm_proc.c
+@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
#include <sys/_lock.h>
#include <sys/_mutex.h>
#include <sys/_task.h>
@@ -289,7 +238,7 @@
#include <sys/user.h>
#include <sys/proc.h>
#define _WANT_PRISON /* make jail.h give us 'struct prison' */
-@@ -101,6 +101,7 @@
+@@ -101,6 +101,7 @@ kvm_proclist(kd, what, arg, p, bp, maxcn
struct kinfo_proc *bp;
int maxcnt;
{
@@ -297,7 +246,7 @@
int cnt = 0;
struct kinfo_proc kinfo_proc, *kp;
struct pgrp pgrp;
-@@ -427,6 +428,8 @@
+@@ -427,6 +428,8 @@ nopgrp:
++cnt;
}
return (cnt);
@@ -306,23 +255,9 @@
}
/*
-Index: freebsd-libs/lib/libkvm/kvm_amd64.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_amd64.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_amd64.c 2009-11-14 09:09:01.000000000 +0000
-@@ -53,6 +53,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <string.h>
- #include <nlist.h>
- #include <kvm.h>
-
-Index: freebsd-libs/lib/libkvm/kvm_cptime.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_cptime.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_cptime.c 2009-11-14 09:09:01.000000000 +0000
-@@ -44,8 +44,8 @@
+--- a/lib/libkvm/kvm_cptime.c
++++ b/lib/libkvm/kvm_cptime.c
+@@ -44,8 +44,8 @@ __FBSDID("$FreeBSD$");
#include "kvm_private.h"
static struct nlist kvm_cp_time_nl[] = {
@@ -333,11 +268,9 @@
};
#define NL_CP_TIME 0
-Index: freebsd-libs/lib/libkvm/kvm_pcpu.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_pcpu.c 2009-11-14 09:09:01.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_pcpu.c 2009-11-14 09:09:01.000000000 +0000
-@@ -41,9 +41,9 @@
+--- a/lib/libkvm/kvm_pcpu.c
++++ b/lib/libkvm/kvm_pcpu.c
+@@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");
#include "kvm_private.h"
static struct nlist kvm_pcpu_nl[] = {
@@ -350,11 +283,9 @@
};
/*
-Index: freebsd-libs/lib/libkvm/kvm_vnet.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_vnet.c 2009-11-14 09:14:36.000000000 +0000
-+++ freebsd-libs/lib/libkvm/kvm_vnet.c 2009-11-14 09:15:01.000000000 +0000
-@@ -69,18 +69,18 @@
+--- a/lib/libkvm/kvm_vnet.c
++++ b/lib/libkvm/kvm_vnet.c
+@@ -69,18 +69,18 @@ _kvm_vnet_selectpid(kvm_t *kd, pid_t pid
* here to __{start,stop}_set_vnet.
*/
#define NLIST_START_VNET 0
Modified: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff 2011-06-08 01:25:46 UTC (rev 3429)
@@ -23,15 +23,6 @@
===================================================================
--- freebsd-libs.orig/lib/libgeom/geom_ctl.c 2009-11-14 09:46:19.000000000 +0000
+++ freebsd-libs/lib/libgeom/geom_ctl.c 2009-11-14 09:46:40.000000000 +0000
-@@ -141,7 +141,7 @@
- struct gctl_req_arg *ap;
-
- req->narg++;
-- req->arg = reallocf(req->arg, sizeof *ap * req->narg);
-+ req->arg = realloc(req->arg, sizeof *ap * req->narg);
- gctl_check_alloc(req, req->arg);
- if (req->arg == NULL) {
- req->narg = 0;
@@ -167,6 +167,9 @@
if (ap->name == NULL)
return;
@@ -72,26 +63,3 @@
#include <libgeom.h>
struct mystate {
-Index: freebsd-libs/lib/libgeom/geom_util.c
-===================================================================
---- freebsd-libs.orig/lib/libgeom/geom_util.c 2009-11-14 09:46:20.000000000 +0000
-+++ freebsd-libs/lib/libgeom/geom_util.c 2009-11-14 09:46:40.000000000 +0000
-@@ -39,6 +39,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <paths.h>
-+#include <bsd/string.h>
-
- #include <libgeom.h>
-
-Index: freebsd-libs/lib/libgeom/geom_getxml.c
-===================================================================
---- freebsd-libs.orig/lib/libgeom/geom_getxml.c 2009-11-14 09:47:41.000000000 +0000
-+++ freebsd-libs/lib/libgeom/geom_getxml.c 2009-11-14 09:47:47.000000000 +0000
-@@ -56,5 +56,5 @@
- free(p);
- return (NULL);
- }
-- return (reallocf(p, strlen(p) + 1));
-+ return (realloc(p, strlen(p) + 1));
- }
Modified: trunk/freebsd-libs/debian/patches/08_libdevstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2011-06-08 01:25:46 UTC (rev 3429)
@@ -10,7 +10,7 @@
DPADD= ${LIBKVM}
-LDADD= -lkvm
-+LDADD= -lrt ../libkvm/libkvm.so.0
++LDADD= -lrt -L../libkvm -lkvm -lbsd
MAN= devstat.3
@@ -19,7 +19,7 @@
MLINKS+=devstat.3 compute_etime.3
-CFLAGS+=-I${.CURDIR}
-+CFLAGS+=-I. -I../libkvm
++CFLAGS+=-I${.CURDIR} -I../libkvm
WARNS?= 2
@@ -33,24 +33,3 @@
#include "devstat.h"
-@@ -1589,6 +1590,7 @@ get_devstat_kvm(kvm_t *kd)
- struct devstatlist dhead;
- int num_devs;
- char *rv = NULL;
-+ char *oldrv;
-
- if ((num_devs = devstat_getnumdevs(kd)) <= 0)
- return(NULL);
-@@ -1616,9 +1618,11 @@ get_devstat_kvm(kvm_t *kd)
- 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/patches/10_memstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/10_memstat.diff 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/patches/10_memstat.diff 2011-06-08 01:25:46 UTC (rev 3429)
@@ -84,8 +84,8 @@
SHLIB_MAJOR= 3
-DPADD= ${LIBKVM}
-LDADD= -lkvm
-+LDADD= -lbsd ../libkvm/libkvm.so.0
-+CFLAGS+=-I. -I../libkvm
++LDADD= -lbsd -L../libkvm -lkvm
++CFLAGS+= -I${.CURDIR} -I../libkvm
+
SRCS+= memstat.c
SRCS+= memstat_all.c
Modified: trunk/freebsd-libs/debian/patches/11_netgraph.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/11_netgraph.diff 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/patches/11_netgraph.diff 2011-06-08 01:25:46 UTC (rev 3429)
@@ -37,7 +37,7 @@
===================================================================
--- freebsd-libs.orig/lib/libnetgraph/msg.c 2009-11-16 20:42:38.000000000 +0000
+++ freebsd-libs/lib/libnetgraph/msg.c 2009-11-16 20:42:39.000000000 +0000
-@@ -44,12 +44,15 @@
+@@ -44,6 +44,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <stdarg.h>
@@ -45,14 +45,6 @@
#include <netgraph/ng_message.h>
#include <netgraph/ng_socket.h>
- #include "netgraph.h"
- #include "internal.h"
-
-+#define INFTIM (-1)
-+
- /* Next message token value */
- static int gMsgId;
-
Index: freebsd-libs/lib/libnetgraph/Makefile
===================================================================
--- freebsd-libs.orig/lib/libnetgraph/Makefile 2009-11-16 20:43:39.000000000 +0000
@@ -61,7 +53,7 @@
LIB= netgraph
WARNS?= 3
MAN= netgraph.3
-+LDADD= -lbsd
++LDADD= -lbsd
SHLIB_MAJOR= 4
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2011-06-07 18:56:38 UTC (rev 3428)
+++ trunk/freebsd-libs/debian/rules 2011-06-08 01:25:46 UTC (rev 3429)
@@ -11,7 +11,8 @@
export DH_OPTIONS
CFLAGS = -Wall -g -pipe -fPIC -I. -I$(CURDIR)/sys -D_GNU_SOURCE \
- -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
+ $(shell pkg-config --cflags libbsd-overlay) \
+ -D__va_list=__builtin_va_list
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
More information about the Glibc-bsd-commits
mailing list