Updates

4 files changed, 45 insertions, 17 deletions

diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD
index 9c03696d4..e17c3f9cf 100644
--- a/core/mkinitcpio-busybox/PKGBUILD
+++ b/core/mkinitcpio-busybox/PKGBUILD
@@ -21,7 +21,7 @@ build() {
 
   case $CARCH in
   mips64el)
-    local safeflags='-O2 -march=loongson2f -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing' ;;
+    local safeflags='loongson2f -O2 -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing' ;;
   *)
     local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" ;;
   esac
diff --git a/core/mkinitcpio/PKGBUILD b/core/mkinitcpio/PKGBUILD
index 49ca6284c..faed61e50 100644
--- a/core/mkinitcpio/PKGBUILD
+++ b/core/mkinitcpio/PKGBUILD
@@ -1,13 +1,12 @@
 pkgname=mkinitcpio
-pkgver=0.7.4
+pkgver=0.7.5
 pkgrel=1
-epoch=14
 pkgdesc="Modular initramfs image creation utility"
 arch=('mips64el')
 url="http://www.archlinux.org/"
 license=('GPL')
 depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils'
-         'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=171-2' 'file' 'gzip')
+         'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=174-1' 'file' 'gzip')
 optdepends=('xz: Use lzma or xz compression for the initramfs image'
             'bzip2: Use bzip2 compression for the initramfs image'
             'lzop: Use lzo compression for the initramfs image'
@@ -17,7 +16,7 @@ replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
 	'patch.patch')
 backup=(etc/mkinitcpio.conf)
-sha256sums=('60ce2c78ecec35a9762c300774753da6870b4469f3b259fe0c116771ff643fd6'
+sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9'
 	    'abf6bb9d692838cc2f97f12f0901f0209dbf6f437f9590accd26dbcfc48f1b16')
 
 package() {
@@ -26,4 +25,6 @@ package() {
   patch install/base ../patch.patch
 
   make DESTDIR="$pkgdir" install
-}
\ No newline at end of file
+}
+sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9'
+            'bb6517e0497cc43aea1287e43b0be2892b7af74add5eca3f3740b091f997729e')
diff --git a/core/mkinitcpio/patch.patch b/core/mkinitcpio/patch.patch
index ce3553557..62dadac32 100644
--- a/core/mkinitcpio/patch.patch
+++ b/core/mkinitcpio/patch.patch
@@ -1,4 +1,11 @@
-4c4
-<     for dir in proc sys dev run usr/{bin,sbin}; do
----
->     for dir in lib32 proc sys dev run usr/{bin,sbin}; do # Added `lib32' like fauno told me to.
+--- install/base	2011-10-22 12:37:45.000000000 -0300
++++ install/base.orig	2011-11-03 19:54:45.574991740 -0300
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ 
+ build() {
+-    for dir in new_root proc sys dev run usr/{bin,sbin}; do
++    for dir in new_root proc sys dev run usr/{bin,sbin} lib32; do
+         add_dir "/$dir"
+     done
+ 
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index a0237888d..e5c5da68a 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -17,24 +17,23 @@ backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         'fix-manpages.patch'
         'no-rpath.patch'
+        'gnu-linux-mips64el-gcc.patch'
         'ca-dir.patch')
 md5sums=('7040b89c4c58c7a1016c0dfa6e821c86'
          '5bbc0655bda2af95bc8eb568963ce8ba'
          'dc78d3d06baffc16217519242ce92478'
+         'd7115f0cc44df346d7b68c681819f94b'
          '3bf51be3a1bbd262be46dc619f92aa90')
 
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('imake')
+
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
 
 build() {
 	cd $srcdir/$pkgname-$_ver
 
-	if [ "${CARCH}" == 'x86_64' ]; then
-		openssltarget='linux-x86_64'
-	elif [ "${CARCH}" == 'i686' ]; then
-		openssltarget='linux-elf'
-	fi
-
 	# avoid conflicts with other man pages
 	# see http://www.linuxfromscratch.org/patches/downloads/openssl/
 	patch -p1 -i $srcdir/fix-manpages.patch
@@ -42,11 +41,32 @@ build() {
 	patch -p0 -i $srcdir/no-rpath.patch
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i $srcdir/ca-dir.patch
+
+	patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch
+
+  case "${CARCH}" in
+	'x86_64')
+		openssltarget='linux-x86_64' ;;
+	'i686')
+		openssltarget='linux-elf' ;;
+	'mips64el')
+#    ./config
+		openssltarget='gnu-linux-mips64el-gcc' ;;
+	#	openssltarget='linux-generic32' ;;
+	esac
+
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+  if [ "$CARCH" = "mips64el" ]; then
+	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
+		shared zlib enable-md2 \
+		"${openssltarget}" -Wa,--noexecstack "${CFLAGS}"
+  else
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
 		shared zlib enable-md2 \
 		"${openssltarget}" \
-		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
+    -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
+
+  fi
 
 	make depend
 	make