From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/jmbsvicetto:master commit in: net-analyzer/ocsng/files/, net-analyzer/ocsng/
Date: Tue, 23 Aug 2011 18:11:08 +0000 (UTC) [thread overview]
Message-ID: <7528a573aac91a03d8ada3b7878e73908390345c.jmbsvicetto@gentoo> (raw)
commit: 7528a573aac91a03d8ada3b7878e73908390345c
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 18:10:34 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:10:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=7528a573
[net-analyzer/ocsng-2.0] Bumped ocsng to the 2.0 release.
---
net-analyzer/ocsng/ChangeLog | 7 +
net-analyzer/ocsng/Manifest | 10 +-
net-analyzer/ocsng/files/postinstall-en.txt | 2 +-
.../{ocsng-2.0_rc4.ebuild => ocsng-2.0.ebuild} | 32 ++--
net-analyzer/ocsng/ocsng-2.0_rc3.ebuild | 187 --------------------
5 files changed, 26 insertions(+), 212 deletions(-)
diff --git a/net-analyzer/ocsng/ChangeLog b/net-analyzer/ocsng/ChangeLog
index 997ae17..d420487 100644
--- a/net-analyzer/ocsng/ChangeLog
+++ b/net-analyzer/ocsng/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*ocsng-2.0 (23 Aug 2011)
+
+ 23 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ -ocsng-2.0_rc3.ebuild, -ocsng-2.0_rc4.ebuild, +ocsng-2.0.ebuild,
+ files/postinstall-en.txt:
+ [net-analyzer/ocsng-2.0] Bumped ocsng to the 2.0 release.
+
*ocsng-2.0_rc4 (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 2192396..a08ff8b 100644
--- a/net-analyzer/ocsng/Manifest
+++ b/net-analyzer/ocsng/Manifest
@@ -1,16 +1,14 @@
-AUX postinstall-en.txt 332 RMD160 92b5d06eb88cdc10988c69cfec193c4ed8c882ae SHA1 fc847eebaee733cf68148247ef78922a7703a271 SHA256 d703acb5e7ff34527b5a5822562352934e315198090f489933934e801b49e99c
+AUX postinstall-en.txt 335 RMD160 12f3192e3de30f5489fa3d920ca394b10c3567e6 SHA1 5ba1babb56c92dd4ad9120151a7bdd15421660c1 SHA256 cee049b96d6ccc94269e98186d746c030a758eca4531463249f4408207977d9f
DIST OCSNG_LINUX_SERVER_1.01.tar.gz 6631615 RMD160 6d06ea9f4f8f4d2f487fab2bdba675fd0c47a3b2 SHA1 e7704ba24ada9495596a8bda2b8e9567642138b7 SHA256 ecc0e83e4b48a5c27382f76a1c75593b226c7e2b181d9a477f770420c5d669af
DIST OCSNG_UNIX_SERVER-1.02.1.tar.gz 1488981 RMD160 83e84a56e2f716cf6c7bf7a631eb55b4e3182dda SHA1 f1387d4993ad7cd887d52f6d945110b209711fb5 SHA256 4fcea18ff0955b57064dfd9cfe3333ee7876c08bd0221381509c7c2aaa9c5699
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.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
+DIST OCSNG_UNIX_SERVER-2.0.tar.gz 6348697 RMD160 ec251d0e7416deef1332bbab81a91d91a015f74d SHA1 7a2fd0c13315cdcab966e8b810cdd262b37a7f83 SHA256 f9d2912f6e6af6b6c5bee44cab057300d11ca0907a467e8dd2da301bfd6619d9
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
-EBUILD ocsng-2.0_rc4.ebuild 4959 RMD160 8cfad9d7faa5d994bf729e01e0decffe7266cbcf SHA1 f42720d884bfd2139f3ad7d91c4efcdb10eb34bf SHA256 61745487e4a3e39e3d9bdbdaff794828d1b527b786c291c547c5751612bfe44c
-MISC ChangeLog 2314 RMD160 0b2ecbc5e60c7e7f8eb68798422dca20a7335a52 SHA1 9f810c91c2918e321b47e270a964dad98f34588e SHA256 71f70479475c1433ea73cd38cf48b7d043c80b2d481f4d9452f3dd602448bafe
+EBUILD ocsng-2.0.ebuild 4728 RMD160 a19f528a8a4c5c076a8576bed045acbb4c1c9a9f SHA1 741726df4f955e6efdca0cab1baf2b5ad4594b02 SHA256 dd754f6bd81a3c0b8b85bb965b48d4b42863900e0149dcac7ebde77e8243562f
+MISC ChangeLog 2563 RMD160 bc65498038cac71621a59cd881e6d82d5ee7a0de SHA1 64eb911918168bd3d9cb9d2a37ed65424ad42b57 SHA256 e075da6f72fedcedc9d88249b528540226a8f0bfd631c8c046ea6613f91c1763
diff --git a/net-analyzer/ocsng/files/postinstall-en.txt b/net-analyzer/ocsng/files/postinstall-en.txt
index 8059020..2675c00 100644
--- a/net-analyzer/ocsng/files/postinstall-en.txt
+++ b/net-analyzer/ocsng/files/postinstall-en.txt
@@ -1,5 +1,5 @@
0. Create a new MySQL database:
-mysqladmin create geeklog
+mysqladmin create <database>
1. Edit ${VHOST_ROOT}/${PN}-${PVR}/config.php and set database settings.
diff --git a/net-analyzer/ocsng/ocsng-2.0_rc4.ebuild b/net-analyzer/ocsng/ocsng-2.0.ebuild
similarity index 84%
rename from net-analyzer/ocsng/ocsng-2.0_rc4.ebuild
rename to net-analyzer/ocsng/ocsng-2.0.ebuild
index 30c0c7f..31652ae 100644
--- a/net-analyzer/ocsng/ocsng-2.0_rc4.ebuild
+++ b/net-analyzer/ocsng/ocsng-2.0.ebuild
@@ -27,12 +27,12 @@ S="${WORKDIR}/${MY_P}"
LOGDIR="/var/log/ocsng"
DEPEND="
+ dev-lang/perl
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
@@ -96,7 +96,7 @@ src_install() {
dodir /etc/logrotate.d
cat <<- EOF > "${D}etc/logrotate.d/ocsng"
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
#
@@ -129,31 +129,27 @@ src_install() {
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"
+ # Create dirs
+ elog "Creating ${MY_HTDOCSDIR}/{download,ipd,snmp} dirs"
+ for dir in "download" "ipd" "snmp" ; 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
+ # Protect the db config file and ocsreports
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"
@@ -161,7 +157,7 @@ src_install() {
doins binutils/ipdiscover-util.pl
fowners root:apache "${MY_HTDOCSDIR}/ocsreports/ipdiscover-util.pl"
- fperms ug+x "${MY_HTDOCSDIR}/ocsreports/ipdiscover-util.pl"
+ fperms ug+x,o-rwx "${MY_HTDOCSDIR}/ocsreports/ipdiscover-util.pl"
webapp_server_configfile apache "etc/ocsinventory/ocsinventory-reports.conf"
fi
diff --git a/net-analyzer/ocsng/ocsng-2.0_rc3.ebuild b/net-analyzer/ocsng/ocsng-2.0_rc3.ebuild
deleted file mode 100644
index 30c0c7f..0000000
--- a/net-analyzer/ocsng/ocsng-2.0_rc3.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# 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
-}
next reply other threads:[~2011-08-23 18:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-23 18:11 Jorge Manuel B. S. Vicetto [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-23 19:11 [gentoo-commits] dev/jmbsvicetto:master commit in: net-analyzer/ocsng/files/, net-analyzer/ocsng/ Jorge Manuel B. S. Vicetto
2014-11-25 21:21 Jorge Manuel B. S. Vicetto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7528a573aac91a03d8ada3b7878e73908390345c.jmbsvicetto@gentoo \
--to=jmbsvicetto@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox