Mon May 20 00:57:42 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-05-20 00:57:43 -0700
committer: root <root@rshg054.dnsready.net> 2013-05-20 00:57:43 -0700
commit: 383955a81810f344e11b1472bd4c5069fa77020c (patch)
tree: 6017ed943ee9ae2ca0da830ede5f00f6d7817cf7
parent: 9a30c3d0083b8330b1aa6c0f89245e68ae762ee5 (diff)
63 files changed, 502 insertions, 2183 deletions
diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD
index 1b6db94b1..cc7bb1cd5 100644
--- a/community/flashrom/PKGBUILD
+++ b/community/flashrom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74911 2012-08-09 12:06:08Z giovanni $
+# $Id: PKGBUILD 91099 2013-05-19 13:18:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Cilyan Olowen <gaknar@gmail.com>
 # Contributor: fill <mailbox@fillo.ru>
@@ -6,7 +6,7 @@
 
 pkgname=flashrom
 pkgver=0.9.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips"
 url="http://www.flashrom.org/"
 arch=('i686' 'x86_64')
@@ -19,6 +19,7 @@ md5sums=('407e836c0a2b17ec76583cb6809f65e5')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  sed -i "s:sbin:bin:g" Makefile
   make
 }
 
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index cb8d4df7e..18d9ef0a2 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88703 2013-04-21 22:24:13Z heftig $
+# $Id: PKGBUILD 91084 2013-05-19 01:47:07Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('polkit-gnome: required for privileged actions'
 options=('!emptydirs' '!libtool')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('fe0a6368ee5a67419c9332a3b0031ecf1e3e92aa2fe0eb30aa4273f6224d070a')
+sha256sums=('f13481d477a47295fa204b73ae7590f61d5576a8c889e5644cee0bc1f5cf530c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index ba4a392af..bed9955a3 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88701 2013-04-21 22:24:09Z heftig $
+# $Id: PKGBUILD 91086 2013-05-19 01:51:02Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ install=$_pkgname.install
 url="http://www.gnome.org"
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
 	'arch.patch')
-sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee'
+sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be'
 	    '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea')
 
 build() {
diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD
index e9039de9c..947ebb3ea 100644
--- a/community/kvpnc/PKGBUILD
+++ b/community/kvpnc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89963 2013-05-06 10:41:26Z spupykin $
+# $Id: PKGBUILD 91108 2013-05-19 18:46:49Z dreisner $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Danial Olsen <do@meyl.fo>
 
 pkgname=kvpnc
 pkgver=0.9.6a
-pkgrel=3
+pkgrel=4
 pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
 arch=(i686 x86_64)
 url="http://home.gna.org/kvpnc/"
@@ -12,12 +12,21 @@ license=("GPL")
 depends=('kdelibs' 'hicolor-icon-theme')
 makedepends=('cmake' 'automoc4' 'optipng')
 install=kvpnc.install
-source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2)
-md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7')
+source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2
+        "vpnc-paths.patch")
+md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7'
+         '4bf6a10c7be84656723183b876cbaf9d')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver-kde4"
+
+  patch -Np0 <"$srcdir/vpnc-paths.patch"
+
+  sed -i '1,1i#include <unistd.h>' src/kvpnc.cpp
+}
 
 build() {
   cd $srcdir
-  sed -i '1,1i#include <unistd.h>' ${pkgname}-${pkgver}-kde4/src/kvpnc.cpp
 
   export LDFLAGS=-lX11
   mkdir build
diff --git a/community/kvpnc/vpnc-paths.patch b/community/kvpnc/vpnc-paths.patch
new file mode 100644
index 000000000..5dc66638d
--- /dev/null
+++ b/community/kvpnc/vpnc-paths.patch
@@ -0,0 +1,20 @@
+--- src/kvpncconfig.cpp.orig	2013-05-19 14:37:11.867517045 -0400
++++ src/kvpncconfig.cpp	2013-05-19 14:37:31.702107829 -0400
+@@ -865,7 +865,7 @@
+     enableDebugXl2tpdtunnel = QVariant(configgroup.readEntry("EnableDebugXl2tpdtunnel", false)).toBool();
+ 
+ 
+-    pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/sbin/vpnc");
++    pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/bin/vpnc");
+     pathToCiscoVpnc = configgroup.readEntry("Path to vpnclient", "/usr/local/bin/vpnclient");
+     pathToSetkey = configgroup.readEntry("Path to setkey", "/usr/sbin/setkey");
+     pathToRacoon = configgroup.readEntry("Path to racoon", "/usr/sbin/racoon");
+@@ -1489,7 +1489,7 @@
+ void KVpncConfig::checkStandardPathValues()
+ {
+     if (pathToVpnc.isEmpty())
+-        pathToVpnc = "/usr/sbin/vpnc";
++        pathToVpnc = "/usr/bin/vpnc";
+ 
+     if (pathToCiscoVpnc.isEmpty())
+         pathToCiscoVpnc = "/usr/local/bin/vpnclient";
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 76d023209..b2e855e55 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90243 2013-05-09 23:40:12Z arodseth $
+# $Id: PKGBUILD 91092 2013-05-19 10:48:50Z arodseth $
 # Maintainer:  Alexander Rødseth <rodseth@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -7,8 +7,8 @@
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
 pkgname=midori
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.5.2
+pkgrel=1
 pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686')
 url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
@@ -20,7 +20,7 @@ optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
             'aria2: download utility')
 options=('!emptydirs')
 source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
-sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0')
+sha256sums=('a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index fd860a96f..d46531006 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83602 2013-02-03 16:05:49Z giovanni $
+# $Id: PKGBUILD 91101 2013-05-19 13:42:04Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
 pkgver=1.8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/pcsclite/"
@@ -21,6 +21,7 @@ build() {
   sed -i -e "s:python:python2:g" src/spy/pcsc-spy
 
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --enable-libudev \
               --sysconfdir=/etc \
               --enable-ipcdir=/run/pcscd \
diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD
index 0e5b9d335..f83770517 100644
--- a/community/tuxpaint/PKGBUILD
+++ b/community/tuxpaint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90097 2013-05-06 19:39:46Z foutrelis $
+# $Id: PKGBUILD 91097 2013-05-19 11:35:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=tuxpaint
 pkgver=0.9.21
-pkgrel=8
+pkgrel=9
 pkgdesc='Drawing program designed for young children'
 arch=('x86_64' 'i686')
 url='http://www.tuxpaint.org/'
@@ -14,7 +14,7 @@ license=('GPL')
 backup=('etc/tuxpaint/tuxpaint.conf')
 depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango'
          'libpaper' 'librsvg')
-makedepends=('setconf')
+makedepends=('setconf' 'optipng')
 optdepends=('tuxpaint-stamps: more stamps'
             'tuxpaint-conf: configuration manager')
 source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz"
@@ -22,18 +22,28 @@ source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.
 sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9'
             '6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;'
+  sed -i 's:# fu:fu:' src/tuxpaint.conf
+
   # python2 fix
   for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do
     sed -i '0,/on/s//on2/' $f
   done
 
+  # libpng15 fix
   patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch
   sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile
-  setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;'
-  sed -i 's:# fu:fu:' src/tuxpaint.conf
+
+  # libpng16 fix
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   make PREFIX=/usr
 }
 
diff --git a/extra/bmp/0.9.7.1-visualization.patch b/extra/bmp/0.9.7.1-visualization.patch
deleted file mode 100644
index ac03323f6..000000000
--- a/extra/bmp/0.9.7.1-visualization.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- beep/vis.c	2004-12-04 10:04:29.000000000 +0100
-+++ beep/vis.c	2005-02-17 12:02:25.391044008 +0100
-@@ -223,7 +223,8 @@ vis_draw(Widget * w)
-     /* FIXME: The check "shouldn't" be neccessary? */
-     /*	if (GTK_IS_WINDOW(vis->vs_window)) { */
-     GDK_THREADS_ENTER();
--    gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-+    if (GDK_IS_DRAWABLE(vis->vs_window))
-+        gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-                            vis->vs_widget.x, vis->vs_widget.y,
-                            vis->vs_widget.width, vis->vs_widget.height,
-                            GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,
diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD
deleted file mode 100644
index 0cf018e71..000000000
--- a/extra/bmp/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148682 2012-02-05 11:46:44Z ibiru $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
-
-pkgname=bmp
-pkgver=0.9.7.1
-pkgrel=9
-pkgdesc="gtk2 port of xmms"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/beepmp/"
-license=('GPL')
-depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils')
-makedepends=('libxt')
-options=('!libtool')
-install=bmp.install
-source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \
-        ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
-md5sums=('c25d5a8d49cc5851d13d525a20023c4c'
-         'fa1bdf5a8d03e8539a6bed5caa471176'
-         '42ad4109ddb66024d4c6d1f3e572ab86')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../${pkgver}-visualization.patch 
-  patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch 
-  LIBS+="-lm" ./configure --prefix=/usr --mandir=/usr/share/man 
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch
deleted file mode 100644
index 4c1e46da9..000000000
--- a/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Patch taken from xmms-crossfade 3.10 tarball.  Required for crossfade to
-work.  http://www.eisenlohr.org/xmms-crossfade/
-
-diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c
---- bmp-0.9.7.1/beep/mainwin.c	2005-05-09 10:45:39.000000000 +0200
-+++ bmp-0.9.7.1.patched/beep/mainwin.c	2005-11-25 00:03:59.000000000 +0100
-@@ -655,9 +655,11 @@
-     mainwin_set_shade(!cfg.player_shaded);
- }
- 
-+gboolean is_quitting = FALSE;
- void
- mainwin_quit_cb(void)
- {
-+    is_quitting = TRUE;
-     gtk_widget_hide(equalizerwin);
-     gtk_widget_hide(playlistwin);
-     gtk_widget_hide(mainwin);
-@@ -1318,7 +1320,7 @@
- change_song(guint pos)
- {
-     if (bmp_playback_get_playing())
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
- 
-     playlist_set_position(pos);
-     bmp_playback_initiate();
-diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c
---- bmp-0.9.7.1/beep/playback.c	2005-01-26 06:56:15.000000000 +0100
-+++ bmp-0.9.7.1.patched/beep/playback.c	2005-11-25 00:03:59.000000000 +0100
-@@ -89,7 +89,7 @@
-         return;
- 
-     if (bmp_playback_get_playing())
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
- 
-     vis_clear_data(mainwin_vis);
-     vis_clear_data(playlistwin_vis);
-@@ -135,6 +135,15 @@
-     get_current_input_plugin()->pause(ip_data.paused);
- }
- 
-+gboolean input_stopped_for_restart = FALSE;
-+void
-+bmp_playback_stop_for_restart(void)
-+{
-+	input_stopped_for_restart = TRUE;
-+	bmp_playback_stop();
-+	input_stopped_for_restart = FALSE;
-+}
-+
- void
- bmp_playback_stop(void)
- {
-diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h
---- bmp-0.9.7.1/beep/playback.h	2004-12-04 10:04:26.000000000 +0100
-+++ bmp-0.9.7.1.patched/beep/playback.h	2005-11-25 00:03:59.000000000 +0100
-@@ -26,6 +26,7 @@
- void bmp_playback_initiate(void);
- void bmp_playback_pause(void);
- void bmp_playback_stop(void);
-+void bmp_playback_stop_for_restart(void);
- gboolean bmp_playback_play_file(const gchar * filename);
- gboolean bmp_playback_get_playing(void);
- gboolean bmp_playback_get_paused(void);
-diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c
---- bmp-0.9.7.1/beep/playlist.c	2005-08-11 09:25:51.000000000 +0200
-+++ bmp-0.9.7.1.patched/beep/playlist.c	2005-11-25 00:03:59.000000000 +0100
-@@ -817,7 +817,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -868,7 +868,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -1018,7 +1018,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -1047,7 +1047,10 @@
- {
-     GList *plist_pos_list;
- 
--    bmp_playback_stop();
-+    if (cfg.repeat)
-+        bmp_playback_stop_for_restart();
-+    else
-+        bmp_playback_stop();
- 
-     PLAYLIST_LOCK();
-     plist_pos_list = find_playlist_position_list();
diff --git a/extra/bmp/bmp.install b/extra/bmp/bmp.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/extra/bmp/bmp.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 90456699b..9ef539758 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 182654 2013-04-12 07:11:03Z tpowa $
+# $Id: PKGBUILD 185803 2013-05-19 09:33:05Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
 pkgver=6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64)
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -14,7 +14,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   # systemd support is broken in mount.cifs
   # https://bugs.archlinux.org/task/30958
-  ./configure --prefix=/usr --disable-systemd
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-systemd
   make
 }
 
diff --git a/extra/dmidecode/PKGBUILD b/extra/dmidecode/PKGBUILD
index 3c5fe030d..d36f8c5e7 100644
--- a/extra/dmidecode/PKGBUILD
+++ b/extra/dmidecode/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183308 2013-04-21 10:54:50Z giovanni $
+# $Id: PKGBUILD 185822 2013-05-19 13:06:30Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dmidecode
 pkgver=2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Management Interface table related utilities"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/dmidecode"
@@ -16,11 +16,12 @@ md5sums=('a406f3cbb27736491698697beeddb781')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  sed -i "s:sbin:bin:g" Makefile
   make prefix=/usr
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make prefix=/usr DESTDIR=${pkgdir} install
+  make prefix=/usr DESTDIR="${pkgdir}" install
 }
diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD
index 4cdbe9f10..a1641db1c 100644
--- a/extra/dosfstools/PKGBUILD
+++ b/extra/dosfstools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179303 2013-03-05 10:42:06Z tpowa $
+# $Id: PKGBUILD 185832 2013-05-19 14:15:45Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=dosfstools
 pkgver=3.0.16
-pkgrel=1
+pkgrel=2
 pkgdesc="DOS filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc')
@@ -20,7 +20,7 @@ build() {
 
 package () {
    cd $srcdir/$pkgname-$pkgver
-   make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
+   make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
 }
 md5sums=('27aca18aeb8bb0851ccaeb47e7416a6e'
          'e8b460ab9c27279e652ddbd1ce7fa4b2')
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 77a9c6614..519423761 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 178954 2013-03-01 10:20:02Z andrea $
+# $Id: PKGBUILD 185936 2013-05-19 21:23:57Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.3.1
-pkgrel=2
+pkgver=1.8.4
+pkgrel=1
 license=('GPL')
 arch=(i686 x86_64)
 url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript'
              'texlive-latexextra' 'graphviz')
 source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('31b0aaab51c5cab7db9f0ebbe9f85530')
-sha1sums=('289fc809f44b8025d45279deefbaee7680efd88f')
+md5sums=('5f460b91c0d8c34a76173cf22015c2fc')
+sha1sums=('a363811b932e44d479addbadffcc8257cde60b44')
 
 build() {
-  . /etc/profile.d/qt4.sh
+  export PATH=$PATH:/usr/lib/qt4/bin
   cd "${srcdir}/${pkgbase}-${pkgver}"
   QTDIR=/usr ./configure --prefix /usr --with-doxywizard
   make
diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD
index d97c9587f..c538a4a96 100755
--- a/extra/efibootmgr/PKGBUILD
+++ b/extra/efibootmgr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 176067 2013-01-27 09:30:54Z tpowa $
+# $Id: PKGBUILD 185838 2013-05-19 14:37:47Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor : Murtuza Akhtari <inxsible at gmail dot com>
 # Contributor: Keshav P R <skodabenz at rocketmail dot com>
 
 pkgname=efibootmgr
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
 arch=('i686' 'x86_64')
 url="http://linux.dell.com/efibootmgr/"
@@ -34,12 +34,12 @@ build () {
 
 package() {
 	
-	mkdir -p ${pkgdir}/usr/sbin/
+	mkdir -p ${pkgdir}/usr/bin/
 	mkdir -p ${pkgdir}/usr/share/man/man8/
 	
 	cd ${srcdir}/efibootmgr-${pkgver}_build/
 	
-	install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/sbin/efibootmgr
+	install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/bin/efibootmgr
 	install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8
 	
 }
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index 01300dc14..27bfde990 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166333 2012-09-06 15:45:17Z giovanni $
+# $Id: PKGBUILD 185814 2013-05-19 12:00:14Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fping
 pkgver=3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A utility to ping multiple hosts at once"
 arch=('i686' 'x86_64')
 url="http://www.fping.org/"
@@ -17,6 +17,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --mandir=/usr/share/man \
               --enable-ipv4 \
               --enable-ipv6
@@ -30,5 +31,5 @@ package() {
 
   # install license
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-  chmod 4555 ${pkgdir}/usr/sbin/fping
+  chmod 4555 ${pkgdir}/usr/bin/fping
 }
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 326342c20..eaf8f656a 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184007 2013-04-30 18:49:43Z giovanni $
+# $Id: PKGBUILD 185866 2013-05-19 16:28:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
 pkgver=0.16.1
-pkgrel=1
+pkgrel=3
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
 url="http://gparted.sourceforge.net"
@@ -14,6 +14,9 @@ depends=('parted' 'gtkmm' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
 optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'jfsutils: for jfs partitions'
+            'f2fs-tools: for Flash-Friendly File System'
+            'btrfs-progs: for btrfs partitions'
+            'exfat-utils: for exFAT partitions'
             'ntfs-3g: for ntfs partitions'
             'reiserfsprogs: for reiser partitions'
             'xfsprogs: for xfs partitions'
@@ -25,12 +28,14 @@ install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy')
 md5sums=('3f399bff031b5ce14d11a8c346f4b89c'
-         'c031d7d2b845ccb025b9f83e0ddd5653')
+         '122ed3120c846376bead22b25f6a3b19')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr
+  sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted_polkit %f:g" gparted.desktop.in.in
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin
   make
 }
 
@@ -42,11 +47,12 @@ package() {
   # Install policy file
   install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy"
 
-  # We need rename the original script
-  mv "${pkgdir}/usr/sbin/gparted" "${pkgdir}/usr/sbin/gparted.elf"
-
   # Install launcher script
-  echo '#!/bin/sh' > ${pkgdir}/usr/sbin/gparted
-  echo 'pkexec --disable-internal-agent "/usr/sbin/gparted.elf" "$@"' >> ${pkgdir}/usr/sbin/gparted
-  chmod 755 ${pkgdir}/usr/sbin/gparted
+  echo '#!/bin/sh' > ${pkgdir}/usr/bin/gparted_polkit
+  echo 'if [ $(which pkexec) ]; then' >> ${pkgdir}/usr/bin/gparted_polkit
+  echo '  pkexec --disable-internal-agent "/usr/bin/gparted" "$@"' >> ${pkgdir}/usr/bin/gparted_polkit
+  echo 'else' >> ${pkgdir}/usr/bin/gparted_polkit
+  echo '  /usr/bin/gparted "$@"' >> ${pkgdir}/usr/bin/gparted_polkit
+  echo 'fi' >> ${pkgdir}/usr/bin/gparted_polkit
+  chmod 755 ${pkgdir}/usr/bin/gparted_polkit
 }
diff --git a/extra/gparted/org.archlinux.pkexec.gparted.policy b/extra/gparted/org.archlinux.pkexec.gparted.policy
index 65894a0cc..4305e5e16 100644
--- a/extra/gparted/org.archlinux.pkexec.gparted.policy
+++ b/extra/gparted/org.archlinux.pkexec.gparted.policy
@@ -12,7 +12,7 @@
       <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted.elf</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gparted</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
   </action>
 
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index e327af6ae..4a8c6e516 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163174 2012-07-08 10:42:54Z andyrtr $
+# $Id: PKGBUILD 185818 2013-05-19 12:13:34Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gutenprint
 pkgver=5.2.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Top quality printer drivers for POSIX systems"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -23,7 +23,16 @@ md5sums=('aefbec27b96dd404d9ac9811e17d58ce')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  
+  # sbindir is not properly taken over there
+  sed -i "s:cups_sbindir=\"\/usr\/sbin\":cups_sbindir=\"\/usr\/bin\":g" m4/stp_cups.m4
+  sed -i  "s:cups_sbindir=\"\${cups_prefix}\/sbin\":cups_sbindir=\"\${cups_prefix}\/bin\":" m4/stp_cups.m4
+
+  sed -i "s:m4local:m4extra:" Makefile.am
+  autoreconf -vfi
+  
   ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
     --enable-samples \
 	--enable-cups-ppds \
 	--enable-cups-ppds-at-top-level \
diff --git a/extra/gutenprint/gutenprint.install b/extra/gutenprint/gutenprint.install
index 05e8bec38..1a042e97a 100644
--- a/extra/gutenprint/gutenprint.install
+++ b/extra/gutenprint/gutenprint.install
@@ -1,5 +1,5 @@
 post_install() {
- echo ">>please run /usr/sbin/cups-genppdupdate"
+ echo ">>please run /usr/bin/cups-genppdupdate"
  echo ">>and restart cups deamon"
 }
 
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index d2b74f769..ec349be67 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180805 2013-03-26 11:49:34Z foutrelis $
+# $Id: PKGBUILD 185844 2013-05-19 15:04:46Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
 pkgver=51.1
-pkgrel=1
+pkgrel=2
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64)
 url="http://www.icu-project.org/"
@@ -25,7 +25,8 @@ build() {
 
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
-	--mandir=/usr/share/man
+	--mandir=/usr/share/man \
+	--sbindir=/usr/bin
   make
 }
 
diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD
index 56d573eb5..fb0005b72 100644
--- a/extra/isapnptools/PKGBUILD
+++ b/extra/isapnptools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136974 2011-09-04 11:49:36Z pierre $
+# $Id: PKGBUILD 185816 2013-05-19 12:09:03Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=isapnptools
 pkgver=1.27
-pkgrel=3
+pkgrel=4
 pkgdesc="Allow ISA Plug-And-Play devices to be configured on a Linux machine"
 url="http://www.roestock.demon.co.uk/isapnptools/"
 depends=('glibc')
@@ -14,11 +14,14 @@ md5sums=('b997ba56583dc850fce9b93d658dfa0c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD
index 2e2c6a688..740569631 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182155 2013-04-08 13:04:10Z tpowa $
+# $Id: PKGBUILD 185799 2013-05-19 09:24:25Z tpowa $
 # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kexec-tools
 pkgver=2.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Load another kernel from the currently executing Linux kernel"
 arch=('i686' 'x86_64')
 url="http://kernel.org/pub/linux/utils/kernel/kexec/"
@@ -18,16 +18,13 @@ license=('GPL2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --without-lzma
+  ./configure --prefix=/usr --sbindir=/usr/bin --without-lzma
   make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-
-  mv $pkgdir/usr/sbin $pkgdir/sbin
-
   install -D -m644 kexec/kexec.8 $pkgdir/usr/share/man/man8/kexec.8
 }
 md5sums=('4713026758923f5f3968905291b991ee')
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index b65ae3f3c..a50731449 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179572 2013-03-07 11:54:29Z foutrelis $
+# $Id: PKGBUILD 185909 2013-05-19 18:47:29Z dreisner $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-vpnc
 pkgver=0.9.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="NetworkManager VPN plugin for vpnc"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,8 +13,15 @@ makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-vpnc.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz
+        "vpnc-paths.patch")
+sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1'
+            '0b07abc21823b316bfd9a9faf7bf34ded35d66e904d081c5e285f8dc8ce30a54')
+
+prepare() {
+  cd NetworkManager-vpnc-${pkgver}
+  patch -Np1 <"$srcdir/vpnc-paths.patch"
+}
 
 build() {
   cd NetworkManager-vpnc-${pkgver}
diff --git a/extra/networkmanager-vpnc/vpnc-paths.patch b/extra/networkmanager-vpnc/vpnc-paths.patch
new file mode 100644
index 000000000..eccdf65b2
--- /dev/null
+++ b/extra/networkmanager-vpnc/vpnc-paths.patch
@@ -0,0 +1,10 @@
+--- a/src/nm-vpnc-service.c	2013-05-19 14:21:35.465816746 -0400
++++ b/src/nm-vpnc-service.c	2013-05-19 14:23:57.554908088 -0400
+@@ -54,6 +54,7 @@
+ 
+ static const char *vpnc_binary_paths[] =
+ {
++	"/usr/bin/vpnc",
+ 	"/usr/sbin/vpnc",
+ 	"/sbin/vpnc",
+ 	"/usr/local/sbin/vpnc",
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index 7a9416441..a27cb8962 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151858 2012-03-03 14:28:32Z giovanni $
+# $Id: PKGBUILD 185834 2013-05-19 14:21:08Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=parted
 pkgver=3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -20,6 +20,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --disable-debug \
               --disable-rpath
   make
diff --git a/extra/parted/linux.c.patch b/extra/parted/linux.c.patch
deleted file mode 100644
index c9feea142..000000000
--- a/extra/parted/linux.c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libparted/arch/linux.c	2011-05-27 14:52:37.000000000 +0200
-+++ b/libparted/arch/linux.c	2011-07-29 20:25:38.000000000 +0200
-@@ -601,17 +601,17 @@
-         static int kver = -1;
- 
-         struct utsname uts;
--        int major;
--        int minor;
--        int teeny;
-+        int major = 0;
-+        int minor = 0;
-+        int teeny = 0;
- 
-         if (kver != -1)
-                 return kver;
- 
-         if (uname (&uts))
-                 return kver = 0;
--        if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3)
--                return kver = 0;
-+        int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny);
-+        assert (n == 2 || n == 3);
- 
-         return kver = KERNEL_VERSION (major, minor, teeny);
- }
diff --git a/extra/parted/parted.install b/extra/parted/parted.install
index 5e00699e8..752a6871b 100644
--- a/extra/parted/parted.install
+++ b/extra/parted/parted.install
@@ -8,7 +8,7 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 pre_remove() {
diff --git a/extra/python-m2crypto/PKGBUILD b/extra/python-m2crypto/PKGBUILD
deleted file mode 100644
index 010da5c82..000000000
--- a/extra/python-m2crypto/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python-m2crypto
-pkgver=0.21.1
-pkgrel=1
-pkgdesc="A crypto and SSL toolkit for Python"
-arch=('i686' 'x86_64')
-url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
-license=('BSD')
-depends=('python2' 'openssl')
-makedepends=('swig')
-source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz")
-md5sums=('f93d8462ff7646397a9f77a2fe602d17')
-
-build() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-
-  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/python-m2crypto/openssl1.patch b/extra/python-m2crypto/openssl1.patch
deleted file mode 100644
index 59dba554d..000000000
--- a/extra/python-m2crypto/openssl1.patch
+++ /dev/null
@@ -1,531 +0,0 @@
-Index: tests/test_ssl.py
-===================================================================
---- tests/test_ssl.py	(revision 698)
-+++ tests/test_ssl.py	(working copy)
-@@ -405,8 +405,11 @@
-         try:
-             ctx = SSL.Context('sslv23', weak_crypto=1)
-             s = SSL.Connection(ctx)
--            s.connect(self.srv_addr)
--            self.failUnlessEqual(s.get_version(), 'SSLv2')
-+            if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL
-+                s.connect(self.srv_addr)
-+                self.failUnlessEqual(s.get_version(), 'SSLv2')
-+            else:
-+                self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
-             s.close()
-         finally:
-             self.stop_server(pid)
-Index: tests/test_x509.py
-===================================================================
---- tests/test_x509.py	(revision 698)
-+++ tests/test_x509.py	(working copy)
-@@ -142,7 +142,7 @@
-         cn.set_data("Hello There!")
-         assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text()
- 
--        assert n.as_hash() == 1697185131
-+        self.assertEquals(n.as_hash(), 1697185131)
-         
-         self.assertRaises(IndexError, lambda: n[100])
-         self.assert_(n[10])
-Index: tests/test_smime.py
-===================================================================
---- tests/test_smime.py	(revision 698)
-+++ tests/test_smime.py	(working copy)
-@@ -6,7 +6,7 @@
- """
- 
- import unittest
--from M2Crypto import SMIME, BIO, Rand, X509, EVP
-+from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err
- 
- class SMIMETestCase(unittest.TestCase):
-     cleartext = 'some text to manipulate'
-@@ -213,7 +213,7 @@
- 
-         self.filenameSmime = 'tests/sig.p7s'
-         f = BIO.openfile(self.filenameSmime, 'wb')
--        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
-+        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error()
-         f.close()
-         
-     def test_write_pkcs7_der(self):
-Index: SWIG/_evp.i
-===================================================================
---- SWIG/_evp.i	(revision 695)
-+++ SWIG/_evp.i	(working copy)
-@@ -180,7 +180,7 @@
- 
-     PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
-                            keylen, key);
--    ret = PyString_FromStringAndSize(key, keylen);
-+    ret = PyString_FromStringAndSize((char*)key, keylen);
-     OPENSSL_cleanse(key, keylen);
-     return ret;
- }
-@@ -339,7 +339,7 @@
-     klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, 
-         (unsigned char *)dbuf, dlen, iter, 
-         key, NULL); /* Since we are not returning IV no need to derive it */
--    ret = PyString_FromStringAndSize(key, klen);
-+    ret = PyString_FromStringAndSize((char*)key, klen);
-     return ret;
- }
- 
-@@ -435,7 +435,7 @@
-         PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
-         return NULL;
-     }
--    ret = PyString_FromStringAndSize(sigbuf, siglen);
-+    ret = PyString_FromStringAndSize((char*)sigbuf, siglen);
-     OPENSSL_cleanse(sigbuf, siglen);
-     OPENSSL_free(sigbuf);
-     return ret;
-@@ -513,7 +513,7 @@
-         PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed");
-         return NULL; 
-     }
--    der = PyString_FromStringAndSize(pp, len);
-+    der = PyString_FromStringAndSize((char*)pp, len);
-     OPENSSL_free(pp);
-     return der;
- }
-Index: SWIG/_ssl.i
-===================================================================
---- SWIG/_ssl.i	(revision 695)
-+++ SWIG/_ssl.i	(working copy)
-@@ -17,13 +17,17 @@
- %apply Pointer NONNULL { SSL_CTX * };
- %apply Pointer NONNULL { SSL * };
- %apply Pointer NONNULL { SSL_CIPHER * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { BIO * };
- %apply Pointer NONNULL { DH * };
- %apply Pointer NONNULL { RSA * };
- %apply Pointer NONNULL { EVP_PKEY *};
- %apply Pointer NONNULL { PyObject *pyfunc };
- 
-+%rename(ssl_get_ciphers) SSL_get_ciphers;
-+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
-+
- %rename(ssl_get_version) SSL_get_version;
- extern const char *SSL_get_version(CONST SSL *);
- %rename(ssl_get_error) SSL_get_error;
-@@ -668,29 +672,25 @@
-     return SSL_CIPHER_get_bits(c, NULL);
- }
- 
--STACK *ssl_get_ciphers(SSL *ssl) {
--    return (STACK *)SSL_get_ciphers(ssl);
-+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) {
-+    return sk_SSL_CIPHER_num(stack);
- }
- 
--int sk_ssl_cipher_num(STACK *stack) {
--    return sk_num(stack);
-+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) {
-+    return sk_SSL_CIPHER_value(stack, idx);
- }
- 
--SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) {
--    return (SSL_CIPHER *)sk_value(stack, idx);
-+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) {
-+    return SSL_get_peer_cert_chain(ssl);
- }
- 
--STACK *ssl_get_peer_cert_chain(SSL *ssl) {
--    return (STACK *)SSL_get_peer_cert_chain(ssl);
-+int sk_x509_num(STACK_OF(X509) *stack) {
-+    return sk_X509_num(stack);
- }
- 
--int sk_x509_num(STACK *stack) {
--    return sk_num(stack);
-+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) {
-+    return sk_X509_value(stack, idx);
- }
--
--X509 *sk_x509_value(STACK *stack, int idx) {
--    return (X509 *)sk_value(stack, idx);
--}
- %}
- 
- %threadallow i2d_ssl_session;
-Index: SWIG/_x509.i
-===================================================================
---- SWIG/_x509.i	(revision 695)
-+++ SWIG/_x509.i	(working copy)
-@@ -148,8 +148,15 @@
- extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long);
- %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp;
- extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long);
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+%rename(x509_name_hash) X509_NAME_hash_old;
-+extern unsigned long X509_NAME_hash_old(X509_NAME *);
-+#else
- %rename(x509_name_hash) X509_NAME_hash;
- extern unsigned long X509_NAME_hash(X509_NAME *);
-+#endif
-+
- %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID;
- extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
- 
-@@ -171,7 +178,7 @@
-     if (PyString_Check($input)) {
-         Py_ssize_t len;
- 
--        $1 = PyString_AsString($input); 
-+        $1 = (unsigned char *)PyString_AsString($input); 
-         len = PyString_Size($input);
-         if (len > INT_MAX) {
-             PyErr_SetString(PyExc_ValueError, "object too large");
-@@ -184,7 +191,7 @@
-     }
- }
- %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data;
--extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int);
-+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int);
- %typemap(in) (CONST unsigned char *, int);
- 
- %rename(x509_req_new) X509_REQ_new;
-@@ -230,7 +237,7 @@
- %rename(x509_store_ctx_free) X509_STORE_CTX_free;
- extern void X509_STORE_CTX_free(X509_STORE_CTX *);
- %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain;
--extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
-+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
- 
- %rename(x509_extension_get_critical) X509_EXTENSION_get_critical;
- extern int X509_EXTENSION_get_critical(X509_EXTENSION *);
-@@ -348,7 +355,7 @@
-         PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-     }
-     else {     
--        ret = PyString_FromStringAndSize(buf, len);
-+        ret = PyString_FromStringAndSize((char*)buf, len);
-         OPENSSL_free(buf);
-     }
-     return ret;
-@@ -435,12 +442,12 @@
- }
- 
- int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) {
--    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0);
-+    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0);
- }
- 
- /* x509_name_add_entry_by_txt */
- int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) {
--    return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
-+    return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set);
- }
- 
- PyObject *x509_name_get_der(X509_NAME *name)
-@@ -450,23 +457,23 @@
- }
- 
- /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */
--STACK *sk_x509_new_null(void) {
--    return (STACK *)sk_X509_new_null();
-+STACK_OF(X509) *sk_x509_new_null(void) {
-+    return sk_X509_new_null();
- }
- 
- /* sk_X509_free() is a macro. */
--void sk_x509_free(STACK *stack) {
--    sk_X509_free((STACK_OF(X509) *)stack);
-+void sk_x509_free(STACK_OF(X509) *stack) {
-+    sk_X509_free(stack);
- }
- 
- /* sk_X509_push() is a macro. */
--int sk_x509_push(STACK *stack, X509 *x509) {
--    return sk_X509_push((STACK_OF(X509) *)stack, x509);
-+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) {
-+    return sk_X509_push(stack, x509);
- }
- 
- /* sk_X509_pop() is a macro. */
--X509 *sk_x509_pop(STACK *stack) {
--    return sk_X509_pop((STACK_OF(X509) *)stack);
-+X509 *sk_x509_pop(STACK_OF(X509) *stack) {
-+    return sk_X509_pop(stack);
- }
- 
- int x509_store_load_locations(X509_STORE *store, const char *file) {
-@@ -493,21 +500,29 @@
-     return X509_REQ_set_version(x, version);
- }
- 
--int x509_req_add_extensions(X509_REQ *req, STACK *exts) {
--    return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts);
-+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) {
-+    return X509_REQ_add_extensions(req, exts);
- }
- 
--X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
--    return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len);
-+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
-+    return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len);
- }
- 
--LHASH * 
--x509v3_lhash(){ 
--       return lh_new(NULL,NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+LHASH_OF(CONF_VALUE) 
-+#else
-+LHASH
-+#endif
-+*x509v3_lhash() { 
-+    return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */
- }
- 
- X509V3_CTX *
--x509v3_set_conf_lhash(LHASH * lhash){
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) {
-+#else
-+x509v3_set_conf_lhash(LHASH                * lhash) {
-+#endif
-       X509V3_CTX * ctx;
-       if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) {
-           PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash");
-@@ -517,11 +532,20 @@
-       return ctx;
- }
- 
--X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
-+X509_EXTENSION *
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#else
-+x509v3_ext_conf(LHASH                *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#endif
-       X509_EXTENSION * ext = NULL;
-       ext = X509V3_EXT_conf(conf, ctx, name, value); 
-       PyMem_Free(ctx); 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      lh_CONF_VALUE_free(conf);
-+#else
-       lh_free(conf);
-+#endif
-       return ext;
- }
- 
-@@ -543,33 +567,33 @@
- }
- 
- /* sk_X509_EXTENSION_new_null is a macro. */
--STACK *sk_x509_extension_new_null(void) {
--    return (STACK *)sk_X509_EXTENSION_new_null();
-+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) {
-+    return sk_X509_EXTENSION_new_null();
- }
- 
- /* sk_X509_EXTENSION_free() is a macro. */
--void sk_x509_extension_free(STACK *stack) {
--    sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack);
-+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) {
-+    sk_X509_EXTENSION_free(stack);
- }
- 
- /* sk_X509_EXTENSION_push() is a macro. */
--int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) {
--    return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext);
-+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) {
-+    return sk_X509_EXTENSION_push(stack, x509_ext);
- }
- 
- /* sk_X509_EXTENSION_pop() is a macro. */
--X509_EXTENSION *sk_x509_extension_pop(STACK *stack) {
--    return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack);
-+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) {
-+    return sk_X509_EXTENSION_pop(stack);
- }
- 
- /* sk_X509_EXTENSION_num() is a macro. */
--int sk_x509_extension_num(STACK *stack) {
--    return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack);
-+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) {
-+    return sk_X509_EXTENSION_num(stack);
- }
- 
- /* sk_X509_EXTENSION_value() is a macro. */
--X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) {
--    return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i);
-+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) {
-+    return sk_X509_EXTENSION_value(stack, i);
- }
- 
- /* X509_STORE_CTX_get_app_data is a macro. */
-@@ -590,7 +614,7 @@
- #define I2DTYPE int (*)()
- #endif   
- 
--STACK *
-+STACK_OF(X509) *
- make_stack_from_der_sequence(PyObject * pyEncodedString){
-     STACK_OF(X509) *certs;
-     Py_ssize_t encoded_string_len;
-@@ -606,7 +630,7 @@
-         return NULL;
-     }
- 
--    certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); 
-+    certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); 
-     if (!certs) {
-        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-        return NULL;
-@@ -616,13 +640,13 @@
- }
- 
- PyObject *
--get_der_encoding_stack(STACK * stack){
-+get_der_encoding_stack(STACK_OF(X509) *stack){
-     PyObject * encodedString;
-     
-     unsigned char * encoding;
-     int len; 
-     
--    encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); 
-+    encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); 
-     if (!encoding) {
-        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-        return NULL;
-Index: SWIG/_aes.i
-===================================================================
---- SWIG/_aes.i	(revision 695)
-+++ SWIG/_aes.i	(working copy)
-@@ -76,7 +76,7 @@
-         AES_encrypt((const unsigned char *)in, out, key);
-     else
-         AES_decrypt((const unsigned char *)in, out, key);
--    return PyString_FromStringAndSize(out, outlen);
-+    return PyString_FromStringAndSize((char*)out, outlen);
- }
- 
- int AES_type_check(AES_KEY *key) {
-Index: SWIG/_util.i
-===================================================================
---- SWIG/_util.i	(revision 695)
-+++ SWIG/_util.i	(working copy)
-@@ -48,7 +48,7 @@
-         PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error()));
-         return NULL;
-     }
--    obj = PyString_FromStringAndSize(ret, len);
-+    obj = PyString_FromStringAndSize((char*)ret, len);
-     OPENSSL_free(ret);
-     return obj;
- }
-Index: SWIG/_m2crypto.i
-===================================================================
---- SWIG/_m2crypto.i	(revision 695)
-+++ SWIG/_m2crypto.i	(working copy)
-@@ -38,6 +38,19 @@
- #define CONST098
- #endif
- 
-+/* Bring in STACK_OF macro definition */
-+%include <openssl/safestack.h>
-+
-+/* Bring in LHASH_OF macro definition */
-+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes
-+   XXX stdio.h etc. which we fail to include. So we have to (re)define
-+   XXX LHASH_OF here instead.
-+%include <openssl/lhash.h>
-+*/
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define LHASH_OF(type) struct lhash_st_##type
-+#endif
-+
- %include constraints.i
- %include _threads.i
- %include _lib.i
-Index: SWIG/_rand.i
-===================================================================
---- SWIG/_rand.i	(revision 695)
-+++ SWIG/_rand.i	(working copy)
-@@ -87,7 +87,7 @@
-         Py_INCREF(Py_None);
-         return Py_None;
-     } else {
--        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n));
-+        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n));
-         PyMem_Free(blob);
-         PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret));
-         return tuple;
-Index: SWIG/_pkcs7.i
-===================================================================
---- SWIG/_pkcs7.i	(revision 695)
-+++ SWIG/_pkcs7.i	(working copy)
-@@ -12,7 +12,7 @@
- %apply Pointer NONNULL { EVP_CIPHER * };
- %apply Pointer NONNULL { EVP_PKEY * };
- %apply Pointer NONNULL { PKCS7 * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { X509 * };
- 
- %rename(pkcs7_new) PKCS7_new;
-@@ -54,8 +54,8 @@
- 
- %threadallow pkcs7_encrypt;
- %inline %{
--PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
--    return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags);
-+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
-+    return PKCS7_encrypt(stack, bio, cipher, flags);
- }
- 
- PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) {
-@@ -96,14 +96,14 @@
- 
- %threadallow pkcs7_sign1;
- %inline %{
--PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) {
--    return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags);
-+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) {
-+    return PKCS7_sign(x509, pkey, stack, bio, flags);
- }
- %}
- 
- %threadallow pkcs7_verify1;
- %inline %{
--PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) {
-+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) {
-     int outlen;
-     char *outbuf;
-     BIO *bio;
-@@ -113,7 +113,7 @@
-         PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1");
-         return NULL;
-     }
--    if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) {
-+    if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) {
-         PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error()));
-         BIO_free(bio);
-         return NULL;
-@@ -131,7 +131,7 @@
-     return ret;
- }
- 
--PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) {
-+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) {
-     return pkcs7_verify1(pkcs7, stack, store, NULL, flags);
- }
- %}
-@@ -229,7 +229,7 @@
- }
- 
- /* return STACK_OF(X509)* */     
--STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {     
-+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) {     
-     return PKCS7_get0_signers(p7, certs, flags);      
- }
- 
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index b37c9e8b1..b73a8d808 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182410 2013-04-10 07:43:35Z tpowa $
+# $Id: PKGBUILD 185795 2013-05-19 09:05:59Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=4
+pkgrel=5
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64')
@@ -34,7 +34,7 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
 
-  ./configure --prefix=/usr \
+  ./configure --prefix=/usr --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --with-docdir=/usr/share/doc/sane \
@@ -69,8 +69,8 @@ package () {
       "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
 md5sums=('e226a89c54173efea80e91e9a5eb6573'
-         '5f519030392d599e2ad348159ec4c96f'
+         'bc2c8b4f7b3012c8936c7da21f60e2ac'
          'e57e9e15528f47f5f1b3f1411135ed5d'
-         'e44bd4c994a52d6f472463d1eb0a03be'
+         '3f9fe36b0c4ff0b01b53b1cffa5d9700'
          'e65dbefb7c3d69955fb6eb3ace14aa12'
          '44e77692c52db15b0f530a1d9a8e1296')
diff --git a/extra/sane/sane.xinetd b/extra/sane/sane.xinetd
index 67f08a656..311ca6202 100644
--- a/extra/sane/sane.xinetd
+++ b/extra/sane/sane.xinetd
@@ -5,7 +5,7 @@ service sane-port
 	wait        = no
 	user        = nobody 
 	group       = scanner
-	server      = /usr/sbin/saned
+	server      = /usr/bin/saned
 	# disabled by default!
 	disable     = yes
 		  }
diff --git a/extra/sane/saned.service b/extra/sane/saned.service
index 69e833e7e..6b2a3f7a7 100644
--- a/extra/sane/saned.service
+++ b/extra/sane/saned.service
@@ -3,6 +3,6 @@ Description=Scanner Service
 
 [Service]
 Group=scanner
-ExecStart=/usr/sbin/saned
+ExecStart=/usr/bin/saned
 StandardInput=socket
 StandardError=syslog
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index 09337c78a..10eb11338 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183306 2013-04-21 10:49:31Z giovanni $
+# $Id: PKGBUILD 185826 2013-05-19 13:29:06Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Jani Talikka <jani.talikka@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=smartmontools
 pkgver=6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
 url="http://smartmontools.sourceforge.net"
 license=('GPL')
@@ -24,6 +24,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --sysconfdir=/etc \
               --enable-drivedb \
               --with-libcap-ng=yes \
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index 9dd06afab..9fe48df7c 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184005 2013-04-30 18:42:55Z giovanni $
+# $Id: PKGBUILD 185812 2013-05-19 11:54:46Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=tcpdump
 pkgver=4.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for network monitoring and data acquisition"
 arch=('i686' 'x86_64')
 url="http://www.tcpdump.org"
@@ -13,7 +13,7 @@ depends=('libpcap' 'openssl')
 source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz"
         'tcpdump_duplicate_executable.patch')
 md5sums=('6f75aabcffd012f73bd7c331bb5d8232'
-         '96c116e5ed51759a029bb6c236d63178')
+         '01379e4a12a208ce951c6c2abe80300f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,6 +22,7 @@ build() {
   patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
 
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --enable-ipv6
   make
 }
diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch
index bb3e60f1a..f3efb6d40 100644
--- a/extra/tcpdump/tcpdump_duplicate_executable.patch
+++ b/extra/tcpdump/tcpdump_duplicate_executable.patch
@@ -1,6 +1,6 @@
---- a/Makefile.in	2012-06-12 18:56:20.000000000 +0200
-+++ b/Makefile.in	2012-06-13 08:41:09.000000000 +0200
-@@ -409,7 +409,6 @@
+--- a/Makefile.in	2013-03-24 22:49:18.000000000 +0100
++++ b/Makefile.in	2013-05-19 13:44:29.000000000 +0200
+@@ -326,7 +326,6 @@
  	[ -d $(DESTDIR)$(sbindir) ] || \
  	    (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
  	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD
index 1e8fc0fff..9b09b1507 100644
--- a/extra/vamp-plugin-sdk/PKGBUILD
+++ b/extra/vamp-plugin-sdk/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 164737 2012-08-04 10:47:06Z schiv $
+# $Id: PKGBUILD 185824 2013-05-19 13:06:56Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Orivej Desh <smpuj@bk.ru>
 
 pkgname=vamp-plugin-sdk
-pkgver=2.4
+pkgver=2.5
+_dir=690
 pkgrel=1
 pkgdesc="The Vamp audio analysis plug-in system"
 arch=('i686' 'x86_64')
 url="http://www.vamp-plugins.org/"
 license=('BSD')
 depends=('gcc-libs' 'libsndfile')
-#options=('!libtool')
-source=("http://code.soundsoftware.ac.uk/attachments/download/517/$pkgname-$pkgver.tar.gz")
-md5sums=('4bd75ca4515c141cd8776bdb59066261')
+options=('!libtool')
+source=("http://code.soundsoftware.ac.uk/attachments/download/$_dir/$pkgname-$pkgver.tar.gz")
+md5sums=('199872997f74951f6769b982bf0d0646')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD
index a181b20b6..45d6b28e1 100644
--- a/extra/vpnc/PKGBUILD
+++ b/extra/vpnc/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 164259 2012-07-29 01:13:10Z dreisner $
+# $Id: PKGBUILD 185907 2013-05-19 18:45:48Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=vpnc
 _vpncver=0.5.3
-_git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6
-pkgver=$_vpncver.svn516
-pkgrel=3
+_git=d2c5a77f3f0ea6ad80fc59158127d63ede81a6cb
+pkgver=$_vpncver.svn527
+pkgrel=1
 pkgdesc="VPN client for cisco3000 VPN Concentrators"
 url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
 license=('GPL')
@@ -17,8 +17,8 @@ source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"
         "http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script"
         'vpnc.conf')
 backup=('etc/vpnc/default.conf')
-md5sums=('2118c5ccc464250c0892be57dbfabdf7'
-         '6293c15ef6e7a3365ed7add5e336b806'
+md5sums=('db1908bc5cf2b70334c9f74a597a4623'
+         '70198474faf36a84beaa11136f6c4d9c'
          'a3f4e0cc682f437e310a1c86ae198e45')
 
 mktarball() {
@@ -52,7 +52,7 @@ build() {
 package() {
   cd "$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir" PREFIX=/usr install
+  make DESTDIR="$pkgdir" PREFIX=/usr SBINDIR=/usr/bin install
 
   install -Dm644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf
   install -Dm755 "$srcdir"/vpnc-script "$pkgdir"/etc/vpnc/vpnc-script
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index 25d8a829b..92b719de6 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180593 2013-03-24 09:34:13Z andyrtr $
+# $Id: PKGBUILD 185846 2013-05-19 15:18:38Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -7,7 +7,7 @@
 # Contributor: Milan Knížek <knizek@volny.cz>
 
 pkgname=x2goserver
-pkgver=4.0.0.1
+pkgver=4.0.0.2
 pkgrel=1
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
@@ -20,12 +20,12 @@ options=('emptydirs')
 install=x2goserver.install
 backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service)
-md5sums=('85dc2a2d52e82eead744a51007155ff9'
-         'b09799f9203150dc1277a56058be48a8')
+md5sums=('6b8cecfdd31a8877203f50d3666c265f'
+         'f76081c01e40b6206895d194dc949707')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
+#return 1
   # -r option does not exist in Arch linux
   # (However, html man pages do not get installed anyway...)
   for Makefile in $(find . -type f -name Makefile); do
@@ -43,7 +43,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 PREFIX=/usr DESTDIR="$pkgdir" install
+  make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
 
   # systemd service file - only runs x2gocleansessions
   install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
diff --git a/extra/x2goserver/x2goserver.service b/extra/x2goserver/x2goserver.service
index 393d841c5..f06d39499 100644
--- a/extra/x2goserver/x2goserver.service
+++ b/extra/x2goserver/x2goserver.service
@@ -3,7 +3,7 @@ Description=x2go - remote desktop server
 After=syslog.target network.target
 
 [Service]
-ExecStart=/usr/sbin/x2gocleansessions
+ExecStart=/usr/bin/x2gocleansessions
 PIDFile=/run/x2goserver.pid
 
 [Install]
diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD
index 0b0257f22..bc68f6eb5 100644
--- a/extra/xsane/PKGBUILD
+++ b/extra/xsane/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184456 2013-05-06 19:40:28Z foutrelis $
+# $Id: PKGBUILD 185793 2013-05-19 08:52:55Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgbase=xsane
 pkgname=('xsane' 'xsane-gimp')
 pkgver=0.998
-pkgrel=4
+pkgrel=5
 arch=(i686 x86_64)
 url="http://www.xsane.org"
 license=('GPL2')
@@ -15,11 +15,15 @@ source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
 md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
          '15541ff0ddc10acfa2059cf99d5478eb')
 
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
   # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora
-  patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch"
+  patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch
   sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
+}
+
+build() {
+  cd "$srcdir/$pkgbase-$pkgver"
 
   ./configure --prefix=/usr \
     --mandir=/usr/share/man \
@@ -29,7 +33,7 @@ build() {
 
   # build again with gimp enabled
   make clean
-  ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
+  ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --disable-gimp
   make
 }
 
@@ -49,9 +53,10 @@ package_xsane-gimp() {
   install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp"
 
   ## For making Gimp Plugin available 
-  /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins"
-  cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/"
-  /bin/ln -s ../../../../bin/xsane-gimp xsane
+  mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins"
+  ln -sf /usr/bin/xsane-gimp $pkgdir/usr/lib/gimp/2.0/plug-ins/xsane
+  #cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/"
+  #/bin/ln -s ../../../../bin/xsane-gimp xsane
 
 # http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup
 # when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora, 
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 0d0e04e21..2623328ac 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185761 2013-05-18 14:38:33Z andyrtr $
+# $Id: PKGBUILD 185808 2013-05-19 10:16:28Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -7,7 +7,7 @@
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.13.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -31,11 +31,13 @@ options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
         cups-1.6-buildfix.diff
-        hp-mkuri.patch)
+        hp-mkuri.patch
+        hplip_typo.patch)
 md5sums=('f0c406f06f191a120f7d283b69ff10e8'
          'SKIP'
          'ef64578c6cb3ce252dbdcb0f1c2f4a47'
-         '0bd7779fdbc4d7a9386df04dce2cb8d4')
+         '0bd7779fdbc4d7a9386df04dce2cb8d4'
+         'b3dd33a538ed8a3774f3c22f13e0a549')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
@@ -45,6 +47,9 @@ build() {
  
  # fix linking libnotify, FS#34283
  patch -Np0 -i ${srcdir}/hp-mkuri.patch
+
+ # fix typo preventing FW to load
+ patch -Np0 -i ${srcdir}/hplip_typo.patch
  
  export PYTHON=python2
  
diff --git a/libre/hplip-libre/hplip_typo.patch b/libre/hplip-libre/hplip_typo.patch
new file mode 100644
index 000000000..8d22f51ea
--- /dev/null
+++ b/libre/hplip-libre/hplip_typo.patch
@@ -0,0 +1,11 @@
+--- config_usb_printer.py	2013-05-19 02:23:17.506716304 +0300
++++ config_usb_printer.py.new	2013-05-19 02:23:30.140049848 +0300
+@@ -257,7 +257,7 @@
+        # ******************************* RUNNING FIRMWARE DOWNLOAD TO DEVICE FOR SUPPORTED PRINTER'S
+        fw_download_req = mq.get('fw-download', False)
+        if fw_download_req:
+-           fw_cmd = utlis.which('hp-firmware', True)
++           fw_cmd = utils.which('hp-firmware', True)
+            if fw_cmd:
+                 fw_cmd += " -y3 -s %s"%param
+                 log.debug(fw_cmd)
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index f3135dc8b..7d5c1e691 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=icedove-l10n
 _pkgver=17.0.5
-pkgver=17.0.5.1
+pkgver=17.0.5.2
 
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 237d617f9..d76893934 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -4,14 +4,14 @@
 # We're getting this from Debian Experimental
 _debname=icedove
 _debver=17.0.5
-_debrel=1
+_debrel=2
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=4
+pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -26,21 +26,21 @@ install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         mozconfig
+        replace-urls.txt
         vendor.js
         makefile.patch
         branding.patch
         ${_pkgname}.desktop
-        libre.patch
         Icedove-branding.patch)
 options=(!emptydirs)
 md5sums=('0c68298c17757257da79b6bb39e3fd10'
-         'eb2a5e1877d87a16e10388f533c081a6'
+         '2086f544ef90570d7629374aeac22aa6'
          '5cf95ea94f69cdd36604890cfbf7b954'
+         'a8fc4658d45b6bf9350023e5c3f34e56'
          '4eecc4fc5aafaf0da651a09eadc90bee'
          'c4ed43e85945e180a89cce03e45ec62c'
          '126b1446212396c33220936c01d9592d'
          'e785e0c267f4435ae1a9aa0b03bcacfb'
-         '2e36075067ddec9304b00ffe077705c2'
          'ea5f7a06967f561d47d7e5c35b23de6f')
 
 prepare() {
@@ -72,8 +72,16 @@ prepare() {
   patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
   patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
 
-  # Patch anything that's left
-  patch -Np1 -i "$srcdir/libre.patch"
+  # Replace common URLs
+  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
+    if [[ -n $moz_url ]]; then
+      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
+      grep -Erl "${moz_url}" \
+        --exclude='*.'{patch,orig,rej} \
+        --exclude-dir={.pc,test,tests,testing} \
+        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
+    fi
+  done
 
   cp "${srcdir}/mozconfig" .mozconfig
 
diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt
index 67ffcf119..fc13e32fb 100644
--- a/libre/icedove-libre/replace-urls.txt
+++ b/libre/icedove-libre/replace-urls.txt
@@ -2,29 +2,24 @@
 # These are whitespace-separated EREs, comments are lines starting with '#'
 
 https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://trisquel.info/browser-plain
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://trisquel.info/browser-plain
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
 
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
 
-https?://services.addons.mozilla.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://trisquel.info/browser-plain
-https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION% https://trisquel.info/browser-plain
-https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIR
-ST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED% https://trisquel.info/browser-plain
-https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox https://trisquel.info/browser-plain
-https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE% https://trisquel.info/browser-plain
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
 
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
 #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
 #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
 
-"https?://addons\.mozilla\.org/" "https://trisquel.info/browser-plain"
+"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
 
 # hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1trisquel.info/browser-plain
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 625995ecd..3eb6b36b4 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=20.0
+_debver=21.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
@@ -75,91 +75,101 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 done
 
 md5sums=('e88728730ecf9f0f145de5f70e362b15'
-         'd1651c29cc6f62fab7aa8d399018fdfd'
-         '326c4e887c068f9ecc9c52041a8de0f4'
-         'c34b9f5b54fe0ee01d4dec85e0be3582'
-         '2b47d281bbe9a46f7a5c1c7a916082a7'
-         '0c8060587becaf417c6184c6259f0269'
-         '9bbbff12bfd00c5b458f844f5e457e82'
-         'd52c93c34062735809dfcd0047092f54'
-         'f92175163b97d52c59f77613a1e7068a'
-         '6e4590b2f46ab6d673ea66f1ebe49d0e'
-         '57c52240c1097a4d4e8d688a243612da'
-         'd159050304d9eee50c90fb24a6767a81'
-         '10cc3fc8a12811eb6c250eacda07331d'
-         '8ee75c270325ac2aaefcf21f05cabee3'
-         'cf8a6e7c49642ce1e25a0b5f1148d7b0'
-         '8df2b6c9ff9fc809a6b760e7d1c547bd'
-         'a3bd9cf2ead7ea2fadc05de54f5471d9'
-         'b5deda5efa7bfee9d40ca24ad3b32fc5'
-         '07c17a2b2ee81e5e92fa40599a11c77c'
-         'e07a84d04a90835ca3ca382841e3d1ac'
-         '9e8c323c92a448e1e0fea0acf16b139c'
-         '7ca09907a2c13997ce81e0898525c0ab'
-         'ea968fd0b22338398433e155199a69cf'
-         '5907528876f8bf63caa9a1ba30618e27'
-         'df46e9156d67d63f8c461d85082c143d'
-         '354dea9cca6f0c52eeaf6fccb0a722a2'
-         '0f66a3864af8dd5416d604444a7caccd'
-         'a628720aad8c316a67e9dbc6925c0117'
-         '838d83ee766ccc23b413cc78feaaf66e'
-         '5338d8017e52d6a2c2bfa9f0456d06a5'
-         '35e1af40baf6be70d2ab1aee7e685d87'
-         'a59464ff5e836aeaed88c14868969ddf'
-         '87697f71946a0b1e60fe6364a03511d0'
-         '5f2831e8b4bc47c96a96b3d54e7567ea'
-         '32a9e0a3b117323d72fbcadb61fffc46'
-         '06b942c5ed0827353a66058e20aa1566'
-         '9077b7c5c7f00a9987c094beb18a8477'
-         'cb5e678ea288eb77cdc72cd775b139fc'
-         'd81b1b70ad5257c9db2c3bc600060564'
-         '70fe86d4dd3f18398f27a79914a5d5a7'
-         '9b4d5ba6ba647a7612fd2599c2123efa'
-         '405bc14439cd1cc6b2272179697870fa'
-         '4ec5178099d4d573b43379e751824b2a'
-         '8462e327c292c8777859dd9def1bf99a'
-         'a5310b15b7c4563d6d14a1d992a366e4'
-         '82dbf25ae893b17fd80f622334b40be9'
-         '639ebfb70a105e5ab8abc27cbc0fc6f4'
-         '931c9cec0b02245faf84178a0ee6bba6'
-         'abf3a17fe5a518a229d98b3165c7ea54'
-         'f7ce85e60cefbafb9d0a5509163ab2fa'
-         '7ce7984f91bde4a100d1cb235ff9d934'
-         'bf2a48221ae4bc2b8dce548801936ce6'
-         '403ce2a839e42fdb0d59c94d44d7d761'
-         'fc70c7291c83014f14a73c63f6c7a96f'
-         'a055ac9a1d9f4d6c851d5bfc469bcf69'
-         'ebcf54da830e668474212f18783eb917'
-         'bbceb1e048430dc4681db49ef3b9fed6'
-         '379590483064e6cea3af18025a418aa9'
-         'ed754da9e0fd5e8425121f48ae62d37c'
-         'd89ef20360750693b95678f301fb2664'
-         '5535b58bf3002c06c6b118d5eaed10fa'
-         '4aa12ddad5b1b998d2b4c5ae08fdcea6'
-         '8efc40ce477c9bd375e371e92571de8b'
-         '144cab65088ad01e5821b62c059deeb5'
-         '0aaf40e7427b958ac5808406cd7d2310'
-         '233e98ecfd0a0e73fd4ecdb2dc5eb434'
-         '68dc8ea77bfcf20aad06d63770a88108'
-         '10a92a0b94522f42aab595a2fa299df0'
-         '120c822b8e91bc77e66df5675f68b218'
-         '7eb3b611964f801695f55375c303bac2'
-         '200f29098852065284c153dc7f405016'
-         'f65badaccceee09063f83342b17b62c8'
-         'cde4af8ad6fe0368c972a7b4cbbcbf2b'
-         '6ab7c6e0ce48680fead7295604067ccd'
-         'b207abe2bc1fb8ccd0c55185b943e341'
-         '338860a47735330619099b35c0a6660b'
-         '5a4de6eb0bca5b337c62feb1fd9bb35e'
-         'a01d5c370b2263cc07e1706e423959c8'
-         'a1e0594303fb257f6cb94c20bf990fdd'
-         '934033c448d6f4b2b78503d2b7864c16'
-         '71ca1bca582ed7199d9e27022ce0b740'
-         '4c081b33ab71b2e8153628f0a0832ad7'
-         '713a2606488f49cf31dc1ea01a45ad00'
-         'b1a1f959f8c639c5435e2ed707f275c0'
-         'fc2f8e28db037c5b2ed0549233199751'
-         '30dee9ddc86d54cff05ab97771f3f2e9'
-         '57a1db9470741338eb452045e1b15221'
-         'd43034023b5289d5a1dcc4e6fe83c7cd'
-         'ea15b25281abc80308b4253253c30936')
+         '59b4b2a362eece9edabb2fdc0f548ea2'
+         '24df894af578b902d16d4bc91759e926'
+         '489f555d46d08e3cb37eb5cb16203a3b'
+         '3b71f901014bd3fdcfc53d19a13cff10'
+         'fc4a5af84dcf6b055b11b8d2ac9868ac'
+         '7d03e2d5c2660942d5fbb5078b71c8cc'
+         'd12132ce5c0a4a881363dfebbf23fbee'
+         '09a5cf2d291f052433bdf834fe1f5100'
+         'a8eb8983f0c63c1383f18f894f2292ee'
+         'ef6fbffbad81223386c30c06da584f65'
+         'f4b80fc31cea5e0aa3c03eab9f36765f'
+         'c7ba7f36e104046ab22f37202c5e291e'
+         'e884fe1127ef15376f4d72047e2ee924'
+         'b235bed0eb4f872d5478a58c00341458'
+         '577498e39c9dd00ea2fb72146b3b5eac'
+         'c611cfc16c7c7b5b6c877fd88b40c10e'
+         '5c6e2f317aba37bc701e4aab4720fcd7'
+         'f9f7db03d1fcf2337902eba79289934c'
+         'e601dc8a1bdd9204ca3a4db5e4fe0df1'
+         'c2075468a1fea47efb7c65000fe73652'
+         'fcf2f689a8d06c7c2c6bb49f57037d55'
+         'f0c8d22cc820bb7177326bb069a38f5e'
+         '9dd2dc6c155ec3a61e26fba4baa980bc'
+         '41eff39b7c819c78fcac10f8064a2627'
+         'c3f9a5f5305fece3f165d5d946805180'
+         'd424c55b8a0242e500916f5bfdc60319'
+         'f5d41bf99c08a27c4f4a2d370e6414f2'
+         '420a3b3194938ecc31e05899bd0c52e4'
+         '19e23ac8f3e187c1b7112e1a252adacb'
+         'f1c9f646c5b70f591497cc36b7312aae'
+         'b246026367f3c5416397566bd5980e5b'
+         '24e4bf6cc17e3fd724387e157e6a49b1'
+         '60af06bc25f259311284d83cb6b2ba02'
+         'c5d8d2fecb6b0d2172ea1b4a4bdb2d68'
+         '58c93fd5ad320935666f0e10a2111f0a'
+         '7777c5b6bfa40c3ece5b48ef18d12938'
+         '47725d7fa7594f5739725096ae999dd1'
+         'c2f34c4fbd2eaf0a9c7e8d97ac49ae43'
+         '7900a33d5694744af6c1b3a6b8a5f2df'
+         '97a95a5c30d8ba542a4c5457a831259d'
+         '02a3052bf3af409c56cdca72c23f2669'
+         'a617e607fe3f952b6a152707c5c895e4'
+         '8d93b0550a30af8377e6198d67fb740e'
+         '938c22bdb193a8be3cf317deded8a49e'
+         'f343106f50810e14ae1264933d5495fb'
+         'a58187d70e895b90ea7667b08e0df6e4'
+         'a014309f9621a15a7f86e759d5a42aa5'
+         '8a4c8bea9c508ad4ca395eb5d31e3105'
+         '6e728d930ca539a022d1d5cc5d8cc9c8'
+         '6c10afb3a86a1305ec4fdfde5702908e'
+         '3f749b1b19d5534442eb9daf5f9ddba1'
+         'd8876e6f3ee24768a602128963f80e1c'
+         '6b7213d8c4d625ff0293e7a7c8eb4254'
+         '3d2b5b760c369ce1ff764205b196f0e5'
+         'c09eec3566a2352f1dd2f2ad0e7cbf6c'
+         '5e560da497a4e448413bfd343d23493d'
+         'faf5235cb19f5d1ee1d8868eb9399d8a'
+         '1dc06a576d7c87059125fa51e8677500'
+         'ea7c6eb5df30fbf3b7b4737025492fd9'
+         'f50c41542503959ddcc0ce200c2f8ec4'
+         '1a633a935016e3570327b52b66bb0dca'
+         '59bcc03566d356ac027655453775efa4'
+         '2d8644f035fe7d4e77a0f5eb196ddb0b'
+         'a5cf6b19492d3e969187fe847d4ee990'
+         'e3167e646b7c556e0d43565a13b066f9'
+         'b1ce311e588dd120d04c2d94597ae100'
+         '129a07881b89c3f3ab14971dec88007f'
+         '37bc634c1f82bd9a01ea7e817e100d71'
+         'd9b39409aa83bcae7aa22c54ebcd48b0'
+         '582926879e8d10d52448f373cd3fbd33'
+         'cf6bafb6e3ee659c27579b43038f704c'
+         '083f69fd4f64fd436d7fdfe8a7747b41'
+         '6f65d6a154fa2c7d72045b4b34fc8890'
+         '1a060b1b08d6fa8413995003c62b220f'
+         '84194eba8c736cd8036975a8423758c0'
+         '30f15d767b3e867df514175680a78a8d'
+         '32946289930406ed3ccd1c174e464210'
+         '05547b17ebd589408a9633aeb4fede40'
+         'f53c078d1ed0e90f2d68f098b34279f2'
+         'a11cf418be9247856f3179f85fe57c9a'
+         '39d47c6e738749b1c01d06a1b112c368'
+         '63adbbe9ac9dde80d2c3ae0c861f1d33'
+         '82d6b78bf72083a5e01652c02e152680'
+         '725a322b12f522591a5fba5aa32031bb'
+         '98c7ed17e8fbe4478032a31ad2c2aa07'
+         'a7c33685d88af8a90a14c874538fa53a'
+         '9b43e2e557c82a20509f34a54cc42e0f'
+         '84e12ebfd749a04adc5b3ace348a06f1'
+         '7f11378288e629d63cb04649a234cf1c'
+         '1af944e12101d8a279bda6ebf665a767'
+         'd3a7e1dd8186bfcefe973d77214ec9c0'
+         '7a12ccf5eee1144bfb61984f811faf66'
+         '67407c724be7d200a06912c83a3404d8'
+         'f3c7e564aa585251d8c908e666ce9f64'
+         'ace03ba25a56488ddbf38a656daf6c93'
+         '4612b54bc7712d99823515799abf41d9'
+         '3eb4be0b553933b0babc582444ecaa6c'
+         'ad78e4e0757bc0d8d956b06b3bae8c17')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 97501a647..253572553 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
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -142,13 +142,12 @@ build() {
   if $_pgo; then
     export DISPLAY=:99
     Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
- 
-    if ! make -f client.mk build MOZ_PGO=1; then
-      kill $!
-      return 1
-    fi
+    _fail=0
+
+    make -f client.mk build MOZ_PGO=1 || _fail=1
 
     kill $! || true
+    return $_fail
   else
     make -f client.mk build
   fi
@@ -173,11 +172,13 @@ package() {
   install -d                                        "$pkgdir/usr/share/applications"
   install -m644  "$srcdir/iceweasel.desktop"        "$pkgdir/usr/share/applications"
 
-  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
+  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation}
   ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
   ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
-  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
+
+  rm -rf "$pkgdir/usr/lib/$_pkgname/browser/"{searchplugins,plugins}
+  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/browser/plugins"
+  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/browser/searchplugins"
 
   # We don't want the development stuff
   rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index b4e9fa35a..d23deae0a 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 165555 2012-08-23 18:27:20Z thomas $
+# $Id: PKGBUILD 185894 2013-05-19 17:17:51Z tpowa $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=syslinux
-pkgver=4.05
-pkgrel=7
+pkgver=5.01
+pkgrel=4
 arch=('i686' 'x86_64')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
-url="http://syslinux.zytor.com/"
+url="http://www.syslinux.org"
 license=('GPL2')
 depends=('perl' 'glibc')
 optdepends=('perl-passwd-md5:  For md5pass'
@@ -24,16 +24,12 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux-dont-build-dos-windows-targets.patch
         syslinux.cfg
         syslinux-install_update
-        avoid-using-ext2_fs.patch
-        handle-ctors-dtors-via-init_array-and-fini_array.patch
         splash.png)
-md5sums=('82299242418385da1274c9479a778cb2'
-         '1528c376e43f0eaccaa80d8ad1bc13b4'
-         '8dc2afca3739667e892faf04eb97e7b1'
-         '680750f73dc2e587ac567d057d485813'
-         '2e2c674a71c0c0bf265d96cfc19ce985'
-         'd016d03f15177b1bb534ce3753b2aa9b'
-         '0035b6cac6756a384b861eda8d33e4f7')
+md5sums=('6c21244277fa4e444967ba45469de863'
+         '25af85a05e7b212b7fb8b7587175e492'
+         'e5a69630e3f7083aad2d14362b6117b3'
+         '4450792e13a0270c1b89bb6a66ce2fbc'
+         'befd0e7c38a03442b791f2a530b4dd2d')
 
 build() {
   # Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -41,10 +37,6 @@ build() {
   cd "$srcdir"/$pkgname-${pkgver}
   # Do not try to build the Windows or DOS installers
   patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch
-  # fix #30084
-  patch -Np1 -i "$srcdir"/avoid-using-ext2_fs.patch
-  # fix #31065 (booting breaks with gcc 4.7)
-  patch -Np1 -i "$srcdir"/handle-ctors-dtors-via-init_array-and-fini_array.patch
   # Fix FHS manpage path
   sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
   make installer
@@ -56,14 +48,16 @@ package() {
   cd "$srcdir"/$pkgname-${pkgver}
   make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install
 
+  # install docs
+  cp -ar "$srcdir"/$pkgname-${pkgver}/doc "$pkgdir"/usr/share/
   # Install the default configuration
   install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
   # Install Parabola splash
   install -D -m644 "$srcdir"/splash.png "$pkgdir"/boot/syslinux/splash.png
   # Install the installation and update script
   # This script is maintained at git://gist.github.com/772138.git
-  install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update
-  # move extlinux binary to /usr/sbin
-  mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux
+  install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update
+  # move extlinux binary to /usr/bin
+  mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/bin/extlinux
   rmdir "$pkgdir"/sbin
 }
diff --git a/libre/syslinux/avoid-using-ext2_fs.patch b/libre/syslinux/avoid-using-ext2_fs.patch
deleted file mode 100644
index 9a166eefc..000000000
--- a/libre/syslinux/avoid-using-ext2_fs.patch
+++ /dev/null
@@ -1,965 +0,0 @@
-From a1006762fa6f98750bb77d76dd992cb8ea9f9c99 Mon Sep 17 00:00:00 2001
-From: "H. Peter Anvin" <hpa@zytor.com>
-Date: Mon, 26 Mar 2012 22:51:09 -0700
-Subject: [PATCH] libinstaller: Avoid using <linux/ext2_fs.h>
-
-Don't use <linux/ext2_fs.h> if we can avoid it.
-
-The ioctl constants have been globalized and moved to <linux/fs.h>.
-Use a private copy of ext2_fs.h from e2fsprogs with the ioctl
-constants removed for the data structures.
-
-Do at least attempt backward compatibility for old kernel headers, but
-no real hope of proper operation there...
-
-Signed-off-by: H. Peter Anvin <hpa@zytor.com>
----
- libinstaller/ext2fs/ext2_fs.h | 856 ++++++++++++++++++++++++++++++++++++++++++
- libinstaller/linuxioctl.h     |  29 +-
- libinstaller/syslxcom.c       |  12 +-
- 3 files changed, 886 insertions(+), 11 deletions(-)
- create mode 100644 libinstaller/ext2fs/ext2_fs.h
-
-diff -urpN syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 syslinux-4.05/libinstaller/ext2fs/ext2_fs.h
---- syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2	2012-08-06 09:48:43.797645032 -0400
-+++ syslinux-4.05/libinstaller/ext2fs/ext2_fs.h	2012-08-06 09:48:43.797645032 -0400
-@@ -0,0 +1,856 @@
-+/*
-+ *  linux/include/linux/ext2_fs.h
-+ *
-+ * Copyright (C) 1992, 1993, 1994, 1995
-+ * Remy Card (card@masi.ibp.fr)
-+ * Laboratoire MASI - Institut Blaise Pascal
-+ * Universite Pierre et Marie Curie (Paris VI)
-+ *
-+ *  from
-+ *
-+ *  linux/include/linux/minix_fs.h
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#ifndef _EXT2FS_EXT2_FS_H
-+#define _EXT2FS_EXT2_FS_H
-+
-+#include <linux/types.h>
-+
-+/*
-+ * The second extended filesystem constants/structures
-+ */
-+
-+/*
-+ * Define EXT2FS_DEBUG to produce debug messages
-+ */
-+#undef EXT2FS_DEBUG
-+
-+/*
-+ * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files
-+ */
-+#define EXT2_PREALLOCATE
-+#define EXT2_DEFAULT_PREALLOC_BLOCKS	8
-+
-+/*
-+ * The second extended file system version
-+ */
-+#define EXT2FS_DATE		"95/08/09"
-+#define EXT2FS_VERSION		"0.5b"
-+
-+/*
-+ * Special inode numbers
-+ */
-+#define EXT2_BAD_INO		 1	/* Bad blocks inode */
-+#define EXT2_ROOT_INO		 2	/* Root inode */
-+#define EXT4_USR_QUOTA_INO	 3	/* User quota inode */
-+#define EXT4_GRP_QUOTA_INO	 4	/* Group quota inode */
-+#define EXT2_BOOT_LOADER_INO	 5	/* Boot loader inode */
-+#define EXT2_UNDEL_DIR_INO	 6	/* Undelete directory inode */
-+#define EXT2_RESIZE_INO		 7	/* Reserved group descriptors inode */
-+#define EXT2_JOURNAL_INO	 8	/* Journal inode */
-+#define EXT2_EXCLUDE_INO	 9	/* The "exclude" inode, for snapshots */
-+#define EXT4_REPLICA_INO	10	/* Used by non-upstream feature */
-+
-+/* First non-reserved inode for old ext2 filesystems */
-+#define EXT2_GOOD_OLD_FIRST_INO	11
-+
-+/*
-+ * The second extended file system magic number
-+ */
-+#define EXT2_SUPER_MAGIC	0xEF53
-+
-+#ifdef __KERNEL__
-+#define EXT2_SB(sb)	(&((sb)->u.ext2_sb))
-+#else
-+/* Assume that user mode programs are passing in an ext2fs superblock, not
-+ * a kernel struct super_block.  This will allow us to call the feature-test
-+ * macros from user land. */
-+#define EXT2_SB(sb)	(sb)
-+#endif
-+
-+/*
-+ * Maximal count of links to a file
-+ */
-+#define EXT2_LINK_MAX		65000
-+
-+/*
-+ * Macro-instructions used to manage several block sizes
-+ */
-+#define EXT2_MIN_BLOCK_LOG_SIZE		10	/* 1024 */
-+#define EXT2_MAX_BLOCK_LOG_SIZE		16	/* 65536 */
-+#define EXT2_MIN_BLOCK_SIZE	(1 << EXT2_MIN_BLOCK_LOG_SIZE)
-+#define EXT2_MAX_BLOCK_SIZE	(1 << EXT2_MAX_BLOCK_LOG_SIZE)
-+#ifdef __KERNEL__
-+#define EXT2_BLOCK_SIZE(s)	((s)->s_blocksize)
-+#define EXT2_BLOCK_SIZE_BITS(s)	((s)->s_blocksize_bits)
-+#define EXT2_ADDR_PER_BLOCK_BITS(s)	(EXT2_SB(s)->addr_per_block_bits)
-+#define EXT2_INODE_SIZE(s)	(EXT2_SB(s)->s_inode_size)
-+#define EXT2_FIRST_INO(s)	(EXT2_SB(s)->s_first_ino)
-+#else
-+#define EXT2_BLOCK_SIZE(s)	(EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size)
-+#define EXT2_BLOCK_SIZE_BITS(s)	((s)->s_log_block_size + 10)
-+#define EXT2_INODE_SIZE(s)	(((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
-+				 EXT2_GOOD_OLD_INODE_SIZE : (s)->s_inode_size)
-+#define EXT2_FIRST_INO(s)	(((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
-+				 EXT2_GOOD_OLD_FIRST_INO : (s)->s_first_ino)
-+#endif
-+#define EXT2_ADDR_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s) / sizeof(__u32))
-+
-+/*
-+ * Macro-instructions used to manage allocation clusters
-+ */
-+#define EXT2_MIN_CLUSTER_LOG_SIZE	EXT2_MIN_BLOCK_LOG_SIZE
-+#define EXT2_MAX_CLUSTER_LOG_SIZE	29	/* 512MB  */
-+#define EXT2_MIN_CLUSTER_SIZE		EXT2_MIN_BLOCK_SIZE
-+#define EXT2_MAX_CLUSTER_SIZE		(1 << EXT2_MAX_CLUSTER_LOG_SIZE)
-+#define EXT2_CLUSTER_SIZE(s)		(EXT2_MIN_BLOCK_SIZE << \
-+						(s)->s_log_cluster_size)
-+#define EXT2_CLUSTER_SIZE_BITS(s)	((s)->s_log_cluster_size + 10)
-+
-+/*
-+ * Macro-instructions used to manage fragments
-+ *
-+ * Note: for backwards compatibility only, for the dump program.
-+ * Ext2/3/4 will never support fragments....
-+ */
-+#define EXT2_MIN_FRAG_SIZE              EXT2_MIN_BLOCK_SIZE
-+#define EXT2_MAX_FRAG_SIZE              EXT2_MAX_BLOCK_SIZE
-+#define EXT2_MIN_FRAG_LOG_SIZE          EXT2_MIN_BLOCK_LOG_SIZE
-+#define EXT2_FRAG_SIZE(s)		EXT2_BLOCK_SIZE(s)
-+#define EXT2_FRAGS_PER_BLOCK(s)		1
-+
-+/*
-+ * ACL structures
-+ */
-+struct ext2_acl_header	/* Header of Access Control Lists */
-+{
-+	__u32	aclh_size;
-+	__u32	aclh_file_count;
-+	__u32	aclh_acle_count;
-+	__u32	aclh_first_acle;
-+};
-+
-+struct ext2_acl_entry	/* Access Control List Entry */
-+{
-+	__u32	acle_size;
-+	__u16	acle_perms;	/* Access permissions */
-+	__u16	acle_type;	/* Type of entry */
-+	__u16	acle_tag;	/* User or group identity */
-+	__u16	acle_pad1;
-+	__u32	acle_next;	/* Pointer on next entry for the */
-+					/* same inode or on next free entry */
-+};
-+
-+/*
-+ * Structure of a blocks group descriptor
-+ */
-+struct ext2_group_desc
-+{
-+	__u32	bg_block_bitmap;	/* Blocks bitmap block */
-+	__u32	bg_inode_bitmap;	/* Inodes bitmap block */
-+	__u32	bg_inode_table;		/* Inodes table block */
-+	__u16	bg_free_blocks_count;	/* Free blocks count */
-+	__u16	bg_free_inodes_count;	/* Free inodes count */
-+	__u16	bg_used_dirs_count;	/* Directories count */
-+	__u16	bg_flags;
-+	__u32	bg_exclude_bitmap_lo;	/* Exclude bitmap for snapshots */
-+	__u16	bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
-+	__u16	bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
-+	__u16	bg_itable_unused;	/* Unused inodes count */
-+	__u16	bg_checksum;		/* crc16(s_uuid+grouo_num+group_desc)*/
-+};
-+
-+/*
-+ * Structure of a blocks group descriptor
-+ */
-+struct ext4_group_desc
-+{
-+	__u32	bg_block_bitmap;	/* Blocks bitmap block */
-+	__u32	bg_inode_bitmap;	/* Inodes bitmap block */
-+	__u32	bg_inode_table;		/* Inodes table block */
-+	__u16	bg_free_blocks_count;	/* Free blocks count */
-+	__u16	bg_free_inodes_count;	/* Free inodes count */
-+	__u16	bg_used_dirs_count;	/* Directories count */
-+	__u16	bg_flags;		/* EXT4_BG_flags (INODE_UNINIT, etc) */
-+	__u32	bg_exclude_bitmap_lo;	/* Exclude bitmap for snapshots */
-+	__u16	bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
-+	__u16	bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
-+	__u16	bg_itable_unused;	/* Unused inodes count */
-+	__u16	bg_checksum;		/* crc16(sb_uuid+group+desc) */
-+	__u32	bg_block_bitmap_hi;	/* Blocks bitmap block MSB */
-+	__u32	bg_inode_bitmap_hi;	/* Inodes bitmap block MSB */
-+	__u32	bg_inode_table_hi;	/* Inodes table block MSB */
-+	__u16	bg_free_blocks_count_hi;/* Free blocks count MSB */
-+	__u16	bg_free_inodes_count_hi;/* Free inodes count MSB */
-+	__u16	bg_used_dirs_count_hi;	/* Directories count MSB */
-+	__u16	bg_itable_unused_hi;	/* Unused inodes count MSB */
-+	__u32	bg_exclude_bitmap_hi;	/* Exclude bitmap block MSB */
-+	__u16	bg_block_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */
-+	__u16	bg_inode_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */
-+	__u32	bg_reserved;
-+};
-+
-+#define EXT2_BG_INODE_UNINIT	0x0001 /* Inode table/bitmap not initialized */
-+#define EXT2_BG_BLOCK_UNINIT	0x0002 /* Block bitmap not initialized */
-+#define EXT2_BG_INODE_ZEROED	0x0004 /* On-disk itable initialized to zero */
-+
-+/*
-+ * Data structures used by the directory indexing feature
-+ *
-+ * Note: all of the multibyte integer fields are little endian.
-+ */
-+
-+/*
-+ * Note: dx_root_info is laid out so that if it should somehow get
-+ * overlaid by a dirent the two low bits of the hash version will be
-+ * zero.  Therefore, the hash version mod 4 should never be 0.
-+ * Sincerely, the paranoia department.
-+ */
-+struct ext2_dx_root_info {
-+	__u32 reserved_zero;
-+	__u8 hash_version; /* 0 now, 1 at release */
-+	__u8 info_length; /* 8 */
-+	__u8 indirect_levels;
-+	__u8 unused_flags;
-+};
-+
-+#define EXT2_HASH_LEGACY		0
-+#define EXT2_HASH_HALF_MD4		1
-+#define EXT2_HASH_TEA			2
-+#define EXT2_HASH_LEGACY_UNSIGNED	3 /* reserved for userspace lib */
-+#define EXT2_HASH_HALF_MD4_UNSIGNED	4 /* reserved for userspace lib */
-+#define EXT2_HASH_TEA_UNSIGNED		5 /* reserved for userspace lib */
-+
-+#define EXT2_HASH_FLAG_INCOMPAT	0x1
-+
-+struct ext2_dx_entry {
-+	__u32 hash;
-+	__u32 block;
-+};
-+
-+struct ext2_dx_countlimit {
-+	__u16 limit;
-+	__u16 count;
-+};
-+
-+
-+/*
-+ * Macro-instructions used to manage group descriptors
-+ */
-+#define EXT2_MIN_DESC_SIZE             32
-+#define EXT2_MIN_DESC_SIZE_64BIT       64
-+#define EXT2_MAX_DESC_SIZE             EXT2_MIN_BLOCK_SIZE
-+#define EXT2_DESC_SIZE(s)                                                \
-+       ((EXT2_SB(s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) ? \
-+	(s)->s_desc_size : EXT2_MIN_DESC_SIZE)
-+
-+#define EXT2_BLOCKS_PER_GROUP(s)	(EXT2_SB(s)->s_blocks_per_group)
-+#define EXT2_INODES_PER_GROUP(s)	(EXT2_SB(s)->s_inodes_per_group)
-+#define EXT2_CLUSTERS_PER_GROUP(s)	(EXT2_SB(s)->s_clusters_per_group)
-+#define EXT2_INODES_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s))
-+/* limits imposed by 16-bit value gd_free_{blocks,inode}_count */
-+#define EXT2_MAX_BLOCKS_PER_GROUP(s)	((((unsigned) 1 << 16) - 8) *	\
-+					 (EXT2_CLUSTER_SIZE(s) / \
-+					  EXT2_BLOCK_SIZE(s)))
-+#define EXT2_MAX_CLUSTERS_PER_GROUP(s)	(((unsigned) 1 << 16) - 8)
-+#define EXT2_MAX_INODES_PER_GROUP(s)	(((unsigned) 1 << 16) - \
-+					 EXT2_INODES_PER_BLOCK(s))
-+#ifdef __KERNEL__
-+#define EXT2_DESC_PER_BLOCK(s)		(EXT2_SB(s)->s_desc_per_block)
-+#define EXT2_DESC_PER_BLOCK_BITS(s)	(EXT2_SB(s)->s_desc_per_block_bits)
-+#else
-+#define EXT2_DESC_PER_BLOCK(s)		(EXT2_BLOCK_SIZE(s) / EXT2_DESC_SIZE(s))
-+#endif
-+
-+/*
-+ * Constants relative to the data blocks
-+ */
-+#define EXT2_NDIR_BLOCKS		12
-+#define EXT2_IND_BLOCK			EXT2_NDIR_BLOCKS
-+#define EXT2_DIND_BLOCK			(EXT2_IND_BLOCK + 1)
-+#define EXT2_TIND_BLOCK			(EXT2_DIND_BLOCK + 1)
-+#define EXT2_N_BLOCKS			(EXT2_TIND_BLOCK + 1)
-+
-+/*
-+ * Inode flags
-+ */
-+#define EXT2_SECRM_FL			0x00000001 /* Secure deletion */
-+#define EXT2_UNRM_FL			0x00000002 /* Undelete */
-+#define EXT2_COMPR_FL			0x00000004 /* Compress file */
-+#define EXT2_SYNC_FL			0x00000008 /* Synchronous updates */
-+#define EXT2_IMMUTABLE_FL		0x00000010 /* Immutable file */
-+#define EXT2_APPEND_FL			0x00000020 /* writes to file may only append */
-+#define EXT2_NODUMP_FL			0x00000040 /* do not dump file */
-+#define EXT2_NOATIME_FL			0x00000080 /* do not update atime */
-+/* Reserved for compression usage... */
-+#define EXT2_DIRTY_FL			0x00000100
-+#define EXT2_COMPRBLK_FL		0x00000200 /* One or more compressed clusters */
-+#define EXT2_NOCOMPR_FL			0x00000400 /* Access raw compressed data */
-+#define EXT2_ECOMPR_FL			0x00000800 /* Compression error */
-+/* End compression flags --- maybe not all used */
-+#define EXT2_BTREE_FL			0x00001000 /* btree format dir */
-+#define EXT2_INDEX_FL			0x00001000 /* hash-indexed directory */
-+#define EXT2_IMAGIC_FL			0x00002000
-+#define EXT3_JOURNAL_DATA_FL		0x00004000 /* file data should be journaled */
-+#define EXT2_NOTAIL_FL			0x00008000 /* file tail should not be merged */
-+#define EXT2_DIRSYNC_FL 		0x00010000 /* Synchronous directory modifications */
-+#define EXT2_TOPDIR_FL			0x00020000 /* Top of directory hierarchies*/
-+#define EXT4_HUGE_FILE_FL               0x00040000 /* Set to each huge file */
-+#define EXT4_EXTENTS_FL 		0x00080000 /* Inode uses extents */
-+#define EXT4_EA_INODE_FL	        0x00200000 /* Inode used for large EA */
-+/* EXT4_EOFBLOCKS_FL 0x00400000 was here */
-+#define EXT4_SNAPFILE_FL		0x01000000  /* Inode is a snapshot */
-+#define EXT4_SNAPFILE_DELETED_FL	0x04000000  /* Snapshot is being deleted */
-+#define EXT4_SNAPFILE_SHRUNK_FL		0x08000000  /* Snapshot shrink has completed */
-+#define EXT2_RESERVED_FL		0x80000000 /* reserved for ext2 lib */
-+
-+#define EXT2_FL_USER_VISIBLE		0x004BDFFF /* User visible flags */
-+#define EXT2_FL_USER_MODIFIABLE		0x004B80FF /* User modifiable flags */
-+
-+/*
-+ * ioctl commands
-+ */
-+
-+/* Used for online resize */
-+struct ext2_new_group_input {
-+	__u32 group;		/* Group number for this data */
-+	__u32 block_bitmap;	/* Absolute block number of block bitmap */
-+	__u32 inode_bitmap;	/* Absolute block number of inode bitmap */
-+	__u32 inode_table;	/* Absolute block number of inode table start */
-+	__u32 blocks_count;	/* Total number of blocks in this group */
-+	__u16 reserved_blocks;	/* Number of reserved blocks in this group */
-+	__u16 unused;		/* Number of reserved GDT blocks in group */
-+};
-+
-+struct ext4_new_group_input {
-+	__u32 group;		/* Group number for this data */
-+	__u64 block_bitmap;	/* Absolute block number of block bitmap */
-+	__u64 inode_bitmap;	/* Absolute block number of inode bitmap */
-+	__u64 inode_table;	/* Absolute block number of inode table start */
-+	__u32 blocks_count;	/* Total number of blocks in this group */
-+	__u16 reserved_blocks;	/* Number of reserved blocks in this group */
-+	__u16 unused;
-+};
-+
-+#ifdef __GNU__			/* Needed for the Hurd */
-+#define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0)
-+#endif
-+
-+#define EXT2_IOC_GETFLAGS		_IOR('f', 1, long)
-+#define EXT2_IOC_SETFLAGS		_IOW('f', 2, long)
-+#define EXT2_IOC_GETVERSION		_IOR('v', 1, long)
-+#define EXT2_IOC_SETVERSION		_IOW('v', 2, long)
-+#define EXT2_IOC_GETVERSION_NEW		_IOR('f', 3, long)
-+#define EXT2_IOC_SETVERSION_NEW		_IOW('f', 4, long)
-+#define EXT2_IOC_GROUP_EXTEND		_IOW('f', 7, unsigned long)
-+#define EXT2_IOC_GROUP_ADD		_IOW('f', 8,struct ext2_new_group_input)
-+#define EXT4_IOC_GROUP_ADD		_IOW('f', 8,struct ext4_new_group_input)
-+#define EXT4_IOC_RESIZE_FS		_IOW('f', 16, __u64)
-+
-+/*
-+ * Structure of an inode on the disk
-+ */
-+struct ext2_inode {
-+	__u16	i_mode;		/* File mode */
-+	__u16	i_uid;		/* Low 16 bits of Owner Uid */
-+	__u32	i_size;		/* Size in bytes */
-+	__u32	i_atime;	/* Access time */
-+	__u32	i_ctime;	/* Inode change time */
-+	__u32	i_mtime;	/* Modification time */
-+	__u32	i_dtime;	/* Deletion Time */
-+	__u16	i_gid;		/* Low 16 bits of Group Id */
-+	__u16	i_links_count;	/* Links count */
-+	__u32	i_blocks;	/* Blocks count */
-+	__u32	i_flags;	/* File flags */
-+	union {
-+		struct {
-+			__u32	l_i_version; /* was l_i_reserved1 */
-+		} linux1;
-+		struct {
-+			__u32  h_i_translator;
-+		} hurd1;
-+	} osd1;				/* OS dependent 1 */
-+	__u32	i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
-+	__u32	i_generation;	/* File version (for NFS) */
-+	__u32	i_file_acl;	/* File ACL */
-+	__u32	i_size_high;	/* Formerly i_dir_acl, directory ACL */
-+	__u32	i_faddr;	/* Fragment address */
-+	union {
-+		struct {
-+			__u16	l_i_blocks_hi;
-+			__u16	l_i_file_acl_high;
-+			__u16	l_i_uid_high;	/* these 2 fields    */
-+			__u16	l_i_gid_high;	/* were reserved2[0] */
-+			__u16	l_i_checksum_lo; /* crc32c(uuid+inum+inode) */
-+			__u16	l_i_reserved;
-+		} linux2;
-+		struct {
-+			__u8	h_i_frag;	/* Fragment number */
-+			__u8	h_i_fsize;	/* Fragment size */
-+			__u16	h_i_mode_high;
-+			__u16	h_i_uid_high;
-+			__u16	h_i_gid_high;
-+			__u32	h_i_author;
-+		} hurd2;
-+	} osd2;				/* OS dependent 2 */
-+};
-+
-+/*
-+ * Permanent part of an large inode on the disk
-+ */
-+struct ext2_inode_large {
-+	__u16	i_mode;		/* File mode */
-+	__u16	i_uid;		/* Low 16 bits of Owner Uid */
-+	__u32	i_size;		/* Size in bytes */
-+	__u32	i_atime;	/* Access time */
-+	__u32	i_ctime;	/* Inode Change time */
-+	__u32	i_mtime;	/* Modification time */
-+	__u32	i_dtime;	/* Deletion Time */
-+	__u16	i_gid;		/* Low 16 bits of Group Id */
-+	__u16	i_links_count;	/* Links count */
-+	__u32	i_blocks;	/* Blocks count */
-+	__u32	i_flags;	/* File flags */
-+	union {
-+		struct {
-+			__u32	l_i_version; /* was l_i_reserved1 */
-+		} linux1;
-+		struct {
-+			__u32  h_i_translator;
-+		} hurd1;
-+	} osd1;				/* OS dependent 1 */
-+	__u32	i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
-+	__u32	i_generation;	/* File version (for NFS) */
-+	__u32	i_file_acl;	/* File ACL */
-+	__u32	i_size_high;	/* Formerly i_dir_acl, directory ACL */
-+	__u32	i_faddr;	/* Fragment address */
-+	union {
-+		struct {
-+			__u16	l_i_blocks_hi;
-+			__u16	l_i_file_acl_high;
-+			__u16	l_i_uid_high;	/* these 2 fields    */
-+			__u16	l_i_gid_high;	/* were reserved2[0] */
-+			__u16	l_i_checksum_lo; /* crc32c(uuid+inum+inode) */
-+			__u16	l_i_reserved;
-+		} linux2;
-+		struct {
-+			__u8	h_i_frag;	/* Fragment number */
-+			__u8	h_i_fsize;	/* Fragment size */
-+			__u16	h_i_mode_high;
-+			__u16	h_i_uid_high;
-+			__u16	h_i_gid_high;
-+			__u32	h_i_author;
-+		} hurd2;
-+	} osd2;				/* OS dependent 2 */
-+	__u16	i_extra_isize;
-+	__u16	i_checksum_hi;	/* crc32c(uuid+inum+inode) */
-+	__u32	i_ctime_extra;	/* extra Change time (nsec << 2 | epoch) */
-+	__u32	i_mtime_extra;	/* extra Modification time (nsec << 2 | epoch) */
-+	__u32	i_atime_extra;	/* extra Access time (nsec << 2 | epoch) */
-+	__u32	i_crtime;	/* File creation time */
-+	__u32	i_crtime_extra;	/* extra File creation time (nsec << 2 | epoch)*/
-+	__u32	i_version_hi;	/* high 32 bits for 64-bit version */
-+};
-+
-+#define i_dir_acl	i_size_high
-+
-+#if defined(__KERNEL__) || defined(__linux__)
-+#define i_reserved1	osd1.linux1.l_i_reserved1
-+#define i_frag		osd2.linux2.l_i_frag
-+#define i_fsize		osd2.linux2.l_i_fsize
-+#define i_uid_low	i_uid
-+#define i_gid_low	i_gid
-+#define i_uid_high	osd2.linux2.l_i_uid_high
-+#define i_gid_high	osd2.linux2.l_i_gid_high
-+#else
-+#if defined(__GNU__)
-+
-+#define i_translator	osd1.hurd1.h_i_translator
-+#define i_frag		osd2.hurd2.h_i_frag;
-+#define i_fsize		osd2.hurd2.h_i_fsize;
-+#define i_uid_high	osd2.hurd2.h_i_uid_high
-+#define i_gid_high	osd2.hurd2.h_i_gid_high
-+#define i_author	osd2.hurd2.h_i_author
-+
-+#endif  /* __GNU__ */
-+#endif	/* defined(__KERNEL__) || defined(__linux__) */
-+
-+#define inode_uid(inode)	((inode).i_uid | (inode).osd2.linux2.l_i_uid_high << 16)
-+#define inode_gid(inode)	((inode).i_gid | (inode).osd2.linux2.l_i_gid_high << 16)
-+#define ext2fs_set_i_uid_high(inode,x) ((inode).osd2.linux2.l_i_uid_high = (x))
-+#define ext2fs_set_i_gid_high(inode,x) ((inode).osd2.linux2.l_i_gid_high = (x))
-+
-+/*
-+ * File system states
-+ */
-+#define EXT2_VALID_FS			0x0001	/* Unmounted cleanly */
-+#define EXT2_ERROR_FS			0x0002	/* Errors detected */
-+#define EXT3_ORPHAN_FS			0x0004	/* Orphans being recovered */
-+
-+/*
-+ * Misc. filesystem flags
-+ */
-+#define EXT2_FLAGS_SIGNED_HASH		0x0001  /* Signed dirhash in use */
-+#define EXT2_FLAGS_UNSIGNED_HASH	0x0002  /* Unsigned dirhash in use */
-+#define EXT2_FLAGS_TEST_FILESYS		0x0004	/* OK for use on development code */
-+#define EXT2_FLAGS_IS_SNAPSHOT		0x0010	/* This is a snapshot image */
-+#define EXT2_FLAGS_FIX_SNAPSHOT		0x0020	/* Snapshot inodes corrupted */
-+#define EXT2_FLAGS_FIX_EXCLUDE		0x0040	/* Exclude bitmaps corrupted */
-+
-+/*
-+ * Mount flags
-+ */
-+#define EXT2_MOUNT_CHECK		0x0001	/* Do mount-time checks */
-+#define EXT2_MOUNT_GRPID		0x0004	/* Create files with directory's group */
-+#define EXT2_MOUNT_DEBUG		0x0008	/* Some debugging messages */
-+#define EXT2_MOUNT_ERRORS_CONT		0x0010	/* Continue on errors */
-+#define EXT2_MOUNT_ERRORS_RO		0x0020	/* Remount fs ro on errors */
-+#define EXT2_MOUNT_ERRORS_PANIC		0x0040	/* Panic on errors */
-+#define EXT2_MOUNT_MINIX_DF		0x0080	/* Mimics the Minix statfs */
-+#define EXT2_MOUNT_NO_UID32		0x0200  /* Disable 32-bit UIDs */
-+
-+#define clear_opt(o, opt)		o &= ~EXT2_MOUNT_##opt
-+#define set_opt(o, opt)			o |= EXT2_MOUNT_##opt
-+#define test_opt(sb, opt)		(EXT2_SB(sb)->s_mount_opt & \
-+					 EXT2_MOUNT_##opt)
-+/*
-+ * Maximal mount counts between two filesystem checks
-+ */
-+#define EXT2_DFL_MAX_MNT_COUNT		20	/* Allow 20 mounts */
-+#define EXT2_DFL_CHECKINTERVAL		0	/* Don't use interval check */
-+
-+/*
-+ * Behaviour when detecting errors
-+ */
-+#define EXT2_ERRORS_CONTINUE		1	/* Continue execution */
-+#define EXT2_ERRORS_RO			2	/* Remount fs read-only */
-+#define EXT2_ERRORS_PANIC		3	/* Panic */
-+#define EXT2_ERRORS_DEFAULT		EXT2_ERRORS_CONTINUE
-+
-+#if (__GNUC__ >= 4)
-+#define ext4_offsetof(TYPE,MEMBER) __builtin_offsetof(TYPE,MEMBER)
-+#else
-+#define ext4_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#endif
-+
-+/*
-+ * Structure of the super block
-+ */
-+struct ext2_super_block {
-+	__u32	s_inodes_count;		/* Inodes count */
-+	__u32	s_blocks_count;		/* Blocks count */
-+	__u32	s_r_blocks_count;	/* Reserved blocks count */
-+	__u32	s_free_blocks_count;	/* Free blocks count */
-+	__u32	s_free_inodes_count;	/* Free inodes count */
-+	__u32	s_first_data_block;	/* First Data Block */
-+	__u32	s_log_block_size;	/* Block size */
-+	__u32	s_log_cluster_size;	/* Allocation cluster size */
-+	__u32	s_blocks_per_group;	/* # Blocks per group */
-+	__u32	s_clusters_per_group;	/* # Fragments per group */
-+	__u32	s_inodes_per_group;	/* # Inodes per group */
-+	__u32	s_mtime;		/* Mount time */
-+	__u32	s_wtime;		/* Write time */
-+	__u16	s_mnt_count;		/* Mount count */
-+	__s16	s_max_mnt_count;	/* Maximal mount count */
-+	__u16	s_magic;		/* Magic signature */
-+	__u16	s_state;		/* File system state */
-+	__u16	s_errors;		/* Behaviour when detecting errors */
-+	__u16	s_minor_rev_level;	/* minor revision level */
-+	__u32	s_lastcheck;		/* time of last check */
-+	__u32	s_checkinterval;	/* max. time between checks */
-+	__u32	s_creator_os;		/* OS */
-+	__u32	s_rev_level;		/* Revision level */
-+	__u16	s_def_resuid;		/* Default uid for reserved blocks */
-+	__u16	s_def_resgid;		/* Default gid for reserved blocks */
-+	/*
-+	 * These fields are for EXT2_DYNAMIC_REV superblocks only.
-+	 *
-+	 * Note: the difference between the compatible feature set and
-+	 * the incompatible feature set is that if there is a bit set
-+	 * in the incompatible feature set that the kernel doesn't
-+	 * know about, it should refuse to mount the filesystem.
-+	 *
-+	 * e2fsck's requirements are more strict; if it doesn't know
-+	 * about a feature in either the compatible or incompatible
-+	 * feature set, it must abort and not try to meddle with
-+	 * things it doesn't understand...
-+	 */
-+	__u32	s_first_ino;		/* First non-reserved inode */
-+	__u16   s_inode_size;		/* size of inode structure */
-+	__u16	s_block_group_nr;	/* block group # of this superblock */
-+	__u32	s_feature_compat;	/* compatible feature set */
-+	__u32	s_feature_incompat;	/* incompatible feature set */
-+	__u32	s_feature_ro_compat;	/* readonly-compatible feature set */
-+	__u8	s_uuid[16];		/* 128-bit uuid for volume */
-+	char	s_volume_name[16];	/* volume name */
-+	char	s_last_mounted[64];	/* directory where last mounted */
-+	__u32	s_algorithm_usage_bitmap; /* For compression */
-+	/*
-+	 * Performance hints.  Directory preallocation should only
-+	 * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
-+	 */
-+	__u8	s_prealloc_blocks;	/* Nr of blocks to try to preallocate*/
-+	__u8	s_prealloc_dir_blocks;	/* Nr to preallocate for dirs */
-+	__u16	s_reserved_gdt_blocks;	/* Per group table for online growth */
-+	/*
-+	 * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
-+	 */
-+	__u8	s_journal_uuid[16];	/* uuid of journal superblock */
-+	__u32	s_journal_inum;		/* inode number of journal file */
-+	__u32	s_journal_dev;		/* device number of journal file */
-+	__u32	s_last_orphan;		/* start of list of inodes to delete */
-+	__u32	s_hash_seed[4];		/* HTREE hash seed */
-+	__u8	s_def_hash_version;	/* Default hash version to use */
-+	__u8	s_jnl_backup_type; 	/* Default type of journal backup */
-+	__u16	s_desc_size;		/* Group desc. size: INCOMPAT_64BIT */
-+	__u32	s_default_mount_opts;
-+	__u32	s_first_meta_bg;	/* First metablock group */
-+	__u32	s_mkfs_time;		/* When the filesystem was created */
-+	__u32	s_jnl_blocks[17]; 	/* Backup of the journal inode */
-+	__u32	s_blocks_count_hi;	/* Blocks count high 32bits */
-+	__u32	s_r_blocks_count_hi;	/* Reserved blocks count high 32 bits*/
-+	__u32	s_free_blocks_hi; 	/* Free blocks count */
-+	__u16	s_min_extra_isize;	/* All inodes have at least # bytes */
-+	__u16	s_want_extra_isize; 	/* New inodes should reserve # bytes */
-+	__u32	s_flags;		/* Miscellaneous flags */
-+	__u16   s_raid_stride;		/* RAID stride */
-+	__u16   s_mmp_update_interval;  /* # seconds to wait in MMP checking */
-+	__u64   s_mmp_block;            /* Block for multi-mount protection */
-+	__u32   s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
-+	__u8	s_log_groups_per_flex;	/* FLEX_BG group size */
-+	__u8    s_reserved_char_pad;
-+	__u16	s_reserved_pad;		/* Padding to next 32bits */
-+	__u64	s_kbytes_written;	/* nr of lifetime kilobytes written */
-+	__u32	s_snapshot_inum;	/* Inode number of active snapshot */
-+	__u32	s_snapshot_id;		/* sequential ID of active snapshot */
-+	__u64	s_snapshot_r_blocks_count; /* reserved blocks for active
-+					      snapshot's future use */
-+	__u32	s_snapshot_list;	/* inode number of the head of the on-disk snapshot list */
-+#define EXT4_S_ERR_START ext4_offsetof(struct ext2_super_block, s_error_count)
-+	__u32	s_error_count;		/* number of fs errors */
-+	__u32	s_first_error_time;	/* first time an error happened */
-+	__u32	s_first_error_ino;	/* inode involved in first error */
-+	__u64	s_first_error_block;	/* block involved of first error */
-+	__u8	s_first_error_func[32];	/* function where the error happened */
-+	__u32	s_first_error_line;	/* line number where error happened */
-+	__u32	s_last_error_time;	/* most recent time of an error */
-+	__u32	s_last_error_ino;	/* inode involved in last error */
-+	__u32	s_last_error_line;	/* line number where error happened */
-+	__u64	s_last_error_block;	/* block involved of last error */
-+	__u8	s_last_error_func[32];	/* function where the error happened */
-+#define EXT4_S_ERR_END ext4_offsetof(struct ext2_super_block, s_mount_opts)
-+	__u8	s_mount_opts[64];
-+	__u32	s_usr_quota_inum;	/* inode number of user quota file */
-+	__u32	s_grp_quota_inum;	/* inode number of group quota file */
-+	__u32	s_overhead_blocks;	/* overhead blocks/clusters in fs */
-+	__u32   s_reserved[108];        /* Padding to the end of the block */
-+	__u32	s_checksum;		/* crc32c(superblock) */
-+};
-+
-+#define EXT4_S_ERR_LEN (EXT4_S_ERR_END - EXT4_S_ERR_START)
-+
-+/*
-+ * Codes for operating systems
-+ */
-+#define EXT2_OS_LINUX		0
-+#define EXT2_OS_HURD		1
-+#define EXT2_OBSO_OS_MASIX	2
-+#define EXT2_OS_FREEBSD		3
-+#define EXT2_OS_LITES		4
-+
-+/*
-+ * Revision levels
-+ */
-+#define EXT2_GOOD_OLD_REV	0	/* The good old (original) format */
-+#define EXT2_DYNAMIC_REV	1	/* V2 format w/ dynamic inode sizes */
-+
-+#define EXT2_CURRENT_REV	EXT2_GOOD_OLD_REV
-+#define EXT2_MAX_SUPP_REV	EXT2_DYNAMIC_REV
-+
-+#define EXT2_GOOD_OLD_INODE_SIZE 128
-+
-+/*
-+ * Journal inode backup types
-+ */
-+#define EXT3_JNL_BACKUP_BLOCKS	1
-+
-+/*
-+ * Feature set definitions
-+ */
-+
-+#define EXT2_HAS_COMPAT_FEATURE(sb,mask)			\
-+	( EXT2_SB(sb)->s_feature_compat & (mask) )
-+#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask)			\
-+	( EXT2_SB(sb)->s_feature_ro_compat & (mask) )
-+#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask)			\
-+	( EXT2_SB(sb)->s_feature_incompat & (mask) )
-+
-+#define EXT2_FEATURE_COMPAT_DIR_PREALLOC	0x0001
-+#define EXT2_FEATURE_COMPAT_IMAGIC_INODES	0x0002
-+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x0004
-+#define EXT2_FEATURE_COMPAT_EXT_ATTR		0x0008
-+#define EXT2_FEATURE_COMPAT_RESIZE_INODE	0x0010
-+#define EXT2_FEATURE_COMPAT_DIR_INDEX		0x0020
-+#define EXT2_FEATURE_COMPAT_LAZY_BG		0x0040
-+/* #define EXT2_FEATURE_COMPAT_EXCLUDE_INODE	0x0080 not used, legacy */
-+#define EXT2_FEATURE_COMPAT_EXCLUDE_BITMAP	0x0100
-+
-+
-+#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER	0x0001
-+#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
-+/* #define EXT2_FEATURE_RO_COMPAT_BTREE_DIR	0x0004 not used */
-+#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE	0x0008
-+#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM		0x0010
-+#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK	0x0020
-+#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE	0x0040
-+#define EXT4_FEATURE_RO_COMPAT_HAS_SNAPSHOT	0x0080
-+#define EXT4_FEATURE_RO_COMPAT_QUOTA		0x0100
-+#define EXT4_FEATURE_RO_COMPAT_BIGALLOC		0x0200
-+#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM	0x0400
-+#define EXT4_FEATURE_RO_COMPAT_REPLICA		0x0800
-+
-+#define EXT2_FEATURE_INCOMPAT_COMPRESSION	0x0001
-+#define EXT2_FEATURE_INCOMPAT_FILETYPE		0x0002
-+#define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004 /* Needs recovery */
-+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008 /* Journal device */
-+#define EXT2_FEATURE_INCOMPAT_META_BG		0x0010
-+#define EXT3_FEATURE_INCOMPAT_EXTENTS		0x0040
-+#define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
-+#define EXT4_FEATURE_INCOMPAT_MMP		0x0100
-+#define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
-+#define EXT4_FEATURE_INCOMPAT_EA_INODE		0x0400
-+#define EXT4_FEATURE_INCOMPAT_DIRDATA		0x1000
-+
-+#define EXT2_FEATURE_COMPAT_SUPP	0
-+#define EXT2_FEATURE_INCOMPAT_SUPP    (EXT2_FEATURE_INCOMPAT_FILETYPE| \
-+				       EXT4_FEATURE_INCOMPAT_MMP)
-+#define EXT2_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
-+					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
-+					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
-+					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
-+
-+/*
-+ * Default values for user and/or group using reserved blocks
-+ */
-+#define EXT2_DEF_RESUID		0
-+#define EXT2_DEF_RESGID		0
-+
-+/*
-+ * Default mount options
-+ */
-+#define EXT2_DEFM_DEBUG		0x0001
-+#define EXT2_DEFM_BSDGROUPS	0x0002
-+#define EXT2_DEFM_XATTR_USER	0x0004
-+#define EXT2_DEFM_ACL		0x0008
-+#define EXT2_DEFM_UID16		0x0010
-+#define EXT3_DEFM_JMODE		0x0060
-+#define EXT3_DEFM_JMODE_DATA	0x0020
-+#define EXT3_DEFM_JMODE_ORDERED	0x0040
-+#define EXT3_DEFM_JMODE_WBACK	0x0060
-+#define EXT4_DEFM_NOBARRIER	0x0100
-+#define EXT4_DEFM_BLOCK_VALIDITY 0x0200
-+#define EXT4_DEFM_DISCARD	0x0400
-+#define EXT4_DEFM_NODELALLOC	0x0800
-+
-+/*
-+ * Structure of a directory entry
-+ */
-+#define EXT2_NAME_LEN 255
-+
-+struct ext2_dir_entry {
-+	__u32	inode;			/* Inode number */
-+	__u16	rec_len;		/* Directory entry length */
-+	__u16	name_len;		/* Name length */
-+	char	name[EXT2_NAME_LEN];	/* File name */
-+};
-+
-+/*
-+ * The new version of the directory entry.  Since EXT2 structures are
-+ * stored in intel byte order, and the name_len field could never be
-+ * bigger than 255 chars, it's safe to reclaim the extra byte for the
-+ * file_type field.
-+ */
-+struct ext2_dir_entry_2 {
-+	__u32	inode;			/* Inode number */
-+	__u16	rec_len;		/* Directory entry length */
-+	__u8	name_len;		/* Name length */
-+	__u8	file_type;
-+	char	name[EXT2_NAME_LEN];	/* File name */
-+};
-+
-+/*
-+ * Ext2 directory file types.  Only the low 3 bits are used.  The
-+ * other bits are reserved for now.
-+ */
-+#define EXT2_FT_UNKNOWN		0
-+#define EXT2_FT_REG_FILE	1
-+#define EXT2_FT_DIR		2
-+#define EXT2_FT_CHRDEV		3
-+#define EXT2_FT_BLKDEV		4
-+#define EXT2_FT_FIFO		5
-+#define EXT2_FT_SOCK		6
-+#define EXT2_FT_SYMLINK		7
-+
-+#define EXT2_FT_MAX		8
-+
-+/*
-+ * EXT2_DIR_PAD defines the directory entries boundaries
-+ *
-+ * NOTE: It must be a multiple of 4
-+ */
-+#define EXT2_DIR_PAD			4
-+#define EXT2_DIR_ROUND			(EXT2_DIR_PAD - 1)
-+#define EXT2_DIR_REC_LEN(name_len)	(((name_len) + 8 + EXT2_DIR_ROUND) & \
-+					 ~EXT2_DIR_ROUND)
-+
-+/*
-+ * This structure is used for multiple mount protection. It is written
-+ * into the block number saved in the s_mmp_block field in the superblock.
-+ * Programs that check MMP should assume that if SEQ_FSCK (or any unknown
-+ * code above SEQ_MAX) is present then it is NOT safe to use the filesystem,
-+ * regardless of how old the timestamp is.
-+ *
-+ * The timestamp in the MMP structure will be updated by e2fsck at some
-+ * arbitary intervals (start of passes, after every few groups of inodes
-+ * in pass1 and pass1b).  There is no guarantee that e2fsck is updating
-+ * the MMP block in a timely manner, and the updates it does are purely
-+ * for the convenience of the sysadmin and not for automatic validation.
-+ *
-+ * Note: Only the mmp_seq value is used to determine whether the MMP block
-+ *	is being updated.  The mmp_time, mmp_nodename, and mmp_bdevname
-+ *	fields are only for informational purposes for the administrator,
-+ *	due to clock skew between nodes and hostname HA service takeover.
-+ */
-+#define EXT4_MMP_MAGIC     0x004D4D50U /* ASCII for MMP */
-+#define EXT4_MMP_SEQ_CLEAN 0xFF4D4D50U /* mmp_seq value for clean unmount */
-+#define EXT4_MMP_SEQ_FSCK  0xE24D4D50U /* mmp_seq value when being fscked */
-+#define EXT4_MMP_SEQ_MAX   0xE24D4D4FU /* maximum valid mmp_seq value */
-+
-+struct mmp_struct {
-+	__u32	mmp_magic;		/* Magic number for MMP */
-+	__u32	mmp_seq;		/* Sequence no. updated periodically */
-+	__u64	mmp_time;		/* Time last updated */
-+	char	mmp_nodename[64];	/* Node which last updated MMP block */
-+	char	mmp_bdevname[32];	/* Bdev which last updated MMP block */
-+	__u16	mmp_check_interval;	/* Changed mmp_check_interval */
-+	__u16	mmp_pad1;
-+	__u32	mmp_pad2[227];
-+};
-+
-+/*
-+ * Default interval for MMP update in seconds.
-+ */
-+#define EXT4_MMP_UPDATE_INTERVAL	5
-+
-+/*
-+ * Maximum interval for MMP update in seconds.
-+ */
-+#define EXT4_MMP_MAX_UPDATE_INTERVAL	300
-+
-+/*
-+ * Minimum interval for MMP checking in seconds.
-+ */
-+#define EXT4_MMP_MIN_CHECK_INTERVAL     5
-+
-+#endif	/* _EXT2FS_EXT2_FS_H */
-diff -urpN syslinux-4.05/libinstaller/linuxioctl.h.ext2 syslinux-4.05/libinstaller/linuxioctl.h
---- syslinux-4.05/libinstaller/linuxioctl.h.ext2	2011-12-09 13:28:17.000000000 -0500
-+++ syslinux-4.05/libinstaller/linuxioctl.h	2012-08-06 09:52:42.653335110 -0400
-@@ -9,17 +9,33 @@
- 
- #include <sys/ioctl.h>
- 
-+#ifdef __linux__
-+
- #define statfs _kernel_statfs	/* HACK to deal with broken 2.4 distros */
- 
- #include <linux/fd.h>		/* Floppy geometry */
- #include <linux/hdreg.h>	/* Hard disk geometry */
- 
--#include <linux/fs.h>		/* FIGETBSZ, FIBMAP, FS_IOC_FIEMAP */
-+#include <linux/fs.h>		/* FIGETBSZ, FIBMAP, FS_IOC_* */
- #include <linux/msdos_fs.h>	/* FAT_IOCTL_SET_ATTRIBUTES */
- 
- #undef SECTOR_SIZE		/* Defined in msdos_fs.h for no good reason */
- #undef SECTOR_BITS
--#include <linux/ext2_fs.h>	/* EXT2_IOC_* */
-+
-+#ifndef FS_IOC_GETFLAGS
-+/* Old kernel headers, these were once ext2-specific... */
-+# include <linux/ext2_fs.h>	/* EXT2_IOC_* */
-+
-+# define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS
-+# define FS_IOC_SETFLAGS EXT2_IOC_SETFLAGS
-+
-+# define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
-+
-+#else
-+
-+# include <ext2fs/ext2_fs.h>
-+
-+#endif
- 
- #ifndef FAT_IOCTL_GET_ATTRIBUTES
- # define FAT_IOCTL_GET_ATTRIBUTES	_IOR('r', 0x10, __u32)
-@@ -37,11 +53,13 @@
- 
- #undef statfs
- 
--#if defined(__linux__) && !defined(BLKGETSIZE64)
-+#ifndef  BLKGETSIZE64
- /* This takes a u64, but the size field says size_t.  Someone screwed big. */
- # define BLKGETSIZE64 _IOR(0x12,114,size_t)
- #endif
- 
- #include <linux/loop.h>
- 
-+#endif /* __linux__ */
-+
- #endif /* LIBINSTALLER_LINUXIOCTL_H */
-diff -urpN syslinux-4.05/libinstaller/syslxcom.c.ext2 syslinux-4.05/libinstaller/syslxcom.c
---- syslinux-4.05/libinstaller/syslxcom.c.ext2	2011-12-09 13:28:17.000000000 -0500
-+++ syslinux-4.05/libinstaller/syslxcom.c	2012-08-06 09:48:43.797645032 -0400
-@@ -121,9 +121,9 @@ void clear_attributes(int fd)
- 	{
- 	    int flags;
- 
--	    if (!ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) {
--		flags &= ~EXT2_IMMUTABLE_FL;
--		ioctl(fd, EXT2_IOC_SETFLAGS, &flags);
-+	    if (!ioctl(fd, FS_IOC_GETFLAGS, &flags)) {
-+		flags &= ~FS_IMMUTABLE_FL;
-+		ioctl(fd, FS_IOC_SETFLAGS, &flags);
- 	    }
- 	    break;
- 	}
-@@ -151,9 +151,9 @@ void set_attributes(int fd)
- 	{
- 	    int flags;
- 
--	    if (st.st_uid == 0 && !ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) {
--		flags |= EXT2_IMMUTABLE_FL;
--		ioctl(fd, EXT2_IOC_SETFLAGS, &flags);
-+	    if (st.st_uid == 0 && !ioctl(fd, FS_IOC_GETFLAGS, &flags)) {
-+		flags |= FS_IMMUTABLE_FL;
-+		ioctl(fd, FS_IOC_SETFLAGS, &flags);
- 	    }
- 	    break;
- 	}
diff --git a/libre/syslinux/fix-undefined-type-umode_t.patch b/libre/syslinux/fix-undefined-type-umode_t.patch
deleted file mode 100644
index 33ac6d323..000000000
--- a/libre/syslinux/fix-undefined-type-umode_t.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- syslinux-4.05.orig/libinstaller/linuxioctl.h	2011-12-09 16:28:17.000000000 -0200
-+++ syslinux-4.05/libinstaller/linuxioctl.h	2012-05-18 20:30:23.000000000 -0300
-@@ -9,22 +9,36 @@
- 
- #include <sys/ioctl.h>
- 
-+#ifdef __linux__
-+
- #define statfs _kernel_statfs	/* HACK to deal with broken 2.4 distros */
- 
- #include <linux/fd.h>		/* Floppy geometry */
- #include <linux/hdreg.h>	/* Hard disk geometry */
- 
--#include <linux/fs.h>		/* FIGETBSZ, FIBMAP, FS_IOC_FIEMAP */
--#include <linux/msdos_fs.h>	/* FAT_IOCTL_SET_ATTRIBUTES */
-+#include <linux/fs.h>		/* FIGETBSZ, FIBMAP, FS_IOC_* */
- 
- #undef SECTOR_SIZE		/* Defined in msdos_fs.h for no good reason */
- #undef SECTOR_BITS
--#include <linux/ext2_fs.h>	/* EXT2_IOC_* */
-+
-+#ifndef FS_IOC_GETFLAGS
-+/* Old kernel headers, these were once ext2-specific... */
-+# include <linux/ext2_fs.h>	/* EXT2_IOC_* */
-+
-+# define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS
-+# define FS_IOC_SETFLAGS EXT2_IOC_SETFLAGS
-+
-+# define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
-+
-+#else
-+
-+# include <ext2fs/ext2_fs.h>
-+
-+#endif
- 
- #ifndef FAT_IOCTL_GET_ATTRIBUTES
- # define FAT_IOCTL_GET_ATTRIBUTES	_IOR('r', 0x10, __u32)
- #endif
--
- #ifndef FAT_IOCTL_SET_ATTRIBUTES
- # define FAT_IOCTL_SET_ATTRIBUTES	_IOW('r', 0x11, __u32)
- #endif
-@@ -37,11 +51,13 @@
- 
- #undef statfs
- 
--#if defined(__linux__) && !defined(BLKGETSIZE64)
-+#ifndef  BLKGETSIZE64
- /* This takes a u64, but the size field says size_t.  Someone screwed big. */
- # define BLKGETSIZE64 _IOR(0x12,114,size_t)
- #endif
- 
- #include <linux/loop.h>
- 
-+#endif /* __linux__ */
-+
- #endif /* LIBINSTALLER_LINUXIOCTL_H */
diff --git a/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch b/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch
deleted file mode 100644
index aa513312b..000000000
--- a/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b6be466444740a34bacd140dccbe57f6629b15bc Mon Sep 17 00:00:00 2001
-From: "H. Peter Anvin" <hpa@zytor.com>
-Date: Mon, 28 May 2012 21:28:52 -0700
-Subject: [PATCH 1/1] com32.ld: handle .init_array and .fini_array
-
-Handle constructors/destructors via .init_array and .fini_array, as
-generated by newer gccs.
-
-Signed-off-by: H. Peter Anvin <hpa@zytor.com>
----
- com32/lib/com32.ld |   33 ++++++++++-----------------------
- 1 files changed, 10 insertions(+), 23 deletions(-)
-
-diff --git a/com32/lib/com32.ld b/com32/lib/com32.ld
-index 37ee46c..008e4ce 100644
---- a/com32/lib/com32.ld
-+++ b/com32/lib/com32.ld
-@@ -36,36 +36,23 @@ SECTIONS
-   .rodata1        : { *(.rodata1) }
-   __rodata_end = .;
- 
--  /* Ensure the __preinit_array_start label is properly aligned.  We
--     could instead move the label definition inside the section, but
--     the linker would then create the section even if it turns out to
--     be empty, which isn't pretty.  */
-+  /*
-+   * The difference betwee .ctors/.dtors and .init_array/.fini_array
-+   * is the ordering, but we don't use prioritization for libcom32, so
-+   * just lump them all together and hope that's okay.
-+   */
-   . = ALIGN(4);
--  .preinit_array     : {
--    PROVIDE (__preinit_array_start = .);
--    *(.preinit_array)
--    PROVIDE (__preinit_array_end = .);
--  }
--  .init_array     : {
--    PROVIDE (__init_array_start = .);
--    *(.init_array)
--    PROVIDE (__init_array_end = .);
--  }
--  .fini_array     : {
--    PROVIDE (__fini_array_start = .);
--    *(.fini_array)
--    PROVIDE (__fini_array_end = .);
--  }
-   .ctors          : {
-     PROVIDE (__ctors_start = .);
--    KEEP (*(SORT(.ctors.*)))
--    KEEP (*(.ctors))
-+    KEEP (*(SORT(.preinit_array*)))
-+    KEEP (*(SORT(.init_array*)))
-+    KEEP (*(SORT(.ctors*)))
-     PROVIDE (__ctors_end = .);
-   }
-   .dtors          : {
-     PROVIDE (__dtors_start = .);
--    KEEP (*(SORT(.dtors.*)))
--    KEEP (*(.dtors))
-+    KEEP (*(SORT(.fini_array*)))
-+    KEEP (*(SORT(.dtors*)))
-     PROVIDE (__dtors_end = .);
-   }
- 
--- 
-1.7.6.5
-
diff --git a/libre/syslinux/rePKGBUILD b/libre/syslinux/rePKGBUILD
deleted file mode 100644
index 33a96d1a1..000000000
--- a/libre/syslinux/rePKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# This is an example rePKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-source PKGBUILD
-unset build package md5sums source check
-_repo=core
-pkgname='syslinux'
-options=(!strip)
-source=(PKGBUILD
-	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-#        http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-4-${CARCH}${PKGEXT}
-	# files for pkg modifications
-        syslinux.cfg
-        splash.png)
-
-build() {
-  cd "${srcdir}/"
-  rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-$pkgrel-$CARCH$PKGEXT || true
-#  rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-4-$CARCH$PKGEXT || true
-  # put actions for package modifications below this line
-
-  rm -v boot/syslinux/syslinux.cfg
-}
-
-package_syslinux() {
-    pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
-    backup=('boot/syslinux/syslinux.cfg'
-            'boot/syslinux/splash.png')
-  # Install the default configuration
-  install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
-  # Install Parabola splash
-  install -D -m644 "$srcdir"/splash.png "$pkgdir"/boot/syslinux/splash.png
-
-
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png
index 43d4692ab..f94067681 100644
--- a/libre/syslinux/splash.png
+++ b/libre/syslinux/splash.png
diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
index 2b86ab828..54151ab87 100644
--- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
+++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
@@ -4,9 +4,9 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
 @@ -54,7 +54,7 @@
  # files that depend only on the B phase, but may have to be regenerated
  # for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
--	   diag libinstaller dos win32 win64 dosutil
-+	   libinstaller
+ BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
+-	   diag libinstaller dos win32 win64 dosutil txt
++	   libinstaller txt
  ITARGET  =
  IOBJECTS = $(ITARGET) \
  	utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index cd1baa572..6d52f7703 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -28,10 +28,10 @@ shopt -s nullglob
 
 libpath="/usr/lib/syslinux"
 bootpath="/boot/syslinux"
-extlinux="/usr/sbin/extlinux"
+extlinux="/usr/bin/extlinux"
 
+core_modules=(ldlinux.c32)
 autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
-com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
 pciids_file=/usr/share/hwdata/pci.ids
 
 ## Helper functions ##
@@ -294,9 +294,10 @@ install_mbr() {
 }
 
 _install() {
-    # Copy files to /boot
-    for file in "${com32_files[@]}"; do
-        # Symlink files even if links exist
+    # Copy all com32 files to /boot
+    for file in "${libpath}"/*.c32; do
+        file=${file##*/}
+        # Symlink files if /boot resides on the same partition as root
         if [[ "$boot" = root ]]; then
             ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
         elif [[ "$boot" = boot ]]; then
@@ -304,8 +305,8 @@ _install() {
         fi
     done
 
-    # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS
-    if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then 
+    # Copy / Symlink pci.ids if pci.ids exists on the FS
+    if [[ -f $pciids_file ]]; then
         if [[ "$boot" = root ]]; then
             ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null
         elif [[ "$boot" = boot ]]; then
@@ -331,10 +332,10 @@ _install() {
 }
 
 update() {
-    # Update any com and c32 files in /boot
+    # Update c32 files in /boot, if /boot is not on same fs
     if [[ "$boot" = boot ]]; then
-        for file in "$bootpath"/*.{c32,com}; do
-            file=$(basename "$file")
+        for file in "$bootpath"/*.{c32}; do
+            file=${file##*/}
             cp "$libpath/$file" "$bootpath/$file" &> /dev/null
         done
         if [[ -f "$bootpath/pci.ids" ]]; then
@@ -342,6 +343,17 @@ update() {
         fi
     fi
 
+    # Ensure core modules exist and if not install them
+    for file in "${core_modules[@]}"; do
+        if [[ ! -f $bootpath/$file ]]; then
+            if [[  "$boot" = root ]]; then
+                ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
+            elif [[ "$boot" = boot ]]; then
+                cp "$libpath/$file" "$bootpath/$file"
+            fi
+        fi
+    done
+
     if device_is_raid $bootpart; then
         echo "Detected RAID on /boot - installing Syslinux with --raid"
         "$extlinux" --update "$bootpath" -r &> /dev/null
diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg
index 5debfef9c..e4f8d8e28 100644
--- a/libre/syslinux/syslinux.cfg
+++ b/libre/syslinux/syslinux.cfg
@@ -7,7 +7,6 @@
 #   * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
 #   * hdt.c32 - hardware detection tool
 #   * reboot.c32 - reboots the system
-#   * poweroff.com - shutdown the system
 #
 # To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
 # If /usr and /boot are on the same file system, symlink the files instead
@@ -50,30 +49,26 @@ MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
 #-*
 
 LABEL parabola
-	MENU LABEL Parabola GNU/Linux-libre
-	LINUX ../vmlinuz-linux-libre
-	APPEND root=/dev/sda3 ro
-	INITRD ../initramfs-linux-libre.img
+    MENU LABEL Parabola GNU/Linux-libre
+    LINUX ../vmlinuz-linux-libre
+    APPEND root=/dev/sda3 ro
+    INITRD ../initramfs-linux-libre.img
 
 LABEL parabolafallback
-	MENU LABEL Parabola GNU/Linux-libre Fallback
-	LINUX ../vmlinuz-linux-libre
-	APPEND root=/dev/sda3 ro
-	INITRD ../initramfs-linux-libre-fallback.img
+    MENU LABEL Parabola GNU/Linux-libre Fallback
+    LINUX ../vmlinuz-linux-libre
+    APPEND root=/dev/sda3 ro
+    INITRD ../initramfs-linux-libre-fallback.img
 
 # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package)
-#LABEL memtest
-#	MENU LABEL Memtest86+
-#	LINUX ../memtest86+/memtest.bin
+#    LABEL memtest
+#    MENU LABEL Memtest86+
+#    LINUX ../memtest86+/memtest.bin
 
 LABEL hdt
         MENU LABEL HDT (Hardware Detection Tool)
         COM32 hdt.c32
- 
+
 LABEL reboot
         MENU LABEL Reboot
         COM32 reboot.c32
- 
-LABEL off
-        MENU LABEL Power Off
-        COMBOOT poweroff.com
diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install
index 0dc0ece36..19caa1026 100644
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux/syslinux.install
@@ -1,13 +1,26 @@
 post_install() {
   echo "==> If you want to use syslinux as your bootloader"
   echo "==> edit /boot/syslinux/syslinux.cfg and run"
-  echo "==>   # /usr/sbin/syslinux-install_update -i -a -m"
+  echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
   echo "==> to install it."
 }
 
 post_upgrade() {
   # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
-  /usr/sbin/syslinux-install_update -s
+  /usr/bin/syslinux-install_update -s
+  # update to 5.01 message
+  if [ "$(vercmp $2 5.01)" -lt 0 ]; then
+      echo "If you used syslinux-install_update to install syslinux:"
+      echo "==> If you want to use syslinux with menu and all modules please rerun" 
+      echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
+      echo ""
+      echo "If you manually installed syslinux:"
+      echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
+      echo "==> If (/ and /boot on seperate fs):"
+      echo "==>   # cp /usr/lib/syslinux/*.c32 /boot/syslinux"
+      echo "==> If (/ and /boot on same fs):"
+      echo "==>   # ln -s /usr/lib/syslinux/*.c32 /boot/syslinux"
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/send-to-torrent/PKGBUILD b/pcr/send-to-torrent/PKGBUILD
new file mode 100644
index 000000000..110ba0b1a
--- /dev/null
+++ b/pcr/send-to-torrent/PKGBUILD
@@ -0,0 +1,19 @@
+pkgname=send-to-torrent
+pkgver=0.0.3
+pkgrel=1
+pkgdesc="Share files from the file browser"
+arch=('any')
+url="http://repo.hackcoop.com.ar/send-to-torrent.git/"
+license=("AGPL3")
+source=("http://repo.hackcoop.com.ar/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.xz")
+md5sums=('e9d465ebec3abd1e142731f53adf8cf2')
+depends=("bash" "mktorrent" "xdg-utils")
+optdepends=("libnotify: desktop notifications"
+            "transmission-cli: transmission support"
+            "opentracker: local sharing support")
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/"
+
+  make TARGET="${pkgdir}" PREFIX="/usr" install
+}
diff --git a/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD
new file mode 100644
index 000000000..ff02793aa
--- /dev/null
+++ b/pcr/triceratops-lv2/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=triceratops-lv2
+pkgver=0.1.6c
+pkgrel=1
+pkgdesc="Polyphonic synthesizer LV2 plugin"
+arch=('i686')
+url="http://sourceforge.net/projects/triceratops/"
+license=('GPL')
+depends=('gtkmm' 'lv2')
+makedepends=('python2')
+source=("http://downloads.sourceforge.net/project/${pkgname/-lv2}/$pkgname-v$pkgver.tar.gz")
+md5sums=('7a0755876c4d3af6f1b4cac899679472')
+
+build() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  python2 waf configure --prefix=/usr
+  python2 waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  DESTDIR="$pkgdir/" python2 waf install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/whysynth/PKGBUILD b/pcr/whysynth/PKGBUILD
new file mode 100644
index 000000000..8d2895984
--- /dev/null
+++ b/pcr/whysynth/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+pkgname=whysynth
+pkgver=20120903
+pkgrel=1
+pkgdesc="A versatile softsynth plugin for the DSSI Soft Synth Interface"
+arch=('i686')
+url="http://www.smbolton.com/whysynth.html"
+depends=('alsa-lib' 'liblo' 'gtk2' 'fftw')
+makedepends=('dssi' 'ladspa')
+license=('GPL')
+source=(http://www.smbolton.com/whysynth/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('b521b63ade13b09062a64c46d2eabee2')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr || return 1
+  make || return 1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install || return 1
+  find ${pkgdir}/usr/lib -name '*.la' -exec rm {} \; || return 1
+}
author	root <root@rshg054.dnsready.net>	2013-05-20 00:57:43 -0700
committer	root <root@rshg054.dnsready.net>	2013-05-20 00:57:43 -0700
commit	383955a81810f344e11b1472bd4c5069fa77020c (patch)
tree	6017ed943ee9ae2ca0da830ede5f00f6d7817cf7
parent	9a30c3d0083b8330b1aa6c0f89245e68ae762ee5 (diff)