[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/files/, www-apps/baikal/
commit: 9c4d0cc83518582c5d33a412f5fef5c3cfbdb1a4
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 7 14:46:06 2021 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 7 15:31:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4d0cc8
www-apps/baikal: cleanup old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
www-apps/baikal/Manifest | 2 --
www-apps/baikal/baikal-0.6.1.ebuild | 57 ---
www-apps/baikal/baikal-0.7.1.ebuild | 58
www-apps/baikal/files/postinstall-en.txt | 5 ---
4 files changed, 122 deletions(-)
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index fc5ed08bf4d..de22ead2efa 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1 @@
-DIST baikal-0.6.1.zip 3437686 BLAKE2B
f28d3a63166a73571116759df3662c2b19c2bcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00
SHA512
d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
-DIST baikal-0.7.1.zip 3596673 BLAKE2B
ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5
SHA512
4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
DIST baikal-0.7.2.zip 3602276 BLAKE2B
160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9
SHA512
df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
diff --git a/www-apps/baikal/baikal-0.6.1.ebuild
b/www-apps/baikal/baikal-0.6.1.ebuild
deleted file mode 100644
index ba407dd2359..000
--- a/www-apps/baikal/baikal-0.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="https://sabre.io/baikal/;
-SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip;
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
- mysql? ( virtual/mysql )
- sqlite? ( dev-db/sqlite )
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
- webapp_src_preinst
-
- dodoc *.md
-
- einfo "Installing web files"
- insinto "${MY_HTDOCSDIR}"
- doins -r html/* html/.htaccess Core vendor
-
- einfo "Setting up container for configuration"
- insinto /etc/${PN}
-
- einfo "Fixing symlinks"
- local link target
- find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
- target=$(readlink "${link}")
- target=${target/..\/Core/Core}
- rm "${link}" && ln -s "${target}" "${link}"
- done
- dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
- dosym . "${MY_HTDOCSDIR}"/html
-
- webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
- webapp_src_install
-
- if has_version www-servers/apache ; then
- fowners -R apache:apache /etc/${PN}
- elif has_version www-servers/nginx ; then
- fowners -R nginx:nginx /etc/${PN}
- else
- einfo "/etc/${PN} must be owned by the webserver user for
baikal"
- fi
-}
diff --git a/www-apps/baikal/baikal-0.7.1.ebuild
b/www-apps/baikal/baikal-0.7.1.ebuild
deleted file mode 100644
index 450d0442276..000
--- a/www-apps/baikal/baikal-0.7.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="https://sabre.io/baikal/;
-SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip;
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
- mysql? ( virtual/mysql )
- sqlite? ( dev-db/sqlite )
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
- webapp_src_preinst
-
- dodoc *.md
-
- einfo "Installing web files"
- insinto "${MY_HTDOCSDIR}"
- doins -r html/* html/.htaccess Core vendor
-
- einfo "Setting up container for configuration"
- dodir /etc/${PN}
-
- einfo "Fixing symlinks"
- local link target
- find "${D}${MY_HTDOCSDIR}" -type l |
[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/files/, www-apps/baikal/
commit: 9963aede3bcd793829740832cfd1eecc1c5236f3
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Jun 14 08:46:02 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Jun 14 08:46:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9963aede
www-apps/baikal-0.7.1: version bump
Closes: https://bugs.gentoo.org/727936
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen gentoo.org>
www-apps/baikal/Manifest | 2 +-
www-apps/baikal/{baikal-0.5.2.ebuild => baikal-0.7.1.ebuild} | 7 ---
www-apps/baikal/files/postinstall-v0.7-en.txt| 9 +
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 841948ccdf5..f6f42ce4b17 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1,3 @@
-DIST baikal-0.5.2.zip 3426025 BLAKE2B
ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922
SHA512
58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
DIST baikal-0.6.0.zip 3432758 BLAKE2B
db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104
SHA512
75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905
DIST baikal-0.6.1.zip 3437686 BLAKE2B
f28d3a63166a73571116759df3662c2b19c2bcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00
SHA512
d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
+DIST baikal-0.7.1.zip 3596673 BLAKE2B
ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5
SHA512
4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
diff --git a/www-apps/baikal/baikal-0.5.2.ebuild
b/www-apps/baikal/baikal-0.7.1.ebuild
similarity index 85%
rename from www-apps/baikal/baikal-0.5.2.ebuild
rename to www-apps/baikal/baikal-0.7.1.ebuild
index 24e74850aa4..1c55957ab51 100644
--- a/www-apps/baikal/baikal-0.5.2.ebuild
+++ b/www-apps/baikal/baikal-0.7.1.ebuild
@@ -15,7 +15,7 @@ IUSE="+mysql sqlite"
REQUIRED_USE="|| ( mysql sqlite )"
DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+RDEPEND=">=dev-lang/php-6[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite )
virtual/httpd-php"
@@ -32,7 +32,7 @@ src_install() {
doins -r html/* html/.htaccess Core vendor
einfo "Setting up container for configuration"
- insinto /etc/${PN}
+ dodir /etc/${PN}
einfo "Fixing symlinks"
local link target
@@ -42,9 +42,10 @@ src_install() {
rm "${link}" && ln -s "${target}" "${link}"
done
dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
+ dosym /etc/${PN} "${MY_HTDOCSDIR}"/config
dosym . "${MY_HTDOCSDIR}"/html
- webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+ webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
webapp_src_install
if has_version www-servers/apache ; then
diff --git a/www-apps/baikal/files/postinstall-v0.7-en.txt
b/www-apps/baikal/files/postinstall-v0.7-en.txt
new file mode 100644
index 000..ab3ec6459f9
--- /dev/null
+++ b/www-apps/baikal/files/postinstall-v0.7-en.txt
@@ -0,0 +1,9 @@
+To install, point your browser at the installation url:
+ /admin/install
+To upgrade baikal, do the same but note that starting from version 0.7.0
+baikal now uses a yaml file instead of php config. The installer will
+try to convert your configuration, but fail to retain your MySQL
+database config (if you use that).
+ https://github.com/sabre-io/Baikal/issues/943
+Simply edit the /etc/baikal/baikal.yaml file and add the missing values
+under the database section.
[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/files/, www-apps/baikal/
commit: cc4413124c89fd482910478c3161d77eab38d104
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Feb 25 20:14:38 2016 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Feb 25 20:15:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc441312
www-apps/baikal: version bump by Perfect Gentleman in bug #575082
Package-Manager: portage-2.2.26
www-apps/baikal/Manifest | 1 +
www-apps/baikal/baikal-0.3.5.ebuild | 57
www-apps/baikal/files/postinstall-en.txt | 1 +
3 files changed, 59 insertions(+)
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index a02314e..745a437 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,2 +1,3 @@
+DIST baikal-0.3.5.zip 3282401 SHA256
a3da3ed6d668b5ea9c2c83a231b5cfe827d25d4f45991554e27c3b277446d728 SHA512
b0e1c9387c92a355c25c39165f608a956778199b23922b10cc9721ac0c5b5c3465e743ab6d890c2400eddaf7249bb2749c2065539892567430f4bef0625d760d
WHIRLPOOL
f1a9e1cd9512b6e6aa89449a341c8da09b36f24b67462e44fe2a9ec5b7843a9b8aaf6cf89b645c668e8e14fa2432c84737e6eb40f136ca11929d7617e2d2cf3a
DIST baikal-regular-0.2.4.tgz 868606 SHA256
5a8a57323d3662e167c8b45b5d10748139be94f54d4cc440aca8aff0159f9678 SHA512
84ac92a9fc0da108a7a56972a6ec4f08bdd5223c4052589db2cbe030093eeb250e5df769a02cd86b74e92c6c56601e1df1f1d422e3a9bc1fc958931f93a0d6ba
WHIRLPOOL
010f4da3c1bb3cf08c1567f80843c44877f2a46a2d0a86258cb903bfc9e7c08da7afeae69e93c524a178ebf2cb89ab35579485349e06e52619b34ca163e09b05
DIST baikal-regular-0.2.7.tgz 2273699 SHA256
268daeec96b9f1bbfee0c16398ae213abfe827c97ec487179985828b6267359f SHA512
261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e3a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f
WHIRLPOOL
bf3e750c9cb5e9e372794e24516e8acb6d43abe1e76d30e3033994e617082f62bef87f5b33363937818ccb1ac35cd37d59dc7caab42356206be37967d284b8f0
diff --git a/www-apps/baikal/baikal-0.3.5.ebuild
b/www-apps/baikal/baikal-0.3.5.ebuild
new file mode 100644
index 000..a52cacb
--- /dev/null
+++ b/www-apps/baikal/baikal-0.3.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="http://sabre.io/baikal/;
+SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip;
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+IUSE="+mysql sqlite"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?]
+ mysql? ( virtual/mysql )
+ sqlite? ( dev-db/sqlite )
+ virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+ webapp_src_preinst
+
+ dodoc *.md || die "dodoc failed"
+
+ einfo "Installing web files"
+ insinto "${MY_HTDOCSDIR}"
+ doins -r html/* html/.htaccess Core vendor || die "doins failed"
+
+ einfo "Setting up container for configuration"
+ insinto /etc/${PN}
+
+ einfo "Fixing symlinks"
+ local link target
+ find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
+ target=$(readlink "${link}")
+ target=${target/..\/Core/Core}
+ rm "${link}" && ln -s "${target}" "${link}"
+ done
+ dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
+ dosym . "${MY_HTDOCSDIR}"/html
+
+ webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+ webapp_src_install
+
+ if has_version www-servers/apache ; then
+ fowners -R apache:apache /etc/${PN}
+ elif has_version www-servers/nginx ; then
+ fowners -R nginx:nginx /etc/${PN}
+ else
+ einfo "/etc/${PN} must be owned by the webserver user for
baikal"
+ fi
+}
diff --git a/www-apps/baikal/files/postinstall-en.txt
b/www-apps/baikal/files/postinstall-en.txt
index aafca85..4f1ed82 100644
--- a/www-apps/baikal/files/postinstall-en.txt
+++ b/www-apps/baikal/files/postinstall-en.txt
@@ -2,3 +2,4 @@ In order to setup baïkal:
- create /etc/${PN}/ENABLE_INSTALL owner apache:apache
- point your browser at the instal's URL and follow the setup
To upgrade baïkal, you have to follow the setup instructions
+If you're upgrading from 0.2.7, see http://sabre.io/baikal/upgrade/
