knot 2.2.1 + remove knot1to2 script from install

3 files changed, 6 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 010f4010be3c..d12b671b34da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon May 16 08:01:07 UTC 2016
+# Tue May 24 20:52:03 UTC 2016
 pkgbase = knot
 	pkgdesc = high-performance authoritative-only DNS server
-	pkgver = 2.2.0
+	pkgver = 2.2.1
 	pkgrel = 1
 	url = https://www.knot-dns.cz/
 	install = install
@@ -14,10 +14,10 @@ pkgbase = knot
 	depends = zlib
 	depends = lmdb
 	depends = jansson
-	source = https://secure.nic.cz/files/knot-dns/knot-2.2.0.tar.xz
+	source = https://secure.nic.cz/files/knot-dns/knot-2.2.1.tar.xz
 	source = knot.service
 	source = knot.tmpfiles
-	sha256sums = 3f36e9671174136755b57ca7f4f52c03756721abe0a44fd3ca98c037eb799044
+	sha256sums = 4b587bd8299445a29990ba89087b156ab9b6bf85cbd68846766c078e5b3481d3
 	sha256sums = caa870a9c93c57c6311f9e8fb5685a9179bb9839a27a30cc1712c91df0d15090
 	sha256sums = 592ffb904b697b8c09ab95b3874ad00637333f1805ab2ab0ee50b4f484108ee2
 
diff --git a/PKGBUILD b/PKGBUILD
index cd00a744de59..9fc5f8c4c7fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 srcname=knot
 pkgname=${srcname}
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc='high-performance authoritative-only DNS server'
 url='https://www.knot-dns.cz/'
@@ -15,7 +15,7 @@ depends=('liburcu>=0.5.4' 'gnutls>=3.0' 'zlib' 'lmdb' 'jansson')
 source=("https://secure.nic.cz/files/knot-dns/${srcname}-${pkgver}.tar.xz"
         'knot.service'
         'knot.tmpfiles')
-sha256sums=('3f36e9671174136755b57ca7f4f52c03756721abe0a44fd3ca98c037eb799044'
+sha256sums=('4b587bd8299445a29990ba89087b156ab9b6bf85cbd68846766c078e5b3481d3'
             'caa870a9c93c57c6311f9e8fb5685a9179bb9839a27a30cc1712c91df0d15090'
             '592ffb904b697b8c09ab95b3874ad00637333f1805ab2ab0ee50b4f484108ee2')
 
diff --git a/install b/install
index d99e22986544..90ece5b423ff 100644
--- a/install
+++ b/install
@@ -3,13 +3,6 @@ post_install() {
   getent passwd knot &>/dev/null || useradd -r -g knot -d /dev/null -s /bin/false -c knot knot >/dev/null
   chown knot:knot /var/lib/knot
   chmod 700 /var/lib/knot
-
-  if [ -r /etc/knot/knot.conf -a ! -r /etc/knot/knot.conf.pacorig ]; then
-    /usr/lib/knot/knot1to2 --in /etc/knot/knot.conf --out /etc/knot/knot.conf.pacnew
-    mv /etc/knot/knot.conf /etc/knot/knot.conf.pacorig
-    mv /etc/knot/knot.conf.pacnew /etc/knot/knot.conf
-    echo 'warning: Old Knot DNS 1.6 configuration has been saved as /etc/knot/knot.conf.pacorig'
-  fi
 }
 
 post_remove() {