From d44d52a09708085dd941ea7cd1d3ba85ad3afbfd Mon Sep 17 00:00:00 2001 From: Ivan Rako Date: Thu, 13 Aug 2020 19:21:20 +0200 Subject: [PATCH] Prva verzija za buster. --- NEWS.CARNet => NEWS.CARNET | 8 ++++---- README.CARNet => README.CARNET | 2 +- carnet_whitelist_clients | 2 +- debian/changelog | 6 ++++++ debian/compat | 2 +- debian/control | 6 +++--- debian/copyright | 2 +- debian/docs | 4 ++-- debian/postinst | 10 +++++++++- debian/templates | 4 ++-- newaliases-gecos | 2 +- newaliases-gecos.8 | 8 ++++---- 12 files changed, 35 insertions(+), 21 deletions(-) rename NEWS.CARNet => NEWS.CARNET (80%) rename README.CARNet => README.CARNET (96%) diff --git a/NEWS.CARNet b/NEWS.CARNET similarity index 80% rename from NEWS.CARNet rename to NEWS.CARNET index 3b4013d..bca773d 100644 --- a/NEWS.CARNet +++ b/NEWS.CARNET @@ -1,7 +1,7 @@ postfix-cn (3.1.8~cn0) sarge; urgency=medium - Napomene uz rad newaliases-gecos skripte - ---------------------------------------- +Napomene uz rad newaliases-gecos skripte +---------------------------------------- Skripta /usr/sbin/newaliases-gecos postavlja aliase samo za korisnicke racune za koje su ispunjeni sljedeci uvjeti: @@ -22,6 +22,6 @@ Slicno tome, ako je definirano vise datoteka u Postfix varijabli $alias_maps, posta ce doci na prvi alias u datoteci koja je ranije definirana u $alias_maps. -Pogledajte /usr/share/doc/postfix-cn/README.CARNet za vise informacija. +Pogledajte /usr/share/doc/postfix-cn/README.CARNET za vise informacija. - -- Ivan Rako Wed, 28 Aug 2013 16:51:46 +0200 + -- Ivan Rako Thu, 13 Aug 2020 19:06:18 +0200 diff --git a/README.CARNet b/README.CARNET similarity index 96% rename from README.CARNet rename to README.CARNET index 84b1170..f84e685 100644 --- a/README.CARNet +++ b/README.CARNET @@ -54,4 +54,4 @@ Slicno tome, ako je definirano vise datoteka u Postfix varijabli $alias_maps, posta ce doci na prvi alias u datoteci koja je ranije definirana u $alias_maps. - -- Ivan Rako Sat, 07 Jul 2018 21:05:59 +0200 + -- Ivan Rako Sat, 07 Jul 2018 21:05:59 +0200 diff --git a/carnet_whitelist_clients b/carnet_whitelist_clients index 1cf7241..fd8b014 100644 --- a/carnet_whitelist_clients +++ b/carnet_whitelist_clients @@ -1,4 +1,4 @@ -# 2006-10-29: CARNet MX +# 2006-10-29: CARNET MX ahab.hzzz.hr andrija.snz.hr antun.erf.hr diff --git a/debian/changelog b/debian/changelog index b9685d7..6fb05ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +postfix-cn (3.4.10~cn0) stable; urgency=medium + + * Prva verzija za buster + + -- Ivan Rako Thu, 13 Aug 2020 19:05:45 +0200 + postfix-cn (3.1.8~cn1) stable; urgency=medium * sdbm->btree diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 7dc5a9c..5722afd 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: postfix-cn Section: mail Priority: optional -Maintainer: Ivan Rako -Build-Depends: debhelper (>= 9), po-debconf +Maintainer: Ivan Rako +Build-Depends: debhelper (>= 10), po-debconf Standards-Version: 3.9.8 Package: postfix-cn Architecture: all -Depends: ${misc:Depends}, postfix (>= 3.1.8), carnet-tools-cn (>= 3.2.1), sasl2-bin (>= 2.1.25), libsasl2-modules (>= 2.1.25), debconf, openssl, adduser +Depends: ${misc:Depends}, postfix (>= 3.4.10), carnet-tools-cn (>= 3.2.1), sasl2-bin (>= 2.1.27), libsasl2-modules (>= 2.1.27), debconf, openssl, adduser Conflicts: sendmail-cn, amavisd-cn (<< 2:20030616p10-10), amavisd-new-milter, sendmail-base Suggests: amavisd-cn Description: High-performance mail transport agent diff --git a/debian/copyright b/debian/copyright index 28add9f..840ef7c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Copyright 2006 CARNet +Copyright 2006 CARNET You are free to distribute this software package under the terms of the GNU General Public License. diff --git a/debian/docs b/debian/docs index aeba979..a321e04 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,2 @@ -README.CARNet -NEWS.CARNet +README.CARNET +NEWS.CARNET diff --git a/debian/postinst b/debian/postinst index cadf94c..040623f 100755 --- a/debian/postinst +++ b/debian/postinst @@ -5,7 +5,7 @@ set -e [ "$1" = "configure" ] || exit 0 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx -# Load CARNet Tools +# Load CARNET Tools . /usr/share/carnet-tools/functions.sh # Load Debconf @@ -94,6 +94,14 @@ if [ -f /etc/postfix/master.cf ]; then "s/# $option/$option/g" \ /etc/postfix/master.cf || true done + + for option in "o smtpd_client_restrictions=" \ + "o smtpd_helo_restrictions=" \ + "o smtpd_sender_restrictions="; do + cp_check_and_sed "$option" \ + "s/.*$option/# -$option/g" \ + /etc/postfix/master.cf || true + done fi # ovo manje/vise uzima kao default, ali u slucaju da je multihomed stroj, diff --git a/debian/templates b/debian/templates index 38309fc..24c3f82 100644 --- a/debian/templates +++ b/debian/templates @@ -5,8 +5,8 @@ _Description: Koje RBL zelite? Postfix moze prilikom provjere primanja e-mail poruka provjeriti da li je posiljatelj zavrsio na nekoj od RBL (Realtime Blackhole List) listi. . - VAZNO: Zbog licencnih razloga pristup CARNetovom RBL posluzitelju je - dopusten samo sa CARNetove mreze (161.53.0.0/16 i 193.198.0.0/16). + VAZNO: Zbog licencnih razloga pristup CARNETovom RBL posluzitelju je + dopusten samo sa CARNETove mreze (161.53.0.0/16 i 193.198.0.0/16). Template: postfix-cn/matchgecos Type: boolean diff --git a/newaliases-gecos b/newaliases-gecos index f831cf4..5c8f63f 100755 --- a/newaliases-gecos +++ b/newaliases-gecos @@ -11,7 +11,7 @@ grep -q "hash:$gecos" /etc/postfix/main.cf || exit 0 [ -d /var/lib/postfix-cn/ ] || exit 0 -# Load CARNet Tools +# Load CARNET Tools . /usr/share/carnet-tools/functions.sh getent passwd | awk -F: ' diff --git a/newaliases-gecos.8 b/newaliases-gecos.8 index 7b21c1f..a559444 100644 --- a/newaliases-gecos.8 +++ b/newaliases-gecos.8 @@ -1,4 +1,4 @@ -.TH newaliases-gecos 8 "April 2011" CARNet "CARNet Debian Commands" +.TH newaliases-gecos 8 "April 2011" CARNET "CARNET Debian Commands" .SH NAME newaliases-gecos \- Initialize the GECOS alias database. .SH SYNOPSIS @@ -8,11 +8,11 @@ newaliases-gecos \- Initialize the GECOS alias database. This script initialize the GECOS alias database stored in /var/lib/postfix-cn/aliases_gecos. .SH AUTHOR -Written by Ivan Rako . +Written by Ivan Rako . .SH "REPORTING BUGS" -Report bugs to . +Report bugs to . .SH COPYRIGHT -Copyright 2006 CARNet +Copyright 2006 CARNET .PP You are free to distribute this software package under the terms of the GNU General Public License. -- 1.7.10.4