diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-28 15:31:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-28 15:31:01 +0000 |
| commit | 3f3ab90792f863fda928a6c2ce9fd8fbc8c72e73 (patch) | |
| tree | 1ce8aee4fb441092cb71abb5bdc3b959e990daa8 | |
| parent | c8228783732fc8051d9f4f3f84381fbe7e0b36d6 (diff) | |
| parent | 41c8b23f2c25c84aa46c5d23263d3c03ab8572cd (diff) | |
| download | aports-3f3ab90792f863fda928a6c2ce9fd8fbc8c72e73.tar.bz2 aports-3f3ab90792f863fda928a6c2ce9fd8fbc8c72e73.tar.xz | |
Merge remote branch 'tdtrask/master'
| -rw-r--r-- | main/acf-core/APKBUILD | 5 | ||||
| -rw-r--r-- | main/acf-core/acf-core.post-upgrade | 16 | ||||
| -rw-r--r-- | main/acf-weblog/APKBUILD | 4 |
3 files changed, 21 insertions, 4 deletions
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD index 68721739..8c431f10 100644 --- a/main/acf-core/APKBUILD +++ b/main/acf-core/APKBUILD @@ -1,10 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-core -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=0 pkgdesc="A web-based system administration interface framework" url="http://git.alpinelinux.org/cgit/acf-core" license="GPL-2" +install="$pkgname.post-upgrade" depends="acf-jquery acf-lib acf-skins haserl lua lua-posix lua-md5" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" @@ -12,4 +13,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="34dade6fd5f70f3319cd4f4aee46062b acf-core-0.10.0.tar.bz2" +md5sums="8a6f463405fd16f45b5dc1e02f4ee863 acf-core-0.10.1.tar.bz2" diff --git a/main/acf-core/acf-core.post-upgrade b/main/acf-core/acf-core.post-upgrade new file mode 100644 index 00000000..1a54c045 --- /dev/null +++ b/main/acf-core/acf-core.post-upgrade @@ -0,0 +1,16 @@ +#!/bin/sh + +new=$1 +old=$2 + +# if current is not older than 0.10.1 we exit. +if ! [ "$(apk version -t $old 0.10.1)" = "<" ]; then + exit 0 +fi + +if [ -e /etc/acf/acf.conf.apk-new ]; then + mv /etc/acf/acf.conf /etc/acf/acf.conf.apk-old + mv /etc/acf/acf.conf.apk-new /etc/acf/acf.conf +fi + +exit 0 diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD index a3b63696..a4629fc4 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.1 +pkgver=0.5.2 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="2ea8c9d6c11558ba1514fc4e854b0380 acf-weblog-0.5.1.tar.bz2" +md5sums="dee1389103e6b4304cfd95091f94fd44 acf-weblog-0.5.2.tar.bz2" |