Skip to content

Commit

Permalink
Update to version 1.1.5
Browse files Browse the repository at this point in the history
* Add missing entries in changelog
* Update README
* Remove duplicate search path for OSX
  • Loading branch information
hellais committed Apr 22, 2016
1 parent f579535 commit e69c7cb
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 11 deletions.
24 changes: 22 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
pypcap-trunk:
pypcap-1.1.5:

- fix for immediate mode on linux (#12)

pypcap-1.1.4:

- fix for immediate mode on Mac OS X 10.10

pypcap-1.1.3:

- minor bugfixing

pypcap-1.1.2:

- setdirection() support - from Eddi Linder

- make it possible to install without pyrex

pypcap-1.1.1:

- honor 'immediate' flag to disable buffering under Windows - by Kosma Moczek

Expand All @@ -11,6 +29,8 @@ pypcap-trunk:

- findalldevs() support - by Bartosz Skowron

- better support for installing on Fedora, Ubuntu and Mac OS X

pypcap-1.1:

- better lookupdev() on win32, as requested by Zack Payton
Expand All @@ -24,7 +44,7 @@ pypcap-1.0:

- API CHANGE: require 'cnt' as first parameter to pcap.dispatch(),
shadowing libpcap pcap_dispatch().

- add pcap.{get,set}nonblock(), to work around broken BPF select()
on certain platforms (MacOS X, older FreeBSD, etc.).

Expand Down
15 changes: 10 additions & 5 deletions README
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Python pcap module
------------------

Expand All @@ -10,17 +9,23 @@ example use:
>>> import pcap
>>> for ts, pkt in pcap.pcap():
... print ts, `pkt`
...
...

Install
--------

easy_install pypcap
This package requires:

* libpcap-dev

* python-dev

To install run::

pip install pypcap


Support
-------

Visit http://code.google.com/p/pypcap for help!

Visit https://github.com/pynetwork/pypcap for help!
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ def recursive_search(path, target_files):
# A list of all the possible search directories
dirs = ['/usr', sys.prefix] + glob.glob('/opt/libpcap*') + \
glob.glob('../libpcap*') + glob.glob('../wpdpack*') + \
['/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/'] + \
glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*')
glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*')

for d in dirs:
# This makes sure that we first search inside of */include/pcap
Expand Down Expand Up @@ -104,10 +103,10 @@ def recursive_search(path, target_files):

setup(
name='pypcap',
version='1.1.4',
version='1.1.5',
author='Dug Song',
author_email='dugsong@monkey.org',
url='http://monkey.org/~dugsong/pypcap/',
url='https://github.com/pynetwork/pypcap',
description='packet capture library',
ext_modules=[pcap],
)

0 comments on commit e69c7cb

Please sign in to comment.