summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/cuetools/PKGBUILD42
-rw-r--r--community/cuetools/cuetag.patch37
-rw-r--r--community/cuetools/fix_build_with_automake-1.12.diff24
-rw-r--r--community/ipset/01-Fix-configure-failure-when-with-kmod.patch43
-rw-r--r--community/ipset/PKGBUILD17
-rw-r--r--community/kmscon/PKGBUILD4
-rw-r--r--community/luaposix/PKGBUILD25
-rw-r--r--community/torsocks/PKGBUILD2
-rw-r--r--community/uwsgi/PKGBUILD6
-rw-r--r--core/binutils/PKGBUILD4
-rw-r--r--core/bison/PKGBUILD3
-rw-r--r--core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch29
-rw-r--r--core/curl/PKGBUILD18
-rw-r--r--core/flex/PKGBUILD3
-rw-r--r--core/make/PKGBUILD45
-rw-r--r--cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD2
-rw-r--r--cross/xtensa-unknown-elf-binutils/PKGBUILD2
-rw-r--r--cross/xtensa-unknown-elf-gcc/PKGBUILD2
-rw-r--r--cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD2
-rw-r--r--extra/c-ares/PKGBUILD4
-rw-r--r--extra/eventlog/PKGBUILD4
-rw-r--r--extra/gegl/PKGBUILD40
-rw-r--r--extra/gegl/gegl-0.2.0-CVE-2012-4433.patch159
-rw-r--r--extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff15
-rw-r--r--extra/gegl/gegl-0.2.0-lua-5.2.patch53
-rw-r--r--extra/gegl/gegl-0.2.0-remove-src-over-op.patch195
-rw-r--r--extra/gperftools/PKGBUILD4
-rw-r--r--extra/imagemagick/PKGBUILD6
-rw-r--r--extra/leveldb/PKGBUILD4
-rw-r--r--extra/sharutils/PKGBUILD6
-rw-r--r--extra/snappy/PKGBUILD4
-rw-r--r--extra/v4l-utils/PKGBUILD5
-rw-r--r--extra/valgrind/PKGBUILD4
-rw-r--r--extra/varnish/PKGBUILD4
-rw-r--r--extra/yajl/PKGBUILD4
-rw-r--r--kernels/linux-libre-pae/PKGBUILD2
-rw-r--r--kernels/linux-libre-rt/PKGBUILD2
-rw-r--r--kernels/linux-libre-xen/PKGBUILD2
-rw-r--r--kernels/xen/PKGBUILD2
-rw-r--r--libre-testing/ath9k-htc-firmware-git/PKGBUILD2
-rw-r--r--libre-testing/icecat/PKGBUILD2
-rw-r--r--libre-testing/linux-libre-firmware/PKGBUILD59
-rw-r--r--libre-testing/systemd/rePKGBUILD2
-rw-r--r--libre/abiword-libre/PKGBUILD2
-rw-r--r--libre/abuse-libre/PKGBUILD2
-rw-r--r--libre/ath9k-htc-firmware/PKGBUILD2
-rw-r--r--libre/atool-libre/PKGBUILD2
-rw-r--r--libre/audacity-libre/PKGBUILD2
-rw-r--r--libre/audex-libre/PKGBUILD2
-rw-r--r--libre/audio-convert-libre/ChangeLog2
-rw-r--r--libre/audio-convert-libre/PKGBUILD2
-rw-r--r--libre/avidemux-libre/PKGBUILD2
-rw-r--r--libre/avidemux-libre/PKGBUILD.WIP2
-rw-r--r--libre/bbswitch-libre/PKGBUILD2
-rw-r--r--libre/bogofilter-libre/PKGBUILD13
-rw-r--r--libre/bumblebee-libre/PKGBUILD2
-rw-r--r--libre/calibre-libre/PKGBUILD2
-rw-r--r--libre/cdfs-libre/PKGBUILD2
-rw-r--r--libre/clementine-libre/PKGBUILD2
-rw-r--r--libre/dkms-libre/PKGBUILD2
-rw-r--r--libre/ecasound-libre/PKGBUILD2
-rw-r--r--libre/epiphany-libre/PKGBUILD2
-rw-r--r--libre/filesystem/PKGBUILD2
-rw-r--r--libre/foomatic-filters-libre/PKGBUILD2
-rw-r--r--libre/ghostscript-libre/PKGBUILD2
-rw-r--r--libre/gnormalize-libre/PKGBUILD2
-rw-r--r--libre/gnu-ghostscript/PKGBUILD2
-rw-r--r--libre/grub-legacy/PKGBUILD2
-rw-r--r--libre/grub/PKGBUILD2
-rw-r--r--libre/gstreamer0.10-bad-libre/PKGBUILD2
-rw-r--r--libre/gummiboot/PKGBUILD2
-rw-r--r--libre/hexchat-libre/PKGBUILD2
-rw-r--r--libre/iceape-l10n/PKGBUILD2
-rw-r--r--libre/iceape-libre/PKGBUILD2
-rw-r--r--libre/icecat-adblock-plus/PKGBUILD2
-rw-r--r--libre/icecat-l10n/PKGBUILD2
-rw-r--r--libre/icecat-noscript/PKGBUILD2
-rw-r--r--libre/icecat/PKGBUILD2
-rw-r--r--libre/icedove-l10n/PKGBUILD2
-rw-r--r--libre/icedove-libre/PKGBUILD2
-rw-r--r--libre/iceweasel-adblock-plus/PKGBUILD2
-rw-r--r--libre/iceweasel-l10n/PKGBUILD2
-rw-r--r--libre/iceweasel-libre/PKGBUILD11
-rw-r--r--libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.pngbin0 -> 12184 bytes
-rw-r--r--libre/iceweasel-noscript/PKGBUILD2
-rw-r--r--libre/ipsec-tools-libre/PKGBUILD2
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD2
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD2
-rw-r--r--libre/kdelibs-libre/PKGBUILD2
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD2
-rw-r--r--libre/kdepim-libre/PKGBUILD2
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD2
-rw-r--r--libre/kile-libre/PKGBUILD2
-rw-r--r--libre/lib32-mesa-demos-libre/PKGBUILD2
-rw-r--r--libre/lib32-sdl-libre/PKGBUILD2
-rw-r--r--libre/licenses-libre/PKGBUILD2
-rw-r--r--libre/liferea-libre/PKGBUILD2
-rw-r--r--libre/linux-libre-api-headers/PKGBUILD2
-rw-r--r--libre/linux-libre-firmware/PKGBUILD6
-rw-r--r--libre/linux-libre-lts/ChangeLog18
-rw-r--r--libre/linux-libre-lts/PKGBUILD2
-rw-r--r--libre/linux-libre-manpages/PKGBUILD2
-rw-r--r--libre/linux-libre-tools/PKGBUILD2
-rw-r--r--libre/linux-libre/ChangeLog21
-rw-r--r--libre/linux-libre/PKGBUILD12
-rw-r--r--libre/lirc-libre/PKGBUILD2
-rw-r--r--libre/lsb-release/PKGBUILD2
-rw-r--r--libre/mcomix-libre/PKGBUILD2
-rw-r--r--libre/mesa-demos-libre/PKGBUILD2
-rw-r--r--libre/mkisolinux/boot.msg2
-rwxr-xr-xlibre/mkisolinux/mkisolinux2
-rw-r--r--libre/mkisolinux/mkisolinux.conf2
-rwxr-xr-xlibre/mkpxelinux/mkpxelinux2
-rw-r--r--libre/mkpxelinux/mkpxelinux.conf2
-rw-r--r--libre/mksyslinux/boot.msg2
-rw-r--r--libre/mksyslinux/mksyslinux.conf2
-rw-r--r--libre/mplayer-libre/PKGBUILD2
-rw-r--r--libre/mplayer-vaapi-libre/PKGBUILD2
-rw-r--r--libre/newton-dynamics-libre/PKGBUILD2
-rw-r--r--libre/ogmrip-libre/PKGBUILD2
-rw-r--r--libre/ogmrip-libre/ogmrip.changelog2
-rw-r--r--libre/openexr-libre/PKGBUILD2
-rw-r--r--libre/openshot-libre/PKGBUILD2
-rw-r--r--libre/oss-libre/PKGBUILD2
-rw-r--r--libre/parabola-keyring/PKGBUILD2
-rw-r--r--libre/parabola-xdg-menu/PKGBUILD2
-rw-r--r--libre/psutils-libre/PKGBUILD2
-rwxr-xr-xlibre/python2-reportlab-libre/PKGBUILD2
-rw-r--r--libre/rp-pppoe-libre/PKGBUILD2
-rw-r--r--libre/sdl-libre/PKGBUILD2
-rw-r--r--libre/soundkonverter-libre/PKGBUILD2
-rw-r--r--libre/stuntrally-data-libre/PKGBUILD2
-rw-r--r--libre/syslinux/PKGBUILD2
-rw-r--r--libre/texlive-bin-libre/PKGBUILD2
-rw-r--r--libre/texlive-core-libre/PKGBUILD2
-rw-r--r--libre/texlive-fontsextra-libre/PKGBUILD2
-rw-r--r--libre/texlive-latexextra-libre/PKGBUILD2
-rw-r--r--libre/tomoyo-tools-libre/PKGBUILD2
-rw-r--r--libre/tp_smapi-libre-lts/PKGBUILD2
-rw-r--r--libre/tp_smapi-libre/PKGBUILD2
-rwxr-xr-xlibre/unar/PKGBUILD2
-rw-r--r--libre/vhba-module-libre/PKGBUILD2
-rw-r--r--libre/virtualbox-libre-modules-lts/PKGBUILD2
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD2
-rw-r--r--libre/virtualbox-libre/PKGBUILD2
-rw-r--r--libre/xchat-libre/PKGBUILD2
-rw-r--r--libre/xscreensaver-libre/PKGBUILD2
-rw-r--r--nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD2
-rw-r--r--pcr/debootstrap-libre/PKGBUILD2
-rw-r--r--pcr/gimp-art/gimp-splash-artwork.license2
-rw-r--r--pcr/gnuhealth/PKGBUILD2
-rw-r--r--pcr/hunspell-pt-br/PKGBUILD2
-rw-r--r--pcr/jitsi/PKGBUILD2
-rw-r--r--pcr/lilo/PKGBUILD2
-rw-r--r--pcr/maliit-framework/PKGBUILD2
-rw-r--r--pcr/maruku/PKGBUILD24
-rw-r--r--pcr/minetest-git/PKGBUILD2
-rw-r--r--pcr/python2-pycha/PKGBUILD2
-rw-r--r--pcr/python2-relatorio/PKGBUILD2
-rw-r--r--pcr/python2-renpy/PKGBUILD2
-rw-r--r--pcr/ruby-maruku/PKGBUILD27
-rw-r--r--pcr/ruby-syntax/PKGBUILD39
-rw-r--r--pcr/sipwitch/PKGBUILD2
-rw-r--r--pcr/trytond-account-invoice/PKGBUILD2
-rw-r--r--pcr/trytond-account-product/PKGBUILD2
-rw-r--r--pcr/trytond-account/PKGBUILD2
-rw-r--r--pcr/trytond-calendar/PKGBUILD2
-rw-r--r--pcr/trytond-company/PKGBUILD2
-rw-r--r--pcr/trytond-country/PKGBUILD2
-rw-r--r--pcr/trytond-currency/PKGBUILD2
-rw-r--r--pcr/trytond-party/PKGBUILD2
-rw-r--r--pcr/trytond-product/PKGBUILD2
-rw-r--r--pcr/trytond-stock-lot/PKGBUILD2
-rw-r--r--pcr/trytond-stock/PKGBUILD2
-rw-r--r--pcr/trytond/PKGBUILD2
-rw-r--r--pcr/zoneminder/PKGBUILD2
-rw-r--r--social/sipwitch/PKGBUILD2
-rw-r--r--~coadde/cross-binutils/PKGBUILD2
-rw-r--r--~emulatorman/hunspell-gl/PKGBUILD2
-rw-r--r--~emulatorman/iceape-l10n/PKGBUILD2
-rw-r--r--~emulatorman/iceape-libre/PKGBUILD2
-rw-r--r--~emulatorman/icecat-l10n/PKGBUILD2
-rw-r--r--~emulatorman/icecat/PKGBUILD2
-rw-r--r--~emulatorman/icedove-l10n/PKGBUILD2
-rw-r--r--~emulatorman/icedove-libre/PKGBUILD2
-rw-r--r--~emulatorman/iceweasel-l10n/PKGBUILD2
-rw-r--r--~emulatorman/iceweasel-libre/PKGBUILD2
-rw-r--r--~emulatorman/raider/PKGBUILD2
-rw-r--r--~emulatorman/xchat-xsys-noaudacious/PKGBUILD2
-rw-r--r--~emulatorman/xonotic-data/PKGBUILD2
-rw-r--r--~emulatorman/xonotic/PKGBUILD2
191 files changed, 862 insertions, 479 deletions
diff --git a/community/cuetools/PKGBUILD b/community/cuetools/PKGBUILD
index 439ce866c..1bb3325e1 100644
--- a/community/cuetools/PKGBUILD
+++ b/community/cuetools/PKGBUILD
@@ -1,33 +1,39 @@
-# $Id: PKGBUILD 64846 2012-02-18 17:42:48Z stativ $
+# $Id: PKGBUILD 98850 2013-10-20 09:41:43Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=cuetools
-pkgver=1.3.1
-pkgrel=5
-pkgdesc="Set of utilities for working with cue files and toc files"
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="Cue and toc file parsers and utilities"
arch=('i686' 'x86_64')
-url="http://developer.berlios.de/projects/cuetools/"
+url="https://github.com/svend/cuetools"
+#url="http://developer.berlios.de/projects/cuetools/"
license=('GPL')
depends=('glibc')
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz \
- cuetag.patch)
-md5sums=('45575f7a1bdc6615599fa6cb49845cca'
- '38969241a7b6ac88e2f1b46c3da0ecc2')
+source=("https://github.com/svend/cuetools/archive/${pkgver}.tar.gz"
+ "fix_build_with_automake-1.12.diff")
+md5sums=('4492dae2b3f9e077f6455a1f1cddef3b'
+ '67a3b32711d1a1f508be6ed0f1bdadf3')
-build() {
- cd "$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -Np1 < "$srcdir/fix_build_with_automake-1.12.diff" || true
- # fix cuetag
- patch -Np0 < "$srcdir"/cuetag.patch
- sed -i -e 's/--import-vc-from/--import-tags-from/' \
- -e 's/--remove-vc-all/--remove-all-tags/' extras/cuetag.sh
+ aclocal
+ autoheader
+ automake --force-missing --add-missing
+ autoconf
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --mandir=/usr/share/man
+ ./configure --prefix=/usr
make
}
package() {
- cd "$srcdir"/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
- install -m755 extras/cuetag.sh "$pkgdir"/usr/bin/cuetag.sh
}
diff --git a/community/cuetools/cuetag.patch b/community/cuetools/cuetag.patch
deleted file mode 100644
index cd41dcd56..000000000
--- a/community/cuetools/cuetag.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- extras/cuetag.sh 2006-09-06 14:24:47.000000000 -0400
-+++ extras/cuetag.sh 2007-01-26 00:13:23.000000000 -0500
-@@ -63,7 +63,7 @@
- (for field in $fields; do
- value=""
- for conv in `eval echo \\$$field`; do
-- value=`$CUEPRINT -n $1 -t "$conv\n" $cue_file`
-+ value=`$CUEPRINT -n $1 -t "$conv\n" "$cue_file"`
-
- if [ -n "$value" ]; then
- echo "$field=$value"
-@@ -96,7 +96,7 @@
- for field in $fields; do
- value=""
- for conv in `eval echo \\$$field`; do
-- value=`$CUEPRINT -n $1 -t "$conv\n" $cue_file`
-+ value=`$CUEPRINT -n $1 -t "$conv\n" "$cue_file"`
-
- if [ -n "$value" ]; then
- break
-@@ -141,14 +141,14 @@
- cue_file=$1
- shift
-
-- ntrack=`cueprint -d '%N' $cue_file`
-+ ntrack=`cueprint -d '%N' "$cue_file"`
- trackno=1
-
- if [ $# -ne $ntrack ]; then
- echo "warning: number of files does not match number of tracks"
- fi
-
-- for file in $@; do
-+ for file in "$@"; do
- case $file in
- *.[Ff][Ll][Aa][Cc])
- vorbis $trackno "$file"
diff --git a/community/cuetools/fix_build_with_automake-1.12.diff b/community/cuetools/fix_build_with_automake-1.12.diff
new file mode 100644
index 000000000..9090f32c3
--- /dev/null
+++ b/community/cuetools/fix_build_with_automake-1.12.diff
@@ -0,0 +1,24 @@
+From 761eba5b9b9c87a872a18b7ba4bf3d77a96e2157 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Horv=C3=A1th=20Bal=C3=A1zs?= <q@qroa.ch>
+Date: Tue, 15 Oct 2013 01:17:52 +0200
+Subject: [PATCH] Fix build with automake-1.12.
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index f54bb92..9f36932 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,6 +4,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AM_PROG_LEX
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ AC_PROG_YACC
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile src/lib/Makefile src/tools/Makefile extras/Makefile])
+--
+1.8.4
+
diff --git a/community/ipset/01-Fix-configure-failure-when-with-kmod.patch b/community/ipset/01-Fix-configure-failure-when-with-kmod.patch
new file mode 100644
index 000000000..d42884355
--- /dev/null
+++ b/community/ipset/01-Fix-configure-failure-when-with-kmod.patch
@@ -0,0 +1,43 @@
+From a76488a84db452865e114336b3fde6257e327715 Mon Sep 17 00:00:00 2001
+From: Oliver Smith <oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
+Date: Fri, 11 Oct 2013 16:41:12 +0200
+Subject: [PATCH 1/2] netfilter: ipset: Fix configure failure when
+ --with-kmod=no
+
+When configuring the sources to build without kernel modules, the path
+to the kernel sources was not set and the kernel header files were still
+checked.
+
+Now, we do not check the kernel sources for compatibility if we're not
+going to build any kernel modules.
+
+Signed-off-by: Oliver Smith <oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
+Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0eb1022..d56328c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -167,6 +167,8 @@ AC_CHECK_TYPES([union nf_inet_addr],,,[#include <linux/types.h>
+ dnl Checks for functions
+ AC_CHECK_FUNCS(gethostbyname2)
+
++if test "$BUILDKMOD" == "yes"
++then
+ dnl Check kernel incompatibilities... Ugly like hell
+ AC_MSG_CHECKING([kernel source for struct xt_action_param])
+ if test -f $ksourcedir/include/linux/netfilter/x_tables.h && \
+@@ -309,6 +311,7 @@ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([Netns support is required in the Linux kernel tree])
+ fi
++fi
+
+ dnl Checks for compiler characteristics.
+ dnl Check extra warning flags except
+--
+1.8.4
+
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index a4d3cb929..8bc0b969f 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 90514 2013-05-12 23:45:55Z seblu $
+# $Id: PKGBUILD 98863 2013-10-20 19:57:37Z seblu $
# Maintainer: Sébastien Luttringer
pkgname=ipset
-pkgver=6.19
-pkgrel=2
+pkgver=6.20
+pkgrel=1
pkgdesc='Administration tool for IP sets'
arch=('i686' 'x86_64')
url='http://ipset.netfilter.org'
license=('GPL2')
-depends=('libmnl' 'bash')
+depends=('libmnl')
backup=("etc/$pkgname.conf")
options=('!libtool')
source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
+ '01-Fix-configure-failure-when-with-kmod.patch'
"$pkgname.service")
-md5sums=('cabba1bd63a93f6e1c3db3fb22412b64'
+md5sums=('af28b3af356fff3e4a8e321ff7145678'
+ '5569fd4ee93acac4ae01d091002cc2f5'
'6be6a2b34c1f38fc8ad60828403e2077')
+prepare() {
+ patch -p1 -d $pkgname-$pkgver < 01-Fix-configure-failure-when-with-kmod.patch
+ cd $pkgname-$pkgver && ./autogen.sh
+}
+
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no
diff --git a/community/kmscon/PKGBUILD b/community/kmscon/PKGBUILD
index 801f87927..0d04c752f 100644
--- a/community/kmscon/PKGBUILD
+++ b/community/kmscon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 85313 2013-02-28 21:20:56Z thestinger $
+# $Id: PKGBUILD 98861 2013-10-20 18:22:20Z thestinger $
# Maintainer: Daniel Micay <danielmicay@gmail.com>
# Contributor: David Herrmann <dh.herrmann@googlemail.com>
pkgname=kmscon
pkgver=7
-pkgrel=1
+pkgrel=2
pkgdesc='Terminal emulator based on Kernel Mode Setting (KMS)'
arch=(i686 x86_64)
url='https://github.com/dvdhrm/kmscon'
diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD
index e937311b8..d6111b0dc 100644
--- a/community/luaposix/PKGBUILD
+++ b/community/luaposix/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93201 2013-06-28 13:21:16Z seblu $
+# $Id: PKGBUILD 98865 2013-10-20 20:53:15Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Contributor: Laszlo Papp <djszapi at archlinux us>
@@ -6,20 +6,31 @@
pkgbase=luaposix
pkgname=('lua-posix' 'lua51-posix')
-pkgver=29
+pkgver=31
pkgrel=1
pkgdesc='A POSIX library for Lua programming language'
arch=('i686' 'x86_64')
url='https://github.com/luaposix/luaposix'
license=('GPL' 'LGPL')
-makedepends=('lua' 'lua51' 'lua51-bitop' 'git')
-options=('!libtool')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/luaposix/luaposix/archive/v$pkgver.tar.gz")
-md5sums=('5c3e49c51caeee6eb5f9dcb2bb082bed')
+makedepends=('lua' 'lua51' 'lua51-bitop' 'git' 'help2man')
+options=('!libtool' '!makeflags')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/$pkgbase/$pkgbase/archive/v$pkgver.tar.gz"
+ 'git+git://git.sv.gnu.org/gnulib'
+ 'git+git://github.com/gvvaughan/slingshot')
+md5sums=('7b17b9a3f25d9658de967c6bfd50c138'
+ 'SKIP'
+ 'SKIP')
prepare() {
- # do bootstrap in prepare, as it clone external git
+ # replace git submodules by source one.
+ # this allow us to cache and avoid clone each time
+ for _rep in gnulib slingshot; do
+ rmdir $pkgbase-$pkgver/$_rep
+ ln -s "$srcdir/$_rep" $pkgbase-$pkgver/$_rep
+ done
+ # bootstraping
(cd $pkgbase-$pkgver && ./bootstrap)
+ # copy source for lua 5.1 build
cp -r $pkgbase-$pkgver $pkgbase-$pkgver-51
}
diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD
index 352a1dce2..ab7f42a9b 100644
--- a/community/torsocks/PKGBUILD
+++ b/community/torsocks/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=torsocks
pkgver=1.3
-pkgrel=4
+pkgrel=5
pkgdesc='Wrapper to safely torify applications'
arch=('i686' 'x86_64')
url='http://code.google.com/p/torsocks'
diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD
index a785dc9bb..447d415b4 100644
--- a/community/uwsgi/PKGBUILD
+++ b/community/uwsgi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98108 2013-10-06 00:44:23Z dwallace $
+# $Id: PKGBUILD 98834 2013-10-20 05:56:09Z dwallace $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
# Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -23,7 +23,7 @@ pkgname=(uwsgi
uwsgi-plugin-pam
uwsgi-plugin-zergpool
)
-pkgver=1.9.17.1
+pkgver=1.9.18.1
pkgrel=1
arch=(i686 x86_64)
url="http://projects.unbit.it/$pkgbase"
@@ -41,7 +41,7 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
uwsgi_ruby20_compatibility.patch
uwsgi_trick_chroot.patch)
-md5sums=('501f29ad4538193c0ef585b4cef46bcf'
+md5sums=('9925e4c189cb0fcd26d4b2efd732b6ca'
'fcd57c37372e6afe5b1fae151dd43bc9'
'b05ba1d796e1ea608a40635bc4f3ec67'
'740a7718bd341b03d916a13ddbbbe694'
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 6676edc88..b3cdebc2f 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193064 2013-08-15 12:08:13Z allan $
+# $Id: PKGBUILD 196835 2013-10-20 12:06:12Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -13,7 +13,7 @@ license=('GPL')
groups=('base-devel')
depends=('glibc>=2.18' 'zlib')
checkdepends=('dejagnu' 'bc')
-options=('!libtool' '!distcc' '!ccache')
+options=('staticlibs' '!distcc' '!ccache')
install=binutils.install
source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
binutils-2.23.2-texinfo-5.0.patch)
diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD
index d8ead584f..27ad9c6ae 100644
--- a/core/bison/PKGBUILD
+++ b/core/bison/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191960 2013-08-02 00:55:04Z allan $
+# $Id: PKGBUILD 196831 2013-10-20 11:52:24Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
@@ -11,6 +11,7 @@ license=('GPL3')
url="http://www.gnu.org/software/bison/bison.html"
depends=('glibc' 'm4' 'sh')
groups=('base-devel')
+options=('staticlibs')
install=bison.install
source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
md5sums=('a2624994561aa69f056c904c1ccb2880'
diff --git a/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch b/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch
deleted file mode 100644
index 73b23ea12..000000000
--- a/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 84f3b3dd448399f9548468676e1bd1475dba8de5 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 29 Aug 2013 22:08:01 +0200
-Subject: [PATCH] curl_multi_remove_handle: allow multiple removes
-
-When removing an already removed handle, avoid that to ruin the
-internals and just return OK instead.
----
- lib/multi.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/multi.c b/lib/multi.c
-index fb495e0..e723a3e 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -483,6 +483,10 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
- if(!GOOD_EASY_HANDLE(curl_handle))
- return CURLM_BAD_EASY_HANDLE;
-
-+ /* Prevent users from trying to remove same easy handle more than once */
-+ if(!data->multi)
-+ return CURLM_OK; /* it is already removed so let's say it is fine! */
-+
- if(easy) {
- bool premature = (data->mstate < CURLM_STATE_COMPLETED) ? TRUE : FALSE;
- bool easy_owns_conn = (data->easy_conn &&
---
-1.8.4
-
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index d8454eb34..9ca623a0e 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193944 2013-09-07 15:30:07Z dreisner $
+# $Id: PKGBUILD 196882 2013-10-20 21:20:05Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,29 +6,21 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=curl
-pkgver=7.32.0
-pkgrel=2
+pkgver=7.33.0
+pkgrel=1
pkgdesc="An URL retrieval utility and library"
arch=('i686' 'x86_64')
url="http://curl.haxx.se"
license=('MIT')
depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
provides=('libcurl.so')
-options=('!libtool')
+options=('!libtool' 'strip' 'debug')
source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
- 0001-curl_multi_remove_handle-allow-multiple-removes.patch
curlbuild.h)
-md5sums=('f77cf3cb59cf2bfe686b80338323fd40'
+md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93'
'SKIP'
- '589a2ccdf90e198fca398809e9d16128'
'751bd433ede935c8fae727377625a8ae')
-prepare() {
- cd "$pkgname-$pkgver"
-
- patch -Np1 <"$srcdir"/0001-curl_multi_remove_handle-allow-multiple-removes.patch
-}
-
build() {
cd "$pkgname-$pkgver"
diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index 2d1ef4adf..1fbcaf1c8 100644
--- a/core/flex/PKGBUILD
+++ b/core/flex/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164810 2012-08-06 13:29:17Z allan $
+# $Id: PKGBUILD 196829 2013-10-20 11:50:22Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
@@ -11,6 +11,7 @@ url="http://flex.sourceforge.net"
license=('custom')
groups=('base-devel')
depends=('glibc' 'm4' 'sh')
+options=('staticlibs')
install=flex.install
source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
lex.sh)
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
index 45a85307b..9b88e89d9 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -1,54 +1,23 @@
-# $Id: PKGBUILD 189479 2013-07-03 10:09:10Z allan $
+# $Id: PKGBUILD 196827 2013-10-20 11:42:36Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=make
-pkgver=3.82
-pkgrel=6
+pkgver=4.0
+pkgrel=1
pkgdesc="GNU make utility to maintain groups of programs"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/make"
license=('GPL3')
groups=('base-devel')
-depends=('glibc' 'sh')
+depends=('glibc' 'sh' 'guile')
install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
- make-3.82-bug30612.patch
- make-3.82-bug30723.patch
- make-3.82-sort-blank.patch
- make-3.82-makeflags.patch
- make-3.82-expensive_glob.patch
- make-3.82-dont-prune-intermediate.patch)
-md5sums=('1a11100f3c63fcf5753818e59d63088f'
- 'SKIP'
- '8714ba22911a58ab3eb42ac3f4c6c3bd'
- '662e6450e19a5acdaa5c9fcb8ad78dea'
- '7d01a99f389d8f08dec93ed479071ee4'
- 'bc12ad4d0c6e6c0e72d9fb61054f446b'
- 'e58d4211c5b29d7d927a304d082849e7'
- '45ac9e987f4bf16c0d7e1685db943917')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('571d470a7647b455e3af3f92d79f1c18'
+ 'SKIP')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
- # http://savannah.gnu.org/bugs/?30612
- patch -Np1 -i $srcdir/make-3.82-bug30612.patch
-
- # http://savannah.gnu.org/bugs/?30723
- patch -Np1 -i $srcdir/make-3.82-bug30723.patch
-
- # https://bugs.archlinux.org/task/22733 (fix from Fedora)
- patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
-
- # https://savannah.gnu.org/bugs/?33873
- patch -Np0 -i $srcdir/make-3.82-makeflags.patch
-
- # http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html
- patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch
-
- # https://savannah.gnu.org/bugs/?30653
- patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch
-
./configure --prefix=/usr
make
}
diff --git a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
index 91084085d..eb0ddb881 100644
--- a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
+++ b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
export ARCH=mips
diff --git a/cross/xtensa-unknown-elf-binutils/PKGBUILD b/cross/xtensa-unknown-elf-binutils/PKGBUILD
index 072e5e50d..7b864eeb6 100644
--- a/cross/xtensa-unknown-elf-binutils/PKGBUILD
+++ b/cross/xtensa-unknown-elf-binutils/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=binutils
diff --git a/cross/xtensa-unknown-elf-gcc/PKGBUILD b/cross/xtensa-unknown-elf-gcc/PKGBUILD
index 76328723c..50d125e8a 100644
--- a/cross/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/cross/xtensa-unknown-elf-gcc/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=gcc
diff --git a/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
index 5885001c0..2e75e0d9a 100644
--- a/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
+++ b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
export ARCH=xtensa
diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD
index b2f70453e..d731936fe 100644
--- a/extra/c-ares/PKGBUILD
+++ b/extra/c-ares/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185276 2013-05-12 20:05:21Z dreisner $
+# $Id: PKGBUILD 196877 2013-10-20 21:10:55Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Contributor: Jeff Mickey <jeff@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=c-ares
pkgver=1.10.0
-pkgrel=1
+pkgrel=2
pkgdesc='C library that performs DNS requests and name resolves asynchronously'
arch=('i686' 'x86_64')
url='http://c-ares.haxx.se/'
diff --git a/extra/eventlog/PKGBUILD b/extra/eventlog/PKGBUILD
index f32a2e4a8..9709e180f 100644
--- a/extra/eventlog/PKGBUILD
+++ b/extra/eventlog/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170165 2012-11-04 01:36:23Z dreisner $
+# $Id: PKGBUILD 196891 2013-10-20 21:58:14Z dreisner $
# Maintainer:
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=eventlog
pkgver=0.2.12
-pkgrel=3
+pkgrel=4
pkgdesc="API to format and send structured log messages"
arch=('i686' 'x86_64')
url="http://www.balabit.com/support/community/products/"
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index 26907729b..b765b45e2 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,42 +1,56 @@
-# $Id: PKGBUILD 191894 2013-08-01 06:53:27Z bpiotrowski $
+# $Id: PKGBUILD 196815 2013-10-20 02:09:43Z heftig $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
pkgname=gegl
pkgver=0.2.0
-pkgrel=9
+pkgrel=10
pkgdesc="Graph based image processing framework"
arch=('i686' 'x86_64')
url="http://www.gegl.org/"
license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
+depends=('babl' 'gtk2' 'libspiro')
makedepends=('intltool' 'ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
-optdepends=('openexr: for using the openexr plugin' \
- 'ffmpeg: for using the ffmpeg plugin' \
- 'librsvg: for using the svg plugin' \
+optdepends=('openexr: for using the openexr plugin'
+ 'ffmpeg: for using the ffmpeg plugin'
+ 'librsvg: for using the svg plugin'
'jasper: for using the jasper plugin')
options=('!libtool')
-source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gegl-0.2.0-ffmpeg-0.11.diff)
+source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ gegl-0.2.0-ffmpeg-0.11.diff
+ gegl-0.2.0-CVE-2012-4433.patch
+ gegl-0.2.0-lua-5.2.patch
+ gegl-0.2.0-remove-src-over-op.patch)
sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
- 'c10fd988c634fcf0948cc91a51d6528f6f1704ba')
+ 'e2e00633149fa4d5196520e284609de257eb012f'
+ '44d48bd9ad008703de9f8eb683d557bac39a02c8'
+ 'c78a092b880874ba7784b652bcd9c532e2b9975d'
+ 'dc9ae21cc5ba0fb47ef05793f0cb169572dfab74')
prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff"
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../gegl-0.2.0-ffmpeg-0.11.diff
+ patch -Np1 -i ../gegl-0.2.0-CVE-2012-4433.patch
+ patch -Np1 -i ../gegl-0.2.0-lua-5.2.patch
+ patch -Np1 -i ../gegl-0.2.0-remove-src-over-op.patch
}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \
--with-libavformat --with-jasper --disable-docs
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
make
}
check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make check
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/gegl/gegl-0.2.0-CVE-2012-4433.patch b/extra/gegl/gegl-0.2.0-CVE-2012-4433.patch
new file mode 100644
index 000000000..965c6fc20
--- /dev/null
+++ b/extra/gegl/gegl-0.2.0-CVE-2012-4433.patch
@@ -0,0 +1,159 @@
+From ffa77a246652c7e706d690682fe659f50fbe5656 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 1 Jul 2013 12:03:51 +0200
+Subject: [PATCH] patch: CVE-2012-4433
+
+Squashed commit of the following:
+
+commit 2a9071e2dc4cfe1aaa7a726805985281936f9874
+Author: Nils Philippsen <nils@redhat.com>
+Date: Tue Oct 16 16:57:37 2012 +0200
+
+ ppm-load: bring comment in line with reality
+
+ (cherry picked from commit 6975a9cfeaf0698b42ac81b1c2f00d13c8755453)
+
+commit 8bb88ebf78e54837322d3be74688f98800e9f33a
+Author: Nils Philippsen <nils@redhat.com>
+Date: Tue Oct 16 16:56:40 2012 +0200
+
+ ppm-load: CVE-2012-4433: add plausibility checks for header fields
+
+ Refuse values that are non-decimal, negative or overflow the target
+ type.
+
+ (cherry picked from commit 4757cdf73d3675478d645a3ec8250ba02168a230)
+
+commit 2b099886969bf055a8635d06a4d89f20fed1ee42
+Author: Nils Philippsen <nils@redhat.com>
+Date: Tue Oct 16 16:58:27 2012 +0200
+
+ ppm-load: CVE-2012-4433: don't overflow memory allocation
+
+ Carefully selected width/height values could cause the size of a later
+ allocation to overflow, resulting in a buffer much too small to store
+ the data which would then written beyond its end.
+
+ (cherry picked from commit 1e92e5235ded0415d555aa86066b8e4041ee5a53)
+---
+ operations/external/ppm-load.c | 64 +++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 54 insertions(+), 10 deletions(-)
+
+diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c
+index efe6d56..e22521c 100644
+--- a/operations/external/ppm-load.c
++++ b/operations/external/ppm-load.c
+@@ -36,6 +36,7 @@ gegl_chant_file_path (path, _("File"), "", _("Path of file to load."))
+ #include "gegl-chant.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <errno.h>
+
+ typedef enum {
+ PIXMAP_ASCII = 51,
+@@ -44,8 +45,8 @@ typedef enum {
+
+ typedef struct {
+ map_type type;
+- gint width;
+- gint height;
++ glong width;
++ glong height;
+ gsize numsamples; /* width * height * channels */
+ gsize bpc; /* bytes per channel */
+ guchar *data;
+@@ -61,7 +62,7 @@ ppm_load_read_header(FILE *fp,
+ gchar header[MAX_CHARS_IN_ROW];
+ gint maxval;
+
+- /* Check the PPM file Type P2 or P5 */
++ /* Check the PPM file Type P3 or P6 */
+ fgets (header,MAX_CHARS_IN_ROW,fp);
+
+ if (header[0] != ASCII_P ||
+@@ -82,12 +83,33 @@ ppm_load_read_header(FILE *fp,
+ }
+
+ /* Get Width and Height */
+- img->width = strtol (header,&ptr,0);
+- img->height = atoi (ptr);
+- img->numsamples = img->width * img->height * CHANNEL_COUNT;
++ errno = 0;
++ img->width = strtol (header,&ptr,10);
++ if (errno)
++ {
++ g_warning ("Error reading width: %s", strerror(errno));
++ return FALSE;
++ }
++ else if (img->width < 0)
++ {
++ g_warning ("Error: width is negative");
++ return FALSE;
++ }
++
++ img->height = strtol (ptr,&ptr,10);
++ if (errno)
++ {
++ g_warning ("Error reading height: %s", strerror(errno));
++ return FALSE;
++ }
++ else if (img->width < 0)
++ {
++ g_warning ("Error: height is negative");
++ return FALSE;
++ }
+
+ fgets (header,MAX_CHARS_IN_ROW,fp);
+- maxval = strtol (header,&ptr,0);
++ maxval = strtol (header,&ptr,10);
+
+ if ((maxval != 255) && (maxval != 65535))
+ {
+@@ -109,6 +131,16 @@ ppm_load_read_header(FILE *fp,
+ g_warning ("%s: Programmer stupidity error", G_STRLOC);
+ }
+
++ /* Later on, img->numsamples is multiplied with img->bpc to allocate
++ * memory. Ensure it doesn't overflow. */
++ if (!img->width || !img->height ||
++ G_MAXSIZE / img->width / img->height / CHANNEL_COUNT < img->bpc)
++ {
++ g_warning ("Illegal width/height: %ld/%ld", img->width, img->height);
++ return FALSE;
++ }
++ img->numsamples = img->width * img->height * CHANNEL_COUNT;
++
+ return TRUE;
+ }
+
+@@ -229,12 +261,24 @@ process (GeglOperation *operation,
+ if (!ppm_load_read_header (fp, &img))
+ goto out;
+
+- rect.height = img.height;
+- rect.width = img.width;
+-
+ /* Allocating Array Size */
++
++ /* Should use g_try_malloc(), but this causes crashes elsewhere because the
++ * error signalled by returning FALSE isn't properly acted upon. Therefore
++ * g_malloc() is used here which aborts if the requested memory size can't be
++ * allocated causing a controlled crash. */
+ img.data = (guchar*) g_malloc (img.numsamples * img.bpc);
+
++ /* No-op without g_try_malloc(), see above. */
++ if (! img.data)
++ {
++ g_warning ("Couldn't allocate %" G_GSIZE_FORMAT " bytes, giving up.", ((gsize)img.numsamples * img.bpc));
++ goto out;
++ }
++
++ rect.height = img.height;
++ rect.width = img.width;
++
+ switch (img.bpc)
+ {
+ case 1:
+--
+1.8.3.1
+
diff --git a/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
index a33ec6f7f..02fe77702 100644
--- a/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
+++ b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
@@ -1,12 +1,21 @@
-diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
+diff -u -r gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
--- gegl-0.2.0/operations/external/ff-load.c 2012-04-01 13:17:57.000000000 +0200
-+++ gegl-0.2.0-1/operations/external/ff-load.c 2012-07-11 12:42:05.174756560 +0200
++++ gegl-0.2.0-1/operations/external/ff-load.c 2013-10-20 03:22:06.824278863 +0200
@@ -271,7 +271,7 @@
gint err;
ff_cleanup (o);
- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+err = avformat_open_input (&p->ic, o->path, NULL, NULL);
++ err = avformat_open_input (&p->ic, o->path, NULL, NULL);
if (err < 0)
{
print_error (o->path, err);
+@@ -312,7 +312,7 @@
+ if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
+ p->enc->flags |= CODEC_FLAG_TRUNCATED;
+
+- if (avcodec_open (p->enc, p->codec) < 0)
++ if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
+ {
+ g_warning ("error opening codec %s", p->enc->codec->name);
+ return;
diff --git a/extra/gegl/gegl-0.2.0-lua-5.2.patch b/extra/gegl/gegl-0.2.0-lua-5.2.patch
new file mode 100644
index 000000000..e5a60bb9f
--- /dev/null
+++ b/extra/gegl/gegl-0.2.0-lua-5.2.patch
@@ -0,0 +1,53 @@
+From 1e12a153d9a82a771c3bfd95c0265b810a424b3c Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 1 Jul 2013 14:41:33 +0200
+Subject: [PATCH] patch: lua-5.2
+
+Squashed commit of the following:
+
+commit 96f65d260c6e40940f2818b721c19565c1b40607
+Author: Vincent Untz <vuntz@gnome.org>
+Date: Wed Jan 11 09:52:25 2012 +0100
+
+ Fix build with lua 5.2 by not using API deprecated in 5.1 already
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=667675
+ (cherry picked from commit a14a29c39352c60f003a65b721c9af8a1d8d20df)
+---
+ operations/workshop/external/gluas.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/operations/workshop/external/gluas.c b/operations/workshop/external/gluas.c
+index 8ba1101..63e82a2 100644
+--- a/operations/workshop/external/gluas.c
++++ b/operations/workshop/external/gluas.c
+@@ -97,7 +97,7 @@ static int l_progress (lua_State * lua);
+ static int l_flush (lua_State * lua);
+ static int l_print (lua_State * lua);
+
+-static const luaL_reg gluas_functions[] =
++static const luaL_Reg gluas_functions[] =
+ {
+ {"set_rgba", l_set_rgba},
+ {"get_rgba", l_get_rgba},
+@@ -122,7 +122,7 @@ static const luaL_reg gluas_functions[] =
+ };
+ static void
+ register_functions (lua_State *L,
+- const luaL_reg *l)
++ const luaL_Reg *l)
+ {
+ for (;l->name; l++)
+ lua_register (L, l->name, l->func);
+@@ -146,7 +146,7 @@ drawable_lua_process (GeglOperation *op,
+ lua_State *L;
+ Priv p;
+
+- L = lua_open ();
++ L = luaL_newstate ();
+ luaL_openlibs (L);
+
+ register_functions (L, gluas_functions);
+--
+1.8.3.1
+
diff --git a/extra/gegl/gegl-0.2.0-remove-src-over-op.patch b/extra/gegl/gegl-0.2.0-remove-src-over-op.patch
new file mode 100644
index 000000000..a823580fd
--- /dev/null
+++ b/extra/gegl/gegl-0.2.0-remove-src-over-op.patch
@@ -0,0 +1,195 @@
+From 72168aba34445e4cd99aaed32d8e6a80e89ce729 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 1 Jul 2013 13:53:18 +0200
+Subject: [PATCH] patch: remove-src-over-op
+
+Squashed commit of the following:
+
+commit b766094d951bf1515a75408ee85d4e1af432e6bd
+Author: Daniel Sabo <DanielSabo@gmail.com>
+Date: Tue Jun 4 20:57:03 2013 -0700
+
+ Remove auto-generated svg:src-over
+
+ It was already shadowed by gegl:over, which declares
+ svg:src-over as a compat-name.
+
+ (cherry picked from commit c1caf2401271e8a17fd1937bf84279c250bd8e2a)
+
+ Conflicts:
+ po/POTFILES.in
+---
+ operations/generated/src-over.c | 122 -----------------------------
+ operations/generated/svg-12-porter-duff.rb | 5 +-
+ po/POTFILES.in | 3 +-
+ 3 files changed, 4 insertions(+), 126 deletions(-)
+ delete mode 100644 operations/generated/src-over.c
+
+diff --git a/operations/generated/src-over.c b/operations/generated/src-over.c
+deleted file mode 100644
+index e586087..0000000
+--- a/operations/generated/src-over.c
++++ /dev/null
+@@ -1,122 +0,0 @@
+-
+-/* !!!! AUTOGENERATED FILE generated by svg-12-porter-duff.rb !!!!!
+- *
+- * This file is an image processing operation for GEGL
+- *
+- * GEGL is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 3 of the License, or (at your option) any later version.
+- *
+- * GEGL is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
+- *
+- * Copyright 2006, 2007 Øyvind Kolås <pippin@gimp.org>
+- * 2007 John Marshall
+- *
+- * SVG rendering modes; see:
+- * http://www.w3.org/TR/SVG12/rendering.html
+- * http://www.w3.org/TR/2004/WD-SVG12-20041027/rendering.html#comp-op-prop
+- *
+- * aA = aux(src) alpha aB = in(dst) alpha aD = out alpha
+- * cA = aux(src) colour cB = in(dst) colour cD = out colour
+- *
+- * !!!! AUTOGENERATED FILE !!!!!
+- */
+-#include "config.h"
+-#include <glib/gi18n-lib.h>
+-
+-
+-#ifdef GEGL_CHANT_PROPERTIES
+-
+-/* no properties */
+-
+-#else
+-
+-#define GEGL_CHANT_TYPE_POINT_COMPOSER
+-#define GEGL_CHANT_C_FILE "src-over.c"
+-
+-#include "gegl-chant.h"
+-
+-static void prepare (GeglOperation *operation)
+-{
+- const Babl *format = babl_format ("RaGaBaA float");
+-
+- gegl_operation_set_format (operation, "input", format);
+- gegl_operation_set_format (operation, "aux", format);
+- gegl_operation_set_format (operation, "output", format);
+-}
+-
+-static gboolean
+-process (GeglOperation *op,
+- void *in_buf,
+- void *aux_buf,
+- void *out_buf,
+- glong n_pixels,
+- const GeglRectangle *roi,
+- gint level)
+-{
+- gint i;
+- gfloat * GEGL_ALIGNED in = in_buf;
+- gfloat * GEGL_ALIGNED aux = aux_buf;
+- gfloat * GEGL_ALIGNED out = out_buf;
+-
+- if (aux==NULL)
+- return TRUE;
+-
+- for (i = 0; i < n_pixels; i++)
+- {
+- gint j;
+- gfloat aA G_GNUC_UNUSED, aB G_GNUC_UNUSED, aD G_GNUC_UNUSED;
+-
+- aB = in[3];
+- aA = aux[3];
+- aD = aA + aB - aA * aB;
+-
+- for (j = 0; j < 3; j++)
+- {
+- gfloat cA G_GNUC_UNUSED, cB G_GNUC_UNUSED;
+-
+- cB = in[j];
+- cA = aux[j];
+- out[j] = cA + cB * (1.0f - aA);
+- }
+- out[3] = aD;
+- in += 4;
+- aux += 4;
+- out += 4;
+- }
+- return TRUE;
+-}
+-
+-
+-static void
+-gegl_chant_class_init (GeglChantClass *klass)
+-{
+- GeglOperationClass *operation_class;
+- GeglOperationPointComposerClass *point_composer_class;
+-
+- operation_class = GEGL_OPERATION_CLASS (klass);
+- point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+-
+- point_composer_class->process = process;
+- operation_class->prepare = prepare;
+-
+-
+- operation_class->compat_name = "gegl:src-over";
+- gegl_operation_class_set_keys (operation_class,
+- "name" , "svg:src-over",
+- "categories", "compositors:porter-duff",
+- "description",
+- _("Porter Duff operation src-over (d = cA + cB * (1.0f - aA))"),
+- NULL);
+-
+-
+-}
+-
+-#endif
+diff --git a/operations/generated/svg-12-porter-duff.rb b/operations/generated/svg-12-porter-duff.rb
+index 5516802..dab5d2f 100755
+--- a/operations/generated/svg-12-porter-duff.rb
++++ b/operations/generated/svg-12-porter-duff.rb
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env ruby
++# encoding: utf-8
+
+ copyright = '
+ /* !!!! AUTOGENERATED FILE generated by svg-12-porter-duff.rb !!!!!
+@@ -38,8 +39,8 @@ a = [
+ 'aA'],
+ ['dst', 'cB',
+ 'aB'],
+- ['src_over', 'cA + cB * (1.0f - aA)',
+- 'aA + aB - aA * aB'],
++# ['src_over', 'cA + cB * (1.0f - aA)',
++# 'aA + aB - aA * aB'],
+ ['dst_over', 'cB + cA * (1.0f - aB)',
+ 'aA + aB - aA * aB'],
+ ['dst_in', 'cB * aA', # <- XXX: typo?
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index e309594..d36cbc2 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -115,10 +115,9 @@ operations/generated/plus.c
+ operations/generated/screen.c
+ operations/generated/soft-light.c
+ operations/generated/src-atop.c
++operations/generated/src.c
+ operations/generated/src-in.c
+ operations/generated/src-out.c
+-operations/generated/src-over.c
+-operations/generated/src.c
+ operations/generated/subtract.c
+ operations/generated/svg-multiply.c
+ operations/generated/xor.c
+--
+1.8.3.1
+
diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD
index d22eba99f..6a3a19e73 100644
--- a/extra/gperftools/PKGBUILD
+++ b/extra/gperftools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191875 2013-08-01 00:55:33Z dreisner $
+# $Id: PKGBUILD 196892 2013-10-20 21:58:33Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Thomas Jost <schnouki@schnouki.net>
@@ -8,7 +8,7 @@
pkgname=gperftools
pkgver=2.1
-pkgrel=1
+pkgrel=2
pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools"
arch=('i686' 'x86_64')
url="http://code.google.com/p/gperftools/"
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index d2f1c5f07..47ca9dd9c 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195181 2013-09-26 23:04:47Z eric $
+# $Id: PKGBUILD 196817 2013-10-20 04:38:14Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.7.0
+pkgver=6.8.7.1
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.imagemagick.org/"
@@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
perlmagick.rpath.patch)
-sha1sums=('e7f5bc0cb03a16fb1b7c278c63bf4ac81e1642b2'
+sha1sums=('c8aabca18e0ca108b403dd154c858cb17ff304ee'
'SKIP'
'e143cf9d530fabf3b58023899b5cc544ba93daec')
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index 614aadc62..c54f661fa 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 195162 2013-09-25 22:08:21Z dreisner $
+# $Id: PKGBUILD 196888 2013-10-20 21:56:36Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: feydaykyn <feydaykyn@yahoo.fr>
pkgname=leveldb
pkgver=1.14.0
-pkgrel=1
+pkgrel=2
pkgdesc="A fast and lightweight key/value database library"
arch=('i686' 'x86_64')
url="https://code.google.com/p/leveldb/"
diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD
index 42a729254..5ada4dc19 100644
--- a/extra/sharutils/PKGBUILD
+++ b/extra/sharutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182986 2013-04-16 16:21:08Z bisson $
+# $Id: PKGBUILD 196822 2013-10-20 09:31:59Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Kevin Piche <kevin@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sharutils
-pkgver=4.13.5
+pkgver=4.14
pkgrel=1
pkgdesc='Makes so-called shell archives out of many files'
url='http://www.gnu.org/software/sharutils/'
@@ -12,7 +12,7 @@ license=('GPL')
arch=('i686' 'x86_64')
depends=('perl' 'gettext' 'texinfo')
source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('8c2e352860994332fa03f2a6c92d789097fb2e52')
+sha1sums=('5d2d76caa6ee816202fb78395415bd863043d81b')
install=install
diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD
index 3e9b287e9..e964d9dfd 100644
--- a/extra/snappy/PKGBUILD
+++ b/extra/snappy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178016 2013-02-13 16:35:15Z dreisner $
+# $Id: PKGBUILD 196879 2013-10-20 21:13:55Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Antony Male <antony dot male at geemail dot com>>
pkgname=snappy
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
pkgdesc='A fast compressor/decompressor library'
arch=('i686' 'x86_64')
url="http://code.google.com/p/snappy/"
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 3d2f80c41..dec180c63 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196345 2013-10-11 18:25:19Z thomas $
+# $Id: PKGBUILD 196834 2013-10-20 12:03:29Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=v4l-utils
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Userspace tools and conversion library for Video 4 Linux"
arch=('i686' 'x86_64')
url="http://freshmeat.net/projects/libv4l"
@@ -18,7 +18,6 @@ source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
sha256sums=('1de3882099e04e89e354675ee408b82c8ac8afd3ca6ab27ea321771901285f30'
'SKIP')
-options=(!libtool)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index a27f7cabb..6123b6b6f 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194381 2013-09-15 10:04:52Z allan $
+# $Id: PKGBUILD 196839 2013-10-20 12:23:36Z allan $
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer: Allan McRae <allan@archlinux.org>
@@ -11,7 +11,7 @@ license=('GPL')
url="http://valgrind.org/"
depends=('glibc>=2.18' 'glibc<2.19' 'perl')
makedepends=('gdb')
-options=('!emptydirs')
+options=('staticlibs' '!emptydirs')
source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
valgrind-3.8.1-glibc-2.18.patch
valgrind-3.8.1-ptrace-build-fix.patch
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 9a89a6eb8..7f8cf8eee 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188735 2013-06-18 17:08:27Z dreisner $
+# $Id: PKGBUILD 196881 2013-10-20 21:18:50Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Douglas Soares de Andrade
@@ -6,7 +6,7 @@
pkgname=varnish
pkgver=3.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="High-performance HTTP accelerator"
arch=('i686' 'x86_64')
url="http://www.varnish-cache.org/"
diff --git a/extra/yajl/PKGBUILD b/extra/yajl/PKGBUILD
index 8cd912127..3f1850713 100644
--- a/extra/yajl/PKGBUILD
+++ b/extra/yajl/PKGBUILD
@@ -5,8 +5,8 @@
pkgname=yajl
pkgver=2.0.4
-pkgrel=1
-pkgdesc='Yet Another JSON Library.'
+pkgrel=2
+pkgdesc='Yet Another JSON Library'
arch=('i686' 'x86_64')
url='http://lloyd.github.com/yajl/'
license=('ISC')
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 6f223157c..2ddd1ad62 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 196455 2013-10-14 06:53:31Z tpowa $
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index d90aaac40..cd9ddeb34 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: timbosa <tinny_tim@dodo.com.au>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 175f5c3d0..8c3d6c88d 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 196455 2013-10-14 06:53:31Z tpowa $
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD
index df4b2dbe8..a6718a6ae 100644
--- a/kernels/xen/PKGBUILD
+++ b/kernels/xen/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Limao Luo
# Contributor: Luceo
# Contributor: Revellion
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=xen
pkgver=4.2.1
diff --git a/libre-testing/ath9k-htc-firmware-git/PKGBUILD b/libre-testing/ath9k-htc-firmware-git/PKGBUILD
index d04643491..ceee17e13 100644
--- a/libre-testing/ath9k-htc-firmware-git/PKGBUILD
+++ b/libre-testing/ath9k-htc-firmware-git/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Maintainer: Márcio Silva <coadde@lavabit.com>
pkgname=ath9k-htc-firmware-git
diff --git a/libre-testing/icecat/PKGBUILD b/libre-testing/icecat/PKGBUILD
index d60144bde..b153ad518 100644
--- a/libre-testing/icecat/PKGBUILD
+++ b/libre-testing/icecat/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
diff --git a/libre-testing/linux-libre-firmware/PKGBUILD b/libre-testing/linux-libre-firmware/PKGBUILD
deleted file mode 100644
index 23ab691aa..000000000
--- a/libre-testing/linux-libre-firmware/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
-# Contributor: Márcio Silva <coadde@lavabit.com>
-
-pkgname=linux-libre-firmware
-pkgver=3.11
-pkgrel=1
-pkgdesc='Free firmware files for Linux-libre'
-arch=('any')
-url=('http://linux-libre.fsfla.org/')
-license=('GPL2')
-depends=('ath9k-htc-firmware')
-provides=('linux-firmware'
- 'kernel26-firmware=2.6.34.99')
-conflicts=('linux-firmware'
- 'linux-firmware-git'
- 'kernel26-firmware'
- 'ar9170-fw'
- 'iwlwifi-1000-ucode'
- 'iwlwifi-3945-ucode'
- 'iwlwifi-4965-ucode'
- 'iwlwifi-5000-ucode'
- 'iwlwifi-5150-ucode'
- 'iwlwifi-6000-ucode'
- 'rt2870usb-fw'
- 'rt2x00-rt61-fw'
- 'rt2x00-rt71w-fw')
-replaces=('linux-firmware'
- 'kernel26-firmware'
- 'ar9170-fw'
- 'iwlwifi-1000-ucode'
- 'iwlwifi-3945-ucode'
- 'iwlwifi-4965-ucode'
- 'iwlwifi-5000-ucode'
- 'iwlwifi-5150-ucode'
- 'iwlwifi-6000-ucode'
- 'rt2870usb-fw'
- 'rt2x00-rt61-fw'
- 'rt2x00-rt71w-fw')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('7ec84223c7adcf01a5287eb7af96b7e7')
-
-package() {
-
- # create firmware folder to put the free firmware files there
- install -d -m755 $pkgdir/usr/lib/firmware
-
- cd $srcdir/linux-$pkgver
-
- # compile free firmware files
- make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
-
- # create licenses folder to put the licenses files there
- install -d -m755 $pkgdir/usr/share/licenses/$pkgname
-
- # move WHENCE file to linux-firmware license folder
- cd $srcdir/linux-$pkgver
- install -m644 firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
-
-}
diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD
index 8b9e59932..bd7d396db 100644
--- a/libre-testing/systemd/rePKGBUILD
+++ b/libre-testing/systemd/rePKGBUILD
@@ -4,7 +4,7 @@
# then please put 'unknown'.
# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
source PKGBUILD
unset build package md5sums source check
_repo=testing
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 30ef5cec2..e8f1e00d8 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 183900 2013-04-29 15:40:28Z bpiotrowski $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Maël Lavault <moimael@neuf.fr>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgbase=abiword
pkgbase=abiword-libre
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index 9dc5a955e..7c99acf76 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: jlvsimoes <jlvsimoes@oninet.pt>
# Contributor: kevin <kevin@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=abuse
pkgname=abuse-libre
diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
index 6aec27967..172cb97b3 100644
--- a/libre/ath9k-htc-firmware/PKGBUILD
+++ b/libre/ath9k-htc-firmware/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Maintainer: Márcio Silva <coadde@lavabit.com>
pkgname=ath9k-htc-firmware
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index b2b3097b9..4ac426440 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: tranquility <trankas@gmail.com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=atool
pkgname=atool-libre
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index 610404545..876c9e71b 100644
--- a/libre/audacity-libre/PKGBUILD
+++ b/libre/audacity-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=audacity
pkgname=audacity-libre
diff --git a/libre/audex-libre/PKGBUILD b/libre/audex-libre/PKGBUILD
index 413c11461..2c4ef80aa 100644
--- a/libre/audex-libre/PKGBUILD
+++ b/libre/audex-libre/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: mightyjaym <jmambrosino@gmail.com>
# Contributor: moostik <mooostik_at_gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=audex
pkgname=audex-libre
diff --git a/libre/audio-convert-libre/ChangeLog b/libre/audio-convert-libre/ChangeLog
index c309d74a0..0d8720f38 100644
--- a/libre/audio-convert-libre/ChangeLog
+++ b/libre/audio-convert-libre/ChangeLog
@@ -1,4 +1,4 @@
-2013-03-13 André Silva <emulatorman@lavabit.com>
+2013-03-13 André Silva <emulatorman@parabola.nu>
* Remove nonfree faac recommendation
2009-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD
index 81db4af67..0824a036c 100644
--- a/libre/audio-convert-libre/PKGBUILD
+++ b/libre/audio-convert-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Igor Galic <i.galic@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=audio-convert
pkgname=audio-convert-libre
diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD
index 3cdb513cb..cbfdf1135 100644
--- a/libre/avidemux-libre/PKGBUILD
+++ b/libre/avidemux-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 189962 2013-07-11 23:40:28Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgbase=avidemux
pkgbase=avidemux-libre
diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP
index 65499e1ef..a6dea6acb 100644
--- a/libre/avidemux-libre/PKGBUILD.WIP
+++ b/libre/avidemux-libre/PKGBUILD.WIP
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgbase=avidemux
pkgbase=avidemux-libre
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index cb6964582..60009bbe6 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: M0Rf30
# Contributor: Samsagax <samsagax@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=bbswitch
pkgname=bbswitch-libre
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
index 42a33a113..0535d872f 100644
--- a/libre/bogofilter-libre/PKGBUILD
+++ b/libre/bogofilter-libre/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 183193 2013-04-18 17:14:00Z andyrtr $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 196818 2013-10-20 08:27:26Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
_pkgname=bogofilter
pkgname=bogofilter-libre
-pkgver=1.2.3
+pkgver=1.2.4
pkgrel=1
pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files"
arch=('i686' 'x86_64')
@@ -13,13 +14,13 @@ url="http://bogofilter.sourceforge.net"
depends=('db' 'perl' 'gsl')
backup=('etc/bogofilter/bogofilter.cf')
source=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
-md5sums=('c3ed7f483b83abcbf6d8c797084bd06e')
+md5sums=('d0a5eebb3274b23ceabe766a6443a1c5')
provides=("${_pkgname}=${pkgver}")
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd ${_pkgname}-${pkgver}
# Remove noncommercial files.
rm doc/bogofilter-SA-{2005-0{1,2},2010-01}
@@ -32,7 +33,7 @@ build() {
}
package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd ${_pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
index 3f43d26c9..4bebcc704 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=bumblebee
pkgname=bumblebee-libre
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 0980f1b36..7636020a5 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: Petrov Roman <nwhisper@gmail.com>
# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
# Contributor: Larry Hajali <larryhaja@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=calibre
pkgname=calibre-libre
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 518e25312..1d1fdac79 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 93210 2013-06-28 18:33:45Z foutrelis $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=cdfs
pkgname=cdfs-libre
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 463a94be4..22a92003d 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: BlackEagle <ike.devolder@gmail.com>
# Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Kete <kete@ninthfloor.org>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
diff --git a/libre/dkms-libre/PKGBUILD b/libre/dkms-libre/PKGBUILD
index 99caab5fa..0f3f66c38 100644
--- a/libre/dkms-libre/PKGBUILD
+++ b/libre/dkms-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 90494 2013-05-12 22:57:28Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com)
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=dkms
pkgname=dkms-libre
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index 6fbdd3fb3..bcf67c89d 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=ecasound
pkgname=ecasound-libre
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD
index d1289a2cf..b33bb486f 100644
--- a/libre/epiphany-libre/PKGBUILD
+++ b/libre/epiphany-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 196579 2013-10-15 14:29:30Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=epiphany
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 60fa5924b..00be19b0a 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 180021 2013-03-14 19:23:11Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=filesystem
pkgver=2013.05
diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD
index eeb26a639..c05a01e86 100644
--- a/libre/foomatic-filters-libre/PKGBUILD
+++ b/libre/foomatic-filters-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 185778 2013-05-18 16:33:20Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase="foomatic"
pkgname=('foomatic-filters-libre')
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index d339089af..4db0709fc 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 193812 2013-09-02 09:41:54Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD
index 6a07966b2..75edbfc1e 100644
--- a/libre/gnormalize-libre/PKGBUILD
+++ b/libre/gnormalize-libre/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
# Contributor:JZsolt Varadi (karmaxxl)
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=gnormalize
pkgname=gnormalize-libre
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 0c124d528..f23b29ec0 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=ghostscript
pkgname=gnu-ghostscript
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index 036540e79..57aaa2840 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 142375 2011-11-08 22:04:23Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
pkgname=grub-legacy
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index ea12eb9ad..de9ebb452 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
# Maintainer : Ronald van Haren <ronald.archlinux.org>
# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_GRUB_BZR_REV="5086"
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index 686f41e06..329c5186c 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 183943 2013-04-29 17:33:53Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=gstreamer0.10-bad-libre
pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index eebb9744c..9fbfa235b 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
# Contributor: Mantas Mikulėnas <grawity@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname="gummiboot"
pkgver="38"
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index 161f78e82..b1c9228a6 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 97268 2013-09-15 22:44:23Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: TingPing <tingping@tingping.se>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=hexchat
pkgname=hexchat-libre
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index 5e088da07..00341af26 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Figue <ffigue@gmail.com>
# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Based on icecat-i18n package, which is in turn based on firefox-i18n
# When updating to a newer upstream release:
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 1ea0c56b0..601de26b9 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
# We're getting this from Debian Sid
_debname=iceape
diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
index 3c078997c..1837c0119 100644
--- a/libre/icecat-adblock-plus/PKGBUILD
+++ b/libre/icecat-adblock-plus/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=firefox-adblock-plus
pkgname=icecat-adblock-plus
diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
index 15e559623..e3e5f7f1d 100644
--- a/libre/icecat-l10n/PKGBUILD
+++ b/libre/icecat-l10n/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Figue <ffigue@gmail.com>
# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Based on firefox-i18n package
# When updating to a newer upstream release:
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index d5e9d4793..14fc3f383 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 98731 2013-10-17 12:50:32Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=icecat-noscript
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 43126e355..31a7bde09 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Figue <ffigue at gmail>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
# Thank you very much to the older contributors:
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 8ebc5657f..0698ac098 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgbase=icedove-l10n
epoch=1
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 8728e2e87..18e394f61 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
# We're getting this from Debian Sid
_debname=icedove
diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
index 81648fbcd..b3c11d563 100644
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ b/libre/iceweasel-adblock-plus/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=firefox-adblock-plus
pkgname=iceweasel-adblock-plus
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index a135d161e..7fb595354 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Maintainer: Márcio Silva <coadde@lavabit.com>
# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: fauno <fauno@kiwwwi.com.ar>
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 069b2827d..08efafb34 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
@@ -23,7 +23,7 @@ _pkgname=iceweasel
pkgname=iceweasel-libre
epoch=1
pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
arch=(i686 x86_64 mips64el)
@@ -56,6 +56,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
iceweasel-install-dir.patch
vendor.js
replace-urls.txt
+ iceweasel-20.0.1-fixed-loading-icon.png
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
md5sums=('8f24807d67599516850a4bdca2b2fbd6'
'1f4f1347e05b15f5af137787d614ecdf'
@@ -66,6 +67,7 @@ md5sums=('8f24807d67599516850a4bdca2b2fbd6'
'abf5ecb74caa857abb42bcfbb3442d9c'
'121fefaa040936c3b96298da0c49f450'
'a8fc4658d45b6bf9350023e5c3f34e56'
+ '6e335a517c68488941340ee1c23f97b0'
'f1594fa3567e5b70202c3432d7c00202')
prepare() {
@@ -149,6 +151,11 @@ prepare() {
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+
+ # Fix tab loading icon (flickers with libpng 1.6)
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
+ cp "$srcdir/iceweasel-20.0.1-fixed-loading-icon.png" \
+ browser/themes/linux/tabbrowser/loading.png
}
build() {
diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
new file mode 100644
index 000000000..55f25e591
--- /dev/null
+++ b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
Binary files differ
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 22e7568a5..f015e02e8 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 98731 2013-10-17 12:50:32Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=iceweasel-noscript
diff --git a/libre/ipsec-tools-libre/PKGBUILD b/libre/ipsec-tools-libre/PKGBUILD
index 6de9bd7d5..373c83942 100644
--- a/libre/ipsec-tools-libre/PKGBUILD
+++ b/libre/ipsec-tools-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 91859 2013-05-28 17:36:54Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Allan Henriksen <allan.henriksen@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=ipsec-tools
pkgname=ipsec-tools-libre
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 077e6aee3..7df2f8067 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index fe99bd935..7d6f46066 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 195503 2013-10-01 15:14:05Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index bb657d4f3..5bfe8f4ce 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 195493 2013-10-01 15:12:48Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdelibs
pkgname=kdelibs-libre
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index ef67d28c9..f9b486dbc 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 195745 2013-10-01 15:33:32Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 7725d7c2c..578023cf9 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 195755 2013-10-01 15:34:16Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgbase=kdepim
pkgbase=kdepim-libre
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 8dc8d1828..a96fdd15b 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 195793 2013-10-01 15:36:58Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD
index 525624001..7bd98b5f5 100644
--- a/libre/kile-libre/PKGBUILD
+++ b/libre/kile-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kile
pkgname=kile-libre
diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD
index aa9fde2c3..d5efffe26 100644
--- a/libre/lib32-mesa-demos-libre/PKGBUILD
+++ b/libre/lib32-mesa-demos-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgbasename=mesa-demos-libre
pkgname=lib32-$_pkgbasename
diff --git a/libre/lib32-sdl-libre/PKGBUILD b/libre/lib32-sdl-libre/PKGBUILD
index a1fa02a0a..6c319e676 100644
--- a/libre/lib32-sdl-libre/PKGBUILD
+++ b/libre/lib32-sdl-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgbasename=sdl-libre
pkgname=lib32-$_pkgbasename
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
index 634d345c1..24b2cc4d8 100644
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=licenses-libre
pkgver=20130203
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 34ffc6f6e..63d195ff0 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 196228 2013-10-08 23:20:06Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor (Parabola): bitlord
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=liferea
pkgname=liferea-libre
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index e8876b3bd..0c4aa24af 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 192503 2013-08-13 10:47:26Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 8bd7c5989..67c853582 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Contributor: Márcio Silva <coadde@lavabit.com>
pkgname=linux-libre-firmware
-pkgver=3.10
+pkgver=3.11
pkgrel=1
pkgdesc='Free firmware files for Linux-libre'
arch=('any')
@@ -37,7 +37,7 @@ replaces=('linux-firmware'
'rt2x00-rt61-fw'
'rt2x00-rt71w-fw')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c')
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7')
package() {
diff --git a/libre/linux-libre-lts/ChangeLog b/libre/linux-libre-lts/ChangeLog
index 7bff7d34d..552a488bf 100644
--- a/libre/linux-libre-lts/ChangeLog
+++ b/libre/linux-libre-lts/ChangeLog
@@ -1,39 +1,39 @@
-2013-07-15 André Silva <emulatorman@lavabit.com>
+2013-07-15 André Silva <emulatorman@parabola.nu>
* linux-libre-3.10.1-1
* Removed linux-libre-kmod-alx package from Parabola due which CONFIG_ALX module was implemented by default in the kernel.
-2013-04-30 André Silva <emulatorman@lavabit.com>
+2013-04-30 André Silva <emulatorman@parabola.nu>
* linux-libre-3.9-2
* Removed CONFIG_STUB_POULSBO module from config files.
-2012-12-19 André Silva <emulatorman@lavabit.com>
+2012-12-19 André Silva <emulatorman@parabola.nu>
* linux-libre-3.7.1-1
* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
-2012-06-23 André Silva <emulatorman@lavabit.com>
+2012-06-23 André Silva <emulatorman@parabola.nu>
* linux-libre-3.4.4-1
- * Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
+ * Replaced email account andre.paulista@adinet.com.uy to emulatorman@parabola.nu.
-2012-05-26 André Silva <emulatorman@lavabit.com>
+2012-05-26 André Silva <emulatorman@parabola.nu>
* linux-libre-3.4-1.2
* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
-2012-04-24 André Silva <emulatorman@lavabit.com>
+2012-04-24 André Silva <emulatorman@parabola.nu>
* linux-libre-3.3.3-1
* Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90
-2012-04-08 André Silva <emulatorman@lavabit.com>
+2012-04-08 André Silva <emulatorman@parabola.nu>
* linux-libre-3.3.1-1.1
* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
-2012-03-03 André Silva <emulatorman@lavabit.com>
+2012-03-03 André Silva <emulatorman@parabola.nu>
* linux-libre-3.2.9-2
* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 4bf66c9b5..8e8070111 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 196788 2013-10-19 07:01:13Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index 695ea966e..125d2ac50 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 185172 2013-05-11 17:49:25Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=linux-libre-manpages
pkgver=3.9
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index c9721b11e..767afa781 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 96809 2013-09-05 18:48:20Z seblu $
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=linux-libre-tools
pkgname=('linux-libre-tools-meta'
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index 7bff7d34d..9020464ef 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,39 +1,44 @@
-2013-07-15 André Silva <emulatorman@lavabit.com>
+2013-10-20 André Silva <emulatorman@parabola.nu>
+
+ * linux-libre-3.11.5-1
+ * Replaced email account emulatorman@lavabit.com to emulatorman@parabola.nu.
+
+2013-07-15 André Silva <emulatorman@parabola.nu>
* linux-libre-3.10.1-1
* Removed linux-libre-kmod-alx package from Parabola due which CONFIG_ALX module was implemented by default in the kernel.
-2013-04-30 André Silva <emulatorman@lavabit.com>
+2013-04-30 André Silva <emulatorman@parabola.nu>
* linux-libre-3.9-2
* Removed CONFIG_STUB_POULSBO module from config files.
-2012-12-19 André Silva <emulatorman@lavabit.com>
+2012-12-19 André Silva <emulatorman@parabola.nu>
* linux-libre-3.7.1-1
* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
-2012-06-23 André Silva <emulatorman@lavabit.com>
+2012-06-23 André Silva <emulatorman@parabola.nu>
* linux-libre-3.4.4-1
* Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
-2012-05-26 André Silva <emulatorman@lavabit.com>
+2012-05-26 André Silva <emulatorman@parabola.nu>
* linux-libre-3.4-1.2
* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
-2012-04-24 André Silva <emulatorman@lavabit.com>
+2012-04-24 André Silva <emulatorman@parabola.nu>
* linux-libre-3.3.3-1
* Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90
-2012-04-08 André Silva <emulatorman@lavabit.com>
+2012-04-08 André Silva <emulatorman@parabola.nu>
* linux-libre-3.3.1-1.1
* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
-2012-03-03 André Silva <emulatorman@lavabit.com>
+2012-03-03 André Silva <emulatorman@parabola.nu>
* linux-libre-3.2.9-2
* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 3d734674a..2d288c73c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 196455 2013-10-14 06:53:31Z tpowa $
+# $Id: PKGBUILD 196776 2013-10-18 23:07:51Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.11
-_sublevel=5
+_sublevel=6
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'3.11-haswell-intel_pstate.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
- 'bcd700aa1ae7f13107a14885923358eb'
+ '15dc0cd2ab1348d1af3475e7c539deb2'
'0084545e67de0e321d90b11405ab3988'
'615084511f033782ca7d29ab6165e5a1'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,7 +43,7 @@ md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
'98beb36f9b8cf16e58de2483ea9985e3'
'd50c1ac47394e9aec637002ef3392bd1'
'1040ae6c10d4a68f89899f94a2318a17'
- 'e92d4241b533fdd7165b5d47197f7162')
+ '9ddc5a221ab7cd26bc27aab164a6f843')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index ef2df859f..47c271c60 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 196465 2013-10-14 07:07:38Z tpowa $
# Maintainer: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgbase=lirc
pkgbase=lirc-libre
diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD
index adf9c4774..1d073c356 100644
--- a/libre/lsb-release/PKGBUILD
+++ b/libre/lsb-release/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Malte Rabenseifner <malte@zearan.de>
# Contributor: John Gerritse <reaphsharc@gmail.com>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva emulatorman@parabola.nu>
pkgname=lsb-release
pkgver=1.4
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index 77baf60bc..d55f4c329 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 97188 2013-09-15 08:42:21Z schuay $
# Maintainer: schuay <jakob.gruber@gmail.com>
# Contributor: Ray Powell <ray_al@xphoniexx.net>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=mcomix
pkgname=mcomix-libre
diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD
index 46f2b42b4..edba07203 100644
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer (Parabola): <emulatorman@lavabit.com>
+# Maintainer (Parabola): <emulatorman@parabola.nu>
pkgname='mesa-demos-libre'
pkgver=8.1.0
diff --git a/libre/mkisolinux/boot.msg b/libre/mkisolinux/boot.msg
index e4109ea39..2725404e0 100644
--- a/libre/mkisolinux/boot.msg
+++ b/libre/mkisolinux/boot.msg
@@ -4,7 +4,7 @@
Parabola GNU/Linux-libre
ISOLINUX BOOT
created with 'mkisolinux' written by Tobias Powalowski <tpowa@archlinux.org>
-rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+rebranded for Parabola by André Silva <emulatorman@parabola.nu>
Press ENTER or type 'parabola' to boot the CD.
diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux
index ce1187d2a..048d925aa 100755
--- a/libre/mkisolinux/mkisolinux
+++ b/libre/mkisolinux/mkisolinux
@@ -1,6 +1,6 @@
#! /bin/sh
# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
# Settings
APPNAME=$(basename "${0}")
CONFIG="/etc/mkisolinux.conf"
diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf
index 4af6f098c..e8b1e0df0 100644
--- a/libre/mkisolinux/mkisolinux.conf
+++ b/libre/mkisolinux/mkisolinux.conf
@@ -1,5 +1,5 @@
# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
# config file of mkisolinux
# DEFAULT kernel boot options like root=/dev/sda3 etc.
diff --git a/libre/mkpxelinux/mkpxelinux b/libre/mkpxelinux/mkpxelinux
index bd173376c..6dd8213f2 100755
--- a/libre/mkpxelinux/mkpxelinux
+++ b/libre/mkpxelinux/mkpxelinux
@@ -1,6 +1,6 @@
#! /bin/sh
# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
# Settings
APPNAME=$(basename "${0}")
CONFIG="/etc/mkpxelinux.conf"
diff --git a/libre/mkpxelinux/mkpxelinux.conf b/libre/mkpxelinux/mkpxelinux.conf
index 4b8e7b0a8..55aba8247 100644
--- a/libre/mkpxelinux/mkpxelinux.conf
+++ b/libre/mkpxelinux/mkpxelinux.conf
@@ -1,5 +1,5 @@
# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
# config file of mkpxelinux
# DEFAULT kernel boot options like ip=:::::eth0:dhcp etc.
diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg
index 15476f2bd..2cfe24d42 100644
--- a/libre/mksyslinux/boot.msg
+++ b/libre/mksyslinux/boot.msg
@@ -4,7 +4,7 @@
Parabola GNU/Linux-libre
SYSLINUX BOOT
created with 'mksyslinux' by Tobias Powalowski <tpowa@archlinux.org>
-rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+rebranded for Parabola by André Silva <emulatorman@parabola.nu>
Press ENTER or type 'parabola' to boot image.
diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf
index cfbfc49d8..a7d032295 100644
--- a/libre/mksyslinux/mksyslinux.conf
+++ b/libre/mksyslinux/mksyslinux.conf
@@ -1,5 +1,5 @@
# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
# config file of mksyslinux
# DEFAULT kernel boot options like root=/dev/sda3 etc.
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index a5bda5d85..faa53de37 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 193127 2013-08-17 00:43:52Z eric $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgbase=mplayer
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 71d158d17..fe188f50e 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
diff --git a/libre/newton-dynamics-libre/PKGBUILD b/libre/newton-dynamics-libre/PKGBUILD
index 1702cca70..58569aafc 100644
--- a/libre/newton-dynamics-libre/PKGBUILD
+++ b/libre/newton-dynamics-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Josh Taylor (deficite) <joshtaylor.mail@gmail.com>
# Contributor: Christophe Robin (bombstrike) <crobin@php.net>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=newton-dynamics
pkgname=newton-dynamics-libre
pkgver=2.36
diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD
index 6876f699f..a14f8d877 100644
--- a/libre/ogmrip-libre/PKGBUILD
+++ b/libre/ogmrip-libre/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Daenyth
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=ogmrip
pkgname=ogmrip-libre
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog
index bf5d84482..27114b508 100644
--- a/libre/ogmrip-libre/ogmrip.changelog
+++ b/libre/ogmrip-libre/ogmrip.changelog
@@ -1,7 +1,7 @@
2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* ogmrip 1.0.0-1
-2013-03-13 André Silva <emulatorman@lavabit.com>
+2013-03-13 André Silva <emulatorman@parabola.nu>
* Remove nonfree faac support
2012-06-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD
index 638d504b7..29c926e1d 100644
--- a/libre/openexr-libre/PKGBUILD
+++ b/libre/openexr-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 191713 2013-07-29 10:21:41Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=openexr
pkgname=openexr-libre
diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD
index f5762f3e7..ca5b029e7 100644
--- a/libre/openshot-libre/PKGBUILD
+++ b/libre/openshot-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=openshot
pkgname=openshot-libre
diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD
index ab51da0cd..2ef42613a 100644
--- a/libre/oss-libre/PKGBUILD
+++ b/libre/oss-libre/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Florian Pritz <bluewind@xinu.at>
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=oss-libre
pkgver=4.2_2007
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index dd48634fd..78b27ad5e 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=parabola-keyring
pkgver=$(LC_ALL=C date -u +%Y%m%d)
diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD
index e601bcb41..e70c71b9b 100644
--- a/libre/parabola-xdg-menu/PKGBUILD
+++ b/libre/parabola-xdg-menu/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 91138 2013-05-20 09:52:33Z spupykin $
# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=parabola-xdg-menu
pkgver=0.7.6.1
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index 4a55ea38e..a9f697ae0 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: eric <eric@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): xihh <hahj87@gmail.com>
_pkgname=psutils
diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
index 10bb58bdc..7db8fbc81 100755
--- a/libre/python2-reportlab-libre/PKGBUILD
+++ b/libre/python2-reportlab-libre/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: William Rea <sillywilly@gmail.com>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor: borgo <nomail>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=python-reportlab-libre
pkgname=python2-reportlab-libre
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index 1cb968c35..f7adb5b80 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 186154 2013-05-21 10:00:49Z tpowa $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: orelien <aurelien.foret@wanadoo.fr>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=rp-pppoe
pkgname=rp-pppoe-libre
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index 9822d5df7..cab25d91e 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index 5e87a1e8c..80b19719e 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Darwin Bautista <djclue917@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=soundkonverter
pkgname=soundkonverter-libre
diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
index fd5d175be..31830f197 100644
--- a/libre/stuntrally-data-libre/PKGBUILD
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=stuntrally-data-libre
_pkgname=stuntrally-data
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index a2ca4c657..35a17b630 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname="syslinux"
pkgver="6.02"
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 40f00f4e7..21c12b87b 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Contributor: francois <francois.archlinux.org>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=texlive-bin-libre
pkgver=2013.30973
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index 3c51d57cd..6bd33d769 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=texlive-core-libre
_pkgname=texlive-core
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 816556575..7d3fc7d20 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Rémy Oudompheng <remy.archlinux.org>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=texlive-fontsextra-libre
_pkgname=texlive-fontsextra
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 8e1f0998f..ba22b53be 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Firmicus <firmicus āt gmx dōt net>
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=texlive-latexextra-libre
_pkgname=texlive-latexextra
diff --git a/libre/tomoyo-tools-libre/PKGBUILD b/libre/tomoyo-tools-libre/PKGBUILD
index c3f65109b..ad0306918 100644
--- a/libre/tomoyo-tools-libre/PKGBUILD
+++ b/libre/tomoyo-tools-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 96508 2013-08-30 20:31:24Z foutrelis $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=tomoyo-tools
pkgname=tomoyo-tools-libre
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index d71e3344b..4c0dd0dd4 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -6,7 +6,7 @@
# Contributor: Christof Musik <christof ð senfdax đ de>
# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=tp_smapi-libre-lts
_pkgname=tp_smapi
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index d08a61bd1..05deae4a7 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -7,7 +7,7 @@
# Contributor: Christof Musik <christof ð senfdax đ de>
# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=tp_smapi
pkgname=tp_smapi-libre
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index c7b60ba9e..c400fc16b 100755
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Cedric Girard <girard.cedric@gmail.com>
# Contributor: N30N <archlinux@alunamation.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=unar
pkgver=1.8
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 8063b05a9..01b8878d7 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=vhba-module
pkgname=vhba-module-libre
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 1d985f296..6a5f9eff8 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
pkgbase=virtualbox-libre-modules-lts
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index e7278298b..cc0d6741d 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Sébastien Luttringer
# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index cab223c30..b53a9f61e 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 93521 2013-07-05 00:32:42Z seblu $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index cc50fb44c..4f962dcb3 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=xchat
pkgname=xchat-libre
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
index 1dc040d92..2e10b72b2 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 190799 2013-07-16 22:56:09Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=xscreensaver
pkgname=xscreensaver-libre
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index f54f3b92c..16429827b 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 195745 2013-10-01 15:33:32Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre-nonprism
diff --git a/pcr/debootstrap-libre/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD
index b4ea8c09f..47ea86d07 100644
--- a/pcr/debootstrap-libre/PKGBUILD
+++ b/pcr/debootstrap-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=debootstrap
pkgname=debootstrap-libre
diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license
index 0f060c013..22b83f32c 100644
--- a/pcr/gimp-art/gimp-splash-artwork.license
+++ b/pcr/gimp-art/gimp-splash-artwork.license
@@ -1,7 +1,7 @@
GIMP LIBRE SPLASH LICENSE
Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@lavabit.com>
-Idea by André Silva <emulatorman@lavabit.com>
+Idea by André Silva <emulatorman@parabola.nu>
The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License.
To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street,
diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD
index 76fdf442a..2293b6375 100644
--- a/pcr/gnuhealth/PKGBUILD
+++ b/pcr/gnuhealth/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Contributor: SpepS <dreamspepser at yahoo dot it>
pkgname=gnuhealth
diff --git a/pcr/hunspell-pt-br/PKGBUILD b/pcr/hunspell-pt-br/PKGBUILD
index 0641711df..a15ddda78 100644
--- a/pcr/hunspell-pt-br/PKGBUILD
+++ b/pcr/hunspell-pt-br/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Felipe Reis Apolinario <dapolinario@gmail.com>
# Contributor: Bernardo Barros <bernardobarros@NOSPAM.gmail.com>
# Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=hunspell-pt-br
pkgver=3.0
diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD
index 87913af64..e0fe27d2e 100644
--- a/pcr/jitsi/PKGBUILD
+++ b/pcr/jitsi/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
pkgname=jitsi
diff --git a/pcr/lilo/PKGBUILD b/pcr/lilo/PKGBUILD
index 10d334b05..bd2446fd4 100644
--- a/pcr/lilo/PKGBUILD
+++ b/pcr/lilo/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Connor Behan <connor.behan@gmail.com>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=lilo
pkgver=24.0
diff --git a/pcr/maliit-framework/PKGBUILD b/pcr/maliit-framework/PKGBUILD
index 545c34a0c..995a12582 100644
--- a/pcr/maliit-framework/PKGBUILD
+++ b/pcr/maliit-framework/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: Jon Nordby <jononor@gmail.com>
# Maintainer: Jon Nordby <jononor@gmail.com>
# Maintainer (Parabola): Javier Barcena <javierbuilder@gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=maliit-framework
pkgver=0.99.0
diff --git a/pcr/maruku/PKGBUILD b/pcr/maruku/PKGBUILD
deleted file mode 100644
index a647e5a12..000000000
--- a/pcr/maruku/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Adam Lloyd <lloyda2 (at) rpi (dot) edu>
-# Maintainter : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=maruku
-pkgver=0.6.0
-pkgrel=1
-pkgdesc="A Markdown-superset interpreter"
-arch=(any)
-url="http://maruku.rubyforge.org/"
-license=('GPL2')
-depends=(ruby ruby-syntax)
-makedepends=(rubygems)
-source=(http://gems.rubyforge.org/gems/maruku-$pkgver.gem)
-noextract=(maruku-$pkgver.gem)
-md5sums=('6e2575e43b675eb4e15bbcee0fd1fd29')
-
-build() {
- cd $srcdir
- local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
- gem install --ignore-dependencies -i "$pkgdir$_gemdir" maruku-$pkgver.gem
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('6e2575e43b675eb4e15bbcee0fd1fd29')
diff --git a/pcr/minetest-git/PKGBUILD b/pcr/minetest-git/PKGBUILD
index b4a5eb7ce..e322285cf 100644
--- a/pcr/minetest-git/PKGBUILD
+++ b/pcr/minetest-git/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Konsta Kokkinen <kray@tsundere.fi>
# Maintainer (Parabola): Jorge Araya Navarro <jorgean@lavabit.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=minetest-git
pkgver=20130501
pkgrel=1
diff --git a/pcr/python2-pycha/PKGBUILD b/pcr/python2-pycha/PKGBUILD
index 4c9cf4ea4..cc6662f70 100644
--- a/pcr/python2-pycha/PKGBUILD
+++ b/pcr/python2-pycha/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Jakub Klinkovský <kuba.klinkovsky@gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=python2-pycha
pkgver=279
pkgrel=1
diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD
index e70699886..888cda81d 100644
--- a/pcr/python2-relatorio/PKGBUILD
+++ b/pcr/python2-relatorio/PKGBUILD
@@ -1,6 +1,6 @@
# Contributor: Florian Walch <florian.walch@gmx.at>
# Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=python2-relatorio
pkgver=0.6.0
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index a7ff17837..ee91bafb8 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Maintainer: Márcio Silva <coadde@lavabit.com>
_pkgname=renpy
diff --git a/pcr/ruby-maruku/PKGBUILD b/pcr/ruby-maruku/PKGBUILD
new file mode 100644
index 000000000..786b03e98
--- /dev/null
+++ b/pcr/ruby-maruku/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainter: Aurelien Desbrieres <aurelien@cwb.io>
+# Contributer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Adam Lloyd <lloyda2@rpi.edu>
+
+_gemname=maruku
+pkgname=ruby-$_gemname
+pkgver=0.6.1
+pkgdesc="A Markdown-superset interpreter"
+url="http://maruku.rubyforge.org/"
+
+license=('GPL') # GPL2+
+
+pkgrel=1
+arch=(any)
+depends=(ruby ruby-syntax)
+makedepends=(rubygems)
+source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
+noextract=($_gemname-$pkgver.gem)
+
+package() {
+ cd "$srcdir"
+ local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+ gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
+ "$_gemname-$pkgver.gem"
+}
+
+md5sums=('b919c2b706ca83502a8bec0be5c16c6d')
diff --git a/pcr/ruby-syntax/PKGBUILD b/pcr/ruby-syntax/PKGBUILD
index 6845206bb..36d38a725 100644
--- a/pcr/ruby-syntax/PKGBUILD
+++ b/pcr/ruby-syntax/PKGBUILD
@@ -1,23 +1,32 @@
-# Contributor: Adam Lloyd <lloyda2 (at) rpi (dot) edu>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-pkgname=ruby-syntax
+# Maintainter: Aurelien Desbrieres <aurelien@cwb.io>
+# Contributer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Adam Lloyd <lloyda2@rpi.edu>
+
+_gemname=syntax
+pkgname=ruby-$_gemname
pkgver=1.0.0
-pkgrel=1
-pkgdesc="Syntax - lexical analysis for syntax highlighting"
-arch=(any)
+pkgdesc="A Ruby library for performing simple syntax highlighting"
url="http://syntax.rubyforge.org/"
-license=('custom:BSD')
+license=('custom:BSD3')
+
+pkgrel=2
+arch=(any)
depends=(ruby)
makedepends=(rubygems)
-source=(http://gems.rubyforge.org/gems/syntax-$pkgver.gem)
-noextract=(syntax-$pkgver.gem)
-md5sums=('d9d2eabc03bc937adfa00e35f228f9a8')
+source=("https://rubyforge.org/frs/download.php/4952/$_gemname-$pkgver.tar.bz2" $_gemname.gemspec)
+md5sums=('bcb53b7d0847190c40a993c3fe1f1611'
+ '6e9a615fd9ba73335b16e5cc8762667d')
build() {
- cd $srcdir
- local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
- gem install --ignore-dependencies -i "$pkgdir$_gemdir" syntax-$pkgver.gem
+ cd "$srcdir/$_gemname-$pkgver"
+ gem build ../$_gemname.gemspec
}
-# vim:set ts=2 sw=2 et:
-md5sums=('d9d2eabc03bc937adfa00e35f228f9a8')
+package() {
+ cd "$srcdir/$_gemname-$pkgver"
+ local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+ gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
+ "$_gemname-$pkgver.gem"
+ install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD
index eba2bb854..fbaf88141 100644
--- a/pcr/sipwitch/PKGBUILD
+++ b/pcr/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Dan Serban
# Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=sipwitch
pkgver=1.2.4
diff --git a/pcr/trytond-account-invoice/PKGBUILD b/pcr/trytond-account-invoice/PKGBUILD
index 880c1dff9..0813dd78d 100644
--- a/pcr/trytond-account-invoice/PKGBUILD
+++ b/pcr/trytond-account-invoice/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-account-invoice
_pkgname=trytond_account_invoice
pkgver=2.8.3
diff --git a/pcr/trytond-account-product/PKGBUILD b/pcr/trytond-account-product/PKGBUILD
index 14c5a1ea8..2d196b1fd 100644
--- a/pcr/trytond-account-product/PKGBUILD
+++ b/pcr/trytond-account-product/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-account-product
_pkgname=trytond_account_product
pkgver=2.8.0
diff --git a/pcr/trytond-account/PKGBUILD b/pcr/trytond-account/PKGBUILD
index 9bb9022e5..31f3c3c14 100644
--- a/pcr/trytond-account/PKGBUILD
+++ b/pcr/trytond-account/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-account
_pkgname=trytond_account
pkgver=2.8.1
diff --git a/pcr/trytond-calendar/PKGBUILD b/pcr/trytond-calendar/PKGBUILD
index aa9341c94..bae7cdb5f 100644
--- a/pcr/trytond-calendar/PKGBUILD
+++ b/pcr/trytond-calendar/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-calendar
_pkgname=trytond_calendar
pkgver=2.8.0
diff --git a/pcr/trytond-company/PKGBUILD b/pcr/trytond-company/PKGBUILD
index 548c46f38..7455afcc2 100644
--- a/pcr/trytond-company/PKGBUILD
+++ b/pcr/trytond-company/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-company
_pkgname=trytond_company
pkgver=2.8.0
diff --git a/pcr/trytond-country/PKGBUILD b/pcr/trytond-country/PKGBUILD
index fa0070eee..802064c3f 100644
--- a/pcr/trytond-country/PKGBUILD
+++ b/pcr/trytond-country/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-country
_pkgname=trytond_country
pkgver=2.8.0
diff --git a/pcr/trytond-currency/PKGBUILD b/pcr/trytond-currency/PKGBUILD
index 02dd63565..3f1e364ad 100644
--- a/pcr/trytond-currency/PKGBUILD
+++ b/pcr/trytond-currency/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-currency
_pkgname=trytond_currency
pkgver=2.8.0
diff --git a/pcr/trytond-party/PKGBUILD b/pcr/trytond-party/PKGBUILD
index 0854e8193..c21e2b44f 100644
--- a/pcr/trytond-party/PKGBUILD
+++ b/pcr/trytond-party/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-party
_pkgname=trytond_party
pkgver=2.8.0
diff --git a/pcr/trytond-product/PKGBUILD b/pcr/trytond-product/PKGBUILD
index 6271f4ef5..210a6b023 100644
--- a/pcr/trytond-product/PKGBUILD
+++ b/pcr/trytond-product/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-product
_pkgname=trytond_product
pkgver=2.8.0
diff --git a/pcr/trytond-stock-lot/PKGBUILD b/pcr/trytond-stock-lot/PKGBUILD
index 4d88cd382..08e022e21 100644
--- a/pcr/trytond-stock-lot/PKGBUILD
+++ b/pcr/trytond-stock-lot/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-stock-lot
_pkgname=trytond_stock_lot
pkgver=2.8.0
diff --git a/pcr/trytond-stock/PKGBUILD b/pcr/trytond-stock/PKGBUILD
index 9906ed675..d84eda26c 100644
--- a/pcr/trytond-stock/PKGBUILD
+++ b/pcr/trytond-stock/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-stock
_pkgname=trytond_stock
pkgver=2.8.1
diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD
index d041fabbe..286cff50d 100644
--- a/pcr/trytond/PKGBUILD
+++ b/pcr/trytond/PKGBUILD
@@ -1,6 +1,6 @@
# Contributor: Florian Walch <florian.walch@gmx.at>
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond
pkgver=2.8.3
_pkgdir=2.8
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index ede03dd77..29cf5ae8c 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jason Gardner <buhrietoe@gmail.com>
# Contributor: Ross melin <rdmelin@gmail.com>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
# based of debian squeeze package
diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD
index 6ab789ccc..769757df4 100644
--- a/social/sipwitch/PKGBUILD
+++ b/social/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Dan Serban
# Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=sipwitch
pkgver=1.2.4
diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD
index e1a8985f3..9c22f62af 100644
--- a/~coadde/cross-binutils/PKGBUILD
+++ b/~coadde/cross-binutils/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Contributor: André Silva <emulatorman@lavabit.com>
+# Contributor: André Silva <emulatorman@parabola.nu>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD
index 8c791a2fe..e3de55b8d 100644
--- a/~emulatorman/hunspell-gl/PKGBUILD
+++ b/~emulatorman/hunspell-gl/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>, 2009-2010.
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=hunspell-gl
pkgver=2.9b
diff --git a/~emulatorman/iceape-l10n/PKGBUILD b/~emulatorman/iceape-l10n/PKGBUILD
index be0a6dd07..227467123 100644
--- a/~emulatorman/iceape-l10n/PKGBUILD
+++ b/~emulatorman/iceape-l10n/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Figue <ffigue@gmail.com>
# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Based on icecat-i18n package, which is in turn based on firefox-i18n
# When updating to a newer upstream release:
diff --git a/~emulatorman/iceape-libre/PKGBUILD b/~emulatorman/iceape-libre/PKGBUILD
index c46631628..db650ddff 100644
--- a/~emulatorman/iceape-libre/PKGBUILD
+++ b/~emulatorman/iceape-libre/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
# We're getting this from Debian Sid
_debname=iceape
diff --git a/~emulatorman/icecat-l10n/PKGBUILD b/~emulatorman/icecat-l10n/PKGBUILD
index 197e3e236..bb3d47c32 100644
--- a/~emulatorman/icecat-l10n/PKGBUILD
+++ b/~emulatorman/icecat-l10n/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Figue <ffigue@gmail.com>
# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Based on firefox-i18n package
# When updating to a newer upstream release:
diff --git a/~emulatorman/icecat/PKGBUILD b/~emulatorman/icecat/PKGBUILD
index c26b3c1b7..6e5bddfe6 100644
--- a/~emulatorman/icecat/PKGBUILD
+++ b/~emulatorman/icecat/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Figue <ffigue at gmail>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
# Thank you very much to the older contributors:
diff --git a/~emulatorman/icedove-l10n/PKGBUILD b/~emulatorman/icedove-l10n/PKGBUILD
index 208e176ba..9ed01c353 100644
--- a/~emulatorman/icedove-l10n/PKGBUILD
+++ b/~emulatorman/icedove-l10n/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgbase=icedove-l10n
pkgver=17.0.2.1
diff --git a/~emulatorman/icedove-libre/PKGBUILD b/~emulatorman/icedove-libre/PKGBUILD
index 5ea3ff98f..43cf38f18 100644
--- a/~emulatorman/icedove-libre/PKGBUILD
+++ b/~emulatorman/icedove-libre/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
# We're getting this from Debian Experimental
_debname=icedove
diff --git a/~emulatorman/iceweasel-l10n/PKGBUILD b/~emulatorman/iceweasel-l10n/PKGBUILD
index 8e0172208..988892cbc 100644
--- a/~emulatorman/iceweasel-l10n/PKGBUILD
+++ b/~emulatorman/iceweasel-l10n/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Figue <ffigue@gmail.com>
# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Based on icecat-i18n package, which is in turn based on firefox-i18n
# When updating to a newer upstream release:
diff --git a/~emulatorman/iceweasel-libre/PKGBUILD b/~emulatorman/iceweasel-libre/PKGBUILD
index 4f7d77337..b3cf15f28 100644
--- a/~emulatorman/iceweasel-libre/PKGBUILD
+++ b/~emulatorman/iceweasel-libre/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Figue <ffigue at gmail>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
# Thank you very much to the older contributors:
diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD
index c5629e9fc..360c3248e 100644
--- a/~emulatorman/raider/PKGBUILD
+++ b/~emulatorman/raider/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: M.Carreira <arch@carreira.com.pt>
# Contributor: M.Carreira <arch@carreira.com.pt>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=raider
pkgver=0.10.0
pkgrel=1
diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
index 7ed44c2e3..42b5e9a46 100644
--- a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
+++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
@@ -1,5 +1,5 @@
# Contributor: Gökmen Görgen <gkmngrgn_gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=xchat-xsys-noaudacious
pkgver=2.2.0
pkgrel=3
diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD
index 13f4d5c12..9ed60c78b 100644
--- a/~emulatorman/xonotic-data/PKGBUILD
+++ b/~emulatorman/xonotic-data/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=xonotic-data
pkgver=0.5.0
diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD
index a51606cd5..22b0fa4ac 100644
--- a/~emulatorman/xonotic/PKGBUILD
+++ b/~emulatorman/xonotic/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=xonotic
pkgver=0.5.0