diff options
44 files changed, 820 insertions, 147 deletions
diff --git a/community/agg/PKGBUILD b/community/agg/PKGBUILD index fe60133a4..0c235e835 100644 --- a/community/agg/PKGBUILD +++ b/community/agg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99669 2013-10-30 22:54:38Z allan $ +# $Id: PKGBUILD 107181 2014-03-14 08:12:44Z andrea $ # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> pkgname=agg pkgver=2.5 -pkgrel=4 +pkgrel=5 pkgdesc="A High Quality Rendering Engine for C++" arch=('i686' 'x86_64') url="http://www.antigrain.com/" @@ -14,21 +14,28 @@ replaces=('antigrain') options=('!makeflags') source=("http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz" agg-2.4-depends.patch - agg-2.5-pkgconfig.patch) + agg-2.5-pkgconfig.patch + autotools.patch) md5sums=('0229a488bc47be10a2fee6cf0b2febd6' '22f8e48c137d25038181c86d5e40b110' - '43a19a7b1564c591e56c8d09a0fd8da5') + '43a19a7b1564c591e56c8d09a0fd8da5' + 'e042231955a8daee5f3cdfa4ee4e866a') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/agg-2.4-depends.patch" + patch -p1 -i "${srcdir}/agg-2.5-pkgconfig.patch" + patch -p0 -i "${srcdir}/autotools.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" - patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" + cd ${pkgname}-${pkgver} sh ./autogen.sh ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/community/agg/autotools.patch b/community/agg/autotools.patch new file mode 100644 index 000000000..b273477a3 --- /dev/null +++ b/community/agg/autotools.patch @@ -0,0 +1,11 @@ +--- configure.in~ 2013-02-22 09:30:00.000000000 -0600 ++++ configure.in 2013-02-22 09:30:49.030777571 -0600 +@@ -8,7 +8,7 @@ + AC_PROG_CC + AC_PROG_CXX + AC_ISC_POSIX +-AM_C_PROTOTYPES ++#AM_C_PROTOTYPES + if test "x$U" != "x"; then + AC_MSG_ERROR(Compiler not ANSI compliant) + fi diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD index fbc3cd89d..6822f3f14 100644 --- a/community/denemo/PKGBUILD +++ b/community/denemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102121 2013-12-05 14:32:13Z spupykin $ +# $Id: PKGBUILD 107193 2014-03-14 09:39:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> # Contributor: Gnud <ach.gnud@gmail.com> pkgname=denemo -pkgver=1.1.0 +pkgver=20140314 pkgrel=1 pkgdesc="A music score editor" arch=('i686' 'x86_64') @@ -14,13 +14,14 @@ license=('GPL') depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw' 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi' 'rubberband') -makedepends=('intltool') -backup=('etc/denemo/denemo.conf') -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('5e708247b2abd9b3b196e8e2e033bf11') +makedepends=('intltool' 'git') +#source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") +source=("$pkgname-$pkgver::git://git.sv.gnu.org/denemo.git#commit=9bdb8e75be68ed3d1ba25a1d512107ac56d2bf18") +md5sums=('SKIP') build() { cd $srcdir/$pkgname-$pkgver + [ -x configure ] || ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/community/fossil/PKGBUILD b/community/fossil/PKGBUILD new file mode 100644 index 000000000..1c105dbdb --- /dev/null +++ b/community/fossil/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 107210 2014-03-14 15:09:48Z anatolik $ +# Maintainer: Anatol Pomozov <anatol pomozov at gmail> +# Contributor: Daniel YC Lin <dlin.tw at gmail> +# Contributor: Konstantin Plotnikov <kostyapl at gmail dot com> + +pkgname=fossil +pkgver=1.28 +_date_pkgver=20140127173344 +# NOTE: update _date_pkgver from http://www.fossil-scm.org/download.html +pkgrel=3 +pkgdesc='Simple, high-reliability, distributed software configuration management' +arch=(i686 x86_64) +license=(BSD) +url='http://www.fossil-scm.org' +depends=(openssl zlib) +source=( + fossil.socket + fossil.service + fossil-xinetd + bash.completion + http://www.fossil-scm.org/download/fossil-src-$_date_pkgver.tar.gz +) +sha256sums=('f885e17998dc1eece1688a75e516663462fe72a7f4f132def4132055777c7ff8' + 'c4973079facf209d3757db81df08f8d0843ede242f2a0c12281720da65e3b166' + '2f9a141fadfb7cb5225f0d65a308949bbc592bff9d567b5c472edb413c81f5aa' + 'e22e19dba1a4be6a62af0b77ff0267c2a0f19edf2f6a9133ee64246fae5d87da' + 'aca7c5a7c39ae2880712020e089c9c12543ba656c71d8cf8ac50e3c8871baa80') + +build() { + cd fossil-src-$_date_pkgver + ./configure --prefix=/usr + # headers and translate targets are problematic with parallel jobs + make -j1 bld bld/headers + make +} + +package() { + install -Dm644 fossil-xinetd "$pkgdir"/etc/xinetd.d/fossil + install -Dm644 fossil.socket "$pkgdir"/usr/lib/systemd/system/fossil.socket + install -Dm644 fossil.service "$pkgdir"/usr/lib/systemd/system/fossil@.service + install -Dm644 bash.completion "$pkgdir"/usr/share/bash-completion/completions/fossil + + cd fossil-src-$_date_pkgver + install -Dm755 fossil "$pkgdir"/usr/bin/fossil + install -Dm644 COPYRIGHT-BSD2.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/fossil/bash.completion b/community/fossil/bash.completion new file mode 100755 index 000000000..63bb9f15b --- /dev/null +++ b/community/fossil/bash.completion @@ -0,0 +1,33 @@ +_fossil() +{ +local cur prev opts + +#Var used by BASH +COMPREPLY=() +#word we are trying to complete +cur="${COMP_WORDS[COMP_CWORD]}" +#word before the one we're trying to complete +prev="${COMP_WORDS[COMP_CWORD-1]}" +#list of word that fossil know +opts="add addremove all annotate bisect branch cat changes checkout " +opts="$opts ci clean clone close co commit delete diff export extras " +opts="$opts finfo gdiff help import info init ls merge mv new open " +opts="$opts pull push rebuild remote-url revert rm settings sqlite3 " +opts="$opts stash status sync tag timeline ui undo unset update version" + +case "${prev}" in +add) opts="--dotfiles --ignore" ;; +addremove) opts="--dotfiles --ignore --test" ;; +all) opts="list ls pull push rebuild sync" ;; +annotate) opts="--limit --log --filevers" ;; +bisect) opts="bad good next options reset vlist" ;; +branch) opts="list ls -R --repository" ;; +merge) opts="--nochange -n --force -f --detail" +esac + +compopt -o filenames +COMPREPLY=($(compgen -fW "${opts}" -- "${cur}") \ +$(compgen -d -- "$cur")) +} + +complete -F _fossil fossil diff --git a/community/fossil/fossil-xinetd b/community/fossil/fossil-xinetd new file mode 100644 index 000000000..28e22a198 --- /dev/null +++ b/community/fossil/fossil-xinetd @@ -0,0 +1,23 @@ +service fossil +{ +#better not change any of these +type = UNLISTED +socket_type = stream +protocol = tcp +wait = no +user = root +server = /usr/bin/fossil + +#only change these +#http port, fossil will listen +port = 8055 + +#change this path to where your fossil repositories are +server_args = http /var/fossil + +#comment next line to enable remote access +only_from = 127.0.0.1 localhost + +#change to `no` to activate fossil +disable = yes +} diff --git a/community/fossil/fossil.service b/community/fossil/fossil.service new file mode 100644 index 000000000..9c585100e --- /dev/null +++ b/community/fossil/fossil.service @@ -0,0 +1,11 @@ +[Unit] +Description=Fossil service + +[Service] +# /var/fossil is the default path to fossil repositories +ExecStart=-/usr/bin/fossil http /var/fossil +StandardInput=socket +# Uncomment this line to use fossil with URL prefix +# This allows fossil to generate correct hyperlinks and redirects when +# hosted within virtual directory (e.g. nginx reverse-proxy setups) +#Environment=SCRIPT_NAME=/fossil diff --git a/community/fossil/fossil.socket b/community/fossil/fossil.socket new file mode 100644 index 000000000..96aee9f06 --- /dev/null +++ b/community/fossil/fossil.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Fossil socket + +[Socket] +# TCP port to listen on +ListenStream=8055 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD index 3efb0ea56..ede9b5151 100644 --- a/community/galculator/PKGBUILD +++ b/community/galculator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104578 2014-01-23 04:23:17Z bgyorgy $ +# $Id: PKGBUILD 107224 2014-03-14 16:49:24Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: SpepS <dreamspepser at yahoo dot it> @@ -6,8 +6,8 @@ pkgbase=galculator pkgname=(galculator galculator-gtk2) -pkgver=2.1.2 -pkgrel=2 +pkgver=2.1.3 +pkgrel=1 pkgdesc='GTK+ based scientific calculator' arch=('i686' 'x86_64') url='http://galculator.sourceforge.net/' @@ -16,7 +16,7 @@ depends=('gtk3' 'gtk2') makedepends=('intltool') install=$pkgname.install source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2) -sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b') +sha256sums=('91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235') build() { # GTK3 version diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index a29530d85..dedb8d94b 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -1,45 +1,41 @@ -# $Id: PKGBUILD 102250 2013-12-07 10:36:34Z bpiotrowski $ +# $Id: PKGBUILD 107173 2014-03-14 00:16:07Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gnash pkgname=(gnash-common gnash-gtk) -pkgver=0.8.10 -pkgrel=11 +pkgver=0.8.11dev +pkgrel=1 arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu - speex fontconfig - gstreamer0.10-base + speex fontconfig ffmpeg jemalloc gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext - pkgconfig boost) + pkgconfig boost git) options=(!emptydirs) -source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 - nodebug.patch gnash-0.8.10-boost-1.50.patch gnucash-0.8.10-giflib-5.0.patch) -sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224' - '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551' - 'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c' - 'd1597ce496d95913a7d5873a0a3c58e4f40fa4ec6e3fc7ae939a66f1362b3e57') +source=('gnash::git://git.sv.gnu.org/gnash.git#commit=a3180f2' + nodebug.patch) +sha256sums=('SKIP' + '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551') -build() { - cd gnash-$pkgver +prepare() { + cd gnash # Disable very, very verbose debugging (gigabytes of logs) patch -Np1 -i ../nodebug.patch - # Link to libboost_system.so - patch -Np1 -i ../gnash-0.8.10-boost-1.50.patch - - patch -Np1 -i ../gnucash-0.8.10-giflib-5.0.patch - ./autogen.sh +} + +build() { + cd gnash ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --with-plugins-install=system \ --with-npapi-plugindir=/usr/lib/mozilla/plugins \ --enable-gui=sdl,gtk,dump \ - --enable-media=gst \ + --enable-media=ffmpeg \ --enable-renderer=all \ --enable-device=x11 @@ -51,13 +47,11 @@ build() { package_gnash-common() { pkgdesc="A GNU Flash movie player" depends=(curl giflib sdl agg libjpeg libpng libltdl libgl glu - speex fontconfig cairo - gstreamer0.10-base + speex fontconfig cairo ffmpeg jemalloc boost-libs) backup=(etc/gnashrc etc/gnashthumbnailrc) - cd gnash-$pkgver - + cd gnash make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install # Split gnash-gtk @@ -79,7 +73,7 @@ package_gnash-gtk() { mv gtk/* "$pkgdir" - cd gnash-$pkgver + cd gnash make DESTDIR="$pkgdir" install-plugin install -m755 -d "$pkgdir/usr/share/gconf/schemas" diff --git a/community/gnash/gnash-0.8.10-boost-1.50.patch b/community/gnash/gnash-0.8.10-boost-1.50.patch deleted file mode 100644 index a422ce932..000000000 --- a/community/gnash/gnash-0.8.10-boost-1.50.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r gnash-0.8.10/macros/boost.m4 gnash-0.8.10-boost1.50/macros/boost.m4 ---- gnash-0.8.10/macros/boost.m4 2012-01-19 20:17:49.000000000 +0100 -+++ gnash-0.8.10-boost-1.50/macros/boost.m4 2012-07-11 10:56:11.089137186 +0200 -@@ -37,7 +37,7 @@ - boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp" - dnl this is a list of *required* libraries. If any of these are missing, this - dnl test will return a failure, and Gnash won't build. -- boost_libs="thread program_options iostreams" -+ boost_libs="thread program_options iostreams system" - - dnl this is a list of *recommended* libraries. If any of these are missing, this - dnl test will return a warning, and Gnash will build, but testing won't work. diff --git a/community/gnash/gnucash-0.8.10-giflib-5.0.patch b/community/gnash/gnucash-0.8.10-giflib-5.0.patch deleted file mode 100644 index 2ca7032bb..000000000 --- a/community/gnash/gnucash-0.8.10-giflib-5.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp ---- a/libbase/GnashImageGif.cpp 2012-01-19 19:17:48.000000000 +0000 -+++ b/libbase/GnashImageGif.cpp 2013-07-30 09:08:37.707930583 +0000 -@@ -269,7 +269,7 @@ GifInput::processRecord(GifRecordType re - void - GifInput::read() - { -- _gif = DGifOpen(_inStream.get(), &readData); -+ _gif = DGifOpen(_inStream.get(), &readData, NULL); - - GifRecordType record; - diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index a50c7166f..d8df2e88f 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105938 2014-02-19 16:00:07Z alucryd $ +# $Id: PKGBUILD 107208 2014-03-14 15:04:38Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.8.7 +pkgver=1.8.8 pkgrel=1 epoch=1 pkgdesc='A lightweight display manager' @@ -20,7 +20,7 @@ source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbas 'lightdm.rules' 'lightdm-default-config.patch' 'Xsession') -sha256sums=('6a56b98224f147e27e0c26ce586ae9b7380dd23291b38a625fcc79a50cc63e39' +sha256sums=('b366c7580574766f40d5b24dbaaecdc5e332be6df44bd4b3df0c04a729b493ba' '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' diff --git a/community/mx/PKGBUILD b/community/mx/PKGBUILD new file mode 100644 index 000000000..66b99a6bb --- /dev/null +++ b/community/mx/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 107203 2014-03-14 13:54:54Z flexiondotorg $ +#Maintainer : Martin Wimpress <code@flexion.org> +#Contributor: GGR <gaby.greboval at yahoo dot com> + +pkgname=mx +pkgver=1.4.7 +pkgrel=2 +pkgdesc="A widget toolkit using Clutter" +arch=('i686' 'x86_64') +url="http://www.clutter-project.org" +license=('LGPL') +depends=('clutter' 'dbus-glib' 'gtk2' 'startup-notification') +makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'libtool' 'vala') +source=("https://github.com/clutter-project/${pkgname}/archive/${pkgver}.tar.gz") +sha256sums=('8a7514ea33c1dec7251d0141e24a702e7701dc9f00348cbcf1816925b7f74dbc') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + NOCONFIGURE=1 ./autogen.sh + # patch to resolv GL errors + # source : https://github.com/clutter-project/mx/pull/62 + sed -i 's/GLushort/gushort/g' mx/mx-deform-texture.c + sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD index 5fc5bb0cc..928386603 100644 --- a/community/nautilus-actions/PKGBUILD +++ b/community/nautilus-actions/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99919 2013-10-31 02:28:23Z allan $ +# $Id: PKGBUILD 107222 2014-03-14 16:43:44Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,12 +6,12 @@ pkgname=nautilus-actions pkgver=3.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Configures programs to be launched when files are selected in Nautilus" arch=('i686' 'x86_64') url="http://www.nautilus-actions.org/" license=('GPL') -depends=('nautilus' 'libunique3' 'libgtop' 'gconf') +depends=('nautilus' 'libunique3' 'libgtop' 'libsm' 'gconf') makedepends=('intltool' 'gnome-doc-utils') install=nautilus-actions.install source=(http://www.nautilus-actions.org/downloads/$pkgname-$pkgver.tar.gz) diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index 3a5568b86..94ee496ce 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 107130 2014-03-13 00:08:38Z bisson $ +# $Id: PKGBUILD 107220 2014-03-14 16:30:47Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd -pkgver=4.0.2 +pkgver=4.0.3 pkgrel=1 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' @@ -15,7 +15,7 @@ makedepends=('flex') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'tmpfiles.d' 'service') -sha1sums=('0855a3a9613e36381cbc36bfc451fb5c92189acc' +sha1sums=('8e5d53fd59c102854470b9b17f54cc1e7dc854b6' '7ad2b8da961a893095eede8963cf8026b13186a1' '3dbe300d834a32c9a339a6c76c58f5c240239e9b') diff --git a/community/pidgin-talkfilters/PKGBUILD b/community/pidgin-talkfilters/PKGBUILD index f094aa050..363bf9f7d 100644 --- a/community/pidgin-talkfilters/PKGBUILD +++ b/community/pidgin-talkfilters/PKGBUILD @@ -2,7 +2,7 @@ pkgname=pidgin-talkfilters pkgver=2.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="Implements GNU talkfilters in pidgin chats" arch=('i686' 'x86_64') url="https://bitbucket.org/rekkanoryo/purple-plugin-pack" @@ -15,13 +15,17 @@ sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') build() { cd "$srcdir"/purple-plugin-pack-$pkgver + sed -i -e 's|GETTEXT_PACKAGE=plugin_pack|GETTEXT_PACKAGE=pidgin_talkfilters|'\ + configure.ac + autoreconf -vfi PYTHON=/usr/bin/python2 \ ./configure --prefix=/usr --with-plugins=talkfilters + + make } package() { cd "$srcdir"/purple-plugin-pack-$pkgver - make make DESTDIR="$pkgdir" install } diff --git a/community/python-qrencode/PKGBUILD b/community/python-qrencode/PKGBUILD new file mode 100644 index 000000000..fea97d190 --- /dev/null +++ b/community/python-qrencode/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 107213 2014-03-14 15:30:46Z flexiondotorg $ +# Maintainer: Martin Wimpress <code@flexion.org> + +pkgname=python-qrencode +pkgver=1.01 +pkgrel=5 +pkgdesc="A simple wrapper for the C qrencode library" +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/qrencode" +license=('Apache') +depends=('python-pillow' 'qrencode') +makedepends=('gcc') +source=("http://pypi.python.org/packages/source/q/qrencode/qrencode-${pkgver}.tar.gz") +sha256sums=('fd8cdabd743e2db7a1ad332d4f0fe037e5a7807cb2f1d32da3e39439088bb610') + +prepare() { + cd "${srcdir}/qrencode-${pkgver}" + sed -i 's/import Image/from PIL import Image/' qrencode/__init__.py +} + +package() { + cd "${srcdir}/qrencode-${pkgver}" + python setup.py install --prefix=/usr --root="${pkgdir}" +} + + diff --git a/community/python2-qrencode/PKGBUILD b/community/python2-qrencode/PKGBUILD new file mode 100644 index 000000000..1fb6370a6 --- /dev/null +++ b/community/python2-qrencode/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 107215 2014-03-14 15:31:57Z flexiondotorg $ +# Maintainer: Martin Wimpress <code@flexion.org> + +pkgname=python2-qrencode +pkgver=1.01 +pkgrel=5 +pkgdesc="A simple wrapper for the C qrencode library" +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/qrencode" +license=('Apache') +depends=('python2-pillow' 'qrencode') +makedepends=('gcc') +source=("http://pypi.python.org/packages/source/q/qrencode/qrencode-${pkgver}.tar.gz") +sha256sums=('fd8cdabd743e2db7a1ad332d4f0fe037e5a7807cb2f1d32da3e39439088bb610') + +prepare() { + cd "${srcdir}/qrencode-${pkgver}" + sed -i 's/import Image/from PIL import Image/' qrencode/__init__.py +} + +package() { + cd "${srcdir}/qrencode-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" +} diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 9e0fe100c..0b2ce436f 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 105661 2014-02-13 09:27:04Z spupykin $ +# $Id: PKGBUILD 107187 2014-03-14 08:52:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=7.6.0 +pkgver=7.6.1 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" @@ -21,7 +21,7 @@ options=('strip' 'zipman') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('26a12cb6d6693839aea07d29f8654bc9' +md5sums=('093c462a5245012bd9e7b82dd8aedffb' '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index e1bf8e9eb..79701902b 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102276 2013-12-07 10:37:05Z bpiotrowski $ +# $Id: PKGBUILD 107189 2014-03-14 08:53:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot -pkgver=1.6.5 -pkgrel=5 +pkgver=1.6.8 +pkgrel=1 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') @@ -28,7 +28,7 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'pam.d.schroot.patch' 'colon-completion.patch' 'fix-bash-completion.patch') -md5sums=('99f679d68f180a56289b3ec40d214ae4' +md5sums=('ab584352cb73c8e137d47ef8d160a275' '54239847f89b9a4772910415bde6276a' '5a3f7b839c7e0b8933748da7c5b6385b' 'ddb2f09c02b24dab777110f9808472e1' diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD index 7aa15c063..714f6127d 100644 --- a/community/xdebug/PKGBUILD +++ b/community/xdebug/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 95812 2013-08-17 08:23:12Z pierre $ +# $Id: PKGBUILD 107191 2014-03-14 08:53:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: sracker <smb.sac@gmail.com> pkgname=xdebug -pkgver=2.2.3 -pkgrel=3 +pkgver=2.2.4 +pkgrel=1 pkgdesc="PHP debugging extension" arch=('i686' 'x86_64') url="http://www.xdebug.org" @@ -15,7 +15,7 @@ depends=('php') backup=('etc/php/conf.d/xdebug.ini') source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz xdebug.ini) -md5sums=('e49cec9861b45dc0b36eae33bf8a14fa' +md5sums=('a2edd77f112ab47286c280df041c396a' '6a1f2ef91c632d4c9b7b218cd2e278ef') build() { diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 4e0a01d44..61cef82f1 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106937 2014-03-10 18:31:13Z jelle $ +# $Id: PKGBUILD 107201 2014-03-14 13:17:51Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=xmobar -pkgver=0.20 +pkgver=0.20.1 pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" @@ -14,7 +14,7 @@ makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'ha 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-base' 'haskell-regex-compat haskell-http') options=('strip') source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) -md5sums=('09483ed2ff57b81d46aa3eb1ac6d89e4') +md5sums=('cee66bfa9aa36d25329ffd5ac044aeaf') build() { cd ${srcdir}/xmobar-$pkgver diff --git a/community/xtrabackup/PKGBUILD b/community/xtrabackup/PKGBUILD index d90eeb4a8..8c1eba308 100644 --- a/community/xtrabackup/PKGBUILD +++ b/community/xtrabackup/PKGBUILD @@ -1,10 +1,11 @@ # $Id$ -# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> + pkgname=xtrabackup -pkgver=2.1.7 -pkgrel=3 +pkgver=2.1.8 +pkgrel=1 pkgdesc='Non-blocking backup tool for MySQL' arch=('i686' 'x86_64') url='http://www.percona.com/software/percona-xtrabackup/' @@ -39,5 +40,5 @@ package() { done } -sha256sums=('b0a89dd805fe25d1fd00c3f84b43d59e88173a19e2075d444a116118e2623587' +sha256sums=('2a397372aaa42228b48e74b89c41265d0b0c4be815069a86feb855bc8fbf2ffa' 'e6f329c061c921be6e44e16fd64d79bcca8c61ea1ce4a1d2f923408d30318b25') diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD index 8fe4e064a..baf1a4fe0 100644 --- a/community/xulrunner/PKGBUILD +++ b/community/xulrunner/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 105483 2014-02-09 04:20:46Z cbehan $ +# $Id: PKGBUILD 107175 2014-03-14 04:14:05Z cbehan $ # Maintainer: Connor Behan <connor.behan@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=27.0 +pkgver=28.0 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'libvpx' 'python2') +depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libpulse' 'libevent' 'libvpx' 'python2') makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gstreamer0.10-base') url="http://wiki.mozilla.org/XUL:Xul_Runner" source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 @@ -18,10 +18,10 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/ shared-libs.patch) options=('!emptydirs' '!makeflags' 'staticlibs') replaces=('xulrunner-oss') -sha256sums=('4f6125c053e12c4ac3317b075e289b10ce470dd90ed6fc43c4572bf1acc64981' - '8455f7bc00e8ad6e69bba43171083c778420a8b1c566347ed5381ae9cf98191a' +sha256sums=('6eacdc549c252da57d1f51a363ad8c7e62f09ec8c796e8eb69ddb3e1008df7af' + '38f1f7a49a03b67a6b96bb696640a28fd20b42f6e45a27a81d25d66fd0148e4e' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' - 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') + 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') prepare() { cd "$srcdir/mozilla-release" @@ -30,6 +30,7 @@ prepare() { #fix libdir/sdkdir - fedora patch -Np1 -i ../mozilla-pkgconfig.patch patch -Np1 -i ../shared-libs.patch + #patch -Np1 -i ../unbreak-plugin-build.patch # WebRTC build tries to execute "python" and expects Python 2 # Workaround taken from chromium PKGBUILD diff --git a/community/xulrunner/mozconfig b/community/xulrunner/mozconfig index d2078e936..ce95b12e8 100644 --- a/community/xulrunner/mozconfig +++ b/community/xulrunner/mozconfig @@ -28,4 +28,4 @@ ac_add_options --disable-tests ac_add_options --disable-installer # https://bugzilla.mozilla.org/show_bug.cgi?id=955876 -ac_add_options --enable-release +#ac_add_options --enable-release diff --git a/community/xulrunner/unbreak-plugin-build.patch b/community/xulrunner/unbreak-plugin-build.patch new file mode 100644 index 000000000..63e624ef3 --- /dev/null +++ b/community/xulrunner/unbreak-plugin-build.patch @@ -0,0 +1,76 @@ + +# HG changeset patch +# User Ehsan Akhgari <ehsan@mozilla.com> +# Date 1392421799 18000 +# Node ID 0691948a0abedc7db35c4cb67ec11ad06f782ab0 +# Parent 6f78482c5792b03adca38c924cc4a41f6e16b8ff +Bug 784739 follow-up: Use NULL in npruntime.h + +diff --git a/dom/plugins/base/npruntime.h b/dom/plugins/base/npruntime.h +--- a/dom/plugins/base/npruntime.h ++++ b/dom/plugins/base/npruntime.h +@@ -132,23 +132,23 @@ void NPN_ReleaseVariantValue(NPVariant * + #define NPVARIANT_TO_INT32(_v) ((_v).value.intValue) + #define NPVARIANT_TO_DOUBLE(_v) ((_v).value.doubleValue) + #define NPVARIANT_TO_STRING(_v) ((_v).value.stringValue) + #define NPVARIANT_TO_OBJECT(_v) ((_v).value.objectValue) + + #define VOID_TO_NPVARIANT(_v) \ + NP_BEGIN_MACRO \ + (_v).type = NPVariantType_Void; \ +- (_v).value.objectValue = nullptr; \ ++ (_v).value.objectValue = NULL; \ + NP_END_MACRO + + #define NULL_TO_NPVARIANT(_v) \ + NP_BEGIN_MACRO \ + (_v).type = NPVariantType_Null; \ +- (_v).value.objectValue = nullptr; \ ++ (_v).value.objectValue = NULL; \ + NP_END_MACRO + + #define BOOLEAN_TO_NPVARIANT(_val, _v) \ + NP_BEGIN_MACRO \ + (_v).type = NPVariantType_Bool; \ + (_v).value.boolValue = !!(_val); \ + NP_END_MACRO + +@@ -211,17 +211,17 @@ typedef void *NPIdentifier; + + /* + NPObjects have methods and properties. Methods and properties are + identified with NPIdentifiers. These identifiers may be reflected + in script. NPIdentifiers can be either strings or integers, IOW, + methods and properties can be identified by either strings or + integers (i.e. foo["bar"] vs foo[1]). NPIdentifiers can be + compared using ==. In case of any errors, the requested +- NPIdentifier(s) will be nullptr. NPIdentifier lifetime is controlled ++ NPIdentifier(s) will be NULL. NPIdentifier lifetime is controlled + by the browser. Plugins do not need to worry about memory management + with regards to NPIdentifiers. + */ + NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name); + void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount, + NPIdentifier *identifiers); + NPIdentifier NPN_GetIntIdentifier(int32_t intid); + bool NPN_IdentifierIsString(NPIdentifier identifier); +@@ -278,17 +278,17 @@ typedef bool (*NPConstructFunctionPtr)(N + NPInvokeFunctionPtr function may return 0 to indicate a void + result. + + NPInvalidateFunctionPtr is called by the scripting environment + when the native code is shutdown. Any attempt to message a + NPObject instance after the invalidate callback has been + called will result in undefined behavior, even if the native code + is still retaining those NPObject instances. (The runtime +- will typically return immediately, with 0 or nullptr, from an ++ will typically return immediately, with 0 or NULL, from an + attempt to dispatch to a NPObject, but this behavior should not + be depended upon.) + + The NPEnumerationFunctionPtr function may pass an array of + NPIdentifiers back to the caller. The callee allocs the memory of + the array using NPN_MemAlloc(), and it's the caller's responsibility + to release it using NPN_MemFree(). + */ + diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index d74ed6dfd..62506015b 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 207473 2014-03-10 16:01:03Z anatolik $ +# $Id: PKGBUILD 207747 2014-03-14 14:31:40Z anatolik $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd pkgver=6.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64') @@ -17,10 +17,21 @@ backup=('etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" 'dhcpcd_.service' - 'dhcpcd.service') + 'dhcpcd.service' + 'commit_9eaeccdf1d.diff' + 'commit_e348e99776.diff') sha1sums=('4db014c7eeca57fea7f954640e68feaa1d249c79' '6f1633edde14d29b5cdc09c4f029a450ef2ebc96' - '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9') + '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9' + '6a381ec2638eba6812a76b0f362e59f283c30168' + 'c81283b4918370992f2f717a3139a23748c6a46d') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p0 -i "${srcdir}/commit_9eaeccdf1d.diff" + patch -p0 -i "${srcdir}/commit_e348e99776.diff" +} build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -36,6 +47,12 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make test +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/dhcpcd/commit_9eaeccdf1d.diff b/core/dhcpcd/commit_9eaeccdf1d.diff new file mode 100644 index 000000000..5653dce60 --- /dev/null +++ b/core/dhcpcd/commit_9eaeccdf1d.diff @@ -0,0 +1,191 @@ +Index: auth.c +================================================================== +--- auth.c ++++ auth.c +@@ -229,10 +229,15 @@ + errno = EINVAL; + return NULL; + } + if (state->reconf == NULL) + errno = ENOENT; ++ /* Free the old token so we log acceptance */ ++ if (state->token) { ++ free(state->token); ++ state->token = NULL; ++ } + /* Nothing to validate, just accepting the key */ + return state->reconf; + case 2: + if (!((mp == 4 && mt == DHCP_FORCERENEW) || + (mp == 6 && mt == DHCP6_RECONFIGURE))) + +Index: dhcp.c +================================================================== +--- dhcp.c ++++ dhcp.c +@@ -1059,12 +1059,16 @@ + syslog(LOG_DEBUG, "%s: dhcp_auth_validate: %m", + ifp->name); + free(dhcp); + return NULL; + } +- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, +- ifp->name, state->auth.token->secretid); ++ if (state->auth.token) ++ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, ++ ifp->name, state->auth.token->secretid); ++ else ++ syslog(LOG_DEBUG, "%s: accepted reconfigure key", ++ ifp->name); + } + + return dhcp; + } + +@@ -2195,12 +2199,16 @@ + iface->name); + log_dhcp1(LOG_ERR, "authentication failed", + iface, dhcp, from, 0); + return; + } +- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, +- iface->name, state->auth.token->secretid); ++ if (state->auth.token) ++ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, ++ iface->name, state->auth.token->secretid); ++ else ++ syslog(LOG_DEBUG, "%s: accepted reconfigure key", ++ iface->name); + } else if (ifo->auth.options & DHCPCD_AUTH_REQUIRE) { + log_dhcp1(LOG_ERR, "no authentication", iface, dhcp, from, 0); + return; + } else if (ifo->auth.options & DHCPCD_AUTH_SEND) + log_dhcp1(LOG_WARNING, "no authentication", + +Index: dhcp6.c +================================================================== +--- dhcp6.c ++++ dhcp6.c +@@ -1458,18 +1458,18 @@ + { + struct dhcp6_state *state; + const struct if_options *ifo; + const struct dhcp6_option *o; + const uint8_t *p; +- int i; ++ int i, e; + uint32_t u32, renew, rebind; + uint8_t iaid[4]; + size_t ol; + struct ipv6_addr *ap, *nap; + + ifo = ifp->options; +- i = 0; ++ i = e = 0; + state = D6_STATE(ifp); + TAILQ_FOREACH(ap, &state->addrs, next) { + ap->flags |= IPV6_AF_STALE; + } + while ((o = dhcp6_findoption(ifo->ia_type, d, l))) { +@@ -1498,12 +1498,14 @@ + rebind = ntohl(u32); + p += sizeof(u32); + ol -= sizeof(u32); + } else + renew = rebind = 0; /* appease gcc */ +- if (dhcp6_checkstatusok(ifp, NULL, p, ol) == -1) ++ if (dhcp6_checkstatusok(ifp, NULL, p, ol) == -1) { ++ e = 1; + continue; ++ } + if (ifo->ia_type == D6_OPTION_IA_PD) { + if (dhcp6_findpd(ifp, iaid, p, ol) == 0) { + syslog(LOG_WARNING, + "%s: %s: DHCPv6 REPLY missing Prefix", + ifp->name, sfrom); +@@ -1542,10 +1544,12 @@ + eloop_q_timeout_delete(ap->iface->ctx->eloop, + 0, NULL, ap); + free(ap); + } + } ++ if (i == 0 && e) ++ return -1; + return i; + } + + static int + dhcp6_validatelease(struct interface *ifp, +@@ -1657,12 +1661,16 @@ + ifp->name); + syslog(LOG_ERR, "%s: authentication failed", + ifp->name); + goto ex; + } +- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, +- ifp->name, state->auth.token->secretid); ++ if (state->auth.token) ++ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, ++ ifp->name, state->auth.token->secretid); ++ else ++ syslog(LOG_DEBUG, "%s: accepted reconfigure key", ++ ifp->name); + } else if (ifp->options->auth.options & DHCPCD_AUTH_REQUIRE) { + syslog(LOG_ERR, "%s: authentication now required", ifp->name); + goto ex; + } + +@@ -2053,14 +2061,17 @@ + if (state == NULL || state->send == NULL) { + syslog(LOG_DEBUG, "%s: DHCPv6 reply received but not running", + ifp->name); + return; + } ++ ++ r = (struct dhcp6_message *)ctx->rcvhdr.msg_iov[0].iov_base; ++ + /* We're already bound and this message is for another machine */ + /* XXX DELEGATED? */ +- if (state->state == DH6S_BOUND || +- state->state == DH6S_INFORMED) ++ if (r->type != DHCP6_RECONFIGURE && ++ (state->state == DH6S_BOUND || state->state == DH6S_INFORMED)) + return; + + r = (struct dhcp6_message *)ctx->rcvhdr.msg_iov[0].iov_base; + if (r->type != DHCP6_RECONFIGURE && + (r->xid[0] != state->send->xid[0] || +@@ -2119,12 +2130,16 @@ + syslog(LOG_DEBUG, "dhcp_auth_validate: %m"); + syslog(LOG_ERR, "%s: authentication failed from %s", + ifp->name, ctx->sfrom); + return; + } +- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, +- ifp->name, state->auth.token->secretid); ++ if (state->auth.token) ++ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32, ++ ifp->name, state->auth.token->secretid); ++ else ++ syslog(LOG_DEBUG, "%s: accepted reconfigure key", ++ ifp->name); + } else if (ifo->auth.options & DHCPCD_AUTH_REQUIRE) { + syslog(LOG_ERR, "%s: no authentication from %s", + ifp->name, ctx->sfrom); + return; + } else if (ifo->auth.options & DHCPCD_AUTH_SEND) +@@ -2155,11 +2170,12 @@ + * didn't get the IA's returned, so preserve them + * from our saved response */ + if (error == 1) + goto recv; + if (error == -1 || +- dhcp6_validatelease(ifp, r, len, ctx->sfrom) == -1){ ++ dhcp6_validatelease(ifp, r, len, ctx->sfrom) == -1) ++ { + dhcp6_startdiscover(ifp); + return; + } + break; + case DH6S_DISCOVER: + diff --git a/core/dhcpcd/commit_e348e99776.diff b/core/dhcpcd/commit_e348e99776.diff new file mode 100644 index 000000000..3f64f3a55 --- /dev/null +++ b/core/dhcpcd/commit_e348e99776.diff @@ -0,0 +1,17 @@ +Index: dhcp.c +================================================================== +--- dhcp.c ++++ dhcp.c +@@ -2701,11 +2701,10 @@ + if (state == NULL) + goto eexit; + ifp->options = calloc(1, sizeof(*ifp->options)); + if (ifp->options == NULL) + goto eexit; +- strlcpy(ifp->name, ifname, sizeof(ifp->name)); + snprintf(state->leasefile, sizeof(state->leasefile), + LEASEFILE, ifp->name); + strlcpy(ifp->options->script, SCRIPT, sizeof(ifp->options->script)); + state->new = read_lease(ifp); + if (state->new == NULL && errno == ENOENT) { + diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index 12605276b..653d1b433 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 206991 2014-03-06 12:06:41Z andrea $ +# $Id: PKGBUILD 207746 2014-03-14 08:20:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch pkgver=4.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" arch=('i686' 'x86_64') @@ -12,12 +12,19 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('1fa7b166fe47d9895758417e717859625a043f0f') +source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz" + 'slovenian.patch') +sha1sums=('1fa7b166fe47d9895758417e717859625a043f0f' + '8bc82fae5ae871253bc11c4778884966d6d4b58a') -build() { - cd "${srcdir}" +prepare() { mkdir build + + cd ktouch-${pkgver} + patch -p1 -i "${srcdir}"/slovenian.patch +} + +build() { cd build cmake ../ktouch-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ @@ -27,6 +34,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdeedu-ktouch/slovenian.patch b/extra/kdeedu-ktouch/slovenian.patch new file mode 100644 index 000000000..b64f640c6 --- /dev/null +++ b/extra/kdeedu-ktouch/slovenian.patch @@ -0,0 +1,22 @@ +commit e787d72ada78a1dac1654c4d3d530f50334e7846 +Author: Sebastian Gottfried <sebastiangottfried@web.de> +Date: Mon Mar 10 11:51:31 2014 +0100 + + data: remove an untypable charaber from the Slovanian course + + BUG: 331945 + FIXED-IN: 4.12.4 + +diff --git a/data/courses/si.xml b/data/courses/si.xml +index fc5f3c2..07feeb1 100644 +--- a/data/courses/si.xml ++++ b/data/courses/si.xml +@@ -201,7 +201,7 @@ odejo nečkinjin naččajo oljili oskalek + naslednika načnjajoč noska osonča neodločične + nalijejo neolikank nanos oslinjeni ničli + ojekleni nenadni ondi nadela neonkine okajen +-niča nasekala naslada onečdena neonka neidili�n ++niča nasekala naslada onečdena neonka neidilin + nasičnje načne odskočle načkana osedlalo + naslonijo okenča naslonilo okisalo odnosni + naseljenkina odločla nasilnik nedojena nenaklonjeni diff --git a/extra/libcryptui/PKGBUILD b/extra/libcryptui/PKGBUILD index e070560c4..38b6ca79f 100644 --- a/extra/libcryptui/PKGBUILD +++ b/extra/libcryptui/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 198141 2013-10-30 13:02:16Z allan $ +# $Id: PKGBUILD 207740 2014-03-14 04:21:04Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=libcryptui pkgver=3.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library for OpenPGP prompts" arch=('i686' 'x86_64') url="http://git.gnome.org/browse/libcryptui/" license=('GPL') -depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf') +depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf' 'libsm') makedepends=('intltool' 'gobject-introspection') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD index 2d5c238e7..eb7b239f0 100644 --- a/extra/pyopenssl/PKGBUILD +++ b/extra/pyopenssl/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 207706 2014-03-13 16:20:18Z fyan $ +# $Id: PKGBUILD 207738 2014-03-14 03:59:15Z fyan $ # Maintainer : Ionut Biru<ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgbase=pyopenssl pkgname=('python-pyopenssl' 'python2-pyopenssl') pkgver=0.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://pypi.python.org/pypi/pyOpenSSL" license=('LGPL2.1') -makedepends=('python-setuptools' 'python2-setuptools' 'openssl') +makedepends=('python-setuptools' 'python2-setuptools' 'openssl' 'python-six' 'python2-six' 'python-cryptography' 'python2-cryptography') source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz) md5sums=('8579ff3a1d858858acfba5f046a4ddf7') @@ -28,7 +28,7 @@ build() { package_python-pyopenssl(){ pkgdesc="Python3 wrapper module around the OpenSSL library" - depends=('python>=3.3' 'openssl') + depends=('python>=3.3' 'openssl' 'python-six' 'python-cryptography') replaces=('pyopenssl') provides=('pyopenssl') conflicts=('pyopenssl') @@ -39,7 +39,7 @@ package_python-pyopenssl(){ package_python2-pyopenssl(){ pkgdesc="Python2 wrapper module around the OpenSSL library" - depends=('python2>=2.7' 'openssl') + depends=('python2>=2.7' 'openssl' 'python2-six' 'python2-cryptography') cd "${srcdir}/pyOpenSSL-${pkgver}-python2" python2 setup.py install --root "${pkgdir}" --optimize=1 diff --git a/extra/python-cffi/PKGBUILD b/extra/python-cffi/PKGBUILD new file mode 100644 index 000000000..46bf6a56e --- /dev/null +++ b/extra/python-cffi/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 207734 2014-03-14 03:35:05Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: lilydjwg <lilydjwg@gmail.com> + +_name=cffi +pkgbase=python-$_name +pkgname=(python-$_name python2-$_name) +pkgver=0.8.2 +pkgrel=3 +pkgdesc="Foreign Function Interface for Python calling C code" +arch=('i686' 'x86_64') +url="http://cffi.readthedocs.org/" +license=('MIT') +makedepends=('python-setuptools' 'python2-setuptools' 'python-pycparser' 'python2-pycparser') +md5sums=('37fc88c62f40d04e8a18192433f951ec') +source=("http://pypi.python.org/packages/source/c/${_name}/${_name}-${pkgver}.tar.gz") + +prepare() { + cp -r $_name-$pkgver{,-py2} +} + +build() { + cd "$srcdir/$_name-$pkgver" + python3 setup.py build + + cd "$srcdir/$_name-$pkgver-py2" + python2 setup.py build +} + +package_python-cffi() { + depends=('python' 'python-pycparser') + + cd "$srcdir/$_name-$pkgver" + python3 setup.py install --root="$pkgdir/" --optimize=1 + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-cffi() { + depends=('python2' 'python2-pycparser') + + cd "$srcdir/$_name-$pkgver-py2" + python2 setup.py install --root="$pkgdir/" --optimize=1 + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/python-cryptography/PKGBUILD b/extra/python-cryptography/PKGBUILD new file mode 100644 index 000000000..4f111327e --- /dev/null +++ b/extra/python-cryptography/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 207736 2014-03-14 03:47:23Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgbase=python-cryptography +pkgname=('python-cryptography' 'python2-cryptography') +pkgver=0.2.2 +pkgrel=1 +pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers" +arch=('i686' 'x86_64') +license=('Apache') +url="http://pypi.python.org/pypi/cryptography" +makedepends=('python-setuptools' 'python2-setuptools' 'python-six' 'python2-six' 'python-cffi' 'python2-cffi') +checkdepends=('python-pytest' 'python2-pytest') +source=("http://pypi.python.org/packages/source/c/cryptography/cryptography-${pkgver}.tar.gz") +md5sums=('f002a442c8c5c7463bf8d2f11f6c3128') + +check() { + # Check python3 module + cd "${srcdir}"/cryptography-${pkgver} + python3 setup.py test + + # Check python2 module + cd "${srcdir}"/cryptography-${pkgver}-python2 + python2 setup.py test +} + +prepare() { + cp -a cryptography-${pkgver}{,-python2} +} + +build() { + # Build python 3 module + cd cryptography-${pkgver} + python3 setup.py build + + # Build python 2 module + cd ../cryptography-${pkgver}-python2 + python2 setup.py build +} + +package_python-cryptography() { + depends=('python' 'python-six' 'python-cffi') + + cd cryptography-${pkgver} + python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build +} + +package_python2-cryptography() { + depends=('python2' 'python2-six' 'python2-cffi') + + cd "${srcdir}/cryptography-${pkgver}-python2" + python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build +} diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index c06c8af0b..fd3f3b5ea 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106748 2014-03-07 08:31:10Z jelle $ +# $Id: PKGBUILD 107204 2014-03-14 14:47:48Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.27.0 +pkgver=1.28.0 pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('d30d39d8a63cb77c8fe04b99ef092dd9' +md5sums=('7f435bb4b4613c9a1642ce3a8414392d' 'ece36dfd737fa4a346f0a0e59395e949' '675cd87d41342119827ef706055491e7') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 77d324667..b39575e9c 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -7,8 +7,8 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.14.1 -pkgrel=2 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation (Parabola rebranded)" +pkgrel=2.1 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') @@ -37,6 +37,28 @@ md5sums=('11eb45f3d3edf1f03887fd13afc61b51' prepare() { cd $_pkgname-$pkgver + + echo "Removing printers not supported with free drivers from the database" + + # based on http://devel.trisquel.info/gitweb/?p=package-helpers.git;a=blob_plain;f=helpers/make-hplip;hb=refs/heads/toutatis revision 4 + # keep header license + sed '/\[/,99999d' data/models/models.dat > mktemp + + for model in $(grep '\[' data/models/models.dat | /bin/sed 's/\[//; s/\]//'); do + sed -n "/\[$model\]/,/^$/p;" data/models/models.dat > mktemp1 + grep '^download=True' -q mktemp1 && continue + grep '^plugin=1' -q mktemp1 && continue + grep '^support-type=0' -q mktemp1 && continue + cat mktemp1 >> mktemp + done + + sed -i 's/plugin=2/plugin=0/g' mktemp + + cp mktemp data/models/models.dat + + rm -v mktemp{,1} + + echo "Preparing source" export PYTHON=python2 diff --git a/libre/python2-ply/PKGBUILD b/libre/python2-ply/PKGBUILD deleted file mode 100644 index fec80926a..000000000 --- a/libre/python2-ply/PKGBUILD +++ /dev/null @@ -1,16 +0,0 @@ -# Contributor: Marcin "avalan" Falkiewicz <avalatron@gmail.com> -# Maintainer: C Anthony Risinger <anthony@xtfx.me> - -pkgname='python2-ply' -pkgver=3.4 -pkgrel=1 -pkgdesc='Implementation of lex and yacc parsing tools for Python.' -arch=('any') -url='http://www.dabeaz.com/ply/' -license=('BSD') -depends=('python2') -makedepends=('python2-distribute') -source=("${url}ply-${pkgver}.tar.gz") -md5sums=('ffdc95858819347bf92d7c2acc074894') - -build() { cd "ply-${pkgver}"; python2 setup.py install --root="${pkgdir}"; } diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index 0aec4683d..e56677d76 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -47,7 +47,7 @@ backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/xdvi/XDvi) mkmd5sums=('7e11e1bf401d0a152ac50ef48d676bb3') -md5sums=('ce7c019db21ce546d6d7f1df4bc247fe' +md5sums=('7f276d14c0d715704b1acbc195e72fe6' '8b998b0944a766abeb1ff8ca53029084' 'd5a3f442ec3b7aa1518170f64f9d006b' '16ad4dc53deb00029baef1b01ba1d984' diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index fb8697bc6..40ef79a37 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -23,8 +23,8 @@ options=('!emptydirs') options=(!strip) install=texlive.install mkmd5sums=('4953978642ddcfc90854230b57145b5b') -md5sums=('e6b12e482913169f44c54172316416bc' - 'f489cc5f762dcdbe6acb11624de7e138') +md5sums=('0e0d06caf88304ed7988f23962f44b2d' + '2ee682ecd2a7defb5f089be09be2ffed') mksource() { mkdir $_pkgname-$pkgver diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index 12b8355a3..48756201a 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -32,7 +32,7 @@ options=('!emptydirs') options=(!strip) install=texlive.install mkmd5sums=('ef7a22d455bcf59aee21fc65274df5b8') -md5sums=('7e6ff7b61faf268fe2b814c4949ab364' +md5sums=('f555e017e8157716ead75f3bdc025d58' '9e4825f47dac663dd62c4bfa67899e84') mksource() { diff --git a/pcr/tryton/PKGBUILD b/pcr/tryton/PKGBUILD new file mode 100644 index 000000000..bca68fbf0 --- /dev/null +++ b/pcr/tryton/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +# Contributor: Florian Walch <florian.walch@gmx.at> +pkgname=tryton +pkgver=3.0.1 +_pkgdir=3.0 +pkgrel=2 +pkgdesc="A three-tiers high-level general purpose application platform (client application)" +arch=('any') +url="http://www.tryton.org/" +license=('GPL3') +depends=('python2>=2.4' 'gtk2' 'pygtk>=2.0' 'librsvg' 'python2-dateutil') +optdepends=('python2-pytz: timezone support') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz" + 'tryton.desktop') +md5sums=('96f1c2619e011f8660b177fb8651f064' + '7ca15ad6c790c78817fe1a1b6a2c3fcf') + +build() { + cd $srcdir/$pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$pkgdir + install -D -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +} diff --git a/pcr/tryton/tryton.desktop b/pcr/tryton/tryton.desktop new file mode 100644 index 000000000..19ad39b4d --- /dev/null +++ b/pcr/tryton/tryton.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Tryton +GenericName=Client of the Tryton application platform +Icon=/usr/share/pixmaps/tryton/tryton-icon.png +Exec=/usr/bin/tryton +Type=Application +Categories=Office;Finance; + |