pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/samba4 samba4: buidling fixes
details: https://anonhg.NetBSD.org/pkgsrc/rev/1d4ab1a23bcf
branches: trunk
changeset: 389177:1d4ab1a23bcf
user: adam <adam%pkgsrc.org@localhost>
date: Sat Dec 22 01:13:52 2018 +0000
description:
samba4: buidling fixes
PkgSrc changes:
* fix building on Darwin and probably other systems as well
* install manpages
* use correct install_name on Darwin
* does not collide with p5-Parse-Yapp anymore
* use cmocka and libgcrypt
* clean-ups
diffstat:
net/samba4/Makefile | 63 +-
net/samba4/PLIST | 381 ++++++---
net/samba4/buildlink3.mk | 25 +
net/samba4/distinfo | 11 +-
net/samba4/options.mk | 10 +-
net/samba4/patches/patch-buildtools_wafsamba_samba__install.py | 16 +
net/samba4/patches/patch-buildtools_wafsamba_samba__pidl.py | 16 +
net/samba4/patches/patch-docs-xml_wscript__build | 14 +
net/samba4/patches/patch-dynconfig_wscript | 4 +-
net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c | 6 +-
net/samba4/patches/patch-pidl_lib_wscript__build | 18 -
net/samba4/patches/patch-source4_torture_local_nss__tests.c | 38 +
12 files changed, 416 insertions(+), 186 deletions(-)
diffs (truncated from 862 to 300 lines):
diff -r df064703929b -r 1d4ab1a23bcf net/samba4/Makefile
--- a/net/samba4/Makefile Sat Dec 22 01:08:56 2018 +0000
+++ b/net/samba4/Makefile Sat Dec 22 01:13:52 2018 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2018/12/20 21:18:22 adam Exp $
+# $NetBSD: Makefile,v 1.57 2018/12/22 01:13:52 adam Exp $
DISTNAME= samba-4.9.4
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://download.samba.org/pub/samba/stable/
@@ -9,14 +10,16 @@
COMMENT= SMB/CIFS protocol server suite
LICENSE= gnu-gpl-v3
-DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-
CONFLICTS+= ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]*
GCC_REQD+= 4.4
-BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
+BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+DEPENDS+= p5-Parse-Yapp>=1.05:../../devel/p5-Parse-Yapp
+DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
+DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601
-DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
BUILD_DEFS+= VARBASE
@@ -52,8 +55,6 @@
# a full dependency since it's not actually needed by samba.
USE_TOOLS+= gmake mktemp perl:run pkg-config
-REPLACE_PERL= script/findsmb.in
-
USE_GNU_ICONV= yes # FIXME: something doesn't work on NetBSD
BROKEN_GETTEXT_DETECTION=yes
@@ -63,8 +64,6 @@
#CONFIGURE_ARGS+= --fatal-errors
HAS_CONFIGURE= yes
-CONFIGURE_ENV+= XSLTPROC=${FALSE} # suppress generation of man pages
-CONFIGURE_ARGS+= --libdir=${SAMBA_LIB}
CONFIG_SHELL= ${PYTHONBIN}
CONFIGURE_SCRIPT= ${WRKSRC}/buildtools/bin/waf
CONFIGURE_ARGS+= configure
@@ -72,6 +71,7 @@
CONFIGURE_ARGS+= --infodir=${SMB_INFO}
CONFIGURE_ARGS+= --mandir=${SMB_MAN}
CONFIGURE_ARGS+= --datarootdir=${SMB_DATAROOT}
+CONFIGURE_ARGS+= --libdir=${SAMBA_LIB}
CONFIGURE_ARGS+= --localedir=${SMB_LOCALE}
CONFIGURE_ARGS+= --docdir=${SMB_DOC}
CONFIGURE_ARGS+= --with-statedir=${SMB_STATE}
@@ -87,8 +87,9 @@
CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG}
CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
#CONFIGURE_ARGS+= --bundled-libraries=com_err
+CONFIGURE_ARGS+= --abi-check-disable
+CONFIGURE_ARGS+= --disable-symbol-versions
CONFIGURE_ARGS+= --enable-gnutls
-CONFIGURE_ARGS+= --abi-check-disable
#CONFIGURE_ARGS+= --bundled-libraries=!crypto,ldb,ntdb,!talloc,tdb,tevent
.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO]))
CONFIGURE_ARGS+= --jobs=${MAKE_JOBS}
@@ -108,23 +109,16 @@
LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB}
CFLAGS.SunOS+= -DHAVE_SOLARIS_GETGRENT_R
-
# workaround https://bugzilla.samba.org/show_bug.cgi?id=12502 for now
CFLAGS.SunOS+= -DMSG_NOSIGNAL=0
.include "options.mk"
-PLIST_VARS+= macosx
-
-.if ${OPSYS} == "Darwin"
-PLIST.macosx= yes
-.endif
-
.if ${SHLIB_TYPE} == "dylib"
-PLIST_SUBST+= LIBEXT=dylib
+PLIST_SUBST+= SOEXT=dylib
SAMBA_LIBEXT= dylib
.else
-PLIST_SUBST+= LIBEXT=so
+PLIST_SUBST+= SOEXT=so
SAMBA_LIBEXT= so
.endif
@@ -152,6 +146,19 @@
OWN_DIRS_PERMS= ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
+SUBST_CLASSES+= docbook
+SUBST_MESSAGE.docbook= Fixing docbook URLs.
+SUBST_FILES.docbook+= buildtools/wafsamba/wafsamba.py
+SUBST_FILES.docbook+= ctdb/doc/*.xml
+SUBST_FILES.docbook+= docs-xml/xslt/*.xsl
+SUBST_FILES.docbook+= lib/ldb/docs/builddocs.sh
+SUBST_FILES.docbook+= librpc/tools/*.xml
+SUBST_FILES.docbook+= */*/man/*.xml
+SUBST_FILES.docbook+= */*/*/man/*.xml
+SUBST_STAGE.docbook= pre-configure
+SUBST_SED.docbook= -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g'
+SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
+
SUBST_CLASSES+= paths
SUBST_MESSAGE.paths= Fixing paths.
SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
@@ -178,7 +185,7 @@
${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
post-install:
- set -e ; cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \
+ ${RUN} cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \
${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \
done
${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \
@@ -190,7 +197,15 @@
${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \
${DESTDIR}${PREFIX}/${EGDIR}
+REPLACE_PERL+= librpc/tables.pl
REPLACE_PERL+= pidl/pidl
+REPLACE_PERL+= pidl/tests/*.pl
+REPLACE_PERL+= script/*.pl
+REPLACE_PERL+= script/findsmb.in
+REPLACE_PERL+= source3/script/*.pl
+REPLACE_PERL+= source4/build/pasn1/pasn1.pl
+REPLACE_PERL+= source4/script/*.pl
+REPLACE_PERL+= third_party/nss_wrapper/nss_wrapper.pl
REPLACE_PYTHON+= buildtools/bin/waf
REPLACE_PYTHON+= source4/setup/wscript_build
REPLACE_PYTHON+= source4/scripting/bin/*
@@ -201,18 +216,20 @@
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
-.if ${OPSYS} == "Linux"
+.if "${OPSYS}" == "Linux"
.include "../../devel/libuuid/buildlink3.mk"
.endif
.include "../../archivers/libarchive/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/lmdb/buildlink3.mk"
+.include "../../devel/cmocka/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.talloc+= talloc>=2.1.9
-.include "../../devel/talloc/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
+BUILDLINK_API_DEPENDS.talloc+= talloc>=2.1.9
+.include "../../devel/talloc/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
.include "../../textproc/jansson/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r df064703929b -r 1d4ab1a23bcf net/samba4/PLIST
--- a/net/samba4/PLIST Sat Dec 22 01:08:56 2018 +0000
+++ b/net/samba4/PLIST Sat Dec 22 01:13:52 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2018/12/10 14:42:45 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/12/22 01:13:52 adam Exp $
bin/cifsdd
bin/dbwrap_tool
bin/findsmb
@@ -214,7 +214,6 @@
${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Util.pm
${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Wireshark/Conformance.pm
${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Wireshark/NDR.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Parse/Yapp/Driver.pm
lib/pkgconfig/dcerpc.pc
lib/pkgconfig/dcerpc_samr.pc
lib/pkgconfig/dcerpc_server.pc
@@ -525,82 +524,82 @@
${PYSITELIB}/samba/xattr_tdb.so
${PYSITELIB}/tdb.so
${PYSITELIB}/tevent.py
-lib/samba/auth/script.so
-lib/samba/bind9/dlz_bind9.so
-lib/samba/bind9/dlz_bind9_10.so
-lib/samba/bind9/dlz_bind9_11.so
-lib/samba/bind9/dlz_bind9_9.so
-lib/samba/gensec/krb5.so
-${PLIST.ldap}lib/samba/idmap/ad.so
-lib/samba/idmap/autorid.so
-lib/samba/idmap/hash.so
-${PLIST.ldap}lib/samba/idmap/rfc2307.so
-lib/samba/idmap/rid.so
-lib/samba/idmap/script.so
-lib/samba/idmap/tdb2.so
-lib/samba/krb5/winbind_krb5_locator.so
-lib/samba/ldb/acl.so
-lib/samba/ldb/aclread.so
-lib/samba/ldb/anr.so
-lib/samba/ldb/asq.so
-lib/samba/ldb/audit_log.so
-lib/samba/ldb/descriptor.so
-lib/samba/ldb/dirsync.so
-lib/samba/ldb/dns_notify.so
-lib/samba/ldb/dsdb_notification.so
-lib/samba/ldb/encrypted_secrets.so
-lib/samba/ldb/extended_dn_in.so
-lib/samba/ldb/extended_dn_out.so
-lib/samba/ldb/extended_dn_store.so
-lib/samba/ldb/group_audit_log.so
-lib/samba/ldb/ildap.so
-lib/samba/ldb/instancetype.so
-lib/samba/ldb/lazy_commit.so
-lib/samba/ldb/ldb.so
-lib/samba/ldb/ldbsamba_extensions.so
-lib/samba/ldb/linked_attributes.so
-lib/samba/ldb/local_password.so
-${PLIST.64bit}lib/samba/ldb/mdb.so
-lib/samba/ldb/new_partition.so
-lib/samba/ldb/objectclass.so
-lib/samba/ldb/objectclass_attrs.so
-lib/samba/ldb/objectguid.so
-lib/samba/ldb/operational.so
-lib/samba/ldb/paged_results.so
-lib/samba/ldb/paged_searches.so
-lib/samba/ldb/partition.so
-lib/samba/ldb/password_hash.so
-lib/samba/ldb/ranged_results.so
-lib/samba/ldb/rdn_name.so
-lib/samba/ldb/repl_meta_data.so
-lib/samba/ldb/resolve_oids.so
-lib/samba/ldb/rootdse.so
-lib/samba/ldb/samba3sam.so
-lib/samba/ldb/samba3sid.so
-lib/samba/ldb/samba_dsdb.so
-lib/samba/ldb/samba_secrets.so
-lib/samba/ldb/samldb.so
-lib/samba/ldb/sample.so
-lib/samba/ldb/schema_data.so
-lib/samba/ldb/schema_load.so
-lib/samba/ldb/secrets_tdb_sync.so
-lib/samba/ldb/server_sort.so
-lib/samba/ldb/show_deleted.so
-lib/samba/ldb/simple_dn.so
-lib/samba/ldb/simple_ldap_map.so
-lib/samba/ldb/skel.so
-lib/samba/ldb/subtree_delete.so
-lib/samba/ldb/subtree_rename.so
-lib/samba/ldb/tdb.so
-lib/samba/ldb/tombstone_reanimate.so
-lib/samba/ldb/unique_object_sids.so
-lib/samba/ldb/update_keytab.so
-lib/samba/ldb/vlv.so
-lib/samba/ldb/wins_ldb.so
-lib/samba/nss_info/hash.so
-${PLIST.ldap}lib/samba/nss_info/rfc2307.so
-${PLIST.ldap}lib/samba/nss_info/sfu.so
-${PLIST.ldap}lib/samba/nss_info/sfu20.so
+lib/samba/auth/script.${SOEXT}
+lib/samba/bind9/dlz_bind9.${SOEXT}
+lib/samba/bind9/dlz_bind9_10.${SOEXT}
+lib/samba/bind9/dlz_bind9_11.${SOEXT}
+lib/samba/bind9/dlz_bind9_9.${SOEXT}
+lib/samba/gensec/krb5.${SOEXT}
+${PLIST.ads}lib/samba/idmap/ad.${SOEXT}
+lib/samba/idmap/autorid.${SOEXT}
+lib/samba/idmap/hash.${SOEXT}
+${PLIST.ads}lib/samba/idmap/rfc2307.${SOEXT}
+lib/samba/idmap/rid.${SOEXT}
+lib/samba/idmap/script.${SOEXT}
+lib/samba/idmap/tdb2.${SOEXT}
+lib/samba/krb5/winbind_krb5_locator.${SOEXT}
+lib/samba/ldb/acl.${SOEXT}
+lib/samba/ldb/aclread.${SOEXT}
+lib/samba/ldb/anr.${SOEXT}
+lib/samba/ldb/asq.${SOEXT}
+lib/samba/ldb/audit_log.${SOEXT}
+lib/samba/ldb/descriptor.${SOEXT}
+lib/samba/ldb/dirsync.${SOEXT}
+lib/samba/ldb/dns_notify.${SOEXT}
+lib/samba/ldb/dsdb_notification.${SOEXT}
+lib/samba/ldb/encrypted_secrets.${SOEXT}
+lib/samba/ldb/extended_dn_in.${SOEXT}
+lib/samba/ldb/extended_dn_out.${SOEXT}
+lib/samba/ldb/extended_dn_store.${SOEXT}
+lib/samba/ldb/group_audit_log.${SOEXT}
+lib/samba/ldb/ildap.${SOEXT}
+lib/samba/ldb/instancetype.${SOEXT}
+lib/samba/ldb/lazy_commit.${SOEXT}
+lib/samba/ldb/ldb.${SOEXT}
+lib/samba/ldb/ldbsamba_extensions.${SOEXT}
+lib/samba/ldb/linked_attributes.${SOEXT}
+lib/samba/ldb/local_password.${SOEXT}
+${PLIST.64bit}lib/samba/ldb/mdb.${SOEXT}
+lib/samba/ldb/new_partition.${SOEXT}
+lib/samba/ldb/objectclass.${SOEXT}
Home |
Main Index |
Thread Index |
Old Index