X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=ff854eb0cedb5a1637cc2fe54bfab23f7882bd34;hb=d97a7dd1153ca03f569ba5100147d8b2a6551fb1;hp=c546d27eb5f23c79cac14b0edbf39f90b6f25240;hpb=66670870243ee78ff68cdd5cbbcbf9974f0a3cae;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index c546d27..ff854eb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -117,7 +117,7 @@ if [ -f $examdir/local.cf ]; then
 
     # old enough
     if [ -s $confdir/local.cf ] &&
-            dpkg --compare-versions "$2" lt "2:3.0.3-3"; then
+            dpkg --compare-versions "$2" lt "2:3.2.5-4"; then
         echo "CN: Backing up old version of $confdir/local.cf in /var/backups"
         cp_backup_conffile $confdir/local.cf
         rm -f $confdir/local.cf
@@ -199,6 +199,45 @@ if [ -f $examdir/local.cf ]; then
             mv -f $confdir/local.cf.$$.$$ $confdir/local.cf.$$
     rm -f $confdir/local.cf.$$.$$
 
+    # calculate trusted networks
+    cp_get_netaddr || true
+    netaddr="$RET"
+    # ... get already configured trusted networks
+    trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
+        $confdir/local.cf.$$ | sed -e 's/,/ /g')
+    # ... merge with local networks configured on eth interfaces
+    for i in $netaddr; do
+        if ! echo "$trusted_networks" | grep -q "$i"; then
+            trusted_networks="$trusted_networks $i"
+        fi
+    done
+    # ... merge with Postfix ranges
+    if [ -x /usr/sbin/postconf ]; then
+        for i in $(postconf -h mynetworks | sed -e 's/,/ /g'); do
+            if ! echo "$trusted_networks" | grep -q "$i"; then
+                trusted_networks="$trusted_networks $i"
+            fi
+        done
+    fi
+    # ... strip 127/8 range
+    for i in $trusted_networks; do
+        if ! echo "$i" | egrep -q \
+            "127.0.0.0/8|\[::1\]/128|\[::ffff:127.0.0.0\]/104"; then
+            trusted_networks_clean="$trusted_networks_clean $i"
+        fi
+    done
+    # ... strip left and right blanks from final string
+    trusted_networks_clean=$(echo "$trusted_networks_clean" \
+        |  sed 's/^[ \t]*//;s/[ \t]*$//')
+    # ... and replace if non-zero
+    if [ ! -z "$trusted_networks_clean" ]; then
+        trusted_networks=$trusted_networks_clean
+    fi
+    cp_check_and_sed "^trusted_networks " \
+        "s#^trusted_networks .*#trusted_networks $trusted_networks#g" \
+        $confdir/local.cf.$$ || true
+    echo "CN: Activated $trusted_networks as trusted networks"
+
     # different than template
     if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
         # backup if not zero size