filesystem

1 files changed, 74 insertions, 89 deletions

diff --git a/abs/core/filesystem/PKGBUILD b/abs/core/filesystem/PKGBUILD
index 01b8a0d..0098c1f 100644
--- a/abs/core/filesystem/PKGBUILD
+++ b/abs/core/filesystem/PKGBUILD
@@ -1,111 +1,96 @@
-# $Id: PKGBUILD 96685 2010-10-24 09:56:25Z pierre $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 163828 2012-07-20 23:48:47Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 
 pkgname=filesystem
-pkgver=2010.10
+pkgver=2012.7
 pkgrel=1
-pkgdesc="Base filesystem"
+pkgdesc='Base filesystem'
 arch=('any')
 license=('GPL')
-url="http://www.archlinux.org"
+url='http://www.archlinux.org'
 groups=('base')
-install=filesystem.install
-# These dependencies are not needed for initial installation.
-# They are only required on upgrade to create missing groups.
-#depends=('sh' 'coreutils')
-depends=('iana-etc')
-backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd
-        etc/shadow etc/gshadow etc/resolv.conf etc/motd etc/nsswitch.conf
-        etc/shells etc/host.conf etc/securetty etc/profile )
-source=(group  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'
-         '1bdc5dba66947d74866a5df8ce9ef3b1'
-         '13753e4e0964f3652b0cc60a28528bdf'
-         '933dee67c58d452334d342c294342910'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '8a9042a2cedf6b6b47eb8973f14289cb'
-         'b8355d9d2782f424f4cedcf682651be0'
-         'ef40305da5803ca69d22e428ffc2ab9b'
-         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
-         '81b3cb42a6ddabc2ed2310511ee9c859'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '40dac0de4c6b99c8ca97effbd7527c84'
-         '5340b9287b71ffe9d4d99510bffe933f'
-         'ccc4e6292ae594f16b44c66c7769765c'
-         '8098ffd9fbf890468d3198277596b85a')
-
-build()
-{
-  cd ${pkgdir}
-  mkdir -p bin boot dev etc home lib media mnt proc root sbin tmp usr var opt srv sys
-  chmod 555 proc
-  mkdir -p usr/{bin,include,lib,sbin,share/misc,src}
-
-  mkdir -p usr/share/man/man{1,2,3,4,5,6,7,8}
-
-  # fhs compliance
-  mkdir -p usr/local/{bin,games,include,lib,man,sbin,share,src}
-  ln -s ../man ${pkgdir}/usr/local/share/man
-  mkdir -p var/{cache/man,local,lock,opt,run,spool/mail,tmp,games}
-  chmod 1777 var/lock
-  mkdir -p var/log/old
-  mkdir -p etc/{ld.so.conf.d,skel,profile.d}
-  mkdir -p lib/modules
-  mkdir -p var/lib/misc
-  (cd ${pkgdir}/var; ln -s spool/mail mail)
+install='filesystem.install'
+depends=('iana-etc' 'bash' 'coreutils')
+backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
+        'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
+        'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
+source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
+        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
+        'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
 
-  # vsftpd won't run with write perms on /srv/ftp
-  mkdir -p srv/ftp
-  chown root.ftp srv/ftp
-  chmod 555 srv/ftp
+package() {
+	cd ${pkgdir}
 
-  install -d -o root -g root -m 755 srv/http
+	#
+	# setup root filesystem
+	#
+	for d in boot dev etc home media mnt usr var opt srv/http run; do
+		install -d -m755 ${d}
+	done
+	install -d -m555 proc
+	install -d -m555 sys
+	install -d -m0750 root
+	install -d -m1777 tmp
+	# vsftpd won't run with write perms on /srv/ftp
+	install -d -m555 -g ftp srv/ftp
 
-  chmod 1777 var/spool/mail tmp var/tmp
-  chmod 0750 root
+	# setup /etc
+	install -d etc/{ld.so.conf.d,skel,profile.d}
+	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do
+		install -m644 ${srcdir}/${f} etc/
+	done
+	ln -s /proc/self/mounts etc/mtab
+	for f in gshadow shadow crypttab; do
+		install -m600 ${srcdir}/${f} etc/
+	done
+	touch etc/arch-release
+	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
 
-  #Allow setgid games to write scores:
-  chmod 775 ${pkgdir}/var/games
-  chown root:50 ${pkgdir}/var/games
+	# setup /var
+	for d in cache/man local opt log/old lib/misc empty; do
+		install -d -m755 var/${d}
+	done
+	install -d -m1777 var/{tmp,spool/mail}
+	# allow setgid games to write scores
+	install -d -m775 -g games var/games
+	ln -s spool/mail var/mail
+	ln -s ../run var/run
+	ln -s ../run/lock var/lock
 
-  cd ${srcdir}
-  cp fstab crypttab group host.conf hosts  ld.so.conf motd nsswitch.conf \
-    passwd resolv.conf securetty shadow shells profile \
-    ${pkgdir}/etc/
-  install -m 600 ${srcdir}/gshadow ${pkgdir}/etc/gshadow
-  chmod 600 ${pkgdir}/etc/shadow
-  chmod 600 ${pkgdir}/etc/crypttab
+	#
+	# setup /usr hierarchy
+	#
+	for d in bin include lib sbin share/misc src; do
+		install -d -m755 usr/${d}
+	done
+	for d in $(seq 8); do
+		install -d -m755 usr/share/man/man${d}
+	done
 
-  # re-add /etc/arch-release, some software uses it
-  # to check whether arch is running
-  touch ${pkgdir}/etc/arch-release
-  
-  # Add /etc/modprobe.d/
-  install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first \
-    ${pkgdir}/etc/modprobe.d/usb-load-ehci-first.conf
 
-  # Prevent pacman from removing directory (FS#16886)
-  mkdir ${pkgdir}/var/empty
-  touch ${pkgdir}/var/empty/.keep
+	#
+	# setup /usr/local hierarchy
+	#
+	for d in bin etc games include lib man sbin share src; do
+		install -d -m755 usr/local/${d}
+	done
+	ln -s ../man usr/local/share/man
 }
-md5sums=('75c7e1770305e1f3b75c52785c137611'
+md5sums=('45940618da782cc391c59f88ab3333c3'
+         'b153cc716cd73e8ec17bc27fa127d052'
          '13753e4e0964f3652b0cc60a28528bdf'
-         'f97799ef3d8990f2eda9166122d8d5aa'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
          'f28150d4c0b22a017be51b9f7f9977ed'
          '6e488ffecc8ba142c0cf7e2d7aeb832e'
          '8a9042a2cedf6b6b47eb8973f14289cb'
          'b8355d9d2782f424f4cedcf682651be0'
-         'ef40305da5803ca69d22e428ffc2ab9b'
+         'ca716f853860199c1286e7939b2f2666'
          'e5d8323a4dbee7a6d0d2a19cbf4b819f'
-         '81b3cb42a6ddabc2ed2310511ee9c859'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
          'd41d8cd98f00b204e9800998ecf8427e'
+         'c1e795aa3bae70bf0fb76b8a720e4825'
          '6f48288b6fcaf0065fcb7b0e525413e0'
-         '40dac0de4c6b99c8ca97effbd7527c84'
-         '5340b9287b71ffe9d4d99510bffe933f'
-         'ccc4e6292ae594f16b44c66c7769765c'
-         '8098ffd9fbf890468d3198277596b85a')
+         '22518e922891f9359f971f4f5b4e793c'
+         'f95416882cef800edef08382a1176b7d'
+         'f3b6ae7db8adffaaa4bffc6099dcbd50'
+         'a8a962370cd0128465d514e6a1f74130')