diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-24 03:30:57 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-24 03:30:57 +0000 |
| commit | 431023a318e680258f02c1fb5fdca176c68e5cb7 (patch) | |
| tree | cedbdd37d2a93310636cf71c781041a2b5ee68a3 | |
| parent | 0459e6459ee534bf22ab8a5381cd485e6035e9e2 (diff) | |
Thu Apr 24 03:25:33 UTC 2014
61 files changed, 736 insertions, 668 deletions
diff --git a/community/arm-none-eabi-gcc/PKGBUILD b/community/arm-none-eabi-gcc/PKGBUILD index 87c353a77..07e167695 100644 --- a/community/arm-none-eabi-gcc/PKGBUILD +++ b/community/arm-none-eabi-gcc/PKGBUILD @@ -2,8 +2,8 @@ _target=arm-none-eabi pkgname=$_target-gcc -pkgver=4.8.2 -pkgrel=8 +pkgver=4.9.0 +pkgrel=1 _newlibver=2.1.0 pkgdesc='The GNU Compiler Collection - cross compiler for ARM EABI (bare-metal) target' arch=(i686 x86_64) @@ -15,13 +15,13 @@ makedepends=($_target-binutils gmp mpfr) options=(!emptydirs !strip staticlibs) source=(ftp://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 ftp://sourceware.org/pub/newlib/newlib-$_newlibver.tar.gz - gcc-$pkgver-multilib.patch - gcc-$pkgver-no-exceptions.patch + gcc-multilib.patch + gcc-no-exceptions.patch libgloss-configure-fix.patch) -sha256sums=('09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8' +sha256sums=('b9b047a97bade9c1c89970bc8e211ff57b7b8998a1730a80a653d329f8ed1257' '3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48' - '4edd875c89391cbf5c2b57587a51da0dfda54ca0c711a85e9c301f03083e4189' - '649eb3b443e975d40ca61128ba715d1e3a29716e1e45a52c661ac0dba3c2099d' + '998d1face674cc8d1af5bf28ded15caaaa18936a28f278123448f29555a07775' + '7f59b28475aa2018a7edfb81ea81444a6eb098fd3847d8e605809ae6fbeabde5' 'eac96c034d3d7d16080d9aef4749e4eda493563a3348e6a06f08e8a330b027ba') prepare() { @@ -30,16 +30,16 @@ prepare() { patch -Np0 -i "$srcdir/libgloss-configure-fix.patch" autoreconf - cd "$srcdir" - patch -Np0 -i gcc-$pkgver-multilib.patch - patch -Np0 -i gcc-$pkgver-no-exceptions.patch + cd "$srcdir/gcc-$pkgver" + patch -Np0 -i "$srcdir"/gcc-multilib.patch + patch -Np0 -i "$srcdir"/gcc-no-exceptions.patch # Move newlib and libgloss to gcc source directory - mv newlib-$_newlibver/newlib gcc-$pkgver - mv newlib-$_newlibver/libgloss gcc-$pkgver + mv "$srcdir"/newlib-$_newlibver/newlib "$srcdir/gcc-$pkgver" + mv "$srcdir"/newlib-$_newlibver/libgloss "$srcdir/gcc-$pkgver" # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" gcc-$pkgver/{libiberty,gcc}/configure + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/gcc-$pkgver/{libiberty,gcc}/configure } build() { @@ -91,7 +91,6 @@ package() { find "$pkgdir" -executable -type f -exec /usr/bin/strip --strip-debug '{}' \; # Remove files that conflict with host gcc package - rm "$pkgdir"/usr/lib/libiberty.a rm -r "$pkgdir"/usr/share/man/man7 rm -r "$pkgdir"/usr/share/info rm -r "$pkgdir"/usr/share/gcc-$pkgver diff --git a/community/arm-none-eabi-gcc/gcc-4.8.2-multilib.patch b/community/arm-none-eabi-gcc/gcc-multilib.patch index c75aa158b..026a87ff9 100644 --- a/community/arm-none-eabi-gcc/gcc-4.8.2-multilib.patch +++ b/community/arm-none-eabi-gcc/gcc-multilib.patch @@ -1,5 +1,5 @@ ---- gcc-4.8.2/gcc/config/arm/t-arm-elf.orig 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.2/gcc/config/arm/t-arm-elf 2013-10-17 08:14:29.237001796 +0200 +--- gcc/config/arm/t-arm-elf.orig 2013-01-10 21:38:27.000000000 +0100 ++++ gcc/config/arm/t-arm-elf 2013-10-17 08:14:29.237001796 +0200 @@ -18,73 +18,26 @@ MULTILIB_OPTIONS = marm/mthumb diff --git a/community/arm-none-eabi-gcc/gcc-4.8.2-no-exceptions.patch b/community/arm-none-eabi-gcc/gcc-no-exceptions.patch index 6291ee43b..2abb0ce92 100644 --- a/community/arm-none-eabi-gcc/gcc-4.8.2-no-exceptions.patch +++ b/community/arm-none-eabi-gcc/gcc-no-exceptions.patch @@ -1,5 +1,5 @@ ---- gcc-4.8.2/libgcc/Makefile.in.orig 2013-02-04 20:06:20.000000000 +0100 -+++ gcc-4.8.2/libgcc/Makefile.in 2013-10-17 08:05:38.314091932 +0200 +--- libgcc/Makefile.in.orig 2013-02-04 20:06:20.000000000 +0100 ++++ libgcc/Makefile.in 2013-10-17 08:05:38.314091932 +0200 @@ -492,7 +492,7 @@ ifeq ($(LIB2_DIVMOD_EXCEPTION_FLAGS),) # Provide default flags for compiling divmod functions, if they haven't been diff --git a/community/bbrun/PKGBUILD b/community/bbrun/PKGBUILD index 807d3b561..92b824f3c 100644 --- a/community/bbrun/PKGBUILD +++ b/community/bbrun/PKGBUILD @@ -1,20 +1,26 @@ -# $Id: PKGBUILD 65065 2012-02-20 02:40:27Z spupykin $ +# $Id: PKGBUILD 110058 2014-04-23 16:47:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sven Kauber <celeon@gmail.com> pkgname=bbrun pkgver=1.6 -pkgrel=4 +pkgrel=5 pkgdesc="A run - component for blackbox window manager" arch=(i686 x86_64) -url="http://www.darkops.net/bbrun/" +#url="http://www.darkops.net/bbrun/" +url="https://packages.debian.org/unstable/x11/bbrun" license=('GPL') depends=('gtk2' 'libxpm') -source=(http://www.darkops.net/bbrun/$pkgname-$pkgver.tar.gz) +#source=(http://www.darkops.net/bbrun/$pkgname-$pkgver.tar.gz) +source=("http://ftp.de.debian.org/debian/pool/main/b/bbrun/bbrun_$pkgver.orig.tar.gz") md5sums=('820960e3d52ddf2d5cf7e4ba51821bfd') build() { cd $srcdir/$pkgname-$pkgver/$pkgname make LIBS="-lXpm `pkg-config --libs gtk+-2.0` -lX11 -lXext" +} + +package() { + cd $srcdir/$pkgname-$pkgver/$pkgname install -Dm755 bbrun $pkgdir/usr/bin/bbrun } diff --git a/community/catdvi/PKGBUILD b/community/catdvi/PKGBUILD index cb8321332..855d8bb08 100644 --- a/community/catdvi/PKGBUILD +++ b/community/catdvi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65072 2012-02-20 03:29:57Z spupykin $ +# $Id: PKGBUILD 110060 2014-04-23 16:48:04Z spupykin $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Xilon <xilonmu@gmail.com> pkgname=catdvi pkgver=0.14 -pkgrel=5 +pkgrel=6 pkgdesc="A DVI to plain text translator" arch=('i686' 'x86_64') url="http://catdvi.sourceforge.net" @@ -16,22 +16,20 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" md5sums=('b18eac65baf522c1e37bb3dc37ab42c3' '509f61a30d3758e5d102c124bc5fa9a0') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "${srcdir}"/texlive2008.patch - autoconf +} +build() { + cd "$srcdir/$pkgname-$pkgver" + autoconf ./configure --prefix=/usr --mandir=/usr/share/man - - install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1 - sed -i "s#\(bindir = \)\(.*\)#\1$pkgdir\2#" config.mk - sed -i "s#\(mandir = \)\(.*\)#\1$pkgdir\2#" config.mk - make } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1 + make DESTDIR="$pkgdir" install bindir=$pkgdir/usr/bin mandir=$pkgdir/usr/share/man } diff --git a/community/clipit/PKGBUILD b/community/clipit/PKGBUILD index bd39684a2..35be1a962 100644 --- a/community/clipit/PKGBUILD +++ b/community/clipit/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 76710 2012-09-27 13:37:18Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 110048 2014-04-23 16:06:57Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Mihai Militaru <mihai dot militaru at xmpp dot ro> pkgname=clipit pkgver=1.4.2 -pkgrel=4 +pkgrel=5 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' 'librsvg') +depends=('gtk2' 'librsvg') makedepends=('intltool') optdepends=('xdotool: for automatic paste') -install=$pkgname.install -source=(https://github.com/downloads/shantzu/ClipIt/${pkgname}-${pkgver}.tar.gz) +source=("https://github.com/downloads/shantzu/ClipIt/${pkgname}-${pkgver}.tar.gz") md5sums=('118175f26869adcf04909fdbb5021eff') +install=${pkgname}.install build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install } diff --git a/community/cmocka/PKGBUILD b/community/cmocka/PKGBUILD new file mode 100644 index 000000000..2c11615e8 --- /dev/null +++ b/community/cmocka/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 110062 2014-04-23 16:53:25Z anatolik $ +# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com> + +pkgname=cmocka +url='http://cmocka.org/' +pkgver=0.4.0 +pkgrel=1 +pkgdesc='an elegant unit testing framework for C with support for mock objects' +arch=(i686 x86_64) +license=(GPL) +depends=(glibc) +makedepends=(cmake) +source=(https://open.cryptomilk.org/attachments/download/37/cmocka-$pkgver.tar.xz) +sha1sums=('7fe27a6fdcf60222cf15ae67aeee83139180a759') + +build() { + rm -rf build; mkdir build + cd build + cmake ../$pkgname-$pkgver -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUNIT_TESTING=ON + make +} + +check() { + cd build + make test +} + +package() { + cd build + make install DESTDIR="$pkgdir" +} diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index cd113b131..5eb58b8df 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104366 2014-01-19 16:29:30Z bpiotrowski $ +# $Id: PKGBUILD 110084 2014-04-23 20:55:16Z xyne $ # Maintainer: Xyne <ca dot archlinux at xyne, backwards> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -6,10 +6,10 @@ pkgname=cmus pkgver=2.5.0 -pkgrel=5 +pkgrel=7 pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64') -url="http://cmus.sourceforge.net/" +url="https://cmus.github.io/" license=('GPL') depends=('ncurses') makedepends=( @@ -30,7 +30,7 @@ optdepends=('alsa-lib: for ALSA output plugin support' 'libcdio-paranoia: for cdio support' 'opusfile: for opus input plugin support' 'wavpack: for wavpack input plugin support') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2 +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-v$pkgver.tar.bz2 cmus-2.5.0-opus-support.patch cdio-git.patch) sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b' @@ -43,6 +43,9 @@ prepare() { patch -Np1 -i "$srcdir/cmus-2.5.0-opus-support.patch" # Include changes from git for compatibility with new cdio. patch -N -i "$srcdir/cdio-git.patch" + + # Quick fix for modplug header. + sed -i 's@<modplug.h>@<libmodplug/modplug.h>@' "$srcdir/$pkgname-v$pkgver/modplug.c" } build() { diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 89c6f85c7..4958e4e5d 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105573 2014-02-10 13:31:16Z spupykin $ +# $Id: PKGBUILD 110041 2014-04-23 14:51:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.4.1 +pkgver=1.4.2 _pkgver=1.4 pkgrel=1 pkgdesc="Utility to organize and develop raw images" @@ -18,7 +18,7 @@ makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') install=darktable.install source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('78252618bb7b1df30109ef5484d46f3c') +md5sums=('f86554329c2c809ffb009244a6f1d643') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD index 575707a27..fbcda9c93 100644 --- a/community/dispcalgui/PKGBUILD +++ b/community/dispcalgui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105728 2014-02-14 14:41:06Z tredaelli $ +# $Id: PKGBUILD 110033 2014-04-23 13:36:22Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Cedric Girard <girard.cedric@gmail.com> # Contributor: foxbunny <bg.branko@gmail.com> pkgname=dispcalgui -pkgver=1.7.5.7 +pkgver=2.0.0.0 pkgrel=1 pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS" arch=('i686' 'x86_64') @@ -14,14 +14,12 @@ makedepends=('libx11' 'libxrandr' 'libxinerama' 'libxxf86vm' 'python2-setuptools depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'python2-numpy') optdepends=('gksu: For running as root') install=${pkgname}.install -source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz" - dispcalGUI-1.5.3.1-wxgtk3.patch) -md5sums=('7a66051d244f1b734448a865b50fae01' - 'b8001e5cbbb849f9ba95e0ef9fb1d073') +source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz") +md5sums=('5740301fb4f7e72a57b4eab6a4ee405a') prepare() { cd "${srcdir}"/dispcalGUI-${pkgver} - patch -p1 -i "$srcdir"/dispcalGUI-1.5.3.1-wxgtk3.patch +# patch -p1 -i "$srcdir"/dispcalGUI-1.5.3.1-wxgtk3.patch find . -name "*.py" -exec sed -i 's!/usr/bin/env python!/usr/bin/env python2!g' {} + } diff --git a/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch b/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch deleted file mode 100644 index e5c556031..000000000 --- a/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/dispcalGUI/dispcalGUI.py -+++ b/dispcalGUI/dispcalGUI.py -@@ -1544,9 +1544,10 @@ - for lstr, lcode in llist: - menuitem = languages.Append(-1, "&" + lstr, kind=wx.ITEM_RADIO) - if (lcode.upper().replace("EN", "US") in flagart.catalog): -- menuitem.SetBitmap( -- flagart.catalog[lcode.upper().replace("EN", -- "US")].getBitmap()) -+ bitmap = flagart.catalog[lcode.upper().replace("EN", -+ "US")].getBitmap() -+ if menuitem.GetKind() == wx.ITEM_NORMAL: -+ menuitem.SetBitmap(bitmap) - if lang.getcode() == lcode: - menuitem.Check() - font = menuitem.Font diff --git a/community/enter/PKGBUILD b/community/enter/PKGBUILD index 9ce24fd0f..2a3f81346 100644 --- a/community/enter/PKGBUILD +++ b/community/enter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59871 2011-12-01 13:33:05Z spupykin $ +# $Id: PKGBUILD 110052 2014-04-23 16:25:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> pkgname=enter pkgver=0.0.9 -pkgrel=3 +pkgrel=4 pkgdesc="Enter is a lightweight graphical login manager for X." arch=('i686' 'x86_64') url="http://enter.sf.net" @@ -17,7 +17,11 @@ build() { cd $srcdir/$pkgname-$pkgver sed -i 's|\[xft-config\]|\[pkg-config\]|' configure.ac autoreconf - ./configure --prefix=/usr --sysconfdir=/etc CFLAGS="$CFLAGS -lcrypt" + ./configure --prefix=/usr --sysconfdir=/etc CFLAGS="$CFLAGS -lcrypt -lXext -lX11" make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/fldiff/PKGBUILD b/community/fldiff/PKGBUILD index e528e4221..eebbfaafb 100644 --- a/community/fldiff/PKGBUILD +++ b/community/fldiff/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 83678 2013-02-04 11:05:24Z spupykin $ +# $Id: PKGBUILD 110054 2014-04-23 16:25:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: kevin <kevin@archlinux.org> # Contributor: iztok pizorn <pizorn@gmail.com> pkgname=fldiff pkgver=1.1 -pkgrel=7 +pkgrel=8 pkgdesc="graphical diff program" arch=(i686 x86_64) -url="http://www.easysw.com/~mike/fldiff/" +url="http://directory.fsf.org/wiki/Fldiff" license=('GPL') install=fldiff.install depends=('diffutils' 'fltk' 'xdg-utils') -source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz +source=("http://ftp.de.debian.org/debian/pool/main/f/fldiff/fldiff_$pkgver+0.orig.tar.gz" build-fix.patch) md5sums=('12897c92106fb5d665210a2e82f5cf25' - 'ea7258e07544b81561c6d76a41c184e7') + '4f6418cb0cbc33aca28a760738ea6f18') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/fldiff/build-fix.patch b/community/fldiff/build-fix.patch index bb3e0245e..bbc6c7615 100644 --- a/community/fldiff/build-fix.patch +++ b/community/fldiff/build-fix.patch @@ -1,8 +1,3 @@ -Only in fldiff-1.1.my: config.log -Only in fldiff-1.1.my: config.status -Only in fldiff-1.1.my: DiffChooser.o -Only in fldiff-1.1.my: DiffOpenWindow.o -Only in fldiff-1.1.my: DiffView.o diff -wbBur fldiff-1.1/DiffWindow.cxx fldiff-1.1.my/DiffWindow.cxx --- fldiff-1.1/DiffWindow.cxx 2006-11-13 21:54:02.000000000 +0300 +++ fldiff-1.1.my/DiffWindow.cxx 2011-07-05 12:58:38.000000000 +0400 @@ -21,11 +16,3 @@ diff -wbBur fldiff-1.1/DiffWindow.cxx fldiff-1.1.my/DiffWindow.cxx prefs_.set("textsize", textsize()); prefs_.set("ignoreblanks", ignoreblanks()); } -Only in fldiff-1.1.my: DiffWindow.o -Only in fldiff-1.1.my: FavoritesMenu.o -Only in fldiff-1.1.my: FavoritesWindow.o -Only in fldiff-1.1.my: fldiff -Only in fldiff-1.1.my: fldiff.list -Only in fldiff-1.1.my: fldiff.o -Only in fldiff-1.1.my: Makefile -Only in fldiff-1.1.my: PtProcess.o diff --git a/community/gnuradio/PKGBUILD b/community/gnuradio/PKGBUILD index 0ff6ced9e..d466baf48 100644 --- a/community/gnuradio/PKGBUILD +++ b/community/gnuradio/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 110002 2014-04-22 21:44:23Z kkeen $ +# $Id: PKGBUILD 110006 2014-04-22 23:18:22Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dominik Heidler <dheidler@gmail.com> # Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com> pkgname=gnuradio pkgver=3.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="General purpose DSP and SDR toolkit. With drivers for usrp and fcd." arch=('i686' 'x86_64') url="http://gnuradio.org" license=('GPL') -depends=('fftw' 'python2-numpy' 'cppunit' 'swig' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd') +depends=('fftw' 'python2-numpy' 'cppunit' 'swig' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd' 'libsm') makedepends=('boost' 'cmake' 'python2-lxml' 'pygtk' 'wxpython' 'python2-cheetah' 'glu') optdepends=('python2-cheetah: gnuradio-companion' 'python2-lxml: gnuradio-companion' @@ -34,6 +34,7 @@ install=gnuradio.install # split the gui components? # build doxygen docs? # icons +# remove libsm dep when FS#40047 is fixed # comedilib: gr-comedi # zeroc-ice: gr-ctrlport diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index 69a8ac95c..5cd40a7ec 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78640 2012-10-22 12:45:21Z arodseth $ +# $Id: PKGBUILD 110043 2014-04-23 15:23:03Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Sergio A. Morales <sergiomorales@archlinux.cl> @@ -6,30 +6,29 @@ pkgname=gummi pkgver=0.6.5 -pkgrel=1 +pkgrel=2 pkgdesc='Simple LaTex editor for GTK users' arch=('x86_64' 'i686') url='http://gummi.midnightcoding.org/' license=('MIT') depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file-utils') makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool') -install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz") +install="$pkgname.install" +source=("http://dev.midnightcoding.org/attachments/download/301/$pkgname-$pkgver.tar.gz") sha256sums=('b23c2958376ea43c701a276ad19ceac5b50d9cb32a489a10897b25aa5004fffb') build() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" - find . -type f -exec touch {} \; ./configure --prefix=/usr make } package() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" - make prefix=$pkgdir/usr install - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: diff --git a/community/miniupnpd/PKGBUILD b/community/miniupnpd/PKGBUILD index 4cfee322b..559f9443f 100644 --- a/community/miniupnpd/PKGBUILD +++ b/community/miniupnpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 109008 2014-04-09 11:00:33Z tredaelli $ +# $Id: PKGBUILD 110046 2014-04-23 15:59:45Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: fauno <fauno@parabola.nu> pkgname=miniupnpd pkgver=1.8.20140401 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight UPnP IGD daemon" arch=('i686' 'x86_64') url="http://miniupnp.free.fr" @@ -12,30 +12,38 @@ backup=(etc/miniupnpd/miniupnpd.conf) depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux') makedepends=('lsb-release') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" + miniupnpd-1.8.20140401-foreground.patch miniupnpd.systemd) sha256sums=('086dfffa59e8e86e792b73a71d275fec55ef17fe3e94a8c140301aceb05bcdbd' - '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c') + '79350f2dbb695b58744aa9036d34a7dfdcfc97cf0f5f3419b86bd9ca58482f8e' + 'baac6223eb35729ea301bd658dc2df6aad5396c7c0b1ec15c8aac1803ef37f6a') + +prepare() { + cd "$pkgname-$pkgver" + + patch -p0 -i "$srcdir"/miniupnpd-1.8.20140401-foreground.patch +} build() { - cd "$pkgname-$pkgver" + cd "$pkgname-$pkgver" - CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h - make -f Makefile.linux + CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h + make -f Makefile.linux } package() { - cd "$pkgname-$pkgver" - mkdir -p "$pkgdir/usr/share/man/man8" + cd "$pkgname-$pkgver" + mkdir -p "$pkgdir/usr/share/man/man8" - make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install + make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install - rm -r "${pkgdir}/etc/init.d" + rm -r "${pkgdir}/etc/init.d" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" - sed -i 's:/s\?bin/iptables:/usr/bin/iptables: - s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh - sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/ - s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf" + sed -i 's:/s\?bin/iptables:/usr/bin/iptables: + s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh + sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/ + s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf" } diff --git a/community/miniupnpd/miniupnpd-1.8.20140401-foreground.patch b/community/miniupnpd/miniupnpd-1.8.20140401-foreground.patch new file mode 100644 index 000000000..7d40fadc7 --- /dev/null +++ b/community/miniupnpd/miniupnpd-1.8.20140401-foreground.patch @@ -0,0 +1,40 @@ +--- ./miniupnpd.c.orig 2014-04-23 15:41:11.783562093 +0000 ++++ ./miniupnpd.c 2014-04-23 15:43:19.672842038 +0000 +@@ -797,7 +797,7 @@ + { + int i; + int pid; +- int debug_flag = 0; ++ int debug_flag = 0, foreground_flag = 0; + int openlog_option; + struct sigaction sa; + /*const char * logfilename = 0;*/ +@@ -1159,6 +1159,9 @@ + case 'd': + debug_flag = 1; + break; ++ case 'D': ++ foreground_flag = 1; ++ break; + case 'w': + if(i+1 < argc) + presurl = argv[++i]; +@@ -1273,7 +1276,7 @@ + goto print_usage; + } + +- if(debug_flag) ++ if(debug_flag || foreground_flag) + { + pid = getpid(); + } +@@ -1413,7 +1416,8 @@ + "\tNotify interval is in seconds. Default is 30 seconds.\n" + "\tDefault pid file is '%s'.\n" + "\tDefault config file is '%s'.\n" +- "\tWith -d miniupnpd will run as a standard program.\n" ++ "\tWith -D miniupnpd will run as a standard program.\n" ++ "\tWith -d miniupnpd will run as a standard program in debug mode.\n" + #if defined(USE_PF) || defined(USE_IPF) + "\t-L sets packet log in pf and ipf on.\n" + #endif diff --git a/community/miniupnpd/miniupnpd.systemd b/community/miniupnpd/miniupnpd.systemd index 88973535c..304c4fe8e 100644 --- a/community/miniupnpd/miniupnpd.systemd +++ b/community/miniupnpd/miniupnpd.systemd @@ -3,10 +3,9 @@ Description=Lightweight UPnP IGD daemon [Service] ExecStartPre=/etc/miniupnpd/iptables_init.sh -ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d +ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -D ExecStopPost=/etc/miniupnpd/iptables_removeall.sh PIDFile=/run/miniupnpd.pid -StandardOutput=null [Install] WantedBy=network.target diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index ac943c80e..149162bdf 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109574 2014-04-16 10:04:50Z spupykin $ +# $Id: PKGBUILD 110064 2014-04-23 17:09:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim pkgver=2.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" diff --git a/community/opendkim/opendkim.install b/community/opendkim/opendkim.install index a1f16f6ca..c7b8e519d 100644 --- a/community/opendkim/opendkim.install +++ b/community/opendkim/opendkim.install @@ -1,5 +1,5 @@ post_install() { - useradd -r -g mail -d / opendkim + useradd -r -g mail -d / -s /sbin/nologin opendkim chown -R opendkim:mail etc/opendkim cat <<EOF >>> Check and modify /etc/opendkim/opendkim.conf before starting diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index f5a9d6231..5f7dd0c6e 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108455 2014-03-27 14:47:53Z fyan $ +# $Id: PKGBUILD 110018 2014-04-23 05:25:45Z fyan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -7,7 +7,7 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') pkgver=1.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64') url='http://matplotlib.org' @@ -16,8 +16,8 @@ checkdepends=('python-nose' 'python2-nose') makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt4' 'python-pytz' 'python-numpy' 'python-pyqt4' 'tk' 'python-cairo' 'python2-cairo' 'python-dateutil' 'python2-dateutil' 'python-gobject' 'python2-gobject' 'python-pyparsing' - 'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin' 'agg' - 'python-tornado' 'python2-tornado' 'gtk3') + 'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin' + 'python-tornado' 'python2-tornado' 'gtk3' 'wxpython') source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz" "ffmpeg-2.0.patch") sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40' @@ -51,11 +51,14 @@ build() { package_python2-matplotlib() { depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt4' 'python2-dateutil' 'python2-pyparsing') - optdepends=('pygtk: for use with the GTK or GTKAgg backend' + optdepends=('pygtk: for GTK/GTKAgg/GTKCairo backend' + 'python2-cairo: for GTKCairo/GTK3Cairo backend' 'tk: used by the TkAgg backend' 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies' - 'python2-tornado: for webagg backend') + 'python2-tornado: for webagg backend' + 'python2-gobject: for GTK3Agg/GTK3Cairo backend' + 'wxpython: for WX/WXAgg backend') cd matplotlib-${pkgver} python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr @@ -66,7 +69,8 @@ package_python2-matplotlib() { package_python-matplotlib() { depends=('python-pytz' 'python-numpy' 'python-cairo' 'python-pyqt4' 'python-dateutil' 'python-pyparsing') - optdepends=('pygtk: for use with the GTK or GTKAgg backend' + optdepends=('python-gobject: for GTK3Agg/GTK3Cairo backend' + 'python-cairo: for GTK3Cairo backend' 'tk: used by the TkAgg backend' 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies' diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD index 7a634e977..e31a0a466 100644 --- a/community/qps/PKGBUILD +++ b/community/qps/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85392 2013-03-01 10:38:18Z andrea $ +# $Id: PKGBUILD 110074 2014-04-23 17:29:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Rosenstrauch <darose@darose.net> pkgname=qps pkgver=1.10.16 _dlpkgver=5963 -pkgrel=2 +pkgrel=3 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'." url="http://qps.kldp.net/projects/qps" depends=('qt4') @@ -16,7 +16,7 @@ md5sums=('dc3396749ad9254fd60ca84b5c0b16b9') build() { cd $srcdir/$pkgname-$pkgver - qmake + qmake-qt4 make } diff --git a/community/rethinkdb/PKGBUILD b/community/rethinkdb/PKGBUILD index 92030aeba..8344f836a 100644 --- a/community/rethinkdb/PKGBUILD +++ b/community/rethinkdb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109136 2014-04-10 17:21:08Z anatolik $ +# $Id: PKGBUILD 110011 2014-04-23 03:13:26Z anatolik $ # Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com> # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Sigmund Lahn <sigmund@lahn.no> pkgname=rethinkdb -pkgver=1.12.2 +pkgver=1.12.3 pkgrel=1 pkgdesc='An open-source distributed database built with love.' arch=(i686 x86_64) @@ -20,7 +20,7 @@ source=( rethinkdb-tmpfile.conf rethinkdb.service ) -sha256sums=('bf6f69ab963e8eb60301dde203f33ae112c7f005e19697be073369b2d4aef492' +sha256sums=('545319fedf65fce26fa83d46bf3a7884ed6b8b085bc712314c458b387c6058d5' '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4' 'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2') diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index 4687d69cb..f5ea210f1 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104887 2014-01-28 03:34:18Z td123 $ +# $Id: PKGBUILD 110020 2014-04-23 06:48:38Z fyan $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Jeremy <reebydobalina@yahoo.ca> pkgname=ruby-cairo -pkgver=1.12.8 +pkgver=1.12.9 pkgrel=1 pkgdesc='Ruby bindings for cairo' arch=('x86_64' 'i686') @@ -13,7 +13,7 @@ license=('GPL') depends=('ruby' 'cairo') makedepends=('ruby-pkgconfig') source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz") -sha256sums=('8a6a73c9c67eb0a5b6502483c8c39ffb6acbcadd2574123a6597271c2c25736d') +sha256sums=('ef894e2a52926c1c9d6d7f32cc1899fa21de90787a4a98493e4a004ecdb90b6e') build() { cd "$srcdir/rcairo-$pkgver" @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/rcairo-$pkgver" - make DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install # Workaround installation failure with -j1 install -Dm644 ext/cairo/cairo.so \ "$pkgdir/usr/lib/ruby/vendor_ruby/2.1.0/$CARCH-linux/cairo.so" } diff --git a/community/slrn/PKGBUILD b/community/slrn/PKGBUILD index 598c62561..c98e55c78 100644 --- a/community/slrn/PKGBUILD +++ b/community/slrn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81585 2012-12-24 15:02:37Z spupykin $ +# $Id: PKGBUILD 110066 2014-04-23 17:10:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> pkgname=slrn pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open source text-based news client" arch=('i686' 'x86_64') url="http://www.slrn.org/" @@ -19,16 +19,17 @@ md5sums=('232670ab76a045967b137e5124b3d681') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ --enable-setgid-code \ --with-slrnpull --with-ssl --with-uu \ --with-uulib=/usr/lib/uudeview \ --with-uuinc=/usr/include/uudeview \ --enable-spoilers + make UUDEVIEW_LIB="/usr/lib/uudeview/*.o" +} - make +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -D -m644 doc/slrn.rc $pkgdir/etc/slrnrc } diff --git a/community/splint/PKGBUILD b/community/splint/PKGBUILD index f6559ab07..c3eaf18c6 100644 --- a/community/splint/PKGBUILD +++ b/community/splint/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 55573 2011-09-14 10:41:16Z andrea $ +# $Id: PKGBUILD 110068 2014-04-23 17:10:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=splint pkgver=3.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for statically checking C programs for security vulnerabilities and coding mistakes" arch=('i686' 'x86_64') url="http://www.splint.org/" license=('GPL') -depends=('glibc') +depends=('flex') source=("http://www.splint.org/downloads/${pkgname}-${pkgver}.src.tgz" 'splint.sh') md5sums=('25f47d70bd9c8bdddf6b03de5949c4fd' @@ -19,7 +19,7 @@ options=('!makeflags') build() { cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man - make + make LDFLAGS="$LDFLAGS -lfl" } package() { diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD index 135ff8e63..c7a4ddebd 100644 --- a/community/vyqchat/PKGBUILD +++ b/community/vyqchat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88015 2013-04-09 21:51:55Z eric $ +# $Id: PKGBUILD 110076 2014-04-23 17:29:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=vyqchat pkgver=0.2.8 -pkgrel=4 +pkgrel=5 pkgdesc="vypress compatible qt chat (can work without server)" arch=('i686' 'x86_64') url="http://linux.bydg.org/~yogin/" @@ -22,7 +22,7 @@ build() { sed -i 's/vyqchat_LDFLAGS/vyqchat_LDADD/' src/Makefile.am # Correct acinclude.m4 to avoid empty else block sed -i 's:# Leave bnv_qt_lib_dir defined:/bin/true:' acinclude.m4 - autoreconf -v + autoreconf -fiv ./configure --prefix=/usr --with-Qt-bin-dir=/usr/lib/qt3/bin --with-Qt-include-dir=/usr/include/qt3 --with-Qt-lib-dir=/usr/lib make } diff --git a/community/xdiskusage/PKGBUILD b/community/xdiskusage/PKGBUILD index 71491ef78..8d946eab7 100644 --- a/community/xdiskusage/PKGBUILD +++ b/community/xdiskusage/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65246 2012-02-20 12:32:09Z spupykin $ +# $Id: PKGBUILD 110070 2014-04-23 17:10:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Jason Chu <jason@archlinux.org> pkgname=xdiskusage pkgver=1.48 -pkgrel=7 +pkgrel=8 pkgdesc="xdiskusage is a user-friendly program to show you what is using up all your disk space" arch=('i686' 'x86_64') depends=('fltk') @@ -14,34 +14,24 @@ license=('GPL') url="http://xdiskusage.sourceforge.net" options=(!emptydirs) source=(http://xdiskusage.sourceforge.net/$pkgname-$pkgver.tgz - 'stdin-is-null.patch') + 'build-fix.patch') md5sums=('a902aa9d73761ade98256c3cd5c1f533' - '0181b66b44e382e44c91602d8de9a7b6') + '570eb00cb0999231620b67889325a81f') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" - sed -i 's/-lGL -lGLU/-lXft/' makeinclude.in - - patch -Np1 -i "$srcdir/stdin-is-null.patch" - - [ $CARCH == "x86_64" ] && patch xdiskusage.C <<EOF -991c991 -< switch ((int)v) { ---- -> switch ((long long)v) { -1004c1004 -< int n = (int)v; ---- -> int n = (long long)v; -EOF + patch -Np1 -i "$srcdir/build-fix.patch" +} +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" - LDFLAGS=-lXi make + make } package() { cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install chmod 0644 $pkgdir/usr/share/man/man1/* } diff --git a/community/xdiskusage/build-fix.patch b/community/xdiskusage/build-fix.patch new file mode 100644 index 000000000..38a675609 --- /dev/null +++ b/community/xdiskusage/build-fix.patch @@ -0,0 +1,71 @@ +diff -wbBur xdiskusage-1.48/makeinclude.in xdiskusage-1.48.my/makeinclude.in +--- xdiskusage-1.48/makeinclude.in 2004-05-05 10:07:57.000000000 +0400 ++++ xdiskusage-1.48.my/makeinclude.in 2014-04-23 20:58:15.136751299 +0400 +@@ -21,6 +21,6 @@ + CXXFLAGS_D =@CXXFLAGS_D@ + + # libraries to link with: +-LDLIBS =@LIBS@ -lfltk -lXinerama -lGL -lGLU -lX11 -lXext @X_EXTRA_LIBS@ -lm ++LDLIBS =@LIBS@ -lfltk -lXinerama -lXft -lX11 -lXext -lXi @X_EXTRA_LIBS@ -lm + + INSTALL =@INSTALL@ +diff -wbBur xdiskusage-1.48/xdiskusage.C xdiskusage-1.48.my/xdiskusage.C +--- xdiskusage-1.48/xdiskusage.C 2004-09-21 09:23:14.000000000 +0400 ++++ xdiskusage-1.48.my/xdiskusage.C 2014-04-23 21:00:50.696749510 +0400 +@@ -223,6 +223,19 @@ + return 1; + } + ++// returns true if stdin is /dev/null ++// To fix Debian bug #276193 ++// Technically could be possible that returns "true" and is not "true", ++// because same device ID is used across file systems. But is the best ++// solutions that I have ++int isstdinnull() { ++ struct stat ststdin,stnull; ++ stat("/dev/null",&stnull); ++ fstat(0,&ststdin); ++ ++ return (ststdin.st_rdev==stnull.st_rdev); ++} ++ + int main(int argc, char**argv) { + #if FL_MAJOR_VERSION < 2 + // Make fltk look more like KDE/Windoze: +@@ -253,7 +266,7 @@ + OutputWindow* d = OutputWindow::make(argv[n++]); + if (d) d->show(argc,argv); + } +- } else if (!isatty(0)) { ++ } else if (!isatty(0) && !isstdinnull()) { + // test for pipe, if so read stdin: + OutputWindow* d = OutputWindow::make(0); + if (d) d->show(argc,argv); +@@ -392,8 +405,7 @@ + strncpy(pathbuf, path, 1024); + for (int i=0; i<10; i++) { + char *p = (char*)fl_filename_name(pathbuf); +- int i = readlink(pathbuf, p, 1024-(p-pathbuf)); +- if (i < 0) { ++ if (readlink(pathbuf, p, 1024-(p-pathbuf)) < 0) { + if (errno != EINVAL) { + strcat(pathbuf, ": no such file"); + fl_alert(pathbuf); +@@ -988,7 +1000,7 @@ + void OutputWindow::sort_cb(Fl_Widget* o, void*v) { + OutputWindow* d = (OutputWindow*)(o->window()); + int (*compare)(const Node*, const Node*); +- switch ((int)v) { ++ switch ((long long)v) { + case 's': compare = largestfirst; break; + case 'r': compare = smallestfirst; break; + case 'a': compare = alphabetical; break; +@@ -1001,7 +1013,7 @@ + + void OutputWindow::columns_cb(Fl_Widget* o, void*v) { + OutputWindow* d = (OutputWindow*)(o->window()); +- int n = (int)v; ++ int n = (long long)v; + ::ncols = n; + if (n == d->ncols) return; + if (d->current_depth > d->root_depth+n-1) { diff --git a/community/xdiskusage/stdin-is-null.patch b/community/xdiskusage/stdin-is-null.patch deleted file mode 100644 index e70789c13..000000000 --- a/community/xdiskusage/stdin-is-null.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- xdiskusage-1.48/xdiskusage.C 2004-09-21 07:23:14.000000000 +0200 -+++ xdiskusage-1.48.carles/xdiskusage.C 2007-07-30 23:42:05.000000000 +0200 -@@ -223,6 +223,19 @@ - return 1; - } - -+// returns true if stdin is /dev/null -+// To fix Debian bug #276193 -+// Technically could be possible that returns "true" and is not "true", -+// because same device ID is used across file systems. But is the best -+// solutions that I have -+int isstdinnull() { -+ struct stat ststdin,stnull; -+ stat("/dev/null",&stnull); -+ fstat(0,&ststdin); -+ -+ return (ststdin.st_rdev==stnull.st_rdev); -+} -+ - int main(int argc, char**argv) { - #if FL_MAJOR_VERSION < 2 - // Make fltk look more like KDE/Windoze: -@@ -253,7 +266,7 @@ - OutputWindow* d = OutputWindow::make(argv[n++]); - if (d) d->show(argc,argv); - } -- } else if (!isatty(0)) { -+ } else if (!isatty(0) && !isstdinnull()) { - // test for pipe, if so read stdin: - OutputWindow* d = OutputWindow::make(0); - if (d) d->show(argc,argv); diff --git a/community/xmms-imms/PKGBUILD b/community/xmms-imms/PKGBUILD index fd6a5cb94..842b6b78e 100644 --- a/community/xmms-imms/PKGBUILD +++ b/community/xmms-imms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83686 2013-02-04 11:06:53Z spupykin $ +# $Id: PKGBUILD 110078 2014-04-23 17:30:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kritoke <kritoke@nospam.gmail.com> # Contributor: Kritoke <kritoke@nospam.gmail.com> pkgname=xmms-imms -pkgver=3.1.0_rc10 +pkgver=301 pkgrel=1 pkgdesc="An intelligent playlist plug-in for XMMS that tracks your listening patterns and dynamically adapts to your taste." arch=(i686 x86_64) @@ -12,20 +12,20 @@ license=("GPL") url="http://imms.luminal.org/" depends=('xmms' 'pcre' 'sqlite' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw') replaces=('imms') -source=(http://imms.googlecode.com/files/imms-${pkgver/_/-}.tar.bz2) -md5sums=('61302249e9638779b3241987ab62676d') +source=(http://imms.googlecode.com/files/imms-r${pkgver/_/-}.tar.bz2) +md5sums=('8b3dfac2ce1ae988a7c2fbc47026cc73') build() { - cd $srcdir/imms-${pkgver/_/-} - - if [ $NOEXTRACT -ne 1 ]; then - autoheader - aclocal - autoconf - CXXFLAGS="$CXXFLAGS -DDEBUG=0" ./configure --prefix=/usr --disable-immsremote - fi + cd $srcdir/imms-r${pkgver/_/-} + autoheader + aclocal + autoconf + ./configure --prefix=/usr --disable-immsremote + make LDFLAGS="-L. -lXss -lXext -lX11 -lsqlite3 -lz -lpcre -ltag -L/usr/X11R6/lib /usr/lib/libtorch.so.3" +} - make +package() { + cd $srcdir/imms-r${pkgver/_/-} mkdir -p $pkgdir/usr/bin make prefix=$pkgdir/usr DESTDIR=$pkgdir/usr/lib/xmms/General \ BMPDESTDIR=$pkgdir/usr/lib/bmp/General install diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index facd6a1ac..8ee46db7c 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 209915 2014-04-08 15:23:40Z anatolik $ +# $Id: PKGBUILD 211713 2014-04-23 18:51:16Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=bash _basever=4.3 -_patchlevel=008 +_patchlevel=011 pkgver=$_basever.$_patchlevel -pkgrel=2 +pkgrel=1 pkgdesc='The GNU Bourne Again shell' arch=('i686' 'x86_64') license=('GPL') @@ -94,4 +94,10 @@ md5sums=('81348932d5da294953e15d4814c74dd1' 'dcf471d222bcd83283d3094e6ceeb6f8' 'SKIP' 'f7553416646dc26c266454c78a916d36' + 'SKIP' + '7e73d2151f4064b484a4ba2c4b09960e' + 'SKIP' + 'a275463d21735bb6d7161f9fbd320d8f' + 'SKIP' + 'c17103ee20420d77e46b224c8d3fceda' 'SKIP') diff --git a/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch b/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch deleted file mode 100644 index c621f0af8..000000000 --- a/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur bash-4.2-orig/general.c bash-4.2/general.c ---- bash-4.2-orig/general.c 2010-12-13 06:06:27.000000000 +1000 -+++ bash-4.2/general.c 2013-08-25 21:52:36.681484302 +1000 -@@ -766,7 +766,7 @@ - *nbeg++ = '.'; - - nlen = nend - ntail; -- memcpy (nbeg, ntail, nlen); -+ memmove (nbeg, ntail, nlen); - nbeg[nlen] = '\0'; - - return name; diff --git a/core/bash/bash-4.3-debug-trap.patch b/core/bash/bash-4.3-debug-trap.patch deleted file mode 100644 index 8d0a73288..000000000 --- a/core/bash/bash-4.3-debug-trap.patch +++ /dev/null @@ -1,30 +0,0 @@ -*** ../bash-4.3/trap.c 2014-02-05 10:03:21.000000000 -0500 ---- trap.c 2014-02-28 09:51:43.000000000 -0500 -*************** -*** 921,925 **** - - #if defined (JOB_CONTROL) -! save_pipeline (1); /* XXX only provides one save level */ - #endif - ---- 921,926 ---- - - #if defined (JOB_CONTROL) -! if (sig != DEBUG_TRAP) /* run_debug_trap does this */ -! save_pipeline (1); /* XXX only provides one save level */ - #endif - -*************** -*** 941,945 **** - - #if defined (JOB_CONTROL) -! restore_pipeline (1); - #endif - ---- 942,947 ---- - - #if defined (JOB_CONTROL) -! if (sig != DEBUG_TRAP) /* run_debug_trap does this */ -! restore_pipeline (1); - #endif - diff --git a/core/bash/bash-4.3-test-nameref.patch b/core/bash/bash-4.3-test-nameref.patch deleted file mode 100644 index d64a3ccfa..000000000 --- a/core/bash/bash-4.3-test-nameref.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** ../bash-4.3/test.c 2014-02-04 16:52:58.000000000 -0500 ---- test.c 2014-02-28 21:22:44.000000000 -0500 -*************** -*** 647,652 **** - - case 'R': -! v = find_variable (arg); -! return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE); - } - ---- 647,652 ---- - - case 'R': -! v = find_variable_noref (arg); -! return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE); - } - -*************** -*** 724,727 **** ---- 724,728 ---- - case 'u': case 'v': case 'w': case 'x': case 'z': - case 'G': case 'L': case 'O': case 'S': case 'N': -+ case 'R': - return (1); - } diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 06aba8955..e6b313ec1 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 208093 2014-03-17 20:47:18Z bisson $ +# $Id: PKGBUILD 211715 2014-04-23 20:12:34Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=6.6p1 -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} + 'curve25519pad.patch' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' 'sshd.pam') sha1sums=('b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e' 'SKIP' + '13b74b57b3d9b9a256eeb44b4fca29a8f27aa7ad' '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 -p0 -i ../curve25519pad.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/openssh/curve25519pad.patch b/core/openssh/curve25519pad.patch new file mode 100644 index 000000000..9774a9399 --- /dev/null +++ b/core/openssh/curve25519pad.patch @@ -0,0 +1,171 @@ +Hi, + +So I screwed up when writing the support for the curve25519 KEX method +that doesn't depend on OpenSSL's BIGNUM type - a bug in my code left +leading zero bytes where they should have been skipped. The impact of +this is that OpenSSH 6.5 and 6.6 will fail during key exchange with a +peer that implements curve25519-sha256@libssh.org properly about 0.2% +of the time (one in every 512ish connections). + +We've fixed this for OpenSSH 6.7 by avoiding the curve25519-sha256 +key exchange for previous versions, but I'd recommend distributors +of OpenSSH apply this patch so the affected code doesn't become +too entrenched in LTS releases. + +The patch fixes the bug and makes OpenSSH identify itself as 6.6.1 so as +to distinguish itself from the incorrect versions so the compatibility +code to disable the affected KEX isn't activated. + +I've committed this on the 6.6 branch too. + +Apologies for the hassle. + +-d + +Index: version.h +=================================================================== +RCS file: /var/cvs/openssh/version.h,v +retrieving revision 1.82 +diff -u -p -r1.82 version.h +--- version.h 27 Feb 2014 23:01:54 -0000 1.82 ++++ version.h 20 Apr 2014 03:35:15 -0000 +@@ -1,6 +1,6 @@ + /* $OpenBSD: version.h,v 1.70 2014/02/27 22:57:40 djm Exp $ */ + +-#define SSH_VERSION "OpenSSH_6.6" ++#define SSH_VERSION "OpenSSH_6.6.1" + + #define SSH_PORTABLE "p1" + #define SSH_RELEASE SSH_VERSION SSH_PORTABLE +Index: compat.c +=================================================================== +RCS file: /var/cvs/openssh/compat.c,v +retrieving revision 1.82 +retrieving revision 1.85 +diff -u -p -r1.82 -r1.85 +--- compat.c 31 Dec 2013 01:25:41 -0000 1.82 ++++ compat.c 20 Apr 2014 03:33:59 -0000 1.85 +@@ -95,6 +95,9 @@ compat_datafellows(const char *version) + { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, + { "OpenSSH_4*", 0 }, + { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT}, ++ { "OpenSSH_6.6.1*", SSH_NEW_OPENSSH}, ++ { "OpenSSH_6.5*," ++ "OpenSSH_6.6*", SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD}, + { "OpenSSH*", SSH_NEW_OPENSSH }, + { "*MindTerm*", 0 }, + { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| +@@ -251,7 +254,6 @@ compat_cipher_proposal(char *cipher_prop + return cipher_prop; + } + +- + char * + compat_pkalg_proposal(char *pkalg_prop) + { +@@ -263,5 +265,18 @@ compat_pkalg_proposal(char *pkalg_prop) + if (*pkalg_prop == '\0') + fatal("No supported PK algorithms found"); + return pkalg_prop; ++} ++ ++char * ++compat_kex_proposal(char *kex_prop) ++{ ++ if (!(datafellows & SSH_BUG_CURVE25519PAD)) ++ return kex_prop; ++ debug2("%s: original KEX proposal: %s", __func__, kex_prop); ++ kex_prop = filter_proposal(kex_prop, "curve25519-sha256@libssh.org"); ++ debug2("%s: compat KEX proposal: %s", __func__, kex_prop); ++ if (*kex_prop == '\0') ++ fatal("No supported key exchange algorithms found"); ++ return kex_prop; + } + +Index: compat.h +=================================================================== +RCS file: /var/cvs/openssh/compat.h,v +retrieving revision 1.42 +retrieving revision 1.43 +diff -u -p -r1.42 -r1.43 +--- compat.h 31 Dec 2013 01:25:41 -0000 1.42 ++++ compat.h 20 Apr 2014 03:25:31 -0000 1.43 +@@ -59,6 +59,7 @@ + #define SSH_BUG_RFWD_ADDR 0x02000000 + #define SSH_NEW_OPENSSH 0x04000000 + #define SSH_BUG_DYNAMIC_RPORT 0x08000000 ++#define SSH_BUG_CURVE25519PAD 0x10000000 + + void enable_compat13(void); + void enable_compat20(void); +@@ -66,6 +67,7 @@ void compat_datafellows(const char * + int proto_spec(const char *); + char *compat_cipher_proposal(char *); + char *compat_pkalg_proposal(char *); ++char *compat_kex_proposal(char *); + + extern int compat13; + extern int compat20; +Index: sshd.c +=================================================================== +RCS file: /var/cvs/openssh/sshd.c,v +retrieving revision 1.448 +retrieving revision 1.453 +diff -u -p -r1.448 -r1.453 +--- sshd.c 26 Feb 2014 23:20:08 -0000 1.448 ++++ sshd.c 20 Apr 2014 03:28:41 -0000 1.453 +@@ -2462,6 +2438,9 @@ do_ssh2_kex(void) + if (options.kex_algorithms != NULL) + myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; + ++ myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( ++ myproposal[PROPOSAL_KEX_ALGS]); ++ + if (options.rekey_limit || options.rekey_interval) + packet_set_rekey_limits((u_int32_t)options.rekey_limit, + (time_t)options.rekey_interval); +Index: sshconnect2.c +=================================================================== +RCS file: /var/cvs/openssh/sshconnect2.c,v +retrieving revision 1.197 +retrieving revision 1.199 +diff -u -p -r1.197 -r1.199 +--- sshconnect2.c 4 Feb 2014 00:20:16 -0000 1.197 ++++ sshconnect2.c 20 Apr 2014 03:25:31 -0000 1.199 +@@ -195,6 +196,8 @@ ssh_kex2(char *host, struct sockaddr *ho + } + if (options.kex_algorithms != NULL) + myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; ++ myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( ++ myproposal[PROPOSAL_KEX_ALGS]); + + if (options.rekey_limit || options.rekey_interval) + packet_set_rekey_limits((u_int32_t)options.rekey_limit, +Index: bufaux.c +=================================================================== +RCS file: /var/cvs/openssh/bufaux.c,v +retrieving revision 1.62 +retrieving revision 1.63 +diff -u -p -r1.62 -r1.63 +--- bufaux.c 4 Feb 2014 00:20:15 -0000 1.62 ++++ bufaux.c 20 Apr 2014 03:24:50 -0000 1.63 +@@ -1,4 +1,4 @@ +-/* $OpenBSD: bufaux.c,v 1.56 2014/02/02 03:44:31 djm Exp $ */ ++/* $OpenBSD: bufaux.c,v 1.57 2014/04/16 23:22:45 djm Exp $ */ + /* + * Author: Tatu Ylonen <ylo@cs.hut.fi> + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland +@@ -372,6 +372,9 @@ buffer_put_bignum2_from_string(Buffer *b + + if (l > 8 * 1024) + fatal("%s: length %u too long", __func__, l); ++ /* Skip leading zero bytes */ ++ for (; l > 0 && *s == 0; l--, s++) ++ ; + p = buf = xmalloc(l + 1); + /* + * If most significant bit is set then prepend a zero byte to +_______________________________________________ +openssh-unix-dev mailing list +openssh-unix-dev@mindrot.org +https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
\ No newline at end of file diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index 4e23bbbe4..41b69608b 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 209916 2014-04-08 15:23:41Z anatolik $ +# $Id: PKGBUILD 211714 2014-04-23 18:51:17Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=readline _basever=6.3 -_patchlevel=003 +_patchlevel=005 pkgver=$_basever.$_patchlevel -pkgrel=2 +pkgrel=1 pkgdesc='GNU readline library' arch=('i686' 'x86_64') url='http://tiswww.case.edu/php/chet/readline/rltop.html' @@ -59,4 +59,8 @@ md5sums=('33c8fb279e981274f485fd91da77e94a' '700295212f7e2978577feaee584afddb' 'SKIP' 'af4963862f5156fbf9111c2c6fa86ed7' + 'SKIP' + '11f9def89803a5052db3ba72394ce14f' + 'SKIP' + '93721c31cd225393f80cb3aadb165544' 'SKIP') diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD index ebc63b695..1eeb61bd4 100644 --- a/extra/apr/PKGBUILD +++ b/extra/apr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 200759 2013-12-04 19:27:48Z jgc $ +# $Id: PKGBUILD 211680 2014-04-23 03:13:46Z anatolik $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apr -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://apr.apache.org/" depends=('util-linux') license=('APACHE') source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2{,.asc}) -md5sums=('cc93bd2c12d0d037f68e21cc6385dc31' +md5sums=('5486180ec5a23efb5cae6d4292b300ab' 'SKIP') build() { diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 3beb3b40f..ab4e9d512 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 203195 2014-01-05 05:23:56Z bisson $ +# $Id: PKGBUILD 211687 2014-04-23 09:33:39Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=audacious -pkgver=3.4.3 +pkgver=3.5 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' license=('custom:BSD') arch=('i686' 'x86_64') -depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' +depends=('gtk3' 'glib2' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip: zipped skins support') +makedepends=('python2') # for gdbus-codegen source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('1d348f8ef5238de7cd6669189ecca690452e96c4') +sha1sums=('dda830fe0f8a2fabd94db9554ac05e6880d0d370') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD index f8095da0f..8a7a930e9 100644 --- a/extra/bluefish/PKGBUILD +++ b/extra/bluefish/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 204944 2014-02-01 05:29:28Z eric $ +# $Id: PKGBUILD 211664 2014-04-22 23:43:54Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=bluefish -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=1 pkgdesc="A powerful HTML editor for experienced web designers and programmers" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('gucharmap' 'intltool') optdepends=('gucharmap: for using the charmap plugin') install=bluefish.install source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig}) -sha1sums=('efdd577a20a439e58f14f68e725f00be230d5de1' +sha1sums=('7742f732a4259ff927a2160a4d94e0c0a805a196' 'SKIP') prepare() { diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD index 5e6a8f8cf..a5e937e41 100644 --- a/extra/easytag/PKGBUILD +++ b/extra/easytag/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 210327 2014-04-14 11:20:34Z guillaume $ +# $Id: PKGBUILD 211707 2014-04-23 17:16:21Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=easytag -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.1 +pkgrel=1 pkgdesc='Simple application for viewing and editing tags in audio files' arch=('i686' 'x86_64') license=('GPL') @@ -16,7 +16,7 @@ depends=('id3lib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'wavpack' 'tagli 'desktop-file-utils' 'hicolor-icon-theme' 'opusfile') install=${pkgname}.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('29589972a3a8beb7823df74f1e845c1e61ab46508425894fa46b72c86cad56f7') +sha256sums=('8a86f3d6ff76f7141ecc1c362402037ae5f59bbd13a1683982f62251ba1e6a07') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD index 494b9cd42..7ef8e07d9 100644 --- a/extra/ftgl/PKGBUILD +++ b/extra/ftgl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197966 2013-10-30 11:58:23Z allan $ +# $Id: PKGBUILD 211717 2014-04-23 20:50:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: tobias <tobias@archlinux.org> @@ -6,7 +6,7 @@ pkgname=ftgl _pkgver=2.1.3-rc5 pkgver=${_pkgver/-/} -pkgrel=5 +pkgrel=6 pkgdesc="OpenGL library to use arbitrary fonts" arch=(i686 x86_64) url="http://ftgl.wiki.sourceforge.net/" @@ -16,15 +16,19 @@ makedepends=('doxygen' 'mesa') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2") md5sums=('c7879018cde844059495b3029b0b6503') -build() { - cd "$srcdir/$pkgname-${_pkgver/-/~}" +prepare() { + cd $pkgname-${_pkgver/-/\~} sed -i '/^SUBDIRS =/s/demo//' Makefile.in +} + +build() { + cd $pkgname-${_pkgver/-/\~} ./configure --prefix=/usr --with-pic --disable-static make } package() { - cd "$srcdir/$pkgname-${_pkgver/-/~}" + cd $pkgname-${_pkgver/-/\~} make DESTDIR="$pkgdir" install # FS#23283: install missing headers for OpenCascade diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index 0dd6ed919..bc208709d 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 201390 2013-12-10 12:53:56Z jgc $ +# $Id: PKGBUILD 211699 2014-04-23 15:31:26Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=('gstreamer0.10-base') pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') pkgver=0.10.36 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10>=0.10.36' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection' 'git' 'gtk-doc') +makedepends=('pkgconfig' 'gstreamer0.10>=0.10.36' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection' 'git') options=(!emptydirs) url="http://gstreamer.freedesktop.org/" source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-base#commit=48d5966f12d4e6b71c96db0600cf76ef0ef14b3a" @@ -40,7 +40,7 @@ build() { cd gst-plugins-base NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental --disable-gnome_vfs --enable-gtk-doc \ + --disable-static --enable-experimental --disable-gnome_vfs --disable-gtk-doc \ --with-package-name="GStreamer Base Plugins (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" make diff --git a/extra/gstreamer0.10-good/0001-docs-fix-mismatched-para-tags.patch b/extra/gstreamer0.10-good/0001-docs-fix-mismatched-para-tags.patch deleted file mode 100644 index 2747c6975..000000000 --- a/extra/gstreamer0.10-good/0001-docs-fix-mismatched-para-tags.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 908d728c8a8b12acd9f9659ebd8970882b7daa33 Mon Sep 17 00:00:00 2001 -From: William Jon McCann <william.jon.mccann@gmail.com> -Date: Fri, 14 Feb 2014 20:27:20 +0000 -Subject: docs: fix mismatched para tags - -newer gtkdoc is more sensitive to mismatched docbook tags. -This fixes the build in master. ---- -diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c -index 549a9d2..e278886 100644 ---- a/gst/audiofx/audiocheblimit.c -+++ b/gst/audiofx/audiocheblimit.c -@@ -46,12 +46,12 @@ - * be at most this value. A lower ripple value will allow a faster rolloff. - * - * As a special case, a Chebyshev type 1 filter with no ripple is a Butterworth filter. -- * </para> -+ * - * <note><para> - * Be warned that a too large number of poles can produce noise. The most poles are possible with - * a cutoff frequency at a quarter of the sampling rate. - * </para></note> -- * <para> -+ * - * <refsect2> - * <title>Example launch line</title> - * |[ -diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c -index 922e381..ea49af9 100644 ---- a/gst/udp/gstudpsrc.c -+++ b/gst/udp/gstudpsrc.c -@@ -78,8 +78,7 @@ - * </itemizedlist> - * The message is typically used to detect that no UDP arrives in the receiver - * because it is blocked by a firewall. -- * </para> -- * <para> -+ * - * A custom file descriptor can be configured with the - * #GstUDPSrc:sockfd property. The socket will be closed when setting the - * element to READY by default. This behaviour can be --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer0.10-good/0002-docs-use-docbook-markup-for-xi-include.patch b/extra/gstreamer0.10-good/0002-docs-use-docbook-markup-for-xi-include.patch deleted file mode 100644 index e4d2fef81..000000000 --- a/extra/gstreamer0.10-good/0002-docs-use-docbook-markup-for-xi-include.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 79fc4ec80b68eac193095ee40d5da584eb270f1c Mon Sep 17 00:00:00 2001 -From: Stefan Sauer <ensonic@users.sf.net> -Date: Tue, 18 Feb 2014 21:54:45 +0000 -Subject: docs: use docbook markup for xi:include - -It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in -CDATA break xi:inlcude examples. As in a whole jhbuild checkout these where -the only 4, we're fixing them instead. ---- -diff --git a/gst/audiofx/audiofirfilter.c b/gst/audiofx/audiofirfilter.c -index e0887ad..0ab32f3 100644 ---- a/gst/audiofx/audiofirfilter.c -+++ b/gst/audiofx/audiofirfilter.c -@@ -39,9 +39,9 @@ - * - * <refsect2> - * <title>Example application</title> -- * |[ -+ * <informalexample><programlisting language="C"> - * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/firfilter-example.c" /> -- * ]| -+ * </programlisting></informalexample> - * </refsect2> - */ - -diff --git a/gst/audiofx/audioiirfilter.c b/gst/audiofx/audioiirfilter.c -index c107594..eb4f20c 100644 ---- a/gst/audiofx/audioiirfilter.c -+++ b/gst/audiofx/audioiirfilter.c -@@ -35,9 +35,9 @@ - * - * <refsect2> - * <title>Example application</title> -- * |[ -+ * <informalexample><programlisting language="C"> - * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/iirfilter-example.c" /> -- * ]| -+ * </programlisting></informalexample> - * </refsect2> - */ - -diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c -index 59943d4..5cd83c8 100644 ---- a/gst/level/gstlevel.c -+++ b/gst/level/gstlevel.c -@@ -95,9 +95,9 @@ - * - * <refsect2> - * <title>Example application</title> -- * |[ -+ * <informalexample><programlisting language="C"> - * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/level/level-example.c" /> -- * ]| -+ * </programlisting></informalexample> - * </refsect2> - */ - -diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c -index 75a9152..5e192c1 100644 ---- a/gst/spectrum/gstspectrum.c -+++ b/gst/spectrum/gstspectrum.c -@@ -90,9 +90,9 @@ - * - * <refsect2> - * <title>Example application</title> -- * |[ -+ * <informalexample><programlisting language="C"> - * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/spectrum/spectrum-example.c" /> -- * ]| -+ * </programlisting></informalexample> - * </refsect2> - * - * Last reviewed on 2011-03-10 (0.10.29) --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD index 08490a1a0..7b88c4847 100644 --- a/extra/gstreamer0.10-good/PKGBUILD +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -1,23 +1,19 @@ -# $Id: PKGBUILD 207963 2014-03-15 19:48:48Z heftig $ +# $Id: PKGBUILD 211700 2014-04-23 15:31:42Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.31 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'gtk-doc' 'git' 'cairo') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'git' 'cairo') url="http://gstreamer.freedesktop.org/" options=(!emptydirs) source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9" - test-rtp-payloading.patch - 0001-docs-fix-mismatched-para-tags.patch - 0002-docs-use-docbook-markup-for-xi-include.patch) + test-rtp-payloading.patch) sha256sums=('SKIP' - 'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29' - 'ff9411fc67f825144fff8496f6ae303ff14bb3d14f629e76c2b26616255bba64' - '9e71a6bbd83be88ff6793b503af7ccde295cc90b3e3692ae46b874abe9ee32f7') + 'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29') prepare() { cd gst-plugins-good @@ -26,10 +22,6 @@ prepare() { sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac patch -p1 -i ../test-rtp-payloading.patch - - # Fix build with gtk-doc 1.20 FS#39454 - patch -p1 -i ../0001-docs-fix-mismatched-para-tags.patch - patch -p1 -i ../0002-docs-use-docbook-markup-for-xi-include.patch } build() { @@ -40,7 +32,7 @@ build() { --disable-schemas-install \ --disable-hal \ --disable-esd \ - --enable-gtk-doc \ + --disable-gtk-doc \ --with-package-name="GStreamer Good Plugins (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 8287e5170..860118e0c 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 208908 2014-03-28 15:46:21Z bpiotrowski $ +# $Id: PKGBUILD 211702 2014-04-23 15:31:57Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=10 +pkgrel=11 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr' 'gtk-doc' 'git') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr' 'git') url="http://gstreamer.freedesktop.org/" source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-ugly#commit=d637756a8e569753e9869c2c0728288f5dbc5089" opencore-amr.patch @@ -27,7 +27,7 @@ build() { cd gst-plugins-ugly NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental --enable-gtk-doc \ + --disable-static --enable-experimental --disable-gtk-doc \ --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" make diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD index 0c1223bf5..bfe97cf75 100644 --- a/extra/gstreamer0.10/PKGBUILD +++ b/extra/gstreamer0.10/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 201380 2013-12-10 10:18:42Z jgc $ +# $Id: PKGBUILD 211698 2014-04-23 15:31:03Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10 pkgver=0.10.36 -pkgrel=3 +pkgrel=4 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') license=('LGPL') url="http://gstreamer.com" depends=('libxml2' 'glib2') optdepends=('sh: feedback script') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection' 'git') +makedepends=('intltool' 'pkgconfig' 'gobject-introspection' 'git') source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=3ddc31eaa18c3be1613e43430eca78a3e445639e" tests-remove-silly-test_fail_abstract_new-check.patch bison3.patch) @@ -30,7 +30,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ --with-package-name="GStreamer (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" \ - --enable-gtk-doc --disable-static + --disable-gtk-doc --disable-static make } diff --git a/extra/libssh/0004-reset-global-request-status.patch b/extra/libssh/0004-reset-global-request-status.patch deleted file mode 100644 index 760f3497a..000000000 --- a/extra/libssh/0004-reset-global-request-status.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Allow requesting more than one channel per session. -Author: Andreas Schneider <asn@cryptomilk.org> -Abstract: - In the 0.5.x series of libssh only one channel request per session - is possible. This blocks using libssh client sessions which require - requesting multiple channels on a single SSH connection. -Origin: http://git.libssh.org/projects/libssh.git/commit/src/channels.c?id=e30acdb58a86937e8bece57ce47e272f1106ca55 ---- a/src/channels.c -+++ b/src/channels.c -@@ -1951,7 +1951,7 @@ - break; - - } -- -+ session->global_req_state = SSH_CHANNEL_REQ_STATE_NONE; - leave_function(); - return rc; - error: diff --git a/extra/libssh/0005-multi-reverse-fwd.patch b/extra/libssh/0005-multi-reverse-fwd.patch deleted file mode 100644 index 0771e8c4d..000000000 --- a/extra/libssh/0005-multi-reverse-fwd.patch +++ /dev/null @@ -1,85 +0,0 @@ -Description: Allow requesting multiple reverse port forwarding tunnels per connection -Author: Oleksandr Shneyder <o.schneyder@phoca-gmbh.de> -Abstract: - Channel: Add ssh_channel_accept_forward(). - . - This new function works the same way as ssh_forward_accept() - but can return a destination port of the channel (useful if - SSH connection is supposed to reverse forward multiple TCP/IP - ports). -Origin: http://git.libssh.org/projects/libssh.git/commit/?id=a1c4fc07d43fb7a7e1e91bfdadbd3dc62b8ce462 ---- a/include/libssh/libssh.h -+++ b/include/libssh/libssh.h -@@ -371,6 +371,7 @@ - LIBSSH_API char *ssh_dirname (const char *path); - LIBSSH_API int ssh_finalize(void); - LIBSSH_API ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms); -+LIBSSH_API ssh_channel ssh_channel_accept_forward(ssh_session session, int timeout_ms, int *destination_port); - LIBSSH_API int ssh_forward_cancel(ssh_session session, const char *address, int port); - LIBSSH_API int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port); - LIBSSH_API void ssh_free(ssh_session session); ---- a/src/channels.c -+++ b/src/channels.c -@@ -1755,7 +1755,7 @@ - } - - static ssh_channel ssh_channel_accept(ssh_session session, int channeltype, -- int timeout_ms) { -+ int timeout_ms, int *destination_port) { - #ifndef _WIN32 - static const struct timespec ts = { - .tv_sec = 0, -@@ -1779,6 +1779,10 @@ - ssh_message_subtype(msg) == channeltype) { - ssh_list_remove(session->ssh_message_list, iterator); - channel = ssh_message_channel_request_open_reply_accept(msg); -+ if(destination_port) { -+ *destination_port=msg->channel_request_open.destination_port; -+ } -+ - ssh_message_free(msg); - return channel; - } -@@ -1809,7 +1813,7 @@ - * the server. - */ - ssh_channel ssh_channel_accept_x11(ssh_channel channel, int timeout_ms) { -- return ssh_channel_accept(channel->session, SSH_CHANNEL_X11, timeout_ms); -+ return ssh_channel_accept(channel->session, SSH_CHANNEL_X11, timeout_ms, NULL); - } - - /** -@@ -1857,7 +1861,7 @@ - } else { - session->global_req_state=SSH_CHANNEL_REQ_STATE_DENIED; - } -- -+ session->global_req_state = SSH_CHANNEL_REQ_STATE_NONE; - leave_function(); - return SSH_PACKET_USED; - -@@ -2027,7 +2031,23 @@ - * the server - */ - ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) { -- return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms); -+ return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL); -+} -+ -+/** -+ * @brief Accept an incoming TCP/IP forwarding channel and get information -+ * about incomming connection -+ * @param[in] session The ssh session to use. -+ * -+ * @param[in] timeout_ms A timeout in milliseconds. -+ * -+ * @param[in] destination_port A pointer to destination port or NULL. -+ * -+ * @return Newly created channel, or NULL if no incoming channel request from -+ * the server -+ */ -+ssh_channel ssh_channel_accept_forward(ssh_session session, int timeout_ms, int* destination_port) { -+ return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, destination_port); - } - - /** diff --git a/extra/libssh/CVE-2014-0017.patch b/extra/libssh/CVE-2014-0017.patch deleted file mode 100644 index dd56a329d..000000000 --- a/extra/libssh/CVE-2014-0017.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -rupN a/include/libssh/wrapper.h b/include/libssh/wrapper.h ---- a/include/libssh/wrapper.h 2013-07-26 06:39:39.000000000 +0000 -+++ b/include/libssh/wrapper.h 2014-03-09 16:38:49.807812235 +0000 -@@ -44,5 +44,6 @@ int crypt_set_algorithms_server(ssh_sess - struct ssh_crypto_struct *crypto_new(void); - void crypto_free(struct ssh_crypto_struct *crypto); - -+void ssh_reseed(void); - - #endif /* WRAPPER_H_ */ -diff -rupN a/src/bind.c b/src/bind.c ---- a/src/bind.c 2013-07-26 06:39:39.000000000 +0000 -+++ b/src/bind.c 2014-03-09 16:39:00.571080087 +0000 -@@ -375,6 +375,7 @@ int ssh_bind_accept(ssh_bind sshbind, ss - session->dsa_key = dsa; - session->rsa_key = rsa; - -+ ssh_reseed(); - return SSH_OK; - } - -diff -rupN a/src/libcrypto.c b/src/libcrypto.c ---- a/src/libcrypto.c 2013-07-26 06:39:39.000000000 +0000 -+++ b/src/libcrypto.c 2014-03-09 16:40:07.807331327 +0000 -@@ -23,6 +23,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -+#include <sys/time.h> - - #include "libssh/priv.h" - #include "libssh/session.h" -@@ -38,6 +39,8 @@ - #include <openssl/rsa.h> - #include <openssl/hmac.h> - #include <openssl/opensslv.h> -+#include <openssl/rand.h> -+ - #ifdef HAVE_OPENSSL_AES_H - #define HAS_AES - #include <openssl/aes.h> -@@ -66,6 +69,12 @@ static int alloc_key(struct crypto_struc - return 0; - } - -+void ssh_reseed(void) { -+ struct timeval tv; -+ gettimeofday(&tv, NULL); -+ RAND_add(&tv, sizeof(tv), 0.0); -+} -+ - SHACTX sha1_init(void) { - SHACTX c = malloc(sizeof(*c)); - if (c == NULL) { -diff -rupN a/src/libgcrypt.c b/src/libgcrypt.c ---- a/src/libgcrypt.c 2013-07-26 06:39:39.000000000 +0000 -+++ b/src/libgcrypt.c 2014-03-09 16:40:51.730392881 +0000 -@@ -41,6 +41,9 @@ static int alloc_key(struct crypto_struc - return 0; - } - -+void ssh_reseed(void) { -+ } -+ - SHACTX sha1_init(void) { - SHACTX ctx = NULL; - gcry_md_open(&ctx, GCRY_MD_SHA1, 0); diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD index bd9c30295..cbc36b9b3 100644 --- a/extra/libssh/PKGBUILD +++ b/extra/libssh/PKGBUILD @@ -1,42 +1,28 @@ -# $Id: PKGBUILD 207452 2014-03-09 16:43:05Z bpiotrowski $ +# $Id: PKGBUILD 211694 2014-04-23 15:10:12Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: ice-man <icemanf@gmail.com> # Contributor: sergeantspoon <sergeantspoon@archlinux.us> pkgname=libssh -pkgver=0.5.5 -pkgrel=3 +pkgver=0.6.3 +pkgrel=1 pkgdesc="Library for accessing ssh client services through C libraries" url="http://www.libssh.org/" license=('LGPL') arch=('i686' 'x86_64') depends=('zlib' 'openssl') makedepends=('cmake' 'doxygen') -source=(https://red.libssh.org/attachments/download/51/${pkgname}-${pkgver}.tar.gz - 0004-reset-global-request-status.patch - 0005-multi-reverse-fwd.patch - CVE-2014-0017.patch) -md5sums=('bb308196756c7255c0969583d917136b' - '0d8c28906b07e31466157b1fda441f4a' - '6fa3a1a4f448e85a7eb39360f4a72ce9' - '2eddf36e41adf62e4094f17b64d466e0') - -prepare() { - cd ${pkgname}-${pkgver} - # add multiple channels on a single SSH connection required by X2goclient - # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736231 - patch -Np1 -i ${srcdir}/0004-reset-global-request-status.patch - patch -Np1 -i ${srcdir}/0005-multi-reverse-fwd.patch - patch -Np1 -i ${srcdir}/CVE-2014-0017.patch -} +source=(https://red.libssh.org/attachments/download/87/${pkgname}-${pkgver}.tar.xz) +md5sums=('66cf16e77f60913b4d54f18c92cdbf71') build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_GSSAPI=OFF make } diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD index 1e862ba18..a399d48a3 100644 --- a/extra/libxfont/PKGBUILD +++ b/extra/libxfont/PKGBUILD @@ -1,17 +1,25 @@ -# $Id: PKGBUILD 203296 2014-01-07 17:59:08Z lcarlier $ +# $Id: PKGBUILD 211682 2014-04-23 06:32:53Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfont pkgver=1.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') -source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha256sums=('d16ea3541835d296b19cfb05d7e64fc62173d8e7eb93284402ec761b951d1543') +source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2 + fix-for-fontsproto213.patch) +sha256sums=('d16ea3541835d296b19cfb05d7e64fc62173d8e7eb93284402ec761b951d1543' + '9c8298cc9f4dc3981f19107353b2e4373dfb7882768bbf0b3ae027820a2dcad9') + +prepare() { + cd "${srcdir}/libXfont-${pkgver}" + # FS#40044 - merged for branch 1.5 + patch -Np1 -i ../fix-for-fontsproto213.patch +} build() { cd "${srcdir}/libXfont-${pkgver}" diff --git a/extra/libxfont/fix-for-fontsproto213.patch b/extra/libxfont/fix-for-fontsproto213.patch new file mode 100644 index 000000000..04ee1fb6c --- /dev/null +++ b/extra/libxfont/fix-for-fontsproto213.patch @@ -0,0 +1,70 @@ +diff --git a/src/util/patcache.c b/src/util/patcache.c +index 9c05fa1..2101015 100644 +--- a/src/util/patcache.c ++++ b/src/util/patcache.c +@@ -50,7 +50,7 @@ typedef unsigned char EntryPtr; + typedef struct _FontPatternCacheEntry { + struct _FontPatternCacheEntry *next, **prev; + short patlen; +- char *pattern; ++ const char *pattern; + int hash; + FontPtr pFont; /* associated font */ + } FontPatternCacheEntryRec, *FontPatternCacheEntryPtr; +@@ -74,7 +74,7 @@ EmptyFontPatternCache (FontPatternCachePtr cache) + cache->entries[i].next = &cache->entries[i+1]; + cache->entries[i].prev = 0; + cache->entries[i].pFont = 0; +- free (cache->entries[i].pattern); ++ free ((void *) cache->entries[i].pattern); + cache->entries[i].pattern = 0; + cache->entries[i].patlen = 0; + } +@@ -107,7 +107,7 @@ FreeFontPatternCache (FontPatternCachePtr cache) + int i; + + for (i = 0; i < NENTRIES; i++) +- free (cache->entries[i].pattern); ++ free ((void *) cache->entries[i].pattern); + free (cache); + } + +@@ -128,7 +128,7 @@ Hash (const char *string, int len) + /* add entry */ + void + CacheFontPattern (FontPatternCachePtr cache, +- char *pattern, ++ const char *pattern, + int patlen, + FontPtr pFont) + { +@@ -154,7 +154,7 @@ CacheFontPattern (FontPatternCachePtr cache, + if (e->next) + e->next->prev = e->prev; + *e->prev = e->next; +- free (e->pattern); ++ free ((void *) e->pattern); + } + /* set pattern */ + memcpy (newpat, pattern, patlen); +@@ -174,7 +174,7 @@ CacheFontPattern (FontPatternCachePtr cache, + /* find matching entry */ + FontPtr + FindCachedFontPattern (FontPatternCachePtr cache, +- char *pattern, ++ const char *pattern, + int patlen) + { + int hash; +@@ -211,7 +211,7 @@ RemoveCachedFontPattern (FontPatternCachePtr cache, + *e->prev = e->next; + e->next = cache->free; + cache->free = e; +- free (e->pattern); ++ free ((void *) e->pattern); + e->pattern = 0; + } + } +-- +cgit v0.9.0.2-2-gbebe + diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index a638ad442..0b39d24e0 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202652 2013-12-23 08:42:02Z foutrelis $ +# $Id: PKGBUILD 211705 2014-04-23 16:59:49Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -7,7 +7,7 @@ pkgname=slim pkgver=1.3.6 -pkgrel=3 +pkgrel=4 pkgdesc="Desktop-independent graphical login manager for X11" arch=('i686' 'x86_64') url="http://slim.berlios.de/" @@ -19,26 +19,29 @@ backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim' source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz slim-1.3.6-fix-libslim-libraries.patch slim-1.3.6-add-sessiondir.patch + slim-1.3.6-systemd-session.patch slim.pam slim.logrotate) sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df' '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0' '0dffd53a69eb9033a67fad964df6fc150ee7a483e29d8eb8b559010fbd14e5fd' + '900b7ffe723b741c05bcc0ca857f300a2131a0029c6532eb17be935451bf2c70' 'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4' '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver # Fix installation path of slim.service sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt - patch -Np1 -i "$srcdir/slim-1.3.6-fix-libslim-libraries.patch" - patch -Np1 -i "$srcdir/slim-1.3.6-add-sessiondir.patch" + patch -Np1 -i ../slim-1.3.6-fix-libslim-libraries.patch + patch -Np1 -i ../slim-1.3.6-add-sessiondir.patch + patch -Np1 -i ../slim-1.3.6-systemd-session.patch } build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -50,7 +53,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/slim/slim-1.3.6-systemd-session.patch b/extra/slim/slim-1.3.6-systemd-session.patch new file mode 100644 index 000000000..be5f52982 --- /dev/null +++ b/extra/slim/slim-1.3.6-systemd-session.patch @@ -0,0 +1,29 @@ +--- a/app.cpp 2013-10-23 16:19:57.074100282 -0400 ++++ b/app.cpp 2013-10-23 16:33:13.302122574 -0400 +@@ -829,8 +829,13 @@ + + StopServer(); + RemoveLock(); +- while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */ +- Run(); ++ if (force_nodaemon) { ++ delete LoginPanel; ++ exit(ERR_EXIT); /* use ERR_EXIT so that systemd's RESTART=on-failure works */ ++ } else { ++ while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */ ++ Run(); ++ } + } + + void App::KillAllClients(Bool top) { +--- a/slim.service 2013-10-23 16:19:57.074100282 -0400 ++++ b/slim.service 2013-10-23 16:45:14.901142776 -0400 +@@ -4,6 +4,7 @@ + + [Service] + ExecStart=/usr/bin/slim -nodaemon ++Restart=on-failure + + [Install] + Alias=display-manager.service +Common subdirectories: slim-1.3.6/themes and slim-1.3.6.new/themes diff --git a/extra/thunar-archive-plugin/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch b/extra/thunar-archive-plugin/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch new file mode 100644 index 000000000..f1435cd55 --- /dev/null +++ b/extra/thunar-archive-plugin/0001-Fix-file-roller-3.12.1-detection-bug-10826.patch @@ -0,0 +1,37 @@ +From cc1b9c86d1b563318a2b9489b062f9519ae08b20 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Wed, 23 Apr 2014 20:13:19 +0300 +Subject: [PATCH] Fix file-roller>=3.12.1 detection (bug #10826) + +File Roller 3.12.1 changed the name of its .desktop file from +file-roller.desktop to org.gnome.FileRoller.desktop. + +We install a new symlink to support the new .desktop file name. +--- + scripts/Makefile.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/scripts/Makefile.am b/scripts/Makefile.am +index 4da529c..3804605 100644 +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am +@@ -5,12 +5,15 @@ wrapper_SCRIPTS = \ + ark.tap \ + file-roller.tap + +-# Install symlink to 'gnome-file-roller.tap' ++# Install symlink to 'gnome-file-roller.tap' and 'org.gnome.FileRoller.tap' + install-exec-hook: + $(mkinstalldirs) $(DESTDIR)$(wrapperdir) + -( cd $(DESTDIR)$(wrapperdir) ; \ + test -f gnome-file-roller.tap \ + || ln -sf file-roller.tap gnome-file-roller.tap ) ++ -( cd $(DESTDIR)$(wrapperdir) ; \ ++ test -f org.gnome.FileRoller.tap \ ++ || ln -sf file-roller.tap org.gnome.FileRoller.tap ) + + EXTRA_DIST = \ + $(wrapper_SCRIPTS) \ +-- +1.9.2 + diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD index 72994f9e7..c9a75c450 100644 --- a/extra/thunar-archive-plugin/PKGBUILD +++ b/extra/thunar-archive-plugin/PKGBUILD @@ -1,23 +1,33 @@ -# $Id: PKGBUILD 207512 2014-03-11 16:41:15Z foutrelis $ +# $Id: PKGBUILD 211709 2014-04-23 17:41:09Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=thunar-archive-plugin pkgver=0.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Create and extract archives in Thunar" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" license=('GPL2') groups=('xfce4-goodies') depends=('thunar' 'hicolor-icon-theme') -makedepends=('intltool') +makedepends=('intltool' 'xfce4-dev-tools') optdepends=('file-roller' 'kdeutils-ark' 'xarchiver') install=$pkgname.install -source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2) -sha256sums=('9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c') +source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2 + 0001-Fix-file-roller-3.12.1-detection-bug-10826.patch) +sha256sums=('9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c' + '4373c3011f5abd1d4119d283e832aeb858c810f14b3a59b6250cf10893aa0757') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # https://bugzilla.xfce.org/show_bug.cgi?id=10826 + patch -Np1 -i ../0001-Fix-file-roller-3.12.1-detection-bug-10826.patch + NOCONFIGURE=1 xdt-autogen +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD index 4c539c847..1f1bc06ca 100644 --- a/extra/wxgtk/PKGBUILD +++ b/extra/wxgtk/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 203497 2014-01-11 20:07:13Z eric $ +# $Id: PKGBUILD 211704 2014-04-23 15:47:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk pkgver=3.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64') url="http://wxwidgets.org" license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base') +depends=('gtk2' 'gstreamer0.10-base' 'libsm') makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu') optdepends=('webkitgtk2: for webview support') options=('!emptydirs') |