notqmail icon indicating copy to clipboard operation
notqmail copied to clipboard

This adds spawn-filter binary for filtering message passed to qmail-remote/qmail-local

Open mbhangui opened this issue 6 years ago • 9 comments

@schmonz I have created a pull request for the QMAILREMOTE/QMAILLOCAL changes. You can view it now

  1. QMAILREMOTE env variable added to qmail-rspawn.c, taken from #46
  2. Same change added to qmail-lspawn.c using env variable QMAILLOCAL
  3. Modification of man pages qmail-rspawn.8, qmail-lspawn.8 for QMAILREMOTE, QMAILLOCAL
  4. Modification of man page for qmail-control (for new control file filterargs)
  5. addition of a new program spawn-filter (which can be called by setting QMAILREMOTE or QMAILLOCAL. e.g. QMAILREMOTE=/var/qmail/bin/spawn-filter
  6. Addition of a C file wildmat.c for wildmat_internal() function
  7. modification of Makefile, TARGETS
  8. modification of hier.c for installing spawn-filter and spawn-filter man page

mbhangui avatar Jul 29 '19 11:07 mbhangui

please rebase this on current master so it get's easier to review

DerDakon avatar Aug 13 '19 16:08 DerDakon

please rebase this on current master so it get's easier to review

I am a noob when using git. How do I do that. in the webui, the 'Rebase and Merge' shows greyed out

mbhangui avatar Aug 13 '19 16:08 mbhangui

Do it on the commandline:

git fetch
git rebase origin/master
git push --force

DerDakon avatar Aug 13 '19 16:08 DerDakon

I did this and I get this error argos:/usr/local/src/projects/spawn-filter/notqmail>git fetch remote: Enumerating objects: 17, done. remote: Counting objects: 100% (17/17), done. remote: Compressing objects: 100% (13/13), done. remote: Total 17 (delta 8), reused 7 (delta 4), pack-reused 0 Unpacking objects: 100% (17/17), done. From git://github.com/notqmail/notqmail

  • e45ee24...1640bdb instqueue -> origin/instqueue (forced update) 65ceaec..81b5f8e spawn-filter -> origin/spawn-filter
  • [new branch] sysdeps-not-quite-dead -> origin/sysdeps-not-quite-dead argos:/usr/local/src/projects/spawn-filter/notqmail>git rebase origin/master Current branch spawn-filter is up to date. argos:/usr/local/src/projects/spawn-filter/notqmail>git push --force fatal: remote error: You can't push to git://github.com/notqmail/notqmail.git Use https://github.com/notqmail/notqmail.git

mbhangui avatar Aug 13 '19 17:08 mbhangui

OK. I changed it to https in .git/config and did a push. It has gone through git push --force Username for 'https://github.com': [email protected] Password for 'https://[email protected]@github.com': Enumerating objects: 16, done. Counting objects: 100% (16/16), done. Delta compression using up to 4 threads Compressing objects: 100% (10/10), done. Writing objects: 100% (10/10), 7.86 KiB | 1.31 MiB/s, done. Total 10 (delta 6), reused 3 (delta 0) remote: Resolving deltas: 100% (6/6), completed with 6 local objects. To https://github.com/notqmail/notqmail.git

  • 81b5f8e...d6eb292 spawn-filter -> spawn-filter (forced update)

mbhangui avatar Aug 13 '19 17:08 mbhangui

We're agreed on QMAILREMOTE in some form for 1.08. Marking this one 1.08 for consideration alongside #46.

schmonz avatar Aug 26 '19 15:08 schmonz

If it is ok with you I would rebase the branch on the current master to reduce the complexity in git history.

DerDakon avatar Sep 03 '19 07:09 DerDakon

If it is ok with you I would rebase the branch on the current master to reduce the complexity in git history.

That would be awesome. I'm still struggling with knowing how to do things properly with git.

mbhangui avatar Sep 03 '19 07:09 mbhangui

Ok, I have rebased it and squashed a few of your fix commits to those commits that introduced the error. Please do:

git fetch
git reset --hard origin/spawn-filter

DerDakon avatar Sep 03 '19 09:09 DerDakon