CVS commit: pkgsrc/net/libpcap

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/libpcap
From: "Maya Rashish" <maya%netbsd.org@localhost>
Date: Thu, 2 Feb 2017 18:46:39 +0000

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Feb  2 18:46:39 UTC 2017

Modified Files:
        pkgsrc/net/libpcap: Makefile PLIST distinfo
        pkgsrc/net/libpcap/patches: patch-ac

Log Message:
libpcap: update to 1.8.1

Tuesday, Oct. 25, 2016 mcr%sandelman.ca@localhost
  Summary for 1.8.1 libpcap release
    Add a target in Makefile.in for Exuberant Ctags use: 'extags'.
    Rename configure.in to configure.ac: autoconf 2.59
    Clean up the name-to-DLT mapping table.
    Add some newer DLT_ values: IPMI_HPM_2,ZWAVE_R1_R2,ZWAVE_R3,WATTSTOPPER_DLM,ISO_14443,RDS
    Clarify what the return values are for both success and failure.
    Many changes to build on windows
    Check for the "break the loop" condition in the inner loop for TPACKET_V3.
    Fix handling of packet count in the TPACKET_V3 inner loop: GitHub issue #493.
    Filter out duplicate looped back CAN frames.
    Fix the handling of loopback filters for IPv6 packets.
    Add a link-layer header type for RDS (IEC 62106) groups.
    Use different intermediate folders for x86 and x64 builds on Windows.
    On Linux, handle all CAN captures with pcap-linux.c, in cooked mode.
    Removes the need for the "host-endian" link-layer header type.
    Compile with '-Wused-but-marked-unused' in devel mode if supported
    Have separate DLTs for big-endian and host-endian SocketCAN headers.
    Reflect version.h being renamed to pcap_version.h.
    Require that version.h be generated: all build procedures we support generate version.h (autoconf, CMake, MSVC)!
    Properly check for sock_recv() errors.
    Re-impose some of Winsock's limitations on sock_recv().
    Replace sprintf() with pcap_snprintf().
    Fix signature of pcap_stats_ex_remote().
    Initial cmake support for remote packet capture.
    Have rpcap_remoteact_getsock() return a SOCKET and supply an "is active" flag.
    Clean up {DAG, Septel, Myricom SNF}-only builds.
    Do UTF-16-to-ASCII conversion into the right place.
    pcap_create_interface() needs the interface name on Linux.
    Clean up hardware time stamp support: the "any" device does not support any time stamp types.
    Add support for capturing on FreeBSD usbusN interfaces.
    Add a LINKTYPE/DLT_ value for FreeBSD USB.
    Go back to using PCAP_API on Windows.
    CMake support
    Add TurboCap support from WinPcap.
    Recognize 802.1ad nested VLAN tag in vlan filter.

Thursday Sep. 3, 2015 guy%alum.mit.edu@localhost
  Summary for 1.7.5 libpcap release
        Man page cleanups.
        Add some allocation failure checks.
        Fix a number of Linux/ucLinux configure/build issues.
        Fix some memory leaks.
        Recognize 802.1ad nested VLAN tag in vlan filter.
        Fix building Bluetooth Linux Monitor support with BlueZ 5.1+


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/net/libpcap/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/libpcap/PLIST
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/libpcap/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/libpcap/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/libpcap/Makefile
diff -u pkgsrc/net/libpcap/Makefile:1.62 pkgsrc/net/libpcap/Makefile:1.63
--- pkgsrc/net/libpcap/Makefile:1.62    Tue Mar  8 12:53:34 2016
+++ pkgsrc/net/libpcap/Makefile Thu Feb  2 18:46:39 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2016/03/08 12:53:34 adam Exp $
+# $NetBSD: Makefile,v 1.63 2017/02/02 18:46:39 maya Exp $
 
-DISTNAME=      libpcap-1.7.4
+DISTNAME=      libpcap-1.8.1
 CATEGORIES=    net
 MASTER_SITES=  http://www.tcpdump.org/release/
 

Index: pkgsrc/net/libpcap/PLIST
diff -u pkgsrc/net/libpcap/PLIST:1.12 pkgsrc/net/libpcap/PLIST:1.13
--- pkgsrc/net/libpcap/PLIST:1.12       Wed Mar 11 21:05:09 2015
+++ pkgsrc/net/libpcap/PLIST    Thu Feb  2 18:46:39 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2015/03/11 21:05:09 tnn Exp $
+@comment $NetBSD: PLIST,v 1.13 2017/02/02 18:46:39 maya Exp $
 bin/pcap-config
 include/pcap-bpf.h
 include/pcap-int.h
@@ -6,6 +6,9 @@ include/pcap-namedb.h
 include/pcap.h
 include/pcap/bluetooth.h
 include/pcap/bpf.h
+include/pcap/can_socketcan.h
+include/pcap/dlt.h
+include/pcap/export-defs.h
 include/pcap/ipnet.h
 include/pcap/namedb.h
 include/pcap/nflog.h

Index: pkgsrc/net/libpcap/distinfo
diff -u pkgsrc/net/libpcap/distinfo:1.32 pkgsrc/net/libpcap/distinfo:1.33
--- pkgsrc/net/libpcap/distinfo:1.32    Thu Feb 11 05:55:19 2016
+++ pkgsrc/net/libpcap/distinfo Thu Feb  2 18:46:39 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.32 2016/02/11 05:55:19 jklos Exp $
+$NetBSD: distinfo,v 1.33 2017/02/02 18:46:39 maya Exp $
 
-SHA1 (libpcap-1.7.4.tar.gz) = 3f31a7706c1487fca36b8379e511965a8d7cbd70
-RMD160 (libpcap-1.7.4.tar.gz) = aae0e8fd1aa3273bda2212b6df8f50d3f7161ffc
-SHA512 (libpcap-1.7.4.tar.gz) = 83c55aa4173a90e8080a63dc6f0faeb4339d5def998abb9a578f08210c1784a1787ac6975f8bd27b02f8854dd18f03a23c1cd5fa611f46247090b2cc13943cf9
-Size (libpcap-1.7.4.tar.gz) = 663021 bytes
-SHA1 (patch-ac) = a096a4d6c59e855b88dc421b85445aee389a93d9
+SHA1 (libpcap-1.8.1.tar.gz) = 32d7526dde8f8a2f75baf40c01670602aeef7e39
+RMD160 (libpcap-1.8.1.tar.gz) = 295766ab2646c05c330aa04cabc30c5737200279
+SHA512 (libpcap-1.8.1.tar.gz) = bff5ff53fe53324f423e38eb4062c3fbb9125f86ca90d5e88aca9f0b3da72bc0acc6221c022b0f88cb3f000267580719119824c388da545c6f35117660cbb53b
+Size (libpcap-1.8.1.tar.gz) = 739163 bytes
+SHA1 (patch-ac) = c83749e249d8127267045b323f077d93acff54a7
 SHA1 (patch-ad) = ea818a5fb146488f909483d96d943941ea1873e4
 SHA1 (patch-configure) = 36557d7db9f09467fc9699b96d96c4c49173246b

Index: pkgsrc/net/libpcap/patches/patch-ac
diff -u pkgsrc/net/libpcap/patches/patch-ac:1.10 pkgsrc/net/libpcap/patches/patch-ac:1.11
--- pkgsrc/net/libpcap/patches/patch-ac:1.10    Sat Oct 17 10:07:54 2015
+++ pkgsrc/net/libpcap/patches/patch-ac Thu Feb  2 18:46:39 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.10 2015/10/17 10:07:54 adam Exp $
+$NetBSD: patch-ac,v 1.11 2017/02/02 18:46:39 maya Exp $
 
 Add libtoolization
 Fix manpage installation
@@ -14,7 +14,7 @@ Fix manpage installation
  AR = @AR@
  LN_S = @LN_S@
  MKDEP = @MKDEP@
-@@ -80,7 +80,8 @@ YACC = @V_YACC@
+@@ -75,7 +75,8 @@ YACC = @YACC@
  # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
  # Also, gcc does not remove the .o before forking 'as', which can be a
  # problem if you don't own the file but can write to the directory.
@@ -24,8 +24,8 @@ Fix manpage installation
        @rm -f $@
        $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
  
-@@ -91,13 +92,13 @@ CSRC =     pcap.c inet.c gencode.c optimize.
-       savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
+@@ -86,13 +87,13 @@ CSRC =     pcap.c inet.c fad-helpers.c genco
+       etherent.c savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
        bpf_image.c bpf_dump.c
  GENSRC = scanner.c grammar.c bpf_filter.c version.c
 -LIBOBJS = @LIBOBJS@
@@ -41,8 +41,8 @@ Fix manpage installation
        pcap.h \
        pcap-bpf.h \
 @@ -358,12 +359,10 @@ EXTRA_DIST = \
-       Win32/Src/inet_net.c \
-       Win32/Src/inet_pton.c
+       Win32/Prj/wpcap.vcxproj \
+       Win32/Prj/wpcap.vcxproj.filters
  
 -all: libpcap.a shared pcap-config
 +all: libpcap.la pcap-config
@@ -56,27 +56,30 @@ Fix manpage installation
  
  shared: libpcap.$(DYEXT)
  
-@@ -450,10 +449,10 @@ scanner.c: $(srcdir)/scanner.l
-       cat $(srcdir)/$@.top $@.bottom > $@
-       @rm $@.bottom
+@@ -452,10 +451,10 @@ scanner.h: scanner.c
+               $(MAKE) $(MAKEFLAGS) scanner.c; \
+       fi
  
--scanner.o: scanner.c tokdefs.h
-+scanner.lo: scanner.c tokdefs.h
+-scanner.o: scanner.c grammar.h
++scanner.lo: scanner.c grammar.h
        $(CC) $(FULL_CFLAGS) -c scanner.c
  
--pcap.o: version.h
-+pcap.lo: version.h
+-pcap.o: pcap_version.h
++pcap.lo: pcap_version.h
  
- tokdefs.h: grammar.c
  grammar.c: $(srcdir)/grammar.y
-@@ -462,17 +461,17 @@ grammar.c: $(srcdir)/grammar.y
-       mv y.tab.c grammar.c
-       mv y.tab.h tokdefs.h
+       $(YACC) -p pcap_ -o grammar.c -d $<
+@@ -466,19 +465,19 @@ grammar.h: grammar.c
+               $(MAKE) $(MAKEFLAGS) grammar.c; \
+       fi
  
 -grammar.o: grammar.c
 +grammar.lo: grammar.c
-       @rm -f $@
-       $(CC) $(FULL_CFLAGS) -Dyylval=pcap_lval -c grammar.c
+       $(CC) $(FULL_CFLAGS) -c grammar.c
+ 
+-gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
++gencode.lo: $(srcdir)/gencode.c grammar.h scanner.h
+       $(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c
  
 -version.o: version.c
 +version.lo: version.c
@@ -86,21 +89,12 @@ Fix manpage installation
 +snprintf.lo: $(srcdir)/missing/snprintf.c
        $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
  
--version.c: $(srcdir)/VERSION
-+version.c: #$(srcdir)/VERSION
-       @rm -f $@
-       if grep GIT ${srcdir}/VERSION >/dev/null; then \
-               read ver <${srcdir}/VERSION; \
-@@ -489,7 +488,7 @@ version.c: $(srcdir)/VERSION
- # so we make the version string static and return it from
- # a function, which does work.
- #
--version.h: $(srcdir)/VERSION
-+version.h: #$(srcdir)/VERSION
-       @rm -f $@
-       if grep GIT ${srcdir}/VERSION >/dev/null; then \
-               read ver <${srcdir}/VERSION; \
-@@ -503,7 +502,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
+-strtok_r.o: $(srcdir)/missing/strtok_r.c
++strtok_r.lo: $(srcdir)/missing/strtok_r.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strtok_r.c
+ 
+ version.c: $(srcdir)/VERSION $(srcdir)/gen_version_c.sh
+@@ -498,7 +497,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
        rm -f bpf_filter.c
        ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
  
@@ -109,7 +103,7 @@ Fix manpage installation
        $(CC) $(FULL_CFLAGS) -c bpf_filter.c
  
  #
-@@ -549,7 +548,7 @@ selpolltest: tests/selpolltest.c libpcap
+@@ -550,7 +549,7 @@ selpolltest: tests/selpolltest.c libpcap
  valgrindtest: tests/valgrindtest.c libpcap.a
        $(CC) $(FULL_CFLAGS) -I. -L. -o valgrindtest $(srcdir)/tests/valgrindtest.c libpcap.a $(LIBS)
  
@@ -118,7 +112,7 @@ Fix manpage installation
        [ -d $(DESTDIR)$(libdir) ] || \
            (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
        [ -d $(DESTDIR)$(includedir) ] || \
-@@ -564,56 +563,73 @@ install: install-shared install-archive 
+@@ -565,56 +564,73 @@ install: install-shared install-archive 
            (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
        [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
            (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
@@ -232,3 +226,40 @@ Fix manpage installation
        for i in $(MANFILE); do \
                $(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
                    $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
+@@ -656,15 +672,15 @@ install-shared-shareda: libpcap.shareda
+ install-shared-none:
+ 
+ install-archive: install-archive-$(DYEXT)
+-install-archive-so install-archive-dylib install-archive-sl install-archive-none: libpcap.a
++install-archive-so install-archive-dylib install-archive-sl install-archive-none: libpcap.la
+       #
+       # Most platforms have separate suffixes for shared and
+       # archive libraries, so we install both.
+       #
+       [ -d $(DESTDIR)$(libdir) ] || \
+           (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+-      $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
+-      $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
++      $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)/libpcap.la
++      $(RANLIB) $(DESTDIR)$(libdir)/libpcap.la
+ install-archive-shareda:
+       #
+       # AIX, however, doesn't, so we don't install the archive
+@@ -672,7 +688,7 @@ install-archive-shareda:
+       #
+ 
+ uninstall: uninstall-shared
+-      rm -f $(DESTDIR)$(libdir)/libpcap.a
++      rm -f $(DESTDIR)$(libdir)/libpcap.la
+       for i in $(PUBHDR); do \
+               rm -f $(DESTDIR)$(includedir)/$$i; done
+       -rmdir $(DESTDIR)$(includedir)/pcap
+@@ -720,7 +736,7 @@ uninstall-shared-sl:
+       rm -f $(DESTDIR)$(libdir)/libpcap.$$MAJOR_VER; \
+       rm -f $(DESTDIR)$(libdir)/libpcap.sl
+ uninstall-shared-shareda:
+-      rm -f $(DESTDIR)$(libdir)/libpcap.a
++      rm -f $(DESTDIR)$(libdir)/libpcap.la
+ uninstall-shared-none:
+ 
+ clean:

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index