Merge commit 'lesibel/master'

9 files changed, 36 insertions, 35 deletions

diff --git a/base/iptables/.footprint b/base/iptables/.footprint
index 19c25a21f..38631b589 100644
--- a/base/iptables/.footprint
+++ b/base/iptables/.footprint
@@ -24,7 +24,10 @@ lrwxrwxrwx	root/root	lib/libip4tc.so.0 -> libip4tc.so.0.0.0
 lrwxrwxrwx	root/root	lib/libip6tc.so -> libip6tc.so.0.0.0
 lrwxrwxrwx	root/root	lib/libip6tc.so.0 -> libip6tc.so.0.0.0
 -rwxr-xr-x	root/root	lib/libip6tc.so.0.0.0
--rw-r--r--	root/root	lib/libipq.a
+-rwxr-xr-x	root/root	lib/libipq.la
+lrwxrwxrwx	root/root	lib/libipq.so -> libipq.so.0.0.0
+lrwxrwxrwx	root/root	lib/libipq.so.0 -> libipq.so.0.0.0
+-rwxr-xr-x	root/root	lib/libipq.so.0.0.0
 -rwxr-xr-x	root/root	lib/libiptc.la
 lrwxrwxrwx	root/root	lib/libiptc.so -> libiptc.so.0.0.0
 lrwxrwxrwx	root/root	lib/libiptc.so.0 -> libiptc.so.0.0.0
diff --git a/base/iptables/.md5sum b/base/iptables/.md5sum
index 0f704097c..264bdfaad 100644
--- a/base/iptables/.md5sum
+++ b/base/iptables/.md5sum
@@ -1,2 +1,2 @@
-c67cf30e281a924def6426be0973df56  iptables-1.4.6.tar.bz2
+645941dd1f9e0ec1f74c61918d70d52f  iptables-1.4.7.tar.bz2
 c4f416633e88935e966873f4ea89775c  rc.iptables
diff --git a/base/iptables/Pkgfile b/base/iptables/Pkgfile
index afe9f9f2f..1e0d7d717 100755
--- a/base/iptables/Pkgfile
+++ b/base/iptables/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=iptables
-version=1.4.6
+version=1.4.7
 release=1
 source=(ftp://ftp.netfilter.org/pub/iptables/$name-$version.tar.bz2 \
 	rc.iptables )
diff --git a/base/libjpeg/.footprint b/base/libjpeg/.footprint
index 818bc8230..2bc8b682d 100644
--- a/base/libjpeg/.footprint
+++ b/base/libjpeg/.footprint
@@ -13,9 +13,9 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libjpeg.a
 -rwxr-xr-x	root/root	usr/lib/libjpeg.la
-lrwxrwxrwx	root/root	usr/lib/libjpeg.so -> libjpeg.so.7.0.0
-lrwxrwxrwx	root/root	usr/lib/libjpeg.so.7 -> libjpeg.so.7.0.0
--rwxr-xr-x	root/root	usr/lib/libjpeg.so.7.0.0
+lrwxrwxrwx	root/root	usr/lib/libjpeg.so -> libjpeg.so.8.0.1
+lrwxrwxrwx	root/root	usr/lib/libjpeg.so.8 -> libjpeg.so.8.0.1
+-rwxr-xr-x	root/root	usr/lib/libjpeg.so.8.0.1
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
diff --git a/base/libjpeg/.md5sum b/base/libjpeg/.md5sum
index 0e6b65dbf..b6f1334a2 100644
--- a/base/libjpeg/.md5sum
+++ b/base/libjpeg/.md5sum
@@ -1 +1 @@
-382ef33b339c299b56baf1296cda9785  jpegsrc.v7.tar.gz
+5146e68be3633c597b0d14d3ed8fa2ea  jpegsrc.v8a.tar.gz
diff --git a/base/libjpeg/Pkgfile b/base/libjpeg/Pkgfile
index 657e61b9a..b4e764d59 100755
--- a/base/libjpeg/Pkgfile
+++ b/base/libjpeg/Pkgfile
@@ -5,13 +5,14 @@
 # Depends on: 
 
 name=libjpeg
-version=7
+version=8.0
+_version=8a
 release=1
-source=( http://www.ijg.org/files/jpegsrc.v$version.tar.gz)
+source=( http://www.ijg.org/files/jpegsrc.v${_version}.tar.gz)
 
 
 build() {
-	cd jpeg-$version
+	cd jpeg-${_version}
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/base/libpng/.footprint b/base/libpng/.footprint
index 65e583738..1f676e45e 100644
--- a/base/libpng/.footprint
+++ b/base/libpng/.footprint
@@ -1,27 +1,25 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
-lrwxrwxrwx	root/root	usr/bin/libpng-config -> libpng12-config
--rwxr-xr-x	root/root	usr/bin/libpng12-config
+lrwxrwxrwx	root/root	usr/bin/libpng-config -> libpng14-config
+-rwxr-xr-x	root/root	usr/bin/libpng14-config
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/libpng12/
--rw-r--r--	root/root	usr/include/libpng12/png.h
--rw-r--r--	root/root	usr/include/libpng12/pngconf.h
-lrwxrwxrwx	root/root	usr/include/png.h -> libpng12/png.h
-lrwxrwxrwx	root/root	usr/include/pngconf.h -> libpng12/pngconf.h
+drwxr-xr-x	root/root	usr/include/libpng14/
+-rw-r--r--	root/root	usr/include/libpng14/png.h
+-rw-r--r--	root/root	usr/include/libpng14/pngconf.h
+lrwxrwxrwx	root/root	usr/include/png.h -> libpng14/png.h
+lrwxrwxrwx	root/root	usr/include/pngconf.h -> libpng14/pngconf.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libpng.a -> libpng12.a
-lrwxrwxrwx	root/root	usr/lib/libpng.la -> libpng12.la
-lrwxrwxrwx	root/root	usr/lib/libpng.so -> libpng12.so
-lrwxrwxrwx	root/root	usr/lib/libpng.so.3 -> libpng.so.3.39.0
--rwxr-xr-x	root/root	usr/lib/libpng.so.3.39.0
--rw-r--r--	root/root	usr/lib/libpng12.a
--rwxr-xr-x	root/root	usr/lib/libpng12.la
-lrwxrwxrwx	root/root	usr/lib/libpng12.so -> libpng12.so.0.39.0
-lrwxrwxrwx	root/root	usr/lib/libpng12.so.0 -> libpng12.so.0.39.0
--rwxr-xr-x	root/root	usr/lib/libpng12.so.0.39.0
+lrwxrwxrwx	root/root	usr/lib/libpng.a -> libpng14.a
+lrwxrwxrwx	root/root	usr/lib/libpng.la -> libpng14.la
+lrwxrwxrwx	root/root	usr/lib/libpng.so -> libpng14.so
+-rw-r--r--	root/root	usr/lib/libpng14.a
+-rwxr-xr-x	root/root	usr/lib/libpng14.la
+lrwxrwxrwx	root/root	usr/lib/libpng14.so -> libpng14.so.14.1.0
+lrwxrwxrwx	root/root	usr/lib/libpng14.so.14 -> libpng14.so.14.1.0
+-rwxr-xr-x	root/root	usr/lib/libpng14.so.14.1.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
-lrwxrwxrwx	root/root	usr/lib/pkgconfig/libpng.pc -> libpng12.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/libpng12.pc
+lrwxrwxrwx	root/root	usr/lib/pkgconfig/libpng.pc -> libpng14.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libpng14.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man3/
diff --git a/base/libpng/.md5sum b/base/libpng/.md5sum
index e5a02bda2..8bfd4b7d8 100644
--- a/base/libpng/.md5sum
+++ b/base/libpng/.md5sum
@@ -1,2 +1 @@
-bc93c1cd8625811d1311d2957b947e7b  libpng-1.2.39-apng-1.patch
-4d48ecff6fc7ab12e97b07d0f65ec2f0  libpng-1.2.39.tar.bz2
+e1767bf290ded9fda9ee05bd23ae4cff  libpng-1.4.1.tar.bz2
diff --git a/base/libpng/Pkgfile b/base/libpng/Pkgfile
index b4268f7be..36d533ca7 100755
--- a/base/libpng/Pkgfile
+++ b/base/libpng/Pkgfile
@@ -4,15 +4,15 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=libpng
-version=1.2.39
+version=1.4.1
 release=1
-source=( http://downloads.sourceforge.net/$name/$name-$version.tar.bz2 \
-	http://kiao.no-ip.info/NuTyX/files/libpng-$version-apng-1.patch)
+source=( http://downloads.sourceforge.net/$name/$name-$version.tar.bz2 )
+#	http://kiao.no-ip.info/NuTyX/files/libpng-$version-apng-1.patch)
 
 
 build() {
 	cd $name-$version
-	patch -Np1 -i ../libpng-$version-apng-1.patch
+#	patch -Np1 -i ../libpng-$version-apng-1.patch
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \