From b8646c38f9f0f867b019d1be98cb6ddd506e0efd Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 23 Mar 2014 04:08:07 +0000 Subject: Sun Mar 23 04:02:26 UTC 2014 --- extra/accountsservice/PKGBUILD | 17 +++----- .../avoid-deleting-the-root-user.patch | 47 ---------------------- extra/ffmpeg-compat/PKGBUILD | 11 +++-- extra/libmikmod/PKGBUILD | 6 +-- .../libmikmod-3.1.12-loopingvolume-fix.diff | 15 ------- extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff | 12 ------ 6 files changed, 13 insertions(+), 95 deletions(-) delete mode 100644 extra/accountsservice/avoid-deleting-the-root-user.patch delete mode 100644 extra/libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff delete mode 100644 extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff (limited to 'extra') diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index ca65f4be1..9f559b676 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,24 +1,17 @@ -# $Id: PKGBUILD 199022 2013-11-06 14:06:17Z jgc $ +# $Id: PKGBUILD 208513 2014-03-22 19:41:54Z heftig $ # Maintainer: Ionut Biru pkgname=accountsservice -pkgver=0.6.35 -pkgrel=2 +pkgver=0.6.37 +pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) url="http://www.freedesktop.org/software/accountsservice/" license=('GPL3') depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection') -source=($url/$pkgname-$pkgver.tar.xz - avoid-deleting-the-root-user.patch) -md5sums=('3a81133e95faafb603de4475802cb06a' - '4970e77c3c0d56e513f9a5f29fdacd2c') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../avoid-deleting-the-root-user.patch -} +source=($url/$pkgname-$pkgver.tar.xz) +md5sums=('aa5f4da715b8ec19024e39def88831a0') build() { cd $pkgname-$pkgver diff --git a/extra/accountsservice/avoid-deleting-the-root-user.patch b/extra/accountsservice/avoid-deleting-the-root-user.patch deleted file mode 100644 index b8dfaa931..000000000 --- a/extra/accountsservice/avoid-deleting-the-root-user.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 980692e6b9cfe4a34e22f566e0981a8c549e4348 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Fri, 01 Nov 2013 21:09:25 +0000 -Subject: Avoid deleting the root user - -The check we have in place against deleting the root user can -be tricked by exploiting the fact that we are checking a gint64, -and then later cast it to a uid_t. This can be seen with the -following test, which will delete your root account: - -qdbus --system org.freedesktop.Accounts /org/freedesktop/Accounts \ - org.freedesktop.Accounts.DeleteUser -9223372036854775808 true - -Found with the dfuzzer tool, -https://github.com/matusmarhefka/dfuzzer ---- -diff --git a/src/daemon.c b/src/daemon.c -index ea75190..9c7001b 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -1227,7 +1227,7 @@ daemon_uncache_user (AccountsAccounts *accounts, - } - - typedef struct { -- gint64 uid; -+ uid_t uid; - gboolean remove_files; - } DeleteUserData; - -@@ -1309,13 +1309,13 @@ daemon_delete_user (AccountsAccounts *accounts, - Daemon *daemon = (Daemon*)accounts; - DeleteUserData *data; - -- if (uid == 0) { -+ if ((uid_t)uid == 0) { - throw_error (context, ERROR_FAILED, "Refuse to delete root user"); - return TRUE; - } - - data = g_new0 (DeleteUserData, 1); -- data->uid = uid; -+ data->uid = (uid_t)uid; - data->remove_files = remove_files; - - daemon_local_check_auth (daemon, --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD index 1fb5e77f8..1327fd0a7 100644 --- a/extra/ffmpeg-compat/PKGBUILD +++ b/extra/ffmpeg-compat/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 204592 2014-01-23 13:42:13Z bpiotrowski $ -# Maintainer: Sergej Pupykin -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 208330 2014-03-22 14:26:01Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Sergej Pupykin # Contributor: Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg-compat -pkgver=0.10.11 +pkgver=0.10.12 pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' @@ -22,7 +22,7 @@ depends=( makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 ffmpeg-0.10.10-freetype2.patch) -sha256sums=('99a81aa43325de9c670659c15496ef348b5c4c65306caa1ce0893ae5f4f636d0' +sha256sums=('118d82ca182871a9599202362106f03348dc335e2aec7d998d1f59ede3a8db02' '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988') prepare() { @@ -66,7 +66,6 @@ build() { --enable-vdpau \ --enable-version3 \ --enable-x11grab - make } diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD index 526bad1d2..3ca523c2a 100644 --- a/extra/libmikmod/PKGBUILD +++ b/extra/libmikmod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 203444 2014-01-10 21:24:03Z heftig $ +# $Id: PKGBUILD 208511 2014-03-22 19:33:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Tom Newsom pkgname=libmikmod -pkgver=3.3.5 +pkgver=3.3.6 pkgrel=1 pkgdesc="A portable sound library" license=(GPL LGPL) @@ -14,7 +14,7 @@ depends=(libpulse sh) makedepends=(alsa-lib) install=$pkgname.install source=(http://downloads.sourceforge.net/mikmod/$pkgname-$pkgver.tar.gz) -sha256sums=('b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6') +sha256sums=('3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330') prepare() { mkdir build diff --git a/extra/libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff b/extra/libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff deleted file mode 100644 index f0ce70e34..000000000 --- a/extra/libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff +++ /dev/null @@ -1,15 +0,0 @@ -Yi-Huang Han - Wed Oct 24 21:55:47 PDT 2001 - * Fixed MOD music volume when looping - -diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c ---- libmikmod-3.1.12.orig/playercode/mplayer.c 2009-10-05 00:19:59.000000000 -0700 -+++ libmikmod-3.1.12/playercode/mplayer.c 2009-10-05 00:44:35.000000000 -0700 -@@ -3019,7 +3019,7 @@ - { - MUTEX_LOCK(vars); - if (pf) -- pf->volume=(volume<0)?0:(volume>128)?128:volume; -+ pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume; - MUTEX_UNLOCK(vars); - } - diff --git a/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff b/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff deleted file mode 100644 index c965f9ab7..000000000 --- a/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r libmikmod-3.2.0-orig/include/mikmod.h libmikmod-3.2.0/include/mikmod.h ---- libmikmod-3.2.0-orig/include/mikmod.h 2012-06-01 15:15:42.000000000 +0200 -+++ libmikmod-3.2.0/include/mikmod.h 2012-10-03 20:03:48.173576199 +0200 -@@ -85,7 +85,7 @@ - - - --#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) || defined(_LP64) - /* 64 bit architectures */ - - typedef signed char SBYTE; /* 1 byte, signed */ -- cgit v1.2.3-54-g00ecf