[PATCH] Valgrind print symbol of ld.so
Hello, I made patch for print symbold of ld.so, if error was occured as below: Before apply this patch: $ valgrind ./a.out ==62211== Memcheck, a memory error detector ==62211== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al. ==62211== Using Valgrind-3.10.1 and LibVEX; rerun with -h for copyright info ==62211== Command: ./a.out ==62211== ==62211== Invalid write of size 1 ==62211==at 0x4108E72: ??? ==62211==by 0x4108374: ??? ==62211==by 0x41096FA: ??? ==62211==by 0x4102D4E: ??? ==62211==by 0x4103986: ??? ==62211==by 0x4104535: ??? ==62211== Address 0x40052a0 is not stack'd, malloc'd or (recently) free'd ==62211== After apply this patch: $ valgrind ./a.out ==81691== Memcheck, a memory error detector ==81691== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al. ==81691== Using Valgrind-3.10.1 and LibVEX; rerun with -h for copyright info ==81691== Command: ./a.out ==81691== ==81691== Invalid write of size 1 ==81691==at 0x4108E72: chacha_encrypt_bytes (chacha_private.h:191) ==81691==by 0x4108374: _dl_arc4randombuf (util.c:98) ==81691==by 0x41096FA: rbytes_init (malloc.c:187) ==81691==by 0x4102D4E: _dl_malloc_init (in /usr/libexec/ld.so) ==81691==by 0x4103986: _dl_boot (in /usr/libexec/ld.so) ==81691==by 0x4104535: _dl_start (in /usr/libexec/ld.so) ==81691== Address 0x40053e0 is not stack'd, malloc'd or (recently) free'd ==81691== Regards Index: Makefile === RCS file: /cvs/ports/devel/valgrind/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile23 Dec 2019 23:26:32 - 1.23 +++ Makefile3 Apr 2020 03:12:38 - @@ -7,7 +7,7 @@ CATEGORIES =devel V =3.10.1 PV = 20160331 -REVISION = 16 +REVISION = 17 DISTNAME = valgrind-${V} EXTRACT_SUFX = .tar.bz2 Index: patches/patch-coregrind_m_libcfile_c === RCS file: patches/patch-coregrind_m_libcfile_c diff -N patches/patch-coregrind_m_libcfile_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-coregrind_m_libcfile_c3 Apr 2020 03:12:38 - @@ -0,0 +1,129 @@ +--- coregrind/m_libcfile.c coregrind/m_libcfile.c +@@ -40,6 +40,9 @@ + #include "pub_core_xarray.h" + #include "pub_core_clientstate.h" // VG_(fd_hard_limit) + #include "pub_core_syscall.h" ++#if defined(VGO_openbsd) ++#include "pub_core_mallocfree.h" ++#endif + + /* IMPORTANT: on Darwin it is essential to use the _nocancel versions +of syscalls rather than the vanilla version, if a _nocancel version +@@ -165,6 +168,90 @@ + } + #endif + ++#if defined(VGO_openbsd) ++/* - ++ File-descriptor tracking ++ -- */ ++ ++/* One of these is allocated for each open file descriptor. */ ++typedef struct OpenFd ++{ ++ Int fd;/* The file descriptor */ ++ HChar *pathname; /* NULL if not a regular file or unknown */ ++ struct OpenFd *next, *prev; ++} OpenFd; ++ ++/* List of allocated file descriptors. */ ++static OpenFd *opened_fds = NULL; ++ ++/* Note the fact that a file descriptor was just closed. */ ++static ++void delete_fd(Int fd) ++{ ++ OpenFd *i = opened_fds; ++ ++ while(i) { ++ if(i->fd == fd) { ++ if(i->prev) ++i->prev->next = i->next; ++ else ++opened_fds = i->next; ++ if(i->next) ++i->next->prev = i->prev; ++ if(i->pathname) ++VG_(arena_free) (VG_AR_CORE, i->pathname); ++ VG_(arena_free) (VG_AR_CORE, i); ++ break; ++ } ++ i = i->next; ++ } ++} ++ ++/* Note the fact that a file descriptor was just opened. */ ++static ++void register_fd(Int fd, const HChar *pathname) ++{ ++ OpenFd *i; ++ ++ /* Check to see if this fd is already open. */ ++ i = opened_fds; ++ while (i) { ++ if (i->fd == fd) { ++ if (i->pathname) VG_(arena_free)(VG_AR_CORE, i->pathname); ++ break; ++ } ++ i = i->next; ++ } ++ ++ /* Not already one: allocate an OpenFd */ ++ if (i == NULL) { ++ i = VG_(arena_malloc)(VG_AR_CORE, "libcfile.regfd.1", sizeof(OpenFd)); ++ ++ i->prev = NULL; ++ i->next = opened_fds; ++ if(opened_fds) opened_fds->prev = i; ++ opened_fds = i; ++ } ++ ++ i->fd = fd; ++ i->pathname = VG_(arena_strdup)(VG_AR_CORE, "libcfile.regfd.2", pathname); ++} ++ ++extern char *VG_(pathname_by_fd)(Int); ++ ++char * ++VG_(pathname_by_fd)(Int fd) ++{ ++ OpenFd *a; ++ ++ for (a = opened_fds; a; a = a->next) { ++ if (a->fd == fd && a->pathname) ++ return a->pathname; ++ } ++ return NULL; ++} ++#endif ++ + SysRes VG_(open) ( const HChar* pathname, Int flags, Int mode ) + { + # if
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2020/04/02 20:54:46 Modified files: devel/p5-Mouse : Makefile distinfo Log message: Update devel/p5-Mouse to 2.5.10 >From wen heping
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/04/02 20:47:53 Modified files: shells/elvish : Makefile distinfo Log message: Update to elvish-0.13.1 Fix crash when running external command with port table nil values.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2020/04/02 20:31:46 Modified files: devel/p5-Module-Build-XSUtil: Makefile distinfo Log message: Update devel/p5-Module-Build-XSUtil to 0.19 >From wen heping
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/04/02 19:47:41 Modified files: lang/ruby/2.7 : Makefile distinfo lang/ruby/2.7/pkg: PLIST-main PLIST-ri_docs Log message: Update to Ruby 2.7.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/04/02 19:47:05 Modified files: lang/ruby/2.6 : Makefile distinfo lang/ruby/2.6/pkg: PLIST-gdbm PLIST-main Log message: Update to Ruby 2.6.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/04/02 19:45:59 Modified files: lang/ruby/2.5 : Makefile distinfo lang/ruby/2.5/pkg: PLIST-gdbm PLIST-main Log message: Update to Ruby 2.5.8
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/04/02 19:17:28 Modified files: devel/git : Makefile Log message: Provide debug package for -main
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2020/04/02 17:03:00 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register haproxy-2.0.14 as it fixes CVE-2020-11100
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2020/04/02 17:01:17 Modified files: net/haproxy: Makefile distinfo Log message: Update to haproxy-2.0.14 >From the Announce email: The main driver for this release is that it contains a fix for a serious vulnerability that was responsibly reported last week by Felix Wilhelm from Google Project Zero, affecting the HPACK decoder used for HTTP/2. CVE-2020-11100 was assigned to this issue. This vulnerability makes it possible under certain circumstances to write to a wide range of memory locations within the process' heap, with the limitation that the attacker doesn't control the absolute address, so the most likely result and by a far margin will be a process crash, but it is not possible to completely rule out the faint possibility of a remote code execution, at least in a lab-controlled environment.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2020/04/02 16:50:17 Modified files: mail/libetpan : Makefile Log message: Switch homepage to https as pointed out by rsadowski
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2020/04/02 16:49:33 Modified files: mail/libetpan : Makefile Log message: Drop maintainership
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/04/02 14:38:45 Modified files: www/puppetboard: Makefile distinfo Log message: Update 2.1.0 -> 2.1.1
math/py-scipy,python3 build failure
math/py-scipy,python3 failed to build in my latest amd64 bulk build. This was before the py-numpy update. It seems that libcblas is picked up during the build, but there is no dependency. Anyway, I'm appending the full log. Somebody with interest in that area please have a look. -- Christian "naddy" Weisgerber na...@mips.inka.de py-scipy,python3.log.xz Description: application/xz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/04/02 13:36:08 Modified files: editors/nano : Makefile distinfo Log message: Update to 4.9.1. Fixes two bug introduced in 4.9: The cursor was misplaced when undoing line cuts, and filtering of the whole buffer to a new buffer did not work.
Re: fix nodejs/node-gyp tarball version
On Thu, Apr 02, 2020 at 09:05:01AM -0600, Aaron Bieber wrote: > On Thu, 02 Apr 2020 at 15:54:03 +0200, Jeremie Courreges-Anglas wrote: > > > > +cc maintainer ;) > > > > On Thu, Apr 02 2020, Denis Fondras wrote: > > > node-gyp needs to know about the installed Node.js version. > > > > > > This needs to be updated each time Node.js is upgraded. May we do this > > > automatically with sed in Makefile pre-patch section ? > > > > pre-configure already uses ${SUBST_CMD} on this file. > > With this diff you should be able to use ${NODE_VERSION} in > > patches/patch-deps_npm_node_modules_node-gyp_lib_install_js (untested). > > So upstream ships -headers distfiles now - we should be using that instead of > the full tarball. Alternatively, we could completely remove this fix as we > don't have native modules in tree anymore. > > Here is a diff that updates node to the latest version and includes a fix to > store the -headers file: > https://deftly.net/patches/node-12.16.1.diff > Thank you for the diff Aaron. OK denis@ with a fix (deps/npm/node_modules/node-gyp/lib/install.js is missing '/share' in the path). diff --git a/lang/node/Makefile b/lang/node/Makefile index b06ab358476..b9baa0b4b13 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -11,9 +11,11 @@ USE_WXNEEDED = Yes COMMENT = V8 JavaScript for clients and servers -NODE_VERSION = v12.13.1 +NODE_VERSION = v12.16.1 PLEDGE_VER = 1.1.2 -DISTFILES =node-pledge-{}${PLEDGE_VER}.tar.gz:0 ${DISTNAME}.tar.gz +DISTFILES =node-pledge-{}${PLEDGE_VER}.tar.gz:0 \ + ${DISTNAME}-headers.tar.gz \ + ${DISTNAME}.tar.gz DISTNAME = node-${NODE_VERSION} PKGNAME = ${DISTNAME:S/v//g} @@ -24,8 +26,6 @@ CATEGORIES = lang devel HOMEPAGE = http://nodejs.org/ -MAINTAINER = Aaron Bieber - # MIT PERMIT_PACKAGE = Yes @@ -63,6 +63,8 @@ SUBST_VARS += EXTRACT_SUFX SUBST_VARS += LOCALBASE SUBST_VARS += PREFIX SUBST_VARS += WRKDIST +SUBST_VARS += MAKE_PROGRAM +SUBST_VARS += NODE_VERSION MAKE_ENV +=V=1 CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -82,6 +84,7 @@ pre-configure: ${WRKDIST}/deps/npm/bin/node-gyp-bin/node-gyp \ ${WRKDIST}/deps/npm/node_modules/node-gyp/lib/find-python.js \ ${WRKDIST}/deps/npm/node_modules/node-gyp/lib/install.js \ + ${WRKDIST}/deps/openssl/config/generate_gypi.pl \ ${WRKDIST}/node.gyp \ ${WRKDIST}/common.gypi \ ${WRKDIST}/tools/test.py @@ -96,8 +99,8 @@ post-install: ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ ${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp ${INSTALL_DATA_DIR} ${PREFIX}/share/node - ${INSTALL_DATA} ${FULLDISTDIR}/${DISTNAME}.tar.gz \ - ${PREFIX}/share/node/${DISTNAME}.tar.gz + ${INSTALL_DATA} ${FULLDISTDIR}/${DISTNAME}-headers.tar.gz \ + ${PREFIX}/share/node/${DISTNAME}-headers.tar.gz ln -s ${TRUEPREFIX}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp \ ${PREFIX}/bin/node-gyp; cd ${PREFIX}/lib/node_modules/npm/node_modules && for x in *; do \ diff --git a/lang/node/distinfo b/lang/node/distinfo index 894a6f96fd0..8b606c87328 100644 --- a/lang/node/distinfo +++ b/lang/node/distinfo @@ -1,4 +1,6 @@ SHA256 (node-pledge-1.1.2.tar.gz) = zY/JcbZ32mmtqWXXNn3/9aTh7Y3F6fAAaADDA8SYwEk= -SHA256 (node-v12.13.1.tar.gz) = TucQCHaHyN4UIynZUIX1y6ZuRUosnqfsEeH0tHbW0aw= +SHA256 (node-v12.16.1-headers.tar.gz) = gV5zJWG2vhsjibDKxT40tlrRg1pfA1TZiI2ZKkYTlH8= +SHA256 (node-v12.16.1.tar.gz) = T+jDRU+b7lu+ctRKolzZMYWbMDe3qUcwgbOyvRtGW5U= SIZE (node-pledge-1.1.2.tar.gz) = 3155 -SIZE (node-v12.13.1.tar.gz) = 50682874 +SIZE (node-v12.16.1-headers.tar.gz) = 563107 +SIZE (node-v12.16.1.tar.gz) = 52290732 diff --git a/lang/node/patches/patch-common_gypi b/lang/node/patches/patch-common_gypi index 8fbbed51969..f7f66b51d95 100644 --- a/lang/node/patches/patch-common_gypi +++ b/lang/node/patches/patch-common_gypi @@ -3,13 +3,13 @@ $OpenBSD: patch-common_gypi,v 1.13 2019/11/24 18:42:28 abieber Exp $ Index: common.gypi --- common.gypi.orig +++ common.gypi -@@ -497,6 +497,10 @@ +@@ -498,6 +498,10 @@ '-Wl,--export-dynamic', ], }], + ['OS=="openbsd"', { -+'cflags': [ '-I/usr/local/include' ], -+'libraries': [ '-L/usr/local/lib' ], ++'cflags': [ '-I${LOCALBASE}/include' ], ++'libraries': [ '-L${LOCALBASE}/lib' ], + }], # if node is built as an executable, # the openssl mechanism for keeping itself "dload"-ed to ensure proper diff --git
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/02 10:33:19 Modified files: net/dhcpcd : Makefile distinfo net/dhcpcd/pkg : PLIST dhcpcd.rc Log message: update to dhcpcd-9.0.0, now with privsep
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/04/02 10:33:41 Modified files: mail/rspamd: Makefile distinfo mail/rspamd/pkg: PLIST Log message: update to rspamd-2.5
Re: [UPDATE] lang/mruby to 2.1.0
On 2020/04/02 15:44, Frederic Cambus wrote: > Hi ports@, > > Here is a diff to update mruby to 2.1.0. > > Tested on amd64, test suite passes without errors. > > Comments? OK? does www/h2o,mruby still build ok?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/04/02 10:09:27 Modified files: sysutils/tmate : Makefile Added files: sysutils/tmate/patches: patch-Makefile_am Log message: Remove hardcoded -O2 to honor DEBUG, keep debug mode enabled if set
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/02 09:20:59 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-287.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/04/02 09:12:00 Modified files: www/iridium: Makefile distinfo www/iridium/files: pledge.utility_audio pledge.utility_network unveil.main www/iridium/patches: patch-BUILD_gn patch-apps_ui_views_app_window_frame_view_cc patch-ash_display_mirror_window_controller_cc patch-base_BUILD_gn patch-base_allocator_allocator_gni patch-base_allocator_allocator_shim_cc patch-base_atomicops_h patch-base_base_paths_posix_cc patch-base_base_switches_cc patch-base_base_switches_h patch-base_debug_debugger_posix_cc patch-base_debug_elf_reader_cc patch-base_debug_proc_maps_linux_cc patch-base_debug_stack_trace_posix_cc patch-base_files_file_path_watcher_kqueue_h patch-base_files_file_path_watcher_stub_cc patch-base_files_file_util_posix_cc patch-base_i18n_icu_util_cc patch-base_linux_util_cc patch-base_memory_platform_shared_memory_region_h patch-base_memory_platform_shared_memory_region_posix_cc patch-base_native_library_posix_cc patch-base_posix_can_lower_nice_to_cc patch-base_posix_unix_domain_socket_cc patch-base_process_kill_h patch-base_process_kill_posix_cc patch-base_process_launch_h patch-base_process_memory_cc patch-base_process_process_handle_cc patch-base_process_process_handle_h patch-base_process_process_handle_openbsd_cc patch-base_process_process_iterator_openbsd_cc patch-base_process_process_metrics_cc patch-base_process_process_metrics_h patch-base_process_process_metrics_openbsd_cc patch-base_process_process_metrics_posix_cc patch-base_process_process_posix_cc patch-base_rand_util_h patch-base_rand_util_posix_cc patch-base_syslog_logging_cc patch-base_system_sys_info_openbsd_cc patch-base_system_sys_info_posix_cc patch-base_test_launcher_test_launcher_cc patch-base_test_test_file_util_linux_cc patch-base_third_party_libevent_event-config_h patch-base_third_party_libevent_openbsd_config_h patch-base_third_party_libevent_openbsd_event-config_h patch-base_third_party_symbolize_symbolize_cc patch-base_threading_platform_thread_h patch-base_threading_platform_thread_linux_cc patch-base_threading_platform_thread_posix_cc patch-base_threading_thread_task_runner_handle_cc patch-base_trace_event_malloc_dump_provider_cc patch-base_trace_event_process_memory_dump_cc patch-base_trace_event_process_memory_dump_h patch-build_config_BUILDCONFIG_gn patch-build_config_BUILD_gn patch-build_config_c++_c++_gni patch-build_config_compiler_BUILD_gn patch-build_config_features_gni patch-build_config_linux_BUILD_gn patch-build_config_linux_pkg-config_py patch-build_config_v8_target_cpu_gni patch-build_detect_host_arch_py patch-build_gn_run_binary_py patch-build_toolchain_gcc_solink_wrapper_py patch-build_toolchain_gcc_toolchain_gni patch-build_toolchain_openbsd_BUILD_gn patch-cc_BUILD_gn patch-chrome_app_chrome_command_ids_h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/04/02 09:08:21 Modified files: sysutils/tmate : Makefile Added files: sysutils/tmate/patches: patch-osdep-openbsd_c Log message: Add overlooked patch, provide debug package, take maintainer
Re: fix nodejs/node-gyp tarball version
On Thu, 02 Apr 2020 at 15:54:03 +0200, Jeremie Courreges-Anglas wrote: > > +cc maintainer ;) > > On Thu, Apr 02 2020, Denis Fondras wrote: > > node-gyp needs to know about the installed Node.js version. > > > > This needs to be updated each time Node.js is upgraded. May we do this > > automatically with sed in Makefile pre-patch section ? > > pre-configure already uses ${SUBST_CMD} on this file. > With this diff you should be able to use ${NODE_VERSION} in > patches/patch-deps_npm_node_modules_node-gyp_lib_install_js (untested). So upstream ships -headers distfiles now - we should be using that instead of the full tarball. Alternatively, we could completely remove this fix as we don't have native modules in tree anymore. Here is a diff that updates node to the latest version and includes a fix to store the -headers file: https://deftly.net/patches/node-12.16.1.diff > > Index: Makefile > === > RCS file: /d/cvs/ports/lang/node/Makefile,v > retrieving revision 1.82 > diff -u -p -p -u -r1.82 Makefile > --- Makefile 24 Nov 2019 18:42:28 - 1.82 > +++ Makefile 2 Apr 2020 13:52:05 - > @@ -61,6 +61,7 @@ SUBST_VARS += DISTNAME > SUBST_VARS +=DISTFILES > SUBST_VARS +=EXTRACT_SUFX > SUBST_VARS +=LOCALBASE > +SUBST_VARS +=NODE_VERSION > SUBST_VARS +=PREFIX > SUBST_VARS +=WRKDIST > > > > Index: patches/patch-deps_npm_node_modules_node-gyp_lib_install_js > > === > > RCS file: > > /cvs/ports/lang/node/patches/patch-deps_npm_node_modules_node-gyp_lib_install_js,v > > retrieving revision 1.11 > > diff -u -p -r1.11 patch-deps_npm_node_modules_node-gyp_lib_install_js > > --- patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 24 Nov > > 2019 18:42:28 - 1.11 > > +++ patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 2 Apr > > 2020 07:18:39 - > > @@ -11,7 +11,7 @@ Index: deps/npm/node_modules/node-gyp/li > > > > // now download the node tarball > > - var tarPath = gyp.opts.tarball > > -+ var tarPath = gyp.opts['tarball'] || > > '/usr/local/share/node/node-v12.9.0.tar.gz' // Fix for OpenBSD > > ++ var tarPath = gyp.opts['tarball'] || > > '/usr/local/share/node/node-v12.13.1.tar.gz' // Fix for OpenBSD > > var badDownload = false > > var extractCount = 0 > > var contentShasums = {} > > > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: tra...@cvs.openbsd.org 2020/04/02 08:48:27 Modified files: cad/kicad : Makefile cad/kicad/patches: patch-CMakeLists_txt patch-common_CMakeLists_txt patch-include_tool_coroutine_h patch-pcbnew_CMakeLists_txt cad/kicad/pkg : PLIST Added files: cad/kicad/patches: patch-demos_python_scripts_examples_gen_gerber_and_drill_files_board_py patch-demos_python_scripts_examples_plot_board_py Log message: Enable python scripting support for Kicad. Input sthen@ kn@ OK kn@ kmos@ paco@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/04/02 08:34:50 Modified files: x11/gnome : Makefile Added files: x11/gnome/vino : Makefile distinfo x11/gnome/vino/patches: patch-common_org_gnome_Vino_gschema_xml patch-server_libvncserver_rfbserver_c patch-server_vino-main_c patch-server_vino-prefs_c patch-server_vino-server_desktop_in_in patch-server_vino-status-icon_c x11/gnome/vino/pkg: DESCR PLIST Log message: re-add the vino port now that it works without systemd by re-introducing the vino-preferences tool and the required desktop file to auto-start ok aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/04/02 08:35:34 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: x11/gnome/vino is back from the grave
Re: fix nodejs/node-gyp tarball version
+cc maintainer ;) On Thu, Apr 02 2020, Denis Fondras wrote: > node-gyp needs to know about the installed Node.js version. > > This needs to be updated each time Node.js is upgraded. May we do this > automatically with sed in Makefile pre-patch section ? pre-configure already uses ${SUBST_CMD} on this file. With this diff you should be able to use ${NODE_VERSION} in patches/patch-deps_npm_node_modules_node-gyp_lib_install_js (untested). Index: Makefile === RCS file: /d/cvs/ports/lang/node/Makefile,v retrieving revision 1.82 diff -u -p -p -u -r1.82 Makefile --- Makefile24 Nov 2019 18:42:28 - 1.82 +++ Makefile2 Apr 2020 13:52:05 - @@ -61,6 +61,7 @@ SUBST_VARS += DISTNAME SUBST_VARS += DISTFILES SUBST_VARS += EXTRACT_SUFX SUBST_VARS += LOCALBASE +SUBST_VARS += NODE_VERSION SUBST_VARS += PREFIX SUBST_VARS += WRKDIST > Index: patches/patch-deps_npm_node_modules_node-gyp_lib_install_js > === > RCS file: > /cvs/ports/lang/node/patches/patch-deps_npm_node_modules_node-gyp_lib_install_js,v > retrieving revision 1.11 > diff -u -p -r1.11 patch-deps_npm_node_modules_node-gyp_lib_install_js > --- patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 24 Nov > 2019 18:42:28 - 1.11 > +++ patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 2 Apr > 2020 07:18:39 - > @@ -11,7 +11,7 @@ Index: deps/npm/node_modules/node-gyp/li > > // now download the node tarball > - var tarPath = gyp.opts.tarball > -+ var tarPath = gyp.opts['tarball'] || > '/usr/local/share/node/node-v12.9.0.tar.gz' // Fix for OpenBSD > ++ var tarPath = gyp.opts['tarball'] || > '/usr/local/share/node/node-v12.13.1.tar.gz' // Fix for OpenBSD > var badDownload = false > var extractCount = 0 > var contentShasums = {} > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[UPDATE] lang/mruby to 2.1.0
Hi ports@, Here is a diff to update mruby to 2.1.0. Tested on amd64, test suite passes without errors. Comments? OK? Index: Makefile === RCS file: /cvs/ports/lang/mruby/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- Makefile6 Dec 2019 14:33:13 - 1.16 +++ Makefile2 Apr 2020 13:41:24 - @@ -6,8 +6,7 @@ COMMENT = lightweight, embeddable imple GH_ACCOUNT = mruby GH_PROJECT = mruby -GH_TAGNAME = 2.0.1 -REVISION = 0 +GH_TAGNAME = 2.1.0 CATEGORIES = lang HOMEPAGE = https://mruby.org/ Index: distinfo === RCS file: /cvs/ports/lang/mruby/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo11 Nov 2019 11:42:36 - 1.5 +++ distinfo2 Apr 2020 13:41:24 - @@ -1,2 +1,2 @@ -SHA256 (mruby-2.0.1.tar.gz) = /gxQoltNx2kv1/an38HVi6c/U/7dpXYoRbhTaSz6yBA= -SIZE (mruby-2.0.1.tar.gz) = 517932 +SHA256 (mruby-2.1.0.tar.gz) = 1nM3QqB+VTxSq3HfCLBgSztXF2i7wMJyn78DidG7XRM= +SIZE (mruby-2.1.0.tar.gz) = 584901 Index: patches/patch-lib_mruby_build_rb === RCS file: /cvs/ports/lang/mruby/patches/patch-lib_mruby_build_rb,v retrieving revision 1.3 diff -u -p -r1.3 patch-lib_mruby_build_rb --- patches/patch-lib_mruby_build_rb11 Nov 2019 11:42:36 - 1.3 +++ patches/patch-lib_mruby_build_rb2 Apr 2020 13:41:24 - @@ -3,7 +3,7 @@ $OpenBSD: patch-lib_mruby_build_rb,v 1.3 Index: lib/mruby/build.rb --- lib/mruby/build.rb.orig +++ lib/mruby/build.rb -@@ -317,7 +317,7 @@ EOS +@@ -334,7 +334,7 @@ EOS puts ">>> Bintest #{name} <<<" targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map { |v| filename v.dir } targets << filename(".") if File.directory? "./bintest" Index: patches/patch-tasks_toolchains_gcc_rake === RCS file: patches/patch-tasks_toolchains_gcc_rake diff -N patches/patch-tasks_toolchains_gcc_rake --- patches/patch-tasks_toolchains_gcc_rake 11 Nov 2019 11:42:36 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-tasks_toolchains_gcc_rake,v 1.3 2019/11/11 11:42:36 fcambus Exp $ - -Index: tasks/toolchains/gcc.rake tasks/toolchains/gcc.rake.orig -+++ tasks/toolchains/gcc.rake -@@ -1,7 +1,7 @@ - MRuby::Toolchain.new(:gcc) do |conf, _params| - [conf.cc, conf.objc, conf.asm].each do |cc| - cc.command = ENV['CC'] || 'gcc' --cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings -Wundef)] -+cc.flags = [ENV['CFLAGS'] || '-g -O3'] + %w(-std=gnu99 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings -Wundef) - cc.option_include_path = '-I%s' - cc.option_define = '-D%s' - cc.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}' Index: pkg/PLIST === RCS file: /cvs/ports/lang/mruby/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 11 Nov 2019 11:42:36 - 1.6 +++ pkg/PLIST 2 Apr 2020 13:41:24 - @@ -120,6 +120,14 @@ lib/mruby/mrbgems/mruby-compiler/core/le lib/mruby/mrbgems/mruby-compiler/core/node.h lib/mruby/mrbgems/mruby-compiler/core/parse.y lib/mruby/mrbgems/mruby-compiler/mrbgem.rake +lib/mruby/mrbgems/mruby-complex/ +lib/mruby/mrbgems/mruby-complex/mrbgem.rake +lib/mruby/mrbgems/mruby-complex/mrblib/ +lib/mruby/mrbgems/mruby-complex/mrblib/complex.rb +lib/mruby/mrbgems/mruby-complex/src/ +lib/mruby/mrbgems/mruby-complex/src/complex.c +lib/mruby/mrbgems/mruby-complex/test/ +lib/mruby/mrbgems/mruby-complex/test/complex.rb lib/mruby/mrbgems/mruby-enum-chain/ lib/mruby/mrbgems/mruby-enum-chain/mrbgem.rake lib/mruby/mrbgems/mruby-enum-chain/mrblib/ @@ -181,8 +189,6 @@ lib/mruby/mrbgems/mruby-inline-struct/te lib/mruby/mrbgems/mruby-inline-struct/test/inline.c lib/mruby/mrbgems/mruby-inline-struct/test/inline.rb lib/mruby/mrbgems/mruby-io/ -lib/mruby/mrbgems/mruby-io/.gitignore -lib/mruby/mrbgems/mruby-io/.travis.yml lib/mruby/mrbgems/mruby-io/README.md lib/mruby/mrbgems/mruby-io/include/ lib/mruby/mrbgems/mruby-io/include/mruby/ @@ -194,7 +200,6 @@ lib/mruby/mrbgems/mruby-io/mrblib/file.r lib/mruby/mrbgems/mruby-io/mrblib/file_constants.rb lib/mruby/mrbgems/mruby-io/mrblib/io.rb lib/mruby/mrbgems/mruby-io/mrblib/kernel.rb -lib/mruby/mrbgems/mruby-io/run_test.rb lib/mruby/mrbgems/mruby-io/src/ lib/mruby/mrbgems/mruby-io/src/file.c lib/mruby/mrbgems/mruby-io/src/file_test.c @@ -207,8 +212,6 @@ lib/mruby/mrbgems/mruby-io/test/io.rb lib/mruby/mrbgems/mruby-io/test/mruby_io_test.c lib/mruby/mrbgems/mruby-kernel-ext/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2020/04/02 07:40:57 Modified files: devel : Makefile Log message: + sqlc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2020/04/02 07:40:05 Log message: Import sqlc a tool for creating type safe Go from SQL. OK pirofti@, kn@ Status: Vendor Tag: abieber Release Tags: abieber_20200402 N ports/devel/sqlc/Makefile N ports/devel/sqlc/distinfo N ports/devel/sqlc/pkg/DESCR N ports/devel/sqlc/pkg/PLIST No conflicts created by this import
Re: REVISION: kicad-5.1.5
On Wed, 01 Apr 2020, Tracey Emery wrote: > On Wed, Apr 01, 2020 at 04:14:18PM -0600, Tracey Emery wrote: > > On Wed, Apr 01, 2020 at 09:58:32PM +0200, Klemens Nanni wrote: > > > What Stuart said, plus comments in the patches would do fine explaining > > > what is being patched/why. > > > > > > Rest looks good to me. > > > > Here we are again, with changes. > > > > OK? > > > > One more time with comments in the right spot and git added as build dep > for now. Problems pointed out by kn@, thanks. Builds and works fine for me on amd64. Lightly tested wit a couple of PCB projects. Haven't tested the python scripting functionality though. ok paco. -- Paco Esteban. 0x5818130B8A6DBC03
Re: new: devel/py-regex
On Thu, 02 Apr 2020, Jeremie Courreges-Anglas wrote: > > ok to import ? > > IIUC you want to import devel/py-dateparser and devel/py-regex to > fulfill the test deps of an updated py-arrow. But as you noticed, > py-arrow has no consumer, it was imported as a dep of cookiecutter, > along with a bunch of other py ports: > > https://marc.info/?l=openbsd-ports=cookiecutter Yep, you got it right. It bugs me quite a bit if I cannot run test on a port. > > But cookiecutter never made it into our tree. Regarding cookiecutter: > > https://github.com/cookiecutter/cookiecutter/blob/master/setup.py#L27 > > lists jinja2-time, which in turn depends on py-arrow. > > Daniel and Kurt discussed removing py-whichcraft last year: > > https://marc.info/?l=openbsd-ports=155597775827772=2 > > But nobody found a use for those modules since, and nobody took > maintainership. > > Question: should we just remove py-arrow, py-chai, py-binaryornot and > py-whichcraft now, instead of hoping they'll be useful to someone one day? I'm ok with removing all of this. To be honest I just sent an update to py-arrow because I updated it in the past ... -- Paco Esteban. 0x5818130B8A6DBC03
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/04/02 07:11:38 Modified files: net/fpdns : Makefile distinfo net/fpdns/pkg : PLIST Removed files: net/fpdns/patches: patch-lib_Net_DNS_Fingerprint_pm Log message: Update fpdns to 0.10.0.20190131.
mips64 bulk build report
bulk build on octeon.ports.openbsd.org started on Tue Mar 17 17:14:48 UTC 2020 finished at Thu Mar 26 17:46:26 UTC 2020 lasted 10D00h31m done with kern.version=OpenBSD 6.6-current (GENERIC.MP) #21: Mon Mar 23 15:09:05 UTC 2020 built packages:9430 Mar 17:1434 Mar 18:1270 Mar 19:706 Mar 20:604 Mar 21:503 Mar 22:546 Mar 23:542 Mar 24:805 Mar 25:2993 Mar 26:26 build failures: 67 http://build-failures.rhaalovely.net/mips64/2020-03-17/audio/mscore.log http://build-failures.rhaalovely.net/mips64/2020-03-17/cad/netgen.log http://build-failures.rhaalovely.net/mips64/2020-03-17/chinese/libchewing.log http://build-failures.rhaalovely.net/mips64/2020-03-17/chinese/libpinyin.log http://build-failures.rhaalovely.net/mips64/2020-03-17/databases/postgresql-pllua.log http://build-failures.rhaalovely.net/mips64/2020-03-17/devel/cgdb.log http://build-failures.rhaalovely.net/mips64/2020-03-17/devel/coccinelle.log http://build-failures.rhaalovely.net/mips64/2020-03-17/devel/libpeas.log http://build-failures.rhaalovely.net/mips64/2020-03-17/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/mips64/2020-03-17/devel/rebar.log http://build-failures.rhaalovely.net/mips64/2020-03-17/devel/sdcc.log http://build-failures.rhaalovely.net/mips64/2020-03-17/emulators/openmsx.log http://build-failures.rhaalovely.net/mips64/2020-03-17/emulators/retroarch.log http://build-failures.rhaalovely.net/mips64/2020-03-17/games/astromenace.log http://build-failures.rhaalovely.net/mips64/2020-03-17/games/eduke32.log http://build-failures.rhaalovely.net/mips64/2020-03-17/games/hyperrogue.log http://build-failures.rhaalovely.net/mips64/2020-03-17/games/postal.log http://build-failures.rhaalovely.net/mips64/2020-03-17/games/stone-soup.log http://build-failures.rhaalovely.net/mips64/2020-03-17/games/valyriatear.log http://build-failures.rhaalovely.net/mips64/2020-03-17/geo/gpstk.log http://build-failures.rhaalovely.net/mips64/2020-03-17/graphics/colord-gtk.log http://build-failures.rhaalovely.net/mips64/2020-03-17/graphics/enblend-enfuse.log http://build-failures.rhaalovely.net/mips64/2020-03-17/graphics/gimp/stable.log http://build-failures.rhaalovely.net/mips64/2020-03-17/graphics/openimageio.log http://build-failures.rhaalovely.net/mips64/2020-03-17/inputmethods/scim-fcitx.log http://build-failures.rhaalovely.net/mips64/2020-03-17/lang/STk.log http://build-failures.rhaalovely.net/mips64/2020-03-17/lang/gforth.log http://build-failures.rhaalovely.net/mips64/2020-03-17/lang/gpc.log http://build-failures.rhaalovely.net/mips64/2020-03-17/lang/janet.log http://build-failures.rhaalovely.net/mips64/2020-03-17/lang/parrot.log http://build-failures.rhaalovely.net/mips64/2020-03-17/lang/pfe.log http://build-failures.rhaalovely.net/mips64/2020-03-17/lang/squeak/vm.log http://build-failures.rhaalovely.net/mips64/2020-03-17/mail/dspam,-main.log http://build-failures.rhaalovely.net/mips64/2020-03-17/mail/kopano/core.log http://build-failures.rhaalovely.net/mips64/2020-03-17/math/gbc.log http://build-failures.rhaalovely.net/mips64/2020-03-17/math/mlpack,-main.log http://build-failures.rhaalovely.net/mips64/2020-03-17/math/ntl.log http://build-failures.rhaalovely.net/mips64/2020-03-17/misc/dtcltiny.log http://build-failures.rhaalovely.net/mips64/2020-03-17/multimedia/assimp.log http://build-failures.rhaalovely.net/mips64/2020-03-17/multimedia/mkvtoolnix,no_x11.log http://build-failures.rhaalovely.net/mips64/2020-03-17/multimedia/synfigstudio.log http://build-failures.rhaalovely.net/mips64/2020-03-17/net/dleyna/renderer.log http://build-failures.rhaalovely.net/mips64/2020-03-17/net/dleyna/server.log http://build-failures.rhaalovely.net/mips64/2020-03-17/net/telegram-purple.log http://build-failures.rhaalovely.net/mips64/2020-03-17/net/utox.log http://build-failures.rhaalovely.net/mips64/2020-03-17/net/wireshark,-main.log http://build-failures.rhaalovely.net/mips64/2020-03-17/plan9/drawterm.log http://build-failures.rhaalovely.net/mips64/2020-03-17/security/botan2.log http://build-failures.rhaalovely.net/mips64/2020-03-17/shells/ksh93.log http://build-failures.rhaalovely.net/mips64/2020-03-17/sysutils/u-boot,aarch64.log http://build-failures.rhaalovely.net/mips64/2020-03-17/telephony/iaxclient.log http://build-failures.rhaalovely.net/mips64/2020-03-17/textproc/apertium-dicts/crh.log http://build-failures.rhaalovely.net/mips64/2020-03-17/textproc/apertium-dicts/tur.log http://build-failures.rhaalovely.net/mips64/2020-03-17/www/mozplugger.log http://build-failures.rhaalovely.net/mips64/2020-03-17/www/ruby-unicorn,ruby27.log http://build-failures.rhaalovely.net/mips64/2020-03-17/www/webkitgtk4.log http://build-failures.rhaalovely.net/mips64/2020-03-17/x11/gnome/libgweather.log http://build-failures.rhaalovely.net/mips64/2020-03-17/x11/gtk+4,-cloudprint.log http://build-failures.rhaalovely.net/mips64/2020-03-17/x11/gtk-vnc.log http://build-failures.rhaalovely.net/mips64/2020-03-17/x11/gtksourceview4.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/02 06:16:04 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.18.34.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/02 06:15:25 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.15.34.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/02 06:15:41 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.12.34.
Re: new: devel/py-regex
On Wed, Apr 01 2020, Paco Esteban wrote: > Hi ports@, > > This is a new port devel/py-regex. From DESCR: > > Alternative regular expression module, to replace re on Python. > > This regex implementation is backwards-compatible with the standard 're' > module, but offers additional functionality. > > It's needed by devel/py-dateparser which I sent earlier. > > All tests pass on amd64. > > ok to import ? IIUC you want to import devel/py-dateparser and devel/py-regex to fulfill the test deps of an updated py-arrow. But as you noticed, py-arrow has no consumer, it was imported as a dep of cookiecutter, along with a bunch of other py ports: https://marc.info/?l=openbsd-ports=cookiecutter But cookiecutter never made it into our tree. Regarding cookiecutter: https://github.com/cookiecutter/cookiecutter/blob/master/setup.py#L27 lists jinja2-time, which in turn depends on py-arrow. Daniel and Kurt discussed removing py-whichcraft last year: https://marc.info/?l=openbsd-ports=155597775827772=2 But nobody found a use for those modules since, and nobody took maintainership. Question: should we just remove py-arrow, py-chai, py-binaryornot and py-whichcraft now, instead of hoping they'll be useful to someone one day? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update to libvips 8.9.0
On Sun, Feb 09, 2020 at 10:31:14AM +0100, Stephane Guedon wrote: > Updated after sthen's advices. > This looks fine to me. It works OK here. Can we get this in ?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/02 05:13:16 Modified files: misc/hwdata: Makefile distinfo Log message: Update to hwdata-0.334.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/02 05:11:01 Modified files: graphics/graphite2: Makefile distinfo Log message: Update to graphite2-1.3.14.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: piro...@cvs.openbsd.org 2020/04/02 01:39:09 Modified files: math/py-numpy : Makefile distinfo math/py-numpy/patches: patch-numpy_core_include_numpy_npy_common_h patch-numpy_distutils_command_build_src_py patch-numpy_distutils_fcompiler_gnu_py math/py-numpy/pkg: PLIST Added files: math/py-numpy/patches: patch-numpy_core_setup_common_py Log message: Update to numpy-1.16.5 This was a group effort and it already passed several bulks on various archs. Main diffs from jca@, sthen@. Tested in bulk by sthen@ and naddy@. Input from Daniel Dickman, tb@, Martin Reindl, ajacotot@ OK sthen@, kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/04/02 01:37:08 Modified files: x11/gnome/librsvg: Makefile distinfo Log message: Update to librsvg-2.48.2.
fix nodejs/node-gyp tarball version
node-gyp needs to know about the installed Node.js version. This needs to be updated each time Node.js is upgraded. May we do this automatically with sed in Makefile pre-patch section ? Index: patches/patch-deps_npm_node_modules_node-gyp_lib_install_js === RCS file: /cvs/ports/lang/node/patches/patch-deps_npm_node_modules_node-gyp_lib_install_js,v retrieving revision 1.11 diff -u -p -r1.11 patch-deps_npm_node_modules_node-gyp_lib_install_js --- patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 24 Nov 2019 18:42:28 - 1.11 +++ patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 2 Apr 2020 07:18:39 - @@ -11,7 +11,7 @@ Index: deps/npm/node_modules/node-gyp/li // now download the node tarball - var tarPath = gyp.opts.tarball -+ var tarPath = gyp.opts['tarball'] || '/usr/local/share/node/node-v12.9.0.tar.gz' // Fix for OpenBSD ++ var tarPath = gyp.opts['tarball'] || '/usr/local/share/node/node-v12.13.1.tar.gz' // Fix for OpenBSD var badDownload = false var extractCount = 0 var contentShasums = {}