Re: samba-4.3.6

2016-04-11 Thread Ian McWilliam 
Thanks, I'll be taking a look at this today.


Ian McWilliam

On 12 April 2016 at 05:18, Jeremie Courreges-Anglas  wrote:

> Jeremie Courreges-Anglas  writes:
>
> > Jeremie Courreges-Anglas  writes:
> >
> >> j...@wxcvbn.org (Jeremie Courreges-Anglas) writes:
> >>
> >>> Hi,
> >>>
> >>> tomorrow the samba project will release security announces and new
> >>> tarballs.  Rather important bugs, like http://badlock.org/
> >>>
> >>> Since samba-4.1 is out of support, we have two options:
> >>> - backport tons of patches
> >>> - upgrade to a supported release
> >>>
> >>> The diff below upgrades to the latest 4.3.x release (4.4 is already
> >>> out...).  I've only slightly tested it, both ports-wise and
> >>> functionality-wise, so test reports are more than welcome.
> >>>
> >>> ...
> >>
> >> Another diff, changes since the previous one:
> >> - bump libtdb's minor version (two symbols added).  Reminded by sthen@
> >> - in net/samba, enforce deps on the latest tdb / talloc releases
> >> - in net/samba, fix the version encoded in the various .pc files
> >>
> >> Whether lib bumps are also needed in devel/libtalloc and net/samba is
> >> still unclear / unknown.
> >
> > Third iteration:
> > - bump the version of the ldb and tevent subpackages (and kill
> REVISION-*)
> > - bump the shlib version of a few libraries for which upstream provides
> >   ABI signatures
> >
> > I'll try to perform a more thorough check about shlib version, but
> > this is gettting good ports-wise (feel free to prove me wrong!).
> >
> > I'd love to hear build and test reports.  build reports on !(amd64) are
> > more than welcome.
>
> Fourth iteration:
> - remove the dep on libarchive in smbclient(1)
> - get rid of removed libs in PLIST-util
> - get rid of removed libs in x11/gnome/gvfs and x11/kde/base
>
> I'm still missing a way to disable vfs_snapper that depends on d-bus,
> but it shouldn't be hard to find a hack for that.
>
> Still looking for test reports, I'd like to move forward before
> samba-4.3.8 is released tomorrow evening CET.
>
>
> Index: databases/tdb/Makefile
> ===
> RCS file: /cvs/ports/databases/tdb/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- databases/tdb/Makefile  5 Apr 2016 16:34:36 -   1.17
> +++ databases/tdb/Makefile  11 Apr 2016 12:01:31 -
> @@ -3,10 +3,9 @@
>  COMMENT=   trivial database library
>
>  # Keep in sync with the version bundled in net/samba4
> -DISTNAME=  tdb-1.2.12
> -REVISION=  2
> +DISTNAME=  tdb-1.3.7
>
> -SHARED_LIBS+=  tdb 4.0
> +SHARED_LIBS+=  tdb 4.1
>
>  CATEGORIES=databases
>
> @@ -37,6 +36,7 @@ MAKE_ENV += LIB${_l:S/-/_/g}
>  .endfor
>
>  CONFIGURE_STYLE= simple
> -CONFIGURE_ARGS= --mandir="${PREFIX}/man"
> +CONFIGURE_ARGS= --mandir="${PREFIX}/man" \
> +   --disable-rpath
>
>  .include 
> Index: databases/tdb/distinfo
> ===
> RCS file: /cvs/ports/databases/tdb/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- databases/tdb/distinfo  18 Jul 2015 02:11:13 -  1.5
> +++ databases/tdb/distinfo  10 Apr 2016 10:53:33 -
> @@ -1,2 +1,2 @@
> -SHA256 (tdb-1.2.12.tar.gz) = KC09scxWrDARrl85Iv0MW7IX7LAyCDbCO2/mfyFjpx8=
> -SIZE (tdb-1.2.12.tar.gz) = 462590
> +SHA256 (tdb-1.3.7.tar.gz) = pk2VygzAaij+0kxulSrtdmDK4EmDEIc11rwwuSUTZBI=
> +SIZE (tdb-1.3.7.tar.gz) = 493847
> Index: databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
> ===
> RCS file: databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
> diff -N databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
> --- databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py 18
> Jul 2015 02:11:13 -  1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-buildtools_wafadmin_Tools_ccroot_py,v 1.1 2015/07/18
> 02:11:13 jca Exp $
> -
> -- at build time, encode the full library name + version in the SONAME
> -
>  buildtools/wafadmin/Tools/ccroot.py.orig   Sun Jan 27 04:51:43 2013
> -+++ buildtools/wafadmin/Tools/ccroot.pyThu Jul 16 12:55:30 2015
> -@@ -588,7 +588,10 @@ def apply_vnum(self):
> -   name2 = libname + '.' + nums[0]
> -
> -   if self.env.SONAME_ST:
> --  v = self.env.SONAME_ST % name2
> -+  if sys.platform.startswith('openbsd'):
> -+  v = self.env.SONAME_ST % name3
> -+  else:
> -+  v = self.env.SONAME_ST % name2
> -   self.env.append_value('LINKFLAGS', v.split())
> -
> -   bld = self.bld
> Index: databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py
> ===
> RCS file:
>

Re: samba-4.3.6

2016-04-11 Thread Jeremie Courreges-Anglas 
Jeremie Courreges-Anglas  writes:

> Jeremie Courreges-Anglas  writes:
>
>> j...@wxcvbn.org (Jeremie Courreges-Anglas) writes:
>>
>>> Hi,
>>>
>>> tomorrow the samba project will release security announces and new
>>> tarballs.  Rather important bugs, like http://badlock.org/
>>>
>>> Since samba-4.1 is out of support, we have two options:
>>> - backport tons of patches
>>> - upgrade to a supported release
>>>
>>> The diff below upgrades to the latest 4.3.x release (4.4 is already
>>> out...).  I've only slightly tested it, both ports-wise and
>>> functionality-wise, so test reports are more than welcome.
>>>
>>> ...
>>
>> Another diff, changes since the previous one:
>> - bump libtdb's minor version (two symbols added).  Reminded by sthen@
>> - in net/samba, enforce deps on the latest tdb / talloc releases
>> - in net/samba, fix the version encoded in the various .pc files
>>
>> Whether lib bumps are also needed in devel/libtalloc and net/samba is
>> still unclear / unknown.
>
> Third iteration:
> - bump the version of the ldb and tevent subpackages (and kill REVISION-*)
> - bump the shlib version of a few libraries for which upstream provides
>   ABI signatures
>
> I'll try to perform a more thorough check about shlib version, but
> this is gettting good ports-wise (feel free to prove me wrong!).
>
> I'd love to hear build and test reports.  build reports on !(amd64) are
> more than welcome.

Fourth iteration:
- remove the dep on libarchive in smbclient(1)
- get rid of removed libs in PLIST-util
- get rid of removed libs in x11/gnome/gvfs and x11/kde/base

I'm still missing a way to disable vfs_snapper that depends on d-bus,
but it shouldn't be hard to find a hack for that.

Still looking for test reports, I'd like to move forward before
samba-4.3.8 is released tomorrow evening CET.


Index: databases/tdb/Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- databases/tdb/Makefile  5 Apr 2016 16:34:36 -   1.17
+++ databases/tdb/Makefile  11 Apr 2016 12:01:31 -
@@ -3,10 +3,9 @@
 COMMENT=   trivial database library
 
 # Keep in sync with the version bundled in net/samba4
-DISTNAME=  tdb-1.2.12
-REVISION=  2
+DISTNAME=  tdb-1.3.7
 
-SHARED_LIBS+=  tdb 4.0
+SHARED_LIBS+=  tdb 4.1
 
 CATEGORIES=databases
 
@@ -37,6 +36,7 @@ MAKE_ENV += LIB${_l:S/-/_/g}
 .endfor
 
 CONFIGURE_STYLE= simple
-CONFIGURE_ARGS= --mandir="${PREFIX}/man"
+CONFIGURE_ARGS= --mandir="${PREFIX}/man" \
+   --disable-rpath
 
 .include 
Index: databases/tdb/distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- databases/tdb/distinfo  18 Jul 2015 02:11:13 -  1.5
+++ databases/tdb/distinfo  10 Apr 2016 10:53:33 -
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.2.12.tar.gz) = KC09scxWrDARrl85Iv0MW7IX7LAyCDbCO2/mfyFjpx8=
-SIZE (tdb-1.2.12.tar.gz) = 462590
+SHA256 (tdb-1.3.7.tar.gz) = pk2VygzAaij+0kxulSrtdmDK4EmDEIc11rwwuSUTZBI=
+SIZE (tdb-1.3.7.tar.gz) = 493847
Index: databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
===
RCS file: databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
diff -N databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
--- databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py 18 Jul 
2015 02:11:13 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-buildtools_wafadmin_Tools_ccroot_py,v 1.1 2015/07/18 02:11:13 
jca Exp $
-
-- at build time, encode the full library name + version in the SONAME
-
 buildtools/wafadmin/Tools/ccroot.py.orig   Sun Jan 27 04:51:43 2013
-+++ buildtools/wafadmin/Tools/ccroot.pyThu Jul 16 12:55:30 2015
-@@ -588,7 +588,10 @@ def apply_vnum(self):
-   name2 = libname + '.' + nums[0]
- 
-   if self.env.SONAME_ST:
--  v = self.env.SONAME_ST % name2
-+  if sys.platform.startswith('openbsd'):
-+  v = self.env.SONAME_ST % name3
-+  else:
-+  v = self.env.SONAME_ST % name2
-   self.env.append_value('LINKFLAGS', v.split())
- 
-   bld = self.bld
Index: databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py
===
RCS file: 
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-buildtools_wafsamba_samba_install_py
--- databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py18 Jul 
2015 02:11:13 -  1.1
+++ databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py10 Apr 
2016 23:01:33 -
@@ -1,25 +1,32 @@
 $OpenBSD:

Re: samba-4.3.6

2016-04-11 Thread Jeremie Courreges-Anglas 
Jeremie Courreges-Anglas  writes:

> j...@wxcvbn.org (Jeremie Courreges-Anglas) writes:
>
>> Hi,
>>
>> tomorrow the samba project will release security announces and new
>> tarballs.  Rather important bugs, like http://badlock.org/
>>
>> Since samba-4.1 is out of support, we have two options:
>> - backport tons of patches
>> - upgrade to a supported release
>>
>> The diff below upgrades to the latest 4.3.x release (4.4 is already
>> out...).  I've only slightly tested it, both ports-wise and
>> functionality-wise, so test reports are more than welcome.
>>
>> ...
>
> Another diff, changes since the previous one:
> - bump libtdb's minor version (two symbols added).  Reminded by sthen@
> - in net/samba, enforce deps on the latest tdb / talloc releases
> - in net/samba, fix the version encoded in the various .pc files
>
> Whether lib bumps are also needed in devel/libtalloc and net/samba is
> still unclear / unknown.

Third iteration:
- bump the version of the ldb and tevent subpackages (and kill REVISION-*)
- bump the shlib version of a few libraries for which upstream provides
  ABI signatures

I'll try to perform a more thorough check about shlib version, but
this is gettting good ports-wise (feel free to prove me wrong!).

I'd love to hear build and test reports.  build reports on !(amd64) are
more than welcome.

Index: databases/tdb/Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- databases/tdb/Makefile  5 Apr 2016 16:34:36 -   1.17
+++ databases/tdb/Makefile  11 Apr 2016 12:01:31 -
@@ -3,10 +3,9 @@
 COMMENT=   trivial database library
 
 # Keep in sync with the version bundled in net/samba4
-DISTNAME=  tdb-1.2.12
-REVISION=  2
+DISTNAME=  tdb-1.3.7
 
-SHARED_LIBS+=  tdb 4.0
+SHARED_LIBS+=  tdb 4.1
 
 CATEGORIES=databases
 
@@ -37,6 +36,7 @@ MAKE_ENV += LIB${_l:S/-/_/g}
 .endfor
 
 CONFIGURE_STYLE= simple
-CONFIGURE_ARGS= --mandir="${PREFIX}/man"
+CONFIGURE_ARGS= --mandir="${PREFIX}/man" \
+   --disable-rpath
 
 .include 
Index: databases/tdb/distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- databases/tdb/distinfo  18 Jul 2015 02:11:13 -  1.5
+++ databases/tdb/distinfo  10 Apr 2016 10:53:33 -
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.2.12.tar.gz) = KC09scxWrDARrl85Iv0MW7IX7LAyCDbCO2/mfyFjpx8=
-SIZE (tdb-1.2.12.tar.gz) = 462590
+SHA256 (tdb-1.3.7.tar.gz) = pk2VygzAaij+0kxulSrtdmDK4EmDEIc11rwwuSUTZBI=
+SIZE (tdb-1.3.7.tar.gz) = 493847
Index: databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
===
RCS file: databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
diff -N databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
--- databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py 18 Jul 
2015 02:11:13 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-buildtools_wafadmin_Tools_ccroot_py,v 1.1 2015/07/18 02:11:13 
jca Exp $
-
-- at build time, encode the full library name + version in the SONAME
-
 buildtools/wafadmin/Tools/ccroot.py.orig   Sun Jan 27 04:51:43 2013
-+++ buildtools/wafadmin/Tools/ccroot.pyThu Jul 16 12:55:30 2015
-@@ -588,7 +588,10 @@ def apply_vnum(self):
-   name2 = libname + '.' + nums[0]
- 
-   if self.env.SONAME_ST:
--  v = self.env.SONAME_ST % name2
-+  if sys.platform.startswith('openbsd'):
-+  v = self.env.SONAME_ST % name3
-+  else:
-+  v = self.env.SONAME_ST % name2
-   self.env.append_value('LINKFLAGS', v.split())
- 
-   bld = self.bld
Index: databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py
===
RCS file: 
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-buildtools_wafsamba_samba_install_py
--- databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py18 Jul 
2015 02:11:13 -  1.1
+++ databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py10 Apr 
2016 23:01:33 -
@@ -1,25 +1,32 @@
 $OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.1 2015/07/18 02:11:13 
jca Exp $
 
-- install_link is used so encode the SONAME; use of SONAME is currenty
-  needed since the installed library is created with an improper name
-  (eg "libsomething.inst.so")
+- respect OpenBSD shared libraries versioning
+- --version-script fails if specified multipled times
 
-- no need to setup symlinks on OpenBSD
-
 buildtools/wafsamba/samba_install.py.orig  Sun Jan 27 04:51:43 2013
-+++

Re: samba-4.3.6

2016-04-11 Thread Jeremie Courreges-Anglas 
j...@wxcvbn.org (Jeremie Courreges-Anglas) writes:

> Hi,
>
> tomorrow the samba project will release security announces and new
> tarballs.  Rather important bugs, like http://badlock.org/
>
> Since samba-4.1 is out of support, we have two options:
> - backport tons of patches
> - upgrade to a supported release
>
> The diff below upgrades to the latest 4.3.x release (4.4 is already
> out...).  I've only slightly tested it, both ports-wise and
> functionality-wise, so test reports are more than welcome.
>
> ...

Another diff, changes since the previous one:
- bump libtdb's minor version (two symbols added).  Reminded by sthen@
- in net/samba, enforce deps on the latest tdb / talloc releases
- in net/samba, fix the version encoded in the various .pc files

Whether lib bumps are also needed in devel/libtalloc and net/samba is
still unclear / unknown.


Index: databases/tdb/Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- databases/tdb/Makefile  5 Apr 2016 16:34:36 -   1.17
+++ databases/tdb/Makefile  11 Apr 2016 11:37:47 -
@@ -3,10 +3,9 @@
 COMMENT=   trivial database library
 
 # Keep in sync with the version bundled in net/samba4
-DISTNAME=  tdb-1.2.12
-REVISION=  2
+DISTNAME=  tdb-1.3.7
 
-SHARED_LIBS+=  tdb 4.0
+SHARED_LIBS+=  tdb 4.1
 
 CATEGORIES=databases
 
@@ -37,6 +36,7 @@ MAKE_ENV += LIB${_l:S/-/_/g}
 .endfor
 
 CONFIGURE_STYLE= simple
-CONFIGURE_ARGS= --mandir="${PREFIX}/man"
+CONFIGURE_ARGS= --mandir="${PREFIX}/man" \
+   --disable-rpath
 
 .include 
Index: databases/tdb/distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- databases/tdb/distinfo  18 Jul 2015 02:11:13 -  1.5
+++ databases/tdb/distinfo  10 Apr 2016 10:53:33 -
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.2.12.tar.gz) = KC09scxWrDARrl85Iv0MW7IX7LAyCDbCO2/mfyFjpx8=
-SIZE (tdb-1.2.12.tar.gz) = 462590
+SHA256 (tdb-1.3.7.tar.gz) = pk2VygzAaij+0kxulSrtdmDK4EmDEIc11rwwuSUTZBI=
+SIZE (tdb-1.3.7.tar.gz) = 493847
Index: databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
===
RCS file: databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
diff -N databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py
--- databases/tdb/patches/patch-buildtools_wafadmin_Tools_ccroot_py 18 Jul 
2015 02:11:13 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-buildtools_wafadmin_Tools_ccroot_py,v 1.1 2015/07/18 02:11:13 
jca Exp $
-
-- at build time, encode the full library name + version in the SONAME
-
 buildtools/wafadmin/Tools/ccroot.py.orig   Sun Jan 27 04:51:43 2013
-+++ buildtools/wafadmin/Tools/ccroot.pyThu Jul 16 12:55:30 2015
-@@ -588,7 +588,10 @@ def apply_vnum(self):
-   name2 = libname + '.' + nums[0]
- 
-   if self.env.SONAME_ST:
--  v = self.env.SONAME_ST % name2
-+  if sys.platform.startswith('openbsd'):
-+  v = self.env.SONAME_ST % name3
-+  else:
-+  v = self.env.SONAME_ST % name2
-   self.env.append_value('LINKFLAGS', v.split())
- 
-   bld = self.bld
Index: databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py
===
RCS file: 
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-buildtools_wafsamba_samba_install_py
--- databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py18 Jul 
2015 02:11:13 -  1.1
+++ databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py10 Apr 
2016 23:01:33 -
@@ -1,25 +1,32 @@
 $OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.1 2015/07/18 02:11:13 
jca Exp $
 
-- install_link is used so encode the SONAME; use of SONAME is currenty
-  needed since the installed library is created with an improper name
-  (eg "libsomething.inst.so")
+- respect OpenBSD shared libraries versioning
+- --version-script fails if specified multipled times
 
-- no need to setup symlinks on OpenBSD
-
 buildtools/wafsamba/samba_install.py.orig  Sun Jan 27 04:51:43 2013
-+++ buildtools/wafsamba/samba_install.py   Thu Jul 16 13:57:59 2015
-@@ -112,9 +112,12 @@ def install_library(self):
- elif self.vnum:
- vnum_base= self.vnum.split('.')[0]
- install_name = bld.make_libname(target_name, version=self.vnum)
--install_link = bld.make_libname(target_name, version=vnum_base)
-+if sys.platform.startswith('openbsd'):
-+install_link = install_name
-+else:
-+install_link = bld.make_libname(target_name,