diff options
| author | Francesco Colista <francesco.colista@gmail.com> | 2012-07-30 15:24:13 +0000 |
|---|---|---|
| committer | Francesco Colista <francesco.colista@gmail.com> | 2012-07-30 15:24:13 +0000 |
| commit | b334246733c33a825f720748175c4c5c22ebeea2 (patch) | |
| tree | 344be9686ce62c3e99c87c2299078eb514cdadeb | |
| parent | 388752fa23fb4c776fbbb2a0ad7b04d16c336b4c (diff) | |
| parent | a1dff156439409cee21636f5b8dba0f4ae455791 (diff) | |
| download | aports-b334246733c33a825f720748175c4c5c22ebeea2.tar.bz2 aports-b334246733c33a825f720748175c4c5c22ebeea2.tar.xz | |
Merge git://dev.alpinelinux.org/aports
| -rw-r--r-- | main/libpng/APKBUILD | 6 | ||||
| -rw-r--r-- | main/rsyslog/APKBUILD | 4 | ||||
| -rw-r--r-- | main/rsyslog/rsyslog.initd | 1 | ||||
| -rw-r--r-- | main/xf86-video-openchrome/APKBUILD | 4 | ||||
| -rw-r--r-- | testing/owncloud/APKBUILD | 12 |
5 files changed, 14 insertions, 13 deletions
diff --git a/main/libpng/APKBUILD b/main/libpng/APKBUILD index 5ccb4c7a6f..b869d7b692 100644 --- a/main/libpng/APKBUILD +++ b/main/libpng/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libpng -pkgver=1.5.11 +pkgver=1.5.12 pkgrel=0 pkgdesc="Portable Network Graphics library" url="http://www.libpng.org/" @@ -36,5 +36,5 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="7373f65ca1407ce9910d634e527e8959 libpng-1.5.11.tar.gz -e9ddf7670e78ad93f4cc189c884d4f26 libpng-1.5.11-apng.patch.gz" +md5sums="8ea7f60347a306c5faf70b977fa80e28 libpng-1.5.12.tar.gz +7f2924b1fe0cca9080e18b8720443716 libpng-1.5.12-apng.patch.gz" diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD index cdd4be2c4d..4b7241b669 100644 --- a/main/rsyslog/APKBUILD +++ b/main/rsyslog/APKBUILD @@ -2,7 +2,7 @@ # Contributor: cbanta@gmail.com pkgname=rsyslog pkgver=6.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="Enhanced multi-threaded syslogd with database support and more." url="http://www.rsyslog.com/" arch="all" @@ -86,7 +86,7 @@ snmp() { } md5sums="b797b8222d6ea4d5dfa007efe8aafa7f rsyslog-6.2.2.tar.gz -b3fcedb16f9de2d9434ce4c89004a73b rsyslog.initd +e2566e40938c054b61f873dd239d4856 rsyslog.initd 0a0aef98f677364e6178c34274df7723 rsyslog.confd bc43debc9ffdf66bc1409025fd3d1176 rsyslog.logrotate 65fbf5a7a81a53a70974e3085e96cb41 rsyslog.conf" diff --git a/main/rsyslog/rsyslog.initd b/main/rsyslog/rsyslog.initd index 9187fa5737..459832e78b 100644 --- a/main/rsyslog/rsyslog.initd +++ b/main/rsyslog/rsyslog.initd @@ -6,6 +6,7 @@ extra_started_commands="reload" depend() { + need clock hostname localmount provide logger } diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD index 8324232fda..ff5c3d3625 100644 --- a/main/xf86-video-openchrome/APKBUILD +++ b/main/xf86-video-openchrome/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-openchrome -pkgver=0.2.906 +pkgver=0.3.0 pkgrel=0 pkgdesc="X.Org driver for VIA/S3G cards" url="http://xorg.freedesktop.org/" @@ -42,5 +42,5 @@ package() { "$pkgdir"/usr/share/hwdata/videoaliases/openchrome.xinf } -md5sums="244507baf1900f1e923604c4a0f05925 xf86-video-openchrome-0.2.906.tar.bz2 +md5sums="dcd7484dcd50959172329390eaafd139 xf86-video-openchrome-0.3.0.tar.bz2 d6906087f0e93ea2d98e553f4dfbcc97 openchrome.xinf" diff --git a/testing/owncloud/APKBUILD b/testing/owncloud/APKBUILD index e5c210daa2..905ee8cda6 100644 --- a/testing/owncloud/APKBUILD +++ b/testing/owncloud/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=owncloud -pkgver=4.0.4 -pkgrel=2 +pkgver=4.0.5 +pkgrel=0 pkgdesc="Your own WebDAV-based cloud service" url="http://owncloud.org" arch="noarch" @@ -28,14 +28,14 @@ build() { package() { cd "$_builddir" - mkdir -p "$pkgdir"/etc/owncloud/config + mkdir -p "$pkgdir"/etc/owncloud mkdir -p "$pkgdir"/var/lib/owncloud/data mkdir -p "$pkgdir"/usr/share/webapps/owncloud rm -rf config data mv * "$pkgdir"/usr/share/webapps/owncloud - ln -s /etc/owncloud/config "$pkgdir"/usr/share/webapps/owncloud/config || exit 1 + ln -s /etc/owncloud "$pkgdir"/usr/share/webapps/owncloud/config || exit 1 #ln -s /var/lib/owncloud/data "$pkgdir"/usr/share/webapps/owncloud/data || exit 1 - install -m640 ../owncloud.config.php "$pkgdir"/etc/owncloud/config/config.php + install -m640 ../owncloud.config.php "$pkgdir"/etc/owncloud/config.php } pgsql() { @@ -50,5 +50,5 @@ sqlite() { mkdir -p "$subpkgdir"/usr/share/webapps/owncloud } -md5sums="5d7896053591916a6a5e00e9669cc284 owncloud-4.0.4.tar.bz2 +md5sums="08960fcc66d48760cbb8a6e4a68978bb owncloud-4.0.5.tar.bz2 ffca86e31918c3b73878e72148ba9134 owncloud.config.php" |