[Glibc-bsd-commits] r3619 - in trunk/freebsd-libs/debian: . patches
Robert Millan
rmh at alioth.debian.org
Tue Jul 19 20:28:57 UTC 2011
Author: rmh
Date: 2011-07-19 20:28:57 +0000 (Tue, 19 Jul 2011)
New Revision: 3619
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/patches/01_sys_cam.diff
trunk/freebsd-libs/debian/patches/02_libcam.diff
trunk/freebsd-libs/debian/patches/03_libsbuf.diff
trunk/freebsd-libs/debian/patches/04_libkvm.diff
trunk/freebsd-libs/debian/patches/06_libgeom.diff
trunk/freebsd-libs/debian/patches/07_libkiconv.diff
trunk/freebsd-libs/debian/patches/08_libdevstat.diff
trunk/freebsd-libs/debian/patches/09_libusbhid.diff
trunk/freebsd-libs/debian/patches/10_memstat.diff
trunk/freebsd-libs/debian/patches/11_netgraph.diff
trunk/freebsd-libs/debian/patches/12_usb.diff
Log:
Include <stdint.h> in a few more headers that use uintxx_t types. (Closes: #634752)
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/changelog 2011-07-19 20:28:57 UTC (rev 3619)
@@ -1,3 +1,10 @@
+freebsd-libs (8.2+ds1-4) UNRELEASED; urgency=low
+
+ * Include <stdint.h> in a few more headers that use uintxx_t types.
+ (Closes: #634752)
+
+ -- Robert Millan <rmh at debian.org> Tue, 19 Jul 2011 22:28:40 +0200
+
freebsd-libs (8.2+ds1-3) unstable; urgency=low
* Remove hunk to include <sys/user.h> in subr_sbuf.c, as this breaks
Modified: trunk/freebsd-libs/debian/patches/01_sys_cam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -8,7 +8,7 @@
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
-@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
+@@ -36,6 +36,7 @@
#include <sys/sysctl.h>
#else /* _KERNEL */
#include <stdlib.h>
@@ -18,7 +18,7 @@
#endif /* _KERNEL */
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
-@@ -221,7 +221,7 @@ static union ccb *xpt_get_ccb(struct cam
+@@ -221,7 +221,7 @@
static void xpt_run_dev_allocq(struct cam_eb *bus);
static void xpt_run_dev_sendq(struct cam_eb *bus);
static timeout_t xpt_release_devq_timeout;
@@ -29,7 +29,7 @@
u_int count, int run_queue);
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
-@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
+@@ -41,6 +41,7 @@
#include <sys/sysctl.h>
#else
#include <errno.h>
Modified: trunk/freebsd-libs/debian/patches/02_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_libcam.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/02_libcam.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -6,7 +6,7 @@
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
-@@ -6,8 +6,7 @@ SRCS= camlib.c scsi_cmdparse.c scsi_all
+@@ -6,8 +6,7 @@
ata_all.c
INCS= camlib.h
@@ -18,7 +18,7 @@
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
-@@ -150,13 +150,11 @@ int cam_get_device(const char *path, c
+@@ -150,13 +150,11 @@
/*
* Buffer encoding/decoding routines, from the old SCSI library.
*/
@@ -34,7 +34,7 @@
int buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
void (*arg_put)(void *, int, void *, int, char *),
void *puthook);
-@@ -168,8 +166,7 @@ int csio_build_visit(struct ccb_scsiio *
+@@ -168,8 +166,7 @@
int timeout, const char *cmd_spec,
int (*arg_get)(void *hook, char *field_name),
void *gethook);
Modified: trunk/freebsd-libs/debian/patches/03_libsbuf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/03_libsbuf.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/03_libsbuf.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -6,7 +6,7 @@
--- a/lib/libsbuf/Makefile
+++ b/lib/libsbuf/Makefile
-@@ -4,6 +4,7 @@ LIB= sbuf
+@@ -4,6 +4,7 @@
SHLIBDIR?= /lib
SRCS= subr_sbuf.c
WARNS?= 2
@@ -26,7 +26,7 @@
/*
* Structure definition
-@@ -64,10 +65,8 @@ int sbuf_bcat(struct sbuf *, const voi
+@@ -64,10 +65,8 @@
int sbuf_bcpy(struct sbuf *, const void *, size_t);
int sbuf_cat(struct sbuf *, const char *);
int sbuf_cpy(struct sbuf *, const char *);
Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -27,7 +27,7 @@
CFLAGS+=-DSUN4V
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
-@@ -70,6 +71,10 @@ static char sccsid[] = "@(#)kvm.c 8.2 (B
+@@ -70,6 +70,10 @@
#include <strings.h>
#include <unistd.h>
@@ -38,7 +38,7 @@
#include "kvm_private.h"
/* from src/lib/libc/gen/nlist.c */
-@@ -151,6 +156,7 @@ _kvm_open(kd, uf, mf, flag, errout)
+@@ -151,6 +155,7 @@
char *errout;
{
struct stat st;
@@ -46,7 +46,7 @@
kd->vmfd = -1;
kd->pmfd = -1;
-@@ -160,8 +166,17 @@ _kvm_open(kd, uf, mf, flag, errout)
+@@ -160,8 +165,17 @@
kd->argspc = 0;
kd->argv = 0;
@@ -66,7 +66,7 @@
else if (strlen(uf) >= MAXPATHLEN) {
_kvm_err(kd, kd->program, "exec file name too long");
goto failed;
-@@ -244,7 +259,7 @@ kvm_t *
+@@ -244,7 +258,7 @@
kvm_openfiles(uf, mf, sf, flag, errout)
const char *uf;
const char *mf;
@@ -75,7 +75,7 @@
int flag;
char *errout;
{
-@@ -262,7 +277,7 @@ kvm_t *
+@@ -262,7 +276,7 @@
kvm_open(uf, mf, sf, flag, errstr)
const char *uf;
const char *mf;
@@ -86,7 +86,7 @@
{
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
-@@ -59,7 +59,7 @@ static char sccsid[] = "@(#)kvm_file.c 8
+@@ -59,7 +59,7 @@
#include <sys/sysctl.h>
#include <limits.h>
@@ -95,7 +95,7 @@
#include <paths.h>
#include <stdlib.h>
-@@ -80,6 +80,7 @@ kvm_deadfiles(kd, op, arg, allproc_o, np
+@@ -80,6 +80,7 @@
int op, arg, nprocs;
long allproc_o;
{
@@ -103,7 +103,7 @@
struct proc proc;
struct filedesc filed;
int buflen = kd->arglen, ocnt = 0, n = 0, once = 0, i;
-@@ -151,6 +152,7 @@ kvm_deadfiles(kd, op, arg, allproc_o, np
+@@ -151,6 +152,7 @@
return (n);
fail:
free(ofiles);
@@ -111,7 +111,7 @@
return (0);
}
-@@ -166,6 +168,7 @@ kvm_getfiles(kd, op, arg, cnt)
+@@ -166,6 +168,7 @@
_kvm_syserr(kd, kd->program, "kvm_getfiles has been broken for years");
return (0);
@@ -119,7 +119,7 @@
if (ISALIVE(kd)) {
size = 0;
mib[0] = CTL_KERN;
-@@ -228,4 +231,6 @@ kvm_getfiles(kd, op, arg, cnt)
+@@ -228,4 +231,6 @@
}
*cnt = nfiles;
return (kd->argspc);
@@ -128,7 +128,7 @@
}
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
-@@ -44,15 +44,21 @@ static char sccsid[] = "@(#)kvm_getloada
+@@ -44,15 +44,21 @@
#include <limits.h>
#include <nlist.h>
#include <kvm.h>
@@ -155,7 +155,7 @@
/*
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
-@@ -51,9 +51,9 @@ __FBSDID("$FreeBSD$");
+@@ -51,9 +51,9 @@
#include "kvm_private.h"
static struct nlist kvm_swap_nl[] = {
@@ -168,7 +168,7 @@
};
#define NL_SWTAILQ 0
-@@ -210,8 +210,10 @@ kvm_getswapinfo_sysctl(
+@@ -210,8 +210,10 @@
swap_ary[unswdev].ksw_total = ttl;
swap_ary[unswdev].ksw_used = xsd.xsw_used;
swap_ary[unswdev].ksw_flags = xsd.xsw_flags;
@@ -181,7 +181,7 @@
tot.ksw_used += xsd.xsw_used;
--- 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)
+@@ -100,6 +100,15 @@
return (-1);
}
@@ -199,7 +199,7 @@
{
--- 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)
+@@ -102,6 +102,16 @@
return (-1);
}
@@ -229,7 +229,7 @@
* a string to be prepended to error messages
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
-@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
+@@ -54,7 +54,7 @@
#include <sys/_lock.h>
#include <sys/_mutex.h>
#include <sys/_task.h>
@@ -238,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 @@ kvm_proclist(kd, what, arg, p, bp, maxcn
+@@ -101,6 +101,7 @@
struct kinfo_proc *bp;
int maxcnt;
{
@@ -246,7 +246,7 @@
int cnt = 0;
struct kinfo_proc kinfo_proc, *kp;
struct pgrp pgrp;
-@@ -427,6 +428,8 @@ nopgrp:
+@@ -427,6 +428,8 @@
++cnt;
}
return (cnt);
@@ -257,7 +257,7 @@
/*
--- a/lib/libkvm/kvm_cptime.c
+++ b/lib/libkvm/kvm_cptime.c
-@@ -44,8 +44,8 @@ __FBSDID("$FreeBSD$");
+@@ -44,8 +44,8 @@
#include "kvm_private.h"
static struct nlist kvm_cp_time_nl[] = {
@@ -270,7 +270,7 @@
#define NL_CP_TIME 0
--- a/lib/libkvm/kvm_pcpu.c
+++ b/lib/libkvm/kvm_pcpu.c
-@@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");
+@@ -41,9 +41,9 @@
#include "kvm_private.h"
static struct nlist kvm_pcpu_nl[] = {
@@ -285,7 +285,7 @@
/*
--- 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
+@@ -69,18 +69,18 @@
* 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-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -15,7 +15,7 @@
SHLIBDIR?= /lib
SRCS+= geom_getxml.c
SRCS+= geom_stats.c
-@@ -14,7 +15,7 @@ CFLAGS += -I${.CURDIR}
+@@ -14,7 +15,7 @@
WARNS?= 3
DPADD= ${LIBBSDXML} ${LIBSBUF}
@@ -26,7 +26,7 @@
--- a/lib/libgeom/geom_ctl.c
+++ b/lib/libgeom/geom_ctl.c
-@@ -167,6 +167,9 @@ gctl_ro_param(struct gctl_req *req, cons
+@@ -167,6 +167,9 @@
if (ap->name == NULL)
return;
ap->nlen = strlen(ap->name) + 1;
Modified: trunk/freebsd-libs/debian/patches/07_libkiconv.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -3,10 +3,8 @@
lib/libkiconv/quirks.h | 1 +
2 files changed, 2 insertions(+)
-Index: freebsd-libs/lib/libkiconv/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libkiconv/Makefile 2009-11-13 13:54:47.000000000 +0000
-+++ freebsd-libs/lib/libkiconv/Makefile 2009-11-13 13:54:52.000000000 +0000
+--- a/lib/libkiconv/Makefile
++++ b/lib/libkiconv/Makefile
@@ -14,5 +14,6 @@
kiconv.3 kiconv_add_xlat16_table.3
@@ -14,10 +12,8 @@
+LDADD= -ldl
.include <bsd.lib.mk>
-Index: freebsd-libs/lib/libkiconv/quirks.h
-===================================================================
---- freebsd-libs.orig/lib/libkiconv/quirks.h 2009-11-13 13:54:47.000000000 +0000
-+++ freebsd-libs/lib/libkiconv/quirks.h 2009-11-13 13:54:52.000000000 +0000
+--- a/lib/libkiconv/quirks.h
++++ b/lib/libkiconv/quirks.h
@@ -25,6 +25,7 @@
*
* $FreeBSD$
@@ -26,10 +22,8 @@
#ifndef _KICONV_QUIRKS_H_
#define _KICONV_QUIRKS_H_
-Index: freebsd-libs/lib/libkiconv/xlat16_iconv.c
-===================================================================
---- freebsd-libs.orig/lib/libkiconv/xlat16_iconv.c 2009-11-13 13:54:47.000000000 +0000
-+++ freebsd-libs/lib/libkiconv/xlat16_iconv.c 2009-11-13 13:54:52.000000000 +0000
+--- a/lib/libkiconv/xlat16_iconv.c
++++ b/lib/libkiconv/xlat16_iconv.c
@@ -426,8 +426,8 @@
#include <errno.h>
@@ -50,10 +44,8 @@
{
errno = EINVAL;
return (-1);
-Index: freebsd-libs/lib/libkiconv/quirks.c
-===================================================================
---- freebsd-libs.orig/lib/libkiconv/quirks.c 2009-11-13 13:55:56.000000000 +0000
-+++ freebsd-libs/lib/libkiconv/quirks.c 2009-11-13 13:56:19.000000000 +0000
+--- a/lib/libkiconv/quirks.c
++++ b/lib/libkiconv/quirks.c
@@ -187,7 +187,7 @@
#include <sys/iconv.h>
@@ -63,10 +55,8 @@
{
return (base);
-Index: freebsd-libs/lib/libkiconv/xlat16_sysctl.c
-===================================================================
---- freebsd-libs.orig/lib/libkiconv/xlat16_sysctl.c 2009-11-13 13:55:56.000000000 +0000
-+++ freebsd-libs/lib/libkiconv/xlat16_sysctl.c 2009-11-13 13:56:43.000000000 +0000
+--- a/lib/libkiconv/xlat16_sysctl.c
++++ b/lib/libkiconv/xlat16_sysctl.c
@@ -75,8 +75,8 @@
#include <errno.h>
Modified: trunk/freebsd-libs/debian/patches/08_libdevstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -5,7 +5,7 @@
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
-@@ -8,7 +8,7 @@ SRCS= devstat.c
+@@ -8,7 +8,7 @@
INCS= devstat.h
DPADD= ${LIBKVM}
@@ -14,7 +14,7 @@
MAN= devstat.3
-@@ -31,7 +31,7 @@ MLINKS+=devstat.3 buildmatch.3
+@@ -31,7 +31,7 @@
MLINKS+=devstat.3 compute_stats.3
MLINKS+=devstat.3 compute_etime.3
@@ -25,7 +25,7 @@
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
-@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
+@@ -45,6 +45,7 @@
#include <stdarg.h>
#include <kvm.h>
#include <nlist.h>
Modified: trunk/freebsd-libs/debian/patches/09_libusbhid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/09_libusbhid.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/09_libusbhid.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -2,10 +2,8 @@
lib/libusbhid/Makefile | 1 +
1 file changed, 1 insertion(+)
-Index: freebsd-libs/lib/libusbhid/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libusbhid/Makefile 2009-07-19 17:25:24.000000000 +0000
-+++ freebsd-libs/lib/libusbhid/Makefile 2009-11-13 13:45:33.000000000 +0000
+--- a/lib/libusbhid/Makefile
++++ b/lib/libusbhid/Makefile
@@ -4,6 +4,7 @@
LIB= usbhid
MAN= usbhid.3
Modified: trunk/freebsd-libs/debian/patches/10_memstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/10_memstat.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/10_memstat.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -1,7 +1,5 @@
-Index: freebsd-libs/lib/libmemstat/memstat_internal.h
-===================================================================
---- freebsd-libs.orig/lib/libmemstat/memstat_internal.h 2009-11-16 20:42:38.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/memstat_internal.h 2009-11-16 20:42:39.000000000 +0000
+--- a/lib/libmemstat/memstat_internal.h
++++ b/lib/libmemstat/memstat_internal.h
@@ -28,6 +28,8 @@
#ifndef _MEMSTAT_INTERNAL_H_
@@ -11,10 +9,8 @@
/*
* memstat maintains its own internal notion of statistics on each memory
-Index: freebsd-libs/lib/libmemstat/memstat.h
-===================================================================
---- freebsd-libs.orig/lib/libmemstat/memstat.h 2009-11-16 20:42:38.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/memstat.h 2009-11-16 20:42:39.000000000 +0000
+--- a/lib/libmemstat/memstat.h
++++ b/lib/libmemstat/memstat.h
@@ -29,6 +29,8 @@
#ifndef _MEMSTAT_H_
#define _MEMSTAT_H_
@@ -24,10 +20,8 @@
/*
* Number of CPU slots in library-internal data structures. This should be
* at least the value of MAXCPU from param.h.
-Index: freebsd-libs/lib/libmemstat/memstat_malloc.c
-===================================================================
---- freebsd-libs.orig/lib/libmemstat/memstat_malloc.c 2009-11-16 20:42:38.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/memstat_malloc.c 2009-11-16 20:42:39.000000000 +0000
+--- a/lib/libmemstat/memstat_malloc.c
++++ b/lib/libmemstat/memstat_malloc.c
@@ -44,10 +44,10 @@
static struct nlist namelist[] = {
@@ -53,10 +47,8 @@
static int
kread_string(kvm_t *kvm, const void *kvm_pointer, char *buffer, int buflen)
{
-Index: freebsd-libs/lib/libmemstat/memstat_uma.c
-===================================================================
---- freebsd-libs.orig/lib/libmemstat/memstat_uma.c 2009-11-16 20:42:38.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/memstat_uma.c 2009-11-16 20:42:39.000000000 +0000
+--- a/lib/libmemstat/memstat_uma.c
++++ b/lib/libmemstat/memstat_uma.c
@@ -50,12 +50,12 @@
static struct nlist namelist[] = {
@@ -74,10 +66,8 @@
};
/*
-Index: freebsd-libs/lib/libmemstat/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libmemstat/Makefile 2009-11-16 20:42:38.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/Makefile 2009-11-16 20:42:39.000000000 +0000
+--- a/lib/libmemstat/Makefile
++++ b/lib/libmemstat/Makefile
@@ -3,8 +3,9 @@
WARNS?= 3
LIB= memstat
Modified: trunk/freebsd-libs/debian/patches/11_netgraph.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/11_netgraph.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/11_netgraph.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -1,7 +1,5 @@
-Index: freebsd-libs/lib/libnetgraph/netgraph.h
-===================================================================
---- freebsd-libs.orig/lib/libnetgraph/netgraph.h 2009-11-16 20:42:38.000000000 +0000
-+++ freebsd-libs/lib/libnetgraph/netgraph.h 2009-11-16 20:42:39.000000000 +0000
+--- a/lib/libnetgraph/netgraph.h
++++ b/lib/libnetgraph/netgraph.h
@@ -43,14 +43,15 @@
#ifndef _NETGRAPH_H_
#define _NETGRAPH_H_
@@ -20,10 +18,8 @@
int NgSendReplyMsg(int, const char *,
const struct ng_mesg *, const void *, size_t);
int NgRecvMsg(int, struct ng_mesg *, size_t, char *);
-Index: freebsd-libs/lib/libnetgraph/sock.c
-===================================================================
---- freebsd-libs.orig/lib/libnetgraph/sock.c 2009-11-16 20:42:38.000000000 +0000
-+++ freebsd-libs/lib/libnetgraph/sock.c 2009-11-16 20:42:39.000000000 +0000
+--- a/lib/libnetgraph/sock.c
++++ b/lib/libnetgraph/sock.c
@@ -44,6 +44,8 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -33,10 +29,8 @@
#include <netgraph/ng_message.h>
#include <netgraph/ng_socket.h>
-Index: freebsd-libs/lib/libnetgraph/msg.c
-===================================================================
---- 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
+--- a/lib/libnetgraph/msg.c
++++ b/lib/libnetgraph/msg.c
@@ -44,6 +44,7 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -45,10 +39,8 @@
#include <netgraph/ng_message.h>
#include <netgraph/ng_socket.h>
-Index: freebsd-libs/lib/libnetgraph/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libnetgraph/Makefile 2009-11-16 20:43:39.000000000 +0000
-+++ freebsd-libs/lib/libnetgraph/Makefile 2009-11-16 20:44:22.000000000 +0000
+--- a/lib/libnetgraph/Makefile
++++ b/lib/libnetgraph/Makefile
@@ -4,6 +4,7 @@
LIB= netgraph
WARNS?= 3
Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff 2011-07-19 13:11:10 UTC (rev 3618)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff 2011-07-19 20:28:57 UTC (rev 3619)
@@ -32,7 +32,15 @@
pbe = NULL;
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
-@@ -220,7 +220,7 @@
+@@ -29,6 +29,7 @@
+
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <stdint.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+@@ -220,7 +221,7 @@
uint8_t bSynchAddress;
uint8_t *extra;
int extra_length;
@@ -41,7 +49,7 @@
typedef struct libusb_interface_descriptor {
uint8_t bLength;
-@@ -235,12 +235,12 @@
+@@ -235,12 +236,12 @@
struct libusb_endpoint_descriptor *endpoint;
uint8_t *extra;
int extra_length;
@@ -56,7 +64,7 @@
typedef struct libusb_config_descriptor {
uint8_t bLength;
-@@ -254,7 +254,7 @@
+@@ -254,7 +255,7 @@
struct libusb_interface *interface;
uint8_t *extra;
int extra_length;
@@ -65,7 +73,7 @@
typedef struct libusb_control_setup {
uint8_t bmRequestType;
-@@ -270,7 +270,7 @@
+@@ -270,7 +271,7 @@
uint32_t length;
uint32_t actual_length;
enum libusb_transfer_status status;
@@ -74,7 +82,7 @@
typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
-@@ -289,7 +289,7 @@
+@@ -289,7 +290,7 @@
void *os_priv;
int num_iso_packets;
struct libusb_iso_packet_descriptor iso_packet_desc[0];
@@ -85,7 +93,16 @@
--- a/lib/libusb/libusb20_desc.h
+++ b/lib/libusb/libusb20_desc.h
-@@ -98,7 +98,7 @@
+@@ -45,6 +45,8 @@
+ #ifndef _LIBUSB20_DESC_H_
+ #define _LIBUSB20_DESC_H_
+
++#include <stdint.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -98,7 +100,7 @@
void *ptr; /* data pointer */
uint16_t len; /* defaults to zero */
uint16_t type; /* defaults to LIBUSB20_ME_IS_EMPTY */
@@ -94,7 +111,7 @@
struct libusb20_me_format {
const uint8_t *format; /* always set */
-@@ -120,7 +120,7 @@
+@@ -120,7 +122,7 @@
LIBUSB20_ME_IS_##un##SIGNED , \
(size) & 0xFF, ((size) / 0x100) & 0xFF, ) \
LIBUSB20_NOT(ismeta) ( u##int##bits##_t \
@@ -103,7 +120,7 @@
#define LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
-@@ -498,7 +498,7 @@
+@@ -498,7 +500,7 @@
struct libusb20_endpoint {
struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
struct libusb20_me_struct extra;
@@ -112,7 +129,7 @@
struct libusb20_interface {
struct LIBUSB20_INTERFACE_DESC_DECODED desc;
-@@ -507,14 +507,14 @@
+@@ -507,14 +509,14 @@
struct libusb20_endpoint *endpoints;
uint8_t num_altsetting;
uint8_t num_endpoints;
More information about the Glibc-bsd-commits
mailing list