From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RV1UK-0006bG-Uw for garchives@archives.gentoo.org; Mon, 28 Nov 2011 13:43:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E647E0459; Mon, 28 Nov 2011 13:43:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 366B3E0459 for ; Mon, 28 Nov 2011 13:43:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7591E1B4004 for ; Mon, 28 Nov 2011 13:43:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B1F9080044 for ; Mon, 28 Nov 2011 13:43:02 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: Subject: [gentoo-commits] dev/jmbsvicetto:master commit in: net-analyzer/ocsng/ X-VCS-Repository: dev/jmbsvicetto X-VCS-Files: net-analyzer/ocsng/ChangeLog net-analyzer/ocsng/Manifest net-analyzer/ocsng/ocsng-2.0.2.ebuild X-VCS-Directories: net-analyzer/ocsng/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: bcee5399d96bdacbd985b66b177951d4267cb656 Date: Mon, 28 Nov 2011 13:43:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9ebf4b82-3dd4-498f-af82-3f048677b5ee X-Archives-Hash: 92acc3d0c114d7d4a8a7b35ccc3718fe commit: bcee5399d96bdacbd985b66b177951d4267cb656 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Mon Nov 21 21:05:15 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Mon Nov 21 21:05:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/jmbsvicetto.gi= t;a=3Dcommit;h=3Dbcee5399 [net-analyzer/ocsng] 2.0.2 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 | 30 +++--- net-analyzer/ocsng/ocsng-2.0.2.ebuild | 181 +++++++++++++++++++++++++++= ++++++ 3 files changed, 203 insertions(+), 14 deletions(-) diff --git a/net-analyzer/ocsng/ChangeLog b/net-analyzer/ocsng/ChangeLog index 523e59b..d816588 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: $ =20 +*ocsng-2.0.2 (21 Nov 2011) + + 21 Nov 2011; Jorge Manuel B. S. Vicetto + +ocsng-2.0.2.ebuild: + [net-analyzer/ocsng] 2.0.2 version bump. + *ocsng-2.0-r1 (24 Aug 2011) =20 24 Aug 2011; Jorge Manuel B. S. Vicetto diff --git a/net-analyzer/ocsng/Manifest b/net-analyzer/ocsng/Manifest index f3b7141..c72b1b6 100644 --- a/net-analyzer/ocsng/Manifest +++ b/net-analyzer/ocsng/Manifest @@ -5,28 +5,30 @@ AUX postinstall-en.txt 507 RMD160 50c522ec6205bd33bffa5= c00fc86452b1065df63 SHA1 DIST OCSNG_UNIX_SERVER-1.3.1.tar.gz 1509540 RMD160 043d9165e1b4623c08925= a773e6ec41ec0423614 SHA1 b04df845ac5455b245b770dee47df515b94967e1 SHA256 = 8727419cd5d89680c2febc4e7bf4e3a5e662653c01b82f6e5c3b0d190c44c318 DIST OCSNG_UNIX_SERVER-1.3.2.tar.gz 1513372 RMD160 201a4619ee67f674a61ce= 1af3ec2e3e77c390f08 SHA1 ac62694998f100f3b68b8e5174a4b46baf06db35 SHA256 = cf75c3120a529c275463a76dbe787d391757487ac38f057e0ff8c7a88714761a DIST OCSNG_UNIX_SERVER-1.3.tar.gz 1495359 RMD160 18db2c0f18bd96a9067f381= 79db552f099be4231 SHA1 2ce8d5a9366f6d8583b3624d0700a1014b51aff0 SHA256 b1= fc29185de9070c74d67a26598767e9e7ec02127e39ce97b860d58447d2834a +DIST OCSNG_UNIX_SERVER-2.0.2.tar.gz 1968832 RMD160 1c01482f4a4f5d3136e59= 73c2a4821d229e3ee11 SHA1 39d80269ef5c3283ffe506f0d41460928733d1cb SHA256 = 9e5f3cd87a156e3b90e577f4050d059f879178e830bd24f8cc7205f6978405e9 DIST OCSNG_UNIX_SERVER-2.0.tar.gz 6348697 RMD160 ec251d0e7416deef1332bba= b81a91d91a015f74d SHA1 7a2fd0c13315cdcab966e8b810cdd262b37a7f83 SHA256 f9= d2912f6e6af6b6c5bee44cab057300d11ca0907a467e8dd2da301bfd6619d9 EBUILD ocsng-1.3.1.ebuild 4790 RMD160 4bf1e9d27cab695426de2346ab45e390ae= 5202fb SHA1 f9617fb08d5bec9339aabd723a5e691281e3b026 SHA256 958de97a41b22= 003222dfe533bfcee9bf8e90b30c4c5de7baccf606841ca998f EBUILD ocsng-1.3.2.ebuild 4961 RMD160 c77f509dffdabcaf9fbaedf2e41e84bbc8= 7f9a29 SHA1 10f1db2103efeda11de9d052c1be77eafa6cfda0 SHA256 ebed43fd391cf= eb3077190675fb430b4c7060dcf677dffad3aac335350ec23bb EBUILD ocsng-1.3.ebuild 4775 RMD160 bf95782332efbe99106efe6713b98cfb31ef= f15b SHA1 ad4f5bd02a3f55e178c00068a78486fca603a66f SHA256 95f7bef4d5270b9= 84b2b3d6bc0e6353d2c5b52842c0372daacda2d13c01057f0 EBUILD ocsng-2.0-r1.ebuild 4632 RMD160 f43e5c51cd716da5ad3152ce8b8dbbbf9= c1c069a SHA1 4f2d97a1b64e183db5ad7668a4ea3f95af83547d SHA256 d80e870866b5= c8c55a2c73b02e6adaaf488b7357bb2eca5f9483bf82980df384 +EBUILD ocsng-2.0.2.ebuild 4632 RMD160 f43e5c51cd716da5ad3152ce8b8dbbbf9c= 1c069a SHA1 4f2d97a1b64e183db5ad7668a4ea3f95af83547d SHA256 d80e870866b5c= 8c55a2c73b02e6adaaf488b7357bb2eca5f9483bf82980df384 EBUILD ocsng-2.0.ebuild 4972 RMD160 4733d7020dcdccb1dfef55c5eb31a44d1594= a587 SHA1 5be6bd457210fbee101993bcb80481195c4b824f SHA256 94bf9ae48c89376= 31fa3de30a76f92e4f31f534b3bb80f9dad0cfdefb4aaaffe -MISC ChangeLog 3330 RMD160 1a6c41a2c77be26e78065a754bf4e34fe23c638e SHA1= 0136b0c94c58da8bfba1bd1f5e3053a988f36f28 SHA256 48821701011cf8ed7831a1eb= 83ff626cf549b75e6a7718376a1fdc69fa47c1fd +MISC ChangeLog 3492 RMD160 ac59fdeddfef7583057f2c5855682d649a141e24 SHA1= 75b32b58d1e2a8af56f2805b44660e2b013ced3d SHA256 d5885ba5c249305af989d127= a25d468ea1dfa9a0af6d2df78a63e171f48334bc MISC metadata.xml 565 RMD160 287ce4ba6ccd8fa51cea279f9eddd783eebf76ca SH= A1 0d407195398c663f44b9af289252fbcbb6396aa6 SHA256 fba7af61fb555da05dcf7c= 3677093c8553ef821b8893214656605fd3aaf6aa9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) =20 -iQIcBAEBAgAGBQJOVQezAAoJEC8ZTXQF1qEPPu4QAMx5bi4CvQzscYegq3SYCJ2m -UBFN6KbReKCE8inGEdPkAiMTwtdUazmiamJEWkHh3MP/uEolEFXasaBzuHpvhEmA -rHLCDzdreG1KMqJGMgXznbDcAK9EoxxUODgX4nkuKWqUO2ziOaHagfNXpJWS12jk -F0znH8iL6OS4qazQzPzLx3C0yngGJOGpIjoBMdqT7Jps6VObJ9KDzoIWNeU1CTFQ -bFvjcCPZ55gOWR/MCeC1I11ZYmCPY2bnNO5RSAFL8YrFCYJJZ7UrT/jimiEkbyTS -g3ZMUxmpJBG3lHnNFU6tgXl4mLXvCrr8SGMs7m0XRUDhE/HGqadDNYUeyMHAxocW -RtuSZNGYUAJAEpGLbvbZ6mWja6AyTwVOVoUEGV+v4Ih+R7V8kw5RPyGdXsnlUTHP -2dTaQgoqjuF/9cTIwktSg6R2UcinE8ANxyNQ8GmqpWB2GzTLYpcKFR6V3SdwTSo8 -W9tuA0h39ak+vMpFGm/3Ry9n3PaN9rOQox/obz5BFWcc0vWWem8KVjGaxgYg7SFh -9XUsdQNrMHMsRKHii3HLpmoud71wdF/w8oAKC+f30xIIkBBqYnKtIX48gyoptR7h -6XaS1L8RIY87vm+/e8UcHFY/sUJMKhq23x53406JOidgtQZYHlJIaYDlwHANMsiy -rkwKRmHkuIassNVV1A01 -=3DL6ks +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 +=3DyXVw -----END PGP SIGNATURE----- diff --git a/net-analyzer/ocsng/ocsng-2.0.2.ebuild b/net-analyzer/ocsng/o= csng-2.0.2.ebuild new file mode 100644 index 0000000..7d2ed9a --- /dev/null +++ b/net-analyzer/ocsng/ocsng-2.0.2.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D"4" + +inherit depend.php eutils versionator webapp + +MY_PV_MAJOR=3D"$(get_version_component_range 1-2 ${PV})" +MY_PV=3D"${PV//[_]/}" +MY_P=3D"OCSNG_UNIX_SERVER-${MY_PV}" +MY_LPN=3D"ocsinventory-server" +MY_HTDOCSDIR=3D"/usr/share/webapps/${PN}/" +WEBAPP_MANUAL_SLOT=3D"yes" + +DESCRIPTION=3D"OCS Inventory NG Management Server" +HOMEPAGE=3D"http://ocsinventory.sourceforge.net/" +SRC_URI=3D"http://launchpad.net/${MY_LPN}/stable-${MY_PV_MAJOR}/${MY_PV}= /+download/${MY_P}.tar.gz" +SLOT=3D"0" +LICENSE=3D"GPL-2 LGPL-2" +KEYWORDS=3D"~amd64" +IUSE=3D"+comm admin logrotate" + +# INSTALL_DIR is used by webapp.eclass when USE=3D-vhosts +INSTALL_DIR=3D"ocsng" +S=3D"${WORKDIR}/${MY_P}" + +DEPEND=3D" + dev-lang/perl + comm? ( sys-devel/make ) + app-admin/webapp-config +" +RDEPEND=3D"${DEPEND} + >=3Ddev-perl/Apache-DBI-0.93 + >=3Ddev-perl/DBI-1.40 + >=3Ddev-perl/DBD-mysql-2.9004 + >=3Ddev-perl/XML-Simple-2.12 + >=3Ddev-perl/Net-IP-1.21 + www-apache/mod_perl + >=3Dwww-servers/apache-1.3 + admin? ( dev-lang/php[mysql,xml] ) + logrotate? ( app-admin/logrotate ) +" +REQUIRED_USE=3D"|| ( 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=3D"/var/log/ocsng" + IPDDIR=3D"ipd" + SNMPDIR=3D"snmp" + PACKAGESDIR=3D"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=3D"${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) jmbsvicett= o@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/ocsinv= entory-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}} d= irs" + for dir in ${PACKAGESDIR} ${IPDDIR} ${SNMPDIR} ; do + dodir "${MY_HTDOCSDIR}/${dir}" || die "Unable to create ${MY_HTDOCSDI= R}/${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 +}