summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-05-18 06:09:03 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-05-18 06:09:03 +0000
commit67313c76e851795859655bc6f944e5d73753e596 (patch)
tree1591d50b4a459e188ef20066759c5b3e769d24e6 /main
parentfc031f3160d4ebd386d11216e941bdce12c94e3e (diff)
downloadaports-67313c76e851795859655bc6f944e5d73753e596.tar.bz2
aports-67313c76e851795859655bc6f944e5d73753e596.tar.xz
main/samba: upgrade to 3.5.2
Diffstat (limited to 'main')
-rw-r--r--main/samba/APKBUILD22
-rw-r--r--main/samba/samba-uclibc-fstab.patch15
2 files changed, 31 insertions, 6 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 5a7a1d522..864ed9bed 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
-pkgver=3.4.7
-pkgrel=1
+pkgver=3.5.2
+pkgrel=0
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="http://www.samba.org"
license="GPL3"
@@ -13,11 +13,20 @@ source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz
samba.initd
samba.confd
samba.logrotate
+ samba-uclibc-fstab.patch
"
pkggroups="winbind"
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ for i in "$srcdir"/*.patch; do
+ patch -p1 -i "$i" || return 1
+ done
+}
+
build() {
- cd "$srcdir"/$pkgname-$pkgver/source3
+ cd "$_builddir"/source3
./configure --prefix=/usr \
--sysconfdir=/etc/samba \
--with-configdir=/etc/samba \
@@ -38,7 +47,7 @@ build() {
}
package() {
- cd "$srcdir"/$pkgname-$pkgver/source3
+ cd "$_builddir"/source3
make DESTDIR="$pkgdir" install
install -d "$pkgdir"/var/log/samba \
@@ -108,7 +117,8 @@ tdb() {
usr/bin/tdb*
}
-md5sums="f5e11690d54466c143f4598bcce2a8bb samba-3.4.7.tar.gz
+md5sums="6f8cf649207ccd8c2c17e28c335f4e9d samba-3.5.2.tar.gz
c8a7f6ac5df2f73dbf023e25ea39927b samba.initd
c150433426e18261e6e3eed3930e1a76 samba.confd
-b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate"
+b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate
+811e5a3f570d0053cf27a73248be4ae6 samba-uclibc-fstab.patch"
diff --git a/main/samba/samba-uclibc-fstab.patch b/main/samba/samba-uclibc-fstab.patch
new file mode 100644
index 000000000..3fdbc9030
--- /dev/null
+++ b/main/samba/samba-uclibc-fstab.patch
@@ -0,0 +1,15 @@
+--- ./client/mount.cifs.c.orig
++++ ./client/mount.cifs.c
+@@ -39,7 +39,11 @@
+ #include <mntent.h>
+ #include <fcntl.h>
+ #include <limits.h>
+-#include <fstab.h>
++#if defined(__UCLIBC__)
++ #define _PATH_FSTAB "/etc/fstab"
++#else
++ #include <fstab.h>
++#endif
+ #include "mount.h"
+
+ #define MOUNT_CIFS_VERSION_MAJOR "1"