diff --git a/ChangeLog b/ChangeLog index 729c617..31b1340 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ 2021-01-09 David A. Wheeler - * Version 2.0.12 + * Version 2.0.14 * If there are >0 hits, tell users how to ignore them as part of the tool output. * Various Windows improvments. @@ -12,6 +12,9 @@ ignore "system::" to reduce false positives, treat ' as digit separator when file extension is a C++ file (for C++14). + * I had some release problems; this is identified as 2.0.14 + (skipping a few minor numbers) to ensure that the version + number uniquely identifies a specific release. 2020-02-17 David A. Wheeler * Version 2.0.11 diff --git a/flawfinder b/flawfinder index 3eaa4d3..d5c0aa2 100755 --- a/flawfinder +++ b/flawfinder @@ -55,7 +55,7 @@ import csv # To support generating CSV format import hashlib # import formatter -version = "2.0.12" +version = "2.0.14" # Program Options - these are the default values. # TODO: Switch to boolean types where appropriate. diff --git a/flawfinder.spec b/flawfinder.spec index 900035c..367254f 100644 --- a/flawfinder.spec +++ b/flawfinder.spec @@ -1,6 +1,6 @@ Name: flawfinder Summary: Examines C/C++ source code for security flaws -Version: 2.0.12 +Version: 2.0.14 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools diff --git a/makefile b/makefile index 8fe2445..71dca51 100644 --- a/makefile +++ b/makefile @@ -6,7 +6,7 @@ # how to change version numbers. NAME=flawfinder -VERSION=2.0.12 +VERSION=2.0.14 RPM_VERSION=1 VERSIONEDNAME=$(NAME)-$(VERSION) ARCH=noarch diff --git a/release_process.md b/release_process.md index 32721fd..1691edc 100644 --- a/release_process.md +++ b/release_process.md @@ -14,10 +14,10 @@ flawfinder.spec setup.py index.html # in dwheeler.com/flawfinder -Then run: +Then run several times: ~~~~ -make test && make test-is-correct # update version number in tests +make test ; make test-is-correct # update version number in tests ~~~~ ## Test it @@ -26,6 +26,12 @@ make test && make test-is-correct # update version number in tests make check # Run tests in Python 2 and 3 ~~~~ +## Commit it + +~~~~ +git commit -asv +~~~~ + ## Tag version Once you're sure this is the *real* version, tag it: diff --git a/setup.py b/setup.py index 3706abf..f7b45ed 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ from setuptools import setup # Don't need find_packages setup (# Distribution meta-data name = "flawfinder", - version = "2.0.12", + version = "2.0.14", # We install a script, not a separate package. # packages = ["flawfinder"], # Must be same as name # Do not need: packages=find_packages(), diff --git a/test/correct-results-008.txt b/test/correct-results-008.txt index 697de0d..dfcc58d 100644 --- a/test/correct-results-008.txt +++ b/test/correct-results-008.txt @@ -1,4 +1,4 @@ -Flawfinder version 2.0.12, (C) 2001-2019 David A. Wheeler. +Flawfinder version 2.0.14, (C) 2001-2019 David A. Wheeler. Showing hits not in test-saved-hitlist-008.txt Number of rules (primarily dangerous function names) in C/C++ ruleset: 222 diff --git a/test/correct-results.html b/test/correct-results.html index 8335c7d..1d8a712 100644 --- a/test/correct-results.html +++ b/test/correct-results.html @@ -9,7 +9,7 @@

Flawfinder Results

Here are the security scan results from -Flawfinder version 2.0.12, +Flawfinder version 2.0.14, (C) 2001-2019 David A. Wheeler. Number of rules (primarily dangerous function names) in C/C++ ruleset: 222

diff --git a/test/correct-results.txt b/test/correct-results.txt index 4fa7fef..6f726f3 100644 --- a/test/correct-results.txt +++ b/test/correct-results.txt @@ -1,4 +1,4 @@ -Flawfinder version 2.0.12, (C) 2001-2019 David A. Wheeler. +Flawfinder version 2.0.14, (C) 2001-2019 David A. Wheeler. Number of rules (primarily dangerous function names) in C/C++ ruleset: 222 Examining test.c Examining test2.c