Merge branch 'stable' into beta

Add all MD and TXT files to binary distribution; include correct file…

.travis_install.sh

@@ -32,7 +32,7 @@ setup_travis()
     if [ ! -f usr/lib/libbfd-2.22-multiarch.so ];
     then
         # Install the multiarch binutils
-        local_deb_extract http://mirrors.mit.edu/ubuntu/ubuntu/pool/universe/b/binutils/binutils-multiarch_2.22-6ubuntu1_amd64.deb
+        local_deb_extract http://mirrors.mit.edu/ubuntu/pool/universe/b/binutils/binutils-multiarch_2.22-6ubuntu1_amd64.deb
         pushd usr/lib
         ln -sf libbfd-2.22-multiarch.so libbfd-2.22.so
         ln -sf libopcodes-2.22-multiarch.so libopcodes-2.22.so

CHANGELOG.md

@@ -3,24 +3,36 @@
 This changelog only includes added major features and changes. Bugfixes and
 minor changes are omitted.
 
-## 3.0.3 (September 18 2016)
+## 3.1.0 (October 1, 2016)
+
+**Currently on the _beta_ branch**
+
+A number of smaller bugfixes and documentation tweaks.
+
+## 3.0.4 (September 19, 2016)
+
+**Current release**
+
+- Fixed a bug that made 3.0.3 uninstallable (Issue: #751, PR: #752)
+
+## 3.0.3 (September 18, 2016, broken release)
 
 - Fixed some performance and usability problems with the update system (Issues:
   #723, #724, #736. PRs: #729, #738, #747).
 - Fixed a bug related to internals in pyelftools (PRs: #730, #746).
 - Fixed an issue with travis (Issue: #741, PRs: #743, #744, #745).
 
-## 3.0.2 (September 6 2016)
+## 3.0.2 (September 6, 2016)
 
 - Cherry-pick #695, as this was a regression-fix.
 - Added a fix for the update checker, as it would suggest prereleases as updates to stable releases.
 - Various documentation fixes.
 
-## 3.0.1 (August 20 2016)
+## 3.0.1 (August 20, 2016)
 
 A small bugfix release. There were a lot of references to the `master`-branch, however after 3.0.0 we use the names `stable`, `beta` and `dev` for our branches.
 
-## 3.0.0 (August 20 2016)
+## 3.0.0 (August 20, 2016)
 
 This was a large release (1305 commits since 2.2.0) with a lot of bugfixes and changes.  The Binjitsu project, a fork of Pwntools, was merged back into Pwntools.  As such, its features are now available here.
 
@@ -119,7 +131,7 @@ Android support via a new `adb` module, `context.device`, `context.adb_host`, an
 - Added a multi-threaded `bruteforce()` implementation, `mbruteforce()`.
 - Added `dealarm_shell()` helper to remove the effects of `alarm()` after you've popped a shell.
 
-## 2.2.0
+## 2.2.0 (January 5, 2015)
 
 This was a large release with a lot of bugfixes and changes. Only the most significant
 are mentioned here.

MANIFEST.in

@@ -1 +1,7 @@
-include *.txt
+graft examples
+graft extra
+include *.md *.txt *.sh *.yml MANIFEST.in
+recursive-include docs   *.rst *.png Makefile *.py *.txt
+recursive-include pwnlib *.py *.asm *.rst *.md *.txt *.sh
+recursive-include pwn    *.py *.asm *.rst *.md *.txt *.sh
+recursive-exclude *.pyc

pwnlib/update.py

@@ -45,7 +45,7 @@ def available_on_github(prerelease=current_version.is_prerelease):
     url = 'https://api.github.com/repos/%s/tags' % package_repo
 
     with context.quiet:
-        tags = json.loads(wget(url))
+        tags = json.loads(wget(url, timeout = 60))
 
     # 'pwntools-ancient' is a tag, but not a valid version.
     # Handle this here, and for all potential tags which cause

pwnlib/version.py

@@ -1 +1 @@
-__version__ = '3.0.3'
+__version__ = '3.1.0beta3'

setup.py

@@ -75,10 +75,9 @@ except ImportError:
 setup(
     name                 = 'pwntools',
     packages             = find_packages(),
-    version              = '3.0.3',
+    version              = '3.1.0beta3',
     data_files           = [('',
-                             ['LICENSE-pwntools.txt',
-                             ]),
+                             glob.glob('*.md') + glob.glob('*.txt')),
                             ],
     package_data         = {
         'pwnlib': [