extra/samba: added heimdal dep to subpackages and moved heimdal to extra

15 files changed, 4 insertions, 4 deletions

diff --git a/testing/heimdal/001_all_heimdal-no_libedit.patch b/extra/heimdal/001_all_heimdal-no_libedit.patch
index a551bdce15..a551bdce15 100644
--- a/testing/heimdal/001_all_heimdal-no_libedit.patch
+++ b/extra/heimdal/001_all_heimdal-no_libedit.patch
diff --git a/testing/heimdal/002_all_heimdal-fPIC.patch b/extra/heimdal/002_all_heimdal-fPIC.patch
index c67dbae764..c67dbae764 100644
--- a/testing/heimdal/002_all_heimdal-fPIC.patch
+++ b/extra/heimdal/002_all_heimdal-fPIC.patch
diff --git a/testing/heimdal/003_all_heimdal-rxapps.patch b/extra/heimdal/003_all_heimdal-rxapps.patch
index 40fc05f083..40fc05f083 100644
--- a/testing/heimdal/003_all_heimdal-rxapps.patch
+++ b/extra/heimdal/003_all_heimdal-rxapps.patch
diff --git a/testing/heimdal/005_all_heimdal-suid_fix.patch b/extra/heimdal/005_all_heimdal-suid_fix.patch
index 35a9ed9f6b..35a9ed9f6b 100644
--- a/testing/heimdal/005_all_heimdal-suid_fix.patch
+++ b/extra/heimdal/005_all_heimdal-suid_fix.patch
diff --git a/testing/heimdal/013_all_heimdal-pthread-lib.patch b/extra/heimdal/013_all_heimdal-pthread-lib.patch
index 19f8794075..19f8794075 100644
--- a/testing/heimdal/013_all_heimdal-pthread-lib.patch
+++ b/extra/heimdal/013_all_heimdal-pthread-lib.patch
diff --git a/testing/heimdal/014_all_heimdal-path.patch b/extra/heimdal/014_all_heimdal-path.patch
index 36a86f1f93..36a86f1f93 100644
--- a/testing/heimdal/014_all_heimdal-path.patch
+++ b/extra/heimdal/014_all_heimdal-path.patch
diff --git a/testing/heimdal/022_all_heimdal-as-needed.patch b/extra/heimdal/022_all_heimdal-as-needed.patch
index 69c791778a..69c791778a 100644
--- a/testing/heimdal/022_all_heimdal-as-needed.patch
+++ b/extra/heimdal/022_all_heimdal-as-needed.patch
diff --git a/testing/heimdal/APKBUILD b/extra/heimdal/APKBUILD
index 2821ea9a9a..2821ea9a9a 100644
--- a/testing/heimdal/APKBUILD
+++ b/extra/heimdal/APKBUILD
diff --git a/testing/heimdal/heimdal-kadmind.init b/extra/heimdal/heimdal-kadmind.init
index b58ac994df..b58ac994df 100755
--- a/testing/heimdal/heimdal-kadmind.init
+++ b/extra/heimdal/heimdal-kadmind.init
diff --git a/testing/heimdal/heimdal-kdc.init b/extra/heimdal/heimdal-kdc.init
index 753a101c30..753a101c30 100755
--- a/testing/heimdal/heimdal-kdc.init
+++ b/extra/heimdal/heimdal-kdc.init
diff --git a/testing/heimdal/heimdal-kpasswdd.init b/extra/heimdal/heimdal-kpasswdd.init
index 517cb86210..517cb86210 100755
--- a/testing/heimdal/heimdal-kpasswdd.init
+++ b/extra/heimdal/heimdal-kpasswdd.init
diff --git a/testing/heimdal/heimdal-r23235-kb5-libwind_la.patch b/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch
index 88c02e598c..88c02e598c 100644
--- a/testing/heimdal/heimdal-r23235-kb5-libwind_la.patch
+++ b/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch
diff --git a/testing/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch b/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
index 5390b2cf69..5390b2cf69 100644
--- a/testing/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
+++ b/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
diff --git a/testing/heimdal/heimdal-system_sqlite.patch b/extra/heimdal/heimdal-system_sqlite.patch
index 2f8254e4d6..2f8254e4d6 100644
--- a/testing/heimdal/heimdal-system_sqlite.patch
+++ b/extra/heimdal/heimdal-system_sqlite.patch
diff --git a/extra/samba/APKBUILD b/extra/samba/APKBUILD
index afe82d49ef..f69b0de086 100644
--- a/extra/samba/APKBUILD
+++ b/extra/samba/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
 pkgver=3.2.11
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 license="GPL3"
 subpackages="$pkgname-dev $pkgname-doc winbind $pkgname-common 
 	$pkgname-initscript tdb"
-depends="db popt ncurses uclibc samba-initscript samba-common tdb openldap heimdal"
+depends="db popt ncurses uclibc samba-initscript samba-common tdb libldap heimdal"
 makedepends="db-dev popt-dev ncurses-dev openldap-dev heimdal-dev"
 source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz
 	samba.initd
@@ -62,7 +62,7 @@ _mv_files() {
 
 winbind() {
 	pkgdesc="Samba user and group resolver"
-	depends="uclibc samba-common popt samba-initscript"
+	depends="uclibc samba-common popt samba-initscript libldap heimdal"
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/wbinfo \
@@ -74,7 +74,7 @@ winbind() {
 
 common() {
 	pkgdesc="Samba common files for both client an servers"
-	depends="uclibc popt tdb"
+	depends="uclibc popt tdb libldap heimdal"
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/net \