summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD37
2 files changed, 25 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 829ae9854a33..fb1a60ddf59c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = diaspora-postgresql-git
pkgdesc = A distributed privacy aware social network (development head) (PostgreSQL)
- pkgver = 0.7.12.0.r203.ge92eb8878
+ pkgver = 0.7.18.2.r759.g744f5449f
pkgrel = 1
url = https://diasporafoundation.org
install = diaspora.install
@@ -8,9 +8,9 @@ pkgbase = diaspora-postgresql-git
arch = x86_64
license = AGPL3
makedepends = nodejs
+ makedepends = yarn
makedepends = git
- depends = ruby2.4
- depends = ruby2.4-bundler
+ depends = ruby
depends = redis
depends = imagemagick
depends = libxslt
@@ -25,6 +25,7 @@ pkgbase = diaspora-postgresql-git
conflicts = diaspora-mysql-git
options = !strip
backup = etc/webapps/diaspora/diaspora.yml
+ backup = etc/webapps/diaspora/diaspora.toml
backup = etc/webapps/diaspora/database.yml
backup = etc/webapps/diaspora/secret_token.rb
source = git+https://github.com/diaspora/diaspora.git#branch=develop
@@ -41,4 +42,3 @@ pkgbase = diaspora-postgresql-git
sha256sums = 29cfd5116e919d8851ff70b8b82af8d4a6c8243a9d1ca555981a1a695e2d7715
pkgname = diaspora-postgresql-git
-
diff --git a/PKGBUILD b/PKGBUILD
index b223aec67daf..507e5d9048e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
# Maintainer: Jonne Haß <me@jhass.eu>
pkgname='diaspora-postgresql-git'
-pkgver=0.7.12.0.r203.ge92eb8878
+pkgver=0.7.18.2.r759.g744f5449f
pkgrel=1
pkgdesc="A distributed privacy aware social network (development head) (PostgreSQL)"
arch=('i686' 'x86_64')
url="https://diasporafoundation.org"
license=('AGPL3')
-depends=('ruby2.4' 'ruby2.4-bundler' 'redis' 'imagemagick' 'libxslt' 'net-tools' 'gsfonts' 'libtirpc' 'postgresql-libs')
+depends=('ruby' 'redis' 'imagemagick' 'libxslt' 'net-tools' 'gsfonts' 'libtirpc' 'postgresql-libs')
optdepends=('jemalloc: lower memory consumption' 'postgresql: Database server')
-makedepends=('nodejs' 'git')
+makedepends=('nodejs' 'yarn' 'git')
conflicts=('diaspora-mysql' 'diaspora-postgresql' 'diaspora-mysql-git')
options=(!strip)
backup=("etc/webapps/diaspora/diaspora.yml"
+ "etc/webapps/diaspora/diaspora.toml"
"etc/webapps/diaspora/database.yml"
"etc/webapps/diaspora/secret_token.rb")
install="diaspora.install"
@@ -50,9 +51,10 @@ _reset_ruby() {
}
build() {
- _bundle=bundle-2.4
- _ruby=ruby-2.4
- _rake=rake-2.4
+ _bundle=bundle
+ _ruby=ruby
+ _rake=rake
+ _gem=gem
_builddir=$srcdir/build
_reset_ruby
@@ -61,11 +63,14 @@ build() {
rm -rf $_builddir
mkdir -p $_builddir
cp -Rf $srcdir/diaspora/{bin,app,config,db,public,lib,script,vendor,config.ru,Gemfile,Gemfile.lock,Rakefile} $_builddir
+ cp $srcdir/diaspora/{package.json,yarn.lock} $_builddir
cd $_builddir
msg "Bundle dependencies"
echo "gem: --no-rdoc --no-ri --no-user-install" > $_builddir/.gemrc
+ export GEM_HOME="$_builddir/vendor/bundle"
+ HOME=$_builddir $_gem install bundler -v 2.3.18
HOME=$_builddir $_bundle config --local path vendor/bundle
HOME=$_builddir $_bundle config --local frozen 1
HOME=$_builddir $_bundle config --local disable_shared_gems true
@@ -74,15 +79,15 @@ build() {
HOME=$_builddir C_INCLUDE_PATH=/usr/include:/usr/include/tirpc $_bundle install
msg "Patch configuration examples"
- sed -i -e "s|#certificate_authorities: '/etc/ssl/certs/ca-certificates.crt'|certificate_authorities: '/etc/ssl/certs/ca-certificates.crt'|" \
- -e "s|#rails_environment: 'production'|rails_environment: 'production'|" \
- -e "s|#listen: 'unix:tmp/diaspora.sock'|listen: '/run/diaspora/diaspora.sock'|" \
- $_builddir/config/diaspora.yml.example
+ sed -i -e 's|#certificate_authorities = "/etc/ssl/certs/ca-certificates.crt"|certificate_authorities = "/etc/ssl/certs/ca-certificates.crt"|' \
+ -e 's|#rails_environment = "production"|rails_environment = "production"|' \
+ -e 's|#listen = "unix:tmp/diaspora.sock"|listen = "/run/diaspora/diaspora.sock"|' \
+ $_builddir/config/diaspora.toml.example
sed -i -e "s|<<: \*postgresql|<<: *postgresql|" \
-e "s|#<<: \*mysql||" \
$_builddir/config/database.yml.example
- cp $_builddir/config/diaspora.yml{.example,}
+ cp $_builddir/config/diaspora.toml{.example,}
cp $_builddir/config/database.yml{.example,}
msg "Create secret token"
@@ -91,12 +96,12 @@ build() {
msg "Precompile assets"
HOME=$_builddir RAILS_ENV=production $_bundle exec $_rake assets:precompile
- rm $_builddir/config/{diaspora,database}.yml
+ rm $_builddir/config/{diaspora.toml,database.yml}
}
package() {
- _bundle=bundle-2.4
- _ruby=ruby-2.4
+ _bundle=bundle
+ _ruby=ruby
_builddir=$srcdir/build
msg "Copy contents to package directory"
@@ -121,7 +126,7 @@ package() {
msg "Prepare configuration files"
install -dm750 $pkgdir/etc/webapps/diaspora
- install -Dm640 $_builddir/config/diaspora.yml.example $pkgdir/etc/webapps/diaspora/diaspora.yml
+ install -Dm640 $_builddir/config/diaspora.toml.example $pkgdir/etc/webapps/diaspora/diaspora.toml
install -Dm640 $_builddir/config/database.yml.example $pkgdir/etc/webapps/diaspora/database.yml
msg "Create symlinks"
@@ -130,7 +135,7 @@ package() {
rm -Rf $pkgdir/usr/share/webapps/diaspora/log \
$pkgdir/usr/share/webapps/diaspora/tmp \
$pkgdir/usr/share/webapps/diaspora/public/uploads
- ln -s /etc/webapps/diaspora/diaspora.yml $pkgdir/usr/share/webapps/diaspora/config/diaspora.yml
+ ln -s /etc/webapps/diaspora/diaspora.toml $pkgdir/usr/share/webapps/diaspora/config/diaspora.toml
ln -s /etc/webapps/diaspora/database.yml $pkgdir/usr/share/webapps/diaspora/config/database.yml
ln -sf /etc/webapps/diaspora/secret_token.rb $pkgdir/usr/share/webapps/diaspora/config/initializers/secret_token.rb
ln -sf /var/lib/diaspora/uploads $pkgdir/usr/share/webapps/diaspora/public/uploads