PKGBUILD: fix it

filesystem/PKGBUILD

@@ -5,9 +5,9 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=filesystem
-pkgver=2011.04
-pkgrel=5
-_codename=Aida
+pkgver=2011.09
+pkgrel=0.$(date +%Y.%m.%d)
+_codename=Edn
 pkgdesc="Base filesystem"
 arch=('any')
 license=('GPL')
@@ -19,100 +19,94 @@ 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
         etc/chakra-release)
-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=('7dfef3c4b236df5591fbbb557bc03a51'
-         '363f25fe6f857261b8933b8420924e0a'
-         '13753e4e0964f3652b0cc60a28528bdf'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '8a9042a2cedf6b6b47eb8973f14289cb'
-         'b8355d9d2782f424f4cedcf682651be0'
-         'ef40305da5803ca69d22e428ffc2ab9b'
-         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '40dac0de4c6b99c8ca97effbd7527c84'
-         '3e8e464a84cc697e55ae209e25e2bddb'
-         'f3b6ae7db8adffaaa4bffc6099dcbd50'
-         '8098ffd9fbf890468d3198277596b85a')
+source=("http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.xz")
+md5sums=('3d9022e13bb10fbf131d27a6584a58f7')
+
+# create tarball: source PKGBUILD && mksource
+
+mksource() {
+	  rm -vRf chakra-${pkgname}
+	  git clone git://gitorious.org/chakra/chakra-${pkgname}.git
+	  rm -vRf chakra-${pkgname}/.git
+	  pushd chakra-${pkgname}
+	  popd
+	  tar -cvJf ${pkgname}-${pkgver}-${pkgrel}.tar.xz chakra-${pkgname}/*
+	  md5sum ${pkgname}-${pkgver}-${pkgrel}.tar.xz
+}
 
 package() {
-    cd ${srcdir}
-
-    #
-    # setup root filesystem
-    #
-    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
-    install -d -m0750 ${pkgdir}/root
-    install -d -m1777 ${pkgdir}/tmp
-    # vsftpd won't run with write perms on /srv/ftp
-    install -d -m555 -g ftp ${pkgdir}/srv/ftp
-
-    #
-    # setup /etc
-    #
-    install -d ${pkgdir}/etc/{ld.so.conf.d,skel,profile.d}
-    for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
-        install -m644 ${srcdir}/${f} ${pkgdir}/etc/
-    done
-
-    for f in gshadow shadow crypttab; do
-        install -m600 ${srcdir}/${f} ${pkgdir}/etc/
-    done
-
-    install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first ${pkgdir}/etc/modprobe.d/usb-load-ehci-first.conf
-
-    #
-    # setup /var
-    #
-    for d in cache/man local opt run log/old lib/misc empty; do
-        install -d -m755 ${pkgdir}/var/${d}
-    done
-
-    install -d -m1777 ${pkgdir}/var/{lock,tmp,spool/mail}
-
-    #
-    # allow setgid games to write scores
-    #
-    install -d -m775 -g games ${pkgdir}/var/games
-    ln -s spool/mail ${pkgdir}/var/mail
-
-    #
-    # prevent pacman from removing directory (FS#16886)
-    #
-    touch ${pkgdir}/var/empty/.keep
-
-    #
-    # setup /usr hierarchy
-    #
-    for d in bin include lib sbin share/misc src; do
-        install -d -m755 ${pkgdir}/usr/${d}
-    done
-
-    for d in $(seq 8); do
-        install -d -m755 ${pkgdir}/usr/share/man/man${d}
-    done
-
-    #
-    # setup /usr/local hierarchy
-    #
-    for d in bin etc games include lib man sbin share src; do
-        install -d -m755 ${pkgdir}/usr/local/${d}
-    done
-
-    ln -s ../man ${pkgdir}/usr/local/share/man
-
-    #
-    # setup chakra tags
-    #
-    echo "Chakra Linux release ${pkgver} (${_codename})" > "${pkgdir}/etc/chakra-release"
-    sed -i -e "s~Chakra Linux~Chakra Linux (${pkgver} - ${_codename})~g" "${pkgdir}/etc/issue"
+	cd ${srcdir}/chakra-${pkgname}
+
+	#
+	# setup root filesystem
+	#
+	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
+	install -d -m0750 ${pkgdir}/root
+	install -d -m1777 ${pkgdir}/tmp
+	# vsftpd won't run with write perms on /srv/ftp
+	install -d -m555 -g ftp ${pkgdir}/srv/ftp
+
+	#
+	# setup /etc
+	#
+	install -d ${pkgdir}/etc/{ld.so.conf.d,skel,profile.d}
+	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
+		install -m644 ${srcdir}/chakra-${pkgname}/${f} ${pkgdir}/etc/
+	done
+
+	for f in gshadow shadow crypttab; do
+		install -m600 ${srcdir}/chakra-${pkgname}/${f} ${pkgdir}/etc/
+	done
+
+	install -D -m644 ${srcdir}/chakra-${pkgname}/modprobe.d.usb-load-ehci-first ${pkgdir}/etc/modprobe.d/usb-load-ehci-first.conf
+
+	#
+	# setup /var
+	#
+	for d in cache/man local opt run log/old lib/misc empty; do
+		install -d -m755 ${pkgdir}/var/${d}
+	done
+
+	install -d -m1777 ${pkgdir}/var/{lock,tmp,spool/mail}
+
+	#
+	# allow setgid games to write scores
+	#
+	install -d -m775 -g games ${pkgdir}/var/games
+	ln -s spool/mail ${pkgdir}/var/mail
+
+	#
+	# prevent pacman from removing directory (FS#16886)
+	#
+	touch ${pkgdir}/var/empty/.keep
+
+	#
+	# setup /usr hierarchy
+	#
+	for d in bin include lib sbin share/misc src; do
+		install -d -m755 ${pkgdir}/usr/${d}
+	done
+
+	for d in $(seq 8); do
+		install -d -m755 ${pkgdir}/usr/share/man/man${d}
+	done
+
+	#
+	# setup /usr/local hierarchy
+	#
+	for d in bin etc games include lib man sbin share src; do
+		install -d -m755 ${pkgdir}/usr/local/${d}
+	done
+
+	ln -s ../man ${pkgdir}/usr/local/share/man
+
+	#
+	# setup chakra tags
+	#
+	echo "Chakra Linux release ${pkgver} (${_codename})" > "${pkgdir}/etc/chakra-release"
+	sed -i -e "s~Chakra Linux~Chakra Linux (${pkgver} - ${_codename})~g" "${pkgdir}/etc/issue"
 }

filesystem/crypttab

-# crypttab: Mappings for encrypted partitions
-#
-# Each mapped device will be created in /dev/mapper, so your /etc/fstab
-# should use the /dev/mapper/{NAME} paths for encrypted devices.
-#
-# Each PASSWORD field can be an absolute pathname to a key file (starting
-# with a slash, recommended) or a literal string that will be used as
-# a passphrase. To use special characters in the passphrase, surround it
-# by quotes, the usual bash quoting rules apply.
-# There are two special keywords that cannot be used as passphrases:
-#   - ASK  ask for a passphrase on boot
-#   - SWAP use a random key and create a swapspace afterwards
-# WARNING: use the SWAP keyword carefully, as it overwrites the data
-#          on the specified partition
-# 
-# To create a key file:
-#    hashalot -n 32 ripemd160 >/etc/crytfs.key
-# or
-#    dd if=/dev/urandom of=/etc/cryptfs.key bs=256 count=1
-#
-# To pass additional options to cryptsetup for non-LUKS partitions, use the
-# fourth column.
-#
-# NOTE: Do not list your root (/) partition here, it must be set up
-#       beforehand by the initramfs (/etc/mkinitcpio.conf).
-
-
-# NAME		SOURCE DEVICE		PASSWORD		OPTIONS
-#home		/dev/hda4		mypassword
-#data1		/dev/hda3		"my \"password\""
-#data2		/dev/hda5		/etc/cryptfs.key
-#swap		/dev/hdx4		SWAP			-c aes-cbc-essiv:sha256 -s 256
-#vol		/dev/hdb7		ASK

filesystem/fstab

-# 
-# /etc/fstab: static file system information
-#
-# <file system>        <dir>         <type>    <options>          <dump> <pass>
-devpts                 /dev/pts      devpts    defaults            0      0
-shm                    /dev/shm      tmpfs     nodev,nosuid        0      0

filesystem/group

-root:x:0:root
-bin:x:1:root,bin,daemon
-daemon:x:2:root,bin,daemon
-sys:x:3:root,bin
-adm:x:4:root,daemon
-tty:x:5:
-disk:x:6:root
-lp:x:7:daemon
-mem:x:8:
-kmem:x:9:
-wheel:x:10:root
-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:
-http:x:33:
-games:x:50:
-network:x:90:
-video:x:91:
-audio:x:92:
-optical:x:93:
-floppy:x:94:
-storage:x:95:
-scanner:x:96:
-power:x:98:
-nobody:x:99:
-users:x:100:
-cdemu:x:103:

filesystem/gshadow

-root:::root
-bin:::root,bin,daemon
-daemon:::root,bin,daemon
-sys:::root,bin
-adm:::root,daemon
-tty:::
-disk:::root
-lp:::daemon
-mem:::
-kmem:::
-wheel:::root
-ftp:::
-mail:::
-uucp:::
-log:::root
-utmp:x::
-locate:::
-rfkill:x::
-smmsp:::
-http:::
-games:::
-network:x::
-video:x::
-audio:::
-optical:::
-floppy:x::
-storage:x::
-scanner:x::
-power:x::
-nobody:::
-users:::
-cdemu:::

filesystem/host.conf

-#
-# /etc/host.conf
-#
-
-order hosts,bind
-multi on
-
-# End of file

filesystem/hosts

-#
-# /etc/hosts: static lookup table for host names
-#
-
-#<ip-address>	<hostname.domain.org>	<hostname>
-127.0.0.1	localhost.localdomain	localhost
-::1		localhost.localdomain	localhost
-
-# End of file

filesystem/issue

-
-Chakra Linux \r  (\n) (\l)
-

filesystem/ld.so.conf

-#
-# /etc/ld.so.conf
-#
-
-include /etc/ld.so.conf.d/*.conf
-
-# End of file

filesystem/modprobe.d.usb-load-ehci-first

-install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd $CMDLINE_OPTS
-install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd $CMDLINE_OPTS

filesystem/nsswitch.conf

-# Begin /etc/nsswitch.conf
-
-passwd: files
-group: files
-shadow: files
-
-publickey: files
-
-hosts: files dns
-networks: files
-
-protocols: files
-services: files
-ethers: files
-rpc: files
-
-netgroup: files
-
-# End /etc/nsswitch.conf

filesystem/passwd

-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/false
-daemon:x:2:2:daemon:/sbin:/bin/false
-mail:x:8:12:mail:/var/spool/mail:/bin/false
-ftp:x:14:11:ftp:/srv/ftp:/bin/false
-http:x:33:33:http:/srv/http:/bin/false
-nobody:x:99:99:nobody:/:/bin/false

filesystem/profile

-# /etc/profile
-
-#Set our umask
-umask 022
-
-# Set our default path
-PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
-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"
-	done
-	unset profile
-fi
-
-# Source global bash config
-if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
-	. /etc/bash.bashrc
-fi
-
-# Termcap is outdated, old, and crusty, kill it.
-unset TERMCAP
-
-# Man is much better than us at figuring this out
-unset MANPATH

filesystem/resolv.conf

-#
-# /etc/resolv.conf
-#
-
-#search <yourdomain.tld>
-#nameserver <ip>
-
-# End of file

filesystem/securetty

-#
-# /etc/securetty
-#
-
-console
-tty1
-tty2
-tty3
-tty4
-tty5
-tty6
-ttyS0
-hvc0
-
-# End of file

filesystem/shadow

-root::14871::::::
-bin:x:14871::::::
-daemon:x:14871::::::
-mail:x:14871::::::
-ftp:x:14871::::::
-http:x:14871::::::
-nobody:x:14871::::::

filesystem/shells

-#
-# /etc/shells
-#
-
-/bin/sh
-/bin/bash
-/bin/dash
-
-# End of file

grub2/PKGBUILD

@@ -22,10 +22,10 @@ options=(strip purge docs zipman !emptydirs)
 
 #	"http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
 source=("ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz"
-	"http://chakra-project.org/sources/${pkgname}/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz"
-	"http://chakra-project.org/sources/${pkgname}/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz"
-	"http://chakra-project.org/sources/${pkgname}/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz"
-	"http://chakra-project.org/sources/${pkgname}/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz"
+	"http://chakra-project.org/sources/${pkgbase}/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz"
+	"http://chakra-project.org/sources/${pkgbase}/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz"
+	"http://chakra-project.org/sources/${pkgbase}/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz"
+	"http://chakra-project.org/sources/${pkgbase}/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz"
 	'chakra_grub2_mkconfig_fixes.patch'
 	'grub.default'
 	'grub.cfg'