From c706461f10b6f86ed531618653d1074932e9d843 Mon Sep 17 00:00:00 2001 From: Zach Riggle Date: Wed, 28 Sep 2016 13:22:43 -0700 Subject: [PATCH 1/3] Add branch table --- CHANGELOG.md | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e71b22897..4e78dc4f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,36 +3,47 @@ This changelog only includes added major features and changes. Bugfixes and minor changes are omitted. -## 3.1.0 (October 1, 2016) +## Release History -**Currently on the _beta_ branch** +The table below shows which release corresponds to each branch, and what date the version was released. -A number of smaller bugfixes and documentation tweaks. +| Version | Branch | Release Date | +| ---------------- | -------- | ---------------------- | +| [3.2.0](#320) | `dev` | Nov 12, 2016 (planned) +| [3.1.0](#310) | `beta` | Oct 1, 2016 (planned) +| [3.0.4](#304) | `stable` | Sept 19, 2016 +| [3.0.3](#303) | | Sept 18, 2016 +| [3.0.2](#302) | | Sept 6, 2016 +| [3.0.1](#301) | | Aug 20, 2016 +| [3.0.0](#300) | | Aug 20, 2016 +| [2.2.0](#220) | | Jan 5, 2015 + +## 3.1.0 -## 3.0.4 (September 19, 2016) +A number of smaller bugfixes and documentation tweaks. -**Current release** +## 3.0.4 - Fixed a bug that made 3.0.3 uninstallable (Issue: #751, PR: #752) -## 3.0.3 (September 18, 2016, broken release) +## 3.0.3 - 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 - 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 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 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. @@ -68,7 +79,7 @@ Android support via a new `adb` module, `context.device`, `context.adb_host`, an - Added `context.noptrace` setting for disabling actions which require `ptrace` support. This is useful for turning all `gdb.debug` and `gdb.attach` options into no-ops, and can be set via the `NOPTRACE` magic command-line option. - Added `context.proxy` which hooks all connections and sends them to a SOCKS4/SOCKS5. This can be set via the `PROXY` magic command-line option. - Added `context.randomize` to control randommization of settings like XOR keys and register ordering (default off). -- Added `context.termianl` for setting how to launch commands in a new terminal. +- Added `context.terminal` for setting how to launch commands in a new terminal. #### DynELF and MemLeak Module @@ -131,7 +142,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 (January 5, 2015) +## 2.2.0 This was a large release with a lot of bugfixes and changes. Only the most significant are mentioned here. From eb92a95134794b1695bcdc3a890a0a14a2fcf097 Mon Sep 17 00:00:00 2001 From: Mathias Svensson Date: Sun, 2 Oct 2016 20:12:51 +0200 Subject: [PATCH 2/3] Release 3.1.0 --- CHANGELOG.md | 7 ++++--- pwnlib/version.py | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e78dc4f7..bb20980bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,10 @@ The table below shows which release corresponds to each branch, and what date th | Version | Branch | Release Date | | ---------------- | -------- | ---------------------- | -| [3.2.0](#320) | `dev` | Nov 12, 2016 (planned) -| [3.1.0](#310) | `beta` | Oct 1, 2016 (planned) -| [3.0.4](#304) | `stable` | Sept 19, 2016 +| [3.3.0](#320) | `dev` | Dec 24, 2016 (planned) +| [3.2.0](#320) | `beta` | Nov 12, 2016 (planned) +| [3.1.0](#310) | `stable` | Oct 2, 2016 +| [3.0.4](#304) | | Sept 19, 2016 | [3.0.3](#303) | | Sept 18, 2016 | [3.0.2](#302) | | Sept 6, 2016 | [3.0.1](#301) | | Aug 20, 2016 diff --git a/pwnlib/version.py b/pwnlib/version.py index 1075cbf18..7f5601d95 100644 --- a/pwnlib/version.py +++ b/pwnlib/version.py @@ -1 +1 @@ -__version__ = '3.1.0beta3' +__version__ = '3.1.0' diff --git a/setup.py b/setup.py index 8d87033f8..b989cf6c1 100644 --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ setup( name = 'pwntools', packages = find_packages(), - version = '3.1.0beta3', + version = '3.1.0', data_files = [('', glob.glob('*.md') + glob.glob('*.txt')), ], From fc097f344675469e228aa0869de2d2328a63963f Mon Sep 17 00:00:00 2001 From: Mathias Svensson Date: Sun, 2 Oct 2016 20:27:51 +0200 Subject: [PATCH 3/3] Fixed a link in the CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb20980bf..13d2e0bd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ The table below shows which release corresponds to each branch, and what date th | Version | Branch | Release Date | | ---------------- | -------- | ---------------------- | -| [3.3.0](#320) | `dev` | Dec 24, 2016 (planned) +| [3.3.0](#330) | `dev` | Dec 24, 2016 (planned) | [3.2.0](#320) | `beta` | Nov 12, 2016 (planned) | [3.1.0](#310) | `stable` | Oct 2, 2016 | [3.0.4](#304) | | Sept 19, 2016