pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/samba4 Various changes to fix the build and instal...
details: https://anonhg.NetBSD.org/pkgsrc/rev/832608020398
branches: trunk
changeset: 652167:832608020398
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Tue May 26 15:11:25 2015 +0000
description:
Various changes to fix the build and install on SunOS.
diffstat:
net/samba4/Makefile | 10 ++++++++-
net/samba4/PLIST.SunOS | 3 ++
net/samba4/distinfo | 6 ++++-
net/samba4/patches/patch-buildtools_wafsamba_wscript | 17 ++++++++++++++++
net/samba4/patches/patch-lib_nss__wrapper_nss__wrapper.c | 15 ++++++++++++++
net/samba4/patches/patch-lib_nss__wrapper_wscript | 15 ++++++++++++++
net/samba4/patches/patch-nsswitch_wscript__build | 16 +++++++++++++++
7 files changed, 80 insertions(+), 2 deletions(-)
diffs (142 lines):
diff -r 24ea1b047a68 -r 832608020398 net/samba4/Makefile
--- a/net/samba4/Makefile Tue May 26 14:33:20 2015 +0000
+++ b/net/samba4/Makefile Tue May 26 15:11:25 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/05/24 05:24:12 spz Exp $
+# $NetBSD: Makefile,v 1.6 2015/05/26 15:11:25 jperkin Exp $
DISTNAME= samba-${VERSION}
PKGREVISION= 2
@@ -15,6 +15,8 @@
VERSION= 4.2.1
CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
+BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
BUILD_DEFS+= VARBASE
.include "../../mk/bsd.prefs.mk"
@@ -96,9 +98,14 @@
.endif
# for winbind option build.
+.if ${OPSYS} != "SunOS"
LDFLAGS+= -Wl,--allow-shlib-undefined
+.endif
+LDFLAGS+= ${BUILDLINK_LDADD.gettext}
LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB}
+CFLAGS.SunOS+= -DHAVE_SOLARIS_GETGRENT_R
+
.include "options.mk"
PLIST_VARS+= macosx
@@ -187,5 +194,6 @@
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
+BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.9.0
.include "../../security/mit-krb5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 24ea1b047a68 -r 832608020398 net/samba4/PLIST.SunOS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba4/PLIST.SunOS Tue May 26 15:11:25 2015 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.SunOS,v 1.1 2015/05/26 15:11:25 jperkin Exp $
+lib/samba/vfs/dirsort.so
+lib/samba/vfs/syncops.so
diff -r 24ea1b047a68 -r 832608020398 net/samba4/distinfo
--- a/net/samba4/distinfo Tue May 26 14:33:20 2015 +0000
+++ b/net/samba4/distinfo Tue May 26 15:11:25 2015 +0000
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.1 2015/05/12 12:19:52 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2015/05/26 15:11:25 jperkin Exp $
SHA1 (samba-4.2.1.tar.gz) = f5d0471efc459898344866b5bc518c80ce67e8d5
RMD160 (samba-4.2.1.tar.gz) = 539f915c0c80cf67b8a73b6d7924804609801fb8
Size (samba-4.2.1.tar.gz) = 20701467 bytes
+SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5
+SHA1 (patch-lib_nss__wrapper_nss__wrapper.c) = c692fa33ec17ed4f1dc1e40c1fadf7846d976824
+SHA1 (patch-lib_nss__wrapper_wscript) = 1ce37974f93e791c9e0b1bdc34d26890583fdbfb
+SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
SHA1 (patch-source4_scripting_wsript_build) = 91c99acc8cbadbd8d19400d466491c1da3e42527
SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = c651014e5e703041a5bcf83f71a1d36c3f5f3309
diff -r 24ea1b047a68 -r 832608020398 net/samba4/patches/patch-buildtools_wafsamba_wscript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba4/patches/patch-buildtools_wafsamba_wscript Tue May 26 15:11:25 2015 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-buildtools_wafsamba_wscript,v 1.1 2015/05/26 15:11:26 jperkin Exp $
+
+Define _POSIX_PTHREAD_SEMANTICS on SunOS to pick up re-entrant functions.
+
+--- buildtools/wafsamba/wscript.orig 2015-02-24 18:59:51.000000000 +0000
++++ buildtools/wafsamba/wscript
+@@ -385,6 +385,10 @@ def configure(conf):
+ conf.DEFINE('_GNU_SOURCE', 1, add_to_cflags=True)
+ conf.DEFINE('_XOPEN_SOURCE_EXTENDED', 1, add_to_cflags=True)
+
++ # Use POSIX getpwnam_r and friends.
++ if conf.env['SYSTEM_UNAME_SYSNAME'] == 'SunOS':
++ conf.DEFINE('_POSIX_PTHREAD_SEMANTICS', 1, add_to_cflags=True)
++
+ # on Tru64 certain features are only available with _OSF_SOURCE set to 1
+ # and _XOPEN_SOURCE set to 600
+ if conf.env['SYSTEM_UNAME_SYSNAME'] == 'OSF1':
diff -r 24ea1b047a68 -r 832608020398 net/samba4/patches/patch-lib_nss__wrapper_nss__wrapper.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba4/patches/patch-lib_nss__wrapper_nss__wrapper.c Tue May 26 15:11:25 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_nss__wrapper_nss__wrapper.c,v 1.1 2015/05/26 15:11:26 jperkin Exp $
+
+Avoid nss.h on SunOS, incompatible with other nss.h implementations.
+
+--- lib/nss_wrapper/nss_wrapper.c.orig 2014-10-01 09:16:21.000000000 +0000
++++ lib/nss_wrapper/nss_wrapper.c
+@@ -68,7 +68,7 @@
+
+ #include <dlfcn.h>
+
+-#if defined(HAVE_NSS_H)
++#if defined(HAVE_NSS_H) && !defined(__sun)
+ /* Linux and BSD */
+ #include <nss.h>
+
diff -r 24ea1b047a68 -r 832608020398 net/samba4/patches/patch-lib_nss__wrapper_wscript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba4/patches/patch-lib_nss__wrapper_wscript Tue May 26 15:11:25 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_nss__wrapper_wscript,v 1.1 2015/05/26 15:11:26 jperkin Exp $
+
+Fix HAVE_SOLARIS_GETGRENT_R define.
+
+--- lib/nss_wrapper/wscript.orig 2015-01-16 08:18:39.000000000 +0000
++++ lib/nss_wrapper/wscript
+@@ -62,7 +62,7 @@ def configure(conf):
+ define='HAVE_SOLARIS_GETPWUID_R', headers='unistd.h pwd.h')
+ conf.CHECK_C_PROTOTYPE('getgrent_r',
+ 'struct group *getgrent_r(struct group *src, char *buf, int buflen)',
+- define='SOLARIS_GETGRENT_R', headers='unistd.h grp.h')
++ define='HAVE_SOLARIS_GETGRENT_R', headers='unistd.h grp.h')
+ conf.CHECK_C_PROTOTYPE('getgrnam_r',
+ 'int getgrnam_r(const char *name, struct group *grp, char *buf, int buflen, struct group **pgrp)',
+ define='HAVE_SOLARIS_GETGRNAM_R', headers='unistd.h grp.h')
diff -r 24ea1b047a68 -r 832608020398 net/samba4/patches/patch-nsswitch_wscript__build
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba4/patches/patch-nsswitch_wscript__build Tue May 26 15:11:25 2015 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-nsswitch_wscript__build,v 1.1 2015/05/26 15:11:26 jperkin Exp $
+
+Use common library name on SunOS.
+
+--- nsswitch/wscript_build.orig 2015-02-24 18:59:51.000000000 +0000
++++ nsswitch/wscript_build
+@@ -77,8 +77,7 @@ elif Utils.unversioned_sys_platform() ==
+ bld.SAMBA_LIBRARY('nss_winbind',
+ source='winbind_nss_solaris.c winbind_nss_linux.c',
+ deps='winbind-client',
+- realname='nss_winbind.so.1',
+- vnum='1')
++ realname='libnss_winbind.so')
+ elif (host_os.rfind('hpux') > -1):
+ bld.SAMBA_LIBRARY('nss_winbind',
+ source='winbind_nss_linux.c',
Home |
Main Index |
Thread Index |
Old Index