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

19 files changed, 225 insertions, 44 deletions

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index c46d21bc0e..6fad73d1a7 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -7,7 +7,7 @@ _specs_gcc_ver=4.4.3
 
 _uclibc_abiver=0.9.32
 
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
@@ -290,16 +290,10 @@ objc() {
 	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
 	local gcclibdir=usr/lib/gcc/${CHOST:-$_chost}/$pkgver
 	mkdir -p "$subpkgdir"/$gcclibdir/include \
-		"$subpkgdir"/$gcclibdir/plugin/include \
-		"$subpkgdir"/$gcclibdir/plugin/include/c-family \
 		"$subpkgdir"/usr/lib \
 		|| return 1
 	mv "$pkgdir"/$gcclibdir/include/objc "$subpkgdir"/$gcclibdir/include/ \
 		|| return 1
-	mv "$pkgdir"/$gcclibdir/plugin/include/objc \
-		"$subpkgdir"/$gcclibdir/plugin/include/ || return 1
-	mv "$pkgdir"/$gcclibdir/plugin/include/c-family/c-objc.h \
-		"$subpkgdir"/$gcclibdir/plugin/include/c-family || return 1
 	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
 		"$subpkgdir"/usr/lib/ || return 1
 }
diff --git a/main/gnome-vfs/APKBUILD b/main/gnome-vfs/APKBUILD
index e83a6b651a..70d2e4ca12 100644
--- a/main/gnome-vfs/APKBUILD
+++ b/main/gnome-vfs/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=3
+pkgrel=4
 pkgdesc="GNOME virtual filesystem subsystem"
 url="http://projects.gnome.org/gnome-vfs"
 arch="all"
@@ -12,7 +12,8 @@ depends_dev="gconf-dev libxml2-dev dbus-glib-dev gamin-dev"
 makedepends="$depends_dev intltool"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+	disable-deprecated.patch"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
@@ -29,7 +30,7 @@ build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		|| return 1
 	make || return 1
 }
 
@@ -42,4 +43,9 @@ package() {
 		"$pkgdir"/usr/lib/gnome-vfs*/modules/*.la
 }
 
-md5sums="a05fab03eeef10a47dd156b758982f2e  gnome-vfs-2.24.4.tar.bz2"
+md5sums="a05fab03eeef10a47dd156b758982f2e  gnome-vfs-2.24.4.tar.bz2
+d3a82207004680d4543c6136d046f05f  disable-deprecated.patch"
+sha256sums="62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa  gnome-vfs-2.24.4.tar.bz2
+1f4fa69a4f52be71cdbdb7319ec44089d989f5254e4edfff992c30b572d146fb  disable-deprecated.patch"
+sha512sums="db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581  gnome-vfs-2.24.4.tar.bz2
+aeee9b12f4aa2bea3a8cecf3309a5715341dd8632695b74b191a12ea3d1c6841da8c214245018020b356710bed6b628e031aa5a51959fea2c45891f35ef078f3  disable-deprecated.patch"
diff --git a/main/gnome-vfs/disable-deprecated.patch b/main/gnome-vfs/disable-deprecated.patch
new file mode 100644
index 0000000000..33b255bd78
--- /dev/null
+++ b/main/gnome-vfs/disable-deprecated.patch
@@ -0,0 +1,60 @@
+diff --git a/daemon/Makefile.in b/daemon/Makefile.in
+index ce88e8d..d82b3e7 100644
+--- a/daemon/Makefile.in
++++ b/daemon/Makefile.in
+@@ -337,7 +337,6 @@ INCLUDES = \
+ 	-D_LARGEFILE64_SOURCE                   \
+ 	-D_POSIX_PTHREAD_SEMANTICS		\
+ 	-D_REENTRANT				\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+ 	-DGNOME_VFS_LIBDIR=\"$(libdir)\"	\
+diff --git a/libgnomevfs/Makefile.in b/libgnomevfs/Makefile.in
+index 5f96b43..0908007 100644
+--- a/libgnomevfs/Makefile.in
++++ b/libgnomevfs/Makefile.in
+@@ -430,7 +430,6 @@ INCLUDES = \
+ 	-D_LARGEFILE64_SOURCE                   \
+ 	-D_POSIX_PTHREAD_SEMANTICS		\
+ 	-D_REENTRANT				\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
+ 	-DGNOME_VFS_BINDIR=\"$(bindir)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+diff --git a/modules/Makefile.in b/modules/Makefile.in
+index 5482f1d..fcf80de 100644
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -468,7 +468,6 @@ INCLUDES = \
+ 	-D_POSIX_PTHREAD_SEMANTICS		\
+ 	-D_REENTRANT				\
+ 	-DSSH_PROGRAM=\"$(SSH_PROGRAM)\"	\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+ 	-DGNOME_VFS_LIBDIR=\"$(libdir)\"	\
+diff --git a/programs/Makefile.in b/programs/Makefile.in
+index a7a84f1..be5f238 100644
+--- a/programs/Makefile.in
++++ b/programs/Makefile.in
+@@ -345,7 +345,6 @@ INCLUDES = \
+ 	-I$(top_builddir)			\
+ 	$(TEST_CFLAGS)				\
+ 	$(VFS_CFLAGS)				\
+-	-DG_DISABLE_DEPRECATED
+ 
+ libraries = \
+ 	$(top_builddir)/libgnomevfs/libgnomevfs-2.la	\
+diff --git a/test/Makefile.in b/test/Makefile.in
+index 9a3b4b0..6d8e337 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -471,7 +471,6 @@ INCLUDES = \
+ 	-I$(top_builddir)/libgnomevfs           \
+ 	$(TEST_CFLAGS)				\
+ 	$(VFS_CFLAGS)				\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DMODULES_PATH=\"$(libdir)/vfs/modules\"
+ 
+ @OS_WIN32_FALSE@platform_only_programs = test-dns-sd test-symlinks test-parse-ls-lga
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index 96c93f2fc3..aa1b53a642 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=heimdal
 pkgver=1.5.2
-pkgrel=5
+pkgrel=6
 pkgdesc="An implementation of Kerberos 5"
 arch="all"
 url="http://www.h5l.org/"
@@ -23,6 +23,7 @@ source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz
 	heimdal_missing-include.patch
 	heimdal_missing_symbols.patch
 	heimdal-1.5-use-perl-Getopt_Std.patch
+	heimdal_texinfo-5.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -32,10 +33,10 @@ prepare() {
 
 	cd "$_builddir"
 	
-	for i in ../*.patch
-	do
-		msg "Applying patch $i"
-		patch -p0 -i $i || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg "Applying patch $i"; patch -p0 -i "$srcdir"/$i || return 1;;
+		esac
 	done
 
 	# name clash with ruserpass in netdb.h
@@ -197,4 +198,23 @@ md5sums="bb23d9dbdafd395d816f7abc598481a1  heimdal-1.5.2.tar.gz
 f320b91692b872e28f446f9cf1bc68bf  telnetd.patch
 8e127440fe11380c65fda40283326a46  heimdal_missing-include.patch
 a14b9001271c3b794b083c25936ebe21  heimdal_missing_symbols.patch
-dbe4106d1ca938587c948ee34121c020  heimdal-1.5-use-perl-Getopt_Std.patch"
+dbe4106d1ca938587c948ee34121c020  heimdal-1.5-use-perl-Getopt_Std.patch
+53201e2a953c47a7437ce0222c4fb80d  heimdal_texinfo-5.patch"
+sha256sums="22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec  heimdal-1.5.2.tar.gz
+b9b3204bc533c5865eb12174004bd0b1bf70397c603bd51c0e4ba6b2e9b0591d  003_all_heimdal-rxapps.patch
+c83c04822f5178556b4c3b0973f56c9ede328378bc2bbbbf5e180d6798a38754  005_all_heimdal-suid_fix.patch
+e9b5ca5bab430500b25ff5191d3bb2fd85133c5b4649c21cbc51f6c7d9151e5e  014_all_heimdal-path.patch
+6efb369eb42dcaaf20b9d0fa267b09c3096b9a7403fb9ad5364ad588e4659a62  telnetd.patch
+1ad9d71d01776e2d2dd49da5951f6f02630ce137be910ff8484968e8327837c3  heimdal_missing-include.patch
+0620144d5f4c8a477276da487875e573c2bab4f5ea056c70b1eec2e13cffed58  heimdal_missing_symbols.patch
+1a3d06b306fb30e5ce947d612901b2b246d2b6af3e7234c6b10c13f29c376349  heimdal-1.5-use-perl-Getopt_Std.patch
+fb77b0c0dd4e5b55e65f16e2ddac99ece9bd20f505e2cef9c4d795224b6e0d86  heimdal_texinfo-5.patch"
+sha512sums="a04abb6f6ad3b1d6c366d9c4e6d92f5c2ca00ae0261c7acbfb1a5782d1bab4b3c498c4fa4b114867cb7e09291cee663cf4fd5c25afca8deb425a8e5112308957  heimdal-1.5.2.tar.gz
+cf5c785f33a7ee81f47c0a3b457deab0b65d0ccfb6eff51fd61ecc61706f515910351ed820eaba90715d4ce6ceb139cebe44bc4c0afd87dc4cdf927815090ffa  003_all_heimdal-rxapps.patch
+fc0b28aa34e1df1dd2d43628f460120311bbf242e00e7a978f8663fb9168e62e97a990f1ff045c3c2c440ac4db3eea9a0c9325dd69eaf5dd053a114923868c86  005_all_heimdal-suid_fix.patch
+45180ac9968491ddc1ea271a00befdf917dc48648ee38b192a849e4e878fd2845fc5ed8b8b7f09071de12661e17e570f67ad1b099e8e133422f6948270a36191  014_all_heimdal-path.patch
+eb6ec2606556c004d83cc52d3537f8a42dace7992c05dc474de44b66333442b218bbdd4408ee86b65692f8d8b10e37a51efb41cefd26a3db713b471217cd6bb8  telnetd.patch
+18f4a5b0c74ae11fbd8874d2954639f36d480655d978af2b2dd19a8ec2b206057ef4be5861d8daca0725926b295604daeaa895b6024b2098922cd189d3e4484b  heimdal_missing-include.patch
+af3ce21d6fe2e5b8902167a556bc48c29f544da2556ef0635308bdc0f9c9538b8afe7a6f3964c4a4f1d87db09da01a2d8c777e1339c28933b758f71d786b5bf7  heimdal_missing_symbols.patch
+07bfcc27dc7d15cdd282770ad1e91d0aeaecdb6f4c2463b75352550b7ec116399fca00445d800bfb6ce825e58c05ec0c81c0d3e92ffde037bf3d774b4a2f2500  heimdal-1.5-use-perl-Getopt_Std.patch
+12abf4837c0daff6e51e8728dcf55752407e3616c8d657409d159119d60133a268e664a7eb1a6ad8632f17ef194933fac035c2856299ba4c4fb6053208cd1608  heimdal_texinfo-5.patch"
diff --git a/main/heimdal/heimdal_texinfo-5.patch b/main/heimdal/heimdal_texinfo-5.patch
new file mode 100644
index 0000000000..8f0ef099e0
--- /dev/null
+++ b/main/heimdal/heimdal_texinfo-5.patch
@@ -0,0 +1,22 @@
+--- doc/whatis.texi	2012-12-10 00:06:44.000000000 +0200

++++ doc/whatis.texi	2013-04-08 15:11:44.646165777 +0300

+@@ -36,8 +36,8 @@

+ @end ifinfo

+ 

+ @tex

+-@def@xsub#1{$_{#1}$}

+-@global@let@sub=@xsub

++@@def@@xsub#1@{$_@{#1@}$@}

++@@global@@let@@sub=@@xsub

+ @end tex

+ 

+ @ifhtml

+--- doc/win2k.texi	2012-12-10 00:06:44.000000000 +0200

++++ doc/win2k.texi	2013-04-08 16:17:21.316961234 +0300

+@@ -311,4 +311,5 @@

+ 

+ @itemize @bullet

+ @item pwdump2

+-@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize

++@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}

++@end itemize

diff --git a/main/libarchive/APKBUILD b/main/libarchive/APKBUILD
index fe4e07a160..5305967e1b 100644
--- a/main/libarchive/APKBUILD
+++ b/main/libarchive/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libarchive
 pkgver=3.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="library that can create and read several streaming archive formats"
 url="http://libarchive.googlecode.com/"
 arch="all"
@@ -10,9 +10,19 @@ depends=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 makedepends="zlib-dev bzip2-dev xz-dev acl-dev openssl-dev expat-dev"
 depends_dev="$makedepends"
-source="http://www.libarchive.org/downloads/libarchive-$pkgver.tar.gz"
+source="http://www.libarchive.org/downloads/libarchive-$pkgver.tar.gz
+	CVE-2013-0211.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	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 --without-xml2
@@ -31,6 +41,9 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="efad5a503f66329bb9d2f4308b5de98a  libarchive-3.1.2.tar.gz"
-sha256sums="eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e  libarchive-3.1.2.tar.gz"
-sha512sums="1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114  libarchive-3.1.2.tar.gz"
+md5sums="efad5a503f66329bb9d2f4308b5de98a  libarchive-3.1.2.tar.gz
+fc5f5158d414e3a7e9f085d8d1470014  CVE-2013-0211.patch"
+sha256sums="eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e  libarchive-3.1.2.tar.gz
+75f30c3867d3924461bb764ea2ca3c1b1e43240aeb5b0dd93a103fd7a7ca7fe9  CVE-2013-0211.patch"
+sha512sums="1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114  libarchive-3.1.2.tar.gz
+c10470ab67dd94944489f72e4d6f39d98163f5d7a92bcd550aa323e9a1b96148588bd04ac7d8c6ff232dc388559fb3e67552bb5c83ac7626ad714517f5022fce  CVE-2013-0211.patch"
diff --git a/main/libarchive/CVE-2013-0211.patch b/main/libarchive/CVE-2013-0211.patch
new file mode 100644
index 0000000000..c927a860e2
--- /dev/null
+++ b/main/libarchive/CVE-2013-0211.patch
@@ -0,0 +1,32 @@
+From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001
+From: Tim Kientzle <kientzle@acm.org>
+Date: Fri, 22 Mar 2013 23:48:41 -0700
+Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a
+ certain common programming error (passing -1 to write) from leading to other
+ problems deeper in the library.
+
+---
+ libarchive/archive_write.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
+index eede5e0..be85621 100644
+--- a/libarchive/archive_write.c
++++ b/libarchive/archive_write.c
+@@ -673,8 +673,13 @@ struct archive_write_filter *
+ _archive_write_data(struct archive *_a, const void *buff, size_t s)
+ {
+ 	struct archive_write *a = (struct archive_write *)_a;
++	const size_t max_write = INT_MAX;
++
+ 	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
+ 	    ARCHIVE_STATE_DATA, "archive_write_data");
++	/* In particular, this catches attempts to pass negative values. */
++	if (s > max_write)
++		s = max_write;
+ 	archive_clear_error(&a->archive);
+ 	return ((a->format_write_data)(a, buff, s));
+ }
+-- 
+1.8.1.6
+
diff --git a/main/orbit2/APKBUILD b/main/orbit2/APKBUILD
index 08b22f401b..4387f4c12a 100644
--- a/main/orbit2/APKBUILD
+++ b/main/orbit2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=orbit2
 pkgver=2.14.19
-pkgrel=2
+pkgrel=3
 pkgdesc="CORBA implementation for GNOME"
 url="http://projects.gnome.org/ORBit2"
 arch="all"
@@ -12,7 +12,8 @@ depends_dev="glib-dev libidl-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/${pkgver%.*}/ORBit2-${pkgver}.tar.bz2"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/${pkgver%.*}/ORBit2-${pkgver}.tar.bz2
+	glib-2.36.patch"
 
 _builddir="${srcdir}/ORBit2-${pkgver}"
 prepare() {
@@ -38,4 +39,9 @@ package() {
 		"$pkgdir"/usr/lib/orbit*/*.la
 }
 
-md5sums="7082d317a9573ab338302243082d10d1  ORBit2-2.14.19.tar.bz2"
+md5sums="7082d317a9573ab338302243082d10d1  ORBit2-2.14.19.tar.bz2
+811d99415310bd2afc46c820d5558f63  glib-2.36.patch"
+sha256sums="55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550  ORBit2-2.14.19.tar.bz2
+0eba7131ced5876f9a7b68f3de1ef09898e20483809c4f677c589b7d1cc6e885  glib-2.36.patch"
+sha512sums="313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e  ORBit2-2.14.19.tar.bz2
+b90d8e200d16b735bece54454d1e2b1a7c1b75aaac83986263b5a9ac38c4235eed747408a07a266c0aaaeb9c7a75e7fda1ef1b2ed54300003da38ff2251fdcfa  glib-2.36.patch"
diff --git a/main/orbit2/glib-2.36.patch b/main/orbit2/glib-2.36.patch
new file mode 100644
index 0000000000..c94f920f7d
--- /dev/null
+++ b/main/orbit2/glib-2.36.patch
@@ -0,0 +1,15 @@
+$NetBSD: patch-linc2_src_Makefile.in,v 1.1 2013/04/19 14:28:54 prlw1 Exp $
+
+Avoid compilation error caused by use of deprecated g_thread API
+
+--- ./linc2/src/Makefile.in.orig	2010-09-28 09:39:39.000000000 +0000
++++ ./linc2/src/Makefile.in
+@@ -244,7 +244,7 @@ noinst_LTLIBRARIES = liblinc.la
+ #	-I$(top_srcdir)/include    
+ INCLUDES = -I$(top_builddir)/linc2/include \
+ 	-I$(top_srcdir)/linc2/include $(LINC_CFLAGS) $(WARN_CFLAGS) \
+-	-DG_DISABLE_DEPRECATED $(am__append_1)
++	$(am__append_1)
+ liblinc_la_SOURCES = \
+ 	linc.c			\
+ 	linc-connection.c	\
diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD
index 6adbbab17d..8c3ca0a9e6 100644
--- a/main/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postfix
 pkgver=2.10.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
 url="http://www.postfix.org/"
 arch="all"
@@ -161,7 +161,7 @@ sqlite() { _mv_dict sqlite ; }
 
 md5sums="b2a563b2d5c53462952886e6fc4e4b7b  postfix-2.10.0.tar.gz
 d773f01dcc965d219a8a37b88f89c5bf  postfix.initd
-8de3f108639eda995162c590053a1278  dynamic-maps3.patch
+cf6b5ddf6adabd12224c083b8b2ec5e8  dynamic-maps3.patch
 442efd1a95b0c061dfb8ab75456e0f24  dynamicmaps.cf
 2ebe51a882eb9d6d7866583eb6af3969  postfix-ldap.post-install
 2ebe51a882eb9d6d7866583eb6af3969  postfix-mysql.post-install
@@ -170,7 +170,7 @@ fd16ec00b60269c4ede4a0a0a514cefa  postfix-pcre.post-install
 2ebe51a882eb9d6d7866583eb6af3969  postfix-sqlite.post-install"
 sha256sums="4a42a6029af418cbd4a8668b4f8c7e1ea9975cbe9756df760649c0a941bfeb7b  postfix-2.10.0.tar.gz
 6b3fe71542ab783c7adddbfa161f7e2dcb2325913ad5d611ca56f730876ce4ab  postfix.initd
-a0e1d4c1622a7a7696461012831ea6c0fd57bd00182935692cf91ed6b4819f5f  dynamic-maps3.patch
+d91df2fb9a4d6d535c58ab839a05abc228ef9b4a7d26a9162a1355b0f07d1188  dynamic-maps3.patch
 2041ff6cd71fe16f3d75603ff40d90a08a8b97f0883e1de1d58563ab1521b5ea  dynamicmaps.cf
 fbd75ef31a5d78d5f82b67e08e5bf5ada380afa58a69ef4a07d756c47b3bb498  postfix-ldap.post-install
 fbd75ef31a5d78d5f82b67e08e5bf5ada380afa58a69ef4a07d756c47b3bb498  postfix-mysql.post-install
@@ -179,7 +179,7 @@ fbd75ef31a5d78d5f82b67e08e5bf5ada380afa58a69ef4a07d756c47b3bb498  postfix-pgsql.
 fbd75ef31a5d78d5f82b67e08e5bf5ada380afa58a69ef4a07d756c47b3bb498  postfix-sqlite.post-install"
 sha512sums="88689c2b18aeecd6e363525955c8e3506acf7702eb7fabe148b72a149020c29a76b3f6ed57109380ebb2106cf798a0ce78d470bc4a104a8ecde6c1c4cd0da07e  postfix-2.10.0.tar.gz
 c179534a7243bcf8c19b5367a703b54fcc88b7587ce7ef07ec111cfe00053779eed23b3ccda81eb20059599b857cae0a57cc02613526209f3dd966d65abd9a3f  postfix.initd
-8bf5a62658e069b72a7d65bd381d7d3be6f531747b0e5e55760d9fb9f42706bb1bd010ec1a4ca4836d67502a7273d8300644a51015accf21c419403ffddfdb2d  dynamic-maps3.patch
+31f3900152444d6af019dda63cbbb715d401d0727d05b6a813a93f54f43d1f02fa4cfeee69b0e01ba279bdebcd0463e0691f9a0c4afcc98980a52ea043812d08  dynamic-maps3.patch
 49b8205166f575e5fb9bdaaaaa042dc1be9b556331bf659a55b1115c9fa48486896941f18ca9fb633dd54675079f29a9d69d53c214170731c2127862456ec90b  dynamicmaps.cf
 b35931865eb15b5cd6a2b95bbf486cd064d1447eac1a91d507a7d23155229ac7e7fdf6b8518e663c5c7072b201786c72aead0d95e94d8708a9b5a7c3f37be138  postfix-ldap.post-install
 b35931865eb15b5cd6a2b95bbf486cd064d1447eac1a91d507a7d23155229ac7e7fdf6b8518e663c5c7072b201786c72aead0d95e94d8708a9b5a7c3f37be138  postfix-mysql.post-install
diff --git a/main/postfix/dynamic-maps3.patch b/main/postfix/dynamic-maps3.patch
index 0e5a3c95db..81848ab744 100644
--- a/main/postfix/dynamic-maps3.patch
+++ b/main/postfix/dynamic-maps3.patch
@@ -311,7 +311,7 @@ index 04f9404..1752450 100644
 +/* Global library. */
 +
 +#include <mail_params.h>
-+
++#include <stringops.h>
  /* Application-specific. */
  
  #include <postconf.h>
diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD
index c5cb0f29db..95fecd1923 100644
--- a/main/qt/APKBUILD
+++ b/main/qt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt
 pkgver=4.8.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform application and UI framework"
 url="http://qt.nokia.com/"
 arch="all"
@@ -16,7 +16,7 @@ depends_dev="mesa-dev libice-dev libsm-dev libx11-dev libxext-dev
 	glib-dev libpng-dev zlib-dev sqlite-dev dbus-dev"
 makedepends="$depends_dev postgresql-dev mysql-dev unixodbc-dev cups-dev
 	gtk+-dev tiff-dev libmng-dev libxrandr-dev libxv-dev libxi-dev perl
-	gawk paxctl rsync freetds-dev"
+	gawk paxctl rsync freetds-dev hicolor-icon-theme"
 install=
 source="http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$pkgver.tar.gz
 	qt-gtk-theme-fix.patch
diff --git a/testing/smstools/APKBUILD b/main/smstools/APKBUILD
index 28495a39e5..28495a39e5 100644
--- a/testing/smstools/APKBUILD
+++ b/main/smstools/APKBUILD
diff --git a/testing/smstools/smstools.conf b/main/smstools/smstools.conf
index 7fc1ecc439..7fc1ecc439 100644
--- a/testing/smstools/smstools.conf
+++ b/main/smstools/smstools.conf
diff --git a/testing/smstools/smstools.initd b/main/smstools/smstools.initd
index 44f707a80d..44f707a80d 100644
--- a/testing/smstools/smstools.initd
+++ b/main/smstools/smstools.initd
diff --git a/testing/smstools/smstools.logrotate b/main/smstools/smstools.logrotate
index 3aeac7d5cf..3aeac7d5cf 100644
--- a/testing/smstools/smstools.logrotate
+++ b/main/smstools/smstools.logrotate
diff --git a/testing/smstools/smstools.pre-install b/main/smstools/smstools.pre-install
index 4b6d538cc8..4b6d538cc8 100755
--- a/testing/smstools/smstools.pre-install
+++ b/main/smstools/smstools.pre-install
diff --git a/main/texinfo/APKBUILD b/main/texinfo/APKBUILD
index debd990c3b..121ca9c7d2 100644
--- a/main/texinfo/APKBUILD
+++ b/main/texinfo/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=texinfo
 pkgver=5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
 url="http://www.gnu.org/software/texinfo/"
 arch="all"
-license='GPL3'
-depends=
+license='GPL23'
+depends="perl"
 makedepends="ncurses-dev perl"
 source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
 subpackages="$pkgname-doc"
diff --git a/testing/sipp/APKBUILD b/testing/sipp/APKBUILD
index 6e22d4e187..60843e3624 100644
--- a/testing/sipp/APKBUILD
+++ b/testing/sipp/APKBUILD
@@ -1,7 +1,8 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Contributor: Robert Boisvert <rdboisvert@gmail.com>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=sipp
-pkgver=3.2
+pkgver=3.3
 pkgrel=0
 pkgdesc="A test tool / traffic generator for the SIP protocol"
 url="http://sipp.sourceforge.net/"
@@ -9,22 +10,34 @@ arch="all"
 license="GPL2+"
 depends=""
 depends_dev=""
-makedepends="openssl-dev libpcap-dev ncurses-dev"
+makedepends="autoconf automake openssl-dev libpcap-dev ncurses-dev"
 install=""
 subpackages=""
-source="http://downloads.sourceforge.net/$pkgname/$pkgname.svn.tar.gz"
-_builddir="$srcdir"/$pkgname.svn
+source="http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$srcdir"/$pkgname-$pkgver
+	autoreconf -ivf
+}
 
 build() {
 	cd "$_builddir"
-	make || return 1
+	./configure --prefix=/usr \
+		--with-openssl \
+		--with-pcap \
+		|| return 1
+	make
 }
 
 package() {
 	cd "$_builddir"
-	install -m755 -D "$_builddir"/$pkgname \
-		"$pkgdir"/usr/sbin/$pkgname || return 1
-	rm -f "$pkgdir"/usr/lib/*.la
+	make DESTDIR="$pkgdir" install
+	mkdir -p "$pkgdir"/usr/share/"$pkgname"
+	install -m444 -D pcap/* "$pkgdir"/usr/share/"$pkgname"/
 }
 
-md5sums="2a3a60cb4317dcf8eb5482f6a955e4d0  sipp.svn.tar.gz"
+md5sums="8c1d513423f9dabee799e738b737e311  sipp-3.3.tar.gz"
+sha256sums="17fd02e6aa71d44a90c65e84a1aa39d3aa329990d4aa48e4fb4b895304dbc920  sipp-3.3.tar.gz"
+sha512sums="ab42a71426ae381b9cd1f36e1d64d5c4bfccc1359973e1909f9e9d0ce3b3a4391056250371708b12be0e7de998e88b9224c9f307b1d2ce437942103b6ad10d2b  sipp-3.3.tar.gz"