Merge branch 'master' of ssh://192.168.254.254:443/~/pakxe

10 files changed, 31 insertions, 28 deletions

diff --git a/kernel/post-install b/kernel/post-install
index faed640f7..a93807626 100644
--- a/kernel/post-install
+++ b/kernel/post-install
@@ -1,4 +1,4 @@
-version=3.1.6
+version=3.2.1
 if [ ! -d /lib/modules/${version} ]; then
 	echo "post-install impossible"
 	echo "/lib/modules/${version} pas trouvé"
diff --git a/openssl/.md5sum.i686 b/openssl/.md5sum.i686
index db5e684d6..1233e6c41 100644
--- a/openssl/.md5sum.i686
+++ b/openssl/.md5sum.i686
@@ -1,3 +1,3 @@
 3bf51be3a1bbd262be46dc619f92aa90  openssl-1.0.0c-ca-dir.patch
 dc78d3d06baffc16217519242ce92478  openssl-1.0.0c-no-rpath.patch
-7040b89c4c58c7a1016c0dfa6e821c86  openssl-1.0.0e.tar.gz
+07ecbe4324f140d157478637d6beccf1  openssl-1.0.0g.tar.gz
diff --git a/openssl/.md5sum.x86_64 b/openssl/.md5sum.x86_64
index db5e684d6..1233e6c41 100644
--- a/openssl/.md5sum.x86_64
+++ b/openssl/.md5sum.x86_64
@@ -1,3 +1,3 @@
 3bf51be3a1bbd262be46dc619f92aa90  openssl-1.0.0c-ca-dir.patch
 dc78d3d06baffc16217519242ce92478  openssl-1.0.0c-no-rpath.patch
-7040b89c4c58c7a1016c0dfa6e821c86  openssl-1.0.0e.tar.gz
+07ecbe4324f140d157478637d6beccf1  openssl-1.0.0g.tar.gz
diff --git a/openssl/Pkgfile b/openssl/Pkgfile
index d7a81ecfd..caeda5877 100755
--- a/openssl/Pkgfile
+++ b/openssl/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=openssl
-version=1.0.0e
+version=1.0.0g
 release=1
 source=(http://www.openssl.org/source/$name-$version.tar.gz
 	openssl-1.0.0c-ca-dir.patch
diff --git a/pkg-get/.footprint.i686 b/pkg-get/.footprint.i686
index a7cdc34c6..3d58d2fb9 100644
--- a/pkg-get/.footprint.i686
+++ b/pkg-get/.footprint.i686
@@ -1,5 +1,5 @@
 drwxr-xr-x	root/root	etc/
--rwxr-xr-x	root/root	etc/pkg-get.conf
+-rw-r--r--	root/root	etc/pkg-get.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/pkg-get
diff --git a/pkg-get/.footprint.x86_64 b/pkg-get/.footprint.x86_64
index a7cdc34c6..3d58d2fb9 100644
--- a/pkg-get/.footprint.x86_64
+++ b/pkg-get/.footprint.x86_64
@@ -1,5 +1,5 @@
 drwxr-xr-x	root/root	etc/
--rwxr-xr-x	root/root	etc/pkg-get.conf
+-rw-r--r--	root/root	etc/pkg-get.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/pkg-get
diff --git a/pkg-get/.md5sum.i686 b/pkg-get/.md5sum.i686
index 07209fb2f..24e92d1de 100644
--- a/pkg-get/.md5sum.i686
+++ b/pkg-get/.md5sum.i686
@@ -1,2 +1,2 @@
-48ab36d988e6dae3ff3d41e32fd39e8f  pkg-get-0.3.94.tar.gz
+221d3df546d67b4b8bfbf09c723b3f91  pkg-get-0.3.95.2.tar.gz
 4b2308a5898180c997380228c0dc893b  syn
diff --git a/pkg-get/.md5sum.x86_64 b/pkg-get/.md5sum.x86_64
index 07209fb2f..24e92d1de 100644
--- a/pkg-get/.md5sum.x86_64
+++ b/pkg-get/.md5sum.x86_64
@@ -1,2 +1,2 @@
-48ab36d988e6dae3ff3d41e32fd39e8f  pkg-get-0.3.94.tar.gz
+221d3df546d67b4b8bfbf09c723b3f91  pkg-get-0.3.95.2.tar.gz
 4b2308a5898180c997380228c0dc893b  syn
diff --git a/pkg-get/Pkgfile b/pkg-get/Pkgfile
index d32cf2c10..d3e5c0b28 100644
--- a/pkg-get/Pkgfile
+++ b/pkg-get/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: curl
 
 name=pkg-get
-version=0.3.94
+version=0.3.95.2
 release=1
 source=(http://nutyx.meticul.eu/files/$name-$version.tar.gz \
 	syn)
@@ -16,6 +16,5 @@ build()
 	make clean
 	make
 	make DESTDIR=$PKG install	
-	sed -i "s/uname-m/`uname -m`/g" $PKG/etc/pkg-get.conf
 	install -m 755 ../syn $PKG/usr/bin/syn
 }
diff --git a/readline/Pkgfile b/readline/Pkgfile
index 1f96dd177..b21a99b66 100755..100644
--- a/readline/Pkgfile
+++ b/readline/Pkgfile
@@ -5,26 +5,30 @@
 
 name=readline
 version=6.2
-release=1
+release=2
 source=( http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
+
 build() {
-cd $name-$version
-sed -i '/MV.*old/d' Makefile.in
-sed -i '/{OLDSUFF}/c:' support/shlib-install
+	cd $name-$version
+
+	export LDFLAGS="-I%{_includedir}/ncursesw -lncursesw"
+	sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
 
-./configure --prefix=/usr \
-	--mandir=/usr/share/man \
-        --infodir=/usr/share/info \
-	--libdir=/lib
-make SHLIBS=-lncurses
-make DESTDIR=$PKG install
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+	        --infodir=/usr/share/info \
+		--libdir=/lib \
+		--enable-multibyte \
+		--with-curses
+	make
+	make DESTDIR=$PKG install
 
-mkdir -p $PKG/usr/lib
-mv -v $PKG/lib/lib{readline,history}.a $PKG/usr/lib
-rm -v $PKG/lib/lib{readline,history}.so
-ln -sfv ../../lib/libreadline.so.6 $PKG/usr/lib/libreadline.so
-ln -sfv ../../lib/libhistory.so.6 $PKG/usr/lib/libhistory.so
-if [ -f $PKG/usr/share/info/dir ]; then
-	rm $PKG/usr/share/info/dir
-fi
+	mkdir -p $PKG/usr/lib
+	mv -v $PKG/lib/lib{readline,history}.a $PKG/usr/lib
+	rm -v $PKG/lib/lib{readline,history}.so
+	ln -sfv ../../lib/libreadline.so.6 $PKG/usr/lib/libreadline.so
+	ln -sfv ../../lib/libhistory.so.6 $PKG/usr/lib/libhistory.so
+	if [ -f $PKG/usr/share/info/dir ]; then
+		rm $PKG/usr/share/info/dir
+	fi
 }