Merge branch 'master' of git://git.alpinelinux.org/aports

13 files changed, 122 insertions, 62 deletions

diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index a41926f15..dab257043 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cairo
-pkgver=1.10.2
-pkgrel=10
+pkgver=1.12.0
+pkgrel=0
 pkgdesc="Cairo vector graphics library"
 url="http://cairographics.org/"
 arch="all"
@@ -47,4 +47,4 @@ tools() {
 		"$subpkgdir"/usr/lib/cairo/
 }
 
-md5sums="f101a9e88b783337b20b2e26dfd26d5f  cairo-1.10.2.tar.gz"
+md5sums="e6c85575ba7094f88b637bdfd835a751  cairo-1.12.0.tar.gz"
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 356725187..c47f60ffe 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -4,7 +4,7 @@ pkgname=freeswitch
 _snapshot=20120312
 pkgver=1.0.7_p${_snapshot}
 _commit=5e4a514531de2a1d8040c3d306a9e8de426de566
-pkgrel=1
+pkgrel=3
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 arch="all"
@@ -15,7 +15,7 @@ pkggroups="freeswitch"
 makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev ncurses-dev
 	autoconf automake libtool libpri-dev bash net-snmp-dev postgresql-dev
 	libiconv-dev subversion flac-dev libogg-dev libvorbis-dev
-	jpeg-dev sngtc_client-dev"
+	jpeg-dev sngtc_client-dev gnutls-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dev $pkgname-flite $pkgname-timezones
 	$pkgname-sample-config:conf $pkgname-freetdm $pkgname-sangoma"
@@ -175,6 +175,6 @@ conf() {
 md5sums="8c0609c00039513a1a81eda685845b37  freeswitch-5e4a514531de2a1d8040c3d306a9e8de426de566.tar.bz2
 11883affe0839a8e15fe680aeb11b86e  freeswitch-mod_shout-textrels.patch
 769eaa127d4dbae687dc4aa961a8cc70  0002-mod_lua-alpine-module-search-path.patch
-94516a9473e2283ab201f38cb2756741  modules.conf
+1e6f8a9f18c9c332872cdc40065b76e3  modules.conf
 c608cca8ad773acebf201f581438c7e7  freeswitch.confd
 06d70089ce96abc47a01bf69511a978a  freeswitch.initd"
diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf
index d0d0fce28..2911092d5 100644
--- a/main/freeswitch/modules.conf
+++ b/main/freeswitch/modules.conf
@@ -58,8 +58,8 @@ codecs/mod_sangoma_codec
 dialplans/mod_dialplan_xml
 dialplans/mod_dialplan_asterisk
 #directories/mod_ldap
-#endpoints/mod_dingaling
-#endpoints/mod_portaudio
+endpoints/mod_dingaling
+endpoints/mod_portaudio
 endpoints/mod_sofia
 endpoints/mod_loopback
 #endpoints/mod_alsa
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index 026851c8e..515e2d593 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=libvirt
-pkgver=0.9.10
-pkgrel=3
+pkgver=0.9.11
+pkgrel=0
 pkgdesc="A virtualization API for several hypervisor and container systems"
 url="http://libvirt.org/"
 arch="all"
@@ -44,6 +44,6 @@ package() {
 	install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd
 }
 
-md5sums="a424bb793521e637349da47e93dd5fff  libvirt-0.9.10.tar.gz
+md5sums="6e9fab115075a8fd21d9bd0d7e558a52  libvirt-0.9.11.tar.gz
 1c84a7baeafe0a7f4e9d7ae5180311b7  libvirt.confd
 7067215010da2d7282d878ba43070c5d  libvirt.initd"
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 9f46f6441..c89fa1327 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=3.6.3
+pkgver=3.6.4
 pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
@@ -153,7 +153,7 @@ client() {
 }
 
 
-md5sums="98ac9db9f4b6ebfc3f013aa193ffb0d1  samba-3.6.3.tar.gz
+md5sums="d8e070e2a3b12f202f347e4427469bc2  samba-3.6.4.tar.gz
 f0b8d460ad4af28266ac8bc1d6fa0d31  samba.initd
 c150433426e18261e6e3eed3930e1a76  samba.confd
 b7cafabfb4fa5b3ab5f2e857d8d1c733  samba.logrotate"
diff --git a/main/squark/APKBUILD b/main/squark/APKBUILD
index 68450cd71..be22b743d 100644
--- a/main/squark/APKBUILD
+++ b/main/squark/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=squark
-pkgver=0.4.2
+pkgver=0.4.3
 pkgrel=0
 pkgdesc="Squark - Squid User Authentication and Rating Kit"
 subpackages=
@@ -35,4 +35,4 @@ package() {
 	make FULL_VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir" install
 }
 
-md5sums="92eed4d7e45d0f68895514a076caeaf6  squark-0.4.2.tar.bz2"
+md5sums="dd4d19f01a4d5864e74962b28b39537c  squark-0.4.3.tar.bz2"
diff --git a/main/transmission/0001-gtk-conf-set-correct-download-dir-default.patch b/main/transmission/0001-gtk-conf-set-correct-download-dir-default.patch
deleted file mode 100644
index 3b0a38400..000000000
--- a/main/transmission/0001-gtk-conf-set-correct-download-dir-default.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4028320ba2e8c181292e02171d83ebf6ce3aee5a Mon Sep 17 00:00:00 2001
-From: Felipe Contreras <felipe.contreras@gmail.com>
-Date: Thu, 29 Dec 2011 03:28:27 +0200
-Subject: [PATCH] gtk: conf: set correct download dir default
-
-Otherwise people might get:
-ERROR:open-dialog.c:285:gtr_torrent_options_dialog_new: code should not be reached
-
-It was fixed at some point in ticket #1873, but somebody broket it
-again.
-
-Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
----
- gtk/conf.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/gtk/conf.c b/gtk/conf.c
-index 623b839..6ad6ca2 100644
---- a/gtk/conf.c
-+++ b/gtk/conf.c
-@@ -108,7 +108,6 @@ tr_prefs_init_defaults( tr_benc * d )
-     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_X, 50 );
-     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_Y, 50 );
- 
--    str = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD );
-     tr_bencDictAddStr( d, TR_PREFS_KEY_DOWNLOAD_DIR, str );
- 
-     tr_bencDictAddStr( d, PREF_KEY_SORT_MODE, "sort-by-name" );
--- 
-1.7.8.1
-
diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD
index 26c504aff..257282a50 100644
--- a/main/transmission/APKBUILD
+++ b/main/transmission/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer:Carlo Landmeter
 pkgname=transmission
-pkgver=2.42
+pkgver=2.51
 pkgrel=0
 pkgdesc="Lightweight GTK BitTorrent client"
 url="http://www.tansmissionbt.com"
@@ -11,7 +11,6 @@ depends=
 makedepends="openssl-dev pkgconfig curl-dev gtk+-dev intltool libevent-dev
 	libnotify-dev dbus-glib-dev autoconf automake tar libcanberra-dev gconf-dev"
 source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
-	0001-gtk-conf-set-correct-download-dir-default.patch
 	transmission-daemon.initd
 	transmission-daemon.confd
 	"
@@ -67,7 +66,6 @@ cli() {
 		"$subpkgdir"/usr/bin/
 }
 
-md5sums="2ade0818d465779bd956b8b72ea56b02  transmission-2.42.tar.bz2
-f9fae46f5aa9ed3a22af64091604c6d0  0001-gtk-conf-set-correct-download-dir-default.patch
+md5sums="dfe2faeb2b76b43954ec943affef2133  transmission-2.51.tar.bz2
 1ca57137d38c3429295a4699f535a240  transmission-daemon.initd
 89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd"
diff --git a/main/virtinst/APKBUILD b/main/virtinst/APKBUILD
index a59e3ec11..50942a5bd 100644
--- a/main/virtinst/APKBUILD
+++ b/main/virtinst/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor:
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=virtinst
-pkgver=0.600.0
-pkgrel=1
+pkgver=0.600.1
+pkgrel=0
 pkgdesc="CLI tool for provision operating systems into virtual machines"
 arch="noarch"
 url="http://virt-manager.et.redhat.com"
@@ -10,7 +10,7 @@ license="GPL"
 depends="libvirt python"
 makedepends="gettext-dev libvirt-dev python-dev"
 install=
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-lang"
 source="http://virt-manager.et.redhat.com/download/sources/$pkgname/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -30,4 +30,4 @@ package() {
 	python ./setup.py install --root=$pkgdir
 }
 
-md5sums="d8f6a61d7edbc78129a8b5df2807ad46  virtinst-0.600.0.tar.gz"
+md5sums="7b25d24545c556945689e3191442867e  virtinst-0.600.1.tar.gz"
diff --git a/testing/cntlm/APKBUILD b/testing/cntlm/APKBUILD
new file mode 100644
index 000000000..13a634142
--- /dev/null
+++ b/testing/cntlm/APKBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=cntlm
+pkgver=0.92.3
+pkgrel=0
+pkgdesc="NTLM Session Response / NTLMv2 authenticating HTTP proxy"
+url="http://cntlm.sourceforge.net/"
+arch="all"
+license="GPLv2+"
+depends=""
+makedepends=""
+install=""
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/project/cntlm/cntlm/cntlm%20$pkgver/cntlm-$pkgver.tar.gz"
+
+_builddir="$srcdir"/cntlm-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="0d7fcfbfbef0546306b896be246caa88  cntlm-0.92.3.tar.gz"
diff --git a/testing/ocaml/APKBUILD b/testing/ocaml/APKBUILD
new file mode 100644
index 000000000..c92ad7426
--- /dev/null
+++ b/testing/ocaml/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: Borys Zhukov <mp5@mp5.im>
+# Maintainer: Borys Zhukov <mp5@mp5.im>
+pkgname=ocaml
+pkgver=3.12.1
+pkgrel=0
+pkgdesc="Main implementation of the Caml programming language"
+url="http://caml.inria.fr"
+arch="all"
+license="QPL-1.0/GPLv2"
+makedepends="ncurses-dev zlib-dev gdbm-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://caml.inria.fr/pub/distrib/ocaml-3.12/$pkgname-$pkgver.tar.gz
+	"
+
+_builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure -cc "${CC:-gcc} -fPIC -fno-pie" \
+		-bindir /usr/bin \
+		-libdir /usr/lib/ocaml \
+		-mandir /usr/share/man \
+		-no-tk \
+		|| return 1
+	make -j1 world.opt || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make BINDIR="$pkgdir"/usr/bin LIBDIR="$pkgdir"/usr/lib/ocaml MANDIR="$pkgdir"/usr/share/man install || return 1
+
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+	install -Dm644 INSTALL "$pkgdir"/usr/share/doc/$pkgname/INSTALL
+	install -Dm644 Changes "$pkgdir"/usr/share/doc/$pkgname/Changes
+	install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
+
+	find "$pkgdir"/usr/lib/ocaml -name \*.ml -delete
+}
+md5sums="814a047085f0f901ab7d8e3a4b7a9e65  ocaml-3.12.1.tar.gz"
diff --git a/testing/openswan/APKBUILD b/testing/openswan/APKBUILD
index ffd0a5ad8..7d52d7f5d 100644
--- a/testing/openswan/APKBUILD
+++ b/testing/openswan/APKBUILD
@@ -1,17 +1,17 @@
 # Contributor: Danilo Godec <danilo.godec@agenda.si>
-# Maintainer:
+# Maintainer: Borys Zhukov <mp5@mp5.im>
 pkgname=openswan
-pkgver=2.6.37
+pkgver=2.6.38
 pkgrel=0
 pkgdesc="IPsec Implementation which Allows Building of VPNs"
 url="http://www.openswan.org/"
 arch="all"
 license="GPL"
-depends=""
+depends="perl lsof"
 makedepends="gmp-dev bison flex coreutils bash"
 install=""
 subpackages="$pkgname-doc"
-source="http://www.openswan.org/download/$pkgname-$pkgver.tar.gz
+source="http://download.openswan.org/openswan/$pkgname-$pkgver.tar.gz
 	ipsec.initd setup.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -45,6 +45,6 @@ package() {
 	cp -aR docs/* "$pkgdir"/usr/share/doc/$pkgname/
 
 }
-md5sums="e5c948555088df06cfadcfbe6c13adfe  openswan-2.6.37.tar.gz
+md5sums="13073eb5314b83a31be88e4117e8bbcd  openswan-2.6.38.tar.gz
 f019d1fa23627d54462054fedc9de03b  ipsec.initd
 fd3cd27f9da9140fabd935377c3d6921  setup.patch"
diff --git a/testing/virt-manager/APKBUILD b/testing/virt-manager/APKBUILD
index 369214246..6c8d68dfe 100644
--- a/testing/virt-manager/APKBUILD
+++ b/testing/virt-manager/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor:
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=virt-manager
-pkgver=0.9.0
-pkgrel=3
+pkgver=0.9.1
+pkgrel=0
 pkgdesc="GUI for managing virtual machines"
 url="http://virt-manager.et.redhat.com/"
 arch="noarch"
@@ -37,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="a10331b467f92f4134a39bf636e04adc  virt-manager-0.9.0.tar.gz"
+md5sums="cfee07b277e315b16d5180cfab5f8307  virt-manager-0.9.1.tar.gz"