izmjene za stretch

diff --git a/NEWS.CARNet b/NEWS.CARNet
index e7012da..3b4013d 100644 (file)
--- a/NEWS.CARNet
+++ b/NEWS.CARNet
@@ -1,10 +1,10 @@
-postfix-cn (2.9.6~cn0) sarge; urgency=medium
+postfix-cn (3.1.8~cn0) sarge; urgency=medium
 
-  Napomene uz rad make-aliases-gecos.sh skripte
-  ---------------------------------------------
+  Napomene uz rad newaliases-gecos skripte
+  ----------------------------------------
 
-Skripta /usr/share/postfix-cn/make-aliases-gecos.sh postavlja aliase
-samo za korisnicke racune za koje su ispunjeni sljedeci uvjeti:
+Skripta /usr/sbin/newaliases-gecos postavlja aliase samo za
+korisnicke racune za koje su ispunjeni sljedeci uvjeti:
     - uid veci od 100 ($3 >= 100)
     - korisnik ima eksplicitno postavljenu grupu ($5)
     - korisnicko ime nije "nobody" (uvjet postoji zbog toga sto sistemski

diff --git a/README.CARNet b/README.CARNet
index b79f78a..84b1170 100644 (file)
--- a/README.CARNet
+++ b/README.CARNet
@@ -11,13 +11,13 @@ analogna opciji MatchGECOS u Sendmailu.  Zbog toga je za ovaj paket
 pripremljena skripta koja donosi tu funkcionalnost, a koja se
 poziva iz crona.  Ovaj podsustav se sastoji od:
 
-/usr/share/postfix-cn/make-aliases-gecos.sh
+/usr/sbin/newaliases-gecos
 
-  skripta koja priprema dodatnu aliases datoteku za postfix.  Ukoliko
+  Skripta koja priprema dodatnu aliases datoteku za Postfix. Ukoliko
   ste upravo dodali nove korisnike i zelite odmah obnoviti GECOS
   aliase, pokrenite je:
 
-  # /usr/share/postfix-cn/make-aliases-gecos.sh
+  # /usr/sbin/newaliases-gecos
 
 /etc/cron.d/postfix-cn 
 
@@ -27,16 +27,16 @@ poziva iz crona.  Ovaj podsustav se sastoji od:
 
 /var/lib/postfix-cn/aliases_gecos
 
-  ova datoteka je rezultat poziva skripte.  _Nemojte_ je rucno
+  ova datoteka je rezultat poziva skripte. Nemojte_ je rucno
   mijenjati jer ce sve promjene biti pregazene kod iduceg poziva iz
-  crona.  Umjesto toga, sve lokalne aliase postavljajte u /etc/aliases
+  crona. Umjesto toga, sve lokalne aliase postavljajte u /etc/aliases
   (ili neku drugu datoteku definiranu u Postfix varijabli $alias_maps).
 
-  Napomene uz rad make-aliases-gecos.sh skripte
-  ---------------------------------------------
+Napomene uz rad skripte newaliases-gecos
+----------------------------------------
 
-Skripta /usr/share/postfix-cn/make-aliases-gecos.sh postavlja aliase
-samo za korisnicke racune za koje su ispunjeni sljedeci uvjeti:
+Skripta /usr/sbin/newaliases-gecos postavlja aliase samo za
+korisnicke racune za koje su ispunjeni sljedeci uvjeti:
     - uid veci od 100 ($3 >= 100)
     - korisnik ima eksplicitno postavljenu grupu ($5)
     - korisnicko ime nije "nobody" (uvjet postoji zbog toga sto sistemski
@@ -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 <Ivan.Rako@CARNet.hr>  Wed, 28 Aug 2013 16:52:04 +0200
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Sat, 07 Jul 2018 21:05:59 +0200

diff --git a/debian/changelog b/debian/changelog
index d1bfae7..48c0260 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postfix-cn (3.1.8~cn0) stable; urgency=medium
+
+  * Prva verzija za stretch
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Sat, 07 Jul 2018 21:06:48 +0200
+
 postfix-cn (2.11.3~cn0) stable; urgency=medium
 
   * Prva verzija za jessie

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/debian/control b/debian/control
index fad824a..7dc5a9c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: postfix-cn
 Section: mail
 Priority: optional
 Maintainer: Ivan Rako <Ivan.Rako@CARNet.hr>
-Build-Depends: debhelper (>= 8), po-debconf
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), po-debconf
+Standards-Version: 3.9.8
 
 Package: postfix-cn
 Architecture: all
-Depends: ${misc:Depends}, postfix (>= 2.9.6-2), carnet-tools-cn (>= 2.7), sasl2-bin (>= 2.1.25), libsasl2-modules (>= 2.1.25), debconf, openssl, adduser
+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
 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/postinst b/debian/postinst
index 89372df..c642710 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -41,8 +41,6 @@ if echo $rbl | grep -q dnsbl.njabl.org; then
 fi
 
 db_get postfix-cn/matchgecos || true
-
-db_get postfix-cn/matchgecos || true
 matchgecos="$RET"
 
 hostname="`hostname`"
@@ -60,15 +58,41 @@ netaddr="$RET"
 cp -pf /etc/postfix/master.cf /etc/postfix/master.cf.dpkg-tmp.$$
 cp -pf /etc/postfix/main.cf /etc/postfix/main.cf.dpkg-tmp.$$
 
-# srediti master.cf za TLS
+# srediti master.cf za TLS & submission & retry
 if [ -f /etc/postfix/master.cf ]; then
   cp_check_and_sed '^#tlsmgr' \
                    's/^#tlsmgr/tlsmgr/g' \
                    /etc/postfix/master.cf || true
 
+  cp_check_and_sed '^#submission' \
+                   's/^#submission/submission/g' \
+                   /etc/postfix/master.cf || true
+
+  cp_check_and_sed '^#retry' \
+                   's/^#retry/retry/g' \
+                   /etc/postfix/master.cf || true
+
   cp_check_and_sed '^#smtps' \
                    's/^#smtps/smtps/g' \
                    /etc/postfix/master.cf || true
+
+  cp_check_and_sed '^#  -o' \
+                   's/^#  -o/  -o/g' \
+                   /etc/postfix/master.cf || true
+
+  for option in  "-o milter_macro_daemon_name=ORIGINATING" \
+                 "-o smtpd_recipient_restrictions=" \
+                 "-o smtpd_reject_unlisted_recipient=no" \
+                 "-o smtpd_relay_restrictions=permit_sasl_authenticated,reject" \
+                 "-o smtpd_sasl_auth_enable=yes" \
+                 "-o smtpd_tls_security_level=encrypt" \
+                 "-o smtpd_tls_wrappermode=yes" \
+                 "-o syslog_name=postfix/smtps" \
+                 "-o syslog_name=postfix/submission"; 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,
@@ -251,11 +275,7 @@ fi
 
 # restart saslauthd
 if [ "$restart_saslauthd" = "yes" ]; then
-  if [ -x /usr/sbin/invoke-rc.d ]; then
-    [ -x /etc/init.d/saslauthd ] && invoke-rc.d saslauthd restart
-  else
-    [ -x /etc/init.d/saslauthd ] && /etc/init.d/saslauthd restart
-  fi
+  service saslauthd restart
 fi
 
 # TLS stuff
@@ -347,11 +367,11 @@ if ! cmp -s /etc/postfix/main.cf /etc/postfix/main.cf.dpkg-tmp.$$; then
 fi
 rm -f /etc/postfix/main.cf.dpkg-tmp.$$
 
-if ! grep -q "retry     unix  -       -       -       -       -       error" /etc/postfix/master.cf; then
-  echo "CN: Please, add this line in /etc/postfix/master.cf and restart Postfix."
-  echo "retry     unix  -       -       -       -       -       error"
-  echo
-fi
+#if ! grep -q "retry     unix  -       -       y       -       -       error" /etc/postfix/master.cf; then
+#  echo "CN: Please, add this line in /etc/postfix/master.cf and restart Postfix."
+#  echo "retry     unix  -       -       y       -       -       error"
+#  echo
+#fi
 
 # kreiraj aliases_gecos
 if [ -x /usr/share/postfix-cn/make-aliases-gecos.sh ]; then
@@ -363,11 +383,7 @@ fi
 
 # restart 
 if [ "$restart_postfix" = "yes" ]; then
-  if [ -x /usr/sbin/invoke-rc.d ]; then
-    [ -x /etc/init.d/postfix ] && invoke-rc.d postfix restart
-  else
-    [ -x /etc/init.d/postfix ] && /etc/init.d/postfix restart
-  fi
+  service postfix restart
 fi
 cp_mail postfix-cn