summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-09-28 01:39:44 -0700
committerroot <root@rshg054.dnsready.net>2012-09-28 01:39:44 -0700
commit3edc42216fee4bb8237aa128510c32ceb77dfd8f (patch)
tree1745e2804c7f439fdb27aefa6f4a6884f0442727
parentbd8faf795abf6d91abdc52bc968829cc2efae4bb (diff)
Fri Sep 28 01:39:41 PDT 2012
-rw-r--r--community-staging/haskell-extensible-exceptions/PKGBUILD39
-rw-r--r--community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install19
-rw-r--r--community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch55
-rw-r--r--community-staging/haskell-glib/PKGBUILD48
-rw-r--r--community-staging/haskell-glib/gtk2hs-glib.install18
-rw-r--r--community-staging/xmonad-contrib/PKGBUILD38
-rw-r--r--community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch46
-rw-r--r--community-staging/xmonad-contrib/xmonad-contrib.install17
-rw-r--r--community-staging/xmonad/PKGBUILD53
-rw-r--r--community-staging/xmonad/xmonad-0.10-x11-1.6.patch19
-rw-r--r--community-staging/xmonad/xmonad-gnome-session.session6
-rw-r--r--community-staging/xmonad/xmonad.install22
-rw-r--r--community-staging/xmonad/xmonad.svg77
-rw-r--r--community/clipit/PKGBUILD6
-rw-r--r--community/dunst/PKGBUILD32
-rw-r--r--community/midori/0.4.7-private-mode.patch12
-rw-r--r--community/midori/PKGBUILD15
-rw-r--r--community/minitube/PKGBUILD10
-rw-r--r--community/ncdu/PKGBUILD6
-rw-r--r--community/perl-xml-fast/PKGBUILD32
-rw-r--r--community/pigeonhole/PKGBUILD10
-rwxr-xr-xcommunity/python-scipy/PKGBUILD4
-rw-r--r--community/reptyr/PKGBUILD25
-rw-r--r--extra/cppunit/PKGBUILD6
-rw-r--r--extra/feh/PKGBUILD6
-rw-r--r--extra/gnutls/PKGBUILD8
-rw-r--r--extra/imagemagick/PKGBUILD6
-rw-r--r--extra/libtasn1/PKGBUILD8
-rw-r--r--extra/live-media/PKGBUILD6
-rw-r--r--extra/qt/PKGBUILD13
-rw-r--r--extra/qt/disable-ssl-compression.patch68
-rw-r--r--extra/quota-tools/PKGBUILD15
-rw-r--r--libre/linux-libre/PKGBUILD19
-rw-r--r--testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch30
-rw-r--r--testing/systemd/PKGBUILD9
35 files changed, 737 insertions, 66 deletions
diff --git a/community-staging/haskell-extensible-exceptions/PKGBUILD b/community-staging/haskell-extensible-exceptions/PKGBUILD
new file mode 100644
index 000000000..81760f8c5
--- /dev/null
+++ b/community-staging/haskell-extensible-exceptions/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 76708 2012-09-27 13:34:06Z jelle $
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+
+_hkgname=extensible-exceptions
+pkgname=haskell-${_hkgname}
+pkgver=0.1.1.4
+pkgrel=3
+pkgdesc="extensible exceptions for both new and old versions of GHC"
+url="http://hackage.haskell.org/package/extensible-exceptions"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.1-1' sh)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=$pkgname.install
+md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b')
+
+build() {
+ cd ${srcdir}/${_hkgname}-${pkgver}
+
+ runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+ --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+ --libsubdir=\$compiler/site-local/\$pkgid
+ runhaskell Setup build
+ runhaskell Setup haddock
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd ${srcdir}/${_hkgname}-${pkgver}
+ install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+ install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+ install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+ ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+ runhaskell Setup copy --destdir=${pkgdir}
+ install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install
new file mode 100644
index 000000000..20c7dce30
--- /dev/null
+++ b/community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install
@@ -0,0 +1,19 @@
+HS_DIR=usr/share/haskell/haskell-extensible-exceptions
+post_install() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
+post_remove() {
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
diff --git a/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
new file mode 100644
index 000000000..845beb2bd
--- /dev/null
+++ b/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
@@ -0,0 +1,55 @@
+From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Thu, 27 Sep 2012 04:48:10 -0700
+Subject: [PATCH] compatibility with ghc 7.6.1
+
+---
+ System/Glib/GObject.chs | 4 +---
+ System/Glib/MainLoop.chs | 4 ++--
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs
+index 5f0fe5c..9925d2c 100644
+--- a/System/Glib/GObject.chs
++++ b/System/Glib/GObject.chs
+@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do
+
+ {#pointer GDestroyNotify as DestroyNotify#}
+
+-foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
+-
+ -- | This function wraps any newly created objects that derives from
+ -- GInitiallyUnowned also known as objects with
+ -- \"floating-references\". The object will be refSink (for glib
+@@ -225,4 +223,4 @@ isA obj gType =
+ -- at this point we would normally implement the notify signal handler;
+ -- I've moved this definition into the Object class of the gtk package
+ -- since there's a quite a bit of machinery missing here (generated signal
+--- register functions and the problem of recursive modules)
+\ No newline at end of file
++-- register functions and the problem of recursive modules)
+diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs
+index 72fecb6..feb4c77 100644
+--- a/System/Glib/MainLoop.chs
++++ b/System/Glib/MainLoop.chs
+@@ -71,7 +71,7 @@ import System.Glib.GObject (DestroyNotify, destroyFunPtr)
+
+ {#pointer SourceFunc#}
+
+-foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
++foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
+
+ type HandlerId = {#type guint#}
+
+@@ -79,7 +79,7 @@ type HandlerId = {#type guint#}
+ --
+ makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
+ makeCallback fun = do
+- funPtr <- mkSourceFunc fun
++ funPtr <- mkSourceFunc (const fun)
+ return (funPtr, destroyFunPtr)
+
+ -- | Sets a function to be called at regular intervals, with the default
+--
+1.7.12.1
+
diff --git a/community-staging/haskell-glib/PKGBUILD b/community-staging/haskell-glib/PKGBUILD
new file mode 100644
index 000000000..09b3b870d
--- /dev/null
+++ b/community-staging/haskell-glib/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 76695 2012-09-27 05:01:54Z tdziedzic $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=haskell-glib
+pkgver=0.12.3.1
+pkgrel=2
+pkgdesc="Binding to the GLIB library for Gtk2Hs."
+url="http://hackage.haskell.org/package/glib"
+license=('LGPL2.1')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.1-1' 'glib2')
+makedepends=("gtk2hs-buildtools")
+options=('strip')
+install=gtk2hs-glib.install
+provides=('gtk2hs-glib')
+replaces=('gtk2hs-glib')
+conflicts=('gtk2hs-glib')
+source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz
+ '0001-compatibility-with-ghc-7.6.1.patch')
+md5sums=('f2899bd2a2850fe95479ddb63490eb04'
+ 'b00660b7102542942b0b9d84b59d1f3c')
+
+build() {
+ cd glib-$pkgver
+
+ patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch
+
+ runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+ --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
+ --libsubdir=\$compiler/site-local/\$pkgid
+ runhaskell Setup build
+ runhaskell Setup haddock
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-`
+ depends=("ghc=${_ghcver}" "glib2")
+
+ cd ${srcdir}/glib-${pkgver}
+ install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh
+ install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh
+ install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+ ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib
+ runhaskell Setup copy --destdir=${pkgdir}
+}
diff --git a/community-staging/haskell-glib/gtk2hs-glib.install b/community-staging/haskell-glib/gtk2hs-glib.install
new file mode 100644
index 000000000..24025f5d8
--- /dev/null
+++ b/community-staging/haskell-glib/gtk2hs-glib.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/gtk2hs-glib
+post_install() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
+post_remove() {
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community-staging/xmonad-contrib/PKGBUILD b/community-staging/xmonad-contrib/PKGBUILD
new file mode 100644
index 000000000..51f4ef608
--- /dev/null
+++ b/community-staging/xmonad-contrib/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 76721 2012-09-27 18:19:41Z jelle $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: orbisvicis <gmail.com>
+
+pkgname=xmonad-contrib
+pkgver=0.10
+pkgrel=5
+pkgdesc="Add-ons for xmonad"
+arch=('i686' 'x86_64')
+url="http://xmonad.org/"
+license=('BSD')
+depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3')
+install='xmonad-contrib.install'
+source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch)
+md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81'
+ '32163aaeb3424cf73bf831640c162a8a')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ # Patch xmonad-contrib to support haskell-x11
+ patch -Np1 -i $srcdir/xmonad-contrib-0.10-x11-1.6.patch
+
+ runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
+ --libsubdir=\$compiler/site-local/\$pkgid
+ runhaskell Setup build
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
+ install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
+ runhaskell Setup.lhs copy --destdir=$pkgdir
+ install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
+}
diff --git a/community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
new file mode 100644
index 000000000..8372b4144
--- /dev/null
+++ b/community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
@@ -0,0 +1,46 @@
+Tue Mar 20 03:53:11 FET 2012 Adam Vogt <vogt.adam@gmail.com>
+ * Bump version to 0.10.1
+
+ Raising the X11 dependency while keeping the xmonad version the same leads to
+ problems where cabal install uses the dependency versions following hackage,
+ not what is installed.
+diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
+index 743bdc8..0fbf4ac 100644
+--- a/xmonad-contrib.cabal
++++ b/xmonad-contrib.cabal
+@@ -61,7 +61,7 @@ library
+ extensions: ForeignFunctionInterface
+ cpp-options: -DXFT
+
+- build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string
++ build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string
+
+ if true
+ ghc-options: -fwarn-tabs -Wall
+diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs
+index a485d95..5e388e2 100644
+--- a/XMonad/Layout/Spiral.hs
++++ b/XMonad/Layout/Spiral.hs
+@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral (
+ ) where
+
+ import Data.Ratio
+-import XMonad
++import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..))
+ import XMonad.StackSet ( integrate )
+
+ -- $usage
+diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs
+index 0d78653..4b7fd3b 100644
+--- a/XMonad/Util/Paste.hs
++++ b/XMonad/Util/Paste.hs
+@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage
+ where
+
+ import XMonad (io, theRoot, withDisplay, X ())
+-import Graphics.X11
++import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode)
++import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask)
+ import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent)
+ import Control.Monad.Reader (asks)
+ import XMonad.Operations (withFocused)
diff --git a/community-staging/xmonad-contrib/xmonad-contrib.install b/community-staging/xmonad-contrib/xmonad-contrib.install
new file mode 100644
index 000000000..e9208c833
--- /dev/null
+++ b/community-staging/xmonad-contrib/xmonad-contrib.install
@@ -0,0 +1,17 @@
+HS_DIR=usr/share/haskell/xmonad-contrib
+
+post_install() {
+ ${HS_DIR}/register.sh
+}
+
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+
+post_upgrade() {
+ ${HS_DIR}/register.sh
+}
+
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
diff --git a/community-staging/xmonad/PKGBUILD b/community-staging/xmonad/PKGBUILD
new file mode 100644
index 000000000..404021eb4
--- /dev/null
+++ b/community-staging/xmonad/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 76719 2012-09-27 17:41:43Z jelle $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: shild <shildv@gmail.com>
+
+pkgname=xmonad
+pkgver=0.10
+pkgrel=5
+pkgdesc="Lightweight X11 tiled window manager written in Haskell"
+arch=('i686' 'x86_64')
+url="http://xmonad.org/"
+license=('BSD')
+depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions')
+makedepends=('setconf' 'gendesk')
+optdepends=('xorg-xmessage: for displaying visual error messages')
+install='xmonad.install'
+source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
+ xmonad.svg xmonad-0.10-x11-1.6.patch)
+
+build() {
+ cd "$srcdir"
+ ghc-pkg list
+ gendesk
+
+ cd $srcdir/$pkgname-$pkgver
+ # Patch XMonad so we support haskell 1.6
+ patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch
+
+
+ runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
+ --libsubdir=\$compiler/site-local/\$pkgid
+ runhaskell Setup build
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
+ install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
+ runhaskell Setup.lhs copy --destdir=$pkgdir
+ #runhaskell util/GenerateManpage.hs
+
+ install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
+
+ install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
+
+ install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
+}
+md5sums=('f8381e1ec15137863558a454d4466467'
+ '72bfa5e62e4e44fe7fa59b6a7593d993'
+ '22d29900d71f09a8f9fa6f0d2f3fed32')
diff --git a/community-staging/xmonad/xmonad-0.10-x11-1.6.patch b/community-staging/xmonad/xmonad-0.10-x11-1.6.patch
new file mode 100644
index 000000000..5b7afaf3b
--- /dev/null
+++ b/community-staging/xmonad/xmonad-0.10-x11-1.6.patch
@@ -0,0 +1,19 @@
+Tue Mar 20 03:49:24 FET 2012 Adam Vogt <vogt.adam@gmail.com>
+ * Address versioning problems related to X11 1.6 release.
+
+ Bump version to 0.10.1 since cabal uses hackage dependencies even when the
+ locally installed package differs.
+
+ Allow X11-1.6 dependency.
+diff -rN -u old-xmonad/xmonad.cabal new-xmonad/xmonad.cabal
+--- old-xmonad/xmonad.cabal 2012-05-06 12:20:26.788767220 +0300
++++ new-xmonad/xmonad.cabal 2012-05-06 12:20:26.818766844 +0300
+@@ -46,7 +46,7 @@
+ build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions
+ else
+ build-depends: base < 3
+- build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix,
++ build-depends: X11>=1.5 && < 1.7, mtl, unix,
+ utf8-string >= 0.3 && < 0.4
+
+ if true
diff --git a/community-staging/xmonad/xmonad-gnome-session.session b/community-staging/xmonad/xmonad-gnome-session.session
new file mode 100644
index 000000000..c0bd16781
--- /dev/null
+++ b/community-staging/xmonad/xmonad-gnome-session.session
@@ -0,0 +1,6 @@
+[GNOME Session]
+Name=Xmonad session
+RequiredComponents=gnome-panel;gnome-settings-daemon;
+RequiredProviders=windowmanager;notifications;
+DefaultProvider-windowmanager=xmonad
+DefaultProvider-notifications=notification-daemon
diff --git a/community-staging/xmonad/xmonad.install b/community-staging/xmonad/xmonad.install
new file mode 100644
index 000000000..6659247db
--- /dev/null
+++ b/community-staging/xmonad/xmonad.install
@@ -0,0 +1,22 @@
+HS_DIR=/usr/share/haskell/xmonad
+
+post_install() {
+ ${HS_DIR}/register.sh
+ echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs"
+ echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples"
+ echo
+ echo "If you would like to run xmonad as a window manager inside GNOME, please see"
+ echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad"
+}
+
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+
+post_upgrade() {
+ ${HS_DIR}/register.sh
+}
+
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
diff --git a/community-staging/xmonad/xmonad.svg b/community-staging/xmonad/xmonad.svg
new file mode 100644
index 000000000..5fc884213
--- /dev/null
+++ b/community-staging/xmonad/xmonad.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2211"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ width="47"
+ height="73"
+ version="1.0"
+ sodipodi:docbase="/home/sjanssen/xmonad-web/images"
+ sodipodi:docname="logo.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata2216">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs2214" />
+ <sodipodi:namedview
+ inkscape:window-height="778"
+ inkscape:window-width="1278"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="1"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:zoom="4"
+ inkscape:cx="23.5"
+ inkscape:cy="22.689137"
+ inkscape:window-x="0"
+ inkscape:window-y="20"
+ inkscape:current-layer="g3208" />
+ <g
+ id="g3208"
+ transform="translate(-44.517797,4.0967298)">
+ <g
+ id="g3212"
+ transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)">
+ <path
+ style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462"
+ id="text2220"
+ sodipodi:nodetypes="cccccccc" />
+ <path
+ id="path3206"
+ d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349"
+ style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ sodipodi:nodetypes="ccccccccc" />
+ </g>
+ <path
+ style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
+ d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z "
+ id="text3216"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccc" />
+ </g>
+</svg>
diff --git a/community/clipit/PKGBUILD b/community/clipit/PKGBUILD
index ed3a18654..bd39684a2 100644
--- a/community/clipit/PKGBUILD
+++ b/community/clipit/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 72903 2012-06-24 18:15:32Z bpiotrowski $
+# $Id: PKGBUILD 76710 2012-09-27 13:37:18Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Mihai Militaru <mihai dot militaru at xmpp dot ro>
pkgname=clipit
pkgver=1.4.2
-pkgrel=3
+pkgrel=4
pkgdesc="Lightweight GTK+ clipboard manager (fork of Parcellite)"
arch=('i686' 'x86_64')
url="http://gtkclipit.sourceforge.net/"
license=('GPL3')
-depends=('gtk2' 'gtk-update-icon-cache' 'hicolor-icon-theme')
+depends=('gtk2' 'gtk-update-icon-cache' 'hicolor-icon-theme' 'librsvg')
makedepends=('intltool')
optdepends=('xdotool: for automatic paste')
install=$pkgname.install
diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD
new file mode 100644
index 000000000..33337133b
--- /dev/null
+++ b/community/dunst/PKGBUILD
@@ -0,0 +1,32 @@
+$Id: PKGBUILD 76730 2012-09-28 03:35:52Z dwallace $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: feuri
+
+pkgname=dunst
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="a dmenu-ish notification system "
+arch=('i686' 'x86_64')
+url="http://knopwob.github.com/dunst"
+license=(MIT)
+depends=(dbus-core libxinerama libxft libxss libxdg-basedir)
+makedepends=('git' 'perl')
+optdepends=('libnotify: dunst is able to listen to notifications from libnotify')
+provides=(notification-daemon)
+source=("${pkgname}-${pkgver}.tar.bz2::http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2")
+md5sums=('615b673011222f6ab6f5df28def329a9')
+
+build() {
+ cd "${srcdir}/$pkgname-$pkgver"
+
+ make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+}
+
+package() {
+ cd "${srcdir}/$pkgname-$pkgver"
+
+ make DESTDIR="${pkgdir}" PREFIX=/usr install
+
+ install -Dm644 "${srcdir}/$pkgname-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+# vim:set ts=2 sw=2 et:
diff --git a/community/midori/0.4.7-private-mode.patch b/community/midori/0.4.7-private-mode.patch
new file mode 100644
index 000000000..599780b78
--- /dev/null
+++ b/community/midori/0.4.7-private-mode.patch
@@ -0,0 +1,12 @@
+diff -aur midori-0.4.7/katze/midori-paths.vala midori-0.4.7.patch/katze/midori-paths.vala
+--- midori-0.4.7/katze/midori-paths.vala 2012-09-19 23:17:43.000000000 +0200
++++ midori-0.4.7.patch/katze/midori-paths.vala 2012-09-24 20:36:04.585209437 +0200
+@@ -74,7 +74,7 @@
+ else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
+ /* Use mock folders in development builds */
+ if ("." in MIDORI_VERSION_SUFFIX)
+- config_dir = cache_dir = user_data_dir = config_base;
++ config_dir = cache_dir = user_data_dir = config_base ?? Path.DIR_SEPARATOR_S;
+ else
+ config_dir = cache_dir = user_data_dir = "/";
+ readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S,
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 49e132e5a..5a49b7dce 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76505 2012-09-20 05:16:42Z bpiotrowski $
+# $Id: PKGBUILD 76712 2012-09-27 13:47:42Z bpiotrowski $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -8,7 +8,7 @@
pkgname=midori
pkgver=0.4.7
-pkgrel=1
+pkgrel=2
pkgdesc='Lightweight web browser based on Gtk WebKit'
arch=('x86_64' 'i686')
url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
@@ -18,12 +18,17 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util
makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala')
optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support')
options=('!emptydirs')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('06db7b88a41e9b2265728960d5e98f35')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+ 0.4.7-private-mode.patch)
+md5sums=('06db7b88a41e9b2265728960d5e98f35'
+ 'b2f21a853038662fd0e6c2274ed9dfb7')
build() {
cd $srcdir/$pkgname-$pkgver
-
+
+ # fs#31641
+ patch -Np1 -i $srcdir/0.4.7-private-mode.patch
+
# python2
export PYTHON=/usr/bin/python2
sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD
index 38aab9086..21c600ecc 100644
--- a/community/minitube/PKGBUILD
+++ b/community/minitube/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 73056 2012-06-29 18:18:46Z andrea $
+# $Id: PKGBUILD 76714 2012-09-27 15:50:01Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=minitube
-pkgver=1.8
+pkgver=1.9
pkgrel=1
pkgdesc="A native YouTube client in QT. Watch YouTube videos without Flash Player"
arch=('i686' 'x86_64')
@@ -12,11 +12,11 @@ depends=('phonon')
install="${pkgname}.install"
source=("http://flavio.tordini.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'fix-build.patch')
-md5sums=('dabfe4776ab6a19eff14e644f68714bb'
+md5sums=('a60bb568519eb91035d5d6dc27ff1406'
'b6d67acdfc5ef17235449ca13575ba97')
build() {
- cd "${srcdir}"/${pkgname}
+ cd ${pkgname}
patch -p1 -i "${srcdir}"/fix-build.patch
@@ -24,6 +24,6 @@ build() {
}
package() {
- cd "${srcdir}"/${pkgname}
+ cd ${pkgname}
make install INSTALL_ROOT="${pkgdir}"
}
diff --git a/community/ncdu/PKGBUILD b/community/ncdu/PKGBUILD
index 2a61a768d..011f7e0d8 100644
--- a/community/ncdu/PKGBUILD
+++ b/community/ncdu/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59391 2011-11-24 07:32:15Z bisson $
+# $Id: PKGBUILD 76727 2012-09-27 22:43:52Z bisson $
# Contributor: lp76 <l.peduto@gmail.com>
# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=ncdu
-pkgver=1.8
+pkgver=1.9
pkgrel=1
pkgdesc='Disk usage analyzer with an ncurses interface'
url='http://dev.yorhel.nl/ncdu/'
@@ -13,7 +13,7 @@ license=('custom:MIT')
depends=('ncurses')
arch=('i686' 'x86_64')
source=("http://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('3d98e78cf7035e32333d263d301d12e9b4352598')
+sha1sums=('27cb5464b192db8ffdf0a894fe51d29985348eb0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/perl-xml-fast/PKGBUILD b/community/perl-xml-fast/PKGBUILD
new file mode 100644
index 000000000..ced5668d1
--- /dev/null
+++ b/community/perl-xml-fast/PKGBUILD
@@ -0,0 +1,32 @@
+$Id: PKGBUILD 76693 2012-09-27 04:18:50Z dwallace $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: trizen .= x@gmail.com
+
+pkgname=perl-xml-fast
+pkgver=0.11
+pkgrel=3
+pkgdesc="Simple and very fast XML to hash conversion."
+arch=('x86_64' 'i686')
+url="http://search.cpan.org/dist/XML-Fast/"
+license=('GPL' 'PerlArtistic')
+depends=('perl')
+options=('!emptydirs')
+source=("http://search.cpan.org/CPAN/authors/id/M/MO/MONS/XML-Fast-${pkgver}.tar.gz")
+md5sums=('a2985cc2f328cf9eda6ad75c3f40f6b3')
+
+build() {
+ cd "${srcdir}/XML-Fast-${pkgver}"
+
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+
+ make
+}
+
+package() {
+ cd "${srcdir}/XML-Fast-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ find ${pkgdir} -name '.packlist' -delete
+ find ${pkgdir} -name '*.pod' -delete
+}
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index eba6ef3f7..129249b9a 100644
--- a/community/pigeonhole/PKGBUILD
+++ b/community/pigeonhole/PKGBUILD
@@ -4,12 +4,12 @@
# This must be built against the version of dovecot being used,
# else mail delivery will fail.
# Specify the version of dovecot to be used here:
-_dcpkgver=2.1.9
+_dcpkgver=2.1.10
# Make sure to bump pkgrel if changing this.
pkgname=pigeonhole
-pkgver=0.3.1
-pkgrel=3
+pkgver=0.3.3
+pkgrel=1
pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
arch=('i686' 'x86_64')
url="http://pigeonhole.dovecot.org/"
@@ -19,8 +19,8 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg')
source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig}
"dovecot.conf")
options=('!libtool')
-sha256sums=('e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7'
- '9d4699435cb1e82d3ac943c37f2ef909cd80cab707cc8b23be0d087f0e80903f'
+sha256sums=('1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e'
+ '8604f9c52cff28506873cf4d0026c57ef73def5f05877126ea561774f1b8ffec'
'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
build() {
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index 460313b10..3d3097b44 100755
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -6,7 +6,7 @@
# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
pkgname=('python-scipy' 'python2-scipy')
-pkgver=0.10.1
+pkgver=0.11.0
pkgrel=1
pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ license=('BSD')
makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy')
checkdepends=('python-nose' 'python2-nose')
source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz")
-md5sums=('6ad976549e22e04ca93e70cf55b70a22')
+md5sums=('842c81d35fd63579c41a8ca21a2419b9')
build() {
unset LDFLAGS
diff --git a/community/reptyr/PKGBUILD b/community/reptyr/PKGBUILD
new file mode 100644
index 000000000..0fe64d389
--- /dev/null
+++ b/community/reptyr/PKGBUILD
@@ -0,0 +1,25 @@
+$Id: PKGBUILD 76717 2012-09-27 16:24:59Z dwallace $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+
+pkgname=reptyr
+pkgver=0.4
+pkgrel=2
+pkgdesc="A tool for \"re-ptying\" programs"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="https://github.com/nelhage/reptyr"
+depends=('glibc')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nelhage/$pkgname/tarball/$pkgname-$pkgver")
+md5sums=('4846a0b22c267a154853ce1409e823da')
+
+build() {
+ cd "$srcdir"/nelhage-$pkgname-*
+
+ make
+}
+
+package() {
+ cd "$srcdir"/nelhage-$pkgname-*
+
+ make "DESTDIR=$pkgdir" "PREFIX=/usr" install
+}
diff --git a/extra/cppunit/PKGBUILD b/extra/cppunit/PKGBUILD
index 988124454..6fcb3d40d 100644
--- a/extra/cppunit/PKGBUILD
+++ b/extra/cppunit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163110 2012-07-07 09:30:05Z andyrtr $
+# $Id: PKGBUILD 167193 2012-09-27 15:30:04Z andyrtr $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
pkgname=cppunit
-pkgver=1.13.0
+pkgver=1.13.1
pkgrel=1
-_hash=0c65c839854edd43d9294d1431a2b292
+_hash=fa9aa839145cdf860bf596532bb8af97
pkgdesc="A C++ unit testing framework"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/cppunit"
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index 1274c5c59..5098feb65 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167159 2012-09-26 17:14:45Z bisson $
+# $Id: PKGBUILD 167203 2012-09-27 22:43:39Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=feh
-pkgver=2.6.2
+pkgver=2.6.3
pkgrel=1
pkgdesc='Fast and light imlib2-based image viewer'
url='http://feh.finalrewind.org/'
@@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh'
'imagemagick: support more file formats')
makedepends=('libxt')
source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a2c6cf99ef2128834d14c0367cb5a9a11957ba6c')
+sha1sums=('3aa991b1596d5bc1fb35e8a1b356b5f1a8a9c04e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index f35e89e63..ad28fdfc6 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165900 2012-09-03 09:49:29Z andyrtr $
+# $Id: PKGBUILD 167195 2012-09-27 15:45:57Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnutls
-pkgver=3.1.1
+pkgver=3.1.2
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ options=('!libtool' '!zipman')
depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
makedepends=('valgrind' 'strace')
source=(http://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('59c432df79108c74c34a4582c7d7e7e7'
- '00d354ec9ac8ca4329b35ea397589b6c')
+md5sums=('5d722e5850d79269ba413b0e69b9e14f'
+ '2764135bac008654a0b2fdd9fc6e62d1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index d7e3ab964..b3a717d40 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166610 2012-09-13 02:13:20Z eric $
+# $Id: PKGBUILD 167199 2012-09-27 17:38:29Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.9.4
+pkgver=6.7.9.8
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.imagemagick.org/"
@@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
perlmagick.rpath.patch)
-sha1sums=('6fa1a160c85f9119047a94ad1c8d3f49d9a84492'
+sha1sums=('dc61335f931ea637e7bd2e711b520d221bfe464c'
'23405f80904b1de94ebd7bd6fe2a332471b8c283')
build() {
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index 20d5bf4cc..ffcdb9bb9 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160686 2012-06-03 18:36:06Z andyrtr $
+# $Id: PKGBUILD 167197 2012-09-27 15:53:17Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=libtasn1
-pkgver=2.13
+pkgver=2.14
pkgrel=1
pkgdesc="The ASN.1 library used in GNUTLS"
arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('glibc' 'texinfo')
options=('!libtool')
install=libtasn1.install
source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('89120584bfedd244dab92df99e955a174c481851'
- '2f9ce2aef6c1bd78f462e95de531b2b61f59d13c')
+sha1sums=('22f9e0b15f870c8e03ac9cc1ead969d4d84eb931'
+ 'cd6fdde4f59f7c24eb738896904034f17ab490f2')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 709eb00c7..0a69ffbc8 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166690 2012-09-15 17:24:11Z giovanni $
+# $Id: PKGBUILD 167205 2012-09-27 23:00:52Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
-pkgver=2012.09.13
+pkgver=2012.09.27
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
url="http://live555.com/liveMedia"
depends=('gcc-libs')
source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('33ffc8df7f07a6db0e923d73dfdc0547')
+md5sums=('a587166b7830f1be4b829c2bf84ac195')
build() {
cd ${srcdir}/live
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index a29c185e7..c2002dea7 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 166954 2012-09-23 09:22:55Z andrea $
+# $Id: PKGBUILD 167191 2012-09-27 12:38:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.3
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -20,7 +20,8 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
'qtconfig.desktop'
'improve-cups-support.patch'
'fix-crash-in-assistant.patch'
- 'undo-fix-jit-crash-on-x86_64.patch')
+ 'undo-fix-jit-crash-on-x86_64.patch'
+ 'disable-ssl-compression.patch')
md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
@@ -28,7 +29,8 @@ md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
'c439c7731c25387352d8453ca7574971'
'57590084078b6379f0501f7728b02ae2'
- '094e5a4e30e52423c77daa4a9c782df5')
+ '094e5a4e30e52423c77daa4a9c782df5'
+ '94e9e433342018bf35e8d6d968b7432c')
build() {
cd "${srcdir}"/${_pkgfqn}
@@ -41,6 +43,9 @@ build() {
# (FS#31654)
patch -Rp1 -i "${srcdir}"/undo-fix-jit-crash-on-x86_64.patch
+
+ # Security fix
+ patch -p1 -i "${srcdir}"/disable-ssl-compression.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
diff --git a/extra/qt/disable-ssl-compression.patch b/extra/qt/disable-ssl-compression.patch
new file mode 100644
index 000000000..443af57f3
--- /dev/null
+++ b/extra/qt/disable-ssl-compression.patch
@@ -0,0 +1,68 @@
+From d41dc3e101a694dec98d7bbb582d428d209e5401 Mon Sep 17 00:00:00 2001
+From: Richard Moore <rich@kde.org>
+Date: Fri, 14 Sep 2012 00:13:08 +0100
+Subject: [PATCH] Disable SSL compression by default.
+
+Disable SSL compression by default since this appears to be the a likely
+cause of the currently hyped CRIME attack.
+
+This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74
+
+Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+Reviewed-by: Peter Hartmann <phartmann@rim.com>
+---
+ src/network/ssl/qssl.cpp | 5 +++--
+ src/network/ssl/qsslconfiguration.cpp | 4 +++-
+ src/network/ssl/qsslconfiguration_p.h | 4 +++-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
+index 49e086f..9578178 100644
+--- a/src/network/ssl/qssl.cpp
++++ b/src/network/ssl/qssl.cpp
+@@ -148,8 +148,9 @@ QT_BEGIN_NAMESPACE
+
+ By default, SslOptionDisableEmptyFragments is turned on since this causes
+ problems with a large number of servers. SslOptionDisableLegacyRenegotiation
+- is also turned on, since it introduces a security risk. The other options
+- are turned off.
++ is also turned on, since it introduces a security risk.
++ SslOptionDisableCompression is turned on to prevent the attack publicised by
++ CRIME. The other options are turned off.
+
+ Note: Availability of above options depends on the version of the SSL
+ backend in use.
+diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
+index 24c7b77..3a05f54 100644
+--- a/src/network/ssl/qsslconfiguration.cpp
++++ b/src/network/ssl/qsslconfiguration.cpp
+@@ -201,7 +201,9 @@ bool QSslConfiguration::isNull() const
+ d->privateKey.isNull() &&
+ d->peerCertificate.isNull() &&
+ d->peerCertificateChain.count() == 0 &&
+- d->sslOptions == (QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation));
++ d->sslOptions == ( QSsl::SslOptionDisableEmptyFragments
++ |QSsl::SslOptionDisableLegacyRenegotiation
++ |QSsl::SslOptionDisableCompression));
+ }
+
+ /*!
+diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
+index 74f17cd..c36b651 100644
+--- a/src/network/ssl/qsslconfiguration_p.h
++++ b/src/network/ssl/qsslconfiguration_p.h
+@@ -83,7 +83,9 @@ public:
+ : protocol(QSsl::SecureProtocols),
+ peerVerifyMode(QSslSocket::AutoVerifyPeer),
+ peerVerifyDepth(0),
+- sslOptions(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)
++ sslOptions(QSsl::SslOptionDisableEmptyFragments
++ |QSsl::SslOptionDisableLegacyRenegotiation
++ |QSsl::SslOptionDisableCompression)
+ { }
+
+ QSslCertificate peerCertificate;
+--
+1.7.10
+
diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD
index 33474d7e9..41bb7f216 100644
--- a/extra/quota-tools/PKGBUILD
+++ b/extra/quota-tools/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163746 2012-07-18 22:38:58Z eric $
+# $Id: PKGBUILD 167201 2012-09-27 19:22:41Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=quota-tools
-pkgver=4.00
+pkgver=4.01
pkgrel=1
epoch=1
pkgdesc="Tools to manage kernel-level quotas in Linux"
@@ -12,21 +12,20 @@ license=('GPL' 'BSD')
depends=('e2fsprogs')
backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins')
options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz \
- LICENSE)
-sha1sums=('9ef79933bebfd80f007600fd422616ad161c5fd0'
- '57297bdc9e638c500506169bbbe12eb89bcf7d07')
+source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz)
+sha1sums=('64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf')
build() {
cd "${srcdir}/${pkgname}"
./configure --prefix=/usr --sysconfdir=/etc
- make RPCGEN="rpcgen -Y /usr/bin"
+ make
}
package() {
cd "${srcdir}/${pkgname}"
make ROOTDIR="${pkgdir}" install
- install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ head -33 quota.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
# remove conflicts with glibc
rm "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x}
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 45888f407..0e350070c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -90,7 +90,7 @@ build() {
# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
# and make USB storage support builtin (e.g. for booting from USB
# disks without slowly loading an initramfs)
- sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+ sed -ri \
-e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
-e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
@@ -178,7 +178,8 @@ _package() {
_basekernel=${_kernver%%-*}
_basekernel=${_basekernel%.*}
- mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
+ mkdir -p "${pkgdir}"/{usr/{lib/modules,lib/firmware},boot}
+ ln -s usr/lib "${pkgdir}"/lib
make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
if [ "$CARCH" == "mips64el" ]; then
@@ -213,22 +214,22 @@ _package() {
fi
# remove build and source links
- rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
+ rm -f "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build}
# remove the firmware
- rm -rf "${pkgdir}/lib/firmware"
+# rm -rf "${pkgdir}/lib/firmware"
# gzip -9 all modules to save 100MB of space
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
# make room for external modules
- ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+ ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules"
# add real version for building modules and running depmod from post_install/upgrade
- mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}"
- echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version"
+ mkdir -p "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}"
+ echo "${_kernver}" > "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version"
# Now we call depmod...
depmod -b "$pkgdir" -F System.map "$_kernver"
- # move module tree /lib -> /usr/lib
- mv "$pkgdir/lib" "$pkgdir/usr"
+# remove the symlink (conflicts with glibc)
+ rm ${pkgdir}/lib
}
_package-headers() {
diff --git a/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
new file mode 100644
index 000000000..9be6ef28f
--- /dev/null
+++ b/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
@@ -0,0 +1,30 @@
+From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Thu, 27 Sep 2012 20:48:13 -0400
+Subject: [PATCH] tmpfiles: restore previous behavior for F/f
+
+d4e9eb91ea changed the behavior for the F and f actions, wrongly sending
+them to glob_item(). Restore the old behavior and shortcut straight to
+write_one_file().
+---
+ src/tmpfiles/tmpfiles.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index f10f908..bf900fa 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -673,6 +673,10 @@ static int create_item(Item *i) {
+
+ case CREATE_FILE:
+ case TRUNCATE_FILE:
++ r = write_one_file(i, i->path);
++ if (r < 0)
++ return r;
++ break;
+ case WRITE_FILE:
+ r = glob_item(i, write_one_file);
+ if (r < 0)
+--
+1.7.12.1
+
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
index 5e0421849..8dc086a4a 100644
--- a/testing/systemd/PKGBUILD
+++ b/testing/systemd/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=192
+pkgver=193
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -18,12 +18,14 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-install-udev'
'initcpio-install-timestamp'
'0001-Reinstate-TIMEOUT-handling.patch'
+ '0001-tmpfiles-restore-previous-behavior-for-F-f.patch'
'use-split-usr-path.patch')
-md5sums=('e8692055923e87f7f9cb634d44314edb'
+md5sums=('732a9de2b1d2a15cab639c987ff9e90e'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'59e91c4d7a69b7bf12c86a9982e37ced'
'df69615503ad293c9ddf9d8b7755282d'
'5543be25f205f853a21fa5ee68e03f0d'
+ '1f435290db227c3a4f4396f86819227e'
'fd5b5f04ab0a847373d357555129d4c0')
build() {
@@ -35,6 +37,9 @@ build() {
# hang onto this until we do the /{,s}bin merge
patch -Np1 <"$srcdir/use-split-usr-path.patch"
+ # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0
+ patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch"
+
./configure \
--libexecdir=/usr/lib \
--localstatedir=/var \