summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--community/awesome/awesome.desktop7
-rw-r--r--community/fcitx-mozc/PKGBUILD4
-rw-r--r--community/fcitx/PKGBUILD11
-rw-r--r--community/gtest/PKGBUILD24
-rw-r--r--community/ming/PKGBUILD8
-rw-r--r--community/pidgin-lwqq/PKGBUILD6
-rw-r--r--community/plan9port/PKGBUILD12
-rw-r--r--community/uwsgi/PKGBUILD7
-rw-r--r--community/xcircuit/PKGBUILD6
-rw-r--r--core/glibc/PKGBUILD11
-rw-r--r--core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch485
-rw-r--r--core/m4/PKGBUILD24
-rw-r--r--extra/leveldb/PKGBUILD6
-rw-r--r--extra/libdvbpsi/PKGBUILD6
-rw-r--r--extra/phonon-vlc/PKGBUILD4
-rw-r--r--extra/vlc/PKGBUILD25
-rw-r--r--extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch29
-rw-r--r--pcr/ii/PKGBUILD30
-rw-r--r--pcr/sic/PKGBUILD32
19 files changed, 619 insertions, 118 deletions
diff --git a/community/awesome/awesome.desktop b/community/awesome/awesome.desktop
deleted file mode 100644
index 453399c6e..000000000
--- a/community/awesome/awesome.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Awesome
-Comment=Highly configurable framework window manager
-Type=XSession
-Exec=awesome
-TryExec=awesome
diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index ae9c6ce71..36ce20149 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96696 2013-09-03 03:55:15Z fyan $
+# $Id: PKGBUILD 97633 2013-09-26 06:11:29Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
@@ -14,7 +14,7 @@ pkgname=fcitx-mozc
pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
pkgver=1.11.1522.102
_patchver=${pkgver}.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://code.google.com/p/mozc/"
license=('custom')
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index 40e623d1a..35d7a4484 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 94235 2013-07-17 12:26:33Z fyan $
+# $Id: PKGBUILD 97631 2013-09-26 04:10:56Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: csslayer <wengxt AT gmail com>
pkgbase=fcitx
pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
-pkgver=4.2.8.1
-pkgrel=2
+pkgver=4.2.8.2
+pkgrel=1
groups=('fcitx-im')
arch=('i686' 'x86_64')
url="http://fcitx-im.org"
@@ -23,6 +23,7 @@ build() {
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc \
-DFORCE_OPENCC=ON \
-DFORCE_PRESAGE=ON \
-DFORCE_ENCHANT=ON \
@@ -102,7 +103,7 @@ package_fcitx-gtk3() {
}
package_fcitx-qt4() {
- pkgdesc='QT4 IM Module for fcitx'
+ pkgdesc='Qt4 IM Module for fcitx'
depends=('qt4' "fcitx>=$pkgver")
replaces=('fcitx-qt')
provides=('fcitx-qt')
@@ -118,4 +119,4 @@ package_fcitx-qt4() {
make DESTDIR="${pkgdir}" install
}
-sha512sums=('981e07830693b9525f8f8c7f18579477c066a19ae9358d8aa96ae5439cc3d40f7af2ad24b8cbd24410a5472d002a02eccb8c9d042019cd8459fd094e302d5a72')
+sha512sums=('57945d1bacf80b112a4c5fd8454931f7014036ad1b7b81161be184c3c4d6e31c501f90361bd7327ebaef651f162eb450a6def4c726bd7159c3794b7606b3c2e2')
diff --git a/community/gtest/PKGBUILD b/community/gtest/PKGBUILD
index efc2ab416..665d9df7c 100644
--- a/community/gtest/PKGBUILD
+++ b/community/gtest/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 80934 2012-12-07 06:58:41Z fyan $
+# $Id: PKGBUILD 97632 2013-09-26 06:11:28Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Alexandre Bique <bique.alexandre@gmail.com>
# Contributor: Louis R. Marascio <lrm@fitnr.com>
# Contributor: Cody Maloney <cmaloney@theoreticalchaos.com>
pkgname=gtest
-pkgver=1.6.0
-pkgrel=7
+pkgver=1.7.0
+pkgrel=1
pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
arch=('i686' 'x86_64')
url="http://code.google.com/p/googletest/"
@@ -15,7 +15,6 @@ options=('!libtool')
depends=('gcc-libs' 'sh')
makedepends=('python2' 'cmake')
source=("http://googletest.googlecode.com/files/$pkgname-$pkgver.zip")
-sha1sums=('00d6be170eb9fc3b2198ffdcb1f1d6ba7fc6e621')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -30,14 +29,15 @@ build() {
package() {
cd "$srcdir/$pkgname-$pkgver"
- mkdir -pm 0755 $pkgdir/usr/{lib,include/gtest/internal,share/licenses/$pkgname,src/gtest/src,src/gtest/cmake}
- install -m 0644 build/libgtest{,_main}.so $pkgdir/usr/lib/
- install -m 0644 include/gtest/*.h $pkgdir/usr/include/gtest/
- install -m 0644 include/gtest/internal/*.h $pkgdir/usr/include/gtest/internal/
- install -m 0644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
- install -m 0644 $srcdir/$pkgname-$pkgver/fused-src/gtest/* $pkgdir/usr/src/gtest/src
- install -m 0644 $srcdir/$pkgname-$pkgver/CMakeLists.txt $pkgdir/usr/src/gtest
- install -m 0644 $srcdir/$pkgname-$pkgver/cmake/* $pkgdir/usr/src/gtest/cmake
+ mkdir -pm 0755 "$pkgdir"/usr/{lib,include/gtest/internal,share/licenses/$pkgname,src/gtest/src,src/gtest/cmake}
+ install -m 0644 build/libgtest{,_main}.so "$pkgdir"/usr/lib
+ install -m 0644 include/gtest/*.h "$pkgdir"/usr/include/gtest
+ install -m 0644 include/gtest/internal/*.h "$pkgdir"/usr/include/gtest/internal/
+ install -m 0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/
+ install -m 0644 "$srcdir/$pkgname-$pkgver/fused-src/gtest"/* "$pkgdir"/usr/src/gtest/src/
+ install -m 0644 "$srcdir/$pkgname-$pkgver/CMakeLists.txt" "$pkgdir"/usr/src/gtest/
+ install -m 0644 "$srcdir/$pkgname-$pkgver/cmake"/* "$pkgdir"/usr/src/gtest/cmake/
}
# vim:set ts=2 sw=2 et:
+sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07')
diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD
index 423865a86..87f4707cf 100644
--- a/community/ming/PKGBUILD
+++ b/community/ming/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: mar77i <mysatyre at gmail dot com>
pkgname=ming
-pkgver=0.4.4
-pkgrel=2
+pkgver=0.4.5
+pkgrel=1
pkgdesc="SWF output library"
arch=('i686' 'x86_64')
url="http://www.libming.net/"
@@ -12,11 +12,10 @@ depends=('freetype2' 'libpng' 'flex')
makedepends=('bison' 'pkg-config' 'python2')
options=('!libtool' '!emptydirs')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('9e780f93670eaf68b1eefa6cdfc1d1e2')
+md5sums=('73bcbcb837f3872ef1a936c539a2513c')
build() {
cd "$srcdir"/$pkgname-$pkgver/
- sed -i -e 's/ifndef HAVE_VASPRINTF/ifdef HAVE_VASPRINTF/' util/decompile.c util/makeswf.c
LDFLAGS="${LDFLAGS/ -Wl,--as-needed/}"
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-python
make
@@ -26,3 +25,4 @@ package() {
cd "$srcdir"/$pkgname-$pkgver/
make DESTDIR="$pkgdir" install
}
+
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index fa4c693b7..9fd41f865 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97423 2013-09-19 10:16:34Z fyan $
+# $Id: PKGBUILD 97645 2013-09-26 13:29:45Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgname=pidgin-lwqq
-pkgver=0.2a.20130919
-_commit=ec60dc53d5387e1b285878fbcd57ffe6df16790f
+pkgver=0.2a.20130925
+_commit=0aa045727a803fb22fcc3d0ec5b54a3556355f97
pkgrel=1
pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
arch=('i686' 'x86_64')
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index fd9157b4b..3769cfbd8 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88636 2013-04-20 19:00:12Z arodseth $
+# $Id: PKGBUILD 97651 2013-09-26 18:54:27Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: phrakture <aaronmgriffin--gmail--com>
# Contributor: Fazlul Shahriar
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
pkgname=plan9port
-pkgver=20130320
+pkgver=20130926
pkgrel=1
pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
arch=('x86_64' 'i686')
@@ -18,16 +18,16 @@ install='plan9.install'
options=('!zipman')
source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz"
'plan9.sh')
-sha256sums=('49a5e6c97c76f0846c45791bda10d6b3ba5c4453855e401980e8e04f92e830fa'
+sha256sums=('9ba90b04bc45bec3e197e6c12f68f270c15ba1a9f68a6051e1f2b99503b6b2a7'
'0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d')
package() {
- cd "$srcdir/plan9"
+ cd plan9
- # Package
./INSTALL -b
install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh"
- mkdir -p "$pkgdir/opt" "$pkgdir/usr/share/doc/$pkgname"
+ install -d "$pkgdir/opt"
+ install -d "$pkgdir/usr/share/doc/$pkgname"
cp -r "$srcdir/plan9" "$pkgdir/opt/"
cd "$pkgdir/opt/plan9"
./INSTALL -c -r "$pkgdir/opt/plan9"
diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD
index 9829db0f7..92f172db4 100644
--- a/community/uwsgi/PKGBUILD
+++ b/community/uwsgi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97172 2013-09-14 20:33:55Z dwallace $
+# $Id: PKGBUILD 97628 2013-09-25 23:54:48Z dwallace $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
# Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -23,7 +23,7 @@ pkgname=(uwsgi
uwsgi-plugin-pam
uwsgi-plugin-zergpool
)
-pkgver=1.9.16
+pkgver=1.9.17
pkgrel=1
arch=(i686 x86_64)
url="http://projects.unbit.it/$pkgbase"
@@ -40,7 +40,8 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
uwsgi_fix_rpath.patch
uwsgi_ruby20_compatibility.patch
uwsgi_trick_chroot.patch)
-md5sums=('71fdc369d595ec40776ad954c6ea346b'
+
+md5sums=('0e05fe94aa6065a65fb1f54b327f6702'
'fcd57c37372e6afe5b1fae151dd43bc9'
'b05ba1d796e1ea608a40635bc4f3ec67'
'740a7718bd341b03d916a13ddbbbe694'
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index 8296b7daa..2e69542a3 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94361 2013-07-22 11:21:13Z spupykin $
+# $Id: PKGBUILD 97641 2013-09-26 10:52:31Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Giovanni Scafora <linuxmania@gmail.com>
# Contributor: simo <simo@archlinux.org>
pkgname=xcircuit
-pkgver=3.7.51
+pkgver=3.7.52
pkgrel=1
pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL2')
depends=('tk' 'libxpm' 'zlib')
makedepends=('chrpath')
source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz)
-md5sums=('a3f5d10f6f96a6298505801f4d0f6190')
+md5sums=('b39a2dcce9c3844ee2e6f9b477c501f5')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 1ffcd8697..c0cf2112b 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194434 2013-09-16 11:00:09Z allan $
+# $Id: PKGBUILD 195163 2013-09-26 03:20:58Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
pkgname=glibc
pkgver=2.18
-pkgrel=4
+pkgrel=5
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
@@ -23,6 +23,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
glibc-2.18-readdir_r-CVE-2013-4237.patch
glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+ glibc-2.18-ptr-mangle-CVE-2013-4788.patch
glibc-2.18-strstr-hackfix.patch
nscd.service
nscd.tmpfiles
@@ -33,6 +34,7 @@ md5sums=('88fbbceafee809e82efd52efa1e3c58f'
'154da6bf5a5248f42a7bf5bf08e01a47'
'b79561ab9dce900e9bbeaf0d49927c2b'
'c7264b99d0f7e51922a4d3126182c40a'
+ '9749ba386b08a8fe53e7ecede9bf2dfb'
'4441f6dfe7d75ced1fa75e54dd21d36e'
'd5fab2cd3abea65aa5ae696ea4a47d6b'
'da662ca76e7c8d7efbc7986ab7acea2d'
@@ -48,11 +50,14 @@ prepare() {
# upstream commits 1159a193, 55e17aad and b73ed247
patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
- # upstream commit 1326ba1a and two not yet committed patches
+ # upstream commits 1326ba1a, 141f3a77 and 303e567a
# https://sourceware.org/ml/libc-alpha/2013-08/msg00394.html
# https://sourceware.org/ml/libc-alpha/2013-08/msg00462.html
patch -p1 -i $srcdir/glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+ # upstream commits c61b4d41 and 0b1f8e35
+ patch -p1 -i $srcdir/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
+
# hack fix for strstr issues on x86
patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
diff --git a/core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch b/core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
new file mode 100644
index 000000000..09a439440
--- /dev/null
+++ b/core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
@@ -0,0 +1,485 @@
+diff --git a/csu/libc-start.c b/csu/libc-start.c
+index e5da3ef..c898d06 100644
+--- a/csu/libc-start.c
++++ b/csu/libc-start.c
+@@ -37,6 +37,12 @@ extern void __pthread_initialize_minimal (void);
+ in thread local area. */
+ uintptr_t __stack_chk_guard attribute_relro;
+ # endif
++# ifndef THREAD_SET_POINTER_GUARD
++/* Only exported for architectures that don't store the pointer guard
++ value in thread local area. */
++uintptr_t __pointer_chk_guard_local
++ attribute_relro attribute_hidden __attribute__ ((nocommon));
++# endif
+ #endif
+
+ #ifdef HAVE_PTR_NTHREADS
+@@ -195,6 +201,16 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
+ # else
+ __stack_chk_guard = stack_chk_guard;
+ # endif
++
++ /* Set up the pointer guard value. */
++ uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random,
++ stack_chk_guard);
++# ifdef THREAD_SET_POINTER_GUARD
++ THREAD_SET_POINTER_GUARD (pointer_chk_guard);
++# else
++ __pointer_chk_guard_local = pointer_chk_guard;
++# endif
++
+ #endif
+
+ /* Register the destructor of the dynamic linker if there is any. */
+diff --git a/elf/Makefile b/elf/Makefile
+index aaa9534..cb8da93 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -121,7 +121,8 @@ endif
+ tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 \
+ tst-array1 tst-array2 tst-array3 tst-array4 tst-array5
+ tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static \
+- tst-leaks1-static tst-array1-static tst-array5-static
++ tst-leaks1-static tst-array1-static tst-array5-static \
++ tst-ptrguard1-static
+ ifeq (yes,$(build-shared))
+ tests-static += tst-tls9-static
+ tst-tls9-static-ENV = \
+@@ -145,7 +146,8 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
+ tst-audit1 tst-audit2 tst-audit8 \
+ tst-stackguard1 tst-addr1 tst-thrlock \
+ tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
+- tst-initorder tst-initorder2 tst-relsort1 tst-null-argv
++ tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \
++ tst-ptrguard1
+ # reldep9
+ test-srcs = tst-pathopt
+ selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
+@@ -1016,6 +1018,9 @@ LDFLAGS-order2mod2.so = $(no-as-needed)
+ tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"
+ tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
+
++tst-ptrguard1-ARGS = --command "$(host-test-program-cmd) --child"
++tst-ptrguard1-static-ARGS = --command "$(objpfx)tst-ptrguard1-static --child"
++
+ $(objpfx)tst-leaks1: $(libdl)
+ $(objpfx)tst-leaks1-mem: $(objpfx)tst-leaks1.out
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1.mtrace > $@
+diff --git a/elf/tst-ptrguard1-static.c b/elf/tst-ptrguard1-static.c
+new file mode 100644
+index 0000000..7aff3b7
+--- /dev/null
++++ b/elf/tst-ptrguard1-static.c
+@@ -0,0 +1 @@
++#include "tst-ptrguard1.c"
+diff --git a/elf/tst-ptrguard1.c b/elf/tst-ptrguard1.c
+new file mode 100644
+index 0000000..c344a04
+--- /dev/null
++++ b/elf/tst-ptrguard1.c
+@@ -0,0 +1,202 @@
++/* Copyright (C) 2013 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++#include <errno.h>
++#include <stdbool.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/wait.h>
++#include <stackguard-macros.h>
++#include <tls.h>
++#include <unistd.h>
++
++#ifndef POINTER_CHK_GUARD
++extern uintptr_t __pointer_chk_guard;
++# define POINTER_CHK_GUARD __pointer_chk_guard
++#endif
++
++static const char *command;
++static bool child;
++static uintptr_t ptr_chk_guard_copy;
++static bool ptr_chk_guard_copy_set;
++static int fds[2];
++
++static void __attribute__ ((constructor))
++con (void)
++{
++ ptr_chk_guard_copy = POINTER_CHK_GUARD;
++ ptr_chk_guard_copy_set = true;
++}
++
++static int
++uintptr_t_cmp (const void *a, const void *b)
++{
++ if (*(uintptr_t *) a < *(uintptr_t *) b)
++ return 1;
++ if (*(uintptr_t *) a > *(uintptr_t *) b)
++ return -1;
++ return 0;
++}
++
++static int
++do_test (void)
++{
++ if (!ptr_chk_guard_copy_set)
++ {
++ puts ("constructor has not been run");
++ return 1;
++ }
++
++ if (ptr_chk_guard_copy != POINTER_CHK_GUARD)
++ {
++ puts ("POINTER_CHK_GUARD changed between constructor and do_test");
++ return 1;
++ }
++
++ if (child)
++ {
++ write (2, &ptr_chk_guard_copy, sizeof (ptr_chk_guard_copy));
++ return 0;
++ }
++
++ if (command == NULL)
++ {
++ puts ("missing --command or --child argument");
++ return 1;
++ }
++
++#define N 16
++ uintptr_t child_ptr_chk_guards[N + 1];
++ child_ptr_chk_guards[N] = ptr_chk_guard_copy;
++ int i;
++ for (i = 0; i < N; ++i)
++ {
++ if (pipe (fds) < 0)
++ {
++ printf ("couldn't create pipe: %m\n");
++ return 1;
++ }
++
++ pid_t pid = fork ();
++ if (pid < 0)
++ {
++ printf ("fork failed: %m\n");
++ return 1;
++ }
++
++ if (!pid)
++ {
++ if (ptr_chk_guard_copy != POINTER_CHK_GUARD)
++ {
++ puts ("POINTER_CHK_GUARD changed after fork");
++ exit (1);
++ }
++
++ close (fds[0]);
++ close (2);
++ dup2 (fds[1], 2);
++ close (fds[1]);
++
++ system (command);
++ exit (0);
++ }
++
++ close (fds[1]);
++
++ if (TEMP_FAILURE_RETRY (read (fds[0], &child_ptr_chk_guards[i],
++ sizeof (uintptr_t))) != sizeof (uintptr_t))
++ {
++ puts ("could not read ptr_chk_guard value from child");
++ return 1;
++ }
++
++ close (fds[0]);
++
++ pid_t termpid;
++ int status;
++ termpid = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0));
++ if (termpid == -1)
++ {
++ printf ("waitpid failed: %m\n");
++ return 1;
++ }
++ else if (termpid != pid)
++ {
++ printf ("waitpid returned %ld != %ld\n",
++ (long int) termpid, (long int) pid);
++ return 1;
++ }
++ else if (!WIFEXITED (status) || WEXITSTATUS (status))
++ {
++ puts ("child hasn't exited with exit status 0");
++ return 1;
++ }
++ }
++
++ qsort (child_ptr_chk_guards, N + 1, sizeof (uintptr_t), uintptr_t_cmp);
++
++ /* The default pointer guard is the same as the default stack guard.
++ They are only set to default if dl_random is NULL. */
++ uintptr_t default_guard = 0;
++ unsigned char *p = (unsigned char *) &default_guard;
++ p[sizeof (uintptr_t) - 1] = 255;
++ p[sizeof (uintptr_t) - 2] = '\n';
++ p[0] = 0;
++
++ /* Test if the pointer guard canaries are either randomized,
++ or equal to the default pointer guard value.
++ Even with randomized pointer guards it might happen
++ that the random number generator generates the same
++ values, but if that happens in more than half from
++ the 16 runs, something is very wrong. */
++ int ndifferences = 0;
++ int ndefaults = 0;
++ for (i = 0; i < N; ++i)
++ {
++ if (child_ptr_chk_guards[i] != child_ptr_chk_guards[i+1])
++ ndifferences++;
++ else if (child_ptr_chk_guards[i] == default_guard)
++ ndefaults++;
++ }
++
++ printf ("differences %d defaults %d\n", ndifferences, ndefaults);
++
++ if (ndifferences < N / 2 && ndefaults < N / 2)
++ {
++ puts ("pointer guard values are not randomized enough");
++ puts ("nor equal to the default value");
++ return 1;
++ }
++
++ return 0;
++}
++
++#define OPT_COMMAND 10000
++#define OPT_CHILD 10001
++#define CMDLINE_OPTIONS \
++ { "command", required_argument, NULL, OPT_COMMAND }, \
++ { "child", no_argument, NULL, OPT_CHILD },
++#define CMDLINE_PROCESS \
++ case OPT_COMMAND: \
++ command = optarg; \
++ break; \
++ case OPT_CHILD: \
++ child = true; \
++ break;
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/ports/sysdeps/ia64/stackguard-macros.h b/ports/sysdeps/ia64/stackguard-macros.h
+index dc683c2..3907293 100644
+--- a/ports/sysdeps/ia64/stackguard-macros.h
++++ b/ports/sysdeps/ia64/stackguard-macros.h
+@@ -2,3 +2,6 @@
+
+ #define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("adds %0 = -8, r13;; ld8 %0 = [%0]" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++ ({ uintptr_t x; asm ("adds %0 = -16, r13;; ld8 %0 = [%0]" : "=r" (x)); x; })
+diff --git a/ports/sysdeps/tile/stackguard-macros.h b/ports/sysdeps/tile/stackguard-macros.h
+index 589ea2b..f2e041b 100644
+--- a/ports/sysdeps/tile/stackguard-macros.h
++++ b/ports/sysdeps/tile/stackguard-macros.h
+@@ -4,11 +4,17 @@
+ # if __WORDSIZE == 64
+ # define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("addi %0, tp, -16; ld %0, %0" : "=r" (x)); x; })
++# define POINTER_CHK_GUARD \
++ ({ uintptr_t x; asm ("addi %0, tp, -24; ld %0, %0" : "=r" (x)); x; })
+ # else
+ # define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("addi %0, tp, -8; ld4s %0, %0" : "=r" (x)); x; })
++# define POINTER_CHK_GUARD \
++ ({ uintptr_t x; asm ("addi %0, tp, -12; ld4s %0, %0" : "=r" (x)); x; })
+ # endif
+ #else
+ # define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("addi %0, tp, -8; lw %0, %0" : "=r" (x)); x; })
++# define POINTER_CHK_GUARD \
++ ({ uintptr_t x; asm ("addi %0, tp, -12; lw %0, %0" : "=r" (x)); x; })
+ #endif
+diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h
+index ababf65..4fa3d96 100644
+--- a/sysdeps/generic/stackguard-macros.h
++++ b/sysdeps/generic/stackguard-macros.h
+@@ -2,3 +2,6 @@
+
+ extern uintptr_t __stack_chk_guard;
+ #define STACK_CHK_GUARD __stack_chk_guard
++
++extern uintptr_t __pointer_chk_guard_local;
++#define POINTER_CHK_GUARD __pointer_chk_guard_local
+diff --git a/sysdeps/i386/stackguard-macros.h b/sysdeps/i386/stackguard-macros.h
+index 8c31e19..0397629 100644
+--- a/sysdeps/i386/stackguard-macros.h
++++ b/sysdeps/i386/stackguard-macros.h
+@@ -2,3 +2,11 @@
+
+ #define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("movl %%gs:0x14, %0" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++ ({ \
++ uintptr_t x; \
++ asm ("movl %%gs:%c1, %0" : "=r" (x) \
++ : "i" (offsetof (tcbhead_t, pointer_guard))); \
++ x; \
++ })
+diff --git a/sysdeps/powerpc/powerpc32/stackguard-macros.h b/sysdeps/powerpc/powerpc32/stackguard-macros.h
+index 839f6a4..b3d0af8 100644
+--- a/sysdeps/powerpc/powerpc32/stackguard-macros.h
++++ b/sysdeps/powerpc/powerpc32/stackguard-macros.h
+@@ -2,3 +2,13 @@
+
+ #define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("lwz %0,-28680(2)" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++ ({ \
++ uintptr_t x; \
++ asm ("lwz %0,%1(2)" \
++ : "=r" (x) \
++ : "i" (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t)) \
++ ); \
++ x; \
++ })
+diff --git a/sysdeps/powerpc/powerpc64/stackguard-macros.h b/sysdeps/powerpc/powerpc64/stackguard-macros.h
+index 9da879c..4620f96 100644
+--- a/sysdeps/powerpc/powerpc64/stackguard-macros.h
++++ b/sysdeps/powerpc/powerpc64/stackguard-macros.h
+@@ -2,3 +2,13 @@
+
+ #define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("ld %0,-28688(13)" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++ ({ \
++ uintptr_t x; \
++ asm ("ld %0,%1(2)" \
++ : "=r" (x) \
++ : "i" (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t)) \
++ ); \
++ x; \
++ })
+diff --git a/sysdeps/s390/s390-32/stackguard-macros.h b/sysdeps/s390/s390-32/stackguard-macros.h
+index b74c579..449e8d4 100644
+--- a/sysdeps/s390/s390-32/stackguard-macros.h
++++ b/sysdeps/s390/s390-32/stackguard-macros.h
+@@ -2,3 +2,14 @@
+
+ #define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=a" (x)); x; })
++
++/* On s390/s390x there is no unique pointer guard, instead we use the
++ same value as the stack guard. */
++#define POINTER_CHK_GUARD \
++ ({ \
++ uintptr_t x; \
++ asm ("ear %0,%%a0; l %0,%1(%0)" \
++ : "=a" (x) \
++ : "i" (offsetof (tcbhead_t, stack_guard))); \
++ x; \
++ })
+diff --git a/sysdeps/s390/s390-64/stackguard-macros.h b/sysdeps/s390/s390-64/stackguard-macros.h
+index 0cebb5f..c8270fb 100644
+--- a/sysdeps/s390/s390-64/stackguard-macros.h
++++ b/sysdeps/s390/s390-64/stackguard-macros.h
+@@ -2,3 +2,17 @@
+
+ #define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("ear %0,%%a0; sllg %0,%0,32; ear %0,%%a1; lg %0,0x28(%0)" : "=a" (x)); x; })
++
++/* On s390/s390x there is no unique pointer guard, instead we use the
++ same value as the stack guard. */
++#define POINTER_CHK_GUARD \
++ ({ \
++ uintptr_t x; \
++ asm ("ear %0,%%a0;" \
++ "sllg %0,%0,32;" \
++ "ear %0,%%a1;" \
++ "lg %0,%1(%0)" \
++ : "=a" (x) \
++ : "i" (offsetof (tcbhead_t, stack_guard))); \
++ x; \
++ })
+diff --git a/sysdeps/sparc/sparc32/stackguard-macros.h b/sysdeps/sparc/sparc32/stackguard-macros.h
+index c0b02b0..1eef0f1 100644
+--- a/sysdeps/sparc/sparc32/stackguard-macros.h
++++ b/sysdeps/sparc/sparc32/stackguard-macros.h
+@@ -2,3 +2,6 @@
+
+ #define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("ld [%%g7+0x14], %0" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++ ({ uintptr_t x; asm ("ld [%%g7+0x18], %0" : "=r" (x)); x; })
+diff --git a/sysdeps/sparc/sparc64/stackguard-macros.h b/sysdeps/sparc/sparc64/stackguard-macros.h
+index 80f0635..cc0c12c 100644
+--- a/sysdeps/sparc/sparc64/stackguard-macros.h
++++ b/sysdeps/sparc/sparc64/stackguard-macros.h
+@@ -2,3 +2,6 @@
+
+ #define STACK_CHK_GUARD \
+ ({ uintptr_t x; asm ("ldx [%%g7+0x28], %0" : "=r" (x)); x; })
++
++#define POINTER_CHK_GUARD \
++ ({ uintptr_t x; asm ("ldx [%%g7+0x30], %0" : "=r" (x)); x; })
+diff --git a/sysdeps/x86_64/stackguard-macros.h b/sysdeps/x86_64/stackguard-macros.h
+index d7fedb3..1948800 100644
+--- a/sysdeps/x86_64/stackguard-macros.h
++++ b/sysdeps/x86_64/stackguard-macros.h
+@@ -4,3 +4,8 @@
+ ({ uintptr_t x; \
+ asm ("mov %%fs:%c1, %0" : "=r" (x) \
+ : "i" (offsetof (tcbhead_t, stack_guard))); x; })
++
++#define POINTER_CHK_GUARD \
++ ({ uintptr_t x; \
++ asm ("mov %%fs:%c1, %0" : "=r" (x) \
++ : "i" (offsetof (tcbhead_t, pointer_guard))); x; })
+diff --git a/elf/Makefile b/elf/Makefile
+index cb8da93..27d249b 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -1019,6 +1019,9 @@ tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"
+ tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
+
+ tst-ptrguard1-ARGS = --command "$(host-test-program-cmd) --child"
++# When built statically, the pointer guard interface uses
++# __pointer_chk_guard_local.
++CFLAGS-tst-ptrguard1-static.c = -DPTRGUARD_LOCAL
+ tst-ptrguard1-static-ARGS = --command "$(objpfx)tst-ptrguard1-static --child"
+
+ $(objpfx)tst-leaks1: $(libdl)
+diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h
+index 4fa3d96..b4a6b23 100644
+--- a/sysdeps/generic/stackguard-macros.h
++++ b/sysdeps/generic/stackguard-macros.h
+@@ -3,5 +3,10 @@
+ extern uintptr_t __stack_chk_guard;
+ #define STACK_CHK_GUARD __stack_chk_guard
+
++#ifdef PTRGUARD_LOCAL
+ extern uintptr_t __pointer_chk_guard_local;
+-#define POINTER_CHK_GUARD __pointer_chk_guard_local
++# define POINTER_CHK_GUARD __pointer_chk_guard_local
++#else
++extern uintptr_t __pointer_chk_guard;
++# define POINTER_CHK_GUARD __pointer_chk_guard
++#endif
diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD
index d0e2ffb5a..57d7ddd24 100644
--- a/core/m4/PKGBUILD
+++ b/core/m4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183048 2013-04-17 02:02:03Z allan $
+# $Id: PKGBUILD 195164 2013-09-26 03:20:59Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=m4
-pkgver=1.4.16
-pkgrel=3
+pkgver=1.4.17
+pkgrel=1
pkgdesc="The GNU macro processor"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/m4"
@@ -12,21 +12,9 @@ license=('GPL3')
groups=('base-devel')
depends=('glibc' 'bash')
install=m4.install
-source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
- m4-1.4.16-readlink-einval.patch)
-md5sums=('7548ec061a1ba993790159764f522d0e'
- 'SKIP'
- 'cea138fa9b568d06e46269611cec8dd0')
-
-prepare() {
- cd ${srcdir}/$pkgname-$pkgver
-
- # glibc-2.16 compatibility
- sed -i -e '/gets is a/d' lib/stdio.in.h
-
- # patch testsuite failure with newer kernels
- patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch
-}
+source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('12a3c829301a4fd6586a57d3fcf196dc'
+ 'SKIP')
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index 5f02a69b2..614aadc62 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193955 2013-09-07 18:36:17Z dreisner $
+# $Id: PKGBUILD 195162 2013-09-25 22:08:21Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: feydaykyn <feydaykyn@yahoo.fr>
pkgname=leveldb
-pkgver=1.13.0
+pkgver=1.14.0
pkgrel=1
pkgdesc="A fast and lightweight key/value database library"
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="https://code.google.com/p/leveldb/"
license=('BSD')
depends=('gperftools' 'snappy')
source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('1da7c57b43415b3f486af31507302422e5854a20')
+sha1sums=('641d54df4aaf7ee569ae003cfbdb888ebdee0d7f')
build() {
make -C "$pkgname-$pkgver"
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index 2c47fdca7..ef0f43f6f 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184029 2013-05-01 14:46:54Z foutrelis $
+# $Id: PKGBUILD 195173 2013-09-26 15:48:02Z foutrelis $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=libdvbpsi
-pkgver=0.2.2
+pkgver=1.1.0
pkgrel=1
epoch=1
pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables"
@@ -15,7 +15,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5')
conflicts=('libdvbpsi4' 'libdvbpsi5')
url="http://developers.videolan.org/libdvbpsi/"
source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b387e07ffd844b61c7a050c47307c0f7')
+md5sums=('1f84f9d1de08e15f94e6ff9957278064')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index d3e6b3a33..9c3d89653 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177946 2013-02-12 07:43:37Z andrea $
+# $Id: PKGBUILD 195169 2013-09-26 11:04:10Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=phonon-vlc
pkgver=0.6.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://phonon.kde.org/'
pkgdesc="Phonon VLC backend"
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 3e636d515..ca7fdea37 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $
+# $Id: PKGBUILD 195175 2013-09-26 15:49:07Z foutrelis $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc
-pkgver=2.0.8.a
-pkgrel=1
+pkgver=2.1.0
+pkgrel=2
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/"
license=('LGPL2.1' 'GPL2')
depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
- 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska'
- 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp'
+ 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
+ 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms')
makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
- 'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 'oss'
- 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' 'projectm'
+ 'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca'
+ 'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs'
'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' 'mesa')
optdepends=('avahi: for service discovery using bonjour protocol'
@@ -31,7 +31,6 @@ optdepends=('avahi: for service discovery using bonjour protocol'
'libva-intel-driver: back-end for intel cards'
'libbluray: for Blu-Ray support'
'flac: for Free Lossless Audio Codec plugin'
- 'oss: for OSS audio support'
'portaudio: for portaudio support'
'twolame: for TwoLAME mpeg2 encoder plugin'
'projectm: for ProjectM visualisation plugin'
@@ -57,17 +56,14 @@ backup=('usr/share/vlc/lua/http/.hosts'
options=('!libtool' '!emptydirs')
install=vlc.install
source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz"
- vlc-2.0.7-vaapi-compat.patch
- vlc-2.0.8-Fix-live555-breakage-in-last-update.patch)
-md5sums=('e5000677181406d026ffe448633d1ca0'
- '6df10774bb7acf20e09d6139e5c7839e'
- 'e592efe7bb65291a84f99cfaa3a9f8a2')
+vlc-2.0.7-vaapi-compat.patch)
+md5sums=('8c77bda671821f5b9ede96b6816e2ade'
+ '6df10774bb7acf20e09d6139e5c7839e')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver/.a}"
patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch
- patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
@@ -81,7 +77,6 @@ build() {
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-rpath \
- --enable-oss \
--enable-faad \
--enable-nls \
--enable-lirc \
diff --git a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
deleted file mode 100644
index 3006cbc8d..000000000
--- a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb@videolan.org>
-Date: Thu, 25 Jul 2013 01:14:32 +0200
-Subject: [PATCH] Fix live555 breakage in last update
-
----
- modules/demux/live555.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
-index 9e02630..7a1ab16 100644
---- a/modules/demux/live555.cpp
-+++ b/modules/demux/live555.cpp
-@@ -243,7 +243,11 @@ public:
- char const* applicationName, portNumBits tunnelOverHTTPPortNum,
- demux_sys_t *p_sys) :
- RTSPClient( env, rtspURL, verbosityLevel, applicationName,
-- tunnelOverHTTPPortNum )
-+ tunnelOverHTTPPortNum
-+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800
-+ , -1
-+#endif
-+ )
- {
- this->p_sys = p_sys;
- }
---
-1.8.3.4
-
diff --git a/pcr/ii/PKGBUILD b/pcr/ii/PKGBUILD
new file mode 100644
index 000000000..b17cc2d18
--- /dev/null
+++ b/pcr/ii/PKGBUILD
@@ -0,0 +1,30 @@
+# Contributor: Evan Gates <evan.gates@gmail.com>
+# Contributor: Dag Odenhall <dag.odenhall@gmail.com>
+# Contributor: Chris Brannon <cmbrannon@cox.net>
+# Contributor: William Giokas <1007380@gmail.com>
+pkgname=ii
+pkgver=1.7
+pkgrel=2
+pkgdesc="A minimalist FIFO and filesystem-based IRC client"
+license=(MIT)
+arch=(i686 x86_64)
+url=http://tools.suckless.org/ii
+depends=(glibc)
+source=("http://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz")
+
+md5sums=('6191008ca09770873d84f40270493d0e')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make PREFIX=/usr MANDIR=/usr/share/man DESTDIR="$pkgdir" install
+}
diff --git a/pcr/sic/PKGBUILD b/pcr/sic/PKGBUILD
new file mode 100644
index 000000000..b006f95b5
--- /dev/null
+++ b/pcr/sic/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Dag Odenhall <dag.odenhall@gmail.com>
+# Contributor: Giorgio Lando <patroclo7@gmail.com>
+
+pkgname=sic
+pkgver=1.2
+pkgrel=1
+pkgdesc='An extremely simple IRC client.'
+license=('MIT')
+arch=('i686' 'x86_64')
+url='http://tools.suckless.org/sic'
+depends=('glibc')
+source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz")
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
+}
+build() {
+ cd $pkgname-$pkgver
+
+ make PREFIX=/usr MANPREFIX=/usr/share/man
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make PREFIX=/usr MANPREFIX=/usr/share/man DESTDIR="$pkgdir" install
+
+ install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+sha1sums=('a91a603d536ae9cff9a806d6b2737053d262e722')
+sha256sums=('ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185')
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-09-03 14:45:37 +0000