From 0fe6fcf8be501e25f4d0094dfe22fd5cb19ab7e4 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Tue, 24 Jan 2012 22:06:38 +0100
Subject: [PATCH] filesystem: bump to 2012.01

---
 filesystem/PKGBUILD           | 12 ++++++------
 filesystem/filesystem.install | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD
index f38d18202..822d01cad 100644
--- a/filesystem/PKGBUILD
+++ b/filesystem/PKGBUILD
@@ -5,8 +5,8 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=filesystem
-pkgver=2011.12
-pkgrel=2
+pkgver=2012.01
+pkgrel=1
 _codename=Edn
 pkgdesc="Base filesystem"
 arch=('any')
@@ -20,7 +20,7 @@ backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd
         etc/shells etc/host.conf etc/securetty etc/profile etc/issue
         etc/chakra-release)
 source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.xz")
-md5sums=('0b81a2221c3222bb852711844cc01220')
+md5sums=(12b33ab00a115c422c85bc1b6355eaa9)
 
 # create tarball: source PKGBUILD && mksource
 
@@ -67,17 +67,17 @@ package() {
 	#
 	# setup /var
 	#
-	for d in cache/man local opt run log/old lib/misc empty; do
+	for d in cache/man local opt log/old lib/misc empty; do
 		install -d -m755 ${pkgdir}/var/${d}
 	done
 
-	install -d -m1777 ${pkgdir}/var/{lock,tmp,spool/mail}
+	install -d -m1777 ${pkgdir}/var/{tmp,spool/mail}
 
 	#
 	# allow setgid games to write scores
 	#
 	install -d -m775 -g games ${pkgdir}/var/games
-	ln -s spool/mail ${pkgdir}/var/mail
+	ln -s /var/spool/mail ${pkgdir}/var/mail
 
 	#
 	# prevent pacman from removing directory (FS#16886)
diff --git a/filesystem/filesystem.install b/filesystem/filesystem.install
index 75f1c7921..d5f34a376 100644
--- a/filesystem/filesystem.install
+++ b/filesystem/filesystem.install
@@ -5,11 +5,14 @@ post_install() {
 	chown root:20 var/run/utmp
 	chmod 664 var/run/utmp
 	[ -f var/log/btmp ]    || (: >var/log/btmp && bin/chmod 600 var/log/btmp)
+	# link conflicting folders
+	ln -sf /proc/self/mounts etc/mtab
+	ln -sf /run var/run
+	ln -sf /run/lock var/lock
 	# workaround for bug #7194
 	# readded due to bug #9465
 	# please do not remove!
 	bin/chmod 1777 var/spool/mail tmp var/tmp var/lock
-	ln -sf /proc/self/mounts etc/mtab
 }
 
 # args: <group> [options]
@@ -29,6 +32,14 @@ _adduser() {
 post_upgrade() {
 	post_install
 
+	if [ "$(vercmp $2 2012.02)" -lt 0 ]; then
+	  echo "Your system might have a damaged /etc/fstab"
+	  echo "please remove any /tmp (tmpfs /tmp tmpfs nodev,nosuid 0 0) line "
+	  echo "and add followed instead:"
+	  echo "devpts                 /dev/pts      devpts    defaults            0      0"
+	  echo "shm                    /dev/shm      tmpfs     nodev,nosuid        0      0"
+	fi
+
 	_addgroup cdemu   -g 103
 	_addgroup optical -g 93
 	_addgroup audio   -g 92