[Glibc-bsd-commits] r4986 - in trunk/freebsd-libs/debian: . patches
Robert Millan
rmh at alioth.debian.org
Wed Oct 2 22:25:51 UTC 2013
Author: rmh
Date: 2013-10-02 22:25:51 +0000 (Wed, 02 Oct 2013)
New Revision: 4986
Removed:
trunk/freebsd-libs/debian/patches/no_kvm_uread_in_freebsd10.diff
trunk/freebsd-libs/debian/patches/preserve_libkvm_abi.diff
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/libcam6.symbols
trunk/freebsd-libs/debian/libsbuf6.symbols
trunk/freebsd-libs/debian/libusb2debian.symbols
trunk/freebsd-libs/debian/patches/04_libkvm.diff
trunk/freebsd-libs/debian/patches/cdefs_macros.diff
trunk/freebsd-libs/debian/patches/series
trunk/freebsd-libs/debian/rules
Log:
* New upstream release.
- Refresh all patches.
- Remove preserve_libkvm_abi.diff and no_kvm_uread_in_freebsd10.diff
(obsoleted by kvm_uread() re-addition in stable/9).
- Update symbols in libsbu6, libcam6 and libusb2debian.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/changelog 2013-10-02 22:25:51 UTC (rev 4986)
@@ -1,9 +1,16 @@
-freebsd-libs (9.1+ds1-4) UNRELEASED; urgency=low
+freebsd-libs (9.2-1) unstable; urgency=low
+ * New upstream release.
+ - Refresh all patches.
+ - Remove preserve_libkvm_abi.diff and no_kvm_uread_in_freebsd10.diff
+ (obsoleted by kvm_uread() re-addition in stable/9).
+ - Update symbols in libsbu6, libcam6 and libusb2debian.
+
+ [ Guillem Jover ]
* Create $(DESTDIR) on install-indep, otherwise dh_install with
--list-missing is unhappy (arguably a bug in debhelper).
- -- Guillem Jover <guillem at debian.org> Mon, 29 Jul 2013 12:28:44 +0200
+ -- Robert Millan <rmh at debian.org> Wed, 02 Oct 2013 23:28:58 +0200
freebsd-libs (9.1+ds1-3) unstable; urgency=low
Modified: trunk/freebsd-libs/debian/libcam6.symbols
===================================================================
--- trunk/freebsd-libs/debian/libcam6.symbols 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/libcam6.symbols 2013-10-02 22:25:51 UTC (rev 4986)
@@ -62,6 +62,9 @@
csio_encode at Base 7.0
csio_encode_visit at Base 7.0
num_cam_status_entries at Base 7.0
+ scsi_ata_identify at Base 9.2
+ scsi_ata_pass_16 at Base 9.2
+ scsi_ata_trim at Base 9.2
scsi_block_sbuf at Base 9.0
scsi_calc_syncparam at Base 7.0
scsi_calc_syncsrate at Base 7.0
@@ -70,12 +73,17 @@
scsi_command_string at Base 7.0
scsi_delay at Base 7.0
scsi_desc_iterate at Base 9.0
+ scsi_devid_is_lun_eui64 at Base 9.2
+ scsi_devid_is_lun_naa at Base 9.2
+ scsi_devid_is_lun_name at Base 9.2
+ scsi_devid_is_lun_t10 at Base 9.2
scsi_devid_is_naa_ieee_reg at Base 9.0
scsi_devid_is_sas_target at Base 9.0
scsi_devid_match at Base 9.0
scsi_erase at Base 7.0
scsi_error_action at Base 7.0
scsi_extract_sense at Base 9.0
+ scsi_extract_sense_ccb at Base 9.2
scsi_extract_sense_len at Base 9.0
scsi_find_desc at Base 9.0
scsi_format_unit at Base 7.0
Modified: trunk/freebsd-libs/debian/libsbuf6.symbols
===================================================================
--- trunk/freebsd-libs/debian/libsbuf6.symbols 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/libsbuf6.symbols 2013-10-02 22:25:51 UTC (rev 4986)
@@ -1,5 +1,6 @@
libsbuf.so.6 libsbuf6 #MINVER#
FBSD_1.2 at FBSD_1.2 9.0
+ FBSD_1.3 at FBSD_1.3 9.2
sbuf_bcat at FBSD_1.2 9.0
sbuf_bcpy at FBSD_1.2 9.0
sbuf_cat at FBSD_1.2 9.0
@@ -8,6 +9,7 @@
sbuf_data at FBSD_1.2 9.0
sbuf_delete at FBSD_1.2 9.0
sbuf_done at FBSD_1.2 9.0
+ sbuf_end_section at FBSD_1.3 9.2
sbuf_error at FBSD_1.2 9.0
sbuf_finish at FBSD_1.2 9.0
sbuf_len at FBSD_1.2 9.0
@@ -16,5 +18,6 @@
sbuf_putc at FBSD_1.2 9.0
sbuf_set_drain at FBSD_1.2 9.0
sbuf_setpos at FBSD_1.2 9.0
+ sbuf_start_section at FBSD_1.3 9.2
sbuf_trim at FBSD_1.2 9.0
sbuf_vprintf at FBSD_1.2 9.0
Modified: trunk/freebsd-libs/debian/libusb2debian.symbols
===================================================================
--- trunk/freebsd-libs/debian/libusb2debian.symbols 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/libusb2debian.symbols 2013-10-02 22:25:51 UTC (rev 4986)
@@ -43,6 +43,7 @@
libusb20_dev_get_parent_address at Base 8.3~
libusb20_dev_get_parent_port at Base 8.3~
libusb20_dev_get_power_mode at Base 7.1
+ libusb20_dev_get_power_usage at Base 9.2
libusb20_dev_get_speed at Base 7.1
libusb20_dev_kernel_driver_active at Base 7.1
libusb20_dev_open at Base 7.1
Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff 2013-10-02 22:25:51 UTC (rev 4986)
@@ -114,7 +114,7 @@
int cnt = 0;
struct kinfo_proc kinfo_proc, *kp;
struct pgrp pgrp;
-@@ -437,6 +438,8 @@
+@@ -439,6 +440,8 @@
++cnt;
}
return (cnt);
Modified: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff 2013-10-02 22:25:51 UTC (rev 4986)
@@ -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
-@@ -69,9 +69,9 @@
+@@ -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 *, ...)
Deleted: trunk/freebsd-libs/debian/patches/no_kvm_uread_in_freebsd10.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/no_kvm_uread_in_freebsd10.diff 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/patches/no_kvm_uread_in_freebsd10.diff 2013-10-02 22:25:51 UTC (rev 4986)
@@ -1,16 +0,0 @@
-
-See the comments in preserve_libkvm_abi.diff for an explanation
-
---- a/lib/libkvm/kvm_proc.c
-+++ b/lib/libkvm/kvm_proc.c
-@@ -720,6 +720,10 @@
- ssize_t amount;
- int fd;
-
-+#if __FreeBSD_version >= 1000000
-+#error "kvm_uread is not present in FreeBSD 10 ABI. Please remove preserve_libkvm_abi.diff"
-+#endif
-+
- if (!ISALIVE(kd)) {
- _kvm_err(kd, kd->program,
- "cannot read user space from dead kernel");
Deleted: trunk/freebsd-libs/debian/patches/preserve_libkvm_abi.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/preserve_libkvm_abi.diff 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/patches/preserve_libkvm_abi.diff 2013-10-02 22:25:51 UTC (rev 4986)
@@ -1,68 +0,0 @@
-
-rev 253166 from stable/9
-
-kvm_uread was accidentally removed in 9.1. Upstream decided to add it
-back in stable/9 to preserve 9.0 ABI, while bumping soname in HEAD at
-the same time.
-
-This patch (along with no_kvm_uread_in_freebsd10.diff) needs to be
-removed when we upgrade to 10.0 or 9.2, whichever comes first.
-
---- a/lib/libkvm/kvm_proc.c
-+++ b/lib/libkvm/kvm_proc.c
-@@ -704,3 +704,55 @@
- {
- return (kvm_argv(kd, kp, 1, nchr));
- }
-+
-+/*
-+ * Read from user space. The user context is given by p.
-+ */
-+ssize_t
-+kvm_uread(kvm_t *kd, const struct kinfo_proc *kp, u_long uva, char *buf,
-+ size_t len)
-+{
-+ char *cp;
-+ char procfile[MAXPATHLEN];
-+ ssize_t amount;
-+ int fd;
-+
-+ if (!ISALIVE(kd)) {
-+ _kvm_err(kd, kd->program,
-+ "cannot read user space from dead kernel");
-+ return (0);
-+ }
-+
-+ sprintf(procfile, "/proc/%d/mem", kp->ki_pid);
-+ fd = open(procfile, O_RDONLY, 0);
-+ if (fd < 0) {
-+ _kvm_err(kd, kd->program, "cannot open %s", procfile);
-+ return (0);
-+ }
-+
-+ cp = buf;
-+ while (len > 0) {
-+ errno = 0;
-+ if (lseek(fd, (off_t)uva, 0) == -1 && errno != 0) {
-+ _kvm_err(kd, kd->program, "invalid address (%lx) in %s",
-+ uva, procfile);
-+ break;
-+ }
-+ amount = read(fd, cp, len);
-+ if (amount < 0) {
-+ _kvm_syserr(kd, kd->program, "error reading %s",
-+ procfile);
-+ break;
-+ }
-+ if (amount == 0) {
-+ _kvm_err(kd, kd->program, "EOF reading %s", procfile);
-+ break;
-+ }
-+ cp += amount;
-+ uva += amount;
-+ len -= amount;
-+ }
-+
-+ close(fd);
-+ return ((ssize_t)(cp - buf));
-+}
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/patches/series 2013-10-02 22:25:51 UTC (rev 4986)
@@ -1,5 +1,4 @@
# Patches from (or merged in) upstream
-preserve_libkvm_abi.diff
#missing_static_decl.diff
# Patches that are in good shape for merging upstream
@@ -28,5 +27,4 @@
#elf.diff
# Patches that are likely to be Debian-specific
-no_kvm_uread_in_freebsd10.diff
libusb_pthread_condattr_setclock.diff
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2013-10-02 22:22:38 UTC (rev 4985)
+++ trunk/freebsd-libs/debian/rules 2013-10-02 22:25:51 UTC (rev 4986)
@@ -18,7 +18,6 @@
revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
CFLAGS = -Wall -g -pipe -fPIC -I. -I$(CURDIR)/sys -D_GNU_SOURCE \
- -D__va_list=__builtin_va_list \
-D__FreeBSD_version=__FreeBSD_kernel_version \
-I/usr/include/freebsd \
-Werror=implicit-function-declaration
More information about the Glibc-bsd-commits
mailing list