Re: UPDATE: samba 3.6.7 - current TAKE 2
On Tue, Aug 14, 2012 at 01:32:04PM +1000, Ian McWilliam wrote: > Take 2 - forgot to cvs add. Doh! > > An update for samba to version 3.6.7 for current. > > As usual lots of bug fixes. > > http://www.samba.org/samba/history/samba-3.6.7.html > > Major enhancements in Samba 3.6.7 include: > > Fix resolving our own "Domain Local" groups (bug #9052). > Fix migrating printers while upgrading from 3.5.x (bug #9026). > > Make sure you apply the diff with > > patch -E > > 2 patches removed, 1 added. > > Ian McWilliam What is that md5 patch about? -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: samba 3.6.7 - current TAKE 2
On 14/08/2012 3:21 PM, Brad Smith wrote: On Tue, Aug 14, 2012 at 01:32:04PM +1000, Ian McWilliam wrote: Take 2 - forgot to cvs add. Doh! An update for samba to version 3.6.7 for current. As usual lots of bug fixes. http://www.samba.org/samba/history/samba-3.6.7.html Major enhancements in Samba 3.6.7 include: Fix resolving our own "Domain Local" groups (bug #9052). Fix migrating printers while upgrading from 3.5.x (bug #9026). Make sure you apply the diff with patch -E 2 patches removed, 1 added. Ian McWilliam What is that md5 patch about? Between 3.6.6 -> 3.6.7 the samba mob added a bunch of code that bought in /usr/include/md5.h that breaks building samba. The patch removes the cruft so that it builds again. Samba Bug 9094 && bug 9086 have been filed against it as is also seems to break building on Freebsd as well. I'm guessing no a lot of other OSes. Ian McWilliam
Re: UPDATE: samba 3.6.7 - current TAKE 2
On Tue, Aug 14, 2012 at 01:32:04PM +1000, Ian McWilliam wrote: > Take 2 - forgot to cvs add. Doh! > > An update for samba to version 3.6.7 for current. > > As usual lots of bug fixes. > > http://www.samba.org/samba/history/samba-3.6.7.html > > Major enhancements in Samba 3.6.7 include: > > Fix resolving our own "Domain Local" groups (bug #9052). > Fix migrating printers while upgrading from 3.5.x (bug #9026). > > Make sure you apply the diff with > > patch -E > > 2 patches removed, 1 added. > > Ian McWilliam The issue with the build and which MD5 implementation to use has been resolved. Please take a look at bug report 9037.. https://bugzilla.samba.org/show_bug.cgi?id=9037 and take the two diffs mentioned there and apply them to the port instead of the header hack there now. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: samba 3.6.7 - current TAKE 2
On 2012/08/30 10:19, Brad Smith wrote:
> On Tue, Aug 14, 2012 at 01:32:04PM +1000, Ian McWilliam wrote:
> > Take 2 - forgot to cvs add. Doh!
> >
> > An update for samba to version 3.6.7 for current.
> >
> > As usual lots of bug fixes.
> >
> > http://www.samba.org/samba/history/samba-3.6.7.html
> >
> > Major enhancements in Samba 3.6.7 include:
> >
> > Fix resolving our own "Domain Local" groups (bug #9052).
> > Fix migrating printers while upgrading from 3.5.x (bug #9026).
> >
> > Make sure you apply the diff with
> >
> > patch -E
> >
> > 2 patches removed, 1 added.
> >
> > Ian McWilliam
>
> The issue with the build and which MD5 implementation to use has been
> resolved. Please take a look at bug report 9037..
> https://bugzilla.samba.org/show_bug.cgi?id=9037
> and take the two diffs mentioned there and apply them to the port instead
> of the header hack there now.
ports diff looks like this (hasn't finished building yet)
Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- Makefile25 Aug 2012 10:14:37 - 1.169
+++ Makefile30 Aug 2012 14:53:39 -
@@ -5,9 +5,8 @@ SHARED_ONLY=Yes
COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= additional documentation and examples for Samba
-DISTNAME= samba-3.6.6
+DISTNAME= samba-3.6.7
PKGNAME-main= ${DISTNAME}
-REVISION-main= 3
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
FULLPKGPATH-docs= net/samba,-docs
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo27 Jun 2012 07:29:17 - 1.32
+++ distinfo30 Aug 2012 14:53:39 -
@@ -1,5 +1,2 @@
-MD5 (samba-3.6.6.tar.gz) = C+pShC0XIjHAwOI+5XDXrw==
-RMD160 (samba-3.6.6.tar.gz) = cKUgASocAghfDWIJwqyshFEtn4s=
-SHA1 (samba-3.6.6.tar.gz) = 8VFs4zL+EcaKBShV7ddFNorE2Ok=
-SHA256 (samba-3.6.6.tar.gz) = Z2hfK633RRywatYFNHhAcpR8OoReTQr+xat4F/LukxA=
-SIZE (samba-3.6.6.tar.gz) = 34061741
+SHA256 (samba-3.6.7.tar.gz) = uFig8BG6f+VUiBucfmyxyct/rOIu2Ghg9WD8rsxO1Mo=
+SIZE (samba-3.6.7.tar.gz) = 34067900
Index: patches/patch-source3_configure_in
===
RCS file: /cvs/ports/net/samba/patches/patch-source3_configure_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-source3_configure_in
--- patches/patch-source3_configure_in 27 Jun 2012 07:29:17 - 1.3
+++ patches/patch-source3_configure_in 30 Aug 2012 14:53:39 -
@@ -1,7 +1,55 @@
$OpenBSD: patch-source3_configure_in,v 1.3 2012/06/27 07:29:17 sthen Exp $
source3/configure.in.orig Mon Jun 25 03:21:16 2012
-+++ source3/configure.in Tue Jun 26 12:01:27 2012
-@@ -834,9 +834,15 @@ if test x$enable_cups != xno; then
+--- source3/configure.in.orig Thu Aug 30 15:48:05 2012
source3/configure.in Thu Aug 30 15:48:02 2012
+@@ -753,23 +753,38 @@ AC_CHECK_HEADERS(linux/falloc.h)
+
+ dnl check for OS implementation of md5 conformant to rfc1321
+ AC_CHECK_HEADERS(md5.h)
++
++samba_cv_md5lib=none
++
+ if test x"$ac_cv_header_md5_h" = x"yes"; then
+ AC_DEFINE(HAVE_MD5_H, 1,
+ [Whether md5.h is available.])
+- AC_CHECK_LIB(md5, MD5Update,
+- [
+- LIBS="${LIBS} -lmd5"
+- CRYPTO_MD5_OBJ=
+- AC_DEFINE(HAVE_LIBMD5, 1,
+- [Whether libmd5 conformant to rfc1321 is available.])],
+- [
+- CRYPTO_MD5_OBJ="../lib/crypto/md5.o"])
++ AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5])
++fi
++
++if test x"$ac_cv_header_md5_h" = x"yes" -a \
++x"$samba_cv_md5lib" = x"none" ; then
++ AC_CHECK_LIB(md, MD5Update, [samba_cv_md5lib=md])
++fi
++
++if test x"$ac_cv_header_md5_h" = x"yes" -a \
++x"$samba_cv_md5lib" = x"none" ; then
++ AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
++fi
++
++if test x"$samba_cv_md5lib" != x"none" ; then
++ if test x"$samba_cv_md5lib" != x ; then
++ LIBS="${LIBS} -l${samba_cv_md5lib}"
++ fi
++ CRYPTO_MD5_OBJ=
++ AC_DEFINE(HAVE_LIBMD5, 1,
++ [Whether libmd5 conformant to rfc1321 is available.])
+ else
+ CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
+ fi
++
+ AC_SUBST(CRYPTO_MD5_OBJ)
+
+-
+ AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[
+ #if HAVE_RPC_RPC_H
+ #include
+@@ -853,9 +868,15 @@ if test x$enable_cups != xno; then
if test "x$CUPS_CONFIG" != x; then
@@ -17,7 +65,7 @@ $OpenBSD: patch-source3_configure_in,v 1
if test x"$ac_cv_header_cups_cups_h" = xyes -a \
x"$ac_cv_header_cups_language_h" = xyes; then
-@@ -844,18 +850,19 @@ if test x$enable_cups != xno; then
+@@ -863,18 +884,19 @@ if test x$enable_cups != xno; then
# underlinked. W
Re: UPDATE: samba 3.6.7 - current TAKE 2
On Thu, Aug 30, 2012 at 03:54:03PM +0100, Stuart Henderson wrote: > On 2012/08/30 10:19, Brad Smith wrote: > > On Tue, Aug 14, 2012 at 01:32:04PM +1000, Ian McWilliam wrote: > > > Take 2 - forgot to cvs add. Doh! > > > > > > An update for samba to version 3.6.7 for current. > > > > > > As usual lots of bug fixes. > > > > > > http://www.samba.org/samba/history/samba-3.6.7.html > > > > > > Major enhancements in Samba 3.6.7 include: > > > > > > Fix resolving our own "Domain Local" groups (bug #9052). > > > Fix migrating printers while upgrading from 3.5.x (bug #9026). > > > > > > Make sure you apply the diff with > > > > > > patch -E > > > > > > 2 patches removed, 1 added. > > > > > > Ian McWilliam > > > > The issue with the build and which MD5 implementation to use has been > > resolved. Please take a look at bug report 9037.. > > https://bugzilla.samba.org/show_bug.cgi?id=9037 > > and take the two diffs mentioned there and apply them to the port instead > > of the header hack there now. > > ports diff looks like this (hasn't finished building yet) Looks fine to me. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: samba 3.6.7 - current TAKE 2
On 04/09/2012, at 7:26 AM, Brad Smith wrote: > On Thu, Aug 30, 2012 at 03:54:03PM +0100, Stuart Henderson wrote: >> On 2012/08/30 10:19, Brad Smith wrote: >>> On Tue, Aug 14, 2012 at 01:32:04PM +1000, Ian McWilliam wrote: Take 2 - forgot to cvs add. Doh! An update for samba to version 3.6.7 for current. As usual lots of bug fixes. http://www.samba.org/samba/history/samba-3.6.7.html Major enhancements in Samba 3.6.7 include: Fix resolving our own "Domain Local" groups (bug #9052). Fix migrating printers while upgrading from 3.5.x (bug #9026). Make sure you apply the diff with patch -E 2 patches removed, 1 added. Ian McWilliam >>> >>> The issue with the build and which MD5 implementation to use has been >>> resolved. Please take a look at bug report 9037.. >>> https://bugzilla.samba.org/show_bug.cgi?id=9037 >>> and take the two diffs mentioned there and apply them to the port instead >>> of the header hack there now. >> >> ports diff looks like this (hasn't finished building yet) > > Looks fine to me. > Diff looks OK. Will test the different flavors shortly. Ian McWilliam
Re: UPDATE: samba 3.6.7 - current TAKE 2
On 4/09/2012 12:55 PM, Ian McWilliam wrote: On 04/09/2012, at 7:26 AM, Brad Smith wrote: On Thu, Aug 30, 2012 at 03:54:03PM +0100, Stuart Henderson wrote: On 2012/08/30 10:19, Brad Smith wrote: On Tue, Aug 14, 2012 at 01:32:04PM +1000, Ian McWilliam wrote: Take 2 - forgot to cvs add. Doh! An update for samba to version 3.6.7 for current. As usual lots of bug fixes. http://www.samba.org/samba/history/samba-3.6.7.html Major enhancements in Samba 3.6.7 include: Fix resolving our own "Domain Local" groups (bug #9052). Fix migrating printers while upgrading from 3.5.x (bug #9026). Make sure you apply the diff with patch -E 2 patches removed, 1 added. Ian McWilliam The issue with the build and which MD5 implementation to use has been resolved. Please take a look at bug report 9037.. https://bugzilla.samba.org/show_bug.cgi?id=9037 and take the two diffs mentioned there and apply them to the port instead of the header hack there now. ports diff looks like this (hasn't finished building yet) Looks fine to me. Diff looks OK. Will test the different flavors shortly. Ian McWilliam Builds and runs fine with Stuart's diff. Ian McWilliam
