Merge branch '3.0' into 3.1

cups-filters/.md5sum

@@ -1,2 +1,2 @@
 f182d7717ed0a939a4f50e572939afdd  cups-browsed
-c1baecc8996c97af1ffe58b5f2046e86  cups-filters-1.0.47.tar.xz
+112b265ebc5f4ebef998dfa938612a4a  cups-filters-1.0.48.tar.xz

cups-filters/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  cups ghostscript poppler qpdf
 
 name=cups-filters
-version=1.0.47
+version=1.0.48
 release=1
 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz
         cups-browsed)

mutt/.md5sum

@@ -1 +1 @@
-48267aba1bc53db636777f4a1ec87cb6  mutt-1.5.22.tar.gz
+11f5b6a3eeba1afa1257fe93c9f26bff  mutt-1.5.23.tar.gz

mutt/Pkgfile

@@ -4,9 +4,9 @@
 # Depends on:  gdbm ncurses openssl zlib
 
 name=mutt
-version=1.5.22
+version=1.5.23
 release=1
-source=(ftp://ftp.mutt.org/mutt/devel/$name-$version.tar.gz)
+source=(ftp://ftp.mutt.org/mutt/$name-$version.tar.gz)
 
 build () {
     cd $name-$version

unbound/.md5sum

@@ -1,3 +1,2 @@
-a79423bcc4129e6d59b616b1cae11e5e  ldns-1.6.17.tar.gz
 20a8c112ea3ce0049dfe16f92614185e  unbound
-0aa8db06ea784bf7879060bd1f6551c8  unbound-1.4.21.tar.gz
+59728c74fef8783f8bad1d7451eba97f  unbound-1.4.22.tar.gz

unbound/Pkgfile

@@ -4,18 +4,14 @@
 # Depends on:  openssl expat
 
 name=unbound
-version=1.4.21
-release=2
+version=1.4.22
+release=1
 source=(http://www.unbound.net/downloads/$name-$version.tar.gz
-        http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz
         unbound)
 
 build () {
-    cd ldns-1.6.17
-    ./configure --disable-shared
-    make
-
-    cd ../$name-$version
+    cd $name-$version
+    
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
                 --sysconfdir=/etc \
@@ -23,8 +19,7 @@ build () {
                 --with-chroot-dir=/etc/unbound \
                 --with-rootkey-file=/etc/unbound/anchor/root.key \
                 --disable-shared \
-                --with-username=unbound \
-                --with-ldns=../ldns-1.6.17
+                --with-username=unbound 
 
     make
     make DESTDIR=$PKG install