From 24992c0f0818076f0b7afe68e7d7644c73cfa084 Mon Sep 17 00:00:00 2001 From: "David A. Wheeler" Date: Sat, 2 Sep 2017 20:46:45 -0400 Subject: [PATCH] Update version to 2.0.4 My upload intended for pypitest appears to have gone to pypi instead. To eliminate confusion, I'm bumping the version number so that any single version number always refers to exactly one program version. This was done with: sed -i.bak -e 's/2\.0\.3/2.0.4/g' \ ChangeLog correct-results.* flawfinder makefile setup.py Signed-off-by: David A. Wheeler --- ChangeLog | 2 +- correct-results.html | 2 +- correct-results.txt | 2 +- flawfinder | 2 +- makefile | 11 ++++++++++- setup.cfg | 3 +++ setup.py | 7 ++++--- 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e92a54..04233f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ 2017-09-02 David A. Wheeler - * Version 2.0.3 + * Version 2.0.4 * Switch from distutils to setuptools 2017-08-26 David A. Wheeler diff --git a/correct-results.html b/correct-results.html index ad97675..600d7b0 100644 --- a/correct-results.html +++ b/correct-results.html @@ -9,7 +9,7 @@

Flawfinder Results

Here are the security scan results from -Flawfinder version 2.0.3, +Flawfinder version 2.0.4, (C) 2001-2017 David A. Wheeler. Number of rules (primarily dangerous function names) in C/C++ ruleset: 219

diff --git a/correct-results.txt b/correct-results.txt index 5cef45d..d7c8610 100644 --- a/correct-results.txt +++ b/correct-results.txt @@ -1,4 +1,4 @@ -Flawfinder version 2.0.3, (C) 2001-2017 David A. Wheeler. +Flawfinder version 2.0.4, (C) 2001-2017 David A. Wheeler. Number of rules (primarily dangerous function names) in C/C++ ruleset: 219 Examining test.c Examining test2.c diff --git a/flawfinder b/flawfinder index 655ca8d..e99c2c9 100755 --- a/flawfinder +++ b/flawfinder @@ -55,7 +55,7 @@ import csv # To support generating CSV format import hashlib # import formatter -version = "2.0.3" +version = "2.0.4" # Program Options - these are the default values. # TODO: Switch to boolean types where appropriate. diff --git a/makefile b/makefile index a8a3961..577ab6d 100644 --- a/makefile +++ b/makefile @@ -10,7 +10,7 @@ # Eventually switch to using DistUtils to autogenerate. NAME=flawfinder -VERSION=2.0.3 +VERSION=2.0.4 RPM_VERSION=1 VERSIONEDNAME=$(NAME)-$(VERSION) ARCH=noarch @@ -119,6 +119,15 @@ distribute: clean flawfinder.pdf flawfinder.ps dist: distribute +# This *creates* a PyPi distribution package. Use "upload-pypi" to upload it +pypi: distribute + rm -fr build dist flawfinder.egg-info + python setup.py bdist_wheel --universal + +# Use "-r pypitest" to upload to pypitest. +upload-pypi: + twine upload dist/* + time: echo "Timing the program. First, time taken:" time ./flawfinder $(SAMPLE_DIR)/*/*.[ch] > /dev/null diff --git a/setup.cfg b/setup.cfg index b2ea384..9ff4c78 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,9 @@ [metadata] description-file = README +[bdist_wheel] +universal=1 + [bdist_rpm] release = 1 doc_files = ChangeLog diff --git a/setup.py b/setup.py index 5417566..3b9e88e 100644 --- a/setup.py +++ b/setup.py @@ -9,9 +9,10 @@ from setuptools import setup # Don't need find_packages setup (# Distribution meta-data name = "flawfinder", - packages = ["flawfinder"], # Must be same as name + version = "2.0.4", + # We install a script, not a separate package. + # packages = ["flawfinder"], # Must be same as name # Do not need: packages=find_packages(), - version = "2.0.3", description = "a program that examines source code looking for security weaknesses", author = "David A. Wheeler", author_email = "dwheeler@dwheeler.com", @@ -21,7 +22,7 @@ C/C++ source code and identify out potential security flaws, ranking them by likely severity. It is released under the GNU GPL license.""", url = "http://www.dwheeler.com/flawfinder/", - download_url = "https://sourceforge.net/projects/flawfinder/files/flawfinder-2.0.3.tar.gz/download", + download_url = "https://sourceforge.net/projects/flawfinder/files/flawfinder-2.0.4.tar.gz/download", zip_safe = True, keywords = ['analysis', 'security', 'analyzer'], classifiers = [