From 8325e08588e2d07720ae810982b48267b0abf384 Mon Sep 17 00:00:00 2001
From: Steffen Nurpmeso <steffen@sdaoden.eu>
Date: Mon, 21 Feb 2022 19:51:43 +0100
Subject: [PATCH] postfix-lmdb: change $mynetworks <-> localhost (remove acc.
 comm. vim file)

---
 postfix-lmdb/.Pkgfile.swp  | Bin 12288 -> 0 bytes
 postfix-lmdb/.signature    |   6 +++---
 postfix-lmdb/Pkgfile       |   2 +-
 postfix-lmdb/main-addon.cf |  41 ++++++++++++++++++++++++-------------
 4 files changed, 31 insertions(+), 18 deletions(-)
 delete mode 100644 postfix-lmdb/.Pkgfile.swp

diff --git a/postfix-lmdb/.Pkgfile.swp b/postfix-lmdb/.Pkgfile.swp
deleted file mode 100644
index 8e5e1a1e2a5194f438ced5fac6aece2f36465906..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
LW@N5W9wq+(0YEFP

diff --git a/postfix-lmdb/.signature b/postfix-lmdb/.signature
index 3b3558f37..f19e49e29 100644
--- a/postfix-lmdb/.signature
+++ b/postfix-lmdb/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39FFLfzuP9sSTYucdaycYGZstsYaO6zDsmGx0vpABBxGTev1pv7xG6SvTbOMBGNLnQBceeHZUdwcTvkp2CO4UAA=
-SHA256 (Pkgfile) = 6877221db8e8534e9c78264f369338ef6ae5916806a3a13da4cbd9913d66fe6f
+RWSagIOpLGJF38rrseYPbhCN8cD92Tw7fGke1/WH4oAmNsnC8hrSZvwotu4lrW8OZA0OFow3hciSIRJlcTCidnBTJ6VXLUz2HAI=
+SHA256 (Pkgfile) = a993203a02ece29839c26820e0c3e061be3b8171466f3b7a8cc55293c38e089c
 SHA256 (.footprint) = c4bef46624508b9105e8c5816c322560a560c09e9c5507509eb95c886d52a387
 SHA256 (postfix-3.7.0.tar.gz) = 645c6a74959703f8dff5b696b2df2e8bc0c91ac530127a21c998e3defbb9528c
 SHA256 (lmdb-default.patch) = 11f42333ae0640a3ca579463ed28007973693b93bc734b5d82225fcb516bf05e
@@ -14,5 +14,5 @@ SHA256 (relay_clientcerts) = 2aa69a949c06826e2f5a760791fb5cebb37e6797613270fd113
 SHA256 (client_restrict) = 9496a99f6714625c5883a41f8a5f9db8aa43199ef2167c18d83a2b39469622e3
 SHA256 (sender_access) = c9b9b86c985facdc18e6bfe436c78340174fc315478e578d82c956e35355e678
 SHA256 (sender_restrict) = 9b672511eac1971f8cd72b045e200aac8e0fe6407f1a055085fc1b85c1f24ed7
-SHA256 (main-addon.cf) = 3ab7e6882fbd302a95cfe7476c162fe63e0989c2be235778daabd871184f1fbb
+SHA256 (main-addon.cf) = 3c8e601c90773a6b8dc35327651af1307201f703a3dea55db10ef5fd7171e0bf
 SHA256 (master.patch) = 062960dbabd1ae4890d7bb3dc364215f5755c04d1a2d6138f9871dbd66301009
diff --git a/postfix-lmdb/Pkgfile b/postfix-lmdb/Pkgfile
index 2914c3a00..386da95dd 100644
--- a/postfix-lmdb/Pkgfile
+++ b/postfix-lmdb/Pkgfile
@@ -7,7 +7,7 @@
 rname=postfix
 name=postfix-lmdb
 version=3.7.0
-release=1
+release=2
 source=(
    https://de.${rname}.org/ftpmirror/official/${rname}-${version}.tar.gz
    lmdb-default.patch
diff --git a/postfix-lmdb/main-addon.cf b/postfix-lmdb/main-addon.cf
index f3464f33d..8263183f8 100644
--- a/postfix-lmdb/main-addon.cf
+++ b/postfix-lmdb/main-addon.cf
@@ -9,19 +9,35 @@ alias_maps = $alias_database
 # all # or ipv4, ipv6 or ipv4 or ipv6
 inet_protocols = all
 
-#myhostname = crux-0306 # default: gethostname
+#myhostname = crux-box # default: gethostname
 #mydomain = localdomain # default: $myhostname less one component
 #myorigin = $mydomain
 # , lists.$myhostname
 mydestination = $myhostname, localhost.$mydomain, localhost
 mynetworks_style = host
-# One class A, 16 class B, 256 class C networks; loopback
+
+# mynetworks: which addresses we treat as belonging to "our network".
+# RFC 1918 defines several "address ranges for private internets",
+# one class A, 16 class B, 256 class C networks:
+#  10.0.0.0    - 10.255.255.255  (10/8 prefix)
+#  172.16.0.0  - 172.31.255.255  (172.16/12 prefix)
+#  192.168.0.0 - 192.168.255.255 (192.168/16 prefix)
+# In practice these are used by WLAN and other such networks, which is not
+# "our" per se.  RFC 5737 defines several blocks "reserved for documentation"
+# that SHOULD NOT occur on the public internet, so they should be blocked on
+# ingress and better not leave on egress, but they can be assigned to local
+# namespaces etc., and be used within VPNs:
+#     192.0.2.0    - 192.0.2.255    (192.0.2.0/24, TEST-NET-1, from RFC 1166)
+#     198.51.100.0 - 198.51.100.255 (198.51.100.0/24, TEST-NET-2)
+#     203.0.113.0  - 203.0.113.255  (203.0.113.0/24, TEST-NET-3)
 # Dunno how to specify IPv6 link-local and site-local
-mynetworks = 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16  127.0.0.0/8
+#mynetworks = 192.0.2.0/24 198.51.100.0/24 203.0.113.0/24 127.0.0.0/8
+mynetworks = 127.0.0.0/8
+
 #inet_interfaces = localhost
 #inet_interfaces = $myhostname, localhost
 inet_interfaces = all
-#debug_peer_list = 10.0.0.1
+#debug_peer_list = localhost
 
 smtputf8_enable = no
 disable_vrfy_command = yes
@@ -67,10 +83,10 @@ smtpd_client_restrictions =
    permit_mynetworks,
 #RELAY   permit_tls_clientcerts,
 #[RELAY]  permit_sasl_authenticated,
-   check_client_access lmdb:/etc/postfix-lmdb/client_restrict,
    reject_unknown_client_hostname,
-   # in case you want reject DNS blacklists rather than greylist them
-   # with gross, exchange sleep (maybe) and uncomment the lines below
+   check_client_access lmdb:/etc/postfix-lmdb/client_restrict,
+   # in case you want reject DNS blacklists rather than greylist them,
+   # exchange sleep (maybe) and uncomment the lines below
    sleep 1,
     #reject_rbl_client cbl.abuseat.org,
     #reject_rbl_client sbl.spamhaus.org,
@@ -105,7 +121,6 @@ smtpd_sender_restrictions =
    check_sender_access lmdb:/etc/postfix-lmdb/sender_restrict,
    reject_unknown_sender_domain,
    permit
-
 smtpd_relay_before_recipient_restrictions = yes
 
 # RCPT TO checks, relay policy
@@ -129,19 +144,17 @@ smtpd_recipient_restrictions =
    permit_mynetworks,
 #RELAY   permit_tls_clientcerts,
 #[RELAY]  permit_sasl_authenticated,
-   reject_unknown_sender_domain,
-   reject_unknown_reverse_client_hostname,
    reject_unknown_recipient_domain,
    # (SMTPD_POLICY_README says
    #   reject_unauth_destination is not needed here if the mail relay policy is
    #   specified with smtpd_relay_restrictions (available with Postfix 2.10 and
    #   later))
-   reject_unauth_destination,
+   #reject_unauth_destination,
    # better not: reject_unverified_sender,
    # DB of MAIL FROM's without policy server checks (one way, or another)
    check_sender_access lmdb:/etc/postfix-lmdb/sender_access,
-   #check_policy_service unix:/run/greylistd.socket,
-   ##check_policy_service inet:127.0.0.1:5525,
+   #check_policy_service inet:127.0.0.1:5525,
+   #check_policy_service unix:private/postgray
    permit
 
 # i would turn that on..
@@ -211,7 +224,7 @@ smtp_tls_ciphers = $smtpd_tls_ciphers
 smtp_tls_exclude_ciphers = $smtpd_tls_exclude_ciphers
 smtp_tls_connection_reuse = yes
 smtp_tls_session_cache_database = lmdb:/var/lib/postfix-lmdb/smtp_scache
-smtp_tls_session_cache_timeout = $smtpd_tls_session_cache_timeout 
+smtp_tls_session_cache_timeout = $smtpd_tls_session_cache_timeout
 
 #smtp_sasl_auth_enable = $smtpd_sasl_auth_enable
 #smtp_sasl_type = $smtpd_sasl_type