diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2011-02-04 21:28:58 +0200 |
|---|---|---|
| committer | Jeff Bilyk <jbilyk@gmail.com> | 2011-02-07 20:18:02 +0000 |
| commit | 1a4888e2c647fd4c129cffe3c992a55ac6b55b05 (patch) | |
| tree | 8bcea1c8b81aaf296f3841bbe32043783b6f22b2 | |
| parent | 13e2435d28396e9d3826e9626bee0dc39526998a (diff) | |
| download | aports-1a4888e2c647fd4c129cffe3c992a55ac6b55b05.tar.bz2 aports-1a4888e2c647fd4c129cffe3c992a55ac6b55b05.tar.xz | |
main/talloc, samba: fix libtalloc conflict
* make samba use talloc provided libraries
* allow talloc to overwrite libtalloc from samba-common
| -rw-r--r-- | main/samba/APKBUILD | 5 | ||||
| -rw-r--r-- | main/talloc/APKBUILD | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index ae59f87fb4..cea027533e 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba pkgver=3.5.6 -pkgrel=2 +pkgrel=3 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" arch="all" @@ -10,7 +10,7 @@ subpackages="$pkgname-dev $pkgname-doc winbind $pkgname-common $pkgname-initscript tdb libsmbclient $pkgname-client" depends="samba-initscript samba-client" makedepends="popt-dev ncurses-dev openldap-dev heimdal-dev e2fsprogs-dev - libiconv-dev" + libiconv-dev talloc-dev" source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz samba.initd samba.confd @@ -42,6 +42,7 @@ build() { --with-krb5 \ --with-libsmbclient \ --with-shared-modules=idmap_rid,imap_ad \ + --enable-external-libtalloc \ --disable-nss-wrapper \ --disable-dnssd \ --disable-swat diff --git a/main/talloc/APKBUILD b/main/talloc/APKBUILD index ce86bb139b..efc4863672 100644 --- a/main/talloc/APKBUILD +++ b/main/talloc/APKBUILD @@ -2,13 +2,14 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=talloc pkgver=2.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="memory pool management library" url="http://talloc.samba.org/" arch="all" license="LGPL" depends= depends_dev= +replaces="samba-common" makedepends="$depends_dev python" install="" subpackages="$pkgname-dev" |