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 <dwheeler@dwheeler.com>
This commit is contained in:
David A. Wheeler 2017-09-02 20:46:45 -04:00
parent 1df337cb8b
commit 24992c0f08
7 changed files with 21 additions and 8 deletions

View File

@ -1,5 +1,5 @@
2017-09-02 David A. Wheeler <dwheeler, at, dwheeler.com> 2017-09-02 David A. Wheeler <dwheeler, at, dwheeler.com>
* Version 2.0.3 * Version 2.0.4
* Switch from distutils to setuptools * Switch from distutils to setuptools
2017-08-26 David A. Wheeler <dwheeler, at, dwheeler.com> 2017-08-26 David A. Wheeler <dwheeler, at, dwheeler.com>

View File

@ -9,7 +9,7 @@
<body> <body>
<h1>Flawfinder Results</h1> <h1>Flawfinder Results</h1>
Here are the security scan results from Here are the security scan results from
<a href="http://www.dwheeler.com/flawfinder">Flawfinder version 2.0.3</a>, <a href="http://www.dwheeler.com/flawfinder">Flawfinder version 2.0.4</a>,
(C) 2001-2017 <a href="http://www.dwheeler.com">David A. Wheeler</a>. (C) 2001-2017 <a href="http://www.dwheeler.com">David A. Wheeler</a>.
Number of rules (primarily dangerous function names) in C/C++ ruleset: 219 Number of rules (primarily dangerous function names) in C/C++ ruleset: 219
<p> <p>

View File

@ -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 Number of rules (primarily dangerous function names) in C/C++ ruleset: 219
Examining test.c Examining test.c
Examining test2.c Examining test2.c

View File

@ -55,7 +55,7 @@ import csv # To support generating CSV format
import hashlib import hashlib
# import formatter # import formatter
version = "2.0.3" version = "2.0.4"
# Program Options - these are the default values. # Program Options - these are the default values.
# TODO: Switch to boolean types where appropriate. # TODO: Switch to boolean types where appropriate.

View File

@ -10,7 +10,7 @@
# Eventually switch to using DistUtils to autogenerate. # Eventually switch to using DistUtils to autogenerate.
NAME=flawfinder NAME=flawfinder
VERSION=2.0.3 VERSION=2.0.4
RPM_VERSION=1 RPM_VERSION=1
VERSIONEDNAME=$(NAME)-$(VERSION) VERSIONEDNAME=$(NAME)-$(VERSION)
ARCH=noarch ARCH=noarch
@ -119,6 +119,15 @@ distribute: clean flawfinder.pdf flawfinder.ps
dist: distribute 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: time:
echo "Timing the program. First, time taken:" echo "Timing the program. First, time taken:"
time ./flawfinder $(SAMPLE_DIR)/*/*.[ch] > /dev/null time ./flawfinder $(SAMPLE_DIR)/*/*.[ch] > /dev/null

View File

@ -1,6 +1,9 @@
[metadata] [metadata]
description-file = README description-file = README
[bdist_wheel]
universal=1
[bdist_rpm] [bdist_rpm]
release = 1 release = 1
doc_files = ChangeLog doc_files = ChangeLog

View File

@ -9,9 +9,10 @@ from setuptools import setup # Don't need find_packages
setup (# Distribution meta-data setup (# Distribution meta-data
name = "flawfinder", 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(), # Do not need: packages=find_packages(),
version = "2.0.3",
description = "a program that examines source code looking for security weaknesses", description = "a program that examines source code looking for security weaknesses",
author = "David A. Wheeler", author = "David A. Wheeler",
author_email = "dwheeler@dwheeler.com", author_email = "dwheeler@dwheeler.com",
@ -21,7 +22,7 @@ C/C++ source code and identify out potential security flaws,
ranking them by likely severity. ranking them by likely severity.
It is released under the GNU GPL license.""", It is released under the GNU GPL license.""",
url = "http://www.dwheeler.com/flawfinder/", 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, zip_safe = True,
keywords = ['analysis', 'security', 'analyzer'], keywords = ['analysis', 'security', 'analyzer'],
classifiers = [ classifiers = [