Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre

Conflicts:
	libre/kernel26-libre-lts/PKGBUILD
	libre/kernel26-libre-lts/config.x86_64

5 files changed, 26 insertions, 21 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index bdfbee155..7a9630c34 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
 pkgname=filesystem
-pkgver=2010.12
-pkgrel=2
+pkgver=2011.04
+pkgrel=1.1
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
@@ -18,23 +18,6 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc
 source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells'
         'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
-md5sums=('75c7e1770305e1f3b75c52785c137611'
-         '140787c0dc6f3f1272cfd381b92b0155'
-         '13753e4e0964f3652b0cc60a28528bdf'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '8a9042a2cedf6b6b47eb8973f14289cb'
-         'b8355d9d2782f424f4cedcf682651be0'
-         'ef40305da5803ca69d22e428ffc2ab9b'
-         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '40dac0de4c6b99c8ca97effbd7527c84'
-         '59768b5f4080b96b67bcde5f66984ad5'
-         '51ac5c337236235bf8fe85a9b07b6db1'
-         '8098ffd9fbf890468d3198277596b85a')
 
 package() {
 	cd ${srcdir}
@@ -42,7 +25,7 @@ package() {
 	#
 	# setup root filesystem
 	#
-	for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys; do
+	for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys run; do
 		install -d -m755 ${pkgdir}/${d}
 	done
 	install -d -m555 ${pkgdir}/proc
@@ -93,3 +76,20 @@ package() {
 	done
 	ln -s ../man ${pkgdir}/usr/local/share/man
 }
+md5sums=('772fe869b921698cc3e6fde73c4ac85a'
+         '140787c0dc6f3f1272cfd381b92b0155'
+         '13753e4e0964f3652b0cc60a28528bdf'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '8a9042a2cedf6b6b47eb8973f14289cb'
+         'b8355d9d2782f424f4cedcf682651be0'
+         'ef40305da5803ca69d22e428ffc2ab9b'
+         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '40dac0de4c6b99c8ca97effbd7527c84'
+         'd2dc4e39dbdea75b107f91789e3274ab'
+         'f3b6ae7db8adffaaa4bffc6099dcbd50'
+         '8098ffd9fbf890468d3198277596b85a')
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 4b2b261a4..640cd5c1d 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -2,6 +2,8 @@ post_install() {
 	[ -f var/log/lastlog ] ||  : >var/log/lastlog
 	[ -f var/log/wtmp ]    ||  : >var/log/wtmp
 	[ -f var/run/utmp ]    ||  : >var/run/utmp
+	chown root:20 var/run/utmp
+	chmod 664 var/run/utmp
 	[ -f var/log/btmp ]    || (: >var/log/btmp && bin/chmod 600 var/log/btmp)
 	# workaround for bug #7194
 	# readded due to bug #9465
@@ -32,6 +34,7 @@ post_upgrade() {
 	_addgroup floppy  -g 94
 	_addgroup storage -g 95
 	_addgroup log     -g 19
+	_addgroup utmp    -g 20
 	_addgroup power   -g 98
 	_addgroup network -g 90
 	_addgroup games   -g 50
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 4bd635c47..261746d9e 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -13,6 +13,7 @@ ftp:x:11:
 mail:x:12:
 uucp:x:14:
 log:x:19:root
+utmp:x:20:
 locate:x:21:
 rfkill:x:24:
 smmsp:x:25:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
index 06b488fe9..ed176823e 100644
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem/gshadow
@@ -13,6 +13,7 @@ ftp:::
 mail:::
 uucp:::
 log:::root
+utmp:x::
 locate:::
 rfkill:x::
 smmsp:::
diff --git a/libre/filesystem/profile b/libre/filesystem/profile
index ccc07a4e5..3bc22db9f 100644
--- a/libre/filesystem/profile
+++ b/libre/filesystem/profile
@@ -10,7 +10,7 @@ export PATH
 # Load profiles from /etc/profile.d
 if test -d /etc/profile.d/; then
 	for profile in /etc/profile.d/*.sh; do
-		test -r $profile && . $profile
+		test -r "$profile" && . "$profile"
 	done
 	unset profile
 fi