Permalink
Browse files

Version 3.4.1 (2012-06-04)

 * derive default config file location at 'make' time
 * include vlists in RPM
  • Loading branch information...
1 parent 9b48ce9 commit 7e51c96f374e9a0056f18c265806f44ab0a45c2b @jschauma committed Jun 4, 2012
Showing with 17,189 additions and 15 deletions.
  1. +4 −0 CHANGES
  2. +1 −1 MANIFEST.in
  3. +27 −3 Makefile
  4. +5,028 −0 conf/fbvlist
  5. +6,090 −0 conf/nbvlist
  6. +789 −0 conf/rh4vlist
  7. +3,655 −0 conf/rh5vlist
  8. +1,582 −0 conf/rh6vlist
  9. +2 −2 doc/man/fetch-vlist.1
  10. +1 −1 doc/man/yvc.1
  11. +2 −2 doc/man/yvc.conf.5
  12. +8 −6 setup.py
View
@@ -1,5 +1,9 @@
Changelog:
+Version 3.4.1 (2012-06-04)
+ * derive default config file location at 'make' time
+ * include vlists in RPM
+
Version 3.4.0 (2012-05-22)
* include setup.py, shuffle files around a bit for this
* update and add a few make targets
View
@@ -1,2 +1,2 @@
recursive-include doc man/*gz
-recursive-include conf *.conf
+recursive-include conf *
View
@@ -16,7 +16,7 @@ LISTS= ${RH6VLIST} ${RH5VLIST} ${RH4VLIST} ${FBVLIST}
MANPAGES=fetch-vlist.1 yvc.1 yvc.conf.5
GONERS= ${RH6VLIST}.in ${RH5VLIST}.in ${RH4VLIST}.in ${FBVLIST}.in \
- ${RHEL_XML} MANIFEST
+ ${RHEL_XML} MANIFEST
date!=date
@@ -31,15 +31,33 @@ help:
@echo "rpm build an RPM"
@echo "uninstall uninstall yvc and fetch-vlist"
-install: man-compress
+install: man-compress replace-prefix
python setup.py install
+replace-prefix:
+ @cp bin/fetch-vlist bin/fetch-vlist.in
+ @cp conf/yvc.conf conf/yvc.conf.in
+ @cp doc/man/fetch-vlist.1 doc/man/fetch-vlist.1.in
+ @cp doc/man/yvc.1 doc/man/yvc.1.in
+ @cp doc/man/yvc.conf.5 doc/man/yvc.conf.5.in
+ @cp yahoo/yvc.py yahoo/yvc.py.in
+ @prefix=$$(echo "import sysprint sys.prefix" | python); \
+ if [ "$$prefix" = "/usr" ]; then \
+ prefix=""; \
+ fi; \
+ sed -e "s|/usr/local/|$$prefix/|g" bin/fetch-vlist.in > bin/fetch-vlist; \
+ sed -e "s|/usr/local/|$$prefix/|g" conf/yvc.conf.in > conf/yvc.conf; \
+ sed -e "s|/usr/local/|$$prefix/|g" doc/man/yvc.1.in > doc/man/yvc.1; \
+ sed -e "s|/usr/local/|$$prefix/|g" doc/man/yvc.conf.5.in > doc/man/yvc.conf.5; \
+ sed -e "s|/usr/local/|$$prefix/|g" doc/man/fetch-vlist.1.in > doc/man/fetch-vlist.1; \
+ sed -e "s|/usr/local/|$$prefix/|g" yahoo/yvc.py.in > yahoo/yvc.py;
+
uninstall:
@echo "Sorry, setup.py apparently can't do that."
@echo "Your best bet is to run 'python setup.py install --record /tmp/f'"
@echo "followed by 'xargs rm -f </tmp/f'"
-rpm: man-compress
+rpm: replace-prefix man-compress
python setup.py bdist_rpm
man-compress:
@@ -69,5 +87,11 @@ rh6vlist:
python ./misc/redhat_oval_to_yvc.py 6 | sort -u > rh6vlist
clean:
+ mv -f bin/fetch-vlist.in bin/fetch-vlist 2>/dev/null || true
+ mv -f conf/yvc.conf.in conf/yvc.conf 2>/dev/null || true
+ mv -f doc/man/yvc.1.in doc/man/yvc.1 2>/dev/null || true
+ mv -f doc/man/yvc.conf.5.in doc/man/yvc.conf.5 2>/dev/null || true
+ mv -f doc/man/fetch-vlist.1.in doc/man/fetch-vlist.1 2>/dev/null || true
+ mv -f yahoo/yvc.in yahoo/yvc 2>/dev/null || true
rm -f ${LISTS} ${GONERS} doc/man/*gz
rm -fr build dist
View
5,028 conf/fbvlist

Large diffs are not rendered by default.

Oops, something went wrong.
View
6,090 conf/nbvlist

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -68,8 +68,8 @@ http://www.netmeister.org/apps/yvc/rh6vlist.
.Sh EXIT STATUS
.Ex -std
.Sh FILES
-.Bl -tag -width _home_y_var_yvc_
-.It /home/y/var/yvc
+.Bl -tag -width _var_yvc_
+.It /usr/local/var/yvc
The final directory into which the file is installed.
.El
.Sh SEE ALSO
View
@@ -185,7 +185,7 @@ will return an exit status of '2'.
.Pp
An exit status of '1' indicates some sort of unexpected error.
.Sh FILES
-.Bl -tag -width _home_y_var_yvc_rh6vlist__
+.Bl -tag -width _usr_local_var_yvc_rh6vlist__
.It /usr/local/etc/yvc.conf
The
.Nm
View
@@ -3,7 +3,7 @@
.\"
.\" Copyright (c) 2008 Yahoo! Inc.
.\"
-.Dd October 31, 2009
+.Dd June 04, 2012
.Dt YVC.CONF 1
.Os
.Sh NAME
@@ -48,7 +48,7 @@ A list of URLs that should be ignored.
That is, if a package is found to be vulnerable for the given URL, ignore it.
.It VLISTS
The file(s) in which the list(s) of vulnerabilities is/are found.
-Defaults to /home/y/var/yvc/yvlist and a platform-specific vlist.
+Defaults to /usr/local/var/yvc/yvlist and a platform-specific vlist.
.It VERBOSITY
Level of verbosity.
Valid values are '0' (no output except for vulnerable packages), '1' (some
View
@@ -3,16 +3,18 @@
from distutils.core import setup
setup(name = 'yvc',
- version = '3.4.0',
+ version = '3.4.1',
description = 'a software package vulnerability check',
author = 'Jan Schaumann',
author_email = 'jschauma@netmeister.org',
- license = 'BSD',
+ license = 'BSD',
url = 'http://www.netmeister.org/apps/yvc/',
- long_description = 'yvc compares the given package name against the list of known vulnerabilities and reports any security issues. This output contains the name and version of the package, the type of vulnerability, and a URL for further information for each vulnerable package.',
+ long_description = 'yvc compares the given package name against the list of known vulnerabilities and reports any security issues. This output contains the name and version of the package, the type of vulnerability, and a URL for further information for each vulnerable package.',
py_modules = [ 'yahoo.yvc' ],
scripts = [ 'bin/yvc', 'bin/fetch-vlist' ],
- data_files = [ ('share/man/man1', [ 'doc/man/fetch-vlist.1.gz', 'doc/man/yvc.1.gz' ]),
- ('share/man/man5', [ 'doc/man/yvc.conf.5.gz' ]),
- ('etc', [ 'conf/yvc.conf' ]), ]
+ data_files = [ ('share/man/man1', [ 'doc/man/fetch-vlist.1.gz', 'doc/man/yvc.1.gz' ]),
+ ('share/man/man5', [ 'doc/man/yvc.conf.5.gz' ]),
+ ('/var/yvc', [ 'conf/fbvlist', 'conf/nbvlist', 'conf/rh4vlist',
+ 'conf/rh5vlist', 'conf/rh6vlist' ]),
+ ('/etc', [ 'conf/yvc.conf' ]), ]
)

0 comments on commit 7e51c96

Please sign in to comment.