summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-18Recording merge technique in git historyPhil Pennock
This is an empty commit which exists for this commit message, documenting how I handled GitHub PR 52, which was 228 separate commits, each fixing the spelling of one word. The submitter's approach made it easy to consider and approve/reject each independently, so was valuable, but I didn't want so many commits in our history. A few aspects of the shell commands rely upon Zsh: `read -q` for getting a single Y/N response; `$IFS` containing ASCII NUL (and builtins handling NUL inside strings) for parsing `.git/MERGE_RR`; anonymous function calls so that I could abort cleanly if I wanted to. git log --pretty=tformat:%h master..github/pr/52 > ../1.consider touch ../2.keep for F in $(<../1.consider); do git show $F | cat -v; read -q "keep?Keep $F ? " && echo $F >> ../2.keep; echo; echo =============================; done That let me iterate through each, selecting 214/228 commits to apply in one pass. Two PR commits were held for a separate commit, because they fixed behavioural bugs. So 216/228 were accepted. A couple warranted minor post-fixing as part of the first PR. for F in $(<../2.keep ) ; do (){ git cherry-pick -n $F && continue; for junk fn in $(<.git/MERGE_RR); do [[ -n $fn ]] || break; if vi $fn; then git add $fn; else return 1; fi; done } || break; done vi src/src/filter.c && git add src/src/filter.c vi src/src/dns.c && git add src/src/dns.c GIT_AUTHOR_NAME='Josh Soref' GIT_AUTHOR_EMAIL='jsoref@users.noreply.github.com' git commit and similarly for the second commit. One more commit from the PR requires chasing with a contributor whose name is natively in a non-Roman alphabet and who appears to have changed the Romanisation, to check how they'd like it handled. I will chase under separate cover.
2017-01-18Bug-fix no_require_dnssec parsing & spelling fixesJosh Soref
Patches from Josh Soref fixing spelling fixed two bugs: * Parsing `no_require_dnssec` configuration option * Setting `_HAVE_TRANSPORT_APPEND_MAILDIR` macro (for config parsing) [ PP pulled these two out into a separate commit to update the ChangeLog accordingly. ]
2017-01-18214 spelling fixesJosh Soref
2017-01-12Provide alternative Heimdal pkg-config examplePhil Pennock
Building Exim against Heimdal 1.5, heimdal-gssapi.pc was needed. There's been a major version bump in Heimdal, and against 7.1 that doesn't work; using heimdal-krb5.pc fails on missing `gss_*` functions. I can find no build documentation for Heimdal which describes what should be needed. heimdal-gssapi.pc does reference heimdal-krb5.pc in `Requires.private` but it's not being used by FreeBSD pkgconf in such a way that it's available when building on FreeBSD 10.3. Fortunately, our `*_PC` logic works with multiple packages listed, so provide that example.
2017-01-11Docs: add note on DKIM ACL triggersJeremy Harris
2017-01-04Testsuite: moved output fileJeremy Harris
Broken-by: f4630439f888
2017-01-03CHUNKING: fix non-pipelined synch checks. Bug 2004Jeremy Harris
2017-01-02PROXY: fix v2 protocol decode. Bugs 2003, 1747Jeremy Harris
2017-01-02wip: OpenSSL docs on custom installPhil Pennock
To fix before merge: ability to use `$ORIGIN` in linker line via Exim config file.
2017-01-01Docs: fix smtp transport TFO option indexingJeremy Harris
2016-12-31Merge remote-tracking branch 'github/pr/50'Phil Pennock
GitHub user @YmrDtnJu "Björn" provided a patch to fix that we called ldap_start_tls_s on ldapi:// connections. This is obviously a correct change, since above we've avoiding initializing the TLS state if using ldapi. Added documentation noting this behaviour.
2016-12-31DKIM: Under debug, when signing do an extra check on the dns record that will beJeremy Harris
used for verification. Bug 1926
2016-12-31Do not call ldap_start_tls_s on ldapi:// connections.YmrDtnJu
The code already skips the initialisation of TLS on LDAP connections over unix sockets but the call to ldap_start_tls_s is done nonetheless.
2016-12-30Docs: Add .new/wen marker for relative includes (Bug 1971)Heiko Schlittermann (HS12-RIPE)
2016-12-30Tidy and add \0 after string_append() for relative .includesHeiko Schlittermann (HS12-RIPE)
2016-12-29tidyingJeremy Harris
2016-12-29Docs: typoesJeremy Harris
2016-12-29I18N: avoid trying to downconvert all-ascii domain names.Jeremy Harris
With the IDNA-2008 handling downconversion results in lowercasing; so avoid doing that if possible.
2016-12-29Testsuite: use custom-munge for dsn-info in 4510Jeremy Harris
Broken-by: 87cb4a166c47
2016-12-29Allow relative file names in .include lines (Closes 1971)Heiko Schlittermann (HS12-RIPE)
2016-12-29Doc: Minor fixesHeiko Schlittermann (HS12-RIPE)
2016-12-29Release process: make mk_exim_release more self descriptiveHeiko Schlittermann (HS12-RIPE)
2016-12-29Release process: rename the scripts to be more genericHeiko Schlittermann (HS12-RIPE)
2016-12-29Release process: sign all *.tar.* under a given dirHeiko Schlittermann (HS12-RIPE)
2016-12-29Release process: fix the --no-web optionHeiko Schlittermann (HS12-RIPE)
2016-12-29Constify config_filenameHeiko Schlittermann (HS12-RIPE)
2016-12-29DKIM: More validation of DNS key record. Bug 1926Jeremy Harris
2016-12-29OpenSSL: add detail to certname verify fail log lineJeremy Harris
2016-12-29Pipe transport: expand the path optionJeremy Harris
2016-12-29Testsuite: enhance IDNA examples; move to IDNA-2008 conversionsJeremy Harris
2016-12-27Docs: clarify headers availability in data-time ACLsJeremy Harris
2016-12-26I18N: support IDNA2008. Bug 1911Jeremy Harris
2016-12-25Docs: Clean for next releaseJeremy Harris
2016-12-22Doc: clarify CVE-2016-9963Heiko Schlittermann (HS12-RIPE)
2016-12-18Doc: short description of CVE-2016-9963exim-4_88Heiko Schlittermann (HS12-RIPE)
2016-12-18Fix DKIM information leakageJeremy Harris
2016-12-16Docs: typoJeremy Harris
2016-12-13Use long names for the _DRIVER_*, and _OPT_* macrosHeiko Schlittermann (HS12-RIPE)
2016-12-09Doc: fix minor typosHeiko Schlittermann (HS12-RIPE)
2016-12-07Testsuite: ipv6 output changesexim-4_88_RC6Jeremy Harris
2016-12-04Testsuite: honour the "build" environment variableHeiko Schlittermann (HS12-RIPE)
2016-12-04OpenSSL: default to tls_eccurve = autoHeiko Schlittermann (HS12-RIPE)
For OpenSSL < 1.0.2: fallback to prime256v1, for newer libraries rely on auto-selection.
2016-12-04Testsuite: more pipe transport / perl casesJeremy Harris
2016-12-04Testsuite: set path for use of perl by pipe transportJeremy Harris
FreeBSD places perl in a nonstandard (for the pipe transport) directory
2016-12-04Testsuite: remove outdated flavour result filesJeremy Harris
2016-12-03Testsuite: platform variance for perl utility locationJeremy Harris
2016-12-03Testsuite: ipv6 source address platform varianceJeremy Harris
2016-12-03Testsuite: ensure delivery orderJeremy Harris
2016-12-03Testsuite: OpenSSL error lines change going to 1.1Jeremy Harris
2016-12-03Build: disable OCSP, AUTH_TLS and EXPERIMENTAL_CERTNAMES if SUPPORT_TLS is ↵Jeremy Harris
not enabled