diff --git a/.gitattributes b/.gitattributes index 3c93bcf..0833179 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,23 +4,23 @@ # Force the following filetypes to have unix eols and encoding, so that Windows does not break them. # If a file is going to be used on linux and windows, we want it invariant, # rather than automatically translated, because automatic translation always screw things up. -* text=auto eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -.gitignore text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -.gitattributes text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -.gitmodules text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=bash -*.c text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=cpp -*.rs text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=rust -*.py text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=python -*.h text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.txt text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.html text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=html -*.htm text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=html -*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=markdown -*.pandoc text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.css text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=css -*.manifest text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +* text=auto eol=lf encoding=utf-8, whitespace=trailing-space,space-before-tab,tabwidth=4 +.gitignore text eol=lf encoding=utf-8, whitespace=trailing-space,space-before-tab,tabwidth=4 +.gitattributes text eol=lf encoding=utf-8, whitespace=trailing-space,space-before-tab,tabwidth=4 +.gitmodules text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=bash +*.c text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=cpp +*.rs text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=rust +*.py text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=python +*.h text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.txt text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.html text eol=lf encoding=utf-8 whitespace=space-before-tab,tabwidth=4 diff=html +*.htm text eol=lf encoding=utf-8 whitespace=space-before-tab,tabwidth=4 diff=html +*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=markdown +*.pandoc text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.css text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=css +*.manifest text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 makefile text eol=lf encoding=utf-8 diff --git a/README.html b/README.html new file mode 100644 index 0000000..acfae94 --- /dev/null +++ b/README.html @@ -0,0 +1,158 @@ + + + + + + + README + + + + + + + +
+ + logo +
+
+ +
+
+ readme + license + notice + release notes +
+
+

README

+

pre alpha documentation (mostly a wish list)

+

copyright © and license

+

pre-requisite, Pandoc to build the html documentation from the markdown files.

+

Windows pre-requisites: Visual Studio and git-bash

+

To obtain the source code from which the project can be built, +including this README.html, from the bash command line (git-bash in windows).

+
git clone --recurse-submodules missing url
+

To build the docs, you need pandoc on the path.

+
cd wallet/docs
+./mkdocs.sh
+

To configure and build the required third party libraries in windows, then +build the program and run unit test for the first time, you need to have +Visual studio build tools at their default location)

+
cd wallet
+./winConfigure.bat
+

Or, if you are in the command shell or power shell,

+
.\winConfigure.bat
+

After a pull from remote in which the submodules have changed, the pull +fails to automatically update the submodules by default, and when you +switch or checkout branches, the switch fails to automatically switch +and checkout the brances.

+

After a pull that gives you a status of modified submodules.

+
git submodule update --init --recursive --remote
+

After a checkout or branch switch that gives you a status of modified submodules.

+
git submodule update --recursive
+

The documentation is in pandoc flavored markdown, which is +conveniently edited in vscode with the markdown lint and Pandoc +extensions included and, if you have launched code in the docs directory, +with file/preferences/Extensions/Markdown/Styles set to +pandoc_templates\\style.css, that being the style used by the mkdocs.sh documentation build script.

+

On Windows, if Git Bash and Pandoc has been installed, you should be +able to run this shell file in bash by double clicking on it.

+

if you add the recommended repository configuration defaults to your local repository configuration

+
git config --local include.path ../.gitconfig
+

this will substantially mitigate the problem of submodules failing to +update in pushes, pulls, checkouts, and switches.

+

It will, however, also implement signed commits, and insist you have set up a key pair as +explained in the contributor code of conduct because cryptographic software is under attack from NSA +entryists and shills, who seek to introduce backdoors.

+

.gitconfig also adds several git aliases:

+
    +
  1. git lg to display the git log with committer name from .gitsigners that corresponds to the public key
    2. +
  2. git graph to graph the commit tree with the committer name from .gitsigners that corresponds to the public key
    3. +
  3. git alias to display the git aliases.
    4. +
  4. git utcmt to make a commit without revealing your time zone.
    5. +
+

Pre alpha release, which means it does not yet work even well +enough for it to be apparent what it would do if it did work.

+

Creative Commons License reaction.la gpg key 154588427F2709CD9D7146B01C99BB982002C39F
This work is licensed under the Creative Commons Attribution 4.0 International License.

+ + diff --git a/RELEASE_NOTES.html b/RELEASE_NOTES.html new file mode 100644 index 0000000..f6675d5 --- /dev/null +++ b/RELEASE_NOTES.html @@ -0,0 +1,52 @@ + + + + + + + Release Notes + + + + + + + +
+ + logo +
+
+ +
+
+ readme + license + notice + release notes +
+
+

Release Notes

+

To build and run README

+

pre alpha documentation (mostly a wish list) (In order to read these on this local system, you must first execute the document build script mkdocs.sh, with bash, sed and pandoc)

+

This software is pre alpha and should not yet be released. It does +not work well enough to even show what it would do if it was +working

+

Creative Commons License reaction.la gpg key 154588427F2709CD9D7146B01C99BB982002C39F
This work is licensed under the Creative Commons Attribution 4.0 International License.

+ + diff --git a/docs/pandoc_templates/pandoc.template b/docs/pandoc_templates/pandoc.template index 24e1368..b4f858d 100644 --- a/docs/pandoc_templates/pandoc.template +++ b/docs/pandoc_templates/pandoc.template @@ -26,7 +26,7 @@ $endfor$ $for(header-includes)$ $endfor$ - $header-includes$ +$header-includes$ $if(math)$ $if(mathjax)$ diff --git a/docs/setup/nixos.md b/docs/setup/nixos.md index c79ab49..7070927 100644 --- a/docs/setup/nixos.md +++ b/docs/setup/nixos.md @@ -257,4 +257,43 @@ Setup is also decribed as ridiculously easy -- compare and contrast with much gr And the huge disadvantage that it only exists for Nix 23.05, while the latest "stable" (not very stable at all) release is 24.05 -It also has only a minimal nginx setup. Not at all sure what will happen when I combine it with a real nginx setup. \ No newline at end of file +It also has only a minimal nginx setup. Not at all sure what will happen when I combine it with a real nginx setup. + +We have to pin to a particular release: The following code is an example of such pinning + +```nix +{ config, pkgs, ... }: { + imports = [ + # builtins.fetchTarbll pins Nixos to a particular release, prevents the lastest release (24.05)from being default installed. + (builtins.fetchTarball { + # Pick a release version you are interested in and set its hash, e.g. + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-23.05/nixos-mailserver-nixos-23.05.tar.gz"; + # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: + # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack + sha256 = "0000000000000000000000000000000000000000000000000000"; + }) + ]; + + mailserver = { + enable = true; + fqdn = "mail.example.com"; + domains = [ "example.com" ]; + + # A list of all login accounts. To create the password hashes, use + # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' + loginAccounts = { + "user1@example.com" = { + hashedPasswordFile = "/a/file/containing/a/hashed/password"; + aliases = ["postmaster@example.com"]; + }; + "user2@example.com" = { ... }; + }; + + # Use Let's Encrypt certificates. Note that this needs to set up a stripped + # down nginx and opens port 80. + certificateScheme = "acme-nginx"; + }; + security.acme.acceptTerms = true; + security.acme.defaults.email = "security@example.com"; +} +``` \ No newline at end of file diff --git a/docs/setup/set_up_build_environments.md b/docs/setup/set_up_build_environments.md index 3f7bff0..ade10ef 100644 --- a/docs/setup/set_up_build_environments.md +++ b/docs/setup/set_up_build_environments.md @@ -3073,13 +3073,21 @@ directory url (with no trailing backslash). ### Git Daemon +Now integrated into Git, needs no separate install. + +When correctly set up, the url for repo foo.git is `git://host/foo` + git-daemon will listen on port 9418. By default, it will allow access to any directory that looks like a git directory and contains the magic file git-daemon-export-ok. This is by far the simplest and most direct way of allowing the world to get at your git repository. +[Git documentation for Git daemon](https://git-scm.com/docs/git-daemon) + +[Git Book for Git daemon](https://git-scm.com/book/en/v2/Git-on-the-Server-Git-Daemon) + ### Gitweb -Does much the same thing has git-daemon, makes your repository public with a +Does much the same thing as git-daemon, makes your repository public with a prettier user interface, and somewhat less efficient protocol. Gitweb provides a great deal of UI for viewing and interacting with your diff --git a/public_key.gpg b/public_key.gpg deleted file mode 100644 index 03f2f9d..0000000 --- a/public_key.gpg +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mDMEX1SfJRYJKwYBBAHaRw8BAQdAcXlEHKWZNw9o2Fj5ssAjCmsbthDz0DVzYKxF -pnwiDjm0JENoZW5nIFNoZW5nIDxDaGVuZ1NoZW5nQGZha2VtYWlsLmNoPoiQBBMW -CAA4AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEECW6uFvuNYuddJDGZvESC -5JZzcRwFAmH4/lYACgkQvESC5JZzcRxRcAEA2uPehywNxbp9DON0CJ578vbmX7qt -OmDjsHovsQ5I1W8BAMbQyOcIRYQlPTijl3I/R4sWLZ9hEYIbP+FS3JtbDYAFiJAE -ExYIADgWIQQJbq4W+41i510kMZm8RILklnNxHAUCX1SfJQIbAwULCQgHAgYVCgkI -CwIEFgIDAQIeAQIXgAAKCRC8RILklnNxHPteAQDFs4dbz7I1a5VoKXMupmSW3MMP -uHChIilz9P2JYX6oOAEAx4+tmu7DIGwBgNQZKuxlVgWYavkuEGYkLYdGgIBpwQi4 -OARfVJ8lEgorBgEEAZdVAQUBAQdATTzhgBNNONqRkUDfj/dtps9n+BvZMcS1t6cD -tjLejT0DAQgHiHgEGBYIACAWIQQJbq4W+41i510kMZm8RILklnNxHAUCX1SfJQIb -DAAKCRC8RILklnNxHPB4AP4kKI590T81yFAEkcfKA3fFRxcDJwUqus2L4GpckyMq -ngEAv9viVp3aHvlXZMpQ4prvzC/Gpzs3TrsDXWEhg5PzDA+4MwRhhoZwFgkrBgEE -AdpHDwEBB0CuAAgmkYQetnz3BJ0ALBuVKn1aeBjMq+1sPKeyUDnjWIjvBBgWCAAg -FiEECW6uFvuNYuddJDGZvESC5JZzcRwFAmGGhnACGyIAgQkQvESC5JZzcRx2IAQZ -FggAHRYhBCuf+rsp/waNpunfl1ccOpw7nm/KBQJhhoZwAAoJEFccOpw7nm/KjykA -/2TcUdtOXUCRJsM+SvoG3xWjk7iCOuSTWsUkap9ha6daAQD2hLRL9/Z6c2mREKXz -7nR416Cs1YUACs98wTD5pBuYAk76AP9vr+uVoKbjf/q230SBNen2Hjhk8g+JD4Cu -ZpFKuVwZhQEAopykWKujX5dGU/1352QrUcoCVYbTMiXGIxL9CPrUzw+4MwRh2A+7 -FgkrBgEEAdpHDwEBB0A9rVFSCmvpkkeSCmB+PDYqnJsz7Fq0b9NkN87xQ854i4j1 -BBgWCAAmFiEECW6uFvuNYuddJDGZvESC5JZzcRwFAmHYD7sCGyIFCQHhM4AAgQkQ -vESC5JZzcRx2IAQZFggAHRYhBIDfnjfH6rZKSICJDtUTAeF2sxgoBQJh2A+7AAoJ -ENUTAeF2sxgogxsBAMAV8d12lHhnL64qbG+llKJKEXI1ZTSHLEcdXN5dOo6zAP9j -Na3cNcEwxreUlgUZhOjagxrMnGpd5l/pHVG/7ijECa/8AQDpNtaC1G/6bIwpekky -KdbZtliClpajSD7zoj2Bxe24nAD/TSwGmXzqr9+VeOctO/m6q+QKwFa3mGyOUWpp -oTNQfA0= -=Kusp ------END PGP PUBLIC KEY BLOCK----- diff --git a/wxWidgets b/wxWidgets index aff2cd0..8037402 160000 --- a/wxWidgets +++ b/wxWidgets @@ -1 +1 @@ -Subproject commit aff2cd0190c1b87e98862209a6a5c1b3c918c028 +Subproject commit 8037402f847136a279e80f3813113aad7fac506f