diff -Nru bro-pkg-1.5.1/bropkg/__init__.py bro-pkg-1.5.2/bropkg/__init__.py --- bro-pkg-1.5.1/bropkg/__init__.py 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/bropkg/__init__.py 2019-01-11 19:20:46.000000000 +0000 @@ -9,7 +9,7 @@ import logging -__version__ = "1.5.1" +__version__ = "1.5.2" __all__ = ['manager', 'package', 'source'] LOG = logging.getLogger(__name__) diff -Nru bro-pkg-1.5.1/CHANGES bro-pkg-1.5.2/CHANGES --- bro-pkg-1.5.1/CHANGES 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/CHANGES 2019-01-11 19:20:46.000000000 +0000 @@ -1,4 +1,28 @@ +1.5.2 | 2019-01-11 13:18:51 -0600 + + * Release 1.5.2. + +1.5.1-5 | 2019-01-11 13:18:18 -0600 + + * Add docs for 'credits' metadata field (Jon Siwek, Corelight) + +1.5.1-4 | 2019-01-11 11:59:35 -0600 + + * Swap Zeek in for Bro in Sphinx config (Jon Siwek, Corelight) + +1.5.1-3 | 2019-01-10 17:59:09 -0600 + + * Fix RTD URL (Jon Siwek, Corelight) + +1.5.1-2 | 2019-01-10 17:18:58 -0600 + + * Update URLs and some simple s/Bro/Zeek in README (Jon Siwek, Corelight) + +1.5.1-1 | 2019-01-04 17:17:27 -0600 + + * GH-41: fix man page formatting of positional args (Jon Siwek, Corelight) + 1.5.1 | 2018-12-17 12:21:41 -0600 * Release 1.5.1. diff -Nru bro-pkg-1.5.1/debian/changelog bro-pkg-1.5.2/debian/changelog --- bro-pkg-1.5.1/debian/changelog 2019-01-04 20:08:12.000000000 +0000 +++ bro-pkg-1.5.2/debian/changelog 2019-01-14 14:48:20.000000000 +0000 @@ -1,3 +1,10 @@ +bro-pkg (1.5.2-1) unstable; urgency=medium + + * New upstream version 1.5.2 + * Remove patch for man page bug fixes (fixed upstream) + + -- Robert Haist Mon, 14 Jan 2019 15:48:20 +0100 + bro-pkg (1.5.1-1) unstable; urgency=medium * New upstream version 1.5.1 diff -Nru bro-pkg-1.5.1/debian/patches/0001-fix-Lintian-warning-about-manpage.patch bro-pkg-1.5.2/debian/patches/0001-fix-Lintian-warning-about-manpage.patch --- bro-pkg-1.5.1/debian/patches/0001-fix-Lintian-warning-about-manpage.patch 2019-01-04 20:08:12.000000000 +0000 +++ bro-pkg-1.5.2/debian/patches/0001-fix-Lintian-warning-about-manpage.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,131 +0,0 @@ -Description: Fix lintian warnings about man macros -Author: Robert Haist ---- ---- a/doc/man/bro-pkg.1 -+++ b/doc/man/bro-pkg.1 -@@ -90,7 +90,7 @@ usage: bro\-pkg test [\-h] [\-\-version - .B Positional arguments: - .INDENT 7.0 - .TP --.Bpackage -+.B package - The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". - .UNINDENT - .TP -@@ -122,7 +122,7 @@ usage: bro\-pkg install [\-h] [\-\-force - .B Positional arguments: - .INDENT 7.0 - .TP --.Bpackage -+.B package - The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". - .UNINDENT - .TP -@@ -164,7 +164,7 @@ usage: bro\-pkg remove [\-h] [\-\-force] - .B Positional arguments: - .INDENT 7.0 - .TP --.Bpackage -+.B package - The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". - .UNINDENT - .TP -@@ -219,7 +219,7 @@ usage: bro\-pkg bundle [\-h] [\-\-force] - .B Positional arguments: - .INDENT 7.0 - .TP --.Bbundle_filename -+.B bundle_filename - The path of the bundle file to create. It will be overwritten if it already exists. Note that if \-\-manifest is used before this filename is specified, you should use a double\-dash, \-\-, to first terminate that argument list. - .UNINDENT - .TP -@@ -258,7 +258,7 @@ usage: bro\-pkg unbundle [\-h] [\-\-forc - .B Positional arguments: - .INDENT 7.0 - .TP --.Bbundle_filename -+.B bundle_filename - The path of the bundle file to install. - .UNINDENT - .TP -@@ -323,7 +323,7 @@ usage: bro\-pkg upgrade [\-h] [\-\-force - .B Positional arguments: - .INDENT 7.0 - .TP --.Bpackage -+.B package - The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". - .UNINDENT - .TP -@@ -362,7 +362,7 @@ usage: bro\-pkg load [\-h] package [pack - .B Positional arguments: - .INDENT 7.0 - .TP --.Bpackage -+.B package - Name(s) of package(s) to load. - .UNINDENT - .UNINDENT -@@ -385,7 +385,7 @@ usage: bro\-pkg unload [\-h] package [pa - .B Positional arguments: - .INDENT 7.0 - .TP --.Bpackage -+.B package - The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". - .UNINDENT - .UNINDENT -@@ -408,7 +408,7 @@ usage: bro\-pkg pin [\-h] package [packa - .B Positional arguments: - .INDENT 7.0 - .TP --.Bpackage -+.B package - The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". - .UNINDENT - .UNINDENT -@@ -431,7 +431,7 @@ usage: bro\-pkg unpin [\-h] package [pac - .B Positional arguments: - .INDENT 7.0 - .TP --.Bpackage -+.B package - The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". - .UNINDENT - .UNINDENT -@@ -455,7 +455,7 @@ usage: bro\-pkg list [\-h] [\-\-nodesc] - .B Positional arguments: - .INDENT 7.0 - .TP --.Bcategory -+.B category - Package category used to filter listing. - .sp - Possible choices: all, installed, not_installed, loaded, unloaded, outdated -@@ -487,7 +487,7 @@ usage: bro\-pkg search [\-h] search_text - .B Positional arguments: - .INDENT 7.0 - .TP --.Bsearch_text -+.B search_text - The text(s) or pattern(s) to look for. - .UNINDENT - .UNINDENT -@@ -512,7 +512,7 @@ usage: bro\-pkg info [\-h] [\-\-version - .B Positional arguments: - .INDENT 7.0 - .TP --.Bpackage -+.B package - The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". If a single name is given and matches one of the same categories as the "list" command, then it is automatically expanded to be the names of all packages which match the given category. - .UNINDENT - .TP -@@ -555,7 +555,7 @@ usage: bro\-pkg config [\-h] - .B Positional arguments: - .INDENT 7.0 - .TP --.Bconfig_param -+.B config_param - Name of a specific config file field to output. - .sp - Possible choices: all, sources, user_vars, state_dir, script_dir, plugin_dir, bro_dist diff -Nru bro-pkg-1.5.1/debian/patches/series bro-pkg-1.5.2/debian/patches/series --- bro-pkg-1.5.1/debian/patches/series 2019-01-04 20:08:12.000000000 +0000 +++ bro-pkg-1.5.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001-fix-Lintian-warning-about-manpage.patch diff -Nru bro-pkg-1.5.1/doc/conf.py bro-pkg-1.5.2/doc/conf.py --- bro-pkg-1.5.1/doc/conf.py 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/doc/conf.py 2019-01-11 19:20:46.000000000 +0000 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Bro Package Manager documentation build configuration file, created by +# Zeek Package Manager documentation build configuration file, created by # sphinx-quickstart on Fri Jul 15 13:46:04 2016. # # This file is execfile()d with the current directory set to its @@ -49,9 +49,9 @@ master_doc = 'index' # General information about the project. -project = u'Bro Package Manager' -copyright = u'2016, The Bro Project' -author = u'The Bro Project' +project = u'Zeek Package Manager' +copyright = u'2019, The Zeek Project' +author = u'The Zeek Project' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -135,7 +135,7 @@ # The name for this set of Sphinx documents. # " v documentation" by default. # -html_title = u'Bro Package Manager Documentation' +html_title = u'Zeek Package Manager Documentation' # A shorter title for the navigation bar. Default is the same as html_title. # @@ -239,7 +239,7 @@ # html_search_scorer = 'scorer.js' # Output file base name for HTML help builder. -htmlhelp_basename = 'BroPackageManagerdoc' +htmlhelp_basename = 'ZeekPackageManagerdoc' # -- Options for LaTeX output --------------------------------------------- @@ -265,8 +265,8 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'BroPackageManager.tex', u'Bro Package Manager Documentation', - u'The Bro Project', 'manual'), + (master_doc, 'ZeekPackageManager.tex', u'Zeek Package Manager Documentation', + u'The Zeek Project', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -307,7 +307,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('bro-pkg', 'bro-pkg', u'Bro Package Manager', + ('bro-pkg', 'bro-pkg', u'Zeek Package Manager', [author], 1) ] @@ -322,8 +322,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'BroPackageManager', u'Bro Package Manager Documentation', - author, 'BroPackageManager', 'One line description of project.', + (master_doc, 'ZeekPackageManager', u'Zeek Package Manager Documentation', + author, 'ZeekPackageManager', 'One line description of project.', 'Miscellaneous'), ] diff -Nru bro-pkg-1.5.1/doc/developers.rst bro-pkg-1.5.2/doc/developers.rst --- bro-pkg-1.5.1/doc/developers.rst 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/doc/developers.rst 2019-01-11 19:20:46.000000000 +0000 @@ -1,20 +1,20 @@ .. _Sphinx: http://www.sphinx-doc.org -.. _Read the Docs: http://bro-package-manager.readthedocs.io/en/latest -.. _GitHub: https://github.com/bro/package-manager +.. _Read the Docs: https://docs.zeek.org/projects/package-manager +.. _GitHub: https://github.com/zeek/package-manager .. _Google Style Docstrings: http://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html -.. _bro-aux: https://github.com/bro/bro-aux +.. _zeek-aux: https://github.com/zeek/zeek-aux .. _PyPi: https://pypi.python.org/pypi Developer's Guide ================= -This a guide for developers working on the Bro Package Manager itself. +This a guide for developers working on the Zeek Package Manager itself. Versioning/Releases ------------------- After making a commit to the *master* branch, you can use the -:program:`update-changes` script in the `bro-aux`_ repository to automatically +:program:`update-changes` script in the `zeek-aux`_ repository to automatically adapt version numbers and regenerate the :program:`bro-pkg` man page. Make sure to install the `documentation dependencies`_ before using it. diff -Nru bro-pkg-1.5.1/doc/ext/sphinxarg/ext.py bro-pkg-1.5.2/doc/ext/sphinxarg/ext.py --- bro-pkg-1.5.1/doc/ext/sphinxarg/ext.py 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/doc/ext/sphinxarg/ext.py 2019-01-11 19:20:46.000000000 +0000 @@ -66,7 +66,8 @@ text=('Possible choices: %s' % ', '.join([str(c) for c in arg['choices']])))) items.append( nodes.option_list_item( - '', nodes.option_group('', nodes.option_string(text=name)), + '', nodes.option_group('', + nodes.option('', nodes.option_string(text=name))), nodes.description('', *my_def))) return nodes.option_list('', *items) if items else None diff -Nru bro-pkg-1.5.1/doc/man/bro-pkg.1 bro-pkg-1.5.2/doc/man/bro-pkg.1 --- bro-pkg-1.5.1/doc/man/bro-pkg.1 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/doc/man/bro-pkg.1 2019-01-11 19:20:46.000000000 +0000 @@ -1,8 +1,8 @@ .\" Man page generated from reStructuredText. . -.TH "BRO-PKG" "1" "Dec 17, 2018" "1.5.1" "Bro Package Manager" +.TH "BRO-PKG" "1" "Jan 11, 2019" "1.5.2" "Zeek Package Manager" .SH NAME -bro-pkg \- Bro Package Manager +bro-pkg \- Zeek Package Manager . .nr rst2man-indent-level 0 . @@ -90,7 +90,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bpackage +.B package The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". .UNINDENT .TP @@ -122,7 +122,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bpackage +.B package The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". .UNINDENT .TP @@ -164,7 +164,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bpackage +.B package The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". .UNINDENT .TP @@ -219,7 +219,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bbundle_filename +.B bundle_filename The path of the bundle file to create. It will be overwritten if it already exists. Note that if \-\-manifest is used before this filename is specified, you should use a double\-dash, \-\-, to first terminate that argument list. .UNINDENT .TP @@ -258,7 +258,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bbundle_filename +.B bundle_filename The path of the bundle file to install. .UNINDENT .TP @@ -323,7 +323,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bpackage +.B package The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". .UNINDENT .TP @@ -362,7 +362,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bpackage +.B package Name(s) of package(s) to load. .UNINDENT .UNINDENT @@ -385,7 +385,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bpackage +.B package The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". .UNINDENT .UNINDENT @@ -408,7 +408,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bpackage +.B package The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". .UNINDENT .UNINDENT @@ -431,7 +431,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bpackage +.B package The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". .UNINDENT .UNINDENT @@ -455,7 +455,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bcategory +.B category Package category used to filter listing. .sp Possible choices: all, installed, not_installed, loaded, unloaded, outdated @@ -487,7 +487,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bsearch_text +.B search_text The text(s) or pattern(s) to look for. .UNINDENT .UNINDENT @@ -512,7 +512,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bpackage +.B package The name(s) of package(s) to operate on. The package may be named in several ways. If the package is part of a package source, it may be referred to by the base name of the package (last component of git URL) or its path within the package source. If two packages in different package sources have conflicting paths, then the package source name may be prepended to the package path to resolve the ambiguity. A full git URL may also be used to refer to a package that does not belong to a source. E.g. for a package source called "bro" that has a package named "foo" located in "alice/bro\-pkg.index" the following names work: "foo", "alice/foo", "bro/alice/foo". If a single name is given and matches one of the same categories as the "list" command, then it is automatically expanded to be the names of all packages which match the given category. .UNINDENT .TP @@ -555,7 +555,7 @@ .B Positional arguments: .INDENT 7.0 .TP -.Bconfig_param +.B config_param Name of a specific config file field to output. .sp Possible choices: all, sources, user_vars, state_dir, script_dir, plugin_dir, bro_dist @@ -675,8 +675,8 @@ .UNINDENT .UNINDENT .SH AUTHOR -The Bro Project +The Zeek Project .SH COPYRIGHT -2016, The Bro Project +2019, The Zeek Project .\" Generated by docutils manpage writer. . diff -Nru bro-pkg-1.5.1/doc/overview.rst bro-pkg-1.5.2/doc/overview.rst --- bro-pkg-1.5.1/doc/overview.rst 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/doc/overview.rst 2019-01-11 19:20:46.000000000 +0000 @@ -1,22 +1,23 @@ -.. _Bro: https://bro.org -.. _Bro package source: https://github.com/bro/packages -.. _documentation: http://bro-package-manager.readthedocs.io +.. _Zeek: https://www.zeek.org +.. _Zeek package source: https://github.com/zeek/packages +.. _documentation: https://docs.zeek.org/projects/package-manager -Bro Package Manager -=================== +Zeek Package Manager +==================== -The Bro Package Manager makes it easy for Bro_ users to install and manage third -party scripts as well as plugins for Bro and BroControl. The command-line tool -is preconfigured to download packages from the `Bro package source`_ , a GitHub -repository that has been set up such that any developer can request their Bro -package be included. See the ``README`` file of that repository for information -regarding the package submission process. +The Zeek Package Manager makes it easy for Zeek users to install and +manage third party scripts as well as plugins for Zeek and BroControl. +The command-line tool is preconfigured to download packages from the +`Zeek package source`_ , a GitHub repository that has been set up such +that any developer can request their Zeek package be included. See the +``README`` file of that repository for information regarding the package +submission process. -:note: It's left up to users to decide for themselves via code review, GitHub - comments/stars, or other metrics whether any given package is trustworthy - as there is no implied guarantees that it's secure just because it's been - accepted into the default package source. +:note: It's left up to users to decide for themselves via code review, + GitHub comments/stars, or other metrics whether any given package + is trustworthy as there is no implied guarantees that it's secure + just because it's been accepted into the default package source. -See the package manager documentation_ for further usage information, how-to -guides, and walkthroughs. For offline reading, it's also available in the -``doc/`` directory of the source code distribution. +See the package manager documentation_ for further usage information, +how-to guides, and walkthroughs. For offline reading, it's also +available in the ``doc/`` directory of the source code distribution. diff -Nru bro-pkg-1.5.1/doc/package.rst bro-pkg-1.5.2/doc/package.rst --- bro-pkg-1.5.1/doc/package.rst 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/doc/package.rst 2019-01-11 19:20:46.000000000 +0000 @@ -1,6 +1,6 @@ -.. _Bro Scripting: https://www.bro.org/sphinx/scripting/index.html -.. _Bro Plugins: https://www.bro.org/sphinx/devel/plugins.html -.. _BroControl Plugins: https://www.bro.org/sphinx/components/broctl/README.html#plugins +.. _Bro Scripting: https://www.zeek.org/sphinx/scripting/index.html +.. _Bro Plugins: https://www.zeek.org/sphinx/devel/plugins.html +.. _BroControl Plugins: https://www.zeek.org/sphinx/components/broctl/README.html#plugins .. _Semantic Version Specification: https://python-semanticversion.readthedocs.io/en/latest/reference.html#version-specifications-the-spec-class .. _btest: https://github.com/bro/btest .. _configparser interpolation: https://docs.python.org/3/library/configparser.html#interpolation-of-values @@ -287,6 +287,25 @@ Available :program:`since bro-pkg v1.5`. +`credits` field +~~~~~~~~~~~~~~~ + +The `credits` field contains a comma-delimited set of +author/contributor/maintainer names, descriptions, and/or email +addresses. + +It may be used if you have particular requirements or concerns regarding +how authors or contributors for your package are credited in any public +listings made by external metadata scraping tools (:program:`bro-pkg` +does not itself use this data directly for any functional purpose). It +may also be useful as a standardized location for users to get +contact/support info in case they encounter problems with the package. +For example:: + + [package] + credits = A. Sacker ., + JSON support added by W00ter (Acme Corporation) + `tags` field ~~~~~~~~~~~~ diff -Nru bro-pkg-1.5.1/doc/quickstart.rst bro-pkg-1.5.2/doc/quickstart.rst --- bro-pkg-1.5.1/doc/quickstart.rst 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/doc/quickstart.rst 2019-01-11 19:20:46.000000000 +0000 @@ -1,5 +1,5 @@ .. _PyPI: https://pypi.python.org/pypi -.. _BroControl: https://www.bro.org/sphinx/components/broctl/README.html +.. _BroControl: https://www.zeek.org/sphinx/components/broctl/README.html Quickstart Guide ================ diff -Nru bro-pkg-1.5.1/README bro-pkg-1.5.2/README --- bro-pkg-1.5.1/README 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/README 2019-01-11 19:20:46.000000000 +0000 @@ -1,22 +1,23 @@ -.. _Bro: https://bro.org -.. _Bro package source: https://github.com/bro/packages -.. _documentation: http://bro-package-manager.readthedocs.io +.. _Zeek: https://www.zeek.org +.. _Zeek package source: https://github.com/zeek/packages +.. _documentation: https://docs.zeek.org/projects/package-manager -Bro Package Manager -=================== +Zeek Package Manager +==================== -The Bro Package Manager makes it easy for Bro_ users to install and manage third -party scripts as well as plugins for Bro and BroControl. The command-line tool -is preconfigured to download packages from the `Bro package source`_ , a GitHub -repository that has been set up such that any developer can request their Bro -package be included. See the ``README`` file of that repository for information -regarding the package submission process. +The Zeek Package Manager makes it easy for Zeek users to install and +manage third party scripts as well as plugins for Zeek and BroControl. +The command-line tool is preconfigured to download packages from the +`Zeek package source`_ , a GitHub repository that has been set up such +that any developer can request their Zeek package be included. See the +``README`` file of that repository for information regarding the package +submission process. -:note: It's left up to users to decide for themselves via code review, GitHub - comments/stars, or other metrics whether any given package is trustworthy - as there is no implied guarantees that it's secure just because it's been - accepted into the default package source. +:note: It's left up to users to decide for themselves via code review, + GitHub comments/stars, or other metrics whether any given package + is trustworthy as there is no implied guarantees that it's secure + just because it's been accepted into the default package source. -See the package manager documentation_ for further usage information, how-to -guides, and walkthroughs. For offline reading, it's also available in the -``doc/`` directory of the source code distribution. +See the package manager documentation_ for further usage information, +how-to guides, and walkthroughs. For offline reading, it's also +available in the ``doc/`` directory of the source code distribution. diff -Nru bro-pkg-1.5.1/README.rst bro-pkg-1.5.2/README.rst --- bro-pkg-1.5.1/README.rst 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/README.rst 2019-01-11 19:20:46.000000000 +0000 @@ -1,22 +1,23 @@ -.. _Bro: https://bro.org -.. _Bro package source: https://github.com/bro/packages -.. _documentation: http://bro-package-manager.readthedocs.io +.. _Zeek: https://www.zeek.org +.. _Zeek package source: https://github.com/zeek/packages +.. _documentation: https://docs.zeek.org/projects/package-manager -Bro Package Manager -=================== +Zeek Package Manager +==================== -The Bro Package Manager makes it easy for Bro_ users to install and manage third -party scripts as well as plugins for Bro and BroControl. The command-line tool -is preconfigured to download packages from the `Bro package source`_ , a GitHub -repository that has been set up such that any developer can request their Bro -package be included. See the ``README`` file of that repository for information -regarding the package submission process. +The Zeek Package Manager makes it easy for Zeek users to install and +manage third party scripts as well as plugins for Zeek and BroControl. +The command-line tool is preconfigured to download packages from the +`Zeek package source`_ , a GitHub repository that has been set up such +that any developer can request their Zeek package be included. See the +``README`` file of that repository for information regarding the package +submission process. -:note: It's left up to users to decide for themselves via code review, GitHub - comments/stars, or other metrics whether any given package is trustworthy - as there is no implied guarantees that it's secure just because it's been - accepted into the default package source. +:note: It's left up to users to decide for themselves via code review, + GitHub comments/stars, or other metrics whether any given package + is trustworthy as there is no implied guarantees that it's secure + just because it's been accepted into the default package source. -See the package manager documentation_ for further usage information, how-to -guides, and walkthroughs. For offline reading, it's also available in the -``doc/`` directory of the source code distribution. +See the package manager documentation_ for further usage information, +how-to guides, and walkthroughs. For offline reading, it's also +available in the ``doc/`` directory of the source code distribution. diff -Nru bro-pkg-1.5.1/setup.py bro-pkg-1.5.2/setup.py --- bro-pkg-1.5.1/setup.py 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/setup.py 2019-01-11 19:20:46.000000000 +0000 @@ -13,10 +13,10 @@ description='The Bro Package Manager', long_description=open('README').read(), license='University of Illinois/NCSA Open Source License', - keywords='bro broctl brocontrol package manager scripts plugins security', + keywords='bro zeek broctl brocontrol package manager scripts plugins security', maintainer='The Bro Project', - maintainer_email='info@bro.org', - url='https://github.com/bro/package-manager', + maintainer_email='info@zeek.org', + url='https://github.com/zeek/package-manager', scripts=['bro-pkg'], packages=['bropkg'], install_requires=install_requires, diff -Nru bro-pkg-1.5.1/VERSION bro-pkg-1.5.2/VERSION --- bro-pkg-1.5.1/VERSION 2018-12-17 18:24:31.000000000 +0000 +++ bro-pkg-1.5.2/VERSION 2019-01-11 19:20:46.000000000 +0000 @@ -1 +1 @@ -1.5.1 +1.5.2