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

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

commit:     a14a0b89cf3bf12bd26cee05418f05e3961a69b1
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 19:43:07 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 19:43:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=a14a0b89

[net-analyzer/ocsng] 2.0.3 version bump.

(Portage version: 2.2.0_alpha76/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 net-analyzer/ocsng/ChangeLog          |    6 +
 net-analyzer/ocsng/Manifest           |   32 +++---
 net-analyzer/ocsng/ocsng-2.0.3.ebuild |  181 +++++++++++++++++++++++++++++++++
 3 files changed, 204 insertions(+), 15 deletions(-)

diff --git a/net-analyzer/ocsng/ChangeLog b/net-analyzer/ocsng/ChangeLog
index d816588..94c8d6f 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.3 (30 Nov 2011)
+
+  30 Nov 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +ocsng-2.0.3.ebuild:
+  [net-analyzer/ocsng] 2.0.3 version bump.
+
 *ocsng-2.0.2 (21 Nov 2011)
 
   21 Nov 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>

diff --git a/net-analyzer/ocsng/Manifest b/net-analyzer/ocsng/Manifest
index c72b1b6..35d080f 100644
--- a/net-analyzer/ocsng/Manifest
+++ b/net-analyzer/ocsng/Manifest
@@ -1,34 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX postinstall-en.txt 507 RMD160 50c522ec6205bd33bffa5c00fc86452b1065df63 SHA1 4397ce93fc99dee9af2e3d7d6ce428290c812d28 SHA256 1c9ea57beb3b6907432aedb210f282a59fea66d931b61a7e310a6622bbdae13d
 DIST OCSNG_UNIX_SERVER-1.3.1.tar.gz 1509540 RMD160 043d9165e1b4623c08925a773e6ec41ec0423614 SHA1 b04df845ac5455b245b770dee47df515b94967e1 SHA256 8727419cd5d89680c2febc4e7bf4e3a5e662653c01b82f6e5c3b0d190c44c318
 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.0.2.tar.gz 1968832 RMD160 1c01482f4a4f5d3136e5973c2a4821d229e3ee11 SHA1 39d80269ef5c3283ffe506f0d41460928733d1cb SHA256 9e5f3cd87a156e3b90e577f4050d059f879178e830bd24f8cc7205f6978405e9
+DIST OCSNG_UNIX_SERVER-2.0.3.tar.gz 1969060 RMD160 ed6ebb65a62db9a5e3d5564a6f11516b91692f3a SHA1 fffda31b7f8ef8edcd12262cf01ba460fb0227dd SHA256 56e6c5f53535175942e337231bad6c3965f47b27ec51b30505e95b691bb1fc1f
 DIST OCSNG_UNIX_SERVER-2.0.tar.gz 6348697 RMD160 ec251d0e7416deef1332bbab81a91d91a015f74d SHA1 7a2fd0c13315cdcab966e8b810cdd262b37a7f83 SHA256 f9d2912f6e6af6b6c5bee44cab057300d11ca0907a467e8dd2da301bfd6619d9
 EBUILD ocsng-1.3.1.ebuild 4790 RMD160 4bf1e9d27cab695426de2346ab45e390ae5202fb SHA1 f9617fb08d5bec9339aabd723a5e691281e3b026 SHA256 958de97a41b22003222dfe533bfcee9bf8e90b30c4c5de7baccf606841ca998f
 EBUILD ocsng-1.3.2.ebuild 4961 RMD160 c77f509dffdabcaf9fbaedf2e41e84bbc87f9a29 SHA1 10f1db2103efeda11de9d052c1be77eafa6cfda0 SHA256 ebed43fd391cfeb3077190675fb430b4c7060dcf677dffad3aac335350ec23bb
 EBUILD ocsng-1.3.ebuild 4775 RMD160 bf95782332efbe99106efe6713b98cfb31eff15b SHA1 ad4f5bd02a3f55e178c00068a78486fca603a66f SHA256 95f7bef4d5270b984b2b3d6bc0e6353d2c5b52842c0372daacda2d13c01057f0
 EBUILD ocsng-2.0-r1.ebuild 4632 RMD160 f43e5c51cd716da5ad3152ce8b8dbbbf9c1c069a SHA1 4f2d97a1b64e183db5ad7668a4ea3f95af83547d SHA256 d80e870866b5c8c55a2c73b02e6adaaf488b7357bb2eca5f9483bf82980df384
 EBUILD ocsng-2.0.2.ebuild 4632 RMD160 f43e5c51cd716da5ad3152ce8b8dbbbf9c1c069a SHA1 4f2d97a1b64e183db5ad7668a4ea3f95af83547d SHA256 d80e870866b5c8c55a2c73b02e6adaaf488b7357bb2eca5f9483bf82980df384
+EBUILD ocsng-2.0.3.ebuild 4632 RMD160 f43e5c51cd716da5ad3152ce8b8dbbbf9c1c069a SHA1 4f2d97a1b64e183db5ad7668a4ea3f95af83547d SHA256 d80e870866b5c8c55a2c73b02e6adaaf488b7357bb2eca5f9483bf82980df384
 EBUILD ocsng-2.0.ebuild 4972 RMD160 4733d7020dcdccb1dfef55c5eb31a44d1594a587 SHA1 5be6bd457210fbee101993bcb80481195c4b824f SHA256 94bf9ae48c8937631fa3de30a76f92e4f31f534b3bb80f9dad0cfdefb4aaaffe
-MISC ChangeLog 3492 RMD160 ac59fdeddfef7583057f2c5855682d649a141e24 SHA1 75b32b58d1e2a8af56f2805b44660e2b013ced3d SHA256 d5885ba5c249305af989d127a25d468ea1dfa9a0af6d2df78a63e171f48334bc
+MISC ChangeLog 3654 RMD160 a7756536e77bb5bc362174e086f52f3911631fee SHA1 1e9bb891170dc759b80e163c95e0608cfdb0744a SHA256 6daa25e26de24f33d7273982627d3e5d8eccf25fc67bca865799bbb35d656986
 MISC metadata.xml 565 RMD160 287ce4ba6ccd8fa51cea279f9eddd783eebf76ca SHA1 0d407195398c663f44b9af289252fbcbb6396aa6 SHA256 fba7af61fb555da05dcf7c3677093c8553ef821b8893214656605fd3aaf6aa9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOyr0LAAoJEC8ZTXQF1qEPiPAP/RUL6P7t7a0yNqL5Xl/quiOV
-yo/vjf1PMpCx/sUZIYznFRIlxotlLjeFEFoYy77J12z9tZOak22cnwlJRcxmaGOH
-S7P+mJcP5WIWmPy3LCqlcK+hIf8aQuqWzf+X5RpgwvWVgSfip8a2OFRI9ieWctAR
-aASlMEG7sIijX7WbzXsrCwetFGFuwWIaqeZU+qqWtIXGCWCp4qV9adypTeHW5MQg
-AVL4SYXSmiIvf/KecAoKoF9zzGFfAjv4iGNXYUd8nemMH/x/Ztfb/0v+ZJU8eu4Z
-D81f9F53s0F9s9q5vIYr+A6GQIxRqDfFNKVNbv8Ue4b6/FmVosQ2l0tehccicWEL
-wkAazjqIpbIPWqq77Le4Iam+s29fDZDbuF0tyhiqhTeJfTF8DwW20H+tw//bQCfu
-vTna3uWd2yDfE44bsY4px7SDa2hhPkQo+g0CnvJT8xQZTzR7kypitE3ypDlFbHFI
-n2PyxCPuPGJGuMd9VLKDap0v2DaQ3AjAQHARP6Xu8KF0OI2ssIQSGFNFdstY563J
-0lRRMGnGfcDDoJ4l8KE3pw8ou2n1lW2GobWjCAq9nQhScytYQ9qzuCDm8XyGcIkb
-5Y42D/H42myY+18ge+HW1SnbTYW0aTHgBgOaUE2TWH4YLOfHBqCGFHLDW/zwVAY7
-3LvF09gVxjR82ipUAAbZ
-=yXVw
+iQIcBAEBCgAGBQJO1odLAAoJEC8ZTXQF1qEPURcP/Aq8uYE+77ylH21L+Lb/GJjc
+lsZoNiv+hZvGSp3L1wjy94/+5YK01+2yZjARgexeN4KgYyZuMHbylSck26PmZJpB
+t17A9QF6J6kyGzuoNIPRFVfC6LoXlf45wEeqAhQRyydy5GqnCbnEXxaMq5ivkej8
+W9S24EyujQB6bej5laTSAj38ljo/NGkszI+g5RwCVkt2NEZRkTZpx5oC3vmlFY02
+9xRIK1qmZBFi9A5mSr9quxlmhwZ/jKQqFxCoGX671qN/wg6dwwSHaDy0US05dO41
+sJgrneuwevk1lry96+0uEQIjfXkHm/tHGtOD7K8xKij9jAByiseqT+jYSJb3HPE2
+69x78vMOAve6DNGaqphjsDjSkrhmNo5qX8hxBhjxeB/hASnX3Nj4emJqw0kvS0wQ
+hDL/G/j6YDuNCzVLv5/VWonwP4XulJl4A18ihaeS9ndZ4dhshTQ86Ix4zYCXdC9o
+iv8ppeijouzNBY4ajtx8CUS9k3j7hgfUa3hELbG/pDcaEEltSmfAJdYrXR6ds5rr
+XqOFb3pofBAGnQIR1IXToyg7elnZFghpi+ZUk9hcchZIemWMRW2vApQNHi8h4/Ly
+8w84JK3So0tCyvrVOC1okIjWWM+AH0RIDxeTC6kn9im60mlBOMHnDrPNrNogHSq/
+A7M7TwMt6Yc6kCj+nAAY
+=mDnA
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/ocsng/ocsng-2.0.3.ebuild b/net-analyzer/ocsng/ocsng-2.0.3.ebuild
new file mode 100644
index 0000000..7d2ed9a
--- /dev/null
+++ b/net-analyzer/ocsng/ocsng-2.0.3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+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}"
+
+DEPEND="
+	dev-lang/perl
+	comm? ( sys-devel/make )
+	app-admin/webapp-config
+"
+RDEPEND="${DEPEND}
+	>=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[mysql,xml] )
+	logrotate? ( app-admin/logrotate )
+"
+REQUIRED_USE="|| ( admin comm )"
+
+pkg_setup() {
+
+	# call default eclass pkg_setup
+	webapp_pkg_setup
+}
+
+src_compile() {
+
+	if ( use comm ); then
+
+		pushd "Apache"
+		perl Makefile.PL || die "perl Makefile.PL failed"
+		emake || die "emake failed"
+		popd
+	fi
+}
+
+src_install() {
+
+	LOGDIR="/var/log/ocsng"
+	IPDDIR="ipd"
+	SNMPDIR="snmp"
+	PACKAGESDIR="download"
+
+	# call default eclass src_preinst
+	webapp_src_preinst
+
+	fowners root:apache "${MY_HTDOCSDIR}"
+	fperms g-w,o-rwx "${MY_HTDOCSDIR}"
+
+	if ( 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-2011 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 dirs
+		elog "Creating ${MY_HTDOCSDIR}/{${PACKAGESDIR},${IPDDIR},${SNMPDIR}} dirs"
+		for dir in ${PACKAGESDIR} ${IPDDIR} ${SNMPDIR} ; do
+			dodir "${MY_HTDOCSDIR}/${dir}" || die "Unable to create ${MY_HTDOCSDIR}/${dir}"
+			webapp_serverowned -R "${MY_HTDOCSDIR}/${dir}"
+			fowners -R apache:apache "${MY_HTDOCSDIR}/${dir}"
+			fperms g+w,o-rwx "${MY_HTDOCSDIR}/${dir}"
+		done
+
+		# copy ocsreports
+		insinto "${MY_HTDOCSDIR}"
+		doins -r ocsreports
+
+		# Protect the db config file and ocsreports
+		webapp_configfile "${MY_HTDOCSDIR}/ocsreports/dbconfig.inc.php"
+		webapp_serverowned -R "${MY_HTDOCSDIR}/ocsreports"
+		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
+
+		# 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,o-rwx "${MY_HTDOCSDIR}/ocsreports/ipdiscover-util.pl"
+
+		# install snmp_com.txt
+		elog "Install snmp_com.txt"
+		insinto "${MY_HTDOCSDIR}/snmp"
+		doins etc/ocsinventory/snmp_com.txt
+
+		fowners root:apache  "${MY_HTDOCSDIR}/snmp/snmp_com.txt"
+		fperms g+w,o-rwx "${MY_HTDOCSDIR}/snmp/snmp_com.txt"
+
+		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
+}