Merge remote branch 'tdtrask/1.10-stable' into 1.10-stable

3 files changed, 18 insertions, 4 deletions

diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 7b256601e6..82b9ceb243 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-tinydns
-pkgver=0.5.2
+pkgver=0.5.3
 pkgrel=0
 pkgdesc="A web-based system administration interface for tinydns"
 url="http://git.alpinelinux.org/cgit/acf-tinydns"
@@ -12,4 +12,4 @@ build() {
         cd "$srcdir/$pkgname-$pkgver"
         make DESTDIR="$pkgdir" install
 }
-md5sums="906c2d284f4aa5a9059ae3c1c980a309  acf-tinydns-0.5.2.tar.bz2"
+md5sums="0fec252d8cef53ffe226b3adf2acb9c3  acf-tinydns-0.5.3.tar.bz2"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index 6600623f8b..ec2f111cad 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-weblog
-pkgver=0.5.3
+pkgver=0.5.4
 pkgrel=0
 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
 url="http://git.alpinelinux.org/cgit/acf-weblog"
@@ -17,4 +17,4 @@ build() {
         make DESTDIR="$pkgdir" install
 }
 
-md5sums="ec29bf0cf9ab0a3deb892ff28d8c98bc  acf-weblog-0.5.3.tar.bz2"
+md5sums="8926a8178bf646363678bc9feacbc310  acf-weblog-0.5.4.tar.bz2"
diff --git a/main/acf-weblog/acf-weblog.post-upgrade b/main/acf-weblog/acf-weblog.post-upgrade
index aec1e22c4d..a15590cc73 100644
--- a/main/acf-weblog/acf-weblog.post-upgrade
+++ b/main/acf-weblog/acf-weblog.post-upgrade
@@ -3,6 +3,20 @@
 new=$1
 old=$2
 
+# if current is not older than 0.5.4 we exit.
+if ! [ "$(apk version -t $old 0.5.4)" = "<" ]; then
+        exit 0
+fi
+
+psql -U postgres -c "ALTER TABLE weblog ALTER bytes TYPE bigint"\
+        webproxylog
+psql -U postgres -c "ALTER TABLE pubweblog ALTER bytes TYPE bigint"\
+        webproxylog
+psql -U postgres -c "ALTER TABLE blocklog ALTER bytes TYPE bigint"\
+        webproxylog
+psql -U postgres -c "ALTER TABLE pubblocklog ALTER bytes TYPE bigint"\
+        webproxylog
+
 # if current is not older than 0.4.5 we exit.
 if ! [ "$(apk version -t $old 0.4.5)" = "<" ]; then
         exit 0