diff options
| author | timur <timur@FreeBSD.org> | 2009-08-02 07:59:22 +0800 |
|---|---|---|
| committer | timur <timur@FreeBSD.org> | 2009-08-02 07:59:22 +0800 |
| commit | 3a6657885460f13f2807eaed488d040d87fccee5 (patch) | |
| tree | f69f53b8a4ac9bb582eb4d5a4a18860398c049ea /net/samba4-devel | |
| parent | bed3f2419fe4cf01b95795129f56493c6daa241b (diff) | |
| download | freebsd-ports-gnome-3a6657885460f13f2807eaed488d040d87fccee5.tar.gz freebsd-ports-gnome-3a6657885460f13f2807eaed488d040d87fccee5.tar.zst freebsd-ports-gnome-3a6657885460f13f2807eaed488d040d87fccee5.zip | |
Fix CONFLICTS, point USE_LDCONFIG to the location of the installed libs.
Thanks to kwm@FreeBSD.org.
Fix provision script to work OOTB.
Diffstat (limited to 'net/samba4-devel')
| -rw-r--r-- | net/samba4-devel/Makefile | 6 | ||||
| -rw-r--r-- | net/samba4-devel/files/patch-0001-s4-provision-Fix-provision-on-FreeBSD | 31 | ||||
| -rw-r--r-- | net/samba4-devel/files/patch-source4__script__installmisc.sh | 2 |
3 files changed, 35 insertions, 4 deletions
diff --git a/net/samba4-devel/Makefile b/net/samba4-devel/Makefile index 0334971eaa4c..c0a5b4dd6f11 100644 --- a/net/samba4-devel/Makefile +++ b/net/samba4-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME?= ${SAMBA_PORTNAME} PORTVERSION?= ${SAMBA_VERSION} +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= samba4 @@ -16,7 +17,7 @@ DISTNAME= ${SAMBA_DISTNAME} MAINTAINER?= timur@FreeBSD.org COMMENT?= A free SMB and CIFS client and server for UNIX -CONFLICTS?= +CONFLICTS?= *samba-3.* SAMBA_PORTNAME= samba4 SAMBA_VERSION= 4.0.0.a8 @@ -42,9 +43,9 @@ USE_PERL5= yes USE_PYTHON= yes USE_GMAKE= yes USE_ICONV= yes -USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig +USE_LDCONFIG= ${SAMBA_LIBDIR} USE_AUTOTOOLS= autoconf:262 autoheader:262 # directories VARDIR= /var @@ -86,7 +87,6 @@ OPTIONS= \ EXT_TEVENT "With external libtevent" on \ POPT "With system-wide POPT library" on \ PCH "With precompiled headers" off - .endif .include <bsd.port.pre.mk> diff --git a/net/samba4-devel/files/patch-0001-s4-provision-Fix-provision-on-FreeBSD b/net/samba4-devel/files/patch-0001-s4-provision-Fix-provision-on-FreeBSD new file mode 100644 index 000000000000..49db38f56f02 --- /dev/null +++ b/net/samba4-devel/files/patch-0001-s4-provision-Fix-provision-on-FreeBSD @@ -0,0 +1,31 @@ +From 1887ad0a26cca026c3503f0ef4e40f8eff42a121 Mon Sep 17 00:00:00 2001 +From: Andrew Bartlett <abartlet@samba.org> +Date: Wed, 22 Jul 2009 18:04:58 +1000 +Subject: [PATCH] s4:provision Fix provision on FreeBSD + +We were missing the 'cn' attribute, which we then prepare a sorted +list based on. On Linux, strcmp(NULL, NULL) does not segfault, where +it does on FreeBSD. + +Reported by Timur I. Bakeyev <timur@com.bat.ru> + +Andrew Bartlett +--- + source4/scripting/python/samba/ms_schema.py | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/source4/scripting/python/samba/ms_schema.py b/source4/scripting/python/samba/ms_schema.py +index 2e8050e..a0abc33 100644 +--- a/source4/scripting/python/samba/ms_schema.py ++++ b/source4/scripting/python/samba/ms_schema.py +@@ -226,6 +226,7 @@ def __transform_entry(entry, objectClass): + assert(cn) + entry.insert(0, ["dn", "CN=%s,${SCHEMADN}" % cn]) + entry.insert(1, ["objectClass", ["top", objectClass]]) ++ entry.insert(2, ["cn", cn]) + + for l in entry: + key = l[0].lower() +-- +1.6.3.1 + diff --git a/net/samba4-devel/files/patch-source4__script__installmisc.sh b/net/samba4-devel/files/patch-source4__script__installmisc.sh index 104623dabf13..d38a05d64bc7 100644 --- a/net/samba4-devel/files/patch-source4__script__installmisc.sh +++ b/net/samba4-devel/files/patch-source4__script__installmisc.sh @@ -6,7 +6,7 @@ mkdir -p $SETUPDIR || exit 1 +for p in enableaccount newuser provision provision-backend setexpiry setpassword upgrade +do -+ chmod 055 setup/$p ++ chmod 0555 setup/$p + cp setup/$p $SETUPDIR || exit 1 +done +cp -R setup/ad-schema $SETUPDIR || exit 1 |