From 91d3f2ebc9b69c3e24bd507890afbb4bd3f4eea3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 5 Jun 2013 00:33:46 -0700 Subject: Wed Jun 5 00:33:46 PDT 2013 --- community/c++-gtk-utils/PKGBUILD | 6 +- community/dmd/PKGBUILD | 124 +++++++----- ...akefile-respect-DESTDIR-in-tic-invocation.patch | 25 +++ community/dvtm/PKGBUILD | 18 +- community/efax-gtk/PKGBUILD | 6 +- community/haskell-cairo/PKGBUILD | 6 +- community/highlight/PKGBUILD | 18 +- community/kdenlive/PKGBUILD | 4 +- community/kdenlive/kdenlive.install | 1 + community/ktoblzcheck/PKGBUILD | 6 +- community/ldc/PKGBUILD | 32 +-- community/libvirt/PKGBUILD | 8 +- community/mlt/PKGBUILD | 19 +- community/mumble/PKGBUILD | 8 +- community/parole/PKGBUILD | 8 +- community/processing/PKGBUILD | 8 +- community/ruby-gtk2/PKGBUILD | 6 +- community/surf/PKGBUILD | 8 +- community/surf/config.h | 2 +- community/tor/PKGBUILD | 13 +- community/tor/tor.install | 7 - community/tor/tor.service | 7 +- community/tor/torrc | 222 +++++++++++++-------- 23 files changed, 314 insertions(+), 248 deletions(-) create mode 100644 community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch (limited to 'community') diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 356628b34..dd27cbf7b 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88546 2013-04-19 14:27:07Z giovanni $ +# $Id: PKGBUILD 92397 2013-06-04 16:29:40Z giovanni $ # Maintainer: Giovanni Scafora pkgname=c++-gtk-utils -pkgver=2.0.16 +pkgver=2.0.17 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool' '!docs' '!emptydirs') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('5502683a5ca2c725fb9dd205fe81ca5b') +md5sums=('2ce17c4d9f2cc669f67f0087479e278a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index 5da4b04ab..bfccd2274 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,90 +1,106 @@ -# $Id: PKGBUILD 84430 2013-02-18 23:24:23Z svenstaro $ +# $Id: PKGBUILD 92352 2013-06-04 07:05:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Chris Brannon # Contributor: Andrea Scarpino # Contributor: Anders Bergh # Contributor: Alexander Fehr -pkgname=('dmd' 'libphobos') +pkgname=('dmd' 'libphobos' 'dtools') pkgbase=dmd -pkgver=2.062 -pkgrel=1 +pkgver=2.063.1 +pkgrel=2 arch=('i686' 'x86_64') -url="http://www.digitalmars.com/d/2.0/" -#source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip -source=(http://downloads.dlang.org.s3-website-us-east-1.amazonaws.com/releases/2013/dmd.${pkgver}.zip - tools-${pkgver}.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v${pkgver}) -license=('custom') -md5sums=('fd2211206532ab41a8aef764a9225d3c' - '2e301d06071fb24c7c2d504c8ddbbc39') +url="http://www.dlang.org" +makedepends=('git') +source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver" + "git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver" + "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver" + "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver") +sha1sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP') [[ $CARCH == "x86_64" ]] && _archbits="64" [[ $CARCH == "i686" ]] && _archbits="32" build() { - cd $srcdir/dmd2/src/ + cd $srcdir/dmd/src + make -f posix.mak MODEL=$_archbits RELEASE=1 - echo "$pkgver" > VERSION # Fix specific release bug of 2.062 - cd dmd - make -f posix.mak MODEL=$_archbits + cd $srcdir/druntime + make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 - cd ../druntime - make -f posix.mak MODEL=$_archbits DMD=../dmd/dmd + cd $srcdir/phobos + make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 - cd ../phobos - make -f posix.mak MODEL=$_archbits DMD=../dmd/dmd - - # Building rdmd ourselves breaks in dmd 2.059 - #cd $srcdir/D-Programming-Language-tools-* - #$srcdir/dmd2/src/dmd/dmd -I$srcdir/dmd2/src/druntime/import/ -I$srcdir/dmd2/src/phobos -L-L$srcdir/dmd2/src/phobos/generated/linux/release/$_archbits/ rdmd.d + cd $srcdir/tools + for tool in rdmd.d ddemangle.d catdoc.d detab.d tolf.d dget.d; do + $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ $tool + done } package_dmd() { - pkgdesc="The Digital Mars D compiler" - backup=('etc/dmd.conf') - depends=('libphobos' 'gcc') + pkgdesc="The D programming language reference compiler" + backup=('etc/dmd.conf') + depends=('gcc') + provides=("d-compiler=$pkgver") + license=('custom') - install -Dm755 $srcdir/dmd2/src/dmd/dmd $pkgdir/usr/bin/dmd + install -Dm755 $srcdir/dmd/src/dmd $pkgdir/usr/bin/dmd - mkdir -p $pkgdir/etc - echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf + mkdir -p $pkgdir/etc + echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf + install -Dm644 $srcdir/dmd/docs/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1 + install -Dm644 $srcdir/dmd/docs/man/man1/dmd.conf.5 $pkgdir/usr/share/man/man5/dmd.conf.5 - install -Dm644 $srcdir/dmd2/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1 - install -Dm644 $srcdir/dmd2/man/man1/rdmd.1 $pkgdir/usr/share/man/man1/rdmd.1 - install -Dm644 $srcdir/dmd2/man/man1/dmd.conf.5 $pkgdir/usr/share/man/man5/dmd.conf.5 + install -Dm644 $srcdir/dmd/src/backendlicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-backend + install -Dm644 $srcdir/dmd/src/gpl.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend.1 + install -Dm644 $srcdir/dmd/src/artistic.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend.2 - install -Dm644 $srcdir/dmd2/license.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE + mkdir -p $pkgdir/usr/share/d/samples/ + cp -r $srcdir/dmd/samples/* $pkgdir/usr/share/d/samples/ - mkdir -p $pkgdir/usr/share/d/samples/ - cp -r $srcdir/dmd2/samples/d/* $pkgdir/usr/share/d/samples/ + find $pkgdir/usr -type f | xargs chmod 0644 + chmod 755 $pkgdir/usr/bin/* - find $pkgdir/usr -type f | xargs chmod 0644 - chmod 755 $pkgdir/usr/bin/* + # No longer available, because not source code is provided and those are not mandatory. + # Please get those from http://dlang.org if absolutely needed. - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/ddemangle $pkgdir/usr/bin/ddemangle - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/dman $pkgdir/usr/bin/dman - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/dumpobj $pkgdir/usr/bin/dumpobj - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/obj2asm $pkgdir/usr/bin/obj2asm - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/rdmd $pkgdir/usr/bin/rdmd - #install -Dm755 $srcdir/D-Programming-Language-tools-*/rdmd $pkgdir/usr/bin/rdmd + # install -Dm755 $srcdir/dmd/linux/bin${_archbits}/dumpobj $pkgdir/usr/bin/dumpobj + # install -Dm755 $srcdir/dmd/linux/bin${_archbits}/obj2asm $pkgdir/usr/bin/obj2asm } +# Will be packaged separately once GDC/LDC will be able to compile phobos and pass test suite. +# For now only dependency is relaxed package_libphobos() { - pkgdesc="The phobos D standard library for DMD" - install -Dm644 $srcdir/dmd2/src/druntime/lib/libdruntime-linux${_archbits}.a $pkgdir/usr/lib/libdruntime.a - install -Dm644 $srcdir/dmd2/src/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a + depends=("d-compiler>=$pkgver" "curl") + pkgdesc="The Phobos standard library for D programming language" + license=("boost") + install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a + install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.so $pkgdir/usr/lib/libphobos2.so + + mkdir -p $pkgdir/usr/include/d + cp -r $srcdir/phobos/{*.d,etc,std} $pkgdir/usr/include/d - mkdir -p $pkgdir/usr/include/d - cp -r $srcdir/dmd2/src/phobos/{*.d,etc,std} $pkgdir/usr/include/d + mkdir -p $pkgdir/usr/include/d/druntime + cp -r $srcdir/druntime/import $pkgdir/usr/include/d/druntime - mkdir -p $pkgdir/usr/include/d/druntime - cp -r $srcdir/dmd2/src/druntime/import $pkgdir/usr/include/d/druntime + mkdir -p $pkgdir/usr/share/doc/d/ - mkdir -p $pkgdir/usr/share/doc/d/ - cp -r $srcdir/dmd2/html $pkgdir/usr/share/doc/d/ + find $pkgdir/usr -type f | xargs chmod 0644 + + install -Dm644 $srcdir/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE-druntime + install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos +} - find $pkgdir/usr -type f | xargs chmod 0644 +package_dtools() { + pkgdesc="Ancilliary tools for the D programming language compiler" + license=("boost") + depends=("curl") - install -Dm644 $srcdir/dmd2/src/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + cd $srcdir/tools + mkdir -p $pkgdir/usr/bin + install -m755 -t $pkgdir/usr/bin rdmd ddemangle catdoc detab tolf dget } diff --git a/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch b/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch new file mode 100644 index 000000000..9ce462240 --- /dev/null +++ b/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch @@ -0,0 +1,25 @@ +From 4ab5ed57a3b53e0271cf50f256cd7904c50cac55 Mon Sep 17 00:00:00 2001 +From: Douglas Jerome +Date: Wed, 15 May 2013 14:33:31 +0200 +Subject: [PATCH] Makefile: respect ${DESTDIR} in tic invocation + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index ff85deb..eb849f4 100644 +--- a/Makefile ++++ b/Makefile +@@ -55,7 +55,7 @@ install: dvtm + @sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1 + @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1 + @echo installing terminfo description +- @tic -s dvtm.info ++ @tic -o ${DESTDIR}/usr/share/terminfo -s dvtm.info + + uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin +-- +1.8.3.450.gf3f2a46 + diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD index ad374d4d3..bedae4873 100644 --- a/community/dvtm/PKGBUILD +++ b/community/dvtm/PKGBUILD @@ -1,26 +1,34 @@ -# $Id: PKGBUILD 88575 2013-04-20 13:06:56Z lfleischer $ +# $Id: PKGBUILD 92416 2013-06-04 19:05:34Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Giorgio Lando # Contributor: bender02 at gmx dot com pkgname=dvtm pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64') url='http://www.brain-dump.org/projects/dvtm/' license=('MIT') depends=('ncurses') source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'config.h') + 'config.h' + '0001-Makefile-respect-DESTDIR-in-tic-invocation.patch') md5sums=('7de1103abb0ca410f7250cf89f019a38' - '41107e5e84a8572f70d6cb111b4e07f8') + '41107e5e84a8572f70d6cb111b4e07f8' + 'c85d8265ced45d014a7d3f05134bf6a1') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../0001-Makefile-respect-DESTDIR-in-tic-invocation.patch + cp "${srcdir}/config.h" . sed -i 's/CFLAGS =/CFLAGS +=/' config.mk +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" make clean make diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD index 8007c8012..ef2d279e0 100644 --- a/community/efax-gtk/PKGBUILD +++ b/community/efax-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 81976 2013-01-05 08:19:44Z giovanni $ +# $Id: PKGBUILD 92399 2013-06-04 16:39:33Z giovanni $ # Maintainer: Giovanni Scafora pkgname=efax-gtk -pkgver=3.2.11 +pkgver=3.2.12 pkgrel=1 pkgdesc="A GUI front end for the 'efax' fax program" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('heirloom-mailx: to use the mail_fax script') backup=('etc/efax-gtkrc') install=efax-gtk.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz") -md5sums=('237dddbc6d208565f2860319314f4392') +md5sums=('5d38ca4d4c90e0805f2cf8f191177fb6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index eb6a48ed4..751d2ee54 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89294 2013-04-28 16:52:15Z td123 $ +# $Id: PKGBUILD 92370 2013-06-04 12:29:46Z spupykin $ # Maintainer: Sergej Pupykin pkgname=haskell-cairo pkgver=0.12.4 -pkgrel=4 +pkgrel=5 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') @@ -34,7 +34,7 @@ build() { package() { _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hglibver}") + depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hmtlver}") cd ${srcdir}/cairo-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 7cf82ed54..4872a8ebb 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 85360 2013-03-01 10:33:34Z andrea $ +# $Id: PKGBUILD 92418 2013-06-04 19:14:33Z bluewind $ # Maintainer: Florian Pritz # Contributor: Jan Fader pkgbase=highlight pkgname=(highlight highlight-gui) -pkgver=3.13 -pkgrel=2 +pkgver=3.14 +pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64') makedepends=(qt4 lua51 boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('2b5e217c80c441853360926dbb7777e9' - 'c68f6dd20af61ca1061d910879d910a8') +md5sums=('a0bf796e952f5e1ccf061704cd774047' + 'SKIP') build() { cd "$srcdir/$pkgbase-$pkgver" - make - make gui + make QMAKE=qmake-qt4 + make QMAKE=qmake-qt4 gui } package_highlight() { @@ -25,7 +25,7 @@ package_highlight() { depends=('lua51') cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" QMAKE=qmake-qt4 install } package_highlight-gui() { @@ -34,7 +34,7 @@ package_highlight-gui() { cd "$srcdir/$pkgbase-$pkgver" install -dm755 "$pkgdir/usr/bin" - make DESTDIR="$pkgdir" install-gui + make DESTDIR="$pkgdir" QMAKE=qmake-qt4 install-gui } # vim:set ts=2 sw=2 et: diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 03f64a96f..87705015f 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87846 2013-04-08 09:22:44Z spupykin $ +# $Id: PKGBUILD 92336 2013-06-04 05:10:18Z svenstaro $ # Maintainer: Sergej Pupykin # Contributor: Zuf # Contributor: Darwin Bautista pkgname=kdenlive pkgver=0.9.6 -pkgrel=1 +pkgrel=2 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64') # http://download.kde.org/stable/kdenlive/ diff --git a/community/kdenlive/kdenlive.install b/community/kdenlive/kdenlive.install index a3489ee9d..53a1827fd 100644 --- a/community/kdenlive/kdenlive.install +++ b/community/kdenlive/kdenlive.install @@ -1,5 +1,6 @@ post_install() { update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q xdg-icon-resource forceupdate --theme hicolor &> /dev/null } diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index f898512e5..87f25f0c7 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88778 2013-04-22 10:14:34Z spupykin $ +# $Id: PKGBUILD 92372 2013-06-04 12:30:22Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Philipp Sandhaus pkgname=ktoblzcheck -pkgver=1.41 +pkgver=1.42 pkgrel=1 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz ktoblzcheck-python3.patch) -md5sums=('48f6d0086d780d1c101b17b5b63706f3' +md5sums=('86f25d5c6a07313638bb74d6b11eb57c' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 653997fd2..39c040f65 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 84438 2013-02-19 02:32:24Z svenstaro $ +# $Id: PKGBUILD 92338 2013-06-04 05:21:45Z svenstaro $ # Maintainer: Sven-Hendrik Haase pkgname=ldc -pkgver=20130219 +pkgver=20130604 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') @@ -10,33 +10,15 @@ license=('BSD') depends=('llvm' 'libconfig') makedepends=('git' 'cmake') backup=('etc/ldc2.conf') -source=() -md5sums=() - -_gitroot=git://github.com/ldc-developers/ldc.git -_gitname=ldc -_gitbranch=master +source=("git://github.com/ldc-developers/ldc.git") +sha1sums=('SKIP') [[ $CARCH == "x86_64" ]] && _multilib="ON" [[ $CARCH == "i686" ]] && _multilib="OFF" build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone --branch "$_gitbranch" "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone --recursive "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" + cd "$srcdir"/ldc + git submodule update --init --recursive mkdir build && cd build cmake \ @@ -48,7 +30,7 @@ build() { } package() { - cd "$srcdir/$_gitname-build" + cd "$srcdir"/ldc cd build make DESTDIR=$pkgdir install diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 591b8b8e6..87faea6da 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92275 2013-06-03 13:36:45Z spupykin $ +# $Id: PKGBUILD 92374 2013-06-04 12:30:52Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt -pkgver=1.0.5 -pkgrel=8 +pkgver=1.0.6 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -34,7 +34,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d libvirt.tmpfiles.d) -md5sums=('91c4145f49bcf92e89470fa3fb28fff6' +md5sums=('a4a09a981f902c4d6aa5138c753d64fd' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '020971887442ebbf1b6949e031c8dd3f') diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 3b75a1a3b..d0ce1644b 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86716 2013-03-21 12:08:21Z spupykin $ +# $Id: PKGBUILD 92329 2013-06-04 04:33:12Z svenstaro $ # Maintainer: Sergej Pupykin # Contributor: Fabian Schoelzel # Contributor: funkyou @@ -7,8 +7,8 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.8.8 -pkgrel=4 +pkgver=0.9.0 +pkgrel=1 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64') url="http://www.mltframework.org" @@ -16,24 +16,19 @@ license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch) -md5sums=('06de4052cffd6760c468d7da9557edae' + fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch) +md5sums=('1cd2d73f3ffe77a43980e99aaa4ea06c' '8227e7a1b059b1b16901166d2a508317') build() { # mlt cd "$srcdir/mlt-$pkgver" - patch -p1 <$srcdir/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch - - [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= -# SSE2=--disable-sse2 - msg "SSE2=$SSE2" - ./configure --prefix=/usr --enable-gpl --enable-gpl3 \ + ./configure --prefix=/usr --disable-gtk2 \ --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \ --avformat-vdpau \ - --avformat-swscale $SSE2 + --avformat-swscale make # mlt python bindings diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD index 3e8c39104..7bac8dd9c 100644 --- a/community/mumble/PKGBUILD +++ b/community/mumble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92166 2013-06-02 06:17:34Z svenstaro $ +# $Id: PKGBUILD 92323 2013-06-04 02:33:32Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Lauri Niskanen # Contributor: Sebastian.Salich@gmx.de @@ -9,11 +9,11 @@ pkgname=mumble pkgver=1.2.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="A voice chat application similar to TeamSpeak" license=('BSD') -depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse') +depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse' 'opus') makedepends=('boost' 'mesa' 'avahi') #optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support') options=('!libtool') @@ -27,7 +27,7 @@ build() { # Building mumble qmake-qt4 main.pro \ - CONFIG+="bundled-celt no-bundled-speex no-speechd no-g15 no-xevie no-server \ + CONFIG+="bundled-celt no-bundled-opus no-bundled-speex no-speechd no-g15 no-xevie no-server \ no-embed-qt-translations no-update packaged" \ DEFINES+="PLUGIN_PATH=/usr/lib/mumble" make release diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index 82ae36fd8..7946cbd63 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87041 2013-03-26 11:08:17Z spupykin $ +# $Id: PKGBUILD 92376 2013-06-04 12:32:38Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: TDY pkgname=parole -pkgver=0.5.0 -pkgrel=3 +pkgver=0.5.1 +pkgrel=1 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/applications/parole/" @@ -22,7 +22,7 @@ conflicts=('parole-media-player-git') options=('!libtool') install=parole.install source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2) -md5sums=('03eb2df373adaae56959a548553ef72e') +md5sums=('0236073ad67916092a75fcaa59583780') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index 63ef3cdaa..59bff2498 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 91372 2013-05-21 10:01:44Z arodseth $ +# $Id: PKGBUILD 92422 2013-06-04 20:05:04Z arodseth $ # Maintainer: Alexander Rødseth pkgname=processing -pkgver=2.0b9 +pkgver=2.0 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming language and environment for creating images, animations and interactions' @@ -15,12 +15,12 @@ options=(!strip) if [ "$CARCH" == "x86_64" ]; then source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('df6ab1042a09e72dec6eee8ae3bf21ed2fb47fc1eb63668960bea31a6cd62108' + sha256sums=('91b218d69bfe681c671d029346c671612f443f429ea68b63e0e08ae3aa2ffcf6' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('9a1cc4b41c3eee3835347bc198252a2b30fea1c811abda18a42e295b5544048b' + sha256sums=('5f09d79b13ec24384d64385c625b559cc24f2682d5ca3d6a8944ce95873e8e26' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index bfc9c167a..259ba3cdd 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90322 2013-05-11 14:56:12Z arodseth $ +# $Id: PKGBUILD 92390 2013-06-04 13:59:53Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -8,14 +8,14 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=2.0.0 +pkgver=2.0.2 pkgrel=1 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('6a36d2d4212e65f23d1c174b03006ea7fecaad1f3b82151dbfbe7ddf4268579f') +sha256sums=('3a009bde5f4c684214d7860cce5763db4d862cfdeafaa84578117dc723b7e1e5') prepare() { cd "$srcdir/ruby-gtk2-$pkgver" diff --git a/community/surf/PKGBUILD b/community/surf/PKGBUILD index df36f7829..17bd37ad6 100644 --- a/community/surf/PKGBUILD +++ b/community/surf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84289 2013-02-15 14:50:43Z lfleischer $ +# $Id: PKGBUILD 92388 2013-06-04 13:14:40Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Pierre Chapuis # Contributor: Ray Kohler @@ -7,7 +7,7 @@ pkgname=surf pkgver=0.6 -pkgrel=1 +pkgrel=2 pkgdesc='A simple web browser based on WebKit/GTK+.' arch=('i686' 'x86_64') url='http://surf.suckless.org/' @@ -16,13 +16,13 @@ depends=('libwebkit' 'xorg-xprop') optdepends=('dmenu: URL-bar' 'ca-certificates: SSL verification' 'xterm: default download handler' - 'wget: default download handler') + 'curl: default download handler') makedepends=('pkgconfig') install='surf.install' source=("http://dl.suckless.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'config.h') md5sums=('aeeed723b562a30cc6a2b3ea18f6d99a' - '15c2c911658e2e6085e4c4fa7a7b01c1') + '1447600ca79c56577af3438d5f3d3d56') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/surf/config.h b/community/surf/config.h index a221c86e3..43506bd90 100644 --- a/community/surf/config.h +++ b/community/surf/config.h @@ -35,7 +35,7 @@ static Bool hidebackground = FALSE; /* DOWNLOAD(URI, referer) */ #define DOWNLOAD(d, r) { \ .v = (char *[]){ "/bin/sh", "-c", \ - "st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \ + "xterm -e /bin/sh -c \"curl -J -O --user-agent '$1'" \ " --referer '$2'" \ " -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \ " sleep 5;\"", \ diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index dc66e4093..f21989d87 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 90563 2013-05-13 08:20:47Z lfleischer $ +# $Id: PKGBUILD 92386 2013-06-04 12:52:29Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: simo +# Contributor: Sid Karunaratne pkgname=tor pkgver=0.2.3.25 -pkgrel=2 +pkgrel=3 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64') url='http://www.torproject.org/' license=('BSD') -depends=('openssl' 'libevent' 'tsocks' 'bash') +depends=('openssl' 'libevent' 'torsocks' 'bash') makedepends=('ca-certificates') backup=('etc/tor/torrc' 'etc/tor/torrc-dist' @@ -19,9 +20,9 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'torrc' 'tor.service') md5sums=('a1c364189a9a66ed9daa8e6436489daf' - 'a4c12795ffb8f68550a5dab4a9eb0654' - '56c75d4e8a66f34167d31e38c43793dd' - 'b8989a7b3ab39d697624b243f7fc255d') + 'SKIP' + 'c1dd4004c63edaeaa829e01be5413cfc' + 'a396657e6f6df21d319ad586500c04b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/tor/tor.install b/community/tor/tor.install index 2c448d28e..beceb6070 100644 --- a/community/tor/tor.install +++ b/community/tor/tor.install @@ -1,9 +1,4 @@ post_install() { - echo "-> Tor has been preconfigured to run as a client only." - echo "-> Tor is experimental software. Do not rely on it for strong anonymity." - echo '-> ' - echo '-> You can set custom file descriptor ulimits for Tor in' - echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.' groupadd -g 43 tor &>/dev/null useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null chown tor:tor var/lib/tor &> /dev/null @@ -11,8 +6,6 @@ post_install() { } post_upgrade() { - echo '-> You can now set custom file descriptor ulimits for Tor in' - echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.' getent group tor &>/dev/null || groupadd -g 43 tor &>/dev/null getent passwd tor &>/dev/null || useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null chown tor:tor var/lib/tor &> /dev/null diff --git a/community/tor/tor.service b/community/tor/tor.service index 33bbc0776..264a95624 100644 --- a/community/tor/tor.service +++ b/community/tor/tor.service @@ -3,10 +3,9 @@ Description=Anonymizing Overlay Network After=network.target [Service] -Type=forking -GuessMainPID=yes -ExecStart=/usr/bin/tor -f /etc/tor/torrc --quiet -ExecReload=/bin/kill -HUP $MAINPID +User=tor +Type=simple +ExecStart=/usr/bin/tor -f /etc/tor/torrc KillSignal=SIGINT LimitNOFILE=8192 diff --git a/community/tor/torrc b/community/tor/torrc index 3505653ab..19e05970a 100644 --- a/community/tor/torrc +++ b/community/tor/torrc @@ -1,82 +1,72 @@ -## CONFIGURED FOR ARCHLINUX - -## Last updated 22 July 2005 for Tor 0.1.0.13. -## (May or may not work for older or newer versions of Tor.) -# -## See the man page, or http://tor.eff.org/tor-manual.html, for more -## options you can use in this file. -# -# On Unix, Tor will look for this file in someplace like "~/.tor/torrc" or -# "/etc/torrc" -# -# On Windows, Tor will look for the configuration file in someplace like -# "Application Data\tor\torrc" or "Application Data\\tor\torrc" -# -# With the default Mac OS X installer, Tor will look in ~/.tor/torrc or -# /Library/Tor/torrc - +## Configuration file for a typical Tor user +## Last updated 22 April 2012 for Tor 0.2.3.14-alpha. +## (may or may not work for much older or much newer versions of Tor.) +## +## Lines that begin with "## " try to explain what's going on. Lines +## that begin with just "#" are disabled commands: you can enable them +## by removing the "#" symbol. +## +## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, +## for more options you can use in this file. +## +## Tor will look for this file in various places based on your platform: +## https://www.torproject.org/docs/faq#torrc -## Replace this with "SocksPort 0" if you plan to run Tor only as a -## server, and not make any local application connections yourself. -SocksPort 9050 # what port to open for local application connections -SocksBindAddress 127.0.0.1 # accept connections only from localhost -#SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port too +## Tor opens a socks proxy on port 9050 by default -- even if you don't +## configure one below. Set "SocksPort 0" if you plan to run Tor only +## as a relay, and not make any local application connections yourself. +#SocksPort 9050 # Default: Bind to localhost:9050 for local connections. +#SocksPort 192.168.0.1:9100 # Bind to this adddress:port too. ## Entry policies to allow/deny SOCKS requests based on IP address. ## First entry that matches wins. If no SocksPolicy is set, we accept -## all (and only) requests from SocksBindAddress. -#SocksPolicy accept 192.168.0.1/16 +## all (and only) requests that reach a SocksPort. Untrusted users who +## can access your SocksPort may be able to learn about the connections +## you make. +#SocksPolicy accept 192.168.0.0/16 #SocksPolicy reject * -## Allow no-name routers (ones that the dirserver operators don't -## know anything about) in only these positions in your circuits. -## Other choices (not advised) are entry,exit,introduction. -AllowUnverifiedNodes middle,rendezvous - ## Logs go to stdout at level "notice" unless redirected by something -## else, like one of the below lines. You can have as many log lines as +## else, like one of the below lines. You can have as many Log lines as ## you want. ## +## We advise using "notice" in most cases, since anything more verbose +## may provide sensitive information to an attacker who obtains the logs. +## ## Send all messages of level 'notice' or higher to /var/log/tor/notices.log #Log notice file /var/log/tor/notices.log -## Send only debug and info messages to /var/log/tor/debug.log -#Log debug-info file /var/log/tor/debug.log -## Send ONLY debug messages to /var/log/tor/debug.log -#Log debug-debug file /var/log/tor/debug.log -## To use the system log instead of Tor's logfiles, uncomment these lines: +## Send every possible message to /var/log/tor/debug.log +#Log debug file /var/log/tor/debug.log +## Use the system log instead of Tor's logfiles Log notice syslog ## To send all messages to stderr: #Log debug stderr ## Uncomment this to start the process in the background... or use -## --runasdaemon 1 on the command line. -RunAsDaemon 1 -User tor -Group tor - -## Tor only trusts directories signed with one of these keys, and -## uses the given addresses to connect to the trusted directory -## servers. If no DirServer lines are specified, Tor uses the built-in -## defaults (moria1, moria2, tor26), so you can leave this alone unless -## you need to change it. -#DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441 -#DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF -#DirServer 86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D +## --runasdaemon 1 on the command line. This is ignored on Windows; +## see the FAQ entry if you want Tor to run as an NT service. +#RunAsDaemon 1 ## The directory for keeping all the keys/etc. By default, we store ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. DataDirectory /var/lib/tor -## The port on which Tor will listen for local connections from Tor controller -## applications, as documented in control-spec.txt. NB: this feature is -## currently experimental. +## The port on which Tor will listen for local connections from Tor +## controller applications, as documented in control-spec.txt. #ControlPort 9051 +## If you enable the controlport, be sure to enable one of these +## authentication methods, to prevent attackers from accessing it. +#HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C +#CookieAuthentication 1 ############### This section is just for location-hidden services ### -## Look in .../hidden_service/hostname for the address to tell people. -## HiddenServicePort x y:z says to redirect a port x request from the -## client to y:z. +## Once you have configured a hidden service, you can look at the +## contents of the file ".../hidden_service/hostname" for the address +## to tell people. +## +## HiddenServicePort x y:z says to redirect requests on port x to the +## address y:z. #HiddenServiceDir /var/lib/tor/hidden_service/ #HiddenServicePort 80 127.0.0.1:80 @@ -84,60 +74,116 @@ DataDirectory /var/lib/tor #HiddenServiceDir /var/lib/tor/other_hidden_service/ #HiddenServicePort 80 127.0.0.1:80 #HiddenServicePort 22 127.0.0.1:22 -#HiddenServiceNodes moria1,moria2 -#HiddenServiceExcludeNodes bad,otherbad - -################ This section is just for servers ##################### -## NOTE: If you enable these, you should consider mailing your identity -## key fingerprint to the tor-ops, so we can add you to the list of -## servers that clients will trust. See -## http://tor.eff.org/doc/tor-doc.html#server for details. +################ This section is just for relays ##################### +# +## See https://www.torproject.org/docs/tor-doc-relay for details. -## Required: A unique handle for this server -#Nickname ididnteditheconfig +## Required: what port to advertise for incoming Tor connections. +#ORPort 9001 +## If you want to listen on a port other than the one advertised in +## ORPort (e.g. to advertise 443 but bind to 9090), you can do it as +## follows. You'll need to do ipchains or other port forwarding +## yourself to make this work. +#ORPort 443 NoListen +#ORPort 127.0.0.1:9090 NoAdvertise -## The IP or fqdn for this server. Leave commented out and Tor will guess. +## The IP address or full DNS name for incoming connections to your +## relay. Leave commented out and Tor will guess. #Address noname.example.com -## Contact info that will be published in the directory, so we can -## contact you if you need to upgrade or if something goes wrong. -## This is optional but recommended. +## If you have multiple network interfaces, you can specify one for +## outgoing traffic to use. +# OutboundBindAddress 10.0.0.5 + +## A handle for your relay, so people don't have to refer to it by key. +#Nickname ididnteditheconfig + +## Define these to limit how much relayed traffic you will allow. Your +## own traffic is still unthrottled. Note that RelayBandwidthRate must +## be at least 20 KB. +## Note that units for these config options are bytes per second, not bits +## per second, and that prefixes are binary prefixes, i.e. 2^10, 2^20, etc. +#RelayBandwidthRate 100 KB # Throttle traffic to 100KB/s (800Kbps) +#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps) + +## Use these to restrict the maximum traffic per day, week, or month. +## Note that this threshold applies separately to sent and received bytes, +## not to their sum: setting "4 GB" may allow up to 8 GB total before +## hibernating. +## +## Set a maximum of 4 gigabytes each way per period. +#AccountingMax 4 GB +## Each period starts daily at midnight (AccountingMax is per day) +#AccountingStart day 00:00 +## Each period starts on the 3rd of the month at 15:00 (AccountingMax +## is per month) +#AccountingStart month 3 15:00 + +## Contact info to be published in the directory, so we can contact you +## if your relay is misconfigured or something else goes wrong. Google +## indexes this, so spammers might also collect it. #ContactInfo Random Person ## You might also include your PGP or GPG fingerprint if you have one: -#ContactInfo 1234D/FFFFFFFF Random Person - -## Required: what port to advertise for tor connections -#ORPort 9001 -## If you want to listen on a port other than the one advertised -## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment -## the line below. You'll need to do ipchains or other port forwarding -## yourself to make this work. -#ORBindAddress 0.0.0.0:9090 +#ContactInfo 0xFFFFFFFF Random Person -## Uncomment this to mirror the directory for others (please do) +## Uncomment this to mirror directory information for others. Please do +## if you have enough bandwidth. #DirPort 9030 # what port to advertise for directory connections -## If you want to listen on a port other than the one advertised -## in DirPort (e.g. to advertise 80 but bind 9091), uncomment the line -## below. You'll need to do ipchains or other port forwarding yourself -## to make this work. -#DirBindAddress 0.0.0.0:9091 +## If you want to listen on a port other than the one advertised in +## DirPort (e.g. to advertise 80 but bind to 9091), you can do it as +## follows. below too. You'll need to do ipchains or other port +## forwarding yourself to make this work. +#DirPort 80 NoListen +#DirPort 127.0.0.1:9091 NoAdvertise +## Uncomment to return an arbitrary blob of html on your DirPort. Now you +## can explain what Tor is if anybody wonders why your IP address is +## contacting them. See contrib/tor-exit-notice.html in Tor's source +## distribution for a sample. +#DirPortFrontPage /etc/tor/tor-exit-notice.html + +## Uncomment this if you run more than one Tor relay, and add the identity +## key fingerprint of each Tor relay you control, even if they're on +## different networks. You declare it here so Tor clients can avoid +## using more than one of your relays in a single circuit. See +## https://www.torproject.org/docs/faq#MultipleRelays +## However, you should never include a bridge's fingerprint here, as it would +## break its concealability and potentionally reveal its IP/TCP address. +#MyFamily $keyid,$keyid,... ## A comma-separated list of exit policies. They're considered first -## to last, and the first match wins. If you want to *replace* +## to last, and the first match wins. If you want to _replace_ ## the default exit policy, end this with either a reject *:* or an -## accept *:*. Otherwise, you're *augmenting* (prepending to) the +## accept *:*. Otherwise, you're _augmenting_ (prepending to) the ## default exit policy. Leave commented to just use the default, which is -## available in the man page or at http://tor.eff.org/documentation.html +## described in the man page or at +## https://www.torproject.org/documentation.html ## -## Look at http://tor.eff.org/faq-abuse.html#TypicalAbuses +## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses ## for issues you might encounter if you use the default exit policy. ## ## If certain IPs and ports are blocked externally, e.g. by your firewall, ## you should update your exit policy to reflect this -- otherwise Tor ## users will be told that those destinations are down. ## +## For security, by default Tor rejects connections to private (local) +## networks, including to your public IP address. See the man page entry +## for ExitPolicyRejectPrivate if you want to allow "exit enclaving". +## #ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more #ExitPolicy accept *:119 # accept nntp as well as default exit policy -#ExitPolicy reject *:* # middleman only -- no exits allowed +#ExitPolicy reject *:* # no exits allowed + +## Bridge relays (or "bridges") are Tor relays that aren't listed in the +## main directory. Since there is no complete public list of them, even an +## ISP that filters connections to all the known Tor relays probably +## won't be able to block all the bridges. Also, websites won't treat you +## differently because they won't know you're running Tor. If you can +## be a real relay, please do; but if not, be a bridge! +#BridgeRelay 1 +## By default, Tor will advertise your bridge to users through various +## mechanisms like https://bridges.torproject.org/. If you want to run +## a private bridge, for example because you'll give out your bridge +## address manually to your friends, uncomment this line: +#PublishServerDescriptor 0 -- cgit v1.2.3-54-g00ecf