[arch-commits] CVS update of core/base/filesystem (PKGBUILD filesystem.install)

[Aaron Griffin]

    Date: Friday, January 11, 2008 @ 18:48:10
  Author: aaron
    Path: /home/cvs-core/core/base/filesystem

Modified: PKGBUILD (1.92 -> 1.93) filesystem.install (1.14 -> 1.15)

upgpkg: filesystem 2007.11-5
       Removal of /tmp workaround - FS#7194 close message
   Removal of pacman dirs - FS#6062 comments
   /proc permissions set to 555 - FS#8857


--------------------+
 PKGBUILD           |   11 ++++++-----
 filesystem.install |    9 ---------
 2 files changed, 6 insertions(+), 14 deletions(-)


Index: core/base/filesystem/PKGBUILD
diff -u core/base/filesystem/PKGBUILD:1.92 core/base/filesystem/PKGBUILD:1.93
--- core/base/filesystem/PKGBUILD:1.92	Thu Dec 20 03:19:26 2007
+++ core/base/filesystem/PKGBUILD	Fri Jan 11 18:48:10 2008
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD,v 1.92 2007/12/20 08:19:26 aaron Exp $
+# $Id: PKGBUILD,v 1.93 2008/01/11 23:48:10 aaron Exp $
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=filesystem
 pkgver=2007.11
-pkgrel=4
+pkgrel=5
 pkgdesc="Base filesystem"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.archlinux.org"
 groups=('base')
 install=filesystem.install
-depends=('sh' 'coreutils')
+#depends=('sh' '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)
@@ -50,16 +50,17 @@
 
   # fhs compliance
   mkdir -p usr/local/{bin,games,include,lib,man,sbin,share,src}
-  mkdir -p var/{cache/man,lib/pacman,abs,local,lock,opt,run,spool/mail,tmp,games}
+  mkdir -p var/{cache/man,local,lock,opt,run,spool/mail,tmp,games}
   mkdir -p var/log/old
   mkdir -p etc/{skel,profile.d}
-  mkdir -p home/ftp lib/modules
+  mkdir -p lib/modules
   (cd $startdir/pkg/usr; ln -s ../var var)
   (cd $startdir/pkg/var; ln -s spool/mail mail)
 
   # vsftpd won't run with write perms on /home/ftp
   chown root.ftp home/ftp
   chmod 555 home/ftp
+
   chmod 1777 var/spool/mail tmp var/tmp
   chmod 0750 root
 
Index: core/base/filesystem/filesystem.install
diff -u core/base/filesystem/filesystem.install:1.14 core/base/filesystem/filesystem.install:1.15
--- core/base/filesystem/filesystem.install:1.14	Sat May 19 13:21:12 2007
+++ core/base/filesystem/filesystem.install	Fri Jan 11 18:48:10 2008
@@ -4,11 +4,6 @@
   [ -f var/log/wtmp ]    ||  : >var/log/wtmp
   [ -f var/run/utmp ]    ||  : >var/run/utmp
   [ -f var/log/btmp ]    || (: >var/log/btmp && bin/chmod 600 var/log/btmp)
-
-  [ -f root/.bashrc ]       || cp etc/skel/.bashrc root/
-  [ -f root/.bash_profile ] || cp etc/skel/.bash_profile root/
-  # workaround for bug #7194
-  chmod 1777 var/spool/mail tmp var/tmp
 }
 
 # arg 1:  the new package version
@@ -43,7 +38,3 @@
     usr/sbin/groupadd -g 50 games >/dev/null
   fi
 }
-
-op=$1
-shift
-$op $*