diff options
| author | Brenton Earl <brent@exitstatusone.com> | 2018-08-12 20:07:31 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-08-18 08:39:45 +0700 |
| commit | 36dbcd3d37190a181a920f78965f0e5a14eb58ab (patch) | |
| tree | 1aa77532565b38120c2a7e43648565b59c7078e0 /python/python-vulndb/do-not-commit-vulndb-to-upstream.diff | |
| parent | 1c598862630b6dd750a8d36866a29c255134c2af (diff) | |
python/python-vulndb: Updated for version 0.1.0.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'python/python-vulndb/do-not-commit-vulndb-to-upstream.diff')
| -rw-r--r-- | python/python-vulndb/do-not-commit-vulndb-to-upstream.diff | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff b/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff index 23c232f5d6..b9f47e67a3 100644 --- a/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff +++ b/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff @@ -1,17 +1,16 @@ ---- vulndb-0.0.19.orig/tools/update-db.sh 2016-12-17 22:06:14.959661248 +0000 -+++ vulndb-0.0.19/tools/update-db.sh 2016-12-17 22:26:36.641608883 +0000 -@@ -1,29 +1,23 @@ +--- vulndb-0.1.0.orig/tools/update-db.sh 2018-08-12 07:51:58.105606135 -0600 ++++ vulndb-0.1.0/tools/update-db.sh 2018-08-12 08:10:39.242604312 -0600 +@@ -1,30 +1,26 @@ #!/usr/bin/env bash -set -x -+set -xe ++set -e # # Update the database # -if [ ! -d "data" ]; then - git clone https://github.com/vulndb/data.git -+ +if [ ! -d "/tmp/vulndb_data" ]; then + git clone https://github.com/vulndb/data.git /tmp/vulndb_data fi @@ -21,9 +20,10 @@ git pull cd .. +-rm -rf vulndb/db/ -mkdir -p vulndb/db/ --cp -rf data/db/*.json vulndb/db/ --git add vulndb/db/ +-cp -rf data/db/* vulndb/db/ +-git add vulndb/db/* - -# Bump the version numbers -tools/semver.sh bump patch @@ -31,14 +31,18 @@ -cd data -git rev-parse HEAD > ../vulndb/db-version.txt -cd .. ++echo "Copying new vulnerability data..." ++sleep 3 +if [ -d "/usr/lib64" ]; then -+ cp -rf /tmp/vulndb_data/db/*.json /usr/lib64/python2.7/site-packages/vulndb/db/ ++ cp -Ruv /tmp/vulndb_data/db/en/ /usr/lib64/python2.7/site-packages/vulndb/db/ +else -+ cp -rf /tmp/vulndb_data/db/*.json /usr/lib/python2.7/site-packages/vulndb/db/ ++ cp -Ruv /tmp/vulndb_data/db/en/ /usr/lib/python2.7/site-packages/vulndb/db/ +fi -# Push to repo -git commit vulndb/db/ vulndb/version.txt vulndb/db-version.txt -m 'Updated vulnerability database' -git push \ No newline at end of file -+rm -r /tmp/vulndb_data ++echo "Removing temporary files..." ++sleep 3 ++rm -Rv /tmp/vulndb_data |