message
stringlengths
6
474
diff
stringlengths
8
5.22k
examles/netlink: Fix a typo that resulted in build breakage.
@@ -103,7 +103,7 @@ static void dump_devices(sa_family_t family) FAR struct netlib_device_s *dev = &devlist[i]; #ifdef CONFIG_NETDEV_IFINDEX - printf(" Index: %2d ," dev->ifindex); + printf(" Index: %2d ", dev->ifindex); #else printf(" "); #endif
dsp.h: enable NEON w/VS2019+ ARM64 targets Visual Studio added ARM64 support, but requires arm64_neon.h to be included rather than arm_neon.h. Visual Studio 2019 addressed this so we'll start with that version and leave a local adapter include for a follow up.
@@ -119,7 +119,12 @@ extern "C" { #define WEBP_USE_NEON #endif -#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) +// Note: ARM64 is supported in Visual Studio 2017, but requires the direct +// inclusion of arm64_neon.h; Visual Studio 2019 includes this file in +// arm_neon.h. +#if defined(_MSC_VER) && \ + ((_MSC_VER >= 1700 && defined(_M_ARM)) || \ + (_MSC_VER >= 1920 && defined(_M_ARM64))) #define WEBP_USE_NEON #define WEBP_USE_INTRINSICS #endif
server session BUGFIX set umask before mkstemp
#include <stdlib.h> #include <string.h> #include <sys/types.h> +#include <sys/stat.h> #include <pwd.h> #include <shadow.h> #include <crypt.h> @@ -34,13 +35,16 @@ base64der_key_to_tmp_file(const char *in, int rsa) { char path[12] = "/tmp/XXXXXX"; int fd, written; + mode_t umode; FILE *file; if (in == NULL) { return NULL; } + umode = umask(0600); fd = mkstemp(path); + umask(umode); if (fd == -1) { return NULL; }
Fix i vs. i iterator collidation
@@ -1059,6 +1059,7 @@ void DeRestPluginPrivate::addLightNode(const deCONZ::Node *node) lightNode2->setManufacturerCode(node->nodeDescriptor().manufacturerCode()); ResourceItem *reachable = lightNode2->item(RStateReachable); + DBG_Assert(reachable != 0); if (!reachable->toBool()) { // the node existed before @@ -1078,9 +1079,9 @@ void DeRestPluginPrivate::addLightNode(const deCONZ::Node *node) READ_SCENES | READ_BINDING_TABLE); - for (uint32_t i = 0; i < 32; i++) + for (uint32_t j = 0; j < 32; j++) { - uint32_t item = 1 << i; + uint32_t item = 1 << j; if (lightNode.mustRead(item)) { lightNode.setNextReadTime(item, queryTime); @@ -1095,7 +1096,7 @@ void DeRestPluginPrivate::addLightNode(const deCONZ::Node *node) updateEtag(lightNode2->etag); } - if (lightNode2->uniqueId().isEmpty() || lightNode2->uniqueId().startsWith("0x")) + if (lightNode2->uniqueId().isEmpty() || lightNode2->uniqueId().startsWith(QLatin1String("0x"))) { QString uid = generateUniqueId(lightNode2->address().ext(), lightNode2->haEndpoint().endpoint(), 0); lightNode2->setUniqueId(uid); @@ -1250,9 +1251,9 @@ void DeRestPluginPrivate::addLightNode(const deCONZ::Node *node) READ_GROUPS | READ_SCENES | READ_BINDING_TABLE); - for (uint32_t i = 0; i < 32; i++) + for (uint32_t j = 0; j < 32; j++) { - uint32_t item = 1 << i; + uint32_t item = 1 << j; if (lightNode.mustRead(item)) { lightNode.setNextReadTime(item, queryTime);
Use correct attribute number in updating aoseg tuplecounts Spotted while reading.
@@ -1059,7 +1059,7 @@ AOCSFileSegInfoAddCount(Relation prel, int32 segno, d[Anum_pg_aocs_varblockcount - 1] = fastgetattr(oldtup, Anum_pg_aocs_varblockcount, tupdesc, &null[Anum_pg_aocs_varblockcount - 1]); Assert(!null[Anum_pg_aocs_varblockcount - 1]); d[Anum_pg_aocs_varblockcount - 1] += varblockadded; - repl[Anum_pg_aocs_tupcount - 1] = true; + repl[Anum_pg_aocs_varblockcount - 1] = true; d[Anum_pg_aocs_modcount - 1] = fastgetattr(oldtup, Anum_pg_aocs_modcount, tupdesc, &null[Anum_pg_aocs_modcount - 1]); Assert(!null[Anum_pg_aocs_modcount - 1]);
fixed small binary output bug
@@ -1038,8 +1038,9 @@ void WriteCBPInsol(BODY *body,CONTROL *control,OUTPUT *output,SYSTEM *system,UNI if(iBody < 2 || body[iBody].iBodyType != 0) { *dTmp = -1; } - + else{ *dTmp = fndApproxInsol(body,iBody); + } // Always in units of insolation received by Earth strcpy(cUnit,"F/F_Earth");
filter: add casting
@@ -173,7 +173,7 @@ void flb_filter_do(struct flb_input_chunk *ic, /* Point back the 'data' pointer to the new address */ ret = cio_chunk_get_content(ic->chunk, - &work_data, &cur_size); + (char **) &work_data, &cur_size); work_data += (cur_size - out_size); work_size = out_size;
Ruby: Fix version check Before this change the Ruby bindings were excluded if we installed Swig 3.0.10 or any later version of Swig 3.0.
@@ -11,7 +11,7 @@ find_package(Ruby) if (NOT RUBY_FOUND) remove_binding(swig_ruby "ruby interpreter or ruby header files not found (package ruby-dev/ruby-devel installed?)") -elseif (SWIG_VERSION MATCHES "^([12]\\.)|(3\\.0\\.[01234567])") +elseif (SWIG_VERSION MATCHES "^([12]\\.)|(3\\.0\\.[01234567])$") remove_binding(swig_ruby "found SWIG version (${SWIG_VERSION}) is not suitable. SWIG version >= 3.0.8 required") else()
update packaged files; add selinux post scripts
@@ -142,11 +142,22 @@ usermod -a -G warewulf www >/dev/null 2>&1 || : %else usermod -a -G warewulf apache >/dev/null 2>&1 || : %endif -service httpd restart >/dev/null 2>&1 || : -chkconfig httpd on >/dev/null 2>&1 || : -chkconfig tftp on >/dev/null 2>&1 || : -chkconfig xinetd on >/dev/null 2>&1 || : -killall -1 xinetd || service xinetd restart >/dev/null 2>&1 || : +systemctl enable httpd.service >/dev/null 2>&1 || : +systemctl restart httpd.service >/dev/null 2>&1 || : +systemctl enable tftp-server.socket >/dev/null 2>&1 || : +systemctl restart tftp-server.socket >/dev/null 2>&1 || : + +mkdir -p %{_localstatedir}/warewulf/ipxe %{_localstatedir}/warewulf/bootstrap 2>/dev/null || : +semanage fcontext -a -t httpd_sys_content_t '%{_localstatedir}/warewulf/ipxe(/.*)?' 2>/dev/null || : +semanage fcontext -a -t httpd_sys_content_t '%{_localstatedir}/warewulf/bootstrap(/.*)?' 2>/dev/null || : +restorecon -R %{_localstatedir}/warewulf/bootstrap || : +restorecon -R %{_localstatedir}/warewulf/ipxe || : + +%postun server +if [ $1 -eq 0 ] ; then +semanage fcontext -d -t httpd_sys_content_t '%{_localstatedir}/warewulf/ipxe(/.*)?' 2>/dev/null || : +semanage fcontext -d -t httpd_sys_content_t '%{_localstatedir}/warewulf/bootstrap(/.*)?' 2>/dev/null || : +fi %clean rm -rf $RPM_BUILD_ROOT @@ -159,12 +170,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/warewulf/provision.conf %config(noreplace) %{_sysconfdir}/warewulf/livesync.conf %config(noreplace) %{_sysconfdir}/warewulf/defaults/provision.conf -%{_bindir}/* +%{_sysconfdir}/warewulf/filesystem/examples/*.cmds %{_mandir}/* %{wwpkgdir}/* -%ifarch x86_64 -%{_datadir}/warewulf/* -%endif %{perl_vendorlib}/Warewulf/Bootstrap.pm %{perl_vendorlib}/Warewulf/Provision.pm %{perl_vendorlib}/Warewulf/Vnfs.pm @@ -193,9 +201,11 @@ rm -rf $RPM_BUILD_ROOT %attr(0750, root, apache) %{_libexecdir}/warewulf/cgi-bin/ %endif +%{_bindir}/* +%{_datadir}/warewulf/ipxe/* %{perl_vendorlib}/Warewulf/Event/Bootstrap.pm %{perl_vendorlib}/Warewulf/Event/Dhcp.pm -%{perl_vendorlib}/Warewulf/Event/Pxelinux.pm +%{perl_vendorlib}/Warewulf/Event/Pxe.pm %{perl_vendorlib}/Warewulf/Module/Cli/Pxe.pm %{perl_vendorlib}/Warewulf/Module/Cli/Dhcp.pm
fixed file handling
@@ -5148,7 +5148,7 @@ if(nmeaoutname != NULL) errorcount++; globalclose(); } - if((fh_nmea = fopen(nmeaoutname, "a+")) == NULL) + if((fh_nmea = fopen(nmeaoutname, "a")) == NULL) { perror("failed to open NMEA 0183 dump file"); errorcount++;
do nothing but print in %wake error case
~|([%bad-channel-wire wire] !!) :: %timeout + ?> ?=([%b %wake *] sign) + ?^ error.sign + [[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate] =/ on-channel-timeout on-channel-timeout:by-channel:(per-server-event event-args) =^ moves server-state.ax (on-channel-timeout i.t.t.wire) - ?> ?=([%b %wake *] sign) - =? moves ?=(^ error.sign) - [[duct %slip %d %flog %crud %wake u.error.sign] moves] [moves http-server-gate] :: ?(%poke %subscription)
Rust: Add example usage for BinaryKey
@@ -53,7 +53,7 @@ fn main() { ### Key -An example for using a key. For a full example, see the [examples](elektra/src/examples.rs). +An example for using a `StringKey`. For a full example, see the [examples](elektra/src/examples.rs). ```rust extern crate elektra; @@ -72,6 +72,28 @@ fn main() -> Result<(), Box<dyn std::error::Error>> { Compared to the C-API, there are two distinct key types, `StringKey` and `BinaryKey`. With these, type mismatches such as calling `keyString` on a `BinaryKey` is not possible. The only difference between them is the type of value you can set and get from them. They are only wrappers over the `Key` from the C-API. +Use a `BinaryKey` for setting arbitrary byte values. + +```rust +extern crate elektra; +use elektra::{BinaryKey, ReadableKey, WriteableKey}; + +fn main() -> Result<(), Box<dyn std::error::Error>> { + let binary_content: [u8; 7] = [25, 34, 0, 254, 1, 0, 7]; + let mut key = BinaryKey::new("user/test/rust")?; + key.set_value(&binary_content); + let read_content = key.value(); + + println!( + "Key with name {} holds bytes {:?}", + key.name(), + read_content + ); + + Ok(()) +} +``` + The functionality of the keys is split into two traits, `ReadableKey` and `WritableKey`, which define methods that only read information from a key, and modify a key, respectively. For example, the method to retrieve metakeys only returns a key that implements `ReadableKey`, which is named `ReadOnly`. The keys returned cannot be modified in accordance to the design. ## Documentation
re-enable dependency change detection in makefile
@@ -106,4 +106,4 @@ flash: $(BUILD_DIR)/$(BINARY).bin (echo -n 'R' > /dev/ttyACM0 && sleep 2) || true dfu-util -a 0 -s 0x08000000:leave -D $(BUILD_DIR)/$(BINARY).bin -#-include $(DEPS) \ No newline at end of file +-include $(DEPS) \ No newline at end of file
Unregister file from workset even it's not "delete at close" SharedFileSet files are automatically closed at end of transaction, but are not automatically deleted on close because they are intended to be shared between cooperating backends. By that, unregister file from workset just as unregister from resource owner there.
@@ -1961,9 +1961,6 @@ FileClose(File file) else stat_errno = 0; - if (vfdP->fdstate & FD_WORKFILE) - WorkFileDeleted(file, true); - /* in any case do the unlink */ if (unlink(vfdP->fileName)) elog(DEBUG1, "could not unlink file \"%s\": %m", vfdP->fileName); @@ -1982,6 +1979,10 @@ FileClose(File file) if (vfdP->resowner) ResourceOwnerForgetFile(vfdP->resowner, file); + /* Unregister it from the workfile set */ + if (vfdP->fdstate & FD_WORKFILE) + WorkFileDeleted(file, true); + /* * Return the Vfd slot to the free list */
Add sk_lookup to kernel-versions.md sk_lookup programs allow intercepting socket lookup per namespace.
@@ -81,6 +81,7 @@ BPF cgroup sysctl | 5.2 | [`7b146cebe30c`](https://github.com/torvalds/linux/com BPF raw tracepoint writable | 5.2 | [`9df1c28bb752`](https://github.com/torvalds/linux/commit/9df1c28bb75217b244257152ab7d788bb2a386d0) BPF trampoline | 5.5 | [`fec56f5890d9`](https://github.com/torvalds/linux/commit/fec56f5890d93fc2ed74166c397dc186b1c25951) BPF LSM hook | 5.7 | [`fc611f47f218`](https://github.com/torvalds/linux/commit/fc611f47f2188ade2b48ff6902d5cce8baac0c58) [`641cd7b06c91`](https://github.com/torvalds/linux/commit/641cd7b06c911c5935c34f24850ea18690649917) +BPF socket lookup hook | 5.9 | [`e9ddbb7707ff`](https://github.com/torvalds/linux/commit/e9ddbb7707ff5891616240026062b8c1e29864ca) ## Tables (_a.k.a._ Maps)
Leave a note for future me.
@@ -38,8 +38,13 @@ command_fails( [ 'pg_basebackup', '-D', "$tempdir/backup" ], 'pg_basebackup fails because of WAL configuration'); +# +# TODO: When we re-enable pg_basebackup TAP tests, we need to make sure +# this configuration variable matches the actual default guc value for +# max_wal_senders, which increased with the addition of replication slots. +# open CONF, ">>$tempdir/pgdata/postgresql.conf"; -print CONF "max_wal_senders = 1\n"; # GPDB: Upstream sets this to 10, but GPDB caps the value at 1. +print CONF "max_wal_senders = 1\n"; print CONF "wal_level = archive\n"; close CONF; restart_test_server;
Change bro filetype support to zeek.
@@ -15,7 +15,6 @@ lang_spec_t langs[] = { { "batch", { "bat", "cmd" } }, { "bazel", { "bazel" } }, { "bitbake", { "bb", "bbappend", "bbclass", "inc" } }, - { "bro", { "bro", "bif" } }, { "cc", { "c", "h", "xs" } }, { "cfmx", { "cfc", "cfm", "cfml" } }, { "chpl", { "chpl" } }, @@ -142,6 +141,7 @@ lang_spec_t langs[] = { { "wadl", { "wadl" } }, { "xml", { "xml", "dtd", "xsl", "xslt", "xsd", "ent", "tld", "plist", "wsdl" } }, { "yaml", { "yaml", "yml" } }, + { "zeek", { "zeek", "bro", "bif" } }, { "zephir", { "zep" } } };
vell: Fix thermal high/halt point version 3 BRANCH=none TEST=Thermal team verified thermal policy is expected.
@@ -210,11 +210,11 @@ BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); #define THERMAL_CPU \ { \ .temp_host = { \ - [EC_TEMP_THRESH_HIGH] = C_TO_K(85), \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(90), \ [EC_TEMP_THRESH_HALT] = C_TO_K(95), \ }, \ .temp_host_release = { \ - [EC_TEMP_THRESH_HIGH] = C_TO_K(90), \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(85), \ }, \ } __maybe_unused static const struct ec_thermal_config thermal_cpu = THERMAL_CPU; @@ -228,11 +228,11 @@ __maybe_unused static const struct ec_thermal_config thermal_cpu = THERMAL_CPU; #define THERMAL_CHARGER \ { \ .temp_host = { \ - [EC_TEMP_THRESH_HIGH] = C_TO_K(85), \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(90), \ [EC_TEMP_THRESH_HALT] = C_TO_K(95), \ }, \ .temp_host_release = { \ - [EC_TEMP_THRESH_HIGH] = C_TO_K(90), \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(85), \ }, \ } __maybe_unused static const struct ec_thermal_config thermal_charger =
[core] set socket perms after bind, before listen (it is still recommended to create sockets in protected directories) x-ref: "Feature request: add server config for setting permissions on Unix domain socket"
@@ -271,11 +271,6 @@ static int network_server_init(server *srv, buffer *host_token, size_t sidx) { goto error_free_socket; } - if (-1 == listen(srv_socket->fd, s->listen_backlog)) { - log_error_write(srv, __FILE__, __LINE__, "ss", "listen failed: ", strerror(errno)); - goto error_free_socket; - } - if (srv_socket->addr.plain.sa_family == AF_UNIX && !buffer_string_is_empty(s->socket_perms)) { mode_t m = 0; for (char *str = s->socket_perms->ptr; *str; ++str) { @@ -287,6 +282,11 @@ static int network_server_init(server *srv, buffer *host_token, size_t sidx) { } } + if (-1 == listen(srv_socket->fd, s->listen_backlog)) { + log_error_write(srv, __FILE__, __LINE__, "ss", "listen failed: ", strerror(errno)); + goto error_free_socket; + } + if (s->ssl_enabled) { #ifdef TCP_DEFER_ACCEPT } else if (s->defer_accept) {
fix:fix ethereum test case(test_001CreateWallet_0002CreateOneTimeWalletFailureNullConfig)
@@ -119,7 +119,6 @@ START_TEST(test_001CreateWallet_0002CreateOneTimeWalletFailureNullConfig) /* 3-2. verify the global variables that be affected */ ck_assert(g_boat_iot_sdk_context.wallet_list[0].is_used == false); - BoatIotSdkDeInit(); } END_TEST
Fixed memory leak in xfpga sysobject test.
@@ -261,6 +261,7 @@ TEST_P(sysobject_mock_p, xfpga_fpgaGetSize) { uint32_t value = 0; EXPECT_EQ(xfpga_fpgaObjectGetSize(object, &value, 0), FPGA_OK); EXPECT_EQ(value, DATA.size()); + EXPECT_EQ(xfpga_fpgaDestroyObject(&object), FPGA_OK); } INSTANTIATE_TEST_CASE_P(sysobject_c, sysobject_mock_p,
hdata/spira: Add missing newline to prlog() call We're missing a \n here.
@@ -1374,7 +1374,7 @@ static void add_npu(struct dt_node *xscom, const struct HDIF_array_hdr *links, * this is going to break. */ - prlog(PR_DEBUG, "NPU: %04x:%d: Link (%d) targets slot %u", + prlog(PR_DEBUG, "NPU: %04x:%d: Link (%d) targets slot %u\n", chip_id, link_count, link_count, slot_id); if (link_count >= 6) {
BugID: update link address in README.md
@@ -56,7 +56,7 @@ AliOS Things can help you connect your devices to [Alibaba Cloud IoT platform](h ## Community * [DingTalk Group](https://img.alicdn.com/tfs/TB1X2HOhYPpK1RjSZFFXXa5PpXa-970-1280.png) -* [Alibaba Cloud IoT Community](https://dev.iot.aliyun.com/) +* [Alibaba Cloud IoT Community](https://developer.aliyun.com/group/aliiot) ## License
avx512bw: define and use SIMDE_AVX512BW_ENABLE_NATIVE_ALIASES
@@ -50,6 +50,10 @@ SIMDE_DISABLE_UNWANTED_DIAGNOSTICS # include <altivec.h> # endif +#if !defined(SIMDE_AVX512BW_NATIVE) && defined(SIMDE_ENABLE_NATIVE_ALIASES) + #define SIMDE_AVX512BW_ENABLE_NATIVE_ALIASES +#endif + SIMDE__BEGIN_DECLS SIMDE__FUNCTION_ATTRIBUTES @@ -75,7 +79,7 @@ simde_mm512_add_epi8 (simde__m512i a, simde__m512i b) { return simde__m512i_from_private(r_); #endif } -#if defined(SIMDE_AVX2_ENABLE_NATIVE_ALIASES) +#if defined(SIMDE_AVX512BW_ENABLE_NATIVE_ALIASES) # define _mm512_add_epi8(a, b) simde_mm512_add_epi8(a, b) #endif @@ -102,7 +106,7 @@ simde_mm512_add_epi16 (simde__m512i a, simde__m512i b) { return simde__m512i_from_private(r_); #endif } -#if defined(SIMDE_AVX2_ENABLE_NATIVE_ALIASES) +#if defined(SIMDE_AVX512BW_ENABLE_NATIVE_ALIASES) # define _mm512_add_epi16(a, b) simde_mm512_add_epi16(a, b) #endif
BugID:16917891: fix the build error of keil project
@@ -23,4 +23,4 @@ if aos_global_config.get('sal', 1) == 1: component.set_enable_vfp() linux_only_targets="blink coapapp helloworld http2app linkkit_gateway linkkitapp modbus_demo mqttapp otaapp tls udataapp yts" -windows_only_targets="helloworld|COMPILER=armcc helloworld|COMPILER=iar blink|COMPILER=armcc blink|COMPILER=keil" +windows_only_targets="helloworld|COMPILER=armcc helloworld|COMPILER=iar blink|COMPILER=armcc blink|COMPILER=iar"
build: bump wlroots dependency to 0.17.0
@@ -36,7 +36,7 @@ if is_freebsd endif # Execute the wlroots subproject, if any -wlroots_version = ['>=0.16.0', '<0.17.0'] +wlroots_version = ['>=0.17.0', '<0.18.0'] subproject( 'wlroots', default_options: ['examples=false'],
proc: kill if a thread cannot handle signal_segv or signal_illegal
@@ -1152,6 +1152,7 @@ time_t proc_nextWakeup(void) int threads_sigpost(process_t *process, thread_t *thread, int sig) { int sigbit = 1 << sig; + int kill = 0; switch (sig) { case signal_segv: @@ -1174,6 +1175,12 @@ int threads_sigpost(process_t *process, thread_t *thread, int sig) hal_spinlockSet(&threads_common.spinlock); if (thread != NULL && hal_cpuPushSignal(thread->kstack + thread->kstacksz, thread->process->sighandler, sig) != EOK) { thread->sigpend |= sigbit; + + if (sig == signal_segv || sig == signal_illegal) { + /* If they can't handle those right away, kill */ + kill = 1; + _proc_threadExit(thread); + } } else { process->sigpend |= sigbit; @@ -1191,6 +1198,9 @@ int threads_sigpost(process_t *process, thread_t *thread, int sig) } hal_cpuReschedule(&threads_common.spinlock); + if (kill) + proc_kill(process); + return EOK; }
doc: remove out-dated recommendation
@@ -650,20 +650,6 @@ applications to link against plugins. ## Troubleshooting -### Missing Links/Libraries - -If you get errors that `libelektra-resolver.so` or `libelektra-storage.so` are missing, -or the links do not work, you can use as workaround: - -```sh -cmake -DBUILD_SHARED=OFF -DBUILD_FULL=ON .. -``` - -This issue was reported for: - -- OpenSuse 42 (when running `make run_all`) -- CLion IDE (does not allow to build) - ### Dependencies not Available for Cent OS Please enable EPEL https://fedoraproject.org/wiki/EPEL
constants: add ENABLE_ASAN see
@@ -156,6 +156,7 @@ static void elektraAddConstants (KeySet * ks, Key * parentKey) elektraAddKeyValue (ks, parentKey, "cmake/ENABLE_DEBUG", "@ENABLE_DEBUG@"); elektraAddKeyValue (ks, parentKey, "cmake/ENABLE_LOGGER", "@ENABLE_LOGGER@"); + elektraAddKeyValue (ks, parentKey, "cmake/ENABLE_ASAN", "@ENABLE_ASAN@"); elektraAddKeyValue (ks, parentKey, "cmake/BUILTIN_PLUGIN_FOLDER", BUILTIN_PLUGIN_FOLDER); elektraAddKeyValue (ks, parentKey, "cmake/BUILTIN_DATA_FOLDER", BUILTIN_DATA_FOLDER);
add ifdef TLS
struct gconf_t *gconf = NULL; static const char *g_announce_args[64] = { 0 }; +#ifdef TLS static const char *g_tls_client_args[16] = { 0 }; static const char *g_tls_server_args[16] = { 0 }; +#endif const char *kadnode_version_str = "KadNode v"MAIN_VERSION" (" #ifdef BOB @@ -616,6 +618,7 @@ void conf_apply() { args += 1; } +#ifdef TLS args = g_tls_client_args; while( rc == 0 && *args ) { // Add Certificate Authority (CA) entries for the TLS client @@ -637,7 +640,7 @@ void conf_apply() { } args += 1; } - +#endif if( rc != 0 ) { exit( 1 ); @@ -673,6 +676,8 @@ void conf_setup( int argc, char **argv ) { conf_apply(); array_free( &g_announce_args[0] ); +#ifdef TLS array_free( &g_tls_client_args[0] ); array_free( &g_tls_server_args[0] ); +#endif }
fix copy updates
@@ -90,9 +90,9 @@ if( !$skipCopy) { if ($micro) { #TODO: support update repo merge print "\nCopying updates\n"; - "$tmp_dir/updates" || warn "Unable to remove updates link: $!"; - "$tmp_dir/empty" || warn "Unable to remove empty dir: $!"; - ("$base_repo_path/$base_release:/Update$micro/*", "$tmp_dir/updates") || + unlink "$tmp_dir/updates" || warn "Unable to remove updates link: $!"; + rmtree "$tmp_dir/empty" || warn "Unable to remove empty dir: $!"; + dircopy("$base_repo_path/$base_release:/Update$micro/*", "$tmp_dir/updates") || die "Unable to copy update repo: $!"; } }
BugID:21191325: Decouple LwM2M app and linkkit sdk
#include <signal.h> #include "aos/cli.h" #include "ulog/ulog.h" - -#include "utils_hmac.h" +#include "infra_md5.h" #define MAX_PACKET_SIZE 1024 #define DEFAULT_SERVER_IPV6 "[::1]"
Update Xiaomi Light sensor GZCGQ01LM DDF to use deviating manufacturer
"schema": "devcap1.schema.json", "doc:path": "xiaomi/xiaomi_gzcgq01lm_light_sensor.md", "doc:hdr": "Light sensor GZCGQ01LM", - "manufacturername": "$MF_XIAOMI", - "modelid": "lumi.sen_ill.mgl01", + "manufacturername": ["$MF_XIAOMI", "$MF_LUMI"], + "modelid": ["lumi.sen_ill.mgl01", "lumi.sen_ill.mgl01"], "vendor": "Xiaomi", "product": "Mijia Light Sensor GZCGQ01LM", "status": "Gold",
Fix rare segfault during shutdown Sometimes player-sdl segfaults during shutdown. By reordering the shutdown sequence the segfault seem to have disappeared.
@@ -206,11 +206,11 @@ s32 runCart(void* cart, s32 size) tic80_delete(tic); + SDL_CloseAudioDevice(audioDevice); + SDL_DestroyMutex(state.mutex); SDL_DestroyTexture(texture); SDL_DestroyRenderer(renderer); SDL_DestroyWindow(window); - SDL_CloseAudioDevice(audioDevice); - SDL_DestroyMutex(state.mutex); } SDL_free(cart);
Unpause clients earlier during manual cluster failover Unpause clients after manual failover ends instead of the timed offset
@@ -3536,8 +3536,10 @@ void clusterHandleSlaveMigration(int max_slaves) { * The function can be used both to initialize the manual failover state at * startup or to abort a manual failover in progress. */ void resetManualFailover(void) { - if (server.cluster->mf_end) { - checkClientPauseTimeoutAndReturnIfPaused(); + if (server.cluster->mf_slave) { + /* We were a master failing over, so we paused clients. Regardless + * of the outcome we unpause now to allow traffic again. */ + unpauseClients(); } server.cluster->mf_end = 0; /* No manual failover in progress. */ server.cluster->mf_can_start = 0;
doc: clarify about name in toml
@@ -155,11 +155,16 @@ example= [internal/<plugin>/*] status= implemented -usedby/plugin= (ini) -description= Internal metadata to be ignored by other plugins. -example=internal/ini/parent could be the name for internal parent - information of the ini plugin. - +usedby/plugin= +description= Internal metadata that must be ignored by other plugins. + It is useful for reconstruction of information about keys between + kdbGet and kdbSet. + Always avoid to use it if there is any other metadata that + can be used instead. + For example, if a type can be represented with the CORBA + type system, metadata `type` should be used. + Only if a type cannot be represented, e.g., the `toml` + plugin would use `internal/toml/type`. [line] type= int
dprint: arms calling other arms dont steal doccord i thought this would be a neat feature but ted called it too clever and probably not what you really want. this code is atrocious though and needs some serious cleanup
?~ doc-one ~? > debug %doc-one-empty ~ :: no need to look for a second doc if there is no first one + ?: =(~ links.u.doc-one) + :: doc-one is a product-doc + [~ [~ `crib.u.doc-one]] + ?: !=([%funk name] -.links.u.doc-one) + :: link on doc-one doesnt match arm name, so that means its calling a + :: different arm and trying to use its docs. don't let it + ~ :: technically doc-two doesn't need to be a help, i could just grab the what :: directly since we aren't testing it to see if its an arm-doc, but it makes :: the code more confusing to use a different structure. + ~? > debug :- %doc-one doc-one =/ doc-two=(unit help) - ?> ?=([%hint *] sut) - (help-from-hint q.sut) + ?+ sut ~ + [%hint *] + (help-from-hint p.p.sut) + [%hold *] + ~? > debug %doc-two-hold + ~ + == ?~ doc-two ~? > debug %doc-two-empty ?~ links.u.doc-one ~? > debug %link-match [~ [`crib.u.doc-one ~]] ~? > debug %link-doesnt-match-arm - :: this shouldn't happen at this point in time + :: this can happen if +bar calls +foo which has doccords [~ [`crib.u.doc-one ~]] :: doc-two is non-empty. make sure that doc-one is an arm-doc ?~ links.u.doc-one
Amend missing resume token tests for wire version 8+
@@ -513,6 +513,7 @@ _test_resume_token_error (const char *id_projection) client = test_framework_client_new (); ASSERT (client); + mongoc_client_set_error_api (client, MONGOC_ERROR_API_VERSION_2); coll = drop_and_get_coll (client, "db", "coll_missing_resume"); ASSERT (coll); @@ -544,6 +545,12 @@ _test_resume_token_error (const char *id_projection) MONGOC_ERROR_CURSOR, MONGOC_ERROR_CHANGE_STREAM_NO_RESUME_TOKEN, "Cannot provide resume functionality"); + } else { + ASSERT_ERROR_CONTAINS (err, + MONGOC_ERROR_SERVER, + 280, + "Only transformations that retain the unmodified " + "_id field are allowed."); } bson_destroy (&opts);
Update obsolete file name bitesize -> bitehist Update tutorial to change the file name.
@@ -326,7 +326,7 @@ This may be improved in future bcc versions. Eg, the Python data struct could be Rewrite sync_timing.py, from a prior lesson, to use ```BPF_PERF_OUTPUT```. -### Lesson 9. bitesize.py +### Lesson 9. bitehist.py The following tool records a histogram of disk I/O sizes. Sample output: @@ -345,7 +345,7 @@ Tracing... Hit Ctrl-C to end. 128 -> 255 : 800 |**************************************| ``` -Code is [examples/tracing/bitesize.py](../examples/tracing/bitesize.py): +Code is [examples/tracing/bitehist.py](../examples/tracing/bitehist.py): ```Python from bcc import BPF @@ -393,7 +393,7 @@ New things to learn: ### Lesson 10. disklatency.py -Write a program that times disk I/O, and prints a histogram of their latency. Disk I/O instrumentation and timing can be found in the disksnoop.py program from a prior lesson, and histogram code can be found in bitesize.py from a prior lesson. +Write a program that times disk I/O, and prints a histogram of their latency. Disk I/O instrumentation and timing can be found in the disksnoop.py program from a prior lesson, and histogram code can be found in bitehist.py from a prior lesson. ### Lesson 11. vfsreadlat.py
[style] proper place for operator==
@@ -32,6 +32,24 @@ namespace NCB { Groups = std::move(groups); } + bool operator==(const TObjectsGrouping& rhs) const { + if (IsTrivial()) { + if (rhs.IsTrivial()) { + return GroupCount == rhs.GroupCount; + } + return (GroupCount == rhs.GroupCount) && + !FindIfPtr( + rhs.Groups, + [](TGroupBounds groupBounds) { + return groupBounds.GetSize() != 1; + } + ); + } + return Groups == rhs.Groups; + } + + SAVELOAD() + ui32 GetObjectCount() const { return IsTrivial() ? GroupCount : Groups.back().End; } @@ -64,22 +82,6 @@ namespace NCB { return Groups; } - bool operator==(const TObjectsGrouping& rhs) const { - if (IsTrivial()) { - if (rhs.IsTrivial()) { - return GroupCount == rhs.GroupCount; - } - return (GroupCount == rhs.GroupCount) && - !FindIfPtr( - rhs.Groups, - [](TGroupBounds groupBounds) { - return groupBounds.GetSize() != 1; - } - ); - } - return Groups == rhs.Groups; - } - ui32 GetGroupIdxForObject(ui32 objectIdx) const { CB_ENSURE( objectIdx < GetObjectCount(),
OcAppleKernelLib: Add ParseFatArchitecture status check
@@ -145,6 +145,9 @@ ParseFatArchitecture ( UINT32 FileSize; Status = GetFileSize (File, &FileSize); + if (EFI_ERROR (Status)) { + return Status; + } if (BufferSize >= FileSize) { return EFI_INVALID_PARAMETER; }
filter_modify: release leak on error (CID 183638)
@@ -223,6 +223,7 @@ static int setup(struct filter_modify_ctx *ctx, ("[filter_modify] Unable to create regex for condition %s %s", condition->raw_k, condition->raw_v); condition_free(condition); + flb_utils_split_free(split); return -1; } else { @@ -240,6 +241,7 @@ static int setup(struct filter_modify_ctx *ctx, "for condition %s %s", condition->raw_k, condition->raw_v); condition_free(condition); + flb_utils_split_free(split); return -1; } else {
Fixed incorrect threads count on Linux
#include <sys/sysctl.h> #endif +#if defined(TUNDRA_LINUX) +#include <thread> +#endif + #if defined(TUNDRA_WIN32) #include <windows.h> #include <ctype.h> @@ -341,6 +345,8 @@ int GetCpuCount() SYSTEM_INFO si; GetSystemInfo(&si); return (int) si.dwNumberOfProcessors; +#elif defined(TUNDRA_LINUX) + return (int)std::thread::hardware_concurrency(); #else long nprocs_max = sysconf(_SC_NPROCESSORS_CONF); if (nprocs_max < 0)
microbitv2: Reduce target SWD clock to 6 MHz
@@ -5,8 +5,7 @@ common: - MSC_LED_DEF=GPIO_LED_ON - USB_PROD_STR="BBC micro:bit CMSIS-DAP" - IO_CONFIG_OVERRIDE - - DELAY_FAST_CYCLES=2U # Fast delay needed to reach 8MHz SWD clock speed - - DAP_DEFAULT_SWJ_CLOCK=8000000 + - DAP_DEFAULT_SWJ_CLOCK=6000000 # Results in one slow delay of 3 cycles - BOARD_USB_BMAXPOWER=0x96 - CDC_ACM_DEFAULT_BAUDRATE=115200 includes:
updated date and added multicast to signaling
@@ -6,7 +6,7 @@ baresip README Baresip is a portable and modular SIP User-Agent with audio and video support. -Copyright (c) 2010 - 2020 Alfred E. Heggestad and Contributors +Copyright (c) 2010 - 2021 Alfred E. Heggestad and Contributors Distributed under BSD license @@ -44,6 +44,7 @@ Distributed under BSD license - DNS NAPTR/SRV support - Multiple accounts support - DTMF support (RTP, SIP INFO) + - Multicast sending & receiving * Security: - Signalling encryption (TLS)
AppVeyor: Install lua5.1 instead of 5.3.
@@ -45,7 +45,7 @@ $CMAKE_FLAGS = "$CMAKE_FLAGS -G ""$GENERATOR""" ### Install dependencies and setup system. ############################################################################### choco install -y -r swig --version 3.0.9 -choco install -y -r lua53 +choco install -y -r lua choco install -y -r python3 if ($Env:COMPILER -eq "mingw") { if ($Env:PLATFORM -eq "Win64") {
Enhance UAO templating to recognize "aoseg" and "aocsseg" keywords. This is useful if a test wants to use gp_toolkit.__gp_{aoseg|aocsseg}* functions.
@@ -428,7 +428,13 @@ convert_line(char *line, replacements *repls) replace_string(line, "@DLSUFFIX@", repls->dlsuffix); replace_string(line, "@bindir@", repls->bindir); if (repls->orientation) + { replace_string(line, "@orientation@", repls->orientation); + if (strcmp(repls->orientation, "row") == 0) + replace_string(line, "@aoseg@", "aoseg"); + else + replace_string(line, "@aoseg@", "aocsseg"); + } } /*
Update python port readme.
@@ -10,7 +10,11 @@ Abstract **METACALL** Python Port is the port of **METACALL** to Python Programming Language. With **METACALL** Python Port you can transparently execute code from Python to any programming language, for -example, calling JavaScript (NodeJS) code from Python. +example, calling JavaScript, NodeJS, Ruby or C# code from Python. + +.. code:: console + + pip install metacall ``sum.js`` @@ -28,4 +32,4 @@ example, calling JavaScript (NodeJS) code from Python. metacall_load_from_file('node', [ 'sum.js' ]); - metacall('sum', 3, 4); // 7 + metacall('sum', 3, 4); # 7
Small cleanup of some build.info files
@@ -268,7 +268,6 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN INCLUDE[cipherlist_test]=../include DEPEND[cipherlist_test]=../libcrypto ../libssl libtestutil.a - INCLUDE[testutil.o]=.. INCLUDE[ssl_test_ctx.o]=../include INCLUDE[handshake_helper.o]=../include INCLUDE[ssltestlib.o]=.. ../include @@ -371,7 +370,6 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN ENDIF SOURCE[uitest]=uitest.c ../apps/apps.c ../apps/opt.c - DEPEND[uitest.o]=../apps/progs.h INCLUDE[uitest]=.. ../include ../apps DEPEND[uitest]=../libcrypto ../libssl libtestutil.a
Return errors PKCS#7/CMS enveloped data ctrls and PSS
@@ -526,14 +526,18 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) return rctx->oaep_labellen; case EVP_PKEY_CTRL_DIGESTINIT: - case EVP_PKEY_CTRL_PKCS7_ENCRYPT: - case EVP_PKEY_CTRL_PKCS7_DECRYPT: case EVP_PKEY_CTRL_PKCS7_SIGN: +#ifndef OPENSSL_NO_CMS + case EVP_PKEY_CTRL_CMS_SIGN: +#endif return 1; + + case EVP_PKEY_CTRL_PKCS7_ENCRYPT: + case EVP_PKEY_CTRL_PKCS7_DECRYPT: #ifndef OPENSSL_NO_CMS case EVP_PKEY_CTRL_CMS_DECRYPT: case EVP_PKEY_CTRL_CMS_ENCRYPT: - case EVP_PKEY_CTRL_CMS_SIGN: + if (!pkey_ctx_is_pss(ctx)) return 1; #endif case EVP_PKEY_CTRL_PEER_KEY:
disable eigen test for aarch64
@@ -136,6 +136,10 @@ tx2=test_static } @test "[$tname] run eigen under resource manager ($rm/$LMOD_FAMILY_COMPILER)" { + # [email protected] (6/8/17) - disable test on aarch64 as precision assumptions + # within GSL are tuned for x86 and 80-bit extended precision + [[ "$ARCH" == "aarch64" ]] && skip "Skipping eigen test for ARCH=$ARCH" + pushd eigen if [ ! -s $tx1 ];then flunk "$tx1 binary does not exit"
Router configuration retention count fixed.
@@ -262,7 +262,6 @@ nxt_router_temp_conf(nxt_task_t *task) } rtcf->mem_pool = mp; - rtcf->count = 1; tmp = nxt_mp_create(1024, 128, 256, 32); if (nxt_slow_path(tmp == NULL)) { @@ -693,6 +692,7 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf, skcf->listen.handler = nxt_router_conn_init; skcf->router_conf = tmcf->conf; + skcf->router_conf->count++; skcf->application = nxt_router_listener_application(tmcf, &lscf.application);
subproc: don't change nice-ness, until all effects are understood
@@ -260,13 +260,6 @@ static bool subproc_PrepareExecv(run_t* run) { } #endif /* ifdef RLIMIT_STACK */ - /* Increase nice-ness by one */ - errno = 0; - int pval = nice(1); - if (errno != 0 && pval != 19) { - PLOG_W("nice(1) failed, prev:%d", pval); - } - if (run->global->exe.clearEnv) { environ = NULL; }
hwloc also needs libltdl
@@ -52,7 +52,7 @@ BuildRequires: opensm-devel BuildRequires: numactl BuildRequires: libevent-devel BuildRequires: pmix%{PROJ_DELIM} -BuildRequires: hwloc hwloc-devel +BuildRequires: hwloc-devel libtool-ltdl %if 0%{with_slurm} BuildRequires: slurm-devel%{PROJ_DELIM} #!BuildIgnore: slurm%{PROJ_DELIM}
Java: added java module in configure help.
@@ -58,4 +58,7 @@ cat << END nodejs OPTIONS configure Node.js module run "./configure nodejs --help" to see available options + java OPTIONS configure Java module + run "./configure java --help" to see available options + END
sh prefix renamed to sb
@@ -12,7 +12,7 @@ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_cblas_helper.sh foreach(float_type ${FLOAT_TYPES}) string(SUBSTRING ${float_type} 0 1 float_char_upper) string(TOLOWER ${float_char_upper} float_char) - if (${float_char} STREQUAL "h") + if (${float_char} STREQUAL "b") continue() endif() #level1
tweaks event reference counting and fixes mis-fixed memory leak
@@ -773,7 +773,7 @@ _worker_poke(void* vod_p, u3_noun mat) goto error; } - u3_noun entry = u3ke_cue(u3k(jammed_entry)); + u3_noun entry = u3qe_cue(jammed_entry); if ( (c3y != u3du(entry)) || (c3n == u3r_cell(entry, &mug, &job)) || (c3n == u3ud(mug)) || @@ -818,7 +818,6 @@ _worker_poke(void* vod_p, u3_noun mat) } evt_d = u3r_chub(0, evt); - u3z(evt); u3z(jar); c3_assert( evt_d == u3V.evt_d );
appveyor.yml: Let 'nmake' run by defaut silently (/S), using MAKEVERBOSE like .travis.yml
@@ -50,13 +50,19 @@ before_build: Select-String "\[extended tests\]") ) { $env:EXTENDED_TESTS="yes" } + - ps: >- + If ($env:BUILDONLY -or $env:MAKEVERBOSE) { + $env:NMAKE="nmake" + } Else { + $env:NMAKE="nmake /S" + } build_script: - cd _build - ps: >- If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - cmd /c "nmake build_all_generated 2>&1" - cmd /c "nmake PERL=no-perl 2>&1" + cmd /c "%NMAKE% build_all_generated 2>&1" + cmd /c "%NMAKE% PERL=no-perl 2>&1" } - cd .. @@ -65,14 +71,14 @@ test_script: - ps: >- If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { if ($env:EXTENDED_TESTS) { - cmd /c "nmake test HARNESS_VERBOSE_FAILURE=yes 2>&1" + cmd /c "%NMAKE% test HARNESS_VERBOSE_FAILURE=yes 2>&1" } Else { - cmd /c "nmake test HARNESS_VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1" + cmd /c "%NMAKE% test HARNESS_VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1" } } - ps: >- if ($env:EXTENDED_TESTS) { mkdir ..\_install - cmd /c "nmake install DESTDIR=..\_install 2>&1" + cmd /c "%NMAKE% install DESTDIR=..\_install 2>&1" } - cd ..
Do variable replacements for cmd-extra in documentation.
@@ -176,7 +176,7 @@ sub executeKey if (defined($oCommand->fieldGet('exe-cmd-extra', false))) { - $$hCacheKey{'cmd-extra'} = $oCommand->fieldGet('exe-cmd-extra'); + $$hCacheKey{'cmd-extra'} = $self->{oManifest}->variableReplace($oCommand->fieldGet('exe-cmd-extra')); } if (defined($oCommand->paramGet('err-expect', false)))
reduced excess of hashes
@@ -46,6 +46,7 @@ char *hcxoutname = NULL; char *wdfhcxoutname = NULL; char *nonwdfhcxoutname = NULL; +hcx_t oldhcxrecord; /*===========================================================================*/ void printhex(uint8_t channel, const uint8_t *macaddr1, const uint8_t *macaddr2, int destflag) { @@ -119,6 +120,18 @@ memcpy(hcxrecord.eapol,zeiger2->eapol, zeiger2->eapol_len +4); memcpy(hcxrecord.keymic, eap2->keymic, 16); memset(&hcxrecord.eapol[0x51], 0, 16); +if(oldhcxrecord.message_pair == hcxrecord.message_pair) + if(memcmp(oldhcxrecord.mac_ap.addr, hcxrecord.mac_ap.addr, 6) == 0) + if(memcmp(oldhcxrecord.mac_sta.addr, hcxrecord.mac_sta.addr, 6) == 0) + if(memcmp(oldhcxrecord.keymic, hcxrecord.keymic, 16) == 0) + if(memcmp(oldhcxrecord.nonce_ap, hcxrecord.nonce_ap, 32) == 0) + if(memcmp(oldhcxrecord.nonce_sta, hcxrecord.nonce_sta, 32) == 0) + return; + +memcpy(&oldhcxrecord, &hcxrecord, HCX_SIZE); + + + if(hcxoutname != NULL) { if((fhhcx = fopen(hcxoutname, "ab")) == NULL) @@ -597,7 +610,6 @@ int packetcount = 0; int wcflag = FALSE; int c; - char pcaperrorstring[PCAP_ERRBUF_SIZE]; if (!(pcapin = pcap_open_offline(pcapinname, pcaperrorstring))) @@ -951,7 +963,6 @@ char *essidunicodeoutname = NULL; eigenpfadname = strdupa(argv[0]); eigenname = basename(eigenpfadname); - setbuf(stdout, NULL); while ((auswahl = getopt(argc, argv, "o:p:e:E:w:W:xrhv")) != -1) { @@ -1002,6 +1013,7 @@ if(pcapoutname != NULL) fprintf(stderr, "\x1B[31merror creating dump file %s\x1B[0m\n", pcapoutname); } +memset(&oldhcxrecord, 0, HCX_SIZE); for (index = optind; index < argc; index++) { if(processcap(argv[index], essidoutname, essidunicodeoutname) == FALSE)
testutil: teach test_mk_file_path() how to merge VMS file specs This isn't a full solution, it only handles current use cases.
@@ -436,13 +436,36 @@ char *test_mk_file_path(const char *dir, const char *file) const char *sep = "/"; # else const char *sep = ""; + char *dir_end; + char dir_end_sep; # endif size_t len = strlen(dir) + strlen(sep) + strlen(file) + 1; char *full_file = OPENSSL_zalloc(len); if (full_file != NULL) { + if (dir != NULL && dir[0] != '\0') { OPENSSL_strlcpy(full_file, dir, len); +# ifdef OPENSSL_SYS_VMS + /* + * If |file| contains a directory spec, we need to do some + * careful merging. + * "vol:[dir.dir]" + "[.certs]sm2-root.crt" should become + * "vol:[dir.dir.certs]sm2-root.crt" + */ + dir_end = &full_file[strlen(full_file) - 1]; + dir_end_sep = *dir_end; + if ((dir_end_sep == ']' || dir_end_sep == '>') + && (file[0] == '[' || file[0] == '<')) { + file++; + if (file[0] == '.') + *dir_end = '\0'; + else + *dir_end = '.'; + } +#else OPENSSL_strlcat(full_file, sep, len); +#endif + } OPENSSL_strlcat(full_file, file, len); }
test: add build ssc job for esp32c6
@@ -472,6 +472,12 @@ build_ssc_esp32s3: variables: TARGET_NAME: "ESP32S3" +build_ssc_esp32c6: + extends: .build_ssc_template + parallel: 3 + variables: + TARGET_NAME: "ESP32C6" + .build_esp_idf_tests_cmake_template: extends: - .build_cmake_template
add Scroll networks
@@ -48,7 +48,10 @@ const network_info_t NETWORK_MAPPING[] = { {.chain_id = 7341, .name = "Shyft", .ticker = "SHFT "}, {.chain_id = 19, .name = "Songbird", .ticker = "SGB "}, {.chain_id = 73799, .name = "Volta", .ticker = "VOLTA "}, - {.chain_id = 25, .name = "Cronos", .ticker = "CRO "}}; + {.chain_id = 25, .name = "Cronos", .ticker = "CRO "}, + {.chain_id = 534354, .name = "Scroll (Pre-Alpha)", .ticker = "SCR "}, + {.chain_id = 534353, .name = "Scroll (Goerli)", .ticker = "SCR "}, + {.chain_id = 534352, .name = "Scroll", .ticker = "SCR "}}; uint64_t get_chain_id(void) { uint64_t chain_id = 0;
Fix check for roughness coefficient Fix check for roughness coefficient
@@ -302,7 +302,7 @@ int pipedata(Project *pr) if (!getfloat(parser->Tok[4], &diam)) return setError(parser, 4, 202); if (diam <= 0.0) return setError(parser, 4, 211); if (!getfloat(parser->Tok[5], &rcoeff)) return setError(parser, 5, 202); - if (rcoeff <= 0.0) setError(parser, 5, 211); + if (rcoeff <= 0.0) return setError(parser, 5, 211); // Either a loss coeff. or a status is supplied if (n == 7)
Show info if your game has problems with sync removed minDelay, and soundblit() calls after screen is rendered
@@ -2429,8 +2429,6 @@ static void renderStudio() studio.tic->api.tick_end(studio.tic); - blitSound(); - if(studio.mode != TIC_RUN_MODE) useSystemPalette(); @@ -2546,6 +2544,8 @@ static void tick() SDL_SetCursor(SDL_CreateSystemCursor(studio.mouse.system)); SDL_RenderPresent(studio.renderer); + + blitSound(); } static void initSound() @@ -2796,8 +2796,6 @@ s32 main(s32 argc, char **argv) useDelay = !(info.flags & SDL_RENDERER_PRESENTVSYNC) || mode.refresh_rate != TIC_FRAMERATE; } - enum{MinDelay = 10}; - u64 nextTick = SDL_GetPerformanceCounter(); const u64 Delta = SDL_GetPerformanceFrequency() / TIC_FRAMERATE; @@ -2816,12 +2814,11 @@ s32 main(s32 argc, char **argv) if(studio.deSync < DESYNC_FRAMES) studio.deSync++; } - else if(delay >= MinDelay) + else { if(useDelay || SDL_GetWindowFlags(studio.window) & SDL_WINDOW_MINIMIZED) SDL_Delay((u32)(delay * 1000 / SDL_GetPerformanceFrequency())); } - else nextTick -= delay; if(delay >= 0 && studio.deSync > 0) studio.deSync--;
Add theme support to selection dialog
#include <phapp.h> #include <settings.h> +#include <phsettings.h> typedef struct _CHOICE_DIALOG_CONTEXT { @@ -259,6 +260,8 @@ INT_PTR CALLBACK PhpChoiceDlgProc( SWP_NOACTIVATE | SWP_NOZORDER); } + PhInitializeWindowTheme(hwndDlg, PhEnableThemeSupport); + PhSetDialogFocus(hwndDlg, comboBoxHandle); } break;
CAN: Fix critical section compliance This commit makes the CAN driver ISR use the ISR version of critical section.
@@ -151,6 +151,8 @@ typedef struct { static can_obj_t *p_can_obj = NULL; static portMUX_TYPE can_spinlock = portMUX_INITIALIZER_UNLOCKED; +#define CAN_ENTER_CRITICAL_ISR() portENTER_CRITICAL_ISR(&can_spinlock) +#define CAN_EXIT_CRITICAL_ISR() portEXIT_CRITICAL_ISR(&can_spinlock) #define CAN_ENTER_CRITICAL() portENTER_CRITICAL(&can_spinlock) #define CAN_EXIT_CRITICAL() portEXIT_CRITICAL(&can_spinlock) @@ -494,7 +496,7 @@ static void can_intr_handler_main(void *arg) can_status_reg_t status; can_intr_reg_t intr_reason; - CAN_ENTER_CRITICAL(); + CAN_ENTER_CRITICAL_ISR(); status.val = can_get_status(); intr_reason.val = (p_can_obj != NULL) ? can_get_interrupt_reason() : 0; //Incase intr occurs whilst driver is being uninstalled @@ -534,7 +536,7 @@ static void can_intr_handler_main(void *arg) } /* Todo: Check possible bug where transmitting self reception request then clearing rx buffer will cancel the transmission. */ - CAN_EXIT_CRITICAL(); + CAN_EXIT_CRITICAL_ISR(); if (p_can_obj->alert_semphr != NULL && alert_req) { //Give semaphore if alerts were triggered
bin: on listing help, put the pipeline in the right order
@@ -147,6 +147,13 @@ static void flb_help(int rc, struct flb_config *config) } printf(" %-22s%s\n", in->name, in->description); } + + printf("\n%sFilters%s\n", ANSI_BOLD, ANSI_RESET); + mk_list_foreach(head, &config->filter_plugins) { + filter = mk_list_entry(head, struct flb_filter_plugin, _head); + printf(" %-22s%s\n", filter->name, filter->description); + } + printf("\n%sOutputs%s\n", ANSI_BOLD, ANSI_RESET); mk_list_foreach(head, &config->out_plugins) { out = mk_list_entry(head, struct flb_output_plugin, _head); @@ -157,12 +164,6 @@ static void flb_help(int rc, struct flb_config *config) printf(" %-22s%s\n", out->name, out->description); } - printf("\n%sFilters%s\n", ANSI_BOLD, ANSI_RESET); - mk_list_foreach(head, &config->filter_plugins) { - filter = mk_list_entry(head, struct flb_filter_plugin, _head); - printf(" %-22s%s\n", filter->name, filter->description); - } - printf("\n%sInternal%s\n", ANSI_BOLD, ANSI_RESET); printf(" Event Loop = %s\n", mk_event_backend()); printf(" Build Flags = %s\n", FLB_INFO_FLAGS);
abi build parameter for xamarin
@@ -127,6 +127,7 @@ def buildXamarinNuget(args, target): parser = argparse.ArgumentParser() parser.add_argument('--profile', dest='profile', default='standard', type=validProfile, help='Build profile') +parser.add_argument('--android-abi', dest='androidabi', default=[], choices=ANDROID_ABIS + ['all'], action='append', help='Android target ABIs') parser.add_argument('--defines', dest='defines', default='', help='Defines for compilation') parser.add_argument('--xbuild', dest='xbuild', default='xbuild', help='Xamarin xbuild executable') parser.add_argument('--nuget', dest='nuget', default='nuget', help='nuget executable') @@ -141,6 +142,8 @@ parser.add_argument('--build-nuget', dest='buildnuget', default=False, action='s parser.add_argument(dest='target', choices=['android', 'ios'], help='Target platform') args = parser.parse_args() +if 'all' in args.androidabi or args.androidabi == []: + args.androidabi = ANDROID_ABIS if args.xbuild == 'auto': args.xbuild = DEFAULT_XBUILD elif args.xbuild == 'none': @@ -162,7 +165,7 @@ args.nativeconfiguration = args.configuration target = None if args.target == 'android': target = 'Android' - for abi in ANDROID_ABIS: + for abi in args.androidabi: if not buildAndroidSO(args, abi): exit(-1) elif args.target == 'ios':
doc: PG 12 relnotes - add item about amcheck index root check Reported-by: Peter Geoghegan Discussion: Backpatch-through: 12
@@ -3228,6 +3228,18 @@ Author: Tom Lane <[email protected]> <listitem> <!-- +Author: Peter Geoghegan <[email protected]> +2019-03-20 [c1afd175b] Allow amcheck to re-find tuples using new search. +--> + + <para> + Add a parameter to a <xref linkend="amcheck"/> function to check + each index tuple from the root of the tree. + </para> + </listitem> + + <listitem> +<!-- Author: Michael Paquier <[email protected]> 2018-08-28 [1aaf532de] Rework option set of oid2name Author: Michael Paquier <[email protected]>
rpi-base.inc: Split overlays and dtbs from KERNEL_DEVICETREE This is helpful for example in the cases where the kernel doesn't provide all the dtbs in arm64 as in arm.
@@ -14,16 +14,7 @@ XSERVER = " \ ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \ " -KERNEL_DEVICETREE ?= " \ - bcm2708-rpi-0-w.dtb \ - bcm2708-rpi-b.dtb \ - bcm2708-rpi-b-plus.dtb \ - bcm2709-rpi-2-b.dtb \ - bcm2710-rpi-3-b.dtb \ - bcm2710-rpi-3-b-plus.dtb \ - bcm2708-rpi-cm.dtb \ - bcm2710-rpi-cm3.dtb \ - \ +RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/dwc2.dtbo \ overlays/hifiberry-amp.dtbo \ overlays/hifiberry-dac.dtbo \ @@ -46,6 +37,22 @@ KERNEL_DEVICETREE ?= " \ overlays/at86rf233.dtbo \ " +RPI_KERNEL_DEVICETREE ?= " \ + bcm2708-rpi-0-w.dtb \ + bcm2708-rpi-b.dtb \ + bcm2708-rpi-b-plus.dtb \ + bcm2709-rpi-2-b.dtb \ + bcm2710-rpi-3-b.dtb \ + bcm2710-rpi-3-b-plus.dtb \ + bcm2708-rpi-cm.dtb \ + bcm2710-rpi-cm3.dtb \ + " + +KERNEL_DEVICETREE ?= " \ + ${RPI_KERNEL_DEVICETREE} \ + ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ + " + # By default: # # * When u-boot is disabled use the "Image" format which can be directly loaded
Changed 'dot' to 'source' Running Section changed the period to the word "source"
@@ -228,7 +228,7 @@ Murl is not supported in windows at this time. ## Running 1. `export LD_LIBRARY_PATH="<path to ssl lib;path to curl lib>"` -2. Modify and run `. 6scripts/nist_setup.sh` +2. Modify scripts/nist_setup.sh and run `source scripts/nist_setup.sh` 3. `./app/acvp_app --<options>` Use `./app/acvp_app --help` for more information on available options.
gstoraster: ".setfilladjust2" needs two zeros as arguments.
@@ -895,7 +895,7 @@ main (int argc, char **argv, char *envp[]) (t && (!strcasecmp(t, "true") || !strcasecmp(t, "on") || !strcasecmp(t, "yes")))) { fprintf(stderr, "DEBUG: Ghostscript using Center-of-Pixel method to fill paths.\n"); - cupsArrayAdd(gs_args, strdup("0 .setfilladjust2")); + cupsArrayAdd(gs_args, strdup("0 0 .setfilladjust2")); } else fprintf(stderr, "DEBUG: Ghostscript using Any-Part-of-Pixel method to fill paths.\n");
tests CHANGE enhance type compilation tests
@@ -768,8 +768,19 @@ test_type_pattern(void **state) assert_int_equal(3, ((struct lysc_type_str*)type)->patterns[0]->refcount); assert_int_equal(1, ((struct lysc_type_str*)type)->patterns[1]->refcount); + assert_non_null(mod = lys_parse_mem(ctx, "module c {namespace urn:c;prefix c;typedef mytype {type string {pattern '[0-9]*';}}" + "leaf l {type mytype {length 10;}}}", LYS_IN_YANG)); + assert_int_equal(LY_SUCCESS, lys_compile(mod, 0)); + type = ((struct lysc_node_leaf*)mod->compiled->data)->type; + assert_non_null(type); + assert_int_equal(LY_TYPE_STRING, type->basetype); + assert_int_equal(1, type->refcount); + assert_non_null(((struct lysc_type_str*)type)->patterns); + assert_int_equal(1, LY_ARRAY_SIZE(((struct lysc_type_str*)type)->patterns)); + assert_int_equal(2, ((struct lysc_type_str*)type)->patterns[0]->refcount); + /* test substitutions */ - assert_non_null(mod = lys_parse_mem(ctx, "module c {namespace urn:c;prefix c;leaf l {type string {" + assert_non_null(mod = lys_parse_mem(ctx, "module d {namespace urn:d;prefix d;leaf l {type string {" "pattern '^\\p{IsLatinExtended-A}$';}}}", LYS_IN_YANG)); assert_int_equal(LY_SUCCESS, lys_compile(mod, 0)); type = ((struct lysc_node_leaf*)mod->compiled->data)->type; @@ -878,6 +889,11 @@ test_type_enum(void **state) assert_int_equal(LY_EVALID, lys_compile(mod, 0)); logbuf_assert("Invalid enumeration - value 1 collide in items \"y\" and \"x\"."); + assert_non_null(mod = lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg;typedef mytype {type enumeration;}" + "leaf l {type mytype {enum one;}}}", LYS_IN_YANG)); + assert_int_equal(LY_EVALID, lys_compile(mod, 0)); + logbuf_assert("Missing enum substatement for enumeration type \"mytype\"."); + *state = NULL; ly_ctx_destroy(ctx, NULL); } @@ -970,6 +986,11 @@ test_type_bits(void **state) assert_int_equal(LY_EVALID, lys_compile(mod, 0)); logbuf_assert("Invalid bits - position 1 collide in items \"y\" and \"x\"."); + assert_non_null(mod = lys_parse_mem(ctx, "module gg {namespace urn:gg;prefix gg;typedef mytype {type bits;}" + "leaf l {type mytype {bit one;}}}", LYS_IN_YANG)); + assert_int_equal(LY_EVALID, lys_compile(mod, 0)); + logbuf_assert("Missing bit substatement for bits type \"mytype\"."); + *state = NULL; ly_ctx_destroy(ctx, NULL); }
[hardware] Cut ready path in TCDM adapter
@@ -103,19 +103,29 @@ module tcdm_adapter #( ); // Store response if it's not accepted immediately - fall_through_register #( - .T(logic[DataWidth-1:0]) - ) i_rdata_register ( + logic rdata_full, rdata_empty; + logic rdata_usage; + + // assign rdata_ready = !rdata_full; + assign rdata_ready = !rdata_usage && !rdata_full; + assign rdata_valid = !rdata_empty; + + fifo_v3 #( + .FALL_THROUGH (1'b1 ), + .DATA_WIDTH (DataWidth), + .DEPTH (2 ) + ) i_rdata_fifo ( .clk_i (clk_i ), .rst_ni (rst_ni ), - .clr_i (1'b0 ), + .flush_i (1'b0 ), .testmode_i (1'b0 ), - .data_i (out_rdata ), - .valid_i (out_gnt ), - .ready_o (rdata_ready), - .data_o (in_rdata_o ), - .valid_o (rdata_valid), - .ready_i (pop_resp ) + .full_o (rdata_full ),// queue is full + .empty_o (rdata_empty ),// queue is empty + .usage_o (rdata_usage ),// fill pointer + .data_i (out_rdata ),// data to push into the queue + .push_i (out_gnt ),// data is valid and can be pushed to the queue + .data_o (in_rdata_o ),// output data + .pop_i (pop_resp && !rdata_empty) ); localparam int unsigned CoreIdWidth = idx_width(NumCores); @@ -226,7 +236,7 @@ module tcdm_adapter #( always_comb begin // feed-through - in_ready_o = in_valid_o && !in_ready_i ? 1'b0 : 1'b1; + in_ready_o = rdata_ready; out_req_o = in_valid_i && in_ready_o; out_add_o = in_address_i; out_write_o = in_write_i || (sc_successful_d && (amo_op_t'(in_amo_i) == AMOSC)); @@ -341,8 +351,8 @@ module tcdm_adapter #( end `ifndef VERILATOR - rdata_full : assert property( - @(posedge clk_i) disable iff (~rst_ni) (out_gnt |-> rdata_ready)) + assert_rdata_full : assert property( + @(posedge clk_i) disable iff (~rst_ni) (out_gnt |-> !rdata_full)) else $fatal (1, "Trying to push new data although the i_rdata_register is not ready."); `endif // pragma translate_on
engine: dispatch: always set chunk up before to dispatch a retry
int flb_engine_dispatch_retry(struct flb_task_retry *retry, struct flb_config *config) { + size_t buf_size; struct flb_thread *th; struct flb_task *task; struct flb_input_instance *i_ins; @@ -41,6 +42,13 @@ int flb_engine_dispatch_retry(struct flb_task_retry *retry, task = retry->parent; i_ins = task->i_ins; + /* Set file up/down based on restrictions */ + flb_input_chunk_set_up(task->ic); + + /* There is a match, get the buffer */ + task->buf = flb_input_chunk_flush(task->ic, &buf_size); + task->size = buf_size; + th = flb_output_thread(task, i_ins, retry->o_ins,
Remove resumption and ecn tests from interop until fully supported.
if [ -n "$TESTCASE" ]; then case "$TESTCASE" in # TODO: add supported test cases here - "versionnegotiation"|"handshake"|"transfer"|"retry"|"resumption"|\ - "multiconnect"|"ecn"|"keyupdate") + "versionnegotiation"|"handshake"|"transfer"|"retry"|"multiconnect"|"keyupdate") ;; *) exit 127
Ensure we simply update the TUI once after tailing multiple files.
@@ -983,20 +983,20 @@ static void term_tail_logs (Logs * logs) { struct timespec ts = {.tv_sec = 0,.tv_nsec = 200000000 }; /* 0.2 seconds */ uint32_t offset = 0; - int i; + int i, ret; - for (i = 0; i < logs->size; ++i) { - if (perform_tail_follow (&logs->glog[i]) != 0) - continue; + for (i = 0, ret = 0; i < logs->size; ++i) + ret |= perform_tail_follow (&logs->glog[i]); + if (1 == ret) { tail_term (); offset = *logs->processed - logs->offset; render_screens (offset); + } if (nanosleep (&ts, NULL) == -1 && errno != EINTR) { FATAL ("nanosleep: %s", strerror (errno)); } } -} /* Interfacing with the keyboard */ static void
Reenable logs
#include "kdbprivate.h" #include "elektra_private.h" #include "elektra_error_private.h" +#include <kdblogger.h> #include "stdio.h" @@ -378,7 +379,7 @@ void setValueAsString (Elektra * elektra, const char * name, const char * value, Key * problemKey = ksCurrent (elektra->config); if (problemKey != NULL) { -// ELEKTRA_LOG_DEBUG("problemKey: %s\n", keyName (problemKey)); + ELEKTRA_LOG_DEBUG("problemKey: %s\n", keyName (problemKey)); } kdbGet (elektra->kdb, elektra->config, elektra->parentKey); @@ -418,7 +419,7 @@ void setArrayElementValueAsString (Elektra * elektra, const char * name, const c Key * problemKey = ksCurrent (elektra->config); if (problemKey != NULL) { -// ELEKTRA_LOG_DEBUG("problemKey: %s\n", keyName (problemKey)); + ELEKTRA_LOG_DEBUG("problemKey: %s\n", keyName (problemKey)); } kdbGet (elektra->kdb, elektra->config, elektra->parentKey); @@ -456,7 +457,7 @@ static Key * lookup (Elektra * elektra, Key * key) Key * const resultKey = ksLookup (elektra->config, key, 0); if (resultKey == NULL) { -// ELEKTRA_LOG_DEBUG("Key not found: %s\n", keyName (key)); + ELEKTRA_LOG_DEBUG("Key not found: %s\n", keyName (key)); exit (EXIT_FAILURE); } @@ -467,7 +468,7 @@ static void checkType (Key * key, KDBType type) { if (strcmp (keyString (keyGetMeta (key, "type")), type)) { -// ELEKTRA_LOG_DEBUG("Wrong type. Should be: %s\n", type); + ELEKTRA_LOG_DEBUG("Wrong type. Should be: %s\n", type); exit (EXIT_FAILURE); } }
Build libs with MinGW.
@@ -14,6 +14,10 @@ docker build -t ${IMAGE_NAME} -f - "${ROOT_DIR}" <<-END WORKDIR /tinyspline END +MINGW_LIBS="\ +/usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/libstdc++-6.dll\ +\;/usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/libgcc_s_seh-1.dll" + docker run \ --rm \ --volume "${VOLUME}:${STORAGE}" \ @@ -223,6 +227,35 @@ docker run \ /opt/linux/python39/bin/python3 setup.py bdist_wheel && \ chown $(id -u):$(id -g) dist/*.whl && \ cp -a dist/*.whl ${STORAGE}/macosx64 && \ + popd && \ + mkdir -p ${STORAGE}/windows64 && \ + chown $(id -u):$(id -g) ${STORAGE}/windows64 && \ + mkdir windows64 && pushd windows64 && \ + CC=x86_64-w64-mingw32-gcc-win32 \ + CXX=x86_64-w64-mingw32-g++-win32 \ + JAVA_HOME=/opt/wincross/java \ + cmake .. \ + -DCMAKE_SYSTEM_NAME=Windows \ + -DCMAKE_BUILD_TYPE=Release \ + -DTINYSPLINE_RUNTIME_LIBRARIES=${MINGW_LIBS} \ + -DTINYSPLINE_ENABLE_CSHARP=True \ + -DTINYSPLINE_ENABLE_DLANG=True \ + -DTINYSPLINE_ENABLE_JAVA=True \ + -DJava_JAVAC_EXECUTABLE=/usr/bin/javac \ + -DJava_JAR_EXECUTABLE=/usr/bin/jar && \ + cmake --build . --target tinysplinecsharp && \ + nuget pack && \ + chown $(id -u):$(id -g) *.nupkg && \ + cp -a *.nupkg ${STORAGE}/windows64 && \ + dub build && \ + tar czf tinysplinedlang.tar.gz dub && \ + chown $(id -u):$(id -g) tinysplinedlang.tar.gz && \ + cp -a tinysplinedlang.tar.gz ${STORAGE}/windows64 && \ + mvn package && \ + chown $(id -u):$(id -g) target/*.jar && \ + cp -a target/*.jar ${STORAGE}/windows64 && \ + chown $(id -u):$(id -g) pom.xml && \ + cp -a pom.xml ${STORAGE}/windows64 && \ popd" docker rmi ${IMAGE_NAME}
fix: actor-gen.exe needs -lm and delete the generated files in clean
@@ -128,7 +128,7 @@ $(OBJDIR)/%.cc.o: %.cc $(CXX) $(CXXFLAGS) $(LIBS_CFLAGS) $(GENFLAGS) -c -o $@ $< actor-gen.exe: mkdir $(ACTOR_GEN_OBJS) - $(CC) -o $@ $(ACTOR_GEN_OBJS) + $(CC) -o $@ $(ACTOR_GEN_OBJS) -lm mv $@ ./bin #generic compilation @@ -151,7 +151,7 @@ clean_specs : rm -f specs/*.cc specs/*.h clean : clean_specs - rm -rf $(OBJDIR) *.exe test/*.exe bots/*.exe + rm -rf $(OBJDIR) *.exe test/*.exe bots/*.exe bin/*
fixed code size condition on saving
@@ -206,7 +206,7 @@ s32 tic_cart_save(const tic_cartridge* cart, u8* buffer) buffer = SAVE_CHUNK(CHUNK_FLAGS, cart->banks[i].flags, i); } - if(strlen(cart->code.data) > TIC_CODE_BANK_SIZE) + if(strlen(cart->code.data) >= TIC_CODE_BANK_SIZE) { char* dst = malloc(TIC_CODE_BANK_SIZE); s32 size = tic_tool_zip(dst, TIC_CODE_BANK_SIZE, cart->code.data, strlen(cart->code.data));
VERSION bump to version 2.2.17
@@ -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 16) +set(SYSREPO_MICRO_VERSION 17) set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_MICRO_VERSION}) # Version of the library
jenkins: add CentOS test stage
@@ -368,11 +368,18 @@ def dockerInit() { /* openSUSE Leap 15.3 image*/ DOCKER_IMAGES.opensuse_15_3 = dockerUtils.createDockerImageDesc( - "opensuse_15.3", dockerUtils.&idTesting, + "opensuse-15-3", dockerUtils.&idTesting, "./scripts/docker/opensuse/15.3", "./scripts/docker/opensuse/15.3/Dockerfile" ) + /* CentOS Stream 8 image*/ + DOCKER_IMAGES.centos_stream8 = dockerUtils.createDockerImageDesc( + "centos-stream-8", dockerUtils.&idTesting, + "./scripts/docker/centos/stream8", + "./scripts/docker/centos/stream8/Dockerfile" + ) + /* Image building the libelektra.org website */ DOCKER_IMAGES.website = dockerUtils.createDockerImageDesc( "website", dockerUtils.&idArtifact, @@ -551,13 +558,21 @@ def generateFullBuildStages() { ) tasks << buildAndTest( - "opensuse-15.3", + "opensuse-15-3", DOCKER_IMAGES.opensuse_15_3, CMAKE_FLAGS_BUILD_ALL+ CMAKE_FLAGS_DEBUG, [TEST.ALL, TEST.MEM, TEST.INSTALL] ) + tasks << buildAndTest( + "centos-stream-8", + DOCKER_IMAGES.centos_stream8, + CMAKE_FLAGS_BUILD_ALL+ + CMAKE_FLAGS_DEBUG, + [TEST.ALL, TEST.MEM, TEST.INSTALL] + ) + // Add a task that should build the whole project to catch all test errors // in a standard environment tasks << buildAndTest(
sicslowpan: fix compilation with fragmentation disabled
@@ -1461,6 +1461,7 @@ send_packet(linkaddr_t *dest) watchdog know that we are still alive. */ watchdog_periodic(); } +#if SICSLOWPAN_CONF_FRAG /*--------------------------------------------------------------------*/ /** * \brief This function is called by the 6lowpan code to copy a fragment's @@ -1501,6 +1502,7 @@ fragment_copy_payload_and_send(uint16_t uip_offset, linkaddr_t *dest) { } return 1; } +#endif /* SICSLOWPAN_CONF_FRAG */ /*--------------------------------------------------------------------*/ /** \brief Take an IP packet and format it to be sent on an 802.15.4 * network using 6lowpan. @@ -1868,11 +1870,12 @@ input(void) } packetbuf_payload_len = packetbuf_datalen() - packetbuf_hdr_len; +#if SICSLOWPAN_CONF_FRAG if(is_fragment) { LOG_INFO("input: fragment (tag %d, payload %d, offset %d)\n", frag_tag, packetbuf_payload_len, frag_offset << 3); } - +#endif /*SICSLOWPAN_CONF_FRAG*/ /* Sanity-check size of incoming packet to avoid buffer overflow */ {
esp-tls: Added support for fragmenting outgoing data in tls_write(), for cases of out data being larger than the maximum out buffer of underlying tls-stack.
@@ -551,15 +551,32 @@ static ssize_t tcp_write(esp_tls_t *tls, const char *data, size_t datalen) static ssize_t tls_write(esp_tls_t *tls, const char *data, size_t datalen) { - ssize_t ret = mbedtls_ssl_write(&tls->ssl, (unsigned char*) data, datalen); - if (ret < 0) { - if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) { + size_t written = 0; + size_t write_len = datalen; + while (written < datalen) { + if (write_len > MBEDTLS_SSL_OUT_CONTENT_LEN) { + write_len = MBEDTLS_SSL_OUT_CONTENT_LEN; + } + if (datalen > MBEDTLS_SSL_OUT_CONTENT_LEN) { + ESP_LOGD(TAG, "Fragmenting data of excessive size :%d, offset: %d, size %d", datalen, written, write_len); + } + ssize_t ret = mbedtls_ssl_write(&tls->ssl, (unsigned char*) data + written, write_len); + if (ret <= 0) { + if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE && ret != 0) { ESP_INT_EVENT_TRACKER_CAPTURE(tls->error_handle, ERR_TYPE_MBEDTLS, -ret); ESP_INT_EVENT_TRACKER_CAPTURE(tls->error_handle, ERR_TYPE_ESP, ESP_ERR_MBEDTLS_SSL_WRITE_FAILED); ESP_LOGE(TAG, "write error :%d:", ret); + return ret; + } else { + // Exitting the tls-write process as less than desired datalen are writable + ESP_LOGD(TAG, "mbedtls_ssl_write() returned %d, already written %d, exitting...", ret, written); + return written; } } - return ret; + written += ret; + write_len = datalen - written; + } + return written; } static int esp_tls_low_level_conn(const char *hostname, int hostlen, int port, const esp_tls_cfg_t *cfg, esp_tls_t *tls)
Better tag size default for m-aead finish
@@ -3772,7 +3772,7 @@ psa_status_t psa_aead_finish( psa_aead_operation_t *operation, psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; *ciphertext_length = 0; - *tag_length = 0; + *tag_length = tag_size; if( operation->id == 0 ) {
buildrequire libstdc++
@@ -45,6 +45,7 @@ BuildRequires: perl BuildRequires: python BuildRequires: pkgconfig BuildRequires: binutils-devel +BuildRequires: libstdc++-devel Requires: binutils Requires: gnu-compilers%{PROJ_DELIM} = %{gnuver} %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?rhel}
Modules: show path and args in LIST reply
@@ -8667,11 +8667,19 @@ void addReplyLoadedModules(client *c) { while ((de = dictNext(di)) != NULL) { sds name = dictGetKey(de); struct RedisModule *module = dictGetVal(de); - addReplyMapLen(c,2); + sds path = module->loadmod->path; + addReplyMapLen(c,4); addReplyBulkCString(c,"name"); addReplyBulkCBuffer(c,name,sdslen(name)); addReplyBulkCString(c,"ver"); addReplyLongLong(c,module->ver); + addReplyBulkCString(c,"path"); + addReplyBulkCBuffer(c,path,sdslen(path)); + addReplyBulkCString(c,"args"); + addReplyArrayLen(c,module->loadmod->argc); + for (int i = 0; i < module->loadmod->argc; i++) { + addReplyBulk(c,module->loadmod->argv[i]); + } } dictReleaseIterator(di); }
Modfify dummy test to work on hw
@@ -457,11 +457,15 @@ TEST(pluginmgr_c_p, dummy_plugin) { EXPECT_STREQ(output.c_str(), "hello plugin!\n"); uint32_t matches = 0; - EXPECT_EQ(fpgaEnumerate(nullptr, 0, nullptr, 0, &matches), FPGA_OK); + fpga_properties filter = NULL; + uint16_t device_id = 49178; + EXPECT_EQ(fpgaGetProperties(nullptr, &filter), FPGA_OK); + EXPECT_EQ(fpgaPropertiesSetDeviceID(filter, device_id), FPGA_OK); + EXPECT_EQ(fpgaEnumerate(&filter, 1, nullptr, 0, &matches), FPGA_OK); EXPECT_EQ(matches, 99); std::array<fpga_token, 99> tokens = {0}; std::array<fpga_handle, 99> handles = {0}; - EXPECT_EQ(fpgaEnumerate(nullptr, 0, tokens.data(), tokens.size(), &matches), + EXPECT_EQ(fpgaEnumerate(&filter, 1, tokens.data(), tokens.size(), &matches), FPGA_OK); int i = 0; for (auto t : tokens) {
LICENSE: add license for ubloxmodem document the license in the LICENSE file
@@ -1320,3 +1320,37 @@ apps/system/telnet/telnet_client.c LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +apps/system/ubloxmodem/ubloxmodem_main.c +apps/system/ubloxmodem/ubloxmodem.h +=================================== + + Copyright (C) 2016 Vladimir Komendantskiy. All rights reserved. + Author: Vladimir Komendantskiy <[email protected]> + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. Neither the name NuttX nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE.
Fix dsaparam -genkey with DER outform
@@ -195,6 +195,9 @@ int dsaparam_main(int argc, char **argv) OPENSSL_free(data); } + if (outformat == FORMAT_ASN1 && genkey) + noout = 1; + if (!noout) { if (outformat == FORMAT_ASN1) i = i2d_DSAparams_bio(out, dsa);
arvo: improves faces in vane install/upgrade
%= ..pith van %+ roll van.job - |= [[(cask hoof)] =_van] + |= [[nam=term txt=hoof] =_van] ^+ van - =/ way (wilt p) - =/ nex (create:va zus way /sys/vane/[p]/hoon q) + =/ way (wilt nam) + =/ nex (create:va zus way /sys/vane/[nam]/hoon txt) =/ nav (~(get by van) way) =? nex ?=(^ nav) (update:va vase.u.nav nex) (~(put by van) way (settle:va nex))
[cmake] come back to default options
# mechanisms is "off" by default. # Check https://nonsmooth.gricad-pages.univ-grenoble-alpes.fr/siconos/install_guide/install_guide.html#id6 # for details about components. -# set(COMPONENTS externals numerics kernel control mechanics io CACHE INTERNAL "List of siconos components to build and install") -set(COMPONENTS externals numerics CACHE INTERNAL "List of siconos components to build and install") +set(COMPONENTS externals numerics kernel control mechanics io CACHE INTERNAL "List of siconos components to build and install") + option(WITH_PYTHON_WRAPPER "Build and install python bindings using swig. Default = ON" ON) @@ -55,7 +55,7 @@ option(WITH_UMFPACK "Compilation with the UMFPACK solver. Default = OFF" OFF) option(WITH_SUPERLU "Compilation with the SuperLU solver. Default = OFF" OFF) option(WITH_SUPERLU_MT "Compilation with the SuperLU solver, multithreaded version. Default = OFF" OFF) option(WITH_MA57 "Compilation with the MA57 solver (License HSL). Default = OFF" OFF) -option(WITH_FCLIB "link with fclib when this mode is enable. Default = OFF" ON) +option(WITH_FCLIB "link with fclib when this mode is enable. Default = OFF" OFF) option(WITH_FREECAD "Use FreeCAD. Default = OFF" OFF) option(WITH_RENDERER "Install OCC renderer. Default = OFF" OFF) option(WITH_SYSTEM_SUITESPARSE "Use SuiteSparse installed on the system instead of built-in CXSparse library. Default = ON" ON)
Update some exp cone params to ensure greater accuracy (though slower).
#include "scs_blas.h" /* contains BLAS(X) macros and type info */ #include "util.h" -#define CONE_RATE (2) -#define CONE_TOL (1e-8) -#define CONE_THRESH (1e-6) +/* #define CONE_RATE (2) */ +#define CONE_TOL (1e-10) +#define CONE_THRESH (1e-8) #define EXP_CONE_MAX_ITERS (100) #define POW_CONE_MAX_ITERS (20) @@ -257,6 +257,9 @@ static scs_float exp_newton_one_d(scs_float rho, scs_float y_hat, break; } } + if (i == EXP_CONE_MAX_ITERS) { + scs_printf("warning: exp cone proj took maximum %i iters\n", (int)i); + } return t + z_hat; }
examples:dns_matching: added pragma directive for loop unrolling Loop unrolling was not working because of if-condition in the loop. Added #pragma unroll directive.
@@ -84,7 +84,7 @@ int dns_matching(struct __sk_buff *skb) u16 i = 0; struct dns_char_t *c; - // This unroll worked not in latest BCC version. + #pragma unroll for(i = 0; i<255;i++){ if (cursor == sentinel) goto end; c = cursor_advance(cursor, 1); key.p[i] = c->c; }
Fix tiny typo in Yara.Match docs
@@ -437,7 +437,7 @@ Reference .. py:attribute:: tags - Array of strings containig the tags associated to the matching rule. + Array of strings containing the tags associated to the matching rule. .. py:attribute:: meta
Delete null check before mrb_gc_unregister receivers for channel
@@ -38,9 +38,7 @@ static void on_gc_dispose_channel(mrb_state *mrb, void *_ctx) { struct st_h2o_mruby_channel_context_t *ctx = _ctx; assert(ctx != NULL); /* ctx can only be disposed by gc, so data binding has been never removed */ - if (!mrb_nil_p(ctx->receivers)) { mrb_gc_unregister(mrb, ctx->receivers); - } free(ctx); }
Fix missing braces from previous commit (PR3600)
@@ -6,7 +6,7 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL GNU) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-tree-vectorize") endif() if (CMAKE_Fortran_COMPILER_ID STREQUAL Flang) - set(CMAKE_Fortran_FLAGS "$CMAKE_Fortran_FLAGS -O2") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O2") endif() if (BUILD_SINGLE)
update kernel requirement
@@ -109,7 +109,7 @@ Requirements * detailed knowledge of 802.11 protocol * detailed knowledge of key derivation functions * detailed knowledge of Linux -* operatingsystem: Linux distribution, Kernel >= 5.10 +* operatingsystem: Linux distribution, Kernel >= 5.15 * recommended: Arch Linux on notebooks and desktop systems, Arch Linux Arm on Raspberry Pi >= ARMv7 systems, Raspbian OS Lite on Raspberry Pi ARMv6 systems * chipset must be able to run in monitor mode. Recommended: MEDIATEK (MT7601) or RALINK (RT2870, RT3070, RT5370) chipset * driver must (mandatory) support monitor mode as well as full packet injection and ioctl() system calls