diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-24 23:14:38 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-24 23:14:38 +0000 |
| commit | f53c212680c1817ef2337855ef8814dea6b07e4e (patch) | |
| tree | c93db9dbaade4f2c86a8d550c237edf7d574f6da | |
| parent | 9254c2bc6500471b22eead69781ddef84f87e2bf (diff) | |
Wed Aug 24 23:14:37 UTC 2011
43 files changed, 797 insertions, 177 deletions
diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD index 36d291377..59b20c371 100644 --- a/community/aqbanking/PKGBUILD +++ b/community/aqbanking/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 51223 2011-07-05 21:41:50Z spupykin $ +# $Id: PKGBUILD 54691 2011-08-23 10:03:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Moore <davidm@sjsoft.com> pkgname=aqbanking -pkgver=5.0.11 +pkgver=5.0.14 pkgrel=1 pkgdesc="A library for online banking and financial applications" arch=(i686 x86_64) @@ -12,8 +12,8 @@ url="http://www.aquamaniac.de/aqbanking" license=('GPL') depends=('gwenhywfar' 'ktoblzcheck' 'libofx') options=('!makeflags' '!libtool') -source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=84&file=01&dummy=aqbanking-$pkgver.tar.gz") -md5sums=('08b42813f7a6c1ac3529e1004b66d81d') +source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=85&file=01&dummy=aqbanking-$pkgver.tar.gz") +md5sums=('c489bc8a8621d77653f09cae1ceb06e8') build() { cd $srcdir/aqbanking-$pkgver diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index d5809b91e..4c0076a82 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -4,31 +4,31 @@ # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.99.03 -pkgrel=2 +pkgver=1.99.05 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license="GPL" -depends=('xulrunner>=5.0' 'chmlib' 'desktop-file-utils') -makedepends=() +depends=('xulrunner>=6.0' 'chmlib' 'desktop-file-utils') +makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) install=chmsee.install -md5sums=('d72625e82222497237efeb228fb53816' +md5sums=('accef6baba2842ad13c59db3627c05f1' '4999362b0c89c24764cbd25173610a38') build() { - cd ${srcdir}/jungleji-chmsee-e06453b/src + cd ${srcdir}/jungleji-chmsee-370f906/src cp Makefile.arch Makefile - sed -i -e 's/2.0/5.0/g' Makefile + sed -i -e 's/5.0/6.0/g' Makefile make } package() { - cd ${srcdir}/jungleji-chmsee-e06453b + cd ${srcdir}/jungleji-chmsee-370f906 install -d ${pkgdir}/usr/share/chmsee cp -a * ${pkgdir}/usr/share/chmsee diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 6d4d6d171..db519cae8 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51045 2011-07-04 15:16:10Z spupykin $ +# $Id: PKGBUILD 54686 2011-08-23 09:50:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Previous Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.1.0 -pkgrel=1.svn20110704 +pkgrel=1.svn20110823 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64') url="http://couchdb.apache.org" @@ -18,16 +18,17 @@ backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') #source=("http://www.apache.org/dist/$pkgname/$pkgver/apache-$pkgname-$pkgver.tar.gz" -source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.svn20110704.tar.gz" +source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.svn20110823.tar.gz" "rc-script.patch") -md5sums=('a961f9047aa34df56ef19d6f6dce083b' - 'e9b5595338efbdc1a5db13284a296612') +md5sums=('b5a6e2dab45f19ef39f04a46ac146a0a' + '12171b097d2f98f4874e002bc1eabfc5') build() { cd "$srcdir/apache-$pkgname-$pkgver" + [ -x configure ] || ./bootstrap sed -i 's|-ljs|-lmozjs185|' configure - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make patch etc/init/couchdb <$srcdir/rc-script.patch } @@ -39,8 +40,6 @@ package() { install -Dm755 etc/default/couchdb $pkgdir/etc/conf.d/couchdb sed -i 's|\(CONFIGURATION_FILE=/etc/\)default\(/couchdb\)|\1conf.d\2|' $pkgdir/etc/rc.d/couchdb sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb - sed -i 's|$COUCHDB -s|$COUCHDB $COUCHDB_OPTIONS -s|' $pkgdir/etc/rc.d/couchdb - sed -i 's|su $COUCHDB_USER -c|su $COUCHDB_USER -s /bin/bash -c|' $pkgdir/etc/rc.d/couchdb rm -rf $pkgdir/etc/default/ $pkgdir/var/run } diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch index d38f4dc6c..d7fd105c4 100644 --- a/community/couchdb/rc-script.patch +++ b/community/couchdb/rc-script.patch @@ -1,15 +1,14 @@ ---- couchdb.org 2011-04-01 19:56:32.000000000 +0000 -+++ couchdb 2011-04-01 19:59:17.000000000 +0000 -@@ -1,4 +1,7 @@ +--- couchdb.orig 2011-08-23 13:13:45.000000000 +0400 ++++ couchdb 2011-08-23 13:34:20.000000000 +0400 +@@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/bash -+#general config +. /etc/rc.conf +. /etc/rc.d/functions # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy of -@@ -29,7 +32,7 @@ +@@ -29,7 +31,7 @@ NAME=couchdb SCRIPT_NAME=`basename $0` COUCHDB=/usr/bin/couchdb @@ -18,73 +17,33 @@ RUN_DIR=/var/run/couchdb LSB_LIBRARY=/lib/lsb/init-functions -@@ -61,8 +63,9 @@ +@@ -42,16 +44,14 @@ fi - start_couchdb () { -- # Start Apache CouchDB as a background process. -+ stat_busy "Starting the CouchDB daemon" + log_daemon_msg () { +- # Dummy function to be replaced by LSB library. +- +- echo $@ ++ stat_busy $@ + } -+ [ -d /var/run/couchdb ] || mkdir -p /var/run/couchdb - command="$COUCHDB -b" - if test -n "$COUCHDB_STDOUT_FILE"; then - command="$command -o $COUCHDB_STDOUT_FILE" -@@ -79,38 +82,38 @@ - mkdir -p "$RUN_DIR" - if test -n "$COUCHDB_USER"; then - chown $COUCHDB_USER "$RUN_DIR" -- if su $COUCHDB_USER -c "$command" > /dev/null; then -- return $SCRIPT_OK -+ if su $COUCHDB_USER -s /bin/bash -c "$command" > /dev/null; then -+ stat_done - else -- return $SCRIPT_ERROR -+ stat_fail - fi - else - if $command > /dev/null; then -- return $SCRIPT_OK -+ stat_done - else -- return $SCRIPT_ERROR -+ stat_fail - fi + log_end_msg () { +- # Dummy function to be replaced by LSB library. +- + if test "$1" != "0"; then +- echo "Error with $DESCRIPTION: $NAME" ++ stat_fail ++ else ++ stat_done fi + return $1 } - - stop_couchdb () { -- # Stop the running Apache CouchDB process. -+ stat_busy "Stopping the CouchDB daemon" - - command="$COUCHDB -d" - if test -n "$COUCHDB_OPTIONS"; then +@@ -66,7 +66,7 @@ command="$command $COUCHDB_OPTIONS" fi if test -n "$COUCHDB_USER"; then -- if su $COUCHDB_USER -c "$command" > /dev/null; then -- return $SCRIPT_OK -+ if su $COUCHDB_USER -s /bin/bash -c "$command" > /dev/null; then -+ stat_done +- if su $COUCHDB_USER -c "$command"; then ++ if su $COUCHDB_USER -s /bin/bash -c "$command"; then + return $SCRIPT_OK else -- return $SCRIPT_ERROR -+ stat_fail - fi - else - if $command > /dev/null; then -- return $SCRIPT_OK -+ stat_done - else -- return $SCRIPT_ERROR -+ stat_fail - fi - fi - } -@@ -118,7 +121,7 @@ - display_status () { - # Display the status of the running Apache CouchDB process. - -- $COUCHDB -s -+ $COUCHDB $COUCHDB_OPTIONS -s - } - - parse_script_option_list () { + return $SCRIPT_ERROR diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index 432ccbef4..5468f6f69 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -2,17 +2,17 @@ # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=ginac -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.' arch=('i686' 'x86_64') url='http://www.ginac.de' license=('GPL') depends=('cln') -makedepends=('transfig') +makedepends=('transfig' 'doxygen' 'texlive-bin') options=('!libtool') source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2") -md5sums=('6d1385b440c00705a368ad51d60a292d') +md5sums=('d383f3ee50f88ffa1b3966fdb11d0f12') build() { cd ginac-${pkgver} @@ -21,6 +21,10 @@ build() { --prefix=/usr make +} + +check() { + cd ginac-${pkgver} make check } diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index afdcd4c2f..c9e33afda 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Jared Casper <jaredcasper@gmail.com> pkgname=gtkwave -pkgver=3.3.22 +pkgver=3.3.24 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('106d5b6554793b6ce418d469870b61ca') +md5sums=('792cdc0b7c3e4583f407800020877d05') build() { cd gtkwave-${pkgver} diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD index ee5e44c65..a81ba0275 100644 --- a/community/gwenhywfar/PKGBUILD +++ b/community/gwenhywfar/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 54457 2011-08-18 15:06:59Z bluewind $ +# $Id: PKGBUILD 54696 2011-08-23 10:04:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=gwenhywfar -pkgver=4.2.0 -pkgrel=2 +pkgver=4.2.1 +pkgrel=1 pkgdesc="OS abstraction functions for various projects" arch=(i686 x86_64) url="http://www.aquamaniac.de" options=('!libtool') license=("LGPL") -depends=('openssl' 'gnutls') +depends=('openssl' 'gnutls' 'libgcrypt') makedepends=('gtk2' 'qt') optdepends=('gtk2' 'qt') -source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=62&file=01&dummy=gwenhywfar-$pkgver.tar.gz") -md5sums=('62d15e090a0c21bc9d22489ceaaadfde') +source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=63&file=01&dummy=gwenhywfar-$pkgver.tar.gz") +md5sums=('b1673f601af5f07d591f6716d822275b') build() { pacman -Q gwenhywfar && return 1 diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index e46c04f9f..1648fc546 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=1.8.2 -pkgrel=6 +pkgver=1.8.3 +pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64') url='http://www.mongodb.org' @@ -19,7 +19,7 @@ source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.conf' 'mongodb-1.8.0-spidermonkey-1.8.5-support.patch' 'add-js185-support-to-SConstruct.diff') -md5sums=('951fb1a75d90fc822cf4528585a970cf' +md5sums=('662e7ad6ff9f8e4d16c72c038b4a0c60' '85eaa28e349fdc6250f883624e624cca' '4839fe1d638187ca3226e8267b947318' '2e6409732fba887c9cfe81257b5260ad' diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index f7bb06784..0bc1fcd14 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 54370 2011-08-17 15:48:41Z spupykin $ +# $Id: PKGBUILD 54702 2011-08-23 11:42:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20110817 +pkgver=20110823 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" arch=('i686' 'x86_64') license=('custom:LGPL') depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm') -makedepends=('git' 'pkgconfig') +makedepends=('git' 'pkgconfig' + 'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra') conflicts=('ion3') provides=('libtu' 'libextl') -source=() _gitroot="git://notion.git.sourceforge.net/gitroot/notion/notion" _gitname="notion" @@ -22,6 +22,11 @@ _gitroot2="git://notion.git.sourceforge.net/gitroot/notion/libtu" _gitname2="libtu" _gitroot3="git://notion.git.sourceforge.net/gitroot/notion/libextl" _gitname3="libextl" +_gitroot4="git://notion.git.sourceforge.net/gitroot/notion/notion-doc" +_gitname4="notion-doc" + +source=(doc-build-fix.patch) +md5sums=('68b348427d0531d2679a8a8d97d51c7d') build() { cd ${srcdir} @@ -51,6 +56,14 @@ build() { echo fi + if [ -d ${srcdir}/${_gitname}/${_gitname4} ]; then + echo + git pull origin + else + git clone --depth 1 ${_gitroot4} + echo + fi + msg "GIT checkout done or server timeout" rm -rf ${srcdir}/${_gitname}-build @@ -67,11 +80,14 @@ build() { -i system.mk make INCLUDES=-I${srcdir}/${_gitname}-build + (cd notion-doc && patch -p1 <$srcdir/doc-build-fix.patch) + (cd notion-doc && make -j1 TOPDIR=.. all) } package() { cd ${srcdir}/${_gitname}-build make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install + (cd notion-doc && make PREFIX=${pkgdir}/usr TOPDIR=.. install) mkdir -p ${pkgdir}/usr/share/licenses/notion cp LICENSE ${pkgdir}/usr/share/licenses/notion } diff --git a/community/notion/doc-build-fix.patch b/community/notion/doc-build-fix.patch new file mode 100644 index 000000000..45cc19725 --- /dev/null +++ b/community/notion/doc-build-fix.patch @@ -0,0 +1,106 @@ +diff --git a/Makefile b/Makefile +index 8cb5b6c..11c3ca0 100644 +--- a/Makefile ++++ b/Makefile +@@ -19,6 +19,12 @@ FNTEXES=ioncore.exports mod_tiling.exports \ + mod_query.exports de.exports mod_menu.exports \ + mod_dock.exports mod_sp.exports mod_statusbar.exports + ++TEXSOURCES=conf-bindings.tex confintro.tex conf-menus.tex \ ++ conf-statusbar.tex conf.tex conf-winprops.tex cstyle.tex designnotes.tex \ ++ de.tex fdl.tex fnref.tex fullhierarchy.tex hookref.tex luaif.tex \ ++ macros.tex miscref.tex notionconf.tex notionnotes.tex objectsimpl.tex objects.tex \ ++ prelim.tex statusd.tex tricks.tex ++ + RUBBER_DVI=rubber + RUBBER_PS=rubber -p + RUBBER_PDF=rubber -d +@@ -31,14 +37,17 @@ TARGETS = notionconf notionnotes + nothing: + @ echo "Please read the README first." + +-%-dvi: ++%-dvi: $(TEXSOURCES) + $(RUBBER_DVI) $* +- +-%-ps: ++ touch $@ ++ ++%-ps: $(TEXSOURCES) + $(RUBBER_PS) $* ++ touch $@ + +-%-pdf: ++%-pdf: $(TEXSOURCES) + $(RUBBER_PDF) $* ++ touch $@ + + # Install + ###################################### +@@ -48,30 +57,38 @@ install: + for d in $(DOCS); do \ + for e in ps pdf dvi; do \ + test -f $$d.$$e && $(INSTALL) -m $(DATA_MODE) $$d.$$e $(DOCDIR); \ +- done; \ ++ done; \ + $(INSTALLDIR) $(DOCDIR)/$$d; \ +- for i in $$d/*; do \ +- $(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/$$i; \ ++ for i in $$d/*; do \ ++ $(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/$$i; \ + done; \ +- done ++ rm -f $(DOCDIR)/$$d/*.log; \ ++ rm -f $(DOCDIR)/$$d/WARNINGS; \ ++ rm -f $(DOCDIR)/$$d/*.aux; \ ++ rm -f $(DOCDIR)/$$d/*.idx; \ ++ rm -f $(DOCDIR)/$$d/*.tex; \ ++ rm -f $(DOCDIR)/$$d/*.pl; \ ++ done + + # notionconf rules + ###################################### + +-notionconf-dvi: fnlist.tex +-notionconf-ps: fnlist.tex +-notionconf-pdf: fnlist.tex ++notionconf-dvi: fnlist.tex $(TEXSOURCES) ++notionconf-ps: fnlist.tex $(TEXSOURCES) ++notionconf-pdf: fnlist.tex $(TEXSOURCES) + +-notionconf-html: $(FNTEXES) ++notionconf-html: $(FNTEXES) $(TEXSOURCES) + $(L2H) -split 3 notionconf + cp notion.css notionconf ++ touch $@ + + # notionnotes rules + ###################################### + +-notionnotes-html: ++notionnotes-html: $(TEXSOURCES) + $(L2H) -split 4 notionnotes + cp notion.css notionnotes ++ touch $@ + + # More generic rules + ###################################### +@@ -94,7 +111,7 @@ all-html: $(patsubst %, %-html, $(TARGETS)) + + clean: + rm -f $(FNTEXES) fnlist.tex +- rm -f *.aux *.toc *.log ++ rm -f *.aux *.toc *.log *.out + rm -f *.idx *.ild *.ilg *.ind + + realclean: clean +@@ -111,7 +128,8 @@ $(TOPDIR)/%/exports.tex: + $(MAKE) -C $$(dirname $@) _exports_doc + + %.exports: $(TOPDIR)/%/exports.tex +- cp $< $@ ++ cat $< | sed 's|UTF8_STRING|UTF8\\_STRING|' >$@ ++# cp $< $@ + + # Function list + ###################################### diff --git a/community/python2-rst2pdf/PKGBUILD b/community/python2-rst2pdf/PKGBUILD new file mode 100644 index 000000000..b33bcdea3 --- /dev/null +++ b/community/python2-rst2pdf/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 54723 2011-08-23 21:08:22Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Roberto Alsina <ralsina@kde.org> +pkgname=python2-rst2pdf +pkgver=0.16 +pkgrel=10 +pkgdesc="Create PDFs from simple text markup, no LaTeX required." +arch=('i686' 'x86_64') +url="http://rst2pdf.googlecode.com" +license=('MIT') +depends=('python2' 'setuptools' 'docutils' 'python-reportlab') +source=(http://rst2pdf.googlecode.com/files/rst2pdf-$pkgver.tar.gz LICENSE.txt + rst2pdf-0.16_docutils-0.8.patch) +optdepends=('uniconvertor: vector images support' + 'python-svglib: some SVG support' + 'inkscape: best SVG support' + 'python-wordaxe: hyphenation' + 'python2-pygments: Syntax Highlighting' + 'pil: non-JPEG bitmap image formats' + 'pythonmagick: more image formats') +md5sums=('67b8bfac3ac55a85a09fc35ba98794d3' + '416f8046c66b9476cdbacda69a673afe' + 'fcd21288b01b35f654579670dd8c7a02') + +build() { + cd $srcdir/rst2pdf-$pkgver + patch -p0 < ../rst2pdf-0.16_docutils-0.8.patch + python2 setup.py install --root=$pkgdir +} + +package() { + cd $srcdir/rst2pdf-$pkgver + install -D ../LICENSE.txt $pkgdir/usr/share/licenses/python-rst2pdf/COPYING + (cd doc && rst2man rst2pdf.txt rst2pdf.1) + install -D doc/rst2pdf.1 $pkgdir/usr/share/man/man1/rst2pdf.1 + gzip $pkgdir/usr/share/man/man1/rst2pdf.1 +} diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD index 9e0faf6f9..86646aa3b 100644 --- a/community/swi-prolog/PKGBUILD +++ b/community/swi-prolog/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=swi-prolog -pkgver=5.10.4 +pkgver=5.10.5 pkgrel=1 pkgdesc='Prolog environment' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('unixodbc: for using the odbc4pl library' 'libxft: for using the pl2xpce library') options=('!makeflags') source=("http://www.swi-prolog.org/download/stable/src/pl-${pkgver}.tar.gz") -md5sums=('363433bb2f80a6c2befeaee7768197b4') +md5sums=('1ca45eddd3590fb525085761e75a4ebd') build() { cd pl-${pkgver} @@ -32,6 +32,12 @@ build() { make } +check() { + cd pl-${pkgver} + + make check || true +} + package() { cd pl-${pkgver} diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 3ad0f297a..bcb80f277 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 33887 2010-11-29 08:54:01Z spupykin $ +# $Id: PKGBUILD 54707 2011-08-23 12:04:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.8.1 -pkgrel=6 +pkgrel=7 pkgdesc="Open Source IRC Server." arch=('i686' 'x86_64') url="http://unrealircd.com" @@ -14,29 +14,18 @@ conflicts=(ircd) provides=(ircd) backup=(etc/unrealircd/unrealircd.conf) source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz - unrealircd.rc) + unrealircd.rc + arch-fixes.patch) md5sums=('7b741e94e867c0a7370553fd01506c66' - '0d728240132a97a2cef61be9558750b1') + '0d728240132a97a2cef61be9558750b1' + '670f0a5ecd60789cd5f296a1901cf1b7') build() { mkdir -p $pkgdir/etc/unrealircd mkdir -p $pkgdir/usr/bin cd $srcdir/Unreal3.2 - patch src/ircd.c <<EOF -847c847 -< #ifdef USE_SSL ---- -> #if 0 -857c857 -< #ifdef ZIP_LINKS ---- -> #if 0 -867c867 -< #ifdef USE_LIBCURL ---- -> #if 0 -EOF + patch -p1 <$srcdir/arch-fixes.patch ./configure --with-showlistmodes \ --enable-hub --enable-prefixaq --with-listen=5 \ diff --git a/community/unrealircd/arch-fixes.patch b/community/unrealircd/arch-fixes.patch new file mode 100644 index 000000000..02bbb18b3 --- /dev/null +++ b/community/unrealircd/arch-fixes.patch @@ -0,0 +1,56 @@ +diff -wbBur Unreal3.2/doc/example.conf Unreal3.2.my/doc/example.conf +--- Unreal3.2/doc/example.conf 2009-04-13 15:03:55.000000000 +0400 ++++ Unreal3.2.my/doc/example.conf 2011-08-23 15:48:46.000000000 +0400 +@@ -33,8 +33,8 @@ + */ + + /* FOR *NIX, uncomment the following 2lines: */ +-//loadmodule "src/modules/commands.so"; +-//loadmodule "src/modules/cloak.so"; ++loadmodule "modules/commands.so"; ++loadmodule "modules/cloak.so"; + + /* FOR Windows, uncomment the following 2 lines: */ + //loadmodule "modules/commands.dll"; +diff -wbBur Unreal3.2/src/ircd.c Unreal3.2.my/src/ircd.c +--- Unreal3.2/src/ircd.c 2009-03-01 21:37:58.000000000 +0300 ++++ Unreal3.2.my/src/ircd.c 2011-08-23 15:44:30.000000000 +0400 +@@ -844,7 +844,7 @@ + const char *compiledfor, *runtime; + int error = 0; + +-#ifdef USE_SSL ++#if 0 + compiledfor = OPENSSL_VERSION_TEXT; + runtime = SSLeay_version(SSLEAY_VERSION); + if (strcasecmp(compiledfor, runtime)) +@@ -854,7 +854,7 @@ + error=1; + } + #endif +-#ifdef ZIP_LINKS ++#if 0 + runtime = zlibVersion(); + compiledfor = ZLIB_VERSION; + if (*compiledfor != *runtime) +@@ -864,7 +864,7 @@ + error = 1; + } + #endif +-#ifdef USE_LIBCURL ++#if 0 + /* Perhaps someone should tell them to do this a bit more easy ;) + * problem is runtime output is like: 'libcurl/7.11.1 zlib/1.2.1 c-ares/1.2.0' + * while header output is like: '7.11.1'. +diff -wbBur Unreal3.2/unreal.in Unreal3.2.my/unreal.in +--- Unreal3.2/unreal.in 2009-03-01 21:37:55.000000000 +0300 ++++ Unreal3.2.my/unreal.in 2011-08-23 15:49:20.000000000 +0400 +@@ -7,7 +7,7 @@ + if [ -r $PID_FILE ] ; then + mv -f $PID_FILE $PID_BACKUP + fi +- @BINDIR@ ++ @BINDIR@/ircd + sleep 1 + if [ ! -r $PID_FILE ] ; then + echo "Possible error encountered (IRCd seemingly not started)" diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index 2d869d714..40254a8b5 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128934 2011-06-25 14:19:16Z allan $ +# $Id: PKGBUILD 136188 2011-08-24 01:48:21Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=fakeroot -pkgver=1.16 +pkgver=1.17 pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ install=fakeroot.install depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') options=('!libtool') source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('e8470aa7e965bfc74467de0e594e60b6') +md5sums=('1adc603cc18eedee11d9889798c863db') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD index 5b706c6ba..d0579e6a2 100644 --- a/core/pcre/PKGBUILD +++ b/core/pcre/PKGBUILD @@ -1,28 +1,39 @@ -# $Id: PKGBUILD 135715 2011-08-18 02:10:20Z allan $ +# $Id: PKGBUILD 136192 2011-08-24 03:36:11Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre pkgver=8.13 -pkgrel=1 +pkgrel=2 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64') url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs') options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2) -md5sums=('5e595edbcded141813fa1a10dbce05cb') - +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2 + r661.diff) +md5sums=('5e595edbcded141813fa1a10dbce05cb' + '70e2725b46ff6f3f114ce5067fd03405') build() { cd "${srcdir}"/${pkgname}-${pkgver} + + # http://bugs.exim.org/show_bug.cgi?id=1136 + patch -Np2 -i "${srcdir}"/r661.diff + sed -i '12140d' testdata/testoutput2 + [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" ./configure --prefix=/usr --enable-utf8 --enable-unicode-properties make } +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install diff --git a/core/pcre/r661.diff b/core/pcre/r661.diff new file mode 100644 index 000000000..7bed4ce2e --- /dev/null +++ b/core/pcre/r661.diff @@ -0,0 +1,26 @@ +--- code/trunk/pcre_compile.c 2011/08/02 11:00:40 654 ++++ code/trunk/pcre_compile.c 2011/08/21 09:00:54 661 +@@ -2295,8 +2295,13 @@ + A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not. + It seems that the appearance of a nested POSIX class supersedes an apparent + external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or +-a digit. Also, unescaped square brackets may also appear as part of class +-names. For example, [:a[:abc]b:] gives unknown class "[:abc]b:]"in Perl. ++a digit. ++ ++In Perl, unescaped square brackets may also appear as part of class names. For ++example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for ++[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not ++seem right at all. PCRE does not allow closing square brackets in POSIX class ++names. + + Arguments: + ptr pointer to the initial [ +@@ -2314,6 +2319,7 @@ + { + if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) + ptr++; ++ else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE; + else + { + if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 1711534b8..c380932b8 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127641 2011-06-17 11:09:38Z bisson $ +# $Id: PKGBUILD 136183 2011-08-23 19:33:20Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,12 +7,12 @@ pkgname=bitlbee pkgver=3.0.3 -pkgrel=2 +pkgrel=3 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64') url='http://www.bitlbee.org/' license=('GPL') -depends=('openssl' 'glib2' 'libotr') +depends=('gnutls' 'glib2' 'libotr') optdepends=('xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' @@ -32,7 +32,7 @@ build() { --pidfile=/var/run/bitlbee/bitlbee.pid \ --ipcsocket=/var/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/lib/systemd/system \ - --ssl=openssl \ + --ssl=gnutls \ --strip=0 \ --otr=1 \ diff --git a/extra/fwbuilder/PKGBUILD b/extra/fwbuilder/PKGBUILD index 055db9e92..31018c3d3 100644 --- a/extra/fwbuilder/PKGBUILD +++ b/extra/fwbuilder/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 109609 2011-02-11 02:28:42Z kevin $ +# $Id: PKGBUILD 136184 2011-08-24 01:47:26Z kevin $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fwbuilder -pkgver=4.1.3 +pkgver=5.0.0.3568 pkgrel=1 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms" url="http://www.fwbuilder.org/" arch=('i686' 'x86_64') license=('GPL') -depends=("libfwbuilder=${pkgver}" 'qt' 'net-snmp' 'hicolor-icon-theme') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7cb6d50ce6f02b485525405bd00d8c33') +depends=('libxslt' 'net-snmp' 'qt') +conflicts=('libfwbuilder') +source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/5.0.0/fwbuilder-${pkgver}.tar.gz") +md5sums=('0324edab10329dde029953d646aa8dad') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/fwbuilder-${pkgver}" ./autogen.sh ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/fwbuilder-${pkgver}" make INSTALL_ROOT=${pkgdir} install } diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index 0dc103a82..808c0885b 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 125631 2011-05-27 10:55:14Z heftig $ +# $Id: PKGBUILD 136177 2011-08-23 18:46:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.8.8 +pkgver=4.8.9 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('b3a961d2e0ff3331745220984c70b6a9' +md5sums=('60770d45dc08c0f181b22cdfce5be3e8' 'bce1611f3117b53fc904cab549c09967') build() { diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index bdd3377d4..33c4c3771 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 125630 2011-05-27 10:55:00Z heftig $ +# $Id: PKGBUILD 136180 2011-08-23 18:59:12Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.12.10 +pkgver=3.12.11 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.8.7 -depends=("nspr>=${_nsprver}" 'sqlite3>=3.7.5' 'zlib' 'sh') +_nsprver=4.8.9 +depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh') makedepends=('perl') replaces=('nss-nspr') options=('!strip') @@ -18,7 +18,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s nss-config.in add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch) -md5sums=('027954e894f02732f4e66cd854261145' +md5sums=('ca0ca058380be200cf247ea2496b5352' 'e5c97db0c884d5f4cfda21e562dc9bba' 'c547b030c57fe1ed8b77c73bf52b3ded' '46bee81908f1e5b26d6a7a2e14c64d9f' diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index dc3699a5b..5a2ff5ec4 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136081 2011-08-22 13:27:31Z pierre $ +# $Id: PKGBUILD 136162 2011-08-23 15:55:48Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,9 +22,9 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.7 -_suhosinver=${pkgver}-0.9.10 -pkgrel=3 +pkgver=5.3.8 +_suhosinver=5.3.7-0.9.10 +pkgrel=1 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -35,16 +35,14 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm' - 'crypt.patch') -md5sums=('2d47d003c96de4e88863ff38da61af33' + 'logrotate.d.php-fpm') +md5sums=('704cd414a0565d905e1074ffdc1fadfb' '08582e502fed8221c6577042ca45ddb8' '39eaa70d276fc3d45d6bcf6cd5ae1106' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' '09005dabd90c48ddd392b3dbf05f8a82' - '07c4e412909ac65a44ec90e7a2c4bade' - '8e079c6d9b31358d59b98aa3dbd7d692') + '07c4e412909ac65a44ec90e7a2c4bade') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ @@ -137,9 +135,6 @@ build() { cd ${srcdir}/${pkgbase}-${pkgver} - # Fix MD5 crypt(); see https://bugs.php.net/bug.php?id=55439 - patch -p0 -i ${srcdir}/crypt.patch - # apply suhosin patch patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index 5afcac5a1..d147e5e76 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 135006 2011-08-09 21:00:16Z schiv $ +# $Id: PKGBUILD 136171 2011-08-23 17:11:36Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: dorphell <dorphell@archlinux.org> pkgname=snd -pkgver=12.3 +pkgver=12.4 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') url="http://ccrma.stanford.edu/software/snd/" license=('custom') -depends=('lesstif' 'jack' 'fam' 'gsl' 'fftw') +depends=('lesstif' 'jack' 'gamin' 'gsl' 'fftw') makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'libxpm' 'timidity++' 'mpg123' 'vorbis-tools' 'gmp') optdepends=('ladspa' 'wavpack' 'flac' 'speex' 'timidity++' 'mpg123' 'vorbis-tools') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('e1dab6945b9583f02aa6ae73d3780c98') +md5sums=('107e5a4fd5df2d1432d0ec51cb31a88b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index 5f793c68b..f8179e2e3 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136078 2011-08-22 13:09:39Z andyrtr $ +# $Id: PKGBUILD 136121 2011-08-23 06:05:20Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> diff --git a/extra/xfce4-session/gdm.patch b/extra/xfce4-session/gdm.patch new file mode 100644 index 000000000..e89e6a0b6 --- /dev/null +++ b/extra/xfce4-session/gdm.patch @@ -0,0 +1,21 @@ +From 3bba8eb773a96339fb841c76b04f2d4fd3317814 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen <pmatilai@laiskiainen.org> +Date: Wed, 23 Mar 2011 21:13:40 +0000 +Subject: Fix GDM_LANG usage to be compatible with GDM3 (bug #7400). + +--- +diff --git a/xfce4-session/main.c b/xfce4-session/main.c +index ff6e324..fcf69f8 100644 +--- a/xfce4-session/main.c ++++ b/xfce4-session/main.c +@@ -103,7 +103,7 @@ setup_environment (void) + + /* this is for compatibility with the GNOME Display Manager */ + lang = g_getenv ("GDM_LANG"); +- if (lang != NULL) ++ if (lang != NULL && strlen (lang) > 0) + { + xfce_setenv ("LANG", lang, TRUE); + xfce_unsetenv ("GDM_LANG"); +-- +cgit diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index dc77e6923..eafe6f472 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135629 2011-08-16 19:39:58Z ibiru $ +# $Id: PKGBUILD 136174 2011-08-23 18:08:58Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner pkgver=6.0 _ffoxver=6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -13,15 +13,23 @@ makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'm url="http://wiki.mozilla.org/XUL:Xul_Runner" source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2 mozconfig - mozilla-pkgconfig.patch) + mozilla-pkgconfig.patch + moz-639554.patch) options=('!emptydirs' '!buildflags') replaces=('xulrunner-oss') +md5sums=('1840185865a1a8975df4a3db59080ddc' + '2358a2ddd35bcdd62ff42442dfe548d9' + '639ea80e823543dd415b90c0ee804186' + '96d3c1790a56f8e6df88e327adccf3bf') + build() { cd "${srcdir}/mozilla-release" cp "${srcdir}/mozconfig" .mozconfig #fix libdir/sdkdir - fedora patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch" + #upstream fixes + patch -Np1 -i "${srcdir}/moz-639554.patch" export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" @@ -40,7 +48,8 @@ package() { # add xulrunner library path to ld.so.conf install -d ${pkgdir}/etc/ld.so.conf.d echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf + + #wtf mozilla! + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-6.0/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "${pkgdir}/usr/lib/xulrunner-devel-6.0/sdk/bin/xpt.py" } -md5sums=('1840185865a1a8975df4a3db59080ddc' - '2358a2ddd35bcdd62ff42442dfe548d9' - '639ea80e823543dd415b90c0ee804186') diff --git a/extra/xulrunner/moz-639554.patch b/extra/xulrunner/moz-639554.patch new file mode 100644 index 000000000..30fe15c6e --- /dev/null +++ b/extra/xulrunner/moz-639554.patch @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Chris Coulson <chrisccoulson@ubuntu.com> +# Date 1306390403 -7200 +# Node ID 99672871e93003520189cfe3a684ebbea151cb4b +# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e +Bug 639554 - Install sdk/bin with make install. r=bsmedberg + +diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk +--- a/toolkit/mozapps/installer/packager.mk ++++ b/toolkit/mozapps/installer/packager.mk +@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard + $(NSINSTALL) -D $(DESTDIR)$(includedir) + (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(includedir) && tar -xf -) + $(NSINSTALL) -D $(DESTDIR)$(idldir) + (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(idldir) && tar -xf -) + # SDK directory is the libs + a bunch of symlinks + $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib ++ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin + if test -f $(DIST)/include/xpcom-config.h; then \ + $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ + fi + (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) ++ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) + $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl + ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib + ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin + ln -s $(includedir) $(DESTDIR)$(sdkdir)/include + ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl + endif # INSTALL_SDK + + make-sdk: + diff --git a/testing/libssh2/PKGBUILD b/testing/libssh2/PKGBUILD index 4eeb02c5d..342e889fa 100644 --- a/testing/libssh2/PKGBUILD +++ b/testing/libssh2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134704 2011-08-07 16:23:21Z angvp $ +# $Id: PKGBUILD 136165 2011-08-23 16:20:17Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: ice-man <icemanf@gmail.com> pkgname=libssh2 -pkgver=1.2.8 +pkgver=1.2.9 pkgrel=1 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" url="http://www.libssh2.org/" @@ -15,7 +15,7 @@ depends=('openssl') makedepends=('zlib') options=('!libtool') source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('1b236563b75d1b1f0d483352dc5918cf') +md5sums=('62ea143c41c6ed437a55d6a0b0579f2f') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD new file mode 100644 index 000000000..4bcc17f5e --- /dev/null +++ b/testing/network-manager-applet/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 136149 2011-08-23 08:09:50Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Arjan Timmerman <arjan@archlinux.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Tor Krill <tor@krill.nu> +# Contributor: Will Rea <sillywilly@gmail.com> + +pkgname=network-manager-applet +pkgver=0.9.0 +pkgrel=1 +pkgdesc="GNOME frontends to NetWorkmanager" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf') +makedepends=('intltool' 'gnome-bluetooth') +optdepends=('gnome-bluetooth: for PAN/DUN support') +options=('!libtool') +install=network-manager-applet.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0e85f7e1c0d7677f382dde08a3c9d3fa93d4d850d3801a41e5a9bd95043bfe24') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static \ + --disable-maintainer-mode + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install new file mode 100644 index 000000000..9922d12b2 --- /dev/null +++ b/testing/network-manager-applet/network-manager-applet.install @@ -0,0 +1,18 @@ +pkgname=network-manager-applet + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} diff --git a/testing/networkmanager-openconnect/PKGBUILD b/testing/networkmanager-openconnect/PKGBUILD new file mode 100644 index 000000000..5c0913fe5 --- /dev/null +++ b/testing/networkmanager-openconnect/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 136151 2011-08-23 08:09:52Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=networkmanager-openconnect +pkgver=0.9.0 +pkgrel=1 +pkgdesc="NetworkManager VPN integration for openconnect" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'openconnect' 'dbus-glib' 'gconf') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) +sha256sums=('0fef61c672265f2b6008d8439ed5b18fe188f2a5f207227fc79a1b78657a6812') + +build() { + cd "${srcdir}/NetworkManager-openconnect-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd "${srcdir}/NetworkManager-openconnect-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-openconnect/networkmanager-openconnect.install b/testing/networkmanager-openconnect/networkmanager-openconnect.install new file mode 100644 index 000000000..7bd4d44f9 --- /dev/null +++ b/testing/networkmanager-openconnect/networkmanager-openconnect.install @@ -0,0 +1,16 @@ +pkgname=networkmanager-openconnect + +post_install() { + getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect + getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect + passwd -l nm-openconnect > /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect + getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect +} diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD new file mode 100644 index 000000000..f1c520cb9 --- /dev/null +++ b/testing/networkmanager-openvpn/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 136155 2011-08-23 08:09:55Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=networkmanager-openvpn +pkgver=0.9.0 +pkgrel=1 +pkgdesc="NetworkManager VPN plugin for OpenVPN" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +install=networkmanager-openvpn.install +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) +sha256sums=('741e39bcedd589b656067c9d3aa45ebca41a0f329914d157450f4b92e79bf7ee') + +build() { + cd "${srcdir}/NetworkManager-openvpn-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd "${srcdir}/NetworkManager-openvpn-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install new file mode 100644 index 000000000..931c0517c --- /dev/null +++ b/testing/networkmanager-openvpn/networkmanager-openvpn.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD new file mode 100644 index 000000000..2548f6757 --- /dev/null +++ b/testing/networkmanager-pptp/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 136157 2011-08-23 08:09:58Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=networkmanager-pptp +pkgver=0.9.0 +pkgrel=1 +pkgdesc="NetworkManager VPN plugin for pptp " +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +options=('!libtool') +install=networkmanager-pptp.install +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) +sha256sums=('97da81b0c8b1698316908a1dfe66c5a02a71088b56471d67d7e12066d956cbd5') + +build() { + cd "${srcdir}/NetworkManager-pptp-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd "${srcdir}/NetworkManager-pptp-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install new file mode 100644 index 000000000..931c0517c --- /dev/null +++ b/testing/networkmanager-pptp/networkmanager-pptp.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD new file mode 100644 index 000000000..e06189c21 --- /dev/null +++ b/testing/networkmanager-vpnc/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 136159 2011-08-23 08:10:02Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=networkmanager-vpnc +pkgver=0.9.0 +pkgrel=1 +pkgdesc="NetworkManager VPN plugin for vpnc" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' + 'gtk3' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +options=('!libtool') +install=networkmanager-vpnc.install +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) +sha256sums=('d672ed353f57d0422486ba96bc1bd673fd08aec5f9c015584028af07c45239a4') + +build() { + cd "${srcdir}/NetworkManager-vpnc-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd "${srcdir}/NetworkManager-vpnc-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install new file mode 100644 index 000000000..931c0517c --- /dev/null +++ b/testing/networkmanager-vpnc/networkmanager-vpnc.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf new file mode 100644 index 000000000..c37b59680 --- /dev/null +++ b/testing/networkmanager/NetworkManager.conf @@ -0,0 +1,2 @@ +[main] +plugins=keyfile diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD new file mode 100644 index 000000000..42d12cf4e --- /dev/null +++ b/testing/networkmanager/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 136147 2011-08-23 08:09:48Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinxu.org> +# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Tor Krill <tor@krill.nu> +# Contributor: Will Rea <sillywilly@gmail.com> +# Contributor: Valentine Sinitsyn <e_val@inbox.ru> + +pkgname=networkmanager +pkgver=0.9.0 +pkgrel=1 +pkgdesc="Network Management daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') +optdepends=('modemmanager: for modem management service' + 'dhclient: alternative DHCP/DHCPv6 client' + 'iptables: Connection sharing' + 'dnsmasq: Connection sharing' + 'bluez: Bluetooth support') +options=('!libtool') +backup=('etc/NetworkManager/NetworkManager.conf') +install=networkmanager.install +source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz + NetworkManager.conf disable_set_hostname.patch) +sha256sums=('166db385e5a349dd320f061554a54a9d599eb5bfc8fcbcc836cf5046904c5149' + '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') + +build() { + cd "${srcdir}/NetworkManager-${pkgver}" + + patch -Np1 -i "${srcdir}/disable_set_hostname.patch" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-distro=arch \ + --with-dhclient=/usr/sbin/dhclient \ + --with-dhcpcd=/sbin/dhcpcd \ + --with-iptables=/usr/sbin/iptables \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax + + make +} + +package() { + cd "${srcdir}/NetworkManager-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" + + rm -rf "${pkgdir}/var/run/" +} diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch new file mode 100644 index 000000000..ee95dd0e1 --- /dev/null +++ b/testing/networkmanager/disable_set_hostname.patch @@ -0,0 +1,19 @@ +diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c +--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 ++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 +@@ -302,6 +302,7 @@ + return; + } + ++#if 0 + /* Try automatically determined hostname from the best device's IP config */ + if (!best4) + best4 = get_best_ip4_device (policy->manager, &best_req4); +@@ -356,6 +357,7 @@ + } + } + ++#endif + /* If no automatically-configured hostname, try using the hostname from + * when NM started up. + */ diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install new file mode 100644 index 000000000..de40c17ed --- /dev/null +++ b/testing/networkmanager/networkmanager.install @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG +ATTENTION: + /etc/NetworkManager/nm-system-settings.conf has been replaced + by /etc/NetworkManager/NetworkManager.conf. Make sure you move + any custom settings to the new config file. +MSG + true +} diff --git a/testing/openconnect/PKGBUILD b/testing/openconnect/PKGBUILD new file mode 100644 index 000000000..c4b34224c --- /dev/null +++ b/testing/openconnect/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 136153 2011-08-23 08:09:54Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=openconnect +pkgver=3.11 +pkgrel=1 +epoch=1 +pkgdesc="Open client for Cisco AnyConnect VPN" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.infradead.org/openconnect.html" +depends=('libxml2' 'openssl' 'libproxy') +options=('!libtool' '!emptydirs') +source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('b66927f98cfeb577b3016f8b83005d6b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} |