Thu Jan 30 03:47:11 UTC 2014

24 files changed, 696 insertions, 174 deletions

diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 81cae3171..a378864ec 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 200685 2013-12-02 11:59:05Z svenstaro $
+# $Id: PKGBUILD 204853 2014-01-29 13:51:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.12.1
-pkgrel=3
+pkgver=2.8.12.2
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -15,7 +15,7 @@ optdepends=('qt4: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
         "findfreetype.patch")
-md5sums=('9d38cd4e2c94c3cea97d0e2924814acc'
+md5sums=('17c6513483d23590cbce6957ec6d1e66'
          '90321de1d9d46cd8d6609d0509dbd7b0')
 
 build() {
diff --git a/extra/cppunit/PKGBUILD b/extra/cppunit/PKGBUILD
index 4ff85ba24..e1d317dac 100644
--- a/extra/cppunit/PKGBUILD
+++ b/extra/cppunit/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 197901 2013-10-30 11:34:14Z allan $
+# $Id: PKGBUILD 204848 2014-01-29 10:11:42Z andyrtr $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 
 pkgname=cppunit
-pkgver=1.13.1
+pkgver=1.13.2
 pkgrel=1
-_hash=fa9aa839145cdf860bf596532bb8af97
 pkgdesc="A C++ unit testing framework"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/cppunit"
 license=('LGPL')
 depends=('sh' 'gcc-libs')
 options=('!emptydirs')
-source=(http://dev-www.libreoffice.org/src/${_hash}-${pkgname}-${pkgver}.tar.gz)
-md5sums=(${_hash})
+source=(http://dev-www.libreoffice.org/src/${pkgname}-${pkgver}.tar.gz)
+md5sums=('d1c6bdd5a76c66d2c38331e2d287bc01')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd ${pkgname}-${pkgver}
    ./configure --prefix=/usr --disable-static
    make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
+  cd ${pkgname}-${pkgver}
+  make check
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd ${pkgname}-${pkgver}
    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD
index 4d2b02e42..54d7e808e 100644
--- a/extra/gstreamer-vaapi/PKGBUILD
+++ b/extra/gstreamer-vaapi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200351 2013-11-26 23:08:09Z heftig $
+# $Id: PKGBUILD 204869 2014-01-29 19:22:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gstreamer-vaapi
 pkgname=(gst-vaapi gstreamer0.10-vaapi)
-pkgver=0.5.7
+pkgver=0.5.8
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework VA Plugins"
 arch=(i686 x86_64)
@@ -14,13 +14,18 @@ makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstream
 options=(!emptydirs)
 
 #source=(git://gitorious.org/vaapi/${pkgbase}.git#tag=$pkgver)
-source=($url/$pkgbase-${pkgver}.tar.bz2)
-sha1sums=('6baa794e5f95a22fbb5e0788ec29c8a78f40b5b3')
+source=($url/$pkgbase-${pkgver}.tar.bz2
+        https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.c
+        https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.h)
+sha1sums=('b0756a5941e3ad2d33a94a550eb9fe3ade0c07e6'
+          'd1edee8caacd6d0868b95fd80c8aab8018105178'
+          'd3f198da32cfe5c305818ca93a941ac5198efa1c')
 
 prepare() {
   mkdir build build-0.10
-  #cd $pkgbase
-  #NO_CONFIGURE=1 ./autogen.sh
+
+  # Fix files not in tarball
+  cp gstvideoencoder.{c,h} $pkgbase-$pkgver/ext/videoutils/gst-libs/gst/video
 }
 
 _build() (
diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD
index 4d4eb94e2..3ef74f71e 100644
--- a/extra/hdf5/PKGBUILD
+++ b/extra/hdf5/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198099 2013-10-30 12:47:33Z allan $
+# $Id: PKGBUILD 204867 2014-01-29 19:00:16Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=hdf5
-pkgver=1.8.11
+pkgver=1.8.12
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -14,10 +14,10 @@ license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e')
+sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f')
 
 build() {
-  cd $srcdir/${pkgname}-${pkgver/_/-}
+  cd "$srcdir/${pkgname}-${pkgver/_/-}"
 
   export CFLAGS="${CFLAGS/O2/O0}"
   export CXXFLAGS="${CFLAGS}"
@@ -34,12 +34,12 @@ build() {
 }
 
 package() {
-  cd $srcdir/${pkgname}-${pkgver/_/-}
+  cd "$srcdir/${pkgname}-${pkgver/_/-}"
 
-  make -j1 DESTDIR=${pkgdir} install
+  make -j1 DESTDIR="${pkgdir}" install
 
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
-  install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
-          $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
+  install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
+  install -m644 "$srcdir/${pkgname}-${pkgver/_/-}/COPYING" \
+          "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" 
 }
 
diff --git a/extra/id3lib/00-add-libz-to-compilation.patch b/extra/id3lib/00-add-libz-to-compilation.patch
new file mode 100644
index 000000000..e93787736
--- /dev/null
+++ b/extra/id3lib/00-add-libz-to-compilation.patch
@@ -0,0 +1,14 @@
+This patch was first introduced in version 3.8.3-3
+
+It fixes http://bugs.debian.org/208672
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,6 +74,8 @@
+ 
+ if ID3_NEEDZLIB
+ LDADD        = $(top_builddir)/zlib/src/libz.la
++else
++libid3_la_LIBADD  = -lz
+ endif
+ 
+ libid3_la_LDFLAGS = \
diff --git a/extra/id3lib/05-create-m4-directory.patch b/extra/id3lib/05-create-m4-directory.patch
new file mode 100644
index 000000000..d8111205e
--- /dev/null
+++ b/extra/id3lib/05-create-m4-directory.patch
@@ -0,0 +1,12 @@
+Create a local m4 subdirectory
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,6 +12,8 @@
+ # require automake 1.5
+ AUTOMAKE_OPTIONS = 1.5
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ EXTRA_DIST =                    \
+         HISTORY                 \
+         config.h.win32          \
diff --git a/extra/id3lib/10-fix-compilation-with-cpp-headers.patch b/extra/id3lib/10-fix-compilation-with-cpp-headers.patch
new file mode 100644
index 000000000..a9b45ab02
--- /dev/null
+++ b/extra/id3lib/10-fix-compilation-with-cpp-headers.patch
@@ -0,0 +1,22 @@
+This patch imports the proper C++ headers
+--- a/include/id3/id3lib_strings.h
++++ b/include/id3/id3lib_strings.h
+@@ -30,6 +30,7 @@
+ #define _ID3LIB_STRINGS_H_
+ 
+ #include <string>
++#include <cstring>
+ 
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
+ namespace std
+--- a/include/id3/writers.h
++++ b/include/id3/writers.h
+@@ -30,7 +30,7 @@
+ 
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
++#include <cstring>
+ 
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ {
diff --git a/extra/id3lib/15-fix-headers-of-main-functions.patch b/extra/id3lib/15-fix-headers-of-main-functions.patch
new file mode 100644
index 000000000..48e01d145
--- /dev/null
+++ b/extra/id3lib/15-fix-headers-of-main-functions.patch
@@ -0,0 +1,45 @@
+This patch fixes some function headers in demo code used during 'make check'
+--- a/examples/demo_info.cpp
++++ b/examples/demo_info.cpp
+@@ -309,7 +309,7 @@
+ 
+ #define DEBUG
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   ID3D_INIT_DOUT();
+ 
+--- a/examples/demo_convert.cpp
++++ b/examples/demo_convert.cpp
+@@ -84,7 +84,7 @@
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   flags_t ulFlag = ID3TT_ALL;
+   gengetopt_args_info args;
+--- a/examples/demo_copy.cpp
++++ b/examples/demo_copy.cpp
+@@ -81,7 +81,7 @@
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
+--- a/examples/demo_tag.cpp
++++ b/examples/demo_tag.cpp
+@@ -46,7 +46,7 @@
+     os << "v2";
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
diff --git a/extra/id3lib/20-create-manpages.patch b/extra/id3lib/20-create-manpages.patch
new file mode 100644
index 000000000..b2ef4ef57
--- /dev/null
+++ b/extra/id3lib/20-create-manpages.patch
@@ -0,0 +1,198 @@
+This patch adds debian-made man pages
+--- /dev/null
++++ b/doc/man/id3info.1
+@@ -0,0 +1,31 @@
++.TH ID3INFO 1 "May 2000" local "User Command"
++.SH NAME
++id3info \- Display id3 tag information.
++.SH SYNOPSIS
++.B id3info
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3info
++displays both the id3v1 and id3v2 tag information for a file.
++Id3info will not differentiate between the two types of tags.
++.SH OPTIONS
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3tag(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3tag.1
+@@ -0,0 +1,69 @@
++.TH ID3TAG 1 "May 2000" local "User Command"
++.SH NAME
++id3tag \- Tags an mp3 file with id3v1 and/or id3v2 tags.
++.SH SYNOPSIS
++.B id3tag
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I FILE
++.RB ] ...
++.br
++.SH DESCRIPTION
++.B Id3tag
++will render both types of tag by default.  Only the last
++tag type indicated in the option list will be used.  Non-
++rendered will remain unchanged in the original file.  Will
++also parse and convert Lyrics3 v2.0 frames, but will not
++render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.TP
++.B \-a, \-\-artist ARTIST
++Set the artist information
++.TP
++.B \-s, \-\-song SONG
++Set the song title information
++.TP
++.B \-A, \-\-album ALBUM
++Set the album title information
++.TP
++.B \-c, \-\-comment COMMENT
++Set the comment information
++.TP
++.B \-C, \-\-desc DESCRIPTION
++Set the comment description
++.TP
++.B \-g, \-\-genre num
++Set the genre number
++.TP
++.B \-y, \-\-year num
++Set the year
++.TP
++.B \-t, \-\-track num
++Set the track number
++.TP
++.B \-T, \-\-total num
++Set the total number of tracks on the album
++
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3convert.1
+@@ -0,0 +1,47 @@
++.TH ID3CONVERT 1 "May 2000" local "User Command"
++.SH NAME
++id3convert \- Converts between id3v1 and id3v2 tags of an mp3 file.
++.SH SYNOPSIS
++.B id3convert
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3convert
++converts between id3v1 and id3v2 tags of an mp3 file. Id3convert will render
++both types of tag by default. Only the last tag type indicated in the option
++list will be used. Non-rendered tags will remain unchanged in the original
++file. Id3convert will also parse and convert Lyrics3 v2.0 frames, but will
++not render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-1, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-s, \-\-strip
++Strip, rather than render, the tags
++.TP
++.B \-p, \-\-padding
++Use padding in the tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++
++.SH SEE ALSO
++id3tag(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
+--- /dev/null
++++ b/doc/man/id3cp.1
+@@ -0,0 +1,38 @@
++.TH ID3CP 1 "July 2001" local "User Command"
++.SH NAME
++id3cp \- Copies tags from one file to another.
++.SH SYNOPSIS
++.B id3cp
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I SOURCE
++.RB ]
++.RB [
++.I DEST
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3cp
++copies tags from SOURCE to DEST.
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-1, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
diff --git a/extra/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/extra/id3lib/30-fix-utf16.patch
index b05d2cf29..3d3f50fed 100644
--- a/extra/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
+++ b/extra/id3lib/30-fix-utf16.patch
@@ -1,6 +1,6 @@
-diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
---- id3lib-3.8.3.orig/ChangeLog	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/ChangeLog	2006-02-22 00:33:59.946214472 +0100
+Patch from 'Spoon' to fix issues with writing certain unicode characters
+--- a/ChangeLog
++++ b/ChangeLog
 @@ -1,3 +1,8 @@
 +2006-02-17  Jerome Couderc
 +
@@ -10,9 +10,8 @@ diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
  2003-03-02 Sunday 17:38   Thijmen Klok <thijmen@id3lib.org>
  
  	* THANKS (1.20): added more people 
-diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
---- id3lib-3.8.3.orig/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
+--- a/src/io_helpers.cpp
++++ b/src/io_helpers.cpp
 @@ -363,11 +363,22 @@
      // Write the BOM: 0xFEFF
      unicode_t BOM = 0xFEFF;
diff --git a/extra/id3lib/id3lib-3.8.3-CVE-2007-4460.patch b/extra/id3lib/40-deal-with-mkstemp.patch
index daa08667b..36c84179f 100644
--- a/extra/id3lib/id3lib-3.8.3-CVE-2007-4460.patch
+++ b/extra/id3lib/40-deal-with-mkstemp.patch
@@ -1,5 +1,10 @@
---- src/tag_file.cpp
-+++ src/tag_file.cpp
+This patch fixes an issues where temporary files were created in an insecure
+way.
+
+It was first intruduced in version 3.8.3-7 and fixes
+http://bugs.debian.org/438540
+--- a/src/tag_file.cpp
++++ b/src/tag_file.cpp
 @@ -242,8 +242,8 @@
      strcpy(sTempFile, filename.c_str());
      strcat(sTempFile, sTmpSuffix.c_str());
diff --git a/extra/id3lib/50-remove-outdated-check.patch b/extra/id3lib/50-remove-outdated-check.patch
new file mode 100644
index 000000000..386da2771
--- /dev/null
+++ b/extra/id3lib/50-remove-outdated-check.patch
@@ -0,0 +1,11 @@
+We don't actually need iomanip.h
+--- a/configure.in
++++ b/configure.in
+@@ -227,7 +227,6 @@
+ )
+ AC_CHECK_HEADERS(               \
+   string                        \
+-  iomanip.h                     \
+   ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
+ )
+ 
diff --git a/extra/id3lib/60-add-c-wrapper-functions.patch b/extra/id3lib/60-add-c-wrapper-functions.patch
new file mode 100644
index 000000000..d72e81c0e
--- /dev/null
+++ b/extra/id3lib/60-add-c-wrapper-functions.patch
@@ -0,0 +1,58 @@
+This patch adds C wrapper functions for field encoding.
+
+It was first introduced in version 3.8.3-8 and fixes
+http://bugs.debian.org/281292
+--- a/include/id3.h
++++ b/include/id3.h
+@@ -104,6 +104,9 @@
+   ID3_C_EXPORT void                 CCONV ID3Field_GetBINARY          (const ID3Field *field, uchar *buffer, size_t buffLength);
+   ID3_C_EXPORT void                 CCONV ID3Field_FromFile           (ID3Field *field, const char *fileName);
+   ID3_C_EXPORT void                 CCONV ID3Field_ToFile             (const ID3Field *field, const char *fileName);
++  ID3_C_EXPORT bool                 CCONV ID3Field_SetEncoding        (ID3Field *field, ID3_TextEnc enc);
++  ID3_C_EXPORT ID3_TextEnc          CCONV ID3Field_GetEncoding        (const ID3Field *field);
++  ID3_C_EXPORT bool                 CCONV ID3Field_IsEncodable        (const ID3Field *field);
+ 
+   /* field-info wrappers */
+   ID3_C_EXPORT char*                CCONV ID3FrameInfo_ShortName     (ID3_FrameID frameid);
+--- a/src/c_wrapper.cpp
++++ b/src/c_wrapper.cpp
+@@ -681,6 +681,39 @@
+     }
+   }
+ 
++  ID3_C_EXPORT bool CCONV
++  ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc)
++  {
++    bool changed = false;
++    if (field)
++    {
++      ID3_CATCH(changed = reinterpret_cast<ID3_Field *>(field)->SetEncoding(enc));
++    }
++    return changed;
++  }
++
++  ID3_C_EXPORT ID3_TextEnc CCONV
++  ID3Field_GetEncoding(const ID3Field *field)
++  {
++    ID3_TextEnc enc = ID3TE_NONE;
++    if (field)
++    {
++      ID3_CATCH(enc = reinterpret_cast<const ID3_Field *>(field)->GetEncoding());
++    }
++    return enc;
++  }
++
++  ID3_C_EXPORT bool CCONV
++  ID3Field_IsEncodable(const ID3Field *field)
++  {
++    bool isEncodable = false;
++    if (field)
++    {
++      ID3_CATCH(isEncodable = reinterpret_cast<const ID3_Field *>(field)->IsEncodable());
++    }
++    return isEncodable;
++  }
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
diff --git a/extra/id3lib/60-fix_make_check.patch b/extra/id3lib/60-fix_make_check.patch
new file mode 100644
index 000000000..e2bb1b051
--- /dev/null
+++ b/extra/id3lib/60-fix_make_check.patch
@@ -0,0 +1,50 @@
+This patch fixes some function headers and imports in order for 'make check'
+to work.
+
+It was first introduced in version 3.8.3-9
+diff -Naur id3lib-3.8.3.orig/examples/findeng.cpp id3lib-3.8.3/examples/findeng.cpp
+--- id3lib-3.8.3.orig/examples/findeng.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/examples/findeng.cpp	2009-12-10 00:58:12.173795997 +0100
+@@ -9,7 +9,7 @@
+ using std::cout;
+ using std::endl;
+ 
+-int main(unsigned argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+   ID3D_INIT_DOUT();
+   ID3D_INIT_WARNING();
+diff -Naur id3lib-3.8.3.orig/examples/findstr.cpp id3lib-3.8.3/examples/findstr.cpp
+--- id3lib-3.8.3.orig/examples/findstr.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/examples/findstr.cpp	2009-12-10 00:57:48.036819825 +0100
+@@ -9,7 +9,7 @@
+ using std::cout;
+ using std::endl;
+ 
+-int main(unsigned argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+   ID3D_INIT_DOUT();
+   ID3D_INIT_WARNING();
+diff -Naur id3lib-3.8.3.orig/examples/test_io.cpp id3lib-3.8.3/examples/test_io.cpp
+--- id3lib-3.8.3.orig/examples/test_io.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/examples/test_io.cpp	2009-12-10 00:57:03.612111640 +0100
+@@ -11,6 +11,9 @@
+ #include <id3/io_strings.h>
+ #include <id3/utils.h>
+ 
++using std::cin;
++using std::hex;
++using std::dec;
+ using std::cout;
+ using std::endl;
+ using std::cerr;
+@@ -18,7 +21,7 @@
+ using namespace dami;
+ 
+ int
+-main(size_t argc, const char** argv)
++main(int argc, const char** argv)
+ {
+   ID3D_INIT_DOUT();
+   ID3D_INIT_WARNING();
diff --git a/extra/id3lib/60-id3lib-missing-nullpointer-check.patch b/extra/id3lib/60-id3lib-missing-nullpointer-check.patch
new file mode 100644
index 000000000..d4ca5d292
--- /dev/null
+++ b/extra/id3lib/60-id3lib-missing-nullpointer-check.patch
@@ -0,0 +1,12 @@
+This patch adds a check for a null pointer
+--- a/src/header_tag.cpp
++++ b/src/header_tag.cpp
+@@ -54,7 +54,7 @@
+ {
+   size_t bytesUsed = ID3_TagHeader::SIZE;
+ 
+-  if (_info->is_extended)
++  if (_info && _info->is_extended)
+   {
+     bytesUsed += _info->extended_bytes;
+   }
diff --git a/extra/id3lib/60-spelling.patch b/extra/id3lib/60-spelling.patch
new file mode 100644
index 000000000..7547aa3d5
--- /dev/null
+++ b/extra/id3lib/60-spelling.patch
@@ -0,0 +1,107 @@
+This patch fixes some minor spelling mistakes
+diff -Naur id3lib-3.8.3.orig//ChangeLog id3lib-3.8.3//ChangeLog
+--- id3lib-3.8.3.orig//ChangeLog	2010-06-08 05:21:47.817061336 +0200
++++ id3lib-3.8.3//ChangeLog	2010-06-08 05:21:05.320811354 +0200
+@@ -2266,7 +2266,7 @@
+ 	* examples/demo_info.cpp (1.19): 
+ 	(PrintInformation): When printing synced lyrics info, now uses a 
+ 	MemoryReader, BinaryNumberReader, and TextReader to extract the 
+-	infromation from the binary field.  This is a cheat, since these 
++	information from the binary field.  This is a cheat, since these 
+ 	classes aren't normally exposed to folks using the library. 
+ 	Hopefully they will be exposed soon enough for the next major
+ 	release.  
+diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.html id3lib-3.8.3//doc/id3v2.3.0.html
+--- id3lib-3.8.3.orig//doc/id3v2.3.0.html	2010-06-08 05:21:47.859810543 +0200
++++ id3lib-3.8.3//doc/id3v2.3.0.html	2010-06-08 05:21:05.373811128 +0200
+@@ -2157,7 +2157,7 @@
+  64.Native American

+  65.Cabaret

+  66.New Wave

+- 67.Psychadelic

++ 67.Psychedelic

+  68.Rave

+  69.Showtunes

+  70.Trailer

+@@ -2254,4 +2254,4 @@
+ Email: <a href="mailto:johan@id3.org">johan@id3.org</a>

+ </p>

+ 

+-</body></html>
+\ No newline at end of file
++</body></html>

+diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.txt id3lib-3.8.3//doc/id3v2.3.0.txt
+--- id3lib-3.8.3.orig//doc/id3v2.3.0.txt	2010-06-08 05:21:47.860810639 +0200
++++ id3lib-3.8.3//doc/id3v2.3.0.txt	2010-06-08 05:21:05.374811307 +0200
+@@ -1929,7 +1929,7 @@
+      64.Native American

+      65.Cabaret

+      66.New Wave

+-     67.Psychadelic

++     67.Psychedelic

+      68.Rave

+      69.Showtunes

+      70.Trailer

+diff -Naur id3lib-3.8.3.orig//id3com/id3com.idl id3lib-3.8.3//id3com/id3com.idl
+--- id3lib-3.8.3.orig//id3com/id3com.idl	2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//id3com/id3com.idl	2010-06-08 05:21:05.355061546 +0200
+@@ -179,7 +179,7 @@
+       /* USER */ ID3_TERMSOFUSE,        /**< Terms of use */

+       /* USLT */ ID3_UNSYNCEDLYRICS,    /**< Unsynchronized lyric/text transcription */

+       /* WCOM */ ID3_WWWCOMMERCIALINFO, /**< Commercial information */

+-      /* WCOP */ ID3_WWWCOPYRIGHT,      /**< Copyright/Legal infromation */

++      /* WCOP */ ID3_WWWCOPYRIGHT,      /**< Copyright/Legal information */

+       /* WOAF */ ID3_WWWAUDIOFILE,      /**< Official audio file webpage */

+       /* WOAR */ ID3_WWWARTIST,         /**< Official artist/performer webpage */

+       /* WOAS */ ID3_WWWAUDIOSOURCE,    /**< Official audio source webpage */

+diff -Naur id3lib-3.8.3.orig//include/id3/globals.h id3lib-3.8.3//include/id3/globals.h
+--- id3lib-3.8.3.orig//include/id3/globals.h	2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//include/id3/globals.h	2010-06-08 05:22:27.395811102 +0200
+@@ -313,7 +313,7 @@
+   /* USER */ ID3FID_TERMSOFUSE,        /**< Terms of use */
+   /* USLT */ ID3FID_UNSYNCEDLYRICS,    /**< Unsynchronized lyric/text transcription */
+   /* WCOM */ ID3FID_WWWCOMMERCIALINFO, /**< Commercial information */
+-  /* WCOP */ ID3FID_WWWCOPYRIGHT,      /**< Copyright/Legal infromation */
++  /* WCOP */ ID3FID_WWWCOPYRIGHT,      /**< Copyright/Legal information */
+   /* WOAF */ ID3FID_WWWAUDIOFILE,      /**< Official audio file webpage */
+   /* WOAR */ ID3FID_WWWARTIST,         /**< Official artist/performer webpage */
+   /* WOAS */ ID3FID_WWWAUDIOSOURCE,    /**< Official audio source webpage */
+@@ -608,7 +608,7 @@
+   "Native American",   //64
+   "Cabaret",           //65
+   "New Wave",          //66
+-  "Psychadelic",       //67
++  "Psychedelic",       //67
+   "Rave",              //68
+   "Showtunes",         //69
+   "Trailer",           //70
+@@ -686,7 +686,7 @@
+   "Christian Rock ",       //141
+   "Merengue",              //142
+   "Salsa",                 //143
+-  "Trash Metal",           //144
++  "Thrash Metal",          //144
+   "Anime",                 //145
+   "JPop",                  //146
+   "Synthpop"               //147
+diff -Naur id3lib-3.8.3.orig//src/field.cpp id3lib-3.8.3//src/field.cpp
+--- id3lib-3.8.3.orig//src/field.cpp	2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//src/field.cpp	2010-06-08 05:21:05.373811128 +0200
+@@ -719,7 +719,7 @@
+ // USER       ID3FID_TERMSOFUSE        Terms of use
+ // USLT  ULT  ID3FID_UNSYNCEDLYRICS    Unsynchronized lyric/text transcription
+ // WCOM  WCM  ID3FID_WWWCOMMERCIALINFO Commercial information
+-// WCOP  WCM  ID3FID_WWWCOPYRIGHT      Copyright/Legal infromation
++// WCOP  WCM  ID3FID_WWWCOPYRIGHT      Copyright/Legal information
+ // WOAF  WCP  ID3FID_WWWAUDIOFILE      Official audio file webpage
+ // WOAR  WAF  ID3FID_WWWARTIST         Official artist/performer webpage
+ // WOAS  WAR  ID3FID_WWWAUDIOSOURCE    Official audio source webpage
+@@ -813,7 +813,7 @@
+   {ID3FID_TERMSOFUSE,        ""   , "USER", false, false, ID3FD_TermsOfUse,    "Terms of use"},
+   {ID3FID_UNSYNCEDLYRICS,    "ULT", "USLT", false, false, ID3FD_GeneralText,   "Unsynchronized lyric/text transcription"},
+   {ID3FID_WWWCOMMERCIALINFO, "WCM", "WCOM", false, false, ID3FD_URL,           "Commercial information"},
+-  {ID3FID_WWWCOPYRIGHT,      "WCP", "WCOP", false, false, ID3FD_URL,           "Copyright/Legal infromation"},
++  {ID3FID_WWWCOPYRIGHT,      "WCP", "WCOP", false, false, ID3FD_URL,           "Copyright/Legal information"},
+   {ID3FID_WWWAUDIOFILE,      "WAF", "WOAF", false, false, ID3FD_URL,           "Official audio file webpage"},
+   {ID3FID_WWWARTIST,         "WAR", "WOAR", false, false, ID3FD_URL,           "Official artist/performer webpage"},
+   {ID3FID_WWWAUDIOSOURCE,    "WAS", "WOAS", false, false, ID3FD_URL,           "Official audio source webpage"},
diff --git a/extra/id3lib/61-fix_vbr_stack_smash.patch b/extra/id3lib/61-fix_vbr_stack_smash.patch
new file mode 100644
index 000000000..9bf33e978
--- /dev/null
+++ b/extra/id3lib/61-fix_vbr_stack_smash.patch
@@ -0,0 +1,19 @@
+Description: Fix crashes when reading VBR MP3 file.
+Bug-Ubuntu: https://launchpad.net/bugs/444466
+Origin: upstream, http://sourceforge.net/tracker/?func=detail&aid=937707&group_id=979&atid=300979
+Forwarded: yes
+Author: Urs Fleisch
+
+Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp
+===================================================================
+--- id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp	2009-10-06 23:12:10.381250132 +0200
++++ id3lib3.8.3-3.8.3/src/mp3_parse.cpp	2009-10-06 23:14:09.545252591 +0200
+@@ -465,7 +465,7 @@
+   // from http://www.xingtech.com/developer/mp3/
+ 
+   const size_t VBR_HEADER_MIN_SIZE = 8;     // "xing" + flags are fixed
+-  const size_t VBR_HEADER_MAX_SIZE = 116;   // frames, bytes, toc and scale are optional
++  const size_t VBR_HEADER_MAX_SIZE = 120;   // frames, bytes, toc and scale are optional
+ 
+   if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE) 
+   {
diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD
index 269acf934..5d1ae757d 100644
--- a/extra/id3lib/PKGBUILD
+++ b/extra/id3lib/PKGBUILD
@@ -1,34 +1,81 @@
-# $Id: PKGBUILD 198108 2013-10-30 12:50:19Z allan $
-# Contributor: Jochem Kossen <j.kossen@home.nl>
+# $Id: PKGBUILD 204871 2014-01-29 20:02:59Z guillaume $
+# Maintainer : Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor: Jochem Kossen   <j.kossen@home.nl>
+# Contributor: rtfreedman      <rob.til.freedman@googlemail.com>
 
 pkgname=id3lib
 pkgver=3.8.3
-pkgrel=13
-pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags"
+pkgrel=14
+pkgdesc='Library for reading, writing, and manipulating ID3v1 and ID3v2 tags'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://id3lib.sourceforge.net/"
 depends=('zlib' 'gcc-libs')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'patch_id3lib_3.8.3_UTF16_writing_bug.diff'
-        'id3lib-3.8.3-CVE-2007-4460.patch'
-        'id3lib-3.8.3-gcc-4.3.patch')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        00-add-libz-to-compilation.patch
+        05-create-m4-directory.patch
+        10-fix-compilation-with-cpp-headers.patch
+        15-fix-headers-of-main-functions.patch
+        20-create-manpages.patch
+        30-fix-utf16.patch
+        40-deal-with-mkstemp.patch
+        50-remove-outdated-check.patch
+        60-add-c-wrapper-functions.patch
+        60-fix_make_check.patch
+        60-id3lib-missing-nullpointer-check.patch
+        60-spelling.patch
+        61-fix_vbr_stack_smash.patch)
+
 md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7'
-         '196c65adee1ba511ddacef2de0dfd102'
-         '78e90e15ddd1122b66da352b6c3b00ff'
-         'fdbffd2d9d289ed0d730950c78d4ebc4')
+         '9428ef38283d13adb6e349089537a63f'
+         '5a78e0fe586fba334eae2a29e4bf5a28'
+         '88f21f1bf4f697be8030706bbec11705'
+         'b3de841cd2eda0d37c8c8330119e12d4'
+         'd922a91abcdee1ffce26b512b171c2aa'
+         '74ba59c03f91fedbe4dd8045b29c7e15'
+         'd2d06d46df3867d73746f584d1e6fcc5'
+         'd3a61d07a2bfa83f4ac6290794789022'
+         '93ef4b26ad08027e28d3f80ad6e492b4'
+         '5c4b53a3d5543c5c50b23d6d5b9f230b'
+         '964fa0db0da7b1495b34b81bd36539fd'
+         '26c74a90267892bbaca1e162919121d0'
+         '0973e285cdc420130b984a259cdd8ae0')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -p1 -i ${srcdir}/00-add-libz-to-compilation.patch
+  patch -p1 -i ${srcdir}/05-create-m4-directory.patch
+  patch -p1 -i ${srcdir}/10-fix-compilation-with-cpp-headers.patch
+  patch -p1 -i ${srcdir}/15-fix-headers-of-main-functions.patch
+  patch -p1 -i ${srcdir}/20-create-manpages.patch
+  patch -p1 -i ${srcdir}/30-fix-utf16.patch
+  patch -p1 -i ${srcdir}/40-deal-with-mkstemp.patch
+  patch -p1 -i ${srcdir}/60-add-c-wrapper-functions.patch
+  patch -p1 -i ${srcdir}/60-fix_make_check.patch
+  patch -p1 -i ${srcdir}/60-id3lib-missing-nullpointer-check.patch
+  patch -p1 -i ${srcdir}/60-spelling.patch
+  patch -p1 -i ${srcdir}/61-fix_vbr_stack_smash.patch
+  patch -p1 -i ${srcdir}/50-remove-outdated-check.patch
+
+  libtoolize -fc
+  aclocal
+  autoconf
+  automake --add-missing --copy
+}
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/patch_id3lib_3.8.3_UTF16_writing_bug.diff
-  patch -p0 -i "${srcdir}"/id3lib-3.8.3-CVE-2007-4460.patch
-  patch -p1 -i "${srcdir}"/id3lib-3.8.3-gcc-4.3.patch
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  sed -i -e 's/^LIBS =/LIBS = -lz -lstdc++/' src/Makefile
   make
 }
 
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/id3lib/id3lib-3.8.3-gcc-4.3.patch b/extra/id3lib/id3lib-3.8.3-gcc-4.3.patch
deleted file mode 100644
index f5ec498b6..000000000
--- a/extra/id3lib/id3lib-3.8.3-gcc-4.3.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naur id3lib-3.8.3-orig/configure id3lib-3.8.3/configure
---- id3lib-3.8.3-orig/configure      2008-05-24 23:39:36.000000000 -0400
-+++ id3lib-3.8.3/configure   2008-05-24 23:39:57.000000000 -0400
-@@ -10296,8 +10296,7 @@
- 
- for ac_header in \
-   string                        \
--  iomanip.h                     \
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- 
-diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
---- id3lib-3.8.3-orig/include/id3/id3lib_strings.h	2008-03-05 18:19:46.000000000 -0600
-+++ id3lib-3.8.3/include/id3/id3lib_strings.h	2008-03-05 18:19:38.000000000 -0600
-@@ -30,6 +30,7 @@
- #define _ID3LIB_STRINGS_H_
- 
- #include <string>
-+#include <cstring>
- 
- #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
- namespace std
-diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
---- id3lib-3.8.3-orig/include/id3/writers.h	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/include/id3/writers.h	2008-03-05 18:23:05.000000000 -0600
-@@ -30,7 +30,7 @@
- 
- #include "id3/writer.h"
- #include "id3/id3lib_streams.h"
--//#include <string.h>
-+#include <string.h>
- 
- class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
- {
-diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp
---- id3lib-3.8.3-orig/examples/demo_convert.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_convert.cpp	2008-03-05 18:26:50.000000000 -0600
-@@ -84,7 +84,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   flags_t ulFlag = ID3TT_ALL;
-   gengetopt_args_info args;
-diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp
---- id3lib-3.8.3-orig/examples/demo_info.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_info.cpp	2008-03-05 18:27:40.000000000 -0600
-@@ -309,7 +309,7 @@
- 
- #define DEBUG
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   ID3D_INIT_DOUT();
- 
-diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp
---- id3lib-3.8.3-orig/examples/demo_tag.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_tag.cpp	2008-03-05 18:31:20.000000000 -0600
-@@ -46,7 +46,7 @@
-     os << "v2";
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
-diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp
---- id3lib-3.8.3-orig/examples/demo_copy.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_copy.cpp	2008-03-05 18:32:44.000000000 -0600
-@@ -81,7 +81,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 640058bf7..9cc2085df 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204309 2014-01-17 05:30:07Z andyrtr $
+# $Id: PKGBUILD 204857 2014-01-29 14:49:34Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,18 +6,19 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.4.4
+_icedtea_ver=2.4.5
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
 _JDK_UPDATE_VERSION=51
-_CORBA_CHANGESET=e540fd592221
-_JAXP_CHANGESET=2e2bf2d8be16
-_JAXWS_CHANGESET=5aceb5a787b1
-_JDK_CHANGESET=1fe539ed00bc
-_LANGTOOLS_CHANGESET=3f5408abf14b
-_OPENJDK_CHANGESET=796d1bf47b24
 
-_HOTSPOT_CHANGESET=a8a33cc2dd4b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_CORBA_CHANGESET=3594dbde270d
+_JAXP_CHANGESET=8fe156ad49e2
+_JAXWS_CHANGESET=32ea8b1ed91a
+_JDK_CHANGESET=9db88c18e114
+_LANGTOOLS_CHANGESET=dabd37b7e295
+_OPENJDK_CHANGESET=410eb7fef869
+
+_HOTSPOT_CHANGESET=2cb58882dac3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -47,14 +48,15 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('ddce5dadaca4a24e8ecd632d5299fefd76f3bdcd7040bfbded3de3b1dffd56b3'
-            'abe048022f46f4d04130b2cf6a1b1d897bdca981518349d34fe5b415310f7782'
-            '77c3285f6abdefe7f19fc4c698ef1f4fe533f38941314e7e7077c34fa5eb4456'
-            '48bb8ece00ef62c6c0161dd90e5789419594dfb5d08163781dac9ffc00c0a3f8'
-            'ee2a7165b78693c3bb61a90128b60934704e9a5c6c7514abfbb61e41531b9919'
-            '16373b85dc5123cfe1816ec04f7d14e9a048c6eee7eb7c22b5b816fa1fd5e9bc'
-            '4375ccfacc49793dd0f13cb73ce3c684218bce71008fc237f3b6da754f4dfea6'
-            'cb5f109ae32c07301bc3a017c334ca3a7723124ff217d46127a16ade516d2902'
+
+sha256sums=('10c08eeffaa0602b23cb957a2595a2ad3ab474cbe47b12743bbdd79037d5883d'
+            '2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707'
+            'd1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d'
+            '0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3'
+            '08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0'
+            '285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e'
+            '86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f'
+            'd8c1681ae76e660c1888065933cedbbc1309869c7a2fb98f07c424716d5ebaf9'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
diff --git a/extra/libao/PKGBUILD b/extra/libao/PKGBUILD
index c08182ef0..b90178b57 100644
--- a/extra/libao/PKGBUILD
+++ b/extra/libao/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198123 2013-10-30 12:55:41Z allan $
+# $Id: PKGBUILD 204844 2014-01-29 00:25:51Z bisson $
 # Contributor: dorphell <dorphell@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libao
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc='Cross-platform audio output library and plugins'
 url='http://xiph.org/ao/'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('libpulse')
 backup=('etc/libao.conf')
 source=("http://downloads.xiph.org/releases/ao/${pkgname}-${pkgver}.tar.gz"
         'libao.conf')
-sha1sums=('9301bc4886f170c7122ab62677fb71cf001c04fd'
+sha1sums=('6b1d2c6a2e388e3bb6ebea158d51afef18aacc56'
           '603f5e6715e7e50e1c8e8c1935c45a897c46e9af')
 
 conflicts=('libao-pulse')
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 4df4996ea..4d233049c 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 202771 2013-12-27 14:33:26Z juergen $
+# $Id: PKGBUILD 204865 2014-01-29 18:43:38Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
-pkgver=5.31.0
-pkgrel=2
+pkgver=5.32.1
+pkgrel=1
 pkgdesc="A sophisticated computer algebra system"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,11 +17,11 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/
 options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
 install=maxima.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-sha1sums=('07623644b2962d68388cfd3f507e3d381e33ce02'                                          
+sha1sums=('8667c9e26fdb2889ceb0641b0abc7372aadd591a'
           '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # set correct python executable to create docs
   sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
@@ -35,15 +35,15 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   # install some freedesktop.org compatibility
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-  	${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 "${srcdir}/${pkgname}.desktop" \
+  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
   # make sure, we have a nice icon for the desktop file at the right place ;)
-  install -d ${pkgdir}/usr/share/pixmaps/
+  install -d "${pkgdir}/usr/share/pixmaps/"
   ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
-	${pkgdir}/usr/share/pixmaps/${pkgname}.png
+	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index 2ccdd166c..55dd2c338 100644
--- a/extra/socat/PKGBUILD
+++ b/extra/socat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186472 2013-05-27 06:47:24Z bisson $
+# $Id: PKGBUILD 204846 2014-01-29 01:50:38Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=socat
-pkgver=1.7.2.2
+pkgver=1.7.2.3
 pkgrel=1
 pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
@@ -12,7 +12,7 @@ license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('readline' 'openssl')
 source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('588294c17373d52a8ac877dcd599ef26f14b110b')
+sha1sums=('580c56b6aadab6b71562e1c5a963c22e8ace6e32')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xcb-util-wm/PKGBUILD b/extra/xcb-util-wm/PKGBUILD
index 55868ba5c..9dfa665e2 100644
--- a/extra/xcb-util-wm/PKGBUILD
+++ b/extra/xcb-util-wm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198495 2013-10-30 15:12:43Z allan $
+# $Id: PKGBUILD 204850 2014-01-29 10:16:49Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=xcb-util-wm
-pkgver=0.3.9
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('libxcb>=1.7')
 makedepends=('xorg-util-macros')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
-sha256sums=('038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030'
+sha256sums=('66f97c18f7d98d3c873fe5db5842d2fca34519274c31ee668551ab8995a2f51f'
             'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9')
 
 build() {