Merge remote branch 'nutyx-attapu/master'

9 files changed, 182 insertions, 4 deletions

diff --git a/extra/samba3-server/.footprint b/extra/samba3-server/.footprint
new file mode 100755
index 000000000..199b7cbb5
--- /dev/null
+++ b/extra/samba3-server/.footprint
@@ -0,0 +1,93 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/rc.d/
+drwxr-xr-x	root/root	etc/rc.d/init.d/
+-rwxr-xr--	root/root	etc/rc.d/init.d/samba
+-rwxr-xr--	root/root	etc/rc.d/init.d/winbind
+drwxr-xr-x	root/root	etc/rc.d/rc0.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K48samba -> ../init.d/samba
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K49winbind -> ../init.d/winbind
+drwxr-xr-x	root/root	etc/rc.d/rc1.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K48samba -> ../init.d/samba
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K49winbind -> ../init.d/winbind
+drwxr-xr-x	root/root	etc/rc.d/rc2.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K48samba -> ../init.d/samba
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K49winbind -> ../init.d/winbind
+drwxr-xr-x	root/root	etc/rc.d/rc3.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S45samba -> ../init.d/samba
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S50winbind -> ../init.d/winbind
+drwxr-xr-x	root/root	etc/rc.d/rc4.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S45samba -> ../init.d/samba
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S50winbind -> ../init.d/winbind
+drwxr-xr-x	root/root	etc/rc.d/rc5.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S45samba -> ../init.d/samba
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S50winbind -> ../init.d/winbind
+drwxr-xr-x	root/root	etc/rc.d/rc6.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K48samba -> ../init.d/samba
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K49winbind -> ../init.d/winbind
+drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
+drwxr-xr-x	root/root	etc/samba/
+drwxr-xr-x	root/root	etc/samba/private/
+-rwxr-xr-x	root/root	etc/samba/smb.conf
+-rw-r--r--	root/root	etc/samba/smb.conf.default
+drwxr-xr-x	root/root	etc/sysconfig/
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/nmbd
+-rwxr-xr-x	root/root	usr/sbin/smbd
+-rwxr-xr-x	root/root	usr/sbin/swat
+-rwxr-xr-x	root/root	usr/sbin/winbindd
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/eventlogadm.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmap_ad.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmap_adex.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmap_hash.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmap_ldap.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmap_nss.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmap_rid.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmap_tdb.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/idmap_tdb2.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/net.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nmbd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/pam_winbind.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/pdbedit.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/smbd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/smbpasswd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/smbspool.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/tdbbackup.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/tdbdump.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/tdbtool.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_acl_tdb.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_acl_xattr.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_audit.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_cacheprime.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_cap.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_catia.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_commit.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_default_quota.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_dirsort.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_extd_audit.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_fake_perms.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_fileid.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_full_audit.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_gpfs.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_netatalk.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_notify_fam.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_prealloc.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_preopen.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_readahead.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_readonly.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_recycle.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_scannedonly.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_shadow_copy.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_shadow_copy2.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_smb_traffic_analyzer.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_streams_depot.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_streams_xattr.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vfs_xattr_tdb.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/winbindd.8.gz
+drwxr-xr-x	root/root	var/
+drwxr-xr-x	root/root	var/lib/
+drwxr-xr-x	root/root	var/lib/samba/
+drwxr-xr-x	root/root	var/run/
diff --git a/extra/samba3-server/.md5sum b/extra/samba3-server/.md5sum
new file mode 100755
index 000000000..9d66839cc
--- /dev/null
+++ b/extra/samba3-server/.md5sum
@@ -0,0 +1,2 @@
+6f8cf649207ccd8c2c17e28c335f4e9d  samba-3.5.2.tar.gz
+f6561501d6c68959e80e9804384cb028  smb.conf
diff --git a/extra/samba3-server/Pkgfile b/extra/samba3-server/Pkgfile
new file mode 100755
index 000000000..b76e90b8b
--- /dev/null
+++ b/extra/samba3-server/Pkgfile
@@ -0,0 +1,40 @@
+# Description: Service de partage de fichiers et imprimantes Windows pour Linux
+# URL: http://www.samba.org
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: samba3
+
+name=samba3-server
+version=3.5.2
+release=1
+localname=samba
+source=( http://us6.samba.org/samba/ftp/stable/$localname-$version.tar.gz\
+       smb.conf)
+
+
+build() {
+	source /etc/blfs-bootscripts
+	wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+	tar xf $scripts-$scriptsversion.tar.bz2
+	cd $scripts-$scriptsversion
+	make DESTDIR=$PKG install-samba
+	make DESTDIR=$PKG install-winbind
+	cd ../$localname-$version/source3
+	./configure --prefix=/usr \
+		--localstatedir=/var \
+		--sysconfdir=/etc \
+                --with-piddir=/var/run \
+                --with-pammodulesdir=/lib/security \
+		--with-fhs --with-cups --with-syslog \
+                --with-cifsumount --with-cifsmount
+	make -j3
+	make DESTDIR=$PKG install
+        
+        # reorganise files
+	rm -r $PKG/{lib,usr/{lib,include,bin,share/{samba,locale,man/man{1,5,7}}}}
+	rm $PKG/usr/sbin/{u,}mount.cifs
+	rm $PKG/usr/share/man/man8/{swat.8,{u,}mount.cifs.8}
+	install -v -m644 ../examples/smb.conf.default $PKG/etc/samba/smb.conf.default
+        cp $SRC/smb.conf $PKG/etc/samba/
+
+}
diff --git a/extra/samba3-server/smb.conf b/extra/samba3-server/smb.conf
new file mode 100755
index 000000000..7085ce741
--- /dev/null
+++ b/extra/samba3-server/smb.conf
@@ -0,0 +1,42 @@
+[global]
+    workgroup = MYGROUP
+    netbios name = NUTYX-SERVER
+    dos charset = cp850
+    unix charset = ISO-8859-1
+    server string = nutyx-server
+;    printcap name = /etc/printcap
+    printcap name = cups
+    disable spoolss = yes
+    printing = cups
+;    security = user
+    security = share
+;    load printers = yes
+    log file = /var/log/samba-log.%m
+;    lock directory = /var/lock/samba
+[srv]
+    comment = films at srv
+    path = /srv
+    read only = no
+;[dv]
+;    comment = Rushs
+;    path = /mnt/Disk2/Video
+;    read only = no
+[printers]
+    comment = All Printers
+;    browseable = yes
+;    browseable = Yes
+    use client driver = Yes
+    printable = Yes
+;    public = yes
+;    create mode = 0700
+    guest ok = Yes
+    path = /var/spool/samba
+;    printer admin = root
+;[hpdeskjet950C]
+;    comment = HP DeskJet 930C Network Printer
+;    printable = Yes
+;    path = /var/spool/samba
+;    public = Yes
+;    guest ok = Yes
+;    browseable = Yes
+;    printer admin = root
diff --git a/xorg/xorg-server/.Pkgfile.swp b/xorg/xorg-server/.Pkgfile.swp
deleted file mode 100644
index 342afee00..000000000
--- a/xorg/xorg-server/.Pkgfile.swp
+++ /dev/null
diff --git a/xorg/xorg-server/.footprint b/xorg/xorg-server/.footprint
index ba1379110..3cd7f3251 100644
--- a/xorg/xorg-server/.footprint
+++ b/xorg/xorg-server/.footprint
@@ -204,6 +204,8 @@ drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libextmod.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/librecord.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/librecord.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libexa.la
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libexa.so
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/libfb.la
diff --git a/xorg/xorg-server/Pkgfile b/xorg/xorg-server/Pkgfile
index c576d68a8..178de7134 100755
--- a/xorg/xorg-server/Pkgfile
+++ b/xorg/xorg-server/Pkgfile
@@ -17,9 +17,8 @@ build() {
 	            --localstatedir=/var \
 		--sysconfdir=/etc/X11 \
 	            --with-xkb-output=/var/lib/xkb
-#	sed -i 's|xorgconfddir = $(prefix)|xorgconfddir = |' config/Makefile
+	sed -i 's|xorgconfddir = $(datadir)|xorgconfddir = /etc|' config/Makefile
 	make
 	make DESTDIR=$PKG install
-
 	rmdir $PKG/var/log
 }
diff --git a/xorg/xorg-xf86-input-evdev/.md5sum b/xorg/xorg-xf86-input-evdev/.md5sum
index 09406fc1d..3bc110268 100644
--- a/xorg/xorg-xf86-input-evdev/.md5sum
+++ b/xorg/xorg-xf86-input-evdev/.md5sum
@@ -1 +1 @@
-2da277451c0763e7cf6f4ca4df1ee457  xf86-input-evdev-2.3.3.tar.bz2
+1dbf4d57d99682ba466c7855ed555f19  xf86-input-evdev-2.4.0.tar.bz2
diff --git a/xorg/xorg-xf86-input-evdev/Pkgfile b/xorg/xorg-xf86-input-evdev/Pkgfile
index cca2568c5..cd62e3b5a 100644
--- a/xorg/xorg-xf86-input-evdev/Pkgfile
+++ b/xorg/xorg-xf86-input-evdev/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: xorg-server
 
 name=xorg-xf86-input-evdev
-version=2.3.3
+version=2.4.0
 release=1
 source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-$version.tar.bz2)