Bump
Package-Manager: portage-2.2.8-r1 RepoMan-Options: --force
This commit is contained in:
Mario Fetka
parent
0623fb3619
commit
019106dc66
|
|
@ -2,6 +2,13 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
*zarafa-webapp-1.5.43477 (26 Jun 2014)
|
||||
|
||||
26 Jun 2014; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/zarafa-webapp-phpautologin-1.4.patch, +zarafa-webapp-1.5.43477.ebuild,
|
||||
-files/zarafa-webapp-phpautologin.patch, zarafa-webapp-1.4.42633.ebuild:
|
||||
Bump
|
||||
|
||||
*zarafa-webapp-1.4.42633 (20 Jan 2014)
|
||||
|
||||
20 Jan 2014; Mario Fetka <mario.fetka@gmail.com>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
AUX zarafa-webapp-phpautologin.patch 1381 SHA256 bcc153214c869f41743159f32286b551d85ff2b4e792ea310a7459369c25a368 SHA512 44ce9126fd510f13a2fd167ce1df2d3d6cf047d5b31da4748d500d0bbd5fdaa6c297aa69841bf29de49712e0f836e37d446fb69dbc9bce7862a5b0e49f8f06fc WHIRLPOOL b44595f025f744cd72d5b6caf69789ba88a8314f50c2c664ae9ac544262527f18030289215d5a4885ff16a73fd70a1b24af67cc28e48d05beac4d1669cd8e895
|
||||
AUX zarafa-webapp-phpautologin-1.4.patch 1246 SHA256 9f3abc8d6fde877187fed051d3dcc1219ccdc22c42f3d1b2d7c14b87a2584d42 SHA512 73706d055261efad898ff1a5d4c4c626bd765f968e209c73994e4b37f13d33d552ec9dba3e611640afe05538068a8e7c8d1ae53af533418a056fe24ed799fe86 WHIRLPOOL e0a25c6f77b27951e6b73fd64f6773a7502d1c2dafd629aef911fd025020258969fa1f2307d132c9137fe0b199290f2be32dbda7fd9f3a9a16ca8be5d72c6a1a
|
||||
DIST zarafa-webapp-1.4-42633.noarch.rpm 3295162 SHA256 46e34fa687673657d5edae06f20cd2889dfc449e56fe668c991cff49765890e2 SHA512 80964d92c282abe3f57c433bff3e9b4afa1805e884bc3169612571ceb94dbd847900ff7b09c4d2aef1010deb9b945eeac65d64f10cb74c532d117b56360422a2 WHIRLPOOL f058722b83e73df6d754056b9b2184648e010723f42a2f2df8bd9b4615f2f878747dfaf2a75fa76d409457c3241f0a53fb0e8abc5f5b741b4b27a772a3930792
|
||||
EBUILD zarafa-webapp-1.4.42633.ebuild 1737 SHA256 be2a2aed504f8773ba385ee8a9f809a6a91911cd8086b740c741c835c5ac18f4 SHA512 9030c8c8456bcd3da9997a3cb6ee0e3065a044080c70c247ab89bcaab2830a32f9d9b601d2fc963773bae83992365b1db6242056f111a54118b3ec050f25074a WHIRLPOOL bb6a83402d126d9b5a5c92948fc8c5bae69ef7f55ae60960e677fccbcf6023d885a312e6efcccc40ad7a63223af59430fa85a9aea5fa5b14762ddb75778ae182
|
||||
MISC ChangeLog 520 SHA256 969fabb574c5882705f996a6dabd7837a0aaca35dbdb186ef00cbfca93259977 SHA512 1243185da5583523ac17a03ff2487e18b4be11127a86ab6ea720162b142af2e5c430848b9e07cbc1c2ba286eee66594e193c3909a491e517146ee30363e217de WHIRLPOOL 048250dc4cb28cc21afdb105e2aa879cecec89411765d9fda98778f9342b859b0cac0f7091f1c9b23d3fb85a244f3b2c1c55c707aeafe5bd3dcdb32b74ee7b89
|
||||
DIST zarafa-webapp-1.5-43477.noarch.rpm 4686252 SHA256 c37a7ed8deca0a5d6301196ce5f761ea42f8ebe05a055a902c94791b7909a19b SHA512 6ab15c6a58198058087b5d01256c197358ed74029fb88d172ac19d5f6cbfc42f254c38e07e0d2544ff53eab1ad8e49d65189c7451cd186e5656ad5b1af623015 WHIRLPOOL 84b8c8883652bc61a1e2e1d77776217e27ec73f0d47819ecd53672ea6ddc4ce8c895462a0c53acef28b482924a6bb6f07428f733e274eb7f6624db0890084295
|
||||
EBUILD zarafa-webapp-1.4.42633.ebuild 1711 SHA256 beda74d838060996373c002192bf2e29e9bece0d34386e9443e7485461835329 SHA512 7a7308cce1b6525c440a306bc7c568ea7ef57d4b057f472ffe8e780d5051db416ce950fb6ea34cd6f6b6e69975bb1df5ec76fa0d40809eb4d019a41bd9ceaa33 WHIRLPOOL fa01337fa390b652a930de5604e3fdc75c455ddebf042596d2848962ebb1692c3b64fd83cb275e367786b71f97df3db8847cf6df3fb05c0e0b986f563742c8ac
|
||||
EBUILD zarafa-webapp-1.5.43477.ebuild 1740 SHA256 4b21793b6c5bd157304bb0d47330602d044dd9e2c9c48ea7ca44191e87b8d299 SHA512 a902a0feb200bfca472577513d5b6acddf57ac0f91ef1fab86af1e57fbc6c9df2ec9e42c5a368027fe78453da91303e62cf725313669a01219b397f7a31233f2 WHIRLPOOL 0823694c8f218037411648a5918194216ef43ab1410149f02415cbd2aa7ef3da43a9a2cd113fd9cb1c5228cac4db577538c5600145fe3003e65306531452069b
|
||||
MISC ChangeLog 774 SHA256 0ff94f83b50abf4f4e3130ea2040f8a35fc6643ca9cd372fc5c73e5700776768 SHA512 5cb5f1add41f59c2336a150e5665a00d60184f09c8175b79105b56f0b7bbac9a19bedb1653b56aac93b8b7928a100c7f085b071e03a225c000ab4ebd67e8e6cf WHIRLPOOL 459121770c79bec4a66c6727f1969efb96bea30835780adfa155356d9370b2a0d80610ad02ee6b4fe8c9f2cc62e63d68db53bec6014aedf0a02bea1310895d8b
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
diff -rupN zarafa-webapp-1.4-42633/usr/share/zarafa-webapp/index.php zarafa-webapp-1.4-42633.patched/usr/share/zarafa-webapp/index.php
|
||||
--- zarafa-webapp-1.4-42633/usr/share/zarafa-webapp/index.php 2013-10-01 19:35:05.000000000 +0200
|
||||
+++ zarafa-webapp-1.4-42633.patched/usr/share/zarafa-webapp/index.php 2013-10-14 20:02:48.644604785 +0200
|
||||
@@ -122,12 +122,12 @@
|
||||
// REMOTE_USER is set when apache has authenticated the user
|
||||
// Don't perform single-signon when $_POST is set, as that implies
|
||||
// the user was sending us data from a form.
|
||||
- if (!$_POST && $_SERVER && array_key_exists('REMOTE_USER', $_SERVER)) {
|
||||
- $_SESSION['username'] = $_SERVER['REMOTE_USER'];
|
||||
+ if (!$_POST && $_SERVER && array_key_exists('PHP_AUTH_USER', $_SERVER)) {
|
||||
+ $_SESSION['username'] = $_SERVER['PHP_AUTH_USER'];
|
||||
if (LOGINNAME_STRIP_DOMAIN) {
|
||||
$_SESSION['username'] = ereg_replace('@.*', '', $_SESSION['username']);
|
||||
}
|
||||
- $_SESSION['password'] = '';
|
||||
+ $_SESSION['password'] = $_SERVER['PHP_AUTH_PW'];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
diff -rupN zarafa-webapp-1.3-40290/usr/share/zarafa-webapp/index.php zarafa-webapp-1.3-40290.patched/usr/share/zarafa-webapp/index.php
|
||||
--- zarafa-webapp-1.3-40290/usr/share/zarafa-webapp/index.php 2013-01-21 13:39:43.000000000 +0100
|
||||
+++ zarafa-webapp-1.3-40290.patched/usr/share/zarafa-webapp/index.php 2013-01-23 09:53:02.828723573 +0100
|
||||
@@ -96,7 +96,7 @@
|
||||
// and request the logon page.
|
||||
header('Location: index.php' . $actionURI, true, 303);
|
||||
exit;
|
||||
- } else if ($logon) {
|
||||
+ } else if ($logon || !isset($_SESSION['username'])) {
|
||||
// The user requested to logon. Check if credentials were provided
|
||||
// or if the a remote user login is possible.
|
||||
$username = ($_POST && array_key_exists('username', $_POST)) ? $_POST['username'] : '';
|
||||
@@ -117,12 +117,12 @@
|
||||
|
||||
if (!DISABLE_REMOTE_USER_LOGIN){
|
||||
// REMOTE_USER is set when apache has authenticated the user
|
||||
- if (!$_POST && $_SERVER && array_key_exists('REMOTE_USER', $_SERVER)) {
|
||||
- $_SESSION['username'] = $_SERVER['REMOTE_USER'];
|
||||
+ if (!$_POST && $_SERVER && array_key_exists('PHP_AUTH_USER', $_SERVER)) {
|
||||
+ $_SESSION['username'] = $_SERVER['PHP_AUTH_USER'];
|
||||
if (LOGINNAME_STRIP_DOMAIN) {
|
||||
$_SESSION['username'] = ereg_replace('@.*', '', $_SESSION['username']);
|
||||
}
|
||||
- $_SESSION["password"] = '';
|
||||
+ $_SESSION["password"] = $_SERVER['PHP_AUTH_PW'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -14,8 +14,6 @@ MY_PVR=$(get_version_component_range 1-3 )
|
|||
DESCRIPTION="Open Source Groupware Solution"
|
||||
HOMEPAGE="http://zarafa.com/"
|
||||
|
||||
ZARAFA_WEBAPP_BUILD="final"
|
||||
|
||||
if [[ ${ZARAFA_WEBAPP_BUILD} == "final" ]] ; then
|
||||
SRC_URI="http://download.zarafa.com/community/${ZARAFA_WEBAPP_BUILD}/WebApp/${MY_PVM}/rhel/zarafa-webapp-${MY_PV}.noarch.rpm"
|
||||
else
|
||||
|
|
@ -36,7 +34,7 @@ pkg_setup () {
|
|||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-phpautologin.patch"
|
||||
epatch "${FILESDIR}/${PN}-phpautologin-1.4.patch"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
|
|
@ -46,7 +44,7 @@ src_install() {
|
|||
rm config.php || die "Unexpected source layout; ebuild needs update"
|
||||
rm -r plugins || die "Unexpected source layout; ebuild needs update"
|
||||
cp "${S}/../../../etc/zarafa/webapp/config.php" "${S}/config.php" || die "Unexpected source layout; ebuild needs update"
|
||||
|
||||
|
||||
dodir "/var/lib/zarafa-webapp/plugins"
|
||||
dosym "/var/lib/zarafa-webapp/plugins" "${MY_HTDOCSDIR}"/plugins
|
||||
dodir "/var/lib/zarafa-webapp/tmp"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=2
|
||||
|
||||
inherit webapp eutils rpm depend.php versionator
|
||||
|
||||
MY_PV=$(replace_version_separator 2 '-' )
|
||||
MY_PVV=$(replace_version_separator 3 'beta' $MY_PV )
|
||||
MY_PVM=$(get_version_component_range 1-2 )
|
||||
MY_PVR=$(get_version_component_range 1-3 )
|
||||
|
||||
DESCRIPTION="Open Source Groupware Solution"
|
||||
HOMEPAGE="http://zarafa.com/"
|
||||
|
||||
ZARAFA_WEBAPP_BUILD="final"
|
||||
|
||||
if [[ ${ZARAFA_WEBAPP_BUILD} == "final" ]] ; then
|
||||
SRC_URI="http://download.zarafa.com/community/${ZARAFA_WEBAPP_BUILD}/WebApp/${MY_PVM}/rhel/zarafa-webapp-${MY_PV}.noarch.rpm"
|
||||
else
|
||||
SRC_URI="http://download.zarafa.com/community/${ZARAFA_WEBAPP_BUILD}/WebApp/zarafa-webapp-${MY_PV}.noarch.rpm"
|
||||
fi
|
||||
S="${WORKDIR}/usr/share/zarafa-webapp"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
RESTRICT="mirror"
|
||||
IUSE=""
|
||||
|
||||
need_php_httpd
|
||||
|
||||
pkg_setup () {
|
||||
webapp_pkg_setup
|
||||
require_php_with_use iconv session xml
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-phpautologin-1.4.patch"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
webapp_src_preinst
|
||||
|
||||
# rearrange files and remove unneeded ones
|
||||
rm config.php || die "Unexpected source layout; ebuild needs update"
|
||||
rm -r plugins || die "Unexpected source layout; ebuild needs update"
|
||||
cp "${S}/../../../etc/zarafa/webapp/config.php" "${S}/config.php" || die "Unexpected source layout; ebuild needs update"
|
||||
|
||||
dodir "/var/lib/zarafa-webapp/plugins"
|
||||
dosym "/var/lib/zarafa-webapp/plugins" "${MY_HTDOCSDIR}"/plugins
|
||||
dodir "/var/lib/zarafa-webapp/tmp"
|
||||
|
||||
insinto "${MY_HTDOCSDIR}"
|
||||
doins -r "${S}"/*
|
||||
|
||||
webapp_serverowned -R "/var/lib/zarafa-webapp"
|
||||
webapp_serverowned "${MY_HTDOCSDIR}/config.php"
|
||||
webapp_configfile "${MY_HTDOCSDIR}/config.php"
|
||||
|
||||
webapp_src_install
|
||||
}
|
||||
Loading…
Reference in New Issue