Merge branch 'testing'

# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
  LinHES-config: during install don't kill off lirc.  This keeps the remote active all the way to the finish
  Change version numbers to 8.0  to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
  LinHES-conifig: mv_install.py  for the last partition don't go all the way to the end.  Gotta leave room for gpt tables.
  xf86-video-ati: xorg ati driver.
  LinHES-config: timezip.py  add syncing up of parental lvl passwords and starting level with MBE.
  LinHES-system: correct the logic for breaking out of the wmctrl loop.   As written it would break out of the inner loop..but not the 60 iteration loop.
  e16_theme_settings:  remove slide-in prop for new windows.   For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
  LinHES-config, mythinstall:  change  case of hd_pvr and   serial to all lower refs #902
  zilog-firmware:   firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters  but including the firmware just in case someone really wants to
  linhes-udev-rules:  added hdprv_lirc rule. All of these lirc rules are limited to exactly one device.  If more then one device is present then only the last device in init will get the symlink
  runit-scripts:  fix logging for igdeamon,   add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
  LinHES-system:   add lh_system_restore and lh_system_backup.  These scripts are called from the mythmenu. refs #900
  iguanair: rebuild with python 2.7
  LinHES-system: msg_daemon.py fix  init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
  linhes-udev-rules:  add rules for mce,streamzap,serial  lirc devices.
  mythinstall: recompile for matching libs
  mythtv:  latest .25-fixes  and change mythbackup/restore call lh_system_$op   to replace mythbackup/mythrestore.  mythbackup no longer works correctly with the new windowmanager
  linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
  LinHES-config, supplimental-web:  Fix proxy numbering for Ceton infiniTV
  linhes-system:  add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
  ...

5 files changed, 15 insertions, 607 deletions

diff --git a/abs/core/libsndfile/ChangeLog b/abs/core/libsndfile/ChangeLog
deleted file mode 100644
index f96b790..0000000
--- a/abs/core/libsndfile/ChangeLog
+++ /dev/null
@@ -1,46 +0,0 @@
-2010-10-11  Eric Belanger  <eric@archlinux.org>
-
-	* libsndfile 1.0.23-1
-	* Upstream update
-
-2010-10-05  Eric Belanger  <eric@archlinux.org>
-
-	* libsndfile 1.0.22-1
-	* Upstream update
-
-2010-08-23  Eric Belanger  <eric@archlinux.org>
-
-	* Removed jack makedepends and optdepends (close FS#20574)
-
-2009-12-30  Eric Belanger  <eric@archlinux.org>
-
-	* libsndfile 1.0.21-1
-	* Upstream update
-	* Updated source url
-
-2009-07-09  Eric Belanger  <eric@archlinux.org>
-
-	* libsndfile 1.0.20-3
-	* Added libvorbis depends (close FS#15313)
-
-2009-06-03  Eric Belanger  <eric@archlinux.org>
-
-	* libsndfile 1.0.20-2
-	* Added jack-audio-connection-kit support (close FS#14658)
-
-2009-05-14  Eric Belanger  <eric@archlinux.org>
-
-	* libsndfile 1.0.20-1
-	* Upstream update
-
-2009-03-03  Eric Belanger  <eric@archlinux.org>
-
-	* libsndfile 1.0.19-1
-	* Upstream update
-
-2009-02-07  Eric Belanger  <eric@archlinux.org>
-
-	* libsndfile 1.0.18-1
-	* Upstream update
-	* Added license
-	* Added ChangeLog
diff --git a/abs/core/libsndfile/PKGBUILD b/abs/core/libsndfile/PKGBUILD
index 8acc8f7..cff3c64 100644
--- a/abs/core/libsndfile/PKGBUILD
+++ b/abs/core/libsndfile/PKGBUILD
@@ -1,26 +1,33 @@
-# $Id: PKGBUILD 94887 2010-10-11 21:28:29Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 149407 2012-02-07 15:40:58Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libsndfile
-pkgver=1.0.23
-pkgrel=1
+pkgver=1.0.25
+pkgrel=2
 pkgdesc="A C library for reading and writing files containing sampled sound"
 arch=('i686' 'x86_64')
 url="http://www.mega-nerd.com/libsndfile"
 license=('LGPL')
 depends=('alsa-lib' 'flac' 'libvorbis')
+checkdepends=('python2')
 options=('!libtool')
-changelog=ChangeLog
-source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d0e22b5ff2ef945615db33960376d733')
-sha1sums=('dee36861b503fe7754f0131364523f45720a0914')
+source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e'
+          'a93d26016730cb9fa214c753d079ee77dca1f326')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' src/binheader_writef_check.py \
+    src/create_symbols_file.py programs/test-sndfile-metadata-set.py
   ./configure --prefix=/usr --disable-sqlite
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/abs/core/libsndfile/flac-1.1.4.dpatch b/abs/core/libsndfile/flac-1.1.4.dpatch
deleted file mode 100644
index a0b68b5..0000000
--- a/abs/core/libsndfile/flac-1.1.4.dpatch
+++ /dev/null
@@ -1,486 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## flac-1.1.4.dpatch by Samuel Mimram <smimram@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adapt to FLAC 1.1.4 API.
-## DP: Patch stolen from http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/lib/libsndfile/flac-1.1.4.patch.
-
-@DPATCH@
-diff -ruN libsndfile-1.0.17/configure libsndfile-1.0.17-new/configure
---- libsndfile-1.0.17/configure	2006-08-31 12:55:50.000000000 +0200
-+++ libsndfile-1.0.17-new/configure	2008-04-18 18:56:48.000000000 +0200
-@@ -31226,7 +31226,8 @@
- _ACEOF
- 
- 			fi
--		FLAC_LIBS="-lFLAC"
-+		    # in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we need -logg
-+		    FLAC_LIBS="-lFLAC -logg"
- 		fi
- 	fi
- 
-diff -urNad libsndfile-1.0.17~/src/flac.c libsndfile-1.0.17/src/flac.c
---- libsndfile-1.0.17~/src/flac.c	2006-08-31 11:22:19.000000000 +0200
-+++ libsndfile-1.0.17/src/flac.c	2007-06-15 12:38:53.000000000 +0200
-@@ -46,6 +46,13 @@
- #include	"sfendian.h"
- #include	"float_cast.h"
- 
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- /*------------------------------------------------------------------------------
- ** Private static functions.
- */
-@@ -60,8 +67,14 @@
- } PFLAC_PCM ;
- 
- typedef struct
--{	FLAC__SeekableStreamDecoder *fsd ;
-+{
-+#ifdef LEGACY_FLAC
-+	FLAC__SeekableStreamDecoder *fsd ;
- 	FLAC__SeekableStreamEncoder *fse ;
-+#else
-+	FLAC__StreamDecoder *fsd ;
-+	FLAC__StreamEncoder *fse ;
-+#endif
- 	PFLAC_PCM pcmtype ;
- 	void* ptr ;
- 	unsigned pos, len, remain ;
-@@ -108,6 +121,7 @@
- static int flac_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
- 
- /* Decoder Callbacks */
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderReadStatus sf_flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer [], unsigned *bytes, void *client_data) ;
- static FLAC__SeekableStreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
- static FLAC__SeekableStreamDecoderTellStatus sf_flac_tell_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
-@@ -116,13 +130,29 @@
- static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
- static void sf_flac_meta_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
- static void sf_flac_error_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
-+#else
-+static FLAC__StreamDecoderReadStatus sf_flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer [], size_t *bytes, void *client_data) ;
-+static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
-+static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
-+static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ;
-+static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder, void *client_data) ;
-+static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
-+static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
-+static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
-+#endif
- 
- /* Encoder Callbacks */
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
- #ifdef HAVE_FLAC_1_1_1
- static FLAC__SeekableStreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
- #endif
- static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer [], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) ;
-+#else
-+static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
-+static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
-+static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ;
-+#endif
- 
- static const int legal_sample_rates [] =
- {	8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
-@@ -283,51 +313,99 @@
- } /* flac_buffer_copy */
- 
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderReadStatus
- sf_flac_read_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__byte buffer [], unsigned *bytes, void *client_data)
-+#else
-+static FLAC__StreamDecoderReadStatus
-+sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte buffer [], size_t *bytes, void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 
- 	*bytes = psf_fread (buffer, 1, *bytes, psf) ;
- 	if (*bytes > 0 && psf->error == 0)
-+#ifdef LEGACY_FLAC
- 		return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK ;
- 
-     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR ;
-+#else
-+		return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ;
-+
-+    return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
-+#endif
- } /* sf_flac_read_callback */
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderSeekStatus
- sf_flac_seek_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
-+#else
-+static FLAC__StreamDecoderSeekStatus
-+sf_flac_seek_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 
- 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
- 	if (psf->error)
-+#ifdef LEGACY_FLAC
- 		return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR ;
- 
- 	return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK ;
-+#else
-+		return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ;
-+
-+	return FLAC__STREAM_DECODER_SEEK_STATUS_OK ;
-+#endif
- } /* sf_flac_seek_callback */
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderTellStatus
- sf_flac_tell_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
-+#else
-+static FLAC__StreamDecoderTellStatus
-+sf_flac_tell_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 
- 	*absolute_byte_offset = psf_ftell (psf) ;
- 	if (psf->error)
-+#ifdef LEGACY_FLAC
- 		return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR ;
- 
- 	return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK ;
-+#else
-+		return FLAC__STREAM_DECODER_TELL_STATUS_ERROR ;
-+
-+	return FLAC__STREAM_DECODER_TELL_STATUS_OK ;
-+#endif
- } /* sf_flac_tell_callback */
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderLengthStatus
- sf_flac_length_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
-+#else
-+static FLAC__StreamDecoderLengthStatus
-+sf_flac_length_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 
- 	if ((*stream_length = psf->filelength) == 0)
-+#ifdef LEGACY_FLAC
- 		return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR ;
- 
- 	return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK ;
-+#else
-+		return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ;
-+
-+	return FLAC__STREAM_DECODER_LENGTH_STATUS_OK ;
-+#endif
- } /* sf_flac_length_callback */
- 
- static FLAC__bool
-+#ifdef LEGACY_FLAC
- sf_flac_eof_callback (const FLAC__SeekableStreamDecoder *UNUSED (decoder), void *client_data)
-+#else
-+sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 
- 	if (psf_ftell (psf) == psf->filelength)
-@@ -337,7 +415,11 @@
- } /* sf_flac_eof_callback */
- 
- static FLAC__StreamDecoderWriteStatus
-+#ifdef LEGACY_FLAC
- sf_flac_write_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
-+#else
-+sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
- 
-@@ -353,7 +435,11 @@
- } /* sf_flac_write_callback */
- 
- static void
-+#ifdef LEGACY_FLAC
- sf_flac_meta_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
-+#else
-+sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 
- 	switch (metadata->type)
-@@ -387,7 +473,11 @@
- } /* sf_flac_meta_callback */
- 
- static void
-+#ifdef LEGACY_FLAC
- sf_flac_error_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#else
-+sf_flac_error_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 
- 	psf_log_printf (psf, "ERROR : %s\n", FLAC__StreamDecoderErrorStatusString [status]) ;
-@@ -407,17 +497,29 @@
- 	return ;
- } /* sf_flac_error_callback */
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamEncoderSeekStatus
- sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
-+#else
-+static FLAC__StreamEncoderSeekStatus
-+sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 
- 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
- 	if (psf->error)
-+#ifdef LEGACY_FLAC
- 		return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR ;
- 
-     return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK ;
-+#else
-+		return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ;
-+
-+    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
-+#endif
- } /* sf_flac_enc_seek_callback */
- 
-+#ifdef LEGACY_FLAC
- #ifdef HAVE_FLAC_1_1_1
- static FLAC__SeekableStreamEncoderTellStatus
- sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
-@@ -430,9 +532,25 @@
- 	return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK ;
- } /* sf_flac_enc_tell_callback */
- #endif
-+#else
-+static FLAC__StreamEncoderTellStatus
-+sf_flac_enc_tell_callback (const FLAC__StreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
-+{	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
-+
-+	*absolute_byte_offset = psf_ftell (psf) ;
-+	if (psf->error)
-+		return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR ;
-+
-+	return FLAC__STREAM_ENCODER_TELL_STATUS_OK ;
-+} /* sf_flac_enc_tell_callback */
-+#endif
- 
- static FLAC__StreamEncoderWriteStatus
-+#ifdef LEGACY_FLAC
- sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], unsigned bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
-+#else
-+sf_flac_enc_write_callback (const FLAC__StreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], size_t bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
-+#endif
- {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
- 
- 	if (psf_fwrite (buffer, 1, bytes, psf) == bytes && psf->error == 0)
-@@ -509,15 +627,27 @@
- 		return 0 ;
- 
- 	if (psf->mode == SFM_WRITE)
--	{	FLAC__seekable_stream_encoder_finish (pflac->fse) ;
-+	{
-+#ifdef LEGACY_FLAC
-+		FLAC__seekable_stream_encoder_finish (pflac->fse) ;
- 		FLAC__seekable_stream_encoder_delete (pflac->fse) ;
-+#else
-+		FLAC__stream_encoder_finish (pflac->fse) ;
-+		FLAC__stream_encoder_delete (pflac->fse) ;
-+#endif
- 		if (pflac->encbuffer)
- 			free (pflac->encbuffer) ;
- 		} ;
- 
- 	if (psf->mode == SFM_READ)
--	{	FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
-+	{
-+#ifdef LEGACY_FLAC
-+		FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
- 		FLAC__seekable_stream_decoder_delete (pflac->fsd) ;
-+#else
-+		FLAC__stream_decoder_finish (pflac->fsd) ;
-+		FLAC__stream_decoder_delete (pflac->fsd) ;
-+#endif
- 		} ;
- 
- 	for (k = 0 ; k < ARRAY_LEN (pflac->rbuffer) ; k++)
-@@ -546,17 +676,6 @@
- 		return SFE_FLAC_BAD_SAMPLE_RATE ;
- 
- 	psf_fseek (psf, 0, SEEK_SET) ;
--	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
--		return SFE_FLAC_NEW_DECODER ;
--	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
--	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
--
--#ifdef HAVE_FLAC_1_1_1
--	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
--#endif
--	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
--	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
--	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
- 
- 	switch (psf->sf.format & SF_FORMAT_SUBMASK)
- 	{	case SF_FORMAT_PCM_S8 :
-@@ -574,12 +693,36 @@
- 			break ;
- 		} ;
- 
-+#ifdef LEGACY_FLAC
-+	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
-+		return SFE_FLAC_NEW_DECODER ;
-+	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
-+	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
-+
-+#ifdef HAVE_FLAC_1_1_1
-+	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
-+#endif
-+	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
-+	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
-+	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
- 	FLAC__seekable_stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
- 
- 	if ((bps = FLAC__seekable_stream_encoder_init (pflac->fse)) != FLAC__SEEKABLE_STREAM_DECODER_OK)
- 	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__seekable_stream_encoder_get_resolved_state_string (pflac->fse)) ;
- 		return SFE_FLAC_INIT_DECODER ;
- 		} ;
-+#else
-+	if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL)
-+		return SFE_FLAC_NEW_DECODER ;
-+	FLAC__stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
-+	FLAC__stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
-+	FLAC__stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
-+
-+	if ((bps = FLAC__stream_encoder_init_stream (pflac->fse, sf_flac_enc_write_callback, sf_flac_enc_seek_callback, sf_flac_enc_tell_callback, NULL, psf)) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__StreamEncoderInitStatusString[bps]) ;
-+		return SFE_FLAC_INIT_DECODER ;
-+		} ;
-+#endif
- 
- 	if (psf->error == 0)
- 		psf->dataoffset = psf_ftell (psf) ;
-@@ -593,6 +736,7 @@
- {	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
- 
- 	psf_fseek (psf, 0, SEEK_SET) ;
-+#ifdef LEGACY_FLAC
- 	if ((pflac->fsd = FLAC__seekable_stream_decoder_new ()) == NULL)
- 		return SFE_FLAC_NEW_DECODER ;
- 
-@@ -610,9 +754,22 @@
- 		return SFE_FLAC_INIT_DECODER ;
- 
- 	FLAC__seekable_stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
-+#else
-+	if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL)
-+		return SFE_FLAC_NEW_DECODER ;
-+
-+	if (FLAC__stream_decoder_init_stream (pflac->fsd, sf_flac_read_callback, sf_flac_seek_callback, sf_flac_tell_callback, sf_flac_length_callback, sf_flac_eof_callback, sf_flac_write_callback, sf_flac_meta_callback, sf_flac_error_callback, psf) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+		return SFE_FLAC_INIT_DECODER ;
-+
-+	FLAC__stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
-+#endif
- 	if (psf->error == 0)
- 	{	FLAC__uint64 position ;
-+#ifdef LEGACY_FLAC
- 		FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
-+#else
-+		FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
-+#endif
- 		psf->dataoffset = position ;
- 		} ;
- 
-@@ -676,10 +833,18 @@
- 		flac_buffer_copy (psf) ;
- 
- 	while (pflac->pos < pflac->len)
--	{	if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
-+	{
-+#ifdef LEGACY_FLAC
-+		if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
- 			break ;
- 		if (FLAC__seekable_stream_decoder_get_state (pflac->fsd) != FLAC__SEEKABLE_STREAM_DECODER_OK)
- 			break ;
-+#else
-+		if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
-+			break ;
-+		if (FLAC__stream_decoder_get_state (pflac->fsd) >= FLAC__STREAM_DECODER_END_OF_STREAM)
-+			break ;
-+#endif
- 		} ;
- 
- 	pflac->ptr = NULL ;
-@@ -795,7 +960,11 @@
- 	while (len > 0)
- 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
- 		convert (ptr + total, buffer, writecount) ;
-+#ifdef LEGACY_FLAC
- 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
-+#else
-+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
-+#endif
- 			thiswrite = writecount ;
- 		else
- 			break ;
-@@ -837,7 +1006,11 @@
- 	while (len > 0)
- 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
- 		convert (ptr + total, buffer, writecount) ;
-+#ifdef LEGACY_FLAC
- 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
-+#else
-+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
-+#endif
- 			thiswrite = writecount ;
- 		else
- 			break ;
-@@ -879,7 +1052,11 @@
- 	while (len > 0)
- 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
- 		convert (ptr + total, buffer, writecount, psf->norm_float) ;
-+#ifdef LEGACY_FLAC
- 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
-+#else
-+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
-+#endif
- 			thiswrite = writecount ;
- 		else
- 			break ;
-@@ -1011,7 +1188,11 @@
- 	while (len > 0)
- 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
- 		convert (ptr + total, buffer, writecount, psf->norm_double) ;
-+#ifdef LEGACY_FLAC
- 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
-+#else
-+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
-+#endif
- 			thiswrite = writecount ;
- 		else
- 			break ;
-@@ -1131,10 +1312,17 @@
- 
- 	if (psf->mode == SFM_READ)
- 	{	FLAC__uint64 position ;
-+#ifdef LEGACY_FLAC
- 		if (FLAC__seekable_stream_decoder_seek_absolute (pflac->fsd, offset))
- 		{	FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
- 			return offset ;
- 			} ;
-+#else
-+		if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset))
-+		{	FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
-+			return offset ;
-+			} ;
-+#endif
- 
- 		return ((sf_count_t) -1) ;
- 		} ;
diff --git a/abs/core/libsndfile/lossy_comp_test-overflow.dpatch b/abs/core/libsndfile/lossy_comp_test-overflow.dpatch
deleted file mode 100644
index bf5c829..0000000
--- a/abs/core/libsndfile/lossy_comp_test-overflow.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lossy_comp_test-overflow.dpatch by Martin Michlmayr <tbm@cyrius.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Avoid a possible overflow in sum_abs.
-## DP: See #362414.
-
-@DPATCH@
-diff -urNad libsndfile-1.0.17~/tests/lossy_comp_test.c libsndfile-1.0.17/tests/lossy_comp_test.c
---- libsndfile-1.0.17~/tests/lossy_comp_test.c	2006-08-31 11:22:07.000000000 +0200
-+++ libsndfile-1.0.17/tests/lossy_comp_test.c	2007-04-07 10:33:05.000000000 +0200
-@@ -691,7 +691,8 @@
- lcomp_test_int (const char *filename, int filetype, int channels, double margin)
- {	SNDFILE		*file ;
- 	SF_INFO		sfinfo ;
--	int			k, m, *orig, *data, sum_abs ;
-+	int		k, m, *orig, *data ;
-+	long long	sum_abs ;
- 	long		datalen, seekpos ;
- 	double		scale ;
- 
diff --git a/abs/core/libsndfile/overflow.dpatch b/abs/core/libsndfile/overflow.dpatch
deleted file mode 100644
index 108b68c..0000000
--- a/abs/core/libsndfile/overflow.dpatch
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## overflow.dpatch by Samuel Mimram <smimram@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a buffer overflow (CVE-2007-4974). See #443386.
-
-@DPATCH@
-diff -urNad libsndfile-1.0.17~/src/flac.c libsndfile-1.0.17/src/flac.c
---- libsndfile-1.0.17~/src/flac.c	2007-09-20 23:38:16.000000000 +0000
-+++ libsndfile-1.0.17/src/flac.c	2007-09-20 23:38:16.000000000 +0000
-@@ -57,7 +57,7 @@
- ** Private static functions.
- */
- 
--#define ENC_BUFFER_SIZE 4096
-+#define ENC_BUFFER_SIZE 8192
- 
- typedef enum
- {	PFLAC_PCM_SHORT = 0,
-@@ -202,6 +202,17 @@
- 	const FLAC__int32* const *buffer = pflac->wbuffer ;
- 	unsigned i = 0, j, offset ;
- 
-+	/*
-+	**	frame->header.blocksize is variable and we're using a constant blocksize
-+	**	of FLAC__MAX_BLOCK_SIZE.
-+	**	Check our assumptions here.
-+	*/
-+	if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
-+	{	psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ;
-+		psf->error = SFE_INTERNAL ;
-+		return 0 ;
-+		} ;
-+
- 	if (pflac->ptr == NULL)
- 	{	/*
- 		**	Not sure why this code is here and not elsewhere.
-@@ -210,7 +221,7 @@
- 		pflac->bufferbackup = SF_TRUE ;
- 		for (i = 0 ; i < frame->header.channels ; i++)
- 		{	if (pflac->rbuffer [i] == NULL)
--				pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ;
-+				pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
- 			memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ;
- 			} ;
- 		pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;