j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
> Here's a bugfix update to samba-4.1.20, freshly released.
>
> Tarball diff (that contains the release notes) available at
> http://wxcvbn.org/~jca/tmp/samba-4.1.20-tarball.diff.txt
>
> Lightly tested on amd64. ok?
Here's a diff that also removes all the "ld(1) is fragile on OpenBSD"
hacks. This is related to the (rather) recent activation
of -Wl,--as-needed which had previously been disabled by upstream.
I don't plan to commit the ld(1) parts right now, but I could use test
reports on !(amd64). :)
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.208
diff -u -p -r1.208 Makefile
--- Makefile 26 Aug 2015 18:05:31 -0000 1.208
+++ Makefile 1 Sep 2015 11:10:46 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.208 2015/08/26 18:05:31 jca Exp $
SHARED_ONLY = Yes
-VERSION = 4.1.19
+VERSION = 4.1.20
DISTNAME = samba-${VERSION}
DOCSVERSION = v3-5-test-4c5a1b6b
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
@@ -19,11 +19,8 @@ PKGNAME-tevent = tevent-${TEVENT_V}
PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
-REVISION-main = 7
-REVISION-ldb = 4
-REVISION-tevent = 2
-REVISION-util = 2
-REVISION-docs = 2
+REVISION-ldb = 5
+REVISION-tevent = 3
PKG_ARCH-docs = *
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo 25 Aug 2015 11:04:39 -0000 1.42
+++ distinfo 1 Sep 2015 10:49:21 -0000
@@ -1,4 +1,4 @@
-SHA256 (samba-4.1.19.tar.gz) = YvI9/6zU+visVX+c8BoVleOdsLvdlZxMGJD0YVXJ+TY=
+SHA256 (samba-4.1.20.tar.gz) = rc8CHC7n69upntkLsG5FvMjj/ZQZZnYicEJ2YHuDIDg=
SHA256 (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) =
bsF0WP1KT1M3jMx3Z88MbsEQ1QEq9catijXpnPm7hZA=
-SIZE (samba-4.1.19.tar.gz) = 19558250
+SIZE (samba-4.1.20.tar.gz) = 19561057
SIZE (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) = 8070761
Index: patches/patch-buildtools_wafsamba_samba_autoconf_py
===================================================================
RCS file:
/cvs/ports/net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-buildtools_wafsamba_samba_autoconf_py
--- patches/patch-buildtools_wafsamba_samba_autoconf_py 25 Aug 2015 11:04:39
-0000 1.1
+++ patches/patch-buildtools_wafsamba_samba_autoconf_py 3 Sep 2015 11:27:20
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-buildtools_wafsamba_samba_autoconf_py,v 1.1 2015/08/25
11:04:39 jca Exp $
Sort -L flags to unbreak linking when any other version of Samba is installed.
---- buildtools/wafsamba/samba_autoconf.py.orig Sat May 11 12:20:52 2013
-+++ buildtools/wafsamba/samba_autoconf.py Sat May 11 13:04:26 2013
+--- buildtools/wafsamba/samba_autoconf.py.orig Wed Sep 2 09:11:05 2015
++++ buildtools/wafsamba/samba_autoconf.py Thu Sep 3 13:27:16 2015
@@ -716,6 +716,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
if not 'EXTRA_LDFLAGS' in conf.env:
conf.env['EXTRA_LDFLAGS'] = []
@@ -30,3 +30,15 @@ Sort -L flags to unbreak linking when an
return flags
+@@ -776,9 +797,8 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
+ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
+ # we don't want any libraries or modules to rely on runtime
+ # resolution of symbols
+- if not sys.platform.startswith("openbsd"):
+- conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined',
testflags=True)
++ conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined',
testflags=True)
+
+- if not sys.platform.startswith("openbsd") and
conf.env.undefined_ignore_ldflags == []:
++ if conf.env.undefined_ignore_ldflags == []:
+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+ conf.env.undefined_ignore_ldflags = ['-undefined',
'dynamic_lookup']
Index: patches/patch-lib_ldb_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_ldb_wscript,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_ldb_wscript
--- patches/patch-lib_ldb_wscript 25 Aug 2015 11:04:39 -0000 1.1
+++ patches/patch-lib_ldb_wscript 1 Sep 2015 18:43:18 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_ldb_wscript,v 1.1 2015/08/25 11:04:39 jca Exp $
Force building standalone library (e.g., put headers in apporiate place).
---- lib/ldb/wscript.orig Mon May 27 16:42:26 2013
-+++ lib/ldb/wscript Mon May 27 20:45:07 2013
+--- lib/ldb/wscript.orig Tue Sep 1 20:40:31 2015
++++ lib/ldb/wscript Tue Sep 1 20:42:06 2015
@@ -44,6 +44,7 @@ def configure(conf):
conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') +
'/ldb')
@@ -10,3 +10,13 @@ Force building standalone library (e.g.,
if not conf.env.standalone_ldb:
if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
+@@ -64,8 +65,7 @@ def configure(conf):
+
+ # we don't want any libraries or modules to rely on runtime
+ # resolution of symbols
+- if not sys.platform.startswith("openbsd"):
+- conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
++ conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
+
+ conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
+
Index: patches/patch-source3_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source3_wscript,v
retrieving revision 1.1
diff -u -p -r1.1 patch-source3_wscript
--- patches/patch-source3_wscript 25 Aug 2015 11:04:39 -0000 1.1
+++ patches/patch-source3_wscript 1 Sep 2015 18:43:19 -0000
@@ -1,13 +1,14 @@
$OpenBSD: patch-source3_wscript,v 1.1 2015/08/25 11:04:39 jca Exp $
Use more generic check for OpenBSD.
---- source3/wscript.orig Mon Dec 1 13:48:32 2014
-+++ source3/wscript Wed Jun 17 13:18:09 2015
-@@ -72,7 +72,7 @@ def configure(conf):
+--- source3/wscript.orig Tue Sep 1 20:40:32 2015
++++ source3/wscript Tue Sep 1 20:43:06 2015
+@@ -72,8 +72,7 @@ def configure(conf):
conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
conf.env.developer = True
- if sys.platform != 'openbsd5':
-+ if not sys.platform.startswith('openbsd'):
- conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
+- conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
++ conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
+ conf.CHECK_HEADERS('linux/falloc.h')
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
