From 39e700fe186e6d7b0f62803935308da2f05cc0b2 Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Thu, 26 Aug 2021 00:01:41 +0200 Subject: [PATCH] www-apps/netbox: Version bump to 2.11.12 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alarig Le Lay --- www-apps/netbox/Manifest | 2 +- ...-pip.patch => netbox-2.11.12-no-pip.patch} | 24 +++++-- ...ox-2.10.5.ebuild => netbox-2.11.12.ebuild} | 65 +++++++++++++------ 3 files changed, 63 insertions(+), 28 deletions(-) rename www-apps/netbox/files/{netbox-2.10.5-no-pip.patch => netbox-2.11.12-no-pip.patch} (73%) rename www-apps/netbox/{netbox-2.10.5.ebuild => netbox-2.11.12.ebuild} (59%) diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest index e3ffbba..bc66020 100644 --- a/www-apps/netbox/Manifest +++ b/www-apps/netbox/Manifest @@ -1,3 +1,3 @@ -DIST netbox-2.10.5.tar.gz 7063897 BLAKE2B 87a0b3a8f7251d770752c4e4d4bd45f379aa473ef5de754b9e8319791b81f45f9887710746b0070d2d4797b0abcc0ac7728578d72d8b92a5de626732d232a4ab SHA512 db93fa4d4bd64fea95558f64b8149aeac81c47472b8fbd7836e8a70ceacf24a4abba9c93e4795400fc8627f4e19426441fc7a66d63452ec93b6f9c07030c9fac +DIST netbox-2.11.12.tar.gz 7125072 BLAKE2B 4136748fed3b6559aecdf489f2f300f656c8b617fb62442fe94d2f08f58a21b493062e8d24e2ee94889e3e530f9f757adfe3eaef78ee4a240c7a1c584ad2bf5d SHA512 6c4c0ad99d6df9b8a97065e2f326ce46d666313c6eb93e72c163f32a1ed7450409ab528ceee97b8c12f9702d333dd51d8dd4402eddcfe338598d5bfd05d9a72f DIST netbox-2.11.3.tar.gz 7102639 BLAKE2B cc4339c6ceb3446467b21959deb20995059e9852742e4049282a446035a68b23175a7d971587763cb43bdcef206f3918995705e9b2ec2ecebfd32615586b8d87 SHA512 7e12bc7731d8d3f0d4b3c622689b21ac7d50236bb071d8d60247d8810e6867689f8bda54f84c90a0d64631308517bf78f8f7bcf024495fdc6e9a7167eee94439 DIST netbox-2.11.4.tar.gz 7104191 BLAKE2B 169808bcf26b1d68e6cc4254815b6b44b7bf1da2649c748a405894c08bd32efba32c66676325ad936a7b3436de9c099e887c1350a918fbde3e360758e82134f3 SHA512 01099b2ba64de698e90b3eeef18fe38c698a910031a328f22bbd7dedaf0a2e3f56450e87a37e4fed1fb6478e5ffd5aec67f10a91987a6d66cda742995c6133a9 diff --git a/www-apps/netbox/files/netbox-2.10.5-no-pip.patch b/www-apps/netbox/files/netbox-2.11.12-no-pip.patch similarity index 73% rename from www-apps/netbox/files/netbox-2.10.5-no-pip.patch rename to www-apps/netbox/files/netbox-2.11.12-no-pip.patch index fd5f909..0f3bf95 100644 --- a/www-apps/netbox/files/netbox-2.10.5-no-pip.patch +++ b/www-apps/netbox/files/netbox-2.11.12-no-pip.patch @@ -1,11 +1,23 @@ ---- a/upgrade.sh 2021-03-15 14:54:09.287164820 +0100 -+++ b/upgrade.sh 2021-03-15 15:08:32.463687738 +0100 -@@ -14,48 +14,6 @@ - WARN_MISSING_VENV=1 - fi +--- a/upgrade.sh 2021-08-25 23:49:35.343236769 +0200 ++++ b/upgrade.sh 2021-08-25 23:50:31.305521930 +0200 +@@ -2,60 +2,6 @@ + # This script will prepare NetBox to run after the code has been upgraded to + # its most recent release. +-cd "$(dirname "$0")" +-VIRTUALENV="$(pwd -P)/venv" +- +-# Remove the existing virtual environment (if any) +-if [ -d "$VIRTUALENV" ]; then +- COMMAND="rm -rf ${VIRTUALENV}" +- echo "Removing old virtual environment..." +- eval $COMMAND +-else +- WARN_MISSING_VENV=1 +-fi +- -# Create a new virtual environment --COMMAND="/usr/bin/python3 -m venv ${VIRTUALENV}" +-COMMAND="python3 -m venv ${VIRTUALENV}" -echo "Creating a new virtual environment at ${VIRTUALENV}..." -eval $COMMAND || { - echo "--------------------------------------------------------------------" diff --git a/www-apps/netbox/netbox-2.10.5.ebuild b/www-apps/netbox/netbox-2.11.12.ebuild similarity index 59% rename from www-apps/netbox/netbox-2.10.5.ebuild rename to www-apps/netbox/netbox-2.11.12.ebuild index 83ab5da..8b3f5d4 100644 --- a/www-apps/netbox/netbox-2.10.5.ebuild +++ b/www-apps/netbox/netbox-2.11.12.ebuild @@ -20,28 +20,29 @@ RDEPEND=" acct-user/netbox ${PYTHON_DEPS} $(python_gen_cond_dep ' - >=dev-python/django-3.1.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/django-cacheops-5.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/django-cors-headers-3.5.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/django-debug-toolbar-3.1.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/django-3.2.6[${PYTHON_MULTI_USEDEP}] + >=dev-python/django-cacheops-6.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/django-cors-headers-3.8.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/django-debug-toolbar-3.2.2[${PYTHON_MULTI_USEDEP}] >=dev-python/django-filter-2.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/django-mptt-0.11.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/django-mptt-0.13.1[${PYTHON_MULTI_USEDEP}] >=dev-python/django-pglocks-1.0.4[${PYTHON_MULTI_USEDEP}] >=dev-python/django-prometheus-2.1.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/djangorestframework-3.12.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/django-rq-2.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/django-tables2-2.3.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/django-taggit-1.3.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/django-timezone-field-4.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/django-rq-2.4.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/django-tables2-2.4.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/django-taggit-1.5.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/django-timezone-field-4.1.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/djangorestframework-3.12.4[${PYTHON_MULTI_USEDEP}] >=dev-python/drf-yasg-1.20.0[${PYTHON_MULTI_USEDEP},validation] - >=dev-python/jinja-2.11.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/markdown-3.3.3[${PYTHON_MULTI_USEDEP}] + >=dev-python/jinja-3.0.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/markdown-3.3.4[${PYTHON_MULTI_USEDEP}] >=dev-python/netaddr-0.8.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pillow-8.0.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/psycopg-2.8.6[${PYTHON_MULTI_USEDEP}] - >=dev-python/pycryptodome-3.9.9[${PYTHON_MULTI_USEDEP}] - >=dev-python/pyyaml-5.3.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/svgwrite-1.4[${PYTHON_MULTI_USEDEP}] + >=dev-python/pillow-8.3.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/psycopg-2.9.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/pycryptodome-3.10.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/pyyaml-5.4.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/svgwrite-1.4.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/tablib-3.0.0[${PYTHON_MULTI_USEDEP}] www-servers/gunicorn[${PYTHON_MULTI_USEDEP}] ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] ) ')" @@ -91,7 +92,7 @@ src_install() { dodir /opt cp -a ../${P} "${ED}"/opt dosym ${P} /opt/netbox -dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py + dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py dosym ../../../../etc/netbox/configuration.py \ /opt/netbox/netbox/netbox/configuration.py dodir /etc/netbox @@ -110,11 +111,33 @@ dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py pkg_postinst() { readme.gentoo_print_elog - local r - for r in $REPLACING_VERSIONS; do - if [[ $r = "2.5.10" ]]; then + for LAST_PREVIOUS_VERSION in $REPLACING_VERSIONS; do + if [[ "$LAST_PREVIOUS_VERSION" = "2.5.10" ]]; then ewarn "The home directory of the netbox user is now /var/lib/netbox" ewarn "Please adjust your system." fi done + + if [ -z "${LAST_PREVIOUS_VERSION}" ]; then + exit + fi + + LAST_BASE_DIRECTORY="/opt/netbox-${LAST_PREVIOUS_VERSION}" + NBCP="su -l ${PN} -s /bin/sh -c cp" + if [ -f "${LAST_BASE_DIRECTORY}/local_requirements.txt}" ]; then + ${NBCP} "${LAST_BASE_DIRECTORY}/local_requirements.txt}" /opt/netbox + fi + if [ -f "${LAST_BASE_DIRECTORY}/netbox/netbox/ldap_config.py" ]; then + ${NBCP} "${LAST_BASE_DIRECTORY}/netbox/netbox/ldap_config.py" /opt/netbox/netbox/netbox/ + fi + if [ -d "${LAST_BASE_DIRECTORY}/netbox/media" ]; then + ${NBCP} -pr "${LAST_BASE_DIRECTORY}/netbox/media" /opt/netbox/netbox/ + fi + if [ -d "${LAST_BASE_DIRECTORY}/netbox/scripts" ]; then + ${NBCP} -pr "${LAST_BASE_DIRECTORY}/netbox/scripts" /opt/netbox/netbox/ + fi + if [ -d "${LAST_BASE_DIRECTORY}/netbox/reports" ]; then + ${NBCP} -pr "${LAST_BASE_DIRECTORY}/netbox/reports" /opt/netbox/netbox/ + fi + cd /opt/netbox && su -l "${PN}" -s /bin/sh -c ./upgrade.sh }