dovecot: updating to 1.1.19

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2254 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 64 insertions, 19 deletions

diff --git a/net/mail/dovecot/Manifest b/net/mail/dovecot/Manifest
index f487c787..ae7a34f5 100644
--- a/net/mail/dovecot/Manifest
+++ b/net/mail/dovecot/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST dovecot-1.1.14.tar.gz 2372939 MD5 60b1deccc0ae77e5669060d2b1894e5e RMD160 c39ab75125a224492f36deaada4c8ab73d51db21 SHA1 a508e6cb69710e5f7fe40ef2559d370678352ad5 SHA256 95aa89b65fd89a42484850bbd33d463601039eea21107febc15175d4f3652c4c SHA512 fb266b1bc07599e02d8d7bebb0c4799fa5289e27a47f383a5a42da68e692cd2f93e815859d0c95687b40789d2ab9f0ac3884da9d2678c38869e54bc7e4ba47a4
-MKBUILD dovecot.mkbuild 5117 MD5 18c35c32836866a3fdcf2570fe949696 RMD160 d5591f9fe09b536f49926bca8120dd1445e7e8eb SHA1 904e9c0df1e724c0c02571959934fa447d7be922 SHA256 d79d53788535943d64b289278f4baa0ac9bbf4915ba204301189eed771698723 SHA512 ca72b859ffa9ca07332bcaa4fe1133824059d21a6a67c9ee0399e98b9766c65adecd549a32606006d6eef2eb47a8ed9e97d29731ed38cb98f6b60934a85d7922
-SLACKBUILD dovecot.SlackBuild 7086 MD5 fb5f8d0e5cd67796048ca2f704171941 RMD160 ddca1628208cb8d7a2641e7229000c7aefe77d72 SHA1 18e852ee1e0b1202fd941e7c8618dd0e102ea22f SHA256 2e5c86635e1c08ac9805543ca251ee6bdff2d63508b5c00c4ce4902f9cc76238 SHA512 e686c2e6fbe33337f769da44ce9ffa51ff5b4c9d700cb4a85c285643cd189d67b8db40709013be4109715df3c08d2ff77b46bd05cb2e67ca0ecb2e6a06511db0
+DIST dovecot-1.1.19.tar.gz 2389194 MD5 755be2a4bad1e8fd26f22b463e544183 RMD160 8fe25b5a5347792e7aa919cc285c1b8c99bab36e SHA1 ce8f8a135a2c8ef1bd0cd1ceff04018402f3cb58 SHA256 33df1d97b9241b25dfcbc78c86ba6114f16ddf14763879432a6afe4acd1bc95a SHA512 bb583515e31b1a24a8e344a19497a9cfc43a060c9bad246dafba0741ad2fbfa60162c8d6da625d45aa9c40435bc5824bc440ee6c9b0c3278c4a519415b6f4552
+MKBUILD dovecot.mkbuild 5124 MD5 0f2801534d1aeb9625663963cf236669 RMD160 bc8aefa9ef633f7b60b858fc9dac36aac567e7b6 SHA1 98d2fac53a269ad8b2ff5b0ab817373bd983caf8 SHA256 a225cb6f473e88033c9a013f82a0b6e558b98fea14ebadadcc1608c339a6dc65 SHA512 b5ae9c62e759d297d767c096c7e9ac603a0e5acb6777e770ccda676e6bc2d97b7d44fd4cfaa29e761272d4228c7a0b75ab564d9f3fe9a4f35ab3c700b339016e
+SLACKBUILD dovecot.SlackBuild 8445 MD5 1ed74084a26135d08bb9d53b2512b0ab RMD160 1b83e03ac49225253cdc15b3c5a626f2ade072e1 SHA1 d59cd1b82c49359c3c19cc4097cc79acc2edb828 SHA256 943e2ebc9e0eb3d26618662fa29890495baae4bcfcb4eecf0ed782604cd9dd7a SHA512 18fd908a645f9f79625d4d5bb7e2d1c6b84f45797e2f4cec7f409905a401203d8b47b2b410db154ce13208ac1a699ee3a5b2ed20cdc8eb06fd9e38f5192f04da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIbBAEBAgAGBQJJ82ivAAoJEEHL93ESzgeiM2EP9jHlRigPlE7wCN/a0t4vTb5l
-v6NanUioUXJD1WcIsfIi6hZNNZM+UyJwGAZFu2LG7m2PTdB8cdumXAcPi8CaQJnk
-2LN3McL9gE75gHJ3yMh5w/acJDwxSEbJQQUeiuXbn8FrwJLRm3/jVcrUZQfLg7gG
-JB1NTPTETEU9z7YLPhEPOWHF4SIBYp6YeZYkkoJe2YhhrnTRYb1y8y2MuF5jbbzW
-TGKCmz++Nur4SJX2X8ZZBk4qgYckUb5QNM+GtWYK1tkFROndOQpUnC7u0rmCO/aI
-3d+kSW4Pk9tIyGPD5a6g7HGE+29x7mjTo6+pwf5qlU3w7A2pDPENHjLBLte/tfKF
-pf7T2XYLQhKV6JV0XsAYf67yYKuugOIufRq9OvA4fwfvvcaX1PkTd3v5+H15PwxO
-wj293qK6l3KGN9jDA/xNs9m10MR/Pt7KqQOHV8heqe2ZebihEDFkxC6vDi4C9MF5
-uWXSnS67si43c/EIETOeVd8TiLb7YNo0ezw+H8KmeyQj4d/k6/vKSDuvvwUg+ho+
-vmJfXNXHcpwN1/T7B4Q4cixCeAvjoPvkJLMiMd3g5maoDs/Z3rT73UoN+V2YWTRC
-CksfpnDVQoncgwAmWhs9wz+Qmshx0ELNiWvCjtEc2bDeSBTBPss7KoS1QSsGvM6w
-MOkkMaVmaK8uczC0lXI=
-=iwrt
+iQIcBAEBCAAGBQJKw256AAoJEEHL93ESzgeix98QAIo8D0FPAvOya/8SG+5JnFwJ
+aaeVBb2hzcOLxgg1GUC99mj0vDj/bBbmPLPchKfJSEz5HC+pNhd0ViaDXaDnGi2h
+qBqqFqBp3+dmsBl83cmTE9IxvNva0lCFPb+z25CBqeGZqEczqHSZdQvJhF1xAFRq
++WcLklgNB179rriaYV3zq9W6pW4rUqOap/cO1qv+JGaImh2bvSjyl68SPSARKV+M
+Gfs79xJz8knWn3+pAp1L/kVukXC6W2Y+15mkC7XRLlAe50XWm8WOpNxCc+rNYJRd
+5C0vxyJRuQXPYAl2N+0sY70v3RF0rOVg02MxGLna53jMhax7r/VkSCSyve+qJrmK
+3d0+ler/uz1ywqXQJLcHh3U17AtGyn9FtlmolAMiGn26DufqmW2Igs5qTfmYT/wV
+HLwAwgNbaddqdGZ0+kuXbd/n0l8b9Pps4YOaiTMcpHVM5xhnHCBSr31euwT4Zp2n
+Y6N2aFCJwUG6eNVjiqfM2ehWmNnLyiePMuHgBX2ce4fPT0jdNV3WsCYA2rb7fCNP
+8pNxOvs6Qs4cLGmdO74TdUajKw7QddffyXxgXxqQHajv/gg15TEiDXMJ+y+hW4gl
+F4h4vJVT5/O7HP18IrT/KElzI0X+mj+6n8HTpS7yX3NMaEaBLf7NihHwwTOUu+V6
+hAJkCu8XSQrhMVFU8nbS
+=aXDV
 -----END PGP SIGNATURE-----
diff --git a/net/mail/dovecot/dovecot.SlackBuild b/net/mail/dovecot/dovecot.SlackBuild
index e4e36e15..4fa9d6ee 100755
--- a/net/mail/dovecot/dovecot.SlackBuild
+++ b/net/mail/dovecot/dovecot.SlackBuild
@@ -16,8 +16,8 @@
 #
 # slackbuild for dovecot, by Silvio Rhatto
 # requires:  
-# tested: dovecot-1.1.14
-# model: generic.mkSlackBuild $Rev: 805 $
+# tested: dovecot-1.1.19
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -32,7 +32,7 @@ CWD="$(pwd)"
 SRC_NAME="dovecot"
 PKG_NAME="dovecot"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.1.14}
+SRC_VERSION=${VERSION:=1.1.19}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -87,6 +87,50 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Import minimized signing key from
+if echo [[SIGNING KEY URL]] | grep -q -v "SIGNING KEY URL"; then
+  lynx -dump [[SIGNING KEY URL]] | gpg --import || exit $ERROR_GPG
+elif echo 40558AC9 | grep -q -v "SIGNING KEY ID"; then
+  gpg --recv-keys 40558AC9 || exit $ERROR_GPG
+else
+  gpg --import << EOKEY || exit $ERROR_GPG
+[[SIGNING KEY]]
+EOKEY
+fi
+
+# Download source's signature if necessary and check it
+if echo [[SIGNING URL]] | grep -q -v "SIGNING URL"; then
+  SIGNATURE="`basename [[SIGNING URL]]`"
+  if [ ! -s "$SRC_DIR/$SIGNATURE" ]; then
+    wget "[[SIGNING URL]]" -O "$SRC_DIR/$SIGNATURE" || exit $ERROR_WGET
+  fi
+else
+  if [ -s "$SRC_DIR/$SRC.sig" ]; then
+    SIGNATURE="$SRC.sig"
+  elif [ -s "$SRC_DIR/$SRC.asc" ]; then
+    SIGNATURE="$SRC.asc"
+  else
+    echo Trying to get signature file from $URL.sig...
+    if wget "$URL.sig" -O "$SRC_DIR/$SRC.sig"; then
+      SIGNATURE="$SRC.sig"
+    else
+      rm $SRC_DIR/$SRC.sig
+      echo Trying to get signature file from $URL.asc...
+      if wget "$URL.asc" -O "$SRC_DIR/$SRC.asc"; then
+        SIGNATURE="$SRC.asc"
+      else
+        rm $SRC_DIR/$SRC.asc
+        echo "Error getting source's signature file"
+        exit $ERROR_GPG
+      fi
+    fi
+  fi
+fi
+
+echo Checking $SRC_DIR/$SRC with gpg using $SRC_DIR/$SIGNATURE...
+gpg --verify "$SRC_DIR/$SIGNATURE" "$SRC_DIR/$SRC" || exit $ERROR_GPG
+echo Success.
+
 # Check Manifest file
 if [ -e "$CWD/Manifest" ]; then