Bug#802621: samba: FTBFS on kfreebsd-*: UnboundLocalError: local variable 'CTDB_SYSTEM_SRC' referenced before assignment
reopen 802621 = found 802621 samba/4.2.10+dfsg-0+deb8u2 thanks Hi, Unfortunately this patch was not included in what security team uploaded. It was also not pulled into the +deb8u2 regression update either. In the build log below, of samba/4.2.10+dfsg-0+deb8u2 for jessie-kfreebsd, there is no ctdb-Fix-detection-of-gnukfreebsd.patch Please could you maybe: * revert https://anonscm.debian.org/cgit/pkg-samba/samba.git/commit/?h=stable-update=e84aab844661db284b58cf6449f25b6e313f30e5 * import samba/4.2.10+dfsg-0+deb8u2 into Git (because it seems to have not been committed into VCS yet) * bump version number to +deb8u3, re-apply the kfreebsd patch on top of that, and hopefully it can be included in some future stable, security or regression update? In fact... let me do all that for you. Just pull the top 7 commits of http://pyro.eu.org/git/?p=samba.git;a=shortlog from repository URI http://pyro.eu.org/git/samba.git into your stable-update branch and that's all done. Pull with --tags and you'll get tags marking exactly what was in the +deb8u1 and +deb8u2 security uploads. HTTP-only URI, but the top commit should be SHA1:1dd10d5ea847d12d733204ff9fc2550ab885968b Thanks again! | dpkg-source: info: unpacking samba_4.2.10+dfsg.orig.tar.gz | dpkg-source: info: unpacking samba_4.2.10+dfsg-0+deb8u2.debian.tar.xz | dpkg-source: info: applying 05_share_ldb_module | dpkg-source: info: applying 07_private_lib | dpkg-source: info: applying bug_221618_precise-64bit-prototype.patch | dpkg-source: info: applying bug_601406_fix-perl-path-in-example.patch | dpkg-source: info: applying pam-examples.patch | dpkg-source: info: applying README_nosmbldap-tools.patch | dpkg-source: info: applying smbclient-pager.patch | dpkg-source: info: applying usershare.patch | dpkg-source: info: applying VERSION.patch | dpkg-source: info: applying waf_smbpasswd_location | dpkg-source: info: applying add-so-version-to-private-libraries | dpkg-source: info: applying xsltproc_dont_build_smb.conf.5.patch | dpkg-source: info: applying heimdal-rfc3454.txt | dpkg-source: info: applying no_wrapper | dpkg-source: info: applying ctdb_sockpath.patch | dpkg-source: info: applying Fix-privacy-breach-on-google.com.patch | dpkg-source: info: applying decrease-min-ldb-version.patch | dpkg-source: warning: diff `samba-4.2.10+dfsg/debian/patches/backupkey.patch' patches file samba-4.2.10+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c twice | dpkg-source: warning: diff `samba-4.2.10+dfsg/debian/patches/backupkey.patch' patches file samba-4.2.10+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c twice | dpkg-source: warning: diff `samba-4.2.10+dfsg/debian/patches/backupkey.patch' patches file samba-4.2.10+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c twice | dpkg-source: warning: diff `samba-4.2.10+dfsg/debian/patches/backupkey.patch' patches file samba-4.2.10+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c twice | dpkg-source: warning: diff `samba-4.2.10+dfsg/debian/patches/backupkey.patch' patches file samba-4.2.10+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c twice | dpkg-source: info: applying backupkey.patch | dpkg-source: info: applying fix_pam_smbpass.patch | dpkg-source: info: applying security-2016-04-12-prerequisite-v4-2-regression-fixes.metze01.txt | dpkg-source: info: applying disable-socketwrapper.diff | dpkg-source: warning: diff `samba-4.2.10+dfsg/debian/patches/sockets-with-htons.patch' patches file samba-4.2.10+dfsg/ctdb/common/system_freebsd.c twice | dpkg-source: warning: diff `samba-4.2.10+dfsg/debian/patches/sockets-with-htons.patch' patches file samba-4.2.10+dfsg/ctdb/common/system_gnu.c twice | dpkg-source: warning: diff `samba-4.2.10+dfsg/debian/patches/sockets-with-htons.patch' patches file samba-4.2.10+dfsg/ctdb/common/system_kfreebsd.c twice | dpkg-source: warning: diff `samba-4.2.10+dfsg/debian/patches/sockets-with-htons.patch' patches file samba-4.2.10+dfsg/ctdb/common/system_linux.c twice | dpkg-source: info: applying sockets-with-htons.patch | dpkg-source: info: applying unprivate-samba-debug.patch Regards, -- Steven Chamberlain ste...@pyro.eu.org signature.asc Description: Digital signature
Bug#802621: samba: FTBFS on kfreebsd-*: UnboundLocalError: local variable 'CTDB_SYSTEM_SRC' referenced before assignment
Awesome, thanks! I built the dependencies, and can confirm what I suspected, which is that samba 4.2.x would have FTBFS on kfreebsd. And cherry-picking ctdb-Fix-detection-of-gnukfreebsd.patch does fix that. (The only thing that may cause a build failure now, is whether the kfreebsd buildds support faketime or not, but that is not for you to worry about.) Thanks again, Regards, -- Steven Chamberlain ste...@pyro.eu.org signature.asc Description: Digital signature
Bug#802621: samba: FTBFS on kfreebsd-*: UnboundLocalError: local variable 'CTDB_SYSTEM_SRC' referenced before assignment
On Wed, 2016-04-13 at 03:00 +0100, Steven Chamberlain wrote: > found 802621 samba/2:4.2.10+dfsg-0+deb8u1 > thanks > > Hi, > > If samba is updated to 4.2.x in jessie, I suspect it would introduce > Bug#802621 (FTBFS on kfreebsd-*) and not be able to build on kfreebsd > (meaning jessie-kfreebsd would not get the security fixes). > > If there is time before uploading, please could you cherry-pick > ce41f24a8ad37a85ee86d91fc9e9259b97075c05 from master, into the > stable-update branch? It's a trivial one-line diff and applies > cleanly > to 4.2.x. A suggested debian/changelog entry is: > > * ctdb: Fix detection of gnukfreebsd (Closes: #802621) > > (p.s., I could not build samba/2:4.2.10+dfsg-0+deb8u1 as-is because > of > a pkg-config check for tdb >= 1.3.6, not recent enough in jessie) Thanks. If I can negotiate it with the security team, then it will be in. You can get the dependent packages from https://seafile.catalyst.net.nz/d/e48e09f665/ until they are in jessie. Andrew Bartlett -- Andrew Bartlett https://samba.org/~abartlet/ Authentication Developer, Samba Team https://samba.org Samba Development and Support, Catalyst IT https://catalyst.net.nz/services/samba signature.asc Description: This is a digitally signed message part
Bug#802621: samba: FTBFS on kfreebsd-*: UnboundLocalError: local variable 'CTDB_SYSTEM_SRC' referenced before assignment
found 802621 samba/2:4.2.10+dfsg-0+deb8u1 thanks Hi, If samba is updated to 4.2.x in jessie, I suspect it would introduce Bug#802621 (FTBFS on kfreebsd-*) and not be able to build on kfreebsd (meaning jessie-kfreebsd would not get the security fixes). If there is time before uploading, please could you cherry-pick ce41f24a8ad37a85ee86d91fc9e9259b97075c05 from master, into the stable-update branch? It's a trivial one-line diff and applies cleanly to 4.2.x. A suggested debian/changelog entry is: * ctdb: Fix detection of gnukfreebsd (Closes: #802621) (p.s., I could not build samba/2:4.2.10+dfsg-0+deb8u1 as-is because of a pkg-config check for tdb >= 1.3.6, not recent enough in jessie) Thanks! Regards, -- Steven Chamberlain ste...@pyro.eu.org signature.asc Description: Digital signature
Bug#802621: samba: FTBFS on kfreebsd-*: UnboundLocalError: local variable 'CTDB_SYSTEM_SRC' referenced before assignment
Thanks so much for this. For the upstream patch, this can be marked Reviewed-by: Andrew BartlettBonus points if you can make this a git commit or Github PR, otherwise I'm hoping Jelmer can package this up and commit it (we have a two- reviewer policy on Samba) Andrew Bartlett On Thu, 2016-02-11 at 02:27 +, Steven Chamberlain wrote: > Package: samba > Version: 2:4.2.1+dfsg-1 > Followup-For: Bug #802621 > > Hi! > > The FTBFS on kfreebsd since samba 4.2.x is due to a really trivial > typo > in an upstream wscript file. Please find patch for this attached. > Thanks! > > -- System Information: > Debian Release: stretch/sid > APT prefers unstable > APT policy: (500, 'unstable'), (1, 'experimental') > Architecture: kfreebsd-amd64 (x86_64) > > Kernel: kFreeBSD 10.1-0-amd64 > Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash -- Andrew Bartlett https://samba.org/~abartlet/ Authentication Developer, Samba Team https://samba.org Samba Development and Support, Catalyst IT https://catalyst.net.nz/services/samba
Bug#802621: samba: FTBFS on kfreebsd-*: UnboundLocalError: local variable 'CTDB_SYSTEM_SRC' referenced before assignment
Package: samba Version: 2:4.2.1+dfsg-1 Followup-For: Bug #802621 Hi! The FTBFS on kfreebsd since samba 4.2.x is due to a really trivial typo in an upstream wscript file. Please find patch for this attached. Thanks! -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: kfreebsd-amd64 (x86_64) Kernel: kFreeBSD 10.1-0-amd64 Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash --- a/ctdb/wscript 2016-02-11 01:24:34.0 + +++ b/ctdb/wscript 2016-02-11 01:39:24.739728329 + @@ -306,7 +306,7 @@ CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_aix.c') elif sys.platform.startswith('freebsd'): CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_freebsd.c') -elif sys.platform == 'kfreebsd': +elif sys.platform.startswith('gnukfreebsd'): CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_kfreebsd.c') elif sys.platform == 'gnu': CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_gnu.c')
Bug#802621: samba: FTBFS on kfreebsd-*: UnboundLocalError: local variable 'CTDB_SYSTEM_SRC' referenced before assignment
Source: samba Version: 2:4.3.0+dfsg-2 Severity: important samba in experimental fails to build on kfreebsd-*: | dh_auto_build --sourcedirectory=ctdb | make -j1 | make[2]: Entering directory '/«BUILDDIR»/samba-4.3.0+dfsg/ctdb' | WAF_MAKE=1 PATH=buildtools/bin:../buildtools/bin:$PATH waf build | Waf: Entering directory `/«BUILDDIR»/samba-4.3.0+dfsg/ctdb/bin' | Platform gnukfreebsd10 not supported | Traceback (most recent call last): | File "../buildtools/bin/waf", line 76, in | Scripting.prepare(t, cwd, VERSION, wafdir) | File "/«BUILDDIR»/samba-4.3.0+dfsg/third_party/waf/wafadmin/Scripting.py", line 145, in prepare | prepare_impl(t, cwd, ver, wafdir) | File "/«BUILDDIR»/samba-4.3.0+dfsg/third_party/waf/wafadmin/Scripting.py", line 135, in prepare_impl | main() | File "/«BUILDDIR»/samba-4.3.0+dfsg/third_party/waf/wafadmin/Scripting.py", line 188, in main | fun(ctx) | File "/«BUILDDIR»/samba-4.3.0+dfsg/third_party/waf/wafadmin/Scripting.py", line 386, in build | return build_impl(bld) | File "/«BUILDDIR»/samba-4.3.0+dfsg/third_party/waf/wafadmin/Scripting.py", line 399, in build_impl | bld.add_subdirs([os.path.split(Utils.g_module.root_path)[0]]) | File "/«BUILDDIR»/samba-4.3.0+dfsg/third_party/waf/wafadmin/Build.py", line 993, in add_subdirs | self.recurse(dirs, 'build') | File "/«BUILDDIR»/samba-4.3.0+dfsg/third_party/waf/wafadmin/Utils.py", line 634, in recurse | f(self) | File "/«BUILDDIR»/samba-4.3.0+dfsg/ctdb/wscript", line 317, in build | source=CTDB_SYSTEM_SRC, | UnboundLocalError: local variable 'CTDB_SYSTEM_SRC' referenced before assignment | make[2]: *** [all] Error 1 | Makefile:6: recipe for target 'all' failed | make[2]: Leaving directory '/«BUILDDIR»/samba-4.3.0+dfsg/ctdb' For a full build log see https://buildd.debian.org/status/fetch.php?pkg=samba=kfreebsd-amd64=2:4.3.0+dfsg-2=1443611546 Cheers -- Sebastian Ramacher signature.asc Description: PGP signature