commit c87a5528c24e1c70637276f1dfb886cb76bdb43e Author: Juergen Daubert <jue@jue.li> Date: Sun Jan 9 12:17:40 2011 +0100 [notify] samba: use external talloc library samba depends now on the talloc library provided by opt/talloc which is used by opt/mesa3d as well. Because we have a file-conflict between samba and talloc, do a forced install of talloc first and after that rebuild samba. diff --git a/samba/.footprint b/samba/.footprint index d75ea32..956f1b5 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -45,7 +45,6 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/libsmbclient.h -rw-r--r-- root/root usr/include/netapi.h -rw-r--r-- root/root usr/include/smb_share_modes.h --rw-r--r-- root/root usr/include/talloc.h -rw-r--r-- root/root usr/include/wbc_async.h -rw-r--r-- root/root usr/include/wbclient.h drwxr-xr-x root/root usr/lib/ @@ -55,8 +54,6 @@ lrwxrwxrwx root/root usr/lib/libsmbclient.so -> libsmbclient.so.0 -rwxr-xr-x root/root usr/lib/libsmbclient.so.0 lrwxrwxrwx root/root usr/lib/libsmbsharemodes.so -> libsmbsharemodes.so.0 -rwxr-xr-x root/root usr/lib/libsmbsharemodes.so.0 -lrwxrwxrwx root/root usr/lib/libtalloc.so -> libtalloc.so.2 --rwxr-xr-x root/root usr/lib/libtalloc.so.2 lrwxrwxrwx root/root usr/lib/libwbclient.so -> libwbclient.so.0 -rwxr-xr-x root/root usr/lib/libwbclient.so.0 drwxr-xr-x root/root usr/lib/samba/ diff --git a/samba/Pkgfile b/samba/Pkgfile index a659984..10825c8 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -1,11 +1,11 @@ # Description: SMB server and client for unix # URL: http://www.samba.org # Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de -# Depends on: ncurses openssl readline zlib tdb libcap acl +# Depends on: ncurses openssl readline zlib tdb talloc libcap acl name=samba version=3.5.6 -release=1 +release=2 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ samba-config.patch samba) @@ -26,7 +26,7 @@ build () { --disable-swat \ --with-included-popt \ --with-cifs{mount,umount} \ - --enable-external-libtdb + --enable-external-{libtdb,libtalloc} make make DESTDIR=$PKG install