28bbfcdc0ed54d5498e82a773e3bf2ed100a9c7c is the commit for the Release-13.0.3 tag, not the "most recent commit" for either bxattr_freebsd.c or the repository as a whole, so I think that is where the misunderstanding started.
c0e27eca4f29dfcc000b2156094b867e995a2f64 was the first attempt to fix it, but it was then fixed again in 111333a97b10ce620c5b5bcf290980aaf454d922, which is currently the most recent commit of bxattr_freebsd.c. __Martin >>>>> On Wed, 18 Oct 2023 17:55:36 -0400, Dan Langille said: > > Oh wait, I now understanding the misunderstanding. > > I went looking for the commit. > https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/commits/c0e27eca4f29dfcc000b2156094b867e995a2f64 > > I found the most recent commit and clicked on it. > > See Fix compilation on FreeBSD > <https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/commit/c0e27eca4f29dfcc000b2156094b867e995a2f64> > 28bbfcdc0ed54d5498e82a773e3bf2ed100a9c7c > > That does not take me to the actual change, but to the commit seen at this > link below: > > https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/commit/c0e27eca4f29dfcc000b2156094b867e995a2f64 > > Instead, this pages shows the the fix ti the problem originally reported: > > https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/blame/Branch-13.0/bacula/src/filed/bxattr_freebsd.c#L106 > > The commit message there is: Fix compilation on FreeBSD again > <https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/commit/111333a97b10ce620c5b5bcf290980aaf454d922> > > > I don't know why this is wrong. But it sure seems like it is wrong to me. > > > On Wed, Oct 18, 2023, at 4:56 PM, Dan Langille wrote: > > I don't see a reply to my question. > > > > The patch is wrong. The build still fails. > > > > I call again: bring back regression testing for users. Host a cdash > > instance. We have bugs going 5+ months undetected. > > > > This is the correct patch (pasted, so errors may be with tabs) > > > > --- src/filed/bxattr_freebsd.c.orig 2023-10-18 20:41:39 UTC > > > > +++ src/filed/bxattr_freebsd.c > > > > @@ -103,7 +103,7 @@ bRC_BXATTR BXATTR_FreeBSD::os_backup_xattr (JCR *jcr, > > > > case bRC_BXATTR_skip: > > > > case bRC_BXATTR_cont: > > > > /* no xattr available, so skip rest of it */ > > > > - rc = bRC_XACL_ok; > > > > + rc = bRC_BXATTR_ok; > > > > continue; > > > > default: > > > > goto bail_out; > > > > > > > > On Wed, May 31, 2023, at 7:49 AM, Dan Langille wrote: > >> NOTE: the patch in git uses bRC_XATTR_ok > >> > >> The patch I have uses bRC_BXATTR_ok (note the extra B in my version). My > >> patch is below. > >> > >> This patch builds. The patch in git does not. Please advise. > >> > >> [11:45 pkg01 dan ~/ports/head] % cat > >> sysutils/bacula13-server/files/patch-src_filed_bxattr_freebsd.c > >> diff --git a/bacula/src/filed/bxattr_freebsd.c > >> b/bacula/src/filed/bxattr_freebsd.c > >> index > >> b83331fc578ebc6caf74ff1bf5e67e49329394be..ed2efad02cf2b4f1d1437b25962d28a4d326b873 > >> 100644 > >> --- src/filed/bxattr_freebsd.c > >> +++ src/filed/bxattr_freebsd.c > >> @@ -103,7 +103,7 @@ bRC_BXATTR BXATTR_FreeBSD::os_backup_xattr (JCR *jcr, > >> FF_PKT *ff_pkt){ > >> case bRC_BXATTR_skip: > >> case bRC_BXATTR_cont: > >> /* no xattr available, so skip rest of it */ > >> - rc = bRC_XACL_ok; > >> + rc = bRC_BXATTR_ok; > >> continue; > >> default: > >> goto bail_out; > >> > >> — > >> Dan Langille > >> http://langille.org/ > >> > >> > >> > >> > >>> On May 26, 2023, at 1:54 PM, Dan Langille <d...@langille.org> wrote: > >>> > >>> For those looking for the commit: > >>> https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/commit/c0e27eca4f29dfcc000b2156094b867e995a2f64 > >>> > >>> Is that the right change? > >>> > >>> If I use bRC_XATTR_ok instead, it does compile, but I don't know if > >>> that's the right value. > >>> > >>> I ask because. > >>> > >>> bxattr_freebsd.c:106:18: error: use of undeclared identifier > >>> 'bRC_XATTR_ok'; did you mean 'bRC_BXATTR_ok'? > >>> rc = bRC_XATTR_ok; > >>> ^~~~~~~~~~~~ > >>> bRC_BXATTR_ok > >>> ./bxattr.h:51:4: note: 'bRC_BXATTR_ok' declared here > >>> bRC_BXATTR_ok = 0, // success > >>> ^ > >>> 1 error generated. > >>> *** [bxattr_freebsd.o] Error code 1 > >>> > >>> make[2]: stopped in > >>> /wrkdirs/usr/ports/sysutils/bacula13-client/work/bacula-13.0.3/src/filed > >>> 1 error > >>> > >>> > >>> — > >>> Dan Langille > >>> http://langille.org/ > >>> > >>> > >>> > >>> > >>> > >>>> On May 26, 2023, at 9:39 AM, Eric Bollengier via Bacula-devel > >>>> <bacula-devel@lists.sourceforge.net> wrote: > >>>> > >>>> Hello Dan, > >>>> > >>>> > >>>> Thanks for the report, I have pushed a fix. > >>>> > >>>> Best Regards, > >>>> > >>>> Eric > >>>> > >>>> On 26.05.23 14:18, Dan Langille wrote: >>>>> Hello, > >>>>> >>>>> When building bacula13-client-13.0.3 on FreeBSD, I encountered this error. > >>>>> >>>>> Compiling bacl.c >>>>> Compiling bxattr.c >>>>> --- bxattr_freebsd.o --- >>>>> bxattr_freebsd.c:106:18: error: use of undeclared identifier >>>>> 'bRC_XACL_ok'; did you mean 'bRC_BXATTR_ok'? >>>>> rc = bRC_XACL_ok; >>>>> ^~~~~~~~~~~ >>>>> bRC_BXATTR_ok >>>>> ./bxattr.h:51:4: note: 'bRC_BXATTR_ok' declared here >>>>> bRC_BXATTR_ok = 0, // success >>>>> ^ >>>>> 1 error generated. > >>>>> > >>>>> >>>>> Full log output at >>>>> https://services.unixathome.org/poudriere/data/131amd64-dvl-testing/2023-05-26_12h07m40s/logs/errors/bacula13-client-13.0.3.log > >>>>> >>>>> Thank you. > >>>> > >>>> > >>>> _______________________________________________ > >>>> Bacula-devel mailing list > >>>> Bacula-devel@lists.sourceforge.net > >>>> https://lists.sourceforge.net/lists/listinfo/bacula-devel > >>> > >>> _______________________________________________ > >>> Bacula-devel mailing list > >>> Bacula-devel@lists.sourceforge.net > >>> https://lists.sourceforge.net/lists/listinfo/bacula-devel > >> > >> _______________________________________________ > >> Bacula-devel mailing list > >> Bacula-devel@lists.sourceforge.net > >> https://lists.sourceforge.net/lists/listinfo/bacula-devel > >> > > > > -- > > Dan Langille > > d...@langille.org > > > > > > > > _______________________________________________ > > Bacula-devel mailing list > > Bacula-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/bacula-devel > > > > -- > Dan Langille > d...@langille.org > > _______________________________________________ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
