Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

16 files changed, 36 insertions, 33 deletions

diff --git a/base/httrack/.footprint.i686 b/base/httrack/.footprint.i686
index e7cf23e34..f3d4cbd82 100644
--- a/base/httrack/.footprint.i686
+++ b/base/httrack/.footprint.i686
@@ -70,14 +70,14 @@ lrwxrwxrwx	root/root	usr/lib/httrack/libsimple.so.1 -> libsimple.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/httrack/libsimple.so.1.0.0
 -rw-r--r--	root/root	usr/lib/libhtsjava.a
 -rwxr-xr-x	root/root	usr/lib/libhtsjava.la
-lrwxrwxrwx	root/root	usr/lib/libhtsjava.so -> libhtsjava.so.2.0.43
-lrwxrwxrwx	root/root	usr/lib/libhtsjava.so.2 -> libhtsjava.so.2.0.43
--rwxr-xr-x	root/root	usr/lib/libhtsjava.so.2.0.43
+lrwxrwxrwx	root/root	usr/lib/libhtsjava.so -> libhtsjava.so.2.0.44
+lrwxrwxrwx	root/root	usr/lib/libhtsjava.so.2 -> libhtsjava.so.2.0.44
+-rwxr-xr-x	root/root	usr/lib/libhtsjava.so.2.0.44
 -rw-r--r--	root/root	usr/lib/libhttrack.a
 -rwxr-xr-x	root/root	usr/lib/libhttrack.la
-lrwxrwxrwx	root/root	usr/lib/libhttrack.so -> libhttrack.so.2.0.43
-lrwxrwxrwx	root/root	usr/lib/libhttrack.so.2 -> libhttrack.so.2.0.43
--rwxr-xr-x	root/root	usr/lib/libhttrack.so.2.0.43
+lrwxrwxrwx	root/root	usr/lib/libhttrack.so -> libhttrack.so.2.0.44
+lrwxrwxrwx	root/root	usr/lib/libhttrack.so.2 -> libhttrack.so.2.0.44
+-rwxr-xr-x	root/root	usr/lib/libhttrack.so.2.0.44
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/WebHTTrack-Websites.desktop
diff --git a/base/httrack/.footprint.x86_64 b/base/httrack/.footprint.x86_64
index e7cf23e34..f3d4cbd82 100644
--- a/base/httrack/.footprint.x86_64
+++ b/base/httrack/.footprint.x86_64
@@ -70,14 +70,14 @@ lrwxrwxrwx	root/root	usr/lib/httrack/libsimple.so.1 -> libsimple.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/httrack/libsimple.so.1.0.0
 -rw-r--r--	root/root	usr/lib/libhtsjava.a
 -rwxr-xr-x	root/root	usr/lib/libhtsjava.la
-lrwxrwxrwx	root/root	usr/lib/libhtsjava.so -> libhtsjava.so.2.0.43
-lrwxrwxrwx	root/root	usr/lib/libhtsjava.so.2 -> libhtsjava.so.2.0.43
--rwxr-xr-x	root/root	usr/lib/libhtsjava.so.2.0.43
+lrwxrwxrwx	root/root	usr/lib/libhtsjava.so -> libhtsjava.so.2.0.44
+lrwxrwxrwx	root/root	usr/lib/libhtsjava.so.2 -> libhtsjava.so.2.0.44
+-rwxr-xr-x	root/root	usr/lib/libhtsjava.so.2.0.44
 -rw-r--r--	root/root	usr/lib/libhttrack.a
 -rwxr-xr-x	root/root	usr/lib/libhttrack.la
-lrwxrwxrwx	root/root	usr/lib/libhttrack.so -> libhttrack.so.2.0.43
-lrwxrwxrwx	root/root	usr/lib/libhttrack.so.2 -> libhttrack.so.2.0.43
--rwxr-xr-x	root/root	usr/lib/libhttrack.so.2.0.43
+lrwxrwxrwx	root/root	usr/lib/libhttrack.so -> libhttrack.so.2.0.44
+lrwxrwxrwx	root/root	usr/lib/libhttrack.so.2 -> libhttrack.so.2.0.44
+-rwxr-xr-x	root/root	usr/lib/libhttrack.so.2.0.44
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/WebHTTrack-Websites.desktop
diff --git a/base/httrack/.md5sum.i686 b/base/httrack/.md5sum.i686
index 9d28b3dec..dbb4a741a 100644
--- a/base/httrack/.md5sum.i686
+++ b/base/httrack/.md5sum.i686
@@ -1 +1 @@
-065d2d7d37e99ab788fe4968bc947ac8  httrack-3.43.12.tar.gz
+7aaf56913388adfdba506c346c2ca020  httrack-3.44.1.tar.gz
diff --git a/base/httrack/.md5sum.x86_64 b/base/httrack/.md5sum.x86_64
index 9d28b3dec..dbb4a741a 100644
--- a/base/httrack/.md5sum.x86_64
+++ b/base/httrack/.md5sum.x86_64
@@ -1 +1 @@
-065d2d7d37e99ab788fe4968bc947ac8  httrack-3.43.12.tar.gz
+7aaf56913388adfdba506c346c2ca020  httrack-3.44.1.tar.gz
diff --git a/base/httrack/Pkgfile b/base/httrack/Pkgfile
index 0a0a4e2c2..19fc95fad 100644
--- a/base/httrack/Pkgfile
+++ b/base/httrack/Pkgfile
@@ -4,11 +4,13 @@
 # Packager: fanch
 
 name=httrack
-version=3.43.12
+version=3.44.1
+#3.43.12
 release=1
 source=(http://download.httrack.com/$name-$version.tar.gz)
 
 build() {
+	unset MAKEFLAGS
 	cd $name-$version
         ./configure --prefix=/usr
         make
diff --git a/base/jdk/.footprint.x86_64 b/base/jdk/.footprint.x86_64
index 95e0f83ff..b6dcd48b2 100644
--- a/base/jdk/.footprint.x86_64
+++ b/base/jdk/.footprint.x86_64
@@ -6,8 +6,6 @@ drwxr-xr-x	root/root	opt/jdk/
 -r--r--r--	root/root	opt/jdk/COPYRIGHT
 -rw-r--r--	root/root	opt/jdk/LICENSE
 -rw-r--r--	root/root	opt/jdk/README.html
--r--r--r--	root/root	opt/jdk/README_ja.html
--r--r--r--	root/root	opt/jdk/README_zh_CN.html
 -r--r--r--	root/root	opt/jdk/THIRDPARTYLICENSEREADME.txt
 drwxr-xr-x	root/root	opt/jdk/bin/
 lrwxrwxrwx	root/root	opt/jdk/bin/ControlPanel -> ../jre/bin/ControlPanel
@@ -322,6 +320,8 @@ drwxr-xr-x	root/root	opt/jdk/jre/lib/ext/
 -rw-r--r--	root/root	opt/jdk/jre/lib/fontconfig.RedHat.3.properties.src
 -r--r--r--	root/root	opt/jdk/jre/lib/fontconfig.RedHat.4.bfc
 -rw-r--r--	root/root	opt/jdk/jre/lib/fontconfig.RedHat.4.properties.src
+-r--r--r--	root/root	opt/jdk/jre/lib/fontconfig.RedHat.6.0.bfc
+-rw-r--r--	root/root	opt/jdk/jre/lib/fontconfig.RedHat.6.0.properties.src
 -r--r--r--	root/root	opt/jdk/jre/lib/fontconfig.RedHat.bfc
 -rw-r--r--	root/root	opt/jdk/jre/lib/fontconfig.RedHat.properties.src
 -r--r--r--	root/root	opt/jdk/jre/lib/fontconfig.SuSE.11.bfc
@@ -598,6 +598,7 @@ drwxr-xr-x	root/root	opt/jdk/jre/lib/zi/America/Kentucky/
 -rw-r--r--	root/root	opt/jdk/jre/lib/zi/America/Nome
 -rw-r--r--	root/root	opt/jdk/jre/lib/zi/America/Noronha
 drwxr-xr-x	root/root	opt/jdk/jre/lib/zi/America/North_Dakota/
+-rw-r--r--	root/root	opt/jdk/jre/lib/zi/America/North_Dakota/Beulah
 -rw-r--r--	root/root	opt/jdk/jre/lib/zi/America/North_Dakota/Center
 -rw-r--r--	root/root	opt/jdk/jre/lib/zi/America/North_Dakota/New_Salem
 -rw-r--r--	root/root	opt/jdk/jre/lib/zi/America/Ojinaga
diff --git a/base/jdk/.md5sum.x86_64 b/base/jdk/.md5sum.x86_64
index be1800f98..764ae2b23 100644
--- a/base/jdk/.md5sum.x86_64
+++ b/base/jdk/.md5sum.x86_64
@@ -1,3 +1,3 @@
 94065b612df0046d9ae758943f9f6a75  construct.sh
-51a388560b0125456d982cdab1ad4fdd  jdk-6u24-dlj-linux-amd64.bin
+bc239ea3f5e2ef067fb4eee79afeab9f  jdk-6u25-dlj-linux-amd64.bin
 c51e76d9742a5d3b0cd8b2394b881160  jdk.sh
diff --git a/base/jdk/Pkgfile b/base/jdk/Pkgfile
index 8f026356c..48dfdfe6f 100644
--- a/base/jdk/Pkgfile
+++ b/base/jdk/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=jdk
-version=6u24
+version=6u25
 release=1
 [ "`uname -m`" == "i686"   ] && _ARCH=i586
 [ "`uname -m`" == "x86_64"   ] && _ARCH=amd64
diff --git a/base/libpng/.footprint.i686 b/base/libpng/.footprint.i686
index fd4959cbe..6f4a90cc4 100644
--- a/base/libpng/.footprint.i686
+++ b/base/libpng/.footprint.i686
@@ -16,9 +16,9 @@ lrwxrwxrwx	root/root	usr/lib/libpng.la -> libpng15.la
 lrwxrwxrwx	root/root	usr/lib/libpng.so -> libpng15.so
 -rw-r--r--	root/root	usr/lib/libpng15.a
 -rwxr-xr-x	root/root	usr/lib/libpng15.la
-lrwxrwxrwx	root/root	usr/lib/libpng15.so -> libpng15.so.15.1.0
-lrwxrwxrwx	root/root	usr/lib/libpng15.so.15 -> libpng15.so.15.1.0
--rwxr-xr-x	root/root	usr/lib/libpng15.so.15.1.0
+lrwxrwxrwx	root/root	usr/lib/libpng15.so -> libpng15.so.15.2.0
+lrwxrwxrwx	root/root	usr/lib/libpng15.so.15 -> libpng15.so.15.2.0
+-rwxr-xr-x	root/root	usr/lib/libpng15.so.15.2.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 lrwxrwxrwx	root/root	usr/lib/pkgconfig/libpng.pc -> libpng15.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpng15.pc
diff --git a/base/libpng/.footprint.x86_64 b/base/libpng/.footprint.x86_64
index fd4959cbe..6f4a90cc4 100644
--- a/base/libpng/.footprint.x86_64
+++ b/base/libpng/.footprint.x86_64
@@ -16,9 +16,9 @@ lrwxrwxrwx	root/root	usr/lib/libpng.la -> libpng15.la
 lrwxrwxrwx	root/root	usr/lib/libpng.so -> libpng15.so
 -rw-r--r--	root/root	usr/lib/libpng15.a
 -rwxr-xr-x	root/root	usr/lib/libpng15.la
-lrwxrwxrwx	root/root	usr/lib/libpng15.so -> libpng15.so.15.1.0
-lrwxrwxrwx	root/root	usr/lib/libpng15.so.15 -> libpng15.so.15.1.0
--rwxr-xr-x	root/root	usr/lib/libpng15.so.15.1.0
+lrwxrwxrwx	root/root	usr/lib/libpng15.so -> libpng15.so.15.2.0
+lrwxrwxrwx	root/root	usr/lib/libpng15.so.15 -> libpng15.so.15.2.0
+-rwxr-xr-x	root/root	usr/lib/libpng15.so.15.2.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 lrwxrwxrwx	root/root	usr/lib/pkgconfig/libpng.pc -> libpng15.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpng15.pc
diff --git a/base/libpng/.md5sum.i686 b/base/libpng/.md5sum.i686
index 636253c52..542e7537c 100644
--- a/base/libpng/.md5sum.i686
+++ b/base/libpng/.md5sum.i686
@@ -1,2 +1,2 @@
-d425da50c9425b31e8061b146e5df32f  libpng-1.5.1-apng.patch.gz
-8fdcb7c0e78d54ff0362a800cbe3bc31  libpng-1.5.1.tar.bz2
+5f3374ab2554920cc8a64c4b01a32af1  libpng-1.5.2-apng.patch.gz
+a003b37ed9afb0d9164eb7228421057c  libpng-1.5.2.tar.bz2
diff --git a/base/libpng/.md5sum.x86_64 b/base/libpng/.md5sum.x86_64
index 636253c52..542e7537c 100644
--- a/base/libpng/.md5sum.x86_64
+++ b/base/libpng/.md5sum.x86_64
@@ -1,2 +1,2 @@
-d425da50c9425b31e8061b146e5df32f  libpng-1.5.1-apng.patch.gz
-8fdcb7c0e78d54ff0362a800cbe3bc31  libpng-1.5.1.tar.bz2
+5f3374ab2554920cc8a64c4b01a32af1  libpng-1.5.2-apng.patch.gz
+a003b37ed9afb0d9164eb7228421057c  libpng-1.5.2.tar.bz2
diff --git a/base/libpng/Pkgfile b/base/libpng/Pkgfile
index e60ba9f55..a91dcd0e0 100755
--- a/base/libpng/Pkgfile
+++ b/base/libpng/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=libpng
-version=1.5.1
+version=1.5.2
 release=1
 source=( http://downloads.sourceforge.net/$name/$name-$version.tar.bz2 \
 	http://downloads.sourceforge.net/sourceforge/libpng-apng/$name-$version-apng.patch.gz)
diff --git a/base/sip/.md5sum.i686 b/base/sip/.md5sum.i686
index 7bd7b06a5..42c1c513d 100644
--- a/base/sip/.md5sum.i686
+++ b/base/sip/.md5sum.i686
@@ -1 +1 @@
-0f8e8305b14c1812191de2e0ee22fea9  sip-4.12.1.tar.gz
+9df80f88e0e4022cdd8a8891c6c38048  sip-4.12.2.tar.gz
diff --git a/base/sip/.md5sum.x86_64 b/base/sip/.md5sum.x86_64
index 7bd7b06a5..42c1c513d 100644
--- a/base/sip/.md5sum.x86_64
+++ b/base/sip/.md5sum.x86_64
@@ -1 +1 @@
-0f8e8305b14c1812191de2e0ee22fea9  sip-4.12.1.tar.gz
+9df80f88e0e4022cdd8a8891c6c38048  sip-4.12.2.tar.gz
diff --git a/base/sip/Pkgfile b/base/sip/Pkgfile
index 326981899..e88c825cc 100644
--- a/base/sip/Pkgfile
+++ b/base/sip/Pkgfile
@@ -6,7 +6,7 @@
 # Run on:
 
 name=sip
-version=4.12.1
+version=4.12.2
 release=1
 source=(http://www.riverbankcomputing.com/static/Downloads/sip4/$name-$version.tar.gz)