diff options
| -rw-r--r-- | README.md | 37 | ||||
| -rw-r--r-- | contrib/dnsviz-py2.spec | 65 | ||||
| -rw-r--r-- | contrib/dnsviz.spec (renamed from contrib/dnsviz-py3.spec) | 9 |
3 files changed, 18 insertions, 93 deletions
@@ -33,7 +33,7 @@ Instructions for running in a Docker container are also available ### Dependencies -* python (2.7/3.5/3.6/3.7) - http://www.python.org/ +* python (2.7/3.5/3.6/3.7/3.8/3.9) - http://www.python.org/ * dnspython (1.13.0 or later) - http://www.dnspython.org/ @@ -41,10 +41,10 @@ Instructions for running in a Docker container are also available * M2Crypto (0.37.0 or later) - https://gitlab.com/m2crypto/m2crypto -Note that the software versions listed above are known to work with the current -version of DNSViz. Other versions might also work, but with some caveats. For -example, M2Crypto 0.28.0 and later should work, but versions earlier than -0.37.0 lack support for DNSSEC algorithms 15 (Ed25519) and 16 (Ed448). +Note that earlier versions of the softwarre listed above might also work with +DNSViz, but with some caveats. For example, M2Crypto 0.28.0 and later will +work, but versions earlier than 0.37.0 lack support for DNSSEC algorithms 15 +(Ed25519) and 16 (Ed448). ### Optional Software @@ -81,6 +81,7 @@ $ source ~/myenv/bin/activate (Note that this installs the dependencies that are python packages, but some of these packages have non-python dependecies, such as Graphviz (required for pygraphviz) that are not installed automatically.) +[virtual environment](#installation-in-a-virtual-environment), and installation Next download and install DNSViz from the Python Package Index (PyPI): ``` @@ -94,15 +95,9 @@ or locally, from a downloaded copy of DNSViz: ### Fedora RPM Build and Install -A Fedora RPM can be built for either python2 or python3. However, note that -with Fedora releases after 29, python2 packages are being removed, so python3 -is preferred. - -The value of ${PY_VERS} is either 2 or 3, corresponding to python2 or python3. - Install the tools for building an RPM, and set up the rpmbuild tree. ``` -$ sudo dnf install rpm-build rpmdevtools python${PY_VERS}-devel +$ sudo dnf install rpm-build rpmdevtools python3-devel $ rpmdev-setuptree ``` @@ -110,23 +105,19 @@ From within the DNSViz source directory, create a source distribution tarball and copy it and the DNSViz spec file to the appropriate rpmbuild subdirectories. ``` -$ python setup.py sdist +$ python3 setup.py sdist $ cp dist/dnsviz-*.tar.gz ~/rpmbuild/SOURCES/ -$ cp contrib/dnsviz-py${PY_VERS}.spec ~/rpmbuild/SPECS/dnsviz.spec +$ cp contrib/dnsviz.spec ~/rpmbuild/SPECS/ ``` Install dnspython, pygraphviz, and M2Crypto. ``` -$ sudo dnf install python${PY_VERS}-dns python${PY_VERS}-pygraphviz -``` -For python2: -``` -$ sudo dnf install m2crypto -``` -For python3: -``` -$ sudo dnf install python3-m2crypto +$ sudo dnf install python3-dns python3-pygraphviz python3-m2crypto ``` +(Note that as of Fedora 33, the latest version of M2Crypto is 0.35.2. If you +would like support for DNSSEC algorithms 15 (Ed25519) and 16 (Ed448), you will +need to install M2Crypto using `pip3`. For example, see [installation to a +virtual environment](#installation-in-a-virtual-environment).) Build and install the DNSViz RPM. ``` diff --git a/contrib/dnsviz-py2.spec b/contrib/dnsviz-py2.spec deleted file mode 100644 index af533a0..0000000 --- a/contrib/dnsviz-py2.spec +++ /dev/null @@ -1,65 +0,0 @@ -Name: dnsviz -Version: 0.8.1 -Release: 1%{?dist} -Summary: Tools for analyzing and visualizing DNS and DNSSEC behavior - -License: GPLv2+ -URL: https://github.com/dnsviz/dnsviz -Source0: https://github.com/dnsviz/dnsviz/releases/download/v%{version}/%{name}-%{version}.tar.gz - -BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: graphviz -BuildRequires: make -# python2-pygraphviz should be >= 1.4 -Requires: python2-pygraphviz >= 1.3 -Requires: m2crypto >= 0.37.0 -Requires: python2-dns >= 1.13 - -%description -DNSViz is a tool suite for analysis and visualization of Domain Name System -(DNS) behavior, including its security extensions (DNSSEC). This tool suite -powers the Web-based analysis available at http://dnsviz.net/ - -%prep -%autosetup - -%build -%py2_build - -%install -#XXX Normally the py2_install macro would be used here, -# but dnsviz/config.py is build with the install command, -# so install MUST call the build subcommand, so config.py -# will be proplerly placed. With py2_install, the -# --skip-build argument is used. -%{__python2} %{py_setup} %{?py_setup_args} install -O1 --root %{buildroot} %{?*} - -#XXX no checks yet -#%check -#%{__python2} setup.py test - -%clean -rm -rf %{buildroot} - -%files -%license LICENSE -%doc README.md -%{python2_sitelib}/%{name}/* -%{python2_sitelib}/%{name}-%{version}-py2.7.egg-info/* -%{_bindir}/%{name} -%{_datadir}/%{name}/* -%{_defaultdocdir}/%{name}/dnsviz-graph.html -%{_defaultdocdir}/%{name}/images/*png -%{_mandir}/man1/%{name}.1* -%{_mandir}/man1/%{name}-probe.1* -%{_mandir}/man1/%{name}-graph.1* -%{_mandir}/man1/%{name}-grok.1* -%{_mandir}/man1/%{name}-print.1* -%{_mandir}/man1/%{name}-query.1* - -%changelog -* Wed Feb 6 2019 Casey Deccio - 0.8.1 release -* Fri Jan 25 2019 Casey Deccio - 0.8.0 release diff --git a/contrib/dnsviz-py3.spec b/contrib/dnsviz.spec index 26b6c6b..37faf84 100644 --- a/contrib/dnsviz-py3.spec +++ b/contrib/dnsviz.spec @@ -1,5 +1,5 @@ Name: dnsviz -Version: 0.8.0 +Version: 0.8.1 Release: 1%{?dist} Summary: Tools for analyzing and visualizing DNS and DNSSEC behavior @@ -11,9 +11,8 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: graphviz BuildRequires: make -# python3-pygraphviz should be >= 1.4 -Requires: python3-pygraphviz >= 1.3 -Requires: python3-m2crypto >= 0.37.0 +Requires: python3-pygraphviz >= 1.4 +Requires: python3-m2crypto >= 0.28.0 Requires: python3-dns >= 1.13 %description @@ -46,7 +45,7 @@ rm -rf %{buildroot} %license LICENSE %doc README.md %{python3_sitelib}/%{name}/* -%{python3_sitelib}/%{name}-%{version}-py3.7.egg-info/* +%{python3_sitelib}/%{name}-%{version}-*.egg-info/* %{_bindir}/%{name} %{_datadir}/%{name}/* %{_defaultdocdir}/%{name}/dnsviz-graph.html |