summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-02-07 03:24:01 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-02-07 03:24:01 +0000
commitb4f09e0a566f01cd9a250e2f44423169c70adc94 (patch)
treed407e83c47735fe0d24a6be03937a1d84f41c1cf
parentae5e27e4900c0c38025462f59e0524aef7aa630b (diff)
Fri Feb 7 03:21:50 UTC 2014
-rwxr-xr-xcommunity/cairo-dock-plugins/PKGBUILD4
-rw-r--r--community/i3status/PKGBUILD4
-rw-r--r--community/knemo/PKGBUILD21
-rw-r--r--community/libftdi/PKGBUILD (renamed from extra/libftdi/PKGBUILD)2
-rw-r--r--community/libinfinity/PKGBUILD8
-rw-r--r--community/lxpanel/PKGBUILD8
-rw-r--r--community/mate-netspeed/PKGBUILD6
-rw-r--r--community/mate-system-tools/PKGBUILD8
-rw-r--r--community/python2-gnutls/PKGBUILD4
-rw-r--r--community/python2-gnutls/libraryinit.patch2
-rw-r--r--community/shapelib/PKGBUILD15
-rw-r--r--community/sleuthkit/PKGBUILD8
-rw-r--r--community/sleuthkit/sleuthkit.changelog3
-rw-r--r--community/winff/PKGBUILD15
-rw-r--r--community/xmobar/PKGBUILD4
-rw-r--r--community/yaz/PKGBUILD5
-rw-r--r--community/yaz/yaz.changelog3
-rw-r--r--core/dhcpcd/PKGBUILD22
-rw-r--r--core/dhcpcd/dhcpcd.service4
-rw-r--r--core/openssh/PKGBUILD11
-rw-r--r--core/openssh/lowercase.patch32
-rw-r--r--core/s-nail/PKGBUILD9
-rw-r--r--core/s-nail/mimeheader.patch147
-rw-r--r--core/wireless_tools/PKGBUILD21
-rw-r--r--core/wireless_tools/dense.patch49
-rw-r--r--extra/claws-mail/PKGBUILD6
-rw-r--r--extra/conky/PKGBUILD4
-rw-r--r--extra/git/PKGBUILD6
-rw-r--r--extra/kdebase-workspace/PKGBUILD5
-rw-r--r--extra/libchamplain/PKGBUILD6
-rw-r--r--extra/libetpan/PKGBUILD21
-rw-r--r--extra/moc/PKGBUILD35
-rw-r--r--extra/moc/moc-ffmpeg.patch557
-rw-r--r--extra/php-apcu/PKGBUILD6
-rw-r--r--extra/php/PKGBUILD6
-rw-r--r--extra/python-iwscan/PKGBUILD13
-rw-r--r--extra/python-pycurl/PKGBUILD (renamed from extra/pycurl/PKGBUILD)39
-rw-r--r--extra/qt5/PKGBUILD8
-rw-r--r--extra/qtcreator/PKGBUILD8
-rw-r--r--extra/qtcreator/qtcreator.desktop2
-rw-r--r--kernels/pax-flags-libre/games.conf18
-rwxr-xr-xkernels/pax-flags-libre/pax-flags-libre.sh13
-rw-r--r--libre/reflector/PKGBUILD43
-rw-r--r--~lukeshu/dunst-lukeshu-git/PKGBUILD42
44 files changed, 363 insertions, 890 deletions
diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD
index 19d1e76af..e5e736130 100755
--- a/community/cairo-dock-plugins/PKGBUILD
+++ b/community/cairo-dock-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99702 2013-10-30 23:07:09Z alucryd $
+# $Id: PKGBUILD 105391 2014-02-06 16:23:43Z andyrtr $
# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
# Contributor: Tofe <chris dot chapuis at gmail dot com>
# Contributor: zhuqin <zhuqin83 at gmail dot com>
@@ -7,7 +7,7 @@
pkgname=cairo-dock-plugins
pkgver=3.3.2
-pkgrel=1
+pkgrel=2
pkgdesc='Plugins for Cairo-Dock'
arch=('i686' 'x86_64')
url="https://launchpad.net/${pkgname%-*}-plug-ins"
diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD
index 649bb51c1..7342a29c4 100644
--- a/community/i3status/PKGBUILD
+++ b/community/i3status/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 103554 2014-01-07 21:43:33Z ttoepper $
+# $Id: PKGBUILD 105366 2014-02-06 05:24:12Z bisson $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
pkgname=i3status
pkgver=2.8
-pkgrel=1
+pkgrel=2
pkgdesc='Generates status bar to use with i3bar, dzen2 or xmobar'
arch=('i686' 'x86_64')
url='http://i3.zekjur.net/i3status/'
diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD
index 5995a13dd..50cab6ec1 100644
--- a/community/knemo/PKGBUILD
+++ b/community/knemo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85916 2013-03-08 23:40:41Z foutrelis $
+# $Id: PKGBUILD 105367 2014-02-06 05:24:13Z bisson $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
pkgname=knemo
pkgver=0.7.6
-pkgrel=3
+pkgrel=4
pkgdesc="The KDE Network Monitor"
arch=('i686' 'x86_64')
url="http://www.kde-apps.org/content/show.php?content=12956"
@@ -15,25 +15,26 @@ depends=('kdebase-workspace' 'wireless_tools' 'iw' 'libnl' 'gtk-update-icon-cach
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
options=('libtool')
-source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2")
+source=(https://launchpad.net/ubuntu/+archive/primary/+files/knemo_$pkgver.orig.tar.bz2)
md5sums=('42b35d4d48698a2f514adeb2ca872408')
-build() {
- cd ${srcdir}
-
+prepare() {
mkdir build
+}
+
+build() {
cd build
+
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
- cd ${srcdir}/build
-
- make DESTDIR=${pkgdir} install
+ cd build
+ make DESTDIR="${pkgdir}" install
# remove knemo autostart
# rm -rf ${pkgdir}/usr/share/autostart
diff --git a/extra/libftdi/PKGBUILD b/community/libftdi/PKGBUILD
index d269075a6..08d225b72 100644
--- a/extra/libftdi/PKGBUILD
+++ b/community/libftdi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205481 2014-02-05 19:47:07Z eric $
+# $Id: PKGBUILD 105380 2014-02-06 10:28:29Z bpiotrowski $
# Maintainer:
pkgname=libftdi
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index e5cbee89f..de8e0afdd 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100198 2013-11-01 21:12:34Z spupykin $
+# $Id: PKGBUILD 105374 2014-02-06 09:23:52Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Gregory Haynes <greg@greghaynes.net>
pkgname=libinfinity
-pkgver=0.5.4
-pkgrel=2
+pkgver=0.5.5
+pkgrel=1
pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
arch=('i686' 'x86_64')
url="http://gobby.0x539.de"
@@ -15,7 +15,7 @@ makedepends=('gtk-doc' 'pkgconfig')
optdepends=('avahi: zeroconf support'
'gtk2: gtk support')
source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1e83ec8b3ed3159d0c883c056b153429')
+md5sums=('93a0cd2b73c9298aa77ee37503d2bc5f')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index ba5c7dc83..adf8ae827 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98054 2013-10-04 17:26:39Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 105368 2014-02-06 05:24:14Z bisson $
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
pkgname=lxpanel
pkgver=0.6.1
-pkgrel=1
+pkgrel=2
pkgdesc='Lightweight X11 desktop panel for LXDE'
arch=('i686' 'x86_64')
license=('GPL2')
@@ -22,7 +22,7 @@ build() {
CFLAGS+=' -lgmodule-2.0' ./configure \
--sysconfdir=/etc \
--prefix=/usr \
- --enable-man
+ --enable-man
make
}
diff --git a/community/mate-netspeed/PKGBUILD b/community/mate-netspeed/PKGBUILD
index 37dfa6017..883a6a108 100644
--- a/community/mate-netspeed/PKGBUILD
+++ b/community/mate-netspeed/PKGBUILD
@@ -1,11 +1,9 @@
-# $Id: PKGBUILD 104242 2014-01-16 17:54:33Z flexiondotorg $
+# $Id: PKGBUILD 105369 2014-02-06 05:24:15Z bisson $
# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
pkgname=mate-netspeed
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
pkgdesc="A MATE applet that shows how much traffic occurs on a specified network device."
url="http://mate-desktop.org"
arch=('i686' 'x86_64')
diff --git a/community/mate-system-tools/PKGBUILD b/community/mate-system-tools/PKGBUILD
index 55f89914e..c3301560e 100644
--- a/community/mate-system-tools/PKGBUILD
+++ b/community/mate-system-tools/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 104274 2014-01-16 19:22:48Z flexiondotorg $
+# $Id: PKGBUILD 105370 2014-02-06 05:24:16Z bisson $
# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
pkgname=mate-system-tools
pkgver=1.6.0
-pkgrel=8
+pkgrel=9
pkgdesc="Suite of tools for MATE to simplify configuring workstations."
url="http://mate-desktop.org/"
arch=('i686' 'x86_64')
@@ -14,7 +13,6 @@ depends=('dconf' 'gtk2' 'liboobs' 'mate-polkit' 'system-tools-backends'
makedepends=('mate-common' 'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser')
optdepends=('ntp: Automatic time synchronisation.'
'mate-file-manager: provides Caja Shares extension')
-groups=('mate-extra')
source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
sha1sums=('89d53c22171f6181ad4fb89387d4fa3300bb27b2')
install=${pkgname}.install
@@ -27,7 +25,6 @@ prepare() {
# - https://bbs.archlinux.org/viewtopic.php?pid=1183332
# Desktop user
sed -i 's/cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,video/adm,log,sys,users,uucp/' src/users/user-profiles.conf.in
-
# Administrator
sed -i 's/cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,admin,sambashare,lpadmin,video/adm,disk,locate,log,sys,users,uucp,wheel/' src/users/user-profiles.conf.in
}
@@ -45,5 +42,4 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- #rm -f "${pkgdir}/usr/lib/caja/extensions-2.0/libcaja-gst-shares.a"
}
diff --git a/community/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD
index 42912d1bd..0d3e97324 100644
--- a/community/python2-gnutls/PKGBUILD
+++ b/community/python2-gnutls/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=python2-gnutls
pkgver=1.2.5
-pkgrel=3
+pkgrel=4
pkgdesc="Python wrapper for the GNUTLS library"
arch=('i686' 'x86_64')
url="http://cheeseshop.python.org/pypi/python-gnutls"
@@ -15,7 +15,7 @@ source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${p
libraryinit.patch
libraryfunctions.patch)
md5sums=('a398a75b1f366857cf2628cf4d62dd34'
- '28227b8626e8a7df81cf3b7dae88bd80'
+ '2ac537f816225bc324a9e0529774df48'
'9907d3a446fdc3b33a70e57925d67298')
build() {
diff --git a/community/python2-gnutls/libraryinit.patch b/community/python2-gnutls/libraryinit.patch
index 5f987b513..5a82bbcf8 100644
--- a/community/python2-gnutls/libraryinit.patch
+++ b/community/python2-gnutls/libraryinit.patch
@@ -5,7 +5,7 @@
gcry_control = libgcrypt.gcry_control
else:
- gcry_control = libgnutls.gcry_control
-+ libgcrypt = load_library(name='gcrypt', version=11)
++ libgcrypt = load_library(name='gcrypt', version=20)
+ gcry_control = libgcrypt.gcry_control
gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD
index 26804f905..596fb3880 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 103038 2013-12-25 17:41:52Z jlichtblau $
+# $Id: PKGBUILD 105403 2014-02-06 19:27:08Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Federico Cinelli <cinelli@aur.archlinux.org>
# Contributor: Bob Finch <w9ya@arrl.net>
pkgname=shapelib
pkgver=1.3.0
-pkgrel=4
+pkgrel=5
pkgdesc='simple C API for reading and writing ESRI Shapefiles'
arch=('i686' 'x86_64')
url='http://shapelib.maptools.org/'
license=('LGPL' 'MIT')
+options=('staticlibs')
source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz
LICENSE)
sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f'
'67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789')
build() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
sed -i -e s:'-fPIC':"${CFLAGS} -fPIC": Makefile
make lib
}
package() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
- install -dm755 "$pkgdir"/usr/{lib,include}
+ install -dm755 "${pkgdir}"/usr/{lib,include}
# Fix the broken makefile
sed -i -e s:/usr/local:${pkgdir}/usr: Makefile
@@ -33,7 +34,7 @@ package() {
make lib_install
# Fix world readable bit not set
- chmod 644 $pkgdir/usr/include/shapefil.h
+ chmod 644 "${pkgdir}"/usr/include/shapefil.h
- install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -D -m644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD
index 62cadc319..6c72d530f 100644
--- a/community/sleuthkit/PKGBUILD
+++ b/community/sleuthkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103041 2013-12-25 17:46:25Z jlichtblau $
+# $Id: PKGBUILD 105400 2014-02-06 18:08:16Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=sleuthkit
-pkgver=4.1.2
-pkgrel=2
+pkgver=4.1.3
+pkgrel=1
pkgdesc='File system and media management forensic analysis tools'
arch=('i686' 'x86_64')
url='http://www.sleuthkit.org/sleuthkit'
@@ -12,7 +12,7 @@ license=('GPL2' 'CPL' 'custom:"IBM Public Licence"')
depends=('perl')
changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('58253b35c016083558fb581308f4a3baf884229de89eb84ddbfb977ed56600d3')
+sha256sums=('67f9d2a31a8884d58698d6122fc1a1bfa9bf238582bde2b49228ec9b899f0327')
build() {
cd ${pkgname}-${pkgver}
diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog
index 86fb29e8b..9a3c7c791 100644
--- a/community/sleuthkit/sleuthkit.changelog
+++ b/community/sleuthkit/sleuthkit.changelog
@@ -1,3 +1,6 @@
+2014-02-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * sleuthkit 4.1.3-1
+
2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* sleuthkit 4.1.2-2 static library removed
diff --git a/community/winff/PKGBUILD b/community/winff/PKGBUILD
index efbf80827..df3f45a64 100644
--- a/community/winff/PKGBUILD
+++ b/community/winff/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96460 2013-08-29 16:47:40Z arodseth $
+# $Id: PKGBUILD 105386 2014-02-06 11:25:14Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: yugrotavele <yugrotavele at archlinux dot us>
# Contributor: Paolo Stivanin <admin AT polslinux DOT it>
pkgname=winff
-pkgver=1.5.2
+pkgver=1.5.3
pkgrel=1
pkgdesc='GUI for ffmpeg'
url='http://code.google.com/p/winff/'
@@ -13,9 +13,8 @@ arch=('x86_64' 'i686')
depends=('ffmpeg' 'gtk2' 'xterm' 'hicolor-icon-theme')
makedepends=('lazarus' 'lazarus-gtk2' 'gendesk' 'tar')
install='winff.install'
-source=("https://$pkgname.googlecode.com/files/WinFF-$pkgver-source.tar.gz")
-noextract=("WinFF-$pkgver-source.tar.gz")
-sha256sums=('9ee1c68173263dad8d07df2bd62e830d73e6546a0fa86b35de9be8b4c363434c')
+source=("$pkgname-$pkgver.tar.gz::https://docs.google.com/uc?authuser=0&id=0B8HoAIi30ZDkMHlvVkVtNHJnLVE&export=download")
+sha256sums=('ce82ef4359ef45d4c4a18977e49e403474cae4e3a948e90a66cc41068b3d5106')
prepare() {
gendesk -n \
@@ -23,12 +22,6 @@ prepare() {
--pkgdesc "$pkgdesc" \
--genericname 'Video converter' \
--categories 'AudioVideo;AudioVideoEditing;GTK'
-
- # The file provided by upstream is an "exploding tarball" where the files
- # are not extracted in a directory. Also everything is set as executable. m)
- mkdir -p "$pkgname"
- cd "$pkgname"
- tar zxf "../WinFF-$pkgver-source.tar.gz"
}
build() {
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index e202076b4..75c330b62 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99437 2013-10-28 20:54:44Z jelle $
+# $Id: PKGBUILD 105371 2014-02-06 05:24:17Z bisson $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
pkgname=xmobar
pkgver=0.19
-pkgrel=1
+pkgrel=2
pkgdesc="A Minimalistic Text Based Status Bar"
url="http://hackage.haskell.org/package/xmobar"
license=('custom:BSD3')
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index cdce74adc..5c8caf484 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103930 2014-01-13 17:17:06Z andyrtr $
+# $Id: PKGBUILD 105395 2014-02-06 17:52:44Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,7 +7,7 @@
# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
pkgname=yaz
-pkgver=5.0.9
+pkgver=5.0.12
pkgrel=1
pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
arch=('i686' 'x86_64')
@@ -34,3 +34,4 @@ package() {
install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
}
+sha256sums=('4501bbeee665e34ad480508e83fbe8b65d2b5fd0a8194077f1b4235b616a846e')
diff --git a/community/yaz/yaz.changelog b/community/yaz/yaz.changelog
index 9f1b8f484..2ee2a0a8a 100644
--- a/community/yaz/yaz.changelog
+++ b/community/yaz/yaz.changelog
@@ -1,3 +1,6 @@
+2014-02-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * yaz 5.0.12-1
+
2013-10-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* yaz 5.0.9-1
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index f6b0abcd7..ff0c3c431 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199762 2013-11-15 21:24:38Z ronald $
+# $Id: PKGBUILD 205513 2014-02-06 15:35:30Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Killian <tom.archlinux.org>
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
-pkgver=6.1.0
+pkgver=6.2.1
pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/projects/dhcpcd/"
@@ -18,12 +18,12 @@ options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
'dhcpcd_.service'
'dhcpcd.service')
-sha1sums=('dcd6970db0440398aaf3ae4b58cc262a67b2e472'
+sha1sums=('02319be210f10e73a3add726ae3fd96f69743cff'
'6f1633edde14d29b5cdc09c4f029a450ef2ebc96'
- '7f3e62908037b888df2f6b87af1c7611f462dd08')
+ '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
# configure variables
./configure \
@@ -37,18 +37,18 @@ build() {
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
# Install License
- install -d $pkgdir/usr/share/licenses/$pkgname
+ install -d "$pkgdir/usr/share/licenses/$pkgname"
sed 26q "$srcdir/$pkgname-$pkgver/control.h" \
>>"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
# Set Options in /etc/dhcpcd.conf
- echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
+ echo noipv4ll >> "${pkgdir}/etc/dhcpcd.conf" # Disable ip4vall
# install systemd files
- install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service
- install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
+ install -Dm644 "${srcdir}/dhcpcd_.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd@.service"
+ install -Dm644 "${srcdir}/dhcpcd.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd.service" # FS#31543
}
diff --git a/core/dhcpcd/dhcpcd.service b/core/dhcpcd/dhcpcd.service
index 489023d3e..e7dc2890a 100644
--- a/core/dhcpcd/dhcpcd.service
+++ b/core/dhcpcd/dhcpcd.service
@@ -6,8 +6,8 @@ Before=network.target
[Service]
Type=forking
PIDFile=/run/dhcpcd.pid
-ExecStart=/bin/dhcpcd -q -b
-ExecStop=/bin/dhcpcd -x
+ExecStart=/usr/bin/dhcpcd -q -b
+ExecStop=/usr/bin/dhcpcd -x
[Install]
WantedBy=multi-user.target
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index b3c2fdf08..56f49da61 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 205002 2014-02-02 20:56:12Z bisson $
+# $Id: PKGBUILD 205496 2014-02-06 05:24:35Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
pkgver=6.5p1
-pkgrel=1
+pkgrel=2
pkgdesc='Free version of the SSH connectivity tools'
url='http://www.openssh.org/portable.html'
license=('custom:BSD')
@@ -15,12 +15,14 @@ depends=('krb5' 'openssl' 'libedit' 'ldns')
optdepends=('xorg-xauth: X11 forwarding'
'x11-ssh-askpass: input passphrase in X')
source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+ 'lowercase.patch'
'sshdgenkeys.service'
'sshd@.service'
'sshd.service'
'sshd.socket'
'sshd.pam')
sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP'
+ '3163a71cbaeac39d0783ad4c501fd0630d6c0c22'
'cc1ceec606c98c7407e7ac21ade23aed81e31405'
'6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
'ec49c6beba923e201505f5669cea48cad29014db'
@@ -31,6 +33,11 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
install=install
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../lowercase.patch
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/openssh/lowercase.patch b/core/openssh/lowercase.patch
new file mode 100644
index 000000000..50b9e6e7d
--- /dev/null
+++ b/core/openssh/lowercase.patch
@@ -0,0 +1,32 @@
+From d56b44d2dfa093883a5c4e91be3f72d99946b170 Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Tue, 04 Feb 2014 00:26:04 +0000
+Subject: - djm@cvs.openbsd.org 2014/02/04 00:24:29
+
+ [ssh.c]
+ delay lowercasing of hostname until right before hostname
+ canonicalisation to unbreak case-sensitive matching of ssh_config;
+ reported by Ike Devolder; ok markus@
+---
+diff --git a/ssh.c b/ssh.c
+index ec95733..add760c 100644
+--- a/ssh.c
++++ b/ssh.c
+@@ -780,7 +780,6 @@ main(int ac, char **av)
+ if (!host)
+ usage();
+
+- lowercase(host);
+ host_arg = xstrdup(host);
+
+ OpenSSL_add_all_algorithms();
+@@ -914,6 +913,7 @@ main(int ac, char **av)
+ }
+
+ /* If canonicalization requested then try to apply it */
++ lowercase(host);
+ if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
+ addrs = resolve_canonicalize(&host, options.port);
+ /*
+--
+cgit v0.9.2
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
index 21c91e6ca..4f8597e81 100644
--- a/core/s-nail/PKGBUILD
+++ b/core/s-nail/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205003 2014-02-02 20:56:12Z bisson $
+# $Id: PKGBUILD 205499 2014-02-06 08:39:31Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
@@ -6,7 +6,7 @@
pkgname=s-nail
pkgver=14.5.2
-pkgrel=2
+pkgrel=3
pkgdesc='Mail processing system with a command syntax reminiscent of ed'
url='http://sdaoden.users.sourceforge.net/code.html#s-nail'
license=('custom:BSD')
@@ -14,8 +14,10 @@ arch=('i686' 'x86_64')
depends=('openssl')
optdepends=('smtp-forwarder: for sending mail')
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz"
+ 'mimeheader.patch'
'sort.patch')
sha1sums=('26ad43f5f41b429d5f13a3ce73a3dff75325950c'
+ 'e72ed84f584ebc50eb9d04779b8b754afa446bf4'
'909da731e590d1d2877ed38bed667440a02d1259')
groups=('base')
@@ -26,7 +28,8 @@ conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../sort.patch # http://sourceforge.net/mailarchive/message.php?msg_id=31906477
+ patch -p1 -i ../mimeheader.patch
+ patch -p1 -i ../sort.patch
}
build() {
diff --git a/core/s-nail/mimeheader.patch b/core/s-nail/mimeheader.patch
new file mode 100644
index 000000000..2f7163b36
--- /dev/null
+++ b/core/s-nail/mimeheader.patch
@@ -0,0 +1,147 @@
+s-nail-14_5_2-mimeheader.patch, 2014-02-05:
+
+Apply:
+ $ cd s-nail-14.5.2
+ $ patch -bu < s-nail-14_5_2-mimeheader.patch
+
+Description:
+ mime_fromhdr(): fix my rewrite again..
+
+ My hasty rewrite [0f9ad93] (mime_fromhdr(): partial rewrite using
+ n_iconv_str(), 2013-03-12), just about ninety (90) minutes before
+ the release of S-nail v14.1 already caused the bugfix [b608c6b]
+ (mime_fromhdr(): never return NULL output.., 2013-03-14), which
+ was the sole reason for the release of S-nail v14.2.
+
+ Well, about a year later, after tens of thousands of mails,
+ including multibyte ones, i wrote myself a message that has shown
+ that the rewrite was still buggy -- the header
+
+ Subject: ehm, .getElementById("blink") needs <span
+ =?US-ASCII?Q?id=3D"blink">,?= not =?US-ASCII?Q?class=3D"id"?=
+
+ cannot be viewed correctly, the ", not" will be lost.
+ The reason is now understood and this changeset should fix
+ mime_fromhdr() so that it'll do what it is assumed to do in the
+ current codebase, unless i'm terribly mistaken.
+
+ Because i bickered some time in private, i WANT to add that the
+ real problem is that the codebase is weird INSOFAR as that i still
+ don't really understand the WAY it works, because THAT IS SICK.
+ I.e., in my brain i assume this function effectively is
+ rfc_2047_decode(), meant to decode encoded words as specified in
+ RFC 2047, but that's simply not true, and FOR QUITE SOME TIME,
+ because of the embedded newlines that may be in the data and need
+ to passed through for at least the case that we send data to the
+ display. I slowly get around that schizophrenic codebase while
+ also converting it to a straight one, but that will take years.
+ Until then we need to strip whitespace in between multiple
+ adjacent encoded words, while passing through newlines and
+ whitespace that follows newlines, regardless of whatever.
+ I hope this will do it until we are sane.
+---
+ mime.c | 63 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 39 insertions(+), 24 deletions(-)
+
+diff --git a/mime.c b/mime.c
+index ccb0061..6ee55cc 100644
+--- a/mime.c
++++ b/mime.c
+@@ -863,20 +863,26 @@ jclear:
+ goto jleave;
+ }
+
+-/*
+- * Convert header fields from RFC 1522 format
+- * TODO mime_fromhdr(): NO error handling, fat; REWRITE **ASAP**
+- */
+ FL void
+ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ {
+- /* TODO mime_fromhdr(): is called with strings that contain newlines;
+- * TODO this is the usual newline problem all around the codebase;
+- * TODO i.e., if we strip it, then the display misses it ;} */
++ /* TODO mime_fromhdr(): is called with strings that contain newlines;
++ * TODO this is the usual newline problem all around the codebase;
++ * TODO i.e., if we strip it, then the display misses it ;>
++ * TODO this is why it is so messy and why S-nail v14.2 plus additional
++ * TODO patch for v14.5.2 (and maybe even v14.5.3 subminor) occurred, and
++ * TODO why our display reflects what is contained in the message: the 1:1
++ * TODO relationship of message content and display!
++ * TODO instead a header line should be decoded to what it is (a single
++ * TODO line that is) and it should be objective to the backend wether
++ * TODO it'll be folded to fit onto the display or not, e.g., for search
++ * TODO purposes etc. then the only condition we have to honour in here
++ * TODO is that whitespace in between multiple adjacent MIME encoded words
++ * TODO á la RFC 2047 is discarded; i.e.: this function should deal with
++ * TODO RFC 2047 and be renamed: mime_fromhdr() -> mime_rfc2047_decode() */
+ struct str cin, cout;
+ char *p, *op, *upper, *cs, *cbeg;
+- int convert;
+- size_t lastoutl = (size_t)-1;
++ ui32_t convert, lastenc, lastoutl;
+ #ifdef HAVE_ICONV
+ char const *tcs;
+ iconv_t fhicd = (iconv_t)-1;
+@@ -894,6 +900,7 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ #endif
+ p = in->s;
+ upper = p + in->l;
++ lastenc = lastoutl = 0;
+
+ while (p < upper) {
+ op = p;
+@@ -949,8 +956,7 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ --cout.l;
+ } else
+ (void)qp_decode(&cout, &cin, NULL);
+- if (lastoutl != (size_t)-1)
+- out->l = lastoutl;
++ out->l = lastenc;
+ #ifdef HAVE_ICONV
+ if ((flags & TD_ICONV) && fhicd != (iconv_t)-1) {
+ cin.s = NULL, cin.l = 0; /* XXX string pool ! */
+@@ -966,21 +972,30 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ #ifdef HAVE_ICONV
+ }
+ #endif
+- lastoutl = out->l;
++ lastenc = lastoutl = out->l;
+ free(cout.s);
+- } else {
+-jnotmime:
+- p = op;
+- convert = 1;
+- while ((op = p + convert) < upper &&
+- (op[0] != '=' || op[1] != '?'))
+- ++convert;
+- out = n_str_add_buf(out, p, convert);
+- p += convert;
+- if (! blankchar(p[-1]))
+- lastoutl = (size_t)-1;
+- }
++ } else
++jnotmime: {
++ bool_t onlyws;
++
++ p = op;
++ onlyws = (lastenc > 0);
++ for (;;) {
++ if (++op == upper)
++ break;
++ if (op[0] == '=' && (PTRCMP(op + 1, ==, upper) || op[1] == '?'))
++ break;
++ if (onlyws && !blankchar(*op))
++ onlyws = FAL0;
++ }
++
++ out = n_str_add_buf(out, p, PTR2SIZE(op - p));
++ p = op;
++ if (!onlyws || lastoutl != lastenc)
++ lastenc = out->l;
++ lastoutl = out->l;
+ }
++ }
+ out->s[out->l] = '\0';
+
+ if (flags & TD_ISPR) {
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 57ba7574f..e8cbf1cc7 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 186266 2013-05-23 06:41:05Z bisson $
+# $Id: PKGBUILD 205493 2014-02-06 05:23:57Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jason Chu <jchu@xentac.net>
pkgname=wireless_tools
-pkgver=29
-pkgrel=8
+pkgver=30.pre9
+_pkgver=${pkgver%.pre*}
+pkgrel=1
pkgdesc='Tools allowing to manipulate the Wireless Extensions'
url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
license=('GPL')
arch=('i686' 'x86_64')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz"
- 'dense.patch')
-sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
- '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
+source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
+sha1sums=('41db5ced9ed3d8d3cc104ce43c19af1d72f07eec')
prepare() {
- cd "${srcdir}/${pkgname}.${pkgver}"
- patch -p1 -i ../dense.patch # FS#15363
+ cd "${srcdir}/${pkgname}.${_pkgver}"
+ sed '/BUILD_STATIC =/d' -i Makefile
}
build() {
- cd "${srcdir}/${pkgname}.${pkgver}"
+ cd "${srcdir}/${pkgname}.${_pkgver}"
make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}"
}
package() {
- cd "${srcdir}/${pkgname}.${pkgver}"
+ cd "${srcdir}/${pkgname}.${_pkgver}"
make \
INSTALL_DIR="${pkgdir}/usr/bin" \
INSTALL_LIB="${pkgdir}/usr/lib" \
diff --git a/core/wireless_tools/dense.patch b/core/wireless_tools/dense.patch
deleted file mode 100644
index 85182cd82..000000000
--- a/core/wireless_tools/dense.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-The length field of wext data (iw_point.data) is 16 bits. The largest
-value is thus 65535. During the attempts to increase buffer size the
-buffer starts at 4096 and is doubled after each failure to fill. From the
-time this length reaches 65536 it is effectively zero. We thus loose all
-potential space from 32768 to 65535.
-
-This problem is clear when scanning in a RF dense environment.
-
-Without this patch:
-~$ iwlist wlan0 scan
-print_scanning_info: Allocation failed
-
-With this patch:
-~$ iwlist wlan0 scan | grep Cell | wc -l
-86
-
-Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-
----
-A similar patch was recently created to fix wpa_supplicant.
-
-I could not find a source code repo for this code and created this patch
-against version 30-pre7 downloaded from
-http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-
-diff -uprN wireless_tools_org/wireless_tools.30/iwlist.c wireless_tools.30/iwlist.c
---- wireless_tools_org/wireless_tools.30/iwlist.c 2008-01-16 17:45:41.000000000 -0800
-+++ wireless_tools.30/iwlist.c 2009-02-12 14:16:48.000000000 -0800
-@@ -800,7 +800,7 @@ print_scanning_info(int skfd,
- if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
- {
- /* Check if buffer was too small (WE-17 only) */
-- if((errno == E2BIG) && (range.we_version_compiled > 16))
-+ if((errno == E2BIG) && (range.we_version_compiled > 16) && (buflen < 65535))
- {
- /* Some driver may return very large scan results, either
- * because there are many cells, or because they have many
-@@ -816,6 +816,10 @@ print_scanning_info(int skfd,
- else
- buflen *= 2;
-
-+ /* wrq.u.data.length is 16 bits so max size is 65535 */
-+ if(buflen > 65535)
-+ buflen = 65535;
-+
- /* Try again */
- goto realloc;
- }
-
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index da6b00a57..49bb20157 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 201548 2013-12-14 21:56:57Z andyrtr $
+# $Id: PKGBUILD 205523 2014-02-06 16:23:04Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=claws-mail
pkgver=3.9.3
-pkgrel=1
+pkgrel=2
pkgdesc="A GTK+ based e-mail client."
arch=('i686' 'x86_64')
license=('GPL3')
url="http://www.claws-mail.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' 'compface'
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface'
'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('spamassassin' 'bogofilter' 'valgrind'
# dependencies for plugins
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index 90291eb21..a77caff88 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 199065 2013-11-08 03:17:34Z bisson $
+# $Id: PKGBUILD 205494 2014-02-06 05:24:01Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: James Rayner <james@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=conky
pkgver=1.9.0
-pkgrel=2
+pkgrel=4
pkgdesc='Lightweight system monitor for X'
url='http://conky.sourceforge.net/'
license=('BSD' 'GPL')
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 8d83f579f..cbfc30fc8 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 204248 2014-01-15 14:35:38Z dan $
+# $Id: PKGBUILD 205529 2014-02-06 18:45:30Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.8.5.3
+pkgver=1.8.5.4
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64)
@@ -107,6 +107,6 @@ package() {
install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
}
-md5sums=('57b966065882f83ef5879620a1e329ca'
+md5sums=('25965b5973aae43848a4ba5ca91b6a52'
'042524f942785772d7bd52a1f02fe5ae'
'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 0d8520e20..24910a3b0 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 205430 2014-02-04 18:28:47Z svenstaro $
+# $Id: PKGBUILD 205542 2014-02-06 20:54:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.11.6
+_pkgver=4.12.2
pkgrel=1
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
@@ -25,7 +26,7 @@ optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
'appmenu-qt: menu applications over dbus')
install="${pkgname}.install"
backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index 1ada0ba03..2a194feaa 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 205428 2014-02-04 17:15:14Z heftig $
+# $Id: PKGBUILD 205540 2014-02-06 20:50:44Z heftig $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Michael Kanis <mkanis@gmx.de>
pkgname=libchamplain
-pkgver=0.12.6
+pkgver=0.12.7
pkgrel=1
pkgdesc="Gtk3 widget for displaying rasterized maps"
url="http://projects.gnome.org/libchamplain/"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64')
depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite')
makedepends=('gobject-introspection' 'gtk-doc' 'vala')
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2400ff2f4b25e5441b3a7d988e8ff996c9d2107d0aca101fc22320969db22576')
+sha256sums=('b607fa7e32dd67e5d9541d620abb212a85d076d1def0252c0112a362bddeac5e')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index 033e99d79..3c4e298ce 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -1,19 +1,28 @@
-# $Id: PKGBUILD 198154 2013-10-30 13:07:31Z allan $
+# $Id: PKGBUILD 205522 2014-02-06 16:23:03Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=libetpan
-pkgver=1.1
-pkgrel=4
+pkgver=1.2
+pkgrel=1
pkgdesc="A portable middleware for email access"
arch=('i686' 'x86_64')
-url="http://www.etpan.org/"
+url="http://www.etpan.org/libetpan.html"
license=("custom:etpan")
depends=('libsasl' 'curl' 'expat')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6fee60d08506e941642b8fa087e60b07')
+source=(https://github.com/dinhviethoa/${pkgname}/archive/${pkgver}.tar.gz)
+md5sums=('c15905ebc2ec620afb8bcca7b9d9c232')
build() {
cd ${pkgname}-${pkgver}
+
+ # generate automake files that are not included in the tarball
+ libtoolize --force --copy
+ aclocal -I m4
+ autoheader
+ autoconf
+ automake --add-missing --foreign --force --copy
+ #autoreconf -vfi
+
./configure --prefix=/usr \
--disable-static \
--disable-db
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 5f5fe7725..059249cb8 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 198322 2013-10-30 14:09:45Z allan $
+# $Id: PKGBUILD 205535 2014-02-06 19:58:31Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=moc
-pkgver=2.5beta1
-pkgrel=5
+pkgver=2.5.0beta2
+pkgrel=1
epoch=1
pkgdesc="An ncurses console audio player designed to be powerful and easy to use"
arch=('i686' 'x86_64')
url="http://moc.daper.net/"
license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file' 'popt')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug' 'faad2')
-optdepends=('speex: for using the speex plugin'
+optdepends=('speex: for using the speex plugin'
'ffmpeg: for using the ffmpeg plugin'
- 'taglib: for using the musepack plugin'
- 'libmpcdec: for using the musepack plugin'
- 'wavpack: for using the wavpack plugin'
- 'faad2: for using the aac plugin'
+ 'taglib: for using the musepack plugin'
+ 'libmpcdec: for using the musepack plugin'
+ 'wavpack: for using the wavpack plugin'
+ 'faad2: for using the aac plugin'
'libmodplug: for using the modplug plugin')
-source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig} \
- moc-ffmpeg.patch)
-sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa'
- '29c232c37e1f3737c3b670372732446e9c0786a8'
- 'f3b8b327dd27d50422b1ad8c9ef89a7366529307')
+source=(http://ftp.daper.net/pub/soft/moc/unstable/moc-${pkgver%b*}-${pkgver#*.*.?}.tar.bz2{,.sig})
+sha1sums=('bf786d719c853c22dec74bc2ee565aae4596fbe7'
+ 'SKIP')
# source PKGBUILD && mksource
mksource() {
@@ -40,13 +38,8 @@ mksource() {
gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
}
-prepare() {
- cd ${pkgname}-2.5.0-beta1
- patch -p0 -i "${srcdir}/moc-ffmpeg.patch"
-}
-
build() {
- cd ${pkgname}-2.5.0-beta1
+ cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
./configure --prefix=/usr --without-rcc \
--with-oss --with-alsa --with-jack --with-aac --with-mp3 \
--with-musepack --with-vorbis --with-flac --with-wavpack \
@@ -56,6 +49,6 @@ build() {
}
package() {
- cd ${pkgname}-2.5.0-beta1
+ cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch
deleted file mode 100644
index e268e5427..000000000
--- a/extra/moc/moc-ffmpeg.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-Index: menu.c
-===================================================================
---- menu.c (revision 2516)
-+++ menu.c (working copy)
-@@ -90,9 +90,14 @@
- getyx (menu->win, y, x);
- if (title_width <= title_space || mi->align == MENU_ALIGN_LEFT)
- xwaddnstr (menu->win, mi->title, title_space);
-- else
-- xwaddstr (menu->win, mi->title + title_width - title_space);
-+ else {
-+ char *ptr;
-
-+ ptr = xstrtail (mi->title, title_space);
-+ xwaddstr (menu->win, ptr);
-+ free (ptr);
-+ }
-+
- /* Fill the remainder of the title field with spaces. */
- if (mi == menu->selected) {
- getyx (menu->win, y, ix);
-Index: utf8.c
-===================================================================
---- utf8.c (revision 2516)
-+++ utf8.c (working copy)
-@@ -199,47 +199,50 @@
-
- int xwaddnstr (WINDOW *win, const char *str, const int n)
- {
-- int res;
-+ int res, width, inv_char;
-+ wchar_t *ucs;
-+ char *mstr, *lstr;
-+ size_t size, num_chars;
-
- assert (n > 0);
- assert (str != NULL);
-
-- if (using_utf8) {
-+ mstr = iconv_str (iconv_desc, str);
-
-- /* This nasty hack is because we need to count n in chars, but
-- * [w]addnstr() takes arguments in bytes (in UTF-8 a char can be
-- * longer than 1 byte). There are also problems with [w]addnwstr()
-- * (screen garbled). I have no better idea. */
-+ size = xmbstowcs (NULL, mstr, -1, NULL) + 1;
-+ ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
-+ xmbstowcs (ucs, mstr, size, &inv_char);
-+ width = wcswidth (ucs, WIDTH_MAX);
-
-- wchar_t *ucs;
-- size_t size;
-- size_t utf_num_chars;
-- int inv_char;
--
-- size = xmbstowcs (NULL, str, -1, NULL) + 1;
-- ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
-- xmbstowcs (ucs, str, size, &inv_char);
-- if ((size_t)n < size - 1)
-- ucs[n] = L'\0';
-- utf_num_chars = wcstombs (NULL, ucs, 0);
-- if (inv_char) {
-- char *utf8 = (char *)xmalloc (utf_num_chars + 1);
--
-- wcstombs (utf8, ucs, utf_num_chars + 1);
-- res = waddstr (win, utf8);
-- free (utf8);
-+ if (width == -1) {
-+ size_t clidx;
-+ for (clidx = 0; clidx < size - 1; clidx++) {
-+ if (wcwidth (ucs[clidx]) == -1)
-+ ucs[clidx] = L'?';
- }
-- else
-- res = waddnstr (win, str, utf_num_chars);
-- free (ucs);
-+ width = wcswidth (ucs, WIDTH_MAX);
-+ inv_char = 1;
- }
-- else {
-- char *lstr = iconv_str (iconv_desc, str);
-
-- res = waddnstr (win, lstr, n);
-- free (lstr);
-+ if (width > n) {
-+ while (width > n)
-+ width -= wcwidth (ucs[--size]);
-+ ucs[size] = L'\0';
- }
-
-+ num_chars = wcstombs (NULL, ucs, 0);
-+ lstr = (char *)xmalloc (num_chars + 1);
-+
-+ if (inv_char)
-+ wcstombs (lstr, ucs, num_chars + 1);
-+ else
-+ snprintf (lstr, num_chars + 1, "%s", mstr);
-+
-+ res = waddstr (win, lstr);
-+
-+ free (ucs);
-+ free (lstr);
-+ free (mstr);
- return res;
- }
-
-Index: decoder_plugins/mp3/mp3.c
-===================================================================
---- decoder_plugins/mp3/mp3.c (revision 2516)
-+++ decoder_plugins/mp3/mp3.c (working copy)
-@@ -696,17 +696,19 @@
- {
- char *ext;
-
-+ strcpy (buf, "MPx");
-+
- ext = ext_pos (file);
-- if (!strcasecmp (ext, "mp3"))
-- strcpy (buf, "MP3");
-- else if (!strcasecmp (ext, "mp2"))
-- strcpy (buf, "MP2");
-- else if (!strcasecmp (ext, "mp1"))
-- strcpy (buf, "MP1");
-- else if (!strcasecmp (ext, "mpga"))
-- strcpy (buf, "MPG");
-- else
-- strcpy (buf, "MPx");
-+ if (ext) {
-+ if (!strcasecmp (ext, "mp3"))
-+ strcpy (buf, "MP3");
-+ else if (!strcasecmp (ext, "mp2"))
-+ strcpy (buf, "MP2");
-+ else if (!strcasecmp (ext, "mp1"))
-+ strcpy (buf, "MP1");
-+ else if (!strcasecmp (ext, "mpga"))
-+ strcpy (buf, "MPG");
-+ }
- }
-
- static int mp3_our_format_ext (const char *ext)
-Index: decoder_plugins/ffmpeg/ffmpeg.m4
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.m4 (revision 2516)
-+++ decoder_plugins/ffmpeg/ffmpeg.m4 (working copy)
-@@ -88,6 +88,25 @@
- [#include <libavcodec/avcodec.h>])
- AC_CHECK_DECLS([AV_CODEC_ID_OPUS], , ,
- [#include <libavcodec/avcodec.h>])
-+ AC_SEARCH_LIBS(avcodec_free_frame, avcodec,
-+ [AC_DEFINE([HAVE_AVCODEC_FREE_FRAME], 1,
-+ [Define to 1 if you have the `avcodec_free_frame' function.])])
-+ AC_CHECK_DECLS([CODEC_ID_PCM_S8_PLANAR], , ,
-+ [#include <libavcodec/avcodec.h>])
-+ AC_CHECK_DECLS([AV_SAMPLE_FMT_U8P], , ,
-+ [#include <libavcodec/avcodec.h>])
-+ AC_CHECK_DECLS([AV_SAMPLE_FMT_S16P], , ,
-+ [#include <libavcodec/avcodec.h>])
-+ AC_CHECK_DECLS([AV_SAMPLE_FMT_S32P], , ,
-+ [#include <libavcodec/avcodec.h>])
-+ AC_CHECK_DECLS([AV_SAMPLE_FMT_FLTP], , ,
-+ [#include <libavcodec/avcodec.h>])
-+ AC_SEARCH_LIBS(av_get_sample_fmt_name, avutil,
-+ [AC_DEFINE([HAVE_AV_GET_SAMPLE_FMT_NAME], 1,
-+ [Define to 1 if you have the `av_get_sample_fmt_name' function.])])
-+ AC_SEARCH_LIBS(av_lockmgr_register, avcodec,
-+ [AC_DEFINE([HAVE_LOCKMGR_REGISTER], 1,
-+ [Define to 1 if you have the `av_lockmgr_register' function.])])
- CPPFLAGS="$save_CPPFLAGS"
- CFLAGS="$save_CFLAGS"
- LIBS="$save_LIBS"
-Index: decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.c (revision 2516)
-+++ decoder_plugins/ffmpeg/ffmpeg.c (working copy)
-@@ -99,6 +99,7 @@
- bool okay; /* was this stream successfully opened? */
- struct decoder_error error;
- long fmt;
-+ int sample_width;
- int bitrate; /* in bits per second */
- int avg_bitrate; /* in bits per second */
- #if SEEK_IN_DECODER
-@@ -106,6 +107,7 @@
- int seek_sec; /* second to which to seek */
- #endif
- bool seek_broken; /* FFmpeg seeking is broken */
-+ bool timing_broken; /* FFmpeg trashes duration and bit_rate */
- #if SEEK_IN_DECODER && defined(DEBUG)
- pthread_t thread_id;
- #endif
-@@ -277,8 +279,72 @@
- }
- }
-
-+/* Handle FFmpeg's locking requirements. */
-+#ifdef HAVE_LOCKMGR_REGISTER
-+static int locking_cb (void **mutex, enum AVLockOp op)
-+{
-+ int result;
-+
-+ switch (op) {
-+ case AV_LOCK_CREATE:
-+ *mutex = xmalloc (sizeof (pthread_mutex_t));
-+ result = pthread_mutex_init (*mutex, NULL);
-+ break;
-+ case AV_LOCK_OBTAIN:
-+ result = pthread_mutex_lock (*mutex);
-+ break;
-+ case AV_LOCK_RELEASE:
-+ result = pthread_mutex_unlock (*mutex);
-+ break;
-+ case AV_LOCK_DESTROY:
-+ result = pthread_mutex_destroy (*mutex);
-+ free (*mutex);
-+ *mutex = NULL;
-+ break;
-+ }
-+
-+ return result;
-+}
-+#endif
-+
-+/* Here we attempt to determine if FFmpeg/LibAV has trashed the 'duration'
-+ * and 'bit_rate' fields in AVFormatContext for large files. Determining
-+ * whether or not they are likely to be valid is imprecise and will vary
-+ * depending (at least) on:
-+ *
-+ * - The file's size,
-+ * - The file's codec,
-+ * - The number and size of tags,
-+ * - The version of FFmpeg/LibAV, and
-+ * - Whether it's FFmpeg or LibAV.
-+ *
-+ * This function represents a best guess.
-+*/
-+static bool is_timing_broken (AVFormatContext *ic)
-+{
-+ int64_t file_size;
-+
-+ if (ic->duration < 0 || ic->bit_rate < 0)
-+ return true;
-+
-+#ifdef HAVE_AVIO_SIZE
-+ file_size = avio_size (ic->pb);
-+#else
-+ file_size = ic->file_size;
-+#endif
-+
-+ if (file_size < UINT32_MAX)
-+ return false;
-+
-+ return true;
-+}
-+
- static void ffmpeg_init ()
- {
-+#ifdef HAVE_LOCKMGR_REGISTER
-+ int rc;
-+#endif
-+
- #ifdef DEBUG
- av_log_set_level (AV_LOG_INFO);
- #else
-@@ -291,10 +357,20 @@
- supported_extns = lists_strs_new (16);
- load_audio_extns (supported_extns);
- load_video_extns (supported_extns);
-+
-+#ifdef HAVE_LOCKMGR_REGISTER
-+ rc = av_lockmgr_register (locking_cb);
-+ if (rc < 0)
-+ fatal ("Lock manager initialisation failed");
-+#endif
- }
-
- static void ffmpeg_destroy ()
- {
-+#ifdef HAVE_LOCKMGR_REGISTER
-+ av_lockmgr_register (NULL);
-+#endif
-+
- av_log_set_level (AV_LOG_QUIET);
- ffmpeg_log_repeats (NULL);
-
-@@ -341,9 +417,9 @@
- }
- #endif
-
-- if (tags_sel & TAGS_TIME) {
-+ if (!is_timing_broken (ic) && tags_sel & TAGS_TIME) {
- info->time = -1;
-- if (ic->duration >= 0)
-+ if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
- info->time = ic->duration / AV_TIME_BASE;
- }
-
-@@ -426,12 +502,6 @@
-
- #endif
-
-- if (tags_sel & TAGS_TIME) {
-- info->time = -1;
-- if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
-- info->time = ic->duration / AV_TIME_BASE;
-- }
--
- end:
- #ifdef HAVE_AVFORMAT_CLOSE_INPUT
- avformat_close_input (&ic);
-@@ -450,12 +520,16 @@
- if (!strcmp (data->ic->iformat->name, "wav")) {
- switch (data->enc->codec_id) {
- case CODEC_ID_PCM_S8:
-+#if HAVE_DECL_CODEC_ID_PCM_S8_PLANAR
-+ case CODEC_ID_PCM_S8_PLANAR:
-+#endif
- result = SFMT_S8;
- break;
- case CODEC_ID_PCM_U8:
- result = SFMT_U8;
- break;
- case CODEC_ID_PCM_S16LE:
-+ case CODEC_ID_PCM_S16LE_PLANAR:
- case CODEC_ID_PCM_S16BE:
- result = SFMT_S16;
- break;
-@@ -490,15 +564,27 @@
-
- switch (data->enc->sample_fmt) {
- case AV_SAMPLE_FMT_U8:
-+#if HAVE_DECL_AV_SAMPLE_FMT_U8P
-+ case AV_SAMPLE_FMT_U8P:
-+#endif
- result = SFMT_U8;
- break;
- case AV_SAMPLE_FMT_S16:
-+#if HAVE_DECL_AV_SAMPLE_FMT_S16P
-+ case AV_SAMPLE_FMT_S16P:
-+#endif
- result = SFMT_S16;
- break;
- case AV_SAMPLE_FMT_S32:
-+#if HAVE_DECL_AV_SAMPLE_FMT_S32P
-+ case AV_SAMPLE_FMT_S32P:
-+#endif
- result = SFMT_S32;
- break;
- case AV_SAMPLE_FMT_FLT:
-+#if HAVE_DECL_AV_SAMPLE_FMT_FLTP
-+ case AV_SAMPLE_FMT_FLTP:
-+#endif
- result = SFMT_FLOAT;
- break;
- default:
-@@ -597,6 +683,7 @@
- data->stream = NULL;
- data->enc = NULL;
- data->codec = NULL;
-+ data->sample_width = 0;
- data->bitrate = 0;
- data->avg_bitrate = 0;
-
-@@ -624,6 +711,7 @@
- data->seek_sec = 0;
- #endif
- data->seek_broken = false;
-+ data->timing_broken = false;
-
- decoder_error_init (&data->error);
-
-@@ -702,27 +790,38 @@
- if (data->fmt == 0)
- data->fmt = fmt_from_sample_fmt (data);
- if (data->fmt == 0) {
-+#ifdef HAVE_AV_GET_SAMPLE_FMT_NAME
- decoder_error (&data->error, ERROR_FATAL, 0,
-+ "Cannot get sample size from unknown sample format: %s",
-+ av_get_sample_fmt_name (data->enc->sample_fmt));
-+#else
-+ decoder_error (&data->error, ERROR_FATAL, 0,
- "Unsupported sample size!");
-+#endif
-+ avcodec_close (data->enc);
- goto end;
- }
-+ data->sample_width = sfmt_Bps (data->fmt);
- if (data->codec->capabilities & CODEC_CAP_DELAY)
- data->delay = true;
- data->seek_broken = is_seek_broken (data);
-+ data->timing_broken = is_timing_broken (data->ic);
-
- data->okay = true;
-
-- if (data->ic->duration >= AV_TIME_BASE) {
-+ if (!data->timing_broken && data->ic->duration >= AV_TIME_BASE) {
- #ifdef HAVE_AVIO_SIZE
- data->avg_bitrate = (int) (avio_size (data->ic->pb) /
-- (data->ic->duration / AV_TIME_BASE) * 8);
-+ (data->ic->duration / AV_TIME_BASE) * 8);
- #else
- data->avg_bitrate = (int) (data->ic->file_size /
-- (data->ic->duration / AV_TIME_BASE) * 8);
-+ (data->ic->duration / AV_TIME_BASE) * 8);
- #endif
- }
-- data->bitrate = data->ic->bit_rate;
-
-+ if (!data->timing_broken && data->ic->bit_rate > 0)
-+ data->bitrate = data->ic->bit_rate;
-+
- return data;
-
- end:
-@@ -943,12 +1042,14 @@
- char *buf, int buf_len)
- {
- int filled = 0;
-+ AVFrame *frame;
-
-+ frame = avcodec_alloc_frame ();
-+
- do {
- int len, got_frame, is_planar, plane_size, data_size, copied;
-- AVFrame frame;
-
-- len = avcodec_decode_audio4 (data->enc, &frame, &got_frame, pkt);
-+ len = avcodec_decode_audio4 (data->enc, frame, &got_frame, pkt);
-
- if (len < 0) {
- /* skip frame */
-@@ -968,33 +1069,46 @@
-
- is_planar = av_sample_fmt_is_planar (data->enc->sample_fmt);
- data_size = av_samples_get_buffer_size (&plane_size,
-- data->enc->channels, frame.nb_samples,
-+ data->enc->channels,
-+ frame->nb_samples,
- data->enc->sample_fmt, 1);
-
- if (data_size == 0)
- continue;
-
-- copied = copy_or_buffer (data, (char *)frame.extended_data[0],
-- plane_size, buf, buf_len);
-- buf += copied;
-- filled += copied;
-- buf_len -= copied;
-+ if (is_planar && data->enc->channels > 1) {
-+ int offset, ch;
-
-- if (is_planar && data->enc->channels > 1) {
-- int ch;
-+ for (offset = 0; offset < plane_size; offset += data->sample_width) {
-+ for (ch = 0; ch < data->enc->channels; ch += 1) {
-+ copied = copy_or_buffer (data,
-+ (char *)frame->extended_data[ch]
-+ + offset,
-+ data->sample_width, buf, buf_len);
-+ buf += copied;
-+ filled += copied;
-+ buf_len -= copied;
-+ }
-+ }
-+ }
-+ else {
-+ copied = copy_or_buffer (data, (char *)frame->extended_data[0],
-+ plane_size, buf, buf_len);
-+ buf += copied;
-+ filled += copied;
-+ buf_len -= copied;
-+ }
-
-- for (ch = 1; ch < data->enc->channels; ch += 1) {
-- copied = copy_or_buffer (data, (char *)frame.extended_data[ch],
-- plane_size, buf, buf_len);
-- buf += copied;
-- filled += copied;
-- buf_len -= copied;
-- }
-- }
--
- debug ("Copying %dB (%dB filled)", data_size, filled);
- } while (pkt->size > 0);
-
-+ avcodec_get_frame_defaults (frame);
-+#ifdef HAVE_AVCODEC_FREE_FRAME
-+ avcodec_free_frame (&frame);
-+#else
-+ av_freep (&frame);
-+#endif
-+
- return filled;
- }
- #endif
-@@ -1122,9 +1236,10 @@
- free_packet (pkt);
- } while (!bytes_produced && !data->eos);
-
-- data->bitrate = compute_bitrate (sound_params, bytes_used,
-- bytes_produced + data->remain_buf_len,
-- data->bitrate);
-+ if (!data->timing_broken)
-+ data->bitrate = compute_bitrate (sound_params, bytes_used,
-+ bytes_produced + data->remain_buf_len,
-+ data->bitrate);
-
- return bytes_produced;
- }
-@@ -1185,20 +1300,23 @@
- {
- struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
-
-- return data->bitrate / 1000;
-+ return data->timing_broken ? -1 : data->bitrate / 1000;
- }
-
- static int ffmpeg_get_avg_bitrate (void *prv_data)
- {
- struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
-
-- return data->avg_bitrate / 1000;
-+ return data->timing_broken ? -1 : data->avg_bitrate / 1000;
- }
-
- static int ffmpeg_get_duration (void *prv_data)
- {
- struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
-
-+ if (data->timing_broken)
-+ return -1;
-+
- if (!data->stream)
- return -1;
-
-
-Index: configure.in
-===================================================================
---- configure.in (revision 2518)
-+++ configure.in (working copy)
-@@ -293,7 +293,6 @@
-
- dnl optional functions
- AC_CHECK_FUNCS([strcasestr strerror_r syslog])
--AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
- AX_CHECK_UNAME_SYSCALL
-
- dnl MIME magic
-@@ -322,6 +321,7 @@
- CC="$PTHREAD_CC"
- CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
- EXTRA_LIBS="$EXTRA_LIBS $PTHREAD_LIBS"
-+AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
-
- dnl __FUNCTION__
- AC_TRY_COMPILE(,[printf(__FUNCTION__);], [AC_DEFINE([HAVE__FUNCTION__], 1,
-
-
diff --git a/extra/php-apcu/PKGBUILD b/extra/php-apcu/PKGBUILD
index 96e41a005..cd4cb9f08 100644
--- a/extra/php-apcu/PKGBUILD
+++ b/extra/php-apcu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194370 2013-09-14 20:47:48Z pierre $
+# $Id: PKGBUILD 205511 2014-02-06 14:49:36Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=php-apcu
-pkgver=4.0.2
+pkgver=4.0.3
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='A userland caching module for PHP'
@@ -14,7 +14,7 @@ provides=("php-apc=${pkgver}")
license=('PHP')
source=("http://pecl.php.net/get/apcu-$pkgver.tgz")
backup=('etc/php/conf.d/apcu.ini')
-md5sums=('c8a5c246b787eec81847017823099884')
+md5sums=('4db3d1ed48c447d9adebec13a8846d48')
build() {
cd $srcdir/apcu-$pkgver
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 93f94a870..1daebb0da 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203430 2014-01-10 20:36:02Z pierre $
+# $Id: PKGBUILD 205510 2014-02-06 14:49:36Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.5.8
+pkgver=5.5.9
pkgrel=1
arch=('i686' 'x86_64')
license=('PHP')
@@ -34,7 +34,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz"
"http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc"
'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('1ed2b0193ecaca8b980a9b6a90357f1c'
+md5sums=('c018461604db38af48d1ca304cb592c6'
'SKIP'
'799cd5f91f5253f4b47ec4fd7fccf4f1'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
diff --git a/extra/python-iwscan/PKGBUILD b/extra/python-iwscan/PKGBUILD
index 752d224cb..2636d914b 100644
--- a/extra/python-iwscan/PKGBUILD
+++ b/extra/python-iwscan/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169016 2012-10-17 10:20:21Z allan $
+# $Id: PKGBUILD 205495 2014-02-06 05:24:02Z bisson $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
pkgbase=python-iwscan
pkgname=python2-iwscan
pkgver=20090609
-pkgrel=4
+pkgrel=5
pkgdesc="A Python interface to iwlist, using the iwlib library"
arch=('i686' 'x86_64')
url="http://projects.otaku42.de/browser/python-iwscan"
@@ -15,12 +15,17 @@ replaces=('python-iwscan<=20090609-3')
source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz)
md5sums=('30fbe8ad3b07e67c1c35db2de16077d8')
+prepare() {
+ cd ${pkgbase}
+ sed -i 's|PROC_NET_WIRELESS|"/proc/net/wireless"|' pyiwscan.c
+}
+
build() {
- cd "${srcdir}/${pkgbase}"
+ cd ${pkgbase}
python2 setup.py build
}
package_python2-iwscan() {
- cd "${srcdir}/${pkgbase}"
+ cd ${pkgbase}
python2 setup.py install --root="${pkgdir}"
}
diff --git a/extra/pycurl/PKGBUILD b/extra/python-pycurl/PKGBUILD
index 3db793090..86bd6201c 100644
--- a/extra/pycurl/PKGBUILD
+++ b/extra/python-pycurl/PKGBUILD
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD 204461 2014-01-20 15:09:51Z eric $
-# Maintainer:
+# $Id: PKGBUILD 205506 2014-02-06 10:55:43Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-pkgbase=pycurl
+_pypiname=pycurl
+pkgbase=python-$_pypiname
pkgname=('python-pycurl' 'python2-pycurl')
-pkgver=7.19.3
+pkgver=7.19.3.1
pkgrel=1
arch=('i686' 'x86_64')
url="http://pycurl.sourceforge.net/"
license=('LGPL' 'MIT')
-makedepends=('python' 'python2' 'curl')
-source=("http://pycurl.sourceforge.net/download/${pkgbase}-${pkgver}.tar.gz")
-sha1sums=('5d8b7a7f869362421061d72f6d234bf805ebebb5')
+makedepends=('python' 'python2' 'curl' 'git')
+source=("git+https://github.com/pycurl/pycurl.git#tag=REL_${pkgver//./_}")
+sha1sums=('SKIP')
prepare() {
- cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+ cp -r ${_pypiname} python2-${_pypiname}
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${srcdir}/${_pypiname}"
find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python3|" {} +
- sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py
- cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+ sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py
+
+ cd "${srcdir}/python2-${_pypiname}"
find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python2|" {} +
- sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py
+ sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py
}
build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${srcdir}/${_pypiname}"
python3 setup.py build --with-ssl
- cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+
+ cd "${srcdir}/python2-${_pypiname}"
python2 setup.py build --with-ssl
}
@@ -36,8 +39,8 @@ package_python-pycurl() {
pkgdesc="A Python 3.x interface to libcurl"
depends=('python' 'curl')
- cd ${pkgbase}-${pkgver}
- python setup.py install --root="${pkgdir}"
+ cd ${_pypiname}
+ python setup.py install -O1 --root="${pkgdir}"
install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
@@ -45,7 +48,7 @@ package_python2-pycurl() {
pkgdesc="A Python 2.x interface to libcurl"
depends=('python2' 'curl')
- cd python2-${pkgbase}-${pkgver}
- python2 setup.py install --root="${pkgdir}"
+ cd python2-${_pypiname}
+ python2 setup.py install -O1 --root="${pkgdir}"
install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index ddec22a80..293ac8cb5 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204881 2014-01-30 08:57:40Z andrea $
+# $Id: PKGBUILD 205501 2014-02-06 09:24:42Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=qt5
@@ -21,8 +21,8 @@ pkgname=('qt5-base'
'qt5-webkit'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.2.0
-pkgrel=4
+pkgver=5.2.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -37,7 +37,7 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz"
'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
'use-python2.patch')
-md5sums=('8f60b47ca9461831d940f579ee90517e'
+md5sums=('0c8d2aa45f38be9c3f7c9325eb059d9d'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index 0097a14a0..a334b1380 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -7,9 +7,9 @@
# Contributor: delor <bartekpiech gmail com>
pkgname=qtcreator
-pkgver=3.0.0
-_pkgver=3.0.0
-pkgrel=2
+pkgver=3.0.1
+_pkgver=3.0.1
+pkgrel=1
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('i686' 'x86_64')
url='http://qt-project.org'
@@ -31,7 +31,7 @@ source=("git://gitorious.org/qt-creator/qt-creator.git#tag=v${_pkgver}"
'qtcreator.desktop')
md5sums=('SKIP'
'SKIP'
- '82888d4be900e7833d768050a135cd37')
+ '50880836fd62ccd87550940feb995f06')
prepare() {
cd qt-creator
diff --git a/extra/qtcreator/qtcreator.desktop b/extra/qtcreator/qtcreator.desktop
index 0e8f73e64..7db94d4a9 100644
--- a/extra/qtcreator/qtcreator.desktop
+++ b/extra/qtcreator/qtcreator.desktop
@@ -3,7 +3,7 @@ Exec=/usr/bin/qtcreator
Name=Qt Creator
GenericName=C++ IDE
X-KDE-StartupNotify=true
-Icon=/usr/share/icons/hicolor/512x512/apps/QtProject-qtcreator.png
+Icon=QtProject-qtcreator.png
Terminal=false
Type=Application
Categories=Qt;Development;
diff --git a/kernels/pax-flags-libre/games.conf b/kernels/pax-flags-libre/games.conf
deleted file mode 100644
index 5552b2814..000000000
--- a/kernels/pax-flags-libre/games.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# MPROTECT and RANDMMAP off
-PSmXEr:
- - /usr/bin/pyrogenesis
-
-# PAGEEXEC and MPROTECT off
-#pSmXER:
-# TODO
-
-# MPROTECT off
-PSmXER:
- - /opt/doom3/doom.x86
- - /opt/enemy-territory/et.x86
- - /opt/quake3/ioquake3.i386
- - /opt/quake3/ioquake3.x86_64
- - /usr/bin/bzflag
- - /usr/bin/minetest
- - /usr/bin/opencity
-
diff --git a/kernels/pax-flags-libre/pax-flags-libre.sh b/kernels/pax-flags-libre/pax-flags-libre.sh
deleted file mode 100755
index 97b45cc87..000000000
--- a/kernels/pax-flags-libre/pax-flags-libre.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-ruby=$(which ruby)
-
-[ -z $PAX_FLAGS_SUDO ] && sudo='' || sudo='sudo'
-
-[ "$(paxctl -v $ruby 2>/dev/null)" ] || {
- $sudo paxctl -cm $ruby
-}
-
-$sudo systemctl --system daemon-reload
-
-$sudo pax-flags-libre.rb $@
diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
deleted file mode 100644
index dda93c171..000000000
--- a/libre/reflector/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-#Maintainer: Xyne <ac xunilhcra enyx, backwards>
-#Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=reflector
-pkgver=2014
-pkgrel=2
-pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
-arch=(any)
-license=(GPL)
-url="http://xyne.archlinux.ca/projects/reflector"
-depends=(python3)
-optdepends=('rsync: rate rsync mirrors')
-source=(
- http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz
- http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz.sig
- rebranding.patch
-)
-sha512sums=(
- ac9e0026019048c96be5dd4d156bf79b7d7616f764b5d8fb169cb09cbf629a3e2b1efb1ee7cb53b4e0cd109b985f598d9f80941714e47ed0f21c6417df9b073b
- SKIP
- 83609177f88c0412f1a543f0431ecfb8be229bfef76d7087c35e9273988faedaf24a98ca45d98248eb5dfaa9a27e321dea99a256c68c5bc86a8a0ba53ed56d02
-)
-md5sums=(
- 69ab92b948ffe842189229d09bfbf1c0
- SKIP
- 24c2a21bc1ac0d3758d8043f36d95add
-)
-
-prepare ()
-{
- cd "$srcdir/$pkgname-$pkgver"
- # Rebranding for Parabola
- patch -Np1 -i "$srcdir/rebranding.patch"
-}
-
-package ()
-{
- cd "$srcdir/$pkgname-$pkgver"
- python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
- install -Dm755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname"
-}
-
-
-# vim: set ts=2 sw=2 et:
diff --git a/~lukeshu/dunst-lukeshu-git/PKGBUILD b/~lukeshu/dunst-lukeshu-git/PKGBUILD
deleted file mode 100644
index 31037e113..000000000
--- a/~lukeshu/dunst-lukeshu-git/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-# $Id: PKGBUILD 88586 2013-04-20 15:35:54Z dwallace $
-# Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: feuri
-
-_pkgname=dunst
-_pkgver=1.0.0
-conflicts=("$_pkgname")
-
-pkgname=$_pkgname-lukeshu-git
-pkgver=20130918
-_gitver='commit=67b259b98ac1895bf47c877f216307a174deeb3d'
-pkgrel=1
-pkgdesc="A dmenu-ish notification system"
-arch=('i686' 'x86_64')
-url="http://www.knopwob.org/dunst/"
-license=(BSD3)
-depends=(libxinerama libxss libxdg-basedir pango)
-optdepends=("libnotify: notify-send"
- "dbus: start dunst on demand")
-makedepends=(libnotify dbus perl)
-provides=(notification-daemon "$_pkgname=$_pkgver")
-
-source=("https://repo.parabolagnulinux.org/other/~lukeshu/$pkgname/$pkgname-$pkgver.tar.gz")
-mksource=("$pkgname-$pkgver::git://github.com/LukeShu/dunst.git#${_gitver}")
-mkmd5sums=('SKIP')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- make PREFIX=/usr X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" PREFIX=/usr install
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm755 dunstify "${pkgdir}/usr/bin/dunstify"
- cp docs/* "${pkgdir}/usr/share/dunst/"
-}
-
-md5sums=('720b643b2c7a710fabcc7dc1953318bf')