aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <francesco.colista@gmail.com>2012-11-01 06:44:18 +0000
committerFrancesco Colista <francesco.colista@gmail.com>2012-11-01 06:44:18 +0000
commit850bd171cf7137cd577fa2dfe15137d919d07a99 (patch)
treeb4d179902aabbd18a2cb95b0116b3d6cbb3ec829
parent1348d9fc4f59c5ce0c8191f4d12bde3600f957bb (diff)
parent94c89210906a941924a7caa6702231e5c69fdbca (diff)
downloadaports-850bd171cf7137cd577fa2dfe15137d919d07a99.tar.bz2
aports-850bd171cf7137cd577fa2dfe15137d919d07a99.tar.xz
Merge git://dev.alpinelinux.org/aports
-rw-r--r--main/freeradius/APKBUILD4
-rw-r--r--main/libvirt/APKBUILD4
-rw-r--r--main/tvheadend/APKBUILD (renamed from testing/tvheadend/APKBUILD)0
-rw-r--r--main/tvheadend/tvheadend.confd (renamed from testing/tvheadend/tvheadend.confd)0
-rw-r--r--main/tvheadend/tvheadend.initd (renamed from testing/tvheadend/tvheadend.initd)0
-rw-r--r--main/tvheadend/tvheadend.pre-install (renamed from testing/tvheadend/tvheadend.pre-install)0
6 files changed, 4 insertions, 4 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index c46c77ded9..f5cee1245f 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
pkgver=2.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="http://freeradius.org/"
arch="all"
@@ -84,7 +84,7 @@ package() {
rm -f "$pkgdir/usr/sbin/rc.radiusd"
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/radiusd
install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/radiusd
- install -m644 -D scripts/logrotate.freeradius "$pkgdir"/etc/lorotate.d/$pkgname
+ install -m644 -D scripts/logrotate.freeradius "$pkgdir"/etc/logrotate.d/$pkgname
find $pkgdir -iname *.la -delete
}
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index 7d7579c7eb..ca4937306e 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=libvirt
vmajor="1.0.0"
-vminor="rc2"
+vminor="rc3"
pkgver="${vmajor}_${vminor}"
_ver="${pkgver/_rc/-rc}"
pkgrel=0
@@ -125,7 +125,7 @@ uml() {
_mv_driver uml
}
-md5sums="77555217fc96423fa2c9fc4dbeb1febf libvirt-1.0.0-rc2.tar.gz
+md5sums="f2d89d0d13c3704887134a51a09b85e8 libvirt-1.0.0-rc3.tar.gz
1c84a7baeafe0a7f4e9d7ae5180311b7 libvirt.confd
d897df38c7e7fa1a297aa551108633c9 libvirt.initd
df9cbfaf8a6e520a4822914a300add4d uclibc-physmem.patch
diff --git a/testing/tvheadend/APKBUILD b/main/tvheadend/APKBUILD
index 1d05dff582..1d05dff582 100644
--- a/testing/tvheadend/APKBUILD
+++ b/main/tvheadend/APKBUILD
diff --git a/testing/tvheadend/tvheadend.confd b/main/tvheadend/tvheadend.confd
index 32dfe2526c..32dfe2526c 100644
--- a/testing/tvheadend/tvheadend.confd
+++ b/main/tvheadend/tvheadend.confd
diff --git a/testing/tvheadend/tvheadend.initd b/main/tvheadend/tvheadend.initd
index c244dd63ff..c244dd63ff 100644
--- a/testing/tvheadend/tvheadend.initd
+++ b/main/tvheadend/tvheadend.initd
diff --git a/testing/tvheadend/tvheadend.pre-install b/main/tvheadend/tvheadend.pre-install
index c91e1eda93..c91e1eda93 100644
--- a/testing/tvheadend/tvheadend.pre-install
+++ b/main/tvheadend/tvheadend.pre-install