diff options
| -rw-r--r-- | python/python-vulndb/do-not-commit-vulndb-to-upstream.diff | 24 | ||||
| -rw-r--r-- | python/python-vulndb/python-vulndb.SlackBuild | 4 | ||||
| -rw-r--r-- | python/python-vulndb/python-vulndb.info | 6 |
3 files changed, 19 insertions, 15 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 23c232f5d6925..b9f47e67a380c 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 diff --git a/python/python-vulndb/python-vulndb.SlackBuild b/python/python-vulndb/python-vulndb.SlackBuild index 4eb1e8c3df69f..916bdff9d09f3 100644 --- a/python/python-vulndb/python-vulndb.SlackBuild +++ b/python/python-vulndb/python-vulndb.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python-vulndb -# Copyright 2015-2016 Brenton Earl <brent@exitstatusone.com> +# Copyright 2015-2016, 2018 Brenton Earl <brent@exitstatusone.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=python-vulndb SRCNAM=vulndb -VERSION=${VERSION:-0.0.19} +VERSION=${VERSION:-0.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python-vulndb/python-vulndb.info b/python/python-vulndb/python-vulndb.info index 40c5f2ac61293..dd40c6685e179 100644 --- a/python/python-vulndb/python-vulndb.info +++ b/python/python-vulndb/python-vulndb.info @@ -1,8 +1,8 @@ PRGNAM="python-vulndb" -VERSION="0.0.19" +VERSION="0.1.0" HOMEPAGE="https://github.com/vulndb/python-sdk/" -DOWNLOAD="https://pypi.python.org/packages/source/v/vulndb/vulndb-0.0.19.tar.gz" -MD5SUM="40f60a109aca06a928e0e0e64c13c226" +DOWNLOAD="https://files.pythonhosted.org/packages/b6/8e/e5dc89c7d916615f44d8854d471e93965ab25282df2818d239ff8e759fed/vulndb-0.1.0.tar.gz" +MD5SUM="657bc984c8caba0d059089dada09348d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="setuptools-git" |