[Glibc-bsd-commits] r4722 - in trunk/freebsd-libs/debian: . patches
Robert Millan
rmh at alioth.debian.org
Tue Jul 9 21:24:42 UTC 2013
Author: rmh
Date: 2013-07-09 21:24:42 +0000 (Tue, 09 Jul 2013)
New Revision: 4722
Added:
trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff
Removed:
trunk/freebsd-libs/debian/local/
trunk/freebsd-libs/debian/patches/01_sys_cam.diff
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
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/cdefs_macros.diff
trunk/freebsd-libs/debian/patches/series
Log:
* New upstream release.
- Sync all patches.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/changelog 2013-07-09 21:24:42 UTC (rev 4722)
@@ -1,3 +1,10 @@
+freebsd-libs (9.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Sync all patches.
+
+ -- Robert Millan <rmh at debian.org> Tue, 09 Jul 2013 22:49:44 +0200
+
freebsd-libs (9.0+ds2-1) experimental; urgency=low
* Add libelf and libdwarf.
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/control 2013-07-09 21:24:42 UTC (rev 4722)
@@ -8,7 +8,7 @@
libbsd-dev (>= 0.3.0),
libc0.1-dev (>= 2.13-31) [kfreebsd-any],
libgdbm-dev [kfreebsd-any],
- kfreebsd-kernel-headers (>= 0.81) [kfreebsd-any],
+ kfreebsd-kernel-headers (>= 9.1) [kfreebsd-any],
# libexpat-dev: aka bsdxml. needed by libgeom
libexpat-dev [kfreebsd-any],
# libncurses5-dev: needed by libalias
Deleted: trunk/freebsd-libs/debian/patches/01_sys_cam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -1,20 +0,0 @@
---- a/sys/cam/cam.c
-+++ b/sys/cam/cam.c
-@@ -36,6 +36,7 @@
- #include <sys/sysctl.h>
- #else /* _KERNEL */
- #include <stdlib.h>
-+#include <stdint.h>
- #include <stdio.h>
- #include <string.h>
- #include <camlib.h>
---- a/sys/cam/scsi/scsi_all.c
-+++ b/sys/cam/scsi/scsi_all.c
-@@ -43,6 +43,7 @@
- #include <sys/sysctl.h>
- #else
- #include <errno.h>
-+#include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -12,18 +12,7 @@
KVM_ARCH=${MACHINE_ARCH}
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
-@@ -71,6 +71,10 @@
- #include <strings.h>
- #include <unistd.h>
-
-+#ifndef _PATH_FWMEM
-+#define _PATH_FWMEM "/dev/fwmem"
-+#endif
-+
- #include "kvm_private.h"
-
- /* from src/lib/libc/gen/nlist.c */
-@@ -144,6 +148,7 @@
+@@ -144,6 +144,7 @@
_kvm_open(kvm_t *kd, const char *uf, const char *mf, int flag, char *errout)
{
struct stat st;
@@ -31,7 +20,7 @@
kd->vmfd = -1;
kd->pmfd = -1;
-@@ -153,8 +158,17 @@
+@@ -153,8 +154,17 @@
kd->argspc = 0;
kd->argv = 0;
@@ -106,17 +95,6 @@
}
tot.ksw_total += ttl;
tot.ksw_used += xsd.xsw_used;
---- a/lib/libkvm/kvm_private.h
-+++ b/lib/libkvm/kvm_private.h
-@@ -34,6 +34,8 @@
- * $FreeBSD$
- */
-
-+#include <stdint.h>
-+
- struct __kvm {
- /*
- * a string to be prepended to error messages
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -54,7 +54,7 @@
@@ -128,7 +106,7 @@
#include <sys/user.h>
#include <sys/proc.h>
#define _WANT_PRISON /* make jail.h give us 'struct prison' */
-@@ -116,6 +116,7 @@
+@@ -113,6 +113,7 @@
kvm_proclist(kvm_t *kd, int what, int arg, struct proc *p,
struct kinfo_proc *bp, int maxcnt)
{
@@ -136,7 +114,7 @@
int cnt = 0;
struct kinfo_proc kinfo_proc, *kp;
struct pgrp pgrp;
-@@ -440,6 +441,8 @@
+@@ -437,6 +438,8 @@
++cnt;
}
return (cnt);
Modified: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -17,29 +17,3 @@
MAN= libgeom.3
---- a/lib/libgeom/geom_stats.c
-+++ b/lib/libgeom/geom_stats.c
-@@ -34,11 +34,11 @@
- #include <fcntl.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
- #include <unistd.h>
- #include <libgeom.h>
-
- #include <sys/mman.h>
--#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/devicestat.h>
-
---- a/lib/libgeom/geom_xml2tree.c
-+++ b/lib/libgeom/geom_xml2tree.c
-@@ -43,7 +43,7 @@
- #include <sys/sbuf.h>
- #include <sys/sysctl.h>
- #include <err.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <libgeom.h>
-
- struct mystate {
Modified: trunk/freebsd-libs/debian/patches/07_libkiconv.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -5,7 +5,7 @@
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
-@@ -14,6 +14,7 @@
+@@ -17,6 +17,7 @@
kiconv.3 kiconv_add_xlat16_table.3
CFLAGS+= -I${.CURDIR}/../../sys
@@ -23,49 +23,3 @@
#ifndef _KICONV_QUIRKS_H_
#define _KICONV_QUIRKS_H_
---- a/lib/libkiconv/xlat16_iconv.c
-+++ b/lib/libkiconv/xlat16_iconv.c
-@@ -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);
---- a/lib/libkiconv/quirks.c
-+++ b/lib/libkiconv/quirks.c
-@@ -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);
---- a/lib/libkiconv/xlat16_sysctl.c
-+++ b/lib/libkiconv/xlat16_sysctl.c
-@@ -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/08_libdevstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -23,13 +23,3 @@
WARNS?= 3
---- a/lib/libdevstat/devstat.c
-+++ b/lib/libdevstat/devstat.c
-@@ -45,6 +45,7 @@
- #include <stdarg.h>
- #include <kvm.h>
- #include <nlist.h>
-+#include <time.h>
-
- #include "devstat.h"
-
Modified: trunk/freebsd-libs/debian/patches/09_libusbhid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/09_libusbhid.diff 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/09_libusbhid.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -1,7 +1,3 @@
----
- lib/libusbhid/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -4,6 +4,7 @@
@@ -12,14 +8,3 @@
SHLIB_MAJOR= 4
MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
---- a/lib/libusbhid/parse.c
-+++ b/lib/libusbhid/parse.c
-@@ -143,7 +143,7 @@
- * hid_start_parse
- *------------------------------------------------------------------------*/
- hid_data_t
--hid_start_parse(report_desc_t d, int kindset, int id __unused)
-+hid_start_parse(report_desc_t d, int kindset, int id)
- {
- struct hid_data *s;
-
Modified: trunk/freebsd-libs/debian/patches/10_memstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/10_memstat.diff 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/10_memstat.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -1,14 +1,3 @@
---- a/lib/libmemstat/memstat_internal.h
-+++ b/lib/libmemstat/memstat_internal.h
-@@ -28,6 +28,8 @@
-
- #ifndef _MEMSTAT_INTERNAL_H_
- #define _MEMSTAT_INTERNAL_H_
-+
-+#include <sys/queue.h>
-
- /*
- * memstat maintains its own internal notion of statistics on each memory
--- a/lib/libmemstat/memstat.h
+++ b/lib/libmemstat/memstat.h
@@ -29,6 +29,8 @@
@@ -36,17 +25,6 @@
};
/*
-@@ -242,6 +242,10 @@
- return (0);
- }
-
-+#ifndef __DECONST
-+#define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var))
-+#endif
-+
- static int
- kread_string(kvm_t *kvm, const void *kvm_pointer, char *buffer, int buflen)
- {
--- a/lib/libmemstat/memstat_uma.c
+++ b/lib/libmemstat/memstat_uma.c
@@ -51,12 +51,12 @@
Modified: trunk/freebsd-libs/debian/patches/11_netgraph.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/11_netgraph.diff 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/11_netgraph.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -8,27 +8,6 @@
#include <sys/types.h>
#include <netgraph/ng_message.h>
---- a/lib/libnetgraph/sock.c
-+++ b/lib/libnetgraph/sock.c
-@@ -44,6 +44,8 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <stdarg.h>
-+#include <stdint.h>
-+
- #include <netgraph/ng_message.h>
- #include <netgraph/ng_socket.h>
-
---- a/lib/libnetgraph/msg.c
-+++ b/lib/libnetgraph/msg.c
-@@ -44,6 +44,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <stdarg.h>
-+#include <stdint.h>
- #include <netgraph/ng_message.h>
- #include <netgraph/ng_socket.h>
-
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -4,6 +4,7 @@
Modified: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -44,16 +44,16 @@
int NgRecvMsg(int, struct ng_mesg *, size_t, char *);
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
-@@ -228,7 +228,7 @@
+@@ -242,7 +242,7 @@
uint8_t bSynchAddress;
uint8_t *extra;
int extra_length;
-} libusb_endpoint_descriptor __aligned(sizeof(void *));
+} libusb_endpoint_descriptor __attribute__((__aligned__(sizeof(void *))));
- typedef struct libusb_interface_descriptor {
- uint8_t bLength;
-@@ -243,12 +243,12 @@
+ typedef struct libusb_ss_endpoint_companion_descriptor {
+ uint8_t bLength;
+@@ -265,12 +265,12 @@
struct libusb_endpoint_descriptor *endpoint;
uint8_t *extra;
int extra_length;
@@ -68,16 +68,16 @@
typedef struct libusb_config_descriptor {
uint8_t bLength;
-@@ -262,7 +262,7 @@
+@@ -284,7 +284,7 @@
struct libusb_interface *interface;
uint8_t *extra;
int extra_length;
-} libusb_config_descriptor __aligned(sizeof(void *));
+} libusb_config_descriptor __attribute__((__aligned__(sizeof(void *))));
- typedef struct libusb_control_setup {
- uint8_t bmRequestType;
-@@ -278,7 +278,7 @@
+ typedef struct libusb_usb_2_0_device_capability_descriptor {
+ uint8_t bLength;
+@@ -333,7 +333,7 @@
uint32_t length;
uint32_t actual_length;
enum libusb_transfer_status status;
@@ -86,7 +86,7 @@
typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
-@@ -297,7 +297,7 @@
+@@ -352,7 +352,7 @@
void *os_priv;
int num_iso_packets;
struct libusb_iso_packet_descriptor iso_packet_desc[0];
@@ -115,7 +115,7 @@
#define LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
-@@ -498,7 +498,7 @@
+@@ -557,7 +557,7 @@
struct libusb20_endpoint {
struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
struct libusb20_me_struct extra;
@@ -124,7 +124,7 @@
struct libusb20_interface {
struct LIBUSB20_INTERFACE_DESC_DECODED desc;
-@@ -507,14 +507,14 @@
+@@ -566,14 +566,14 @@
struct libusb20_endpoint *endpoints;
uint8_t num_altsetting;
uint8_t num_endpoints;
Added: trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff (rev 0)
+++ trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff 2013-07-09 21:24:42 UTC (rev 4722)
@@ -0,0 +1,14 @@
+--- a/lib/libusb/libusb10.c
++++ b/lib/libusb/libusb10.c
+@@ -37,6 +37,11 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+
++/* Set the clock selected for the conditon variable attribute ATTR. */
++extern int pthread_condattr_setclock (pthread_condattr_t *__attr,
++ __clockid_t __clock_id)
++ __THROW __nonnull ((1));
++
+ #define libusb_device_handle libusb20_device
+
+ #include "libusb20.h"
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2013-07-09 20:34:20 UTC (rev 4721)
+++ trunk/freebsd-libs/debian/patches/series 2013-07-09 21:24:42 UTC (rev 4722)
@@ -1,5 +1,4 @@
cdefs_macros.diff
-01_sys_cam.diff
02_libcam.diff
03_libsbuf.diff
04_libkvm.diff
@@ -20,3 +19,5 @@
kvm_size_t_kludge.diff
dwarf.diff
elf.diff
+pthread_condattr_setclock.diff
+libusb_pthread_condattr_setclock.diff
More information about the Glibc-bsd-commits
mailing list