[Glibc-bsd-commits] r5337 - in trunk/freebsd-libs/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Wed Jan 15 16:39:59 UTC 2014
Author: rmh
Date: 2014-01-15 16:39:59 +0000 (Wed, 15 Jan 2014)
New Revision: 5337
Added:
trunk/freebsd-libs/debian/libkvm6.install
trunk/freebsd-libs/debian/libkvm6.symbols
trunk/freebsd-libs/debian/libusb3-udeb.install
trunk/freebsd-libs/debian/libusb3.install
trunk/freebsd-libs/debian/libusb3.symbols
Removed:
trunk/freebsd-libs/debian/libkvm0.install
trunk/freebsd-libs/debian/libkvm0.symbols
trunk/freebsd-libs/debian/libusb2debian-udeb.install
trunk/freebsd-libs/debian/libusb2debian.install
trunk/freebsd-libs/debian/libusb2debian.symbols
trunk/freebsd-libs/debian/patches/missing_static_decl.diff
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/libcam6.symbols
trunk/freebsd-libs/debian/libutil-freebsd-9.symbols
trunk/freebsd-libs/debian/patches/12_usb.diff
trunk/freebsd-libs/debian/patches/cdefs_macros.diff
trunk/freebsd-libs/debian/patches/elf.diff
trunk/freebsd-libs/debian/patches/libbsd_nlist.diff
trunk/freebsd-libs/debian/patches/libusb_backward.diff
trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff
trunk/freebsd-libs/debian/patches/makefiles.diff
trunk/freebsd-libs/debian/patches/series
trunk/freebsd-libs/debian/rules
Log:
* New upstream release.
- Refresh all patches.
- Remove missing_static_decl.diff (merged).
- Bump SONAME in libusb (2debian -> 3) and libkvm (0 -> 6).
- Update symbol list in libcam, libkvm, libusb and libutil.
- B-D on freebsd-mk (>= 10.0-2~) and kfreebsd-kernel-headers
(>= 10.0~2).
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/changelog 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1,11 +1,20 @@
-freebsd-libs (9.2+ds3-1) UNRELEASED; urgency=low
+freebsd-libs (10.0-1) UNRELEASED; urgency=low
+ * New upstream release.
+ - Refresh all patches.
+ - Remove missing_static_decl.diff (merged).
+ - Bump SONAME in libusb (2debian -> 3) and libkvm (0 -> 6).
+ - Update symbol list in libcam, libkvm, libusb and libutil.
+ - B-D on freebsd-mk (>= 10.0-2~) and kfreebsd-kernel-headers
+ (>= 10.0~2).
+
+ [ Robert Millan ]
* Fetch source code securely (https) in get-orig-source.
* Leave -lbsdxml untouched (latest freebsd-glue supports it).
* Make libipx available on all architectures.
* Correctly setup BSD version of MAKEFLAGS to support parallel builds.
- -- Robert Millan <rmh at debian.org> Sat, 07 Dec 2013 23:22:56 +0100
+ -- Robert Millan <rmh at debian.org> Wed, 15 Jan 2014 16:21:42 +0100
freebsd-libs (9.2+ds2-2) unstable; urgency=low
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/control 2014-01-15 16:39:59 UTC (rev 5337)
@@ -5,10 +5,11 @@
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Robert Millan <rmh at debian.org>
Build-Depends: debhelper (>= 7), pkg-config,
freebsd-buildutils (>= 9.0-3~),
+ freebsd-mk (>= 10.0-2~),
libbsd-dev (>= 0.3.0),
libc0.1-dev (>= 2.13-31) [kfreebsd-any],
libgdbm-dev [kfreebsd-any],
- kfreebsd-kernel-headers (>= 9.2~5) [kfreebsd-any],
+ kfreebsd-kernel-headers (>= 10.0~2) [kfreebsd-any],
# libexpat-dev: aka bsdxml. needed by libgeom
libexpat-dev [kfreebsd-any],
# libncurses5-dev: needed by libalias
@@ -167,7 +168,7 @@
This package contains the header files and static library needed to
compile applications that use libusbhid.
-Package: libusb2debian
+Package: libusb3
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: FreeBSD userspace USB programming library
@@ -177,7 +178,7 @@
Package: libusb2-dev
Section: libdevel
Architecture: kfreebsd-any
-Depends: libusb2debian (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
+Depends: libusb3 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
Provides: libusb-1.0-0-dev
Conflicts: libusb-dev
Description: Development files for libusb2
@@ -187,7 +188,7 @@
It should be API compatible with both libusb-1.0 and libusb-0.1
used on Linux.
-Package: libusb2debian-udeb
+Package: libusb3-udeb
Package-Type: udeb
Section: debian-installer
Architecture: kfreebsd-any
@@ -198,7 +199,7 @@
.
This is a minimal package for use in debian-installer.
-Package: libkvm0
+Package: libkvm6
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: FreeBSD kvm (kernel memory interface) library
@@ -208,7 +209,7 @@
Package: libkvm-dev
Section: libdevel
Architecture: kfreebsd-any
-Depends: libkvm0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev,
+Depends: libkvm6 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev,
kfreebsd-kernel-headers (>= 0.81),
Description: Development files for libkvm
This package contains the header files and static library needed to
Modified: trunk/freebsd-libs/debian/libcam6.symbols
===================================================================
--- trunk/freebsd-libs/debian/libcam6.symbols 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/libcam6.symbols 2014-01-15 16:39:59 UTC (rev 5337)
@@ -21,6 +21,7 @@
ata_pm_read_cmd at Base 8.2
ata_pm_write_cmd at Base 8.2
ata_print_ident at Base 8.2
+ ata_print_ident_short at Base 10.0
ata_res_sbuf at Base 8.2
ata_res_string at Base 8.2
ata_reset_cmd at Base 8.2
@@ -110,6 +111,7 @@
scsi_prevent at Base 7.0
scsi_progress_sbuf at Base 9.0
scsi_print_inquiry at Base 7.0
+ scsi_print_inquiry_short at Base 10.0
scsi_read_block_limits at Base 7.0
scsi_read_buffer at Base 9.1
scsi_read_capacity at Base 7.0
@@ -123,6 +125,7 @@
scsi_reserve_release_unit at Base 7.0
scsi_rewind at Base 7.0
scsi_sa_read_write at Base 7.0
+ scsi_sanitize at Base 10.0
scsi_send_diagnostic at Base 9.0
scsi_sense_block_sbuf at Base 9.0
scsi_sense_command_sbuf at Base 9.0
@@ -157,6 +160,7 @@
scsi_write_filemarks at Base 7.0
scsi_write_same at Base 9.1
semb_print_ident at Base 9.1
+ semb_print_ident_short at Base 10.0
semb_read_buffer at Base 9.1
semb_receive_diagnostic_results at Base 9.1
semb_send_diagnostic at Base 9.1
Deleted: trunk/freebsd-libs/debian/libkvm0.install
===================================================================
--- trunk/freebsd-libs/debian/libkvm0.install 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/libkvm0.install 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1 +0,0 @@
-lib/libkvm*.so.*
Deleted: trunk/freebsd-libs/debian/libkvm0.symbols
===================================================================
--- trunk/freebsd-libs/debian/libkvm0.symbols 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/libkvm0.symbols 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1,36 +0,0 @@
-libkvm.so.0 libkvm0 #MINVER#
- kvm_close at Base 7.0
- kvm_dpcpu_setcpu at Base 8.3~
- kvm_getargv at Base 7.0
- kvm_getcptime at Base 7.1
- kvm_getenvv at Base 7.0
- kvm_geterr at Base 7.0
- kvm_getfiles at Base 7.0
- kvm_getloadavg at Base 7.0
- kvm_getmaxcpu at Base 7.1
- kvm_getpcpu at Base 7.1
- kvm_getprocs at Base 7.0
- kvm_getswapinfo at Base 7.0
- kvm_nlist at Base 7.0
- kvm_open at Base 7.0
- kvm_openfiles at Base 7.0
- kvm_read at Base 7.0
- kvm_uread at Base 7.0
- kvm_write at Base 7.0
- (optional)_kvm_dpcpu_initialized at Base 8.3~
- (optional)_kvm_dpcpu_validaddr at Base 8.3~
- (optional)_kvm_err at Base 7.0
- (optional)_kvm_freeprocs at Base 7.0
- (optional)_kvm_freevtop at Base 7.0
- (optional)_kvm_initvtop at Base 7.0
- (optional)_kvm_kvatop at Base 7.0
- (optional)_kvm_malloc at Base 7.0
- (optional)_kvm_minidump_freevtop at Base 7.0
- (optional)_kvm_minidump_initvtop at Base 7.0
- (optional)_kvm_minidump_kvatop at Base 7.0
- (optional)_kvm_nlist at Base 7.1
- (optional)_kvm_realloc at Base 7.0
- (optional)_kvm_syserr at Base 7.0
- (optional)_kvm_vnet_initialized at Base 7.1
- (optional)_kvm_vnet_selectpid at Base 7.1
- (optional)_kvm_vnet_validaddr at Base 7.1
Copied: trunk/freebsd-libs/debian/libkvm6.install (from rev 5330, trunk/freebsd-libs/debian/libkvm0.install)
===================================================================
--- trunk/freebsd-libs/debian/libkvm6.install (rev 0)
+++ trunk/freebsd-libs/debian/libkvm6.install 2014-01-15 16:39:59 UTC (rev 5337)
@@ -0,0 +1 @@
+lib/libkvm*.so.*
Copied: trunk/freebsd-libs/debian/libkvm6.symbols (from rev 5330, trunk/freebsd-libs/debian/libkvm0.symbols)
===================================================================
--- trunk/freebsd-libs/debian/libkvm6.symbols (rev 0)
+++ trunk/freebsd-libs/debian/libkvm6.symbols 2014-01-15 16:39:59 UTC (rev 5337)
@@ -0,0 +1,37 @@
+libkvm.so.6 libkvm6 #MINVER#
+ kvm_close at Base 7.0
+ kvm_counter_u64_fetch at Base 10.0
+ kvm_dpcpu_setcpu at Base 8.3~
+ kvm_getargv at Base 7.0
+ kvm_getcptime at Base 7.1
+ kvm_getenvv at Base 7.0
+ kvm_geterr at Base 7.0
+ kvm_getfiles at Base 7.0
+ kvm_getloadavg at Base 7.0
+ kvm_getmaxcpu at Base 7.1
+ kvm_getpcpu at Base 7.1
+ kvm_getprocs at Base 7.0
+ kvm_getswapinfo at Base 7.0
+ kvm_nlist at Base 7.0
+ kvm_open at Base 7.0
+ kvm_openfiles at Base 7.0
+ kvm_read at Base 7.0
+ kvm_read_zpcpu at Base 10.0
+ kvm_write at Base 7.0
+ (optional)_kvm_dpcpu_initialized at Base 8.3~
+ (optional)_kvm_dpcpu_validaddr at Base 8.3~
+ (optional)_kvm_err at Base 7.0
+ (optional)_kvm_freeprocs at Base 7.0
+ (optional)_kvm_freevtop at Base 7.0
+ (optional)_kvm_initvtop at Base 7.0
+ (optional)_kvm_kvatop at Base 7.0
+ (optional)_kvm_malloc at Base 7.0
+ (optional)_kvm_minidump_freevtop at Base 7.0
+ (optional)_kvm_minidump_initvtop at Base 7.0
+ (optional)_kvm_minidump_kvatop at Base 7.0
+ (optional)_kvm_nlist at Base 7.1
+ (optional)_kvm_realloc at Base 7.0
+ (optional)_kvm_syserr at Base 7.0
+ (optional)_kvm_vnet_initialized at Base 7.1
+ (optional)_kvm_vnet_selectpid at Base 7.1
+ (optional)_kvm_vnet_validaddr at Base 7.1
Deleted: trunk/freebsd-libs/debian/libusb2debian-udeb.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2debian-udeb.install 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/libusb2debian-udeb.install 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1 +0,0 @@
-lib/libusb.so.*
Deleted: trunk/freebsd-libs/debian/libusb2debian.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2debian.install 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/libusb2debian.install 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1 +0,0 @@
-lib/libusb.so.*
Deleted: trunk/freebsd-libs/debian/libusb2debian.symbols
===================================================================
--- trunk/freebsd-libs/debian/libusb2debian.symbols 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/libusb2debian.symbols 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1,210 +0,0 @@
-libusb.so.2debian libusb2debian #MINVER#
- LIBUSB20_BOS_DESCRIPTOR_FORMAT at Base 9.1
- LIBUSB20_CONFIG_DESC_FORMAT at Base 7.1
- LIBUSB20_CONTROL_SETUP_FORMAT at Base 7.1
- LIBUSB20_DEVICE_DESC_FORMAT at Base 7.1
- LIBUSB20_ENDPOINT_DESC_FORMAT at Base 7.1
- LIBUSB20_INTERFACE_DESC_FORMAT at Base 7.1
- LIBUSB20_SS_ENDPT_COMP_DESC_FORMAT at Base 9.1
- LIBUSB20_SS_USB_DEVCAP_DESC_FORMAT at Base 9.1
- LIBUSB20_USB_20_DEVCAP_DESC_FORMAT at Base 9.1
- libusb20_be_add_dev_quirk at Base 7.1
- libusb20_be_alloc at Base 7.1
- libusb20_be_alloc_default at Base 7.1
- libusb20_be_alloc_linux at Base 7.1
- libusb20_be_alloc_ugen20 at Base 7.1
- libusb20_be_dequeue_device at Base 7.1
- libusb20_be_device_foreach at Base 7.1
- libusb20_be_enqueue_device at Base 7.1
- libusb20_be_free at Base 7.1
- libusb20_be_get_dev_quirk at Base 7.1
- libusb20_be_get_quirk_name at Base 7.1
- libusb20_be_get_template at Base 7.1
- libusb20_be_remove_dev_quirk at Base 7.1
- libusb20_be_set_template at Base 7.1
- libusb20_desc_foreach at Base 7.1
- libusb20_dev_alloc at Base 7.1
- libusb20_dev_alloc_config at Base 7.1
- libusb20_dev_check_connected at Base 7.1
- libusb20_dev_close at Base 7.1
- libusb20_dev_detach_kernel_driver at Base 7.1
- libusb20_dev_free at Base 7.1
- libusb20_dev_get_address at Base 7.1
- libusb20_dev_get_backend_name at Base 7.1
- libusb20_dev_get_bus_number at Base 7.1
- libusb20_dev_get_config_index at Base 7.1
- libusb20_dev_get_debug at Base 7.1
- libusb20_dev_get_desc at Base 7.1
- libusb20_dev_get_device_desc at Base 7.1
- libusb20_dev_get_fd at Base 7.1
- libusb20_dev_get_iface_desc at Base 7.1
- libusb20_dev_get_info at Base 7.1
- libusb20_dev_get_mode at Base 7.1
- 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
- libusb20_dev_process at Base 7.1
- libusb20_dev_req_string_simple_sync at Base 7.1
- libusb20_dev_req_string_sync at Base 7.1
- libusb20_dev_request_sync at Base 7.1
- libusb20_dev_reset at Base 7.1
- libusb20_dev_set_alt_index at Base 7.1
- libusb20_dev_set_config_index at Base 7.1
- libusb20_dev_set_debug at Base 7.1
- libusb20_dev_set_power_mode at Base 7.1
- libusb20_dev_wait_process at Base 7.1
- libusb20_error_name at Base 8.3~
- libusb20_me_decode at Base 7.1
- libusb20_me_encode at Base 7.1
- libusb20_me_get_1 at Base 7.1
- libusb20_me_get_2 at Base 7.1
- libusb20_parse_config_desc at Base 7.1
- libusb20_strerror at Base 8.3~
- libusb20_tr_bulk_intr_sync at Base 7.1
- libusb20_tr_callback_wrapper at Base 7.1
- libusb20_tr_clear_stall_sync at Base 7.1
- libusb20_tr_close at Base 7.1
- libusb20_tr_drain at Base 7.1
- libusb20_tr_get_actual_frames at Base 7.1
- libusb20_tr_get_actual_length at Base 7.1
- libusb20_tr_get_length at Base 7.1
- libusb20_tr_get_max_frames at Base 7.1
- libusb20_tr_get_max_packet_length at Base 7.1
- libusb20_tr_get_max_total_length at Base 7.1
- libusb20_tr_get_pointer at Base 7.1
- libusb20_tr_get_priv_sc0 at Base 7.1
- libusb20_tr_get_priv_sc1 at Base 7.1
- libusb20_tr_get_status at Base 7.1
- libusb20_tr_get_time_complete at Base 7.1
- libusb20_tr_open at Base 7.1
- libusb20_tr_pending at Base 7.1
- libusb20_tr_set_buffer at Base 7.1
- libusb20_tr_set_callback at Base 7.1
- libusb20_tr_set_flags at Base 7.1
- libusb20_tr_set_length at Base 7.1
- libusb20_tr_set_priv_sc0 at Base 7.1
- libusb20_tr_set_priv_sc1 at Base 7.1
- libusb20_tr_set_timeout at Base 7.1
- libusb20_tr_set_total_frames at Base 7.1
- libusb20_tr_setup_bulk at Base 7.1
- libusb20_tr_setup_control at Base 7.1
- libusb20_tr_setup_intr at Base 7.1
- libusb20_tr_setup_isoc at Base 7.1
- libusb20_tr_start at Base 7.1
- libusb20_tr_stop at Base 7.1
- libusb20_tr_submit at Base 7.1
- libusb20_ugen20_backend at Base 7.1
- libusb_alloc_transfer at Base 7.1
- libusb_attach_kernel_driver at Base 7.1
- libusb_bulk_transfer at Base 7.1
- libusb_cancel_transfer at Base 7.1
- libusb_check_connected at Base 8.2
- libusb_claim_interface at Base 7.1
- libusb_clear_halt at Base 7.1
- libusb_close at Base 7.1
- libusb_control_transfer at Base 7.1
- libusb_control_transfer_get_data at Base 7.1
- libusb_control_transfer_get_setup at Base 7.1
- libusb_cpu_to_le16 at Base 7.1
- libusb_detach_kernel_driver at Base 7.1
- libusb_detach_kernel_driver_np at Base 8.2
- libusb_error_name at Base 8.3~
- libusb_event_handler_active at Base 7.1
- libusb_event_handling_ok at Base 7.1
- libusb_exit at Base 7.1
- libusb_fill_bulk_transfer at Base 7.1
- libusb_fill_control_setup at Base 7.1
- libusb_fill_control_transfer at Base 7.1
- libusb_fill_interrupt_transfer at Base 7.1
- libusb_fill_iso_transfer at Base 7.1
- libusb_free_bos_descriptor at Base 9.1
- libusb_free_config_descriptor at Base 7.1
- libusb_free_device_list at Base 7.1
- libusb_free_ss_endpoint_comp at Base 9.1
- libusb_free_transfer at Base 7.1
- libusb_get_active_config_descriptor at Base 7.1
- libusb_get_bus_number at Base 7.1
- libusb_get_config_descriptor at Base 7.1
- libusb_get_config_descriptor_by_value at Base 7.1
- libusb_get_configuration at Base 7.1
- libusb_get_descriptor at Base 7.1
- libusb_get_device at Base 7.1
- libusb_get_device_address at Base 7.1
- libusb_get_device_descriptor at Base 7.1
- libusb_get_device_list at Base 7.1
- libusb_get_device_speed at Base 8.3~
- libusb_get_driver at Base 8.2
- libusb_get_driver_np at Base 8.2
- libusb_get_iso_packet_buffer at Base 7.1
- libusb_get_iso_packet_buffer_simple at Base 7.1
- libusb_get_max_iso_packet_size at Base 9.1
- libusb_get_max_packet_size at Base 7.1
- libusb_get_next_timeout at Base 7.1
- libusb_get_pollfds at Base 7.1
- libusb_get_string_descriptor_ascii at Base 7.1
- libusb_handle_events at Base 7.1
- libusb_handle_events_locked at Base 7.1
- libusb_handle_events_timeout at Base 7.1
- libusb_init at Base 7.1
- libusb_interrupt_transfer at Base 7.1
- libusb_kernel_driver_active at Base 7.1
- libusb_le16_to_cpu at Base 7.1
- libusb_lock_events at Base 7.1
- libusb_lock_event_waiters at Base 7.1
- libusb_open at Base 7.1
- libusb_open_device_with_vid_pid at Base 7.1
- libusb_parse_bos_descriptor at Base 9.1
- libusb_parse_ss_endpoint_comp at Base 9.1
- libusb_ref_device at Base 7.1
- libusb_release_interface at Base 7.1
- libusb_reset_device at Base 7.1
- libusb_set_configuration at Base 7.1
- libusb_set_debug at Base 7.1
- libusb_set_interface_alt_setting at Base 7.1
- libusb_set_iso_packet_lengths at Base 7.1
- libusb_set_pollfd_notifiers at Base 7.1
- libusb_submit_transfer at Base 7.1
- libusb_strerror at Base 8.2
- libusb_try_lock_events at Base 7.1
- libusb_unlock_events at Base 7.1
- libusb_unlock_event_waiters at Base 7.1
- libusb_unref_device at Base 7.1
- libusb_wait_for_event at Base 7.1
- usbi_default_context at Base 7.1
- usb_bulk_read at Base 7.1
- usb_bulk_write at Base 7.1
- usb_busses at Base 7.1
- usb_check_connected at Base 8.2
- usb_claim_interface at Base 7.1
- usb_clear_halt at Base 7.1
- usb_close at Base 7.1
- usb_control_msg at Base 7.1
- usb_destroy_configuration at Base 7.1
- usb_detach_kernel_driver_np at Base 8.3~
- usb_device at Base 7.1
- usb_fetch_and_parse_descriptors at Base 7.1
- usb_find_busses at Base 7.1
- usb_find_devices at Base 7.1
- usb_get_busses at Base 7.1
- usb_get_descriptor at Base 7.1
- usb_get_descriptor_by_endpoint at Base 7.1
- usb_get_driver_np at Base 8.3~
- usb_get_string at Base 7.1
- usb_get_string_simple at Base 7.1
- usb_init at Base 7.1
- usb_interrupt_read at Base 7.1
- usb_interrupt_write at Base 7.1
- usb_open at Base 7.1
- usb_parse_configuration at Base 7.1
- usb_parse_descriptor at Base 7.1
- usb_release_interface at Base 7.1
- usb_reset at Base 7.1
- usb_resetep at Base 7.1
- usb_set_altinterface at Base 7.1
- usb_set_configuration at Base 7.1
- usb_set_debug at Base 7.1
- usb_strerror at Base 7.1
Copied: trunk/freebsd-libs/debian/libusb3-udeb.install (from rev 5330, trunk/freebsd-libs/debian/libusb2debian-udeb.install)
===================================================================
--- trunk/freebsd-libs/debian/libusb3-udeb.install (rev 0)
+++ trunk/freebsd-libs/debian/libusb3-udeb.install 2014-01-15 16:39:59 UTC (rev 5337)
@@ -0,0 +1 @@
+lib/libusb.so.*
Copied: trunk/freebsd-libs/debian/libusb3.install (from rev 5330, trunk/freebsd-libs/debian/libusb2debian.install)
===================================================================
--- trunk/freebsd-libs/debian/libusb3.install (rev 0)
+++ trunk/freebsd-libs/debian/libusb3.install 2014-01-15 16:39:59 UTC (rev 5337)
@@ -0,0 +1 @@
+lib/libusb.so.*
Copied: trunk/freebsd-libs/debian/libusb3.symbols (from rev 5330, trunk/freebsd-libs/debian/libusb2debian.symbols)
===================================================================
--- trunk/freebsd-libs/debian/libusb3.symbols (rev 0)
+++ trunk/freebsd-libs/debian/libusb3.symbols 2014-01-15 16:39:59 UTC (rev 5337)
@@ -0,0 +1,215 @@
+libusb.so.3 libusb3 #MINVER#
+ LIBUSB20_BOS_DESCRIPTOR_FORMAT at Base 9.1
+ LIBUSB20_CONFIG_DESC_FORMAT at Base 7.1
+ LIBUSB20_CONTROL_SETUP_FORMAT at Base 7.1
+ LIBUSB20_DEVICE_DESC_FORMAT at Base 7.1
+ LIBUSB20_ENDPOINT_DESC_FORMAT at Base 7.1
+ LIBUSB20_INTERFACE_DESC_FORMAT at Base 7.1
+ LIBUSB20_SS_ENDPT_COMP_DESC_FORMAT at Base 9.1
+ LIBUSB20_SS_USB_DEVCAP_DESC_FORMAT at Base 9.1
+ LIBUSB20_USB_20_DEVCAP_DESC_FORMAT at Base 9.1
+ libusb20_be_add_dev_quirk at Base 7.1
+ libusb20_be_alloc at Base 7.1
+ libusb20_be_alloc_default at Base 7.1
+ libusb20_be_alloc_linux at Base 7.1
+ libusb20_be_alloc_ugen20 at Base 7.1
+ libusb20_be_dequeue_device at Base 7.1
+ libusb20_be_device_foreach at Base 7.1
+ libusb20_be_enqueue_device at Base 7.1
+ libusb20_be_free at Base 7.1
+ libusb20_be_get_dev_quirk at Base 7.1
+ libusb20_be_get_quirk_name at Base 7.1
+ libusb20_be_get_template at Base 7.1
+ libusb20_be_remove_dev_quirk at Base 7.1
+ libusb20_be_set_template at Base 7.1
+ libusb20_desc_foreach at Base 7.1
+ libusb20_dev_alloc at Base 7.1
+ libusb20_dev_alloc_config at Base 7.1
+ libusb20_dev_check_connected at Base 7.1
+ libusb20_dev_close at Base 7.1
+ libusb20_dev_detach_kernel_driver at Base 7.1
+ libusb20_dev_free at Base 7.1
+ libusb20_dev_get_address at Base 7.1
+ libusb20_dev_get_backend_name at Base 7.1
+ libusb20_dev_get_bus_number at Base 7.1
+ libusb20_dev_get_config_index at Base 7.1
+ libusb20_dev_get_debug at Base 7.1
+ libusb20_dev_get_desc at Base 7.1
+ libusb20_dev_get_device_desc at Base 7.1
+ libusb20_dev_get_fd at Base 7.1
+ libusb20_dev_get_iface_desc at Base 7.1
+ libusb20_dev_get_info at Base 7.1
+ libusb20_dev_get_mode at Base 7.1
+ libusb20_dev_get_parent_address at Base 8.3~
+ libusb20_dev_get_parent_port at Base 8.3~
+ libusb20_dev_get_port_path at Base 10.0
+ 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
+ libusb20_dev_process at Base 7.1
+ libusb20_dev_req_string_simple_sync at Base 7.1
+ libusb20_dev_req_string_sync at Base 7.1
+ libusb20_dev_request_sync at Base 7.1
+ libusb20_dev_reset at Base 7.1
+ libusb20_dev_set_alt_index at Base 7.1
+ libusb20_dev_set_config_index at Base 7.1
+ libusb20_dev_set_debug at Base 7.1
+ libusb20_dev_set_power_mode at Base 7.1
+ libusb20_dev_wait_process at Base 7.1
+ libusb20_error_name at Base 8.3~
+ libusb20_me_decode at Base 7.1
+ libusb20_me_encode at Base 7.1
+ libusb20_me_get_1 at Base 7.1
+ libusb20_me_get_2 at Base 7.1
+ libusb20_parse_config_desc at Base 7.1
+ libusb20_strerror at Base 8.3~
+ libusb20_tr_bulk_intr_sync at Base 7.1
+ libusb20_tr_callback_wrapper at Base 7.1
+ libusb20_tr_clear_stall_sync at Base 7.1
+ libusb20_tr_close at Base 7.1
+ libusb20_tr_drain at Base 7.1
+ libusb20_tr_get_actual_frames at Base 7.1
+ libusb20_tr_get_actual_length at Base 7.1
+ libusb20_tr_get_length at Base 7.1
+ libusb20_tr_get_max_frames at Base 7.1
+ libusb20_tr_get_max_packet_length at Base 7.1
+ libusb20_tr_get_max_total_length at Base 7.1
+ libusb20_tr_get_pointer at Base 7.1
+ libusb20_tr_get_priv_sc0 at Base 7.1
+ libusb20_tr_get_priv_sc1 at Base 7.1
+ libusb20_tr_get_status at Base 7.1
+ libusb20_tr_get_time_complete at Base 7.1
+ libusb20_tr_open at Base 7.1
+ libusb20_tr_open_stream at Base 10.0
+ libusb20_tr_pending at Base 7.1
+ libusb20_tr_set_buffer at Base 7.1
+ libusb20_tr_set_callback at Base 7.1
+ libusb20_tr_set_flags at Base 7.1
+ libusb20_tr_set_length at Base 7.1
+ libusb20_tr_set_priv_sc0 at Base 7.1
+ libusb20_tr_set_priv_sc1 at Base 7.1
+ libusb20_tr_set_timeout at Base 7.1
+ libusb20_tr_set_total_frames at Base 7.1
+ libusb20_tr_setup_bulk at Base 7.1
+ libusb20_tr_setup_control at Base 7.1
+ libusb20_tr_setup_intr at Base 7.1
+ libusb20_tr_setup_isoc at Base 7.1
+ libusb20_tr_start at Base 7.1
+ libusb20_tr_stop at Base 7.1
+ libusb20_tr_submit at Base 7.1
+ libusb20_ugen20_backend at Base 7.1
+ libusb_alloc_transfer at Base 7.1
+ libusb_attach_kernel_driver at Base 7.1
+ libusb_bulk_transfer at Base 7.1
+ libusb_cancel_transfer at Base 7.1
+ libusb_check_connected at Base 8.2
+ libusb_claim_interface at Base 7.1
+ libusb_clear_halt at Base 7.1
+ libusb_close at Base 7.1
+ libusb_control_transfer at Base 7.1
+ libusb_control_transfer_get_data at Base 7.1
+ libusb_control_transfer_get_setup at Base 7.1
+ libusb_cpu_to_le16 at Base 7.1
+ libusb_detach_kernel_driver at Base 7.1
+ libusb_detach_kernel_driver_np at Base 8.2
+ libusb_error_name at Base 8.3~
+ libusb_event_handler_active at Base 7.1
+ libusb_event_handling_ok at Base 7.1
+ libusb_exit at Base 7.1
+ libusb_fill_bulk_transfer at Base 7.1
+ libusb_fill_control_setup at Base 7.1
+ libusb_fill_control_transfer at Base 7.1
+ libusb_fill_interrupt_transfer at Base 7.1
+ libusb_fill_iso_transfer at Base 7.1
+ libusb_free_bos_descriptor at Base 9.1
+ libusb_free_config_descriptor at Base 7.1
+ libusb_free_device_list at Base 7.1
+ libusb_free_ss_endpoint_comp at Base 9.1
+ libusb_free_transfer at Base 7.1
+ libusb_get_active_config_descriptor at Base 7.1
+ libusb_get_bus_number at Base 7.1
+ libusb_get_config_descriptor at Base 7.1
+ libusb_get_config_descriptor_by_value at Base 7.1
+ libusb_get_configuration at Base 7.1
+ libusb_get_descriptor at Base 7.1
+ libusb_get_device at Base 7.1
+ libusb_get_device_address at Base 7.1
+ libusb_get_device_descriptor at Base 7.1
+ libusb_get_device_list at Base 7.1
+ libusb_get_device_speed at Base 8.3~
+ libusb_get_driver at Base 8.2
+ libusb_get_driver_np at Base 8.2
+ libusb_get_iso_packet_buffer at Base 7.1
+ libusb_get_iso_packet_buffer_simple at Base 7.1
+ libusb_get_max_iso_packet_size at Base 9.1
+ libusb_get_max_packet_size at Base 7.1
+ libusb_get_next_timeout at Base 7.1
+ libusb_get_pollfds at Base 7.1
+ libusb_get_port_numbers at Base 10.0
+ libusb_get_port_path at Base 10.0
+ libusb_get_string_descriptor at Base 10.0
+ libusb_get_string_descriptor_ascii at Base 7.1
+ libusb_handle_events at Base 7.1
+ libusb_handle_events_locked at Base 7.1
+ libusb_handle_events_timeout at Base 7.1
+ libusb_init at Base 7.1
+ libusb_interrupt_transfer at Base 7.1
+ libusb_kernel_driver_active at Base 7.1
+ libusb_le16_to_cpu at Base 7.1
+ libusb_lock_events at Base 7.1
+ libusb_lock_event_waiters at Base 7.1
+ libusb_open at Base 7.1
+ libusb_open_device_with_vid_pid at Base 7.1
+ libusb_parse_bos_descriptor at Base 9.1
+ libusb_parse_ss_endpoint_comp at Base 9.1
+ libusb_ref_device at Base 7.1
+ libusb_release_interface at Base 7.1
+ libusb_reset_device at Base 7.1
+ libusb_set_configuration at Base 7.1
+ libusb_set_debug at Base 7.1
+ libusb_set_interface_alt_setting at Base 7.1
+ libusb_set_iso_packet_lengths at Base 7.1
+ libusb_set_pollfd_notifiers at Base 7.1
+ libusb_submit_transfer at Base 7.1
+ libusb_strerror at Base 8.2
+ libusb_try_lock_events at Base 7.1
+ libusb_unlock_events at Base 7.1
+ libusb_unlock_event_waiters at Base 7.1
+ libusb_unref_device at Base 7.1
+ libusb_wait_for_event at Base 7.1
+ usbi_default_context at Base 7.1
+ usb_bulk_read at Base 7.1
+ usb_bulk_write at Base 7.1
+ usb_busses at Base 7.1
+ usb_check_connected at Base 8.2
+ usb_claim_interface at Base 7.1
+ usb_clear_halt at Base 7.1
+ usb_close at Base 7.1
+ usb_control_msg at Base 7.1
+ usb_destroy_configuration at Base 7.1
+ usb_detach_kernel_driver_np at Base 8.3~
+ usb_device at Base 7.1
+ usb_fetch_and_parse_descriptors at Base 7.1
+ usb_find_busses at Base 7.1
+ usb_find_devices at Base 7.1
+ usb_get_busses at Base 7.1
+ usb_get_descriptor at Base 7.1
+ usb_get_descriptor_by_endpoint at Base 7.1
+ usb_get_driver_np at Base 8.3~
+ usb_get_string at Base 7.1
+ usb_get_string_simple at Base 7.1
+ usb_init at Base 7.1
+ usb_interrupt_read at Base 7.1
+ usb_interrupt_write at Base 7.1
+ usb_open at Base 7.1
+ usb_parse_configuration at Base 7.1
+ usb_parse_descriptor at Base 7.1
+ usb_release_interface at Base 7.1
+ usb_reset at Base 7.1
+ usb_resetep at Base 7.1
+ usb_set_altinterface at Base 7.1
+ usb_set_configuration at Base 7.1
+ usb_set_debug at Base 7.1
+ usb_strerror at Base 7.1
Modified: trunk/freebsd-libs/debian/libutil-freebsd-9.symbols
===================================================================
--- trunk/freebsd-libs/debian/libutil-freebsd-9.symbols 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/libutil-freebsd-9.symbols 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1,9 +1,11 @@
libutil-freebsd.so.9 libutil-freebsd-9 #MINVER#
_secure_path at Base 9.2
+ auth_getval at Base 10.0
crypt_set_format at Base 9.2
expand_number at Base 9.2
flopen at Base 9.2
fparseln at Base 9.2
+ gr_add at Base 10.0
gr_copy at Base 9.2
gr_dup at Base 9.2
gr_equal at Base 9.2
Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1,29 +1,28 @@
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
-@@ -19,7 +19,7 @@
- WARNS?= 2
+@@ -21,6 +21,7 @@
DPADD= ${LIBPTHREAD}
--LDADD= -lpthread
-+LDADD+= -lpthread -lrt -lbsd
+ LDADD= ${PTHREAD_LIBS}
++LDADD+= -lrt -lbsd
MLINKS+= libusb.3 usb.3
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
-@@ -29,6 +29,7 @@
-
+@@ -31,6 +31,7 @@
+ #include <stdint.h>
#include <sys/time.h>
#include <sys/types.h>
+#include <stdint.h>
+ #endif
#ifdef __cplusplus
- extern "C" {
--- a/lib/libusb/libusb20_desc.h
+++ b/lib/libusb/libusb20_desc.h
-@@ -45,6 +45,8 @@
- #ifndef _LIBUSB20_DESC_H_
- #define _LIBUSB20_DESC_H_
+@@ -49,6 +49,8 @@
+ #include <stdint.h>
+ #endif
+#include <stdint.h>
+
Modified: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff 2014-01-15 16:39:59 UTC (rev 5337)
@@ -44,7 +44,7 @@
int NgRecvMsg(int, struct ng_mesg *, size_t, char *);
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
-@@ -242,7 +242,7 @@
+@@ -245,7 +245,7 @@
uint8_t bSynchAddress;
uint8_t *extra;
int extra_length;
@@ -53,7 +53,7 @@
typedef struct libusb_ss_endpoint_companion_descriptor {
uint8_t bLength;
-@@ -250,7 +250,7 @@
+@@ -253,7 +253,7 @@
uint8_t bMaxBurst;
uint8_t bmAttributes;
uint16_t wBytesPerInterval;
@@ -62,7 +62,7 @@
typedef struct libusb_interface_descriptor {
uint8_t bLength;
-@@ -265,12 +265,12 @@
+@@ -268,12 +268,12 @@
struct libusb_endpoint_descriptor *endpoint;
uint8_t *extra;
int extra_length;
@@ -77,7 +77,7 @@
typedef struct libusb_config_descriptor {
uint8_t bLength;
-@@ -284,7 +284,7 @@
+@@ -287,7 +287,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;
-@@ -292,7 +292,7 @@
+@@ -295,7 +295,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;
-@@ -308,7 +308,7 @@
+@@ -311,7 +311,7 @@
uint8_t bFunctionalitySupport;
uint8_t bU1DevExitLat;
uint16_t wU2DevExitLat;
@@ -104,7 +104,7 @@
typedef struct libusb_bos_descriptor {
uint8_t bLength;
-@@ -317,7 +317,7 @@
+@@ -320,7 +320,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;
-@@ -333,7 +333,7 @@
+@@ -336,7 +336,7 @@
uint32_t length;
uint32_t actual_length;
enum libusb_transfer_status status;
@@ -122,8 +122,8 @@
typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
-@@ -352,7 +352,7 @@
- void *os_priv;
+@@ -354,7 +354,7 @@
+ uint8_t *buffer;
int num_iso_packets;
struct libusb_iso_packet_descriptor iso_packet_desc[0];
-} libusb_transfer __aligned(sizeof(void *));
@@ -133,7 +133,7 @@
--- a/lib/libusb/libusb20_desc.h
+++ b/lib/libusb/libusb20_desc.h
-@@ -98,7 +98,7 @@
+@@ -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 */
-@@ -120,7 +120,7 @@
+@@ -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)
-@@ -557,7 +557,7 @@
+@@ -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;
-@@ -566,14 +566,14 @@
+@@ -570,14 +570,14 @@
struct libusb20_endpoint *endpoints;
uint8_t num_altsetting;
uint8_t num_endpoints;
Modified: trunk/freebsd-libs/debian/patches/elf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/elf.diff 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/patches/elf.diff 2014-01-15 16:39:59 UTC (rev 5337)
@@ -8,7 +8,7 @@
SRCS= elf_begin.c \
elf_cntl.c \
-@@ -158,6 +158,8 @@
+@@ -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/libbsd_nlist.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libbsd_nlist.diff 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/patches/libbsd_nlist.diff 2014-01-15 16:39:59 UTC (rev 5337)
@@ -8,7 +8,7 @@
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
- #include <sys/_types.h>
+ #include <sys/types.h>
-#include <nlist.h>
+#include <bsd/nlist.h>
Modified: trunk/freebsd-libs/debian/patches/libusb_backward.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libusb_backward.diff 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/patches/libusb_backward.diff 2014-01-15 16:39:59 UTC (rev 5337)
@@ -3,17 +3,6 @@
some commits which hadn't made it to 9.0-RELEASE were MFC'ed to
8.3-STABLE, adding new symbols. Upgrading to 9.0 removed them.
---- a/lib/libusb/Makefile
-+++ b/lib/libusb/Makefile
-@@ -5,7 +5,7 @@
- #
-
- LIB= usb
--SHLIB_MAJOR= 2
-+SHLIB_MAJOR= 2debian
- SHLIB_MINOR= 0
- SRCS= libusb20.c
- SRCS+= libusb20_desc.c
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -5,7 +5,7 @@
Modified: trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1,8 +1,8 @@
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
-@@ -37,6 +37,11 @@
- #include <stdlib.h>
- #include <unistd.h>
+@@ -43,6 +43,11 @@
+ #include <sys/endian.h>
+ #endif
+/* Set the clock selected for the conditon variable attribute ATTR. */
+extern int pthread_condattr_setclock (pthread_condattr_t *__attr,
Modified: trunk/freebsd-libs/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff 2014-01-15 16:39:59 UTC (rev 5337)
@@ -19,7 +19,7 @@
MLINKS+= \
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
-@@ -5,18 +5,22 @@
+@@ -5,15 +5,11 @@
.include <bsd.own.mk>
@@ -27,7 +27,7 @@
+LIB= util-freebsd
SHLIB_MAJOR= 9
- SRCS= _secure_path.c expand_number.c flopen.c fparseln.c gr_util.c \
+ SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
- hexdump.c humanize_number.c kinfo_getfile.c kinfo_getfile.c \
- kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c kld.c \
- login_auth.c login_cap.c \
@@ -37,22 +37,26 @@
stub.c trimdomain.c uucplock.c
INCS= libutil.h login_cap.h
-+SYS!= dpkg-architecture -qDEB_HOST_GNU_SYSTEM
-+.if ${SYS} == "kfreebsd-gnu"
+@@ -25,6 +21,14 @@
+
+ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
+
++OS!= dpkg-architecture -qDEB_HOST_GNU_SYSTEM
++.if ${OS} == "kfreebsd-gnu"
+SRCS+= login_cap.c login_class.c \
+ pidfile.c
+.endif
+
-+LDADD= -lbsd -lfreebsd-glue
++LDADD= -lbsd -lfreebsd-glue
+
- CFLAGS+= -DLIBC_SCCS
-
- .if ${MK_INET6_SUPPORT} != "no"
+ MAN+= expand_number.3 flopen.3 fparseln.3 hexdump.3 \
+ humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
+ kinfo_getproc.3 kinfo_getvmmap.3 kld.3 login_auth.3 login_cap.3 \
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
-@@ -4,6 +4,7 @@
- LIB= kvm
+@@ -5,6 +5,7 @@
SHLIBDIR?= /lib
+ SHLIB_MAJOR= 6
CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
+LDADD= -lbsd -lfreebsd-glue
@@ -71,3 +75,14 @@
WARNS?= 2
.include <bsd.lib.mk>
+--- a/lib/libelf/Makefile
++++ b/lib/libelf/Makefile
+@@ -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.
+ #
+-SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h
++#SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h
+
+ GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c
+ CLEANFILES= ${GENSRCS}
Deleted: trunk/freebsd-libs/debian/patches/missing_static_decl.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/missing_static_decl.diff 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/patches/missing_static_decl.diff 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1,27 +0,0 @@
-
-From rev 241720 in HEAD
-
-_libdwarf_errors made it into public ABI before this patch.
-
---- a/lib/libdwarf/dwarf_errmsg.c
-+++ b/lib/libdwarf/dwarf_errmsg.c
-@@ -29,7 +29,7 @@
- #include <stdio.h>
- #include "_libdwarf.h"
-
--const char *_libdwarf_errors[] = {
-+static const char *_libdwarf_errors[] = {
- #define DEFINE_ERROR(N,S) [DWARF_E_##N] = S
- DEFINE_ERROR(NONE, "No Error"),
- DEFINE_ERROR(ERROR, "An error"),
---- a/lib/libelf/elf_errmsg.c
-+++ b/lib/libelf/elf_errmsg.c
-@@ -36,7 +36,7 @@
- * Retrieve a human readable translation for an error message.
- */
-
--const char *_libelf_errors[] = {
-+static const char *_libelf_errors[] = {
- #define DEFINE_ERROR(N,S) [ELF_E_##N] = S
- DEFINE_ERROR(NONE, "No Error"),
- DEFINE_ERROR(ARCHIVE, "Malformed ar(1) archive"),
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/patches/series 2014-01-15 16:39:59 UTC (rev 5337)
@@ -1,5 +1,4 @@
# Patches from (or merged in) upstream
-missing_static_decl.diff
# Patches that are in good shape for merging upstream
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2014-01-15 16:34:55 UTC (rev 5336)
+++ trunk/freebsd-libs/debian/rules 2014-01-15 16:39:59 UTC (rev 5337)
@@ -12,7 +12,7 @@
full_version := $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
tar_version := $(shell echo $(full_version) | sed -e 's/-.*//g')
-svn_revision := $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g')
+svn_revision := $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
version := $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
major := $(shell echo $(version) | sed -e 's/\..*//g')
revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
@@ -69,7 +69,7 @@
sys/sys/sbuf.h \
sys/netipx/ipx.h \
share/misc/usb_hid_usages ; do \
- svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
+ svn export -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/$$i ; \
done
# Remove unused files with non GPL compatible license (eg BSD 4 clauses)
rm -f $(ORIGDIR)/sys/cam/scsi/scsi_ch.*
@@ -291,7 +291,7 @@
dh_makeshlibs -plibgeom1 --add-udeb=libgeom1-udeb
dh_makeshlibs -plibipx2 --add-udeb=libipx2-udeb
dh_makeshlibs -plibsbuf6 --add-udeb=libsbuf6-udeb
- dh_makeshlibs -plibusb2debian --add-udeb=libusb2debian-udeb
+ dh_makeshlibs -plibusb3 --add-udeb=libusb3-udeb
endif
dh_installdeb -a
dh_shlibdeps -a
More information about the Glibc-bsd-commits
mailing list