From 812ff137a32d1fdf5b9b6f60bcb7c983dfaa23a9 Mon Sep 17 00:00:00 2001 From: "Stefan Garthe (the_mgt)" Date: Sun, 21 Feb 2010 19:37:46 +0000 Subject: www-servers/webcit: Version bump for webcit, added enewuser line, removed --with-included-gettext. Also changed conf.d file to drop privileges while running webcit. Bugfix/maintenance update http://easyinstall.citadel.org/releasenotes-7.72.txt svn path=/sunrise/; revision=10177 --- www-servers/webcit/ChangeLog | 7 ++++ www-servers/webcit/Manifest | 8 ++--- www-servers/webcit/files/webcit.conf.d | 7 ++-- www-servers/webcit/webcit-7.71.ebuild | 56 ------------------------------ www-servers/webcit/webcit-7.72.ebuild | 63 ++++++++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 62 deletions(-) delete mode 100644 www-servers/webcit/webcit-7.71.ebuild create mode 100644 www-servers/webcit/webcit-7.72.ebuild (limited to 'www-servers') diff --git a/www-servers/webcit/ChangeLog b/www-servers/webcit/ChangeLog index fceb387fd..8f2476d00 100644 --- a/www-servers/webcit/ChangeLog +++ b/www-servers/webcit/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Feb 2010; the_mgt themgt@mail.ru -webcit-7.71.ebuild, + +webcit-7.72.ebuild, files/webcit.conf.d: + Version bump for webcit, added enewuser line, removed + --with-included-gettext. Also changed conf.d file to drop privileges while + running webcit. Bugfix/maintenance update + http://easyinstall.citadel.org/releasenotes-7.72.txt + 08 Feb 2010; the_mgt themgt@mail.ru -webcit-7.66.ebuild, +webcit-7.71.ebuild, -files/as-needed.patch, ,files/webcit.init.d: Version bump to current 7.71 version. Corrected init script diff --git a/www-servers/webcit/Manifest b/www-servers/webcit/Manifest index 9dda2afac..9e947b26a 100644 --- a/www-servers/webcit/Manifest +++ b/www-servers/webcit/Manifest @@ -1,6 +1,6 @@ -AUX webcit.conf.d 941 RMD160 490ec57f6e6243bc20b31279e879f1122b5fb563 SHA1 636303ff9b3f769894552a431eb3b07a7f60894a SHA256 1868ac4758e678c118987a245049a25d29c5ee5f855aadf7fc018399a5bda576 +AUX webcit.conf.d 1059 RMD160 986d5edf54dc29d4e20beb8832b64cabb506c188 SHA1 962e9235a79f3ed8ac1ea5aaaf6854f7b4cdfa5a SHA256 6df86e62242574dbeb5a6795c978523d4cb32a370cca747944d09938d64dee80 AUX webcit.init.d 581 RMD160 2c0b8a9c64b2611e2cb8439402096a6527f2593f SHA1 424699afca02cc49bc0ead43b517ac5448fa00fe SHA256 65715da03657486265986e238205483eaf7e7ec2ecc057499d6b5b7e499d29a9 -DIST webcit-7.71.tar.gz 1386835 RMD160 a66d6db8035e95de6359c560af50d86b16d24e9d SHA1 8640dc2ad8acdf2a93e76a5b29bbe78b3cb8a267 SHA256 3e67858e4c36ce2ff541e3a8a53e35f1a355141ee0365c9fdae3e677dae1693d -EBUILD webcit-7.71.ebuild 1527 RMD160 38c1147f9577248bbcb7c0ae88ae04077d92edbd SHA1 8f60fef1d177819c482845b67513f998cadad92e SHA256 abbd144bae9eda915547ebc18d3cdf213a0bbf27a4a2d715449db64ec9c371d3 -MISC ChangeLog 695 RMD160 b25fca281e6e29d6c9143ba17876a364bb2ca8e2 SHA1 5b65616e8d42af611d6003517c78f41fa932ed1e SHA256 1311d333223b48102679f957ef08a876a8b4fb657ebcc8281e65d22bc322a995 +DIST webcit-7.72.tar.gz 1387393 RMD160 888f89f3e6999b5a5c883f54bf1aac15cb56c903 SHA1 bb152297d398f2d1d4ab851effb9da87e8c10c28 SHA256 be27752d5b90a25d959ebee32d945dea420ebfe5ed2b1c1fd123c85060430e8c +EBUILD webcit-7.72.ebuild 1679 RMD160 7cbaebf0945ad439ef4155173858bae03c94b923 SHA1 b7aab58c6b644ad553c2739828b15ba0a7a269bb SHA256 f9ff98ea77323c34b7307930926742824cb62145a83565ceb21cd651f2f0435e +MISC ChangeLog 1031 RMD160 ef72e8e2c6c89d0c27ff6d589a71735c1f2198c5 SHA1 4ac1e219324594f43c8bab0a02a1c0a3b8a10330 SHA256 837f260093b9458037f240392523edb72a6fe8b0def8e9a3b2211845e0f86366 MISC metadata.xml 698 RMD160 7be58fa9dfecb304bd9f3542f396fabda1d2e7f8 SHA1 b9c70776dd8f97766a6c5b155f8ffb5e4001c678 SHA256 cb0be7311e1a23eb293372eb7252f84d479ee5c903efe0c0d97ba8ff7fe5c83a diff --git a/www-servers/webcit/files/webcit.conf.d b/www-servers/webcit/files/webcit.conf.d index 30d79ecc0..1a0b2e869 100644 --- a/www-servers/webcit/files/webcit.conf.d +++ b/www-servers/webcit/files/webcit.conf.d @@ -10,6 +10,9 @@ WEBCIT_OPTS="" ##WebCit defaults to port 2000. #WEBCIT_OPTS="${WEBCIT_OPTS} -p 2000" +##[-u username] Lets Webcit drop root privileges and run as a useraccount. +#WEBCIT_OPTS="${WEBCIT_OPTS} -u webcit" + ##[-t tracefile] Where you want WebCit to log information. WEBCIT_OPTS="${WEBCIT_OPTS} -t /var/log/webcit" @@ -18,11 +21,11 @@ WEBCIT_OPTS="${WEBCIT_OPTS} -t /var/log/webcit" #WEBCIT_OPTS="${WEBCIT_OPTS} -c" ##[-s] Causes WebCit to present an HTTPS web service. -WEBCIT_OPTS="${WEBCIT_OPTS} -s" +#WEBCIT_OPTS="${WEBCIT_OPTS} -s" ##[-f] Tells WebCit to follow "X-Forwarded-For:" HTTP headers #WEBCIT_OPTS="${WEBCIT_OPTS} -f" ##[remotehost [remoteport]] IP address and port of your Citadel server. ##Defaults to localhost 504 -WEBCIT_OPTS="${WEBCIT_OPTS} 127.0.0.1" +#WEBCIT_OPTS="${WEBCIT_OPTS} 127.0.0.1" diff --git a/www-servers/webcit/webcit-7.71.ebuild b/www-servers/webcit/webcit-7.71.ebuild deleted file mode 100644 index 58a49453f..000000000 --- a/www-servers/webcit/webcit-7.71.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -inherit eutils - -DESCRIPTION="Modern AJAX-style web interface for Citadel" -HOMEPAGE="http://www.citadel.org/" -SRC_URI="http://easyinstall.citadel.org/${P}.tar.gz" - -LICENSE="GPL-2 MIT LGPL-3 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -DEPEND=">=dev-libs/libical-0.43 - >=dev-libs/libcitadel-${PV} - ssl? ( >=dev-libs/openssl-0.9.6 )" - -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - --with-included-gettext \ - $(use_with ssl) \ - --with-libical \ - --without-newt \ - --prefix=/usr/sbin/ \ - --with-wwwdir=/usr/share/citadel-webcit \ - --with-localedir=/usr/share/ \ - --with-editordir=/usr/share/citadel-webcit/tiny_mce/ \ - --with-rundir=/var/run/citadel \ - --with-ssldir=/etc/ssl/webcit/ \ - --with-datadir=/var/run/citadel -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - newinitd "${FILESDIR}"/webcit.init.d webcit || die "Installing initscript failed" - newconfd "${FILESDIR}"/webcit.conf.d webcit || die "Installing conf for initscript failed" - - ##House cleaning... - #We don't use Webcit's setup program - #Settings are in /etc/conf.d/webcit - rm "${D}"/usr/sbin/setup || "Removing upstreams setup bin failed" - - dodoc *.txt || die "dodoc failed" -} - -pkg_postinst() { - einfo "Make sure to configure webcit under /etc/conf.d/webcit." - einfo "Then start the server with /etc/init.d/webcit start" - einfo - einfo "Webcit will listen on port 2000 by default" -} diff --git a/www-servers/webcit/webcit-7.72.ebuild b/www-servers/webcit/webcit-7.72.ebuild new file mode 100644 index 000000000..747ad05e1 --- /dev/null +++ b/www-servers/webcit/webcit-7.72.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +inherit eutils + +DESCRIPTION="Modern AJAX-style web interface for Citadel" +HOMEPAGE="http://www.citadel.org/" +SRC_URI="http://easyinstall.citadel.org/${P}.tar.gz" + +LICENSE="GPL-2 MIT LGPL-3 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ssl" + +DEPEND=">=dev-libs/libical-0.43 + >=dev-libs/libcitadel-${PV} + ssl? ( >=dev-libs/openssl-0.9.6 )" +RDEPEND="${DEPEND}" + +WWWDIR="/usr/share/citadel-webcit" + +pkg_setup() { + #Homedir needs to be the same as --with-datadir + einfo "Adding Citadel User/Group" + enewgroup webcit + enewuser webcit -1 -1 ${WWWDIR} webcit +} + +src_configure() { + econf \ + $(use_with ssl) \ + --with-libical \ + --without-newt \ + --prefix=/usr/sbin/ \ + --with-wwwdir="${WWWDIR}" \ + --with-localedir=/usr/share/ \ + --with-editordir=/usr/share/citadel-webcit/tiny_mce/ \ + --with-rundir=/var/run/citadel \ + --with-ssldir=/etc/ssl/webcit/ \ + --with-datadir=/var/run/citadel +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + newinitd "${FILESDIR}"/webcit.init.d webcit || die "Installing initscript failed" + newconfd "${FILESDIR}"/webcit.conf.d webcit || die "Installing conf for initscript failed" + + ##House cleaning... + #We don't use Webcit's setup program + #Settings are in /etc/conf.d/webcit + rm "${D}"/usr/sbin/setup || "Removing upstreams setup bin failed" + + dodoc *.txt || die "dodoc failed" +} + +pkg_postinst() { + einfo "Make sure to configure webcit under /etc/conf.d/webcit." + einfo "Then start the server with /etc/init.d/webcit start" + einfo + einfo "Webcit will listen on port 2000 by default" +} -- cgit v1.2.3-65-gdbad