Control: tags -1 + patch
Control: affects -1 wireshark

Attached is a patch to build it with rpcapd support and the rpcapd
binary. I am mostly interested in getting wireshark built against it
because I am using network equipment (Lancom) which supports it as a
capturing protocol.
--- a/debian/control
+++ b/debian/control
@@ -67,3 +67,13 @@ Description: system interface for user-level packet capture
  functionality, the libpcap authors created this system-independent API
  to ease in porting and to alleviate the need for several
  system-dependent packet capture modules in each application.
+
+Package: rpcapd
+Section: net
+Architecture: linux-any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Remote packet capture daemon
+ rpcapd (Remote Packet CAPture Daemon) provides a server to capture directly
+ on a remote device while analyzing the capture on the local system.
diff --git a/debian/libpcap0.8t64.symbols b/debian/libpcap0.8t64.symbols
index 606fbcc4a087bc4accceefa23ed0e9ecd163e4ff..50745336a88c99507b66d233877ba4294d8f692e 100644
--- a/debian/libpcap0.8t64.symbols
+++ b/debian/libpcap0.8t64.symbols
@@ -13,6 +13,7 @@ libpcap.so.0.8 libpcap0.8t64 #MINVER#
  pcap_compile@Base 0.9.8
  pcap_compile_nopcap@Base 0.9.8
  pcap_create@Base 1.0.0
+ (arch=linux-any)pcap_createsrcstr@Base 1.10.5-2~
  pcap_datalink@Base 0.9.8
  pcap_datalink_ext@Base 1.0.0
  pcap_datalink_name_to_val@Base 0.9.8
@@ -34,6 +35,7 @@ libpcap.so.0.8 libpcap0.8t64 #MINVER#
  pcap_file@Base 0.9.8
  pcap_fileno@Base 0.9.8
  pcap_findalldevs@Base 0.9.8
+ (arch=linux-any)pcap_findalldevs_ex@Base 1.10.5-2~
  pcap_fopen_offline@Base 0.9.8
  pcap_fopen_offline_with_tstamp_precision@Base 1.5.1
  pcap_free_datalinks@Base 1.0.0
@@ -68,12 +70,19 @@ libpcap.so.0.8 libpcap0.8t64 #MINVER#
  pcap_next_etherent@Base 0.9.8
  pcap_next_ex@Base 0.9.8
  pcap_offline_filter@Base 1.0.0
+ (arch=linux-any)pcap_open@Base 1.10.5-2~
  pcap_open_dead@Base 0.9.8
  pcap_open_dead_with_tstamp_precision@Base 1.5.1
  pcap_open_live@Base 0.9.8
  pcap_open_offline@Base 0.9.8
  pcap_open_offline_with_tstamp_precision@Base 1.5.1
+ (arch=linux-any)pcap_parsesrcstr@Base 1.10.5-2~
  pcap_perror@Base 0.9.8
+ (arch=linux-any)pcap_remoteact_accept@Base 1.10.5-2~
+ (arch=linux-any)pcap_remoteact_accept_ex@Base 1.10.5-2~
+ (arch=linux-any)pcap_remoteact_cleanup@Base 1.10.5-2~
+ (arch=linux-any)pcap_remoteact_close@Base 1.10.5-2~
+ (arch=linux-any)pcap_remoteact_list@Base 1.10.5-2~
  pcap_sendpacket@Base 0.9.8
  pcap_set_buffer_size@Base 1.0.0
  pcap_set_datalink@Base 0.9.8
@@ -88,6 +97,7 @@ libpcap.so.0.8 libpcap0.8t64 #MINVER#
  pcap_setdirection@Base 0.9.8
  pcap_setfilter@Base 0.9.8
  pcap_setnonblock@Base 0.9.8
+ (arch=linux-any)pcap_setsampling@Base 1.10.5-2~
  pcap_snapshot@Base 0.9.8
  pcap_stats@Base 0.9.8
  pcap_statustostr@Base 1.0.0
diff --git a/debian/patches/shared-lib.diff b/debian/patches/shared-lib.diff
index 62d96dabc22b59d1f8aa8383de9a558d2cea425f..47fcd0aef1662733ecdcc7c795bceddfe4d1efd1 100644
--- a/debian/patches/shared-lib.diff
+++ b/debian/patches/shared-lib.diff
@@ -184,7 +184,7 @@ Forwarded: not-needed
  		    V_SONAME_OPT="-Wl,-soname,"
 --- /dev/null
 +++ b/libpcap-symbols.lds
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,118 @@
 +{
 +  global:
 +    bpf_dump;
@@ -214,6 +214,7 @@ Forwarded: not-needed
 +    pcap_file;
 +    pcap_fileno;
 +    pcap_findalldevs;
++    pcap_findalldevs_ex;
 +    pcap_fopen_offline;
 +    pcap_freealldevs;
 +    pcap_freecode;
@@ -244,11 +245,17 @@ Forwarded: not-needed
 +    pcap_open_live;
 +    pcap_open_offline;
 +    pcap_perror;
++    pcap_remoteact_accept;
++    pcap_remoteact_accept_ex;
++    pcap_remoteact_cleanup;
++    pcap_remoteact_close;
++    pcap_remoteact_list;
 +    pcap_sendpacket;
 +    pcap_set_datalink;
 +    pcap_setdirection;
 +    pcap_setfilter;
 +    pcap_setnonblock;
++    pcap_setsampling;
 +    pcap_snapshot;
 +    pcap_stats;
 +    pcap_statustostr;
@@ -257,9 +264,11 @@ Forwarded: not-needed
 +    /* introduced in pcap 1.0 */
 +    pcap_activate;
 +    pcap_create;
++    pcap_createsrcstr;
 +    pcap_datalink_ext;
 +    pcap_free_datalinks;
 +    pcap_offline_filter;
++    pcap_open;
 +    pcap_set_buffer_size;
 +    pcap_set_promisc;
 +    pcap_set_rfmon;
@@ -278,6 +287,7 @@ Forwarded: not-needed
 +    pcap_get_tstamp_precision;
 +    pcap_open_dead_with_tstamp_precision;
 +    pcap_open_offline_with_tstamp_precision;
++    pcap_parsesrcstr;
 +    pcap_fopen_offline_with_tstamp_precision;
 +    /* introduced in pcap 1.7 */
 +    pcap_dump_open_append;
diff --git a/debian/rpcapd.install b/debian/rpcapd.install
new file mode 100644
index 0000000000000000000000000000000000000000..0e5291064e8ee0921dc24310eae8c9a6e7139e0b
--- /dev/null
+++ b/debian/rpcapd.install
@@ -0,0 +1,3 @@
+usr/sbin/rpcapd
+usr/share/man/man5/rpcapd-config.5
+usr/share/man/man8/rpcapd.8
diff --git a/debian/rules b/debian/rules
index bde872cb4adf1b8b15ca634dbc980ef0f53a5b70..2e2812d65d8651924bb69182a96510b6bac73f12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ include /usr/share/dpkg/architecture.mk
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 export with_pcap=linux
+export enable_remote=yes
 endif
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
 export with_pcap=hurd
@@ -16,12 +17,15 @@ endif
 
 override_dh_install-arch:
 	dh_install
-	# Some man pages of interest to end users go into libpcap0.8
+	# Some man pages of interest to end users go into libpcap0.8t64 + rpcapd
 	# (see #527599, #1035661).
 	rm debian/libpcap0.8-dev/usr/share/man/man5/pcap-savefile.5
+	rm -f debian/libpcap0.8-dev/usr/share/man/man5/rpcapd-config.5
 	rmdir debian/libpcap0.8-dev/usr/share/man/man5
 	rm debian/libpcap0.8-dev/usr/share/man/man7/pcap-filter.7
 	rm debian/libpcap0.8-dev/usr/share/man/man7/pcap-tstamp.7
+	rm -f debian/libpcap0.8-dev/usr/share/man/man8/rpcapd.8
+	[ ! -d debian/libpcap0.8-dev/usr/share/man/man8 ] || rmdir debian/libpcap0.8-dev/usr/share/man/man8
 
 override_dh_strip-arch:
 	dh_strip --dbgsym-migration='libpcap0.8-dbg (<< 1.10.1-3~)'

Reply via email to