[Pkg-samba-maint] updating samba to current upstream
L.P.H. van Belle
belle at bazuin.nl
Thu Mar 24 11:10:32 GMT 2022
Added the text bit lower..
> -----Oorspronkelijk bericht-----
> Van: Pkg-samba-maint
> [mailto:pkg-samba-maint-bounces+belle=bazuin.nl at alioth-lists.d
ebian.net] Namens Mathieu Parent
> Verzonden: donderdag 24 maart 2022 10:22
> Aan: Andrew Bartlett
> CC: Debian Samba Maintainers
> Onderwerp: Re: [Pkg-samba-maint] updating samba to current upstream
>
> Hi all,
>
> (I have to admit I've read those mails only superficially. I may have
> misunderstood some ...)
>
> About talloc, tevent, tdb version updates: you can take the latest
> here, the ABI is backward compatible (we only had a breakage once, and
> in doubt you can check with symbols).
>
> ldb and samba should be updated in sync, going thru experimental.
> Those are tightly linked as Andrew said.
>
> About Louis's list:
> > 01-talloc 02-tevent 03-tdb 04-cmocka 05-ldb
> > 06-nss-wrapper 07-resolv-wrapper 08-uid-wrapper 09-socket-wrapper
> > 10-pam-wrapper 11-salsa 11-samba
> >
> > (* optional or needed als build deb)
> > 12-cifs-utils 12-liburing-ubuntu 12-wsdd2 13-dwz 14-debhelper
>
> Only update when needed, this is what README.source.md does:
>
> > grep ^VERSION lib/{talloc,tdb,tevent,ldb}/wscript
> > [...]
> > git diff origin/master.."samba-${upstream_version}" \
> > buildtools/wafsamba/samba_third_party.py
>
> If cmocka or *-wrapper need updates, reach there packaging teams. They
> usually update it quickly.
>
> I have never done anything for liburing-ubuntu, wsdd2, dwz or
> debhelper.
Quick chip in here to explain it a bit.
I needed these for ubuntu focal or buster builds, so on these
liburing-ubuntu, wsdd2, dwz or debhelper.
Liburing - needed in 4.16 build on focal, i havent started on Debian packages yet.
( mainly due, i only build amd64 on focal and 4 lines in buster/bullseye, its a time saver)
Wsdd2 - not in debian, a WSD/LLMNR Discovery/Name Service Daemon. Debian has wsdd.
Dwz - some packages builds failed, i believe it was/is due this bug.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=968670
Upgrade dwz myself to 0.14.1 from debian sid and building worked again.
Debhelper 12 in Ubuntu focal, also a package that failed.
Backported a 13.3.4 from ubuntu to fix it.
Anything in bookworm and up, dont needed extra's, but if we would make these
packages backport compliant, we might need some small changes then.
As soon i have some clear instruction on the build depends how to start on the
pristine tar's, i can help at least to upload these as soon they are available.
Which is also usefull for meself and the packages i currently make,
they are not that different compaired to debian official.
Basicly only the samba package itself is only a bit different.
Current changes are that i enabled:
- Full spotlight support (* which add more packages, which is my its not full enabled in debian.)
- profiling-data support. (* some debian packages, can use the profiling data.
I had a few requests in the list/mail if i could enable it in my packages, which i did.
But since i cant make these without Mathieu's and now also Michael work.
I still greatfull and leaning on support/work of you guys.
I'll keep close eye on the debian-packing, next week im on vacation but after that.
I'll see where we are at and what i can do more.
So far,
Greetz,
Louis
Ps.
Why i "need" you guys, a build fail thats to big for me to fix. *(current 4.16.0 build)
FORTIFY_SOURCE=2']
In file included from ../../third_party/heimdal/lib/gssapi/gssapi/gssapi_krb5.h:40,
from ../../lib/replace/system/gssapi.h:43,
from ../../lib/krb5_wrap/gss_samba.h:27,
from ../../lib/krb5_wrap/gss_samba.c:23:
../../third_party/heimdal/lib/gssapi/gssapi/gssapi_oid.h:9:8: error: unknown type name ‘GSSAPI_LIB_VARIABLE’
9 | extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_copy_ccache_x_oid_desc;
| ^~~~~~~~~~~~~~~~~~~
../../third_party/heimdal/lib/gssapi/gssapi/gssapi_oid.h:9:41: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘__gss_krb5_copy_ccache_x_oid_desc’
9 | extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_copy_ccache_x_oid_desc;
... Lots of messages more..
Waf: Leaving directory `/<<PKGBUILDDIR>>/bin/default'
Build failed
-> task in 'krb5samba.objlist' failed with exit status 1:
{task 140628131559456: c gss_samba.c -> gss_samba.c.1.o}
['/usr/lib/ccache/gcc', '-D_SAMBA_BUILD_=4', '-DHAVE_CONFIG_H=1', '-g', '-O2', '-fdebug-prefix-map=/<<PKGBUILDDIR>>=.', '-fstack-protector-strong', '-Wformat', '-Werror=format-security', '-MMD', '-D_GNU_SOURCE=1', '-D_XOPEN_SOURCE_EXTENDED=1', '-DHAVE_CONFIG_H=1', '-fPIC', '-D__STDC_WANT_LIB_EXT1__=1', '-D_REENTRANT', '-DCTDB_HELPER_BINDIR="/usr/lib/x86_64-linux-gnu/ctdb"', '-DLOGDIR="/var/log/ctdb"', '-DCTDB_DATADIR="/usr/share/ctdb"', '-DCTDB_ETCDIR="/etc/ctdb"', '-DCTDB_VARDIR="/var/lib/ctdb"', '-DCTDB_RUNDIR="/var/run/ctdb"', '-fstack-protector-strong', '-fstack-clash-protection', '-DSTATIC_krb5samba_MODULES=NULL', '-DSTATIC_krb5samba_MODULES_PROTO=extern void __krb5samba_dummy_module_proto(void)', '-Ilib/krb5_wrap', '-I../../lib/krb5_wrap', '-Iinclude/public', '-I../../include/public', '-Isource4', '-I../../source4', '-Ilib', '-I../../lib', '-Isource4/lib', '-I../../source4/lib', '-Isource4/include', '-I../../source4/include', '-Iinclude
', '-I../../include', '-Ilib/replace', '-I../../lib/replace', '-Ictdb/include', '-I../../ctdb/include', '-Ictdb', '-I../../ctdb', '-I.', '-I../..', '-Ithird_party/heimdal/lib/hcrypto/libtommath', '-I../../third_party/heimdal/lib/hcrypto/libtommath', '-Ithird_party/heimdal_build', '-I../../third_party/heimdal_build', '-Ithird_party/heimdal/lib/asn1', '-I../../third_party/heimdal/lib/asn1', '-Ithird_party/heimdal/lib/wind', '-I../../third_party/heimdal/lib/wind', '-Idynconfig', '-I../../dynconfig', '-Ilib/util/<<PKGBUILDDIR>>/third_party/gpfs', '-I../../lib/util/<<PKGBUILDDIR>>/third_party/gpfs', '-Ithird_party/heimdal/lib/hcrypto', '-I../../third_party/heimdal/lib/hcrypto', '-Ithird_party/heimdal/lib', '-I../../third_party/heimdal/lib', '-Ithird_party/heimdal/include', '-I../../third_party/heimdal/include', '-Ithird_party/heimdal/lib/roken', '-I../../third_party/heimdal/lib/roken', '-Ithird_party/heimdal_build/include', '-I../../third_party/heimdal_build/include', '-Ithird_pa
rty/heimdal/lib/base', '-I../../third_party/heimdal/lib/base', '-Ithird_party/heimdal/lib/krb5', '-I../../third_party/heimdal/lib/krb5', '-Ithird_party/heimdal/lib/hx509', '-I../../third_party/heimdal/lib/hx509', '-Ithird_party/heimdal/lib/gssapi', '-I../../third_party/heimdal/lib/gssapi', '-Ithird_party/heimdal/lib/com_err', '-I../../third_party/heimdal/lib/com_err', '-Ithird_party/heimdal/lib/gssapi/gssapi', '-I../../third_party/heimdal/lib/gssapi/gssapi', '-Ithird_party/heimdal/lib/gssapi/spnego', '-I../../third_party/heimdal/lib/gssapi/spnego', '-Ithird_party/heimdal/lib/gssapi/krb5', '-I../../third_party/heimdal/lib/gssapi/krb5', '-Ithird_party/heimdal/lib/gssapi/mech', '-I../../third_party/heimdal/lib/gssapi/mech', '-Ithird_party/heimdal/lib/ntlm', '-I../../third_party/heimdal/lib/ntlm', '-Ilib/util/charset', '-I../../lib/util/charset', '-Ilib/crypto', '-I../../lib/crypto', '-Ithird_party/heimdal/lib/ipc', '-I../../third_party/heimdal/lib/ipc', '-I/usr/include/p11-kit-
1', '../../lib/krb5_wrap/gss_samba.c', '-c', '-o/<<PKGBUILDDIR>>/bin/default/lib/krb5_wrap/gss_samba.c.1.o', '-Wdate-time', '-D_FORTIFY_SOURCE=2']
make[1]: *** [debian/rules:101: override_dh_auto_build] Error 1
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
make: *** [debian/rules:95: build] Error 2
dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
--------------------------------------------------------------------------------
Build finished at 2022-03-23T09:49:12Z
Now, that build failed and this is one thats over my head to fix.
>
> On Thu, Mar 24, 2022 at 9:51 AM Andrew Bartlett
> <abartlet at samba.org> wrote:
> >
> > On Thu, 2022-03-24 at 11:42 +0300, Michael Tokarev wrote:
> > > 23.03.2022 12:34, Andrew Bartlett wrote:
> > > []
> > > > > Yeah, that might be interesting. 4.16 should need
> some extra work
> > > > > due to
> > > > > the new dcerpc binary. And they also updated bundled heimdal
> > > > > which needs
> > > > > some attention too. I'll come to that next :)
> > > >
> > > > Yes, a massive update there. Have fun making the new massive
> > > > import
> > > > DFSG-safe, as we now take the full tree, not just the
> files we were
> > > > building.
> > >
> > > Andrew, can you share some information here? What is non-dfsg in
> > > here,
> > > besides the RFCs (it was a surprise to me that RFC texts are non-
> > > DFSG-compliant).
> >
> > The RFCs are what comes to mind, if the old scripts only remove some
> > files by name that might need updating.
> >
> > I hope there isn't anything else, but it was a big rsync!
> >
> > > I hate it when one piece of software - especially when it
> is already
> > > included
> > > in debian - is distributed inside another piece of
> software. So the
> > > natural
> > > wish is to use the already packaging heimdal to start
> with, but for
> > > that I
> > > definitely does not have enough experience, if it is at
> all possible
> > > with
> > > current samba.
> >
> > Yeah, I know, but Samba's Heimdal is not upstream Heimdal,
> it carries
> > (many less than at any time in the past, but still a number
> of) patches
> > that upstream won't accept. Also, like ldb, tdb, talloc
> etc, we test
> > with exactly one version and mixing in others is a totally untested
> > combination.
> >
> > The Debian packaging at one point tried to know better than
> Samba, and
> > use the system Heimdal, but that was dropped thankfully.
> >
> > > After looking at all this, I'm somewhat lost here. I didn't expect
> > > this to
> > > take *this* much work. It is not the work which bothers
> me, but that
> > > I still
> > > don't have understanding about which side to attack it
> all. I have to
> > > start
> > > with *something* which is manageable more or less short-term.
> >
> > Was that a hot potato or a hot grenade I saw passed your way?
> >
> > More seriously, I do thank you for stepping up, new energy has been
> > needed in this space for a long time.
> >
> > > Sure we'll have to deal with 4.16 at some point. But at
> this time I
> > > think it
> > > might be a good idea to package 4.15 first (which was my initial
> > > intention)
> > > just to become a bit more familiar with whole thing (including
> > > switching to
> > > embedded ldb), and next try to address this heimdal thing.
> >
> > It shouldn't be much of a change honestly - we have always embedded
> > Heimdal, but I just wanted to mention the silly RFC stripping
> > requirement.
> >
> > > Maybe even updating to 4.13.17 for a start (with embedded
> ldb being
> > > next)
> > > is already a good step further :) I think it should be done anyway
> > > (but
> > > without ldb) for bullseye.
> > >
> > > Anyway, I'd love to understand what's up with heimdal and DFSG.
> >
> > Just the RFCs and an audit really.
> >
> > I would love to see 4.16 packaged. That would help everyone as it
> > means it is more likely that 4.17 is also packaged in time for those
> > deadlines at the end of year, and the faint hope of a Debian release
> > also matching the support life of Samba for the most part.
> (Typically
> > Debian Stable always has an out-of-support Samba).
> >
> > Andrew Bartlett
> > --
> > Andrew Bartlett (he/him) https://samba.org/~abartlet/
> > Samba Team Member (since 2001) https://samba.org
> > Samba Team Lead, Catalyst IT
> https://catalyst.net.nz/services/samba
> >
> > Samba Development and Support, Catalyst IT - Expert Open Source
> > Solutions
> >
> >
> > _______________________________________________
> > Pkg-samba-maint mailing list
> > Pkg-samba-maint at alioth-lists.debian.net
> >
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-s
amba-maint
>
>
>
> --
> Mathieu
>
> _______________________________________________
> Pkg-samba-maint mailing list
> Pkg-samba-maint at alioth-lists.debian.net
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-s
amba-maint
>
>
More information about the Pkg-samba-maint
mailing list