[Glibc-bsd-commits] r2839 - in trunk/freebsd-libs/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Sat Nov 14 09:52:00 UTC 2009
Author: ps-guest
Date: 2009-11-14 09:51:59 +0000 (Sat, 14 Nov 2009)
New Revision: 2839
Added:
trunk/freebsd-libs/debian/libdevstat7.install
trunk/freebsd-libs/debian/libkiconv4.install
trunk/freebsd-libs/debian/libusbhid4.install
Removed:
trunk/freebsd-libs/debian/libdevstat6.install
trunk/freebsd-libs/debian/libkiconv3.install
trunk/freebsd-libs/debian/libusbhid3.install
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/04_libkvm.diff
trunk/freebsd-libs/debian/patches/06_libgeom.diff
trunk/freebsd-libs/debian/patches/07_libkiconv.diff
trunk/freebsd-libs/debian/patches/09_libusbhid.diff
trunk/freebsd-libs/debian/rules
Log:
preliminary freebsd-libs 8.0
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/changelog 2009-11-14 09:51:59 UTC (rev 2839)
@@ -1,3 +1,14 @@
+freebsd-libs (8.0-0) EXPERIMENTAL; urgency=low
+
+ [ Petr Salinger ]
+ * based on FreeBSD 8.0
+ * Change packages name to reflect SONAME changes:
+ - libusbhid3 -> libusbhid4
+ - libkiconv3 -> libkiconv4
+ - libdevstat6 -> libdevstat7
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 14 Nov 2009 10:41:06 +0100
+
freebsd-libs (7.2-4) unstable; urgency=low
[ Aurelien Jarno ]
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/control 2009-11-14 09:51:59 UTC (rev 2839)
@@ -56,7 +56,7 @@
This package contains the header files and static library needed to
compile applications that use libgeom.
-Package: libusbhid3
+Package: libusbhid4
Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
Description: FreeBSD library to access USB HID devices
@@ -71,7 +71,7 @@
Package: libusbhid-dev
Section: libdevel
Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: libusbhid3 (= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
+Depends: libusbhid4 (= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
Description: Development files for libusbhid
This package contains the header files and static library needed to
compile applications that use libusbhid.
@@ -91,7 +91,7 @@
This package contains the header files and static library needed to
compile applications that use libkvm.
-Package: libdevstat6
+Package: libdevstat7
Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
Description: FreeBSD devstat (kernel interface) library
@@ -101,7 +101,7 @@
Package: libdevstat-dev
Section: libdevel
Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: libdevstat6 (= ${binary:Version}), libkvm-dev, libc0.1-dev | libc-dev,
+Depends: libdevstat7 (= ${binary:Version}), libkvm-dev, libc0.1-dev | libc-dev,
libbsd-dev
Description: Development files for libdevstat
This package contains the header files and static library needed to
@@ -121,7 +121,7 @@
This package contains the header files and static library needed to
compile applications that use libipx.
-Package: libkiconv3
+Package: libkiconv4
Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
Description: FreeBSD kernel side iconv library
@@ -131,7 +131,7 @@
Package: libkiconv-dev
Section: libdevel
Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: libkiconv3 (= ${binary:Version}), libc0.1-dev | libc-dev
+Depends: libkiconv4 (= ${binary:Version}), libc0.1-dev | libc-dev
Description: Development files for libkiconv
This package contains the header files and static library needed to
compile applications that use libkiconv.
Deleted: trunk/freebsd-libs/debian/libdevstat6.install
===================================================================
--- trunk/freebsd-libs/debian/libdevstat6.install 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/libdevstat6.install 2009-11-14 09:51:59 UTC (rev 2839)
@@ -1 +0,0 @@
-usr/lib/libdevstat*.so.*
Copied: trunk/freebsd-libs/debian/libdevstat7.install (from rev 2820, trunk/freebsd-libs/debian/libdevstat6.install)
===================================================================
--- trunk/freebsd-libs/debian/libdevstat7.install (rev 0)
+++ trunk/freebsd-libs/debian/libdevstat7.install 2009-11-14 09:51:59 UTC (rev 2839)
@@ -0,0 +1 @@
+usr/lib/libdevstat*.so.*
Deleted: trunk/freebsd-libs/debian/libkiconv3.install
===================================================================
--- trunk/freebsd-libs/debian/libkiconv3.install 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/libkiconv3.install 2009-11-14 09:51:59 UTC (rev 2839)
@@ -1 +0,0 @@
-usr/lib/libkiconv*.so.*
Copied: trunk/freebsd-libs/debian/libkiconv4.install (from rev 2820, trunk/freebsd-libs/debian/libkiconv3.install)
===================================================================
--- trunk/freebsd-libs/debian/libkiconv4.install (rev 0)
+++ trunk/freebsd-libs/debian/libkiconv4.install 2009-11-14 09:51:59 UTC (rev 2839)
@@ -0,0 +1 @@
+usr/lib/libkiconv*.so.*
Deleted: trunk/freebsd-libs/debian/libusbhid3.install
===================================================================
--- trunk/freebsd-libs/debian/libusbhid3.install 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/libusbhid3.install 2009-11-14 09:51:59 UTC (rev 2839)
@@ -1 +0,0 @@
-usr/lib/libusbhid*.so.*
Copied: trunk/freebsd-libs/debian/libusbhid4.install (from rev 2820, trunk/freebsd-libs/debian/libusbhid3.install)
===================================================================
--- trunk/freebsd-libs/debian/libusbhid4.install (rev 0)
+++ trunk/freebsd-libs/debian/libusbhid4.install 2009-11-14 09:51:59 UTC (rev 2839)
@@ -0,0 +1 @@
+usr/lib/libusbhid*.so.*
Modified: trunk/freebsd-libs/debian/patches/01_sys_cam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2009-11-14 09:51:59 UTC (rev 2839)
@@ -5,30 +5,36 @@
sys/cam/scsi/scsi_all.h | 2 ++
4 files changed, 5 insertions(+), 1 deletion(-)
---- a/sys/cam/cam.c
-+++ b/sys/cam/cam.c
-@@ -35,6 +35,7 @@
+Index: freebsd-libs/sys/cam/cam.c
+===================================================================
+--- freebsd-libs.orig/sys/cam/cam.c 2009-11-14 09:30:58.000000000 +0000
++++ freebsd-libs/sys/cam/cam.c 2009-11-14 09:32:53.000000000 +0000
+@@ -36,6 +36,7 @@
#include <sys/sysctl.h>
#else /* _KERNEL */
#include <stdlib.h>
+#include <stdint.h>
#include <stdio.h>
+ #include <camlib.h>
#endif /* _KERNEL */
-
---- a/sys/cam/cam_xpt.c
-+++ b/sys/cam/cam_xpt.c
-@@ -766,7 +766,7 @@
+Index: freebsd-libs/sys/cam/cam_xpt.c
+===================================================================
+--- freebsd-libs.orig/sys/cam/cam_xpt.c 2009-11-14 09:30:58.000000000 +0000
++++ freebsd-libs/sys/cam/cam_xpt.c 2009-11-14 09:32:53.000000000 +0000
+@@ -210,7 +210,7 @@
+ static union ccb *xpt_get_ccb(struct cam_ed *device);
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;
-static void xpt_release_simq_timeout(void *arg) __unused;
+static void xpt_release_simq_timeout(void *arg);
static void xpt_release_bus(struct cam_eb *bus);
static void xpt_release_devq_device(struct cam_ed *dev, u_int count,
int run_queue);
---- a/sys/cam/scsi/scsi_all.c
-+++ b/sys/cam/scsi/scsi_all.c
-@@ -40,6 +40,7 @@
+Index: freebsd-libs/sys/cam/scsi/scsi_all.c
+===================================================================
+--- freebsd-libs.orig/sys/cam/scsi/scsi_all.c 2009-11-14 09:30:58.000000000 +0000
++++ freebsd-libs/sys/cam/scsi/scsi_all.c 2009-11-14 09:32:53.000000000 +0000
+@@ -41,6 +41,7 @@
#include <sys/sysctl.h>
#else
#include <errno.h>
@@ -36,8 +42,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
---- a/sys/cam/scsi/scsi_all.h
-+++ b/sys/cam/scsi/scsi_all.h
+Index: freebsd-libs/sys/cam/scsi/scsi_all.h
+===================================================================
+--- freebsd-libs.orig/sys/cam/scsi/scsi_all.h 2009-11-14 09:30:58.000000000 +0000
++++ freebsd-libs/sys/cam/scsi/scsi_all.h 2009-11-14 09:32:53.000000000 +0000
@@ -32,6 +32,8 @@
* bus reset.
*/
@@ -47,3 +55,16 @@
#endif /* _KERNEL */
/*
+Index: freebsd-libs/sys/cam/ata/ata_all.c
+===================================================================
+--- freebsd-libs.orig/sys/cam/ata/ata_all.c 2009-11-14 09:33:07.000000000 +0000
++++ freebsd-libs/sys/cam/ata/ata_all.c 2009-11-14 09:33:15.000000000 +0000
+@@ -53,7 +53,7 @@
+ #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/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff 2009-11-14 09:51:59 UTC (rev 2839)
@@ -13,10 +13,10 @@
lib/libkvm/kvm_proc.c | 19 +++++++++++--------
12 files changed, 83 insertions(+), 33 deletions(-)
-Index: b/lib/libkvm/Makefile
+Index: freebsd-libs/lib/libkvm/Makefile
===================================================================
---- a/lib/libkvm/Makefile
-+++ b/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
@@ -2,8 +2,8 @@
# $FreeBSD$
@@ -27,36 +27,30 @@
.if ${MACHINE} == "sun4v"
CFLAGS+=-DSUN4V
-Index: b/lib/libkvm/kvm.c
+Index: freebsd-libs/lib/libkvm/kvm.c
===================================================================
---- a/lib/libkvm/kvm.c
-+++ b/lib/libkvm/kvm.c
-@@ -47,6 +47,7 @@
+--- 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 <vm/vm.h>
- #include <vm/vm_param.h>
-@@ -59,10 +60,16 @@
- #include <limits.h>
- #include <nlist.h>
- #include <paths.h>
-+#include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
+ #include <net/vnet.h>
+
+@@ -70,6 +71,10 @@
+ #include <strings.h>
#include <unistd.h>
-+#include <bsd/string.h>
-+
+
+#ifndef _PATH_FWMEM
+#define _PATH_FWMEM "/dev/fwmem"
+#endif
-
++
#include "kvm_private.h"
-@@ -145,6 +152,7 @@
+ /* from src/lib/libc/gen/nlist.c */
+@@ -151,6 +156,7 @@
char *errout;
{
struct stat st;
@@ -64,7 +58,7 @@
kd->vmfd = -1;
kd->pmfd = -1;
-@@ -154,8 +162,17 @@
+@@ -160,8 +166,17 @@
kd->argspc = 0;
kd->argv = 0;
@@ -84,7 +78,7 @@
else if (strlen(uf) >= MAXPATHLEN) {
_kvm_err(kd, kd->program, "exec file name too long");
goto failed;
-@@ -238,7 +255,7 @@
+@@ -244,7 +259,7 @@
kvm_openfiles(uf, mf, sf, flag, errout)
const char *uf;
const char *mf;
@@ -93,7 +87,7 @@
int flag;
char *errout;
{
-@@ -257,7 +274,7 @@
+@@ -262,7 +277,7 @@
kvm_open(uf, mf, sf, flag, errstr)
const char *uf;
const char *mf;
@@ -102,55 +96,54 @@
int flag;
const char *errstr;
{
-Index: b/lib/libkvm/kvm_file.c
+Index: freebsd-libs/lib/libkvm/kvm_file.c
===================================================================
---- a/lib/libkvm/kvm_file.c
-+++ b/lib/libkvm/kvm_file.c
-@@ -60,7 +60,7 @@
+--- 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 @@
#include <sys/sysctl.h>
#include <limits.h>
-#include <ndbm.h>
+#include <gdbm-ndbm.h>
#include <paths.h>
+ #include <stdlib.h>
- #include "kvm_private.h"
-@@ -77,6 +77,7 @@
- int op, arg, nfiles;
- long filehead_o;
+@@ -80,6 +80,7 @@
+ int op, arg, nprocs;
+ long allproc_o;
{
+#if 0
- int buflen = kd->arglen, n = 0;
- struct file *fp;
- char *where = kd->argspc;
-@@ -114,6 +115,8 @@
- return (0);
- }
- return (nfiles);
+ struct proc proc;
+ struct filedesc filed;
+ int buflen = kd->arglen, ocnt = 0, n = 0, once = 0, i;
+@@ -151,6 +152,7 @@
+ return (n);
+ fail:
+ free(ofiles);
+#endif
-+ return 0;
+ return (0);
+
}
+@@ -166,6 +168,7 @@
- char *
-@@ -122,6 +125,7 @@
- int op, arg;
- int *cnt;
- {
+ _kvm_syserr(kd, kd->program, "kvm_getfiles has been broken for years");
+ return (0);
+#if 0
- int mib[2], st, nfiles;
- size_t size;
- struct file *fp, *fplim;
-@@ -185,4 +189,6 @@
+ if (ISALIVE(kd)) {
+ size = 0;
+ mib[0] = CTL_KERN;
+@@ -228,4 +231,6 @@
}
*cnt = nfiles;
return (kd->argspc);
+#endif
+ return 0;
}
-Index: b/lib/libkvm/kvm_getloadavg.c
+Index: freebsd-libs/lib/libkvm/kvm_getloadavg.c
===================================================================
---- a/lib/libkvm/kvm_getloadavg.c
-+++ b/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 @@
#include <limits.h>
#include <nlist.h>
@@ -176,10 +169,10 @@
};
/*
-Index: b/lib/libkvm/kvm_getswapinfo.c
+Index: freebsd-libs/lib/libkvm/kvm_getswapinfo.c
===================================================================
---- a/lib/libkvm/kvm_getswapinfo.c
-+++ b/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>
@@ -211,19 +204,11 @@
}
tot.ksw_total += ttl;
tot.ksw_used += xsd.xsw_used;
-Index: b/lib/libkvm/kvm_minidump_amd64.c
+Index: freebsd-libs/lib/libkvm/kvm_minidump_amd64.c
===================================================================
---- a/lib/libkvm/kvm_minidump_amd64.c
-+++ b/lib/libkvm/kvm_minidump_amd64.c
-@@ -38,6 +38,7 @@
- #include <sys/fnv_hash.h>
- #include <stdlib.h>
- #include <strings.h>
-+#include <string.h>
- #include <unistd.h>
- #include <nlist.h>
- #include <kvm.h>
-@@ -100,6 +101,15 @@
+--- 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 @@
return (-1);
}
@@ -239,10 +224,10 @@
static int
inithash(kvm_t *kd, uint64_t *base, int len, off_t off)
{
-Index: b/lib/libkvm/kvm_minidump_i386.c
+Index: freebsd-libs/lib/libkvm/kvm_minidump_i386.c
===================================================================
---- a/lib/libkvm/kvm_minidump_i386.c
-+++ b/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 @@
return (-1);
}
@@ -260,11 +245,20 @@
static int
inithash(kvm_t *kd, uint32_t *base, int len, off_t off)
{
-Index: b/lib/libkvm/kvm_private.h
+Index: freebsd-libs/lib/libkvm/kvm_private.h
===================================================================
---- a/lib/libkvm/kvm_private.h
-+++ b/lib/libkvm/kvm_private.h
-@@ -68,7 +68,7 @@
+--- 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
+@@ -34,6 +34,8 @@
+ * $FreeBSD$
+ */
+
++#include <stdint.h>
++
+ 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, ...)
@@ -273,19 +267,19 @@
void _kvm_freeprocs(kvm_t *kd);
void _kvm_freevtop(kvm_t *);
int _kvm_initvtop(kvm_t *);
-@@ -76,7 +76,7 @@
- void *_kvm_malloc(kvm_t *kd, size_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 *);
-
- #if defined(__amd64__) || defined(__i386__)
-Index: b/lib/libkvm/kvm_proc.c
+ int _kvm_vnet_selectpid(kvm_t *, pid_t);
+ int _kvm_vnet_initialized(kvm_t *, int);
+Index: freebsd-libs/lib/libkvm/kvm_proc.c
===================================================================
---- a/lib/libkvm/kvm_proc.c
-+++ b/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 @@
#include <sys/_lock.h>
#include <sys/_mutex.h>
@@ -303,7 +297,7 @@
int cnt = 0;
struct kinfo_proc kinfo_proc, *kp;
struct pgrp pgrp;
-@@ -420,6 +421,8 @@
+@@ -427,6 +428,8 @@
++cnt;
}
return (cnt);
@@ -312,28 +306,23 @@
}
/*
-Index: b/lib/libkvm/kvm_amd64.c
+Index: freebsd-libs/lib/libkvm/kvm_amd64.c
===================================================================
---- a/lib/libkvm/kvm_amd64.c
-+++ b/lib/libkvm/kvm_amd64.c
-@@ -52,6 +52,7 @@
- #include <sys/mman.h>
+--- 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: b/lib/libkvm/kvm_cptime.c
+Index: freebsd-libs/lib/libkvm/kvm_cptime.c
===================================================================
---- a/lib/libkvm/kvm_cptime.c
-+++ b/lib/libkvm/kvm_cptime.c
-@@ -39,12 +39,13 @@
- #include <kvm.h>
- #include <limits.h>
- #include <stdlib.h>
-+#include <string.h>
-
+--- 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 @@
#include "kvm_private.h"
static struct nlist kvm_cp_time_nl[] = {
@@ -344,10 +333,10 @@
};
#define NL_CP_TIME 0
-Index: b/lib/libkvm/kvm_pcpu.c
+Index: freebsd-libs/lib/libkvm/kvm_pcpu.c
===================================================================
---- a/lib/libkvm/kvm_pcpu.c
-+++ b/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 @@
#include "kvm_private.h"
@@ -361,3 +350,33 @@
};
/*
+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 @@
+ * here to __{start,stop}_set_vnet.
+ */
+ #define NLIST_START_VNET 0
+- { .n_name = "___start_" VNET_SETNAME },
++ { "___start_" VNET_SETNAME },
+ #define NLIST_STOP_VNET 1
+- { .n_name = "___stop_" VNET_SETNAME },
++ { "___stop_" VNET_SETNAME },
+ #define NLIST_VNET_HEAD 2
+- { .n_name = "vnet_head" },
++ { "vnet_head" },
+ #define NLIST_ALLPROC 3
+- { .n_name = "allproc" },
++ { "allproc" },
+ #define NLIST_DUMPTID 4
+- { .n_name = "dumptid" },
++ { "dumptid" },
+ #define NLIST_PROC0 5
+- { .n_name = "proc0" },
+- { .n_name = NULL },
++ { "proc0" },
++ { NULL },
+ };
+ uintptr_t procp, tdp, credp;
+ lwpid_t dumptid;
Modified: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff 2009-11-14 09:51:59 UTC (rev 2839)
@@ -6,8 +6,10 @@
lib/libgeom/geom_xml2tree.c | 2 +-
5 files changed, 7 insertions(+), 3 deletions(-)
---- a/lib/libgeom/Makefile
-+++ b/lib/libgeom/Makefile
+Index: freebsd-libs/lib/libgeom/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libgeom/Makefile 2009-11-14 09:46:19.000000000 +0000
++++ freebsd-libs/lib/libgeom/Makefile 2009-11-14 09:46:40.000000000 +0000
@@ -14,7 +14,7 @@
WARNS?= 3
@@ -17,11 +19,22 @@
MAN= libgeom.3
---- a/lib/libgeom/geom_ctl.c
-+++ b/lib/libgeom/geom_ctl.c
-@@ -158,6 +158,9 @@
- ap->name = strdup(name);
- gctl_check_alloc(req, ap->name);
+Index: freebsd-libs/lib/libgeom/geom_ctl.c
+===================================================================
+--- 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;
ap->nlen = strlen(ap->name) + 1;
+#ifndef __DECONST
+#define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var))
@@ -29,8 +42,10 @@
ap->value = __DECONST(void *, value);
ap->flag = GCTL_PARAM_RD;
if (len >= 0)
---- a/lib/libgeom/geom_stats.c
-+++ b/lib/libgeom/geom_stats.c
+Index: freebsd-libs/lib/libgeom/geom_stats.c
+===================================================================
+--- freebsd-libs.orig/lib/libgeom/geom_stats.c 2009-11-14 09:46:20.000000000 +0000
++++ freebsd-libs/lib/libgeom/geom_stats.c 2009-11-14 09:46:40.000000000 +0000
@@ -34,11 +34,11 @@
#include <fcntl.h>
#include <stdlib.h>
@@ -44,8 +59,10 @@
#include <sys/types.h>
#include <sys/devicestat.h>
---- a/lib/libgeom/geom_xml2tree.c
-+++ b/lib/libgeom/geom_xml2tree.c
+Index: freebsd-libs/lib/libgeom/geom_xml2tree.c
+===================================================================
+--- freebsd-libs.orig/lib/libgeom/geom_xml2tree.c 2009-11-14 09:46:20.000000000 +0000
++++ freebsd-libs/lib/libgeom/geom_xml2tree.c 2009-11-14 09:46:40.000000000 +0000
@@ -43,7 +43,7 @@
#include <sys/sbuf.h>
#include <sys/sysctl.h>
@@ -55,9 +72,11 @@
#include <libgeom.h>
struct mystate {
---- a/lib/libgeom/geom_util.c
-+++ b/lib/libgeom/geom_util.c
-@@ -38,6 +38,7 @@
+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>
@@ -65,3 +84,14 @@
#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/07_libkiconv.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2009-11-14 09:51:59 UTC (rev 2839)
@@ -3,8 +3,10 @@
lib/libkiconv/quirks.h | 1 +
2 files changed, 2 insertions(+)
---- a/lib/libkiconv/Makefile
-+++ b/lib/libkiconv/Makefile
+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
@@ -14,5 +14,6 @@
kiconv.3 kiconv_add_xlat16_table.3
@@ -12,13 +14,67 @@
+LDADD= -ldl
.include <bsd.lib.mk>
---- a/lib/libkiconv/quirks.h
-+++ b/lib/libkiconv/quirks.h
+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
@@ -25,6 +25,7 @@
*
- * $FreeBSD: src/lib/libkiconv/quirks.h,v 1.1.30.1 2009/04/15 03:14:26 kensmith Exp $
+ * $FreeBSD$
*/
+#include <stdint.h>
#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
+@@ -426,8 +426,8 @@
+ #include <errno.h>
+
+ int
+-kiconv_add_xlat16_cspair(const char *tocode __unused, const char *fromcode __unused,
+- int flag __unused)
++kiconv_add_xlat16_cspair(const char *tocode, const char *fromcode,
++ int flag)
+ {
+
+ errno = EINVAL;
+@@ -435,7 +435,7 @@
+ }
+
+ int
+-kiconv_add_xlat16_cspairs(const char *tocode __unused, const char *fromcode __unused)
++kiconv_add_xlat16_cspairs(const char *tocode, const char *fromcode)
+ {
+ 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
+@@ -187,7 +187,7 @@
+ #include <sys/iconv.h>
+
+ const char *
+-kiconv_quirkcs(const char* base __unused, int vendor __unused)
++kiconv_quirkcs(const char* base, int vendor)
+ {
+
+ 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
+@@ -75,8 +75,8 @@
+ #include <errno.h>
+
+ int
+-kiconv_add_xlat16_table(const char *to __unused, const char *from __unused,
+- const void *data __unused, int datalen __unused)
++kiconv_add_xlat16_table(const char *to, const char *from,
++ const void *data, int datalen)
+ {
+
+ return (EINVAL);
Modified: trunk/freebsd-libs/debian/patches/09_libusbhid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/09_libusbhid.diff 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/patches/09_libusbhid.diff 2009-11-14 09:51:59 UTC (rev 2839)
@@ -2,13 +2,15 @@
lib/libusbhid/Makefile | 1 +
1 file changed, 1 insertion(+)
---- a/lib/libusbhid/Makefile
-+++ b/lib/libusbhid/Makefile
+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
@@ -4,6 +4,7 @@
LIB= usbhid
MAN= usbhid.3
+LDADD= -lbsd
- SHLIB_MAJOR= 3
+ SHLIB_MAJOR= 4
MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2009-11-14 09:51:20 UTC (rev 2838)
+++ trunk/freebsd-libs/debian/rules 2009-11-14 09:51:59 UTC (rev 2839)
@@ -19,6 +19,7 @@
VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
SVN=svn://svn.freebsd.org/base/release/$(VERSION).0
+SVN=http://svn.freebsd.org/base/releng/8.0
ORIGDIR=freebsd-libs-$(VERSION)
PATH:=/usr/lib/freebsd:$(PATH)
DESTDIR=$(CURDIR)/debian/tmp
More information about the Glibc-bsd-commits
mailing list