FreeBSD Bugzilla – Attachment 166536 Details for
Bug 206808
net/samba36: security/vuxml: ineffective vuxml entry
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
samba-3.6.35_2.patch
samba36.patch (text/plain), 24.83 KB, created by
takefu
on 2016-02-04 06:37:33 UTC
(
hide
)
Description:
samba-3.6.35_2.patch
Filename:
MIME Type:
Creator:
takefu
Created:
2016-02-04 06:37:33 UTC
Size:
24.83 KB
patch
obsolete
>diff -dpruN /usr/ports/net/samba36/Makefile ./Makefile >--- /usr/ports/net/samba36/Makefile 2015-09-15 16:22:32.000000000 +0000 >+++ ./Makefile 2016-02-04 06:31:12.000000000 +0000 >@@ -2,10 +2,12 @@ > > PORTNAME= ${SAMBA_BASENAME}36 > PORTVERSION= 3.6.25 >-PORTREVISION?= 1 >+PORTREVISION?= 2 > CATEGORIES?= net > MASTER_SITES= SAMBA/samba SAMBA/samba/stable SAMBA/samba/pre > DISTNAME= ${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} >+PATCH_SITES= https://www.samba.org/samba/ftp/patches/security/ >+PATCHFILES= samba-3.6.25-security-2015-12-16.patch:-p1 > > MAINTAINER?= timur@FreeBSD.org > COMMENT?= Free SMB and CIFS client and server for Unix >@@ -492,16 +494,16 @@ post-install: > .for sect in 1 3 5 7 8 > @${MKDIR} ${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect} > . for man in ${SAMBA_MAN${sect}} >- @${INSTALL_MAN} "${WRKDIR}/${DISTNAME}/docs/manpages/${man}" "${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect}" >+ ${INSTALL_MAN} "${WRKDIR}/${DISTNAME}/docs/manpages/${man}" "${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect}" > ${ECHO_CMD} "man/man${sect}/${man}.gz" >> ${TMPPLIST} > . endfor > .endfor > # Put examples in place > @${MKDIR} "${STAGEDIR}${EXAMPLESDIR}" >- @${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/* "${STAGEDIR}${EXAMPLESDIR}" >+ @(cd ${WRKDIR}/${DISTNAME}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) > .if ${PORT_OPTIONS:MPAM_SMBPASS} > @${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/pam_smbpass" >- @${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* "${STAGEDIR}${EXAMPLESDIR}/pam_smbpass" >+ @(cd ${WRKSRC}/pam_smbpass/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/pam_smbpass) > .endif > ${INSTALL_DATA} "${WRKDIR}/smb.conf.sample" "${STAGEDIR}${EXAMPLESDIR}/${SAMBA_CONFIG}.sample" > ${INSTALL_DATA} "${WRKDIR}/smb.conf.sample" "${STAGEDIR}${SAMBA_CONFDIR}/${SAMBA_CONFIG}.sample" >@@ -526,16 +528,16 @@ post-install: > done > # Documentation > .if ${PORT_OPTIONS:MDOCS} >- @${MKDIR} ${STAGEDIR}${DOCSDIR} >- @${CP} -Rp "${WRKDIR}/${DISTNAME}/docs/registry" "${STAGEDIR}${DOCSDIR}" >+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/registry >+ @(cd ${WRKDIR}/${DISTNAME}/docs/registry && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/registry) > . for f in Samba3-ByExample.pdf Samba3-HOWTO.pdf Samba3-Developers-Guide.pdf >- @${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/docs/${f}" "${STAGEDIR}${DOCSDIR}" >+ ${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/docs/${f}" "${STAGEDIR}${DOCSDIR}" > . endfor > . for f in README COPYING MAINTAINERS.txt PFIF.txt Manifest Roadmap \ > WHATSNEW.txt docs/THANKS docs/history >- @${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/${f}" "${STAGEDIR}${DOCSDIR}" >+ ${INSTALL_DATA} "${WRKDIR}/${DISTNAME}/${f}" "${STAGEDIR}${DOCSDIR}" > . endfor >- @${INSTALL_DATA} "${FILESDIR}/README.FreeBSD" "${STAGEDIR}${DOCSDIR}" >+ ${INSTALL_DATA} "${FILESDIR}/README.FreeBSD" "${STAGEDIR}${DOCSDIR}" > .endif > # Run post-install script > .for dir in ${SAMBA_SPOOL} ${SAMBA_LOGDIR} ${SAMBA_RUNDIR} ${SAMBA_LOCKDIR} ${SAMBA_PRIVATEDIR} >diff -dpruN /usr/ports/net/samba36/distinfo ./distinfo >--- /usr/ports/net/samba36/distinfo 2015-02-24 15:47:33.000000000 +0000 >+++ ./distinfo 2016-02-03 08:54:49.000000000 +0000 >@@ -1,2 +1,4 @@ > SHA256 (samba-3.6.25.tar.gz) = 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 > SIZE (samba-3.6.25.tar.gz) = 34121828 >+SHA256 (samba-3.6.25-security-2015-12-16.patch) = abe1ba1a73afe0865f20ac34a207c799cde29d34e736de5c2d029d532c93ac01 >+SIZE (samba-3.6.25-security-2015-12-16.patch) = 8023 >diff -dpruN /usr/ports/net/samba36/files/patch-lib__replace__system__wait.h ./files/patch-lib__replace__system__wait.h >--- /usr/ports/net/samba36/files/patch-lib__replace__system__wait.h 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-lib__replace__system__wait.h 2016-02-02 06:18:33.000000000 +0000 >@@ -1,5 +1,5 @@ >---- ./lib/replace/system/wait.h.orig 2010-04-01 15:26:22.000000000 +0200 >-+++ ./lib/replace/system/wait.h 2010-04-23 01:08:35.000000000 +0200 >+--- ./lib/replace/system/wait.h.orig 2015-02-22 14:11:32 UTC >++++ ./lib/replace/system/wait.h > @@ -32,6 +32,18 @@ > > #include <signal.h> >diff -dpruN /usr/ports/net/samba36/files/patch-lib__tevent__tevent_signal.c ./files/patch-lib__tevent__tevent_signal.c >--- /usr/ports/net/samba36/files/patch-lib__tevent__tevent_signal.c 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-lib__tevent__tevent_signal.c 2016-02-02 06:14:25.000000000 +0000 >@@ -1,5 +1,5 @@ >---- ./lib/tevent/tevent_signal.c.orig 2010-04-01 15:26:22.000000000 +0200 >-+++ ./lib/tevent/tevent_signal.c 2010-04-23 01:08:35.000000000 +0200 >+--- ./lib/tevent/tevent_signal.c.orig 2015-02-22 14:11:32 UTC >++++ ./lib/tevent/tevent_signal.c > @@ -30,7 +30,7 @@ > #include "tevent_internal.h" > #include "tevent_util.h" >diff -dpruN /usr/ports/net/samba36/files/patch-nsswitch__pam_winbind.c ./files/patch-nsswitch__pam_winbind.c >--- /usr/ports/net/samba36/files/patch-nsswitch__pam_winbind.c 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-nsswitch__pam_winbind.c 2016-02-02 06:20:24.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./nsswitch/pam_winbind.c.orig 2011-08-09 13:17:47.000000000 +0200 >-+++ ./nsswitch/pam_winbind.c 2011-09-06 23:23:18.000000000 +0200 >-@@ -163,7 +163,6 @@ >+--- ./nsswitch/pam_winbind.c.orig 2015-02-22 14:11:32 UTC >++++ ./nsswitch/pam_winbind.c >+@@ -163,7 +163,6 @@ static inline void textdomain_init(void) > } > #endif > >@@ -31,7 +31,7 @@ > } > > /* some syslogging */ >-@@ -311,7 +316,7 @@ >+@@ -311,7 +316,7 @@ static void _pam_log_state_datum(struct > if (item_type != 0) { > pam_get_item(ctx->pamh, item_type, &data); > } else { >@@ -40,7 +40,7 @@ > } > if (data != NULL) { > const char *type = (item_type != 0) ? "ITEM" : "DATA"; >-@@ -2835,8 +2840,7 @@ >+@@ -2835,8 +2840,7 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, > ret = PAM_USER_UNKNOWN; > goto out; > case 0: >diff -dpruN /usr/ports/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c ./files/patch-nsswitch__winbind_nss_freebsd.c >--- /usr/ports/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c 2013-03-25 15:18:58.000000000 +0000 >+++ ./files/patch-nsswitch__winbind_nss_freebsd.c 2016-02-02 06:21:52.000000000 +0000 >@@ -1,5 +1,5 @@ >---- ./nsswitch/winbind_nss_freebsd.c.orig 2012-10-02 08:24:41.000000000 +0000 >-+++ ./nsswitch/winbind_nss_freebsd.c 2013-03-13 09:40:37.285778609 +0000 >+--- ./nsswitch/winbind_nss_freebsd.c.orig 2015-02-22 14:11:32 UTC >++++ ./nsswitch/winbind_nss_freebsd.c > @@ -5,6 +5,7 @@ > routines against Samba winbind/Windows NT Domain > >@@ -8,7 +8,7 @@ > > This library is free software; you can redistribute it and/or > modify it under the terms of the GNU Lesser General Public >-@@ -53,6 +54,9 @@ >+@@ -53,6 +54,9 @@ NSS_METHOD_PROTOTYPE(__nss_compat_getpwu > NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r); > NSS_METHOD_PROTOTYPE(__nss_compat_setpwent); > NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); >@@ -18,7 +18,7 @@ > > static ns_mtab methods[] = { > { NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_winbind_getgrnam_r }, >-@@ -60,6 +64,7 @@ >+@@ -60,6 +64,7 @@ static ns_mtab methods[] = { > { NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_winbind_getgrent_r }, > { NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_winbind_setgrent }, > { NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_winbind_endgrent }, >@@ -26,7 +26,7 @@ > > { NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_winbind_getpwnam_r }, > { NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_winbind_getpwuid_r }, >-@@ -69,6 +74,71 @@ >+@@ -69,6 +74,71 @@ static ns_mtab methods[] = { > > }; > >diff -dpruN /usr/ports/net/samba36/files/patch-nsswitch__wins_freebsd.c ./files/patch-nsswitch__wins_freebsd.c >--- /usr/ports/net/samba36/files/patch-nsswitch__wins_freebsd.c 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-nsswitch__wins_freebsd.c 2016-02-02 06:59:56.000000000 +0000 >@@ -1,5 +1,5 @@ >---- ./nsswitch/wins_freebsd.c.orig 2010-04-23 01:08:35.000000000 +0200 >-+++ ./nsswitch/wins_freebsd.c 2010-04-23 01:08:35.000000000 +0200 >+--- ./nsswitch/wins_freebsd.c.orig 2010-04-22 23:08:35 UTC >++++ ./nsswitch/wins_freebsd.c > @@ -0,0 +1,79 @@ > +/* > + Unix SMB/CIFS implementation. >diff -dpruN /usr/ports/net/samba36/files/patch-source3__Makefile.in ./files/patch-source3__Makefile.in >--- /usr/ports/net/samba36/files/patch-source3__Makefile.in 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-source3__Makefile.in 2016-02-02 06:42:36.000000000 +0000 >@@ -1,5 +1,14 @@ >---- ./source3/Makefile.in.orig 2013-06-19 07:35:24.000000000 +0000 >-+++ ./source3/Makefile.in 2013-06-30 04:26:08.399888796 +0000 >+--- ./source3/Makefile.in.orig 2015-02-22 14:11:32 UTC >++++ ./source3/Makefile.in >+@@ -102,7 +102,7 @@ TDBTORTURE = @TDBTORTURE@ >+ PTHREADPOOLTEST = @PTHREADPOOLTEST@ >+ >+ INSTALLCMD=@INSTALL@ >+-INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@ >++INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@ -s >+ INSTALLLIBCMD_A=@INSTALLLIBCMD_A@ >+ UNINSTALLLIBCMD_SH=@UNINSTALLLIBCMD_SH@ >+ UNINSTALLLIBCMD_A=@UNINSTALLLIBCMD_A@ > @@ -151,7 +151,7 @@ > # These can be overridden by command line switches (see smbd(8)) > # or in smb.conf (see smb.conf(5)) >@@ -9,7 +18,7 @@ > LMHOSTSFILE = $(CONFIGDIR)/lmhosts > NCALRPCDIR = @ncalrpcdir@ > >-@@ -1305,8 +1305,8 @@ >+@@ -1305,8 +1305,8 @@ SMBFILTER_OBJ = utils/smbfilter.o $(PARA > $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \ > $(LIBNDR_GEN_OBJ0) > >@@ -20,7 +29,7 @@ > > PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ > pam_smbpass/pam_smb_acct.o pam_smbpass/support.o ../lib/util/asn1.o >-@@ -1623,6 +1623,7 @@ >+@@ -1623,6 +1623,7 @@ everything:: all libtalloc libsmbclient > > .SUFFIXES: > .SUFFIXES: .c .o .lo >@@ -28,7 +37,7 @@ > > .PHONY: showflags SHOWFLAGS > >-@@ -1684,6 +1685,9 @@ >+@@ -1684,6 +1685,9 @@ COMPILE = $(COMPILE_CC) > $(COMPILE_CC) >/dev/null 2>&1 > @BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@ > >@@ -38,7 +47,7 @@ > PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch > > # this adds support for precompiled headers. To use it, install a snapshot >-@@ -2856,9 +2860,9 @@ >+@@ -2856,9 +2860,9 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP > $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \ > @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ > >@@ -50,7 +59,7 @@ > $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@` > > bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBWBCLIENT) >-@@ -3215,7 +3219,8 @@ >+@@ -3215,7 +3219,8 @@ bin/pam_smbpass.@SHLIBEXT@: $(BINARY_PRE > @echo "Linking shared library $@" > @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) -lpam $(DYNEXP) \ > $(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ >diff -dpruN /usr/ports/net/samba36/files/patch-source3__configure.in ./files/patch-source3__configure.in >--- /usr/ports/net/samba36/files/patch-source3__configure.in 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-source3__configure.in 2016-02-02 06:48:47.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./source3/configure.in.orig 2013-01-18 10:41:08.000000000 +0000 >-+++ ./source3/configure.in 2013-01-30 01:24:19.349878982 +0000 >-@@ -864,9 +864,13 @@ >+--- ./source3/configure.in.orig 2015-02-22 14:11:32 UTC >++++ ./source3/configure.in >+@@ -864,9 +864,13 @@ if test x$enable_cups != xno; then > AC_PATH_PROG(CUPS_CONFIG, cups-config) > > if test "x$CUPS_CONFIG" != x; then >@@ -15,7 +15,7 @@ > AC_CHECK_HEADERS(cups/cups.h cups/language.h) > > if test x"$ac_cv_header_cups_cups_h" = xyes -a \ >-@@ -875,7 +879,7 @@ >+@@ -875,7 +879,7 @@ if test x$enable_cups != xno; then > # underlinked. With cups-config --libs we pull in unwanted and unneeded > # dendencies including thread libraries - use cups-config only if really > # required. >@@ -24,7 +24,7 @@ > [PRINT_LIBS="$ac_save_PRINT_LIBS -lcups"], > [AC_MSG_WARN([your cups library doesn't link with -lcups alone, it might be underlinked.]) ; > PRINT_LIBS="$ac_save_PRINT_LIBS `$CUPS_CONFIG --libs`"]) >-@@ -885,10 +889,10 @@ >+@@ -885,10 +889,10 @@ if test x$enable_cups != xno; then > AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt) > else > AC_MSG_WARN([cups-config around but cups-devel not installed]) >@@ -37,7 +37,7 @@ > > elif test x"$enable_cups" = x"yes"; then > AC_MSG_ERROR(Cups support required but cups-config not located. Make sure cups-devel related files are installed.) >-@@ -1845,7 +1849,7 @@ >+@@ -1845,7 +1849,7 @@ if test "$enable_shared" = yes -a "${ac_ > fi > > if test x"$BLDSHARED" = x"true" ; then >@@ -46,7 +46,7 @@ > fi > > AC_MSG_RESULT($BLDSHARED) >-@@ -1976,9 +1980,6 @@ >+@@ -1976,9 +1980,6 @@ AC_MSG_RESULT([$SONAMEFLAG]) > AC_MSG_CHECKING([PICFLAG]) > AC_MSG_RESULT([$PICFLAG]) > >@@ -56,7 +56,7 @@ > AC_CACHE_CHECK([whether building shared libraries actually works], > [ac_cv_shlib_works],[ > # try building a trivial shared library >-@@ -4656,15 +4657,51 @@ >+@@ -4656,15 +4657,51 @@ if test x"${try_pam}" != x"no";then > x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then > if test x"${try_pam}" = x"yes";then > AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found]) >@@ -112,7 +112,7 @@ > > if test x"$create_pam_modules" = x"yes"; then > AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support]) >-@@ -4674,7 +4711,7 @@ >+@@ -4674,7 +4711,7 @@ if test x"${try_pam}" != x"no";then > AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h) > AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS) > else >@@ -121,7 +121,7 @@ > fi > fi > AC_MSG_CHECKING(whether to use PAM support) >-@@ -5877,7 +5914,7 @@ >+@@ -5877,7 +5914,7 @@ int main() { struct aiocb a; return aio_ > > AC_MSG_CHECKING(for aio_suspend) > AC_LINK_IFELSE([#include <aio.h> >@@ -130,7 +130,7 @@ > [AC_DEFINE(HAVE_AIO_SUSPEND, 1, [Have aio_suspend]) AC_MSG_RESULT(yes)], > [AC_MSG_RESULT(no)]) > fi >-@@ -6336,12 +6373,13 @@ >+@@ -6336,12 +6373,13 @@ case "$host_os" in > NSSSONAMEVERSIONSUFFIX=".2" > WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o" > ;; >@@ -145,7 +145,7 @@ > WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT" > WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT" > ;; >-@@ -6488,10 +6526,14 @@ >+@@ -6488,10 +6526,14 @@ else > AC_MSG_RESULT(no$winbind_no_reason) > fi > >@@ -160,7 +160,7 @@ > AC_SUBST(NSSSONAMEVERSIONSUFFIX) > > AC_SUBST(WINBIND_KRB5_LOCATOR) >-@@ -6810,13 +6852,21 @@ >+@@ -6810,13 +6852,21 @@ CFLAGS=$CFLAGS_SAVE > # Start > AC_CHECK_FUNC(getmntent) > >@@ -183,7 +183,7 @@ > int main(void) > { > struct statfs fsd; >-@@ -7116,6 +7166,16 @@ >+@@ -7116,6 +7166,16 @@ then > LIBS="$LIBS -ldmalloc" > fi > >@@ -200,7 +200,7 @@ > dnl Remove -L/usr/lib/? from LDFLAGS and LIBS > LIB_REMOVE_USR_LIB(LDFLAGS) > LIB_REMOVE_USR_LIB(LIBS) >-@@ -7164,6 +7224,7 @@ >+@@ -7164,6 +7224,7 @@ SMBD_LIBS="$samba_dmapi_libs" > AC_SUBST(SMBD_LIBS) > > CFLAGS="${CFLAGS} \$(FLAGS)" >diff -dpruN /usr/ports/net/samba36/files/patch-source3__include__includes.h ./files/patch-source3__include__includes.h >--- /usr/ports/net/samba36/files/patch-source3__include__includes.h 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-source3__include__includes.h 2016-02-02 06:29:26.000000000 +0000 >@@ -1,5 +1,5 @@ >---- ./source3/include/includes.h.orig 2011-08-09 13:17:47.000000000 +0200 >-+++ ./source3/include/includes.h 2011-10-04 00:34:33.000000000 +0200 >+--- ./source3/include/includes.h.orig 2015-02-22 14:11:32 UTC >++++ ./source3/include/includes.h > @@ -161,6 +161,10 @@ > #include <sys/uio.h> > #endif >@@ -11,7 +11,7 @@ > #if HAVE_LANGINFO_H > #include <langinfo.h> > #endif >-@@ -548,10 +552,6 @@ >+@@ -548,10 +552,6 @@ typedef char fstring[FSTRING_LEN]; > #define SIGCLD SIGCHLD > #endif > >diff -dpruN /usr/ports/net/samba36/files/patch-source3__lib__fault.c ./files/patch-source3__lib__fault.c >--- /usr/ports/net/samba36/files/patch-source3__lib__fault.c 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-source3__lib__fault.c 2016-02-02 06:39:19.000000000 +0000 >@@ -1,5 +1,5 @@ >---- ./source3/lib/fault.c.orig 2010-04-01 15:26:22.000000000 +0200 >-+++ ./source3/lib/fault.c 2010-04-23 01:08:35.000000000 +0200 >+--- ./source3/lib/fault.c.orig 2015-02-22 14:11:32 UTC >++++ ./source3/lib/fault.c > @@ -26,6 +26,10 @@ > #endif > >@@ -11,7 +11,7 @@ > #ifdef HAVE_SYS_PRCTL_H > #include <sys/prctl.h> > #endif >-@@ -144,52 +148,93 @@ >+@@ -144,52 +148,93 @@ static char *get_default_corepath(const > * before dump_core() calls abort. > */ > #if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME)) >@@ -143,7 +143,7 @@ > } > #endif > >-@@ -248,8 +293,7 @@ >+@@ -248,8 +293,7 @@ static char *get_corepath(const char *lo > { > #if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME)) > char *tmp_corepath = NULL; >@@ -153,7 +153,7 @@ > /* If this has been set correctly, we're done. */ > if (tmp_corepath) { > return tmp_corepath; >-@@ -327,7 +371,7 @@ >+@@ -327,7 +371,7 @@ void dump_core_setup(const char *prognam > SAFE_FREE(logbase); > } > >diff -dpruN /usr/ports/net/samba36/files/patch-source3__lib__system.c ./files/patch-source3__lib__system.c >--- /usr/ports/net/samba36/files/patch-source3__lib__system.c 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-source3__lib__system.c 2016-02-02 06:40:19.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./source3/lib/system.c.orig 2011-08-09 13:17:47.000000000 +0200 >-+++ ./source3/lib/system.c 2011-10-13 23:38:02.000000000 +0200 >-@@ -2586,14 +2586,14 @@ >+--- ./source3/lib/system.c.orig 2015-02-22 14:11:32 UTC >++++ ./source3/lib/system.c >+@@ -2586,14 +2586,14 @@ int sys_aio_fsync(int op, SMB_STRUCT_AIO > } > > /******************************************************************* >diff -dpruN /usr/ports/net/samba36/files/patch-source3__m4__aclocal.m4 ./files/patch-source3__m4__aclocal.m4 >--- /usr/ports/net/samba36/files/patch-source3__m4__aclocal.m4 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-source3__m4__aclocal.m4 2016-02-02 06:28:48.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./source3/m4/aclocal.m4.orig 2012-09-14 08:12:09.000000000 +0000 >-+++ ./source3/m4/aclocal.m4 2012-10-20 13:13:36.975802862 +0000 >-@@ -385,7 +385,7 @@ >+--- ./source3/m4/aclocal.m4.orig 2015-02-22 14:11:32 UTC >++++ ./source3/m4/aclocal.m4 >+@@ -385,7 +385,7 @@ AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[ > ac_new_flags="" > for i in [$]$1; do > case [$]i in >@@ -9,7 +9,7 @@ > *) ac_new_flags="[$]ac_new_flags [$]i" ;; > esac > done >-@@ -437,104 +437,81 @@ >+@@ -437,104 +437,81 @@ AC_DEFUN(jm_ICONV, > dnl those with the standalone portable libiconv installed). > AC_MSG_CHECKING(for iconv in $1) > jm_cv_func_iconv="no" >diff -dpruN /usr/ports/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c ./files/patch-source3__modules__vfs_shadow_copy2.c >--- /usr/ports/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c 2012-10-22 09:20:05.000000000 +0000 >+++ ./files/patch-source3__modules__vfs_shadow_copy2.c 2016-02-02 06:27:47.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./source3/modules/vfs_shadow_copy2.c.orig 2012-10-19 03:37:47.475803452 +0000 >-+++ ./source3/modules/vfs_shadow_copy2.c 2012-10-19 03:39:42.665808023 +0000 >-@@ -237,7 +237,7 @@ >+--- ./source3/modules/vfs_shadow_copy2.c.orig 2015-02-22 14:11:32 UTC >++++ ./source3/modules/vfs_shadow_copy2.c >+@@ -237,7 +237,7 @@ static const char *shadow_copy2_normalis > if (shadow_copy2_match_name(fname, &gmt_start)) { \ > char *name2; \ > rtype ret; \ >@@ -9,7 +9,7 @@ > if (name2 == NULL) { \ > errno = EINVAL; \ > return eret; \ >-@@ -258,7 +258,7 @@ >+@@ -258,7 +258,7 @@ static const char *shadow_copy2_normalis > char *name2; \ > char *smb_base_name_tmp = NULL; \ > rtype ret; \ >@@ -18,7 +18,7 @@ > if (name2 == NULL) { \ > errno = EINVAL; \ > return eret; \ >-@@ -285,7 +285,7 @@ >+@@ -285,7 +285,7 @@ static const char *shadow_copy2_normalis > if (shadow_copy2_match_name(fname, &gmt_start)) { \ > char *name2; \ > NTSTATUS ret; \ >@@ -27,7 +27,7 @@ > if (name2 == NULL) { \ > errno = EINVAL; \ > return eret; \ >-@@ -409,7 +409,8 @@ >+@@ -409,7 +409,8 @@ static const char *shadow_copy2_find_bas > convert a filename from a share relative path, to a path in the > snapshot directory > */ >@@ -37,7 +37,7 @@ > { > TALLOC_CTX *tmp_ctx = talloc_new(handle->data); > const char *snapdir, *relpath, *baseoffset, *basedir; >-@@ -486,11 +487,13 @@ >+@@ -486,11 +487,13 @@ static char *convert_shadow2_name(vfs_ha > if (*relpath == '/') relpath++; > if (*baseoffset == '/') baseoffset++; > >@@ -53,7 +53,7 @@ > DEBUG(6,("convert_shadow2_name: '%s' -> '%s'\n", fname, ret)); > talloc_free(tmp_ctx); > return ret; >-@@ -687,68 +690,17 @@ >+@@ -687,68 +690,17 @@ static char *shadow_copy2_realpath(vfs_h > static const char *shadow_copy2_connectpath(struct vfs_handle_struct *handle, > const char *fname) > { >diff -dpruN /usr/ports/net/samba36/files/patch-source3__script__installbin.sh.in ./files/patch-source3__script__installbin.sh.in >--- /usr/ports/net/samba36/files/patch-source3__script__installbin.sh.in 1970-01-01 00:00:00.000000000 +0000 >+++ ./files/patch-source3__script__installbin.sh.in 2016-02-02 06:30:00.000000000 +0000 >@@ -0,0 +1,10 @@ >+--- ./source3/script/installbin.sh.in.orig 2015-02-22 14:11:32 UTC >++++ ./source3/script/installbin.sh.in >+@@ -19,6 +19,7 @@ >+ fi >+ cp $p $DESTDIR/$BINDIR/ >+ chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2 >++ strip $DESTDIR/$BINDIR/$p2 >+ done >+ >+ >diff -dpruN /usr/ports/net/samba36/files/patch-source3__script__installmodules.sh ./files/patch-source3__script__installmodules.sh >--- /usr/ports/net/samba36/files/patch-source3__script__installmodules.sh 1970-01-01 00:00:00.000000000 +0000 >+++ ./files/patch-source3__script__installmodules.sh 2016-02-02 06:30:25.000000000 +0000 >@@ -0,0 +1,10 @@ >+--- ./source3/script/installmodules.sh.orig 2015-02-22 14:11:32 UTC >++++ ./source3/script/installmodules.sh >+@@ -37,6 +37,7 @@ >+ echo Installing $p as $DESTDIR/$LIBDIR/$name >+ cp -f $p $DESTDIR/$LIBDIR/$name >+ chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$name >++ strip $DESTDIR/$LIBDIR/$name >+ done >+ >+ exit 0 >diff -dpruN /usr/ports/net/samba36/files/patch-source3__smbd__quotas.c ./files/patch-source3__smbd__quotas.c >--- /usr/ports/net/samba36/files/patch-source3__smbd__quotas.c 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-source3__smbd__quotas.c 2016-02-02 06:37:10.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./source3/smbd/quotas.c.orig 2010-04-01 15:26:22.000000000 +0200 >-+++ ./source3/smbd/quotas.c 2010-04-23 01:08:35.000000000 +0200 >-@@ -1235,6 +1235,7 @@ >+--- ./source3/smbd/quotas.c.orig 2015-02-22 14:11:32 UTC >++++ ./source3/smbd/quotas.c >+@@ -1235,6 +1235,7 @@ static bool nfs_quotas(char *nfspath, ui > if (!cutstr) > return False; > >@@ -8,7 +8,7 @@ > memset(cutstr, '\0', len+1); > host = strncat(cutstr,mnttype, sizeof(char) * len ); > DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr)); >-@@ -1243,7 +1244,7 @@ >+@@ -1243,7 +1244,7 @@ static bool nfs_quotas(char *nfspath, ui > args.gqa_pathp = testpath+1; > args.gqa_uid = uid; > >diff -dpruN /usr/ports/net/samba36/files/patch-source3__smbd__statvfs.c ./files/patch-source3__smbd__statvfs.c >--- /usr/ports/net/samba36/files/patch-source3__smbd__statvfs.c 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-source3__smbd__statvfs.c 2016-02-02 06:38:19.000000000 +0000 >@@ -1,5 +1,5 @@ >---- ./source3/smbd/statvfs.c.orig 2010-04-01 15:26:22.000000000 +0200 >-+++ ./source3/smbd/statvfs.c 2010-04-23 01:08:35.000000000 +0200 >+--- ./source3/smbd/statvfs.c.orig 2015-02-22 14:11:32 UTC >++++ ./source3/smbd/statvfs.c > @@ -3,6 +3,7 @@ > VFS API's statvfs abstraction > Copyright (C) Alexander Bokovoy 2005 >@@ -8,7 +8,7 @@ > Copyright (C) James Peach 2006 > > This program is free software; you can redistribute it and/or modify >-@@ -49,9 +50,42 @@ >+@@ -49,9 +50,42 @@ static int linux_statvfs(const char *pat > } > return result; > } >@@ -53,7 +53,7 @@ > > #include <sys/attr.h> > >-@@ -137,6 +171,8 @@ >+@@ -137,6 +171,8 @@ int sys_statvfs(const char *path, vfs_st > { > #if defined(LINUX) && defined(HAVE_FSID_INT) > return linux_statvfs(path, statbuf); >diff -dpruN /usr/ports/net/samba36/files/patch-source3__utils__net.c ./files/patch-source3__utils__net.c >--- /usr/ports/net/samba36/files/patch-source3__utils__net.c 2013-01-31 15:59:44.000000000 +0000 >+++ ./files/patch-source3__utils__net.c 2016-02-02 06:33:37.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./source3/utils/net.c.orig 2013-01-29 08:49:31.000000000 +0000 >-+++ ./source3/utils/net.c 2013-01-31 15:04:24.069877314 +0000 >-@@ -898,8 +898,13 @@ >+--- ./source3/utils/net.c.orig 2015-02-22 14:11:32 UTC >++++ ./source3/utils/net.c >+@@ -898,8 +898,13 @@ static struct functable net_func[] = { > set_global_myname(c->opt_requester_name); > } > >diff -dpruN /usr/ports/net/samba36/files/patch-source3__utils__net_time.c ./files/patch-source3__utils__net_time.c >--- /usr/ports/net/samba36/files/patch-source3__utils__net_time.c 2014-01-22 17:40:44.000000000 +0000 >+++ ./files/patch-source3__utils__net_time.c 2016-02-02 06:35:17.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./source3/utils/net_time.c.orig 2010-04-01 15:26:22.000000000 +0200 >-+++ ./source3/utils/net_time.c 2010-04-23 01:08:35.000000000 +0200 >-@@ -87,10 +87,15 @@ >+--- ./source3/utils/net_time.c.orig 2015-02-22 14:11:32 UTC >++++ ./source3/utils/net_time.c >+@@ -87,10 +87,15 @@ static const char *systime(time_t t) > if (!tm) { > return "unknown"; > }
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=166536">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 206808
: 166536 |
166734
|
166735
|
166736