public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/files/, www-apps/netbox/
@ 2019-05-01 21:56 William Hubbs
  0 siblings, 0 replies; 3+ messages in thread
From: William Hubbs @ 2019-05-01 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     a1673d48e60c63fb893b1ffeda18133b632c5f72
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Wed May  1 21:54:10 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed May  1 21:55:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1673d48

www-apps/netbox: 2.5.12 bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 www-apps/netbox/Manifest                         |   1 +
 www-apps/netbox/files/netbox-2.5.12-no-pip.patch |  27 ++++++
 www-apps/netbox/netbox-2.5.12.ebuild             | 118 +++++++++++++++++++++++
 3 files changed, 146 insertions(+)

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 2f26f7d2126..fedbeb9fccb 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,2 +1,3 @@
 DIST netbox-2.5.10.tar.gz 2363340 BLAKE2B 9bc946398ac75b585f2bc6fdb01bfb7545c92ccbb239e9ac0309b66be435134a87cde5fcf876cec4c3354e7aedf5af1d9e1976574689dfb0af34404e9c9f907f SHA512 ed71b0efaffd8bad6e53f7b281d1933234161f031110fa901e1b789a964f000f2ff13897685e79193cbee9294c1f50b8c6edef7d0ef6f829a7357640c8034525
 DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d
+DIST netbox-2.5.12.tar.gz 2364874 BLAKE2B efe1360fd7c1105e5c6010ee22a882fb4fc796ff0f907974984dba35a0ab6da7724fd6042b102cebe3e3e291c3a1c65c347a5967edbaf443ece6fe61648a93be SHA512 e105a351f1150139c5bce36527ea650f95504ccc1c7b6a82c41396d69bc8671758cc3b33789c95c81785c5ff54d34c7310cd3e03e65bd006606e85021dcd1795

diff --git a/www-apps/netbox/files/netbox-2.5.12-no-pip.patch b/www-apps/netbox/files/netbox-2.5.12-no-pip.patch
new file mode 100644
index 00000000000..5d1fa595f4e
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.5.12-no-pip.patch
@@ -0,0 +1,27 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index 24e79f5b..248e1cb5 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -8,22 +8,6 @@
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# TODO: Remove this in v2.6 as it is no longer needed under Python 3
+-# Delete stale bytecode
+-COMMAND="find . -name \"*.pyc\" -delete"
+-echo "Cleaning up stale Python bytecode ($COMMAND)..."
+-eval $COMMAND
+-
+-# Uninstall any Python packages which are no longer needed
+-COMMAND="${PIP} uninstall -r old_requirements.txt -y"
+-echo "Removing old Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Install any new Python packages
+-COMMAND="${PIP} install -r requirements.txt --upgrade"
+-echo "Updating required Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/netbox-2.5.12.ebuild b/www-apps/netbox/netbox-2.5.12.ebuild
new file mode 100644
index 00000000000..02a00a2c553
--- /dev/null
+++ b/www-apps/netbox/netbox-2.5.12.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 user readme.gentoo-r1
+
+DESCRIPTION="IP address and data center infrastructure management tool"
+HOMEPAGE="https://github.com/digitalocean/netbox"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+
+RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
+	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
+	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
+	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
+	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	webhooks? ( dev-python/django-rq )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-pip.patch
+	)
+
+DISABLE_AUTOFORMATTING=YES
+DOC_CONTENTS="
+netbox is installed on your system. However, there are some manual steps
+you need to complete from the installation guide [1].
+
+On Gentoo, the configuration files you need to edit are located in
+/etc/netbox, not /opt/netbox as shown in the installation guide.
+
+If this is a new installation, please follow the installation guide
+other than this difference. Also, if you need ldap or webhooks, set the
+appropriate use flags when you emerge netbox to install the
+dependencies.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you have webhooks turned on,  you should also add the netbox-rqworker
+service to the default runlevel and start it.
+
+If this is an upgrade, follow these instructions:
+
+Stop the netbox service. If the  netbox-rqworker service is running,
+stop it as well.
+
+Next, run the upgrade script as described in the upgrading guide[2].
+
+Next, check for new configuration options and set them as appropriate
+for your system.
+
+Next, start the netbox service.
+
+Finally, if you are using webhooks, start the netbox-rqworker service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+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/configuration.py \
+	/opt/netbox/netbox/netbox/configuration.py
+	dodir /etc/netbox
+	insinto /etc/netbox
+	newins netbox/netbox/configuration.example.py configuration.py
+	doins "${FILESDIR}"/gunicorn_config.py
+	fowners -R netbox:netbox /etc/netbox /opt/${P}
+	fowners -h netbox:netbox /opt/netbox
+	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use webhooks &&
+		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
+	keepdir /var/log/netbox
+	fowners -R netbox:netbox /var/log/netbox
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	local r
+	for r in $REPLACING_VERSIONS; do
+		if [[ $r = "2.5.10" ]]; then
+			ewarn "The home directory of the netbox user is now /var/lib/netbox"
+			ewarn "Please adjust your system."
+		fi
+	done
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/files/, www-apps/netbox/
@ 2019-05-01 21:59 William Hubbs
  0 siblings, 0 replies; 3+ messages in thread
From: William Hubbs @ 2019-05-01 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     a00e5db4ee7f280d7744e3d116c815caccdf777f
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Wed May  1 21:59:00 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed May  1 21:59:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a00e5db4

www-apps/netbox: remove 2.5.10

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 www-apps/netbox/Manifest                         |   1 -
 www-apps/netbox/files/netbox-2.5.10-no-pip.patch |  27 ------
 www-apps/netbox/netbox-2.5.10-r1.ebuild          | 107 -----------------------
 www-apps/netbox/netbox-2.5.10.ebuild             | 100 ---------------------
 4 files changed, 235 deletions(-)

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index fedbeb9fccb..70891e41ba8 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,3 +1,2 @@
-DIST netbox-2.5.10.tar.gz 2363340 BLAKE2B 9bc946398ac75b585f2bc6fdb01bfb7545c92ccbb239e9ac0309b66be435134a87cde5fcf876cec4c3354e7aedf5af1d9e1976574689dfb0af34404e9c9f907f SHA512 ed71b0efaffd8bad6e53f7b281d1933234161f031110fa901e1b789a964f000f2ff13897685e79193cbee9294c1f50b8c6edef7d0ef6f829a7357640c8034525
 DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d
 DIST netbox-2.5.12.tar.gz 2364874 BLAKE2B efe1360fd7c1105e5c6010ee22a882fb4fc796ff0f907974984dba35a0ab6da7724fd6042b102cebe3e3e291c3a1c65c347a5967edbaf443ece6fe61648a93be SHA512 e105a351f1150139c5bce36527ea650f95504ccc1c7b6a82c41396d69bc8671758cc3b33789c95c81785c5ff54d34c7310cd3e03e65bd006606e85021dcd1795

diff --git a/www-apps/netbox/files/netbox-2.5.10-no-pip.patch b/www-apps/netbox/files/netbox-2.5.10-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e..00000000000
--- a/www-apps/netbox/files/netbox-2.5.10-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/netbox-2.5.10-r1.ebuild b/www-apps/netbox/netbox-2.5.10-r1.ebuild
deleted file mode 100644
index c12e3feb2dc..00000000000
--- a/www-apps/netbox/netbox-2.5.10-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-
-RDEPEND=">=dev-python/django-2.1.5[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( dev-python/django-rq )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete.
-
-If this is a new installation, please follow these instructions:
-
-From the installation instructions [1], you need to configure postgres
-ldap and webhooks if you want to use them.  Then, you need to
-configure and install a web server. Gunicorn is already installed, so
-skip that step.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-	to the default runlevel and start it.
-
-The files you need to edit are located in /etc/netbox, not /opt/netbox,
-as shown in the installation instructions.
-
-If this is an upgrade, you just need to stop the netbox service,
-	run the /opt/netbox/upgrade.sh script, check for new configuration
-	options in the installation documentation [1] then restart the
-	service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}

diff --git a/www-apps/netbox/netbox-2.5.10.ebuild b/www-apps/netbox/netbox-2.5.10.ebuild
deleted file mode 100644
index efa1ca65e92..00000000000
--- a/www-apps/netbox/netbox-2.5.10.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-
-RDEPEND=">=dev-python/django-2.1.5[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( dev-python/django-rq )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete.
-
-If this is a new installation, please follow these instructions:
-
-From the installation instructions [1], you need to configure postgres
-ldap and webhooks if you want to use them.  Then, you need to
-configure and install a web server. Gunicorn is already installed, so
-skip that step.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-	to the default runlevel and start it.
-
-The files you need to edit are located in /etc/netbox, not /opt/netbox,
-as shown in the installation instructions.
-
-If this is an upgrade, you just need to stop the netbox service,
-	run the /opt/netbox/upgrade.sh script, check for new configuration
-	options in the installation documentation [1] then restart the
-	service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /opt/${PN} ${PN}
-}
-
-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/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/files/, www-apps/netbox/
@ 2019-11-17 19:29 William Hubbs
  0 siblings, 0 replies; 3+ messages in thread
From: William Hubbs @ 2019-11-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     5b529b02ecf3417aa21b87b2ead3ba563a1afbf4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 19:26:30 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 19:27:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b529b02

www-apps/netbox: 2.6.7 bump

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 www-apps/netbox/Manifest                        |   1 +
 www-apps/netbox/files/netbox-2.6.7-no-pip.patch |  32 ++++++
 www-apps/netbox/netbox-2.6.7.ebuild             | 124 ++++++++++++++++++++++++
 3 files changed, 157 insertions(+)

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index b76f4454a5e..c60ca246557 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -4,3 +4,4 @@ DIST netbox-2.6.1.tar.gz 2393902 BLAKE2B 027115458cbb873cb7aa7660a6cd1df46a7768d
 DIST netbox-2.6.4.tar.gz 2408970 BLAKE2B 47fa3473e893e8443aace8b587df0065a3024a34f9509644deddce7c53e5ac8b3832df55604f3328d699f8f703ae15ad5b52312e1af8fcccabb7cd06377c8a09 SHA512 b137ec7f2d33bb7b48bcb38719ac9ea8cc31d7d38e33cedfb3279b8be2078c9a48ede10db1e4b4cab4a08c77e010060936e445cb6a1d2e6247bcc8d935cc9c3a
 DIST netbox-2.6.5.tar.gz 2408180 BLAKE2B d119a1bf8256e0d6265eda7122a1d436ecb0e8e640acd12890d242c2c93768b21b5f8ebdbaecdfa31c0eaab0150edf52f08a1f424102fd940dd359bd8eafd4af SHA512 0b76e5bc3f56effbf7493680d10d549caf36e7769e21a2c24449cbe329379369f3428354c228d0cbbbc153dc62efb5c0e56c4a0d71c99f3267acd2446f48fb8a
 DIST netbox-2.6.6.tar.gz 2414895 BLAKE2B b27e1bd5bf810627a4ec563b2eb5dbd7c86bf3d98e52555e511ee16492fd96a6cb7604dce8f5954120ab8b3a48d6acf7878721005bcfd2bd9e3880294dfbcd4d SHA512 9b44442cea1f76cdecb37faee8fe32012b869ff63c1b0bc678d2bb8624851941e9296854a9d85abea24e49a75fd5b31b968e4adbd56e5bc03a1c9f28fc8b846e
+DIST netbox-2.6.7.tar.gz 2416096 BLAKE2B 9c9744b60c3999fa7c3336539937cc20eebac67559444a4512cc4d69e8d38babc147254fd1fc49b8515203a8fd4411bc61c4c30aa3313e1ffe0d0e86abd8c9bb SHA512 63ed6a95a1f33ee5dd19dc2e43fc5c6aa09979c6f6856b28060992a8aaee956363caf20c48e72884adb84d260669d828311c0cf0d143fc0e58fed9677baf76db

diff --git a/www-apps/netbox/files/netbox-2.6.7-no-pip.patch b/www-apps/netbox/files/netbox-2.6.7-no-pip.patch
new file mode 100644
index 00000000000..a47e151c084
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.6.7-no-pip.patch
@@ -0,0 +1,32 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index d17dec06..6972ed2f 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -10,27 +10,6 @@ cd "$(dirname "$0")"
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# Uninstall any Python packages which are no longer needed
+-COMMAND="${PIP} uninstall -r old_requirements.txt -y"
+-echo "Removing old Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Install any new Python packages
+-COMMAND="${PIP} install -r requirements.txt --upgrade"
+-echo "Updating required Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Validate Python dependencies
+-COMMAND="${PIP} check"
+-echo "Validating Python dependencies ($COMMAND)..."
+-eval $COMMAND || (
+-  echo "******** PLEASE FIX THE DEPENDENCIES BEFORE CONTINUING ********"
+-  echo "* Manually install newer version(s) of the highlighted packages"
+-  echo "* so that 'pip3 check' passes. For more information see:"
+-  echo "* https://github.com/pypa/pip/issues/988"
+-  exit 1
+-)
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/netbox-2.6.7.ebuild b/www-apps/netbox/netbox-2.6.7.ebuild
new file mode 100644
index 00000000000..5058c620813
--- /dev/null
+++ b/www-apps/netbox/netbox-2.6.7.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 user readme.gentoo-r1
+
+DESCRIPTION="IP address and data center infrastructure management tool"
+HOMEPAGE="https://github.com/netbox-community/netbox"
+SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
+	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
+	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
+	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
+	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
+	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
+	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/pillow-6.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
+	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-pip.patch
+	)
+
+DISABLE_AUTOFORMATTING=YES
+DOC_CONTENTS="
+netbox is installed on your system. However, there are some manual steps
+you need to complete from the installation guide [1].
+
+On Gentoo, the configuration files you need to edit are located in
+/etc/netbox, not /opt/netbox as shown in the installation guide.
+
+If this is a new installation, please follow the installation guide
+other than this difference. Also, if you need ldap or webhooks, set the
+appropriate use flags when you emerge netbox to install the
+dependencies.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you have webhooks turned on,  you should also add the netbox-rqworker
+service to the default runlevel and start it.
+
+If this is an upgrade, follow these instructions:
+
+Stop the netbox service. If the  netbox-rqworker service is running,
+stop it as well.
+
+Next, run the upgrade script as described in the upgrading guide[2].
+
+Next, check for new configuration options and set them as appropriate
+for your system.
+
+Next, start the netbox service.
+
+Finally, if you are using webhooks, start the netbox-rqworker service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+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/configuration.py \
+	/opt/netbox/netbox/netbox/configuration.py
+	dodir /etc/netbox
+	insinto /etc/netbox
+	newins netbox/netbox/configuration.example.py configuration.py
+	doins "${FILESDIR}"/gunicorn_config.py
+	fowners -R netbox:netbox /etc/netbox /opt/${P}
+	fowners -h netbox:netbox /opt/netbox
+	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use webhooks &&
+		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
+	keepdir /var/log/netbox
+	fowners -R netbox:netbox /var/log/netbox
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	local r
+	for r in $REPLACING_VERSIONS; do
+		if [[ $r = "2.5.10" ]]; then
+			ewarn "The home directory of the netbox user is now /var/lib/netbox"
+			ewarn "Please adjust your system."
+		fi
+	done
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-11-17 19:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-17 19:29 [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/files/, www-apps/netbox/ William Hubbs
  -- strict thread matches above, loose matches on Subject: below --
2019-05-01 21:59 William Hubbs
2019-05-01 21:56 William Hubbs

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox