Merge git://dev.alpinelinux.org/aports

38 files changed, 1738 insertions, 58 deletions

diff --git a/main/apk-tools/0001-db-remove-AT_SYMLINK_NOFOLLOW-for-directory-permissi.patch b/main/apk-tools/0001-db-remove-AT_SYMLINK_NOFOLLOW-for-directory-permissi.patch
index f3554419b5..15436ca595 100644
--- a/main/apk-tools/0001-db-remove-AT_SYMLINK_NOFOLLOW-for-directory-permissi.patch
+++ b/main/apk-tools/0001-db-remove-AT_SYMLINK_NOFOLLOW-for-directory-permissi.patch
@@ -34,5 +34,5 @@ index efff29f..d1a8f1a 100644
  
  	if (fchownat(db->root_fd, dir->name, dir->uid, dir->gid, 0) != 0)
 -- 
-1.7.12
+1.7.12.2
 
diff --git a/main/apk-tools/0004-solver-fix-compile-with-Werror-on-64bit.patch b/main/apk-tools/0004-solver-fix-compile-with-Werror-on-64bit.patch
new file mode 100644
index 0000000000..74043d60e7
--- /dev/null
+++ b/main/apk-tools/0004-solver-fix-compile-with-Werror-on-64bit.patch
@@ -0,0 +1,25 @@
+From 00958d92070c583e4fa9d01f5010bce12bcd1b40 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 3 Oct 2012 09:04:35 +0200
+Subject: [PATCH] solver: fix compile with -Werror on 64bit
+
+---
+ src/solver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/solver.c b/src/solver.c
+index ec44958..f9a2117 100644
+--- a/src/solver.c
++++ b/src/solver.c
+@@ -1664,7 +1664,7 @@ static void update_progress(struct progress *prog, size_t percent)
+ 		draw_progress(percent);
+ 	if (prog->progress_fd != 0) {
+ 		char buf[8];
+-		size_t n = snprintf(buf, sizeof(buf), "%d\n", percent);
++		size_t n = snprintf(buf, sizeof(buf), "%zu\n", percent);
+ 		write(prog->progress_fd, buf, n);
+ 	}
+ }
+-- 
+1.7.12.2
+
diff --git a/main/apk-tools/0005-solver-improve-assert-error-messages.patch b/main/apk-tools/0005-solver-improve-assert-error-messages.patch
new file mode 100644
index 0000000000..0773efcf6a
--- /dev/null
+++ b/main/apk-tools/0005-solver-improve-assert-error-messages.patch
@@ -0,0 +1,32 @@
+From 081155c438c0680b868175c95d160f1e3b519541 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 3 Oct 2012 09:16:28 +0200
+Subject: [PATCH] solver: improve assert error messages
+
+Print name of package and void double "ERROR"
+---
+ src/solver.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/solver.c b/src/solver.c
+index f9a2117..edf1650 100644
+--- a/src/solver.c
++++ b/src/solver.c
+@@ -927,11 +927,12 @@ static int next_branch(struct apk_solver_state *ss)
+ 
+ #ifdef DEBUG_CHECKS
+ 		ASSERT(cmpscore(&d->saved_score, &ss->score) == 0,
+-			"ERROR! saved_score "SCORE_FMT" != score "SCORE_FMT,
++			"Saved_score "SCORE_FMT" != score "SCORE_FMT,
+ 			SCORE_PRINTF(&d->saved_score),
+ 			SCORE_PRINTF(&ss->score));
+ 		ASSERT(d->saved_requirers == name->ss.requirers,
+-			"ERROR! requirers not restored between decisions");
++			"Requirers not restored between decisions (%s)",
++			name->name);
+ #endif
+ 
+ 		if (backup_until >= ss->num_decisions &&
+-- 
+1.7.12.2
+
diff --git a/main/apk-tools/0006-solver-various-fixes.patch b/main/apk-tools/0006-solver-various-fixes.patch
new file mode 100644
index 0000000000..8c11c53117
--- /dev/null
+++ b/main/apk-tools/0006-solver-various-fixes.patch
@@ -0,0 +1,239 @@
+From 4dd8c58df9aa2e7821a7d5bb50407033858ed1c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Wed, 3 Oct 2012 14:59:48 +0300
+Subject: [PATCH] solver: various fixes
+
+ * push_decision expects to always get the package primary 'name'
+   as apk_name. ASSERT that and fix problem cases.
+   (though - this might need to be reverted, and store the non
+    primary name in apk_decision instead to accomodate for better
+    backtracking optimizations)
+ * fix error reporting of virtual package names
+ * make 'assign_name' errors soft. the incorrect packages just are
+   no longer consider instead of aborting whole calculation.
+ * fix backtracking of virtual packages that are not depended
+   directly
+---
+ src/solver.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 58 insertions(+), 14 deletions(-)
+
+diff --git a/src/solver.c b/src/solver.c
+index edf1650..3fb7832 100644
+--- a/src/solver.c
++++ b/src/solver.c
+@@ -706,10 +706,14 @@ static inline void assign_name(
+ 	struct apk_solver_state *ss, struct apk_name *name, struct apk_provider p)
+ {
+ 	if (p.version == &apk_null_blob) {
+-		ASSERT(!name->ss.locked || name->ss.chosen.version == &apk_null_blob,
+-		       "Assigning locked name with version");
++		/* Assigning locked name with version is a problem;
++		 * generally package providing same name twice */
++		if (name->ss.locked && name->ss.chosen.version != &apk_null_blob)
++			ss->impossible_state = 1;
+ 	} else {
+-		ASSERT(!name->ss.locked, "Assigning locked name");
++		/* Similar to above */
++		if (name->ss.locked)
++			ss->impossible_state = 1;
+ 	}
+ 	name->ss.chosen = p;
+ 	name->ss.locked++;
+@@ -721,7 +725,7 @@ static inline void assign_name(
+ 
+ static inline void unassign_name(struct apk_solver_state *ss, struct apk_name *name)
+ {
+-	ASSERT(name->ss.locked, "Unassigning unlocked name");
++	ASSERT(name->ss.locked, "Unassigning unlocked name %s", name->name);
+ 	name->ss.locked--;
+ 	if (name->ss.locked == 0) {
+ 		name->ss.chosen = CHOSEN_NONE;
+@@ -793,7 +797,7 @@ static solver_result_t apply_decision(struct apk_solver_state *ss,
+ 			addscore(&ss->score, &score);
+ 
+ 			name->ss.chosen = CHOSEN_NONE;
+-			name->ss.locked = 1;
++			name->ss.locked++;
+ 			list_del(&name->ss.unsolved_list);
+ 			list_init(&name->ss.unsolved_list);
+ 		} else {
+@@ -847,7 +851,7 @@ static void undo_decision(struct apk_solver_state *ss,
+ 		for (i = 0; i < pkg->provides->num; i++)
+ 			pkg->provides->item[i].name->ss.name_touched = 1;
+ 
+-		if (name->ss.locked) {
++		if (d->type == DECISION_ASSIGN) {
+ 			if (ps->handle_install_if)
+ 				foreach_rinstall_if_pkg(ss, pkg, untrigger_install_if);
+ 			foreach_dependency(ss, pkg->depends, undo_constraint);
+@@ -871,12 +875,12 @@ static void undo_decision(struct apk_solver_state *ss,
+ 		if (d->type == DECISION_ASSIGN) {
+ 			get_unassigned_score(name, &score);
+ 			subscore(&ss->score, &score);
++			name->ss.locked--;
+ 		} else {
+ 			name->ss.none_excluded = 0;
+ 		}
+ 
+ 		/* Put back the name to unsolved list */
+-		name->ss.locked = 0;
+ 		promote_name(ss, name);
+ 	}
+ }
+@@ -890,6 +894,9 @@ static solver_result_t push_decision(struct apk_solver_state *ss,
+ {
+ 	struct apk_decision *d;
+ 
++	ASSERT(pkg == NULL || pkg->name == name,
++		"push_decision got non-primary name: %s != %s",
++		pkg->name->name, name->name);
+ 	ASSERT(ss->num_decisions <= ss->max_decisions,
+ 	       "Decision tree overflow.");
+ 
+@@ -897,6 +904,8 @@ static solver_result_t push_decision(struct apk_solver_state *ss,
+ 	d = &ss->decisions[ss->num_decisions];
+ 
+ #ifdef DEBUG_CHECKS
++	dbg_printf("Saving score ("SCORE_FMT") and requirers (%d) for %s\n",
++		SCORE_PRINTF(&ss->score), name->ss.requirers, name->name);
+ 	d->saved_score = ss->score;
+ 	d->saved_requirers = name->ss.requirers;
+ #endif
+@@ -911,6 +920,12 @@ static solver_result_t push_decision(struct apk_solver_state *ss,
+ 		d->pkg = pkg;
+ 		d->no_package = 0;
+ 	}
++	/* FIXME: this is needed for virtual packages - should possible
++	 * consider making backtracking information also keep the 
++	 * virtual apk_name causing the touched information to be more
++	 * accurate */
++	if (name->ss.last_touched_decision == 0)
++		name->ss.last_touched_decision = ss->num_decisions;
+ 
+ 	return apply_decision(ss, d);
+ }
+@@ -931,8 +946,8 @@ static int next_branch(struct apk_solver_state *ss)
+ 			SCORE_PRINTF(&d->saved_score),
+ 			SCORE_PRINTF(&ss->score));
+ 		ASSERT(d->saved_requirers == name->ss.requirers,
+-			"Requirers not restored between decisions (%s)",
+-			name->name);
++			"Requirers not restored between decisions (%s), %d != %d",
++			name->name, d->saved_requirers, name->ss.requirers);
+ #endif
+ 
+ 		if (backup_until >= ss->num_decisions &&
+@@ -940,6 +955,10 @@ static int next_branch(struct apk_solver_state *ss)
+ 			d->branching_point = BRANCH_NO;
+ 			d->type = (d->type == DECISION_ASSIGN) ? DECISION_EXCLUDE : DECISION_ASSIGN;
+ 			return apply_decision(ss, d);
++		} else {
++			if (d->branching_point == BRANCH_YES)
++				dbg_printf("skipping %s, %d < %d\n",
++					name->name, backup_until, ss->num_decisions);
+ 		}
+ 
+ 		if (d->no_package && !d->found_solution) {
+@@ -963,11 +982,15 @@ static void apply_constraint(struct apk_solver_state *ss, struct apk_dependency
+ 	if (ss->num_decisions > 0) {
+ 		requirer_name = decision_to_name(&ss->decisions[ss->num_decisions]);
+ 		requirer_pkg  = decision_to_pkg(&ss->decisions[ss->num_decisions]);
++		/* FIXME: should probably take into account the requirer
++		 * package's provided name's 'requirer strength' */
+ 		strength = requirer_name->ss.requirers ?: 1;
+ 	} else {
+ 		strength = 1;
+ 	}
+ 
++	dbg_printf("--->apply_constraint: %s (strength %d)\n", name->name, strength);
++
+ 	if (name->ss.locked) {
+ 		if (name->ss.chosen.pkg)
+ 			dbg_printf("%s: locked to " PKG_VER_FMT " already\n",
+@@ -1021,8 +1044,10 @@ static void apply_constraint(struct apk_solver_state *ss, struct apk_dependency
+ 	if (changed)
+ 		name->ss.last_touched_decision = ss->num_decisions;
+ 
+-	if (!dep->conflict)
++	if (!dep->conflict) {
++		dbg_printf("%s requirers += %d\n", name->name, strength);
+ 		name->ss.requirers += strength;
++	}
+ 
+ 	promote_name(ss, name);
+ }
+@@ -1041,6 +1066,8 @@ static void undo_constraint(struct apk_solver_state *ss, struct apk_dependency *
+ 		strength = 1;
+ 	}
+ 
++	dbg_printf("--->undo_constraint: %s (strength %d)\n", name->name, strength);
++
+ 	if (name->ss.locked) {
+ 		if (name->ss.chosen.pkg != NULL) {
+ 			dbg_printf(PKG_VER_FMT " selected already for %s\n",
+@@ -1091,8 +1118,16 @@ static void undo_constraint(struct apk_solver_state *ss, struct apk_dependency *
+ 	if (name->ss.last_touched_decision > ss->num_decisions)
+ 		name->ss.last_touched_decision = ss->num_decisions;
+ 
+-	if (!dep->conflict)
++	if (requirer_name && requirer_name->ss.requirers != strength) {
++		dbg_printf("requirer %s, dependency %s: strength mismatch %d != %d\n",
++			requirer_name->name, name->name,
++			requirer_name->ss.requirers, strength);
++	}
++
++	if (!dep->conflict) {
+ 		name->ss.requirers -= strength;
++		dbg_printf("%s requirers -= %d\n", name->name, strength);
++	}
+ 
+ 	demote_name(ss, name);
+ }
+@@ -1144,7 +1179,7 @@ static int reconsider_name(struct apk_solver_state *ss, struct apk_name *name)
+ 
+ 		/* viable alternative? */
+ 		if (cmpscore2(&ss->score, &pkg0_score, &ss->best_score) >= 0)
+-			return push_decision(ss, name, pkg0, DECISION_EXCLUDE, BRANCH_NO, FALSE);
++			return push_decision(ss, pkg0->name, pkg0, DECISION_EXCLUDE, BRANCH_NO, FALSE);
+ 
+ 		if (cmpscore(&pkg0_score, &best_score) < 0) {
+ 			best_score = pkg0_score;
+@@ -1169,9 +1204,10 @@ static int reconsider_name(struct apk_solver_state *ss, struct apk_name *name)
+ 			return SOLVERR_PRUNED;
+ 		return push_decision(ss, name, NULL, DECISION_ASSIGN, BRANCH_NO, FALSE);
+ 	} else if (options == 1 && score_locked && name->ss.none_excluded && name == next_p->pkg->name) {
++		struct apk_package *pkg0 = next_p->pkg;
+ 		dbg_printf("reconsider_name: %s: only one choice left with known score, locking.\n",
+ 			name->name);
+-		return push_decision(ss, name, next_p->pkg, DECISION_ASSIGN, BRANCH_NO, FALSE);
++		return push_decision(ss, pkg0->name, pkg0, DECISION_ASSIGN, BRANCH_NO, FALSE);
+ 	}
+ 
+ 	name->ss.chosen = *next_p;
+@@ -1916,7 +1952,10 @@ static void print_dep_errors(struct apk_database *db, char *label,
+ 
+ 	for (i = 0; i < deps->num; i++) {
+ 		struct apk_dependency *dep = &deps->item[i];
+-		struct apk_package *pkg = (struct apk_package*) dep->name->state_ptr;
++		struct apk_package *pkg = NULL;
++
++		if (dep->name->state_int != 1)
++			pkg = (struct apk_package*) dep->name->state_ptr;
+ 
+ 		if (apk_dep_is_materialized_or_provided(dep, pkg))
+ 			continue;
+@@ -1953,6 +1992,11 @@ void apk_solver_print_errors(struct apk_database *db,
+ 	for (i = 0; i < solution->num; i++) {
+ 		struct apk_package *pkg = solution->item[i].pkg;
+ 		pkg->name->state_ptr = pkg;
++		for (j = 0; j < pkg->provides->num; j++) {
++			if (pkg->provides->item[j].version == &apk_null_blob)
++				continue;
++			pkg->provides->item[j].name->state_ptr = pkg;
++		}
+ 	}
+ 
+ 	print_dep_errors(db, "world", world, &names);
+-- 
+1.7.12.2
+
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 85946fcbe3..699b5d3cbf 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
 pkgver=2.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 subpackages="$pkgname-static lua-apk:luaapk"
 depends=
@@ -10,6 +10,9 @@ source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.b
 	0001-db-remove-AT_SYMLINK_NOFOLLOW-for-directory-permissi.patch
 	0002-apk-implement-progress-fd-to-write-progress-to-a-spe.patch
 	0003-info-provides-alias-p-is-reserved-for-root-use-P.patch
+	0004-solver-fix-compile-with-Werror-on-64bit.patch
+	0005-solver-improve-assert-error-messages.patch
+	0006-solver-various-fixes.patch
 	"
 
 url="http://git.alpinelinux.org/cgit/apk-tools/"
@@ -62,6 +65,9 @@ luaapk() {
 }
 
 md5sums="813b7c9fd7f6159972dc4fa5dfcc97c5  apk-tools-2.3.2.tar.bz2
-a5a635f510e6f69b1e2f6cadb45efe04  0001-db-remove-AT_SYMLINK_NOFOLLOW-for-directory-permissi.patch
+e755492397eba99b3fe698151e4241ff  0001-db-remove-AT_SYMLINK_NOFOLLOW-for-directory-permissi.patch
 0a96443650fec545667b6eccc5d9ef1e  0002-apk-implement-progress-fd-to-write-progress-to-a-spe.patch
-6718b405982c5bfeed3761a9d57cfce8  0003-info-provides-alias-p-is-reserved-for-root-use-P.patch"
+6718b405982c5bfeed3761a9d57cfce8  0003-info-provides-alias-p-is-reserved-for-root-use-P.patch
+c32124de6cee4b1bea2d5e2ac954d73a  0004-solver-fix-compile-with-Werror-on-64bit.patch
+79188874b0a35983b182fa48b7c91643  0005-solver-improve-assert-error-messages.patch
+b83138b13bf534046d6cb7c62be87a69  0006-solver-various-fixes.patch"
diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD
index 61e3ebe704..4954e9ce87 100644
--- a/main/audacious-plugins/APKBUILD
+++ b/main/audacious-plugins/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=audacious-plugins
 pkgver=3.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="playlist-oriented media player with multiple interfaces (plugins)"
 url="http://audacious-media-player.org/"
 arch="all"
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index 2851d9f730..a61cd52732 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 pkgname=awall
-pkgver=0.2.10
+pkgver=0.2.11
 pkgrel=0
 pkgdesc="Alpine Wall"
 url=http://git.alpinelinux.org/cgit/kunkku/awall/
@@ -37,4 +37,4 @@ masquerade() {
 	done
 }
 
-md5sums="480934633355a324d24ad542577bb95f  awall-0.2.10.tar.bz2"
+md5sums="252b4284a22d8d7d13a12cb8d74b50f2  awall-0.2.11.tar.bz2"
diff --git a/main/cdparanoia/APKBUILD b/main/cdparanoia/APKBUILD
new file mode 100644
index 0000000000..fc065c1772
--- /dev/null
+++ b/main/cdparanoia/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=cdparanoia
+pkgver=10.2
+pkgrel=5
+pkgdesc="An audio CD extraction application"
+url="http://www.xiph.org/paranoia"
+arch="all"
+license="GPL"
+depends=
+makedepends="libtool autoconf automake"
+install=
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+patches="gcc.patch"
+source="http://downloads.xiph.org/releases/cdparanoia/$pkgname-III-$pkgver.src.tgz
+	$patches"
+
+_builddir="$srcdir/cdparanoia-III-$pkgver"
+prepare() {
+	cd "$_builddir"
+	for i in $patches; do
+		msg $i
+		patch -p1 -i "$srcdir"/$i || return 1
+	done
+	mv configure.guess config.guess
+	mv configure.sub config.sub
+	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || return 1
+	aclocal && autoconf || return 1
+	libtoolize || return 1
+}	
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		|| return 1
+	make -j1 || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make prefix="$pkgdir"/usr MANDIR="$pkgdir"/usr/share/man install
+}
+
+libs() {
+	pkgname="Libraries for libcdda_paranoia (Paranoia III)"
+	replaces="cdparanoia"
+	install -d "$subpkgdir"/usr
+	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+}
+
+md5sums="b304bbe8ab63373924a744eac9ebc652  cdparanoia-III-10.2.src.tgz
+0555411001f5546162dfb798b37ebf16  gcc.patch"
diff --git a/main/cdparanoia/gcc.patch b/main/cdparanoia/gcc.patch
new file mode 100644
index 0000000000..d75adfba1e
--- /dev/null
+++ b/main/cdparanoia/gcc.patch
@@ -0,0 +1,582 @@
+Index: interface/test_interface.c
+===================================================================
+--- a/interface/test_interface.c	(Revision 15337)
++++ b/interface/test_interface.c	(Revision 15340)
+@@ -66,9 +66,9 @@
+   if(!fd)fd=fdopen(d->cdda_fd,"r");
+ 
+   if(begin<lastread)
+-    d->private->last_milliseconds=20;
++    d->private_data->last_milliseconds=20;
+   else
+-    d->private->last_milliseconds=sectors;
++    d->private_data->last_milliseconds=sectors;
+ 
+ #ifdef CDDA_TEST_UNDERRUN
+   sectors-=1;
+Index: interface/cdda_interface.h
+===================================================================
+--- a/interface/cdda_interface.h	(Revision 15337)
++++ b/interface/cdda_interface.h	(Revision 15340)
+@@ -84,7 +84,7 @@
+   int is_atapi;
+   int is_mmc;
+ 
+-  cdda_private_data_t *private;
++  cdda_private_data_t *private_data;
+   void         *reserved;
+   unsigned char inqbytes[4];
+ 
+Index: interface/interface.c
+===================================================================
+--- a/interface/interface.c	(Revision 15337)
++++ b/interface/interface.c	(Revision 15340)
+@@ -39,9 +39,9 @@
+     if(d->drive_model)free(d->drive_model);
+     if(d->cdda_fd!=-1)close(d->cdda_fd);
+     if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
+-    if(d->private){
+-      if(d->private->sg_hd)free(d->private->sg_hd);
+-      free(d->private);
++    if(d->private_data){
++      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
++      free(d->private_data);
+     }
+ 
+     free(d);
+@@ -127,7 +127,7 @@
+ 	}
+       }	
+     }
+-    if(ms)*ms=d->private->last_milliseconds;
++    if(ms)*ms=d->private_data->last_milliseconds;
+     return(sectors);
+   }
+   
+Index: interface/scsi_interface.c
+===================================================================
+--- a/interface/scsi_interface.c	(Revision 15337)
++++ b/interface/scsi_interface.c	(Revision 15340)
+@@ -15,13 +15,13 @@
+ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
+   struct timespec tv1;
+   struct timespec tv2;
+-  int ret1=clock_gettime(d->private->clock,&tv1);
++  int ret1=clock_gettime(d->private_data->clock,&tv1);
+   int ret2=ioctl(fd, command,arg);
+-  int ret3=clock_gettime(d->private->clock,&tv2);
++  int ret3=clock_gettime(d->private_data->clock,&tv2);
+   if(ret1<0 || ret3<0){
+-    d->private->last_milliseconds=-1;
++    d->private_data->last_milliseconds=-1;
+   }else{
+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
+   }
+   return ret2;
+ }
+@@ -96,7 +96,7 @@
+ static void clear_garbage(cdrom_drive *d){
+   fd_set fdset;
+   struct timeval tv;
+-  struct sg_header *sg_hd=d->private->sg_hd;
++  struct sg_header *sg_hd=d->private_data->sg_hd;
+   int flag=0;
+ 
+   /* clear out any possibly preexisting garbage */
+@@ -185,7 +185,7 @@
+   struct timespec tv2;
+   int tret1,tret2;
+   int status = 0;
+-  struct sg_header *sg_hd=d->private->sg_hd;
++  struct sg_header *sg_hd=d->private_data->sg_hd;
+   long writebytes=SG_OFF+cmd_len+in_size;
+ 
+   /* generic scsi device services */
+@@ -195,7 +195,7 @@
+ 
+   memset(sg_hd,0,sizeof(sg_hd)); 
+   memset(sense_buffer,0,SG_MAX_SENSE); 
+-  memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
++  memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
+   sg_hd->twelve_byte = cmd_len == 12;
+   sg_hd->result = 0;
+   sg_hd->reply_len = SG_OFF + out_size;
+@@ -209,7 +209,7 @@
+      tell if the command failed.  Scared yet? */
+ 
+   if(bytecheck && out_size>in_size){
+-    memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
++    memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
+     /* the size does not remove cmd_len due to the way the kernel
+        driver copies buffers */
+     writebytes+=(out_size-in_size);
+@@ -243,7 +243,7 @@
+   }
+ 
+   sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
+-  tret1=clock_gettime(d->private->clock,&tv1);  
++  tret1=clock_gettime(d->private_data->clock,&tv1);  
+   errno=0;
+   status = write(d->cdda_fd, sg_hd, writebytes );
+ 
+@@ -289,7 +289,7 @@
+     }
+   }
+ 
+-  tret2=clock_gettime(d->private->clock,&tv2);  
++  tret2=clock_gettime(d->private_data->clock,&tv2);  
+   errno=0;
+   status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
+   sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL );
+@@ -313,7 +313,7 @@
+   if(bytecheck && in_size+cmd_len<out_size){
+     long i,flag=0;
+     for(i=in_size;i<out_size;i++)
+-      if(d->private->sg_buffer[i]!=bytefill){
++      if(d->private_data->sg_buffer[i]!=bytefill){
+ 	flag=1;
+ 	break;
+       }
+@@ -326,9 +326,9 @@
+ 
+   errno=0;
+   if(tret1<0 || tret2<0){
+-    d->private->last_milliseconds=-1;
++    d->private_data->last_milliseconds=-1;
+   }else{
+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
+   }
+   return(0);
+ }
+@@ -347,7 +347,7 @@
+ 
+   memset(&hdr,0,sizeof(hdr));
+   memset(sense,0,sizeof(sense));
+-  memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
++  memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
+ 
+   hdr.cmdp = cmd;
+   hdr.cmd_len = cmd_len;
+@@ -355,7 +355,7 @@
+   hdr.mx_sb_len = SG_MAX_SENSE;
+   hdr.timeout = 50000;
+   hdr.interface_id = 'S';
+-  hdr.dxferp =  d->private->sg_buffer;
++  hdr.dxferp =  d->private_data->sg_buffer;
+   hdr.flags = SG_FLAG_DIRECT_IO;  /* direct IO if we can get it */
+ 
+   /* scary buffer fill hack */
+@@ -400,7 +400,7 @@
+   if(bytecheck && in_size<out_size){
+     long i,flag=0;
+     for(i=in_size;i<out_size;i++)
+-      if(d->private->sg_buffer[i]!=bytefill){
++      if(d->private_data->sg_buffer[i]!=bytefill){
+ 	flag=1;
+ 	break;
+       }
+@@ -412,7 +412,7 @@
+   }
+ 
+   /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
+-  /* d->private->last_milliseconds = hdr.duration; */
++  /* d->private_data->last_milliseconds = hdr.duration; */
+ 
+   errno = 0;
+   return 0;
+@@ -445,9 +445,9 @@
+ 
+   handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
+ 
+-  key = d->private->sg_buffer[2] & 0xf;
+-  ASC = d->private->sg_buffer[12];
+-  ASCQ = d->private->sg_buffer[13];
++  key = d->private_data->sg_buffer[2] & 0xf;
++  ASC = d->private_data->sg_buffer[12];
++  ASCQ = d->private_data->sg_buffer[13];
+   
+   if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
+   return 1;
+@@ -492,7 +492,7 @@
+   if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1);
+ 
+   {
+-    unsigned char *b=d->private->sg_buffer;
++    unsigned char *b=d->private_data->sg_buffer;
+     if(b[0])return(1); /* Handles only up to 256 bytes */
+     if(b[6])return(1); /* Handles only up to 256 bytes */
+ 
+@@ -604,8 +604,8 @@
+ static unsigned int get_orig_sectorsize(cdrom_drive *d){
+   if(mode_sense(d,12,0x01))return(-1);
+ 
+-  d->orgdens = d->private->sg_buffer[4];
+-  return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);
++  d->orgdens = d->private_data->sg_buffer[4];
++  return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
+ }
+ 
+ /* switch CDROM scsi drives to given sector size  */
+@@ -664,8 +664,8 @@
+     return(-4);
+   }
+ 
+-  first=d->private->sg_buffer[2];
+-  last=d->private->sg_buffer[3];
++  first=d->private_data->sg_buffer[2];
++  last=d->private_data->sg_buffer[3];
+   tracks=last-first+1;
+ 
+   if (last > MAXTRK || first > MAXTRK || last<0 || first<0) {
+@@ -683,7 +683,7 @@
+       return(-5);
+     }
+     {
+-      scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
++      scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
+ 
+       d->disc_toc[i-first].bFlags=toc->bFlags;
+       d->disc_toc[i-first].bTrack=i;
+@@ -704,7 +704,7 @@
+     return(-2);
+   }
+   {
+-    scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
++    scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
+     
+     d->disc_toc[i-first].bFlags=toc->bFlags;
+     d->disc_toc[i-first].bTrack=0xAA;
+@@ -738,7 +738,7 @@
+   }
+ 
+   /* copy to our structure and convert start sector */
+-  tracks = d->private->sg_buffer[1];
++  tracks = d->private_data->sg_buffer[1];
+   if (tracks > MAXTRK) {
+     cderror(d,"003: CDROM reporting illegal number of tracks\n");
+     return(-3);
+@@ -754,33 +754,33 @@
+       return(-5);
+     }
+     
+-    d->disc_toc[i].bFlags = d->private->sg_buffer[10];
++    d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
+     d->disc_toc[i].bTrack = i + 1;
+ 
+     d->disc_toc[i].dwStartSector= d->adjust_ssize * 
+-	(((signed char)(d->private->sg_buffer[2])<<24) | 
+-	 (d->private->sg_buffer[3]<<16)|
+-	 (d->private->sg_buffer[4]<<8)|
+-	 (d->private->sg_buffer[5]));
++	(((signed char)(d->private_data->sg_buffer[2])<<24) | 
++	 (d->private_data->sg_buffer[3]<<16)|
++	 (d->private_data->sg_buffer[4]<<8)|
++	 (d->private_data->sg_buffer[5]));
+   }
+ 
+   d->disc_toc[i].bFlags = 0;
+   d->disc_toc[i].bTrack = i + 1;
+-  memcpy (&foo, d->private->sg_buffer+2, 4);
+-  memcpy (&bar, d->private->sg_buffer+6, 4);
++  memcpy (&foo, d->private_data->sg_buffer+2, 4);
++  memcpy (&bar, d->private_data->sg_buffer+6, 4);
+   d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
+ 						    be32_to_cpu(bar));
+ 
+   d->disc_toc[i].dwStartSector= d->adjust_ssize * 
+-    ((((signed char)(d->private->sg_buffer[2])<<24) | 
+-      (d->private->sg_buffer[3]<<16)|
+-      (d->private->sg_buffer[4]<<8)|
+-      (d->private->sg_buffer[5]))+
++    ((((signed char)(d->private_data->sg_buffer[2])<<24) | 
++      (d->private_data->sg_buffer[3]<<16)|
++      (d->private_data->sg_buffer[4]<<8)|
++      (d->private_data->sg_buffer[5]))+
+      
+-     ((((signed char)(d->private->sg_buffer[6])<<24) | 
+-       (d->private->sg_buffer[7]<<16)|
+-       (d->private->sg_buffer[8]<<8)|
+-       (d->private->sg_buffer[9]))));
++     ((((signed char)(d->private_data->sg_buffer[6])<<24) | 
++       (d->private_data->sg_buffer[7]<<16)|
++       (d->private_data->sg_buffer[8]<<8)|
++       (d->private_data->sg_buffer[9]))));
+ 
+ 
+   d->cd_extra = FixupTOC(d,tracks+1);
+@@ -817,7 +817,7 @@
+   cmd[8] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -836,7 +836,7 @@
+   cmd[9] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -854,7 +854,7 @@
+   cmd[8] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -872,7 +872,7 @@
+   cmd[9] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -890,7 +890,7 @@
+   cmd[8] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -908,7 +908,7 @@
+   cmd[9] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -922,7 +922,7 @@
+   cmd[8] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -936,7 +936,7 @@
+   cmd[8] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -950,7 +950,7 @@
+   cmd[8] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -964,7 +964,7 @@
+   cmd[8] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -978,7 +978,7 @@
+   cmd[8] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -992,7 +992,7 @@
+   cmd[8] = sectors;
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -1026,7 +1026,7 @@
+ 
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -1039,7 +1039,7 @@
+ 
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -1052,7 +1052,7 @@
+   
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+ 
+@@ -1275,7 +1275,7 @@
+ static int count_2352_bytes(cdrom_drive *d){
+   long i;
+   for(i=2351;i>=0;i--)
+-    if(d->private->sg_buffer[i]!=(unsigned char)'\177')
++    if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
+       return(((i+3)>>2)<<2);
+ 
+   return(0);
+@@ -1284,7 +1284,7 @@
+ static int verify_nonzero(cdrom_drive *d){
+   long i,flag=0;
+   for(i=0;i<2352;i++)
+-    if(d->private->sg_buffer[i]!=0){
++    if(d->private_data->sg_buffer[i]!=0){
+       flag=1;
+       break;
+     }
+@@ -1621,7 +1621,7 @@
+   d->is_mmc=0;
+   if(mode_sense(d,22,0x2A)==0){
+   
+-    b=d->private->sg_buffer;
++    b=d->private_data->sg_buffer;
+     b+=b[3]+4;
+     
+     if((b[0]&0x3F)==0x2A){
+@@ -1669,7 +1669,7 @@
+     cderror(d,"008: Unable to identify CDROM model\n");
+     return(NULL);
+   }
+-  return (d->private->sg_buffer);
++  return (d->private_data->sg_buffer);
+ }
+ 
+ int scsi_init_drive(cdrom_drive *d){
+@@ -1725,8 +1725,8 @@
+   check_cache(d);
+ 
+   d->error_retry=1;
+-  d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
+-  d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
++  d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
++  d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
+   d->report_all=1;
+   return(0);
+ }
+Index: interface/cooked_interface.c
+===================================================================
+--- a/interface/cooked_interface.c	(Revision 15337)
++++ b/interface/cooked_interface.c	(Revision 15340)
+@@ -13,13 +13,13 @@
+ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
+   struct timespec tv1;
+   struct timespec tv2;
+-  int ret1=clock_gettime(d->private->clock,&tv1);
++  int ret1=clock_gettime(d->private_data->clock,&tv1);
+   int ret2=ioctl(fd, command,arg);
+-  int ret3=clock_gettime(d->private->clock,&tv2);
++  int ret3=clock_gettime(d->private_data->clock,&tv2);
+   if(ret1<0 || ret3<0){
+-    d->private->last_milliseconds=-1;
++    d->private_data->last_milliseconds=-1;
+   }else{
+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
+   }
+   return ret2;
+ }
+Index: interface/scan_devices.c
+===================================================================
+--- a/interface/scan_devices.c	(Revision 15337)
++++ b/interface/scan_devices.c	(Revision 15340)
+@@ -264,11 +264,11 @@
+   d->interface=COOKED_IOCTL;
+   d->bigendianp=-1; /* We don't know yet... */
+   d->nsectors=-1;
+-  d->private=calloc(1,sizeof(*d->private));
++  d->private_data=calloc(1,sizeof(*d->private_data));
+   {
+     /* goddamnit */
+     struct timespec tv;
+-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
++    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
+   }
+   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
+   return(d);
+@@ -674,15 +674,15 @@
+   d->bigendianp=-1; /* We don't know yet... */
+   d->nsectors=-1;
+   d->messagedest = messagedest;
+-  d->private=calloc(1,sizeof(*d->private));
++  d->private_data=calloc(1,sizeof(*d->private_data));
+   {
+     /* goddamnit */
+     struct timespec tv;
+-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
++    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
+   }
+   if(use_sgio){
+     d->interface=SGIO_SCSI;
+-    d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
++    d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
+     g_fd=d->cdda_fd=dup(d->ioctl_fd);
+   }else{
+     version=verify_SG_version(d,messagedest,messages);
+@@ -696,8 +696,8 @@
+     }
+ 
+     /* malloc our big buffer for scsi commands */
+-    d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
+-    d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
++    d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
++    d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
+   }
+ 
+   {
+@@ -772,9 +772,9 @@
+   if(i_fd!=-1)close(i_fd);
+   if(g_fd!=-1)close(g_fd);
+   if(d){
+-    if(d->private){
+-      if(d->private->sg_hd)free(d->private->sg_hd);
+-      free(d->private);
++    if(d->private_data){
++      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
++      free(d->private_data);
+     }
+     free(d);
+   }
+@@ -821,7 +821,7 @@
+   d->interface=TEST_INTERFACE;
+   d->bigendianp=-1; /* We don't know yet... */
+   d->nsectors=-1;
+-  d->private=calloc(1,sizeof(*d->private));
++  d->private_data=calloc(1,sizeof(*d->private_data));
+   d->drive_model=copystring("File based test interface");
+   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
+   
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 11d19497d4..1cf3effc38 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,13 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cups
-pkgver=1.5.4
-pkgrel=1
+pkgver=1.6.1
+pkgrel=0
 pkgdesc="The CUPS Printing System"
 url="http://www.cups.org/"
 arch="all"
 license="GPL"
-subpackages="$pkgname-dev $pkgname-doc libcups $pkgname-client $pkgname-lang"
-makedepends="openssl-dev libpaper-dev dbus-dev jpeg-dev>=8 zlib-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs ipptool $pkgname-client
+	$pkgname-lang"
+depends_dev="openssl-dev zlib-dev"
+makedepends="$depends_dev libpaper-dev dbus-dev jpeg-dev>=8"
 depends="cups-client poppler-utils openssl dbus"
 install="cups.pre-install"
 pkggroups="lp lpadmin"
@@ -18,7 +20,6 @@ source="ftp://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz
 	cupsd.initd
 	"
 
-depends_dev="openssl-dev zlib-dev"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -76,18 +77,28 @@ _mv() {
 	done
 }
 
-libcups() {
+libs() {
 	pkgdesc="CUPS libraries"
 	depends=
+	replaces="libcups"
+	cd "$pkgdir"
 	_mv usr/lib/*.so*
 	install -d "$pkgdir"/etc/cups
 }
 
+ipptool() {
+	pkgdesc=""
+	depends=
+	cd "$pkgdir"
+	_mv usr/bin/ipptool \
+		usr/share/cups/ipptool
+}
+
 client() {
 	pkgdesc="CUPS client"
 	depends=
+	cd "$pkgdir"
 	_mv usr/bin \
-		usr/share/cups/charsets \
 		usr/sbin/accept \
 		usr/sbin/cupsaddsmb \
 		usr/sbin/cupsctl \
@@ -100,6 +111,6 @@ client() {
 		usr/sbin/reject
 }
 
-md5sums="de3006e5cf1ee78a9c6145ce62c4e982  cups-1.5.4-source.tar.bz2
+md5sums="87ade07e3d1efd03c9c3add949cf9c00  cups-1.6.1-source.tar.bz2
 f861b18f4446c43918c8643dcbbd7f6d  cups.logrotate
 1154ed66fdcfa0523f929a369079f43c  cupsd.initd"
diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD
index fc4f503461..5dabab1637 100644
--- a/main/epdfview/APKBUILD
+++ b/main/epdfview/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=epdfview
 pkgver=0.1.8
-pkgrel=4
+pkgrel=5
 pkgdesc="A free lightweight PDF document viewer."
 url="http://www.emma-soft.com/projects/epdfview/"
 arch="all"
@@ -12,6 +12,8 @@ subpackages="$pkgname-lang"
 source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2
 	$pkgname.desktop.patch
 	epdfview-0.1.8-glib-2.31-build-fix.patch
+	epdfview-0.1.8-swap-colors-with-poppler-0.18.patch
+	epdfview-0.1.8-cups-1.6.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -56,4 +58,6 @@ package() {
 
 md5sums="e50285b01612169b2594fea375f53ae4  epdfview-0.1.8.tar.bz2
 c87ed492dcf64a0b41476989c9282f8b  epdfview.desktop.patch
-6e52b4bd6996530443eb4477c6f21e3f  epdfview-0.1.8-glib-2.31-build-fix.patch"
+6e52b4bd6996530443eb4477c6f21e3f  epdfview-0.1.8-glib-2.31-build-fix.patch
+c823d279a77a983fe29290c6db2e1881  epdfview-0.1.8-swap-colors-with-poppler-0.18.patch
+113bdf270dec17a7bd59ee990e7c0491  epdfview-0.1.8-cups-1.6.patch"
diff --git a/main/epdfview/epdfview-0.1.8-cups-1.6.patch b/main/epdfview/epdfview-0.1.8-cups-1.6.patch
new file mode 100644
index 0000000000..7ad27011ce
--- /dev/null
+++ b/main/epdfview/epdfview-0.1.8-cups-1.6.patch
@@ -0,0 +1,73 @@
+diff -Naur epdfview-0.1.8.orig/src/PrintPter.cxx epdfview-0.1.8/src/PrintPter.cxx
+--- epdfview-0.1.8.orig/src/PrintPter.cxx	2011-05-28 11:25:01.000000000 +0100
++++ epdfview-0.1.8/src/PrintPter.cxx	2012-08-22 20:11:46.362436859 +0100
+@@ -22,6 +22,40 @@
+ #include <locale.h>
+ #include "epdfview.h"
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++inline int ippGetInteger (ipp_attribute_t *attr, int element)
++{
++    return (attr->values[element].integer);
++}
++
++inline const char * ippGetString (ipp_attribute_t *attr,
++                                  int             element,
++                                  const char      **language /*UNUSED*/)
++{
++    return (attr->values[element].string.text);
++}
++
++inline int ippSetOperation (ipp_t *ipp, ipp_op_t op)
++{
++  if (!ipp)
++    return (0);
++  ipp->request.op.operation_id = op;
++  return (1);
++}
++
++inline int ippSetRequestId (ipp_t *ipp, int request_id)
++{
++    if (!ipp)
++        return (0);
++    ipp->request.any.request_id = request_id;
++    return (1);
++}
++#endif
++
+ using namespace ePDFView;
+ 
+ // Structures
+@@ -380,8 +414,8 @@
+ 
+     ipp_t *request = ippNew ();
+ 
+-    request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
+-    request->request.op.request_id = 1;
++    ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES);
++    ippSetRequestId(request, 1);
+ 
+     ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, "utf-8");
+@@ -403,7 +437,7 @@
+             ippFindAttribute (answer, "printer-state", IPP_TAG_ZERO);
+         if ( NULL != state )
+         {
+-            switch (state->values[0].integer)
++            switch (ippGetInteger (state, 0))
+             {
+                 case IPP_PRINTER_IDLE:
+                     attributes->state = g_strdup (_("Idle"));
+@@ -425,7 +459,7 @@
+             ippFindAttribute (answer, "printer-location", IPP_TAG_ZERO);
+         if ( NULL != location )
+         {
+-            attributes->location = g_strdup (location->values[0].string.text);
++            attributes->location = g_strdup (ippGetString (location, 0, NULL));
+         }
+ 
+         ippDelete (answer);
diff --git a/main/epdfview/epdfview-0.1.8-swap-colors-with-poppler-0.18.patch b/main/epdfview/epdfview-0.1.8-swap-colors-with-poppler-0.18.patch
new file mode 100644
index 0000000000..c93d1e5f3d
--- /dev/null
+++ b/main/epdfview/epdfview-0.1.8-swap-colors-with-poppler-0.18.patch
@@ -0,0 +1,50 @@
+Swap color channels to fix pictures with poppler 0.18
+
+Upstream: http://trac.emma-soft.com/epdfview/changeset/367/trunk
+Fixes bug: https://bugzilla.redhat.com/show_bug.cgi?id=745483
+
+Index: src/PDFDocument.cxx
+===================================================================
+--- ./src/PDFDocument.cxx	(revision 366)
++++ ./src/PDFDocument.cxx	(revision 367)
+@@ -20,6 +20,7 @@
+ #include <time.h>
+ #include <poppler.h>
+ #include <unistd.h>
++#include <algorithm>
+ #include "epdfview.h"
+ 
+ using namespace ePDFView;
+@@ -33,6 +34,24 @@
+ static PageMode convertPageMode (gint pageMode);
+ static gchar *getAbsoluteFileName (const gchar *fileName);
+ 
++namespace
++{
++    void
++    convert_bgra_to_rgba (guint8 *data, int width, int height)
++    {
++        using std::swap;
++
++        for (int y = 0; y < height; y++)
++        {
++            for (int x = 0; x < width; x++)
++            {
++                swap(data[0], data[2]);
++                data += 4;
++            }
++        }
++    }
++}
++
+ ///
+ /// @brief Constructs a new PDFDocument object.
+ ///
+@@ -650,6 +669,7 @@
+         poppler_page_render (page, context);
+         cairo_destroy(context);
+         cairo_surface_destroy (surface);
++        convert_bgra_to_rgba(renderedPage->getData (), width, height);
+ #else // !HAVE_POPPLER_0_17_0
+         // Create the pixbuf from the data and render to it.
+         GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (),
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 32e438fdc5..f4c27afcc3 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ffmpeg
-pkgver=0.11.2
-pkgrel=1
+pkgver=1.0
+pkgrel=0
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 url="http://ffmpeg.org/"
 arch="all"
@@ -43,9 +43,9 @@ build() {
 		--enable-pthreads \
 		--enable-shared \
 		--enable-x11grab \
-		--disable-mmx \
-		--disable-mmx2 \
+		--disable-asm \
 		--disable-stripping \
+		--disable-static \
 		$_dbg \
 		|| return 1
 	make || return 1
@@ -67,5 +67,5 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
 }
 
-md5sums="93c1908022567b321df74db7214da6ac  ffmpeg-0.11.2.tar.bz2
+md5sums="3ed526cea20c1bffb5a37f7730f710bd  ffmpeg-1.0.tar.bz2
 2cdc11a99bf97c63c7cca27b073cb47c  configure-dlvsym.patch"
diff --git a/main/freerdp/APKBUILD b/main/freerdp/APKBUILD
index a04b1fe074..84cf0ac601 100644
--- a/main/freerdp/APKBUILD
+++ b/main/freerdp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freerdp
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Free RDP client"
 url="http://freerdp.sourceforge.net"
 arch="all"
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index ae9fc22704..a06102733c 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -2,21 +2,23 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=ghostscript
 pkgver=9.06
-pkgrel=0
+pkgrel=1
 pkgdesc="An interpreter for the PostScript language and for PDF"
 url="http://ghostscript.com/"
 arch="all"
 license="GPL3"
-makedepends="autoconf automake jpeg-dev libpng-dev jasper-dev expat-dev zlib-dev tiff-dev 
-             freetype-dev libiconv-dev lcms-dev"
-subpackages="$pkgname-doc $pkgname-dev"
+makedepends="autoconf automake jpeg-dev libpng-dev jasper-dev expat-dev
+	zlib-dev tiff-dev freetype-dev libiconv-dev lcms-dev gtk+3.0-dev
+	libtool"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-gtk"
 source="http://downloads.ghostscript.com/public/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/ghostscript-$pkgver"
 prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 
 	# force it to use system-libs
-	rm -rf jpeg libpng zlib jasper expat tiff lcms
+	rm -rf jpeg libpng zlib jasper expat tiff lcms cups/libs
 
 	# fix parallel builds
 	sed -i -e 's/ECHO_XE/ECHOGS_XE/g' \
@@ -31,24 +33,35 @@ prepare() {
 		--docdir=/usr/share/doc/"$pkgname" \
 		--enable-dynamic \
 		--with-system-libtiff \
-		--without-ijs --without-x \
+		--with-ijs \
 		--with-jbig2dec \
 		--without-omni \
+		--enable-gtk \
 		--with-drivers=FILES \
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-		--disable-cups --disable-gtk \
 		--disable-compile-inits # needed for linking with system-zlib
 }
 
 build(){
-	cd "$srcdir/$pkgname-$pkgver"
+	# build ijs
+	cd "$_builddir"/ijs
+	./autogen.sh --prefix=/usr --enable-shared --disable-static || return 1
+	make
+
+	cd "$_builddir"
 	make so all || return 1 
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make -j1 DESTDIR="${pkgdir}" install soinstall || return 1
 
+	cd "$_builddir"/ijs
+	make -j1 DESTDIR="${pkgdir}" install || return 1
+	cd..
+
+	rm "$pkgdir"/usr/lib/*.la || return 1
+
 	#create empty dir for future fonts
 	mkdir -p "${pkgdir}"/usr/share/fonts/Type1
 
@@ -65,4 +78,10 @@ package() {
 	mv "$pkgdir/usr/share/$pkgname/$pkgver/examples" "$pkgdir/usr/share/doc/$pkgname"
 }
 
+gtk() {
+	pkgdesc="A GTK-enabled PostScript interpreter and renderer"
+	install -d "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/gsx "$subpkgdir"/usr/bin/
+}
+
 md5sums="153ddb0622cb155d2f600146f1e28d84  ghostscript-9.06.tar.gz"
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index 8225a8789d..93f976f2d9 100644
--- a/main/gobject-introspection/APKBUILD
+++ b/main/gobject-introspection/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gobject-introspection
-pkgver=1.32.1
-pkgrel=3
+pkgver=1.34.0
+pkgrel=0
 pkgdesc="Introspection system for GObject-based libraries"
-url="http://live.gnome.org/GObjectInstrospection"
+url="http://live.gnome.org/GObjectIntrospection"
 arch="all"
 license="LGPL GPL"
 depends_dev="python glib-dev libffi-dev cairo-dev libtool"
@@ -51,4 +51,4 @@ dev() {
 	replaces="gobject-introspection"
 }
 
-md5sums="7bbdb696c37bb98aef5af02c4b8975e3  gobject-introspection-1.32.1.tar.xz"
+md5sums="0902ae3b31871ea00167720e06acaa40  gobject-introspection-1.34.0.tar.xz"
diff --git a/main/gst-libav1/APKBUILD b/main/gst-libav1/APKBUILD
new file mode 100644
index 0000000000..a04df2da71
--- /dev/null
+++ b/main/gst-libav1/APKBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gst-libav1
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="Gstreamer libav Plugin"
+url="http://www.gstreamer.net"
+arch="all"
+license="GPL"
+makedepends="
+	coreutils
+	gstreamer1-dev
+	gst-plugins-base1-dev
+	liboil-dev
+	orc-dev"
+source="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-$pkgver.tar.xz"
+
+_builddir="$srcdir"/gst-libav-$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"
+	export CFLAGS="$CFLAGS -fno-strict-aliasing"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-orc \
+		--with-libav-extra-configure="--enable-pic --disable-mmx --disable-mmx2" \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find  "$pkgdir"/usr/lib/ \( -name '*.la' -o -name '*.a' \) -delete
+}
+
+md5sums="49c8b54eaae25da2c866a59b284b31ea  gst-libav-1.0.0.tar.xz"
diff --git a/main/gst-plugins-bad1/APKBUILD b/main/gst-plugins-bad1/APKBUILD
new file mode 100644
index 0000000000..0931abd6b1
--- /dev/null
+++ b/main/gst-plugins-bad1/APKBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gst-plugins-bad1
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="GStreamer bad plugins"
+url="http://gstreamer.freedesktop.org/"
+arch="all"
+license="LGPL GPL"
+depends=""
+subpackages="$pkgname-lang"
+makedepends="
+	alsa-lib-dev
+	bzip2-dev
+	curl-dev
+	faac-dev
+	faad2-dev
+	flite-dev
+	glib-dev
+	gsm-dev
+	gst-plugins-base1-dev
+	gstreamer1-dev
+	jasper-dev
+	libdc1394-dev
+	libexif-dev
+	libmms-dev
+	libmodplug-dev
+	liboil-dev
+	librsvg-dev
+	libvdpau-dev
+	libx11-dev
+	neon-dev
+	orc-dev
+	sdl-dev
+	spandsp-dev
+	xvidcore-dev
+	"
+
+source="http://gstreamer.freedesktop.org//src/gst-plugins-bad/gst-plugins-bad-$pkgver.tar.xz"
+ldpath="/usr/lib/gstreamer-1.0"
+
+_builddir="$srcdir"/gst-plugins-bad-$pkgver
+build() { 
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--enable-experimental \
+		--with-package-name="GStreamer Bad Plugins (Alpine Linux)" \
+		--with-package-origin="http://alpinelinux.org/" \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name '*.la' -delete
+}
+
+md5sums="f2d2c432917fb639a510bb3ce85c5329  gst-plugins-bad-1.0.0.tar.xz"
diff --git a/main/gst-plugins-base/APKBUILD b/main/gst-plugins-base/APKBUILD
index 6691eb94dc..2b2d3e09c5 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.36
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Base Plugins"
 url="http://gstreamer.freedesktop.org/"
 arch="all"
@@ -31,7 +31,7 @@ build() {
 		--localstatedir=/var \
 		--disable-static \
 		--disable-experimental \
-		--with-default-audiosink=osssink \
+		--with-default-audiosink=alsasink \
 		--with-package-name="GStreamer Base Plugins (Alpine Linux)" \
 		--with-package-origin="http://www.alpinelinux.org/" \
 		|| return 1
diff --git a/main/gst-plugins-base1/APKBUILD b/main/gst-plugins-base1/APKBUILD
new file mode 100644
index 0000000000..ffccf49a29
--- /dev/null
+++ b/main/gst-plugins-base1/APKBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gst-plugins-base1
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="GStreamer Multimedia Framework Base Plugins"
+url="http://gstreamer.freedesktop.org/"
+arch="all"
+license="GPL LGPL"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+depends=
+depends_dev="gstreamer1-dev glib-dev"
+makedepends="$depends_dev
+	alsa-lib-dev
+	cdparanoia-dev
+	expat-dev
+	gtk+3.0-dev
+	libice-dev
+	libogg-dev
+	liboil-dev
+	libsm-dev
+	libtheora-dev
+	libvorbis-dev
+	libxv-dev
+	orc-dev
+	perl
+	"
+source="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz"
+ldpath="/usr/lib/gstreamer-1.0"
+
+	
+_builddir="$srcdir"/gst-plugins-base-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-experimental \
+		--with-default-audiosink=alsasink \
+		--with-package-name="GStreamer Base Plugins (Alpine Linux)" \
+		--with-package-origin="http://alpinelinux.org/" \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make -j1 DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la \
+		"$pkgdir"/usr/lib/*.a \
+		"$pkgdir"/usr/lib/gstreamer*/*.la \
+		"$pkgdir"/usr/lib/gstreamer*/*.a
+}
+
+md5sums="428f5a0beaa7f76262bea0f431f8337e  gst-plugins-base-1.0.0.tar.xz"
diff --git a/main/gst-plugins-good/APKBUILD b/main/gst-plugins-good/APKBUILD
index e005169afa..4c55a3a084 100644
--- a/main/gst-plugins-good/APKBUILD
+++ b/main/gst-plugins-good/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-plugins-good
 pkgver=0.10.31
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 url="http://gstreamer.freedesktop.org/"
 arch="all"
@@ -11,7 +11,7 @@ depends=
 makedepends="gstreamer-dev glib-dev liboil-dev gst-plugins-base-dev
 	libsoup-dev flac-dev libogg-dev taglib-dev jpeg-dev zlib-dev gconf-dev
 	wavpack-dev libavc1394-dev libiec61883-dev libshout-dev libdv-dev
-	orc-dev"
+	orc-dev libxext libsm-dev libice-dev libxv-dev"
 replaces="gst-plugins-bad"
 
 source="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.bz2"
diff --git a/main/gst-plugins-good1/APKBUILD b/main/gst-plugins-good1/APKBUILD
new file mode 100644
index 0000000000..45f338a7cf
--- /dev/null
+++ b/main/gst-plugins-good1/APKBUILD
@@ -0,0 +1,72 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gst-plugins-good1
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework Good Plugins"
+url="http://gstreamer.freedesktop.org/"
+arch="all"
+license="LGPL"
+subpackages="$pkgname-lang"
+depends=
+depends_dev="gstreamer1-dev gst-plugins-base1-dev"
+makedepends="$depends_dev
+	flac-dev
+	gdk-pixbuf-dev
+	glib-dev
+	jack-dev
+	jpeg-dev
+	libavc1394-dev
+	libdv-dev
+	libice-dev
+	libiec61883-dev
+	libogg-dev
+	liboil-dev
+	libpng-dev
+	libshout-dev
+	libsm-dev
+	libsoup-dev
+	libvpx-dev
+	libxdamage-dev
+	libxext-dev
+	libxv-dev
+	orc-dev
+	taglib-dev
+	udev-dev
+	v4l-utils-dev
+	wavpack-dev
+	zlib-dev
+	"
+replaces=
+ldpath="/usr/lib/gstreamer-1.0"
+
+source="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz"
+
+
+_builddir="$srcdir"/gst-plugins-good-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--enable-experimental \
+		--with-package-name="GStreamer Good Plugins (Alpine Linux)" \
+		--with-package-origin="http://alpinelinux.org/" \
+		|| return 1
+	make
+}
+
+package() {
+	cd "$_builddir"
+
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name '*.la' -delete
+}
+
+md5sums="f711832cd8a9b033eb424fabe89ca9d1  gst-plugins-good-1.0.0.tar.xz"
diff --git a/main/gst-plugins-ugly1/APKBUILD b/main/gst-plugins-ugly1/APKBUILD
new file mode 100644
index 0000000000..417bfff72d
--- /dev/null
+++ b/main/gst-plugins-ugly1/APKBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gst-plugins-ugly1
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
+url="http://gstreamer.freedesktop.org/"
+arch="all"
+license="LGPL"
+depends=
+makedepends="
+	a52dec-dev
+	glib-dev
+	gst-plugins-base1-dev
+	gstreamer1-dev
+	lame-dev
+	libcdio-dev
+	libdvdread-dev
+	libid3tag-dev
+	libmad-dev
+	libmpeg2-dev
+	liboil-dev
+	orc-dev
+	x264-dev
+	"
+source="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.xz"
+subpackages="$pkgname-lang"
+ldpath="/usr/lib/gstreamer-1.0"
+
+_builddir="$srcdir"/gst-plugins-ugly-$pkgver
+
+build() { 
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--enable-experimental \
+		--with-package-name="GStreamer Ugly Plugins (Alpine Linux)" \
+		--with-package-origin="http://alpinelinux.org/" || return 1
+	make
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name '*.la' -delete
+}
+md5sums="7f20303caf4305278573fb7ef73a07b7  gst-plugins-ugly-1.0.0.tar.xz"
diff --git a/main/gstreamer1/APKBUILD b/main/gstreamer1/APKBUILD
new file mode 100644
index 0000000000..5d5af7c579
--- /dev/null
+++ b/main/gstreamer1/APKBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gstreamer1
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="GStreamer Multimedia Framework"
+url="http://gstreamer.freedesktop.org/"
+arch="all"
+license="LGPL"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang"
+depends=
+depends_dev="glib-dev libxml2-dev"
+makedepends="$depends_dev bison flex gobject-introspection-dev"
+source="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz
+	"
+
+_builddir="$srcdir"/gstreamer-$pkgver
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case "$i" in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+}
+
+build() {
+	cd "$srcdir"/gstreamer-$pkgver
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-introspection \
+		--with-package-name="GStreamer (Alpine Linux)" \
+		--with-package-origin="http://alpinelinux.org/" \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/gstreamer-$pkgver
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la \
+		"$pkgdir"/usr/lib/*.a \
+		"$pkgdir"/usr/lib/gstreamer*/*.la \
+		"$pkgdir"/usr/lib/gstreamer*/*.a
+}
+
+tools() {
+	pkgdesc="common tools and files for GStreamer streaming media framework"
+	# gst-feedback needs this
+	depends="pkgconfig"
+	mkdir -p "$subpkgdir"/usr/
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+}
+
+md5sums="b7c9252b83720115d0897fbbbc092dc8  gstreamer-1.0.0.tar.xz"
diff --git a/main/gtk+2.0/APKBUILD b/main/gtk+2.0/APKBUILD
index edba04825b..269e8ed66e 100644
--- a/main/gtk+2.0/APKBUILD
+++ b/main/gtk+2.0/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk+2.0
 pkgver=2.24.13
-pkgrel=0
+pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 url="http://www.gtk.org/"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index ffd0c6d3c8..9129b228c3 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk+3.0
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GTK+ Toolkit (v3)"
 url="http://www.gtk.org/"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
diff --git a/main/jack/APKBUILD b/main/jack/APKBUILD
new file mode 100644
index 0000000000..f0bfa1c403
--- /dev/null
+++ b/main/jack/APKBUILD
@@ -0,0 +1,62 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=jack
+pkgver=1.9.8
+pkgrel=0
+pkgdesc="The Jack Audio Connection Kit"
+url="http://www.jackaudio.org"
+arch="all"
+license="GPLv2 GPLv2+ LGPLv2+"
+depends=""
+depends_dev=""
+makedepends="$depends_dev alsa-lib-dev dbus-dev expat-dev libsamplerate-dev
+	libsndfile-dev ncurses-dev readline-dev python"
+install=""
+subpackages="$pkgname-dev $pkgname-doc $pkgname-dbus $pkgname-example-clients:_clients"
+source="http://www.grame.fr/~letz/jack-$pkgver.tgz"
+
+_builddir="$srcdir"/jack-$pkgver/jack-$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"
+	export PREFIX=/usr
+	./waf configure \
+		-j1 \
+		--mandir=/share/man/man1 \
+		--libdir=/lib \
+		--dbus \
+		--alsa \
+		--classic \
+		|| return 1
+
+
+	./waf build -j${JOBS:-2} -v || return 1
+}
+
+package() {
+	cd "$_builddir"
+	./waf --destdir="$pkgdir" install || return 1
+}
+
+dbus() {
+	pkgdesc="Jack D-Bus launcher"
+	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share
+	mv "$pkgdir"/usr/bin/jackdbus "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/share/dbus* "$subpkgdir"/usr/share/|| return 1
+}
+
+_clients() {
+	pkgdesc="Example clients that use Jack"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/*_* "$subpkgdir"/usr/bin/
+}
+
+md5sums="1dd2ff054cab79dfc11d134756f27165  jack-1.9.8.tgz"
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index 29e644f7b1..b4d8f7a02b 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=libvirt
 pkgver=0.10.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A virtualization API for several hypervisor and container systems"
 url="http://libvirt.org/"
 arch="all"
@@ -13,16 +13,24 @@ makedepends="augeas-dev bridge-utils cyrus-sasl-dev device-mapper
 	lvm2-dev lxc-dev gnutls-dev libgcrypt-dev parted-dev perl pkgconfig 
 	udev-dev xen-dev zlib-dev yajl-dev libpcap-dev curl-dev"
 install=
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-client $pkgname-daemon $pkgname-dev $pkgname-doc $pkgname-lang
+	$pkgname-lxc $pkgname-qemu $pkgname-xen $pkgname-uml"
 source="http://libvirt.org/sources/$pkgname-$pkgver.tar.gz
 	libvirt.confd
-	libvirt.initd"
+	libvirt.initd
+	libvirt-0.10.2-legacy-xen-driver.patch
+	libvirt-0.10.2-support-xen-sysctl-v9.patch
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-	return 0
+	for patch in $(ls ../*.patch)
+	do
+		msg "Applying patch $patch"
+		patch -p1 < ../$patch || return 1
+	done	
 }
 
 build() {
@@ -46,6 +54,76 @@ package() {
 	install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd
 }
 
+daemon() {
+	cd "$_builddir"
+	pkgdesc="libvirt daemon package"
+	depends="libvirt logrotate"
+	daemon="libvirtd"
+	replaces="libvirt"
+	mkdir -p "$subpkgdir"/etc/$pkgname \
+	 "$subpkgdir"/etc/logrotate.d \
+	 "$subpkgdir"/usr/sbin
+	# mkdir -p "$subpkgdir"/usr/sbin
+	mv "$pkgdir"/etc/init.d "$subpkgdir"/etc
+	mv "$pkgdir"/etc/conf.d "$subpkgdir"/etc
+	mv "$pkgdir"/etc/$pkgname/$daemon.conf "$subpkgdir"/etc/libvirt/
+	mv "$pkgdir"/usr/sbin/$daemon "$subpkgdir"/usr/sbin/
+	mv "$pkgdir"/etc/logrotate.d/libvirtd "$subpkgdir"/etc/logrotate.d/
+}
+
+client() {
+	cd "$_builddir"
+	pkgdesc="libvirt client package"
+	depends="libvirt"
+	replaces="libvirt"
+	mkdir -p "$subpkgdir"/etc/$pkgname "$subpkgdir"/usr/bin
+	# mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/etc/$pkgname/$pkgname.conf "$subpkgdir"/etc/libvirt/
+	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
+}
+
+_mv_driver() {
+	mkdir -p "$subpkgdir"/usr/lib/libvirt/connection-driver \
+	 "$subpkgdir"/etc/libvirt "$subpkgdir"/etc/logrotate.d
+	mv "$pkgdir"/usr/lib/libvirt/connection-driver/libvirt_driver_$1.so \
+	 "$subpkgdir"/usr/lib/libvirt/connection-driver/
+	if [ "$1" != "xen" ]; then
+		mv "$pkgdir"/etc/logrotate.d/libvirtd.$1 \
+		 "$subpkgdir"/etc/logrotate.d/
+	fi
+}
+
+qemu() {
+	pkgdesc="QEMU driver for libvirt"
+	depends="libvirt logrotate"
+	replaces="libvirt"
+	_mv_driver qemu
+	mv "$pkgdir"/etc/libvirt/qemu.conf "$subpkgdir"/etc/libvirt/
+}
+
+xen() {
+	pkgdesc="XEN driver for libvirt"
+	depends="libvirt"
+	replaces="libvirt"
+	_mv_driver xen
+}
+
+lxc() {
+	pkgdesc="lxc driver for libvirt"
+	depends="libvirt logrotate"
+	replaces="libvirt"
+	_mv_driver lxc
+}
+
+uml() {
+	pkgdesc="UML driver for libvirt"
+	depends="libvirt logrotate"
+	replaces="libvirt"
+	_mv_driver uml
+}
+
 md5sums="a5e50860d9da238ba270b528411c4a0d  libvirt-0.10.2.tar.gz
 1c84a7baeafe0a7f4e9d7ae5180311b7  libvirt.confd
-7067215010da2d7282d878ba43070c5d  libvirt.initd"
+7067215010da2d7282d878ba43070c5d  libvirt.initd
+31c0c6ca4fe85bd1cfc00756ec47ea06  libvirt-0.10.2-legacy-xen-driver.patch
+e259b3e5b7257c9301a36186b748195b  libvirt-0.10.2-support-xen-sysctl-v9.patch"
diff --git a/main/libvirt/libvirt-0.10.2-legacy-xen-driver.patch b/main/libvirt/libvirt-0.10.2-legacy-xen-driver.patch
new file mode 100644
index 0000000000..caf17aa793
--- /dev/null
+++ b/main/libvirt/libvirt-0.10.2-legacy-xen-driver.patch
@@ -0,0 +1,66 @@
+From: Jim Fehlig <jfehlig@suse.com>
+Date: Wed, 26 Sep 2012 21:20:35 +0000 (-0600)
+Subject: Fix compilation of legacy xen driver with Xen 4.2
+X-Git-Url: http://libvirt.org/git/?p=libvirt.git;a=commitdiff_plain;h=416eca189b1934cfa8575ab72d142ec77600fcf9
+
+Fix compilation of legacy xen driver with Xen 4.2
+
+In Xen 4.2, xs.h is deprecated in favor of xenstore.h.  xs.h now
+contains
+
+#warning xs.h is deprecated use xenstore.h instead
+#include <xenstore.h>
+
+which fails compilation when warnings are treated as errors.
+
+Introduce a configure-time check for xenstore.h and if found,
+use it instead of xs.h.
+---
+
+diff --git a/configure.ac b/configure.ac
+index 38d94d4..ae26de7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -768,6 +768,8 @@ if test "$with_xen" != "no" ; then
+ fi
+ 
+ if test "$with_xen" != "no" ; then
++    dnl In Xen 4.2, xs.h is deprecated in favor of xenstore.h.
++    AC_CHECK_HEADERS([xenstore.h])
+     AC_CHECK_HEADERS([xen/xen.h xen/version.h xen/dom0_ops.h],,[
+        if test "$with_xen" = "yes"; then
+            fail=1
+diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
+index f3b756a..5ab1ce4 100644
+--- a/src/xen/block_stats.c
++++ b/src/xen/block_stats.c
+@@ -32,7 +32,11 @@
+ # include <unistd.h>
+ # include <regex.h>
+ 
+-# include <xs.h>
++# if HAVE_XENSTORE_H
++#  include <xenstore.h>
++# else
++#  include <xs.h>
++# endif
+ 
+ # include "virterror_internal.h"
+ # include "datatypes.h"
+diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
+index 12efa0c..a91d409 100644
+--- a/src/xen/xs_internal.c
++++ b/src/xen/xs_internal.c
+@@ -35,7 +35,11 @@
+ #include <xen/dom0_ops.h>
+ #include <xen/version.h>
+ 
+-#include <xs.h>
++#if HAVE_XENSTORE_H
++# include <xenstore.h>
++#else
++# include <xs.h>
++#endif
+ 
+ #include "virterror_internal.h"
+ #include "datatypes.h"
diff --git a/main/libvirt/libvirt-0.10.2-support-xen-sysctl-v9.patch b/main/libvirt/libvirt-0.10.2-support-xen-sysctl-v9.patch
new file mode 100644
index 0000000000..2270075b5d
--- /dev/null
+++ b/main/libvirt/libvirt-0.10.2-support-xen-sysctl-v9.patch
@@ -0,0 +1,34 @@
+From: Jim Fehlig <jfehlig@suse.com>
+Date: Wed, 26 Sep 2012 16:34:17 +0000 (-0600)
+Subject: Support Xen sysctl version 9 in Xen 4.2
+X-Git-Url: http://libvirt.org/git/?p=libvirt.git;a=commitdiff_plain;h=371ddc98664cbbd8542593e5452115ea7918dae2
+
+Support Xen sysctl version 9 in Xen 4.2
+
+Xen upstream c/s 24102:dc8e55c9 bumped the sysctl version to 9.
+Support this sysctl version in the xen_hypervisor sub-driver.
+---
+
+diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
+index fdc3071..3244bbd 100644
+--- a/src/xen/xen_hypervisor.c
++++ b/src/xen/xen_hypervisor.c
+@@ -2164,6 +2164,18 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
+         goto done;
+     }
+ 
++    /* Xen 4.2
++     * sysctl version 9 -> xen-unstable c/s 24102:dc8e55c90604
++     * domctl version 8 -> unchanged from Xen 4.1
++     */
++    hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */
++    if (virXen_getdomaininfo(fd, 0, &info) == 1) {
++        hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */
++        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
++            VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8");
++            goto done;
++        }
++    }
+ 
+     /*
+      * we failed to make the getdomaininfolist hypercall
diff --git a/main/live-media/APKBUILD b/main/live-media/APKBUILD
index 1814235bb0..d54807a0d5 100644
--- a/main/live-media/APKBUILD
+++ b/main/live-media/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=live-media
-pkgver=2012.07.26
+pkgver=2012.10.01
 pkgrel=0
 pkgdesc="A set of C++ libraries for multimedia streaming"
 url="http://live555.com/liveMedia"
@@ -44,4 +44,4 @@ package() {
 	done
 }
 
-md5sums="18374e9f6681f62ab7c987ca0029d494  live.2012.07.26.tar.gz"
+md5sums="2ce8c66e3721b178d02812bb677fb541  live.2012.10.01.tar.gz"
diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD
index 4b8b56b3dc..9c45ea4f91 100644
--- a/main/mplayer/APKBUILD
+++ b/main/mplayer/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=mplayer
 pkgver=1.1
 _ver=${pkgver/_/}
-pkgrel=1
+pkgrel=2
 pkgdesc="A movie player for linux"
 url="http://www.mplayerhq.hu/"
 arch="all"
diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD
index 943548179d..8bd66097e8 100644
--- a/main/poppler/APKBUILD
+++ b/main/poppler/APKBUILD
@@ -5,13 +5,14 @@
 # So we build gtk support in poppler-gtk
 pkgname=poppler
 pkgver=0.20.3
-pkgrel=0
+pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="http://poppler.freedesktop.org/"
 arch="all"
 license="GPL"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-makedepends="jpeg-dev cairo-dev libxml2-dev fontconfig-dev pkgconfig libiconv-dev"
+makedepends="jpeg-dev cairo-dev libxml2-dev fontconfig-dev libiconv-dev
+	lcms-dev"
 depends=
 depends_dev="cairo-dev"
 source="http://$pkgname.freedesktop.org/$pkgname-$pkgver.tar.gz"
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index a35017015b..670500834f 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
 pkgver=3.6.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 arch="all"
diff --git a/main/sox/APKBUILD b/main/sox/APKBUILD
index ec5a51ec32..215bfd74ad 100644
--- a/main/sox/APKBUILD
+++ b/main/sox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sox
 pkgver=14.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="The Swiss Army knife of sound processing tools"
 url="http://sox.sourceforge.net/"
 arch="all"
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 1dc3f1693a..5b37bcd6c0 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=vlc
 pkgver=2.0.3
 _pkgver=${pkgver/_/-}
-pkgrel=0
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 pkgusers="vlc"
 pkggroups="vlc"
diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index df294669ec..719da721c2 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wireshark
-pkgver=1.8.2
+pkgver=1.8.3
 pkgrel=0
 pkgdesc="network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
@@ -77,6 +77,6 @@ tshark() {
 	mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark
 }
 
-md5sums="5e3ea7eed50dace479e12f49d24506f4  wireshark-1.8.2.tar.bz2
+md5sums="898b4c60e32efcd77ecf875a6ad07a92  wireshark-1.8.3.tar.bz2
 504ede44c02b2a52f6cbd3bffdf93b8d  wireshark.desktop
 e771800a8c977fe223583a453bc27397  wireshark.png"