Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

10 files changed, 326 insertions, 20 deletions

diff --git a/libre/texlive-core/PKGBUILD b/libre/texlive-core/PKGBUILD
index f38aac735..b59c52011 100644
--- a/libre/texlive-core/PKGBUILD
+++ b/libre/texlive-core/PKGBUILD
@@ -37,8 +37,9 @@ replaces=('tetex' 'texlive-latex3' 'pdfjam'
           'texlive-core-libre')
 url='http://tug.org/texlive/'
 mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
+mksha256sums=('2bc3d2afff271b7c28650aa6e398977597e85cb4850f97a41925e8f61f36d2e9')
 noextract=("$pkgname-$pkgver-src.zip")
-source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"
+source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"{,.sig}
         "$pkgname.maps"
         "$pkgname.fmts"
         "mktexlsr.hook"
@@ -50,18 +51,6 @@ source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"
         "texmf.cnf"
         "texmfcnf.lua"
         "09-texlive-fonts.conf")
-sha256sums=('442852ef075b8851086eef4036f4494d6c128a69c9b2003e6e776d0bb499ffdf'
-            '275253728d884b2b75e01840b0824c1fe5afbdda91fafeacd33deb6cd92341a3'
-            '009ab6be9e4fa18709fc74d26a3777372f4b5af9313421ff0546ba94a9d5ff13'
-            '1d62d46d4d3a538ccad48d31192fccdfc8d6c0a60b331575a10a007d46812d46'
-            '05afeae62a5d4c9de79c838c9636e2aefe9ad1d6b787fed4e5930c13baf60eba'
-            '9a0e462ad44d2ced432860ff62288b1c2f55b04c8d0c92887672478752417cf4'
-            '539a6face78ba7c18c8001769f0047ab3248fc7db777832f8eecec33877f4944'
-            '1f2c67e3cab02398980008f3095257ade3bb79f188cf0815a2671af3080e21af'
-            'f96e9f815fa0a4b85e677f2a9215d9106b8abe46eceb3f3e36a6c76eda3e4a85'
-            '59236d61760bf89142a347d6d5b3e59c5daec4e430d12d25cc1d5c6528688f75'
-            '0b6c3ee516608ce04d7133db52cadfa1be5d885b3f82bb39dc5897b213847e0d'
-            '5e79c40cf3ab93348fc89e97890198601767ea2c8fea89ea76088c17a2b35962')
 install=texlive.install
 backup=(etc/texmf/web2c/texmf.cnf \
         etc/texmf/chktex/chktexrc \
@@ -74,7 +63,19 @@ backup=(etc/texmf/web2c/texmf.cnf \
 	etc/texmf/web2c/fmtutil.cnf \
 	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
-mksha256sums=('2bc3d2afff271b7c28650aa6e398977597e85cb4850f97a41925e8f61f36d2e9')
+sha256sums=('442852ef075b8851086eef4036f4494d6c128a69c9b2003e6e776d0bb499ffdf' 'SKIP'
+            '275253728d884b2b75e01840b0824c1fe5afbdda91fafeacd33deb6cd92341a3'
+            '009ab6be9e4fa18709fc74d26a3777372f4b5af9313421ff0546ba94a9d5ff13'
+            '1d62d46d4d3a538ccad48d31192fccdfc8d6c0a60b331575a10a007d46812d46'
+            '05afeae62a5d4c9de79c838c9636e2aefe9ad1d6b787fed4e5930c13baf60eba'
+            '9a0e462ad44d2ced432860ff62288b1c2f55b04c8d0c92887672478752417cf4'
+            '539a6face78ba7c18c8001769f0047ab3248fc7db777832f8eecec33877f4944'
+            '1f2c67e3cab02398980008f3095257ade3bb79f188cf0815a2671af3080e21af'
+            'f96e9f815fa0a4b85e677f2a9215d9106b8abe46eceb3f3e36a6c76eda3e4a85'
+            '59236d61760bf89142a347d6d5b3e59c5daec4e430d12d25cc1d5c6528688f75'
+            '0b6c3ee516608ce04d7133db52cadfa1be5d885b3f82bb39dc5897b213847e0d'
+            '5e79c40cf3ab93348fc89e97890198601767ea2c8fea89ea76088c17a2b35962')
+validpgpkeys=('38D33EF29A7691134357648733466E12EC7BA943') # Isaac David <isacdaavid@isacdaavid@dot@info>
 
 mksource() {
    mkdir $pkgname-$pkgver
diff --git a/libre/texlive-fontsextra/PKGBUILD b/libre/texlive-fontsextra/PKGBUILD
index 699362bd8..530105a4c 100644
--- a/libre/texlive-fontsextra/PKGBUILD
+++ b/libre/texlive-fontsextra/PKGBUILD
@@ -17,12 +17,14 @@ replaces=('texlive-fontsextra-libre')
 conflicts=('texlive-fontsextra-libre')
 url='http://tug.org/texlive/'
 mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
+mksha256sums=('e6fc784cdb144f65a787d050b0f3ea7f109f3ec92cd76fc6acb180e190d715ec')
 noextract=("$pkgname-$pkgver-src.zip")
-source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz" "$pkgname.maps")
+source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"{,.sig}
+        "$pkgname.maps")
 options=('!emptydirs')
-mksha256sums=('e6fc784cdb144f65a787d050b0f3ea7f109f3ec92cd76fc6acb180e190d715ec')
-sha256sums=('da08dc17f0e4d3dbe76fd4e475310b8d23780d970698265e1d32bc633e626a32'
+sha256sums=('da08dc17f0e4d3dbe76fd4e475310b8d23780d970698265e1d32bc633e626a32' 'SKIP'
             '819f8db02567480fc15717b7aded00c3fe3d61bb6dbddacf99adcdcf967d8ee3')
+validpgpkeys=('38D33EF29A7691134357648733466E12EC7BA943') # Isaac David <isacdaavid@isacdaavid@dot@info>
 
 mksource() {
    mkdir $pkgname-$pkgver
diff --git a/libre/texlive-latexextra/PKGBUILD b/libre/texlive-latexextra/PKGBUILD
index fc8bfaa55..e03ec8af6 100644
--- a/libre/texlive-latexextra/PKGBUILD
+++ b/libre/texlive-latexextra/PKGBUILD
@@ -25,13 +25,14 @@ replaces=('texlive-latexextra-libre')
 conflicts=('texlive-latexextra-libre')
 url='http://tug.org/texlive/'
 mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
+mksha256sums=('fc170af03ed0c4065d19fa12d517db2cd672dcb917763061a86cdb0bb1df9fbd')
 noextract=("$pkgname-$pkgver-src.zip")
-source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"
+source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"{,.sig}
         "$pkgname.maps")
 options=('!emptydirs')
-mksha256sums=('fc170af03ed0c4065d19fa12d517db2cd672dcb917763061a86cdb0bb1df9fbd')
-sha256sums=('c254f27dcd29b4b4e83322d2e2206ca4ff4c6937b07aed9669391824320cea53'
+sha256sums=('c254f27dcd29b4b4e83322d2e2206ca4ff4c6937b07aed9669391824320cea53' 'SKIP'
             'd53750a03a52472a1c7c5ba5142959ba382a5d69215471691c0b12c3663950ce')
+validpgpkeys=('38D33EF29A7691134357648733466E12EC7BA943') # Isaac David <isacdaavid@isacdaavid@dot@info>
 
 mksource() {
    mkdir $pkgname-$pkgver
diff --git a/pcr/mediagoblin/PKGBUILD b/pcr/mediagoblin/PKGBUILD
new file mode 100644
index 000000000..bda9ee821
--- /dev/null
+++ b/pcr/mediagoblin/PKGBUILD
@@ -0,0 +1,85 @@
+# Maintainer (AUR): Immae <ismael.bouya@normalesup.org>
+# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+
+pkgname=mediagoblin
+pkgver=0.9.0
+pkgrel=4
+pkgdesc='A free software media publishing platform'
+arch=('i686' 'x86_64')
+url='http://mediagoblin.org'
+license=('AGPL')
+provides=('mediagoblin')
+conflicts=('mediagoblin-git')
+depends=('python' 'python-lxml' 'sqlite' 'python-pillow' 'python-virtualenv' 'npm' 'nodejs')
+optdepends=(
+  'postgresql: to use the postgresql database backend'
+  'python-psycopg2: to use the postgresql database backend'
+  'python-gobject: to handle videos'
+  'gst-libav: to handle videos'
+  'gst-python: to handle videos'
+  'gst-plugins-good: to handle videos'
+  'gst-plugins-bad: to handle videos'
+  'gst-plugins-ugly: to handle videos'
+  )
+backup=('etc/webapps/mediagoblin/paste_local.ini' 'etc/webapps/mediagoblin/mediagoblin_local.ini')
+install=mediagoblin.install
+makedepends=('git' 'automake')
+mksource=("mediagoblin-$pkgver::git://git.savannah.gnu.org/mediagoblin.git#tag=v$pkgver")
+mksha256sums=('SKIP')
+source=(
+  "https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver-src.tar.xz"{,.sig}
+  'mediagoblin-paster.service'
+  'mediagoblin-celeryd.service'
+  'paste_local.ini'
+  'mediagoblin_local.ini'
+  'mediagoblin-tmpfiles.conf'
+)
+sha256sums=('a37657c686933a21dbf47e095a24c086ea509590f1e6bf95a63fe8779c198d31'
+            'SKIP'
+            '2a02c90dcc8f69ac2a072044d3e4281347ed048c2610cb2e11295e4876cfb409'
+            'f636d02f86d2dab5ecc901be5b0f7c42366500393f22dfdc7e354ca299fca65a'
+            'ac914d60886d9bf53d3f40b8b00a60d46ada1cac9130210e045a4776d898e884'
+            '9adf338f5dbfb94ee7ae29433091b6991a1fa39a6135a8295f9f1cc1fde0edc1'
+            'abb6c4c4e54d4372adfe67ab22371ad625505098311955e5ae8e34102b059d47')
+validpgpkeys=('38D33EF29A7691134357648733466E12EC7BA943') # Isaac David <isacdaavid@isacdaavid@dot@info>
+
+prepare() {
+  cd "$srcdir/mediagoblin-$pkgver"
+  git submodule init
+  git submodule update
+}
+
+build() {
+  cd "$srcdir/mediagoblin-$pkgver"
+
+  ./bootstrap.sh
+  ./configure --with-python3
+  make || make
+  ./bin/easy_install flup
+}
+
+package() {
+  cd "$srcdir/mediagoblin-$pkgver"
+  rm -rf .git .gitignore
+
+  install -dm755 "$pkgdir"/usr/share/webapps/mediagoblin/
+  cp -a . "$pkgdir"/usr/share/webapps/mediagoblin
+
+  cd "$pkgdir"/usr/share/webapps/mediagoblin
+  find . -name '*.pyc' -delete
+  find . -type f -exec sed -i "s|$srcdir/mediagoblin|/usr/share/webapps/mediagoblin|g" {} \;
+
+  install -dm755 "$pkgdir"/var/lib/mediagoblin
+  install -dm755 "$pkgdir"/etc/webapps/mediagoblin
+
+  install -Dm644 "$srcdir"/paste_local.ini "$pkgdir"/etc/webapps/mediagoblin/paste_local.ini
+  ln -s /etc/webapps/mediagoblin/paste_local.ini "$pkgdir"/usr/share/webapps/mediagoblin/paste_local.ini
+  install -Dm644 "$srcdir"/mediagoblin_local.ini "$pkgdir"/etc/webapps/mediagoblin/mediagoblin_local.ini
+  ln -s /etc/webapps/mediagoblin/mediagoblin_local.ini "$pkgdir"/usr/share/webapps/mediagoblin/mediagoblin_local.ini
+
+  ln -s /var/lib/mediagoblin/ "$pkgdir"/usr/share/webapps/mediagoblin/user_dev
+
+  install -Dm644 "$srcdir"/mediagoblin-paster.service "$pkgdir"/usr/lib/systemd/system/mediagoblin-paster.service
+  install -Dm644 "$srcdir"/mediagoblin-celeryd.service "$pkgdir"/usr/lib/systemd/system/mediagoblin-celeryd.service
+  install -Dm644 "$srcdir"/mediagoblin-tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/mediagoblin.conf
+}
diff --git a/pcr/mediagoblin/mediagoblin-celeryd.service b/pcr/mediagoblin/mediagoblin-celeryd.service
new file mode 100644
index 000000000..4100d2111
--- /dev/null
+++ b/pcr/mediagoblin/mediagoblin-celeryd.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Mediagoblin Celeryd
+
+[Service]
+User=mediagoblin
+Group=mediagoblin
+Type=simple
+WorkingDirectory=/usr/share/webapps/mediagoblin/
+Environment=MEDIAGOBLIN_CONFIG=/usr/share/webapps/mediagoblin/mediagoblin_local.ini \
+            CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery
+ExecStart=/usr/share/webapps/mediagoblin/bin/celery worker \
+              --logfile=/var/log/mediagoblin/celery.log \
+              --loglevel=INFO
+PIDFile=/var/run/mediagoblin/mediagoblin-celeryd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/mediagoblin/mediagoblin-paster.service b/pcr/mediagoblin/mediagoblin-paster.service
new file mode 100644
index 000000000..f640375e6
--- /dev/null
+++ b/pcr/mediagoblin/mediagoblin-paster.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Mediagoblin
+ 
+[Service]
+Type=simple
+WorkingDirectory=/usr/share/webapps/mediagoblin
+User=mediagoblin
+Group=mediagoblin
+ExecStart=/usr/share/webapps/mediagoblin/bin/paster serve \
+             /usr/share/webapps/mediagoblin/paste_local.ini \
+             --pid-file=/var/run/mediagoblin/mediagoblin.pid \
+             --log-file=/var/log/mediagoblin/mediagoblin.log
+ExecStop=/usr/share/webapps/mediagoblin/bin/paster serve \
+            --pid-file=/var/run/mediagoblin/mediagoblin.pid \
+            /usr/share/webapps/mediagoblin/paste_local.ini stop
+PIDFile=/var/run/mediagoblin/mediagoblin.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/mediagoblin/mediagoblin-tmpfiles.conf b/pcr/mediagoblin/mediagoblin-tmpfiles.conf
new file mode 100644
index 000000000..daf0e4e55
--- /dev/null
+++ b/pcr/mediagoblin/mediagoblin-tmpfiles.conf
@@ -0,0 +1,2 @@
+D /var/run/mediagoblin 0755 mediagoblin mediagoblin -
+D /var/log/mediagoblin 0755 mediagoblin mediagoblin -
diff --git a/pcr/mediagoblin/mediagoblin.install b/pcr/mediagoblin/mediagoblin.install
new file mode 100755
index 000000000..4149ed0cf
--- /dev/null
+++ b/pcr/mediagoblin/mediagoblin.install
@@ -0,0 +1,29 @@
+pkgname=mediagoblin
+
+post_install() {
+  if [ ! `grep mediagoblin /etc/group` ]; then
+    groupadd mediagoblin &>/dev/null;
+  fi
+
+  id mediagoblin &>/dev/null || \
+    useradd -g mediagoblin -d /var/lib/mediagoblin -s /bin/false mediagoblin
+
+  /usr/bin/systemd-tmpfiles --create mediagoblin.conf
+
+  chown -R mediagoblin:mediagoblin /var/run/mediagoblin /var/lib/mediagoblin
+
+  cd /usr/share/webapps/mediagoblin/
+  /bin/su -s /bin/sh -c "/usr/share/webapps/mediagoblin/bin/gmg dbupdate" mediagoblin
+}
+
+post_upgrade() {
+  cd /usr/share/webapps/mediagoblin/
+  /bin/su -s /bin/sh -c "/usr/share/webapps/mediagoblin/bin/gmg dbupdate" mediagoblin
+}
+
+pre_remove() {
+  /usr/bin/systemd-tmpfiles --remove mediagoblin.conf
+
+  userdel mediagoblin &> /dev/null
+  groupdel mediagoblin &> /dev/null
+}
diff --git a/pcr/mediagoblin/mediagoblin_local.ini b/pcr/mediagoblin/mediagoblin_local.ini
new file mode 100644
index 000000000..2f7753ab7
--- /dev/null
+++ b/pcr/mediagoblin/mediagoblin_local.ini
@@ -0,0 +1,64 @@
+# If you want to make changes to this file, first copy it to
+# mediagoblin_local.ini, then make the changes there.
+#
+# If you don't see what you need here, have a look at mediagoblin/config_spec.ini
+# It defines types and defaults so it's a good place to look for documentation
+# or to find hidden options that we didn't tell you about. :)
+
+# To change the directory you should make sure you change the
+# directory in paste.ini and/or your webserver configuration.
+#
+[DEFAULT]
+data_basedir = "/var/lib/mediagoblin"
+
+[mediagoblin]
+direct_remote_path = /mgoblin_static/
+email_sender_address = "notice@mediagoblin.example.org"
+
+## Uncomment and change to your DB's appropiate setting.
+## Default is a local sqlite db "mediagoblin.db".
+## Don't forget to run `./bin/gmg dbupdate` after having changed it.
+sql_engine = sqlite:///%(data_basedir)s/mediagoblin.db
+
+# Set to false to enable sending notices
+email_debug_mode = true
+
+# Set to false to disable registrations
+allow_registration = true
+
+# Set to false to disable the ability for users to report offensive content
+allow_reporting = true
+
+## Uncomment this to put some user-overriding templates here
+# local_templates = %(data_basedir)s/templates/
+
+## You can set your theme by specifying this (not specifying it will
+## use the default theme).  Run `gmg assetlink` to apply the change.
+## The airy and sandyseventiesspeedboat theme comes with GMG; please
+## see the theming docs on how to install other themes.
+# theme = airy
+
+## If you want the terms of service displayed, you can uncomment this
+# show_tos = true
+
+user_privilege_scheme = "uploader,commenter,reporter"
+[storage:queuestore]
+base_dir = %(data_basedir)s/media/queue
+
+[storage:publicstore]
+base_dir = %(data_basedir)s/media/public
+base_url = /mgoblin_media/
+
+[celery]
+CELERY_RESULT_DBURI = sqlite:///%(data_basedir)s/celery.db
+BROKER_URL = sqlite:///%(data_basedir)s/kombu.db
+
+# Put celery stuff here
+
+# Place plugins here, each in their own subsection of [plugins].
+# See http://docs.mediagoblin.org/siteadmin/plugins.html for details.
+[plugins]
+[[mediagoblin.plugins.geolocation]]
+[[mediagoblin.plugins.basic_auth]]
+[[mediagoblin.plugins.processing_info]]
+[[mediagoblin.media_types.image]]
diff --git a/pcr/mediagoblin/paste_local.ini b/pcr/mediagoblin/paste_local.ini
new file mode 100644
index 000000000..ce3f01e85
--- /dev/null
+++ b/pcr/mediagoblin/paste_local.ini
@@ -0,0 +1,86 @@
+# If you want to make changes to this file, first copy it to
+# paste_local.ini, then make the changes there.
+
+[DEFAULT]
+# Set to true to enable web-based debugging messages and etc.
+debug = false
+
+[pipeline:main]
+# pipeline = errors mediagoblin
+pipeline = mediagoblin
+
+[app:mediagoblin]
+use = egg:mediagoblin#app
+config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
+# static paths
+/mgoblin_media = %(here)s/user_dev/media/public
+/mgoblin_static = %(here)s/mediagoblin/static
+/theme_static = %(here)s/user_dev/theme_static
+/plugin_static = %(here)s/user_dev/plugin_static
+
+[loggers]
+keys = root
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-7.7s [%(name)s] %(message)s
+
+[filter:errors]
+use = egg:mediagoblin#errors
+debug = false
+
+
+##############################
+# Server configuration options
+##############################
+
+# The server that is run by default.
+# By default, should only be accessable locally
+[server:main]
+use = egg:waitress#main
+host = 127.0.0.1
+port = 6543
+# # Gunicorn settings. See http://docs.gunicorn.org/en/19.0/settings.html
+# # for more information about configuring Gunicorn
+# proc_name = gmg
+# reload = true
+# accesslog = -
+
+#######################
+# Helper server configs
+# ---------------------
+#   If you are configuring the paste config manually, you can remove
+#   these.
+
+# Use this if you want to run on port 6543 and have MediaGoblin be
+# viewable externally
+[server:broadcast]
+use = egg:waitress#main
+host = 0.0.0.0
+port = 6543
+
+# Use this if you want to connect via fastcgi
+[server:fcgi]
+use = egg:flup#fcgi_fork
+host = %(fcgi_host)s
+port = %(fcgi_port)s
+
+[server:http]
+use = egg:waitress#main
+host = %(http_host)s
+port = %(http_port)s