summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/audacious-plugins-libre/PKGBUILD10
-rw-r--r--libre/blender-libre/PKGBUILD2
-rw-r--r--libre/calibre-libre/PKGBUILD6
-rw-r--r--libre/cdfs-libre/PKGBUILD2
-rw-r--r--libre/claws-mail-libre/PKGBUILD10
-rw-r--r--libre/filesystem/PKGBUILD11
-rw-r--r--libre/filesystem/filesystem.install12
-rw-r--r--libre/ghostscript-libre/PKGBUILD17
-rw-r--r--libre/ghostscript-libre/ijs-automake.patch10
-rw-r--r--libre/gnu-ghostscript/PKGBUILD21
-rw-r--r--libre/gnu-ghostscript/ijs-automake.patch10
-rw-r--r--libre/icecat/PKGBUILD4
-rw-r--r--libre/icecat/mozconfig44
-rw-r--r--libre/iceweasel-libre/PKGBUILD4
-rw-r--r--libre/iceweasel-libre/mozconfig30
-rw-r--r--libre/licenses-libre/PKGBUILD108
-rw-r--r--libre/licenses-libre/w3c.txt76
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD11
-rw-r--r--libre/linux-libre-lts/PKGBUILD12
-rw-r--r--libre/linux-libre-lts/config.i6864
-rw-r--r--libre/linux-libre-lts/config.x86_644
-rw-r--r--libre/linux-libre-lts/linux-libre-lts.install2
-rw-r--r--libre/linux-libre/PKGBUILD12
-rw-r--r--libre/linux-libre/config.i68613
-rw-r--r--libre/linux-libre/config.x86_6414
-rw-r--r--libre/linux-libre/linux-libre.install2
-rw-r--r--libre/lirc-libre/PKGBUILD4
-rw-r--r--libre/pacman/PKGBUILD4
-rw-r--r--libre/parabola-keyring/PKGBUILD6
-rw-r--r--libre/parabola-xdg-menu/PKGBUILD52
-rw-r--r--libre/tp_smapi-libre/PKGBUILD2
-rw-r--r--libre/vhba-module-libre/PKGBUILD2
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD2
-rw-r--r--libre/xchat-libre/PKGBUILD9
-rw-r--r--libre/xchat-libre/remove-non-free-suggestion.patch9
-rw-r--r--libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch18
-rw-r--r--libre/xulrunner-libre/PKGBUILD22
-rw-r--r--libre/xulrunner-libre/mozconfig12
38 files changed, 367 insertions, 226 deletions
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index c59052f0d..a5e25f1e5 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173107 2012-12-11 04:46:40Z bisson $
+# $Id: PKGBUILD 177005 2013-02-04 00:31:50Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: William Rea <sillywilly@gmail.com>
@@ -8,7 +8,7 @@
_pkgname=audacious-plugins
pkgname=audacious-plugins-libre
-pkgver=3.3.3
+pkgver=3.3.4
pkgrel=1
pkgdesc='Plugins for Audacious without unfree plugins'
url='http://audacious-media-player.org/'
@@ -30,7 +30,7 @@ conflicts=("${pkgname%-libre}")
makedepends=("audacious>=${pkgver}"
'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
- 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack'
+ 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack'
'libnotify' 'lirc-utils' 'curl' 'libmtp'
'neon' 'libmms' 'libcue')
@@ -47,7 +47,7 @@ optdepends=('oss: Open Sound System v4 output'
'ffmpeg: ffaudio input'
'libmodplug: modplug input'
'fluidsynth: MIDI FluidSynth backend input'
- 'libcdio: CD Digital Audio input'
+ 'libcdio-paranoia: CD Digital Audio input'
'libsidplay: Commodore 64 audio input'
'wavpack: WavPack input'
@@ -61,7 +61,7 @@ optdepends=('oss: Open Sound System v4 output'
'libcue: CUE playlist format')
source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e')
+sha1sums=('6493f051417a201fc0e2de7ef36a709676f96607')
build() {
# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 95a121a57..53f26e112 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -17,7 +17,7 @@ else
fi
pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
pkgver=2.65a
-pkgrel=1
+pkgrel=2
pkgaev=6
arch=(
i686
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 694358a07..baf02216f 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -6,8 +6,8 @@
_pkgname=calibre
pkgname=calibre-libre
-pkgver=0.9.15
-pkgrel=2
+pkgver=0.9.17
+pkgrel=1
pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
arch=('i686' 'x86_64')
url="http://calibre-ebook.com/"
@@ -27,7 +27,7 @@ install=calibre.install
source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
'desktop_integration.patch'
'calibre-mount-helper')
-md5sums=('2e87ac93bb2006e40001a4028945cee2'
+md5sums=('dd978f45d1fa3702811ec5328c4aec9c'
'42c07b43d575b5e7e7524bd7b9528f0e'
'675cd87d41342119827ef706055491e7')
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 7cd18bb6a..8eada2132 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=cdfs
pkgname=cdfs-libre
pkgver=2.6.27
-pkgrel=34.1
+pkgrel=35
pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
arch=(i686 x86_64 mips64el)
url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index 7a093b29a..ee7019130 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -32,8 +32,8 @@ makedepends=(
bogofilter
compface
spamassassin
- valgrind
)
+[ "$CARCH" != "mips64el" ] && makedepends+=(valgrind)
optdepends=(
'python2: needed for some tools'
'perl: needed for some tools'
@@ -67,7 +67,7 @@ build() {
sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
- setarch $CARCH ./configure --prefix=/usr\
+ ./configure --prefix=/usr\
--disable-dillo-viewer-plugin\
--disable-static\
--enable-bogofilter-plugin\
@@ -79,16 +79,16 @@ build() {
--enable-pgpmime-plugin\
--enable-spamassassin-plugin
- setarch $CARCH make
+ make
}
package() {
cd $srcdir/$pkgbase-$pkgver
- setarch $CARCH make DESTDIR=$pkgdir install
+ make DESTDIR=$pkgdir install
# build and install extra tools
cd tools
- setarch $CARCH make
+ make
# all executables and .conf files ; only top directory
find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
install -D -m755 $i $pkgdir/usr/lib/$pkgbase/tools/$i
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 51e1c0810..eb684f5f7 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 175758 2013-01-21 11:40:12Z allan $
+# $Id: PKGBUILD 176062 2013-01-27 07:33:21Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=filesystem
pkgver=2013.01
-pkgrel=1
+pkgrel=3
pkgdesc='Base filesystem for Parabola'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -13,7 +13,7 @@ url='https://parabolagnulinux.org'
groups=('base')
install='filesystem.install'
makedepends=('asciidoc')
-depends=('iana-etc' 'bash' 'coreutils' 'nss-myhostname')
+depends=('iana-etc')
backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
@@ -85,6 +85,11 @@ package() {
ln -s usr/lib ${pkgdir}/lib64
ln -s lib ${pkgdir}/usr/lib64
)
+ [[ ${CARCH} = "mips64el" ]] && (
+ # For the N32 ABI.
+ ln -s usr/lib ${pkgdir}/lib32
+ ln -s lib ${pkgdir}/usr/lib32
+ )
#
# install parabola(7) manpage
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 12e59b01b..0684afd69 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -1,13 +1,3 @@
-post_install() {
- [ -f var/log/lastlog ] || : >var/log/lastlog
- [ -f var/log/wtmp ] || : >var/log/wtmp
- [ -f var/log/btmp ] || { : >var/log/btmp && chmod 600 var/log/btmp; }
- # workaround for bug #7194
- # readded due to bug #9465
- # please do not remove!
- chmod 1777 var/spool/mail tmp var/tmp
-}
-
# args: <group> [options]
_addgroup() {
if ! getent group "$1" >/dev/null; then
@@ -23,8 +13,6 @@ _adduser() {
}
post_upgrade() {
- post_install
-
_addgroup optical -g 93
_addgroup audio -g 92
_addgroup video -g 91
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index 656f49fb5..499f4bab0 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=ghostscript
pkgname=ghostscript-libre
pkgver=9.06
-pkgrel=1
+pkgrel=1.1 # rebuild for mips64el -march
pkgdesc="An interpreter for the PostScript language without non-free files"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3') #non free files removed
@@ -18,12 +18,17 @@ conflicts=('ghostscript')
replaces=('ghostscript')
provides=("ghostscript=$pkgver")
url="http://www.ghostscript.com/"
-source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool' '!makeflags')
-md5sums=('46f9ebe40dc52755287b30704270db11')
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
+ ijs-automake.patch)
+options=('!libtool')
+md5sums=('46f9ebe40dc52755287b30704270db11'
+ '686830841eb9004143a0d0f56b73aaaf')
build() {
cd ${srcdir}/ghostscript-${pkgver}
+
+ # Fix build with recent automake.
+ patch -p1 -i "$srcdir/ijs-automake.patch"
# delete non-free packages
grep -l "are not altered" Resource/CMap/* | xargs rm -fv
@@ -57,7 +62,7 @@ build() {
package() {
cd ${srcdir}/ghostscript-${pkgver}
- make DESTDIR=${pkgdir} \
+ make -j1 DESTDIR=${pkgdir} \
cups_serverroot=${pkgdir}/etc/cups \
cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
@@ -72,5 +77,5 @@ package() {
# install IJS
cd ${srcdir}/ghostscript-${pkgver}/ijs
- make DESTDIR=${pkgdir} install
+ make -j1 DESTDIR=${pkgdir} install
}
diff --git a/libre/ghostscript-libre/ijs-automake.patch b/libre/ghostscript-libre/ijs-automake.patch
new file mode 100644
index 000000000..1b890277a
--- /dev/null
+++ b/libre/ghostscript-libre/ijs-automake.patch
@@ -0,0 +1,10 @@
+--- ghostscript-9.06.orig/ijs/configure.ac 2012-08-08 10:01:36.000000000 +0200
++++ ghostscript-9.06/ijs/configure.ac 2013-02-03 19:33:08.361797799 +0100
+@@ -117,7 +117,6 @@
+ dnl Checks for programs
+
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AM_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ AC_ISC_POSIX
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index eb3a148e2..dc05d95ad 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -2,11 +2,11 @@
_pkgname=ghostscript
pkgname=gnu-ghostscript
-_pkgver=9.05
-pkgver=9.05.0
-pkgrel=2
+_pkgver=9.06
+pkgver=9.06.0
+pkgrel=1
pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms2')
makedepends=('gtk2' 'gnutls')
@@ -16,14 +16,19 @@ conflicts=${_pkgname}
provides="${_pkgname}=9.06"
url="https://www.gnu.org/software/${_pkgname}/"
source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
+ ijs-automake.patch
libtool.patch)
-options=('!libtool' '!makeflags')
-md5sums=('e80423be9abb32fc99cc897ed379a7df'
+options=('!libtool')
+md5sums=('85a5e07a6b91937c157576293b381065'
+ '83bcae456ad4c9fb790be483914dbeba'
'5bd5d4966007b460deed866a30a0b3c8')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ # fix build with recent automake
+ patch -p1 -i "$srcdir/ijs-automake.patch"
+
# fix libtool version
patch -Np1 -i ${srcdir}/libtool.patch
@@ -55,7 +60,7 @@ build() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} \
+ make -j1 DESTDIR=${pkgdir} \
cups_serverroot=${pkgdir}/etc/cups \
cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
@@ -70,5 +75,5 @@ package() {
# install IJS
cd ${srcdir}/${pkgname}-${pkgver}/ijs
- make DESTDIR=${pkgdir} install
+ make -j1 DESTDIR=${pkgdir} install
}
diff --git a/libre/gnu-ghostscript/ijs-automake.patch b/libre/gnu-ghostscript/ijs-automake.patch
new file mode 100644
index 000000000..7b5f77ca1
--- /dev/null
+++ b/libre/gnu-ghostscript/ijs-automake.patch
@@ -0,0 +1,10 @@
+--- gnu-ghostscript-9.06.0.orig/ijs/configure.ac 2012-12-26 23:11:50.000000000 -0200
++++ gnu-ghostscript-9.06.0/ijs/configure.ac 2013-02-04 13:28:10.656069912 -0200
+@@ -117,7 +117,6 @@
+ dnl Checks for programs
+
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AM_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ AC_ISC_POSIX
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index c26b3c1b7..5f0a03e70 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -16,7 +16,7 @@
_pgo=false
pkgname=icecat
pkgver=17.0.1
-pkgrel=4
+pkgrel=5
pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
arch=(i686 x86_64 mips64el)
license=(GPL2 MPL LGPL)
@@ -76,7 +76,7 @@ source=(
)
md5sums=(
c88a29aa92fc41a07e777a0e63ac5f7e
- a22327391a1995703436ed42fe703d3f
+ f6ade03013a0bcb7f1585c51cb488e81
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
fcd2d895a0335c1b5fb652401e9da0d5
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 5df8547f7..e54cdb54c 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -3,6 +3,15 @@
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
+# Icecat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
# System libraries
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
@@ -15,46 +24,21 @@ ac_add_options --with-system-libvpx
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
-ac_add_options --disable-system-cairo
+#ac_add_options --enable-system-cairo
ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
# Features
ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
-ac_add_options --disable-gnomevfs
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-tests
-ac_add_options --disable-mochitest
ac_add_options --disable-installer
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Icecat
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# ConnochaetOS
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
-
-# Parabola
+# Parabola features
ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-# Build-generated
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 4f7d77337..571ad31a0 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -56,7 +56,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
md5sums=('5d481dd35a304702d1f311eeb3f1149f'
'6a4781e8ddc1b166f36930c4864e095f'
- '619e8f7c8596838a7daf2b7ce2e54cd3'
+ 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3'
'ac29b01c189f20abae2f3eef1618ffc0'
'1ee2d4bcacee73d671b9ffa17a02abaa'
'7b9e5996dd9fe0b186a43a297db1c6b5'
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index 8b5e52d9e..c929b8972 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -3,6 +3,10 @@
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
+# Iceweasel
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/branding
+
# System libraries
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
@@ -15,35 +19,21 @@ ac_add_options --with-system-libvpx
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
# Features
ac_add_options --enable-startup-notification
+#ac_add_options --enable-gstreamer
+
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-tests
-ac_add_options --disable-mochitest
ac_add_options --disable-installer
-# Optimization
-ac_add_options --enable-optimize
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Iceweasel
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# ConnochaetOS
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
-
-# Parabola
+# Parabola features
ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-# Build-generated
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
index 8a3d62929..93468bbba 100644
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses-libre/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 82120 2010-06-08 16:36:51Z dan $
+# $Id: PKGBUILD 176952 2013-02-03 00:38:36Z dan $
# 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>
pkgname=licenses-libre
-pkgver=2.9
+pkgver=20130203
pkgrel=1
pkgdesc="The standard licenses distribution package"
arch=('any')
license=('custom:none')
-url="http://parabolagnulinux.org"
+url="http://parabolagnulinux.org/"
groups=('base')
provides=("licenses=${pkgver}")
conflicts=('licenses')
@@ -29,100 +30,105 @@ source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
http://www.gnu.org/licenses/fdl-1.2.txt
http://www.gnu.org/licenses/fdl-1.3.txt
http://www.latex-project.org/lppl.txt
- http://www.mozilla.org/MPL/MPL-1.1.txt
+ mpl-1.1.txt::http://www.mozilla.org/MPL/1.1/index.txt
perlartistic.txt
http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
php-3.0.txt::http://www.php.net/license/3_0.txt
- ruby-license.txt::http://www.ruby-lang.org/en/LICENSE.txt
+ ruby-license.txt::http://www.ruby-lang.org/en/about/license.txt
cpl-1.0.txt
python-2.txt
+ w3c.txt
ZopePublicLicense.txt)
+md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
+ 'ffb24d1bbf8b83d373f0b8edc3feb0c6'
+ '5367190077e12a7f55403d531ef3998e'
+ '77651e5c686cbc0f8cec5ac7e6504235'
+ '6cb35f3976cd093011967fa1abbce386'
+ 'f300afd598546add034364cd0a533261'
+ '73f1eb20517c55bf9493b7dd6e480788'
+ 'b234ee4d69f5fce4486a80fdaf4a4263'
+ 'd32239bcb673463ab874e80d47fae504'
+ '4fbd65380cdd255951079008b364516c'
+ 'e6a600fd5e1d9cbde2d983680233ad02'
+ '24ea4c7092233849b4394699333b5c56'
+ '10b9de612d532fdeeb7fe8fcd1435cc6'
+ '9f4337828d782bdea41f03dd2ad1b808'
+ 'bfe1f75d606912a4111c90743d6c7325'
+ 'd09c120ca7db95ef2aeecec0cb08293b'
+ 'b4a94da2a1f918b217ef5156634fc9e0'
+ 'a45bb1bbeed9e26b26c5763df1d3913d'
+ 'f24b942d957112d759762054b6e7cf34'
+ 'f083e41c43db25e18f36c91e57750b64'
+ 'a055911c32fb4ed6e96c453ceaeba857'
+ '6f2095b5d61770740852873b195a4d21'
+ 'dc8502850eab9e1ff330a12d7ca18a19')
-build() {
- cd $pkgdir
+package() {
+ cd "$pkgdir"
mkdir -p usr/share/licenses/common
cd usr/share/licenses/common
mkdir AGPL3
- cp $srcdir/agpl-3.0.txt AGPL3/license.txt
+ cp "$srcdir"/agpl-3.0.txt AGPL3/license.txt
ln -s AGPL3 AGPL
mkdir Apache
- cp $srcdir/apache-2.0.txt Apache/license.txt
+ cp "$srcdir"/apache-2.0.txt Apache/license.txt
ln -s Apache APACHE
mkdir Artistic2.0
- cp $srcdir/artistic-2_0.txt Artistic2.0/license.txt
+ cp "$srcdir"/artistic-2_0.txt Artistic2.0/license.txt
mkdir CCPL
- cp $srcdir/cc-by-3.0.txt CCPL/
- cp $srcdir/cc-by-sa-3.0.txt CCPL/
- cp $srcdir/cc-readme.txt CCPL/
+ cp "$srcdir"/cc-by-3.0.txt CCPL/
+ cp "$srcdir"/cc-by-sa-3.0.txt CCPL/
+ cp "$srcdir"/cc-readme.txt CCPL/
mkdir CDDL
- cp $srcdir/cddl-1.0.txt CDDL/license.txt
+ cp "$srcdir"/cddl-1.0.txt CDDL/license.txt
mkdir CPL
- cp $srcdir/cpl-1.0.txt CPL/license.txt
+ cp "$srcdir"/cpl-1.0.txt CPL/license.txt
mkdir EPL
- cp $srcdir/eclipse-1.0.txt EPL/license.txt
+ cp "$srcdir"/eclipse-1.0.txt EPL/license.txt
mkdir {GPL2,GPL3}
- cp $srcdir/gpl-2.0.txt GPL2/license.txt
- cp $srcdir/gpl-3.0.txt GPL3/license.txt
+ cp "$srcdir"/gpl-2.0.txt GPL2/license.txt
+ cp "$srcdir"/gpl-3.0.txt GPL3/license.txt
ln -s GPL2 GPL
mkdir {FDL1.2,FDL1.3}
- cp $srcdir/fdl-1.2.txt FDL1.2/license.txt
- cp $srcdir/fdl-1.3.txt FDL1.3/license.txt
+ cp "$srcdir"/fdl-1.2.txt FDL1.2/license.txt
+ cp "$srcdir"/fdl-1.3.txt FDL1.3/license.txt
ln -s FDL1.2 FDL
mkdir {LGPL2.1,LGPL3}
- cp $srcdir/lgpl-2.1.txt LGPL2.1/license.txt
- cp $srcdir/lgpl-3.0.txt LGPL3/license.txt
+ cp "$srcdir"/lgpl-2.1.txt LGPL2.1/license.txt
+ cp "$srcdir"/lgpl-3.0.txt LGPL3/license.txt
ln -s LGPL2.1 LGPL
mkdir LPPL
- cp $srcdir/lppl.txt LPPL/license.txt
+ cp "$srcdir"/lppl.txt LPPL/license.txt
mkdir MPL
- cp $srcdir/MPL-1.1.txt MPL/license.txt
+ cp "$srcdir"/mpl-1.1.txt MPL/license.txt
mkdir PerlArtistic
- cp $srcdir/perlartistic.txt PerlArtistic/license.txt
+ cp "$srcdir"/perlartistic.txt PerlArtistic/license.txt
mkdir PHP
- cp $srcdir/php-3.0.txt PHP/license.txt
+ cp "$srcdir"/php-3.0.txt PHP/license.txt
mkdir PSF
- cp $srcdir/python-2.txt PSF/license.txt
+ cp "$srcdir"/python-2.txt PSF/license.txt
mkdir RUBY
- cp $srcdir/ruby-license.txt RUBY/license.txt
+ cp "$srcdir"/ruby-license.txt RUBY/license.txt
+
+ mkdir W3C
+ cp "$srcdir"/w3c.txt W3C/license.txt
mkdir ZPL
- cp $srcdir/ZopePublicLicense.txt ZPL/license.txt
+ cp "$srcdir"/ZopePublicLicense.txt ZPL/license.txt
}
-md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
- 'ffb24d1bbf8b83d373f0b8edc3feb0c6'
- '5367190077e12a7f55403d531ef3998e'
- '77651e5c686cbc0f8cec5ac7e6504235'
- '6cb35f3976cd093011967fa1abbce386'
- 'f300afd598546add034364cd0a533261'
- '73f1eb20517c55bf9493b7dd6e480788'
- 'b234ee4d69f5fce4486a80fdaf4a4263'
- 'd32239bcb673463ab874e80d47fae504'
- '4fbd65380cdd255951079008b364516c'
- 'e6a600fd5e1d9cbde2d983680233ad02'
- '24ea4c7092233849b4394699333b5c56'
- '10b9de612d532fdeeb7fe8fcd1435cc6'
- '9f4337828d782bdea41f03dd2ad1b808'
- 'bfe1f75d606912a4111c90743d6c7325'
- 'd09c120ca7db95ef2aeecec0cb08293b'
- 'b4a94da2a1f918b217ef5156634fc9e0'
- 'a45bb1bbeed9e26b26c5763df1d3913d'
- 'bfecdc446cd2a6a4410ac9e6d0064b3a'
- 'f083e41c43db25e18f36c91e57750b64'
- 'a055911c32fb4ed6e96c453ceaeba857'
- 'dc8502850eab9e1ff330a12d7ca18a19')
diff --git a/libre/licenses-libre/w3c.txt b/libre/licenses-libre/w3c.txt
new file mode 100644
index 000000000..6a29463d3
--- /dev/null
+++ b/libre/licenses-libre/w3c.txt
@@ -0,0 +1,76 @@
+W3C Software Notice and License
+
+This work (and included software, documentation such as READMEs, or
+other related items) is being provided by the copyright holders under
+the following license.
+
+License
+
+By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following
+terms and conditions.
+
+Permission to copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and
+without fee or royalty is hereby granted, provided that you include
+the following on ALL copies of the software and documentation or
+portions thereof, including modifications:
+
+ - The full text of this NOTICE in a location viewable to users of
+ the redistributed or derivative work.
+
+ - Any pre-existing intellectual property disclaimers, notices, or
+ terms and conditions. If none exist, the W3C Software Short
+ Notice should be included (hypertext is preferred, text is
+ permitted) within the body of any redistributed or derivative
+ code.
+ *"W3C Software Short Notice" above links to:
+ www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html
+
+ - Notice of any changes or modifications to the files, including
+ the date changes were made. (We recommend you provide URIs to
+ the location from which the code is derived.)
+
+Disclaimers
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without specific,
+written prior permission. Title to copyright in this software and any
+associated documentation will at all times remain with copyright
+holders. Notes
+
+This version:
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This formulation of W3C's notice and license became active on December
+31 2002. This version removes the copyright ownership notice such that
+this license can be used with materials other than those owned by the
+W3C, reflects that ERCIM is now a host of the W3C, includes references
+to this specific dated version of the license, and removes the
+ambiguous grant of "use". Otherwise, this version is the same as the
+previous version and is written so as to preserve the Free Software
+Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition.
+
+ *"previous version" above links to:
+ http://www.w3.org/Consortium/Legal/copyright-software-19980720
+
+ *"Free Software Foundation's assessment of GPL compatibility" links to:
+ http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses
+
+ *"OSI's certification" above links to:
+ http://opensource.org/licenses/W3C.php
+
+ *"Open Source Definition" above links to:
+ http://opensource.org/docs/definition.php
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 1aef0dc2e..f82a250bf 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,10 +1,11 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.7.4
+_kernver=3.7.6
_kernrel=1
pkgname=('linux-libre-kmod-alx')
-_pkgver=2013-01-23-1-u
-pkgver=20130123
+_version=v3.8-rc5
+_pkgver=3.8-rc5-1-u
+pkgver=3.8rc5.1
pkgrel=1
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
@@ -16,9 +17,9 @@ install=linux-libre-kmod-alx.install
replaces=('alx' 'alx-driver' 'dkms-alx')
provides=('alx' 'alx-driver' 'dkms-alx')
conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2013/01/23/compat-drivers-$_pkgver.tar.xz)
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
-md5sums=('4ba03ce3edf5a3fd2b79496284172d73')
+md5sums=('6ad873fbc6664aa4c15160e3ad7cb4c1')
build() {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 654edbf4c..4a4972307 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=60
+_sublevel=62
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.59 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.61 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- '029dea7dd8bd815de241fff00d1bc2ab'
- '34c234b48d663bd4b04b45b9789bd107'
- '7ae9267fd5e8fd8993d9e2428e808afa'
+ '90b2c4b9a05b108219bd44ac4804db84'
+ '99f9c408b64393aceb2482c9a3e329ee'
+ 'fba95bf1857ce6bf863e13a1ab73f584'
'c072b17032e80debc6a8626299245d46'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- 'ffc297dd82534e15a09fabb882d28bc9')
+ '8436bee363b959651d12eeb21bf0ec23')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index bb9308500..f903b2114 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -469,7 +469,7 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_CAN_PM_TRACE=y
-# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_TRACE_RTC=y
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_PROCFS=y
@@ -4920,7 +4920,7 @@ CONFIG_CLKSRC_I8253=y
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS=y
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 5c1e98f9c..c369e1b5b 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -457,7 +457,7 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_CAN_PM_TRACE=y
-# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_TRACE_RTC=y
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_PROCFS=y
@@ -4678,7 +4678,7 @@ CONFIG_INTEL_OAKTRAIL=m
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS=y
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 56b5f411d..dc9b9e2d1 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.60-1-LIBRE-LTS
+KERNEL_VERSION=3.0.62-1-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 5219ea17c..b37ac7027 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.7
-_sublevel=4
+_sublevel=6
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,16 +32,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'fat-3.6.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
- '0ce6896b7069cb5aaf444318d8db3885'
- '741f96278cbf12996166128a4657ce58'
- '0665c18c1ba3abbea5cd4cde91300854'
+ '90b2c4b9a05b108219bd44ac4804db84'
+ '53c782740eb3ddf875ad98c31c1bf213'
+ '71a6f703cb0bee098a76ea42d5836d06'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
'88d501404f172dac6fcb248978251560'
- 'c5dd4404c6f6ae3771f1440107dea240')
+ '22056cd3540f16d19a4adfc83e055b1f')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 5c6f3f62a..e6ffc0759 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.1-1 Kernel Configuration
+# Linux/i386 3.7.6-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -503,7 +503,8 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
@@ -869,6 +870,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NETMAP=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_RATEEST=m
CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
CONFIG_NETFILTER_XT_TARGET_TEE=m
@@ -5142,7 +5144,7 @@ CONFIG_VT6656=m
CONFIG_DX_SEP=m
CONFIG_ZRAM=m
# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=y
+# CONFIG_ZCACHE is not set
CONFIG_ZSMALLOC=y
CONFIG_WLAGS49_H2=m
CONFIG_WLAGS49_H25=m
@@ -5222,6 +5224,7 @@ CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
CONFIG_CSR_WIFI=m
+CONFIG_ZCACHE2=y
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
@@ -5320,7 +5323,7 @@ CONFIG_MEMORY=y
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS=y
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
@@ -5439,7 +5442,7 @@ CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index c213f8707..eb2e5d7ef 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.1-1 Kernel Configuration
+# Linux/x86_64 3.7.6-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -497,7 +497,8 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
@@ -839,6 +840,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NETMAP=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_RATEEST=m
CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
CONFIG_NETFILTER_XT_TARGET_TEE=m
@@ -4909,7 +4911,7 @@ CONFIG_VT6656=m
CONFIG_DX_SEP=m
CONFIG_ZRAM=m
# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=y
+# CONFIG_ZCACHE is not set
CONFIG_ZSMALLOC=y
CONFIG_WLAGS49_H2=m
CONFIG_WLAGS49_H25=m
@@ -4989,6 +4991,8 @@ CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
CONFIG_CSR_WIFI=m
+CONFIG_ZCACHE2=y
+CONFIG_RAMSTER=y
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
@@ -5087,7 +5091,7 @@ CONFIG_MEMORY=y
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS=y
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
@@ -5207,7 +5211,7 @@ CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 155eefe9f..d31ca0b7c 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.7.4-1-LIBRE
+KERNEL_VERSION=3.7.6-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 7da492643..3210fad9f 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=35.1
+pkgrel=36
epoch=1
_extramodules=extramodules-3.7-LIBRE
arch=('i686' 'x86_64' 'mips64el')
@@ -38,6 +38,8 @@ build() {
-e 's/@X_LIBS@//g' \
-e 's/@X_PRE_LIBS@//g' \
-e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+ # fix for new automake #33497
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
libtoolize
autoreconf
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 85ae5cc5f..0cfb73c55 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=pacman
pkgver=4.0.3
-pkgrel=5
+pkgrel=5.1 # no difference from 5 unless on mips64el
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
@@ -77,7 +77,7 @@ package() {
install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
mycarch="mips64el"
mychost="mips64el-unknown-linux-gnu"
- myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+ myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
;;
esac
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 8292119d8..937332360 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
pkgname=parabola-keyring
-pkgver=20121102
+pkgver=20130205
pkgrel=1
pkgdesc='Parabola GNU/Linux-libre PGP keyring'
arch=('any')
@@ -15,5 +15,5 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make PREFIX=/usr DESTDIR=${pkgdir} install
}
-md5sums=('63c49a827ef05575514412ae76637c67'
- '9b887e116a8e115a2ca082f65b3ea65a')
+md5sums=('695ef52f9cdd167f8f406ebfbe08754f'
+ '7f5b50ad7e68f8cf2e3a7f9a4b3b1277')
diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD
new file mode 100644
index 000000000..68615937c
--- /dev/null
+++ b/libre/parabola-xdg-menu/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
+# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=parabola-xdg-menu
+pkgver=0.7.5.5
+pkgrel=1
+pkgdesc="automatic generate WM menu from xdg files (Parabola rebranded)"
+arch=('any')
+url="https://wiki.parabolagnulinux.org/Xdg-menu"
+license=("GPL")
+depends=('perl' 'perlxml')
+optdepends=('sux: for xdg_menu_su')
+backup=("etc/update-menus.conf"
+ "etc/xdg/menus/parabola-applications.menu")
+source=("http://archlinux-stuff.googlecode.com/files/arch-xdg-menu-$pkgver.tar.gz")
+replaces=('archlinux-xdg-menu')
+conflicts=('archlinux-xdg-menu')
+provides=("archlinux-xdg-menu=$pkgver")
+md5sums=('dd139571e537bbe0190eca53eabb8fd2')
+
+build() {
+ cd $srcdir
+
+ # Rebranding Archlinux to Parabola
+ rename -v arch parabola arch-desktop-directories arch-xdg-menu
+ rename -v Arch Parabola parabola-desktop-directories/*
+ rename -v arch parabola parabola-xdg-menu/*
+
+ sed -i -e 's/arch/parabola/'\
+ update-menus || read
+
+ sed -i -e 's/archlinux/parabola/'\
+ xdg_menu || read
+
+ sed -i -e 's/Archlinux/Parabola/'\
+ parabola-xdg-menu/parabola-applications.menu || read
+
+ sed -i -e 's/Arch/Parabola/'\
+ parabola-xdg-menu/parabola-applications.menu || read
+
+ install -D -m 0755 xdg_menu $pkgdir/usr/bin/xdg_menu
+ install -D -m 0755 xdg_menu_su $pkgdir/usr/bin/xdg_menu_su
+ install -D -m 0755 update-menus $pkgdir/usr/sbin/update-menus
+ install -D -m 0644 update-menus.conf $pkgdir/etc/update-menus.conf
+ mkdir -p $pkgdir/usr/share/desktop-directories/
+ cp parabola-desktop-directories/* $pkgdir/usr/share/desktop-directories/
+ mkdir -p $pkgdir/etc/xdg/menus/
+ cp parabola-xdg-menu/* $pkgdir/etc/xdg/menus/
+ mkdir -p $pkgdir//var/cache/xdg-menu
+}
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index d7c900f2a..594e6e98b 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,7 +11,7 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=12.1
+pkgrel=13
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 394379a3c..cfbe70292 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20120422
_extramodules=extramodules-3.7-LIBRE
-pkgrel=15.1
+pkgrel=16
pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 067a95fdd..828e9e6aa 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
pkgver=4.2.6
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index c8cc9d72b..e7805a9b4 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173686 2012-12-21 02:00:14Z eric $
+# $Id: PKGBUILD 176357 2013-01-30 21:29:22Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,9 +6,9 @@
_pkgname=xchat
pkgname=xchat-libre
pkgver=2.8.8
-pkgrel=11.1
+pkgrel=12
pkgdesc="A GTK+ based IRC client without non-free browser reference"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
url="http://www.xchat.org/"
provides=("xchat=$pkgver")
replaces=('xchat')
@@ -32,11 +32,12 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
'a053fba4e1911d1ee6a8248fe19e344797920fe3'
'70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
'aecaf6176a7cfd62555207b02f2793b360aa39da'
- '5a58642e7da870e1d32f7c5da4e61b5c036f76eb'
+ 'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911'
'20aef0ae608af6b30e1b4249f9c53830f8f514f6')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
+ sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c
patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch"
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch
index ab4b3dc7b..f20894610 100644
--- a/libre/xchat-libre/remove-non-free-suggestion.patch
+++ b/libre/xchat-libre/remove-non-free-suggestion.patch
@@ -1,13 +1,12 @@
diff -Nur xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
---- xchat-2.8.8.orig/src/common/xchat.c 2010-05-16 04:04:45.000000000 -0300
-+++ xchat-2.8.8/src/common/xchat.c 2013-01-19 01:56:02.243813379 -0200
-@@ -602,7 +602,8 @@
+--- xchat-2.8.8.orig/src/common/xchat.c 2010-05-16 04:04:45.000000000 -0300
++++ xchat-2.8.8/src/common/xchat.c 2013-01-30 22:23:44.481258504 -0200
+@@ -602,7 +602,7 @@
"NAME WII\n" "CMD quote WHOIS %2 %2\n\n";
static char defaultconf_urlhandlers[] =
- "NAME Open Link in Opera\n" "CMD !opera -remote 'openURL(%s)'\n\n";
-+ "NAME Open Link in Iceweasel\n" "CMD !iceweasel '%s'\n\n"\
-+ "NAME Open Link in GNU IceCat\n" "CMD !icecat '%s'\n\n";
++ "" "";
#ifdef USE_SIGACTION
/* Close and open log files on SIGUSR1. Usefull for log rotating */
diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 69fe5c072..f59454192 100644
--- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -67,7 +67,7 @@ index d7fec75..d531b83 100644
component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index a6598fe..8f83da8 100644
+index 52722e9..0448444 100644
--- a/browser/components/migration/src/FirefoxProfileMigrator.js
+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
@@ -78,12 +78,12 @@ index a6598fe..8f83da8 100644
+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
- const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+ this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 0669aa8..19552e3 100644
+index 1f60879..fc83a99 100644
--- a/browser/components/migration/src/MigrationUtils.jsm
+++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
+@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({
* @see nsIStringBundle
*/
getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
@@ -95,7 +95,7 @@ index 0669aa8..19552e3 100644
if (aReplacements === undefined)
return getMigrationBundle().GetStringFromName(aKey);
return getMigrationBundle().formatStringFromName(
-@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({
+@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({
},
/**
@@ -114,7 +114,7 @@ index 0669aa8..19552e3 100644
*/
finishMigration: function MU_finishMigration() {
diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index 744f117..59e5a4c 100644
+index f67823b..36016b8 100644
--- a/browser/components/migration/src/ProfileMigrator.js
+++ b/browser/components/migration/src/ProfileMigrator.js
@@ -12,6 +12,7 @@ function ProfileMigrator() {
@@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644
-64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 339ffda..6999b26 100644
+index 687c8d8..203d8cf 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -38,7 +38,7 @@ toolkit.jar:
+@@ -39,7 +39,7 @@ toolkit.jar:
+ content/global/mozilla.xhtml (mozilla.xhtml)
content/global/nsDragAndDrop.js (nsDragAndDrop.js)
content/global/resetProfile.css (resetProfile.css)
@@ -267,7 +267,7 @@ index f35c227..7062886 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 68a52e6..02bb30e 100644
+index e3dd0df..ef7bb74 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 1d485e6d5..c2847b2e8 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172187 2012-12-01 13:09:58Z foutrelis $
+# $Id: PKGBUILD 174912 2013-01-08 16:59:52Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -6,7 +6,7 @@
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=17.0.1
+_debver=18.0.1
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -18,8 +18,8 @@ pkgrel=1
pkgdesc="Mozilla Runtime Environment"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
url="http://wiki.mozilla.org/XUL:Xul_Runner"
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
@@ -31,14 +31,20 @@ options=('!emptydirs')
conflicts=('xulrunner')
provides=("xulrunner=${_debver}")
replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
- '1bbf435ff33f9824de23c0b13fbfb452'
- 'f2f4f4a573f549e8b494e33b3ad226bc'
+md5sums=('5d481dd35a304702d1f311eeb3f1149f'
+ '6a4781e8ddc1b166f36930c4864e095f'
+ '7f3317c25308a631ca31d8d280991bb4'
'27271ce647a83906ef7a24605e840d61'
'52e52f840a49eb1d14be1c0065b03a93'
- '65f68090d2a69b467bd2707d0c4ea3bd')
+ '46a4b19b414065b99b870ea79b454f6e')
build() {
+ # WebRTC build tries to execute "python" and expects Python 2
+ # Workaround taken from chromium PKGBUILD on Archlinux
+ mkdir "$srcdir/python2-path"
+ ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+ export PATH="$srcdir/python2-path:$PATH"
+
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig
index 34c5a6137..7c6cd106d 100644
--- a/libre/xulrunner-libre/mozconfig
+++ b/libre/xulrunner-libre/mozconfig
@@ -20,19 +20,13 @@ ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
# Features
-ac_add_options --disable-safe-browsing
ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
-ac_add_options --disable-gnomevfs
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-tests
-ac_add_options --disable-mochitest
ac_add_options --disable-installer
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
+# Parabola features
+ac_add_options --disable-safe-browsing