Page MenuHomeFreeBSD
Differential D33358

www/domoticz: update to 2021.1
Needs ReviewPublic
Actions

Authored by samm on Dec 9 2021, 10:34 AM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 18 2025, 9:41 PM
Unknown Object (File)
Feb 15 2025, 2:28 PM
Unknown Object (File)
Feb 15 2025, 7:49 AM
Unknown Object (File)
Feb 14 2025, 3:14 PM
Unknown Object (File)
Dec 28 2024, 5:53 AM
Unknown Object (File)
Nov 18 2024, 5:28 AM
Unknown Object (File)
Nov 18 2024, 1:58 AM
Unknown Object (File)
Nov 11 2024, 6:30 PM
View All 47 Files
Subscribers
arrowd
mat
Contributor Reviewers (ports)
This revision needs review, but there are no reviewers specified.

Details

Reviewers
None
Summary

www/domoticz: update to 2021.1

  • Add libfmt dependency
  • Remove MQTT files from pkglist, they are not installed with domoticz anymore
  • Remove merged patch
Test Plan

portlint -a
poudriere

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 43258
Build 40146: arc lint + arc unit

Event Timeline

samm created this revision.Dec 9 2021, 10:34 AM
Herald added subscribers: Contributor Reviewers (ports), mat. · View Herald TranscriptDec 9 2021, 10:34 AM
samm requested review of this revision.Dec 9 2021, 10:34 AM
Harbormaster completed remote builds in B43258: Diff 99763.Dec 9 2021, 10:35 AM
samm updated this revision to Diff 99765.Dec 9 2021, 11:09 AM
  • domoticz no longer distributes MQTT files
Harbormaster completed remote builds in B43259: Diff 99765.Dec 9 2021, 11:10 AM
samm edited the summary of this revision. (Show Details)Dec 9 2021, 11:14 AM
samm edited the test plan for this revision. (Show Details)
samm edited the summary of this revision. (Show Details)Dec 9 2021, 11:16 AM
arrowd added a subscriber: arrowd.Dec 9 2021, 12:00 PM
arrowd added inline comments.
www/domoticz/Makefile
52

This can be converted into just

LIBFMT_CMAKE_BOOL=	USE_BUILTIN_LIBFMT
LIBFMT_LIB_DEPENDS=	libfmt.so:devel/libfmt

Revision Contents
Changeset List

PathSize
www/
domoticz/
16 lines
8 lines
files/
273 lines

Diff 99763

View Options

www/domoticz/Makefile

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "local.h" #include "local.h"
#include "xlocale_private.h" #include "xlocale_private.h"
static int struct _sscancookie {
eofread(void *, char *, int); FILE *fp;
const char *str;
};
static int _vsscanf_read(void *, char *, int);
pstefUnsubmitted
Not Done
Inline Actions

Why do names of sscancookie and vsscanf_read() need to start with an underscore?

pstef: Why do names of sscancookie and vsscanf_read() need to start with an underscore?
#ifndef VSSCANF_CHUNK_SIZE
#define VSSCANF_CHUNK_SIZE 128
#endif
/* ARGSUSED */ /* ARGSUSED */
static int static int
eofread(void *cookie, char *buf, int len) _vsscanf_read(void *cookie, char *buf, int len)
{ {
int n;
struct _sscancookie *sc;
sc = (struct _sscancookie *)cookie;
if (sc->str[0] == '\x00')
return (0); return (0);
n = strnlen(sc->str, VSSCANF_CHUNK_SIZE);
/*
* fp->_p is set in __srefill before calling us, this overwrites
* it so we don't have to copy the string into the buffer.
*/
sc->fp->_p = (unsigned char *)sc->str;
sc->str += n;
return (n);
brooksUnsubmitted
Done
Inline Actions
sc->str += n;
- return n;
+ return (n);
}
int
brooks:
} }
int int
vsscanf_l(const char * __restrict str, locale_t locale, vsscanf_l(const char * __restrict str, locale_t locale,
const char * __restrict fmt, __va_list ap) const char * __restrict fmt, __va_list ap)
{ {
FILE f = FAKE_FILE; FILE f = FAKE_FILE;
struct _sscancookie sc;
FIX_LOCALE(locale); FIX_LOCALE(locale);
f._flags = __SRD; f._flags = __SRD;
f._bf._base = f._p = (unsigned char *)str; f._bf._base = f._p = (unsigned char *)str;
f._bf._size = f._r = strlen(str); f._bf._size = f._r = strnlen(str, VSSCANF_CHUNK_SIZE);
f._read = eofread; f._read = _vsscanf_read;
sc = (struct _sscancookie){
.fp = &f,
.str = str + f._r,
brooksUnsubmitted
Done
Inline Actions

I'd tend to swap these two lines to match the struct definition order.

brooks: I'd tend to swap these two lines to match the struct definition order.
};
f._cookie = &sc;
return (__svfscanf(&f, locale, fmt, ap)); return (__svfscanf(&f, locale, fmt, ap));
} }
int int
vsscanf(const char * __restrict str, const char * __restrict fmt, vsscanf(const char * __restrict str, const char * __restrict fmt,
__va_list ap) __va_list ap)
{ {
return vsscanf_l(str, __get_locale(), fmt, ap); return (vsscanf_l(str, __get_locale(), fmt, ap));
} }
View Options

www/domoticz/distinfo

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "local.h" #include "local.h"
#include "xlocale_private.h" #include "xlocale_private.h"
static int struct _sscancookie {
eofread(void *, char *, int); FILE *fp;
const char *str;
};
static int _vsscanf_read(void *, char *, int);
pstefUnsubmitted
Not Done
Inline Actions

Why do names of sscancookie and vsscanf_read() need to start with an underscore?

pstef: Why do names of sscancookie and vsscanf_read() need to start with an underscore?
#ifndef VSSCANF_CHUNK_SIZE
#define VSSCANF_CHUNK_SIZE 128
#endif
/* ARGSUSED */ /* ARGSUSED */
static int static int
eofread(void *cookie, char *buf, int len) _vsscanf_read(void *cookie, char *buf, int len)
{ {
int n;
struct _sscancookie *sc;
sc = (struct _sscancookie *)cookie;
if (sc->str[0] == '\x00')
return (0); return (0);
n = strnlen(sc->str, VSSCANF_CHUNK_SIZE);
/*
* fp->_p is set in __srefill before calling us, this overwrites
* it so we don't have to copy the string into the buffer.
*/
sc->fp->_p = (unsigned char *)sc->str;
sc->str += n;
return (n);
brooksUnsubmitted
Done
Inline Actions
sc->str += n;
- return n;
+ return (n);
}
int
brooks:
} }
int int
vsscanf_l(const char * __restrict str, locale_t locale, vsscanf_l(const char * __restrict str, locale_t locale,
const char * __restrict fmt, __va_list ap) const char * __restrict fmt, __va_list ap)
{ {
FILE f = FAKE_FILE; FILE f = FAKE_FILE;
struct _sscancookie sc;
FIX_LOCALE(locale); FIX_LOCALE(locale);
f._flags = __SRD; f._flags = __SRD;
f._bf._base = f._p = (unsigned char *)str; f._bf._base = f._p = (unsigned char *)str;
f._bf._size = f._r = strlen(str); f._bf._size = f._r = strnlen(str, VSSCANF_CHUNK_SIZE);
f._read = eofread; f._read = _vsscanf_read;
sc = (struct _sscancookie){
.fp = &f,
.str = str + f._r,
brooksUnsubmitted
Done
Inline Actions

I'd tend to swap these two lines to match the struct definition order.

brooks: I'd tend to swap these two lines to match the struct definition order.
};
f._cookie = &sc;
return (__svfscanf(&f, locale, fmt, ap)); return (__svfscanf(&f, locale, fmt, ap));
} }
int int
vsscanf(const char * __restrict str, const char * __restrict fmt, vsscanf(const char * __restrict str, const char * __restrict fmt,
__va_list ap) __va_list ap)
{ {
return vsscanf_l(str, __get_locale(), fmt, ap); return (vsscanf_l(str, __get_locale(), fmt, ap));
} }
View Options

www/domoticz/files/patch-main_mainworker.cpp

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "local.h" #include "local.h"
#include "xlocale_private.h" #include "xlocale_private.h"
static int struct _sscancookie {
eofread(void *, char *, int); FILE *fp;
const char *str;
};
static int _vsscanf_read(void *, char *, int);
pstefUnsubmitted
Not Done
Inline Actions

Why do names of sscancookie and vsscanf_read() need to start with an underscore?

pstef: Why do names of sscancookie and vsscanf_read() need to start with an underscore?
#ifndef VSSCANF_CHUNK_SIZE
#define VSSCANF_CHUNK_SIZE 128
#endif
/* ARGSUSED */ /* ARGSUSED */
static int static int
eofread(void *cookie, char *buf, int len) _vsscanf_read(void *cookie, char *buf, int len)
{ {
int n;
struct _sscancookie *sc;
sc = (struct _sscancookie *)cookie;
if (sc->str[0] == '\x00')
return (0); return (0);
n = strnlen(sc->str, VSSCANF_CHUNK_SIZE);
/*
* fp->_p is set in __srefill before calling us, this overwrites
* it so we don't have to copy the string into the buffer.
*/
sc->fp->_p = (unsigned char *)sc->str;
sc->str += n;
return (n);
brooksUnsubmitted
Done
Inline Actions
sc->str += n;
- return n;
+ return (n);
}
int
brooks:
} }
int int
vsscanf_l(const char * __restrict str, locale_t locale, vsscanf_l(const char * __restrict str, locale_t locale,
const char * __restrict fmt, __va_list ap) const char * __restrict fmt, __va_list ap)
{ {
FILE f = FAKE_FILE; FILE f = FAKE_FILE;
struct _sscancookie sc;
FIX_LOCALE(locale); FIX_LOCALE(locale);
f._flags = __SRD; f._flags = __SRD;
f._bf._base = f._p = (unsigned char *)str; f._bf._base = f._p = (unsigned char *)str;
f._bf._size = f._r = strlen(str); f._bf._size = f._r = strnlen(str, VSSCANF_CHUNK_SIZE);
f._read = eofread; f._read = _vsscanf_read;
sc = (struct _sscancookie){
.fp = &f,
.str = str + f._r,
brooksUnsubmitted
Done
Inline Actions

I'd tend to swap these two lines to match the struct definition order.

brooks: I'd tend to swap these two lines to match the struct definition order.
};
f._cookie = &sc;
return (__svfscanf(&f, locale, fmt, ap)); return (__svfscanf(&f, locale, fmt, ap));
} }
int int
vsscanf(const char * __restrict str, const char * __restrict fmt, vsscanf(const char * __restrict str, const char * __restrict fmt,
__va_list ap) __va_list ap)
{ {
return vsscanf_l(str, __get_locale(), fmt, ap); return (vsscanf_l(str, __get_locale(), fmt, ap));
} }
View Options

www/domoticz/pkg-plist

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "local.h" #include "local.h"
#include "xlocale_private.h" #include "xlocale_private.h"
static int struct _sscancookie {
eofread(void *, char *, int); FILE *fp;
const char *str;
};
static int _vsscanf_read(void *, char *, int);
pstefUnsubmitted
Not Done
Inline Actions

Why do names of sscancookie and vsscanf_read() need to start with an underscore?

pstef: Why do names of sscancookie and vsscanf_read() need to start with an underscore?
#ifndef VSSCANF_CHUNK_SIZE
#define VSSCANF_CHUNK_SIZE 128
#endif
/* ARGSUSED */ /* ARGSUSED */
static int static int
eofread(void *cookie, char *buf, int len) _vsscanf_read(void *cookie, char *buf, int len)
{ {
int n;
struct _sscancookie *sc;
sc = (struct _sscancookie *)cookie;
if (sc->str[0] == '\x00')
return (0); return (0);
n = strnlen(sc->str, VSSCANF_CHUNK_SIZE);
/*
* fp->_p is set in __srefill before calling us, this overwrites
* it so we don't have to copy the string into the buffer.
*/
sc->fp->_p = (unsigned char *)sc->str;
sc->str += n;
return (n);
brooksUnsubmitted
Done
Inline Actions
sc->str += n;
- return n;
+ return (n);
}
int
brooks:
} }
int int
vsscanf_l(const char * __restrict str, locale_t locale, vsscanf_l(const char * __restrict str, locale_t locale,
const char * __restrict fmt, __va_list ap) const char * __restrict fmt, __va_list ap)
{ {
FILE f = FAKE_FILE; FILE f = FAKE_FILE;
struct _sscancookie sc;
FIX_LOCALE(locale); FIX_LOCALE(locale);
f._flags = __SRD; f._flags = __SRD;
f._bf._base = f._p = (unsigned char *)str; f._bf._base = f._p = (unsigned char *)str;
f._bf._size = f._r = strlen(str); f._bf._size = f._r = strnlen(str, VSSCANF_CHUNK_SIZE);
f._read = eofread; f._read = _vsscanf_read;
sc = (struct _sscancookie){
.fp = &f,
.str = str + f._r,
brooksUnsubmitted
Done
Inline Actions

I'd tend to swap these two lines to match the struct definition order.

brooks: I'd tend to swap these two lines to match the struct definition order.
};
f._cookie = &sc;
return (__svfscanf(&f, locale, fmt, ap)); return (__svfscanf(&f, locale, fmt, ap));
} }
int int
vsscanf(const char * __restrict str, const char * __restrict fmt, vsscanf(const char * __restrict str, const char * __restrict fmt,
__va_list ap) __va_list ap)
{ {
return vsscanf_l(str, __get_locale(), fmt, ap); return (vsscanf_l(str, __get_locale(), fmt, ap));
} }