commit 8369efa3c694d0fcfb5a5e75ddbc21d05d2376bd Author: Juergen Daubert <jue@jue.li> Date: Tue Aug 21 13:49:57 2007 +0200 samba: update to 3.0.25c diff --git a/samba/.footprint b/samba/.footprint index c8d015a..4e7da3b 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -4,6 +4,11 @@ drwxr-xr-x root/root etc/rc.d/ drwxr-xr-x root/root etc/samba/ drwxr-xr-x root/root etc/samba/private/ -rw-r--r-- root/root etc/samba/smb.conf.default +drwxr-xr-x root/root lib/ +-rwxr-xr-x root/root lib/libnss_winbind.so +lrwxrwxrwx root/root lib/libnss_winbind.so.2 -> libnss_winbind.so +-rwxr-xr-x root/root lib/libnss_wins.so +lrwxrwxrwx root/root lib/libnss_wins.so.2 -> libnss_wins.so drwxr-xr-x root/root sbin/ lrwxrwxrwx root/root sbin/mount.smbfs -> /usr/bin/smbmount drwxr-xr-x root/root usr/ @@ -38,10 +43,6 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/libmsrpc.h -rw-r--r-- root/root usr/include/libsmbclient.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libnss_winbind.so -> samba/libnss_winbind.so -lrwxrwxrwx root/root usr/lib/libnss_winbind.so.2 -> samba/libnss_winbind.so -lrwxrwxrwx root/root usr/lib/libnss_wins.so -> samba/libnss_wins.so -lrwxrwxrwx root/root usr/lib/libnss_wins.so.2 -> samba/libnss_wins.so lrwxrwxrwx root/root usr/lib/libsmbclient.so -> samba/libsmbclient.so lrwxrwxrwx root/root usr/lib/libsmbclient.so.0 -> samba/libsmbclient.so drwxr-xr-x root/root usr/lib/samba/ @@ -52,8 +53,6 @@ drwxr-xr-x root/root usr/lib/samba/charset/ -rwxr-xr-x root/root usr/lib/samba/charset/CP850.so drwxr-xr-x root/root usr/lib/samba/idmap/ -rwxr-xr-x root/root usr/lib/samba/libmsrpc.so --rwxr-xr-x root/root usr/lib/samba/libnss_winbind.so --rwxr-xr-x root/root usr/lib/samba/libnss_wins.so -rwxr-xr-x root/root usr/lib/samba/libsmbclient.so -rwxr-xr-x root/root usr/lib/samba/libsmbsharemodes.so -rw-r--r-- root/root usr/lib/samba/lowcase.dat @@ -153,3 +152,5 @@ drwxr-xr-x root/root var/log/ drwxr-xr-x root/root var/log/samba/ drwxr-xr-x root/root var/run/ drwxr-xr-x root/root var/run/samba/ +drwxr-xr-x root/root var/spool/ +drwxrwxrwt root/root var/spool/samba/ diff --git a/samba/.md5sum b/samba/.md5sum index 94e57af..dfd9920 100644 --- a/samba/.md5sum +++ b/samba/.md5sum @@ -1,2 +1,3 @@ 448caca4745aef1a842f4fdb1aa62e1e samba -e4979a6aa6f18f0e36bacc25cab7b02d samba-3.0.25b.tar.gz +87950694270b86cbc1b2074cb53dd1aa samba-3.0.25c.tar.gz +8a802d4e784f43e453abfdd204485259 samba-config.patch diff --git a/samba/Pkgfile b/samba/Pkgfile index d374218..cd2fbbe 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -4,13 +4,14 @@ # Depends on: ncurses, readline name=samba -version=3.0.25b +version=3.0.25c release=1 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ - samba) + samba-config.patch samba) build () { cd $name-$version/source + patch -d $SRC -p0 -i $SRC/samba-config.patch ./configure --prefix=/usr \ --with-fhs \ --with-smbmount \ @@ -22,19 +23,20 @@ build () { make -j1 make DESTDIR=$PKG install - # nsswitch extensions - install nsswitch/libnss_win{s,bind}.so $PKG/usr/lib/samba - - install -d $PKG/{sbin,var/log/samba} - # symlinks (cd $PKG/usr/lib ln -s samba/libsmbclient.so libsmbclient.so - ln -s samba/libsmbclient.so libsmbclient.so.0 - ln -s samba/libnss_winbind.so libnss_winbind.so - ln -s samba/libnss_winbind.so libnss_winbind.so.2 - ln -s samba/libnss_wins.so libnss_wins.so - ln -s samba/libnss_wins.so libnss_wins.so.2) + ln -s samba/libsmbclient.so libsmbclient.so.0) + + # nsswitch extensions + install -d $PKG/lib + install nsswitch/libnss_win{s,bind}.so $PKG/lib + ln -s libnss_wins.so $PKG/lib/libnss_wins.so.2 + ln -s libnss_winbind.so $PKG/lib/libnss_winbind.so.2 + + # spool/log directory + install -d $PKG/var/log/samba + install -d -m 1777 $PKG/var/spool/samba # config-file and start-script cp ../examples/smb.conf.default $PKG/etc/samba diff --git a/samba/samba-config.patch b/samba/samba-config.patch new file mode 100644 index 0000000..be0df7c --- /dev/null +++ b/samba/samba-config.patch @@ -0,0 +1,21 @@ +diff -Nru samba-3.0.25c.orig/examples/smb.conf.default samba-3.0.25c/examples/smb.conf.default +--- samba-3.0.25c.orig/examples/smb.conf.default 2007-08-21 10:15:23.000000000 +0200 ++++ samba-3.0.25c/examples/smb.conf.default 2007-08-21 10:17:38.000000000 +0200 +@@ -63,7 +63,7 @@ + + # this tells Samba to use a separate log file for each machine + # that connects +- log file = /usr/local/samba/var/log.%m ++ log file = /var/log/samba/log.%m + + # Put a capping on the size of the log files (in Kb). + max log size = 50 +@@ -184,7 +184,7 @@ + # specifically define each individual printer + [printers] + comment = All Printers +- path = /usr/spool/samba ++ path = /var/spool/samba + browseable = no + # Set public = yes to allow user 'guest account' to print + guest ok = no