Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/samba/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.255 2015/06/12 10:50:52 wiz Exp $
# $NetBSD: Makefile,v 1.259 2016/07/09 06:38:45 wiz Exp $
DISTNAME= samba-${VERSION}
CATEGORIES= net
@@ -10,7 +10,7 @@ COMMENT= SMB/CIFS protocol server suite
LICENSE= gnu-gpl-v3
VERSION= 3.6.25
PKGREVISION= 2
PKGREVISION= 4
CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
@@ -151,6 +151,11 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/script/updatesmbpasswd.sh \
${DESTDIR}${PREFIX}/${EGDIR}
${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h
.if ${_OPSYS_SHLIB_TYPE} == "dylib"
cd ${DESTDIR}${PREFIX}; ${FIND} lib/samba lib/security -name "*.dylib" | while read lib; do \
install_name_tool -id ${PREFIX}/$${lib} $${lib}; \
done
.endif
.include "../../net/samba/Makefile.mirrors"

5
net/samba/Makefile.mirrors
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.mirrors,v 1.11 2014/03/18 12:42:04 tron Exp $
# $NetBSD: Makefile.mirrors,v 1.13 2016/09/01 13:34:34 mef Exp $
#
# This Makefile fragment contains the mirror sites for fetching Samba.
@@ -7,9 +7,6 @@
### http://www.samba.org/samba/download/ftp_mirrors.html
###
SAMBA_MIRRORS= \
ftp://ftp.easynet.be/samba/ \
http://mirrors.uol.com.br/pub/samba/ \
ftp://ca.samba.org/ \
ftp://mirrors.dotsrc.org/samba/ \
ftp://de3.samba.org/pub/samba/ \
ftp://ftp.ntua.gr/pub/net/samba/ \

6
net/samba/distinfo
View File

@@ -1,14 +1,15 @@
$NetBSD: distinfo,v 1.103 2015/05/29 09:01:09 manu Exp $
$NetBSD: distinfo,v 1.105 2016/02/29 17:13:06 jperkin Exp $
SHA1 (samba-3.6.25.tar.gz) = 86fbfcfe80454cc7dbe510e7d58c02922cac3efa
RMD160 (samba-3.6.25.tar.gz) = 4df673ddac2a3fc8590820c8651e10f0dac90281
SHA512 (samba-3.6.25.tar.gz) = 25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626
Size (samba-3.6.25.tar.gz) = 34121828 bytes
SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
SHA1 (patch-ab) = eb680f72ab0118e57d1b322aba869ac798b27e17
SHA1 (patch-ac) = 25edbd616199b7dcb41f87aa1374d0bdf19cafec
SHA1 (patch-ad) = 750b0c08d9975a257bec09088cb38414a1299070
SHA1 (patch-ae) = de70580b293f4b964bc39b95c6a27511faaf088a
SHA1 (patch-af) = 433379f00214ef066043c6c6763cab41a39f3e18
SHA1 (patch-af) = 380980f6c7d3f9ca6b472cfd2142d6d8bdb0f390
SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c
SHA1 (patch-ah) = d4dc5c01fae6b72fb8902b32c0c5b668a918ce49
SHA1 (patch-ai) = 2161f55d4f1ffe13fa24387349bb9ac71dae5521
@@ -24,7 +25,6 @@ SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b
SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84
SHA1 (patch-av) = ee4652f6278eea9b2208dacfba9b075bd60dd54b
SHA1 (patch-aw) = 772678763cfc9df298eb6d0a65c24a8372852309
SHA1 (patch-ba) = 64d88570f2e15db4f8769c7865e0793eb8909c2b
SHA1 (patch-bb) = bfc730bc2f82aff61bdf1000ab33333368a162bd
SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea
SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47

7
net/samba/files/smf/manifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<service_bundle type='manifest' name='@SMF_NAME@'>
<service_bundle type='manifest' name='export'>
<service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
<dependency name='fs-root' grouping='require_all' restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/root' />
@@ -18,7 +18,7 @@
<loctext xml:lang='C'>Samba SMB/CIFS services</loctext>
</common_name>
<documentation>
<manpage title='smbd' section='8' manpath='man'/>
<manpage title='smbd' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
</documentation>
</template>
</instance>
@@ -32,11 +32,10 @@
<loctext xml:lang='C'>Samba NetBIOS name server</loctext>
</common_name>
<documentation>
<manpage title='nmbd' section='8' manpath='man'/>
<manpage title='nmbd' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
</documentation>
</template>
</instance>
<stability value='Unstable'/>
</service>
</service_bundle>

12
net/samba/options.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.34 2015/05/10 12:55:03 ryoon Exp $
# $NetBSD: options.mk,v 1.36 2016/03/18 12:28:21 jperkin Exp $
# Recommended package options for various setups:
#
@@ -38,14 +38,10 @@ CONFIGURE_ARGS+= --with-ads
CONFIGURE_ARGS+= --with-krb5=${KRB5BASE}
# Avoid build failures with recent version of Heimdal under NetBSD.
. if ${OPSYS} == "NetBSD"
CONFIGURE_ENV+= samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no
. endif
CONFIGURE_ENV.NetBSD+= samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no
# ignore gssapi.h on Solaris as it conflicts with <gssapi/gssapi.h>
. if ${OPSYS} == "SunOS"
CONFIGURE_ENV+= ac_cv_header_gssapi_h=no
. endif
CONFIGURE_ENV.SunOS+= ac_cv_header_gssapi_h=no
.else
CONFIGURE_ARGS+= --without-ads
CONFIGURE_ARGS+= --without-krb5
@@ -155,8 +151,10 @@ NSS_WINBIND_cmd= \
# Install a /usr/lib/${NSS_WINBIND:T} -> ${PREFIX}/${NSS_WINBIND} symlink
# Unfortunately NSS_WINDIND_cmd can not be used to determine whether the
# (de)install templates are needed or not.
.if ${OS_VARIANT} != "SmartOS"
INSTALL_TEMPLATES+= INSTALL.nss_winbind
DEINSTALL_TEMPLATES+= DEINSTALL.nss_winbind
.endif
.PHONY: samba-nss-winbind-install
post-install: samba-nss-winbind-install

54
net/samba/patches/patch-af
View File

@@ -1,8 +1,48 @@
$NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
$NetBSD: patch-af,v 1.13 2016/02/29 17:13:06 jperkin Exp $
--- configure.orig 2013-07-29 18:57:14.000000000 +0000
Fix HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS test, from upstream.
--- configure.orig 2015-02-22 14:16:23.000000000 +0000
+++ configure
@@ -19513,6 +19513,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
@@ -15277,20 +15277,24 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-
- if (0) {
- this_function_does_not_exist();
- } else {
- return 1;
- }
-
+#include <sys/types.h>
+size_t __unsafe_string_function_usage_here_size_t__(void);
+#define CHECK_STRING_SIZE(d, len) (sizeof(d) != (len) && sizeof(d) != sizeof(char *))
+static size_t push_string_check_fn(void *dest, const char *src, size_t dest_len) {
+ return 0;
+}
- ;
- return 0;
+#define push_string_check(dest, src, dest_len) \
+ (CHECK_STRING_SIZE(dest, dest_len) \
+ ? __unsafe_string_function_usage_here_size_t__() \
+ : push_string_check_fn(dest, src, dest_len))
+
+int main(int argc, char **argv) {
+ char outbuf[1024];
+ char *p = outbuf;
+ const char *foo = "bar";
+ p += 31 + push_string_check(p + 31, foo, sizeof(outbuf) - (p + 31 - outbuf));
+ return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -19513,6 +19517,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
BLDSHARED="true"
LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
@@ -10,7 +50,7 @@ $NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
CFLAGS="$CFLAGS -fno-common"
SHLD="\${CC}"
SHLIBEXT="dylib"
@@ -19562,7 +19563,7 @@ fi
@@ -19562,7 +19567,7 @@ fi
if test "x$enable_as_needed" != xno; then
saved_before_as_needed_ldflags="$LDFLAGS"
@@ -19,7 +59,7 @@ $NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
saved_ldflags="$LDFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
$as_echo_n "checking if $flags works... " >&6; }
@@ -26638,9 +26639,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS"
@@ -26638,9 +26643,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS"
@@ -32,7 +72,7 @@ $NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26652,31 +26653,31 @@ else
@@ -26652,31 +26657,31 @@ else
#ifdef __cplusplus
extern "C"
#endif
@@ -72,7 +112,7 @@ $NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
_ACEOF
fi
@@ -36043,31 +36044,39 @@ case "$host_os" in
@@ -36049,31 +36054,39 @@ case "$host_os" in
NSSSONAMEVERSIONSUFFIX=".2"
WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
;;

16
net/samba/patches/patch-ba
View File

@@ -1,16 +0,0 @@
$NetBSD: patch-ba,v 1.11 2013/08/12 02:45:55 taca Exp $
--- configure.in.orig 2013-07-29 18:55:18.000000000 +0000
+++ configure.in
@@ -6541,6 +6541,11 @@ AC_CHECK_MEMBER(struct passwd.pw_age,
AC_DEFINE(HAVE_PASSWD_PW_AGE, 1, [Defined if struct passwd has pw_age field]),,
[#include <pwd.h>])
+# NetBSD
+AC_CHECK_MEMBER(struct passwd.pw_class,
+ AC_DEFINE(HAVE_PASSWD_PW_CLASS, 1, [Defined if struct passwd has pw_class field]),,
+ [#include <pwd.h>])
+
# AIX 4.3.x and 5.1 do not have as many members in
# struct secmethod_table as AIX 5.2
AC_CHECK_MEMBERS([struct secmethod_table.method_attrlist], , ,