diff options
39 files changed, 674 insertions, 226 deletions
diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD index b5444c7f4..358b4251d 100644 --- a/community/dvtm/PKGBUILD +++ b/community/dvtm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52669 2011-07-27 12:48:55Z lfleischer $ +# $Id: PKGBUILD 55178 2011-09-04 22:30:57Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Giorgio Lando <patroclo7@gmail.com> # Contributor: bender02 at gmx dot com pkgname=dvtm -pkgver=0.6 +pkgver=0.7 pkgrel=1 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('MIT') depends=('ncurses') source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'config.h') -md5sums=('db77a3744868dd91a5ae5ad98b7df709' - '5759191a39281e62a64941d3f28cf010') +md5sums=('d8ef63bad5b48324ad040630c51a1c26' + '50ae76c4b33864f0cf051417443cc422') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dvtm/config.h b/community/dvtm/config.h index 39e121ee9..2b00776f2 100644 --- a/community/dvtm/config.h +++ b/community/dvtm/config.h @@ -22,7 +22,7 @@ #define NORMAL_FG -1 #define NORMAL_BG -1 /* status bar (command line option -s) position */ -#define BARPOS BarTop /* BarBot, BarOff */ +#define BAR_POS BAR_TOP /* BAR_BOTTOM, BAR_OFF */ /* curses attributes for the status bar */ #define BAR_ATTR A_NORMAL #define BAR_FG BLUE @@ -36,9 +36,9 @@ * the SEPARATOR, %d stands for the window number */ #define TITLE "[%s%s#%d]" /* master width factor [0.1 .. 0.9] */ -#define MWFACT 0.5 +#define MFACT 0.5 /* scroll back buffer size in lines */ -#define SCROLL_BUF_SIZE 500 +#define SCROLL_HISTORY 500 #include "tile.c" #include "grid.c" @@ -68,15 +68,11 @@ Key keys[] = { { MOD, 'b', { setlayout, { "TTT" } } }, { MOD, 'm', { setlayout, { "[ ]" } } }, { MOD, ' ', { setlayout, { NULL } } }, - { MOD, 'h', { setmwfact, { "-0.05" } } }, - { MOD, 'l', { setmwfact, { "+0.05" } } }, + { MOD, 'h', { setmfact, { "-0.05" } } }, + { MOD, 'l', { setmfact, { "+0.05" } } }, { MOD, '.', { toggleminimize, { NULL } } }, -#ifdef CONFIG_STATUSBAR { MOD, 's', { togglebar, { NULL } } }, -#endif -#ifdef CONFIG_MOUSE - { MOD, 'M', { mouse_toggle, { NULL } } }, -#endif + { MOD, 'M', { togglemouse, { NULL } } }, { MOD, '\n', { zoom , { NULL } } }, { MOD, '1', { focusn, { "1" } } }, { MOD, '2', { focusn, { "2" } } }, @@ -98,6 +94,13 @@ Key keys[] = { { MOD, '?', { create, { "man dvtm", "dvtm help" } } }, }; +static const ColorRule colorrules[] = { + /* title attrs fgcolor bgcolor */ +#if 0 + { "ssh", A_NORMAL, COLOR_BLACK, 224 }, +#endif +}; + /* possible values for the mouse buttons are listed below: * * BUTTON1_PRESSED mouse button 1 down @@ -127,6 +130,12 @@ Key keys[] = { * REPORT_MOUSE_POSITION report mouse movement */ +#ifdef NCURSES_MOUSE_VERSION +# define CONFIG_MOUSE /* compile in mouse support if we build against ncurses */ +#endif + +#define ENABLE_MOUSE true /* whether to enable mouse events by default */ + #ifdef CONFIG_MOUSE Button buttons[] = { { BUTTON1_CLICKED, { mouse_focus, { NULL } } }, @@ -136,11 +145,9 @@ Button buttons[] = { }; #endif /* CONFIG_MOUSE */ -#ifdef CONFIG_CMDFIFO Cmd commands[] = { { "create", { create, { NULL } } }, }; -#endif /* CONFIG_CMDFIFO */ /* gets executed when dvtm is started */ Action actions[] = { diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 728a5cab9..97fe39330 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 53990 2011-08-11 07:04:13Z lcarlier $ +# $Id: PKGBUILD 55150 2011-09-04 08:52:45Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.2 +pkgver=2.99.3 pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') @@ -27,9 +27,9 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('247a13e28972985766855a6bc4d6d368' +md5sums=('e576fa9e72863dab0196250cb35f2a9b' 'b284be39d147ec799f1116a6abc068b4' - 'a8ec8e5a6aba7a7e453ce7a35c1800a9') + 'b5cc403990f31b8ea1c5cf37366d3d29') build() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -69,8 +69,8 @@ package_gambas3-runtime() { install -D -m644 mime/* \ ${pkgdir}/usr/share/gambas3/mime/ install -d -m755 ${pkgdir}/usr/share/gambas3/icons - install -D -m644 mime/application-x-gambas.png \ - ${pkgdir}/usr/share/gambas3/icons/application-x-gambas.png + install -D -m644 mime/application-x-gambas3.png \ + ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png cd gbc make DESTDIR="${pkgdir}" uninstall diff --git a/community/gambas3/gambas3-runtime.install b/community/gambas3/gambas3-runtime.install index c6aad0d55..6c8201a6a 100644 --- a/community/gambas3/gambas3-runtime.install +++ b/community/gambas3/gambas3-runtime.install @@ -1,12 +1,10 @@ post_install() { xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas3/mime/application-x-gambas.xml + /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3 + xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml } pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas.xml + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3 + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml } - -# vim:set ts=2 sw=2 et: diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index 56b09d32f..d27b33dbc 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46364 2011-05-06 10:36:35Z spupykin $ +# $Id: PKGBUILD 55148 2011-09-04 07:26:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Lee.MaRS <leemars@gmail.com> pkgname=gsoap -pkgver=2.8.2 +pkgver=2.8.3 pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" @@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) -md5sums=('9cd47be235bc5b8d085bf6eff30fa204' +md5sums=('48e7739a5719bd635843e42d2ec670f7' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD new file mode 100755 index 000000000..de0dc48f4 --- /dev/null +++ b/community/pigz/PKGBUILD @@ -0,0 +1,33 @@ +# Contributor: Laszlo Papp <djszapi2@gmail.com> +# Maintainer:Stefan Husmann <stefan-husmann@t-online.de> + +pkgname=pigz +pkgver=2.1.6 +pkgrel=2 +pkgdesc="Parallel implementation of the gzip file compressor" +arch=('i686' 'x86_64') +url="http://www.zlib.net/pigz/" +license=('custom') +depends=('zlib') +source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('cbe9030c4be3d0ef2438ee5f8b169ca4') + +build() { + cd ${srcdir}/$pkgname-$pkgver + sed -i s/"CFLAGS=".*/"CFLAGS=${CFLAGS}"/g Makefile + make +} +package() { + cd ${srcdir}/$pkgname-$pkgver + install -Dm755 ${srcdir}/${pkgname}-${pkgver}/${pkgname} \ + ${pkgdir}/usr/bin/${pkgname} + pushd ${pkgdir}/usr/bin + ln -s pigz unpigz + popd + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/${pkgname}.1 \ + ${pkgdir}/usr/share/man/man1/${pkgname}.1 + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/${pkgname}.pdf \ + ${pkgdir}/usr/share/doc/${pkgname}/${pkgname}.pdf + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/README \ + ${pkgdir}/usr/share/licenses/${pkgname}/README +} diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 4fd8b9f42..041ec5eee 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50126 2011-06-25 11:05:26Z svenstaro $ +# $Id: PKGBUILD 55146 2011-09-04 05:13:28Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -6,24 +6,19 @@ # Contributor: thotypous <matiasΘarchlinux-br·org> # Contributor: delor <bartekpiech gmail com> -pkgbase=qtcreator -# artisticstyle plugin does currently not support qtcreator 2.2.0 -#pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin') -pkgname=('qtcreator' 'qtcreator-todo-plugin') -pkgver=2.2.1 -pkgrel=3 +pkgname="qtcreator" +pkgver=2.3.0 +pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') url='http://qt.nokia.com/products/developer-tools' license=('LGPL') -depends=('qt>=4.7.3') -makedepends=('qt-private-headers>=4.7.3' 'git') +depends=('qt>=4.7.4') +makedepends=('qt-private-headers>=4.7.4' 'git') options=('docs') source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz" - 'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip' 'qtcreator.desktop') -md5sums=('35d74837e48b12ee58379e1c029a9a6c' - '4dab1bb07ba5c39ae4c975a333d32ec1' +md5sums=('b7ee1b779f9afe9190c5c72fb207650c' '2c3ffbd66845b37be9804f2966815a10') build() { @@ -32,25 +27,10 @@ build() { mkdir build && cd build qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro - make --quiet - - # Building TODO plugin - git clone git://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin.git $srcdir/qt-creator-todo-plugin - msg "Starting TODO plugin build...." - cd $srcdir/qt-creator-todo-plugin - sed -i "s|QTC_BUILD_DIR = .*|QTC_BUILD_DIR = ${srcdir}/build|g" todoplugin.pro - sed -i "s|QTC_SOURCE_DIR = .*|QTC_SOURCE_DIR = $srcdir/qt-creator-${pkgver}-src/|g" todoplugin.pro - sed -i "s|\"2.1.81\"|\"${pkgver}\"|g" todo.pluginspec - qmake make - -# msg "Starting ArtisticStyle plugin build...." -# cd $srcdir/ArtisticStylePlugin-0.6 -# qmake QTC_BUILD=$srcdir/build QTC_SOURCE=$srcdir/qt-creator-${pkgver}-src -config release -# make } -package_qtcreator() { +package() { optdepends=('qt-doc: for the integrated Qt documentation' 'gdb: for the debugger' 'cmake: for cmake project suppport' @@ -63,18 +43,10 @@ package_qtcreator() { make INSTALL_ROOT="${pkgdir}/usr/" install - # qt already fixed this - if [[ -f "$pkgdir/usr/bin/qmlpuppet" ]]; then - echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)" - return 1 - fi - install -Dm755 bin/qmlpuppet "$pkgdir/usr/bin/qmlpuppet" - # remove it soon - # qt already fixed this as well if [[ -f "$pkgdir/usr/lib/qmldesigner/libqtquickplugin.so" ]]; then echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)" - return 1 + exit 1 fi mkdir "$pkgdir/usr/lib/qmldesigner" cp lib/qmldesigner/*.so "$pkgdir/usr/lib/qmldesigner/" @@ -85,30 +57,3 @@ package_qtcreator() { install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \ ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT } - -package_qtcreator-todo-plugin() { - license=('BSD') - depends=("qtcreator=$pkgver") - pkgdesc='TODO plugin for QtCreator' - url='http://gitorious.org/qt-creator-tod - install -Dm644 ${srcdir}/qtcreator.desktop \ - ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \ - o-plugin' - - cd $srcdir/qt-creator-todo-plugin - make INSTALL_ROOT=$pkgdir/usr/ install - - install -Dm644 LICENSE.BSD \ - $pkgdir/usr/share/licenses/${pkgname}/LICENSE -} - -#package_qtcreator-artisticstyle-plugin() { -# license=('GPL3' 'LGPL') -# depends=("qtcreator=$pkgver") -# pkgdesc='ArtisticStyle plugin for QtCreator' -# url='http://astyleplugin.berlios.de/index.php' -# -# cd $srcdir/ArtisticStylePlugin-0.6 -# make INSTALL_ROOT=$pkgdir/usr/ install -#} diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 8a893538b..54fc98c25 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,19 +1,19 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.9.0 -pkgrel=2 -pkgdesc="An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting" +pkgver=0.9.1 +pkgrel=1 +pkgdesc='An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') url='http://crawl.develz.org/' depends=('lua' 'ncurses' 'sdl_image' 'sqlite3' 'libgl' 'mesa' 'freetype2') makedepends=('bison' 'flex') conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') license=('custom') -install=('stone-soup.install') +install=stone-soup.install source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2" "${pkgname}.desktop") -md5sums=('3f73fb051215df3633a554d81e67a452' +md5sums=('b9befb8177618d943295546c3d1e1d78' 'afdacb4c39342e75674efb88eeb3da21') build() { diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index eb2a50995..e7ae09a0e 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,48 +1,54 @@ -# $Id: PKGBUILD 51826 2011-07-16 00:11:50Z dreisner $ +# $Id: PKGBUILD 55167 2011-09-04 16:26:15Z dreisner $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel -pkgver=4.39 +pkgver=4.42 pkgrel=1 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64') url="http://www.stunnel.org" license=('GPL') depends=('openssl') -install=stunnel.install +install=$pkgname.install options=('!libtool') -source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz" - 'Makefile.patch' 'stunnel.rc.d') -md5sums=('853739119a8364daea750154af6d7e79' +source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} + 'Makefile.patch' + 'stunnel.rc.d') +md5sums=('f64a7426166d397dd826deef33bb6aa0' + '011dc68c245c465d120e8bfad10cc891' 'f15398497e10e080c2406d2fc541660c' 'cb647c71ff4cb1e035b6e515d5f13ebf') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + # don't create a certificate... - patch -p0 < $srcdir/Makefile.patch + patch -p0 < "$srcdir/Makefile.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-ipv6 \ --disable-libwrap + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install for i in ca.pl importCA.sh; do - install -Dm755 tools/$i $pkgdir/usr/share/stunnel/$i + install -Dm755 "tools/$i" "$pkgdir/usr/share/stunnel/$i" done - install -Dm755 $srcdir/stunnel.rc.d $pkgdir/etc/rc.d/stunnel + + install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" + install -Dm755 "$srcdir/stunnel.rc.d" "$pkgdir/etc/rc.d/stunnel" + sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ -e "s:nobody:stunnel:g" -e "s:nogroup:stunnel:g" \ - -i ${pkgdir}/etc/stunnel/stunnel.conf-sample - install -Dm644 tools/stunnel.cnf $pkgdir/etc/stunnel/stunnel.cnf + -i "$pkgdir/etc/stunnel/stunnel.conf-sample" } diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 41dab8d90..1e200c83d 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 47904 2011-05-26 00:55:30Z svenstaro $ +# $Id: PKGBUILD 55155 2011-09-04 13:08:06Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift -pkgver=2010.06.30 -pkgrel=3 +pkgver=2011.09.01 +pkgrel=1 pkgdesc="An open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" license=('GPL') -depends=('sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') +depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') makedepends=('scons' 'boost' 'asio') -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-${pkgver//./-}/$pkgname-${pkgver//./-}.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-src-${pkgver//./-}.tar.bz2 $pkgname.desktop) -md5sums=('ddcaf90bb25f9ce9cc084d7f467d7b56' +md5sums=('a4099acacca3d4f0799b012cd168f1c0' '8bb429f37bcb4aed5e7ab1d80c5a4f93') build() { - cd "$srcdir"/$pkgname-${pkgver//./-} + cd "$srcdir"/$pkgname-src-${pkgver//./-} # select arch if [ `uname -m` = "x86_64" ]; then @@ -27,8 +27,8 @@ build() { _sconsarch="686" fi - # patch for crashing with bad drivers sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp + sed -i '/types.h/d' src/http.h # build and install scons \ @@ -37,30 +37,16 @@ build() { "release"=1 \ "force_feedback"=1 \ "prefix"=/usr \ - "datadir"=share/$pkgname/data || return 1 + "datadir"=share/$pkgname/ } package() { - cd "$srcdir"/$pkgname-${pkgver//./-} + cd "$srcdir"/$pkgname-src-${pkgver//./-} - scons install || return 1 - - # remove some unneeded files - find "$pkgdir"/usr/share/$pkgname -name SConscript -delete - - # install icons - install -Dm644 data/textures/icons/$pkgname-16x16.png \ - "$pkgdir"/usr/share/icons/hicolor/16x16/apps/$pkgname.png - install -Dm644 data/textures/icons/$pkgname-32x32.png \ - "$pkgdir"/usr/share/icons/hicolor/32x32/apps/$pkgname.png - install -Dm644 data/textures/icons/$pkgname-64x64.png \ - "$pkgdir"/usr/share/icons/hicolor/64x64/apps/$pkgname.png + scons install # install .desktop file install -Dm644 ../$pkgname.desktop \ "$pkgdir"/usr/share/applications/$pkgname.desktop - - # delete installed data (will be provided by -data package) - rm -r "$pkgdir"/usr/share/$pkgname } # vim: sw=2:ts=2 et: diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD index 14050f70b..2d32793d0 100644 --- a/extra/alsa-oss/PKGBUILD +++ b/extra/alsa-oss/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 13735 2008-09-28 09:02:32Z tpowa $ -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 136976 2011-09-04 11:56:05Z pierre $ +# Contributor: judd <jvinet@zeroflux.org> + pkgname=alsa-oss pkgver=1.0.17 -pkgrel=1 +pkgrel=2 pkgdesc="OSS compatibility library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') url="http://www.alsa-project.org" -options=(!libtool) -depends=('glibc' 'alsa-lib>=1.0.17a') -source=(ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2) +options=('!libtool') +depends=('alsa-lib') +source=("ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2") +md5sums=('1b1850c2fc91476a73d50f537cbd402f') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } -md5sums=('1b1850c2fc91476a73d50f537cbd402f') diff --git a/extra/ftjam/PKGBUILD b/extra/ftjam/PKGBUILD index b78dac253..42726f3cb 100644 --- a/extra/ftjam/PKGBUILD +++ b/extra/ftjam/PKGBUILD @@ -1,30 +1,29 @@ -# $Id: PKGBUILD 49903 2009-08-16 20:18:01Z jgc $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> +# $Id: PKGBUILD 136989 2011-09-04 19:07:07Z eric $ +# Maintainer: Roman Kyrylych <roman@gmail.com> +# Contributor: Roman Kyrylych <roman@gmail.com> pkgname=ftjam pkgver=2.5.3rc2 -pkgrel=2 +pkgrel=3 pkgdesc='FT Jam - an enhanced version of the Jam build tool' arch=('i686' 'x86_64') url="http://freetype.org/jam/" license=('custom') depends=('glibc') provides=('jam') -conflicts=('jam') -replaces=('jam') #source=(http://downloads.sourceforge.net/freetype/$pkgname-$pkgver.tar.bz2 \ -source=(http://david.freetype.org/jam/${pkgname}-${pkgver}.tar.bz2 - license.txt) +source=(http://david.freetype.org/jam/${pkgname}-${pkgver}.tar.bz2 license.txt) md5sums=('911cc4191b3e7213905d107962b4529b' - '2addc259114b4f50a870fa04881e1200') + 'ef8ff7da77fe60e25d1e3e740600f1f0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt" } diff --git a/extra/ftjam/license.txt b/extra/ftjam/license.txt index d111145cc..4b633251a 100644 --- a/extra/ftjam/license.txt +++ b/extra/ftjam/license.txt @@ -5,4 +5,3 @@ freely, as long as this copyright notice is retained and modifications are clearly marked. ALL WARRANTIES ARE HEREBY DISCLAIMED. -
\ No newline at end of file diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 41a1bf574..dc0a8fdfe 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136756 2011-09-01 08:20:58Z bisson $ +# $Id: PKGBUILD 136997 2011-09-05 01:18:48Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin pkgver=1.6.5 -pkgrel=1 +pkgrel=2 pkgdesc='Input method server supporting various input methods' arch=('i686' 'x86_64') license=('LGPL') @@ -17,8 +17,10 @@ optdepends=('qt: support for qt4 input method' 'anthy: support for anthy input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2" + 'gtk3-crash.patch' 'qt4-lib64.patch') sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405' + '5529884d655cf9c95e7bf5ddced3ffed140bbc20' '4307b0d7d6dc10f15909c94973c4357caf31de7e') install=install @@ -26,6 +28,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../qt4-lib64.patch + patch -p1 -i ../gtk3-crash.patch ./configure --prefix=/usr --use_i18n=Y make } diff --git a/extra/gcin/gtk3-crash.patch b/extra/gcin/gtk3-crash.patch new file mode 100644 index 000000000..17cfa6c2d --- /dev/null +++ b/extra/gcin/gtk3-crash.patch @@ -0,0 +1,12 @@ +diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c +--- old/gtk3-im/gtkimcontextgcin.c 2011-08-31 09:14:58.000000000 -0700 ++++ new/gtk3-im/gtkimcontextgcin.c 2011-09-04 13:29:58.838065420 -0700 +@@ -127,6 +127,8 @@ + { + GdkWindow *client_window = context_xim->client_window; + GdkScreen *screen = gdk_window_get_screen (client_window); ++ if (screen == NULL) ++ return; + GdkDisplay *display = gdk_screen_get_display (screen); + if (!context_xim->gcin_ch) { + if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default())))) diff --git a/extra/habak/PKGBUILD b/extra/habak/PKGBUILD index 5ef6cde6f..69899b64e 100644 --- a/extra/habak/PKGBUILD +++ b/extra/habak/PKGBUILD @@ -1,19 +1,26 @@ -# $Id: PKGBUILD 4097 2008-07-03 14:48:26Z ronald $ +# $Id: PKGBUILD 136978 2011-09-04 12:05:11Z pierre $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Simo Leone <simo@archlinux.org> + pkgname=habak pkgver=0.2.5 -pkgrel=3 +pkgrel=4 pkgdesc="A background changing app" url="http://fvwm-crystal.org" license=('GPL2') depends=('imlib2') -source=(http://download.gna.org/fvwm-crystal/habak/$pkgver/$pkgname-$pkgver.tar.gz) +source=("http://download.gna.org/fvwm-crystal/habak/$pkgver/$pkgname-$pkgver.tar.gz") arch=('i686' 'x86_64') +options=('!makeflags') md5sums=('bee5c394989367f7a4c5cb9ec99d307c') build() { cd $srcdir/$pkgname-$pkgver - make || return 1 - install -m755 -D habak $pkgdir/usr/bin/habak || return 1 + export LDFLAGS=${LDFLAGS/,--sort-common,--as-needed//} + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -m755 -D habak $pkgdir/usr/bin/habak } diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD index e29d4cf94..56d573eb5 100644 --- a/extra/isapnptools/PKGBUILD +++ b/extra/isapnptools/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 68051 2010-02-10 15:42:28Z giovanni $ +# $Id: PKGBUILD 136974 2011-09-04 11:49:36Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=isapnptools pkgver=1.27 -pkgrel=2 +pkgrel=3 pkgdesc="Allow ISA Plug-And-Play devices to be configured on a Linux machine" url="http://www.roestock.demon.co.uk/isapnptools/" depends=('glibc') arch=('i686' 'x86_64') license=('GPL') -source=(ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz) +source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") md5sums=('b997ba56583dc850fce9b93d658dfa0c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libmcrypt/PKGBUILD b/extra/libmcrypt/PKGBUILD index 0bbe97d83..aae45867e 100644 --- a/extra/libmcrypt/PKGBUILD +++ b/extra/libmcrypt/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 51263 2009-09-06 19:41:24Z giovanni $ +# $Id: PKGBUILD 136970 2011-09-04 11:35:09Z pierre $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libmcrypt pkgver=2.5.8 -pkgrel=2 +pkgrel=3 pkgdesc="A library which provides a uniform interface to several symmetric encryption algorithms" url="http://mcrypt.sourceforge.net/" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') depends=('glibc') -options=('!libtool') -source=(http://downloads.sourceforge.net/mcrypt/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +source=("http://downloads.sourceforge.net/mcrypt/${pkgname}-${pkgver}.tar.bz2") md5sums=('c4f491dd411a09e9de3b8702ea6f73eb') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/mahjong/PKGBUILD b/extra/mahjong/PKGBUILD index 2aaff6579..1b719f79d 100644 --- a/extra/mahjong/PKGBUILD +++ b/extra/mahjong/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 47741 2009-07-25 22:52:50Z giovanni $ +# $Id: PKGBUILD 136995 2011-09-04 21:27:03Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=mahjong -pkgver=1.10 +pkgver=1.11 pkgrel=1 -pkgdesc="The classical game of Mah Jongg (not the solitare version). Includes network play" +pkgdesc="The classical game of Mah Jong (not the solitare version) with network support" arch=('i686' 'x86_64') url="http://www.stevens-bradfield.com/MahJong/" license=('GPL' 'custom') depends=('gtk2') source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz) -md5sums=('f9bacf9fd6743d5e3a2fd86863607ce2') +md5sums=('c0cd19620eb3fcef3e0a83eaed6c3780') build() { - cd $srcdir/mj-$pkgver-src - make || return 1 - make DESTDIR=$pkgdir/usr/ MANDIR=share/man/man1 install install.man - install -m644 -D tiles-v1/README \ - $pkgdir/usr/share/licenses/$pkgname/tiles-license.txt + cd "$srcdir/mj-$pkgver-src" + sed -i 's/& Calling/Calling/' gui-dial.c + make +} + +package() { + cd "$srcdir/mj-$pkgver-src" + make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man + install -D -m644 tiles-v1/README "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt" } diff --git a/extra/mcrypt/PKGBUILD b/extra/mcrypt/PKGBUILD index 7db28d78c..a3040ad3a 100644 --- a/extra/mcrypt/PKGBUILD +++ b/extra/mcrypt/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 32911 2009-04-02 16:16:11Z giovanni $ +# $Id: PKGBUILD 136972 2011-09-04 11:41:22Z pierre $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=mcrypt pkgver=2.6.8 -pkgrel=1 +pkgrel=2 pkgdesc="A program for encrypting files or streams" url="http://mcrypt.sourceforge.net/" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') -depends=('mhash' 'libmcrypt>=2.5.8' 'zlib') -source=(http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.gz) +depends=('mhash' 'libmcrypt' 'zlib') +source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.gz") md5sums=('97639f8821b10f80943fa17da302607e') build() { cd ${srcdir}/${pkgname}-${pkgver} - aclocal -I ./m4 || return 1 - autoconf || return 1 - automake --force --copy || return 1 ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog index 56ccb2263..40ba5e4e7 100644 --- a/extra/mpd/ChangeLog +++ b/extra/mpd/ChangeLog @@ -1,3 +1,7 @@ +2011-09-03 Angel Velasquez <angvp@archlinux.org> + * Version bump to 0.16.4 + * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream + 2011-06-25 Angel Velasquez <angvp@archlinux.org> * Added a patch for bug with ffmpeg FS#24839 diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 046904a22..fcfe8d4a2 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 128638 2011-06-25 09:54:26Z angvp $ +# $Id: PKGBUILD 136986 2011-09-04 17:03:38Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.16.3 -pkgrel=2 +pkgver=0.16.4 +pkgrel=1 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64') license=('GPL') @@ -18,11 +18,9 @@ makedepends=('pkgconfig' 'doxygen') install=${pkgname}.install changelog=ChangeLog source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" - 'mpd' - 'mpd-0.16.3_ffmpeg_sigsegv.patch') -md5sums=('6e708c02b0e8c288aec855eecf441a5a' - 'e5669c2bff4031928531e52475addeb1' - '9a730957e213c62339e9335971e4b85e') +'mpd') +md5sums=('ddac46eb7d976c5cc6f9bac9e4e100f1' + 'e5669c2bff4031928531e52475addeb1') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -35,7 +33,6 @@ build() { --disable-libwrap \ --disable-cue \ --disable-sidplay - patch -Np1 -i $srcdir/mpd-0.16.3_ffmpeg_sigsegv.patch make } diff --git a/gnome-unstable/evolution-data-server/PKGBUILD b/gnome-unstable/evolution-data-server/PKGBUILD index 404ad3414..4f2307b90 100644 --- a/gnome-unstable/evolution-data-server/PKGBUILD +++ b/gnome-unstable/evolution-data-server/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 136715 2011-08-31 17:09:39Z ibiru $ +# $Id: PKGBUILD 136982 2011-09-04 12:25:33Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.1.90 +pkgver=3.1.91 pkgrel=1 -pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" +pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64') depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') -makedepends=('intltool' 'gperf' 'gobject-introspection') +makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.1/${pkgname}-${pkgver}.tar.xz) -sha256sums=('24c48a0f006c7ed94c08409bb6479ca6915b49ef4291430ca0c3476687d442f9') +sha256sums=('c1524cd4ab45965cac3560f31ca10e282e8c20c130f6c2cf7e31baa88e842a48') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --with-openldap=yes \ --libexecdir=/usr/lib/evolution-data-server \ - --with-krb5=/usr --with-libdb=/usr + --with-krb5=/usr --with-libdb=/usr \ + --enable-vala-bindings make } diff --git a/gnome-unstable/evolution/PKGBUILD b/gnome-unstable/evolution/PKGBUILD new file mode 100644 index 000000000..cd95b39e8 --- /dev/null +++ b/gnome-unstable/evolution/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 136984 2011-09-04 13:38:27Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evolution +pkgver=3.1.91 +pkgrel=1 +pkgdesc="Manage your email, contacts and schedule" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') +optdepends=('bogofilter: possible junk filter plugin' + 'spamassassin: possible junk filter plugin') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +install=evolution.install +url=http://www.gnome.org/projects/evolution/ +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('ca2aadc3b1dbd52784b7200aeb5125b774835ffa2f351cbccd9a9edfe1713e46') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --disable-scrollkeeper \ + --enable-nss=yes \ + --with-openldap=yes \ + --enable-smime=yes \ + --with-krb5=/usr \ + --disable-image-inline + make + make -C plugins/tnef-attachments +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/evolution/evolution.install b/gnome-unstable/evolution/evolution.install new file mode 100644 index 000000000..a2c3aaa54 --- /dev/null +++ b/gnome-unstable/evolution/evolution.install @@ -0,0 +1,24 @@ +pkgname=evolution + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/gnome-unstable/gnome-bluetooth/PKGBUILD b/gnome-unstable/gnome-bluetooth/PKGBUILD index a4997d18d..4fc39a136 100644 --- a/gnome-unstable/gnome-bluetooth/PKGBUILD +++ b/gnome-unstable/gnome-bluetooth/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 136835 2011-09-02 04:51:59Z heftig $ -# Maintainer: +# $Id: PKGBUILD 136993 2011-09-04 20:46:19Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth pkgver=3.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeBluetooth" license=('GPL' 'LGPL') -depends=('gnome-control-center' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf') +depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection') options=('!libtool' '!emptydirs') install=gnome-bluetooth.install diff --git a/gnome-unstable/gtkhtml4/PKGBUILD b/gnome-unstable/gtkhtml4/PKGBUILD index 4b85bea61..01315418b 100644 --- a/gnome-unstable/gtkhtml4/PKGBUILD +++ b/gnome-unstable/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136689 2011-08-31 14:17:48Z ibiru $ +# $Id: PKGBUILD 136981 2011-09-04 12:16:53Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.1.90.1 +pkgver=4.1.91 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -12,8 +12,8 @@ depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup') makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('d5a72b235f750c16548630255686d32e80fbf21a725c905f9d8bc818b057a106') +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) +sha256sums=('8df789b9e3114d1d929ae0b6a5a0ae805be20cf4a641eb8b9e4661c531e3f042') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone new file mode 100644 index 000000000..509c311f6 --- /dev/null +++ b/testing/bind/127.0.0.zone @@ -0,0 +1,11 @@ +$ORIGIN 0.0.127.in-addr.arpa. + +@ 1D IN SOA localhost. root.localhost. ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS localhost. +1 1D IN PTR localhost. diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD new file mode 100644 index 000000000..056bcd03b --- /dev/null +++ b/testing/bind/PKGBUILD @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 136964 2011-09-04 04:46:19Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +# Contributor: Mario Vazquez <mario_vazq@hotmail.com> + +pkgname=bind + +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.8.1 +_pkgver=9.8.1 +pkgrel=1 + +pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' +url='http://www.isc.org/software/bind/' +license=('custom:ISC') +arch=('i686' 'x86_64') +depends=('openssl' 'krb5' 'libxml2') +options=('!makeflags' '!libtool') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'root.hint::ftp://ftp.rs.internic.net/domain/db.cache' + 'so_bsdcompat.patch' + 'remove-tools.patch' + 'named' + 'named.conf' + 'named.conf.d' + 'named.logrotate' + 'localhost.zone' + '127.0.0.zone') +sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c' + 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' + 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' + '18f477f510df31e6c6f547ee2d5fc46e973479bf' + '46232e9db243c6c05e170a1781d7a7f413be5d03' + '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' + '7848edbfb9a848843f57c11c02b0289eefd42d00' + '9ffb5c3f72390a517aeae557e32349d5d278cb63' + '76a0d4cd1b913db177a5a375bebc47e5956866ec' + '53be0f1437ebe595240d8dbdd819939582b97fb9') + +provides=('dns-server') + +install=install +backup=('etc/logrotate.d/named' + 'etc/conf.d/named' + 'etc/named.conf') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../remove-tools.patch + patch -p1 -i ../so_bsdcompat.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-libxml2 \ + --with-libtool \ + + # temporary fix for issue reported upstream + ln -s .libs/driver.o bin/tests/system/dlzexternal/ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}" + + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + make DESTDIR="${pkgdir}" install + + rmdir "${pkgdir}/var/run" + install -d "${pkgdir}"/usr/share/doc/bind + install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ + + install -D -m755 ../named "${pkgdir}"/etc/rc.d/named + install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named + install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named + install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf + + install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/ + install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ + install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ +} diff --git a/testing/bind/install b/testing/bind/install new file mode 100644 index 000000000..287d0e05b --- /dev/null +++ b/testing/bind/install @@ -0,0 +1,21 @@ +post_install() { + getent group named &>/dev/null || groupadd -g 40 named + getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named + passwd -l named &>/dev/null + + touch var/log/named.log + chown named:named var/log/named.log + + # create an rndc.key if it doesn't already exist + if [[ ! -s etc/rndc.key ]]; then + usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key + chown root:named etc/rndc.key + chmod 640 etc/rndc.key + fi +} + +pre_remove() { + getent passwd named &>/dev/null && userdel named >/dev/null + getent group named &>/dev/null && groupdel named >/dev/null + return 0 +} diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone new file mode 100644 index 000000000..e3ff9641c --- /dev/null +++ b/testing/bind/localhost.zone @@ -0,0 +1,10 @@ +$ORIGIN localhost. +@ 1D IN SOA @ root ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS @ + 1D IN A 127.0.0.1 diff --git a/testing/bind/named b/testing/bind/named new file mode 100755 index 000000000..7907f9983 --- /dev/null +++ b/testing/bind/named @@ -0,0 +1,52 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/named + +[[ -d /var/run/named ]] || mkdir -p /var/run/named +chown named:named /var/run/named + +PIDFILE=/var/run/named/named.pid +PID=$(cat $PIDFILE 2>/dev/null) +readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } + +case "$1" in + start) + stat_busy "Starting BIND" + [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon named + stat_done + fi + ;; + stop) + stat_busy "Stopping BIND" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon named + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading BIND" + [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|reload|restart}" +esac +exit 0 diff --git a/testing/bind/named.conf b/testing/bind/named.conf new file mode 100644 index 000000000..38fb12cbe --- /dev/null +++ b/testing/bind/named.conf @@ -0,0 +1,64 @@ +// +// /etc/named.conf +// + +options { + directory "/var/named"; + pid-file "/var/run/named/named.pid"; + auth-nxdomain yes; + datasize default; +// Uncomment these to enable IPv6 connections support +// IPv4 will still work: +// listen-on-v6 { any; }; +// Add this for no IPv4: +// listen-on { none; }; + + // Default security settings. + allow-recursion { 127.0.0.1; }; + allow-transfer { none; }; + allow-update { none; }; + version none; + hostname none; + server-id none; +}; + +zone "localhost" IN { + type master; + file "localhost.zone"; + allow-transfer { any; }; +}; + +zone "0.0.127.in-addr.arpa" IN { + type master; + file "127.0.0.zone"; + allow-transfer { any; }; +}; + +zone "." IN { + type hint; + file "root.hint"; +}; + +//zone "example.org" IN { +// type slave; +// file "example.zone"; +// masters { +// 192.168.1.100; +// }; +// allow-query { any; }; +// allow-transfer { any; }; +//}; + +logging { + channel xfer-log { + file "/var/log/named.log"; + print-category yes; + print-severity yes; + print-time yes; + severity info; + }; + category xfer-in { xfer-log; }; + category xfer-out { xfer-log; }; + category notify { xfer-log; }; +}; + diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d new file mode 100644 index 000000000..aecbd2307 --- /dev/null +++ b/testing/bind/named.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to BIND +# +NAMED_ARGS="-u named" diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate new file mode 100644 index 000000000..ef1a2d032 --- /dev/null +++ b/testing/bind/named.logrotate @@ -0,0 +1,6 @@ +/var/log/named.log { + missingok + postrotate + /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/bind/remove-tools.patch b/testing/bind/remove-tools.patch new file mode 100644 index 000000000..cbd1c53ad --- /dev/null +++ b/testing/bind/remove-tools.patch @@ -0,0 +1,12 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 ++++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700 +@@ -19,7 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ ++SUBDIRS = named rndc dnssec tests tools nsupdate \ + check confgen @PKCS11_TOOLS@ + TARGETS = + diff --git a/testing/bind/so_bsdcompat.patch b/testing/bind/so_bsdcompat.patch new file mode 100644 index 000000000..4d7031fcc --- /dev/null +++ b/testing/bind/so_bsdcompat.patch @@ -0,0 +1,12 @@ +diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c +--- old/lib/isc/unix/socket.c 2011-02-18 05:01:16.000000000 +0100 ++++ new/lib/isc/unix/socket.c 2011-05-27 10:12:01.685269374 +0200 +@@ -712,6 +712,8 @@ + } + #endif + ++#undef SO_BSDCOMPAT ++ + static void + socket_log(isc__socket_t *sock, isc_sockaddr_t *address, + isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD new file mode 100644 index 000000000..206ade9fb --- /dev/null +++ b/testing/dnsutils/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 136966 2011-09-04 04:47:12Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> +# Contributor: mario <mario_vazq@hotmail.com> + +pkgname=dnsutils + +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.8.1 +_pkgver=9.8.1 +pkgrel=1 + +pkgdesc='DNS utilities: dig host nslookup' +url='http://www.isc.org/software/bind/' +license=('custom:ISC') +arch=('i686' 'x86_64') +depends=('openssl' 'idnkit') +options=('!makeflags') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'remove-bind.patch') +sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c' + 'b465ef6160b004838f04de9978fe1be8422af777') + +replaces=('bind-tools' 'host') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../remove-bind.patch + export STD_CDEFINES='-DDIG_SIGCHASE' + + # hack to remove unused bloat from the binaries + CFLAGS+=' -fdata-sections -ffunction-sections' + LDFLAGS+=' -Wl,--gc-sections' + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-idn \ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}" + + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + cd bin + make DESTDIR="${pkgdir}" install + +} diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch new file mode 100644 index 000000000..19d650964 --- /dev/null +++ b/testing/dnsutils/remove-bind.patch @@ -0,0 +1,25 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 ++++ new/bin/Makefile.in 2011-08-28 19:16:17.245495043 -0700 +@@ -19,8 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +- check confgen @PKCS11_TOOLS@ ++SUBDIRS = dig + TARGETS = + + @BIND9_MAKE_RULES@ +diff -aur old/lib/Makefile.in new/lib/Makefile.in +--- old/lib/Makefile.in 2007-06-19 16:47:13.000000000 -0700 ++++ new/lib/Makefile.in 2011-08-28 19:17:50.828688599 -0700 +@@ -23,7 +23,7 @@ + # Attempt to disable parallel processing. + .NOTPARALLEL: + .NO_PARALLEL: +-SUBDIRS = isc isccc dns isccfg bind9 lwres tests ++SUBDIRS = isc dns isccfg bind9 lwres + TARGETS = + + @BIND9_MAKE_RULES@ |