[Glibc-bsd-commits] r5589 - trunk/freebsd-libs/debian/patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Sat Oct 4 18:39:58 UTC 2014
Author: stevenc-guest
Date: 2014-10-04 18:39:58 +0000 (Sat, 04 Oct 2014)
New Revision: 5589
Modified:
trunk/freebsd-libs/debian/patches/02_libcam.diff
trunk/freebsd-libs/debian/patches/04_libkvm.diff
trunk/freebsd-libs/debian/patches/05_libipx.diff
trunk/freebsd-libs/debian/patches/08_libdevstat.diff
trunk/freebsd-libs/debian/patches/12_usb.diff
trunk/freebsd-libs/debian/patches/13_jail.diff
trunk/freebsd-libs/debian/patches/14_alias.diff
trunk/freebsd-libs/debian/patches/assume_default_login_class.diff
trunk/freebsd-libs/debian/patches/cdefs_macros.diff
trunk/freebsd-libs/debian/patches/dwarf.diff
trunk/freebsd-libs/debian/patches/elf.diff
trunk/freebsd-libs/debian/patches/libusb_backward.diff
trunk/freebsd-libs/debian/patches/makefiles.diff
trunk/freebsd-libs/debian/patches/pty_decls.diff
trunk/freebsd-libs/debian/patches/rlimit.diff
trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff
Log:
Undo adding of context onto "@@" lines. In most cases it is not
meaningful, and could change needlessly when a patch is refreshed,
making it hard to review diffs-of-diffs to see the actual changes.
No change to the actual patches with this commit.
Modified: trunk/freebsd-libs/debian/patches/02_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_libcam.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/02_libcam.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -1,6 +1,6 @@
--- 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 smp_all.c
INCS= camlib.h
Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -1,6 +1,6 @@
--- a/lib/libkvm/kvm_vnet.c
+++ b/lib/libkvm/kvm_vnet.c
-@@ -68,18 +68,18 @@ _kvm_vnet_selectpid(kvm_t *kd, pid_t pid
+@@ -68,18 +68,18 @@
* here to __{start,stop}_set_vnet.
*/
#define NLIST_START_VNET 0
@@ -28,7 +28,7 @@
#define VMCORE_VNET_OF_PROC0
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
-@@ -387,6 +387,12 @@ nopgrp:
+@@ -387,6 +387,12 @@
kp->ki_runtime = cputick2usec(proc.p_rux.rux_runtime);
kp->ki_pid = proc.p_pid;
kp->ki_siglist = proc.p_siglist;
Modified: trunk/freebsd-libs/debian/patches/05_libipx.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/05_libipx.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/05_libipx.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -10,7 +10,7 @@
MAN= ipx.3
--- a/sys/netipx/ipx.h
+++ b/sys/netipx/ipx.h
-@@ -146,6 +146,7 @@ struct ipx_addr {
+@@ -146,6 +146,7 @@
u_short x_port;
};
@@ -18,7 +18,7 @@
/*
* Socket address
*/
-@@ -156,6 +157,8 @@ struct sockaddr_ipx {
+@@ -156,6 +157,8 @@
char sipx_zero[2];
};
#define sipx_port sipx_addr.x_port
Modified: trunk/freebsd-libs/debian/patches/08_libdevstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -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
Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -1,6 +1,6 @@
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
-@@ -21,6 +21,7 @@ WARNS?= 2
+@@ -21,6 +21,7 @@
DPADD= ${LIBPTHREAD}
LDADD= ${PTHREAD_LIBS}
Modified: trunk/freebsd-libs/debian/patches/13_jail.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/13_jail.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/13_jail.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -1,6 +1,6 @@
--- a/lib/libjail/Makefile
+++ b/lib/libjail/Makefile
-@@ -5,6 +5,7 @@ SHLIBDIR?= /lib
+@@ -5,6 +5,7 @@
SHLIB_MAJOR= 1
SRCS= jail.c jail_getid.c
INCS= jail.h
Modified: trunk/freebsd-libs/debian/patches/14_alias.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/14_alias.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/14_alias.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -1,6 +1,6 @@
--- a/lib/libalias/libalias/Makefile
+++ b/lib/libalias/libalias/Makefile
-@@ -9,5 +9,6 @@ MAN= libalias.3
+@@ -9,5 +9,6 @@
SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c
INCS= alias.h
NO_WERROR=
Modified: trunk/freebsd-libs/debian/patches/assume_default_login_class.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/assume_default_login_class.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/assume_default_login_class.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -3,7 +3,7 @@
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
-@@ -324,7 +324,6 @@ login_getpwclass(const struct passwd *pw
+@@ -324,7 +324,6 @@
const char *cls = NULL;
if (pwd != NULL) {
Modified: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -4,7 +4,7 @@
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
-@@ -151,12 +151,12 @@ int cam_get_device(const char *path, c
+@@ -151,12 +151,12 @@
* Buffer encoding/decoding routines, from the old SCSI library.
*/
int csio_decode(struct ccb_scsiio *csio, const char *fmt, ...)
@@ -19,7 +19,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);
-@@ -169,7 +169,7 @@ int csio_build_visit(struct ccb_scsiio *
+@@ -169,7 +169,7 @@
int (*arg_get)(void *hook, char *field_name),
void *gethook);
int csio_encode(struct ccb_scsiio *csio, const char *fmt, ...)
@@ -44,7 +44,7 @@
int NgRecvMsg(int, struct ng_mesg *, size_t, char *);
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
-@@ -268,7 +268,7 @@ typedef struct libusb_endpoint_descripto
+@@ -268,7 +268,7 @@
uint8_t bSynchAddress;
uint8_t *extra;
int extra_length;
@@ -53,7 +53,7 @@
typedef struct libusb_ss_endpoint_companion_descriptor {
uint8_t bLength;
-@@ -276,7 +276,7 @@ typedef struct libusb_ss_endpoint_compan
+@@ -276,7 +276,7 @@
uint8_t bMaxBurst;
uint8_t bmAttributes;
uint16_t wBytesPerInterval;
@@ -62,7 +62,7 @@
typedef struct libusb_interface_descriptor {
uint8_t bLength;
-@@ -291,12 +291,12 @@ typedef struct libusb_interface_descript
+@@ -291,12 +291,12 @@
struct libusb_endpoint_descriptor *endpoint;
uint8_t *extra;
int extra_length;
@@ -77,7 +77,7 @@
typedef struct libusb_config_descriptor {
uint8_t bLength;
-@@ -310,7 +310,7 @@ typedef struct libusb_config_descriptor
+@@ -310,7 +310,7 @@
struct libusb_interface *interface;
uint8_t *extra;
int extra_length;
@@ -86,7 +86,7 @@
typedef struct libusb_usb_2_0_device_capability_descriptor {
uint8_t bLength;
-@@ -318,7 +318,7 @@ typedef struct libusb_usb_2_0_device_cap
+@@ -318,7 +318,7 @@
uint8_t bDevCapabilityType;
uint32_t bmAttributes;
#define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT (1 << 1)
@@ -95,7 +95,7 @@
typedef struct libusb_ss_usb_device_capability_descriptor {
uint8_t bLength;
-@@ -334,7 +334,7 @@ typedef struct libusb_ss_usb_device_capa
+@@ -334,7 +334,7 @@
uint8_t bFunctionalitySupport;
uint8_t bU1DevExitLat;
uint16_t wU2DevExitLat;
@@ -104,7 +104,7 @@
typedef struct libusb_bos_descriptor {
uint8_t bLength;
-@@ -343,7 +343,7 @@ typedef struct libusb_bos_descriptor {
+@@ -343,7 +343,7 @@
uint8_t bNumDeviceCapabilities;
struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
@@ -113,7 +113,7 @@
typedef struct libusb_control_setup {
uint8_t bmRequestType;
-@@ -359,7 +359,7 @@ typedef struct libusb_iso_packet_descrip
+@@ -359,7 +359,7 @@
uint32_t length;
uint32_t actual_length;
enum libusb_transfer_status status;
@@ -122,7 +122,7 @@
typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
-@@ -377,7 +377,7 @@ typedef struct libusb_transfer {
+@@ -377,7 +377,7 @@
uint8_t *buffer;
int num_iso_packets;
struct libusb_iso_packet_descriptor iso_packet_desc[0];
@@ -133,7 +133,7 @@
--- a/lib/libusb/libusb20_desc.h
+++ b/lib/libusb/libusb20_desc.h
-@@ -102,7 +102,7 @@ struct libusb20_me_struct {
+@@ -102,7 +102,7 @@
void *ptr; /* data pointer */
uint16_t len; /* defaults to zero */
uint16_t type; /* defaults to LIBUSB20_ME_IS_EMPTY */
@@ -142,7 +142,7 @@
struct libusb20_me_format {
const uint8_t *format; /* always set */
-@@ -124,7 +124,7 @@ struct libusb20_me_format {
+@@ -124,7 +124,7 @@
LIBUSB20_ME_IS_##un##SIGNED , \
(size) & 0xFF, ((size) / 0x100) & 0xFF, ) \
LIBUSB20_NOT(ismeta) ( u##int##bits##_t \
@@ -151,7 +151,7 @@
#define LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
-@@ -561,7 +561,7 @@ enum libusb20_iso_usage_type {
+@@ -561,7 +561,7 @@
struct libusb20_endpoint {
struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
struct libusb20_me_struct extra;
@@ -160,7 +160,7 @@
struct libusb20_interface {
struct LIBUSB20_INTERFACE_DESC_DECODED desc;
-@@ -570,14 +570,14 @@ struct libusb20_interface {
+@@ -570,14 +570,14 @@
struct libusb20_endpoint *endpoints;
uint8_t num_altsetting;
uint8_t num_endpoints;
@@ -179,7 +179,7 @@
uint16_t libusb20_me_get_2(const struct libusb20_me_struct *ie, uint16_t offset);
--- a/sys/sys/sbuf.h
+++ b/sys/sys/sbuf.h
-@@ -71,9 +71,9 @@ int sbuf_bcpy(struct sbuf *, const voi
+@@ -71,9 +71,9 @@
int sbuf_cat(struct sbuf *, const char *);
int sbuf_cpy(struct sbuf *, const char *);
int sbuf_printf(struct sbuf *, const char *, ...)
Modified: trunk/freebsd-libs/debian/patches/dwarf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/dwarf.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/dwarf.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -8,7 +8,7 @@
SRCS= \
dwarf_abbrev.c \
-@@ -20,7 +20,8 @@ SRCS= \
+@@ -20,7 +20,8 @@
INCS= dwarf.h libdwarf.h
Modified: trunk/freebsd-libs/debian/patches/elf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/elf.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/elf.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -8,7 +8,7 @@
SRCS= elf_begin.c \
elf_cntl.c \
-@@ -171,6 +171,8 @@ libelf_convert.c: elf_types.m4 libelf_co
+@@ -171,6 +171,8 @@
libelf_fsize.c: elf_types.m4 libelf_fsize.m4
libelf_msize.c: elf_types.m4 libelf_msize.m4
Modified: trunk/freebsd-libs/debian/patches/libusb_backward.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libusb_backward.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/libusb_backward.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -5,7 +5,7 @@
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
-@@ -5,7 +5,7 @@ LIB= usbhid
+@@ -5,7 +5,7 @@
MAN= usbhid.3
LDADD= -lbsd
Modified: trunk/freebsd-libs/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -8,7 +8,7 @@
SHLIBDIR?= /lib
SRCS+= geom_getxml.c
SRCS+= geom_stats.c
-@@ -16,6 +17,8 @@ WARNS?= 3
+@@ -16,6 +17,8 @@
DPADD= ${LIBBSDXML} ${LIBSBUF}
LDADD= -lbsdxml -lsbuf
@@ -19,7 +19,7 @@
MLINKS+= \
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
-@@ -5,15 +5,11 @@ SHLIBDIR?= /lib
+@@ -5,15 +5,11 @@
.include <bsd.own.mk>
@@ -37,7 +37,7 @@
stub.c trimdomain.c uucplock.c
INCS= libutil.h login_cap.h
-@@ -25,6 +21,14 @@ CFLAGS+= -DINET6
+@@ -25,6 +21,14 @@
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
@@ -54,7 +54,7 @@
kinfo_getproc.3 kinfo_getvmmap.3 kld.3 login_auth.3 login_cap.3 \
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
-@@ -5,6 +5,7 @@ LIB= kvm
+@@ -5,6 +5,7 @@
SHLIBDIR?= /lib
SHLIB_MAJOR= 6
CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
@@ -64,7 +64,7 @@
KVM_ARCH=${MACHINE_ARCH}
--- a/lib/libipx/Makefile
+++ b/lib/libipx/Makefile
-@@ -7,6 +7,10 @@ SRCS= ipx_addr.c ipx_ntoa.c
+@@ -7,6 +7,10 @@
MAN= ipx.3
MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
@@ -77,7 +77,7 @@
.include <bsd.lib.mk>
--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
-@@ -61,7 +61,7 @@ INCS= libelf.h gelf.h
+@@ -61,7 +61,7 @@
# problems when a header file in sys depends on a file in another
# part of the tree, e.g. a machine dependent header.
#
Modified: trunk/freebsd-libs/debian/patches/pty_decls.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/pty_decls.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/pty_decls.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -1,6 +1,6 @@
--- a/lib/libutil/libutil.h
+++ b/lib/libutil/libutil.h
-@@ -94,7 +94,7 @@ int extattr_namespace_to_string(int _att
+@@ -94,7 +94,7 @@
int extattr_string_to_namespace(const char *_string, int *_attrnamespace);
int flopen(const char *_path, int _flags, ...);
int forkpty(int *_amaster, char *_name,
@@ -9,7 +9,7 @@
void hexdump(const void *_ptr, int _length, const char *_hdr, int _flags);
int humanize_number(char *_buf, size_t _len, int64_t _number,
const char *_suffix, int _scale, int _flags);
-@@ -110,7 +110,7 @@ int kld_isloaded(const char *_name);
+@@ -110,7 +110,7 @@
int kld_load(const char *_name);
int login_tty(int _fd);
int openpty(int *_amaster, int *_aslave, char *_name,
Modified: trunk/freebsd-libs/debian/patches/rlimit.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/rlimit.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/rlimit.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -1,6 +1,6 @@
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
-@@ -47,6 +47,9 @@ __FBSDID("$FreeBSD$");
+@@ -47,6 +47,9 @@
#include <syslog.h>
#include <unistd.h>
Modified: trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff 2014-10-04 18:26:13 UTC (rev 5588)
+++ trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff 2014-10-04 18:39:58 UTC (rev 5589)
@@ -1,6 +1,6 @@
--- a/lib/libmemstat/memstat_uma.c
+++ b/lib/libmemstat/memstat_uma.c
-@@ -305,6 +305,7 @@ memstat_kvm_uma(struct memory_type_list
+@@ -305,6 +305,7 @@
char name[MEMTYPE_MAXNAME];
cpuset_t all_cpus;
long cpusetsize;
@@ -8,7 +8,7 @@
kvm_t *kvm;
kvm = (kvm_t *)kvm_handle;
-@@ -328,8 +329,9 @@ memstat_kvm_uma(struct memory_type_list
+@@ -328,8 +329,9 @@
list->mtl_error = ret;
return (-1);
}
More information about the Glibc-bsd-commits
mailing list