Merge remote branch 'nutyx-2009/master'

8 files changed, 54 insertions, 12 deletions

diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint
index a517eb331..160d504f8 100644
--- a/base/aaabasicfs/.footprint
+++ b/base/aaabasicfs/.footprint
@@ -170,6 +170,8 @@ lrwxrwxrwx	root/root	root/useradd -> ../etc/default/useradd
 lrwxrwxrwx	root/root	root/xorg.conf -> ../etc/X11/xorg.conf
 drwxr-xr-x	root/root	sbin/
 drwxr-xr-x	root/root	srv/
+drwxr-xr-x	root/root	srv/NuTyX/
+drwxr-xr-x	root/root	srv/NuTyX/locale/
 drwxrwxrwt	root/root	srv/sources/
 drwxr-xr-x	root/root	sys/
 drwxrwxrwt	root/root	tmp/
@@ -209,6 +211,7 @@ lrwxrwxrwx	root/root	usr/man -> share/man
 drwxr-xr-x	root/root	usr/ports/
 drwxr-xr-x	root/root	usr/sbin/
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/doc/
 drwxr-xr-x	root/root	usr/share/info/
 drwxr-xr-x	root/root	usr/share/locale/
diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum
index ab845989c..3878c7078 100644
--- a/base/aaabasicfs/.md5sum
+++ b/base/aaabasicfs/.md5sum
@@ -14,7 +14,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 255dba011debefe08813959042bb56b4  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 5d7c952bd09d718298dd60d3b976c349  lfs-bootscripts-01.patch
-c611a863db70bf22aa4fc5e24adda035  lfs-bootscripts-20090817.tar.bz2
+5a8b2aacde330663828176064c77b72d  lfs-bootscripts-20100124.tar.bz2
 4e77d38062489bdd53d0eb9065a37b3e  message
 c90e6466720260c377c89f5aa0c47eca  network
 5478e2141b3d5504cd201b23dcc70531  nu
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 3711cde26..b3474237c 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on:
 
 name=aaabasicfs
-version=2009.2
+version=2009.3
 release=1
-scriptsversion=lfs-bootscripts-20090817
+scriptsversion=lfs-bootscripts-20100124
 source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
  hosts clock console fstab inittab message inputrc network xorg.conf \
  profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-01.patch \
@@ -23,11 +23,14 @@ build() {
 	install -dv -m 0750 $PKG/root	
 	install -dv -m 1777 $PKG/tmp 
 	install -dv -m 1777 $PKG/var/tmp
+	mkdir -pv $PKG/srv/NuTyX/locale
 	mkdir -pv $PKG/usr/{,local/}{bin,include,lib,sbin,src}
 	mkdir -pv $PKG/usr/{,local/}share/{doc,info,locale,man}
 	mkdir -v  $PKG/usr/{,local/}share/{misc,terminfo,zoneinfo}
 	mkdir -pv $PKG/usr/{,local/}share/man/man{1..8}
 	mkdir -p $PKG/usr/ports
+	# Needs for cups
+	mkdir -p $PKG/usr/share/applications
 	install -dv  $PKG/lib/{firmware,udev/devices/{pts,shm}}
 	mknod -m 600 $PKG/lib/udev/devices/console c 5 1
 	mknod -m 666 $PKG/lib/udev/devices/null c 1 3
@@ -52,15 +55,22 @@ build() {
 EOF
        cat > $PKG/etc/passwd << "EOF"
 root:x:0:0:root:/root:/bin/bash
+bin:x:1:1::/dev/null:/bin/false
+lp:x:9:9:Print Service User:/dev/null:/bin/false
 messagebus:x:18:18:D-BUS Message Daemon User:/dev/null:/bin/false
 haldaemon:x:19:19:HAL Daemon User:/dev/null:/bin/false
+named:x:20:20:BIND Owner:/home/named:/bin/false
 gdm:x:21:21:GDM Daemon User:/dev/null:/bin/bash
 fcron:x:22:22:Fcron User:/dev/null:/bin/false
 apache:x:25:25:Apache Server:/dev/null:/bin/false
+smmsp:x:26:26:Sendmail Daemon:/dev/null:/bin/false
 polkituser:x:27:27:Policy Kit Daemon User:/dev/null:/bin/false
-mysql:x:40:40:MySQL Server":/dev/null/:bin/false
+mysql:x:40:40:MySQL Server:/dev/null/:bin/false
+postgres:x:41:41:PostgreSQL Server:/srv/pgsql/data:/bin/bash
+rsyncd:48:48:rsyncd Daemon:/home/rsync:/bin/false
+sshd:x:50:50:sshd PrivSep:/var/lib/sshd:/bin/false
 policykit:x:62:62:PolicyKit:/:/sbin/nologin
-clamav:x:98:98:Clam AntiVirus:/dev/null:/bin/false
+anonymous:x:98:1000::/home/anonymous:/bin/false
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false
 EOF
        cat > $PKG/etc/group << "EOF"
@@ -88,10 +98,14 @@ named:x:20:
 gdm:x:21:
 fcron:x:22:
 apache:x:25:
+smmsp:x:26:
 polkituser:x:27:
 mail:x:34:
 mysql:x:40:
+postgres:x:41:
 rsyncd:x:48:
+sshd:x:50:
+games:x:60:
 halusers:x:61:
 policykit:x:62:
 fuse:x:65:
diff --git a/extra/transset-df/.footprint b/extra/transset-df/.footprint
new file mode 100644
index 000000000..acd7f5171
--- /dev/null
+++ b/extra/transset-df/.footprint
@@ -0,0 +1,3 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/transset
diff --git a/extra/transset-df/.md5sum b/extra/transset-df/.md5sum
new file mode 100644
index 000000000..3cc511b65
--- /dev/null
+++ b/extra/transset-df/.md5sum
@@ -0,0 +1 @@
+3375d570adc9d875d7fc476d1a50d5a5  transset-df-6.tar.gz
diff --git a/extra/transset-df/Pkgfile b/extra/transset-df/Pkgfile
new file mode 100644
index 000000000..f0ef9eccc
--- /dev/null
+++ b/extra/transset-df/Pkgfile
@@ -0,0 +1,20 @@
+# Description: outils pour transparence fenetres
+# URL: http://www.forchheimer.se/transset-df/
+# Maintainer: NuTyX core team
+# Packager: geantbrun at gmail dot com
+# Depends on: xbindkeys xorg-xcompmgr
+
+
+
+name=transset-df
+version=6
+release=1
+source=(http://www.forchheimer.se/transset-df/transset-df-6.tar.gz)
+
+build() {
+	cd $name-$version
+	make
+	install -m 0755 -D -s $name $PKG/usr/bin/transset
+}
+
+
diff --git a/xorg/xorg-xcompmgr/.footprint b/xorg/xorg-xcompmgr/.footprint
index 30379a62c..1f45e6ca5 100644
--- a/xorg/xorg-xcompmgr/.footprint
+++ b/xorg/xorg-xcompmgr/.footprint
@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/xcompmgr
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/xcompmgr.1.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/xcompmgr.1.gz
diff --git a/xorg/xorg-xcompmgr/Pkgfile b/xorg/xorg-xcompmgr/Pkgfile
index 67b27f96e..dd3597c3d 100644
--- a/xorg/xorg-xcompmgr/Pkgfile
+++ b/xorg/xorg-xcompmgr/Pkgfile
@@ -1,18 +1,18 @@
 # Description: Compositing manager for X
 # URL: http://xorg.freedesktop.org
-# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
 # Depends on: xorg-libxdamage, xorg-libxcomposite, xorg-libxrender
 
 name=xorg-xcompmgr
 version=1.1.4
-release=1
+release=2
 source=(http://xorg.freedesktop.org/releases/individual/app/xcompmgr-$version.tar.bz2)
 
 build() {
 	cd xcompmgr-$version
 
-	./configure --prefix=/usr --mandir=/usr/man
-
+	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
 }