X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fchangelog;h=18d266703f3212288b2e6af5f88dc36dfda9d569;hb=f1fbb5d77b2af895bb9f67131856bcd1bb08bcc8;hp=20e786606699b259f4415e1dc20606c3f2a30655;hpb=e190e2817c53fa6b45bfbff3e579b50022196750;p=postfix-cn.git

diff --git a/debian/changelog b/debian/changelog
index 20e7866..18d2667 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,29 @@
-<<<<<<< HEAD
-postfix-cn (3.4.10~cn0) stable; urgency=medium
+postfix-cn (3.4.10+cn10u3) stable; urgency=medium
+
+  * Workaround u cronu za poruku "awk: Invalid multibyte data detected. 
+    There may be a mismatch between your data and your locale" 
+  * Workaround u newaliases-gecos za poruku "error writing passwd entry: 
+    Invalid argument"
+  * Dodana provjera UTF-8 znakova u /etc/passwd
+
+ -- Zeljko Boros <Zeljko.Boros@carnet.hr>  Tue, 08 Feb 2022 23:06:44 +0100
+
+postfix-cn (3.4.10+cn10u2) stable; urgency=medium
+
+  * Poruka "using backwards-compatible default setting chroot=y" se više ne
+    pojavljuje za svaki servis u master.cf
+  * Popravljeno generiranje GECOS aliasa
+  * Dodan RBL eta.cert.hr
+  * Dodane access liste za lakše blokiranje upornih spamera
+
+ -- Zeljko Boros <Zeljko.Boros@carnet.hr>  Wed, 28 Apr 2021 16:03:04 +0200
+
+postfix-cn (3.4.10+cn10u1) stable; urgency=medium
 
   * Prva verzija za buster
 
  -- Ivan Rako <Ivan.Rako@CARNET.hr>  Thu, 13 Aug 2020 19:05:45 +0200
 
-postfix-cn (3.1.8~cn1) stable; urgency=medium
-=======
 postfix-cn (3.1.8~cn2) stable; urgency=medium
 
   * Non-maintainer upload. 
@@ -16,7 +33,6 @@ postfix-cn (3.1.8~cn2) stable; urgency=medium
  -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Wed, 05 Feb 2020 15:27:43 +0100
 
 ppostfix-cn (3.1.8~cn1) stable; urgency=medium
->>>>>>> 1185b2ef230939782be3a96949ad7d7dfa738686
 
   * sdbm->btree
   * rjesava gresku "using backwards-compatible default setting chroot=y"