[gentoo-commits] dev/jmbsvicetto:master commit in: net-analyzer/ocsng/

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     01ad552ba54ada20a15b3ff65d58cfb8fd6c1866
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 02:23:36 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 02:23:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=01ad552b

Bumped ocsng to release 2.0_rc4.

---
 net-analyzer/ocsng/ChangeLog            |    6 +
 net-analyzer/ocsng/Manifest             |    4 +-
 net-analyzer/ocsng/ocsng-2.0_rc4.ebuild |  187 +++++++++++++++++++++++++++++++
 3 files changed, 196 insertions(+), 1 deletions(-)

diff --git a/net-analyzer/ocsng/ChangeLog b/net-analyzer/ocsng/ChangeLog
index cffe8bc..997ae17 100644
--- a/net-analyzer/ocsng/ChangeLog
+++ b/net-analyzer/ocsng/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ocsng-2.0_rc4 (18 Apr 2011)
+
+  18 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +ocsng-2.0_rc4.ebuild:
+  Bumped ocsng to release 2.0_rc4.
+
 *ocsng-2.0_rc3 (18 Apr 2011)
 
   18 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>

diff --git a/net-analyzer/ocsng/Manifest b/net-analyzer/ocsng/Manifest
index c5037c4..2192396 100644
--- a/net-analyzer/ocsng/Manifest
+++ b/net-analyzer/ocsng/Manifest
@@ -5,10 +5,12 @@ DIST OCSNG_UNIX_SERVER-1.3.1.tar.gz 1509540 RMD160 043d9165e1b4623c08925a773e6ec
 DIST OCSNG_UNIX_SERVER-1.3.2.tar.gz 1513372 RMD160 201a4619ee67f674a61ce1af3ec2e3e77c390f08 SHA1 ac62694998f100f3b68b8e5174a4b46baf06db35 SHA256 cf75c3120a529c275463a76dbe787d391757487ac38f057e0ff8c7a88714761a
 DIST OCSNG_UNIX_SERVER-1.3.tar.gz 1495359 RMD160 18db2c0f18bd96a9067f38179db552f099be4231 SHA1 2ce8d5a9366f6d8583b3624d0700a1014b51aff0 SHA256 b1fc29185de9070c74d67a26598767e9e7ec02127e39ce97b860d58447d2834a
 DIST OCSNG_UNIX_SERVER-2.0rc3.tar.gz 6324894 RMD160 ecd99ca26f88790fe7abc489e9049bc1824435d4 SHA1 f7b91ea1e4aba360796f1c43ce221d3b717b6385 SHA256 7982a9e8356c1deb7812e7407abf884379a71a8848c3380d55e3a9b39f44f2bd
+DIST OCSNG_UNIX_SERVER-2.0rc4.tar.gz 6351875 RMD160 448a0712aa2e7f1336db0521a9b648bf5fde1701 SHA1 98c14795f7518e9b0ab4fa721c51e6cf596efce7 SHA256 cd5e5b7dda87c81a4f99f7b3b6ab4437a8c63aba9b3e18478badd4ac4ac7b241
 EBUILD ocsng-1.01.ebuild 5000 RMD160 492cf52e4b0daacd4f44d5bdbf22922feac5fd70 SHA1 2d60dfdc71afad5a37ecb200b75a1bf6dcdefff8 SHA256 8c3267062b58f5d365bedb522b345f4a7f5ea341ef322121db871b14f6e4a288
 EBUILD ocsng-1.02.1.ebuild 4733 RMD160 a9b946cae0fce0e0a2ede758912ff00d6614635b SHA1 8023c1bd3356e4c557ae060848e28876bed2acc5 SHA256 8856b5a29d0c8ac20f84c0c1f8fcb694b8c4e485cdcb8cfd41908a0abe01b16c
 EBUILD ocsng-1.3.1.ebuild 4787 RMD160 a8fbeb97b4c0667d76c0d88a21257d2a04df8ba5 SHA1 5c8bf61bf1633bab8ee14744d97f9045a7be5253 SHA256 7548b10d458559a60715b952eea737829f3e4a43e48d519398b6ec82717ac317
 EBUILD ocsng-1.3.2.ebuild 4959 RMD160 8cfad9d7faa5d994bf729e01e0decffe7266cbcf SHA1 f42720d884bfd2139f3ad7d91c4efcdb10eb34bf SHA256 61745487e4a3e39e3d9bdbdaff794828d1b527b786c291c547c5751612bfe44c
 EBUILD ocsng-1.3.ebuild 4772 RMD160 62dc8bc38754379a707ec1b7804e698b215039a1 SHA1 e9f9cba9d70d220f4ab624b438877401a544a50a SHA256 6e3a7f7a86cc9a6871148a4c776d16dbd271c34b46fbfe61404b5e3079681002
 EBUILD ocsng-2.0_rc3.ebuild 4959 RMD160 8cfad9d7faa5d994bf729e01e0decffe7266cbcf SHA1 f42720d884bfd2139f3ad7d91c4efcdb10eb34bf SHA256 61745487e4a3e39e3d9bdbdaff794828d1b527b786c291c547c5751612bfe44c
-MISC ChangeLog 2156 RMD160 d483ad7cab4155d7d62e1775c2c195afe92a53ee SHA1 6f949d32e64faaaa0be2f1cf44d0c5e4d9877ed2 SHA256 cb3cd6a51da4f67a94c026f19a4c0cc14a4a8a01347ea461883cc808e25ce6f9
+EBUILD ocsng-2.0_rc4.ebuild 4959 RMD160 8cfad9d7faa5d994bf729e01e0decffe7266cbcf SHA1 f42720d884bfd2139f3ad7d91c4efcdb10eb34bf SHA256 61745487e4a3e39e3d9bdbdaff794828d1b527b786c291c547c5751612bfe44c
+MISC ChangeLog 2314 RMD160 0b2ecbc5e60c7e7f8eb68798422dca20a7335a52 SHA1 9f810c91c2918e321b47e270a964dad98f34588e SHA256 71f70479475c1433ea73cd38cf48b7d043c80b2d481f4d9452f3dd602448bafe

diff --git a/net-analyzer/ocsng/ocsng-2.0_rc4.ebuild b/net-analyzer/ocsng/ocsng-2.0_rc4.ebuild
new file mode 100644
index 0000000..30c0c7f
--- /dev/null
+++ b/net-analyzer/ocsng/ocsng-2.0_rc4.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit depend.php eutils versionator webapp
+
+MY_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
+MY_PV="${PV//[_]/}"
+MY_P="OCSNG_UNIX_SERVER-${MY_PV}"
+MY_LPN="ocsinventory-server"
+MY_HTDOCSDIR="/usr/share/webapps/${PN}/"
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="OCS Inventory NG Management Server"
+HOMEPAGE="http://ocsinventory.sourceforge.net/"
+SRC_URI="http://launchpad.net/${MY_LPN}/stable-${MY_PV_MAJOR}/${MY_PV}/+download/${MY_P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64"
+IUSE="+comm admin logrotate"
+
+# INSTALL_DIR is used by webapp.eclass when USE=-vhosts
+INSTALL_DIR="ocsng"
+S="${WORKDIR}/${MY_P}"
+LOGDIR="/var/log/ocsng"
+
+DEPEND="
+	comm? ( sys-devel/make )
+	app-admin/webapp-config
+"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	>=dev-perl/Apache-DBI-0.93
+	>=dev-perl/DBI-1.40
+	>=dev-perl/DBD-mysql-2.9004
+	>=dev-perl/XML-Simple-2.12
+	>=dev-perl/Net-IP-1.21
+	www-apache/mod_perl
+	>=www-servers/apache-1.3
+	admin? (
+		dev-lang/php
+	)
+	logrotate? ( app-admin/logrotate )
+"
+
+pkg_setup() {
+
+	# call default eclass pkg_setup
+	webapp_pkg_setup
+
+	# php must be built with mysql and xml support
+	require_php_with_use mysql xml
+
+	if ! ( use admin || use comm ); then
+
+		# Warn user we will install the comm server
+		elog "As you haven't specified any role for the server, we will install"
+		elog "the communication server for ocs-ng."
+		elog "If you don't want this role or want other roles, set the corresponding"
+		elog "admin or comm use flags."
+	fi
+}
+
+src_compile() {
+
+	if ( use comm || ! ( use admin || use comm )); then
+
+		pushd "Apache"
+		perl Makefile.PL || die "perl Makefile.PL failed"
+		emake || die "emake failed"
+		popd
+	fi
+}
+
+src_install() {
+
+	# call default eclass src_preinst
+	webapp_src_preinst
+
+	fowners root:apache "${MY_HTDOCSDIR}"
+	fperms g-w,o-rwx "${MY_HTDOCSDIR}"
+
+	if ( use comm || ! ( use admin || use comm )); then
+
+		pushd "Apache"
+		emake DESTDIR="${D}" install || die "Install failed"
+		popd
+
+		if use logrotate; then
+
+			# create logrotate config file
+			elog "Create logrotate config file"
+
+			dodir /etc/logrotate.d
+			cat <<- EOF > "${D}etc/logrotate.d/ocsng"
+				# Copyright 1999-2010 Gentoo Foundation
+				# Distributed under the terms of the GNU General Public License v2
+				# $Header: $
+				#
+				# OCSNG logrotate config for Gentoo Linux
+				# Contributed by Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto@gentoo.org
+				# Based on the original ocsng logrotate file by Didier LIROULET
+
+				/var/log/ocsng/*.log {
+				daily
+				# rotate 7
+				compress
+				create 0660 root apache
+				notifyempty
+				missingok
+				# postrotate
+				# /etc/init.d/apache2 reload > /dev/null 2>&1 || true
+				# endscript
+				}
+			EOF
+		fi
+
+		# set mod_perl version > 1.999_21
+		sed -i -e "s/VERSION_MP/2/" etc/ocsinventory/ocsinventory-server.conf
+		sed -i -e "s:PATH_TO_LOG_DIRECTORY:${LOGDIR}:" etc/ocsinventory/ocsinventory-server.conf
+
+		# install the communication
+		webapp_server_configfile apache "etc/ocsinventory/ocsinventory-server.conf"
+
+	fi
+
+	if use admin; then
+
+		# create ocsreports and download dirs and copy files
+		elog "Creating ${MY_HTDOCSDIR}/download and copying files"
+		dodir "${MY_HTDOCSDIR}/download" || die "Unable to create ${MY_HTDOCSDIR}/download"
+		insinto "${MY_HTDOCSDIR}"
+		doins -r ocsreports
+
+		# Protect the db config file
+		webapp_configfile "${MY_HTDOCSDIR}/ocsreports/dbconfig.inc.php"
+
+		dodir "${MY_HTDOCSDIR}/ocsreports/ipd" || die "Unable to create ${MY_HTDOCSDIR}/ocsreports/ipd"
+
+		webapp_serverowned -R "${MY_HTDOCSDIR}/download"
+		webapp_serverowned -R "${MY_HTDOCSDIR}/ocsreports"
+
+		# set ownership and permissions
+		elog "Set ownership of download and ocsreports"
+		fowners -R root:apache "${MY_HTDOCSDIR}/download"
+		fperms -R g-w,o-rwx "${MY_HTDOCSDIR}/download"
+		fperms g+w "${MY_HTDOCSDIR}/download"
+		fowners -R root:apache "${MY_HTDOCSDIR}/ocsreports"
+		fperms -R g-w,o-rwx "${MY_HTDOCSDIR}/ocsreports"
+		if [[ -f "${MY_HTDOCSDIR}/ocsreports/dbconfig.inc.php" ]] ; then
+			fperms g-w,o-rwx "${MY_HTDOCSDIR}/ocsreports/dbconfig.inc.php"
+		fi
+		fperms -R g+w "${MY_HTDOCSDIR}/ocsreports/ipd"
+
+		# install ipdiscover-util.pl script
+		elog "Install ipdiscover-util.pl script"
+		insinto "${MY_HTDOCSDIR}/ocsreports"
+		doins binutils/ipdiscover-util.pl
+
+		fowners root:apache  "${MY_HTDOCSDIR}/ocsreports/ipdiscover-util.pl"
+		fperms ug+x "${MY_HTDOCSDIR}/ocsreports/ipdiscover-util.pl"
+
+		webapp_server_configfile apache "etc/ocsinventory/ocsinventory-reports.conf"
+	fi
+
+	# create log dir
+	elog "Creating log dir"
+	dodir "${LOGDIR}"
+	fowners root:apache "${LOGDIR}"
+	fperms 770 "${LOGDIR}"
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	# call default eclass src_install
+	webapp_src_install
+}
+
+pkg_postinst () {
+
+	elog "If you want to run ocsng in this box make sure to install"
+	elog "at least mysql-4.1."
+
+	webapp_pkg_postinst
+}