From 2d7e9da010b34660baba072183cce7664dc8956c Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 7 May 2014 04:04:41 +0000 Subject: Wed May 7 04:00:53 UTC 2014 --- community/converseen/PKGBUILD | 6 +- community/lcdproc/PKGBUILD | 10 +-- community/lwqq/PKGBUILD | 8 +-- community/lz4/PKGBUILD | 4 +- community/mate-desktop/PKGBUILD | 7 +-- community/mongodb/PKGBUILD | 10 +-- community/nodejs/PKGBUILD | 10 ++- community/pd/PKGBUILD | 6 +- community/php-mongo/PKGBUILD | 5 +- community/pidgin-lwqq/PKGBUILD | 8 +-- community/plan9port/PKGBUILD | 15 ++--- community/python-coverage/PKGBUILD | 52 ++++++++++++++++ community/python-tornado/PKGBUILD | 45 +++++++++----- community/shairplay/PKGBUILD | 51 +++++++++++++++ community/shairplay/shairplay.service | 13 ++++ community/vagrant/PKGBUILD | 6 +- community/wireshark/PKGBUILD | 8 +-- .../01-sec-correctly-handle-channel-names.patch | 72 ++++++++++++++++++++++ community/znc/PKGBUILD | 39 ------------ community/znc/znc.install | 29 --------- 20 files changed, 265 insertions(+), 139 deletions(-) create mode 100644 community/python-coverage/PKGBUILD create mode 100644 community/shairplay/PKGBUILD create mode 100644 community/shairplay/shairplay.service create mode 100644 community/znc/01-sec-correctly-handle-channel-names.patch delete mode 100644 community/znc/PKGBUILD delete mode 100644 community/znc/znc.install (limited to 'community') diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 79504f0ea..0932eb4d4 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106819 2014-03-08 17:14:28Z giovanni $ +# $Id: PKGBUILD 110762 2014-05-06 14:12:30Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: archtux pkgname=converseen -pkgver=0.6.8 +pkgver=0.7.0 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('35d9c5d2e3a4aacbf12d92fe552c9539') +md5sums=('20e30c334fa358d75df11b5737f59485') build() { cd "${srcdir}" diff --git a/community/lcdproc/PKGBUILD b/community/lcdproc/PKGBUILD index 0a07f615d..5b1672368 100644 --- a/community/lcdproc/PKGBUILD +++ b/community/lcdproc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106179 2014-02-24 19:17:26Z idevolder $ +# $Id: PKGBUILD 110778 2014-05-06 17:57:07Z idevolder $ # Maintainer: BlackEagle # Contributor: Bernhard Walle pkgname=lcdproc -pkgver=0.5.6 -pkgrel=5 +pkgver=0.5.7 +pkgrel=1 pkgdesc="Utility to drive one or more LCD (and LCD-like) devices" arch=('i686' 'x86_64') url="http://lcdproc.omnipotent.net/" @@ -25,8 +25,6 @@ source=( "http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'lcdd.service' ) -sha256sums=('bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a' - '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638') build() { cd "$pkgname-$pkgver" @@ -47,3 +45,5 @@ package() { sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" -i "$pkgdir/etc/LCDd.conf" install -Dm644 "$srcdir/lcdd.service" "$pkgdir/usr/lib/systemd/system/lcdd.service" } +sha256sums=('843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804' + '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638') diff --git a/community/lwqq/PKGBUILD b/community/lwqq/PKGBUILD index 6a36367ae..1d259f865 100644 --- a/community/lwqq/PKGBUILD +++ b/community/lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109651 2014-04-17 11:14:59Z fyan $ +# $Id: PKGBUILD 110768 2014-05-06 17:17:11Z fyan $ # Maintainer: Felix Yan pkgname=lwqq -pkgver=0.2.4.20140417 -#_gitver="tag=$pkgver" -_gitver='commit=afe08eef972aaabff5c043a72af0b63e2bb23f2d' +pkgver=0.3.0 +_gitver="tag=v$pkgver" +#_gitver='commit=afe08eef972aaabff5c043a72af0b63e2bb23f2d' pkgrel=1 pkgdesc="A library for webqq protocol" arch=('i686' 'x86_64') diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index 2ce437990..29d0f6da3 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 108214 2014-03-24 21:38:05Z seblu $ +# $Id: PKGBUILD 110732 2014-05-05 22:12:01Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=116 +pkgver=117 pkgrel=1 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') diff --git a/community/mate-desktop/PKGBUILD b/community/mate-desktop/PKGBUILD index 02fba2e49..88bf488ea 100644 --- a/community/mate-desktop/PKGBUILD +++ b/community/mate-desktop/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer : Martin Wimpress pkgname=mate-desktop -pkgver=1.8.0 -pkgrel=3 +pkgver=1.8.1 +pkgrel=1 pkgdesc="Library with common API for various MATE modules" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -14,10 +14,9 @@ optdepends=('lightdm-gtk2-greeter: A lightweight display manager' 'onboard: On-screen keyboard useful for mobility impaired users' 'orca: Screen reader for blind or visually impaired individuals' 'yelp: for reading MATE help documents') -options=('!emptydirs') groups=('mate') source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1e722d18a198751b209fcf255ad5d3653cb8f6e6') +sha1sums=('e3e92eec0cf0443d6a0ca18ad2f88b2ddd54f833') install=${pkgname}.install prepare() { diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 015f7fe9b..f4a8d5beb 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109312 2014-04-13 09:23:07Z fyan $ +# $Id: PKGBUILD 110766 2014-05-06 17:08:14Z fyan $ # Maintainer: Felix Yan # Contributor: Sven-Hendrik Haase # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,7 +6,7 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64') @@ -47,7 +47,7 @@ check() { cd mongodb-src-r${pkgver} - #scons smokeAll --smokedbprefix="$srcdir" + scons smokeAll --smokedbprefix="$srcdir" || : } package() { @@ -72,7 +72,7 @@ package() { install -dm755 "$pkgdir/var/log/mongodb" } -sha512sums=('60747ebd2fce9cffdb6b5ea3472a4efa46cd7e1ee38aee2a806a15667b5d86a61da89bf176876553ab348c0f3b3b925125921330b333a8349275e6ce79ccd337' +sha512sums=('a07168a8fa609d2a22b04db6b761e486e58fb63c66ea4974e5cc53a1255d514cd065a84b4dc62efbb27c39a6e3881d98a3f7025c2391a78d91d5cd515b8a2e56' '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c' '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9' - 'SKIP') + '868e5f93ba3c087f80982ffbe01411644d01329a51e4a1811cf8dd6de5e155f604a924be933623b70903fb4dabb27eed100a7eb6f6edcf4bb7a0fdfddd485270') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 9caf9e42e..63f566449 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110530 2014-05-02 15:49:31Z fyan $ +# $Id: PKGBUILD 110758 2014-05-06 12:26:13Z fyan $ # Maintainer: Felix Yan # Contributor Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -10,12 +10,13 @@ pkgname=nodejs pkgver=0.10.28 -pkgrel=1 +pkgrel=3 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' license=('MIT') depends=('openssl') +provides=('nodejs-node-gyp') makedepends=('python2') optdepends=('python2: for node-gyp') checkdepends=('curl') @@ -48,7 +49,7 @@ build() { check() { cd node-v$pkgver - make test || true + make test || : } package() { @@ -63,6 +64,9 @@ package() { install -D -m644 LICENSE \ "$pkgdir"/usr/share/licenses/nodejs/LICENSE + + # Why the hell wasn't this installed?! FS#40221 + ln -s /usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$pkgdir"/usr/bin/node-gyp } # vim:set ts=2 sw=2 et: diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD index 4ff3b7606..fdfc89752 100644 --- a/community/pd/PKGBUILD +++ b/community/pd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99115 2013-10-24 15:22:27Z speps $ +# $Id: PKGBUILD 110760 2014-05-06 13:16:48Z speps $ # Maintainer : speps # Contributor: TDY # Contributor: Shinlun Hsieh pkgname=pd -pkgver=0.45.3 +pkgver=0.45.5 _ver=${pkgver%.*}-${pkgver##*.} pkgrel=1 pkgdesc="The Pure Data real-time music and multimedia environment" @@ -15,7 +15,7 @@ depends=('jack' 'fftw' 'tk') provides=('puredata') source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz" "enable-fftw3.patch") -md5sums=('461a3d0d558a4f45c49943234baa9ca8' +md5sums=('b10b30940f971a2511c176661d85165e' 'bb907907a9b33f6c63312274c8523d40') prepare() { diff --git a/community/php-mongo/PKGBUILD b/community/php-mongo/PKGBUILD index 97db8ac28..0f0f10c89 100644 --- a/community/php-mongo/PKGBUILD +++ b/community/php-mongo/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Jarek Sedlacek pkgname=php-mongo -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="Officially supported PHP driver for MongoDB" arch=("i686" "x86_64") @@ -26,6 +26,5 @@ package() { make INSTALL_ROOT="$pkgdir" install install -Dm644 "$srcdir/mongo.ini" "$pkgdir/etc/php/conf.d/mongo.ini" } - -sha256sums=('883aad17c44e8f053b10c8e31d7ff6487d5b5660ea8bd17a7b62976e988c4ea4' +sha256sums=('98ae2994445763d7bac19c418d9f1773592fd3a4a10ff1e36498383a52fb54e7' 'c89685eee842d5c3a85149a5bb8e310e62bf1a17f94183bb66401593ab2b191b') diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index ea16500df..c146b7301 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109718 2014-04-18 09:35:36Z fyan $ +# $Id: PKGBUILD 110770 2014-05-06 17:34:41Z fyan $ # Maintainer: Felix Yan pkgname=pidgin-lwqq -pkgver=0.2d.20140417 -#_gitver="tag=$pkgver" -_gitver='commit=9537d7053a91d2813e15f834075688097818c7c8' +pkgver=0.3.0 +_gitver="tag=v$pkgver" +#_gitver='commit=9537d7053a91d2813e15f834075688097818c7c8' pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 4aa216d58..62631e3d1 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 105934 2014-02-19 12:29:36Z arodseth $ +# $Id: PKGBUILD 110730 2014-05-05 22:09:47Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: phrakture # Contributor: Fazlul Shahriar # Contributor: Chris Brannon pkgname=plan9port -pkgver=20131024 -pkgrel=4 +pkgver=20140306 +pkgrel=1 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686') url='http://swtch.com/plan9port/' @@ -18,7 +18,7 @@ install='plan9.install' options=('!zipman' 'staticlibs') source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tgz" 'plan9.sh') -sha256sums=('5cba7856bdb35a96a923120e61d320d424fee1a6f09b7af3e87eb7814a747d4f' +sha256sums=('cbb826cde693abdaa2051c49e7ebf75119bf2a4791fe3b3229f1ac36a408eaeb' '8768c080a8ceb0a52a3f866bd8ffc4b26f9deb97c6877ceea78ec0b316325a6b') package() { @@ -46,12 +46,6 @@ package() { rm -f config install.log install.sum install.txt configure Makefile INSTALL \ LICENSE - # The old method for fixing hardcoded paths - #for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do - # echo -n "\t$f" - # [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true - #done - # Fix python scripts find "$pkgdir" -name '*.py' -print0 |xargs -0 \ sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/python2,' \ @@ -71,7 +65,6 @@ package() { done # Once more - #grep --null -l -r "$pkgdir/usr/local/plan9" | xargs --null sed -i "s!$pkgdir/usr/local/plan9!${PLAN9}!g" grep --null -l -r "$pkgdir$PLAN9" | xargs --null sed -i "s!$pkgdir$PLAN9!${PLAN9}!g" || true grep --null -l -r "/build/plan9port/pkg/plan9port/$PLAN9" | xargs --null sed -i "s!/build/plan9port/pkg/plan9port/$PLAN9!${PLAN9}!g" || true } diff --git a/community/python-coverage/PKGBUILD b/community/python-coverage/PKGBUILD new file mode 100644 index 000000000..d954a2fbf --- /dev/null +++ b/community/python-coverage/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 110741 2014-05-06 01:07:19Z fyan $ +# Maintainer: Felix Yan +# Contributor: Clément Démoulins +# Contributor: Fazlul Shahriar + +pkgname=(python-coverage python2-coverage) +pkgver=3.7.1 +pkgrel=3 +pkgdesc="A tool for measuring code coverage of Python programs" +arch=('i686' 'x86_64') +url="http://nedbatchelder.com/code/coverage/" +license=('BSD') +makedepends=('python-setuptools' 'python2-setuptools') +checkdepends=('python-mock' 'python2-mock' 'python-nose' 'python2-nose') +source=("http://pypi.python.org/packages/source/c/coverage/coverage-$pkgver.tar.gz") +md5sums=('c47b36ceb17eaff3ecfab3bcd347d0df') + +prepare() { + cp -a coverage-$pkgver{,-py2} +} + +build() { + cd "$srcdir/coverage-$pkgver" + python3 setup.py build + + cd "$srcdir/coverage-$pkgver-py2" + python2 setup.py build +} + +check() { + cd "$srcdir/coverage-$pkgver" + #python3 igor.py zip_mods install_egg remove_extension + #python3 igor.py test_with_tracer py + #python3 setup.py --quiet build_ext --inplace + #python3 igor.py test_with_tracer c +} + +package_python-coverage() { + depends=('python') + + cd coverage-$pkgver + python3 setup.py install --root="$pkgdir" --optimize=1 +} + +package_python2-coverage() { + depends=('python2') + + cd coverage-$pkgver + python2 setup.py install --root="$pkgdir" --optimize=1 + + mv "$pkgdir/usr/bin/coverage" "$pkgdir/usr/bin/coverage2" +} diff --git a/community/python-tornado/PKGBUILD b/community/python-tornado/PKGBUILD index 527774e25..e77d5a08d 100644 --- a/community/python-tornado/PKGBUILD +++ b/community/python-tornado/PKGBUILD @@ -1,46 +1,57 @@ -# $Id: PKGBUILD 108507 2014-03-27 14:48:32Z fyan $ +# $Id: PKGBUILD 110749 2014-05-06 04:31:01Z fyan $ # Maintainer: Felix Yan # Contributor: Thomas Dziedzic < gostrc at gmail > pkgname=('python-tornado' 'python2-tornado') -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc='open source version of the scalable, non-blocking web server and tools' arch=('i686' 'x86_64') url='http://www.tornadoweb.org/' license=('Apache') -makedepends=('python-setuptools' 'python2-setuptools' 'python2-backports.ssl_match_hostname') -source=("https://github.com/facebook/tornado/archive/v${pkgver}.tar.gz") +makedepends=('python-setuptools' 'python2-setuptools' 'python2-backports.ssl_match_hostname' 'git') +checkdepends=('python-pycurl' 'python2-pycurl' 'python-mock' 'python2-mock' 'twisted') +source=("git+https://github.com/facebook/tornado.git#tag=v$pkgver") +sha512sums=('SKIP') -build() { - cp -r tornado-${pkgver} python2-tornado-${pkgver} +prepare() { + cp -a tornado{,-py2} - cd tornado-${pkgver} + # python -> python2 rename + find tornado-py2 -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \; +} +build() { + cd tornado python setup.py build - cd ../python2-tornado-${pkgver} + cd ../tornado-py2 + python2 setup.py build +} - # python -> python2 rename - find -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \; +check() { + cd tornado + python -m tornado.test.runtests || : + python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop || : + python -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || : - python2 setup.py build + cd ../tornado-py2 + python2 -m tornado.test.runtests || : + python2 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop || : + python2 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop || : } package_python-tornado() { depends=('python') - cd tornado-${pkgver} - + cd tornado python setup.py install --root="${pkgdir}" --optimize=1 } package_python2-tornado() { depends=('python2' 'python2-backports.ssl_match_hostname') - cd python2-tornado-${pkgver} - + cd tornado-py2 python2 setup.py install --root="${pkgdir}" --optimize=1 } -sha512sums=('1703178be34060a6c36e9e0aa742b87ad905dfb0f565e43a1158edfe5c7800fe35aff9168b60aabd3b831b339af6ef95aaa144a9fb167c5d93f548eb59fc2557') diff --git a/community/shairplay/PKGBUILD b/community/shairplay/PKGBUILD new file mode 100644 index 000000000..d1ad1c1a6 --- /dev/null +++ b/community/shairplay/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 110774 2014-05-06 17:52:11Z idevolder $ +# Maintainer: BlackIkeEagle +# Contributor: winlu + +pkgname=shairplay +_gitname=shairplay +pkgver=20140422 +pkgrel=1 +pkgdesc='Apple airplay and raop protocol server' +arch=('i686' 'x86_64') +url='https://github.com/juhovh/shairplay' +license=('custom') +depends=('libao') +optdepends=('avahi: to run the server') +makedepends=('git') +source=("$_gitname::git://github.com/juhovh/shairplay.git#commit=64d59e3087f829006d091fa0d114efb50972a2bf" + 'shairplay.service') +sha256sums=('SKIP' + 'f0a176539a6c5be46dc832d054be2f18c3256e5fd34c5f1416c9463bd75c82b3') +options=(!libtool) +provides=('libshairport') +conflicts=('libshairport') + +build() { + cd $_gitname + + # installing airport.key to /etc/shairplay/ + sed 's/airport.key/\/etc\/shairplay\/airport.key/' -i "$srcdir/$_gitname"/src/shairplay.c + + ./autogen.sh + ./configure --prefix=/usr/ + make +} + + +package() { + cd $_gitname + make DESTDIR="$pkgdir" install + + # install systemd service file + install -Dm644 "$srcdir/shairplay.service" "$pkgdir/usr/lib/systemd/system/shairplay.service" + + # install key file + install -Dm644 airport.key "$pkgdir/etc/shairplay/airport.key" + + # install license file + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # install documentation + install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md" +} diff --git a/community/shairplay/shairplay.service b/community/shairplay/shairplay.service new file mode 100644 index 000000000..a62438412 --- /dev/null +++ b/community/shairplay/shairplay.service @@ -0,0 +1,13 @@ +[Unit] +Description=Apple airplay and raop protocol server +Requires=network.target sound.target +Wants=avahi-daemon.service +After=avahi-daemon.service + +[Service] +Type=simple +ExecStart=/usr/bin/shairplay -a %H +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/vagrant/PKGBUILD b/community/vagrant/PKGBUILD index c035ae09c..aa46c8c14 100644 --- a/community/vagrant/PKGBUILD +++ b/community/vagrant/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109994 2014-04-22 19:49:32Z jsteel $ +# $Id: PKGBUILD 110787 2014-05-06 20:58:28Z jsteel $ # Maintainer: Jonathan Steel # Contributor: Ido Rosen # Contributor: Brett Hoerner @@ -10,7 +10,7 @@ # Contributor: Steven Nance pkgname=vagrant -pkgver=1.5.4 +pkgver=1.6.0 pkgrel=1 pkgdesc="Build and distribute virtualized development environments" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!emptydirs') depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump') source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip) -md5sums=('f6c22ddf494b3bcd860a751e38a8ef1c') +md5sums=('c3d23bc5573e0790eaebfc08e59f0384') [[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4' [[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b' diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD index fdc385446..dafe8812d 100644 --- a/community/wireshark/PKGBUILD +++ b/community/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106919 2014-03-10 11:29:59Z tredaelli $ +# $Id: PKGBUILD 110754 2014-05-06 09:29:25Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Guillaume ALAUX # Contributor: Florian Pritz pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.10.6 +pkgver=1.10.7 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -13,7 +13,7 @@ makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio' url='http://www.wireshark.org/' source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 wireshark-1.10.5-fix-flow-crash.patch) -sha256sums=('a9de3fd3002d4df0946cfea2f5a33557666e14c7014dbc42d1f78dfe113f6b5d' +sha256sums=('d98d263b31dd904a0337ba2db6d1a80bb495b4ac419a304f0f25c551d50cafc6' 'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea') prepare() { @@ -39,7 +39,7 @@ build() { package_wireshark-cli() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libgcrypt' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio') + depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio') install=wireshark.install conflicts=(wireshark) diff --git a/community/znc/01-sec-correctly-handle-channel-names.patch b/community/znc/01-sec-correctly-handle-channel-names.patch new file mode 100644 index 000000000..cc48d13c9 --- /dev/null +++ b/community/znc/01-sec-correctly-handle-channel-names.patch @@ -0,0 +1,72 @@ +From 8756be513ab6663dcd64087006b257ff34e8e487 Mon Sep 17 00:00:00 2001 +From: Uli Schlachter +Date: Sun, 13 Apr 2014 20:36:55 +0200 +Subject: [PATCH] webadmin/add channel: Correctly handle channel names + +The CChan constructor makes sure that the channel name begins with a valid +channel prefix. Thus, this could change the name of the resulting channel. + +When you edited an irc network which already had a channel "#foo", were +connected to IRC (so ZNC knows which prefixes are valid) and added a channel +"foo", this would lead to a problem: + +Webadmin checks and sees that there is no channel "foo" yet. Webadmin creates a +new CChan instance for "foo". The CChan constructor notices that "f" is not a +valid channel prefix and instead calls itself "#foo". Then, +CIRCNetwork::AddChan() would see that this channel already exists, delete the +given channel and return false. + +However, webadmin didn't check this result and would continue changing settings +on an already destroyed CChan instance. + +Fix this by checking if the channel exists after CChan had its chance to mess +with the channel name. Also handle failures from CIRCNetwork::AddChan(). + +Fixes #528. + +Signed-off-by: Uli Schlachter +(cherry picked from commit 5e6e3be32acfeadeaf1fb3bb17bada08aec6432f) +--- + modules/webadmin.cpp | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp +index ec67508..2a03367 100644 +--- a/modules/webadmin.cpp ++++ b/modules/webadmin.cpp +@@ -667,13 +667,19 @@ class CWebAdminMod : public CModule { + return true; + } + +- if (pNetwork->FindChan(sChanName.Token(0))) { +- WebSock.PrintErrorPage("Channel [" + sChanName.Token(0) + "] already exists"); ++ // This could change the channel name and e.g. add a "#" prefix ++ pChan = new CChan(sChanName, pNetwork, true); ++ ++ if (pNetwork->FindChan(pChan->GetName())) { ++ WebSock.PrintErrorPage("Channel [" + pChan->GetName() + "] already exists"); ++ delete pChan; + return true; + } + +- pChan = new CChan(sChanName, pNetwork, true); +- pNetwork->AddChan(pChan); ++ if (!pNetwork->AddChan(pChan)) { ++ WebSock.PrintErrorPage("Could not add channel [" + pChan->GetName() + "]"); ++ return true; ++ } + } + + pChan->SetBufferCount(WebSock.GetParam("buffercount").ToUInt(), spSession->IsAdmin()); +@@ -699,7 +705,7 @@ class CWebAdminMod : public CModule { + + CTemplate TmplMod; + TmplMod["User"] = pUser->GetUserName(); +- TmplMod["ChanName"] = sChanName; ++ TmplMod["ChanName"] = pChan->GetName(); + TmplMod["WebadminAction"] = "change"; + FOR_EACH_MODULE(it, pNetwork) { + (*it)->OnEmbeddedWebRequest(WebSock, "webadmin/channel", TmplMod); +-- +1.9.1 + diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD deleted file mode 100644 index ebc703e1d..000000000 --- a/community/znc/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 108519 2014-03-27 14:48:42Z fyan $ -# Maintainer: Sébastien Luttringer -# Contributor: Kaiting Chen -# Contributor: mickael9 - -pkgname=znc -pkgver=1.2 -pkgrel=2 -pkgdesc='An IRC bouncer with modules & scripts support' -url='http://en.znc.in/wiki/index.php/ZNC' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('libsasl') -makedepends=('tcl' 'python' 'perl') -optdepends=('tcl: modtcl module' - 'python: modpython module' - 'perl: modperl module' - 'cyrus-sasl: saslauth module') -install=$pkgname.install -source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz") -md5sums=('ef18e5402a82cc3fcab5c2ac5c2e6f3b') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-cyrus \ - --enable-python \ - --enable-perl \ - --enable-tcl \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/znc/znc.install b/community/znc/znc.install deleted file mode 100644 index e5dd6575a..000000000 --- a/community/znc/znc.install +++ /dev/null @@ -1,29 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -post_install() { - getent group znc >/dev/null || groupadd -g 136 znc - getent passwd znc >/dev/null || useradd -r -d /var/lib/znc -u 136 -g 136 znc - [ -d /var/lib/znc ] || install -dm 750 -o znc -g znc /var/lib/znc - echo "==> Use 'znc --makeconf' as user znc to generate your first config" - true -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "`vercmp $2 1.0-4`" -lt 0 ]; then - [ -d /var/lib/znc ] || install -dm 750 -o znc -g znc /var/lib/znc - usermod -d /var/lib/znc znc 2>/dev/null && echo '==> znc home directory has moved to /var/lib/znc' - fi - true -} - -# arg 1: the old package version -post_remove() { - userdel -f znc >/dev/null 2>&1 - groupdel znc >/dev/null 2>&1 - true -} - -# vim:set ts=2 sw=2 ft=sh et: -- cgit v1.2.3-54-g00ecf