Merge pull request #2862 from suvari/master
libpcap: ver. bump to 1.8.1
This commit is contained in:
@@ -0,0 +1,29 @@
|
|||||||
|
Disable bits of remote capture support inherited from the WinPCAP merge
|
||||||
|
which cause applications to FTBFS if they define HAVE_REMOTE (#843384).
|
||||||
|
|
||||||
|
--- a/pcap/pcap.h
|
||||||
|
+++ b/pcap/pcap.h
|
||||||
|
@@ -506,6 +506,11 @@
|
||||||
|
#define MODE_STAT 1
|
||||||
|
#define MODE_MON 2
|
||||||
|
|
||||||
|
+#ifdef HAVE_REMOTE
|
||||||
|
+ /* Includes most of the public stuff that is needed for the remote capture */
|
||||||
|
+ #include <remote-ext.h>
|
||||||
|
+#endif /* HAVE_REMOTE */
|
||||||
|
+
|
||||||
|
#elif defined(MSDOS)
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -526,11 +531,6 @@
|
||||||
|
|
||||||
|
#endif /* _WIN32/MSDOS/UN*X */
|
||||||
|
|
||||||
|
-#ifdef HAVE_REMOTE
|
||||||
|
- /* Includes most of the public stuff that is needed for the remote capture */
|
||||||
|
- #include <remote-ext.h>
|
||||||
|
-#endif /* HAVE_REMOTE */
|
||||||
|
-
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<IsA>library</IsA>
|
<IsA>library</IsA>
|
||||||
<Summary>A system-independent library for user-level network packet capture</Summary>
|
<Summary>A system-independent library for user-level network packet capture</Summary>
|
||||||
<Description>libpcap (Packet CAPture) provides a portable framework for low-level network monitoring. Applications include network statistics collection, security monitoring, network debugging, etc.</Description>
|
<Description>libpcap (Packet CAPture) provides a portable framework for low-level network monitoring. Applications include network statistics collection, security monitoring, network debugging, etc.</Description>
|
||||||
<Archive sha1sum="3f31a7706c1487fca36b8379e511965a8d7cbd70" type="targz">http://www.tcpdump.org/release/libpcap-1.7.4.tar.gz</Archive>
|
<Archive sha1sum="32d7526dde8f8a2f75baf40c01670602aeef7e39" type="targz">http://www.tcpdump.org/release/libpcap-1.8.1.tar.gz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>bluez-libs-devel</Dependency>
|
<Dependency>bluez-libs-devel</Dependency>
|
||||||
<Dependency>libnl-devel</Dependency>
|
<Dependency>libnl-devel</Dependency>
|
||||||
@@ -23,6 +23,7 @@
|
|||||||
<!--<Patch>libpcap-1.1-cross-linux.patch</Patch>-->
|
<!--<Patch>libpcap-1.1-cross-linux.patch</Patch>-->
|
||||||
<!--<Patch level="1">libpcap-1.1.1-ignore-ENODEV.patch</Patch>-->
|
<!--<Patch level="1">libpcap-1.1.1-ignore-ENODEV.patch</Patch>-->
|
||||||
<Patch level="1">libpcap-1.7.4-enable_bluetooth-1.patch</Patch>
|
<Patch level="1">libpcap-1.7.4-enable_bluetooth-1.patch</Patch>
|
||||||
|
<Patch>disable-remote.diff</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -55,6 +56,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="3">
|
||||||
|
<Date>2016-06-09</Date>
|
||||||
|
<Version>1.8.1</Version>
|
||||||
|
<Comment>Version Bump</Comment>
|
||||||
|
<Name>Kamil Atlı</Name>
|
||||||
|
<Email>suvari@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="2">
|
<Update release="2">
|
||||||
<Date>2016-06-09</Date>
|
<Date>2016-06-09</Date>
|
||||||
<Version>1.7.4</Version>
|
<Version>1.7.4</Version>
|
||||||
@@ -70,4 +78,4 @@
|
|||||||
<Email>ertugrulerata@gmail.com</Email>
|
<Email>ertugrulerata@gmail.com</Email>
|
||||||
</Update>
|
</Update>
|
||||||
</History>
|
</History>
|
||||||
</PISI>
|
</PISI>
|
||||||
Reference in New Issue
Block a user