From 516570bcb76c98d38fbc69acde375fe214344378 Mon Sep 17 00:00:00 2001 From: Renat Lumpau Date: Sun, 27 Nov 2005 19:14:30 +0000 Subject: [PATCH] Version bump wrt bug #113447. Package-Manager: portage-2.0.51.22-r2 --- www-apps/otrs/ChangeLog | 8 +- www-apps/otrs/Manifest | 28 ++++-- www-apps/otrs/files/digest-otrs-2.0.4 | 1 + www-apps/otrs/files/postinstall-en-2.txt | 12 +-- www-apps/otrs/files/reconfig | 3 + www-apps/otrs/files/reconfig-2 | 4 +- www-apps/otrs/otrs-2.0.4.ebuild | 116 +++++++++++++++++++++++ 7 files changed, 155 insertions(+), 17 deletions(-) create mode 100644 www-apps/otrs/files/digest-otrs-2.0.4 create mode 100644 www-apps/otrs/otrs-2.0.4.ebuild diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog index 0d88bd115a72..a727fa67cc28 100644 --- a/www-apps/otrs/ChangeLog +++ b/www-apps/otrs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apps/otrs # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.15 2005/11/20 16:48:45 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.16 2005/11/27 19:14:30 rl03 Exp $ + +*otrs-2.0.4 (27 Nov 2005) + + 27 Nov 2005; Renat Lumpau files/reconfig-2, + files/postinstall-en-2.txt, files/reconfig, +otrs-2.0.4.ebuild: + Version bump wrt bug #113447. 20 Nov 2005; Stuart Herbert otrs-1.3.2.ebuild, otrs-2.0.3.ebuild: diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest index 6637f82020b3..19c5c9d2c054 100644 --- a/www-apps/otrs/Manifest +++ b/www-apps/otrs/Manifest @@ -1,12 +1,24 @@ -MD5 5faccb6694d65e601ca7cd4cf880e97e ChangeLog 2453 -MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221 -MD5 c522a90cadf43493cf3a97c5fad53576 otrs-1.3.2.ebuild 2760 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 0f6de57c2bf4a6320e10b8283d183f80 otrs-2.0.4.ebuild 3129 MD5 7db2babd6d39e6b246cb52fcad25eba0 otrs-2.0.3.ebuild 3308 -MD5 17263c3cbe7f693cfdfcceefb18f7970 files/digest-otrs-1.3.2 67 -MD5 342b501154e2bbb0e75b34f1b3c27dea files/reconfig-2 883 -MD5 998679b77f9c18e33503499e586ca1fa files/postinstall-en-2.txt 660 -MD5 342b501154e2bbb0e75b34f1b3c27dea files/reconfig 883 +MD5 c522a90cadf43493cf3a97c5fad53576 otrs-1.3.2.ebuild 2760 +MD5 9fc4cf104a8d67179ba8bde9ea13ea55 ChangeLog 2641 +MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221 +MD5 3f701ce10ed527c36c342e856a4e43de files/postinstall-en.txt 548 +MD5 5e6c7c1e995fa5c26613ded275a2a453 files/reconfig-2 880 +MD5 85b123d401ced4533fb3c308145c3164 files/postinstall-en-2.txt 658 MD5 fed75d396b333655a8a8e83e64e27062 files/apache1.patch 529 MD5 f47d2140cdd984fb31b2f468719d94e9 files/apache2.patch 902 +MD5 17263c3cbe7f693cfdfcceefb18f7970 files/digest-otrs-1.3.2 67 MD5 382162791127449707c542d146d8d025 files/digest-otrs-2.0.3 68 -MD5 3f701ce10ed527c36c342e856a4e43de files/postinstall-en.txt 548 +MD5 24fe9f6e22bf1ef7904331a0112a9c2a files/digest-otrs-2.0.4 68 +MD5 c819399f0eb8d0662dc2492977a96d61 files/reconfig 937 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFDigWpEzitwsaoONoRAjQYAKDJPDzfP+xgWhKll7c9unAGutGgJgCfdtjf +4nllEkHIuDJ1TIQ+pqGIFfA= +=8rgy +-----END PGP SIGNATURE----- diff --git a/www-apps/otrs/files/digest-otrs-2.0.4 b/www-apps/otrs/files/digest-otrs-2.0.4 new file mode 100644 index 000000000000..ecbffb9a8b58 --- /dev/null +++ b/www-apps/otrs/files/digest-otrs-2.0.4 @@ -0,0 +1 @@ +MD5 cfc0fa4f711c2fa92bc513b57632bbfe otrs-2.0.4-01.tar.bz2 11560233 diff --git a/www-apps/otrs/files/postinstall-en-2.txt b/www-apps/otrs/files/postinstall-en-2.txt index 41179e0a6712..84f59b14520f 100644 --- a/www-apps/otrs/files/postinstall-en-2.txt +++ b/www-apps/otrs/files/postinstall-en-2.txt @@ -1,18 +1,18 @@ -Your installation is almost complete. -1. You now need to edit ${VHOST_ROOT}/otrs-${PVR}/Kernel/Config.pm +Your installation is almost complete. +1. You now need to edit ${VHOST_ROOT}/${PN}-${PVR}/Kernel/Config.pm and set some Kernel::Config options (FQDN, SystemID, TicketHook, Home, ...). 2. Configure and restart your webserver. -Read /usr/share/doc/otrs-${PVR}/README.webserver.gz. -Sample config files are in ${VHOST_ROOT}/otrs-${PVR}/scripts +Read /usr/share/doc/${PN}-${PVR}/README.webserver.gz. +Sample config files are in ${VHOST_ROOT}/${PN}-${PVR}/scripts -If you are using FastCGI, don't forget to add -D FASTCGI +If you are using FastCGI, don't forget to add -D FASTCGI to your Apache options. 3. Setup your database. Read /usr/share/doc/${PN}-${PVR}/README.database.gz -4. Read /usr/share/doc/${PN}-${PVR}/INSTALL.gz , pp. 9-12, +4. Read /usr/share/doc/${PN}-${PVR}/INSTALL.gz , pp. 9-12, to finish the installation. If you are upgrading, read /usr/share/doc/${PN}-${PVR}/UPGRADING.gz diff --git a/www-apps/otrs/files/reconfig b/www-apps/otrs/files/reconfig index dea936e42019..63a8e079c6f8 100644 --- a/www-apps/otrs/files/reconfig +++ b/www-apps/otrs/files/reconfig @@ -9,14 +9,17 @@ die() { } if [ $1 = "install" ]; then + echo "here here" # edit Apache configs cd ${VHOST_ROOT}/${PF}/scripts sed -e "s|/opt/otrs/var/httpd/htdocs/|${MY_INSTALLDIR}/|g" -i apache-httpd.include.conf apache2-httpd.include.conf || die "sed 1 failed" + echo "here here" # set $HOME grep -lR "/opt" * | xargs sed -i "s|/opt/otrs|${VHOST_ROOT}/${PF}|g" || die "sed failed" sed -i "s|/opt/otrs|${VHOST_ROOT}/${PF}|g" ${VHOST_ROOT}/${PF}/Kernel/Config.pm || die "sed failed" + echo "here here" # set permissions ${VHOST_ROOT}/${PF}/bin/SetPermissions.sh ${VHOST_ROOT}/${PF} otrs apache apache apache > /dev/null || die "Could not set permissions" diff --git a/www-apps/otrs/files/reconfig-2 b/www-apps/otrs/files/reconfig-2 index dea936e42019..769e8a75ae34 100644 --- a/www-apps/otrs/files/reconfig-2 +++ b/www-apps/otrs/files/reconfig-2 @@ -11,7 +11,7 @@ die() { if [ $1 = "install" ]; then # edit Apache configs cd ${VHOST_ROOT}/${PF}/scripts - sed -e "s|/opt/otrs/var/httpd/htdocs/|${MY_INSTALLDIR}/|g" -i apache-httpd.include.conf apache2-httpd.include.conf || die "sed 1 failed" + sed -e "s|/opt/otrs/var/httpd/htdocs/|${MY_INSTALLDIR}/|g" -i apache-httpd.include.conf apache2-httpd.include.conf || die "sed failed" # set $HOME grep -lR "/opt" * | xargs sed -i "s|/opt/otrs|${VHOST_ROOT}/${PF}|g" || die "sed failed" @@ -25,7 +25,7 @@ if [ $1 = "install" ]; then elif [ $1 = "clean" ]; then echo "Please examine the contents of the following directories" echo "and delete anything that is no longer necessary" - echo + echo echo ${VHOST_ROOT}/${PF} echo ${MY_INSTALLDIR} fi diff --git a/www-apps/otrs/otrs-2.0.4.ebuild b/www-apps/otrs/otrs-2.0.4.ebuild new file mode 100644 index 000000000000..9070a100eebb --- /dev/null +++ b/www-apps/otrs/otrs-2.0.4.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.0.4.ebuild,v 1.1 2005/11/27 19:14:30 rl03 Exp $ + +inherit webapp eutils + +S=${WORKDIR}/${PN} + +IUSE="mysql postgres fastcgi apache2 ldap gd" + +DESCRIPTION="OTRS is an Open source Ticket Request System" +HOMEPAGE="http://otrs.org/" +SRC_URI="ftp://ftp.otrs.org/pub/${PN}/${P}-01.tar.bz2" + +KEYWORDS="~x86 ~ppc" + +DEPEND=" + =dev-lang/perl-5* + dev-perl/Date-Pcalc + dev-perl/DBI + perl-core/CGI + perl-core/Digest-MD5 + dev-perl/libwww-perl + dev-perl/IO-stringy + perl-core/MIME-Base64 + dev-perl/MIME-tools + dev-perl/MailTools + dev-perl/Net-DNS + dev-perl/libnet + dev-perl/Authen-SASL + dev-perl/XML-Parser +" + +RDEPEND=" + ${DEPEND} + virtual/mta + ldap? ( dev-perl/perl-ldap net-nds/openldap ) + mysql? ( =dev-db/mysql-4* dev-perl/DBD-mysql ) + postgres? ( dev-db/postgresql dev-perl/DBD-Pg ) + apache2? ( >=net-www/apache-2 + fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi ) + !fastcgi? ( =www-apache/libapreq2-2* ) ) + !apache2? ( =net-www/apache-1* + fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi ) + !fastcgi? ( =www-apache/libapreq-1* ) ) + gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph ) +" + +LICENSE="GPL-2" + +pkg_setup() { + webapp_pkg_setup + enewuser otrs -1 -1 /dev/null apache +} + +src_unpack() { + unpack ${A} + cp ${S}/Kernel/Config.pm.dist ${S}/Kernel/Config.pm + cd ${S}/Kernel/Config/ + for foo in *.dist; do cp ${foo} $(basename ${foo} .dist); done + + cd ${S}/scripts + rm -rf auto_* redhat* suse* + + if use fastcgi; then + if ! use apache2; then + epatch ${FILESDIR}/apache1.patch + sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache-httpd.include.conf + fi + if use apache2; then + epatch ${FILESDIR}/apache2.patch + sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache2-httpd.include.conf + fi + sed -e "s|index.pl|index.fpl|" -i ${S}/var/httpd/htdocs/index.html + fi +} + +src_install() { + webapp_src_preinst + dodir ${MY_HOSTROOTDIR}/${PF} + + # install documentation + dodoc CHANGES CREDITS INSTALL README* TODO UPGRADING \ + doc/otrs-database.dia doc/test-* doc/X-OTRS-Headers.txt \ + .fetchmailrc.dist .mailfilter.dist .procmailrc.dist + dohtml doc/manual/{en,de}/html/* + + # copy main files + cp -R .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE Kernel bin scripts var ${D}/${MY_HOSTROOTDIR}/${PF} + mv ${D}/${MY_HOSTROOTDIR}/${PF}/var/httpd/htdocs/* ${D}/${MY_HTDOCSDIR} + + # remove stuff from ${D} that shouldn't be there + rm -rf ${D}/${MY_HOSTROOTDIR}/${PF}/var/httpd + + # keep some empty dirs + local a + local d="article log pics/images pics/stats pics sessions spool tmp" + for a in ${d}; do + keepdir ${MY_HOSTROOTDIR}/${PF}/var/${a} + done + + # helpers + webapp_configfile ${MY_HOSTROOTDIR}/${PF}/Kernel/Config.pm + webapp_postinst_txt en ${FILESDIR}/postinstall-en-2.txt + webapp_hook_script ${FILESDIR}/reconfig-2 + webapp_src_install +} + +pkg_postinst() { + ewarn "webapp-config will not be run automatically" + ewarn "That messes up Apache configs" + ewarn "Don't run webapp-config with -d otrs." + ewarn "Instead, use something like -d ot" + ewarn + # webapp_pkg_postinst +} -- 2.26.2