Merge branch '2.7' into 2.8

Conflicts:
	firefox/.md5sum

26 files changed, 40 insertions, 32 deletions

diff --git a/alsa-lib/.footprint b/alsa-lib/.footprint
index df9661e0a..c953a4317 100644
--- a/alsa-lib/.footprint
+++ b/alsa-lib/.footprint
@@ -49,8 +49,6 @@ drwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-ac97.so
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-hda.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-hda.so
--rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-python.la
--rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-python.so
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-sbase.la
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/smixer/smixer-sbase.so
 -rwxr-xr-x	root/root	usr/lib/libasound.la
@@ -89,6 +87,7 @@ drwxr-xr-x	root/root	usr/share/alsa/cards/
 -rw-r--r--	root/root	usr/share/alsa/cards/ENS1370.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/ENS1371.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/ES1968.conf
+-rw-r--r--	root/root	usr/share/alsa/cards/Echo_Echo3G.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/FM801.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/FWSpeakers.conf
 -rw-r--r--	root/root	usr/share/alsa/cards/FireWave.conf
diff --git a/alsa-lib/.md5sum b/alsa-lib/.md5sum
index ecc70d193..1efdbd6f4 100644
--- a/alsa-lib/.md5sum
+++ b/alsa-lib/.md5sum
@@ -1 +1 @@
-06fe5819020c6684b991dcffc5471304  alsa-lib-1.0.25.tar.bz2
+2dfa35d28471d721e592b616beedf965  alsa-lib-1.0.26.tar.bz2
diff --git a/alsa-lib/Pkgfile b/alsa-lib/Pkgfile
index 15c4d62c1..99ee1b5b2 100644
--- a/alsa-lib/Pkgfile
+++ b/alsa-lib/Pkgfile
@@ -1,16 +1,16 @@
 # Description: ALSA libraries
 # URL: http://www.alsa-project.org/
 # Maintainer: Matt Housh, jaeger at morpheus dot net
-# Depends on: python
 
 name=alsa-lib
-version=1.0.25
+version=1.0.26
 release=1
 source=(ftp://ftp.alsa-project.org/pub/lib/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
-	./configure --prefix=/usr
+	./configure --prefix=/usr \
+		--disable-python
 	make
 	make DESTDIR=$PKG install
 	rm -f $PKG/usr/share/alsa/alsa.conf.d/README
diff --git a/alsa-utils/.md5sum b/alsa-utils/.md5sum
index 455e6ba69..97386ce49 100644
--- a/alsa-utils/.md5sum
+++ b/alsa-utils/.md5sum
@@ -1,2 +1,2 @@
-f81f9dcb9a014fd32cb3a70066a5b9a9  alsa-utils-1.0.25.tar.bz2
+4dcf1017fafc91603af96705c073eca9  alsa-utils-1.0.26.tar.bz2
 7ca87ae2d727887898e1feb47a48d3f9  rc.alsa
diff --git a/alsa-utils/Pkgfile b/alsa-utils/Pkgfile
index 3bba80379..8425229fa 100644
--- a/alsa-utils/Pkgfile
+++ b/alsa-utils/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: gettext, alsa-lib, dialog
 
 name=alsa-utils
-version=1.0.25
+version=1.0.26
 release=1
 source=(ftp://ftp.alsa-project.org/pub/utils/$name-$version.tar.bz2 \
 	rc.alsa)
diff --git a/dar/.footprint b/dar/.footprint
index 553adb5aa..542f06ffd 100644
--- a/dar/.footprint
+++ b/dar/.footprint
@@ -71,9 +71,9 @@ drwxr-xr-x	root/root	usr/include/dar/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libdar.a
 -rwxr-xr-x	root/root	usr/lib/libdar.la
-lrwxrwxrwx	root/root	usr/lib/libdar.so -> libdar.so.5000.2.4
-lrwxrwxrwx	root/root	usr/lib/libdar.so.5000 -> libdar.so.5000.2.4
--rwxr-xr-x	root/root	usr/lib/libdar.so.5000.2.4
+lrwxrwxrwx	root/root	usr/lib/libdar.so -> libdar.so.5000.3.0
+lrwxrwxrwx	root/root	usr/lib/libdar.so.5000 -> libdar.so.5000.3.0
+-rwxr-xr-x	root/root	usr/lib/libdar.so.5000.3.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libdar.pc
 drwxr-xr-x	root/root	usr/man/
diff --git a/dar/.md5sum b/dar/.md5sum
index f14d88084..a84d162eb 100644
--- a/dar/.md5sum
+++ b/dar/.md5sum
@@ -1,2 +1,2 @@
-1e8952e37299fc0ad376c57167382615  dar-2.4.7.tar.gz
+05660156b4a0675726c0d0f958127a10  dar-2.4.8.tar.gz
 f453ca0df13e48ca72095f9ef71529c9  darrc
diff --git a/dar/Pkgfile b/dar/Pkgfile
index ba170b026..b6f79a574 100644
--- a/dar/Pkgfile
+++ b/dar/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  attr, openssl, zlib, bzip2, libgcrypt
 
 name=dar
-version=2.4.7
+version=2.4.8
 release=1
 source=(http://downloads.sourceforge.net/project/dar/dar/$version/$name-$version.tar.gz \
         darrc)
diff --git a/hpijs/.footprint b/hpijs/.footprint
index b3e236cf6..889a1314c 100644
--- a/hpijs/.footprint
+++ b/hpijs/.footprint
@@ -117,7 +117,9 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320n-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320nw-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320tn-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_200_color_m251-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_200_colormfp_m276-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100_series-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2200-ps.ppd.gz
diff --git a/hpijs/.md5sum b/hpijs/.md5sum
index 4fe1736a9..0f9ed8e94 100644
--- a/hpijs/.md5sum
+++ b/hpijs/.md5sum
@@ -1 +1 @@
-5303938e8630775ea6fb383af85775e5  hplip-3.12.6.tar.gz
+843a089fb4f113e6a65312094aeab8aa  hplip-3.12.9.tar.gz
diff --git a/hpijs/Pkgfile b/hpijs/Pkgfile
index 00b4fbef0..c021ca302 100644
--- a/hpijs/Pkgfile
+++ b/hpijs/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  cups
 
 name=hpijs
-version=3.12.6
+version=3.12.9
 release=1
 source=(http://downloads.sourceforge.net/project/hplip/hplip/$version/hplip-$version.tar.gz)
 
diff --git a/maildrop/.md5sum b/maildrop/.md5sum
index 870973c90..c9a5ac5cd 100644
--- a/maildrop/.md5sum
+++ b/maildrop/.md5sum
@@ -1 +1 @@
-5d71455ab26096ecf4f624fbee0320cb  maildrop-2.5.5.tar.bz2
+ac5a28d88f7f30236ee6aef0b679266b  maildrop-2.6.0.tar.bz2
diff --git a/maildrop/Pkgfile b/maildrop/Pkgfile
index 52b6c74c6..ab8ab6239 100644
--- a/maildrop/Pkgfile
+++ b/maildrop/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  gdbm libpcre
 
 name=maildrop
-version=2.5.5
+version=2.6.0
 release=1
 source=(http://download.sourceforge.net/project/courier/$name/$version/$name-$version.tar.bz2)
 
diff --git a/mc/.footprint b/mc/.footprint
index 731210a81..13602b8db 100644
--- a/mc/.footprint
+++ b/mc/.footprint
@@ -128,6 +128,7 @@ drwxr-xr-x	root/root	usr/share/mc/syntax/
 -rw-r--r--	root/root	usr/share/mc/syntax/c.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/cabal.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/changelog.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/cmake.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/cs.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/css.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/cxx.syntax
@@ -138,6 +139,7 @@ drwxr-xr-x	root/root	usr/share/mc/syntax/
 -rw-r--r--	root/root	usr/share/mc/syntax/debian-description.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/debian-sources-list.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/diff.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/dlink.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/dos.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/ebuild.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/eiffel.syntax
diff --git a/mc/.md5sum b/mc/.md5sum
index 14c24354c..5edb4eebe 100644
--- a/mc/.md5sum
+++ b/mc/.md5sum
@@ -1 +1 @@
-eef6144d9f0331437e9a51adbb77c757  mc-4.8.4.tar.xz
+f1e282124ee27fda4785364d47918fb2  mc-4.8.5.tar.xz
diff --git a/mc/Pkgfile b/mc/Pkgfile
index 7f16d1fdb..05b07ff30 100644
--- a/mc/Pkgfile
+++ b/mc/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  ncurses glib
 
 name=mc
-version=4.8.4
+version=4.8.5
 release=1
 source=(http://www.midnight-commander.org/downloads/$name-$version.tar.xz)
 
diff --git a/poppler-glib/.md5sum b/poppler-glib/.md5sum
index 91fef4657..27285b31f 100644
--- a/poppler-glib/.md5sum
+++ b/poppler-glib/.md5sum
@@ -1 +1 @@
-28c40266f374e1960a7bcead17d39f96  poppler-0.20.3.tar.gz
+ce9486ab05254af922650be64c943487  poppler-0.20.4.tar.gz
diff --git a/poppler-glib/Pkgfile b/poppler-glib/Pkgfile
index d37bbf637..1472a3f3c 100644
--- a/poppler-glib/Pkgfile
+++ b/poppler-glib/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  glib poppler
 
 name=poppler-glib
-version=0.20.3
+version=0.20.4
 release=1
 source=(http://poppler.freedesktop.org/poppler-$version.tar.gz)
 
@@ -21,7 +21,7 @@ build() {
     make
     make DESTDIR=$PKG install
 
-    rm -r $PKG/usr/{bin,share}
+    rm -r $PKG/usr/share
     rm $PKG/usr/lib/pkgconfig/poppler{,-cairo,-splash}.pc
     rm $PKG/usr/lib/libpoppler.*
 }
diff --git a/poppler-qt4/.md5sum b/poppler-qt4/.md5sum
index 91fef4657..27285b31f 100644
--- a/poppler-qt4/.md5sum
+++ b/poppler-qt4/.md5sum
@@ -1 +1 @@
-28c40266f374e1960a7bcead17d39f96  poppler-0.20.3.tar.gz
+ce9486ab05254af922650be64c943487  poppler-0.20.4.tar.gz
diff --git a/poppler-qt4/Pkgfile b/poppler-qt4/Pkgfile
index 73382982a..a508643ab 100644
--- a/poppler-qt4/Pkgfile
+++ b/poppler-qt4/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  qt4 poppler
 
 name=poppler-qt4
-version=0.20.3
+version=0.20.4
 release=1
 source=(http://poppler.freedesktop.org/poppler-$version.tar.gz)
 
diff --git a/poppler/.footprint b/poppler/.footprint
index 08662d66f..12ed108d1 100644
--- a/poppler/.footprint
+++ b/poppler/.footprint
@@ -151,9 +151,9 @@ lrwxrwxrwx	root/root	usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.2.0
 -rwxr-xr-x	root/root	usr/lib/libpoppler-cpp.so.0.2.0
 -rw-r--r--	root/root	usr/lib/libpoppler.a
 -rwxr-xr-x	root/root	usr/lib/libpoppler.la
-lrwxrwxrwx	root/root	usr/lib/libpoppler.so -> libpoppler.so.27.0.0
-lrwxrwxrwx	root/root	usr/lib/libpoppler.so.27 -> libpoppler.so.27.0.0
--rwxr-xr-x	root/root	usr/lib/libpoppler.so.27.0.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler.so -> libpoppler.so.28.0.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler.so.28 -> libpoppler.so.28.0.0
+-rwxr-xr-x	root/root	usr/lib/libpoppler.so.28.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/poppler-cairo.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/poppler-cpp.pc
diff --git a/poppler/.md5sum b/poppler/.md5sum
index 91fef4657..27285b31f 100644
--- a/poppler/.md5sum
+++ b/poppler/.md5sum
@@ -1 +1 @@
-28c40266f374e1960a7bcead17d39f96  poppler-0.20.3.tar.gz
+ce9486ab05254af922650be64c943487  poppler-0.20.4.tar.gz
diff --git a/poppler/Pkgfile b/poppler/Pkgfile
index 1d47e1cd0..a5e75c483 100644
--- a/poppler/Pkgfile
+++ b/poppler/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  cairo lcms
 
 name=poppler
-version=0.20.3
+version=0.20.4
 release=1
 source=(http://poppler.freedesktop.org/$name-$version.tar.gz)
 
diff --git a/syslinux/.footprint b/syslinux/.footprint
index 9ad6f44c5..6ef6cdc8d 100644
--- a/syslinux/.footprint
+++ b/syslinux/.footprint
@@ -41,6 +41,7 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/bitsize/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize/stdint.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize/stdintconst.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/bitsize/stdintlimits.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/bufprintf.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/colortbl.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/com32.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/console.h
@@ -102,6 +103,8 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/memory.h
 drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/vpd/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h
+drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/zzjson/
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/ilog2.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/inttypes.h
 drwxr-xr-x	root/root	usr/share/syslinux/com32/include/klibc/
@@ -174,6 +177,7 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/syslinux/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/zlib.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/libcom32.a
 -rw-r--r--	root/root	usr/share/syslinux/com32/libcom32gpl.a
+-rw-r--r--	root/root	usr/share/syslinux/com32/libcom32upload.a
 -rw-r--r--	root/root	usr/share/syslinux/com32/libutil_com.a
 -rw-r--r--	root/root	usr/share/syslinux/com32/libutil_lnx.a
 -rw-r--r--	root/root	usr/share/syslinux/config.c32
@@ -243,3 +247,4 @@ drwxr-xr-x	root/root	usr/share/syslinux/dosutil/
 -rw-r--r--	root/root	usr/share/syslinux/vesamenu.c32
 -rw-r--r--	root/root	usr/share/syslinux/vpdtest.c32
 -rw-r--r--	root/root	usr/share/syslinux/whichsys.c32
+-rw-r--r--	root/root	usr/share/syslinux/zzjson.c32
diff --git a/syslinux/.md5sum b/syslinux/.md5sum
index 186e5bf18..100561f93 100644
--- a/syslinux/.md5sum
+++ b/syslinux/.md5sum
@@ -1 +1 @@
-a3936208767eb7ced65320abe2e33a10  syslinux-4.04.tar.bz2
+82299242418385da1274c9479a778cb2  syslinux-4.05.tar.bz2
diff --git a/syslinux/Pkgfile b/syslinux/Pkgfile
index a21c6de84..fcfb5beb2 100644
--- a/syslinux/Pkgfile
+++ b/syslinux/Pkgfile
@@ -5,8 +5,8 @@
 # Depends on: mtools perl
 
 name=syslinux
-version=4.04
-release=2
+version=4.05
+release=1
 source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.bz2)
 
 build() {