message
stringlengths
6
474
diff
stringlengths
8
5.22k
rpz triggers, fix that nsdname suffix removal returns allocated memory of the correct length and the correct dnamelen.
@@ -664,12 +664,34 @@ rpz_insert_qname_trigger(struct rpz* r, uint8_t* dname, size_t dnamelen, rrclass, ttl, rdata, rdata_len, rr, rr_len); } -static void -rpz_strip_nsdname_suffix(uint8_t* dname, size_t maxdnamelen) +static int +rpz_strip_nsdname_suffix(uint8_t* dname, size_t maxdnamelen, + uint8_t** stripdname, size_t* stripdnamelen) { uint8_t* stripped = get_tld_label(dname, maxdnamelen); - if(stripped == NULL) { return; } + uint8_t swap; + if(stripped == NULL) { + *stripdname = memdup(dname, maxdnamelen); + if(!*stripdname) { + log_err("malloc failure for rpz strip suffix"); + return 0; + } + *stripdnamelen = maxdnamelen; + return 1; + } + /* shorten the domain name briefly, + * then we allocate a new name with the correct length */ + swap = *stripped; *stripped = 0; + (void)dname_count_size_labels(dname, stripdnamelen); + *stripdname = memdup(dname, *stripdnamelen); + *stripped = swap; + if(!*stripdname) { + *stripdnamelen = 0; + log_err("malloc failure for rpz strip suffix"); + return 0; + } + return 1; } static void @@ -677,20 +699,26 @@ rpz_insert_nsdname_trigger(struct rpz* r, uint8_t* dname, size_t dnamelen, enum rpz_action a, uint16_t rrtype, uint16_t rrclass, uint32_t ttl, uint8_t* rdata, size_t rdata_len, uint8_t* rr, size_t rr_len) { + uint8_t* dname_stripped = NULL; + size_t dnamelen_stripped = 0; verbose(VERB_ALGO, "rpz: insert nsdname trigger: %s", rpz_action_to_string(a)); rpz_log_dname("insert nsdname trigger", dname, dnamelen); - rpz_strip_nsdname_suffix(dname, dnamelen); - rpz_log_dname("insert nsdname trigger (stripped)", dname, dnamelen); + rpz_strip_nsdname_suffix(dname, dnamelen, &dname_stripped, + &dnamelen_stripped); + rpz_log_dname("insert nsdname trigger (stripped)", dname_stripped, dnamelen_stripped); if(a == RPZ_INVALID_ACTION) { verbose(VERB_ALGO, "rpz: skipping invalid action"); + free(dname_stripped); free(dname); return; } - rpz_insert_local_zones_trigger(r->nsdname_zones, dname, dnamelen, a, rrtype, - rrclass, ttl, rdata, rdata_len, rr, rr_len); + rpz_insert_local_zones_trigger(r->nsdname_zones, dname_stripped, + dnamelen_stripped, a, rrtype, rrclass, ttl, rdata, rdata_len, + rr, rr_len); + free(dname); } static int
os/board/rtl8721csm: Add MPU for Secure PSRAM
@@ -1017,6 +1017,11 @@ u32 app_mpu_nocache_init(void) return 0; } +u32 app_mpu_s_nocache_init(void) +{ + mpu_s_no_cache_init(); +} + VOID app_vdd1833_detect(VOID) { u32 temp; @@ -1345,6 +1350,7 @@ extern void __libc_init_array(void); #ifdef CONFIG_PLATFORM_TIZENRT_OS mpu_init(); app_mpu_nocache_init(); + app_mpu_s_nocache_init(); #endif app_vdd1833_detect(); memcpy_gdma_init();
Update pkg/interface/src/apps/chat/components/lib/chat-header.js
@@ -13,11 +13,10 @@ export class ChatHeader extends Component { const isinPopout = props.popout ? "popout/" : ""; const group = Array.from(props.group.members); let title = props.station.substr(1); - if (props.association && "metadata" in props.association) { - title = - props.association.metadata.title !== "" - ? props.association.metadata.title - : props.station.substr(1); + if (props.association && + "metadata" in props.association && + props.association.metadata.tile !== "") { + title = props.association.metadata.title } return (
Corrected OC_PDU_SIZE for builds with OC_SECURITY disabled
#endif /* !OC_BLOCK_WISE_SET_MTU */ enum { +#ifdef OC_SECURITY OC_PDU_SIZE = (2 * OC_BLOCK_SIZE + COAP_MAX_HEADER_SIZE) +#else /* OC_SECURITY */ + OC_PDU_SIZE = (OC_BLOCK_SIZE + COAP_MAX_HEADER_SIZE) +#endif /* !OC_SECURITY */ }; typedef struct
Reduce collision chance when parsing demo output.
@@ -341,12 +341,12 @@ void runDemoTask( void * pArgument ) /* If memory analysis is enabled metrics regarding the heap and stack usage of the demo will print. */ /* This format is used for easier parsing and creates an avenue for future metrics to be added. */ xAfterDemoHeapSize = democonfigMEMORY_ANALYSIS_MIN_EVER_HEAP_SIZE(); - IotLogInfo( "memory_metrics:freertos_heap:before:bytes:%u", xBeforeDemoHeapSize ); - IotLogInfo( "memory_metrics:freertos_heap:after:bytes:%u", xAfterDemoHeapSize ); + IotLogInfo( "memory_metrics::freertos_heap::before::bytes::%u", xBeforeDemoHeapSize ); + IotLogInfo( "memory_metrics::freertos_heap::after::bytes::%u", xAfterDemoHeapSize ); xAfterDemoTaskWaterMark = democonfigMEMORY_ANALYSIS_STACK_WATERMARK( NULL ); - IotLogInfo( "memory_metrics:demo_task_stack:before:bytes:%u", xBeforeDemoTaskWaterMark ); - IotLogInfo( "memory_metrics:demo_task_stack:after:bytes:%u", xAfterDemoTaskWaterMark ); + IotLogInfo( "memory_metrics::demo_task_stack::before::bytes::%u", xBeforeDemoTaskWaterMark ); + IotLogInfo( "memory_metrics::demo_task_stack::after::bytes::%u", xAfterDemoTaskWaterMark ); #endif /* democonfigMEMORY_ANALYSIS */ /* Log the demo status. */
Fix in docu.
@@ -7,7 +7,9 @@ docker tag <ID> tinyspline/build-deps:latest docker push tinyspline/build-deps ### Change loader instruction +```shell x86_64-apple-darwin17-install_name_tool -change \ `x86_64-apple-darwin17-otool -L *tinysplinepython* | grep Python | cut -d' ' -f1 | sed -e 's/^[ \t]*//'` \ Python \ _tinysplinepython.so +```
update the links for submit bug and view change log
@@ -470,87 +470,7 @@ houdiniEngine_runHKey() global proc houdiniEngine_launchSubmitBugs() { - string $houdiniEngineVersion = `houdiniEngine -houdiniEngineVersion`; - - string $operatingSystem = `about -operatingSystem`; - string $mayaVersion = `about -version`; - string $mayaCutIdentifier = `about -cutIdentifier`; - - string $houdiniVersions[] = getHoudiniVersions(); - - string $extraURLParameters; - - // version - $extraURLParameters += `format - -stringArg $houdiniVersions[0] "&version=^1s"`; - - // build - $extraURLParameters += `format - -stringArg $houdiniVersions[1] "&build=^1s"`; - - // category - $extraURLParameters += "&category=Maya%20Plug-in"; - - // platform - if($operatingSystem == "linux64") - { - $extraURLParameters += "&platform=Linux%2064-bit"; - } - else if($operatingSystem == "linux") - { - $extraURLParameters += "&platform=Linux%2032-bit"; - } - else if($operatingSystem == "win64") - { - $extraURLParameters += "&platform=Windows%2064-bit"; - } - else if($operatingSystem == "nt") - { - $extraURLParameters += "&platform=Windows%2032-bit"; - } - else if($operatingSystem == "mac") - { - $extraURLParameters += "&platform=Mac%20OSX%2064-bit"; - } - - // description - // It seems like "launch -web" will automatically convert "\n" to "%0A". - string $description; - string $temp; - - $temp = `format - -stringArg $mayaVersion - -stringArg $mayaCutIdentifier - "Maya Version: ^1s (^2s)\n"`; - - $description += substituteAllString( - $temp, - " ", - "%20" - ); - - if(`houdiniEngine -houdiniVersion` - != `houdiniEngine -buildHoudiniVersion`) - { - string $buildHoudiniVersion = `houdiniEngine -buildHoudiniVersion`; - - $temp = `format - -stringArg $buildHoudiniVersion - "Build Houdini Version: ^1s\n"`; - - $description += substituteAllString( - $temp, - " ", - "%20" - ); - } - - $extraURLParameters += `format - -stringArg $description - "&description=^1s"`; - - launch -web ("http://archive.sidefx.com/index.php?option=com_content&task=view&id=768&Itemid=239" - + $extraURLParameters); + launch -web ("https://www.sidefx.com/bugs/submit/"); } global proc @@ -570,8 +490,8 @@ houdiniEngine_launchChangeLog() -stringArg $houdiniVersions[1] "&buildend=^1s"`; - launch -web ("https://archive.sidefx.com/index.php?option=com_journal&Itemid=213&page=index&journal=default&view=FULL&logfile=ALL&icon=maya&perpage=20" - + $extraURLParameters); + launch -web ("https://www.sidefx.com/changelog/Main/?journal=&categories=&body=Maya&version=&build_0=&build_1=&show_versions=on&show_compatibility=on" + + $extraURLParameter); } global proc
improve nvcc warning settings
@@ -40,9 +40,10 @@ function init(self) self:set("mapflags", { -- warnings - ["-W1"] = "-Wall" - , ["-W2"] = "-Wall" - , ["-W3"] = "-Wall" + ["-W1"] = "" + , ["-W2"] = "" + , ["-W3"] = "" + , ["-W4"] = "-Wreorder" }) -- init buildmodes @@ -72,25 +73,43 @@ function nf_warning(self, level) local maps = { none = "-w" + , less = "" + , more = "" + , all = "" , extra = "-Wreorder" , everything = "-Wreorder" , error = "-Werror" } + local cl_maps = + { + none = "-W0" + , less = "-W1" + , more = "-W3" + , all = "-W3" -- = "-Wall" will enable too more warnings + , extra = "-W4" + , everything = "-Wall" + , error = "-WX" + } + + local gcc_clang_maps = + { + none = "-w" + , less = "-Wall" + , more = "-Wall" + , all = "-Wall" + , extra = "-Wextra" + , everything = "-Weverything -Wall -Wextra -Weffc++" -- gcc dosen't support `-Weverything`, use `-Wall -Wextra -Weffc++` for it + , error = "-Werror" + } + local warning = maps[level] - if not warning then -- for cl.exe if is_plat("windows") then - maps.less = "-Xcompiler -W1" - maps.more = "-Xcompiler -W3" - maps.all = "-Xcompiler -W3" + warning = warning .. ' -Xcompiler "' .. cl_maps[level] .. '"' -- for gcc/clang elseif self:has_flags("-Xcompiler -Wall", "cxflags") then - maps.less = "-Xcompiler -Wall" - maps.more = "-Xcompiler -Wall" - maps.all = "-Xcompiler -Wall" - end - warning = maps[level] + warning = warning .. ' -Xcompiler "' .. gcc_clang_maps[level] .. '"' end return warning end
[x86_64] .gitignore arch-specific staged files
@@ -10,6 +10,7 @@ isodir/ *.a .DS_Store i686-toolchain/ +x86_64-toolchain/ initrd/ .vscode/ @@ -18,3 +19,11 @@ __pycache__/ i686-toolchain-attempt1/ /axle-sysroot/usr/i686-axle/lib/ programs/cross_axle_generated.ini + +# Arch specific files that are staged based on the current architecture +kernel/boot/boot.s +kernel/kernel/util/walk_stack.s +kernel/kernel/multitasking/tasks/process_small.s +kernel/kernel/segmentation/gdt_activate.s +kernel/kernel/interrupts/idt_activate.s +kernel/kernel/interrupts/int_handler_stubs.s
scheduler: initialize timer event structure
@@ -521,6 +521,8 @@ struct flb_sched_timer *flb_sched_timer_create(struct flb_sched *sched) flb_errno(); return NULL; } + MK_EVENT_ZERO(&timer->event); + timer->timer_fd = -1; timer->config = sched->config; timer->data = NULL;
YAML CPP: Fix conversion of array without parent
@@ -97,7 +97,7 @@ KeySet splitArrayParents (KeySet const & keys) continue; } - if (keys.current ().getBaseName ()[0] == '#' && keys.current ().isBelow (previous)) + if (keys.current ().getBaseName ()[0] == '#') { if (!keys.current ().isDirectBelow (previous)) {
DAOS: use proper permissions for obj_open Pass the correct permissions to daos_obj_open instead of 0.
@@ -2312,7 +2312,7 @@ static int mfu_daos_obj_sync( /* open handle of object in dst container */ daos_handle_t dst_oh; - rc = daos_obj_open(dst_coh, oid, DAOS_OO_EXCL, &dst_oh, NULL); + rc = daos_obj_open(dst_coh, oid, DAOS_OO_RW, &dst_oh, NULL); if (rc != 0) { MFU_LOG(MFU_LOG_ERR, "DAOS object open returned with errors: " MFU_ERRF, MFU_ERRP(-MFU_ERR_DAOS)); @@ -4193,7 +4193,7 @@ int daos_cont_serialize_hdlr(int rank, struct hdf5_args *hdf5, char *output_dir, goto out; } } else { - rc = daos_obj_open(da->src_coh, oid, 0, &oh, NULL); + rc = daos_obj_open(da->src_coh, oid, DAOS_OO_RO, &oh, NULL); if (rc != 0) { MFU_LOG(MFU_LOG_ERR, "failed to open object: "DF_RC, DP_RC(rc)); goto out; @@ -5607,7 +5607,7 @@ int daos_cont_deserialize_hdlr(int rank, daos_args_t *da, const char *h5filename goto out; } } else { - rc = daos_obj_open(da->src_coh, oid, 0, &oh, NULL); + rc = daos_obj_open(da->src_coh, oid, DAOS_OO_RW, &oh, NULL); if (rc != 0) { MFU_LOG(MFU_LOG_ERR, "failed to open object: "DF_RC, DP_RC(rc)); goto out;
Fix link to tabix Thanks for the fix!
@@ -57,7 +57,7 @@ rst_epilog = ''' .. _samtools: http://samtools.sourceforge.net/ .. _bcftools: https://samtools.github.io/bcftools/bcftools.html .. _htslib: http://www.htslib.org/ -.. _tabix: http://samtools.sourceforge.net/tabix.shtml/ +.. _tabix: http://samtools.sourceforge.net/tabix.shtml .. _Galaxy: https://main.g2.bx.psu.edu/ .. _cython: http://cython.org/ .. _python: http://python.org/
[core] fix crash printing trace if backend is down
@@ -315,7 +315,7 @@ static void gw_proc_check_enable(gw_host * const host, gw_proc * const proc, log log_error(errh, __FILE__, __LINE__, "gw-server re-enabled: %s %s %hu %s", proc->connection_name->ptr, host->host->ptr, host->port, - host->unixsocket->ptr ? host->unixsocket->ptr : ""); + host->unixsocket && host->unixsocket->ptr ? host->unixsocket->ptr : ""); } static void gw_proc_waitpid_log(const gw_host * const host, const gw_proc * const proc, log_error_st * const errh, const int status) {
Moved NID from wrong library
@@ -2073,6 +2073,7 @@ modules: ksceKernelGetModuleInternal: 0xFE303863 ksceKernelGetModuleInfo: 0xD269F915 ksceKernelLoadModuleForPid: 0xFA21D8CB + ksceKernelStartModuleForPid: 0x6DF745D5 ksceKernelStopModuleForPid: 0x7BB4CE54 ksceKernelUnloadModuleForPid: 0x5972E2CC SceModulemgrForDriver: @@ -2090,7 +2091,6 @@ modules: ksceKernelLoadStartModuleForPid: 0x9D953C22 ksceKernelStopUnloadModuleForPid: 0x49A3EDC7 ksceKernelSearchModuleByName: 0xBBE1771C - ksceKernelStartModuleForPid: 0x6DF745D5 SceModulemgr: functions: sceKernelGetAllowedSdkVersionOnSystem: 0x4397FC4E
scripts: fix author format in update-rpm-changelog
@@ -7,7 +7,7 @@ USAGE=$( Usage: [-h] [-a AUTHOR] [-f FILE] [-m MESSAGE] [-v VERSION] [-l VERSION_SUFFIX] Adds a new entry to the rpm changelog. -a=AUTHOR set the author of the changelog. - Defaults to git config user.email + Defaults to git config user.name and user.email -f=FILE path to the changelog. Defaults to ./changelog. -m=MESSAGE add a custom changelog message. @@ -67,7 +67,7 @@ if [ -n "${PRINT_VERSION_FLAG}" ]; then fi if [ -z ${AUTHOR+x} ]; then - AUTHOR="$(git config user.email)" + AUTHOR="$(git config user.name) <$(git config user.email)>" fi DATE=$(date "+%a %b %d %Y")
Change readme.md Note: mandatory check (NEED_CHECK) was skipped
@@ -1737,7 +1737,7 @@ Appends appendvalue to varname's value using space as a separator. New value is propagated to dependants ###### Macro [SIZE][](SMALL/MEDIUM/LARGE) <a name="macro_SIZE"></a> -Set the 'size' for the test. Each 'size' has own set of resrtictions, SMALL bein the most restricted and LARGE being the list. +Set the 'size' for the test. Each 'size' has own set of restrictions, SMALL being the most restricted and LARGE being the least. See documentation on test system for more details. Documentation about the system test: https://wiki.yandex-team.ru/yatool/test/
tools: add usages on download.sh help shows how to use this command.
TOOLPATH=`test -d ${0%/*} && cd ${0%/*}; pwd` OSPATH="${TOOLPATH}/.." +usages() { + cat <<EOF +USAGE: `basename $0` [OPTIONS] +Program binaries into flash + +OPTIONS: + ALL write all of binaries, os, bootloader, romfs and etc into flash + OS write os binary into flash + ROMFS write romfs image into flash + +Each board has additional options. +For example, ARTIK05X has BL1, BL2, SSSFW, WLANFW, so on. + +EOF +} + +if [ $1 == "--help" ]; then + usages 1>&2 + exit 0 +fi + cd ${OSPATH} if test $# -eq 0; then
util/cros_ec_dev.h: Format with clang-format BRANCH=none TEST=none
@@ -85,10 +85,10 @@ struct cros_ec_readmem_v2 { }; #define CROS_EC_DEV_IOC_V2 0xEC -#define CROS_EC_DEV_IOCXCMD_V2 _IOWR(CROS_EC_DEV_IOC_V2, 0, \ - struct cros_ec_command_v2) -#define CROS_EC_DEV_IOCRDMEM_V2 _IOWR(CROS_EC_DEV_IOC_V2, 1, \ - struct cros_ec_readmem_v2) +#define CROS_EC_DEV_IOCXCMD_V2 \ + _IOWR(CROS_EC_DEV_IOC_V2, 0, struct cros_ec_command_v2) +#define CROS_EC_DEV_IOCRDMEM_V2 \ + _IOWR(CROS_EC_DEV_IOC_V2, 1, struct cros_ec_readmem_v2) #define CROS_EC_DEV_IOCEVENTMASK_V2 _IO(CROS_EC_DEV_IOC_V2, 2) #ifdef __cplusplus
publish: fix bug in comment mark
== ++ both-parser ;~ pose + %+ cook + |= [author=@ date-created=@da content=@t] + ^- comment + [author date-created content %.n] new-parser %+ cook |= [author=@ @ @ date-created=@da @ content=@t]
openssl/rand.h: fix formatting.
@@ -48,7 +48,6 @@ void RAND_seed(const void *buf, int num); # if defined(__ANDROID__) && defined(__NDK_FPABI__) __NDK_FPABI__ /* __attribute__((pcs("aapcs"))) on ARM */ # endif - void RAND_add(const void *buf, int num, double randomness); int RAND_load_file(const char *file, long max_bytes); int RAND_write_file(const char *file);
Refactor s2n_config.h to be under max line length
@@ -60,5 +60,16 @@ extern struct s2n_config s2n_default_config; extern struct s2n_config s2n_default_fips_config; extern struct s2n_config s2n_unsafe_client_testing_config; -int accept_all_rsa_certs(struct s2n_connection *conn, uint8_t *cert_chain_in, uint32_t cert_chain_len, s2n_cert_type *cert_type, s2n_cert_public_key *public_key_out, void *context); -int deny_all_certs(struct s2n_connection *conn, uint8_t *cert_chain_in, uint32_t cert_chain_len, s2n_cert_type *cert_type, s2n_cert_public_key *public_key, void *context); +int accept_all_rsa_certs(struct s2n_connection *conn, + uint8_t *cert_chain_in, + uint32_t cert_chain_len, + s2n_cert_type *cert_type, + s2n_cert_public_key *public_key_out, + void *context); + +int deny_all_certs(struct s2n_connection *conn, + uint8_t *cert_chain_in, + uint32_t cert_chain_len, + s2n_cert_type *cert_type, + s2n_cert_public_key *public_key, + void *context);
pkeyutl: Fix regression with -kdflen option
@@ -463,17 +463,18 @@ int pkeyutl_main(int argc, char **argv) } goto end; } - if (kdflen != 0) { - buf_outlen = kdflen; - rv = 1; - } else { if (rawin) { /* rawin allocates the buffer in do_raw_keyop() */ rv = do_raw_keyop(pkey_op, mctx, pkey, in, filesize, NULL, 0, &buf_out, (size_t *)&buf_outlen); + } else { + if (kdflen != 0) { + buf_outlen = kdflen; + rv = 1; } else { rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen, buf_in, (size_t)buf_inlen); + } if (rv > 0 && buf_outlen != 0) { buf_out = app_malloc(buf_outlen, "buffer output"); rv = do_keyop(ctx, pkey_op, @@ -481,7 +482,6 @@ int pkeyutl_main(int argc, char **argv) buf_in, (size_t)buf_inlen); } } - } if (rv <= 0) { if (pkey_op != EVP_PKEY_OP_DERIVE) { BIO_puts(bio_err, "Public Key operation error\n");
sidk_s5jt200: fix compilation error s5jt200_tash.c This patch fixes a compilation error caused when CONFIG_S5J_SFLASH=n.
@@ -127,8 +127,10 @@ int board_app_initialize(void) adcdrv_register(); #endif +#ifdef CONFIG_S5J_SFLASH qspi_get_base(); qspi_register(); +#endif #ifdef CONFIG_S5J_EFUSE efusedrv_register(); @@ -189,7 +191,9 @@ int board_app_initialize(void) pdma_init(); #endif +#ifdef CONFIG_S5J_SFLASH QSPI_print_mode(); +#endif lldbg("SIDK S5JT200 boot from 0x%x\n", &_vector_start); return OK;
groups: make action buttons transparent bg
@@ -319,7 +319,7 @@ function Participant(props: { gapY={2} p={2} > - <Action> + <Action bg="transparent"> <Link to={`/~chat/new/dm/${contact.patp}`}> <Text color="green">Send Message</Text> </Link> @@ -327,16 +327,16 @@ function Participant(props: { {props.role === "admin" && ( <> {!isInvite && ( - <StatelessAsyncAction onClick={onBan}> + <StatelessAsyncAction onClick={onBan} bg="transparent"> <Text color="red">Ban from {title}</Text> </StatelessAsyncAction> )} {role === "admin" ? ( - <StatelessAsyncAction onClick={onDemote}> + <StatelessAsyncAction onClick={onDemote} bg="transparent"> Demote from Admin </StatelessAsyncAction> ) : ( - <StatelessAsyncAction onClick={onPromote}> + <StatelessAsyncAction onClick={onPromote} bg="transparent"> Promote to Admin </StatelessAsyncAction> )}
heap: support aligned_alloc for retention memory on ESP32-C3
@@ -561,16 +561,6 @@ IRAM_ATTR void *heap_caps_aligned_alloc(size_t alignment, size_t size, uint32_t return NULL; } - //aligned alloc for now only supports default allocator or external - //allocator. - if((caps & (MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM)) == 0) { - heap_caps_alloc_failed(size, caps, __func__); - return NULL; - } - - //if caps requested are supported, clear undesired others: - caps &= (MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM); - for (int prio = 0; prio < SOC_MEMORY_TYPE_NO_PRIOS; prio++) { //Iterate over heaps and check capabilities at this priority heap_t *heap;
build: expose LuaJIT library
@@ -47,6 +47,7 @@ option(FLB_WITHOUT_INOTIFY "Disable inotify support" No) option(FLB_SQLDB "Enable SQL embedded DB" No) option(FLB_HTTP_SERVER "Enable HTTP Server" No) option(FLB_BACKTRACE "Enable stacktrace support" Yes) +option(FLB_LUAJIT "Enable Lua Scripting support" Yes) # Metrics: Experimental Feature, disabled by default on 0.12 series # but enabled in the upcoming 0.13 release. Note that development @@ -117,6 +118,7 @@ option(FLB_FILTER_PARSER "Enable parser filter" Yes) option(FLB_FILTER_KUBERNETES "Enable kubernetes filter" Yes) option(FLB_FILTER_THROTTLE "Enable throttle filter" Yes) option(FLB_FILTER_RECORD_MODIFIER "Enable record_modifier filter" Yes) +option(FLB_FILTER_LUA "Enable Lua scripting filter" Yes) # Enable all features if(FLB_ALL) @@ -185,6 +187,7 @@ include_directories( lib/flb_libco lib/sha1 lib/msgpack-2.1.3/include + lib/luajit-2.0.5/src/ ${MONKEY_INCLUDE_DIR} ) @@ -420,6 +423,22 @@ if(FLB_REGEX) FLB_DEFINITION(FLB_HAVE_REGEX) endif() +# LuaJIT (Scripting Support) +# ========================== +if(FLB_LUAJIT) + set(LUA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib/luajit-2.0.5) + ExternalProject_Add(luajit + SOURCE_DIR ${LUA_PATH} + CONFIGURE_COMMAND export "CFLAGS=-g -fPIC" #${LUA_PATH}/configure + BUILD_COMMAND make -C ${LUA_PATH} + INSTALL_COMMAND cp ${LUA_PATH}/src/libluajit.a "${CMAKE_CURRENT_BINARY_DIR}/lib/libluajit.a") + add_library(libluajit STATIC IMPORTED GLOBAL) + set_target_properties(libluajit PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/lib/libluajit.a") + add_dependencies(libluajit luajit) + include_directories("${CMAKE_CURRENT_BINARY_DIR}/include/") + FLB_DEFINITION(FLB_HAVE_LUAJIT) +endif() + # Pthread Local Storage # ===================== # By default we expect the compiler already support thread local storage
Dockerfile: Add pip modules for Markdown documentation
@@ -105,8 +105,10 @@ RUN wget -nv https://www.nordicsemi.com/-/media/Software-and-other-downloads/Des RUN python3 -m pip -q install --upgrade pip && \ python3 -m pip -q install \ setuptools \ - sphinx_rtd_theme \ - sphinx \ + 'sphinx_rtd_theme==1.0.0' \ + 'myst-parser==0.18.0' \ + 'linkify-it-py==2.0.0' \ + 'sphinx==5.0.2' \ matplotlib \ 'protobuf<=4' && \ python3 -m pip -q install \
Moving code to individual subroutines Moving the existing code to within individual subroutines. No change in functionality (just moving code around).
#!/usr/bin/perl use strict; -my $rundir = shift; - +# Remove duplicate decomposition files in "dirname" +sub rem_dup_decomp_files +{ + my($dirname) = @_; # Find files in current directory that are # named *piodecomp* - these are the pio # decomposition files -opendir(F,$rundir); + opendir(F,$dirname); my @decompfiles = grep(/^piodecomp/,readdir(F)); closedir(F); my $rmfile=0; @@ -43,9 +45,14 @@ for(my $i=0; $i< $#decompfiles; $i++){ } } } +} +# Decode the stack traces in the pio decomposition files +sub decode_stack_traces +{ + my($dirname) = @_; # Decode/Translate the stack trace for CESM runs -opendir(F,$rundir); + opendir(F,$dirname); my @decompfiles = grep(/^piodecomp/,readdir(F)); closedir(F); for(my $i=0; $i<= $#decompfiles; $i++){ @@ -68,4 +75,11 @@ for(my $i=0; $i<= $#decompfiles; $i++){ } close(F1); } +} + +# Main program +my $rundir = shift; +&rem_dup_decomp_files($rundir); +&decode_stack_traces($rundir); +
Ignore lint warning for math/rand which is fine in tests
@@ -611,7 +611,7 @@ const ( ) func (e *e2e) getSpodMetrics() string { - r := rand.New(rand.NewSource(time.Now().UnixNano())) + r := rand.New(rand.NewSource(time.Now().UnixNano())) // #nosec letters := []rune("abcdefghijklmnopqrstuvwxyz") b := make([]rune, 10) for i := range b {
Fix description of how to report a bug in INSTALL
compiler optimization flags from the CFLAGS line in Makefile and run "make clean; make" or corresponding. - Please send bug reports to <[email protected]>. + To report a bug please open an issue on GitHub, at + https://github.com/openssl/openssl/issues. For more details on how the make variables TESTS can be used, see section TESTS in Detail below.
hv: vpci: refine comment for pci_vdev_update_vbar_base Refine why we set the base_gpa to zero for a vBAR.
@@ -137,10 +137,9 @@ static void pci_vdev_update_vbar_base(struct pci_vdev *vdev, uint32_t idx) } if ((base != 0UL) && !ept_is_mr_valid(vpci2vm(vdev->vpci), base, vdev->vbars[idx].size)) { - pr_fatal("%s, %x:%x.%x set invalid bar[%d] base: 0x%lx, size: 0x%lx\n", __func__, + pr_warn("%s, %x:%x.%x set invalid bar[%d] base: 0x%lx, size: 0x%lx\n", __func__, vdev->bdf.bits.b, vdev->bdf.bits.d, vdev->bdf.bits.f, idx, base, vdev->vbars[idx].size); - /* If guest set a invalid GPA, ignore it temporarily */ - base = 0UL; + base = 0UL; /* 0UL means invalid GPA, so that EPT won't map */ } vdev->vbars[idx].base_gpa = base;
Indent API stuff
@@ -131,9 +131,33 @@ class BaseApi(object): :rtype: bool """ + @abstractmethod + def get_comment(self, ea): + """ + Get the comment at an address + :param ea: Effective address + :type ea: int + :return: Comment + :rtype: str + """ + + @abstractmethod + def set_comment(self, ea, comment): + """ + Add a comment to an address + :param ea: Effective address + :type ea: int + :param comment: Comment + :type comment: str + :return: None + """ + api = None + # region IDA Api + +if api is None: try: import idaapi # noqa import idc # noqa @@ -192,12 +216,21 @@ try: result = idc.create_struct(ea, -1, struct_name) return bool(result) + def get_comment(self, ea): + idc.get_cmt(ea, False) + + def set_comment(self, ea, comment): + idc.set_cmt(ea, comment, False) + api = IdaApi() except ImportError: print("Warning: Unable to load IDA") + # endregion # region Ghidra Api + +if api is None: try: import ghidra @@ -233,10 +266,20 @@ try: def clear_struct(self, sid): raise NotImplementedError + def convert_to_struct(self, ea, sid): + raise NotImplementedError + + def get_comment(self, ea): + raise NotImplementedError + + def set_comment(self, ea, comment): + raise NotImplementedError + api = GhidraApi() except ImportError: print("Warning: Unable to load Ghidra") + # endregion if api is None:
Move "Device unauthorized" in FAQ Put "Device not detected" first.
@@ -23,20 +23,6 @@ On Windows, the current directory is in your `PATH`, and `adb.exe` is included in the release, so it should work out-of-the-box. -### Device unauthorized - -> ERROR: Device is unauthorized: -> ERROR: --> (usb) 0123456789abcdef unauthorized -> ERROR: A popup should open on the device to request authorization. - -When connecting, a popup should open on the device. You must authorize USB -debugging. - -If it does not open, check [stackoverflow][device-unauthorized]. - -[device-unauthorized]: https://stackoverflow.com/questions/23081263/adb-android-device-unauthorized - - ### Device not detected > ERROR: Could not find any ADB device @@ -56,6 +42,20 @@ If your device is not detected, you may need some [drivers] (on Windows). There [google-usb-driver]: https://developer.android.com/studio/run/win-usb +### Device unauthorized + +> ERROR: Device is unauthorized: +> ERROR: --> (usb) 0123456789abcdef unauthorized +> ERROR: A popup should open on the device to request authorization. + +When connecting, a popup should open on the device. You must authorize USB +debugging. + +If it does not open, check [stackoverflow][device-unauthorized]. + +[device-unauthorized]: https://stackoverflow.com/questions/23081263/adb-android-device-unauthorized + + ### Several devices connected If several devices are connected, you will encounter this error:
tutorials: java plugin
@@ -68,9 +68,10 @@ You can also mount plugins (see [open issues](https://issues.libelektra.org/3881 kdb mount -c classname=org/libelektra/plugin/PropertiesStorage,classpath=.:/usr/share/java/jna.jar:/usr/share/java/libelektra.jar,print= file.properties /jni jni classname=org/libelektra/plugin/PropertiesStorage,classpath=.:/usr/share/java/jna.jar:/usr/share/java/libelektra.jar,print= ``` -## Compiling the Plugin +## Compiling -Enable the plugin using (`ALL;-EXPERIMENTAL` is default): +If you do not want to use pre-compiled versions, you can compile the plugin yourself. +Start by enabling the plugin using (`ALL;-EXPERIMENTAL` is default): ```sh cmake -DPLUGINS="ALL;-EXPERIMENTAL;jni" /path/to/libelektra
[GB] Implement RST instruction
@@ -1713,6 +1713,15 @@ impl CpuState { InstrInfo::seq(instr_size, 3) } } + "11iii111" => { + // RST Vector + let target = (i as u16) * 8; + if debug { + println!("RST 0x{target:04x}"); + } + self.call_addr(1, target); + InstrInfo::jump(1, 4) + } "00ii1001" => { // ADD HL, Reg16 let hl = self.reg(RegisterName::HL); @@ -4083,4 +4092,41 @@ mod tests { gb.run_opcode_with_expected_attrs(&mut cpu, 0x27, 1, 1); assert_eq!(cpu.reg(RegisterName::A).read_u8(&cpu), 0x45); } + + /* RST Vector */ + + #[test] + fn test_rst() { + let gb = get_system(); + let mut cpu = gb.cpu.borrow_mut(); + + cpu.reg(RegisterName::A).write_u8(&cpu, 0x45); + cpu.reg(RegisterName::B).write_u8(&cpu, 0x38); + + for reset_vector in 0..8 { + let reset_vector_address = reset_vector * 8; + + // Set up a stack pointer + cpu.reg(RegisterName::SP).write_u16(&cpu, 0xfffc); + // Set up a current PC + cpu.reg(RegisterName::PC).write_u16(&cpu, 0x1234); + + let opcode = 0b11000111 | ((reset_vector as u8) << 3); + gb.get_mmu().write(0x1234, opcode); + // When the CPU runs a RST instruction + let instr_info = cpu.step(&gb); + assert_eq!(instr_info.instruction_size, 1); + assert_eq!(instr_info.cycle_count, 4); + + // Then the address of the next instruction after the RST + // has been pushed to the stack + assert_eq!(cpu.reg(RegisterName::SP).read_u16(&cpu), 0xfffa); + assert_eq!(gb.get_mmu().read_u16(0xfffa), 0x1235); + // And the PC has been redirected to the reset vector + assert_eq!( + cpu.reg(RegisterName::PC).read_u16(&cpu), + reset_vector_address + ); + } + } }
Improve `read_frame` and `pending_packet` consistency in the cc13x0 prop mode driver Fixes
@@ -835,10 +835,28 @@ static int read_frame(void *buf, unsigned short buf_len) { rfc_dataEntryGeneral_t *entry = (rfc_dataEntryGeneral_t *)rx_read_entry; - uint8_t *data_ptr = &entry->data; int len = 0; uint32_t rat_timestamp; + int is_found = 0; + /* Go through all RX buffers and check their status */ + do { + if(entry->status == DATA_ENTRY_STATUS_FINISHED + || entry->status == DATA_ENTRY_STATUS_BUSY) { + is_found = 1; + break; + } + + entry = (rfc_dataEntryGeneral_t *)entry->pNextEntry; + } while(entry != (rfc_dataEntryGeneral_t *)rx_read_entry); + + if(is_found == 0) { + /* No available data */ + return 0; + } + + rx_read_entry = (volatile uint8_t *)entry; + /* wait for entry to become finished */ rtimer_clock_t t0 = RTIMER_NOW(); while(entry->status == DATA_ENTRY_STATUS_BUSY @@ -860,6 +878,7 @@ read_frame(void *buf, unsigned short buf_len) * Payload + RSSI (1 byte) + Timestamp (4 bytes) + Status (1 byte) * This length includes all of those. */ + uint8_t *data_ptr = &entry->data; len = (*(uint16_t *)data_ptr); if(len <= RX_BUF_METADATA_SIZE) {
readme DOC mention python bindings
@@ -198,6 +198,13 @@ everal *sysrepo* instances can effectively be run simultanously on one machine. See [examples](examples) directory, which contains an example for basic API functions. +## Bindings + +There are no bindings for other languages directly in this project but they are +available separately. + +* [Python](https://github.com/sysrepo/sysrepo-python/) + ## Tests libyang includes several tests built with [cmocka](https://cmocka.org/). The tests
vm: Key error should flush the msgbuf first.
@@ -980,7 +980,7 @@ LILY_ERROR(Value, LILY_VALUEERROR_ID) /* Raise KeyError with 'key' as the value of the message. */ static void key_error(lily_vm_state *vm, lily_value *key, uint16_t line_num) { - lily_msgbuf *msgbuf = vm->raiser->aux_msgbuf; + lily_msgbuf *msgbuf = lily_mb_flush(vm->raiser->aux_msgbuf); if (key->class_id == LILY_STRING_ID) lily_mb_escape_add_str(msgbuf, key->value.string->string);
Switched to writeFileSync when saving project to remove edge case where file might write multiple times
@@ -2,9 +2,7 @@ import fs from "fs-extra"; import path from "path"; const saveProjectData = async (projectPath, project) => { - console.log("SAVING PROJECT TO ", projectPath); - await fs.writeFile(projectPath, JSON.stringify(project, null, 4)); - console.log("WROTE TO ", projectPath); + fs.writeFileSync(projectPath, JSON.stringify(project, null, 4)); }; export default saveProjectData;
Added PR and to 2.5.0 release notes.
# OpenEXR Release Notes -* [Version 2.5.0](#version-250-may-4-2020) +* [Version 2.5.0](#version-250-may-6-2020) * [Version 2.4.1](#version-241-february-11-2020) * [Version 2.4.0](#version-240-september-19-2019) * [Version 2.3.0](#version-230-august-13-2018) * [Version 1.0.1](#version-101) * [Version 1.0](#version-10) -## Version 2.5.0 (May 4, 2020) +## Version 2.5.0 (May 6, 2020) Minor release with miscellaneous bug fixes and small features @@ -54,6 +54,8 @@ Minor release with miscellaneous bug fixes and small features ### Merged Pull Requests +* [712](https://github.com/AcademySoftwareFoundation/openexr/pull/712) Removed #include PyIlmBaseConfigInternal.h from all public .h files. +* [711](https://github.com/AcademySoftwareFoundation/openexr/pull/711) Rewrote testToFloat(). * [709](https://github.com/AcademySoftwareFoundation/openexr/pull/709) Fix clean pthreads strikes back * [708](https://github.com/AcademySoftwareFoundation/openexr/pull/708) Fix clean pthreads * [707](https://github.com/AcademySoftwareFoundation/openexr/pull/707) A clean version of #673: Allow the use of Pthreads with WIN32/64
VERSION bump to version 2.2.13
@@ -65,7 +65,7 @@ endif() # micro version is changed with a set of small changes or bugfixes anywhere in the project. set(SYSREPO_MAJOR_VERSION 2) set(SYSREPO_MINOR_VERSION 2) -set(SYSREPO_MICRO_VERSION 12) +set(SYSREPO_MICRO_VERSION 13) set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_MICRO_VERSION}) # Version of the library
remove go static build;it takes longer and we don't need it anyways since dynamic loading works
@@ -34,7 +34,7 @@ CONTGEN = $(ROOT)/output/contgen/bin/contgen # Examples -TARGET ?= webgs +TARGET ?= webg FST = $(ROOT)/output/examples/fst HWG = $(ROOT)/output/examples/hwg @@ -43,7 +43,7 @@ HWS = $(ROOT)/output/examples/hws WEB = $(ROOT)/output/examples/web WEBS = $(ROOT)/output/examples/webs WEBG = $(ROOT)/output/examples/webg -WEBGS = $(ROOT)/output/examples/webgs +# WEBGS = $(ROOT)/output/examples/webgs GETDENTS = $(ROOT)/output/examples/getdents # Tests
Added Develco specific attr to basic cluster
<description>As printed on the product.</description> </attribute> <attribute id="0x4000" name="SW Build ID" type="cstring" access="r" required="o" range="0,16"></attribute> + <attribute id="0x8000" name="Primary SW Version" type="ostring" access="r" required="m" mfcode="0x1015"></attribute> <attribute id="0xff0d" name="Xiaomi Sensitivity" type="u8" access="rw" required="o" mfcode="0x115f"></attribute> <attribute id="0xff22" name="Xiaomi Disconnect 1" type="u8" showas="hex" access="rw" required="o" mfcode="0x115f"> <description>Set to 0x12 (0xFE) to connect (disconnect) the left button to (from) the relay.</description>
Make a constructor;
#include "math/transform.h" static int l_lovrMathNewCurve(lua_State* L) { - Curve* curve = lovrCurveCreate(0); + int top = lua_gettop(L); + bool table = lua_type(L, 1) == LUA_TTABLE; + + if (top == 1 && !table) { + Curve* curve = lovrCurveCreate(luaL_checkinteger(L, 1)); + luax_pushobject(L, curve); + return 1; + } + + int size = ((table ? lua_objlen(L, 1) : top) + 2) / 3; + Curve* curve = lovrCurveCreate(size); + for (int i = 0; i < size; i++) { + float point[3]; + + if (table) { + lua_rawgeti(L, 1, 3 * i + 1); + lua_rawgeti(L, 1, 3 * i + 2); + lua_rawgeti(L, 1, 3 * i + 3); + + point[0] = lua_tonumber(L, -3); + point[1] = lua_tonumber(L, -2); + point[2] = lua_tonumber(L, -1); + + lovrCurveAddPoint(curve, point, i); + lua_pop(L, 3); + } else { + point[0] = lua_tonumber(L, 3 * i + 1); + point[1] = lua_tonumber(L, 3 * i + 2); + point[2] = lua_tonumber(L, 3 * i + 3); + lovrCurveAddPoint(curve, point, i); + } + } + luax_pushobject(L, curve); return 1; }
Fix Arty documentation link
@@ -38,4 +38,4 @@ class WithArtyTweaks extends Config( class TinyRocketArtyConfig extends Config( new WithArtyTweaks ++ new chipyard.TinyRocketConfig) -// DOC include start: AbstractArty and Rocket +// DOC include end: AbstractArty and Rocket
apps/bttester: Use ID addr in connected event
@@ -609,7 +609,7 @@ static void le_connected(u16_t conn_handle, int status) peer_id_addr = desc.peer_id_addr; peer_ota_addr = desc.peer_ota_addr; - addr = &desc.peer_ota_addr; + addr = &desc.peer_id_addr; memcpy(ev.address, addr->val, sizeof(ev.address)); ev.address_type = addr->type;
FEATURE: changed exptime notation in dump key result.
@@ -8387,7 +8387,6 @@ static void *item_dumper_main(void *arg) int max_buflen = DUMP_BUFFER_SIZE; static char dump_buffer[DUMP_BUFFER_SIZE]; char *cur_bufptr = dump_buffer; - time_t real_nowtime; /* real now time */ rel_time_t memc_curtime; /* current time of cache server */ int str_length; @@ -8427,7 +8426,6 @@ static void *item_dumper_main(void *arg) pthread_mutex_unlock(&engine->cache_lock); /* write key string to buffer */ - real_nowtime = time(NULL); memc_curtime = svcore->get_current_time(); for (i = 0; i < item_count; i++) { if ((it = item_array[i]) == NULL) continue; @@ -8473,10 +8471,9 @@ static void *item_dumper_main(void *arg) #endif } else { if (it->exptime > memc_curtime) { - snprintf(cur_bufptr, 22, " %"PRIu64"\n", - (uint64_t)(real_nowtime + (it->exptime - memc_curtime))); + snprintf(cur_bufptr, 13, " %u\n", it->exptime - memc_curtime); } else { - snprintf(cur_bufptr, 22, " %"PRIu64"\n", (uint64_t)real_nowtime); + snprintf(cur_bufptr, 13, " -2\n"); /* this case may not occur */ } str_length = strlen(cur_bufptr); cur_bufptr += str_length;
Removed needless goto
@@ -3432,7 +3432,7 @@ ACVP_RESULT acvp_app_run_vector_test_file(const char *path, const char *output, #endif rv = acvp_run_vectors_from_file(ctx, path, output); - goto end; + end: /* * Free all memory associated with
oc_pstat:free all asserted roles on server RESET
#include "oc_core_res.h" #include "oc_cred.h" #include "oc_doxm.h" +#include "oc_roles.h" #include "oc_sp.h" #include "oc_store.h" #include "oc_tls.h" @@ -141,6 +142,7 @@ oc_pstat_handle_state(oc_sec_pstat_t *ps, size_t device) oc_sec_cred_default(device); oc_sec_acl_default(device); #ifdef OC_PKI + oc_sec_free_roles_for_device(device); oc_sec_sp_default(device); #endif /* OC_PKI */ set_post_otm_acl = true; @@ -435,12 +437,12 @@ oc_sec_decode_pstat(oc_rep_t *rep, bool from_storage, size_t device) } } break; case OC_REP_BOOL: - if (/*from_storage && */ oc_string_len(rep->name) == 4 && + if (from_storage && oc_string_len(rep->name) == 4 && memcmp(oc_string(rep->name), "isop", 4) == 0) { ps.isop = rep->value.boolean; - } /* else { + } else { return false; - }*/ + } break; case OC_REP_INT: if (from_storage && memcmp(oc_string(rep->name), "cm", 2) == 0) {
Disable Linux option for qword
@@ -76,6 +76,7 @@ elif host_machine.system() == 'managarm' internal_conf.set('MLIBC_MAP_FILE_WINDOWS', true) subdir('sysdeps/managarm') elif host_machine.system() == 'qword' + disable_linux_option = true rtdl_include_dirs += include_directories('sysdeps/qword/include') libc_include_dirs += include_directories('sysdeps/qword/include') subdir('sysdeps/qword')
Fix search in new VariableSelect
@@ -28,6 +28,7 @@ import entitiesActions from "../../store/features/entities/entitiesActions"; import l10n from "../../lib/helpers/l10n"; import { Dictionary } from "@reduxjs/toolkit"; import { keyBy } from "lodash"; +import { EditorSelectionType } from "../../store/features/editor/editorState"; interface VariableSelectProps { id?: string; @@ -170,6 +171,30 @@ export const VariableToken = styled.span` color: ${(props) => props.theme.colors.token.text}; `; +const formatOptionLabel = ( + type: "8bit" | "16bit", + editorType: EditorSelectionType, + namedVariablesLookup: Dictionary<NamedVariable> +) => (option: Option) => { + let otherVariable = ""; + if (type === "16bit") { + if (editorType === "customEvent") { + otherVariable = `${option.label}+1`; + } else { + otherVariable = + namedVariablesLookup[nextVariable(option.value)]?.name || ""; + } + } + return ( + <> + {option.label} + {type === "16bit" && otherVariable && ( + <OtherVariable> & {otherVariable}</OtherVariable> + )} + </> + ); +}; + export const VariableSelect: FC<VariableSelectProps> = ({ value, type = "8bit", @@ -362,25 +387,11 @@ export const VariableSelect: FC<VariableSelectProps> = ({ onChange={(newValue: Option) => { onChange(newValue.value); }} - getOptionLabel={(option: Option, a: any, b: any) => { - let otherVariable = ""; - if (type === "16bit") { - if (editorType === "customEvent") { - otherVariable = `${option.label}+1`; - } else { - otherVariable = - namedVariablesLookup[nextVariable(option.value)]?.name || ""; - } - } - return ( - <> - {option.label} - {type === "16bit" && otherVariable && ( - <OtherVariable> & {otherVariable}</OtherVariable> + formatOptionLabel={formatOptionLabel( + type, + editorType, + namedVariablesLookup )} - </> - ); - }} /> )} <VariableSizeIndicator
mINI: Improve performance of stripping code
@@ -80,8 +80,8 @@ static inline void parseLine (char * line, size_t lineNumber, KeySet * keySet, K *equals = '\0'; - char * name = elektraStrip (pair); - char * value = elektraStrip (equals + 1); + char * name = elektraRstrip (pair, NULL); + char * value = elektraLskip (equals + 1); Key * key = keyNew (keyName (parentKey), KEY_END); keyAddName (key, name);
bumping up counter threshold slightly - seeing CI results falling outside 20% threshold every once in a while.
@@ -154,8 +154,8 @@ main( int argc, char **argv ) /* Check cycles constraints */ - min = ( long long ) ( ( double ) values[1][0] * .8 ); - max = ( long long ) ( ( double ) values[1][0] * 1.2 ); + min = ( long long ) ( ( double ) values[1][0] * .7 ); + max = ( long long ) ( ( double ) values[1][0] * 1.3 ); /* Check constraint Col1=Col2 */ if ( values[0][0] > max || values[0][0] < min ) {
Tweak: cppguidelines
@@ -376,7 +376,7 @@ void CreateSingleton(RED4ext::Handle<RED4ext::IScriptable> apClassInstance) pGameSystem->OnSystemInitializeAsync(&systemInitParams); } - auto* pParentType = reinterpret_cast<RED4ext::CClass*>(apClassInstance->GetType()); + auto* pParentType = apClassInstance->GetType(); pGameInstance->unk08.Insert(pParentType, apClassInstance); pGameInstance->unk38.PushBack(apClassInstance);
Fix missing cmp and wrong expected value for freq
@@ -66,6 +66,7 @@ static bool execute_test(const struct Test * test) { ret &= (opts.size == test->opts.size); ret &= (opts.reset == test->opts.reset); ret &= (opts.log_level == test->opts.log_level); + ret &= (opts.freq == test->opts.freq); ret &= (opts.format == test->opts.format); } @@ -127,7 +128,7 @@ static struct Test tests[] = { .size = 0, .reset = 1, .log_level = DEBUG_LOG_LEVEL, - .freq = 0, + .freq = 5, .format = FLASH_FORMAT_BINARY } }, { "--debug --freq=6k --reset write test.bin 0x80000000", -1,
sh2 update issue issue
@@ -363,7 +363,7 @@ DWORD WINAPI Init(LPVOID bDelay) injector::WriteMemory(pattern.count(1).get(0).get<uint32_t>(-4), &fFMVOffset1, true); //43DBC5 static float TextOffsetWS = Screen.TextOffset - (((Screen.fHeight * (640.0f / 384.0f)) - Screen.fHeight * (4.0f / 3.0f)) / 2.0f); if (bFMVWidescreenEnhancementPackCompatibility) - TextOffsetWS = Screen.TextOffset - (((Screen.fHeight * (1360.0f / 768.0f)) - Screen.fHeight * (4.0f / 3.0f)) / 2.0f); + TextOffsetWS = Screen.TextOffset - (((Screen.fHeight * (1280.0f / 720.0f)) - Screen.fHeight * (4.0f / 3.0f)) / 2.0f); injector::WriteMemory(FMVpattern1.count(1).get(0).get<uint32_t>(1), &TextOffsetWS, true); //0x0043E4D8 injector::WriteMemory(FMVpattern2.count(1).get(0).get<uint32_t>(2), &TextOffsetWS, true); //0x0043E4C5 injector::WriteMemory(FMVpattern3.count(1).get(0).get<uint32_t>(2), &TextOffsetWS, true); //0x0043E47F @@ -495,7 +495,8 @@ DWORD WINAPI Init(LPVOID bDelay) if (bReduceCutsceneFOV) { static float f1472 = 1.14702f / (1.0f / (Screen.fAspectRatio / (4.0f / 3.0f))); - pattern = hook::pattern("D8 0D ? ? ? ? D9 1D ? ? ? ? E8 ? ? ? ? 6A 00 6A 00 6A 00"); + pattern = hook::pattern("D8 0D ? ? ? ? D9 1D ? ? ? ? E8 ? ? ? ? 6A 00 6A 00 6A 00 6A 00"); + injector::WriteMemory(pattern.count(2).get(0).get<uint32_t>(2), &f1472, true); //4A0E13 injector::WriteMemory(pattern.count(2).get(1).get<uint32_t>(2), &f1472, true); //4A1A61 } @@ -650,6 +651,10 @@ DWORD WINAPI Init(LPVOID bDelay) injector::MakeInline<ImagesHook5>(pattern.get_first(0), pattern.get_first(7)); //0x49F4D8, 0x49F4D8 + 7 } + // Fixes lying figure cutscene bug; original value 00000005; issue #349 + pattern = hook::pattern("C7 05 ? ? ? ? ? ? ? ? E8 ? ? ? ? A1 ? ? ? ? 83 C4 04 83 F8 20"); + injector::WriteMemory(pattern.get_first(6), 0x0000002A, true); + return 0; }
python: fixup deploy clean-up
@@ -237,7 +237,7 @@ for py_version in py_versions(): build_wheel(conda_dir, deploy_dir, py_version) finally: os.chdir(script_dir) - if platform.system() == "Linux" and not platform.machine().startswith("arm"): + if platform.system() != "Linux" or not platform.machine().startswith("arm"): shutil.rmtree(conda_tmp_dir) else: subprocess.check_call(["rm", "-fr", conda_dir])
build: Disable lua plugin tests for clang
@@ -34,11 +34,20 @@ add_plugin (lua INSTALL_TEST_DATA) if (ADDTESTING_PHASE) - if (NOT APPLE) # TODO: ENABLE_BROKEN_TESTS + # Disable broken tests + if (APPLE) + # TODO: ENABLE_BROKEN_TESTS + message (WARNING "Disabling tests in ${CMAKE_CURRENT_LIST_DIR} due to APPLE") + return () + endif (APPLE) + if (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR + CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + message (WARNING "Disabling tests in ${CMAKE_CURRENT_LIST_DIR} due to clang") + return () + endif () check_binding_was_added ("swig_lua" BINDING_WAS_ADDED) # bindings are required for tests if (BUILD_TESTING AND BINDING_WAS_ADDED) - # test environment clears env so setting LUA_CPATH is no option # we workaround this by changing the current directory to our bindings # output directory + per default lua loads modules from current directory @@ -50,5 +59,4 @@ if (ADDTESTING_PHASE) else () message (WARNING "swig_lua bindings are required for testing, test deactivated") endif () - endif (NOT APPLE) endif ()
include/ec_ec_comm_client.h: Format with clang-format BRANCH=none TEST=none
@@ -42,8 +42,7 @@ int ec_ec_client_base_get_static_info(void); * @return EC_RES_SUCCESS on success, EC_RES_ERROR on communication error, * else forwards the error code from the server. */ -int ec_ec_client_base_charge_control(int max_current, - int otg_voltage, +int ec_ec_client_base_charge_control(int max_current, int otg_voltage, int allow_charging); /**
Debug simulator still needs all vsrcs
@@ -59,7 +59,7 @@ $(sim): $(model_mk) $(sim_csrcs) $(model_mk_debug): $(sim_vsrcs) $(INSTALLED_VERILATOR) mkdir -p $(build_dir)/$(long_name).debug $(VERILATOR) $(VERILATOR_FLAGS) -Mdir $(build_dir)/$(long_name).debug --trace \ - -o $(sim_debug) $< $(sim_csrcs) -LDFLAGS "$(LDFLAGS)" \ + -o $(sim_debug) $(sim_vsrcs) $(sim_csrcs) -LDFLAGS "$(LDFLAGS)" \ -CFLAGS "-I$(build_dir) -include $(model_header_debug)" touch $@
Tweak SSL_get_session.pod wording Based on feedback received.
@@ -26,19 +26,19 @@ count of the B<SSL_SESSION> is incremented by one. =head1 NOTES The ssl session contains all information required to re-establish the -connection without a full handshake for SSL versions <= TLSv1.2. In TLSv1.3 the -same is true, but sessions are established after the main handshake has occurred. -The server will send the session information to the client at a time of its -choosing which may be some while after the initial connection is established (or -not at all). Calling these functions on the client side in TLSv1.3 before the -session has been established will still return an SSL_SESSION object but it -cannot be used for resuming the session. See L<SSL_SESSION_is_resumable(3)> for -information on how to determine whether an SSL_SESSION object can be used for -resumption or not. - -Additionally, in TLSv1.3, a server can send multiple session messages for a -single connection. In that case the above functions will only return information -on the last session that was received. +connection without a full handshake for SSL versions up to and including +TLSv1.2. In TLSv1.3 the same is true, but sessions are established after the +main handshake has occurred. The server will send the session information to the +client at a time of its choosing, which may be some while after the initial +connection is established (or never). Calling these functions on the client side +in TLSv1.3 before the session has been established will still return an +SSL_SESSION object but that object cannot be used for resuming the session. See +L<SSL_SESSION_is_resumable(3)> for information on how to determine whether an +SSL_SESSION object can be used for resumption or not. + +Additionally, in TLSv1.3, a server can send multiple messages that establish a +session for a single connection. In that case the above functions will only +return information on the last session that was received. The preferred way for applications to obtain a resumable SSL_SESSION object is to use a new session callback as described in L<SSL_CTX_sess_set_new_cb(3)>.
Testing: add test for accessor g1number_of_coded_values_sh_simple
@@ -61,6 +61,7 @@ test_packing() { # ------------ input=${data_dir}/spherical_model_level.grib2 output=`${tools_dir}/grib_set -r -s packingType=spectral_simple $input $temp 2>&1` +grib_check_key_equals $temp packingType 'spectral_simple' # Check no error was posted i.e. output string is empty [ -z "$output" ] res1=`${tools_dir}/grib_get '-F%.1f' -p avg,enorm $input` @@ -84,4 +85,13 @@ stats2=`${tools_dir}/grib_get -F%.2f -p skew,kurt $temp` test_packing $grib1 $packing1 test_packing $grib2 $packing2 + +# spectral_simple for GRIB1 +# ------------------------- +input=${data_dir}/spherical_model_level.grib1 +${tools_dir}/grib_set -r -s packingType=spectral_simple $input $temp +grib_check_key_equals $temp packingType 'spectral_simple' +${tools_dir}/grib_ls -p numberOfCodedValues $temp + + rm -f $temp
build: link to new in_systemd plugin
@@ -11,6 +11,7 @@ endif() include(GNUInstallDirs) include(ExternalProject) +include(cmake/FindJournald.cmake) # Output paths set(FLB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}") @@ -78,6 +79,7 @@ option(FLB_IN_TCP "Enable TCP input plugin" Yes) option(FLB_IN_MQTT "Enable MQTT Broker input plugin" Yes) option(FLB_IN_HEAD "Enable Head input plugin" Yes) option(FLB_IN_PROC "Enable Process input plugin" Yes) +option(FLB_IN_SYSTEMD "Enable Systemd input plugin" Yes) option(FLB_OUT_COUNTER "Enable Counter output plugin" Yes) option(FLB_OUT_ES "Enable Elasticsearch output plugin" Yes) option(FLB_OUT_EXIT "Enable Exit output plugin" Yes) @@ -234,6 +236,13 @@ endif() FLB_DEFINITION(FLB_HAVE_FLUSH_LIBCO) add_subdirectory(lib/flb_libco) +# Systemd Journald support +if(JOURNALD_FOUND) + FLB_DEFINITION(FLB_HAVE_SYSTEMD) +else() + FLB_OPTION(FLB_IN_SYSTEMD OFF) +endif() + # Valgrind support check_c_source_compiles(" #include <valgrind/valgrind.h>
fix name of CLAP_EXT_TRANSPORT_CONTROL constant
// The host has no obligation to execute those request, so the interface maybe // partially working. -static CLAP_CONSTEXPR const char CLAP_EXT_CV[] = "clap.transport-control.draft/0"; +static CLAP_CONSTEXPR const char CLAP_EXT_TRANSPORT_CONTROL[] = "clap.transport-control.draft/0"; #ifdef __cplusplus extern "C" {
No need to lookup address
@@ -68,9 +68,6 @@ coroutine void do_proxy(int s) { int cmd = socks5_proxy_recvcommand(s, &addr, -1); if(cmd != SOCKS5_CONNECT) goto in_close; - char addr_str[IPADDR_MAXSTRLEN]; - ipaddr_str(&addr, addr_str); - int s_rem = tcp_connect(&addr, -1); if(s_rem < 0) goto in_close;
publish: link preview correctly
@@ -24,7 +24,7 @@ export function NotebookPosts(props: NotebookPostsProps) { return ( <NotePreview key={noteId} - host={note?.author} + host={props.host} book={props.book} note={note} contact={props.contacts[note.author.substr(1)]}
docs/packages: Use "install_dir/" in examples.
@@ -130,12 +130,12 @@ transferring this image to a device by suitable means. Installing to a directory image involves using ``-p`` switch to `upip`:: - micropython -m upip install -p install_image micropython-pystone_lowmem + micropython -m upip install -p install_dir micropython-pystone_lowmem After this command, the package content (and contents of every depenency -packages) will be available in the ``install_image/`` subdirectory. You +packages) will be available in the ``install_dir/`` subdirectory. You would need to transfer contents of this directory (without the -``install_image/`` prefix) to the device, at the suitable location, where +``install_dir/`` prefix) to the device, at the suitable location, where it can be found by the Python ``import`` statement (see discussion of the `upip` installation path above).
Add a runtime check for label length RFC8446 says that key derivation labels must be less than 12 octets. This avoids incurring extra hash compression rounds. This change adds a runtime check to ensure that all labels used meet this requirement.
@@ -93,6 +93,11 @@ int s2n_hkdf_expand_label(struct s2n_hmac_state *hmac, s2n_hmac_algorithm alg, c struct s2n_blob hkdf_label_blob = {0}; struct s2n_stuffer hkdf_label = {{0}}; + /* RFC8446 specifies that labels must be 12 characters or less, to avoid + ** incurring two hash rounds. + */ + lte_check(label->size, 12); + GUARD(s2n_blob_init(&hkdf_label_blob, hkdf_label_buf, sizeof(hkdf_label_buf))); GUARD(s2n_stuffer_init(&hkdf_label, &hkdf_label_blob)); GUARD(s2n_stuffer_write_uint16(&hkdf_label, output->size));
Ensure that we stop the master segment after starting it when rebuilding
@@ -1110,7 +1110,11 @@ class RebuildPersistentTables(Operation): cmd = GpStart('Start the greenplum databse') cmd.run(validateAfter=True) if admin_mode: - cmd = GpStop('Stop the greenplum database', masterOnly=True) + # NOTE: There might be a case where gpstart has a lingering idle + # connection that's not fully closed before gpstop happens. + # We already guaranteed that we did a fresh start, therefore, we + # will stop can immediately. + cmd = GpStop('Stop the greenplum database', masterOnly=True, force=True) cmd.run(validateAfter=True) cmd = GpStart('Start the greenplum master in admin mode', masterOnly=True) cmd.run(validateAfter=True)
Add H7 DCMI cache maintenance.
@@ -376,6 +376,10 @@ HAL_StatusTypeDef HAL_DCMI_Start_DMA(DCMI_HandleTypeDef* hdcmi, uint32_t DCMI_Mo return HAL_OK; } +#define MP_HAL_CLEANINVALIDATE_DCACHE(addr, size) \ + (SCB_CleanInvalidateDCache_by_Addr((uint32_t*)((uint32_t)addr & ~0x1f), \ + ((uint32_t)((uint8_t*)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f))) + HAL_StatusTypeDef HAL_DCMI_Start_DMA_MB(DCMI_HandleTypeDef* hdcmi, uint32_t DCMI_Mode, uint32_t pData, uint32_t Length, uint32_t Count) { /* Initialise the second memory address */ @@ -418,6 +422,8 @@ HAL_StatusTypeDef HAL_DCMI_Start_DMA_MB(DCMI_HandleTypeDef* hdcmi, uint32_t DCMI /* Update second memory address */ SecondMemAddress = (uint32_t)(pData + (4*hdcmi->XferSize)); + MP_HAL_CLEANINVALIDATE_DCACHE(SecondMemAddress, (hdcmi->XferSize*4)); + /* Start DMA multi buffer transfer */ HAL_DMAEx_MultiBufferStart_IT(hdcmi->DMA_Handle, (uint32_t)&hdcmi->Instance->DR, (uint32_t)pData, SecondMemAddress, hdcmi->XferSize); @@ -883,9 +889,11 @@ static void DCMI_DMAXferCplt(DMA_HandleTypeDef *hdma) if ((stream->CR & DMA_SxCR_CT) == 0) { // Current traget is M0 call user callback with M1 + MP_HAL_CLEANINVALIDATE_DCACHE(stream->M0AR, (hdcmi->XferSize*4)); DCMI_DMAConvCpltUser(stream->M1AR); } else { // Current traget is M1 call user callback with M0 + MP_HAL_CLEANINVALIDATE_DCACHE(stream->M1AR, (hdcmi->XferSize*4)); DCMI_DMAConvCpltUser(stream->M0AR); }
Fix mispelling in chat-cli help message
^- (quip card _state) :_ state =- (turn - print:sh-out) - :~ ";view ~host/chat to print messages for a chat you've already jonied." + :~ ";view ~host/chat to print messages for a chat you've already joined." ";flee ~host/chat to stop printing messages for a chat." "For more details:" "https://urbit.org/using/operations/using-your-ship/#messaging"
CI: Fix ImageMagick version in macOS
@@ -77,7 +77,9 @@ jobs: strategy: matrix: ruby-version: [2.6, 2.7] - imagemagick-version: [6.9.10-90, 7.0.9-20] + imagemagick-version: + - { full: 6.9.10-90, major-minor: '6.9' } + - { full: 7.0.9-20, major-minor: '7.0' } name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }} steps: @@ -86,16 +88,16 @@ jobs: uses: actions/cache@v1 with: path: ./build-ImageMagick - key: v1-macos-imagemagick-${{ matrix.imagemagick-version }} + key: v1-macos-imagemagick-${{ matrix.imagemagick-version.full }} restore-keys: | - v1-macos-imagemagick-${{ matrix.imagemagick-version }} + v1-macos-imagemagick-${{ matrix.imagemagick-version.full }} - name: Set up Ruby ${{ matrix.ruby-version }} uses: eregon/use-ruby-action@master with: ruby-version: ${{ matrix.ruby-version }} - name: Update/Install packages run: | - IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version }} ./before_install_osx.sh + IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }} ./before_install_osx.sh - name: Build and test with Rake run: | gem install bundler
Try checkout v3 for CI tests
@@ -16,7 +16,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head.
make html: Exclude mkapiref.py from source list
@@ -42,7 +42,7 @@ apiref: mkapiref.py \ $(top_srcdir)/lib/includes/ngtcp2/ngtcp2.h $(top_srcdir)/doc/mkapiref.py \ source/apiref.rst source/macros.rst source/enums.rst source/types.rst \ - source $^ + source $(wordlist 2, $(words $^), $^) html-local: apiref @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
removed illegal resetValue tag from example
@@ -1668,7 +1668,6 @@ Grouping element to define bit-field properties of a register. <bitOffset>1</bitOffset> <bitWidth>3</bitWidth> <access>read-write</access> - <resetValue>0x0</resetValue> <modifiedWriteValues>oneToSet</modifiedWriteValues> <writeConstraint> <range>
[numerics] fix bug in NM_copy
@@ -1925,7 +1925,7 @@ void NM_copy(const NumericsMatrix* const A, NumericsMatrix* B) } NM_copy_sparse(A_, B_); - + if (numericsSparseMatrix(B)->linearSolverParams) numericsSparseMatrix(B)->linearSolverParams = NSM_linearSolverParams_free(numericsSparseMatrix(B)->linearSolverParams); /* invalidations */
hoon: add jet hint for +redo
== :: :: ++ redo :: refurbish faces + ~/ %redo |= $: :: ref: raw payload :: ref=type
Whops. A tad to eager
@@ -48,12 +48,13 @@ main (int argc, char *argv[]) } client = mongoc_client_new (host_and_port); - bson_free (host_and_port); if (!client) { fprintf (stderr, "Invalid hostname or port: %s\n", host_and_port); + bson_free (host_and_port); return 2; } + bson_free (host_and_port); mongoc_client_set_error_api (client, 2);
rmt test: add case test test the bug of re-install problem add pending bug case:rmt_tx_stop function cause the re-install fail when rmt_config_t.tx_config.loop_en==true
@@ -710,4 +710,61 @@ TEST_CASE("RMT TX stop test", "[rmt][test_env=UT_T1_RMT]") TEST_ESP_OK(rmt_driver_uninstall(RMT_RX_CHANNEL)); } +TEST_CASE("RMT loop_en test", "[rmt][test_env=UT_T1_RMT][ignore]") +{ + rmt_tx_config_t tx_cfg = { + .loop_en = true, // set it as true + .carrier_duty_percent = 50, + .carrier_freq_hz = 38000, + .carrier_level = 1, + .carrier_en = RMT_TX_CARRIER_EN, + .idle_level = 0, + .idle_output_en = true, + }; + rmt_config_t rmt_tx = { + .channel = RMT_TX_CHANNEL, + .gpio_num = RMT_TX_GPIO_NUM, + .mem_block_num = 1, + .clk_div = RMT_CLK_DIV, + .tx_config = tx_cfg, + .rmt_mode = 0, + }; + rmt_config(&rmt_tx); + rmt_driver_install(rmt_tx.channel, 0, 0); + TEST_ESP_OK(rmt_driver_uninstall(RMT_TX_CHANNEL)); + + int rx_channel = RMT_RX_CHANNEL; + rx_init(); + RingbufHandle_t rb = NULL; + rmt_get_ringbuf_handle(rx_channel, &rb); + rmt_rx_start(rx_channel, 1); + vTaskDelay(10); + tx_init(); + int tx_channel = RMT_TX_CHANNEL; + int tx_num = RMT_TX_DATA_NUM; + + ESP_LOGI(TAG, "RMT TX DATA"); + size_t size = (sizeof(rmt_item32_t) * DATA_ITEM_NUM * tx_num); + rmt_item32_t* item = (rmt_item32_t*) malloc(size); + int item_num = DATA_ITEM_NUM * tx_num; + memset((void*) item, 0, size); + int offset = 0; + uint16_t cmd = 0x0; + uint16_t addr = 0x11; + + // send data + set_tx_data(tx_channel, cmd, addr, item_num, item, offset); + rmt_write_items(tx_channel, item, item_num, 0); + vTaskDelay(1000 / portTICK_PERIOD_MS); + rmt_tx_stop(tx_channel); + free(item); + + // receive data + uint16_t tmp = get_rx_data(rb); + TEST_ASSERT(tmp < 100); + + TEST_ESP_OK(rmt_driver_uninstall(RMT_TX_CHANNEL)); + TEST_ESP_OK(rmt_driver_uninstall(RMT_RX_CHANNEL)); +} +
config_format: fluentbit: support windows backslash
@@ -287,7 +287,12 @@ static int local_init(struct local_ctx *ctx, char *file) #endif /* lookup path ending and truncate */ +#ifdef _MSC_VER + end = strrchr(path, '\\'); +#else end = strrchr(path, '/'); +#endif + if (end) { end++; *end = '\0';
yaviks: update batteries setting BRANCH=none TEST=verify batteries can charge/discharge, cutoff.
}; batteries { - default_battery: smp { - compatible = "smp,l20m3pg0", "battery-smart"; + default_battery: cosmx { + compatible = "cosmx,gh02047xl", "battery-smart"; + }; + dynapack_atl_gh02047xl { + compatible = "dynapack,atl_gh02047xl", "battery-smart"; + }; + dynapack_cosmx_gh02047xl { + compatible = "dynapack,cosmx_gh02047xl", "battery-smart"; + }; + smp_coslight_gh02047xl { + compatible = "smp,coslight_gh02047xl", "battery-smart"; + }; + smp_highpower_gh02047xl { + compatible = "smp,highpower_gh02047xl", "battery-smart"; }; };
Annotate potential -Wunused-function violations in err.h Fixes
@@ -214,33 +214,33 @@ struct err_state_st { # define ERR_SYSTEM_ERROR(errcode) (((errcode) & ERR_SYSTEM_FLAG) != 0) -static ossl_inline int ERR_GET_LIB(unsigned long errcode) +static ossl_unused ossl_inline int ERR_GET_LIB(unsigned long errcode) { if (ERR_SYSTEM_ERROR(errcode)) return ERR_LIB_SYS; return (errcode >> ERR_LIB_OFFSET) & ERR_LIB_MASK; } -static ossl_inline int ERR_GET_FUNC(unsigned long errcode ossl_unused) +static ossl_unused ossl_inline int ERR_GET_FUNC(unsigned long errcode ossl_unused) { return 0; } -static ossl_inline int ERR_GET_RFLAGS(unsigned long errcode) +static ossl_unused ossl_inline int ERR_GET_RFLAGS(unsigned long errcode) { if (ERR_SYSTEM_ERROR(errcode)) return 0; return errcode & (ERR_RFLAGS_MASK << ERR_RFLAGS_OFFSET); } -static ossl_inline int ERR_GET_REASON(unsigned long errcode) +static ossl_unused ossl_inline int ERR_GET_REASON(unsigned long errcode) { if (ERR_SYSTEM_ERROR(errcode)) return errcode & ERR_SYSTEM_MASK; return errcode & ERR_REASON_MASK; } -static ossl_inline int ERR_FATAL_ERROR(unsigned long errcode) +static ossl_unused ossl_inline int ERR_FATAL_ERROR(unsigned long errcode) { return (ERR_GET_RFLAGS(errcode) & ERR_RFLAG_FATAL) != 0; }
MQTT re-connect issue Fix to start sending PINGREQ after a reconnect.
@@ -337,6 +337,7 @@ READPACKET: } else { mud->connState = MQTT_DATA; NODE_DBG("MQTT: Connected\r\n"); + mud->keepalive_sent = 0; if (mud->mqtt_state.auto_reconnect == RECONNECT_POSSIBLE) { mud->mqtt_state.auto_reconnect = RECONNECT_ON; }
DOC: document in more detail what a BIO_read_ex() via BIO_f_buffer() does The BIO_f_buffer() documentation tells in enough detail how it affects BIO_gets(), but not how it affects BIO_read_ex(). This change remedies that. Fixes
@@ -49,10 +49,20 @@ is expanded. These functions, other than BIO_f_buffer(), are implemented as macros. -Buffering BIOs implement BIO_gets() by using BIO_read_ex() operations on the -next BIO in the chain. By prepending a buffering BIO to a chain it is therefore -possible to provide BIO_gets() functionality if the following BIOs do not -support it (for example SSL BIOs). +Buffering BIOs implement BIO_read_ex() and BIO_gets() by using +BIO_read_ex() operations on the next BIO in the chain and storing the +result in an internal buffer, from which bytes are given back to the +caller as appropriate for the call; a BIO_gets() is guaranteed to give +the caller a whole line, and BIO_read_ex() is guaranteed to give the +caller the number of bytes it asks for, unless there's an error or end +of communication is reached in the next BIO. By prepending a +buffering BIO to a chain it is therefore possible to provide +BIO_gets() or exact size BIO_read_ex() functionality if the following +BIOs do not support it. + +Do not add more than one BIO_f_buffer() to a BIO chain. The result of +doing so will force a full read of the size of the internal buffer of +the top BIO_f_buffer(), which is 4 KiB at a minimum. Data is only written to the next BIO in the chain when the write buffer fills or when BIO_flush() is called. It is therefore important to call BIO_flush()
Fixed misc/build_order.py KeyError This patch fixed misc/build_order.py KeyError by taking rpm python_prefix macro into consideration.
@@ -69,8 +69,8 @@ for line in open(sys.argv[1]): if ((line[2].startswith('nagios-plugins')) and (not line[2].startswith('nagios-plugins-ohpc'))): continue - # This tries to filter out versions with a "." - if "." in line[2]: + # This tries to filter out versions with a "." or _isa with a "(" + if "." in line[2] or "(" in line[2]: continue if line[0] in dependency: if line[2] not in dependency[line[0]]: @@ -83,8 +83,21 @@ additional = {} # Add entries to the dict which have no dependencies for v in dependency.values(): for value in v: + try: if spec_dict[value] not in dependency.keys(): additional[spec_dict[value]] = [] + except KeyError as err: + # Handle python_prefix rpm macro + if '-numpy-' in value: + spec_dict[value] = 'python-numpy.spec' + elif '-Cython-' in value: + spec_dict[value] = 'python-Cython.spec' + elif '-scipy-' in value: + spec_dict[value] = 'python-scipy.spec' + elif '-mpi4py-' in value: + spec_dict[value] = 'python-mpi4py.spec' + else: + print(err) dependency.update(additional)
Update version to beta status
"bugs": { "url": "https://github.com/chrismaltby/gb-studio/issues" }, - "version": "3.1.0-alpha.0", + "version": "3.1.0-beta.0", "description": "Visual retro game maker", "main": ".webpack/main", "scripts": {
more version fix
@@ -36,10 +36,10 @@ static const int PROTOCOL_VERSION = 31001; //Protocol is now 31001 as of D v3.1. static const int INIT_PROTO_VERSION = 21212; // disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = 30000; +static const int MIN_PEER_PROTO_VERSION = 31000; // Don't forget to change proto in FORTUNA.h as well!! -static const int MIN_MN_PROTO_VERSION = 30000; +static const int MIN_MN_PROTO_VERSION = 31000; // nTime field added to CAddress, starting with this version; // if possible, avoid requesting addresses nodes older than this
Add a dummy call to BN_rand_ex() in the FIPS provider The previous commit made BIGNUM RAND operations available from within the FIPS provider. We test this out by making a dummy call to check it completes successfully.
@@ -120,6 +120,9 @@ static int dummy_evp_call(void *provctx) if (RAND_DRBG_bytes(drbg, randbuf, sizeof(randbuf)) <= 0) goto err; + if (!BN_rand_ex(a, 256, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, bnctx)) + goto err; + ret = 1; err: BN_CTX_end(bnctx);
dm: remove cfc/cf8 pio handler The acrn vhm driver will convert all PCI configure space access to PCI_CFG type, so the pci_emul_cfgaddr and pci_emul_cfgdata will nerver be invoked. Remove these useless functions. Acked-by: Yu Wang
@@ -2253,64 +2253,6 @@ pci_cfgrw(struct vmctx *ctx, int vcpu, int in, int bus, int slot, int func, } } -static int cfgenable, cfgbus, cfgslot, cfgfunc, cfgoff; - -static int -pci_emul_cfgaddr(struct vmctx *ctx, int vcpu, int in, int port, int bytes, - uint32_t *eax, void *arg) -{ - uint32_t x; - - if (bytes != 4) { - if (in) - *eax = (bytes == 2) ? 0xffff : 0xff; - return 0; - } - - if (in) { - x = (cfgbus << 16) | (cfgslot << 11) | (cfgfunc << 8) | cfgoff; - if (cfgenable) - x |= CONF1_ENABLE; - *eax = x; - } else { - x = *eax; - cfgenable = (x & CONF1_ENABLE) == CONF1_ENABLE; - cfgoff = x & PCI_REGMAX; - cfgfunc = (x >> 8) & PCI_FUNCMAX; - cfgslot = (x >> 11) & PCI_SLOTMAX; - cfgbus = (x >> 16) & PCI_BUSMAX; - } - - return 0; -} -INOUT_PORT(pci_cfgaddr, CONF1_ADDR_PORT, IOPORT_F_INOUT, pci_emul_cfgaddr); - -static int -pci_emul_cfgdata(struct vmctx *ctx, int vcpu, int in, int port, int bytes, - uint32_t *eax, void *arg) -{ - int coff; - - if ((bytes != 1) && (bytes != 2) && (bytes != 4)) - return -1; - - coff = cfgoff + (port - CONF1_DATA_PORT); - if (cfgenable) { - pci_cfgrw(ctx, vcpu, in, cfgbus, cfgslot, cfgfunc, coff, bytes, - eax); - } else { - /* Ignore accesses to cfgdata if not enabled by cfgaddr */ - if (in) - *eax = 0xffffffff; - } - return 0; -} - -INOUT_PORT(pci_cfgdata, CONF1_DATA_PORT+0, IOPORT_F_INOUT, pci_emul_cfgdata); -INOUT_PORT(pci_cfgdata, CONF1_DATA_PORT+1, IOPORT_F_INOUT, pci_emul_cfgdata); -INOUT_PORT(pci_cfgdata, CONF1_DATA_PORT+2, IOPORT_F_INOUT, pci_emul_cfgdata); -INOUT_PORT(pci_cfgdata, CONF1_DATA_PORT+3, IOPORT_F_INOUT, pci_emul_cfgdata); - int emulate_pci_cfgrw(struct vmctx *ctx, int vcpu, int in, int bus, int slot, int func, int reg, int bytes, int *value)
modify clock config
#define STM32L4_HSE_FREQUENCY 8000000ul /* 8 MHz from MCO output */ #define STM32L4_LSE_FREQUENCY 32768 -#define HSE_CLOCK_CONFIG +#define MSI_CLOCK_CONFIG #if defined(HSI_CLOCK_CONFIG)
SOVERSION bump to version 2.20.22
@@ -66,7 +66,7 @@ set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_ # set version of the library set(LIBYANG_MAJOR_SOVERSION 2) set(LIBYANG_MINOR_SOVERSION 20) -set(LIBYANG_MICRO_SOVERSION 21) +set(LIBYANG_MICRO_SOVERSION 22) set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION}) set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION})
Fix Shell log command argument parsing
@@ -192,7 +192,11 @@ PT_THREAD(cmd_log(struct pt *pt, shell_output_func output, char *args)) /* Get and parse argument */ SHELL_ARGS_NEXT(args, next_args); + if(args == NULL) { + level = -1; + } else { level = (int)strtol(args, &ptr, 10); + } if((level == 0 && args == ptr) || level < LOG_LEVEL_NONE || level > LOG_LEVEL_DBG) { SHELL_OUTPUT(output, "Invalid argument: %s\n", args);
Guard agains p_of_k_a having weird implementation of ==. E.g. numpy arrays
@@ -412,9 +412,9 @@ def halomod_power_spectrum(cosmo, hmc, k, a, prof, # Power spectrum if isinstance(p_of_k_a, Pk2D): def pkf(sf): return p_of_k_a.eval(k_use, sf, cosmo) - elif (p_of_k_a is None) or (p_of_k_a == 'linear'): + elif (p_of_k_a is None) or (str(p_of_k_a) == 'linear'): def pkf(sf): return linear_matter_power(cosmo, k_use, sf) - elif p_of_k_a == 'nonlinear': + elif str(p_of_k_a) == 'nonlinear': def pkf(sf): return nonlin_matter_power(cosmo, k_use, sf) else: raise TypeError("p_of_k_a must be `None`, \'linear\', "
Take advantage of pre-allocated element
@@ -63,7 +63,7 @@ int ngtcp2_frame_chain_stream_datacnt_new(ngtcp2_frame_chain **pfrc, const ngtcp2_mem *mem) { size_t need, avail = sizeof(ngtcp2_frame) - sizeof(ngtcp2_stream); - if (datacnt > 0) { + if (datacnt > 1) { need = sizeof(ngtcp2_vec) * (datacnt - 1); if (need > avail) { @@ -79,7 +79,7 @@ int ngtcp2_frame_chain_crypto_datacnt_new(ngtcp2_frame_chain **pfrc, const ngtcp2_mem *mem) { size_t need, avail = sizeof(ngtcp2_frame) - sizeof(ngtcp2_crypto); - if (datacnt > 0) { + if (datacnt > 1) { need = sizeof(ngtcp2_vec) * (datacnt - 1); if (need > avail) {
fix(ML302): Fixed errors in generating private keys issue
@@ -399,9 +399,6 @@ static BOAT_RESULT sBoatPort_keyCreate_internal_generation(const BoatWalletPriKe BUINT32 key_try_count; BOAT_RESULT result = BOAT_SUCCESS; - /* Convert private key from UINT256 to Bignum256 format */ - bn_read_le(prikeyTmp, &priv_key_bn256); - /* Convert priv_key_max_u256 from UINT256 to Bignum256 format */ bn_read_le((const uint8_t *)priv_key_max_u256, &priv_key_max_bn256); @@ -417,6 +414,9 @@ static BOAT_RESULT sBoatPort_keyCreate_internal_generation(const BoatWalletPriKe break; } + /* Convert private key from UINT256 to Bignum256 format */ + bn_read_le(prikeyTmp, &priv_key_bn256); + /* check the generated private key is valid or not */ if ((bn_is_zero(&priv_key_bn256) == 0) && \ (bn_is_less(&priv_key_bn256, &priv_key_max_bn256) != 0))
ble_mesh: check ble mesh queue and task init status
@@ -386,8 +386,10 @@ static void bt_mesh_scan_cb(const bt_mesh_addr_t *addr, s8_t rssi, void bt_mesh_adv_init(void) { xBleMeshQueue = xQueueCreate(150, sizeof(bt_mesh_msg_t)); - xTaskCreatePinnedToCore(adv_thread, "BLE_Mesh_ADV_Task", 3072, NULL, + configASSERT(xBleMeshQueue); + int ret = xTaskCreatePinnedToCore(adv_thread, "BLE_Mesh_ADV_Task", 3072, NULL, configMAX_PRIORITIES - 7, NULL, TASK_PINNED_TO_CORE); + configASSERT(ret == pdTRUE); } int bt_mesh_scan_enable(void)
treewide: fix typo errors
@@ -8,7 +8,7 @@ function index() local page page = entry({"admin", "nas", "gowebdav"}, cbi("gowebdav"), _("GoWebDav"), 100) page.dependent = true - page..acl_depends = { "luci-app-gowebdav" } + page.acl_depends = { "luci-app-gowebdav" } entry({"admin","nas","gowebdav","status"},call("act_status")).leaf=true end
nix lang added
@@ -64,6 +64,7 @@ lang_spec_t langs[] = { { "md", { "markdown", "mdown", "mdwn", "mkdn", "mkd", "md" } }, { "mercury", { "m", "moo" } }, { "nim", { "nim" } }, + { "nix", { "nix" } }, { "objc", { "m", "h" } }, { "objcpp", { "mm", "h" } }, { "ocaml", { "ml", "mli", "mll", "mly" } },
gtk/bookmarks.c: fix GtkTreeView auto scrolling don't use gtk_scrolled_window_add_with_viewport() with a GtkTreeView use gtk_container_add() instead
@@ -867,7 +867,6 @@ void edit_bookmarks (gpointer data) return; } - edit_bookmarks_dialog = gtk_dialog_new (); //gtk_window_set_transient_for (GTK_WINDOW (edit_bookmarks_dialog), GTK_WINDOW (main_window)); gtk_window_set_position (GTK_WINDOW (edit_bookmarks_dialog), GTK_WIN_POS_MOUSE); @@ -892,20 +891,16 @@ void edit_bookmarks (gpointer data) gtk_box_pack_start (GTK_BOX (main_vbox), scroll, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (scroll), 3); - gtk_widget_show (scroll); btree = btree_create(); - - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), - GTK_WIDGET(btree) ); - gtk_widget_show_all(GTK_WIDGET(btree)); + gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (btree)); g_signal_connect (G_OBJECT (edit_bookmarks_dialog), // GtkDialog "response", G_CALLBACK (on_gtk_dialog_response_BookmarkDlg), NULL); - gtk_widget_show (edit_bookmarks_dialog); + gtk_widget_show_all (edit_bookmarks_dialog); build_bookmarks_tree (); // expand root node