aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorAndrew Manison <amanison@anselsystems.com>2010-07-14 16:03:58 +0000
committerAndrew Manison <amanison@anselsystems.com>2010-07-14 16:03:58 +0000
commit27b2a7bc9a5b5027aa85431bf44d3ff47ed8ba5e (patch)
tree4e4e100e626f6d3b4982fd209277debd14be2f51 /main
parent6e8020140bbfb5e42802eed7c1491e675924cc01 (diff)
parent32441b10eaf9c5e6f7314af040cd557256b1d2da (diff)
downloadaports-27b2a7bc9a5b5027aa85431bf44d3ff47ed8ba5e.tar.bz2
aports-27b2a7bc9a5b5027aa85431bf44d3ff47ed8ba5e.tar.xz
Merge remote branch 'alpine/master'
Conflicts: main/libconfig/APKBUILD
Diffstat (limited to 'main')
-rw-r--r--main/a52dec/APKBUILD6
-rw-r--r--main/acf-core/APKBUILD4
-rw-r--r--main/alpine-desktop/APKBUILD41
-rw-r--r--main/alpine-desktop/alpine-desktop.post-install9
-rw-r--r--main/alsa-lib/APKBUILD2
-rw-r--r--main/apr-util/APKBUILD6
-rw-r--r--main/apr/APKBUILD2
-rw-r--r--main/aspell/APKBUILD2
-rw-r--r--main/atk/APKBUILD8
-rw-r--r--main/attr/APKBUILD2
-rw-r--r--main/awstats/APKBUILD58
-rw-r--r--main/beecrypt/APKBUILD2
-rw-r--r--main/boost/APKBUILD2
-rw-r--r--main/busybox/APKBUILD32
-rw-r--r--main/busybox/busyboxconfig149
-rw-r--r--main/busybox/diff.patch83
-rw-r--r--main/busybox/flock-bb.patch183
-rw-r--r--main/cairo/APKBUILD2
-rw-r--r--main/cpufrequtils/APKBUILD2
-rw-r--r--main/cryptsetup/APKBUILD4
-rw-r--r--main/cyrus-sasl/APKBUILD9
-rw-r--r--main/db/APKBUILD2
-rw-r--r--main/dbus-glib/APKBUILD2
-rw-r--r--main/enchant/APKBUILD2
-rw-r--r--main/espeak/APKBUILD2
-rw-r--r--main/faac/APKBUILD2
-rw-r--r--main/faad2/APKBUILD6
-rw-r--r--main/fcgi/APKBUILD6
-rw-r--r--main/flac/APKBUILD2
-rw-r--r--main/fontconfig/APKBUILD2
-rw-r--r--main/freeswitch-sounds-en-us-callie-8000/APKBUILD26
-rw-r--r--main/freeswitch/APKBUILD17
-rw-r--r--main/freeswitch/modules.conf2
-rw-r--r--main/freetds/APKBUILD6
-rw-r--r--main/freetype/10-bytecode.patch29
-rw-r--r--main/freetype/APKBUILD6
-rw-r--r--main/fribidi/APKBUILD6
-rw-r--r--main/fuse/APKBUILD62
-rw-r--r--main/fuse/fuse-iconv.patch24
-rw-r--r--main/fuse/fuse.initd35
-rw-r--r--main/gamin/APKBUILD5
-rw-r--r--main/gd/APKBUILD2
-rw-r--r--main/gdbm/APKBUILD6
-rw-r--r--main/ghostscript/APKBUILD2
-rw-r--r--main/giblib/APKBUILD2
-rw-r--r--main/giflib/APKBUILD2
-rw-r--r--main/glib/APKBUILD2
-rw-r--r--main/gnutls/APKBUILD2
-rw-r--r--main/gst-plugins-base/APKBUILD2
-rw-r--r--main/gstreamer/APKBUILD2
-rw-r--r--main/gtk-vnc/APKBUILD2
-rw-r--r--main/hunspell/APKBUILD4
-rw-r--r--main/hylafax/APKBUILD10
-rw-r--r--main/icu/APKBUILD2
-rw-r--r--main/imap/APKBUILD2
-rw-r--r--main/imlib2/APKBUILD2
-rw-r--r--main/jasper/APKBUILD2
-rw-r--r--main/jpeg/APKBUILD2
-rw-r--r--main/libao/APKBUILD2
-rw-r--r--main/libart-lgpl/APKBUILD2
-rw-r--r--main/libassuan/APKBUILD2
-rw-r--r--main/libcroco/APKBUILD6
-rw-r--r--main/libdnet/APKBUILD2
-rw-r--r--main/libetpan/APKBUILD2
-rw-r--r--main/libexif/APKBUILD2
-rw-r--r--main/libffi/APKBUILD2
-rw-r--r--main/libfontenc/APKBUILD2
-rw-r--r--main/libgcrypt/APKBUILD6
-rw-r--r--main/libglade/APKBUILD2
-rw-r--r--main/libgpg-error/APKBUILD6
-rw-r--r--main/libgsf/APKBUILD2
-rw-r--r--main/libgssglue/APKBUILD27
-rw-r--r--main/libgssglue/gssapi_mech.conf22
-rw-r--r--main/libice/APKBUILD2
-rw-r--r--main/libiconv/APKBUILD6
-rw-r--r--main/libid3tag/APKBUILD6
-rw-r--r--main/libidn/APKBUILD2
-rw-r--r--main/libksba/APKBUILD2
-rw-r--r--main/libmad/APKBUILD6
-rw-r--r--main/libmcrypt/APKBUILD6
-rw-r--r--main/libmpeg2/APKBUILD2
-rw-r--r--main/libnet/APKBUILD8
-rw-r--r--main/libnetfilter_conntrack/APKBUILD2
-rw-r--r--main/libnfnetlink/APKBUILD6
-rw-r--r--main/libnl/APKBUILD2
-rw-r--r--main/libnotify/APKBUILD2
-rw-r--r--main/liboil/APKBUILD2
-rw-r--r--main/libpaper/APKBUILD6
-rw-r--r--main/libpcap/APKBUILD9
-rw-r--r--main/libpciaccess/APKBUILD2
-rw-r--r--main/librsvg/APKBUILD2
-rw-r--r--main/libsamplerate/APKBUILD6
-rw-r--r--main/libsexy/APKBUILD6
-rw-r--r--main/libsm/APKBUILD8
-rw-r--r--main/libsndfile/APKBUILD2
-rw-r--r--main/libspf2/APKBUILD8
-rw-r--r--main/libspf2/libspf2-res_ninit-uclibc.patch64
-rw-r--r--main/libtasn1/APKBUILD2
-rw-r--r--main/libtheora/APKBUILD2
-rw-r--r--main/libusb-compat/APKBUILD2
-rw-r--r--main/libvorbis/APKBUILD2
-rw-r--r--main/libxau/APKBUILD6
-rw-r--r--main/libxcb/APKBUILD2
-rw-r--r--main/libxcursor/APKBUILD2
-rw-r--r--main/libxdmcp/APKBUILD6
-rw-r--r--main/libxft/APKBUILD2
-rw-r--r--main/libxi/APKBUILD2
-rw-r--r--main/libxinerama/APKBUILD2
-rw-r--r--main/libxkbfile/APKBUILD2
-rw-r--r--main/libxkbui/APKBUILD2
-rw-r--r--main/libxklavier/APKBUILD2
-rw-r--r--main/libxml2/APKBUILD2
-rw-r--r--main/libxmu/APKBUILD6
-rw-r--r--main/libxpm/APKBUILD2
-rw-r--r--main/libxrandr/APKBUILD2
-rw-r--r--main/libxres/APKBUILD6
-rw-r--r--main/libxslt/APKBUILD2
-rw-r--r--main/libxt/APKBUILD2
-rw-r--r--main/libxtst/APKBUILD6
-rw-r--r--main/libxv/APKBUILD2
-rw-r--r--main/libxvmc/APKBUILD2
-rw-r--r--main/libxxf86dga/APKBUILD2
-rw-r--r--main/libxxf86misc/APKBUILD2
-rw-r--r--main/libxxf86vm/APKBUILD2
-rw-r--r--main/linux-grsec/0021-xfrm-do-not-assume-that-template-resolving-always-returns-xfrms.patch66
-rw-r--r--main/linux-grsec/APKBUILD4
-rw-r--r--main/lm_sensors/APKBUILD14
-rw-r--r--main/lzo/APKBUILD6
-rw-r--r--main/mercurial/APKBUILD4
-rw-r--r--main/mesa/APKBUILD2
-rw-r--r--main/mysql/APKBUILD4
-rw-r--r--main/neon/APKBUILD2
-rw-r--r--main/net-snmp/APKBUILD2
-rw-r--r--main/openldap/APKBUILD2
-rw-r--r--main/pgcluster/APKBUILD6
-rw-r--r--main/pgpool/APKBUILD6
-rw-r--r--main/popt/APKBUILD2
-rw-r--r--main/pth/APKBUILD6
-rw-r--r--main/python/APKBUILD2
-rw-r--r--main/rarian/APKBUILD6
-rw-r--r--main/remmina/APKBUILD6
-rw-r--r--main/ruby/APKBUILD2
-rw-r--r--main/sdl/APKBUILD2
-rw-r--r--main/slang/APKBUILD2
-rw-r--r--main/sox/APKBUILD2
-rw-r--r--main/spandsp/APKBUILD2
-rw-r--r--main/sqlite/APKBUILD2
-rw-r--r--main/sshfs/APKBUILD25
-rw-r--r--main/subversion/APKBUILD2
-rw-r--r--main/swfdec/APKBUILD6
-rw-r--r--main/sysfsutils/APKBUILD6
-rw-r--r--main/taglib/APKBUILD2
-rw-r--r--main/unixodbc/APKBUILD2
-rw-r--r--main/webkit/APKBUILD2
-rw-r--r--main/wine/APKBUILD2
-rw-r--r--main/wireless-tools/APKBUILD2
-rw-r--r--main/xcb-util/APKBUILD6
-rw-r--r--main/xf86-video-ati/APKBUILD4
-rw-r--r--main/xf86-video-dummy/APKBUILD6
-rw-r--r--main/xf86-video-intel/APKBUILD6
-rw-r--r--main/xf86-video-openchrome/APKBUILD2
-rw-r--r--main/xf86-video-rendition/APKBUILD6
-rw-r--r--main/xf86-video-sis/APKBUILD11
-rw-r--r--main/xf86-video-tseng/APKBUILD6
-rw-r--r--main/xfprint/APKBUILD2
-rw-r--r--main/xfsprogs/APKBUILD2
-rw-r--r--main/xvidcore/APKBUILD2
167 files changed, 920 insertions, 562 deletions
diff --git a/main/a52dec/APKBUILD b/main/a52dec/APKBUILD
index bbb41d5f10..71a07b5ad0 100644
--- a/main/a52dec/APKBUILD
+++ b/main/a52dec/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=a52dec
pkgver=0.7.4
-pkgrel=1
+pkgrel=2
pkgdesc="liba52 is a free library for decoding ATSC A/52 streams."
url="http://liba52.sourceforge.net/"
license="GPL2"
@@ -20,6 +20,10 @@ build ()
--enable-shared \
|| return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
install -m644 liba52/a52_internal.h "$pkgdir"/usr/include/a52dec/ || return 1
}
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD
index dc73f7f38a..3834ca86c9 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=acf-core
-pkgver=0.10.4
+pkgver=0.10.5
pkgrel=0
pkgdesc="A web-based system administration interface framework"
url="http://git.alpinelinux.org/cgit/acf-core"
@@ -13,4 +13,4 @@ build() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-md5sums="dac7ee0dee9220d847dd6027179b2bbc acf-core-0.10.4.tar.bz2"
+md5sums="d7bb470cac2442ad01028640fff6956c acf-core-0.10.5.tar.bz2"
diff --git a/main/alpine-desktop/APKBUILD b/main/alpine-desktop/APKBUILD
new file mode 100644
index 0000000000..88aeaad468
--- /dev/null
+++ b/main/alpine-desktop/APKBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=alpine-desktop
+pkgver=2.0
+pkgrel=0
+pkgdesc="Meta package for Alpine Desktop"
+url="http://alpinelinux.org"
+license="GPL"
+depends=
+makedepends="
+ dhcpcd
+ dhcpcd-ui
+ gpicview
+ midori
+ slim
+ sudo
+ xf86-input-keyboard
+ xf86-input-mouse
+ xf86-video-vesa
+ xfce4
+ xorg-server
+ "
+install=alpine-desktop.post-install
+subpackages=
+source=
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+ return 0
+}
+
+build() {
+ return 0
+}
+
+package() {
+ mkdir -p "$pkgdir"
+ return 0
+}
+
+md5sums=
diff --git a/main/alpine-desktop/alpine-desktop.post-install b/main/alpine-desktop/alpine-desktop.post-install
new file mode 100644
index 0000000000..0b52acc598
--- /dev/null
+++ b/main/alpine-desktop/alpine-desktop.post-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# add mousedev to /etc/modules if not already there
+
+if ! grep -w -q ^mousedev /etc/modules; then
+ echo mousedev >> /etc/modules
+fi
+modprobe mousedev || true
+
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index 1b4503c92b..2bc24ff961 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-lib
pkgver=1.0.23
-pkgrel=1
+pkgrel=2
pkgdesc="An alternative implementation of Linux sound support"
url="http://www.alsa-project.org"
license="GPL"
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 8730607a5c..9b8d15407b 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apr-util
pkgver=1.3.9
-pkgrel=1
+pkgrel=2
pkgdesc="The Apache Portable Runtime"
url="http://apr.apache.org/"
license="APACHE"
@@ -24,6 +24,10 @@ build() {
--without-ldap-lib
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
# we dont need this one
diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD
index efef9c19cd..020564ec6f 100644
--- a/main/apr/APKBUILD
+++ b/main/apr/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apr
pkgver=1.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="The Apache Portable Runtime"
url="http://apr.apache.org/"
license="APACHE"
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index 34cd720d4e..767ab1b142 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -2,7 +2,7 @@
pkgname=aspell
pkgver=0.60.6
_pkgmajorver=${pkgver%.*}
-pkgrel=2
+pkgrel=3
pkgdesc="A spell checker designed to eventually replace Ispell"
url="http://aspell.net/"
license="LGPL"
diff --git a/main/atk/APKBUILD b/main/atk/APKBUILD
index 4dd5afd3ab..aeda979883 100644
--- a/main/atk/APKBUILD
+++ b/main/atk/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=atk
pkgver=1.30.0
-pkgrel=2
+pkgrel=3
pkgdesc="A library providing a set of interfaces for accessibility"
url="http://www.gtk.org/"
license="LGPL"
@@ -24,10 +24,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-dev() {
- default_dev
- install -d "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/share/gir* "$subpkgdir"/usr/share/
-}
-
md5sums="548d413775819fef425410739041cac3 atk-1.30.0.tar.bz2"
diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index e244a5aac9..a3a9c399d1 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -2,7 +2,7 @@
pkgname=attr
pkgver=2.4.44
_ver=2.4.44
-pkgrel=2
+pkgrel=3
pkgdesc="Extended attribute support library for ACL support"
url="http://oss.sgi.com/projects/xfs/"
license="LGPL"
diff --git a/main/awstats/APKBUILD b/main/awstats/APKBUILD
new file mode 100644
index 0000000000..4dddfdd1fe
--- /dev/null
+++ b/main/awstats/APKBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=awstats
+pkgver=6.95
+pkgrel=0
+pkgdesc="AWStats is short for Advanced Web Statistics."
+url="http://awstats.sourceforge.net/"
+license="GPL-2"
+depends="perl perl-uri"
+subpackages="$pkgname-doc"
+source="http://awstats.sourceforge.net/files/$pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ local file
+ cd "$_builddir"
+ for file in tools/* wwwroot/cgi-bin/*; do
+ [ -f "${file}" ] || continue
+ sed -e "s:/usr/local/awstats/wwwroot:/usr/lib/awstats:g" \
+ -i "$file"
+ done
+}
+
+build() {
+ return 0
+}
+
+package() {
+ cd "$_builddir"
+# logpath="awstats_log"
+# sed -e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
+# -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|"
+# -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|"
+# -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin\"|"
+# -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+# if use ipv6; then
+# sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+# fi
+
+ install -d "$pkgdir"/usr/share/doc/awstats \
+ "$pkgdir"/var/lib/awstats \
+ "$pkgdir"/usr/lib/awstats \
+ "$pkgdir"/usr/bin \
+ "$pkgdir"/etc/awstats
+ # docs
+ cp -a docs tools/xslt "$pkgdir"/usr/share/doc/awstats || return 1
+
+ # cgi-bin
+ cp -a wwwroot/* "$pkgdir"/usr/lib/awstats
+ mv "$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf \
+ "$pkgdir"/etc/awstats/
+ ln -s /etc/aswtats/awstats \
+ "$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf
+
+ # tools
+ cp tools/*.pl "$pkgdir"/usr/bin/ || return 1
+ ln -s /usr/lib/awstats/cgi-bin/awstats.pl "$pkgdir"/usr/bin/
+}
+md5sums="26a5b19fa9f395e9e7dafed37b795d7f awstats-6.95.tar.gz"
diff --git a/main/beecrypt/APKBUILD b/main/beecrypt/APKBUILD
index 3b12e35901..aaf69be4af 100644
--- a/main/beecrypt/APKBUILD
+++ b/main/beecrypt/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=beecrypt
pkgver=4.1.2
-pkgrel=5
+pkgrel=6
pkgdesc="general-purpose cryptography library"
url="http://sourceforge.net/projects/beecrypt"
license="LGPL"
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
index 1c40e470ad..069ae74d9e 100644
--- a/main/boost/APKBUILD
+++ b/main/boost/APKBUILD
@@ -8,7 +8,7 @@ _y=${_y#*.} # strip x.
_z=${pkgver##*.} # strip x.y.
_ver=${_x}_${_y}_${_z}
-pkgrel=0
+pkgrel=2
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="http://www.boost.org/"
license="custom"
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 9ec44618a3..324fa5c0d2 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
-pkgver=1.16.2
-pkgrel=2
+pkgver=1.17.0
+pkgrel=1
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
license="GPL-2"
@@ -11,8 +11,13 @@ subpackages="$pkgname-static"
triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*"
source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
$pkgname-1.11.1-bb.patch
- diff.patch
- flock-bb.patch
+ http://busybox.net/downloads/fixes-1.17.0/busybox-1.17.0-acpid.patch
+ http://busybox.net/downloads/fixes-1.17.0/busybox-1.17.0-build_system.patch
+ http://busybox.net/downloads/fixes-1.17.0/busybox-1.17.0-diff.patch
+ http://busybox.net/downloads/fixes-1.17.0/busybox-1.17.0-mktemp.patch
+ http://busybox.net/downloads/fixes-1.17.0/busybox-1.17.0-modprobe-l.patch
+ http://busybox.net/downloads/fixes-1.17.0/busybox-1.17.0-volumeid.patch
+ http://busybox.net/downloads/fixes-1.17.0/busybox-1.17.0-wget.patch
busyboxconfig"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -28,9 +33,9 @@ prepare() {
fi
done
- sed -i -e 's/(ip, _BB_DIR_BIN/(ip, _BB_DIR_SBIN/' \
- -e 's/(vi, _BB_DIR_BIN/(vi, _BB_DIR_USR_BIN/' \
- include/applets.h || return 1
+# sed -i -e 's/(ip, _BB_DIR_BIN/(ip, _BB_DIR_SBIN/' \
+# -e 's/(vi, _BB_DIR_BIN/(vi, _BB_DIR_USR_BIN/' \
+# include/applets.h || return 1
}
build() {
@@ -68,8 +73,13 @@ static() {
}
-md5sums="2ba980f720a5bdce4ec05423519acc35 busybox-1.16.2.tar.bz2
+md5sums="2908d1d1ca83ff12bc0b05f0d2a3335c busybox-1.17.0.tar.bz2
4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch
-5ce533f9727761c31de5b5f9df568f2f diff.patch
-20d9beea7d0c0aaca14553a8f98fee12 flock-bb.patch
-4bc85af9dd659cbb83c9a819b3481a47 busyboxconfig"
+0cf814dbe1f62c8c8e891697c896952d busybox-1.17.0-acpid.patch
+ea127206741f9785dd2e8fcce2c32ad8 busybox-1.17.0-build_system.patch
+094cde9990b5c6b02e631c08c91a5b30 busybox-1.17.0-diff.patch
+2f4c29e5fbd3c9527da9ecbd9e9e699f busybox-1.17.0-mktemp.patch
+b159ecc8954369ec3d2320212c075a69 busybox-1.17.0-modprobe-l.patch
+97cccda27dbf4181ca32a58f5d61e5a9 busybox-1.17.0-volumeid.patch
+aecc8dcaff560e1334d2788d588f6ea5 busybox-1.17.0-wget.patch
+e4c9f09bcc27b57f8f0344c69607f4c4 busyboxconfig"
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index da18f038b4..f950be73cf 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.16.0
-# Tue Mar 16 12:28:25 2010
+# Busybox version: 1.17.0
+# Thu Jul 15 14:12:18 2010
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -24,11 +24,21 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
CONFIG_FEATURE_COMPRESS_USAGE=y
CONFIG_FEATURE_INSTALLER=y
# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_FEATURE_ASSUME_UNICODE=y
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
CONFIG_LONG_OPTS=y
CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
CONFIG_FEATURE_PIDFILE=y
CONFIG_FEATURE_SUID=y
# CONFIG_FEATURE_SUID_CONFIG is not set
@@ -105,12 +115,14 @@ CONFIG_FEATURE_HWIB=y
#
# Archival Utilities
#
+# CONFIG_FEATURE_SEAMLESS_XZ is not set
CONFIG_FEATURE_SEAMLESS_LZMA=y
CONFIG_FEATURE_SEAMLESS_BZ2=y
CONFIG_FEATURE_SEAMLESS_GZ=y
CONFIG_FEATURE_SEAMLESS_Z=y
# CONFIG_AR is not set
# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+# CONFIG_FEATURE_AR_CREATE is not set
CONFIG_BUNZIP2=y
CONFIG_BZIP2=y
CONFIG_CPIO=y
@@ -124,7 +136,7 @@ CONFIG_GZIP=y
# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
CONFIG_LZOP=y
# CONFIG_LZOP_COMPR_HIGH is not set
-CONFIG_RPM2CPIO=y
+# CONFIG_RPM2CPIO is not set
# CONFIG_RPM is not set
CONFIG_TAR=y
CONFIG_FEATURE_TAR_CREATE=y
@@ -134,19 +146,33 @@ CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+# CONFIG_FEATURE_TAR_TO_COMMAND is not set
CONFIG_FEATURE_TAR_UNAME_GNAME=y
CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
-CONFIG_UNCOMPRESS=y
+# CONFIG_FEATURE_TAR_SELINUX is not set
+# CONFIG_UNCOMPRESS is not set
CONFIG_UNLZMA=y
CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_LZMA=y
+# CONFIG_UNXZ is not set
+# CONFIG_XZ is not set
CONFIG_UNZIP=y
#
# Coreutils
#
CONFIG_BASENAME=y
-CONFIG_CAL=y
CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_CAL=y
CONFIG_CATV=y
CONFIG_CHGRP=y
CONFIG_CHMOD=y
@@ -158,9 +184,6 @@ CONFIG_COMM=y
CONFIG_CP=y
CONFIG_FEATURE_CP_LONG_OPTIONS=y
CONFIG_CUT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_FEATURE_DATE_COMPAT=y
CONFIG_DD=y
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
@@ -241,12 +264,7 @@ CONFIG_TAIL=y
CONFIG_FEATURE_FANCY_TAIL=y
CONFIG_TEE=y
CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
CONFIG_TOUCH=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-CONFIG_FEATURE_TR_EQUIV=y
CONFIG_TRUE=y
CONFIG_TTY=y
CONFIG_UNAME=y
@@ -286,11 +304,12 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
# Console Utilities
#
CONFIG_CHVT=y
+# CONFIG_FGCONSOLE is not set
CONFIG_CLEAR=y
CONFIG_DEALLOCVT=y
CONFIG_DUMPKMAP=y
CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
+# CONFIG_LOADFONT is not set
CONFIG_LOADKMAP=y
CONFIG_OPENVT=y
CONFIG_RESET=y
@@ -304,6 +323,8 @@ CONFIG_DEFAULT_SETFONT_DIR=""
CONFIG_SETKEYCODES=y
CONFIG_SETLOGCONS=y
CONFIG_SHOWKEY=y
+# CONFIG_FEATURE_LOADFONT_PSF2 is not set
+# CONFIG_FEATURE_LOADFONT_RAW is not set
#
# Debian Utilities
@@ -342,6 +363,7 @@ CONFIG_FEATURE_VI_READONLY=y
CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
CONFIG_FEATURE_ALLOW_EXEC=y
@@ -384,6 +406,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
#
# Init Utilities
#
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
CONFIG_INIT=y
CONFIG_FEATURE_USE_INITTAB=y
CONFIG_FEATURE_KILL_REMOVED=y
@@ -418,8 +443,6 @@ CONFIG_FIRST_SYSTEM_ID=100
CONFIG_LAST_SYSTEM_ID=999
CONFIG_DELUSER=y
CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
CONFIG_LOGIN=y
# CONFIG_PAM is not set
CONFIG_LOGIN_SCRIPTS=y
@@ -441,10 +464,12 @@ CONFIG_VLOCK=y
# CONFIG_CHATTR is not set
CONFIG_FSCK=y
# CONFIG_LSATTR is not set
+# CONFIG_TUNE2FS is not set
#
# Linux Module Utilities
#
+CONFIG_MODINFO=y
# CONFIG_MODPROBE_SMALL is not set
# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
@@ -475,6 +500,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
#
# Linux System Utilities
#
+CONFIG_REV=y
CONFIG_ACPID=y
CONFIG_FEATURE_ACPID_COMPAT=y
CONFIG_BLKID=y
@@ -525,24 +551,6 @@ CONFIG_MKSWAP=y
CONFIG_FEATURE_MKSWAP_UUID=y
CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_VOLUMEID=y
-CONFIG_FEATURE_VOLUMEID_EXT=y
-CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_FEATURE_VOLUMEID_REISERFS=y
-CONFIG_FEATURE_VOLUMEID_FAT=y
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-CONFIG_FEATURE_VOLUMEID_XFS=y
-CONFIG_FEATURE_VOLUMEID_NTFS=y
-CONFIG_FEATURE_VOLUMEID_ISO9660=y
-CONFIG_FEATURE_VOLUMEID_UDF=y
-CONFIG_FEATURE_VOLUMEID_LUKS=y
-CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_FEATURE_VOLUMEID_CRAMFS=y
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-CONFIG_FEATURE_VOLUMEID_OCFS2=y
-CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_FAKE=y
CONFIG_FEATURE_MOUNT_VERBOSE=y
@@ -559,7 +567,7 @@ CONFIG_READPROFILE=y
# CONFIG_RTCWAKE is not set
# CONFIG_SCRIPT is not set
# CONFIG_SCRIPTREPLAY is not set
-CONFIG_SETARCH=y
+# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
CONFIG_FEATURE_SWAPON_PRI=y
CONFIG_SWITCH_ROOT=y
@@ -570,11 +578,37 @@ CONFIG_FEATURE_UMOUNT_ALL=y
# Common options for mount/umount
#
CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
# CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_BTRFS=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
#
# Miscellaneous Utilities
#
+CONFIG_CONSPY=y
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
CONFIG_ADJTIMEX=y
CONFIG_BBCONFIG=y
CONFIG_BEEP=y
@@ -606,8 +640,8 @@ CONFIG_EJECT=y
CONFIG_FEATURE_EJECT_SCSI=y
CONFIG_FBSPLASH=y
# CONFIG_FLASHCP is not set
-CONFIG_FLASH_LOCK=y
-CONFIG_FLASH_UNLOCK=y
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
# CONFIG_FLASH_ERASEALL is not set
CONFIG_IONICE=y
CONFIG_INOTIFYD=y
@@ -636,11 +670,12 @@ CONFIG_FEATURE_LESS_LINENUMS=y
# CONFIG_MAN is not set
CONFIG_MICROCOM=y
CONFIG_MOUNTPOINT=y
-CONFIG_MT=y
+# CONFIG_MT is not set
CONFIG_RAIDAUTORUN=y
CONFIG_READAHEAD=y
-CONFIG_RUNLEVEL=y
-CONFIG_RX=y
+CONFIG_RFKILL=y
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
CONFIG_SETSID=y
CONFIG_STRINGS=y
# CONFIG_TASKSET is not set
@@ -655,6 +690,10 @@ CONFIG_WATCHDOG=y
#
# Networking Utilities
#
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+CONFIG_NC_110_COMPAT=y
CONFIG_FEATURE_IPV6=y
# CONFIG_FEATURE_UNIX_LOCAL is not set
CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
@@ -728,9 +767,6 @@ CONFIG_FEATURE_IPCALC_FANCY=y
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
CONFIG_NAMEIF=y
CONFIG_FEATURE_NAMEIF_EXTENDED=y
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
CONFIG_NETSTAT=y
CONFIG_FEATURE_NETSTAT_WIDE=y
CONFIG_FEATURE_NETSTAT_PRG=y
@@ -743,6 +779,7 @@ CONFIG_FEATURE_FANCY_PING=y
CONFIG_PSCAN=y
CONFIG_ROUTE=y
CONFIG_SLATTACH=y
+# CONFIG_TCPSVD is not set
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
@@ -751,6 +788,10 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
CONFIG_TFTP=y
# CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
CONFIG_FEATURE_TFTP_GET=y
CONFIG_FEATURE_TFTP_PUT=y
CONFIG_FEATURE_TFTP_BLOCKSIZE=y
@@ -761,6 +802,8 @@ CONFIG_TRACEROUTE=y
CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
+CONFIG_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
# CONFIG_UDHCPD is not set
# CONFIG_DHCPRELAY is not set
# CONFIG_DUMPLEASES is not set
@@ -774,16 +817,13 @@ CONFIG_FEATURE_UDHCP_RFC3397=y
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+# CONFIG_UDPSVD is not set
CONFIG_VCONFIG=y
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
-CONFIG_ZCIP=y
-# CONFIG_TCPSVD is not set
-CONFIG_TUNCTL=y
-CONFIG_FEATURE_TUNCTL_UG=y
-# CONFIG_UDPSVD is not set
+# CONFIG_ZCIP is not set
#
# Print Utilities
@@ -806,6 +846,7 @@ CONFIG_SENDMAIL=y
#
# Process Utilities
#
+CONFIG_SMEMCAP=y
CONFIG_FREE=y
CONFIG_FUSER=y
CONFIG_KILL=y
@@ -868,9 +909,6 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
#
# Shells
#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
CONFIG_ASH=y
CONFIG_ASH_BASH_COMPAT=y
CONFIG_ASH_JOB_CONTROL=y
@@ -897,6 +935,12 @@ CONFIG_ASH_EXPAND_PRMT=y
# CONFIG_HUSH_LOCAL is not set
# CONFIG_HUSH_EXPORT_N is not set
# CONFIG_HUSH_RANDOM_SUPPORT is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
# CONFIG_LASH is not set
# CONFIG_MSH is not set
CONFIG_SH_MATH_SUPPORT=y
@@ -913,6 +957,7 @@ CONFIG_SYSLOGD=y
CONFIG_FEATURE_ROTATE_LOGFILE=y
CONFIG_FEATURE_REMOTE_LOG=y
CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
CONFIG_LOGREAD=y
diff --git a/main/busybox/diff.patch b/main/busybox/diff.patch
deleted file mode 100644
index 702c66ca29..0000000000
--- a/main/busybox/diff.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-commit 61f5f7823c4f217dd9bad2f1df547f81b9338c76
-Author: Matheus Izvekov <mizvekov@gmail.com>
-Date: Fri Jul 9 19:40:00 2010 +0200
-
- diff: fix "diff dir1 dir2/". Closes bug 2203
-
- Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
- Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
-diff --git a/editors/diff.c b/editors/diff.c
-index 07594e8..8d91b83 100644
---- a/editors/diff.c
-+++ b/editors/diff.c
-@@ -760,9 +760,11 @@ static int FAST_FUNC add_to_dirlist(const char *filename,
- void *userdata, int depth UNUSED_PARAM)
- {
- struct dlist *const l = userdata;
-+ const char *file = filename + l->len;
- l->dl = xrealloc_vector(l->dl, 6, l->e);
-- /* + 1 skips "/" after dirname */
-- l->dl[l->e] = xstrdup(filename + l->len + 1);
-+ while(*file == '/')
-+ file++;
-+ l->dl[l->e] = xstrdup(file);
- l->e++;
- return TRUE;
- }
-diff --git a/testsuite/diff.tests b/testsuite/diff.tests
-index 06d5a4f..27a4b33 100755
---- a/testsuite/diff.tests
-+++ b/testsuite/diff.tests
-@@ -4,7 +4,7 @@
-
- . ./testing.sh
-
--# testing "test name" "options" "expected result" "file input" "stdin"
-+# testing "test name" "commands" "expected result" "file input" "stdin"
-
- # diff outputs date/time in the header, which should not be analysed
- # NB: sed has tab character in s command!
-@@ -100,9 +100,11 @@ testing "diff always takes context from old file" \
- "abc\na c\ndef\n" \
- "a c\n"
-
--# testing "test name" "options" "expected result" "file input" "stdin"
-+# testing "test name" "commands" "expected result" "file input" "stdin"
-
-+# clean up
- rm -rf diff1 diff2
-+
- mkdir diff1 diff2 diff2/subdir
- echo qwe >diff1/-
- echo asd >diff2/subdir/-
-@@ -187,4 +189,29 @@ SKIP=
- # clean up
- rm -rf diff1 diff2
-
-+# NOT using directory structure from prev test...
-+mkdir diff1 diff2
-+echo qwe >diff1/-
-+echo rty >diff2/-
-+optional FEATURE_DIFF_DIR
-+testing "diff diff1 diff2/" \
-+ "diff -ur diff1 diff2/ | $TRIM_TAB; diff -ur .///diff1 diff2//// | $TRIM_TAB" \
-+"\
-+--- diff1/-
-++++ diff2/-
-+@@ -1 +1 @@
-+-qwe
-++rty
-+--- .///diff1/-
-++++ diff2////-
-+@@ -1 +1 @@
-+-qwe
-++rty
-+" \
-+ "" ""
-+SKIP=
-+
-+# clean up
-+rm -rf diff1 diff2
-+
- exit $FAILCOUNT
diff --git a/main/busybox/flock-bb.patch b/main/busybox/flock-bb.patch
deleted file mode 100644
index d97fbfcca2..0000000000
--- a/main/busybox/flock-bb.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From: Timo Teras <timo.teras@iki.fi>
-To: busybox@busybox.net
-Subject: [PATCH] flock: new applet
-Date: Tue, 16 Mar 2010 14:14:22 +0200
-Message-Id: <1268741663-8790-1-git-send-email-timo.teras@iki.fi>
-X-Mailer: git-send-email 1.6.3.3
-
-An utility to manage file locks from scripts.
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
----
- include/applets.h | 1 +
- include/usage.h | 11 ++++++
- util-linux/Config.in | 6 +++
- util-linux/Kbuild | 1 +
- util-linux/flock.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 112 insertions(+), 0 deletions(-)
- create mode 100644 util-linux/flock.c
-
-diff --git a/include/applets.h b/include/applets.h
-index 2d784bd..83c1792 100644
---- a/include/applets.h
-+++ b/include/applets.h
-@@ -161,6 +161,7 @@ IF_FLASH_ERASEALL(APPLET(flash_eraseall, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
- IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_lock))
- IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_unlock))
- IF_FLASHCP(APPLET(flashcp, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-+IF_FLOCK(APPLET(flock, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_FOLD(APPLET(fold, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_FREE(APPLET(free, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_FREERAMDISK(APPLET(freeramdisk, _BB_DIR_SBIN, _BB_SUID_DROP))
-diff --git a/include/usage.h b/include/usage.h
-index f4259a1..cbf6bef 100644
---- a/include/usage.h
-+++ b/include/usage.h
-@@ -1312,6 +1312,17 @@
- "\nOptions:" \
- "\n -v Verbose" \
-
-+#define flock_trivial_usage \
-+ "[-sxun] [fd# | FILE] [-c] command"
-+#define flock_full_usage "\n\n" \
-+ "Manage file locks from scripts\n" \
-+ "\nOptions:" \
-+ "\n -s Get a shared lock" \
-+ "\n -x Get an exclusive lock" \
-+ "\n -u Remove a lock (from fd#)" \
-+ "\n -n Fail rather than wait" \
-+ "\n -c Command to run" \
-+
- #define fold_trivial_usage \
- "[-bs] [-w WIDTH] [FILE]..."
- #define fold_full_usage "\n\n" \
-diff --git a/util-linux/Config.in b/util-linux/Config.in
-index f04511b..d0d8df3 100644
---- a/util-linux/Config.in
-+++ b/util-linux/Config.in
-@@ -191,6 +191,12 @@ config FINDFS
- WARNING:
- With all submodules selected, it will add ~8k to busybox.
-
-+config FLOCK
-+ bool "flock"
-+ default y
-+ help
-+ Manage locks from shell scripts
-+
- config FREERAMDISK
- bool "freeramdisk"
- default n
-diff --git a/util-linux/Kbuild b/util-linux/Kbuild
-index 72a2ef1..99e3efe 100644
---- a/util-linux/Kbuild
-+++ b/util-linux/Kbuild
-@@ -13,6 +13,7 @@ lib-$(CONFIG_FDFLUSH) += freeramdisk.o
- lib-$(CONFIG_FDFORMAT) += fdformat.o
- lib-$(CONFIG_FDISK) += fdisk.o
- lib-$(CONFIG_FINDFS) += findfs.o
-+lib-$(CONFIG_FLOCK) += flock.o
- lib-$(CONFIG_FREERAMDISK) += freeramdisk.o
- lib-$(CONFIG_FSCK_MINIX) += fsck_minix.o
- lib-$(CONFIG_GETOPT) += getopt.o
-diff --git a/util-linux/flock.c b/util-linux/flock.c
-new file mode 100644
-index 0000000..e9a22d5
---- /dev/null
-+++ b/util-linux/flock.c
-@@ -0,0 +1,93 @@
-+/*
-+ * Copyright (C) 2010 Timo Teras <timo.teras@iki.fi>
-+ *
-+ * This is free software, licensed under the GNU General Public License v2.
-+ */
-+#include <sys/types.h>
-+#include <sys/file.h>
-+#include <sys/stat.h>
-+#include <signal.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <stdio.h>
-+#include "busybox.h"
-+
-+int flock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-+int flock_main(int argc, char **argv)
-+{
-+ char *command = NULL;
-+ int mode, opt, fd, status = 0;
-+ enum {
-+ OPT_s = (1 << 0),
-+ OPT_x = (1 << 1),
-+ OPT_u = (1 << 2),
-+ OPT_n = (1 << 3),
-+ OPT_c = (1 << 4),
-+ };
-+
-+#if ENABLE_LONG_OPTS
-+ static const char getopt_longopts[] ALIGN1 =
-+ "shared\0" No_argument "s"
-+ "exclusive\0" No_argument "x"
-+ "unblock\0" No_argument "u"
-+ "nonblock\0" No_argument "n"
-+ "command\0" Required_argument "c"
-+ ;
-+ applet_long_options = getopt_longopts;
-+#endif
-+
-+ opt = getopt32(argv, "sxunc:", &command);
-+ argv += optind;
-+ argc -= optind;
-+
-+ if (argv[0] == NULL)
-+ bb_show_usage();
-+
-+ if (command != NULL || argc > 1) {
-+ fd = open(argv[0], O_RDONLY|O_NOCTTY|O_CREAT, 0666);
-+ if (fd < 0 && errno == EISDIR)
-+ fd = open(argv[0], O_RDONLY|O_NOCTTY);
-+ } else {
-+ fd = atoi(argv[0]);
-+ }
-+ if (fd < 0)
-+ bb_perror_msg_and_die("cannot open: '%s'", argv[0]);
-+
-+ argv++;
-+ if (command == NULL)
-+ command = argv[0];
-+
-+ if (opt & OPT_u)
-+ mode = LOCK_UN;
-+ else if (opt & OPT_s)
-+ mode = LOCK_SH;
-+ else
-+ mode = LOCK_EX;
-+
-+ if (opt & OPT_n)
-+ mode |= LOCK_NB;
-+
-+ if (flock(fd, mode) && errno == EWOULDBLOCK)
-+ return 1;
-+
-+ if (command != NULL) {
-+ pid_t pid;
-+
-+ pid = fork();
-+ if (pid < 0)
-+ bb_perror_msg_and_die("fork failed");
-+ if (pid == 0) {
-+ execvp(command, argv);
-+ exit(1);
-+ }
-+ waitpid(pid, &status, 0);
-+ if (WIFEXITED(status))
-+ status = WEXITSTATUS(status);
-+ else if (WIFSIGNALED(status))
-+ status = WTERMSIG(status) + 128;
-+ else
-+ status = 1;
-+ }
-+
-+ return status;
-+}
---
-1.6.3.3
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index 1157120312..083d01311e 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cairo
pkgver=1.8.10
-pkgrel=1
+pkgrel=2
pkgdesc="Cairo vector graphics library"
url="http://cairographics.org/"
license="LGPL MPL"
diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
index af8cff9dc0..1f9fd530b8 100644
--- a/main/cpufrequtils/APKBUILD
+++ b/main/cpufrequtils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cpufrequtils
pkgver=007
-pkgrel=1
+pkgrel=2
pkgdesc="Userspace tools for the kernel cpufreq subsystem"
url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
license="GPL"
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 671df0d533..5242be1956 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
-pkgver=1.1.2
+pkgver=1.1.3
pkgrel=0
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="http://code.google.com/p/cryptsetup/"
@@ -22,4 +22,4 @@ package() {
cd "$srcdir"/$pkgname-$pkgver
make DESTDIR=$pkgdir install
}
-md5sums="f3928c1f1d49fcee39bb1e8d42fe707a cryptsetup-1.1.2.tar.bz2"
+md5sums="318a64470861ea5b92a52f2014f1e7c1 cryptsetup-1.1.3.tar.bz2"
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 98c7543990..c8cc940e25 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cyrus-sasl
pkgver=2.1.23
-pkgrel=4
+pkgrel=5
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
license="custom"
@@ -33,11 +33,8 @@ build ()
--enable-plain \
--with-devrandom=/dev/urandom \
--mandir=/usr/share/man || return 1
- # parallell buildds is broken so we build libs first
- cd lib && make || return 1
-
- cd "$srcdir"/cyrus-sasl-$pkgver
- make || return 1
+ # parallell buildds is broken
+ make -j1 || return 1
}
package() {
diff --git a/main/db/APKBUILD b/main/db/APKBUILD
index d299132bbe..0262f4e101 100644
--- a/main/db/APKBUILD
+++ b/main/db/APKBUILD
@@ -2,7 +2,7 @@
pkgname=db
pkgver=4.8.26
_ver=${pkgver}
-pkgrel=1
+pkgrel=2
pkgdesc="The Berkeley DB embedded database system 4.8"
url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
license="custom"
diff --git a/main/dbus-glib/APKBUILD b/main/dbus-glib/APKBUILD
index 799560fbab..e274d3e372 100644
--- a/main/dbus-glib/APKBUILD
+++ b/main/dbus-glib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus-glib
pkgver=0.86
-pkgrel=0
+pkgrel=1
pkgdesc="GLib bindings for DBUS"
url="http://www.freedesktop.org/wiki/Software/DBusBindings"
license="GPL"
diff --git a/main/enchant/APKBUILD b/main/enchant/APKBUILD
index a2698dac4b..cc08be9c8b 100644
--- a/main/enchant/APKBUILD
+++ b/main/enchant/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=enchant
pkgver=1.6.0
-pkgrel=0
+pkgrel=1
pkgdesc="A wrapper library for generic spell checking"
url="http://www.abisource.com/enchant/"
license="LGPL"
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index c8a114d1c0..0d331ca25d 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=espeak
pkgver=1.43.03
-pkgrel=1
+pkgrel=2
pkgdesc="Speech synthesizer for English and other languages"
url="http://espeak.sourceforge.net/"
license="GPL-3"
diff --git a/main/faac/APKBUILD b/main/faac/APKBUILD
index 85a7307942..0beb41d65a 100644
--- a/main/faac/APKBUILD
+++ b/main/faac/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=faac
pkgver=1.28
-pkgrel=2
+pkgrel=3
pkgdesc="FAAC is an AAC audio encoder."
url="http://www.audiocoding.com/"
license="GPL custom"
diff --git a/main/faad2/APKBUILD b/main/faad2/APKBUILD
index 111461655f..9e3135eb99 100644
--- a/main/faad2/APKBUILD
+++ b/main/faad2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=faad2
pkgver=2.7
-pkgrel=1
+pkgrel=2
pkgdesc="ISO AAC audio decoder"
url="http://www.audiocoding.com/"
license="custom:GPL"
@@ -22,6 +22,10 @@ build ()
sh bootstrap
./configure --prefix=/usr || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
install -m644 common/mp4ff/mp4ff_int_types.h "$pkgdir"/usr/include/mp4ff_int_types.h || return 1
}
diff --git a/main/fcgi/APKBUILD b/main/fcgi/APKBUILD
index d2a8bb0344..78cb95d09b 100644
--- a/main/fcgi/APKBUILD
+++ b/main/fcgi/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=fcgi
pkgver=2.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="FAST CGI(fcgi) is a language independent, high performant extension to CGI"
url="http://www.fastcgi.com"
license="GPL"
@@ -33,6 +33,10 @@ build() {
--infodir=/usr/share/info \
--enable-shared
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index 03806b59df..507f09d45d 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=flac
pkgver=1.2.1
-pkgrel=1
+pkgrel=3
pkgdesc="Free Lossless Audio Codec"
url="http://flac.sourceforge.net/"
license="custom:Xiph LGPL GPL FDL"
diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD
index f45956b926..44be5135f4 100644
--- a/main/fontconfig/APKBUILD
+++ b/main/fontconfig/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fontconfig
pkgver=2.8.0
-pkgrel=1
+pkgrel=2
pkgdesc="The Fontconfig package is a library for configuring and customizing font access."
url="http://fontconfig.org"
license="GPL"
diff --git a/main/freeswitch-sounds-en-us-callie-8000/APKBUILD b/main/freeswitch-sounds-en-us-callie-8000/APKBUILD
new file mode 100644
index 0000000000..5677355f01
--- /dev/null
+++ b/main/freeswitch-sounds-en-us-callie-8000/APKBUILD
@@ -0,0 +1,26 @@
+# Contributor:
+# Maintainer:
+pkgname=freeswitch-sounds-en-us-callie-8000
+pkgver=1.0.13
+pkgrel=0
+pkgdesc="Sounds for freeswitch English"
+url="http://files.freeswitch.org/"
+license="unknown"
+depends=
+makedepends=
+install=
+subpackages=
+source="http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+build() {
+ return 0
+}
+
+package() {
+ mkdir -p "$pkgdir"/usr/sounds/
+ cp -ra "$srcdir"/en "$pkgdir"/usr/sounds
+}
+
+md5sums="0ed4eb9490da742821d6241e87b125b5 freeswitch-sounds-en-us-callie-8000-1.0.13.tar.gz"
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 56aed8ea76..2b1766e805 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=freeswitch
pkgver=1.0.6
-pkgrel=9
+pkgrel=11
pkgdesc="A communications platform written in C from the ground up"
url="http://www.freeswitch.org"
license="GPL"
@@ -10,7 +10,7 @@ depends=""
makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev ncurses-dev
autoconf automake libtool"
install="$pkgname.pre-install $pkgname.post-install"
-subpackages="$pkgname-dev $pkgname-flite"
+subpackages="$pkgname-dev $pkgname-flite $pkgname-sample-config:conf"
source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz
modules.conf
freeswitch.confd
@@ -80,8 +80,19 @@ flite() {
mod_say_it mod_say_nl mod_say_zh
}
+conf() {
+ pkgdesc="Freeswitch sample configureation"
+ depends="freeswitch"
+ install=
+ mkdir -p "$subpkgdir"/etc/freeswich
+ # move all configs except freeswitch.xml
+ for i in "$pkgdir"/etc/freeswitch/*; do
+ [ "$i" = "$pkgdir"/etc/freeswitch/freeswitch.xml ] && continue
+ mv "$i" "$subpkgdir"/etc/freeswitch/ || return 1
+ done
+}
md5sums="388effee587887a81fe7f411b7350590 freeswitch-1.0.6.tar.gz
-55e62842ad037e5e550ad097df09f6d2 modules.conf
+10b10cdc4ba1719343a96c5b7b3fa910 modules.conf
c608cca8ad773acebf201f581438c7e7 freeswitch.confd
6973e15d72e5876152b160bd9e8d282b freeswitch.initd"
diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf
index 9968d68d9a..9ef44b0cac 100644
--- a/main/freeswitch/modules.conf
+++ b/main/freeswitch/modules.conf
@@ -62,7 +62,7 @@ formats/mod_tone_stream
languages/mod_lua
#languages/mod_perl
#languages/mod_yaml
-#xml_int/mod_xml_rpc
+xml_int/mod_xml_rpc
#xml_int/mod_xml_curl
#xml_int/mod_xml_cdr
#xml_int/mod_xml_ldap
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index bae42d6689..283ebe6215 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=freetds
pkgver=0.82
-pkgrel=2
+pkgrel=4
pkgdesc="Tabular Datastream Library"
url="http://www.freetds.org/"
license="GPL"
@@ -20,6 +20,10 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/main/freetype/10-bytecode.patch b/main/freetype/10-bytecode.patch
deleted file mode 100644
index dd901ad64b..0000000000
--- a/main/freetype/10-bytecode.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/freetype/config/ftoption.h.old 2006-05-12 02:05:49.000000000 +0800
-+++ include/freetype/config/ftoption.h 2006-10-02 01:22:50.000000000 +0800
-@@ -436,7 +436,7 @@
- /* Do not #undef this macro here, since the build system might */
- /* define it for certain configurations only. */
- /* */
--/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
-+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-
- /*************************************************************************/
-@@ -448,7 +448,7 @@
- /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook */
- /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated. */
- /* */
--#define TT_CONFIG_OPTION_UNPATENTED_HINTING
-+#undef TT_CONFIG_OPTION_UNPATENTED_HINTING
-
-
- /*************************************************************************/
-@@ -480,7 +480,7 @@
- /* http://partners.adobe.com/asn/developer/opentype/glyf.html */
- /* http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html */
- /* */
--#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
-+#define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
-
-
- /*************************************************************************/
diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD
index 7303e8832b..50c16562e6 100644
--- a/main/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter at gmail>
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=freetype
-pkgver=2.3.12
+pkgver=2.4.0
pkgrel=0
pkgdesc="TrueType font rendering library"
url="http://freetype.sourceforge.net"
@@ -10,7 +10,6 @@ depends=
makedepends="zlib-dev"
subpackages="$pkgname-dev"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-10-bytecode.patch
20-enable-spr.patch
30-enable-valid.patch
40-memcpy-fix.patch
@@ -41,8 +40,7 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-md5sums="6fc690d9b34154b51a919ff466cea90c freetype-2.3.12.tar.gz
-9ff19e742968c29e3ba52b08d6bf0a50 10-bytecode.patch
+md5sums="f900148ae8e258803eb1ab9f564f2151 freetype-2.4.0.tar.gz
376b94c06b113a62a3437e4130bb3fc3 20-enable-spr.patch
3f6c5739843dcbc110ee0f243c4f6bdb 30-enable-valid.patch
bd2d808a0c00dcf9f1d1c0a9a8227ad9 40-memcpy-fix.patch"
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index fdf62ff69e..02c7af6239 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fribidi
pkgver=0.19.2
-pkgrel=1
+pkgrel=2
pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm"
url="http://fribidi.org"
license="LGPL"
@@ -15,6 +15,10 @@ build ()
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
md5sums="626db17d2d99b43615ad9d12500f568a fribidi-0.19.2.tar.gz"
diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD
new file mode 100644
index 0000000000..5f2d4eb61e
--- /dev/null
+++ b/main/fuse/APKBUILD
@@ -0,0 +1,62 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=fuse
+pkgver=2.8.1
+pkgrel=1
+pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
+url="http://fuse.sourceforge.net/"
+license="GPL2"
+depends=
+makedepends="pkgconfig libiconv-dev gettext-dev
+ autoconf automake libtool"
+install=
+subpackages="$pkgname-dev"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+ fuse-iconv.patch
+ fuse.initd"
+
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+ cd "$_builddir"
+ patch -p1 -i "$srcdir"/fuse-iconv.patch || return 1
+ aclocal -I m4 && libtoolize && autoconf && automake
+}
+
+build() {
+ cd "$_builddir"
+ ./configure --prefix=/usr \
+ --enable-lib \
+ --enable-util \
+ --bindir=/bin \
+ || return 1
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install || return 1
+
+ rm -rf "$pkgdir"/dev
+ rm -rf "$pkgdir"/etc/init.d
+
+ install -Dm755 "$srcdir"/fuse.initd "$pkgdir"/etc/init.d/fuse
+ # create config
+ install -d "$pkgdir"/etc
+ cat >"$pkgdir"/etc/fuse.conf << _EOF_
+# Set the maximum number of FUSE mounts allowed to non-root users.
+# The default is 1000.
+#
+#mount_max = 1000
+
+# Allow non-root users to specify the 'allow_other' or 'allow_root'
+# mount options.
+#
+#user_allow_other
+_EOF_
+
+}
+
+md5sums="0e3505ce90155983f1bc995eb2cf6fa7 fuse-2.8.1.tar.gz
+e5183506aabc5bf7795da52953d38888 fuse-iconv.patch
+5983726cfabf0830dffbbbf9a3abcddc fuse.initd"
diff --git a/main/fuse/fuse-iconv.patch b/main/fuse/fuse-iconv.patch
new file mode 100644
index 0000000000..4710f576f2
--- /dev/null
+++ b/main/fuse/fuse-iconv.patch
@@ -0,0 +1,24 @@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 3eec119..c7414ac 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -11,8 +11,10 @@ else
+ mount_source = mount.c mount_util.c mount_util.h
+ endif
+
++libfuse_la_LDFLAGS =
+ if ICONV
+ iconv_source = modules/iconv.c
++libfuse_la_LDFLAGS += -liconv
+ else
+ iconv_source =
+ endif
+@@ -35,7 +37,7 @@ libfuse_la_SOURCES = \
+ $(iconv_source) \
+ $(mount_source)
+
+-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:1 \
++libfuse_la_LDFLAGS += @libfuse_libs@ -version-number 2:8:1 \
+ -Wl,--version-script,$(srcdir)/fuse_versionscript
+
+ libulockmgr_la_SOURCES = ulockmgr.c
diff --git a/main/fuse/fuse.initd b/main/fuse/fuse.initd
new file mode 100644
index 0000000000..30b512e8dc
--- /dev/null
+++ b/main/fuse/fuse.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MOUNTPOINT=/sys/fs/fuse/connections
+
+depend() {
+ need localmount
+}
+
+start() {
+
+ ebegin "Starting fuse"
+ if ! grep -qw fuse /proc/filesystems; then
+ modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
+ fi
+ if grep -qw fusectl /proc/filesystems && \
+ ! grep -qw $MOUNTPOINT /proc/mounts; then
+ mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
+ eerror $? "Error mounting control filesystem"
+ fi
+ eend ${?}
+
+}
+
+stop() {
+
+ ebegin "Stopping fuse"
+ if grep -qw $MOUNTPOINT /proc/mounts; then
+ umount $MOUNTPOINT >/dev/null 2>&1 || \
+ eerror $? "Error unmounting control filesystem"
+ fi
+ eend ${?}
+
+}
diff --git a/main/gamin/APKBUILD b/main/gamin/APKBUILD
index f7c8936aa9..1d79f6433a 100644
--- a/main/gamin/APKBUILD
+++ b/main/gamin/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gamin
pkgver=0.1.10
-pkgrel=2
+pkgrel=3
pkgdesc="Gamin is a file and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor) system."
url="http://www.gnome.org/~veillard/gamin"
license="GPL"
@@ -21,7 +21,10 @@ build ()
--disable-dnotify \
--libexecdir=/usr/lib/gamin
make || return 1
+}
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
# some kinde of race in the make install which is not solved with -j
export MKDIRPROG="mkdir -p"
make DESTDIR="$pkgdir" install
diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD
index 5ec2876685..9832c434a3 100644
--- a/main/gd/APKBUILD
+++ b/main/gd/APKBUILD
@@ -3,7 +3,7 @@
pkgname=gd
pkgver=2.0.36_rc1
_myver=2.0.36RC1
-pkgrel=2
+pkgrel=3
pkgdesc="Library for the dynamic creation of images by programmers"
url="http://www.libgd.org/"
license="custom"
diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD
index a24bfb1f47..f7d3a5d3ed 100644
--- a/main/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=gdbm
pkgver=1.8.3
-pkgrel=1
+pkgrel=2
pkgdesc="GNU dbm is a set of database routines that use extensible hashing"
url="http://www.gnu.org/software/gdbm/"
license="GPL"
@@ -28,6 +28,10 @@ build() {
--disable-dependency-tracking \
--enable-fast-install
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make INSTALL_ROOT="$pkgdir" install || return 1
make INSTALL_ROOT="$pkgdir" install-compat || return 1
mv "${pkgdir}"/usr/include/gdbm/gdbm.h "${pkgdir}"/usr/include/
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index 6373c076dd..75a6c2a067 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=ghostscript
pkgver=8.71
-pkgrel=2
+pkgrel=3
pkgdesc="An interpreter for the PostScript language and for PDF"
url="http://ghostscript.com/"
license="GPL"
diff --git a/main/giblib/APKBUILD b/main/giblib/APKBUILD
index 90a61b4d81..f9c63a58b6 100644
--- a/main/giblib/APKBUILD
+++ b/main/giblib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=giblib
pkgver=1.2.4
-pkgrel=2
+pkgrel=3
pkgdesc="Giblib is a library that feh uses as a wrapper to imlib2"
url="http://linuxbrit.co.uk/giblib/"
license="MIT"
diff --git a/main/giflib/APKBUILD b/main/giflib/APKBUILD
index 01fd9047bb..bfa856a8b1 100644
--- a/main/giflib/APKBUILD
+++ b/main/giflib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=giflib
pkgver=4.1.6
-pkgrel=2
+pkgrel=3
pkgdesc="A library for reading and writing gif images"
url="http://sourceforge.net/projects/giflib/"
license="MIT"
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 1e88f6c7c1..ef308b9b10 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=glib
pkgver=2.24.0
-pkgrel=2
+pkgrel=3
pkgdesc="Common C routines used by Gtk+ and other libs"
url="http://www.gtk.org"
license='GPL'
diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD
index ebd171cb98..b26241593b 100644
--- a/main/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnutls
pkgver=2.8.6
-pkgrel=1
+pkgrel=2
pkgdesc="A library which provides a secure connection"
url="http://www.gnu.org/software/gnutls/"
license="GPL"
diff --git a/main/gst-plugins-base/APKBUILD b/main/gst-plugins-base/APKBUILD
index 423f5873fa..54d2ca0cda 100644
--- a/main/gst-plugins-base/APKBUILD
+++ b/main/gst-plugins-base/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-base
pkgver=0.10.29
-pkgrel=0
+pkgrel=1
pkgdesc="GStreamer Multimedia Framework Base Plugins"
url="http://gstreamer.freedesktop.org/"
license="GPL LGPL"
diff --git a/main/gstreamer/APKBUILD b/main/gstreamer/APKBUILD
index ffcd46b78a..2cbc80a4b9 100644
--- a/main/gstreamer/APKBUILD
+++ b/main/gstreamer/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gstreamer
pkgver=0.10.29
-pkgrel=0
+pkgrel=1
pkgdesc="GStreamer Multimedia Framework"
url="http://gstreamer.freedesktop.org/"
license="LGPL"
diff --git a/main/gtk-vnc/APKBUILD b/main/gtk-vnc/APKBUILD
index a321b86788..f0b1edceea 100644
--- a/main/gtk-vnc/APKBUILD
+++ b/main/gtk-vnc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk-vnc
pkgver=0.3.10
-pkgrel=2
+pkgrel=3
pkgdesc="A VNC viewer widget for GTK"
url="http://live.gnome.org/gtk-vnc"
license="LGPL"
diff --git a/main/hunspell/APKBUILD b/main/hunspell/APKBUILD
index efd3476c39..eaf2875a91 100644
--- a/main/hunspell/APKBUILD
+++ b/main/hunspell/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hunspell
-pkgver=1.2.11
+pkgver=1.2.12
pkgrel=0
pkgdesc="Spell checker and morphological analyzer library and program"
url="http://hunspell.sourceforge.net/"
@@ -22,4 +22,4 @@ package() {
make -j1 DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/share/locale/locale.alias
}
-md5sums="8f57cdc4db091d69e1f682ed4d8ab282 hunspell-1.2.11.tar.gz"
+md5sums="5ef2dc1026660d0ffb7eae7b511aee23 hunspell-1.2.12.tar.gz"
diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD
index 06a868b933..419aebc917 100644
--- a/main/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
@@ -2,17 +2,16 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=hylafax
pkgver=4.4.4
-pkgrel=1
+pkgrel=2
pkgdesc="Sends and receives faxes"
url="http://www.hylafax.org/"
license="custom"
#depends on gcc for libgcc_s.so, it's scripts are hardcoded to bash
depends="ghostscript bash"
-makedepends="zlib-dev tiff-dev uclibc++-dev"
+makedepends="zlib-dev tiff-dev"
install="hylafax.post-install"
subpackages="$pkgname-doc"
source="ftp://ftp.hylafax.org/source/$pkgname-$pkgver.tar.gz
- $install
"
build() {
@@ -24,8 +23,8 @@ build() {
# the configure script does not handle ccache or distcc
export CC=gcc
+ export CXX=g++
./configure --nointeractive --disable-pam \
- --with-CXX=/usr/bin/g++-uc \
--with-DIR_BIN=/usr/bin \
--with-DIR_SBIN=/usr/sbin \
--with-DIR_LIB=/usr/lib \
@@ -78,5 +77,4 @@ build() {
# - which the user runs after install
}
-md5sums="4beb3d438ca6c4f00f1d94f9643e6668 hylafax-4.4.4.tar.gz
-a3553e6fc4de30e80759abe5c663c85b hylafax.post-install"
+md5sums="4beb3d438ca6c4f00f1d94f9643e6668 hylafax-4.4.4.tar.gz"
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index df9de54b1d..6ac224b047 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -2,7 +2,7 @@
pkgname=icu
pkgver=4.4.1
_ver=4_2_1
-pkgrel=0
+pkgrel=1
pkgdesc="International Components for Unicode library"
url="http://www.icu-project.org/"
license="custom:icu"
diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD
index 547cf39667..be9cd30ea6 100644
--- a/main/imap/APKBUILD
+++ b/main/imap/APKBUILD
@@ -5,7 +5,7 @@
# build it shared
pkgname=imap
pkgver=2007e
-pkgrel=5
+pkgrel=6
pkgdesc="An IMAP/POP server"
url="http://www.washington.edu/imap"
license="APACHE"
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index fcd4e38a0e..a15533eeca 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imlib2
pkgver=1.4.4
-pkgrel=0
+pkgrel=1
pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
url="http://sourceforge.net/projects/enlightenment/"
license="BSD"
diff --git a/main/jasper/APKBUILD b/main/jasper/APKBUILD
index d74cbd4342..244ff45ee0 100644
--- a/main/jasper/APKBUILD
+++ b/main/jasper/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=jasper
pkgver=1.900.1
-pkgrel=1
+pkgrel=2
pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
url="http://www.ece.uvic.ca/~mdadams/jasper/"
license="custom:JasPer2.0"
diff --git a/main/jpeg/APKBUILD b/main/jpeg/APKBUILD
index e3bd30d10e..8b597c0436 100644
--- a/main/jpeg/APKBUILD
+++ b/main/jpeg/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=jpeg
pkgver=8
-pkgrel=1
+pkgrel=2
pkgdesc="JPEG image tools"
url="http://www.ijg.org/"
license="AS-IS"
diff --git a/main/libao/APKBUILD b/main/libao/APKBUILD
index 9c179172ff..8048939c1e 100644
--- a/main/libao/APKBUILD
+++ b/main/libao/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libao
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="Cross-platform audio output library and plugins"
url="http://www.xiph.org/ao"
license="GPL"
diff --git a/main/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
index 0203cd5148..d7c34cc53f 100644
--- a/main/libart-lgpl/APKBUILD
+++ b/main/libart-lgpl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libart-lgpl
pkgver=2.3.21
-pkgrel=1
+pkgrel=2
pkgdesc="A library for high-performance 2D graphics"
url="http://www.levien.com/libart/"
license="LGPL"
diff --git a/main/libassuan/APKBUILD b/main/libassuan/APKBUILD
index ee8a0d9792..ea9b69ff8a 100644
--- a/main/libassuan/APKBUILD
+++ b/main/libassuan/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libassuan
pkgver=2.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="Libassuan is the IPC library used by some GnuPG related software"
url="ftp://ftp.gnupg.org/gcrypt/libgcrypt"
license="GPL"
diff --git a/main/libcroco/APKBUILD b/main/libcroco/APKBUILD
index 4c0e8ef4f3..dd7d34fd52 100644
--- a/main/libcroco/APKBUILD
+++ b/main/libcroco/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcroco
pkgver=0.6.2
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME CSS2 parsing and manipulation toolkit"
url="http://www.gnome.org"
license="LGPL"
@@ -18,6 +18,10 @@ build ()
./configure --prefix=/usr \
--disable-static || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
md5sums="1429c597aa4b75fc610ab3a542c99209 libcroco-0.6.2.tar.bz2"
diff --git a/main/libdnet/APKBUILD b/main/libdnet/APKBUILD
index 881accbd53..c7645e1d2c 100644
--- a/main/libdnet/APKBUILD
+++ b/main/libdnet/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libdnet
pkgver=1.12
-pkgrel=1
+pkgrel=2
pkgdesc="A simplified, portable interface to several low-level networking routines"
url="http://code.google.com/p/libdnet/"
license="BSD"
diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD
index 8356039e89..dd2bf1e2ff 100644
--- a/main/libetpan/APKBUILD
+++ b/main/libetpan/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libetpan
pkgver=1.0
-pkgrel=0
+pkgrel=1
_dbver=4.8
pkgdesc="a portable middleware for email access"
url="http://www.etpan.org/"
diff --git a/main/libexif/APKBUILD b/main/libexif/APKBUILD
index 83546b1c8e..eb1ba1bda1 100644
--- a/main/libexif/APKBUILD
+++ b/main/libexif/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libexif
pkgver=0.6.19
-pkgrel=1
+pkgrel=2
pkgdesc="A library to parse an EXIF file and read the data from those tags"
url="http://sourceforge.net/projects/libexif"
license="LGPL"
diff --git a/main/libffi/APKBUILD b/main/libffi/APKBUILD
index 39b3ba3a39..0267f6acce 100644
--- a/main/libffi/APKBUILD
+++ b/main/libffi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libffi
pkgver=3.0.9
-pkgrel=1
+pkgrel=2
pkgdesc="A portable, high level programming interface to various calling conventions."
url="http://sourceware.org/libffi"
license="MIT"
diff --git a/main/libfontenc/APKBUILD b/main/libfontenc/APKBUILD
index e7b1e30b91..1405097fd1 100644
--- a/main/libfontenc/APKBUILD
+++ b/main/libfontenc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libfontenc
pkgver=1.0.5
-pkgrel=2
+pkgrel=3
pkgdesc="X11 font encoding library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index 9f8c2044d9..cae302fbf5 100644
--- a/main/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgcrypt
-pkgver=1.4.5
-pkgrel=1
+pkgver=1.4.6
+pkgrel=0
pkgdesc="general purpose crypto library based on the code used in GnuPG"
url="http://www.gnupg.org"
license="LGPL"
@@ -28,4 +28,4 @@ package() {
make -j1 DESTDIR="$pkgdir" install || return 1
rm -f ${pkgdir}/usr/share/info/dir
}
-md5sums="cc2017ad09b4543f8b3b5e9a53cfd89d libgcrypt-1.4.5.tar.bz2"
+md5sums="dbf99425a4fe9217c84ce3a35d938634 libgcrypt-1.4.6.tar.bz2"
diff --git a/main/libglade/APKBUILD b/main/libglade/APKBUILD
index 3b8f67e699..5de6a452ee 100644
--- a/main/libglade/APKBUILD
+++ b/main/libglade/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libglade
pkgver=2.6.4
-pkgrel=2
+pkgrel=3
pkgdesc="Allows you to load glade interface files in a program at runtime"
url="http://www.gnome.org"
license="LGPL"
diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
index 2ae2c026ef..698b9f7e97 100644
--- a/main/libgpg-error/APKBUILD
+++ b/main/libgpg-error/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgpg-error
pkgver=1.7
-pkgrel=1
+pkgrel=2
pkgdesc="Support library for libgcrypt"
url="http://www.gnupg.org"
license="LGPL"
@@ -20,6 +20,10 @@ build () {
--disable-nls
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make -j1 DESTDIR="$pkgdir" install
}
diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD
index 3f34d31504..abb97fad48 100644
--- a/main/libgsf/APKBUILD
+++ b/main/libgsf/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgsf
pkgver=1.14.18
-pkgrel=1
+pkgrel=2
pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats."
url="http://www.gnome.org/"
license="GPL LGPL"
diff --git a/main/libgssglue/APKBUILD b/main/libgssglue/APKBUILD
new file mode 100644
index 0000000000..4701c765cf
--- /dev/null
+++ b/main/libgssglue/APKBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libgssglue
+pkgver=0.1
+pkgrel=1
+pkgdesc="exports a gssapi interface which calls other random gssapi libraries"
+url="http://www.citi.umich.edu/projects/nfsv4/linux/"
+license="BSD"
+depends=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
+ gssapi_mech.conf"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+build() {
+ cd "$_builddir"
+ ./configure --prefix=/usr
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir/" install || return 1
+ install -D -m 644 ../gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf
+ install -D -m644 COPYING $pkgdir/usr/share/licenses/libgssglue/COPYING
+}
+md5sums="ce1b4c758e6de01b712d154c5c97e540 libgssglue-0.1.tar.gz
+234b9cca75a33af98eda3f1683756879 gssapi_mech.conf"
diff --git a/main/libgssglue/gssapi_mech.conf b/main/libgssglue/gssapi_mech.conf
new file mode 100644
index 0000000000..f71aca08ee
--- /dev/null
+++ b/main/libgssglue/gssapi_mech.conf
@@ -0,0 +1,22 @@
+# Example /etc/gssapi_mech.conf file
+#
+# GSSAPI Mechanism Definitions
+#
+# This configuration file determines which GSS-API mechanisms
+# the gssd code should use
+#
+# NOTE:
+# The initiaiization function "mechglue_internal_krb5_init"
+# is used for the MIT krb5 gssapi mechanism. This special
+# function name indicates that an internal function should
+# be used to determine the entry points for the MIT gssapi
+# mechanism funtions.
+#
+# library initialization function
+# ================================ ==========================
+# The MIT K5 gssapi library, use special function for initialization.
+#/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init
+/usr/lib/libgssapi.so mechglue_internal_krb5_init
+#
+# The SPKM3 gssapi library function. Use the function spkm3_gss_initialize.
+# /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so spkm3_gss_initialize
diff --git a/main/libice/APKBUILD b/main/libice/APKBUILD
index 5da1d87727..237974235c 100644
--- a/main/libice/APKBUILD
+++ b/main/libice/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libice
pkgver=1.0.6
-pkgrel=2
+pkgrel=3
pkgdesc="X11 Inter-Client Exchange library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libiconv/APKBUILD b/main/libiconv/APKBUILD
index 0ad6f62721..9f99f10ca2 100644
--- a/main/libiconv/APKBUILD
+++ b/main/libiconv/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
pkgname=libiconv
pkgver=1.12
-pkgrel=1
+pkgrel=2
pkgdesc="GNU charset conversion library for libc which doesn't implement it"
url="http://www.gnu.org/software/libiconv"
license='LGPL'
@@ -15,6 +15,10 @@ build() {
./configure --prefix=/usr \
--mandir=/usr/share/man
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
}
diff --git a/main/libid3tag/APKBUILD b/main/libid3tag/APKBUILD
index 1bd9c9562b..3968aeca78 100644
--- a/main/libid3tag/APKBUILD
+++ b/main/libid3tag/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=libid3tag
pkgver=0.15.1b
-pkgrel=1
+pkgrel=2
pkgdesc="id3 tagger for mp3"
url="http://www.underbit.com/products/mad/"
license="GPL"
@@ -20,6 +20,10 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/main/libidn/APKBUILD b/main/libidn/APKBUILD
index b684e642bc..92c0732b4a 100644
--- a/main/libidn/APKBUILD
+++ b/main/libidn/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libidn
pkgver=1.16
-pkgrel=1
+pkgrel=2
pkgdesc="An encode and decode library for internationalized domain names"
url="http://www.gnu.org/software/libidn/"
license="GPL"
diff --git a/main/libksba/APKBUILD b/main/libksba/APKBUILD
index ed719a0e20..a97278f9a3 100644
--- a/main/libksba/APKBUILD
+++ b/main/libksba/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libksba
pkgver=1.0.7
-pkgrel=0
+pkgrel=1
pkgdesc="Libksba is a CMS and X.509 access library"
url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
license="GPL"
diff --git a/main/libmad/APKBUILD b/main/libmad/APKBUILD
index f48894aed1..46eebdb080 100644
--- a/main/libmad/APKBUILD
+++ b/main/libmad/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libmad
pkgver=0.15.1b
-pkgrel=1
+pkgrel=2
pkgdesc="A high-quality MPEG audio decoder"
url="http://www.underbit.com/products/mad/"
license="GPL"
@@ -31,6 +31,10 @@ build ()
--enable-accuracy
make -j1 || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -D -m644 "$srcdir"/mad.pc "$pkgdir"/usr/lib/pkgconfig/mad.pc
}
diff --git a/main/libmcrypt/APKBUILD b/main/libmcrypt/APKBUILD
index 76b6948cbc..f97b8a6cdc 100644
--- a/main/libmcrypt/APKBUILD
+++ b/main/libmcrypt/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=libmcrypt
pkgver=2.5.8
-pkgrel=1
+pkgrel=2
pkgdesc="A library which provides a uniform interface to several symmetric encryption algorithms"
url="http://mcrypt.sourceforge.net/"
license="GPL"
@@ -18,6 +18,10 @@ build() {
./configure --prefix=/usr \
--mandir=/usr/share/man
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/main/libmpeg2/APKBUILD b/main/libmpeg2/APKBUILD
index e933c8358e..566abb07ac 100644
--- a/main/libmpeg2/APKBUILD
+++ b/main/libmpeg2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libmpeg2
pkgver=0.5.1
-pkgrel=2
+pkgrel=3
pkgdesc="libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams."
url="http://libmpeg2.sourceforge.net/"
license="GPL2"
diff --git a/main/libnet/APKBUILD b/main/libnet/APKBUILD
index 558f827b74..5a940c2d07 100644
--- a/main/libnet/APKBUILD
+++ b/main/libnet/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
-# Maintainer: Your Name <youremail@domain.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnet
pkgver=1.1.4
-pkgrel=1
+pkgrel=2
pkgdesc="A generic networking API that provides access to several protocols."
url="http://sourceforge.net/projects/libnet-dev/"
license="BSD"
@@ -16,6 +16,10 @@ build() {
./configure --prefix=/usr
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index af9dc280f3..542aa0337a 100644
--- a/main/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnetfilter_conntrack
pkgver=0.0.101
-pkgrel=1
+pkgrel=2
pkgdesc="programming interface (API) to the in-kernel connection tracking state table"
url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
license="GPL-2"
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index cebfe70a56..11f6840624 100644
--- a/main/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnfnetlink
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="low-level library for netfilter related kernel/userspace communication"
url="http://www.netfilter.org/projects/libnfnetlink/"
license="GPL-2"
@@ -19,6 +19,10 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
md5sums="016fdec8389242615024c529acc1adb8 libnfnetlink-1.0.0.tar.bz2"
diff --git a/main/libnl/APKBUILD b/main/libnl/APKBUILD
index b63fb044ac..815a01fee8 100644
--- a/main/libnl/APKBUILD
+++ b/main/libnl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnl
pkgver=1.1
-pkgrel=1
+pkgrel=2
pkgdesc="Library for applications dealing with netlink sockets"
url="http://people.suug.ch/~tgr/libnl"
license="GPL"
diff --git a/main/libnotify/APKBUILD b/main/libnotify/APKBUILD
index 4d366af473..7cedaa6408 100644
--- a/main/libnotify/APKBUILD
+++ b/main/libnotify/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnotify
pkgver=0.4.5
-pkgrel=2
+pkgrel=3
pkgdesc="Desktop notification library"
url="http://www.galago-project.org/"
license="LGPL"
diff --git a/main/liboil/APKBUILD b/main/liboil/APKBUILD
index 11a577a408..8f8a893a99 100644
--- a/main/liboil/APKBUILD
+++ b/main/liboil/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=liboil
pkgver=0.3.17
-pkgrel=1
+pkgrel=2
pkgdesc="Library of simple functions that are optimized for various CPUs."
url="http://liboil.freedesktop.org/"
license="custom"
diff --git a/main/libpaper/APKBUILD b/main/libpaper/APKBUILD
index 5cf53829d7..b8399419e1 100644
--- a/main/libpaper/APKBUILD
+++ b/main/libpaper/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libpaper
pkgver=1.1.23
-pkgrel=1
+pkgrel=2
pkgdesc="Library for handling paper characteristics"
url="http://packages.debian.org/unstable/source/libpaper"
license="GPL"
@@ -16,6 +16,10 @@ build ()
./configure --prefix=/usr \
--mandir="$pkgdir"/usr/share/man
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver+nmu1
make prefix="$pkgdir"/usr install
}
diff --git a/main/libpcap/APKBUILD b/main/libpcap/APKBUILD
index 4fc54bbcbd..9e0e031459 100644
--- a/main/libpcap/APKBUILD
+++ b/main/libpcap/APKBUILD
@@ -2,12 +2,12 @@
pkgname=libpcap
pkgver=1.1.1
_sover=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="A system-independent interface for user-level packet capture"
url="http://www.tcpdump.org/"
license="BSD"
depends=
-makedepends="bison flex"
+makedepends="bison flex autoconf"
source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz
"
subpackages="$pkgname-doc $pkgname-dev"
@@ -24,7 +24,10 @@ prepare() {
build() {
cd "$_builddir"
- ./configure --prefix=/usr --enable-ipv6
+ ./configure --prefix=/usr --enable-ipv6 || return 1
+ # seems to be problem with timestamps
+ sleep 1
+ ./config.status
make all shared || return 1
}
diff --git a/main/libpciaccess/APKBUILD b/main/libpciaccess/APKBUILD
index 3ca31cda66..ef8b2dda5b 100644
--- a/main/libpciaccess/APKBUILD
+++ b/main/libpciaccess/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libpciaccess
pkgver=0.11.0
-pkgrel=1
+pkgrel=2
pkgdesc="X11 PCI access library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/librsvg/APKBUILD b/main/librsvg/APKBUILD
index db58871110..fb02a9f426 100644
--- a/main/librsvg/APKBUILD
+++ b/main/librsvg/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=librsvg
pkgver=2.26.3
-pkgrel=0
+pkgrel=1
pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf"
url="http://librsvg.sourceforge.net/"
license="LGPL"
diff --git a/main/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD
index 71b38fb354..d976433504 100644
--- a/main/libsamplerate/APKBUILD
+++ b/main/libsamplerate/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsamplerate
pkgver=0.1.7
-pkgrel=1
+pkgrel=2
pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
url="http://www.mega-nerd.com/SRC/index.html"
subpackages="$pkgname-dev"
@@ -13,6 +13,10 @@ build () {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
md5sums="ad093e60ec44f0a60de8e29983ddbc0f libsamplerate-0.1.7.tar.gz"
diff --git a/main/libsexy/APKBUILD b/main/libsexy/APKBUILD
index ad2f441bd5..1246adc558 100644
--- a/main/libsexy/APKBUILD
+++ b/main/libsexy/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsexy
pkgver=0.1.11
-pkgrel=1
+pkgrel=2
pkgdesc="Doing naughty things to good widgets."
url="http://chipx86.com/wiki/Libsexy"
license="GPL"
@@ -15,6 +15,10 @@ build ()
./configure --prefix=/usr \
--disable-static
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
rm -f "$pkgdir"/usr/lib/libsexy.a
}
diff --git a/main/libsm/APKBUILD b/main/libsm/APKBUILD
index 63a7303c57..1628e677a9 100644
--- a/main/libsm/APKBUILD
+++ b/main/libsm/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsm
pkgver=1.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Session Management library"
url="http://xorg.freedesktop.org/"
license="custom"
-depends="libice libuuid"
+depends=
subpackages="$pkgname-dev $pkgname-doc"
makedepends="pkgconfig libice-dev e2fsprogs-dev xproto xtrans"
source="http://xorg.freedesktop.org/releases/individual/lib/libSM-$pkgver.tar.bz2"
@@ -16,6 +16,10 @@ build () {
cd "$srcdir"/libSM-$pkgver
./configure --prefix=/usr --sysconfdir=/etc || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/libSM-$pkgver
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index b315291db5..300f3b3950 100644
--- a/main/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libsndfile
pkgver=1.0.21
-pkgrel=1
+pkgrel=2
pkgdesc="A C library for reading and writing files containing sampled sound"
url="http://www.mega-nerd.com/libsndfile"
license="LGPL"
diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index b09ea23d6d..89d2351d04 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libspf2
pkgver=1.2.9
-pkgrel=2
+pkgrel=3
pkgdesc="Sender Policy Framework library, a part of the SPF/SRS protocol pair."
url="http://www.libspf2.org"
license="LGPL-2.1 BSD-2"
@@ -11,6 +11,7 @@ depends=
source="http://www.libspf2.org/spf/libspf2-$pkgver.tar.gz
libspf2-localpolicy-fix.patch
0001-provide-dn_skipname.patch
+ libspf2-res_ninit-uclibc.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -27,8 +28,6 @@ build() {
cd "$_builddir"
./configure --prefix=/usr \
|| return 1
- # uclibc claims to have res_ninit() but it doesnt.
- sed -i -e 's:HAVE_DECL_RES_NINIT 1:HAVE_DECL_RES_NINIT 0:' config.h
make || return 1
}
@@ -38,4 +37,5 @@ package() {
}
md5sums="3305df4d1b13ca964d80b23bb5e4e2b6 libspf2-1.2.9.tar.gz
48d82a6af8c513d75a7402f2933b8b0a libspf2-localpolicy-fix.patch
-201889cbd209aa7cae9ce11ed5ebaaa6 0001-provide-dn_skipname.patch"
+201889cbd209aa7cae9ce11ed5ebaaa6 0001-provide-dn_skipname.patch
+06c981fcca0434d447f8a2749b51696f libspf2-res_ninit-uclibc.patch"
diff --git a/main/libspf2/libspf2-res_ninit-uclibc.patch b/main/libspf2/libspf2-res_ninit-uclibc.patch
new file mode 100644
index 0000000000..ae9ba9add6
--- /dev/null
+++ b/main/libspf2/libspf2-res_ninit-uclibc.patch
@@ -0,0 +1,64 @@
+diff --git a/src/libspf2/spf_dns_resolv.c b/src/libspf2/spf_dns_resolv.c
+index 10ccee6..7acdd1f 100644
+--- a/src/libspf2/spf_dns_resolv.c
++++ b/src/libspf2/spf_dns_resolv.c
+@@ -79,13 +79,13 @@ static const struct res_sym ns_sects[] = {
+ static const int num_ns_sect = sizeof(ns_sects) / sizeof(*ns_sects);
+
+
+-#if HAVE_DECL_RES_NINIT
++#if HAVE_DECL_RES_NINIT && !defined(__UCLIBC__)
+ # define SPF_h_errno res_state->res_h_errno
+ #else
+ # define SPF_h_errno h_errno
+ #endif
+
+-#if HAVE_DECL_RES_NINIT
++#if HAVE_DECL_RES_NINIT && !defined(__UCLIBC__)
+ static pthread_once_t res_state_control = PTHREAD_ONCE_INIT;
+ static pthread_key_t res_state_key;
+
+@@ -239,14 +239,14 @@ SPF_dns_resolv_lookup(SPF_dns_server_t *spf_dns_server,
+ size_t rdlen;
+ const u_char *rdata;
+
+-#if HAVE_DECL_RES_NINIT
++#if HAVE_DECL_RES_NINIT && !defined(__UCLIBC__)
+ void *res_spec;
+ struct __res_state *res_state;
+ #endif
+
+ SPF_ASSERT_NOTNULL(spf_dns_server);
+
+-#if HAVE_DECL_RES_NINIT
++#if HAVE_DECL_RES_NINIT && !defined(__UCLIBC__)
+ /** Get the thread-local resolver state. */
+ res_spec = pthread_getspecific(res_state_key);
+ if (res_spec == NULL) {
+@@ -292,7 +292,7 @@ SPF_dns_resolv_lookup(SPF_dns_server_t *spf_dns_server,
+ for (;;) {
+ int dns_len;
+
+-#if HAVE_DECL_RES_NINIT
++#if HAVE_DECL_RES_NINIT && !defined(__UCLIBC__)
+ /* Resolve the name. */
+ dns_len = res_nquery(res_state, domain, ns_c_in, rr_type,
+ responsebuf, responselen);
+@@ -606,7 +606,7 @@ SPF_dns_resolv_free(SPF_dns_server_t *spf_dns_server)
+ {
+ SPF_ASSERT_NOTNULL(spf_dns_server);
+
+-#if ! HAVE_DECL_RES_NINIT
++#if ! HAVE_DECL_RES_NINIT || defined(__UCLIBC__)
+ res_close();
+ #endif
+
+@@ -619,7 +619,7 @@ SPF_dns_resolv_new(SPF_dns_server_t *layer_below,
+ {
+ SPF_dns_server_t *spf_dns_server;
+
+-#if HAVE_DECL_RES_NINIT
++#if HAVE_DECL_RES_NINIT && !defined(__UCLIBC__)
+ pthread_once(&res_state_control, SPF_dns_resolv_init_key);
+ #else
+ if (res_init() != 0) {
diff --git a/main/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
index 84b9653276..df0dc90177 100644
--- a/main/libtasn1/APKBUILD
+++ b/main/libtasn1/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libtasn1
pkgver=2.6
-pkgrel=0
+pkgrel=1
pkgdesc="The ASN.1 library used in GNUTLS"
url="http://www.gnu.org/software/gnutls/"
license="GPL3 LGPL"
diff --git a/main/libtheora/APKBUILD b/main/libtheora/APKBUILD
index d608d36150..e9439bb0df 100644
--- a/main/libtheora/APKBUILD
+++ b/main/libtheora/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libtheora
pkgver=1.1.1
-pkgrel=2
+pkgrel=3
pkgdesc="An open video codec developed by the Xiph.org"
url="http://www.xiph.org"
license="custom"
diff --git a/main/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD
index d9ac9a0b04..c7490e5eca 100644
--- a/main/libusb-compat/APKBUILD
+++ b/main/libusb-compat/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libusb-compat
pkgver=0.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Compatility for older libusb"
url="http://libusb.sourceforge.net/"
license="LGPL"
diff --git a/main/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
index 8296416768..9f06c12349 100644
--- a/main/libvorbis/APKBUILD
+++ b/main/libvorbis/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libvorbis
pkgver=1.3.1
-pkgrel=0
+pkgrel=1
pkgdesc="Vorbis codec library"
url="http://www.xiph.org/ogg/vorbis/"
license="custom"
diff --git a/main/libxau/APKBUILD b/main/libxau/APKBUILD
index 888eb7ddd6..cfcb11fdf9 100644
--- a/main/libxau/APKBUILD
+++ b/main/libxau/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxau
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="X11 authorisation library"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -16,6 +16,10 @@ build() {
cd "$srcdir"/libXau-$pkgver
./configure --prefix=/usr --sysconfdir=/etc || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/libXau-$pkgver
make DESTDIR="$pkgdir" install || return 1
install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING || return 1
diff --git a/main/libxcb/APKBUILD b/main/libxcb/APKBUILD
index 6086b38d9e..beba3cccf0 100644
--- a/main/libxcb/APKBUILD
+++ b/main/libxcb/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxcb
pkgver=1.6
-pkgrel=0
+pkgrel=1
pkgdesc="X11 client-side library"
url="http://xcb.freedesktop.org/"
license="custom"
diff --git a/main/libxcursor/APKBUILD b/main/libxcursor/APKBUILD
index 2a83e866bf..14bbc4f4c3 100644
--- a/main/libxcursor/APKBUILD
+++ b/main/libxcursor/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxcursor
pkgver=1.1.10
-pkgrel=2
+pkgrel=3
pkgdesc="X cursor management library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxdmcp/APKBUILD b/main/libxdmcp/APKBUILD
index 2c6e7e823d..677d0ffb3c 100644
--- a/main/libxdmcp/APKBUILD
+++ b/main/libxdmcp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxdmcp
pkgver=1.0.3
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Display Manager Control Protocol library"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -15,6 +15,10 @@ build() {
./configure --prefix=/usr \
--sysconfdir=/etc
make || return 1
+}
+
+package() {
+ cd "$srcdir"/libXdmcp-$pkgver
make -j1 DESTDIR="$pkgdir" install || return 1
}
md5sums="d60941d471800f41a3f19b24bea855a7 libXdmcp-1.0.3.tar.bz2"
diff --git a/main/libxft/APKBUILD b/main/libxft/APKBUILD
index c9bcb99b86..7ec1a14040 100644
--- a/main/libxft/APKBUILD
+++ b/main/libxft/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxft
pkgver=2.1.14
-pkgrel=2
+pkgrel=3
pkgdesc="FreeType-based font drawing library for X"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxi/APKBUILD b/main/libxi/APKBUILD
index 4f02be89c5..6edaf9730e 100644
--- a/main/libxi/APKBUILD
+++ b/main/libxi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxi
pkgver=1.3
-pkgrel=2
+pkgrel=3
pkgdesc="X11 Input extension library"
url="http://xorg.freedesktop.org"
license="custom"
diff --git a/main/libxinerama/APKBUILD b/main/libxinerama/APKBUILD
index f0ea405cc8..13c0feed20 100644
--- a/main/libxinerama/APKBUILD
+++ b/main/libxinerama/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxinerama
pkgver=1.1
-pkgrel=2
+pkgrel=3
pkgdesc="X11 Xinerama extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxkbfile/APKBUILD b/main/libxkbfile/APKBUILD
index 10aed96159..6cb64adb24 100644
--- a/main/libxkbfile/APKBUILD
+++ b/main/libxkbfile/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxkbfile
pkgver=1.0.6
-pkgrel=2
+pkgrel=3
pkgdesc="X11 keyboard file manipulation library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxkbui/APKBUILD b/main/libxkbui/APKBUILD
index eb53261bfb..d201c36668 100644
--- a/main/libxkbui/APKBUILD
+++ b/main/libxkbui/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxkbui
pkgver=1.0.2
-pkgrel=2
+pkgrel=3
pkgdesc="X11 keyboard UI presentation library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxklavier/APKBUILD b/main/libxklavier/APKBUILD
index 65f66aead1..700c078e72 100644
--- a/main/libxklavier/APKBUILD
+++ b/main/libxklavier/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxklavier
pkgver=5.0
-pkgrel=1
+pkgrel=2
pkgdesc="High-level API for X Keyboard Extension"
url="http://gswitchit.sourceforge.net"
license="LGPL"
diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD
index 6c314eb567..40bdaa8e32 100644
--- a/main/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=libxml2
pkgver=2.7.7
-pkgrel=0
+pkgrel=1
pkgdesc="XML parsing library, version 2"
url="http://www.xmlsoft.org/"
license="MIT"
diff --git a/main/libxmu/APKBUILD b/main/libxmu/APKBUILD
index fb55cfa9ce..afda7a7e42 100644
--- a/main/libxmu/APKBUILD
+++ b/main/libxmu/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxmu
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="X11 miscellaneous micro-utility library"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,6 +17,10 @@ build ()
./configure --prefix=/usr \
--sysconfdir=/etc
make || return 1
+}
+
+package() {
+ cd "$srcdir"/libXmu-$pkgver
make DESTDIR="$pkgdir" install || return 1
install -Dm644 $srcdir/libXmu-$pkgver/COPYING \
$pkgdir/usr/share/licenses/$pkgname/COPYING
diff --git a/main/libxpm/APKBUILD b/main/libxpm/APKBUILD
index cb970fef79..632395a10b 100644
--- a/main/libxpm/APKBUILD
+++ b/main/libxpm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxpm
pkgver=3.5.8
-pkgrel=2
+pkgrel=3
pkgdesc="X11 pixmap library"
url="http://xorg.freedesktop.org/"
license="custom:BELL"
diff --git a/main/libxrandr/APKBUILD b/main/libxrandr/APKBUILD
index e433acc2b1..55e6c48eae 100644
--- a/main/libxrandr/APKBUILD
+++ b/main/libxrandr/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxrandr
pkgver=1.3.0
-pkgrel=2
+pkgrel=3
pkgdesc="X11 RandR extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxres/APKBUILD b/main/libxres/APKBUILD
index cc654c8b42..52ce54831f 100644
--- a/main/libxres/APKBUILD
+++ b/main/libxres/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxres
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Resource extension library"
url="http://xorg.freedesktop.org"
license="custom"
@@ -17,6 +17,10 @@ build ()
./configure --prefix=/usr \
--sysconfdir=/etc
make || return 1
+}
+
+package() {
+ cd "$srcdir"/libXres-$pkgver
make DESTDIR="$pkgdir" install || return 1
install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/main/libxslt/APKBUILD b/main/libxslt/APKBUILD
index c4c9add3dc..b19f012af0 100644
--- a/main/libxslt/APKBUILD
+++ b/main/libxslt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxslt
pkgver=1.1.26
-pkgrel=2
+pkgrel=3
pkgdesc="XML stylesheet transformation library"
url="http://xmlsoft.org/XSLT/"
license="custom"
diff --git a/main/libxt/APKBUILD b/main/libxt/APKBUILD
index 3bf47fe64f..2c9754fa93 100644
--- a/main/libxt/APKBUILD
+++ b/main/libxt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxt
pkgver=1.0.8
-pkgrel=1
+pkgrel=2
pkgdesc="X11 toolkit intrinsics library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxtst/APKBUILD b/main/libxtst/APKBUILD
index 37eac75472..835d2dd376 100644
--- a/main/libxtst/APKBUILD
+++ b/main/libxtst/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxtst
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Testing -- Resource extension library"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,6 +17,10 @@ build ()
./configure --prefix=/usr \
--build=${CHOST} --host=${CHOST}
make || return 1
+}
+
+package() {
+ cd "$srcdir"/libXtst-$pkgver
make DESTDIR="$pkgdir" install || return 1
install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/main/libxv/APKBUILD b/main/libxv/APKBUILD
index c007003195..301e4b9cd9 100644
--- a/main/libxv/APKBUILD
+++ b/main/libxv/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxv
pkgver=1.0.5
-pkgrel=2
+pkgrel=3
pkgdesc="X11 Video extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxvmc/APKBUILD b/main/libxvmc/APKBUILD
index 871d1892bd..88b32628a1 100644
--- a/main/libxvmc/APKBUILD
+++ b/main/libxvmc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxvmc
pkgver=1.0.5
-pkgrel=2
+pkgrel=3
pkgdesc="X11 Video Motion Compensation extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxxf86dga/APKBUILD b/main/libxxf86dga/APKBUILD
index 238e7612e4..7328fd9ffd 100644
--- a/main/libxxf86dga/APKBUILD
+++ b/main/libxxf86dga/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxxf86dga
pkgver=1.1.1
-pkgrel=2
+pkgrel=3
pkgdesc="X11 Direct Graphics Access extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxxf86misc/APKBUILD b/main/libxxf86misc/APKBUILD
index c6dd2cb024..6b8eafdf0d 100644
--- a/main/libxxf86misc/APKBUILD
+++ b/main/libxxf86misc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxxf86misc
pkgver=1.0.2
-pkgrel=2
+pkgrel=3
pkgdesc="X11 XFree86 miscellaneous extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/libxxf86vm/APKBUILD b/main/libxxf86vm/APKBUILD
index 87fe594de1..cc67ef1603 100644
--- a/main/libxxf86vm/APKBUILD
+++ b/main/libxxf86vm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxxf86vm
pkgver=1.1.0
-pkgrel=2
+pkgrel=3
pkgdesc="X11 XFree86 video mode extension library"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/linux-grsec/0021-xfrm-do-not-assume-that-template-resolving-always-returns-xfrms.patch b/main/linux-grsec/0021-xfrm-do-not-assume-that-template-resolving-always-returns-xfrms.patch
new file mode 100644
index 0000000000..bc660dd5cc
--- /dev/null
+++ b/main/linux-grsec/0021-xfrm-do-not-assume-that-template-resolving-always-returns-xfrms.patch
@@ -0,0 +1,66 @@
+From d809ec895505e6f35fb1965f0946381ab4eaa474 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Mon, 12 Jul 2010 21:29:42 +0000
+Subject: [PATCH] xfrm: do not assume that template resolving always returns xfrms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+xfrm_resolve_and_create_bundle() assumed that, if policies indicated
+presence of xfrms, bundle template resolution would always return
+some xfrms. This is not true for 'use' level policies which can
+result in no xfrm's being applied if there is no suitable xfrm states.
+This fixes a crash by this incorrect assumption.
+
+Reported-by: George Spelvin <linux@horizon.com>
+Bisected-by: George Spelvin <linux@horizon.com>
+Tested-by: George Spelvin <linux@horizon.com>
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/xfrm/xfrm_policy.c | 15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
+index af1c173..a7ec5a8 100644
+--- a/net/xfrm/xfrm_policy.c
++++ b/net/xfrm/xfrm_policy.c
+@@ -1594,8 +1594,8 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
+
+ /* Try to instantiate a bundle */
+ err = xfrm_tmpl_resolve(pols, num_pols, fl, xfrm, family);
+- if (err < 0) {
+- if (err != -EAGAIN)
++ if (err <= 0) {
++ if (err != 0 && err != -EAGAIN)
+ XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);
+ return ERR_PTR(err);
+ }
+@@ -1678,6 +1678,13 @@ xfrm_bundle_lookup(struct net *net, struct flowi *fl, u16 family, u8 dir,
+ goto make_dummy_bundle;
+ dst_hold(&xdst->u.dst);
+ return oldflo;
++ } else if (new_xdst == NULL) {
++ num_xfrms = 0;
++ if (oldflo == NULL)
++ goto make_dummy_bundle;
++ xdst->num_xfrms = 0;
++ dst_hold(&xdst->u.dst);
++ return oldflo;
+ }
+
+ /* Kill the previous bundle */
+@@ -1760,6 +1767,10 @@ restart:
+ xfrm_pols_put(pols, num_pols);
+ err = PTR_ERR(xdst);
+ goto dropdst;
++ } else if (xdst == NULL) {
++ num_xfrms = 0;
++ drop_pols = num_pols;
++ goto no_transform;
+ }
+
+ spin_lock_bh(&xfrm_policy_sk_bundle_lock);
+--
+1.7.1.1
+
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 83697b369d..ce3c1b3f36 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
pkgname=linux-${_flavor}
pkgver=2.6.32.16
_kernver=2.6.32
-pkgrel=1
+pkgrel=2
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -32,6 +32,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
0019-ipv4-check-rt_genid-in-dst_check.patch
0020-xfrm-check-bundle-policy-existance-before-dereferencing-it.patch
+ 0021-xfrm-do-not-assume-that-template-resolving-always-returns-xfrms.patch
xfrm-fix-policy-unreferencing-on-larval-drop.patch
r8169-fix-random-mdio_write-failures.patch
r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch
@@ -166,6 +167,7 @@ c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-fo
45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
74e511f12854972db08d3fddc4df0f52 0019-ipv4-check-rt_genid-in-dst_check.patch
edfac5844f91721d49a00a09b6ef258b 0020-xfrm-check-bundle-policy-existance-before-dereferencing-it.patch
+b39bccb5a1124f5a3f2f209edb21aba5 0021-xfrm-do-not-assume-that-template-resolving-always-returns-xfrms.patch
c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch
ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch
b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch
diff --git a/main/lm_sensors/APKBUILD b/main/lm_sensors/APKBUILD
index d587b1b3a1..320726584f 100644
--- a/main/lm_sensors/APKBUILD
+++ b/main/lm_sensors/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lm_sensors
pkgver=3.1.2
-pkgrel=1
+pkgrel=2
pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring."
url="http://www.lm-sensors.org/"
license="GPL"
@@ -18,21 +18,27 @@ source="http://dl.lm-sensors.org/lm-sensors/releases/$pkgname-$pkgver.tar.bz2
"
_builddir="$srcdir"/$pkgname-$pkgver
-build() {
- cd "$_builddir"
+prepare() {
+ cd "$_builddir"
sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile
# Respect LDFLAGS
sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile
sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \
lib/Module.mk
- export CFLAGS="$CFLAGS -fno-stack-protector"
+ # do not check for libiconv in ldconfig cache
+ sed -i -e 's/^LIBICONV.*/LIBICONV ?=/' prog/sensors/Module.mk || return 1
for i in ../*.patch; do
msg "Applying $i"
patch -p1 < $i || return 1
done
+}
+
+build() {
+ cd "$_builddir"
+ export CFLAGS="$CFLAGS -fno-stack-protector"
make PREFIX=/usr user || return 1
}
diff --git a/main/lzo/APKBUILD b/main/lzo/APKBUILD
index aa73d34600..d44ed0f700 100644
--- a/main/lzo/APKBUILD
+++ b/main/lzo/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=lzo
pkgver=2.03
-pkgrel=1
+pkgrel=2
pkgdesc="LZO -- a real-time data compression library"
url="http://www.oberhumer.com/opensource/lzo"
license="GPL"
@@ -21,6 +21,10 @@ build() {
--infodir=/usr/share/info \
--enable-shared
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD
index fbe899324a..c49ca24daf 100644
--- a/main/mercurial/APKBUILD
+++ b/main/mercurial/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mercurial
-pkgver=1.5.4
+pkgver=1.6
pkgrel=0
pkgdesc="A scalable distributed SCM tool"
url="http://www.selenic.com/mercurial"
@@ -29,4 +29,4 @@ package() {
install -Dm644 contrib/vim/HGAnnotate.vim \
"${vimpath}/syntax/HGAnnotate.vim" || return 1
}
-md5sums="db0d673000463fae1ca5cb8a202315ae mercurial-1.5.4.tar.gz"
+md5sums="e97772cb424d29d9382c41daafa6f92d mercurial-1.6.tar.gz"
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 403017613f..ebccf5c7ac 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa
pkgver=7.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="Mesa DRI OpenGL library"
url="http://www.mesa3d.org"
license="LGPL"
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index e2f837506c..48e1d46380 100644
--- a/main/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
@@ -2,9 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mysql
pkgver=5.1.48
-pkgrel=0
+pkgrel=1
pkgdesc="A fast SQL database server"
url="http://www.mysql.com/"
+pkgusers="mysql"
+pkggroups="mysql"
license='GPL'
depends=
makedepends="libtool readline-dev openssl-dev ncurses-dev zlib-dev"
diff --git a/main/neon/APKBUILD b/main/neon/APKBUILD
index b756630cea..90689460f7 100644
--- a/main/neon/APKBUILD
+++ b/main/neon/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=neon
pkgver=0.29.3
-pkgrel=1
+pkgrel=2
pkgdesc="HTTP and WebDAV client library with a C interface"
url="http://www.webdav.org/neon/"
license="GPL LGPL"
diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index 3b68686d90..f7cd098757 100644
--- a/main/net-snmp/APKBUILD
+++ b/main/net-snmp/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=net-snmp
pkgver=5.5
-pkgrel=1
+pkgrel=2
pkgdesc="Simple Network Management Protocol"
url="http://www.net-snmp.org/"
license="GPL"
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index cc369db6e6..6a788fb802 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=openldap
pkgver=2.4.21
-pkgrel=2
+pkgrel=3
pkgdesc="LDAP Server"
url="http://www.openldap.org/"
license="custom"
diff --git a/main/pgcluster/APKBUILD b/main/pgcluster/APKBUILD
index ec2a51af8e..110d1d6065 100644
--- a/main/pgcluster/APKBUILD
+++ b/main/pgcluster/APKBUILD
@@ -2,7 +2,7 @@
pkgname=pgcluster
pkgver=1.9.0_rc5
_myver=1.9.0rc5
-pkgrel=4
+pkgrel=5
pkgdesc="PostgreSQL with multi-master cluster/replication patch"
url="http://pgfoundry.org/projects/pgcluster/"
license="BSD"
@@ -23,6 +23,10 @@ build() {
|| return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$_myver || return 1
make DESTDIR="$pkgdir" install || return 1
install -D -m755 "$srcdir"/$pkgname.initd \
diff --git a/main/pgpool/APKBUILD b/main/pgpool/APKBUILD
index fbd8ca073d..f20fae7c81 100644
--- a/main/pgpool/APKBUILD
+++ b/main/pgpool/APKBUILD
@@ -3,7 +3,7 @@
pkgname=pgpool
_opkgname=pgpool-II
pkgver=2.2.2
-pkgrel=2
+pkgrel=3
pkgdesc="Pgpool II is a connection pooling/replication server for PostgreSQL."
url="http://pgfoundry.org/projects/pgpool/"
license="BSD"
@@ -20,6 +20,10 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info
make || return 1
+}
+
+package() {
+ cd "$srcdir/$_opkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
diff --git a/main/popt/APKBUILD b/main/popt/APKBUILD
index 146f927d82..5534cac359 100644
--- a/main/popt/APKBUILD
+++ b/main/popt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=popt
pkgver=1.16
-pkgrel=0
+pkgrel=1
pkgdesc="A commandline option parser"
url="http://rpm5.org"
license="custom"
diff --git a/main/pth/APKBUILD b/main/pth/APKBUILD
index ec920d874f..49730bd383 100644
--- a/main/pth/APKBUILD
+++ b/main/pth/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=pth
pkgver=2.0.7
-pkgrel=1
+pkgrel=2
pkgdesc="The GNU Portable Threads."
url="http://www.gnu.org/software/pth"
license="LGPL-2.1"
@@ -27,6 +27,10 @@ build () {
--mandir=/usr/share/man
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make -j1 DESTDIR="$pkgdir" install
}
md5sums="9cb4a25331a4c4db866a31cbe507c793 pth-2.0.7.tar.gz
diff --git a/main/python/APKBUILD b/main/python/APKBUILD
index 07fb2d4cd8..c84d25b665 100644
--- a/main/python/APKBUILD
+++ b/main/python/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=python
pkgver=2.6.5
-pkgrel=2
+pkgrel=3
pkgdesc="A high-level scripting language"
url="http://www.python.org"
license="custom"
diff --git a/main/rarian/APKBUILD b/main/rarian/APKBUILD
index 4dcb23a7a9..42913186b1 100644
--- a/main/rarian/APKBUILD
+++ b/main/rarian/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=rarian
pkgver=0.8.1
-pkgrel=2
+pkgrel=3
pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper."
url="http://rarian.freedesktop.org/"
license="GPL"
@@ -21,6 +21,10 @@ build ()
--enable-scrollkeeper-compat \
--disable-static || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make -j1 DESTDIR="$pkgdir" install || return 1
}
diff --git a/main/remmina/APKBUILD b/main/remmina/APKBUILD
index 67ff80659b..cc8ccdf941 100644
--- a/main/remmina/APKBUILD
+++ b/main/remmina/APKBUILD
@@ -1,8 +1,8 @@
# Contributor:
# Maintainer:
pkgname=remmina
-pkgver=0.7.4
-pkgrel=1
+pkgver=0.8.0
+pkgrel=0
pkgdesc="Remmina is a remote desktop client written in GTK+"
url="http://remmina.sourceforge.net/"
license="GPL"
@@ -42,4 +42,4 @@ package() {
# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-md5sums="c53c9473b3730dcc8c8b5bd84e5fe01a remmina-0.7.4.tar.gz"
+md5sums="26786dcc8a5e2afc08d58c2583810895 remmina-0.8.0.tar.gz"
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 87063abdaf..a66b11e8ca 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby
pkgver=1.8.7_p174
_pkgver=1.8.7-p174
-pkgrel=6
+pkgrel=7
pkgdesc="An object-oriented language for quick and easy programming"
url="http://www.ruby-lang.org/en/"
license="Ruby"
diff --git a/main/sdl/APKBUILD b/main/sdl/APKBUILD
index e98589b0a9..cf2d2b7864 100644
--- a/main/sdl/APKBUILD
+++ b/main/sdl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sdl
pkgver=1.2.14
-pkgrel=1
+pkgrel=2
pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
url="http://www.libsdl.org"
license="LGPL"
diff --git a/main/slang/APKBUILD b/main/slang/APKBUILD
index a74ca0e6fe..26075c6cdc 100644
--- a/main/slang/APKBUILD
+++ b/main/slang/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=slang
pkgver=2.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="S-Lang is a powerful interpreted language"
url="http://www.s-lang.org/"
license="GPL"
diff --git a/main/sox/APKBUILD b/main/sox/APKBUILD
index 37b016a99d..b029efb175 100644
--- a/main/sox/APKBUILD
+++ b/main/sox/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sox
pkgver=14.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="The Swiss Army knife of sound processing tools"
url="http://sox.sourceforge.net/"
license="GPL LGPL"
diff --git a/main/spandsp/APKBUILD b/main/spandsp/APKBUILD
index 15372f476f..67c4377b5f 100644
--- a/main/spandsp/APKBUILD
+++ b/main/spandsp/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=spandsp
pkgver=0.0.6_pre17
-pkgrel=1
+pkgrel=2
pkgdesc="SpanDSP is a library of DSP functions for telephony"
url="http://www.soft-switch.org/installing-spandsp.html"
license="GPL"
diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD
index 21d90fc6af..66aa792e5f 100644
--- a/main/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=sqlite
pkgver=3.6.22
-pkgrel=1
+pkgrel=2
pkgdesc="A C library that implements an SQL database engine"
url="http://www.sqlite.org/"
license="custom"
diff --git a/main/sshfs/APKBUILD b/main/sshfs/APKBUILD
new file mode 100644
index 0000000000..f911831236
--- /dev/null
+++ b/main/sshfs/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=sshfs
+pkgver=2.2
+pkgrel=0
+pkgdesc="FUSE client based on the SSH File Transfer Protocol"
+url="http://fuse.sourceforge.net/sshfs.html"
+license="GPL"
+depends="openssh-client"
+makedepends="pkgconfig fuse-dev glib-dev"
+source="http://downloads.sourceforge.net/sourceforge/fuse/sshfs-fuse-$pkgver.tar.gz"
+
+_builddir="$srcdir"/sshfs-fuse-$pkgver
+build ()
+{
+ cd "$_builddir"
+ ./configure --prefix=/usr
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="26e9206eb5169e87e6f95f54bc005a4f sshfs-fuse-2.2.tar.gz"
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index e33abe6e6b..4962aeb722 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=subversion
pkgver=1.6.9
-pkgrel=2
+pkgrel=3
pkgdesc="Replacement for CVS, another versioning system (svn)"
url="http://subversion.tigris.org/"
license="apache bsd"
diff --git a/main/swfdec/APKBUILD b/main/swfdec/APKBUILD
index 8ab7488d95..850610cf45 100644
--- a/main/swfdec/APKBUILD
+++ b/main/swfdec/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=swfdec
pkgver=0.8.4
-pkgrel=2
+pkgrel=3
pkgdesc="free library for decoding and rendering Flash animations"
url="http://swfdec.freedesktop.org"
license="LGPL"
@@ -23,6 +23,10 @@ build ()
--enable-soup \
--with-audio=alsa
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
md5sums="aece501d0e73f3e564200a44ec03c385 swfdec-0.8.4.tar.gz"
diff --git a/main/sysfsutils/APKBUILD b/main/sysfsutils/APKBUILD
index 1f910b148c..4ff8e83c53 100644
--- a/main/sysfsutils/APKBUILD
+++ b/main/sysfsutils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sysfsutils
pkgver=2.1.0
-pkgrel=4
+pkgrel=5
pkgdesc="System Utilities Based on Sysfs"
url="http://linux-diag.sourceforge.net/Sysfsutils.html"
license="GPL LGPL"
@@ -15,6 +15,10 @@ build() {
./configure --prefix=/usr \
--mandir=/usr/share/man
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir"/ install
# cd "$srcdir"/pkg
# mkdir -v lib
diff --git a/main/taglib/APKBUILD b/main/taglib/APKBUILD
index d449276825..ba0b5be2d8 100644
--- a/main/taglib/APKBUILD
+++ b/main/taglib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=taglib
pkgver=1.6.3
-pkgrel=0
+pkgrel=1
pkgdesc="library for reading and editing the meta-data of several popular audio formats."
url="http://ktown.kde.org/~wheeler/taglib.html"
license="GPL2"
diff --git a/main/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index 48d2efe936..18b1499be7 100644
--- a/main/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=unixodbc
pkgver=2.3.0
-pkgrel=0
+pkgrel=1
pkgdesc="ODBC is an open specification to access Data Sources"
url="http://www.unixodbc.org/"
license="GPL2"
diff --git a/main/webkit/APKBUILD b/main/webkit/APKBUILD
index cde6457396..8f5afb1073 100644
--- a/main/webkit/APKBUILD
+++ b/main/webkit/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=webkit
pkgver=1.2.1
-pkgrel=0
+pkgrel=1
pkgdesc="portable web rendering engine WebKit for GTK+"
url="http://webkitgtk.org/"
license="LGPL BSD"
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index 99e4a5bd0d..e04737b395 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=wine
pkgver=1.1.44
-pkgrel=0
+pkgrel=1
pkgdesc="A compatibility layer for running Windows programs"
url="http://www.winehq.com"
license="LGPL"
diff --git a/main/wireless-tools/APKBUILD b/main/wireless-tools/APKBUILD
index 33c0c9273c..c7af27d3b3 100644
--- a/main/wireless-tools/APKBUILD
+++ b/main/wireless-tools/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=wireless-tools
pkgver=29
-pkgrel=2
+pkgrel=3
pkgdesc="Open Source wireless tools"
url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
license="GPL"
diff --git a/main/xcb-util/APKBUILD b/main/xcb-util/APKBUILD
index a1812b5ef1..4c7a398215 100644
--- a/main/xcb-util/APKBUILD
+++ b/main/xcb-util/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xcb-util
pkgver=0.3.6
-pkgrel=1
+pkgrel=2
pkgdesc="Utility libraries for XC Binding"
url="http://xcb.freedesktop.org"
license="GPL"
@@ -15,6 +15,10 @@ build() {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr --disable-static || return 1
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
}
md5sums="dd8968b8ee613cb027a8ef1fcbdc8fc9 xcb-util-0.3.6.tar.bz2"
diff --git a/main/xf86-video-ati/APKBUILD b/main/xf86-video-ati/APKBUILD
index bef7a30b5b..f004aa019f 100644
--- a/main/xf86-video-ati/APKBUILD
+++ b/main/xf86-video-ati/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-ati
-pkgver=6.13.0
+pkgver=6.13.1
pkgrel=0
pkgdesc="ATI video driver"
url="http://xorg.freedesktop.org/"
@@ -29,4 +29,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="7b2642442091808002963920c7693aeb xf86-video-ati-6.13.0.tar.bz2"
+md5sums="d65ae11cc66146c7006dbf5acebde413 xf86-video-ati-6.13.1.tar.bz2"
diff --git a/main/xf86-video-dummy/APKBUILD b/main/xf86-video-dummy/APKBUILD
index f3c27c4a43..6cf6774ba7 100644
--- a/main/xf86-video-dummy/APKBUILD
+++ b/main/xf86-video-dummy/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-dummy
-pkgver=0.3.3
-pkgrel=1
+pkgver=0.3.4
+pkgrel=0
pkgdesc="X.Org driver for dummy cards"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -24,4 +24,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="3ffe3a28f4452e66bf56180e7da9cbc5 xf86-video-dummy-0.3.3.tar.bz2"
+md5sums="1cf99415c998994f2e88575f942b364c xf86-video-dummy-0.3.4.tar.bz2"
diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD
index 4b3d706247..ff710c00b9 100644
--- a/main/xf86-video-intel/APKBUILD
+++ b/main/xf86-video-intel/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-intel
-pkgver=2.11.0
-pkgrel=1
+pkgver=2.12.0
+pkgrel=0
pkgdesc="X.Org driver for Intel cards"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -25,4 +25,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="91a8baa97c4c8c85d35291fea547dd15 xf86-video-intel-2.11.0.tar.bz2"
+md5sums="8314def847dcdc4f2970e2d193054f96 xf86-video-intel-2.12.0.tar.bz2"
diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD
index 1268b7567d..5260923146 100644
--- a/main/xf86-video-openchrome/APKBUILD
+++ b/main/xf86-video-openchrome/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-openchrome
pkgver=0.2.904
-pkgrel=2
+pkgrel=3
pkgdesc="X.Org driver for VIA/S3G cards"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-rendition/APKBUILD b/main/xf86-video-rendition/APKBUILD
index 1912336430..c2d677bfe6 100644
--- a/main/xf86-video-rendition/APKBUILD
+++ b/main/xf86-video-rendition/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-rendition
-pkgver=4.2.3
-pkgrel=2
+pkgver=4.2.4
+pkgrel=0
pkgdesc="Rendition video driver"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -24,4 +24,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="9a0a916fe1e7b5c81cd4c80a08e646cc xf86-video-rendition-4.2.3.tar.bz2"
+md5sums="75cc28125077acb7344955294545553b xf86-video-rendition-4.2.4.tar.bz2"
diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD
index 7348977815..d8bd028f29 100644
--- a/main/xf86-video-sis/APKBUILD
+++ b/main/xf86-video-sis/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-sis
-pkgver=0.10.2
-pkgrel=1
+pkgver=0.10.3
+pkgrel=0
pkgdesc="X.org SiS video driver"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -11,12 +11,10 @@ makedepends="pkgconfig xorg-server-dev videoproto renderproto xproto
fontsproto xf86dgaproto xineramaproto randrproto xextproto mesa-dev
xf86driproto glproto libxi-dev"
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
- fix-bios-read-on-650-760.patch"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
prepare() {
cd "$srcdir"/$pkgname-$pkgver
- patch -Np1 -i "$srcdir/fix-bios-read-on-650-760.patch" || return 1
}
build() {
@@ -32,5 +30,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="f04baa307e49e9f0e5a5c3d2e89a5576 xf86-video-sis-0.10.2.tar.bz2
-827d289307badeae3778180ab19b7363 fix-bios-read-on-650-760.patch"
+md5sums="dd930928b5ed7fcf34e3be4d43202ec7 xf86-video-sis-0.10.3.tar.bz2"
diff --git a/main/xf86-video-tseng/APKBUILD b/main/xf86-video-tseng/APKBUILD
index 288636a6c0..7a68a22d59 100644
--- a/main/xf86-video-tseng/APKBUILD
+++ b/main/xf86-video-tseng/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-tseng
-pkgver=1.2.3
-pkgrel=2
+pkgver=1.2.4
+pkgrel=0
pkgdesc="Tseng Labs video driver"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -24,4 +24,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="79f63999c88477801ae54dc486272ad6 xf86-video-tseng-1.2.3.tar.bz2"
+md5sums="fa441774f8bf516a5c6331d64231a39d xf86-video-tseng-1.2.4.tar.bz2"
diff --git a/main/xfprint/APKBUILD b/main/xfprint/APKBUILD
index daa695367c..15d4600436 100644
--- a/main/xfprint/APKBUILD
+++ b/main/xfprint/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfprint
pkgver=4.6.1
-pkgrel=3
+pkgrel=4
pkgdesc="A print dialog and a printer manager for Xfce"
url="http://www.xfce.org/"
license="GPL2"
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index dadad1d44c..4fc668115a 100644
--- a/main/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfsprogs
pkgver=3.1.2
-pkgrel=0
+pkgrel=1
pkgdesc="XFS filesystem utilities"
url="http://oss.sgi.com/projects/xfs/"
license="LGPL"
diff --git a/main/xvidcore/APKBUILD b/main/xvidcore/APKBUILD
index 6076bfac95..0742d5785c 100644
--- a/main/xvidcore/APKBUILD
+++ b/main/xvidcore/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xvidcore
pkgver=1.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="XviD is an open source MPEG-4 video codec"
url="http://www.xvid.org/"
license="GPL"