diff options
| -rw-r--r-- | buildtools/debian-skeleton/control | 6 | ||||
| -rw-r--r-- | buildtools/debian-skeleton/rules | 2 | ||||
| -rw-r--r-- | buildtools/freebsd-skeleton/rpki-rp/Makefile | 1 | ||||
| -rwxr-xr-x | configure | 60 | ||||
| -rw-r--r-- | configure.ac | 47 |
5 files changed, 68 insertions, 48 deletions
diff --git a/buildtools/debian-skeleton/control b/buildtools/debian-skeleton/control index a91c21ca..5feacdaf 100644 --- a/buildtools/debian-skeleton/control +++ b/buildtools/debian-skeleton/control @@ -2,7 +2,7 @@ Source: rpki Section: net Priority: extra Maintainer: Rob Austein <sra@hactrn.net> -Build-Depends: debhelper (>= 8.0.0), autotools-dev, rsync, rrdtool, xsltproc, python (>= 2.7), python-all-dev, python-setuptools, python-lxml, libxml2-utils, mysql-client, mysql-server, python-mysqldb, python-vobject, python-yaml, python-django (>= 1.3.7), python-django-south (>= 0.7.5) +Build-Depends: debhelper (>= 8.0.0), autotools-dev, python (>= 2.7), python-all-dev, python-setuptools Standards-Version: 3.9.3 Homepage: http://trac.rpki.net/ Vcs-Svn: http://subvert-rpki.hactrn.net/ @@ -11,7 +11,7 @@ X-Python-Version: 2.7 Package: rpki-rp Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7), rrdtool, rsync, xinetd, apache2, ssl-cert +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7), apache2, ssl-cert, python-lxml, postgresql, postgresql-client, python-psycopg2, python-django (>= 1.8.0), python-tornado, rrdtool, rsync, xinetd Description: rpki.net relying party tools "Relying party" validation tools from the rpki.net toolkit. See the online documentation at http://rpki.net/. @@ -19,7 +19,7 @@ Replaces: rpki-ca (<= 0.5767) Package: rpki-ca Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, rpki-rp (= ${binary:Version}), xsltproc, python (>= 2.7), python-lxml, libxml2-utils, mysql-client, mysql-server, python-mysqldb, python-vobject, python-yaml, python-django (>= 1.3.7), python-django-south (>= 0.7.5), apache2, libapache2-mod-wsgi, python-netifaces, ssl-cert +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7), apache2, ssl-cert, python-lxml, postgresql, postgresql-client, python-psycopg2, python-django (>= 1.8.0), python-tornado, libapache2-mod-wsgi, python-vobject, python-yaml, python-netifaces, rpki-rp (= ${binary:Version}) Description: rpki.net certification authority tools "Certification authority" tools for issuing RPKI certificates and related objects using the rpki.net toolkit. diff --git a/buildtools/debian-skeleton/rules b/buildtools/debian-skeleton/rules index ea2b043f..c7d9d197 100644 --- a/buildtools/debian-skeleton/rules +++ b/buildtools/debian-skeleton/rules @@ -8,7 +8,7 @@ export DH_VERBOSE=1 dh $@ --with python2 override_dh_auto_configure: - dh_auto_configure -- --disable-target-installation --enable-python-install-layout=deb + dh_auto_configure -- --disable-target-installation --enable-python-install-layout=deb --disable-runtime-dependencies override_dh_auto_test: @true diff --git a/buildtools/freebsd-skeleton/rpki-rp/Makefile b/buildtools/freebsd-skeleton/rpki-rp/Makefile index 47f1d27e..5b27f211 100644 --- a/buildtools/freebsd-skeleton/rpki-rp/Makefile +++ b/buildtools/freebsd-skeleton/rpki-rp/Makefile @@ -26,6 +26,7 @@ BUILD_DEPENDS+= makedepend>0:${PORTSDIR}/devel/makedepend RCYNIC_DEPENDS= rsync>0:${PORTSDIR}/net/rsync \ rrdtool>0:${PORTSDIR}/databases/rrdtool \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}django18>=1.8:${PORTSDIR}/www/py-django18 \ ${PYTHON_PKGNAMEPREFIX}tornado>0:${PORTSDIR}/www/py-tornado @@ -4752,11 +4752,11 @@ if $PYTHON -c 'import lxml.etree' 2>/dev/null; then have_lxml=yes; else have_lxm { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_lxml" >&5 $as_echo "$have_lxml" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQLdb" >&5 -$as_echo_n "checking for MySQLdb... " >&6; } -if $PYTHON -c 'import MySQLdb' 2>/dev/null; then have_mysqldb=yes; else have_mysqldb=no; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_mysqldb" >&5 -$as_echo "$have_mysqldb" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tornado" >&5 +$as_echo_n "checking for Tornado... " >&6; } +if $PYTHON -c 'import tornado' 2>/dev/null; then have_tornado=yes; else have_tornado=no; fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_tornado" >&5 +$as_echo "$have_tornado" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Django" >&5 $as_echo_n "checking for Django... " >&6; } @@ -4815,8 +4815,8 @@ then if test $have_python_h = no then build_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I can't find Python.h. Python sources are required to build the RP tools." >&5 -$as_echo "$as_me: WARNING: I can't find Python.h. Python sources are required to build the RP tools." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I can't find Python.h. Python sources are required to build the rpki.POW module." >&5 +$as_echo "$as_me: WARNING: I can't find Python.h. Python sources are required to build the rpki.POW module." >&2;} fi if test "x$RRDTOOL" = "x" then @@ -4832,32 +4832,42 @@ $as_echo "$as_me: WARNING: The RPKI relying party tools require rsync." >&2;} fi fi +if test $have_lxml = no +then + runtime_ok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require the Python LXML package." >&5 +$as_echo "$as_me: WARNING: The RPKI tools require the Python LXML package." >&2;} +fi + +if test $have_acceptable_django = no +then + runtime_ok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require Django 1.8 or higher." >&5 +$as_echo "$as_me: WARNING: The RPKI tools require Django 1.8 or higher." >&2;} +fi + +if test $have_argparse = no +then + runtime_ok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require the Python argparse module." >&5 +$as_echo "$as_me: WARNING: The RPKI tools require the Python argparse module." >&2;} +fi + +if test $have_tornado = no +then + runtime_ok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require the Python Tornado package." >&5 +$as_echo "$as_me: WARNING: The RPKI tools require the Python Tornado package." >&2;} +fi + if test $build_ca_tools = yes then - if test $have_lxml = no - then - runtime_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require the Python LXML module." >&5 -$as_echo "$as_me: WARNING: The RPKI tools require the Python LXML module." >&2;} - fi - if test $have_acceptable_django = no - then - runtime_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA tools require Django 1.8 or higher." >&5 -$as_echo "$as_me: WARNING: The RPKI CA tools require Django 1.8 or higher." >&2;} - fi if test $have_vobject = no then runtime_ok=no { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA GUI requires the Python vobject module." >&5 $as_echo "$as_me: WARNING: The RPKI CA GUI requires the Python vobject module." >&2;} fi - if test $have_argparse = no - then - runtime_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA tools require the Python argparse module." >&5 -$as_echo "$as_me: WARNING: The RPKI CA tools require the Python argparse module." >&2;} - fi if test $have_pyyaml = no then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PyYAML missing, so \"make test\" will not work properly." >&5 diff --git a/configure.ac b/configure.ac index a41ebeda..0d06dd5d 100644 --- a/configure.ac +++ b/configure.ac @@ -532,9 +532,9 @@ AC_MSG_CHECKING([for lxml.etree]) if $PYTHON -c 'import lxml.etree' 2>/dev/null; then have_lxml=yes; else have_lxml=no; fi AC_MSG_RESULT([$have_lxml]) -AC_MSG_CHECKING([for MySQLdb]) -if $PYTHON -c 'import MySQLdb' 2>/dev/null; then have_mysqldb=yes; else have_mysqldb=no; fi -AC_MSG_RESULT([$have_mysqldb]) +AC_MSG_CHECKING([for Tornado]) +if $PYTHON -c 'import tornado' 2>/dev/null; then have_tornado=yes; else have_tornado=no; fi +AC_MSG_RESULT([$have_tornado]) AC_MSG_CHECKING([for Django]) if $PYTHON -c 'import django' 2>/dev/null; then have_django=yes; else have_django=no; fi @@ -582,7 +582,7 @@ then if test $have_python_h = no then build_ok=no - AC_MSG_WARN([I can't find Python.h. Python sources are required to build the RP tools.]) + AC_MSG_WARN([I can't find Python.h. Python sources are required to build the rpki.POW module.]) fi if test "x$RRDTOOL" = "x" then @@ -596,28 +596,37 @@ then fi fi +if test $have_lxml = no +then + runtime_ok=no + AC_MSG_WARN([The RPKI tools require the Python LXML package.]) +fi + +if test $have_acceptable_django = no +then + runtime_ok=no + AC_MSG_WARN([The RPKI tools require Django 1.8 or higher.]) +fi + +if test $have_argparse = no +then + runtime_ok=no + AC_MSG_WARN([The RPKI tools require the Python argparse module.]) +fi + +if test $have_tornado = no +then + runtime_ok=no + AC_MSG_WARN([The RPKI tools require the Python Tornado package.]) +fi + if test $build_ca_tools = yes then - if test $have_lxml = no - then - runtime_ok=no - AC_MSG_WARN([The RPKI tools require the Python LXML module.]) - fi - if test $have_acceptable_django = no - then - runtime_ok=no - AC_MSG_WARN([The RPKI CA tools require Django 1.8 or higher.]) - fi if test $have_vobject = no then runtime_ok=no AC_MSG_WARN([The RPKI CA GUI requires the Python vobject module.]) fi - if test $have_argparse = no - then - runtime_ok=no - AC_MSG_WARN([The RPKI CA tools require the Python argparse module.]) - fi if test $have_pyyaml = no then AC_MSG_WARN([PyYAML missing, so "make test" will not work properly.]) |