diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-15 23:12:20 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-15 23:12:20 +0000 |
| commit | 76c26b027d797f3671bf0b6c6618eda2496cf88d (patch) | |
| tree | c386be56a0a3bc7b668a674e9cec6405a4d2fb2f | |
| parent | 29657877f6a02dbba1bd58b417b4ccd211939690 (diff) | |
Fri Jul 15 23:12:20 UTC 2011
78 files changed, 2764 insertions, 306 deletions
diff --git a/community-testing/freevo/PKGBUILD b/community-testing/freevo/PKGBUILD new file mode 100644 index 000000000..c07ec2f34 --- /dev/null +++ b/community-testing/freevo/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 51736 2011-07-13 19:46:02Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=freevo +pkgver=1.9.0 +pkgrel=6 +pkgdesc="Freevo is an open-source home theatre PC platform based on Linux and a number of open-source audio/video tools." +url="http://freevo.sourceforge.net/" +license=('GPL2') +arch=('i686' 'x86_64') +depends=('lame' 'flac' 'faad2' 'cdparanoia' 'vorbis-tools' \ + 'fbset' 'smpeg' 'pil' 'python-pysqlite-legacy' \ + 'pyxml' 'lsdvd' 'twisted' 'python2-numpy' 'python-pygame'\ + 'kaa-metadata' 'kaa-imlib2' 'python-beautifulsoup' 'python-html5lib') +optdepends=('mplayer: most features' 'xine-lib: can be used instead of mplayer' 'tvtime: watching tv' 'xmltv: parsing online tv guides') +install=freevo.install +options=('docs') +source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz \ + freevo.desktop + imdb-html5lib.patch) +sha1sums=('0533a2d4ff8a7b09b3b233fdf303ff56bda22d16' + '5f6e76dc58496f072aca29257c24be5ffa9c6c7d' + '57e1099527603500c594fbffa2cb7233b636eed1') + +build() { + cd $srcdir/$pkgname-$pkgver + + # patch from http://sourceforge.net/tracker/index.php?func=detail&aid=2924872&group_id=46652&atid=446895 + patch -p0 < $srcdir/imdb-html5lib.patch + python2 setup.py install --prefix=$pkgdir/usr + + install -Dm644 local_conf.py.example $pkgdir/usr/share/doc/freevo/local_conf.py.example + + # install .desktop file and icon + install -Dm644 $srcdir/$pkgname-$pkgver/share/icons/misc/freevo_app.png \ + $pkgdir/usr/share/pixmaps/freevo.png + install -Dm644 $srcdir/freevo.desktop \ + $pkgdir/usr/share/applications/freevo.desktop + + # fix executable for python 2.7 + sed -i "s|search = ('python', 'python2')|search = ('python2', 'python2.7')|" $pkgdir/usr/bin/freevo + + } + diff --git a/community-testing/freevo/freevo.desktop b/community-testing/freevo/freevo.desktop new file mode 100644 index 000000000..1b57043be --- /dev/null +++ b/community-testing/freevo/freevo.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=Freevo +GenericName=Freevo +Comment=Home theatre +Exec=freevo +Terminal=false +Type=Application +Icon=/usr/share/pixmaps/freevo.png +Categories=AudioVideo; + diff --git a/community-testing/freevo/freevo.install b/community-testing/freevo/freevo.install new file mode 100644 index 000000000..06734569d --- /dev/null +++ b/community-testing/freevo/freevo.install @@ -0,0 +1,25 @@ +post_install() { + if [ ! -d /etc/freevo ]; then + mkdir /etc/freevo + fi + + if [ ! -f /etc/freevo/local_conf.py ]; then + cp /usr/share/doc/freevo/local_conf.py.example /etc/freevo/local_conf.py + fi + +cat << _EOF + +==> freevo installation notes: +--------------------------------------- + Run 'freevo setup --help' and follow the instructions. Then edit + /etc/freevo/local_conf.py to suit your needs. This file can be + installed on a per-user basis in ~/.freevo and will take precedence + over the one in /etc/freevo/. + +_EOF + +} + +post_upgrade() { + post_install +} diff --git a/community-testing/freevo/imdb-html5lib.patch b/community-testing/freevo/imdb-html5lib.patch new file mode 100644 index 000000000..6f454246e --- /dev/null +++ b/community-testing/freevo/imdb-html5lib.patch @@ -0,0 +1,301 @@ +Index: src/helpers/imdb.py +=================================================================== +--- src/helpers/imdb.py (revision 11608) ++++ src/helpers/imdb.py (working copy) +@@ -53,19 +53,19 @@ + parser = OptionParser(version='%prog 1.0', conflict_handler='resolve', usage=""" + Search IMDB for a movie or a TV show + +-freevo imdb [options] <search> [<output> <video file> [<video file>]] ++freevo imdb [options] | [<result> <fxd file> <video file> [<video file>]] + +-Generate <output>.fxd for the movie. Files is a list of files that belongs to +-this movie. Use [dvd|vcd] to add the whole disc or use [dvd|vcd][title] to add +-a special DVD or VCD title to the list of files""") ++Generate a fxd for the movie. Files is a list of files that belongs to this ++movie. Use [dvd|vcd] to add the whole disc or use [dvd|vcd][title] to add a ++special DVD or VCD title to the list of files""") + parser.add_option('-v', '--verbose', action='count', default=0, + help='set the level of verbosity [default:%default]') + parser.add_option('-s', '--search', action='store_true', dest='search', default=False, + help='search imdb for string [default:%default]') + parser.add_option('-g', '--guess', action='store_true', dest='guess', default=False, + help='search imdb for possible filename match [default:%default]') +- parser.add_option('--tv', action='store_true', dest='tv', default=False, +- help='specify the search is a tv programme [default:%default]') ++ parser.add_option('--tv', action='store', dest='tv', default=None, ++ help='specify the id of a tv programme for a eipsode search [default:%default]') + parser.add_option('--season', dest='season', default=None, + help='specify the season in the search [default:%default]') + parser.add_option('--episode', dest='episode', default=None, +@@ -116,7 +116,9 @@ + sys.exit(u'--search requires <search pattern>') + elif opts.guess and len(args) < 1: + sys.exit(u'--guess requires <guess pattern>') +- tv_marker = (opts.tv or opts.season or opts.episode) and '"' or '' ++ #elif opts.tv and len(args) < 1: ++ # sys.exit(u'--tv requires <imdb id>') ++ tv_marker = (opts.season or opts.episode) and '"' or '' + + if opts.rom_drive is not None: + driveset = True +@@ -176,6 +178,23 @@ + print '%s' % title.encode(opts.encoding) + sys.exit(0) + ++ if opts.tv: ++ print "Searching IMDB for '%s' season:%s episode:%s..." % (opts.tv, opts.season, opts.episode) ++ results = fxd.getIMDBid(opts.tv, opts.season, opts.episode) ++ if len(results) == 0: ++ print 'No results' ++ #for result in results: ++ # if result[3]: ++ # title = 'http://www.imdb.com/title/tt%s/ %s %s (%s) %s' % (result[:1] + result[:4]) ++ # elif result[2]: ++ # title = 'http://www.imdb.com/title/tt%s/ %s %s (%s)' % (result[:1] + result[:3]) ++ # else: ++ # title = 'http://www.imdb.com/title/tt%s/ %s %s' % (result[:1] + result[:2]) ++ # title = results ++ title = 'http://www.imdb.com/title/tt%s/ %s' % (results, results) ++ print '%s' % title.encode(opts.encoding) ++ sys.exit(0) ++ + # normal usage + if len(args) < 3: + sys.exit(u'requires <imdb id> <fxd filename> <video file>|<cd id>') +Index: src/util/fxdimdb.py +=================================================================== +--- src/util/fxdimdb.py (revision 11608) ++++ src/util/fxdimdb.py (working copy) +@@ -48,8 +48,15 @@ + import codecs + import os + import traceback +-from BeautifulSoup import BeautifulSoup, NavigableString +-import HTMLParser ++from pprint import pprint, pformat ++try: ++ from html5lib import HTMLParser, treebuilders ++ from html5lib.treebuilders.soup import NavigableString ++ using_html5lib = True ++except ImportError: ++ import HTMLParser ++ from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup, NavigableString ++ using_html5lib = False + + import config + import util +@@ -232,6 +239,7 @@ + response.close() + + _debug_('id_list has %s items' % (len(self.id_list))) ++ #print 'id_list=%s' % (pformat(self.id_list)) + if len(self.id_list) > 20: + # too many results, check if there are stupid results in the list + words = [] +@@ -311,7 +319,11 @@ + dvd = 0 + + try: +- soup = BeautifulSoup(results.read(), convertEntities='xml') ++ if using_html5lib: ++ parser = HTMLParser(tree=treebuilders.getTreeBuilder('beautifulsoup')) ++ soup = parser.parse(results.read()) ++ else: ++ soup = BeautifulSoup(results.read(), convertEntities=BeautifulStoneSoup.HTML_ENTITIES) + except UnicodeDecodeError: + print "Unicode error: check that /usr/lib/python2.x/site.py has the correct default encoding" + traceback.print_exc() +@@ -336,68 +348,61 @@ + self.info['year'] = y[1:-1] + except (AttributeError, TypeError, ValueError): + self.info['title'] = self.title +- self.info['year'] = title.find('a').string.strip() ++ try: ++ self.info['year'] = title.find('a').contents[0].strip() ++ except AttributeError: ++ self.info['year'] = '' + + # Find the <div> with class info, each <h5> under this provides info ++ wanted_keys = ('release_date', 'genre', 'tagline', 'plot', 'plot_keywords', ++ 'also_known_as', 'mpaa', 'runtime', 'country', 'language', ++ 'color', 'aspect_ratio', 'sound_mix', 'certification', ++ ) ++ + for info in main.findAll('div', {'class' : 'info'}): + infoh5 = info.find('h5') + if not infoh5: + continue + try: +- infostr = infoh5.next +- key = infostr.string.strip(':').lower().replace(' ', '_') +- nextsibling = nextsibling = infoh5.nextSibling.strip() +- sections = info.findAll('a', { 'href' : re.compile('/Sections') }) +- lists = info.findAll('a', { 'href' : re.compile('/List') }) +- if len(nextsibling) > 0: +- self.info[key] = nextsibling ++ infostr = infoh5.find(text=True) ++ key = infostr.strip().strip(':').lower().replace(' ', '_') ++ if key not in wanted_keys: ++ continue ++ content = info.find('div', {'class' : 'info-content'}) ++ infocontent = content.find(text=True) ++ if infocontent: ++ infocontent = infocontent.strip() ++ sections = info.findAll('a', { 'href' : re.compile('^/Sections') }) ++ lists = info.findAll('a', { 'href' : re.compile('^/List') }) ++ keywords = info.findAll('a', { 'href' : re.compile('^/keyword') }) ++ #print 'key=%s content=%r keywords=%r sections=%r lists=%r' % (key, infocontent, keywords, sections, lists) ++ if len(infocontent) > 0: ++ self.info[key] = infocontent + elif len(sections) > 0: + items = [] + for item in sections: +- items.append(item.string) ++ items.append(item.contents[0].strip()) + self.info[key] = ' / '.join(items) + elif len(lists) > 0: + items = [] + for item in lists: +- items.append(item.string) ++ items.append(item.contents[0].strip()) + self.info[key] = ' / '.join(items) ++ elif len(keywords) > 0: ++ items = [] ++ for item in keywords: ++ items.append(item.contents[0].strip()) ++ self.info[key] = ' / '.join(items) + except: + pass + +- # Find Plot Outline/Summary: +- # Normally the tag is named "Plot Outline:" - however sometimes +- # the tag is "Plot Summary:" or just "Plot:". Search for all strings. +- imdb_result = soup.find(text='Plot Outline:') +- if not imdb_result: +- imdb_result = soup.find(text='Plot Summary:') +- if not imdb_result: +- imdb_result = soup.find(text='Plot:') +- if imdb_result: +- self.info['plot'] = imdb_result.next.strip() +- else: +- self.info['plot'] = u'' +- +- # Find tagline - sometimes the tagline is missing. +- # Use an empty string if no tagline could be found. +- imdb_result = soup.find(text='Tagline:') +- if imdb_result: +- self.info['tagline'] = imdb_result.next.strip() +- else: +- self.info['tagline'] = u'' +- + rating = soup.find(text='User Rating:').findNext(text=re.compile('/10')) +- if rating: ++ try: + votes = rating.findNext('a') +- self.info['rating'] = rating.strip() + ' (' + votes.string.strip() + ')' +- else: ++ self.info['rating'] = rating.strip() + ' (' + votes.contents[0].strip() + ')' ++ except AttributeError: + self.info['rating'] = '' + +- runtime = soup.find(text='Runtime:') +- if runtime and runtime.next: +- self.info['runtime'] = runtime.next.strip() +- else: +- self.info['runtime'] = '' +- + # Replace special characters in the items + for (k,v) in self.info.items(): + self.info[k] = self.convert_entities(v) +@@ -794,10 +799,14 @@ + _debug_('parsesearchdata(results=%r, url=%r, id=%r)' % (results, url, id)) + + self.id_list = [] +- m = re.compile('/title/tt([0-9]*)/') +- y = re.compile('\(([^)]+)\)') ++ m = re.compile('/title/tt(\d+)/') ++ y = re.compile('\((\d+)\) *(.*)') + try: +- soup = BeautifulSoup(results.read(), convertEntities='xml') ++ if using_html5lib: ++ parser = HTMLParser(tree=treebuilders.getTreeBuilder('beautifulsoup')) ++ soup = parser.parse(results.read()) ++ else: ++ soup = BeautifulSoup(results.read(), convertEntities=BeautifulStoneSoup.HTML_ENTITIES) + except HTMLParser.HTMLParseError, why: + traceback.print_exc() + _debug_('Cannot parse %r: %s' % (url, why), DWARNING) +@@ -806,28 +815,37 @@ + traceback.print_exc() + _debug_('Cannot parse %r: %s' % (url, why), DWARNING) + return self.id_list +- items = soup.findAll('a', href=re.compile('/title/tt')) ++ items = soup.findAll('a', href=re.compile('^/title/tt')) + ids = set([]) + for item in items: +- idm = m.search(item['href']) ++ idm = item.attrMap['href'] + if not idm: + continue +- if isinstance(item.next.next, NavigableString): +- yrm = y.findall(item.next.next) +- +- id = idm.group(1) +- name = item.string +- # skip empty names +- if not name: ++ m_match = m.match(idm) ++ if not m_match: ++ # skip invalid titles + continue +- # skip duplicate ids ++ id = m_match.group(1) + if id in ids: ++ # skip duplicate ids + continue ++ name = item.contents[0] ++ if not isinstance(name, NavigableString): ++ # skip empty names ++ continue ++ if isinstance(item.next.next, NavigableString): ++ yrm = item.next.next.strip() + ids.add(id) +- year = len(yrm) > 0 and yrm[0] or '0000' +- type = len(yrm) > 1 and yrm[1] or '' ++ y_match = y.match(yrm) ++ if y_match: ++ year = y_match.group(1) ++ type = y_match.group(2) ++ else: ++ year = '0000' ++ type = '' + #print 'url', item['href'] + #print item.parent.findChildren(text=re.compile('[^ ]')) ++ #print 'id=%s name=%s year=%s type=%s' % (id, name, year, type) + self.id_list += [ ( id, name, year, type ) ] + + for item in self.id_list: +@@ -840,7 +858,11 @@ + Returns a new id for getIMDBid with TV series episode data + """ + try: +- soup = BeautifulSoup(results.read(), convertEntities='xml') ++ if using_html5lib: ++ parser = HTMLParser(tree=treebuilders.getTreeBuilder('beautifulsoup')) ++ soup = parser.parse(results.read()) ++ else: ++ soup = BeautifulSoup(results.read(), convertEntities=BeautifulStoneSoup.HTML_ENTITIES) + except UnicodeDecodeError: + print "Unicode error; check that /usr/lib/python2.x/site.py has the correct default encoding" + pass +@@ -968,9 +990,6 @@ + self.image = vfs.basename(self.image) + + _debug_('Downloaded cover image from %s' % (self.image_url)) +- print "Freevo knows nothing about the copyright of this image, please" +- print "go to %s to check for more information about private." % self.image_url +- print "use of this image" + + + def str2XML(self, line): diff --git a/community-testing/mypaint/PKGBUILD b/community-testing/mypaint/PKGBUILD new file mode 100644 index 000000000..cc4d4f85b --- /dev/null +++ b/community-testing/mypaint/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 51725 2011-07-13 14:26:16Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> + +pkgname=mypaint +pkgver=0.9.1 +pkgrel=3 +pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" +arch=('i686' 'x86_64') +url="http://mypaint.intilinux.com/" +license=('GPL' 'LGPL') +depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2') +makedepends=('scons>=0.97' 'swig>=1.3.39') +install=mypaint.install +source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('6249a16359a438d6dc658f5765b35515') + +build() { + cd $srcdir/$pkgname-$pkgver + # python2 fix + sed -i 's_python generate.py_python2 generate.py_' brushlib/SConscript + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + scons +} + +package() { + cd $srcdir/$pkgname-$pkgver + scons prefix="$pkgdir"/usr install +} diff --git a/community-testing/mypaint/mypaint.install b/community-testing/mypaint/mypaint.install new file mode 100644 index 000000000..5f0358791 --- /dev/null +++ b/community-testing/mypaint/mypaint.install @@ -0,0 +1,13 @@ +post_install() { + [ -x `which update-mime-database` ] && update-mime-database usr/share/mime + [ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + /bin/true +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/python-scipy/PKGBUILD b/community-testing/python-scipy/PKGBUILD new file mode 100644 index 000000000..80a97ca82 --- /dev/null +++ b/community-testing/python-scipy/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 51728 2011-07-13 14:46:12Z tdziedzic $ +# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com> +# Contributor: Andrzej Giniewicz <gginiu@gmail.com> + +pkgbase=python-scipy +_app=scipy +pkgname=('python-scipy' 'python2-scipy') +pkgver=0.9.0 +_theapp=$_app-$pkgver +pkgrel=2 +pkgdesc="SciPy is open-source software for mathematics, science, and engineering." +arch=('i686' 'x86_64') +url="http://www.scipy.org/" +license=('BSD') +depends=('python-numpy') +makedepends=('gcc-fortran' 'python2-numpy') +changelog=$pkgbase.changelog +source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz") +md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd') + +build() { + unset LDFLAGS + unset FFLAGS + + # Compatibility symlinks for current stable numpy + # - no need to patch numpy just for this + # see http://projects.scipy.org/numpy/ticket/1749 + ln -sf /usr/lib/liblapack.so liblapack.cpython-32mu.so + ln -sf /usr/lib/libblas.so libblas.cpython-32mu.so + export LAPACK="$srcdir" + export BLAS="$srcdir" + + # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) + sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \ + $_theapp/$_app/special/cephes/mconf.h + + # 2 builds + cp -r $_theapp $_theapp-py2 + + # build for python3 + cd $_theapp + python setup.py config_fc --fcompiler=gnu95 build + + # build for python2 + cd ../$_theapp-py2 + + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + python2 setup.py config_fc --fcompiler=gnu95 build +} + +package_python-scipy() { + provides=('python3-scipy' 'scipy') + + cd "$srcdir/$_theapp" + + python setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-scipy() { + depends=('python2-numpy') + conflicts=('python-scipy<0.9.0') + + cd "$srcdir/$_theapp-py2" + + python2 setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/python-scipy/python-scipy.changelog b/community-testing/python-scipy/python-scipy.changelog new file mode 100644 index 000000000..76a3e7f35 --- /dev/null +++ b/community-testing/python-scipy/python-scipy.changelog @@ -0,0 +1,49 @@ +2011-07-13 Thomas Dziedzic < gostrc at gmail > + * 0.9.0-2: + rebuild for python3-numpy to python-numpy rename + also, minor PKGBUILD cleanup + +2011-04-24 Ray Rashif <schiv@archlinux.org> + + * 0.9.0-1: + Couldn't release previous update due to lapack/blas issues + See http://mailman.archlinux.org/pipermail/arch-general/2011-April/019677.html + Hopefully symlink trick from AUR/python3-scipy fixes that + +2011-04-05 Ray Rashif <schiv@archlinux.org> + + * 0.9.0-1: + Upstream release + SciPy now supports Python 3 + Package split for python(3), python2 + PKGBUILD cleanup + +2010-07-29 Angel 'angvp' Velasquez <angvp@archlinux.org> + * Updated to: 0.8.0 +2009-08-05 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated to: 0.7.1 + +2009-02-11 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updating for i686: 0.7 + +2008-12-12 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updating for i686: 0.7.0 beta 1 + +2008-11-07 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated to svn as scipy 0.6 wont work with python 2.6 + +2008-02-21 Eric Belanger <eric@archlinux.org> + + * Added x86_64 arch tag + * Added license + +2007-10-29 Douglas Soares de Andrade <dsa@aur.archlinux.org> + + * Changed email + * Fixed some problems in the PKGBUILD + * Updated to new release - 0.6.0 + diff --git a/community-testing/systemd/PKGBUILD b/community-testing/systemd/PKGBUILD new file mode 100644 index 000000000..f344d4d74 --- /dev/null +++ b/community-testing/systemd/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 51746 2011-07-13 22:59:52Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=systemd +pkgver=30 +pkgrel=1 +pkgdesc="Session and Startup manager" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2') +depends=('dbus-core' 'sysvinit' 'util-linux>=2.19' 'udev>=172') +makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify') +optdepends=('cryptsetup: required for encrypted block devices' + 'dbus-python: systemd-analyze' + 'gtk2: systemadm' + 'initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: native boot and initialization scripts' + 'libnotify: systemadm' + 'python2-cairo: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') +groups=('systemd') +options=('!libtool') +backup=(etc/systemd/system.conf + etc/tmpfiles.d/console.conf + usr/lib/tmpfiles.d/legacy.conf + usr/lib/tmpfiles.d/systemd.conf + usr/lib/tmpfiles.d/x11.conf) +install=systemd.install +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" + "os-release") +md5sums=('dafd6d2471e2bf80d35525df9801a40f' + '752636def0db3c03f121f8b4f44a63cd') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --with-rootdir= \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-audit \ + --disable-tcpwrap + + make + + # fix .so links in manpages + sed -i 's|\.so halt\.8|.so systemd.halt.8|' man/{halt,poweroff}.8 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" + printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf" + + # fix systemd-analyze for python2 + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + # rename man pages to avoid conflicts with sysvinit + cd "$pkgdir/usr/share/man/man8" + for manpage in telinit halt reboot poweroff runlevel shutdown; do + mv {,systemd.}"$manpage.8" + done + +} + diff --git a/community-testing/systemd/os-release b/community-testing/systemd/os-release new file mode 100644 index 000000000..5e24a6031 --- /dev/null +++ b/community-testing/systemd/os-release @@ -0,0 +1,5 @@ +NAME="Arch Linux" +ID=arch +PRETTY_NAME="Arch Linux" +ANSI_COLOR="1;36" + diff --git a/community-testing/systemd/systemd.install b/community-testing/systemd/systemd.install new file mode 100644 index 000000000..b4228255d --- /dev/null +++ b/community-testing/systemd/systemd.install @@ -0,0 +1,31 @@ +#!/bin/sh + +checkgroups() { + getent group lock >/dev/null || groupadd -g 54 lock +} + +post_install() { + checkgroups + + [ -f etc/machine-id ] || systemd-machine-id-setup + + echo "systemd has been installed to /bin/systemd. Please ensure you append" + echo "init=/bin/systemd to your kernel command line in your bootloader." +} + +post_upgrade() { + checkgroups + + [ -f etc/machine-id ] || systemd-machine-id-setup + systemctl daemon-reexec >/dev/null || : +} + +pre_remove() { + rm -f /etc/systemd/system/default.target +} + +post_remove() { + getent group lock >/dev/null && groupdel lock +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/vhba-module/PKGBUILD b/community-testing/vhba-module/PKGBUILD new file mode 100644 index 000000000..137897a28 --- /dev/null +++ b/community-testing/vhba-module/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 51733 2011-07-13 18:23:43Z schiv $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Contributor: Charles Lindsay <charles@chaoslizard.org> + +pkgname=vhba-module +pkgver=20110416 +_kernver='2.6.39-ARCH' +pkgrel=1 +pkgdesc="Kernel module that emulates SCSI devices" +arch=('i686' 'x86_64') +url="http://cdemu.sourceforge.net/" +license=('GPL2') +depends=('kernel26>=2.6.39' 'kernel26<2.6.40') +makedepends=('kernel26-headers>=2.6.39') +install=vhba-module.install +source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz) +md5sums=('2f91dd4ee8648da92d625221d4275b60') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 KDIR=/usr/src/linux-${_kernver} +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko" + sed -i "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install" +} diff --git a/community-testing/vhba-module/vhba-kernel2.6.37.patch b/community-testing/vhba-module/vhba-kernel2.6.37.patch new file mode 100644 index 000000000..e2b619c74 --- /dev/null +++ b/community-testing/vhba-module/vhba-kernel2.6.37.patch @@ -0,0 +1,56 @@ +From 9ad7ec7fae387f05249b9f4e6accb3bc3b0b8b0f Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gmail.com> +Date: Thu, 6 Jan 2011 03:39:26 -0500 +Subject: [PATCH] Make vhba compatible with kernel 2.6.37 SCSI host API + +Due to the SCSI host lock push-down changes introduced in 2.6.37 (see +http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f281233d3eba15fb225d21ae2e228fd4553d824a +for more details), trying to use current vhba on 2.6.37 leads to oopses +and kernel panics - e.g. see http://bugs.gentoo.org/show_bug.cgi?id=350753 + +Add some #ifdefs to enable compatibility both with 2.6.37 and older API. +Note that if future kernel versions remove the DEF_SCSI_QCMD macro, this +issue will need to be revisited. + +Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com> +--- + vhba-module/vhba.c | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c +index 059f6ce..9d13016 100644 +--- a/vhba-module/vhba.c ++++ b/vhba-module/vhba.c +@@ -27,6 +27,7 @@ + #include <linux/miscdevice.h> + #include <linux/poll.h> + #include <linux/slab.h> ++#include <linux/version.h> + #ifdef CONFIG_COMPAT + #include <linux/compat.h> + #endif +@@ -363,7 +364,7 @@ static void vhba_free_command(struct vhba_command *vcmd) + spin_unlock_irqrestore(&vhost->cmd_lock, flags); + } + +-static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) ++static int vhba_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) + { + struct vhba_device *vdev; + int retval; +@@ -388,6 +389,12 @@ static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn + return retval; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) ++DEF_SCSI_QCMD(vhba_queuecommand) ++#else ++#define vhba_queuecommand vhba_queuecommand_lck ++#endif ++ + static int vhba_abort(struct scsi_cmnd *cmd) + { + struct vhba_device *vdev; +-- +1.7.3.4 + diff --git a/community-testing/vhba-module/vhba-module.install b/community-testing/vhba-module/vhba-module.install new file mode 100644 index 000000000..edb9e8d2b --- /dev/null +++ b/community-testing/vhba-module/vhba-module.install @@ -0,0 +1,16 @@ +post_install() { + echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." + echo ">> This module needs to be recompiled for every kernel version upgrade." + KERNEL_VERSION='2.6.39-ARCH' + depmod $KERNEL_VERSION > /dev/null 2>&1 +} + +post_upgrade() { + post_install +} + +post_remove() { + KERNEL_VERSION='2.6.39-ARCH' + depmod $KERNEL_VERSION > /dev/null 2>&1 +} + diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD index 55800b024..8a32091ac 100644 --- a/community/bonnie++/PKGBUILD +++ b/community/bonnie++/PKGBUILD @@ -4,7 +4,7 @@ pkgname=bonnie++ pkgver=1.03e -pkgrel=4 +pkgrel=5 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray" arch=('i686' 'x86_64') url="http://www.coker.com.au/bonnie++/" @@ -14,14 +14,16 @@ source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz) sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb') build() { - cd ${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver} ./configure --prefix=/usr sed -i "s:CFLAGS=-O2 -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile make } package() { - cd ${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver} make prefix="${pkgdir}/usr" install + install -d $pkgdir/usr/share/doc/bonnie++ + install -Dm644 $srcdir/$pkgname-$pkgver/readme.html $pkgdir/usr/share/doc/bonnie++/readme.html } diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index 54cb9c850..d34736e3f 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 50232 2011-06-27 10:23:04Z spupykin $ +# $Id: PKGBUILD 51686 2011-07-13 08:09:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64) license=('custom') -depends=('tcp_wrappers' 'pam') +depends=('pam') backup=('etc/socks.conf' 'etc/sockd.conf') options=('!libtool') @@ -20,22 +20,19 @@ md5sums=('19b8a15860ce6b9e96453ddd7f1cbfe2' build() { cd ${srcdir}/${pkgname}-${pkgver} - - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc + [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-libwrap make } package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # Config files mkdir -p ${pkgdir}/etc/conf.d cp example/{socks,sockd}.conf ${pkgdir}/etc - # License install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - # rc-script install -D -m755 ${srcdir}/sockd.rc ${pkgdir}/etc/rc.d/sockd echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index bf47efead..1e72b3f35 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47199 2011-05-18 20:06:50Z jelle $ +# $Id: PKGBUILD 51710 2011-07-13 12:57:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -12,19 +12,16 @@ url="http://tools.suckless.org/dmenu/" arch=('i686' 'x86_64') license=('MIT') depends=('sh' 'libxinerama') -#source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") -source=("$pkgname-$pkgver.tar.gz::http://hg.suckless.org/dmenu/archive/tip.tar.gz") -md5sums=('a0e253e2a38c96f7bfd80b23a9ba6a12') +source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") +md5sums=('6b619f6901bf4765442b4e410b1e5410') build(){ -# cd $srcdir/$pkgname-$pkgver - cd `find $srcdir -type d -name dmenu-\*` + cd $srcdir/$pkgname-$pkgver make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 } package() { -# cd $srcdir/$pkgname-$pkgver - cd `find $srcdir -type d -name dmenu-\*` + cd $srcdir/$pkgname-$pkgver make PREFIX=/usr DESTDIR=$pkgdir install install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/dopewars/PKGBUILD b/community/dopewars/PKGBUILD index 2fe81262b..bb04e7fc9 100644 --- a/community/dopewars/PKGBUILD +++ b/community/dopewars/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 19596 2008-11-28 02:08:18Z thayer $ +# $Id: PKGBUILD 51778 2011-07-14 18:25:43Z schuay $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Jeff Mickey <jeff@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Maintainer: schuay <jakob.gruber@gmail.com pkgname=dopewars pkgver=1.5.12 -pkgrel=4 -pkgdesc="dopewars is a Drug dealing game set in New York" +pkgrel=5 +pkgdesc="A drug dealing game set in New York" url="http://dopewars.sourceforge.net/" license=('GPL') arch=('i686' 'x86_64') -depends=('gtk2>=2.12.11' 'alsa-lib' 'audiofile' 'esd' 'sdl_mixer' 'ncurses>=5.6-7') +depends=('gtk2' 'alsa-lib' 'audiofile' 'esd' 'sdl_mixer' 'ncurses') install='dopewars.install' source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('debf749de9053dc2fb2e74c37ae06206') @@ -19,9 +20,13 @@ build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --localstatedir=/var/games \ - --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + --mandir=/usr/share/man + make +} +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install # setup shortcut menu entries mkdir -p $pkgdir/usr/share/applications diff --git a/community/enigma/PKGBUILD b/community/enigma/PKGBUILD index cd93db215..d29811b7f 100644 --- a/community/enigma/PKGBUILD +++ b/community/enigma/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 9152 2008-08-17 04:18:00Z allan $ +# $Id: PKGBUILD 51773 2011-07-14 18:20:30Z schuay $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Jason Chu <jason@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> +# Maintainer: schuay <jakob.gruber@gmail.com> pkgname=enigma pkgver=1.04 -pkgrel=2 +pkgrel=3 pkgdesc=" Enigma is a puzzle game involving falling blocks" arch=('i686' 'x86_64') url="http://www.chiark.greenend.org.uk/~sgtatham/enigma/" license=('custom') depends=('ncurses') -source=(http://www.chiark.greenend.org.uk/~sgtatham/enigma/$pkgname-$pkgver.tar.gz) +source=("http://www.chiark.greenend.org.uk/~sgtatham/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('a54ee9ae40dae781560a3c2b1ce8f45d') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --localstatedir=/var sed -i "s/root\.games/root.root/" Makefile - mkdir -p $startdir/pkg/usr/bin - make || return 1 - make prefix=$startdir/pkg/usr localstatedir=$startdir/pkg/var install - install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/enigma/license + make +} +package() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/bin + make prefix=$pkgdir/usr localstatedir=$pkgdir/var install + install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/license } diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 1b3d364f0..5b69d0db0 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 47452 2011-05-23 15:07:24Z tdziedzic $ +# $Id: PKGBUILD 51749 2011-07-14 06:47:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius -pkgver=2.1.10 -pkgrel=7 +pkgver=2.1.11 +pkgrel=1 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" license=("GPL") -depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' \ +depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow') optdepends=('libpcap' 'unixodbc' 'python2') options=('!libtool' 'emptydirs' '!makeflags') install=$pkgname.install -source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 \ +source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 radiusd krb5-build-fix.patch) -md5sums=('8ea2bd39460a06212decf2c14fdf3fb8' +md5sums=('96b21a95117d8ebde689c4c13c028d30' 'f1a6530b1b69d2fa793aa45b2de379bb' 'c6a61de7576933f59154a53bfc12a2d2') diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD index fdaa7d9b1..9c1767d95 100644 --- a/community/mailutils/PKGBUILD +++ b/community/mailutils/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 34299 2010-12-05 22:48:06Z spupykin $ +# $Id: PKGBUILD 51689 2011-07-13 08:09:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=mailutils pkgver=2.2 -pkgrel=1 +pkgrel=2 pkgdesc="MUA command line tool (mailx)" arch=(i686 x86_64) url="http://www.gnu.org/software/mailutils/" license=('GPL') -depends=(libldap tcp_wrappers pam gnutls guile) -makedepends=('python2') +depends=('libldap' 'pam' 'gnutls' 'guile') +makedepends=('python2' 'emacs') optdepends=('python2') -conflicts=(libsieve) +conflicts=('libsieve') +install=mailutils.install options=(zipman !emptydirs) source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2) md5sums=('834d2f616b922856127ecfe6c2de7d1a') @@ -20,17 +21,24 @@ md5sums=('834d2f616b922856127ecfe6c2de7d1a') build() { cd "$srcdir/mailutils-$pkgver" + py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` + py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` + export PYTHON=/usr/bin/python2 export PYTHON_CONFIG=/usr/bin/python2-config - [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls --libexecdir=/usr/lib/$pkgname --without-fribidi + export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`" + export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`" - py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` - py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` + [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ + --libexecdir=/usr/lib/$pkgname --without-fribidi \ + --without-tcp-wrappers # [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \; - make -j1 - make -j1 DESTDIR=$pkgdir install +} +package() { + cd "$srcdir/mailutils-$pkgver" + make -j1 DESTDIR=$pkgdir install rm -f $pkgdir/usr/share/info/dir mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1 diff --git a/community/mailutils/mailutils.install b/community/mailutils/mailutils.install new file mode 100644 index 000000000..03b451b3e --- /dev/null +++ b/community/mailutils/mailutils.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(mailutils.info mailutils.info-1 mailutils.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/community/newton-dynamics/PKGBUILD b/community/newton-dynamics/PKGBUILD new file mode 100644 index 000000000..93a578450 --- /dev/null +++ b/community/newton-dynamics/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Josh Taylor (deficite) <joshtaylor.mail@gmail.com> +# Contributor: Christophe Robin (bombstrike) <crobin@php.net> +pkgname=newton-dynamics +pkgver=2.33 +pkgrel=1 +pkgdesc="A simple physics API" +arch=('i686' 'x86_64') +url="http://www.newtondynamics.com" +license=('custom') +depends=() +makedepends=('unrar') +source=("http://newton-dynamics.googlecode.com/files/newton-dynamics-${pkgver}.rar" + 'assert-fix.patch') +md5sums=('b8394c7c3f4e8a1bd41ffa07c5979a9e' + 'fa747c99d0516d66f03175fca1f1ba34') + +build() { + _srcdir="${srcdir}/newton-dynamics-${pkgver}" + [ "$CARCH" = "i686" ] && platform="linux32" + [ "$CARCH" = "x86_64" ] && platform="linux64" + builddir="${_srcdir}/coreLibrary_200/projets/${platform}" + + # clean build directory + [ -d "${_srcdir}" ] && rm -Rf "${_srcdir}" + + # decompress package + cd "${srcdir}" + unrar x "newton-dynamics-${pkgver}.rar" + + # needed for building + mkdir -p "${_srcdir}/packages/${platform}" + + # patch issue with an _ASSERT call instead of _ASSERTE + cd "${_srcdir}/coreLibrary_200" + patch -p0 < "${srcdir}/assert-fix.patch" + + ## build lib + cd "${builddir}" + make + + install -D -m644 "${builddir}/libNewton.a" "${pkgdir}/usr/lib/libNewton.a" + install -D -m755 "${builddir}/libNewton.so" "${pkgdir}/usr/lib/libNewton.so" + install -D -m644 "${_srcdir}/coreLibrary_200/source/newton/Newton.h" "${pkgdir}/usr/include/Newton.h" +} diff --git a/community/newton-dynamics/assert-fix.patch b/community/newton-dynamics/assert-fix.patch new file mode 100644 index 000000000..83dfdd790 --- /dev/null +++ b/community/newton-dynamics/assert-fix.patch @@ -0,0 +1,13 @@ +Index: source/core/dgTypes.cpp +=================================================================== +--- source/core/dgTypes.cpp (revision 506) ++++ source/core/dgTypes.cpp (working copy) +@@ -515,7 +515,7 @@ + return 0;
+ }
+ _ASSERTE (compareCount <= dgInt32 (strideInBytes / sizeof (dgFloat64)));
+- _ASSERT (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));
++ _ASSERTE (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));
+
+ dgInt32 stride = strideInBytes / dgInt32 (sizeof (dgFloat64));
+ dgInt32 stride2 = stride + 2;
diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index 5f5f3c55b..3b4d7f374 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -3,7 +3,7 @@ pkgname=nut pkgver=16.13 -pkgrel=1 +pkgrel=2 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') @@ -15,7 +15,9 @@ build() { cd ${pkgname}-${pkgver} # change install path to /usr instead of /usr/local - sed -i 's#local/##' Makefile + sed \ + -e 's#/local##' \ + -i Makefile make } diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index b18a77c40..e7e2472cb 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49091 2011-06-10 19:39:21Z ttopper $ +# $Id: PKGBUILD 51754 2011-07-14 08:47:32Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=0.96.1 +pkgver=0.97.0 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('0782f552cdf786290ab9b4defd1d65869c5ff08f') +sha1sums=('e9cc474449cc38f5efa512adad979bd6f15b4309') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index 7453cb70b..a08f746ec 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound -pkgver=1.4.10 +pkgver=1.4.12 pkgrel=1 pkgdesc='Validating, recursive, and caching DNS resolver' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/$pkgname-$pkgver.tar.gz" 'unbound.conf' 'rc.d') -sha1sums=('ac9ab61a51e147ade69ca8b043fee2ed76336a62' +sha1sums=('c46c05d1fa2402a59c10f51864fd4c62d10a472f' '5d473ec2943fd85367cdb653fcd58e186f07383f' 'a0c8c496d71d43ed9e09b170d3df836dfb096480') diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index f7b59df10..ee0c7a48e 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43267 2011-03-24 12:25:34Z spupykin $ +# $Id: PKGBUILD 51680 2011-07-13 07:32:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura -pkgver=0.0.8.3 +pkgver=0.0.8.4 pkgrel=1 pkgdesc="a PDF viewer" arch=('i686' 'x86_64') @@ -13,19 +13,18 @@ depends=('poppler-glib' 'gtk2' 'cairo') install=zathura.install DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') -source=(https://pwmt.org/download/zathura-$pkgver.tar.gz - zathura.desktop - zathura-poppler-0.16.patch) -md5sums=('95b1d02593e7055f08da3825ad54954d' - '53da4968621934e7d9812380a3a37ee1' - 'fa9f43b1a785743b4f9b840d1f234bae') +source=(https://pwmt.org/download/zathura-$pkgver.tar.gz) +md5sums=('e3a7f82401059e591ed549d615f53ddd') build() { cd $srcdir/zathura-$pkgver -# patch -Np1 -i $srcdir/zathura-poppler-0.16.patch make +} + +package() { + cd $srcdir/zathura-$pkgver install -D -m775 zathura "$pkgdir/usr/bin/zathura" install -D -m664 zathura.1 "$pkgdir/usr/share/man/man1/zathura.1" install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -D -m664 $srcdir/zathura.desktop "$pkgdir/usr/share/applications/zathura.desktop" + install -D -m664 zathura.desktop "$pkgdir/usr/share/applications/zathura.desktop" } diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD index 2edabc2f0..6c00f0dc4 100644 --- a/core/usbutils/PKGBUILD +++ b/core/usbutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123172 2011-05-09 02:20:17Z allan $ +# $Id: PKGBUILD 130339 2011-07-05 15:17:16Z tpowa $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> pkgname=usbutils -pkgver=002 -pkgrel=3 +pkgver=003 +pkgrel=1 _usb_ids_date=2011.04.14 pkgdesc="USB Device Utilities" arch=(i686 x86_64) @@ -17,9 +17,6 @@ url="http://linux-usb.sourceforge.net/" source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz fix-python2.patch usb.ids-${_usb_ids_date}) # from http://linux-usb.sourceforge.net/usb.ids -md5sums=('05610d15c3c8c8ada3d691c320ca784a' - '45766196895b4cc50b53cd56e1bbf3d1' - 'd64f120c208ca742d3a1d05d84e3f531') build() { cd $srcdir/$pkgname-$pkgver @@ -38,3 +35,6 @@ package() { install -dm755 $pkgdir/usr/lib mv $pkgdir/usr/share/pkgconfig $pkgdir/usr/lib/ } +md5sums=('94a1738fe92062cdd6a9642eeaccefc1' + '45766196895b4cc50b53cd56e1bbf3d1' + 'd64f120c208ca742d3a1d05d84e3f531') diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index d33875673..3dadd0b5d 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127783 2011-06-18 10:36:42Z remy $ +# $Id: PKGBUILD 131761 2011-07-14 17:10:17Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Firmicus <francois.archlinux.org> # Contributor: bender02 at gmx dot com pkgname=asymptote -pkgver=2.11 +pkgver=2.13 pkgrel=1 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('python2: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install -sha1sums=('fde16f05bddb9e86a4dd05f25369f35c771fb84b') +sha1sums=('b4f2b72c0a4e7a02b716bfd0ad64bab45c567bbd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index b9f3effa8..753d439df 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129509 2011-06-28 15:26:54Z andyrtr $ +# $Id: PKGBUILD 131768 2011-07-14 19:06:35Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.4.7 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" @@ -105,7 +105,7 @@ optdepends=('php: for included phpcups.so module' # kill the sysv stuff rm -rf ${pkgdir}/etc/rc*.d rm -rf ${pkgdir}/etc/init.d - install -D -m755 ../cups ${pkgdir}/etc/rc.d/cups + install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups diff --git a/extra/cups/cups.install b/extra/cups/cups.install index c4307912b..0b7245aa7 100644 --- a/extra/cups/cups.install +++ b/extra/cups/cups.install @@ -12,6 +12,11 @@ post_upgrade() { if [ -x usr/bin/xdg-icon-resource ]; then xdg-icon-resource forceupdate --theme hicolor 2> /dev/null fi + if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then + # important upgrade notice + echo "daemon srcript has been renamed to /etc/rc.d/cupsd" + echo "change your entry in /etc/rc.conf" + fi } post_remove() { diff --git a/extra/dvgrab/PKGBUILD b/extra/dvgrab/PKGBUILD index cb1cef1e2..13f366a06 100644 --- a/extra/dvgrab/PKGBUILD +++ b/extra/dvgrab/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 63911 2010-01-19 01:19:21Z andrea $ +# $Id: PKGBUILD 131663 2011-07-13 13:39:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=dvgrab pkgver=3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Saves audio and video data from an IEEE (FireWire) digital source" arch=('i686' 'x86_64') url="http://www.kinodv.org" license=('GPL') -depends=('libdv' 'libavc1394' 'libjpeg>=8' 'libiec61883' 'gcc-libs') +depends=('libdv' 'libavc1394' 'libjpeg-turbo' 'libiec61883' 'gcc-libs') makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/kino/${pkgname}-${pkgver}.tar.gz) +source=("http://downloads.sourceforge.net/kino/${pkgname}-${pkgver}.tar.gz") md5sums=('b39a242ce63e80fc347ab59931f75649') build() { cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index ac5e5f98f..cb697cfd8 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 125903 2011-05-31 16:34:54Z ibiru $ +# $Id: PKGBUILD 131658 2011-07-13 12:36:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm pkgver=3.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64') license=('GPL') @@ -10,7 +10,7 @@ url="http://www.gnome.org" backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf') groups=('gnome-extra') options=('!libtool') -depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb') +depends=('libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb') makedepends=('intltool' 'gnome-doc-utils' 'xorg-server') conflicts=('fast-user-switch-applet') replaces=('fast-user-switch-applet') @@ -34,9 +34,12 @@ build() { patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gdm \ + --localstatedir=/var \ --with-at-spi-registryd-directory=/usr/lib/at-spi \ - --disable-scrollkeeper + --disable-scrollkeeper \ + --disable-static \ + --without-tcp-wrappers make } diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD index 4cc6d4027..ed65bc42a 100644 --- a/extra/gnome-python-extras/PKGBUILD +++ b/extra/gnome-python-extras/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131183 2011-07-11 14:53:15Z ibiru $ +# $Id: PKGBUILD 131702 2011-07-13 15:39:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gnome-python-extras pkgname=('gnome-python-extras' 'python2-egg' 'python2-gda' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') pkgver=2.25.3 -pkgrel=9 +pkgrel=10 arch=('i686' 'x86_64') url="http://www.daa.com.au/~james/pygtk/" license=('GPL' 'LGPL') diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index ee5284faf..525dd9a65 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124968 2011-05-25 13:58:20Z giovanni $ +# $Id: PKGBUILD 131671 2011-07-13 13:59:50Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.39.4 +pkgver=1.40.4 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('6b1160697451ba87067231d172285840') +md5sums=('4d79dc7cb7c20019c2a3650d35259c45') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index 227b4f85f..4953ba703 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=git20110620 -_commit=1a04682c18a6029132ab1c520b1fec2f4e609854 +pkgver=git20110713 +_commit=ac332a3e9f6e8ae7427e017b5826e51789437949 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info') optdepends=('mobile-broadband-provider-info: allow to add new mobile connection') install=${pkgname}.install source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('5fc1d5300d04375dd8bfaf39fc590cca') +md5sums=('e367743c72b072ae6d1b6988a3bc4406') build() { cd "${srcdir}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 299cd11c8..1766ef232 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129953 2011-06-30 15:40:13Z giovanni $ +# $Id: PKGBUILD 131676 2011-07-13 14:16:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.06.16 +pkgver=2011.07.08 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('9895e723ee9fe87422f120dc646875d5') +md5sums=('527ebb1061ed1c2b439b02bd26e52440') build() { cd ${srcdir}/live diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 21ff40fe7..b88a9edbc 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,38 +1,39 @@ -# $Id: PKGBUILD 131039 2011-07-09 20:49:15Z stephane $ +# $Id: PKGBUILD 131750 2011-07-14 12:35:49Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave pkgver=3.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" license=('GPL') depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull') -makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack') +makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting' 'umfpack: LU decomposition of some large sparse matrices') -source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2") +source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" "curlfix.patch") options=('!emptydirs') -#install=octave.install -sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5') - +install=octave.install +sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5' + '3f856798f5f8aa15bce1200b8abd059154f3d909') + build() { cd ${srcdir}/${pkgname}-${pkgver} + # remove curl/types.h include + patch -Np0 -i ${srcdir}/curlfix.patch + # http://www.nabble.com/Random-rounding-errors-td16010966.html FFLAGS="-O -ffloat-store" \ - # Avoid build failure due to missing curl/types.h - sed -i "/curl\/types.h/d" src/DLD-FUNCTIONS/urlwrite.cc - ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static --disable-docs + --enable-shared --disable-static - make + LANG=C make } package(){ diff --git a/extra/octave/curlfix.patch b/extra/octave/curlfix.patch new file mode 100644 index 000000000..26f3d92f9 --- /dev/null +++ b/extra/octave/curlfix.patch @@ -0,0 +1,10 @@ +--- src/DLD-FUNCTIONS/urlwrite.cc.old 2011-07-02 16:39:22.466603778 +0200 ++++ src/DLD-FUNCTIONS/urlwrite.cc 2011-07-02 16:39:54.543269859 +0200 +@@ -52,7 +52,6 @@ + + #include <curl/curl.h> + #include <curl/curlver.h> +-#include <curl/types.h> + #include <curl/easy.h> + + static int diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD index d44eddf2a..40e52f634 100644 --- a/extra/perl-fcgi/PKGBUILD +++ b/extra/perl-fcgi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125303 2011-05-25 19:27:52Z remy $ +# $Id: PKGBUILD 131681 2011-07-13 14:35:40Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-fcgi -pkgver=0.72 +pkgver=0.73 pkgrel=1 pkgdesc="Fast CGI" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl>=5.14') options=('!emptydirs') source=(http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz) -md5sums=('7b793e177caa93d972c6fb7ebe7c7ae1') +md5sums=('b55c8b93ccd175b3c0e4473f1a6c0bdd') build() { cd "${srcdir}/FCGI-${pkgver}" diff --git a/extra/perl-time-hires/PKGBUILD b/extra/perl-time-hires/PKGBUILD index db9ddcb7f..c7bc5a1bd 100644 --- a/extra/perl-time-hires/PKGBUILD +++ b/extra/perl-time-hires/PKGBUILD @@ -1,25 +1,35 @@ -# $Id: PKGBUILD 125291 2011-05-25 19:23:52Z foutrelis $ +# $Id: PKGBUILD 131686 2011-07-13 14:46:13Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: mezcal <fila at pruda dot com> pkgname=perl-time-hires -pkgver=1.9721 -pkgrel=4 +pkgver=1.9724 +pkgrel=1 pkgdesc="Perl module: high resolution time, sleep, and alarm" arch=('i686' 'x86_64') license=('PerlArtistic') url="http://search.cpan.org/dist/Time-HiRes/" depends=('perl') options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/J/JH/JHI/Time-HiRes-${pkgver}.tar.gz) -md5sums=('bf09911a36b9481537c8e0d28fbb3aaf') +source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Time-HiRes-${pkgver}.tar.gz") +md5sums=('6467b001de9ba5c01785ebbb8ea247cb') build() { cd "${srcdir}/Time-HiRes-${pkgver}" - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make - make test - make install DESTDIR="${pkgdir}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +check() { + cd "${srcdir}/Time-HiRes-${pkgver}" + + make test +} + +package() { + cd "${srcdir}/Time-HiRes-${pkgver}" + + make install DESTDIR="${pkgdir}" } diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD index 6252fc40c..c4b3adcc9 100644 --- a/extra/putty/PKGBUILD +++ b/extra/putty/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 57024 2009-10-31 09:56:01Z allan $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Andreas Schweitzer <andy@bootblock.de> -# with ideas by Michael Baehr +# $Id: PKGBUILD 131725 2011-07-14 01:51:53Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=putty -pkgver=0.60 -pkgrel=2 -pkgdesc="A terminal integrated SSH/Telnet client known from Windows." +pkgver=0.61 +pkgrel=1 +pkgdesc="A terminal integrated SSH/Telnet client" arch=('i686' 'x86_64') url="http://www.chiark.greenend.org.uk/~sgtatham/putty/" -license=('custom') -depends=('gtk') -#source=(ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/$pkgname-$pkgver.tar.gz) -source=("http://the.earth.li/~sgtatham/putty/latest/putty-$pkgver.tar.gz") -md5sums=('07e65fd98b16d115ae38a180bfb242e2') +license=('MIT') +depends=('gtk2') +source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz) +md5sums=('db0e37f6b82ea62f0ace87927d29b2a4') +sha1sums=('cbb82fd392142e3455e859ca8bc7b1e61b246204') build() { - export CFLAGS="$CFLAGS -fno-strict-aliasing" - cd $srcdir/$pkgname-$pkgver/unix + cd "${srcdir}/${pkgname}-${pkgver}/unix" ./configure --prefix=/usr - make || return 1 - install -dm755 $pkgdir/usr/{bin,share/man/man1} - make DESTDIR=$pkgdir install - install -D -m644 ../LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENSE + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/unix" + make DESTDIR="${pkgdir}" install + install -D -m644 ../LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/screen/PKGBUILD b/extra/screen/PKGBUILD index 0a1383e22..c22d539c2 100644 --- a/extra/screen/PKGBUILD +++ b/extra/screen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 114599 2011-03-14 13:43:00Z allan $ +# $Id: PKGBUILD 131720 2011-07-14 01:42:52Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: dorphell <dorphell@gmx.net> pkgname=screen pkgver=4.0.3 -pkgrel=11 +pkgrel=12 _ptygroup=5 #the UID of our PTY/TTY group pkgdesc="Full-screen window manager that multiplexes a physical terminal" arch=('i686' 'x86_64') @@ -30,7 +30,8 @@ build() { ./configure --prefix=/usr --enable-pam \ --with-sys-screenrc=/etc/screenrc --enable-colors256 \ - --enable-rxvt_osc --with-pty-group=$_ptygroup \ + --enable-rxvt_osc --enable-telnet \ + --with-pty-group=$_ptygroup \ --mandir=/usr/share/man --infodir=/usr/share/info make } diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 9d0fb81ae..280cd0fcd 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 116040 2011-03-22 16:37:49Z giovanni $ +# $Id: PKGBUILD 131691 2011-07-13 14:56:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=0.10.10 +pkgver=0.10.70 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'docbook-xsl') install=smb4k.install source=("http://download.berlios.de/smb4k/${pkgname}-${pkgver}.tar.bz2") -md5sums=('637ca913ffe9ac24a4dd09d4eddf0dcf') +md5sums=('30f916d8f72fc43a9eca8f344960b43a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/sshfs/PKGBUILD b/extra/sshfs/PKGBUILD index 4a29c7d84..7f3d85374 100644 --- a/extra/sshfs/PKGBUILD +++ b/extra/sshfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68119 2010-02-10 20:04:33Z giovanni $ +# $Id: PKGBUILD 131653 2011-07-13 12:06:33Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=sshfs -pkgver=2.2 -pkgrel=3 +pkgver=2.3 +pkgrel=1 pkgdesc="FUSE client based on the SSH File Transfer Protocol" arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/sshfs.html" @@ -11,12 +11,17 @@ license=('GPL') depends=('fuse' 'glib2' 'openssh') makedepends=('pkgconfig') source=(http://downloads.sourceforge.net/sourceforge/fuse/${pkgname}-fuse-${pkgver}.tar.gz) -md5sums=('26e9206eb5169e87e6f95f54bc005a4f') +md5sums=('f72f12fda186dbd92382f70d25662ed3') build() { cd "${srcdir}/${pkgname}-fuse-${pkgver}" ./configure --prefix=/usr - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-fuse-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index 5e6212119..e06a2caa9 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51582 2011-07-11 18:59:50Z lcarlier $ +# $Id: PKGBUILD 51770 2011-07-14 11:51:51Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgbase=lib32-mesa -pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' -'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri') +pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' + 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri') _git=true #_git=false @@ -16,7 +16,7 @@ if [ "${_git}" = "true" ]; then pkgver=7.11rc1 fi -pkgrel=2 +pkgrel=3 arch=(x86_64) makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm') @@ -25,8 +25,8 @@ license=('custom') if [ "${_git}" = "true" ]; then # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 #source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') - source=(git_fixes.patch "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-b033f050fd5179b051181a0a4b6d94110624d25c.tar.bz2") - md5sums=('62b7e9591737846ff0e98f970ffc8b78' '2246d97eb0cfb1f6d2bf8a54b533d07f') + source=(linking_fix.patch "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") + md5sums=('887be83c01d126c2a4cb372af7d3b067' '817a63bb60b81f4f817ffc9ed0a3dddd') else source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc1/}/MesaLib-${pkgver/rc/-rc}.zip") md5sums=('2246d97eb0cfb1f6d2bf8a54b533d07f') @@ -46,7 +46,7 @@ build() { autoreconf -vfi if [ "${_git}" = "true" ]; then - patch -Np1 -i ${srcdir}/git_fixes.patch + patch -Np1 -i ${srcdir}/linking_fix.patch ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ --with-gallium-drivers=r300,r600,nouveau,swrast \ @@ -64,7 +64,6 @@ build() { --enable-32-bit \ --libdir=/usr/lib32 # --enable-gallium-svga \ - # --enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no] else ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ @@ -88,7 +87,7 @@ build() { } package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'libgl') + depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" cd ${srcdir}/?esa-* @@ -108,8 +107,20 @@ package_lib32-libgl() { ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl" } +package_lib32-libglapi() { + depends=('lib32-glibc' 'libglapi') + pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib32" + bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/" + + install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" + ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi" +} + package_lib32-libgles() { - depends=('libgles') + depends=('lib32-libglapi' 'libgles') pkgdesc="Mesa GLES libraries (32-bit)" cd ${srcdir}/?esa-* @@ -124,7 +135,7 @@ package_lib32-libgles() { } package_lib32-libegl() { - depends=('lib32-udev' 'libegl') + depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl') pkgdesc="Mesa libEGL libraries (32-bit)" cd ${srcdir}/?esa-* @@ -142,13 +153,14 @@ package_lib32-libegl() { } package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.26' 'lib32-gcc-libs>=4.6.1' 'mesa') + depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa') pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" cd ${srcdir}/?esa-* make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/lib32/libGL.so"* + rm -f "${pkgdir}/usr/lib32/libglapi.so"* rm -f "${pkgdir}/usr/lib32/libGLESv"* rm -f "${pkgdir}/usr/lib32/libEGL"* rm -rf "${pkgdir}/usr/lib32/egl" @@ -165,10 +177,9 @@ package_lib32-ati-dri() { conflicts=('xf86-video-ati<6.9.0-6') cd ${srcdir}/?esa-*/src/mesa/drivers/dri + # classic mesa drivers for radeon,r200 make -C radeon DESTDIR="${pkgdir}" install make -C r200 DESTDIR="${pkgdir}" install - - # DRI drivers for r300 and r600 are removed # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install @@ -178,18 +189,16 @@ package_lib32-intel-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel (32-bit)" - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C i810 DESTDIR="${pkgdir}" install - make -C i915 DESTDIR="${pkgdir}" install - make -C i965 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install } package_lib32-unichrome-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)" - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C unichrome DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install } package_lib32-mach64-dri() { @@ -197,8 +206,7 @@ package_lib32-mach64-dri() { pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)" conflicts=('xf86-video-mach64<6.8.2') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C mach64 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install } package_lib32-mga-dri() { @@ -206,8 +214,7 @@ package_lib32-mga-dri() { pkgdesc="Mesa DRI drivers for Matrox (32-bit)" conflicts=('xf86-video-mga<1.4.11') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C mga DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install } package_lib32-r128-dri() { @@ -215,8 +222,7 @@ package_lib32-r128-dri() { pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)" conflicts=('xf86-video-r128<6.8.1') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C r128 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install } package_lib32-savage-dri() { @@ -224,8 +230,7 @@ package_lib32-savage-dri() { pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)" conflicts=('xf86-video-savage<2.3.1') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C savage DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install } package_lib32-sis-dri() { @@ -233,8 +238,7 @@ package_lib32-sis-dri() { pkgdesc="Mesa DRI drivers for SiS (32-bit)" conflicts=('xf86-video-sis<0.10.2') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C sis DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install } package_lib32-tdfx-dri() { @@ -242,17 +246,15 @@ package_lib32-tdfx-dri() { pkgdesc="Mesa DRI drivers for 3dfx (32-bit)" conflicts=('xf86-video-tdfx<1.4.3') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C tdfx DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install } package_lib32-nouveau-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)" - cd ${srcdir}/?esa-*/src/mesa/drivers/dri # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C nouveau DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install } diff --git a/multilib-testing/lib32-mesa/linking_fix.patch b/multilib-testing/lib32-mesa/linking_fix.patch new file mode 100644 index 000000000..34ed7902d --- /dev/null +++ b/multilib-testing/lib32-mesa/linking_fix.patch @@ -0,0 +1,22 @@ +From 5fe5d236c26b3b2428bc7395304e40cf21d3d3e1 Mon Sep 17 00:00:00 2001 +From: Chia-I Wu <olv@lunarg.com> +Date: Wed, 13 Jul 2011 07:25:46 +0000 +Subject: targets/egl-static: fix a linking error + +rbug is always linked in and it needs libpthread. +--- +diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile +index 832d7ba..69e7eec 100644 +--- a/src/gallium/targets/egl-static/Makefile ++++ b/src/gallium/targets/egl-static/Makefile +@@ -42,7 +42,7 @@ egl_CPPFLAGS += \ + -I$(TOP)/src/egl/main \ + -D_EGL_MAIN=_eglMain + egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a +-egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm ++egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -lpthread + + # EGL platforms + ifneq ($(findstring x11, $(EGL_PLATFORMS)),) +-- +cgit v0.8.3-6-g21f6 diff --git a/staging/mysql/PKGBUILD b/staging/mysql/PKGBUILD new file mode 100644 index 000000000..54248034e --- /dev/null +++ b/staging/mysql/PKGBUILD @@ -0,0 +1,130 @@ +# $Id: PKGBUILD 131641 2011-07-13 07:03:22Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgbase=mysql +pkgname=('libmysqlclient' 'mysql-clients' 'mysql') +pkgver=5.5.14 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.mysql.com/" +makedepends=('cmake' 'openssl' 'zlib') +options=('!libtool') +source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" + 'mysqld' + 'my.cnf') +md5sums=('19f43bb9c72b1b5f7ff86a7f921c9244' + '2234207625baa29b2ff7d7b4f088abce' + '1c949c0dbea5206af0db14942d9927b6') + +build() { + cd "${srcdir}" + mkdir build + cd build + + # CFLAGS/CXXFLAGS as suggested upstream + CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ + + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ + -DDEFAULT_CHARSET=utf8 \ + -DDEFAULT_COLLATION=utf8_general_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/mysql/docs \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_DOCREADMEDIR=share/mysql \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_DOCDIR=share/mysql/docs \ + -DINSTALL_SHAREDIR=share/mysql \ + -DWITH_READLINE=ON \ + -DWITH_ZLIB=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + + make +} + +package_libmysqlclient(){ + pkgdesc="MySQL client libraries" + depends=('openssl') + + cd "${srcdir}"/build + for dir in include libmysql libmysqld libservices; do + make -C ${dir} DESTDIR="${pkgdir}" install + done + + install -d "${pkgdir}"/usr/bin + install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ + install -d "${pkgdir}"/usr/share/man/man1 + for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done +} + +package_mysql-clients(){ + pkgdesc="MySQL client tools" + depends=('libmysqlclient') + + cd "${srcdir}"/build + make -C client DESTDIR="${pkgdir}" install + + # install man pages + install -d "${pkgdir}"/usr/share/man/man1 + for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done + + # provided by mysql + rm "${pkgdir}"/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest} +} + +package_mysql(){ + pkgdesc="A fast SQL database server" + backup=('etc/mysql/my.cnf') + install=mysql.install + depends=('mysql-clients' 'net-tools') + optdepends=('perl-dbi' 'perl-dbd-mysql') + options=('emptydirs') + + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf + install -Dm755 "${srcdir}"/mysqld "${pkgdir}"/etc/rc.d/mysqld + + # provided by libmysqlclient + rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} + rm "${pkgdir}"/usr/lib/libmysql* + rm -r "${pkgdir}"/usr/include/ + rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + + # provided by mysql-clients + rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + + # not needed + rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench} + rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 + + install -dm700 "${pkgdir}"/var/lib/mysql +} diff --git a/staging/mysql/my.cnf b/staging/mysql/my.cnf new file mode 100644 index 000000000..9a41b4fc3 --- /dev/null +++ b/staging/mysql/my.cnf @@ -0,0 +1,145 @@ +# MySQL config file for medium systems. +# +# This is for a system with little memory (32M - 64M) where MySQL plays +# an important part, or systems up to 128M where MySQL is used together with +# other programs (such as a web server) +# +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html +# +# In this file, you can use all long options that a program supports. +# If you want to know which options a program supports, run the program +# with the "--help" option. + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here follows entries for some specific programs + +# The MySQL server +[mysqld] +port = 3306 +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 1M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +# Don't listen on a TCP/IP port at all. This can be a security enhancement, +# if all processes that need to connect to mysqld run on the same host. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +skip-networking + +# Replication Master Server (default) +# binary logging is required for replication +log-bin=mysql-bin + +# binary logging format - mixed recommended +binlog_format=mixed + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted +server-id = 1 + +# Replication Slave (comment out master section to use this) +# +# To configure this host as a replication slave, you can choose between +# two methods : +# +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - +# the syntax is: +# +# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, +# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; +# +# where you replace <host>, <user>, <password> by quoted strings and +# <port> by the master's port number (3306 by default). +# +# Example: +# +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, +# MASTER_USER='joe', MASTER_PASSWORD='secret'; +# +# OR +# +# 2) Set the variables below. However, in case you choose this method, then +# start replication for the first time (even unsuccessfully, for example +# if you mistyped the password in master-password and the slave fails to +# connect), the slave will create a master.info file, and any later +# change in this file to the variables' values below will be ignored and +# overridden by the content of the master.info file, unless you shutdown +# the slave server, delete master.info and restart the slaver server. +# For that reason, you may want to leave the lines below untouched +# (commented) and instead use CHANGE MASTER TO (see above) +# +# required unique id between 2 and 2^32 - 1 +# (and different from the master) +# defaults to 2 if master-host is set +# but will not function as a slave if omitted +#server-id = 2 +# +# The replication master for this slave - required +#master-host = <hostname> +# +# The username the slave will use for authentication when connecting +# to the master - required +#master-user = <username> +# +# The password the slave will authenticate with when connecting to +# the master - required +#master-password = <password> +# +# The port the master is listening on. +# optional - defaults to 3306 +#master-port = <port> +# +# binary logging - not required for slaves, but recommended +#log-bin=mysql-bin + +# Uncomment the following if you are using InnoDB tables +#innodb_data_home_dir = /var/lib/mysql +#innodb_data_file_path = ibdata1:10M:autoextend +#innodb_log_group_home_dir = /var/lib/mysql +# You can set .._buffer_pool_size up to 50 - 80 % +# of RAM but beware of setting memory usage too high +#innodb_buffer_pool_size = 16M +#innodb_additional_mem_pool_size = 2M +# Set .._log_file_size to 25 % of buffer pool size +#innodb_log_file_size = 5M +#innodb_log_buffer_size = 8M +#innodb_flush_log_at_trx_commit = 1 +#innodb_lock_wait_timeout = 50 + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +no-auto-rehash +# Remove the next comment character if you are not familiar with SQL +#safe-updates + +[myisamchk] +key_buffer_size = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/staging/mysql/mysql.install b/staging/mysql/mysql.install new file mode 100644 index 000000000..9a4479215 --- /dev/null +++ b/staging/mysql/mysql.install @@ -0,0 +1,26 @@ +post_install(){ + groupadd -g 89 mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + usr/bin/mysql_install_db --user=mysql --basedir=/usr + chown -R mysql:mysql var/lib/mysql &>/dev/null +} + +post_upgrade(){ + getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + + if [ "$(vercmp $2 5.5)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} + +post_remove(){ + if getent passwd mysql >/dev/null 2>&1; then + userdel mysql + fi + if getent group mysql >/dev/null 2>&1; then + groupdel mysql + fi +} diff --git a/staging/mysql/mysqld b/staging/mysql/mysqld new file mode 100755 index 000000000..1ac88a7cc --- /dev/null +++ b/staging/mysql/mysqld @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MySQL Server" + [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MySQL Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/net-snmp/PKGBUILD b/staging/net-snmp/PKGBUILD new file mode 100644 index 000000000..a1f72cb01 --- /dev/null +++ b/staging/net-snmp/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 131650 2011-07-13 08:13:14Z andrea $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Dale Blount <dale@archlinux.org> + +pkgname=net-snmp +pkgver=5.6.1 +pkgrel=3 +pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" +arch=('i686' 'x86_64') +url="http://www.net-snmp.org/" +license=('custom') +depends=('openssl' 'libnl') +makedepends=('setuptools') +optdepends=('perl-term-readkey: for snmpcheck application' + 'perl-tk: for snmpcheck and tkmib applications' + 'python2: for the python modules') +provides=('ucd-snmp') +options=('!libtool' '!makeflags' '!emptydirs') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'snmpd.rc') +md5sums=('b4e30ead5783b0bb1d280172c6095ea4' + '9f0d13676ba1fae1eb7eb178edd85b43') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-ucd-snmp-compatibility \ + --enable-ipv6 \ + --with-python-modules \ + --with-default-snmp-version="3" \ + --with-sys-contact="root@localhost" \ + --with-sys-location="Unknown" \ + --with-logfile="/var/log/snmpd.log" \ + --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ + --with-persistent-directory="/var/net-snmp" \ + PYTHONPROG=/usr/bin/python2 + make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath -Wl,/usr/lib/perl5/core_perl/CORE" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install + install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/net-snmp/libnl-2.patch b/staging/net-snmp/libnl-2.patch new file mode 100644 index 000000000..7c140fe83 --- /dev/null +++ b/staging/net-snmp/libnl-2.patch @@ -0,0 +1,67 @@ +diff -Nur net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c +--- net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c 2009-06-13 04:02:02.000000000 +0200 ++++ net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c 2011-01-15 10:31:03.579735957 +0100 +@@ -555,8 +555,10 @@ + static int + tcpTable_load_netlink() + { ++ int err; ++ + /* TODO: perhaps use permanent nl handle? */ +- struct nl_handle *nl = nl_handle_alloc(); ++ struct nl_sock *nl = nl_socket_alloc(); + + if (nl == NULL) { + DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); +@@ -564,10 +566,10 @@ + return -1; + } + +- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + +@@ -579,10 +581,10 @@ + struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); + nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); + +- if (nl_send_auto_complete(nl, nm) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_send_auto_complete(nl, nm)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + nlmsg_free(nm); +@@ -593,9 +595,9 @@ + + while (running) { + if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); ++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); ++ nl_socket_free(nl); + return -1; + } + +@@ -644,7 +646,7 @@ + free(buf); + } + +- nl_handle_destroy(nl); ++ nl_socket_free(nl); + + if (tcp_head) { + DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); diff --git a/staging/net-snmp/snmpd.rc b/staging/net-snmp/snmpd.rc new file mode 100644 index 000000000..9f1b83f64 --- /dev/null +++ b/staging/net-snmp/snmpd.rc @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/snmpd` +case "$1" in + start) + stat_busy "Starting Net-SNMP" + [ -z "$PID" ] && /usr/sbin/snmpd + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/snmpd.pid + add_daemon snmpd + stat_done + fi + ;; + stop) + stat_busy "Stopping Net-SNMP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/snmpd.pid + rm_daemon snmpd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/openssh/PKGBUILD b/staging/openssh/PKGBUILD new file mode 100644 index 000000000..bf45e6396 --- /dev/null +++ b/staging/openssh/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 131644 2011-07-13 07:48:58Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=openssh +pkgver=5.8p2 +pkgrel=9 +pkgdesc='Free version of the SSH connectivity tools' +arch=('i686' 'x86_64') +license=('custom:BSD') +url='http://www.openssh.org/portable.html' +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') +depends=('krb5' 'openssl' 'libedit') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" + 'authfile.c.patch' + 'sshd.confd' + 'sshd.pam' + 'sshd') +sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' + '3669cb5ca6149f69015df5ce8e60b82c540eb0a4' + 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' + '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1' + '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../authfile.c.patch # fix FS#24693 using http://anoncvs.mindrot.org/index.cgi/openssh/authfile.c?revision=1.95 + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh \ + --with-privsep-user=nobody \ + --with-md5-passwords \ + --with-pam \ + --with-mantype=man \ + --mandir=/usr/share/man \ + --with-xauth=/usr/bin/xauth \ + --with-kerberos5=/usr \ + --with-ssl-engine \ + --with-libedit=/usr/lib \ + --disable-strip # stripping is done by makepkg + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + rm "${pkgdir}"/usr/share/man/man1/slogin.1 + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + + # additional contrib scripts that we like + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh + install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id + install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 + + # PAM is a common, standard feature to have + sed -i -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ + -e '/^#UsePAM no$/c UsePAM yes' \ + "${pkgdir}"/etc/ssh/sshd_config +} diff --git a/staging/openssh/authfile.c.patch b/staging/openssh/authfile.c.patch new file mode 100644 index 000000000..6c18fe807 --- /dev/null +++ b/staging/openssh/authfile.c.patch @@ -0,0 +1,198 @@ +diff -aur old/authfile.c new/authfile.c +--- old/authfile.c 2011-06-12 02:21:52.262338254 +0200 ++++ new/authfile.c 2011-06-12 02:13:43.051467269 +0200 +@@ -1,4 +1,4 @@ +-/* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */ ++/* $OpenBSD: authfile.c,v 1.95 2011/05/29 11:42:08 djm Exp $ */ + /* + * Author: Tatu Ylonen <ylo@cs.hut.fi> + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland +@@ -69,6 +69,8 @@ + #include "misc.h" + #include "atomicio.h" + ++#define MAX_KEY_FILE_SIZE (1024 * 1024) ++ + /* Version identification string for SSH v1 identity files. */ + static const char authfile_id_string[] = + "SSH PRIVATE KEY FILE FORMAT 1.1\n"; +@@ -312,12 +314,12 @@ + return pub; + } + +-/* Load the contents of a key file into a buffer */ +-static int ++/* Load a key from a fd into a buffer */ ++int + key_load_file(int fd, const char *filename, Buffer *blob) + { ++ u_char buf[1024]; + size_t len; +- u_char *cp; + struct stat st; + + if (fstat(fd, &st) < 0) { +@@ -325,30 +327,45 @@ + filename == NULL ? "" : filename, + filename == NULL ? "" : " ", + strerror(errno)); +- close(fd); + return 0; + } +- if (st.st_size > 1*1024*1024) { ++ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 && ++ st.st_size > MAX_KEY_FILE_SIZE) { ++ toobig: + error("%s: key file %.200s%stoo large", __func__, + filename == NULL ? "" : filename, + filename == NULL ? "" : " "); +- close(fd); + return 0; + } +- len = (size_t)st.st_size; /* truncated */ +- + buffer_init(blob); +- cp = buffer_append_space(blob, len); +- +- if (atomicio(read, fd, cp, len) != len) { +- debug("%s: read from key file %.200s%sfailed: %.100s", __func__, +- filename == NULL ? "" : filename, +- filename == NULL ? "" : " ", +- strerror(errno)); ++ for (;;) { ++ if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) { ++ if (errno == EPIPE) ++ break; ++ debug("%s: read from key file %.200s%sfailed: %.100s", ++ __func__, filename == NULL ? "" : filename, ++ filename == NULL ? "" : " ", strerror(errno)); ++ buffer_clear(blob); ++ bzero(buf, sizeof(buf)); ++ return 0; ++ } ++ buffer_append(blob, buf, len); ++ if (buffer_len(blob) > MAX_KEY_FILE_SIZE) { ++ buffer_clear(blob); ++ bzero(buf, sizeof(buf)); ++ goto toobig; ++ } ++ } ++ bzero(buf, sizeof(buf)); ++ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 && ++ st.st_size != buffer_len(blob)) { ++ debug("%s: key file %.200s%schanged size while reading", ++ __func__, filename == NULL ? "" : filename, ++ filename == NULL ? "" : " "); + buffer_clear(blob); +- close(fd); + return 0; + } ++ + return 1; + } + +@@ -606,7 +623,7 @@ + error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); + error("Permissions 0%3.3o for '%s' are too open.", + (u_int)st.st_mode & 0777, filename); +- error("It is recommended that your private key files are NOT accessible by others."); ++ error("It is required that your private key files are NOT accessible by others."); + error("This private key will be ignored."); + return 0; + } +@@ -626,6 +643,7 @@ + case KEY_UNSPEC: + return key_parse_private_pem(blob, type, passphrase, commentp); + default: ++ error("%s: cannot parse key type %d", __func__, type); + break; + } + return NULL; +@@ -670,11 +688,38 @@ + } + + Key * ++key_parse_private(Buffer *buffer, const char *filename, ++ const char *passphrase, char **commentp) ++{ ++ Key *pub, *prv; ++ Buffer pubcopy; ++ ++ buffer_init(&pubcopy); ++ buffer_append(&pubcopy, buffer_ptr(buffer), buffer_len(buffer)); ++ /* it's a SSH v1 key if the public key part is readable */ ++ pub = key_parse_public_rsa1(&pubcopy, commentp); ++ buffer_free(&pubcopy); ++ if (pub == NULL) { ++ prv = key_parse_private_type(buffer, KEY_UNSPEC, ++ passphrase, NULL); ++ /* use the filename as a comment for PEM */ ++ if (commentp && prv) ++ *commentp = xstrdup(filename); ++ } else { ++ key_free(pub); ++ /* key_parse_public_rsa1() has already loaded the comment */ ++ prv = key_parse_private_type(buffer, KEY_RSA1, passphrase, ++ NULL); ++ } ++ return prv; ++} ++ ++Key * + key_load_private(const char *filename, const char *passphrase, + char **commentp) + { +- Key *pub, *prv; +- Buffer buffer, pubcopy; ++ Key *prv; ++ Buffer buffer; + int fd; + + fd = open(filename, O_RDONLY); +@@ -697,23 +742,7 @@ + } + close(fd); + +- buffer_init(&pubcopy); +- buffer_append(&pubcopy, buffer_ptr(&buffer), buffer_len(&buffer)); +- /* it's a SSH v1 key if the public key part is readable */ +- pub = key_parse_public_rsa1(&pubcopy, commentp); +- buffer_free(&pubcopy); +- if (pub == NULL) { +- prv = key_parse_private_type(&buffer, KEY_UNSPEC, +- passphrase, NULL); +- /* use the filename as a comment for PEM */ +- if (commentp && prv) +- *commentp = xstrdup(filename); +- } else { +- key_free(pub); +- /* key_parse_public_rsa1() has already loaded the comment */ +- prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase, +- NULL); +- } ++ prv = key_parse_private(&buffer, filename, passphrase, commentp); + buffer_free(&buffer); + return prv; + } +@@ -737,13 +766,19 @@ + case '\0': + continue; + } ++ /* Abort loading if this looks like a private key */ ++ if (strncmp(cp, "-----BEGIN", 10) == 0) ++ break; + /* Skip leading whitespace. */ + for (; *cp && (*cp == ' ' || *cp == '\t'); cp++) + ; + if (*cp) { + if (key_read(k, &cp) == 1) { +- if (commentp) +- *commentp=xstrdup(filename); ++ cp[strcspn(cp, "\r\n")] = '\0'; ++ if (commentp) { ++ *commentp = xstrdup(*cp ? ++ cp : filename); ++ } + fclose(f); + return 1; + } diff --git a/staging/openssh/sshd b/staging/openssh/sshd new file mode 100755 index 000000000..2ee1091f0 --- /dev/null +++ b/staging/openssh/sshd @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/sshd + +PIDFILE=/var/run/sshd.pid +PID=$(cat $PIDFILE 2>/dev/null) +if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then + PID= + rm $PIDFILE 2>/dev/null +fi + +case "$1" in + start) + stat_busy "Starting Secure Shell Daemon" + [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; } + [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; } + [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; } + [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; } + [ -d /var/empty ] || mkdir -p /var/empty + [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon sshd + stat_done + fi + ;; + stop) + stat_busy "Stopping Secure Shell Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon sshd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/openssh/sshd.confd b/staging/openssh/sshd.confd new file mode 100644 index 000000000..5ce7c0079 --- /dev/null +++ b/staging/openssh/sshd.confd @@ -0,0 +1,4 @@ +# +# Parameters to be passed to sshd +# +SSHD_ARGS="" diff --git a/staging/openssh/sshd.pam b/staging/openssh/sshd.pam new file mode 100644 index 000000000..ff8829fe9 --- /dev/null +++ b/staging/openssh/sshd.pam @@ -0,0 +1,11 @@ +#%PAM-1.0 +#auth required pam_securetty.so #Disable remote root +auth required pam_unix.so +auth required pam_env.so +account required pam_nologin.so +account required pam_unix.so +account required pam_time.so +password required pam_unix.so +session required pam_unix_session.so +session required pam_limits.so +-session optional pam_ck_connector.so nox11 diff --git a/staging/qwt/PKGBUILD b/staging/qwt/PKGBUILD new file mode 100644 index 000000000..913a21ba7 --- /dev/null +++ b/staging/qwt/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 131712 2011-07-13 18:32:34Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=qwt +pkgver=6.0.0 +pkgrel=1 +pkgdesc="Qt Widgets for Technical Applications" +arch=('i686' 'x86_64') +url="http://qwt.sourceforge.net/" +depends=('qt') +options=('!makeflags') +license=("custom:$pkgname") +source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \ + "qwtconfig-archlinux.pri") +sha1sums=('306957fc06c90f2049aec57e13a971f54c3cb21a' + 'aba0fc75f6d450237028b7b143bdcf05a79cabb3') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # copy our config file to the right place + install -Dm644 ${srcdir}/qwtconfig-archlinux.pri \ + ${srcdir}/${pkgname}-${pkgver}/qwtconfig.pri + + # build qwt: + qmake qwt.pro + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make INSTALL_ROOT=${pkgdir} QTDIR=/usr install + + # Move man files to proper directory. + install -d ${pkgdir}/usr/share/man/man3 + mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3 + + # install licence + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \ + ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} diff --git a/staging/qwt/qwtconfig-archlinux.pri b/staging/qwt/qwtconfig-archlinux.pri new file mode 100644 index 000000000..520e32d4b --- /dev/null +++ b/staging/qwt/qwtconfig-archlinux.pri @@ -0,0 +1,118 @@ +################################################################ +# Qwt Widget Library +# Copyright (C) 1997 Josef Wilgen +# Copyright (C) 2002 Uwe Rathmann +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the Qwt License, Version 1.0 +################################################################ + +QWT_VER_MAJ = 6 +QWT_VER_MIN = 1 +QWT_VER_PAT = 0 +QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT} + +###################################################################### +# Install paths +###################################################################### + +QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] + +unix { + QWT_INSTALL_PREFIX = /usr +} + +win32 { + QWT_INSTALL_PREFIX = C:/Qwt +} + +QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/qwt +QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt +QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib + +###################################################################### +# Designer plugin +###################################################################### + +#QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer +# QWT_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer + +###################################################################### +# Features +# When building a Qwt application with qmake you might want to load +# the compiler/linker flags, that are required to build a Qwt application +# from qwt.prf. Therefore all you need to do is to add "CONFIG += qwt" +# to your project file and take care, that qwt.prf can be found by qmake. +# ( see http://doc.trolltech.com/4.7/qmake-advanced-usage.html#adding-new-configuration-features ) +# I recommend not to install the Qwt features together with the +# Qt features, because you will have to reinstall the Qwt features, +# with every Qt upgrade. +###################################################################### + +#QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features +# QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features + +###################################################################### +# Build the static/shared libraries. +# If QwtDll is enabled, a shared library is built, otherwise +# it will be a static library. +###################################################################### + +QWT_CONFIG += QwtDll + +###################################################################### +# QwtPlot enables all classes, that are needed to use the QwtPlot +# widget. +###################################################################### + +QWT_CONFIG += QwtPlot + +###################################################################### +# QwtWidgets enables all classes, that are needed to use the all other +# widgets (sliders, dials, ...), beside QwtPlot. +###################################################################### + +QWT_CONFIG += QwtWidgets + +###################################################################### +# If you want to display svg images on the plot canvas, or +# export a plot to a SVG document +###################################################################### + +QWT_CONFIG += QwtSvg + +###################################################################### +# You can use the MathML renderer of the Qt solutions package to +# enable MathML support in Qwt. Because of license implications +# the ( modified ) code of the MML Widget solution is included and +# linked together with the QwtMathMLTextEngine into an own library. +# To use it you will have to add "CONFIG += qwtmathml" +# to your qmake project file. +###################################################################### + +#QWT_CONFIG += QwtMathML + +###################################################################### +# If you want to build the Qwt designer plugin, +# enable the line below. +# Otherwise you have to build it from the designer directory. +###################################################################### + +QWT_CONFIG += QwtDesigner + +###################################################################### +# If you want to auto build the examples, enable the line below +# Otherwise you have to build them from the examples directory. +###################################################################### + +#QWT_CONFIG += QwtExamples + +###################################################################### +# When Qt has been built as framework qmake ( qtAddLibrary ) wants +# to link frameworks instead of regular libs +###################################################################### + +macx:CONFIG(qt_framework, qt_framework|qt_no_framework) { + + QWT_CONFIG += QwtFramework +} diff --git a/staging/socat/PKGBUILD b/staging/socat/PKGBUILD new file mode 100644 index 000000000..458009ce3 --- /dev/null +++ b/staging/socat/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 131647 2011-07-13 08:01:50Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=socat +pkgver=1.7.1.3 +pkgrel=3 +pkgdesc='Multipurpose relay' +url='http://www.dest-unreach.org/socat/' +license=('GPL2') +arch=('i686' 'x86_64') +depends=('readline' 'openssl') +source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz") +sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-libwrap # only required while base/base-devel uses tcp_wrappers + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/testing/ardour/PKGBUILD b/testing/ardour/PKGBUILD new file mode 100644 index 000000000..5780fa159 --- /dev/null +++ b/testing/ardour/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 131778 2011-07-14 23:39:36Z schiv $ +# Maintainer: tobias <tobias@archlinux.org> +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +# ardour, liblrdf and raptor are heavily dependent on each other. Updating of +# one package mostly will require an update of all the other packages. I vote +# for fixed dependencies speaking in terms of versions + +pkgname=ardour +pkgver=2.8.11 +pkgrel=5 +pkgdesc="A multichannel hard disk recorder and digital audio workstation" +arch=('i686' 'x86_64') +url="http://ardour.org/" +license=('GPL') +depends=('liblrdf>=0.4.0-8' 'liblo' 'aubio' 'libusb-compat' + 'libgnomecanvasmm' 'soundtouch' 'slv2>=0.6.6-6') + # -rubberband -libgnomecanvas(+libgnomecanvasmm) + # +soundtouch (these +/- changes are for SYSLIBS) + # liblrdf versioned for https://bugs.archlinux.org/task/25005 + # slv2 versioned for https://bugs.archlinux.org/task/25060 +makedepends=('scons' 'boost' 'pkg-config') +changelog=${pkgname}.changelog +source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2 + ${pkgname}.desktop + gcc46.patch + raptor2.patch) +md5sums=('f451a8d0abc133a1700c3932e07a5612' + '8aeaf433ebf781733db48e5a16b0c4da' + 'd709add59911d099c813162448e4db99' + 'a26a9bec0968fa0630c70f70c54f67de') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # gcc 4.6 compatibility + # http://tracker.ardour.org/view.php?id=3771 + patch -Np1 -i "$srcdir/gcc46.patch" + + # raptor2 compatibility + # https://bugs.archlinux.org/task/25060 + # http://tracker.ardour.org/view.php?id=4179 + patch -Np0 -i "$srcdir/raptor2.patch" + + sed -i '/-O3/d' SConstruct + + # use syslibs until internal sigc++ issue w/ latest gcc (?) resolves + # TODO: report upstream + scons ${MAKEFLAGS} ARCH="${CFLAGS}" \ + PREFIX="/usr" \ + DIST_LIBDIR="lib" \ + FREEDESKTOP=0 \ + FREESOUND=1 \ + SYSLIBS=1 \ + DESTDIR="${pkgdir}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + scons PREFIX="/usr" \ + FREEDESKTOP=0 \ + FREESOUND=1 \ + SYSLIBS=1 \ + DESTDIR="${pkgdir}" install + + # install some freedesktop.org compatibility + install -Dm644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/ardour/ardour.changelog b/testing/ardour/ardour.changelog new file mode 100644 index 000000000..47c111f01 --- /dev/null +++ b/testing/ardour/ardour.changelog @@ -0,0 +1,49 @@ +15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 2.8.11-5: + Resolve previous issues with slv2 & redland/rasqal/raptor + - just needed rebuild of slv2 against latest redland suite [1] + - also needed ardour buildsystem patch for raptor2 [1][2] + - bring back support for slv2 + + [1] https://bugs.archlinux.org/task/25060 + [2] http://tracker.ardour.org/view.php?id=4179 + +9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 2.8.11-4: + Fix build failures and runtime segfaults + - gcc 4.6 patch + - enable SYSLIBS due to ardour sigc++ issues + - remove slv2 dep due to ardour rasqal incompatibility [1][2] + + [1] https://bugs.archlinux.org/task/25060 + [2] https://ardour.org/node/4301 + +22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 2.8.11-2 : + raptor rebuild + +9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 2.8.11-1 : + Testing build. + Removed libgnomecanvasmm depend (ardour internal). + Removed soundtouch makedepend (ardour internal, unneded). + Added new depends + - slv2 ("LV2" plug-ins support) + - rubberband (can "do more" than soundtouch) + - libgnomecanvas + Not using SYSLIBS because upstream does not support it. + Namcap warnings can be ignored; they're ardour internals. + + * PKGBUILD : + Minor cosmetic ammendments. + + * ardour.changelog : + Added this changelog. + Only important changes will be logged. + + * ardour.install : + Removed install scriptlet; old and deprecated information. diff --git a/testing/ardour/ardour.desktop b/testing/ardour/ardour.desktop new file mode 100644 index 000000000..b50f6c952 --- /dev/null +++ b/testing/ardour/ardour.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Ardour +Comment=Multitrack hard disk recorder +Exec=ardour2 +Icon=/usr/share/ardour2/icons/ardour_icon_48px.png +Terminal=false +Type=Application +X-MultipleArgs=false +Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; diff --git a/testing/ardour/gcc46.patch b/testing/ardour/gcc46.patch new file mode 100644 index 000000000..d01610d1d --- /dev/null +++ b/testing/ardour/gcc46.patch @@ -0,0 +1,42 @@ +diff -rupN ardour-2.8.11.old/libs/ardour/enums.cc ardour-2.8.11/libs/ardour/enums.cc +--- ardour-2.8.11.old/libs/ardour/enums.cc 2010-04-20 13:28:37.000000000 -0400 ++++ ardour-2.8.11/libs/ardour/enums.cc 2011-02-13 11:23:02.000000000 -0500 +@@ -31,7 +31,8 @@ + + using namespace std; + using namespace PBD; +-using namespace ARDOUR; ++namespace ARDOUR ++{ + + void + setup_enum_writer () +@@ -362,3 +363,5 @@ setup_enum_writer () + REGISTER (_Track_FreezeState); + + } ++ ++} +diff -rupN ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h +--- ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h 2009-03-26 10:25:40.000000000 -0400 ++++ ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h 2011-02-09 21:41:04.000000000 -0500 +@@ -19,6 +19,7 @@ + #define RUBBERBAND_API_MAJOR_VERSION 2 + #define RUBBERBAND_API_MINOR_VERSION 0 + ++#include <cstddef> + #include <vector> + + /** +diff -rupN ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc +--- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc 2009-02-24 07:38:19.000000000 -0500 ++++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc 2011-02-13 11:23:24.000000000 -0500 +@@ -177,7 +177,7 @@ wiimote_discovery: + std::cerr << "Wiimote: discovering, press 1+2" << std::endl; + + while (!wiimote_handle && !main_thread_quit) { +- bdaddr = *BDADDR_ANY; ++ bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}}; + callback_thread_registered_for_ardour = false; + wiimote_handle = cwiid_open(&bdaddr, 0); + diff --git a/testing/ardour/raptor2.patch b/testing/ardour/raptor2.patch new file mode 100644 index 000000000..fe7cacff3 --- /dev/null +++ b/testing/ardour/raptor2.patch @@ -0,0 +1,57 @@ +Index: SConstruct +=================================================================== +--- SConstruct (revision 9877) ++++ SConstruct (revision 9878) +@@ -431,7 +431,6 @@ + 'gtk+-2.0' : '2.8.1', + 'libxml-2.0' : '2.6.0', + 'samplerate' : '0.1.0', +- 'raptor' : '1.4.2', + 'lrdf' : '0.4.0', + 'jack' : '0.109.0', + 'libgnomecanvas-2.0' : '2.0', +@@ -487,7 +486,10 @@ + + libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs') + +-conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) ++conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists, ++ 'CheckPKGVersion' : CheckPKGVersion } ++ ) ++ + + if conf.CheckPKGExists ('fftw3f'): + libraries['fftw3f'] = LibraryInfo() +@@ -501,6 +503,22 @@ + libraries['aubio'] = LibraryInfo() + libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio') + ++raptorOK = 0 ++ ++if conf.CheckPKGExists ('raptor2'): ++ libraries['raptor'] = LibraryInfo() ++ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2') ++ raptorOK = 1 ++else: ++ if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'): ++ libraries['raptor'] = LibraryInfo() ++ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') ++ raptorOK = 1 ++ ++if raptorOK == 0: ++ print "Ardour requires either raptor or raptor2 to be available at build time" ++ Exit (1) ++ + env = conf.Finish () + + if env['FFT_ANALYSIS']: +@@ -570,9 +588,6 @@ + libraries['lrdf'] = LibraryInfo() + libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') + +-libraries['raptor'] = LibraryInfo() +-libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') +- + libraries['sndfile'] = LibraryInfo() + libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile') + diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD new file mode 100644 index 000000000..2a5489e9d --- /dev/null +++ b/testing/file/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 131726 2011-07-14 01:54:47Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgname=file +pkgver=5.07 +pkgrel=4 +pkgdesc="File type identification utility" +arch=('i686' 'x86_64') +license=('custom') +groups=('base') +url="http://www.darwinsys.com/file/" +depends=('glibc' 'zlib') +options=('!libtool') +source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz + file-5.07-zip-detect.patch) +md5sums=('b8d1f9a8a644067bd0a703cebf3f4858' + 'ac155cf89af6665dfee76738c27366d8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#\$(datadir)/misc#\$(datadir)#' configure + + # combined upstream patches to fix zip file detection + patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch + + ./configure --prefix=/usr --datadir=/usr/share/file + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir} install + install -dm755 ${pkgdir}/usr/share/misc + ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc + + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/testing/file/file-5.07-zip-detect.patch b/testing/file/file-5.07-zip-detect.patch new file mode 100644 index 000000000..ce433bb90 --- /dev/null +++ b/testing/file/file-5.07-zip-detect.patch @@ -0,0 +1,40 @@ +diff -Naur file-5.07-orig//magic/Magdir/archive file-5.07/magic/Magdir/archive +--- file-5.07-orig//magic/Magdir/archive 2011-04-24 01:02:48.000000000 +1000 ++++ file-5.07/magic/Magdir/archive 2011-07-14 11:55:11.821178049 +1000 +@@ -1,5 +1,5 @@ + #------------------------------------------------------------------------------ +-# $File: archive,v 1.63 2011/04/23 15:02:48 christos Exp $ ++# $File: archive,v 1.66 2011/05/25 17:45:54 christos Exp $ + # archive: file(1) magic for archive formats (see also "msdos" for self- + # extracting compressed archives) + # +@@ -654,12 +654,6 @@ + >>>>78 string -template Template + !:mime application/vnd.oasis.opendocument.image-template + +-# StarView Metafile +-# From Pierre Ducroquet <pinaraf@pinaraf.info> +-0 string VCLMTF StarView MetaFile +->6 beshort x \b, version %d +->8 belong x \b, size %d +- + # EPUB (OEBPS) books using OCF (OEBPS Container Format) + # From: Adam Buchbinder <adam.buchbinder@gmail.com> + # http://www.idpf.org/ocf/ocf1.0/download/ocf10.htm, section 4. +@@ -692,8 +686,15 @@ + >>4 byte 0x09 \b, at least v0.9 to extract + >>4 byte 0x0a \b, at least v1.0 to extract + >>4 byte 0x0b \b, at least v1.1 to extract +->>0x161 string WINZIP \b, WinZIP self-extracting + >>4 byte 0x14 \b, at least v2.0 to extract ++>>4 byte 0x2d \b, at least v3.0 to extract ++>>0x161 string WINZIP \b, WinZIP self-extracting ++ ++# StarView Metafile ++# From Pierre Ducroquet <pinaraf@pinaraf.info> ++0 string VCLMTF StarView MetaFile ++>6 beshort x \b, version %d ++>8 belong x \b, size %d + + # Zoo archiver + 20 lelong 0xfdc4a7dc Zoo archive data diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index 2da496b53..9ad6ffe3a 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131188 2011-07-11 16:27:41Z andyrtr $ +# $Id: PKGBUILD 131696 2011-07-13 15:20:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') +pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') _git=true #_git=false @@ -14,32 +14,33 @@ if [ "${_git}" = "true" ]; then else pkgver=7.11rc1 fi -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' - 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm') + 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev') url="http://mesa3d.sourceforge.net" license=('custom') -source=(LICENSE git_fixes.patch) +source=(LICENSE + #git_fixes.patch + linking_fix.patch) if [ "${_git}" = "true" ]; then # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') - source=(${source[@]} "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-b033f050fd5179b051181a0a4b6d94110624d25c.tar.bz2") + source=(${source[@]} "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc1/}/MesaLib-${pkgver/rc/-rc}.zip" ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '62b7e9591737846ff0e98f970ffc8b78' - '2246d97eb0cfb1f6d2bf8a54b533d07f') + '887be83c01d126c2a4cb372af7d3b067' + '817a63bb60b81f4f817ffc9ed0a3dddd') build() { cd ${srcdir}/?esa-* - # fix link errors: https://bugs.archlinux.org/task/25093 - export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} if [ "${_git}" = "true" ]; then - patch -Np1 -i ${srcdir}/git_fixes.patch + #patch -Np1 -i ${srcdir}/git_fixes.patch + patch -Np1 -i ${srcdir}/linking_fix.patch autoreconf -vfi ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ @@ -57,7 +58,6 @@ if [ "${_git}" = "true" ]; then --enable-shared-dricore # --enable-gallium-svga \ - #--enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no] else autoreconf -vfi @@ -81,7 +81,7 @@ fi } package_libgl() { - depends=('libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1') + depends=('libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" cd ${srcdir}/?esa-* @@ -92,7 +92,6 @@ package_libgl() { bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/" bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/" - cd src/mesa/drivers/dri #make -C swrast DESTDIR="${pkgdir}" install if [ "${_git}" = "true" ]; then @@ -107,15 +106,23 @@ fi install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" } +package_libglapi() { + depends=('glibc') + pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib" + bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/" + + install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" +} + package_libgles() { - depends=('libgl') + depends=('libglapi') pkgdesc="Mesa GLES libraries and headers" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}" -fi + cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/lib" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" install -m755 -d "${pkgdir}/usr/include" @@ -133,14 +140,10 @@ fi } package_libegl() { - depends=('libgl') - pkgdesc="Mesa libEGL libraries and headers" + depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev') + pkgdesc="Mesa EGL libraries and headers" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}" -fi + cd ${srcdir}/?esa-* make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" @@ -152,10 +155,8 @@ fi install -m755 -d "${pkgdir}/usr/share/doc" install -m755 -d "${pkgdir}/usr/share/doc/libegl" bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" -#if [ "${_git}" != "true" ]; then install -m755 -d "${pkgdir}/usr/lib/egl" bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" -#fi bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" @@ -166,18 +167,15 @@ fi } package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'libdrm>=2.4.26' 'glproto>=1.4.14') + depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6') # 'dri2proto>=2.6' 'glproto>=1.4.14') optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3-D graphics libraries and include files" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}" -fi + cd ${srcdir}/?esa-* make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/lib/libGL.so"* + rm -f "${pkgdir}/usr/lib/libglapi.so"* rm -f "${pkgdir}/usr/lib/libGLESv"* rm -f "${pkgdir}/usr/lib/libEGL"* rm -rf "${pkgdir}/usr/lib/egl" @@ -198,49 +196,28 @@ package_ati-dri() { pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" conflicts=('xf86-video-ati<6.9.0-6') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}/src/mesa/drivers/dri" -fi - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - # classic mesa driver for R300 r300_dri.so - #make -C r300 DESTDIR="${pkgdir}" install <------- deprecated - # gallium3D driver for R300 r300_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install -fi + # classic mesa drivers for radeon,r200 + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install + # gallium3D driver for r300,r600 + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install } package_intel-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}/src/mesa/drivers/dri" -fi - make -C i810 DESTDIR="${pkgdir}" install - make -C i915 DESTDIR="${pkgdir}" install - make -C i965 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install } package_unichrome-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}/src/mesa/drivers/dri" -fi - make -C unichrome DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install } package_mach64-dri() { @@ -248,12 +225,7 @@ package_mach64-dri() { pkgdesc="Mesa DRI drivers for ATI Mach64" conflicts=('xf86-video-mach64<6.8.2') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C mach64 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install } package_mga-dri() { @@ -261,12 +233,7 @@ package_mga-dri() { pkgdesc="Mesa DRI drivers for Matrox" conflicts=('xf86-video-mga<1.4.11') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}/src/mesa/drivers/dri" -fi - make -C mga DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install } package_r128-dri() { @@ -274,12 +241,7 @@ package_r128-dri() { pkgdesc="Mesa DRI drivers for ATI Rage128" conflicts=('xf86-video-r128<6.8.1') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}/src/mesa/drivers/dri" -fi - make -C r128 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install } package_savage-dri() { @@ -287,12 +249,7 @@ package_savage-dri() { pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage" conflicts=('xf86-video-savage<2.3.1') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C savage DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install } package_sis-dri() { @@ -300,12 +257,7 @@ package_sis-dri() { pkgdesc="Mesa DRI drivers for SiS" conflicts=('xf86-video-sis<0.10.2') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}/src/mesa/drivers/dri" -fi - make -C sis DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install } package_tdfx-dri() { @@ -313,33 +265,17 @@ package_tdfx-dri() { pkgdesc="Mesa DRI drivers for 3dfx" conflicts=('xf86-video-tdfx<1.4.3') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}/src/mesa/drivers/dri" -fi - make -C tdfx DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install } package_nouveau-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver/rc/-rc}/src/mesa/drivers/dri" -fi - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C nouveau DESTDIR="${pkgdir}" install - + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver/rc/-rc}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -fi + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install } #package_llvm-dri() { diff --git a/testing/mesa/linking_fix.patch b/testing/mesa/linking_fix.patch new file mode 100644 index 000000000..34ed7902d --- /dev/null +++ b/testing/mesa/linking_fix.patch @@ -0,0 +1,22 @@ +From 5fe5d236c26b3b2428bc7395304e40cf21d3d3e1 Mon Sep 17 00:00:00 2001 +From: Chia-I Wu <olv@lunarg.com> +Date: Wed, 13 Jul 2011 07:25:46 +0000 +Subject: targets/egl-static: fix a linking error + +rbug is always linked in and it needs libpthread. +--- +diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile +index 832d7ba..69e7eec 100644 +--- a/src/gallium/targets/egl-static/Makefile ++++ b/src/gallium/targets/egl-static/Makefile +@@ -42,7 +42,7 @@ egl_CPPFLAGS += \ + -I$(TOP)/src/egl/main \ + -D_EGL_MAIN=_eglMain + egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a +-egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm ++egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -lpthread + + # EGL platforms + ifneq ($(findstring x11, $(EGL_PLATFORMS)),) +-- +cgit v0.8.3-6-g21f6 diff --git a/testing/pygtk/PKGBUILD b/testing/pygtk/PKGBUILD new file mode 100644 index 000000000..bc7c56efa --- /dev/null +++ b/testing/pygtk/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 131736 2011-07-14 11:07:45Z stephane $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> + +pkgname=pygtk +pkgver=2.24.0 +pkgrel=2 +pkgdesc="Python bindings for the GTK widget set" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('libglade' 'python2-cairo' 'pygobject') +makedepends=('python2-numpy' 'pygobject-devel') +optdepends=('python2-numpy') +options=('!libtool') +url="http://www.pygtk.org/" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + python27.patch) +sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' + '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + #https://bugzilla.gnome.org/show_bug.cgi?id=623965 + patch -Np1 -i "${srcdir}/python27.patch" + + PYTHON=python2 ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" + + sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py +} diff --git a/testing/pygtk/python27.patch b/testing/pygtk/python27.patch new file mode 100644 index 000000000..9bbe2b5ae --- /dev/null +++ b/testing/pygtk/python27.patch @@ -0,0 +1,50 @@ +diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c +index c0e1493..aa8cf10 100644 +--- a/gtk/gtkmodule.c ++++ b/gtk/gtkmodule.c +@@ -227,8 +227,12 @@ init_gtk(void) + pygtk_add_stock_items(d); + + /* extension API */ +- PyDict_SetItemString(d, "_PyGtk_API", +- o=PyCObject_FromVoidPtr(&functions, NULL)); ++#if PY_VERSION_HEX >= 0x02070000 ++ o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL); ++#else ++ o = PyCObject_FromVoidPtr(&functions, NULL); ++#endif ++ PyDict_SetItemString(d, "_PyGtk_API", o); + Py_DECREF(o); + + PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning", +diff --git a/gtk/pygtk.h b/gtk/pygtk.h +index 573c3b9..e4c680f 100644 +--- a/gtk/pygtk.h ++++ b/gtk/pygtk.h +@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; + + + /* a function to initialise the pygtk functions */ ++ ++/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */ ++#if PY_VERSION_HEX >= 0x02070000 ++#define init_pygtk() G_STMT_START { \ ++ void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \ ++ if (!capsule) { \ ++ return; \ ++ } \ ++ _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \ ++} G_STMT_END ++#else /* PY_VERSION_HEX */ ++/* Python 2.6 and earlier use the CObject API */ + #define init_pygtk() G_STMT_START { \ + PyObject *pygtk = PyImport_ImportModule("gtk"); \ + if (pygtk != NULL) { \ +@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; + return; \ + } \ + } G_STMT_END ++#endif /* PY_VERSION_HEX */ + + #endif + diff --git a/testing/python-numpy/PKGBUILD b/testing/python-numpy/PKGBUILD new file mode 100755 index 000000000..699137cf6 --- /dev/null +++ b/testing/python-numpy/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 131668 2011-07-13 13:42:02Z stephane $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> + +pkgbase=python-numpy +pkgname=('python2-numpy' 'python-numpy') +pkgver=1.6.0 +pkgrel=1 +pkgdesc="Scientific tools for Python" +arch=('i686' 'x86_64') +license=('custom') +url="http://numpy.scipy.org/" +makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose') +source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) +md5sums=('e0993c74cb8e83292e560eac1a9be8e9') + +build() { + cd "${srcdir}" + cp -a numpy-${pkgver} numpy-py2-${pkgver} + + export Atlas=None + export LDFLAGS="$LDFLAGS -shared" + + echo "Building Python2" + cd "${srcdir}/numpy-py2-${pkgver}" + python2 setup.py config_fc --fcompiler=gnu95 build + + echo "Building Python3" + cd "${srcdir}/numpy-${pkgver}" + python setup.py config_fc --fcompiler=gnu95 build +} + +package_python2-numpy() { + depends=('lapack' 'python2') + optdepends=('python-nose: testsuite') + + cd "${srcdir}/numpy-py2-${pkgver}" + python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 + + install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy" + install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/" + + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ + $(find ${pkgdir} -name '*.py') +} + +package_python-numpy() { + depends=('lapack' 'python') + provides=("python3-numpy=${pkgver}") + replaces=('python3-numpy') + conflicts=('python3-numpy') + + cd "${srcdir}/numpy-${pkgver}" + python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 + + install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy" + install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/" +} diff --git a/testing/slv2/PKGBUILD b/testing/slv2/PKGBUILD new file mode 100644 index 000000000..3005cd313 --- /dev/null +++ b/testing/slv2/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 131701 2011-07-13 15:39:04Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Leslie P. Polzer <polzer@stardawn.org> + +pkgname=slv2 +pkgver=0.6.6 +pkgrel=6 +pkgdesc="Library for LV2 hosts" +arch=('i686' 'x86_64') +url="http://drobilla.net/software/slv2" +license=('GPL') +depends=('redland>=1.0.13' 'lv2core' 'jack') +makedepends=('python2') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2) +md5sums=('b8e8e0e82dd04324fcd533e8acd1ce85') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf configure --prefix=/usr + python2 waf build $MAKEFLAGS +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf install --destdir="$pkgdir/" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/slv2/slv2.changelog b/testing/slv2/slv2.changelog new file mode 100644 index 000000000..f394a5067 --- /dev/null +++ b/testing/slv2/slv2.changelog @@ -0,0 +1,23 @@ +22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 0.6.6-3: + raptor rebuild + +24 Nov 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * PKGBUILD : + Get rid of sed and use python2 directly for waf. + waf fix for python transition already included previously (unlogged). + Release only (no need binary update; no runtime python requirement). + +9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 0.6.6-2 : + Brought into extra from community for ardour + - adds "LV2" plug-ins support + + * PKGBUILD : + Minor cosmetic ammendments. + + * slv2.changelog : + Added this changelog. diff --git a/testing/slv2/slv2.install b/testing/slv2/slv2.install new file mode 100644 index 000000000..c980ddfab --- /dev/null +++ b/testing/slv2/slv2.install @@ -0,0 +1,14 @@ +post_install() { + echo "Updating Shared Library Links" + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: |