diff options
215 files changed, 1486 insertions, 8500 deletions
diff --git a/community-staging/blender/PKGBUILD b/community-staging/blender/PKGBUILD deleted file mode 100644 index d37cac0dd..000000000 --- a/community-staging/blender/PKGBUILD +++ /dev/null @@ -1,102 +0,0 @@ -# $Id: PKGBUILD 66718 2012-02-27 19:17:34Z svenstaro $ -# Contributor: John Sowiak <john@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -# Apparently, the blender guys refuse to release source tarballs for -# intermediate releases that deal mainly with binaries but incorporate tiny -# minor changes from svn. Since I'm sick and tired of the urges of users that -# look for release numbers only, we make a messy PKGBUILD that can checkout svn -# release if necessary. - -#_svn=true -_svn=false - -pkgname=blender -pkgver=2.62 -pkgrel=2 -epoch=3 -pkgdesc="A fully integrated 3D graphics creation suite" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.blender.org" -depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ - 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio') -makedepends=('cmake' 'boost' 'cuda-toolkit') -optdepends=('cuda-toolkit: cycles renderer cuda support') -options=(!strip) -install=blender.install -if [ $_svn = false ]; then - source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('f2357584a5081b03f6e60ba3efe2a610') -else - source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) - md5sums=('7579d1139d0d6025df8afcfca64a65c4') -fi - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) - _svnver=38016 - _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" - _svnmod="$pkgname-$pkgver" - mkdir ${pkgname}-$pkgver - pushd ${pkgname}-$pkgver - svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod - find . -depth -type d -name .svn -exec rm -rf {} \; - tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* - popd -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - mkdir build - cd build - - [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" - - cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DWITH_INSTALL_PORTABLE:BOOL=OFF \ - -DWITH_PYTHON_INSTALL:BOOL=OFF \ - -DWITH_OPENCOLLADA:BOOL=ON \ - -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \ - -DWITH_GAMEENGINE:BOOL=ON \ - -DWITH_PLAYER:BOOL=ON \ - -DWITH_BUILTIN_GLEW:BOOL=OFF \ - -DWITH_CODEC_FFMPEG:BOOL=ON \ - -DWITH_CODEC_SNDFILE:BOOL=ON \ - -DWITH_CYCLES:BOOL=ON \ - -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \ - -DCUDA_TOOLKIT_ROOT_DIR:STRING=/opt/cuda-toolkit/ \ - -DWITH_FFTW3:BOOL=ON \ - -DWITH_MOD_OCEANSIM:BOOL=ON \ - -DPYTHON_VERSION:STRING=3.2 \ - -DPYTHON_LIBPATH:STRING=/usr/lib \ - -DPYTHON_LIBRARY:STRING=python3.2mu \ - -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ - $ENABLESSE2 - - make $MAKEFLAGS - - cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ - "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ - cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi - chmod 755 bmake - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver/build" - make DESTDIR="${pkgdir}" install - python -m compileall "${pkgdir}/usr/share/blender" - -# install plugins - install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ -} diff --git a/community-staging/blender/blender.install b/community-staging/blender/blender.install deleted file mode 100644 index 724bfce00..000000000 --- a/community-staging/blender/blender.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD deleted file mode 100644 index d68fab52b..000000000 --- a/community-staging/gnash/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 66714 2012-02-27 19:15:41Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgbase=gnash -pkgname=(gnash-common gnash-gtk) -pkgver=0.8.10 -pkgrel=2 -arch=(i686 x86_64) -url="http://www.gnu.org/software/gnash/" -license=(GPL3) -makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool - speex fontconfig ffmpeg - gstreamer0.10-base gstreamer0.10-ffmpeg - gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf - pkgconfig boost) -options=(!libtool !emptydirs) -source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 - nodebug.patch) -sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224' - '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551') - -build() { - cd "$srcdir/gnash-$pkgver" - - # Disable very, very verbose debugging (gigabytes of logs) - patch -Np1 -i "$srcdir/nodebug.patch" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-plugins-install=system \ - --with-npapi-plugindir=/usr/lib/mozilla/plugins \ - --enable-gui=sdl,gtk,dump \ - --enable-media=gst,ffmpeg \ - --enable-renderer=agg,cairo \ - --enable-device=x11 - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package_gnash-common() { - pkgdesc="A GNU Flash movie player" - depends=(curl giflib sdl agg libjpeg libpng libltdl - speex fontconfig ffmpeg cairo - gstreamer0.10-base gstreamer0.10-ffmpeg - boost-libs) - backup=(etc/gnashrc etc/gnashthumbnailrc) - - cd "$srcdir/gnash-$pkgver" - - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - # Split gnash-gtk - mkdir -p "$srcdir"/gtk/{etc,usr/{bin,share/man/man1}} - mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} \ - "$srcdir/gtk/usr/bin/" - mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 \ - "$srcdir/gtk/usr/share/man/man1/" - mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/usr/share/" - mv "$pkgdir"/etc/gnashpluginrc "$srcdir/gtk/etc/" -} - -package_gnash-gtk() { - pkgdesc="A GNU Flash movie player" - depends=("gnash-common=$pkgver" - gtk2 libldap hicolor-icon-theme desktop-file-utils gconf) - install=gnash-gtk.install - backup=(etc/gnashpluginrc) - - mv "$srcdir"/gtk/* "$pkgdir" - - cd "$srcdir/gnash-$pkgver" - make DESTDIR="$pkgdir" install-plugin - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \ - "$pkgdir"/usr/share/applications/*.schemas - rm -f "$pkgdir"/usr/share/applications/*.schemas -} diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install deleted file mode 100644 index 6678a7f8a..000000000 --- a/community-staging/gnash/gnash-gtk.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - gconfpkg --install gnash - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - gconfpkg --uninstall gnash -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-staging/gnash/nodebug.patch b/community-staging/gnash/nodebug.patch deleted file mode 100644 index ca160b898..000000000 --- a/community-staging/gnash/nodebug.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h ---- gnash-0.8.9/libbase/log.h 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-nodebug/libbase/log.h 2012-01-18 09:39:02.004103494 +0100 -@@ -331,27 +331,27 @@ - - // Define to 0 to completely remove parse debugging at compile-time - #ifndef VERBOSE_PARSE --#define VERBOSE_PARSE 1 -+#define VERBOSE_PARSE 0 - #endif - - // Define to 0 to completely remove action debugging at compile-time - #ifndef VERBOSE_ACTION --#define VERBOSE_ACTION 1 -+#define VERBOSE_ACTION 0 - #endif - - // Define to 0 to remove ActionScript errors verbosity at compile-time - #ifndef VERBOSE_ASCODING_ERRORS --#define VERBOSE_ASCODING_ERRORS 1 -+#define VERBOSE_ASCODING_ERRORS 0 - #endif - - // Define to 0 this to remove invalid SWF verbosity at compile-time - #ifndef VERBOSE_MALFORMED_SWF --#define VERBOSE_MALFORMED_SWF 1 -+#define VERBOSE_MALFORMED_SWF 0 - #endif - - // Define to 0 this to remove Networking verbosity at compile-time - #ifndef VERBOSE_NETWORKING --#define VERBOSE_NETWORKING 1 -+#define VERBOSE_NETWORKING 0 - #endif - - #if VERBOSE_PARSE -diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp ---- gnash-0.8.9/libcore/vm/ActionExec.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp 2012-01-18 09:40:25.653458508 +0100 -@@ -46,7 +46,7 @@ - // too much information for my tastes. I really want just - // to see how stack changes while executing actions... - // --strk Fri Jun 30 02:28:46 CEST 2006 --# define DEBUG_STACK 1 -+//# define DEBUG_STACK 1 - - // Max number of stack item to dump. 0 for unlimited. - # define STACK_DUMP_LIMIT 32 diff --git a/community-staging/gtk2hs-buildtools/PKGBUILD b/community-staging/gtk2hs-buildtools/PKGBUILD deleted file mode 100644 index 29a38e357..000000000 --- a/community-staging/gtk2hs-buildtools/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 66665 2012-02-27 02:28:35Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=gtk2hs-buildtools -pkgver=0.12.1 -pkgrel=2 -pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." -url="http://hackage.haskell.org/package/gtk2hs-buildtools" -license=('GPL2') -arch=('i686' 'x86_64') -makedepends=('ghc' 'alex' 'happy' 'haskell-random') -depends=('gmp') -options=('strip') -provides=('haskell-gtk2hs-buildtools') -source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz) -md5sums=('225cbf3736b5ac3053f8c797687c7554') - -build() { - cd ${srcdir}/gtk2hs-buildtools-$pkgver - runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} - runhaskell Setup build -} - -package() { - cd ${srcdir}/gtk2hs-buildtools-$pkgver - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-staging/haskell-binary/PKGBUILD b/community-staging/haskell-binary/PKGBUILD deleted file mode 100644 index 99a4677d7..000000000 --- a/community-staging/haskell-binary/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 66479 2012-02-25 14:56:03Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-binary -pkgver=0.5.1.0 -pkgrel=1 -pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings" -url="http://hackage.haskell.org/package/binary" -license=('custom:BSD3') -arch=('x86_64' 'i686') -depends=(ghc=7.4.1 sh) -options=('strip') -source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz") -install=haskell-binary.install -sha256sums=('2ad477b47e9158d61517689f5f0c7b0240ff891059418d6758879020800351a3') - -build() { - cd "$srcdir/binary-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/binary-$pkgver" - - install -Dm 744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m 744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/binary" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/haskell-binary/haskell-binary.install b/community-staging/haskell-binary/haskell-binary.install deleted file mode 100644 index 844b8a67c..000000000 --- a/community-staging/haskell-binary/haskell-binary.install +++ /dev/null @@ -1,24 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-binary - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -post_upgrade() { - ${HS_DIR}/register.sh - post_remove -} - -post_install() { - post_upgrade -} - -pre_remove() { - pre_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/haskell-bytestring-show/PKGBUILD b/community-staging/haskell-bytestring-show/PKGBUILD deleted file mode 100644 index 1ec12046c..000000000 --- a/community-staging/haskell-bytestring-show/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 66669 2012-02-27 02:56:01Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-bytestring-show -pkgver=0.3.5.1 -pkgrel=1 -pkgdesc="Efficient conversion of values into readable byte strings." -url="http://code.haskell.org/~dolio/" -license=("BSD3") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc" - "haskell-array" - "haskell-binary" - "haskell-bytestring" - "haskell-containers") -options=('strip') -install="${pkgname}.install" -source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") -md5sums=('7396bc2e8f88dedc3374c3f12f24e4bd') - -build() { - cd ${srcdir}/bytestring-show-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/bytestring-show-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-staging/haskell-bytestring-show/haskell-bytestring-show.install b/community-staging/haskell-bytestring-show/haskell-bytestring-show.install deleted file mode 100644 index 335fc37cd..000000000 --- a/community-staging/haskell-bytestring-show/haskell-bytestring-show.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=haskell-bytestring-show -HS_DIR=usr/share/haskell/${pkgname} - -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-cairo/PKGBUILD b/community-staging/haskell-cairo/PKGBUILD deleted file mode 100644 index f99c3047e..000000000 --- a/community-staging/haskell-cairo/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 66743 2012-02-28 02:46:54Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-cairo -pkgver=0.12.2 -pkgrel=2 -pkgdesc="Binding to the cairo library for Gtk2Hs." -url="http://hackage.haskell.org/package/cairo" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc' 'cairo' 'haskell-mtl') -makedepends=("gtk2hs-buildtools") -options=('strip') -conflicts=('gtk2hs-cairo') -provides=('gtk2hs-cairo') -replaces=('gtk2hs-cairo') -install=gtk2hs-cairo.install -source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('b3583136fe84d25cd9d4f7bda3c3db0c') - -build() { - cd ${srcdir}/cairo-$pkgver - sed -i 's#cToBool :: Num a => a -> Bool#cToBool :: (Eq a, Num a) => a -> Bool#' Graphics/Rendering/Cairo/Types.chs - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0') - - cd ${srcdir}/cairo-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-staging/haskell-cairo/gtk2hs-cairo.install b/community-staging/haskell-cairo/gtk2hs-cairo.install deleted file mode 100644 index 4ec5096b6..000000000 --- a/community-staging/haskell-cairo/gtk2hs-cairo.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-cairo -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-ghc-paths/PKGBUILD b/community-staging/haskell-ghc-paths/PKGBUILD deleted file mode 100644 index 46c267182..000000000 --- a/community-staging/haskell-ghc-paths/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 66483 2012-02-25 15:06:14Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-ghc-paths -pkgver=0.1.0.8 -pkgrel=6 -pkgdesc="Knowledge of GHC's installation directories" -url="http://hackage.haskell.org/package/ghc-paths" -license=('custom:BSD3') -arch=('x86_64' 'i686') -makedepends=() -depends=(ghc=7.4.1) -options=('strip') -source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") -install=haskell-ghc-paths.install -md5sums=('d2b23dc563888e380588501d2ce1d82b') - -build() { - cd "$srcdir/ghc-paths-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/ghc-paths-$pkgver" - - install -Dm 744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m 744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/ghc-paths" - runhaskell Setup copy --destdir="$pkgdir" - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/haskell-ghc-paths/haskell-ghc-paths.install b/community-staging/haskell-ghc-paths/haskell-ghc-paths.install deleted file mode 100644 index 4fd2c6c56..000000000 --- a/community-staging/haskell-ghc-paths/haskell-ghc-paths.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-ghc-paths -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-glib/PKGBUILD b/community-staging/haskell-glib/PKGBUILD deleted file mode 100644 index c4df94f81..000000000 --- a/community-staging/haskell-glib/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 66673 2012-02-27 05:58:18Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-glib -pkgver=0.12.2 -pkgrel=2 -pkgdesc="Binding to the GLIB library for Gtk2Hs." -url="http://hackage.haskell.org/package/glib" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc' 'glib2') -makedepends=("gtk2hs-buildtools") -options=('strip') -install=gtk2hs-glib.install -provides=('gtk2hs-glib') -replaces=('gtk2hs-glib') -conflicts=('gtk2hs-glib') -source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('5d8a04be9a975fb70c6508f95aeb3265') - -build() { - cd ${srcdir}/glib-$pkgver - sed -i 's|cap=rts_evalIO|rts_evalIO|' System/Glib/hsgclosure.c - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-glib \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "glib2") - - cd ${srcdir}/glib-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-staging/haskell-glib/gtk2hs-glib.install b/community-staging/haskell-glib/gtk2hs-glib.install deleted file mode 100644 index 24025f5d8..000000000 --- a/community-staging/haskell-glib/gtk2hs-glib.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-glib -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-hslogger/PKGBUILD b/community-staging/haskell-hslogger/PKGBUILD deleted file mode 100644 index a28697842..000000000 --- a/community-staging/haskell-hslogger/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 66671 2012-02-27 02:56:41Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-hslogger -pkgver=1.1.5 -pkgrel=3 -pkgdesc="Versatile logging framework" -url="http://hackage.haskell.org/package/hslogger" -license=('LGPL') -arch=('i686' 'x86_64') -depends=('ghc' 'haskell-mtl' 'haskell-network') -options=('strip') -install=${pkgname}.install -source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) -md5sums=('cd3dfd6f88176bd53b333ea29130a857') - -build() { - cd ${srcdir}/hslogger-${pkgver} - runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \ - --enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \ - --enable-library-profiling - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2') - - cd ${srcdir}/hslogger-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/hslogger - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-staging/haskell-hslogger/haskell-hslogger.install b/community-staging/haskell-hslogger/haskell-hslogger.install deleted file mode 100644 index 2a0d98ae7..000000000 --- a/community-staging/haskell-hslogger/haskell-hslogger.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hslogger -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-pango/PKGBUILD b/community-staging/haskell-pango/PKGBUILD deleted file mode 100644 index b08b885b9..000000000 --- a/community-staging/haskell-pango/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 66745 2012-02-28 03:58:29Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-pango -pkgver=0.12.2 -pkgrel=2 -pkgdesc="Binding to the pango library for Gtk2Hs." -url="http://hackage.haskell.org/package/pango" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') -makedepends=("gtk2hs-buildtools") -provides=('gtk2hs-pango') -replaces=('gtk2hs-pango') -conflicts=('gtk2hs-pango') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) -install=gtk2hs-pango.install -md5sums=('301efd2d2348698ce8d586ee14c36e2b') - -build() { - cd ${srcdir}/pango-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo') - - cd ${srcdir}/pango-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-staging/haskell-pango/gtk2hs-pango.install b/community-staging/haskell-pango/gtk2hs-pango.install deleted file mode 100644 index f2be2100f..000000000 --- a/community-staging/haskell-pango/gtk2hs-pango.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-pango -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-stm/PKGBUILD b/community-staging/haskell-stm/PKGBUILD deleted file mode 100644 index fa9819d51..000000000 --- a/community-staging/haskell-stm/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=stm -pkgname=haskell-stm -pkgver=2.2.0.1 -pkgrel=3 -pkgdesc="A modular composable concurrency abstraction." -url="http://hackage.haskell.org/package/stm" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('b1cf03ed315e00c33160746feeee8682') - -build() { - cd ${srcdir}/${_hkgname}-$pkgver - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-$pkgver - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-staging/haskell-stm/haskell-stm.install b/community-staging/haskell-stm/haskell-stm.install deleted file mode 100644 index 0283c2fc5..000000000 --- a/community-staging/haskell-stm/haskell-stm.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-stm -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-syb/PKGBUILD b/community-staging/haskell-syb/PKGBUILD deleted file mode 100644 index 9223379b2..000000000 --- a/community-staging/haskell-syb/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=syb -pkgname=haskell-syb -pkgver=0.3.6 -pkgrel=1 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('0d807bb244fdeb95fa546b4311fcd8df') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname} - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/community-staging/haskell-syb/haskell-syb.install b/community-staging/haskell-syb/haskell-syb.install deleted file mode 100644 index 080055165..000000000 --- a/community-staging/haskell-syb/haskell-syb.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-syb -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-tar/PKGBUILD b/community-staging/haskell-tar/PKGBUILD deleted file mode 100644 index 7b98d8a82..000000000 --- a/community-staging/haskell-tar/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 66489 2012-02-25 15:51:44Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-tar -pkgver=0.4.0.0 -pkgrel=1 -pkgdesc="Reading, writing and manipulating \".tar\" archive files." -url="http://hackage.haskell.org/package/tar" -license=('custom:BSD3') -arch=('x86_64' 'i686') -depends=('ghc=7.4.1') -options=('strip') -source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") -install=haskell-tar.install -sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113') - -build() { - cd "$srcdir/tar-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/tar-$pkgver" - - install -Dm 744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m 744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/tar" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/haskell-tar/haskell-tar.install b/community-staging/haskell-tar/haskell-tar.install deleted file mode 100644 index 7e0383621..000000000 --- a/community-staging/haskell-tar/haskell-tar.install +++ /dev/null @@ -1,24 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-tar - -post_install() { - ${HS_DIR}/register.sh - post_remove -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - post_install -} - -pre_remove() { - pre_upgrade -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/haskell-terminfo/PKGBUILD b/community-staging/haskell-terminfo/PKGBUILD deleted file mode 100644 index a0bd2d3dc..000000000 --- a/community-staging/haskell-terminfo/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 66654 2012-02-26 22:15:49Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=terminfo -pkgname=haskell-terminfo -pkgver=0.3.2.3 -pkgrel=1 -pkgdesc="Haskell bindings to the terminfo library." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('706f546c629ac100a402c9c2629c25fa') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-staging/haskell-terminfo/haskell-terminfo.install b/community-staging/haskell-terminfo/haskell-terminfo.install deleted file mode 100644 index 40d39f42b..000000000 --- a/community-staging/haskell-terminfo/haskell-terminfo.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-terminfo -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-utf8-string/PKGBUILD b/community-staging/haskell-utf8-string/PKGBUILD deleted file mode 100644 index 40d1f5c2d..000000000 --- a/community-staging/haskell-utf8-string/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 66456 2012-02-25 02:35:26Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=utf8-string -pkgname=haskell-utf8-string -pkgver=0.3.7 -pkgrel=1 -pkgdesc="Support for reading and writing UTF8 Strings" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') -install=${pkgname}.install -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -md5sums=('50e5c395713e716e0e4a56da73f87ccd') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-staging/haskell-utf8-string/haskell-utf8-string.install b/community-staging/haskell-utf8-string/haskell-utf8-string.install deleted file mode 100644 index 0f64366b2..000000000 --- a/community-staging/haskell-utf8-string/haskell-utf8-string.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-utf8-string -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-x11-xft/PKGBUILD b/community-staging/haskell-x11-xft/PKGBUILD deleted file mode 100644 index 93dd4ab28..000000000 --- a/community-staging/haskell-x11-xft/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 66502 2012-02-25 19:03:17Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -_hkgname=X11-xft -pkgname=haskell-x11-xft -pkgver=0.3.1 -pkgrel=3 -pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('LGPL') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.7' 'libxft') -options=('strip') -install=haskell-x11-xft.install -source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) -md5sums=('ad885150a59f63de328e73abe5ffc79e') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-staging/haskell-x11-xft/haskell-x11-xft.install b/community-staging/haskell-x11-xft/haskell-x11-xft.install deleted file mode 100644 index a0ff8dac8..000000000 --- a/community-staging/haskell-x11-xft/haskell-x11-xft.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=/usr/share/haskell/haskell-x11-xft -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/haskell-x11/PKGBUILD b/community-staging/haskell-x11/PKGBUILD deleted file mode 100644 index c867814e4..000000000 --- a/community-staging/haskell-x11/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 66493 2012-02-25 17:16:46Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: shild <sxp@bk.ru> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> - -_hkgname=X11 -pkgname=haskell-x11 -pkgver=1.5.0.1 -pkgrel=2 -pkgdesc="A Haskell binding to the X11 graphics library." -arch=(i686 x86_64) -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" -license=('custom:BSD3') -options=('strip') -depends=("ghc=7.4.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama') -conflicts=(haskell-x11-extras) -install=hsmod.install -source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) -md5sums=('7d69b204f773a0335828ced0e1e069f2') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-staging/haskell-x11/hsmod.install b/community-staging/haskell-x11/hsmod.install deleted file mode 100644 index 45c23b979..000000000 --- a/community-staging/haskell-x11/hsmod.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-x11 -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-staging/mongodb/PKGBUILD b/community-staging/mongodb/PKGBUILD deleted file mode 100644 index 1fa75aa93..000000000 --- a/community-staging/mongodb/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 66732 2012-02-27 20:48:16Z tdziedzic $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Mathias Stearn <mathias@10gen.com> -# Contributor: Alec Thomas - -pkgname=mongodb -pkgver=2.0.2 -pkgrel=2 -pkgdesc='A high-performance, open source, schema-free document-oriented database.' -arch=('i686' 'x86_64') -url='http://www.mongodb.org' -license=('AGPL3') -depends=('boost-libs') -makedepends=('scons' 'boost') -#checkdepends=('python2-pymongo') -optdepends=('libpcap: needed for mongosniff') -backup=('etc/mongodb.conf') -install="mongodb.install" -source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" - 'mongodb.rc' - 'mongodb.conf') -md5sums=('5dcf819249955a3e9cc61a341e45403a' - '9c67e00f4626ad761a8f7d4e037a54d7' - '4839fe1d638187ca3226e8267b947318') - -build() { - export SCONSFLAGS="$MAKEFLAGS" - - cd mongodb-src-r${pkgver} - - # fix python name for smoke tests - sed \ - -e 's/python/&2/' \ - -i SConstruct - - scons \ - all \ - --full -} - -<<COMMENT -check() { - export SCONSFLAGS="$MAKEFLAGS" - - cd mongodb-src-r${pkgver} - - scons \ - smokeAll \ - --smokedbprefix=${srcdir} -} -COMMENT - -package() { - export SCONSFLAGS="$MAKEFLAGS" - - cd mongodb-src-r${pkgver} - - scons \ - install \ - --full \ - --prefix=${pkgdir}/usr - - install -D -m755 ${srcdir}/mongodb.rc \ - ${pkgdir}/etc/rc.d/mongodb - install -D -m644 ${srcdir}/mongodb.conf \ - ${pkgdir}/etc/mongodb.conf - install -d -m700 ${pkgdir}/var/lib/mongodb - install -d -m755 ${pkgdir}/var/log/mongodb - - if [ -d ${pkgdir}/usr/lib64 ]; then - mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib - fi -} diff --git a/community-staging/mongodb/mongodb.conf b/community-staging/mongodb/mongodb.conf deleted file mode 100644 index c5272b7f2..000000000 --- a/community-staging/mongodb/mongodb.conf +++ /dev/null @@ -1,8 +0,0 @@ -# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details -# Run mongod --help to see a list of options - -bind_ip = 127.0.0.1 -quiet = true -dbpath = /var/lib/mongodb -logpath = /var/log/mongodb/mongod.log -logappend = true diff --git a/community-staging/mongodb/mongodb.install b/community-staging/mongodb/mongodb.install deleted file mode 100644 index 3922c12ef..000000000 --- a/community-staging/mongodb/mongodb.install +++ /dev/null @@ -1,32 +0,0 @@ -# vim: syntax=sh - -post_install() { - useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb - chown -R mongodb:daemon /var/lib/mongodb - chown -R mongodb:daemon /var/log/mongodb - - if [ "$(arch)" != "x86_64" ] - then - echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.' - echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations' - fi -} - -post_upgrade() { - chown -R mongodb:daemon /var/lib/mongodb - chown -R mongodb:daemon /var/log/mongodb - - if [ "$(vercmp $2 1.8.2-3)" -lt 0 ] - then - # have to fix my fudge up in 1.8.2-2 and 1.8.2-3 - # added july 5th, 2011 - usermod -s /bin/bash mongodb >& /dev/null - echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb' - echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb' - echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log' - fi -} - -pre_remove() { - userdel mongodb -} diff --git a/community-staging/mongodb/mongodb.rc b/community-staging/mongodb/mongodb.rc deleted file mode 100644 index 30f2bbf79..000000000 --- a/community-staging/mongodb/mongodb.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# vim: syntax=sh - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof /usr/bin/mongod) -case "$1" in - start) - stat_busy "Starting mongodb" - [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mongodb - stat_done - fi - ;; - stop) - stat_busy "Stopping mongodb" - [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mongodb - while [ ! -z "$(pidof /usr/bin/mongod)" ]; do - sleep 1; - done - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/openimageio/PKGBUILD b/community-staging/openimageio/PKGBUILD deleted file mode 100644 index 2825485c5..000000000 --- a/community-staging/openimageio/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 66736 2012-02-27 21:25:22Z svenstaro $ -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -_pkg=OpenImageIO -pkgname=openimageio -pkgver=0.10.4 -pkgrel=6 -pkgdesc="A library for reading and writing images, including classes, utilities, and applications." -arch=(i686 x86_64) -url="http://www.openimageio.org/" -license=('custom') -depends=('openexr' 'boost-libs' 'jasper' 'glew') -makedepends=('cmake' 'qt' 'python2' 'boost') -optdepends=('qt: iv image viewer' 'python2: bindings support') -options=(!buildflags) -source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}" - "openimageio-0.10.2-libpng15.patch") -md5sums=('08a1bc2b82862ad5547bba569f4f633f' - 'd12829808610a54b6bc3350dc5419db3') - -build() { - cd "$srcdir"/$_pkg* - - # remove insecure rpath - sed -i "/RPATH/d" src/CMakeLists.txt - - patch -d src/ -Np0 < $srcdir/openimageio-0.10.2-libpng15.patch - - # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204 - [[ $CARCH == "i686" ]] && make debug || make -} - -package() { - cd "$srcdir"/$_pkg*/dist/* - - # prepare dirs - install -d "$pkgdir"/usr/{share/doc/$_pkg,lib/python2.7/site-packages} - - # bin - cp -r bin include lib "$pkgdir/usr" - - # docs - cp -r doc/* "$pkgdir/usr/share/doc/$_pkg" - - # python module - cp -r python/* "$pkgdir/usr/lib/python2.7/site-packages" - - # license - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-staging/openimageio/openimageio-0.10.2-libpng15.patch b/community-staging/openimageio/openimageio-0.10.2-libpng15.patch deleted file mode 100644 index 97375d5fb..000000000 --- a/community-staging/openimageio/openimageio-0.10.2-libpng15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ico.imageio/icooutput.cpp -+++ ico.imageio/icooutput.cpp -@@ -32,6 +32,8 @@ - #include <cstdlib> - #include <cmath> - -+#include <zlib.h> /* Z_BEST_COMPRESSION */ -+ - #include "ico.h" - #include "../png.imageio/png_pvt.h" - diff --git a/community-staging/pokerth/PKGBUILD b/community-staging/pokerth/PKGBUILD deleted file mode 100644 index 5f57fc3b4..000000000 --- a/community-staging/pokerth/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 66724 2012-02-27 19:46:51Z svenstaro $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> -# Contributor: Vasco Costa <vasco.costa@meiodigital.com> - -pkgname=pokerth -_realname=PokerTH -pkgver=0.9.3 -pkgrel=2 -pkgdesc="Poker game written in C++/QT4" -arch=('i686' 'x86_64') -url="http://www.pokerth.net/" -license=('GPL' 'custom') -depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls' - 'qt' 'sdl_mixer' 'libircclient' 'tinyxml') -makedepends=('boost') -source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) -md5sums=('09d173512f723441f288b2844e3c68cb') - -build() { - cd "$srcdir/$_realname-$pkgver-src" - - sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro - - sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp - - # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' - sed \ - -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ - -i zlib_compress.pro pokerth_game.pro pokerth_server.pro - - qmake $pkgname.pro - make -} - -package() { - cd "$srcdir/$_realname-$pkgver-src" - - make INSTALL_ROOT="$pkgdir" install - - install -D "$pkgname" "$pkgdir/usr/bin/$pkgname" - install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1" - install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" - rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt" -} diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD deleted file mode 100644 index 5294f7b74..000000000 --- a/community-staging/spring/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 66726 2012-02-27 20:26:04Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=spring -pkgver=0.86.0 -_pkgver=86.0 -pkgrel=2 -pkgdesc='A free 3D real-time-strategy (RTS) game engine' -arch=('i686' 'x86_64') -url="http://springrts.com/" -license=('GPL') -depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl' - 'libxcursor') -makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2' 'java-environment') -optdepends=('python2: python-based bots' - 'java-runtime: java-based bots') -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('047511adf2e4cd711df61d556367e7af') - -build() { - bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma - - cd spring_${_pkgver} - - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATADIR=share/spring - make -} - -package() { - cd spring_${_pkgver} - - make DESTDIR=$pkgdir install - - install -d $pkgdir/etc/spring - echo '$HOME/.spring' > $pkgdir/etc/spring/datadir -} - -# vim sw=2:ts=2 et: diff --git a/community-staging/springlobby/PKGBUILD b/community-staging/springlobby/PKGBUILD deleted file mode 100644 index 59c68d9d0..000000000 --- a/community-staging/springlobby/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 66722 2012-02-27 19:40:00Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: DuGi <dugi@irc.pl> - -pkgname=springlobby -pkgver=0.141 -pkgrel=2 -pkgdesc="A free cross-platform lobby client for the Spring RTS project." -arch=('i686' 'x86_64') -url="http://springlobby.info/" -license=('GPL2') -depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs') -optdepends=('sdl' 'sdl_sound' 'sdl_mixer') -makedepends=('boost' 'asio' 'cmake') -install=springlobby.install -source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 - springlobby.desktop - springlobby.png) -md5sums=('a7e5a9b031a1e72a1df59575289fed3f' - '45f8b59d033931d02e734fe3bd7777dd' - '1f388187539aeb0358b51995e26ed890') - -build() { - cd $srcdir/${pkgname}-$pkgver - - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt - - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DOPTION_SOUND=false - make -} - -package() { - cd $srcdir/${pkgname}-$pkgver - - make DESTDIR=$pkgdir install - - install -m755 -d $pkgdir/usr/share/applications - install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications - - install -m755 -d -p $pkgdir/usr/share/pixmaps - install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps -} - -# vim: sw=2:ts=2 et: diff --git a/community-staging/springlobby/springlobby.desktop b/community-staging/springlobby/springlobby.desktop deleted file mode 100644 index 1dce96b90..000000000 --- a/community-staging/springlobby/springlobby.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=SpringLobby -Comment=Lobby for Spring. An open source RTS with similar gameplay to TA -Exec=springlobby -Icon=springlobby.png -Terminal=false -Type=Application -Categories=Application;Game;StrategyGame; diff --git a/community-staging/springlobby/springlobby.install b/community-staging/springlobby/springlobby.install deleted file mode 100644 index 1a05f573e..000000000 --- a/community-staging/springlobby/springlobby.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-staging/springlobby/springlobby.png b/community-staging/springlobby/springlobby.png Binary files differdeleted file mode 100644 index 89c7ab0ac..000000000 --- a/community-staging/springlobby/springlobby.png +++ /dev/null diff --git a/community-staging/wesnoth/PKGBUILD b/community-staging/wesnoth/PKGBUILD deleted file mode 100644 index 5c8742717..000000000 --- a/community-staging/wesnoth/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 66717 2012-02-27 19:17:20Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Jacobo Arvelo <unix4all@ya.com> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=wesnoth -pkgver=1.10.1 -pkgrel=2 -pkgdesc="A turn-based strategy game on a fantasy world" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.wesnoth.org/" -depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data" 'dbus-core' 'python2') -makedepends=('boost' 'cmake') -install=wesnoth.install -options=(!emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - wesnoth.tmpfiles.conf - wesnothd.rc.d) -md5sums=('a2ac2d629d4e3e5fc7e7e48f935d9960' - 'b8122f5054e3895c9c054e87460869dc' - '85659b47d22dfdf4e4d046556973fc3e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - mkdir build && cd build - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_OMP=ON \ - -DENABLE_TOOLS=ON \ - -DMANDIR=share/man \ - -DFIFO_DIR=/var/run/wesnothd - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - cd build - make DESTDIR="$pkgdir" install - - rm -r $pkgdir/usr/share/applications - rm -r $pkgdir/usr/share/doc - rm -r $pkgdir/usr/share/pixmaps - rm -r $pkgdir/usr/share/wesnoth - - install -Dm644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" - install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd" -} diff --git a/community-staging/wesnoth/wesnoth.install b/community-staging/wesnoth/wesnoth.install deleted file mode 100644 index 4f1e419ae..000000000 --- a/community-staging/wesnoth/wesnoth.install +++ /dev/null @@ -1,9 +0,0 @@ -# arg 1: the new package version -post_install() { -cat << EOF -Note: -==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma" -==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth -==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output. -EOF -} diff --git a/community-staging/wesnoth/wesnoth.tmpfiles.conf b/community-staging/wesnoth/wesnoth.tmpfiles.conf deleted file mode 100644 index 3ec0f6013..000000000 --- a/community-staging/wesnoth/wesnoth.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -D /run/wesnothd 0700 root root - diff --git a/community-staging/wesnoth/wesnothd.rc.d b/community-staging/wesnoth/wesnothd.rc.d deleted file mode 100755 index 95e312b7b..000000000 --- a/community-staging/wesnoth/wesnothd.rc.d +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/wesnothd) - -case "$1" in - start) - stat_busy "Starting Wesnoth Server Daemon" - [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd - [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -o %PPID /usr/bin/wesnothd) - echo $PID > /var/run/wesnotd/pid - add_daemon wesnothd - stat_done - fi - ;; - stop) - stat_busy "Stopping Wesnoth Server Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon wesnothd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/xmobar/PKGBUILD b/community-staging/xmobar/PKGBUILD deleted file mode 100644 index ebe3e2563..000000000 --- a/community-staging/xmobar/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 66667 2012-02-27 02:46:19Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.4 - -pkgname=xmobar -pkgver=0.14 -pkgrel=2 -pkgdesc="A Minimalistic Text Based Status Bar" -url="http://hackage.haskell.org/package/xmobar" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') -makedepends=('ghc>=7.0.2' 'haskell-x11>=1.3.0' 'haskell-x11-xft>=0.2' 'haskell-utf8-string' - 'haskell-stm' 'haskell-parsec>=3' 'haskell-mtl>=2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) -md5sums=('b965e2db0555c741db96945210995777') - -build() { - cd ${srcdir}/xmobar-$pkgver -# runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_alsa with_inotify with_iwlib" - runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_iwlib" - runhaskell Setup build -} - -package() { - cd ${srcdir}/xmobar-$pkgver - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community-staging/xmonad/PKGBUILD b/community-staging/xmonad/PKGBUILD deleted file mode 100644 index fa3779df6..000000000 --- a/community-staging/xmonad/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 66511 2012-02-25 22:21:22Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: shild <shildv@gmail.com> - -pkgname=xmonad -pkgver=0.10 -pkgrel=3 -pkgdesc="A lightweight X11 tiled window manager written in Haskell" -arch=('i686' 'x86_64') -url="http://xmonad.org/" -license=('BSD') -depends=('ghc=7.4.1' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.7') -optdepends=('xorg-xmessage: for displaying visual error messages') -install='xmonad.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz - xmonad.desktop - xmonad.session - xmonad.svg) -md5sums=('f8381e1ec15137863558a454d4466467' - 'f8e3d84a9f154d1b5d7fcffbc0a058c9' - '9d1bc84a7f32897d32f3fc71ef76228e' - '72bfa5e62e4e44fe7fa59b6a7593d993') - -build() { - cd $srcdir/$pkgname-$pkgver - runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh - install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh - runhaskell Setup.lhs copy --destdir=$pkgdir -# runhaskell util/GenerateManpage.hs - - install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1 - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE - - install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop - install -D -m644 $srcdir/xmonad.session $pkgdir/usr/share/gnome-session/sessions/xmonad.session - install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg -} diff --git a/community-staging/xmonad/xmonad.desktop b/community-staging/xmonad/xmonad.desktop deleted file mode 100644 index 0af0f2d9b..000000000 --- a/community-staging/xmonad/xmonad.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Xmonad GNOME -Comment=Tiling window manager -TryExec=/usr/bin/gnome-session -Exec=gnome-session --session=xmonad -Type=XSession -Icon=/usr/share/pixmaps/xmonad.svg diff --git a/community-staging/xmonad/xmonad.install b/community-staging/xmonad/xmonad.install deleted file mode 100644 index 6659247db..000000000 --- a/community-staging/xmonad/xmonad.install +++ /dev/null @@ -1,22 +0,0 @@ -HS_DIR=/usr/share/haskell/xmonad - -post_install() { - ${HS_DIR}/register.sh - echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs" - echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples" - echo - echo "If you would like to run xmonad as a window manager inside GNOME, please see" - echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad" -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} diff --git a/community-staging/xmonad/xmonad.png b/community-staging/xmonad/xmonad.png Binary files differdeleted file mode 100644 index d957f62f8..000000000 --- a/community-staging/xmonad/xmonad.png +++ /dev/null diff --git a/community-staging/xmonad/xmonad.session b/community-staging/xmonad/xmonad.session deleted file mode 100644 index c0bd16781..000000000 --- a/community-staging/xmonad/xmonad.session +++ /dev/null @@ -1,6 +0,0 @@ -[GNOME Session] -Name=Xmonad session -RequiredComponents=gnome-panel;gnome-settings-daemon; -RequiredProviders=windowmanager;notifications; -DefaultProvider-windowmanager=xmonad -DefaultProvider-notifications=notification-daemon diff --git a/community-staging/xmonad/xmonad.svg b/community-staging/xmonad/xmonad.svg deleted file mode 100644 index 5fc884213..000000000 --- a/community-staging/xmonad/xmonad.svg +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg2211" - sodipodi:version="0.32" - inkscape:version="0.45.1" - width="47" - height="73" - version="1.0" - sodipodi:docbase="/home/sjanssen/xmonad-web/images" - sodipodi:docname="logo.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <metadata - id="metadata2216"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs2214" /> - <sodipodi:namedview - inkscape:window-height="778" - inkscape:window-width="1278" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - inkscape:zoom="4" - inkscape:cx="23.5" - inkscape:cy="22.689137" - inkscape:window-x="0" - inkscape:window-y="20" - inkscape:current-layer="g3208" /> - <g - id="g3208" - transform="translate(-44.517797,4.0967298)"> - <g - id="g3212" - transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)"> - <path - style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462" - id="text2220" - sodipodi:nodetypes="cccccccc" /> - <path - id="path3206" - d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349" - style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - sodipodi:nodetypes="ccccccccc" /> - </g> - <path - style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono" - d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z " - id="text3216" - sodipodi:nodetypes="ccccccccccccccccccccccccccc" /> - </g> -</svg> diff --git a/community/kdesvn/PKGBUILD b/community/kdesvn/PKGBUILD index f0d900b55..2b3d3b2cd 100644 --- a/community/kdesvn/PKGBUILD +++ b/community/kdesvn/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 26469 2010-09-15 21:07:57Z jlichtblau $ +# $Id: PKGBUILD 66895 2012-02-29 22:49:56Z giovanni $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=kdesvn pkgver=1.5.5 -pkgrel=1 +pkgrel=2 pkgdesc="A pure C++ SVN-client for KDE" arch=('i686' 'x86_64' 'mips64el') -url="http://www.alwins-world.de/programs/kdesvn/" +url="http://kdesvn.alwins-world.de/" license=('GPL') -depends=('hicolor-icon-theme' 'kdelibs' 'subversion' 'xdg-utils' 'qt') +depends=('kdebase-runtime' 'subversion') makedepends=('automoc4' 'cmake') conflicts=('qsvn') -options=('libtool') -install=$pkgname.install -changelog=$pkgname.changelog -source=(http://kdesvn.alwins-world.de/downloads/$pkgname-$pkgver.tar.bz2) -md5sums=('8f11d31cc55fba408b7971541ee261d0') +install=kdesvn.install +source=("http://kdesvn.alwins-world.de/downloads/${pkgname}-${pkgver}.tar.bz2" + 'kdesvn-1.5.5-qt48.patch' + 'kdesvn-1.5.5-doctype-version.patch') +md5sums=('8f11d31cc55fba408b7971541ee261d0' + 'a7440581e373e06e4290e1f0d905c6f2' + '64368d7cb40ce9fe7656f886337628b8') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/kdesvn-1.5.5-qt48.patch" + patch -Np1 -i "${srcdir}/kdesvn-1.5.5-doctype-version.patch" cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -30,13 +35,13 @@ build() { } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install -#removing conflicting files - kdesdk + #removing conflicting files - kdesdk rm -f ${pkgdir}/usr/share/kde4/services/svn* -#removing $srcdir reference + #removing $srcdir reference rm -rf ${pkgdir}/usr/share/doc } diff --git a/community/kdesvn/kdesvn-1.5.5-doctype-version.patch b/community/kdesvn/kdesvn-1.5.5-doctype-version.patch new file mode 100644 index 000000000..908960b72 --- /dev/null +++ b/community/kdesvn/kdesvn-1.5.5-doctype-version.patch @@ -0,0 +1,9 @@ +--- a/doc/nl/index.docbook 2010-08-09 19:00:17.000000000 +0200 ++++ b/doc/nl/index.docbook 2010-08-09 19:00:26.000000000 +0200 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kdesvn "<application>kdesvn</application>"> + <!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname--> + <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc --> diff --git a/community/kdesvn/kdesvn-1.5.5-qt48.patch b/community/kdesvn/kdesvn-1.5.5-qt48.patch new file mode 100644 index 000000000..a1ac51b51 --- /dev/null +++ b/community/kdesvn/kdesvn-1.5.5-qt48.patch @@ -0,0 +1,14 @@ +Source: Ubuntu +https://launchpad.net/ubuntu/precise/+source/kdesvn/1.5.5-3ubuntu1 + +--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h ++++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h +@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil + /** + @author Rajko Albrecht <ral@alwins-world.de> + */ +-class RevGraphView : virtual public QGraphicsView ++class RevGraphView : public QGraphicsView + { + Q_OBJECT + public: diff --git a/community/kdesvn/kdesvn.install b/community/kdesvn/kdesvn.install index b711352cb..5c501dc49 100644 --- a/community/kdesvn/kdesvn.install +++ b/community/kdesvn/kdesvn.install @@ -1,11 +1,12 @@ post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/community/lib32-libpng/PKGBUILD b/community/lib32-libpng/PKGBUILD new file mode 100644 index 000000000..8d626ebc2 --- /dev/null +++ b/community/lib32-libpng/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 66846 2012-02-29 12:56:09Z bluewind $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Travis Willard <travis@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +_pkgbasename=libpng +pkgname=lib32-$_pkgbasename +pkgver=1.5.9 +_apngver=1.5.9 +_libversion=15 +pkgrel=2 +pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)" +arch=('x86_64') +url="http://www.libpng.org/pub/png/libpng.html" +license=('custom') +depends=('lib32-zlib' $_pkgbasename) +makedepends=(gcc-multilib) +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz" + "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz") +md5sums=('05d9ab3705c34954c0032b71318b678a' + '268f7db97b292d5f14a24ea7940f6f1c') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + # Add animated PNG (apng) support + # see http://sourceforge.net/projects/libpng-apng/ + patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch" + + ./configure --prefix=/usr --libdir=/usr/lib32 --program-suffix=-32 + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + cd contrib/pngminus + make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png + + rm -rf "${pkgdir}"/usr/{include,share} + + rm "$pkgdir/usr/bin/libpng-config" + ln -s "libpng${_libversion}-config-32" "$pkgdir/usr/bin/libpng-config-32" + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/community/lilyterm/PKGBUILD b/community/lilyterm/PKGBUILD index 4685226ff..527888dcc 100644 --- a/community/lilyterm/PKGBUILD +++ b/community/lilyterm/PKGBUILD @@ -1,10 +1,12 @@ +# $Id: PKGBUILD 66757 2012-02-28 08:33:19Z giovanni $ +# Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: TDY <tdy@gmx.com> # Contributor: DonVla <donvla@users.sourceforge.net> -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=lilyterm pkgver=0.9.8 -pkgrel=1 +pkgrel=2 pkgdesc="A light and easy to use libvte based X terminal emulator" arch=('i686' 'x86_64' 'mips64el') url="http://lilyterm.luna.com.tw/index_en.html" @@ -17,7 +19,8 @@ md5sums=('995f7b4634523bf5e150b529a4bdbf6f') build() { cd "$srcdir/lilyterm-$pkgver" ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr \ + --sysconfdir=/etc make } diff --git a/community/lwm/PKGBUILD b/community/lwm/PKGBUILD index f14f5c36a..c33d6e556 100644 --- a/community/lwm/PKGBUILD +++ b/community/lwm/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 6621 2009-12-18 08:13:19Z giovanni $ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 66767 2012-02-28 10:21:19Z giovanni $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Jeff Mickey <j@codemac.net> # Contributor: Ben Mazer <blm@groknil.org> pkgname=lwm pkgver=1.2.2 -pkgrel=1 -pkgdesc="a very light weight window manager" +pkgrel=2 +pkgdesc="A very light weight window manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.jfc.org.uk/software/lwm.html" -depends=('xorg-server') +depends=('xorg-server' 'libsm' 'libxext') makedepends=('imake') source=(http://www.jfc.org.uk/files/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('1748722a293e03d632b615275ef84498') build() { cd ${srcdir}/${pkgname}-${pkgver} + + sed -i -e "s/(SMLIB)/& -lICE/g" Imakefile xmkmf - make || return 1 - strip lwm + make EXTRA_LDOPTIONS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS}" +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + install -Dm755 lwm ${pkgdir}/usr/bin/lwm install -Dm644 lwm.man ${pkgdir}/usr/share/man/man1/lwm.1 } diff --git a/community/macchanger/PKGBUILD b/community/macchanger/PKGBUILD index 456e3fcea..bb82b6528 100644 --- a/community/macchanger/PKGBUILD +++ b/community/macchanger/PKGBUILD @@ -1,18 +1,27 @@ -# $Id: PKGBUILD 7199 2010-01-03 07:55:05Z dgriffiths $ +# $Id: PKGBUILD 66755 2012-02-28 08:12:38Z giovanni $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=macchanger pkgver=1.5.0 -pkgrel=3 +pkgrel=4 pkgdesc="A small utility to change you NIC's MAC address" arch=('i686' 'x86_64' 'mips64el') url="http://ftp.gnu.org/gnu/macchanger" license=('GPL') -source=(http://ftp.gnu.org/gnu/macchanger/$pkgname-$pkgver.tar.gz) +source=(http://ftp.gnu.org/gnu/macchanger/${pkgname}-${pkgver}.tar.gz) md5sums=('79b7cdaeca3d8ebafa764c4b0dd03ab7') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/man - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/man + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install } diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index e937af513..517935780 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,9 +1,10 @@ +# $Id: PKGBUILD 66824 2012-02-29 00:49:06Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Mathias Stearn <mathias@10gen.com> # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +19,7 @@ install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' 'mongodb.conf') -md5sums=('5dcf819249955a3e9cc61a341e45403a' +md5sums=('f588cae93196b94599ec50e3c4956592' '9c67e00f4626ad761a8f7d4e037a54d7' '4839fe1d638187ca3226e8267b947318') diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index d9ac969d6..650b6f16d 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -6,15 +6,16 @@ # Contributor: Andrzej Giniewicz <gginiu@gmail.com> pkgname=('python-scipy' 'python2-scipy') -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') url="http://www.scipy.org/" license=('BSD') makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') +checkdepends=('python-nose' 'python2-nose') source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz") -md5sums=('e357c08425fd031dce63bc4905789088') +md5sums=('6ad976549e22e04ca93e70cf55b70a22') build() { unset LDFLAGS @@ -42,6 +43,16 @@ build() { python2 setup.py config_fc --fcompiler=gnu95 build } +check() { + cd scipy-${pkgver} +# figure out how to run tests in the source tree easily +# python -c "from scipy import test; test('full')" + + cd ../scipy-${pkgver}-py2 +# figure out how to run tests in the source tree easily +# python2 -c "from scipy import test; test('full')" +} + package_python-scipy() { depends=('python-numpy') provides=('python3-scipy' 'scipy') diff --git a/community/qtcurve-gtk2/PKGBUILD b/community/qtcurve-gtk2/PKGBUILD index f6dde224d..b77e5b18c 100644 --- a/community/qtcurve-gtk2/PKGBUILD +++ b/community/qtcurve-gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65720 2012-02-22 11:50:01Z svenstaro $ +# $Id: PKGBUILD 66821 2012-02-28 23:45:44Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-gtk2 -pkgver=1.8.13 +pkgver=1.8.14 pkgrel=1 pkgdesc="A configurable set of widget styles for KDE and Gtk" arch=('i686' 'x86_64') @@ -15,19 +15,19 @@ makedepends=('cmake') groups=('qtcurve') options=('!libtool') source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2") -md5sums=('11cee806fd3f78d375498d5bd304799e') +md5sums=('4d8e703c5e906e8e3d27b1a38b57db9b') build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../QtCurve-Gtk2-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make + cd "${srcdir}" + mkdir build + cd build + cmake ../QtCurve-Gtk2-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make } package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/community/rlwrap/PKGBUILD b/community/rlwrap/PKGBUILD index ca15bd42b..6ca506ac5 100644 --- a/community/rlwrap/PKGBUILD +++ b/community/rlwrap/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 16714 2010-05-06 11:51:51Z mherych $ -# Maintainer : wizzomafizzo <wizzomafizzo@gmail.com> -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 66761 2012-02-28 08:57:15Z giovanni $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: wizzomafizzo <wizzomafizzo@gmail.com> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Benjamin Andresen <benny AT klapmuetz DOT org> # Contributor: Douglas Thrift <douglas@douglasthrift.net> pkgname=rlwrap pkgver=0.37 -pkgrel=1 +pkgrel=2 pkgdesc="A 'readline wrapper'" arch=('i686' 'x86_64' 'mips64el') url="http://utopia.knoware.nl/~hlub/uck/rlwrap/" license=('GPL') -depends=('readline') +depends=('perl') source=(http://utopia.knoware.nl/~hlub/uck/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('04cd6e2c257eb5a86b297f2ebf91dbbf') 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/community/root/PKGBUILD b/community/root/PKGBUILD index ac945a609..4010182cb 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.32.00 -pkgrel=4 +pkgver=5.32.01 +pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') url='http://root.cern.ch' @@ -16,21 +16,15 @@ options=('!emptydirs') source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'root.sh' 'rootd' - 'root.xml' - 'fix-mathcore-generation-r42566.diff') -md5sums=('1c30e4e6eeae62ff1ad5118cd1309679' + 'root.xml') +md5sums=('c8f28bb483e0b32208fb153c1ea6af7c' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' - 'e2cf69b204192b5889ceb5b4dedc66f7' - '12877cabd620284f50ea16ef97a54aac') + 'e2cf69b204192b5889ceb5b4dedc66f7') build() { cd root - # temporary workaround: remove on next patch release after 5.32.00 - # bug reported at: https://savannah.cern.ch/bugs/?90906 - patch -Np0 -i ${srcdir}/fix-mathcore-generation-r42566.diff - if [ ${CARCH} == 'i686' ]; then TARGET=linux; else diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD index aa0f750bb..e84b00014 100644 --- a/community/sakura/PKGBUILD +++ b/community/sakura/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 53190 2011-07-31 20:35:40Z rvanharen $ +# $Id: PKGBUILD 66893 2012-02-29 21:54:35Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=sakura -pkgver=2.4.2 +pkgver=3.0.0 pkgrel=1 pkgdesc="A terminal emulator based on GTK and VTE" arch=('i686' 'x86_64' 'mips64el') -url="http://pleyades.net/david/sakura.php" +url="https://launchpad.net/sakura" license=('GPL') -depends=('vte' 'libxft' 'desktop-file-utils') +depends=('vte3' 'libxft' 'desktop-file-utils') makedepends=('cmake') -source=(http://pleyades.net/david/projects/$pkgname/$pkgname-$pkgver.tar.bz2) +source=(http://pleyades.net/david/projects/$pkgname/$pkgname-$pkgver.tar.bz2 + "linker.patch") install=sakura.install -sha1sums=('24b98c42c057da39f57c281a4726901952774641') +sha1sums=('2ac4024b40074fb048e9b75cd7ea351b1829c5ee' + '781058944c572b840e68a55a0fe86e97c4ac5296') build() { cd $srcdir/${pkgname}-${pkgver} + # missing linker + patch -Np1 -i ${srcdir}/linker.patch + # Set default font size a bit smaller sed -i 's|#define DEFAULT_FONT "Bitstream Vera Sans Mono 14"|#define DEFAULT_FONT "Bitstream Vera Sans Mono 10"|g' src/sakura.c diff --git a/community/sakura/linker.patch b/community/sakura/linker.patch new file mode 100644 index 000000000..9277461d9 --- /dev/null +++ b/community/sakura/linker.patch @@ -0,0 +1,11 @@ +--- sakura-3.0.0/CMakeLists.txt.bak 2012-02-29 22:50:16.786701967 +0100 ++++ sakura-3.0.0/CMakeLists.txt 2012-02-29 22:50:26.323368673 +0100 +@@ -43,7 +43,7 @@ + + INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS}) + LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS}) +-LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES}) ++LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES} -lm) + ADD_EXECUTABLE (sakura src/sakura.c) + ADD_DEPENDENCIES (sakura src/sakura.c src/sakura.h) + diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD index 7dea11b25..5c09b8711 100644 --- a/community/scantailor/PKGBUILD +++ b/community/scantailor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66680 2012-02-27 10:02:02Z spupykin $ +# $Id: PKGBUILD 66775 2012-02-28 14:29:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com> pkgname=scantailor -pkgver=0.9.11 +pkgver=0.9.11.1 pkgrel=1 pkgdesc="Interactive post-processing tool for scanned pages" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ depends=('qt') makedepends=('cmake' 'boost') options=('!makeflags') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('15984c8828ecb2de542ac94e3c41a810') +md5sums=('6cdca1b6d1dafd022ea94b4800dad340') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 2b9d1321f..3e9f6ebc8 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61725 2012-01-07 01:42:13Z arodseth $ +# $Id: PKGBUILD 66814 2012-02-28 22:45:12Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Jochem Kossen <j.kossen@home.nl> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('i686' 'x86_64' 'mips64el') @@ -14,9 +14,9 @@ license=('custom:scite') depends=('desktop-file-utils' 'gtk2') makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') -install=scite.install +install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('a5687faaa201c39a4ec9608e8a77e418e259f525b21871a5c9f1282c62e58eaa') +sha256sums=('0d02b81f6f182366abe8133f4e727d802b756d33e9eeba5fe9ac69c4a17286fd') build() { cd "$srcdir" diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD index a8c019f10..b4285249f 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=6.0.0 +pkgver=6.0.1 pkgrel=1 pkgdesc='Prolog environment' arch=('i686' 'x86_64' 'mips64el') @@ -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=('5c09e6f37fe56bc843a8f3fcce380fb0') +md5sums=('a4ea80195b4e1dc63dc1b2c82a59a088') build() { cd pl-${pkgver} diff --git a/community/typespeed/PKGBUILD b/community/typespeed/PKGBUILD index 461714d7a..0be3db773 100644 --- a/community/typespeed/PKGBUILD +++ b/community/typespeed/PKGBUILD @@ -1,8 +1,10 @@ -# $Id: PKGBUILD 34838 2010-12-12 22:33:17Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 66763 2012-02-28 09:12:45Z giovanni $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> + pkgname=typespeed pkgver=0.6.5 -pkgrel=3 +pkgrel=4 pkgdesc="Test your typing speed, and get your fingers' CPS." arch=('i686' 'x86_64' 'mips64el') url="http://typespeed.sourceforge.net" @@ -11,12 +13,18 @@ depends=('ncurses') install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('578102b418c7df84903d3e90df2e7483') + build() { cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc - make - make DESTDIR=$pkgdir install + make } +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install +} diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 548827524..58321e66f 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $ +# $Id: PKGBUILD 66834 2012-02-29 07:29:58Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules') pkgver=4.1.8 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/vobcopy/PKGBUILD b/community/vobcopy/PKGBUILD index 77119e34d..6760ee59c 100644 --- a/community/vobcopy/PKGBUILD +++ b/community/vobcopy/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 22478 2010-07-21 21:11:19Z lcarlier $ +# $Id: PKGBUILD 66897 2012-02-29 23:21:33Z giovanni $ # Maintainer: Daenyth # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tino Reichardt <milky-archlinux@mcmilk.de> pkgname=vobcopy pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Copies DVD .vob files to harddisk, decrypting them on the way" arch=('i686' 'x86_64' 'mips64el') url="http://www.vobcopy.org" license=('GPL2') -depends=('libdvdread>=4.1.3' 'libdvdcss') -source=(http://www.vobcopy.org/download/$pkgname-$pkgver.tar.bz2) +depends=('libdvdread' 'libdvdcss') +options=('!docs') +source=(http://www.vobcopy.org/download/${pkgname}-${pkgver}.tar.bz2) md5sums=('88f735ccd051093ff40dab4597bc586e') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="$pkgdir" PREFIX=/usr/ MANDIR=/usr/share/man install } diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD index a88faa4d7..11aa99ec2 100644 --- a/community/xmlrpc-c/PKGBUILD +++ b/community/xmlrpc-c/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 63853 2012-02-06 08:42:18Z arodseth $ +# $Id: PKGBUILD 66818 2012-02-28 23:03:08Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Vitaliy Berdinskikh <skipper13@root.ua> + pkgname=xmlrpc-c -pkgver=1.16.39 +pkgver=1.29.2 epoch=1 pkgrel=1 pkgdesc='XML-RPC for C and C++' @@ -14,11 +15,11 @@ license=('custom') depends=('curl' 'libxml2' 'gcc-libs' 'zlib') makedepends=('libtool' 'setconf') options=('!makeflags' '!libtool') -source=("http://sourceforge.net/projects/$pkgname/files/Xmlrpc-c%20Super%20Stable/$pkgver/$pkgname-$pkgver.tgz") -sha256sums=('54adc6dae0af044fcbbfe97625f256f8afe7d7f0768ef82cef1f98d03c3fbb39') +source=("http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced.tar.gz") +sha256sums=('0807e829ef333bd161d0e6fa1327e6698f467015366fb70f236753cb096ee794') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/advanced" [ "$CARCH" != "i686" ] && export CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr \ @@ -34,7 +35,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/advanced" make DESTDIR="$pkgdir" install install -Dm644 doc/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index a447951a5..f63716b48 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147657 2012-01-26 02:44:17Z dreisner $ +# $Id: PKGBUILD 151635 2012-02-29 01:57:14Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=libarchive pkgver=3.0.3 -pkgrel=3 +pkgrel=5 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64' 'mips64el') url="http://libarchive.googlecode.com/" @@ -11,16 +11,16 @@ license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" 'interpret-non-posix-zips.patch' - 'test-with-zip-mtime.patch') + 'test-with-zip-mtime.patch' + 'skip-fiemap-on-unavail.patch') md5sums=('ca4090f0099432a9ac5a8b6618dc3892' 'f02b88eb10877c7a7d527ed89c662e44' - '8366def6d7d70d424fa28a986c78c015') + '8366def6d7d70d424fa28a986c78c015' + 'efa7cbda9fc64a4f1392324d0b5707e2') sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7' '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc' - 'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' + 'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f' + '05696eb87bf60520aff3a9d6afb4e40273ecca25e0a01a6d5a3669642f07b444') build() { cd "$srcdir/$pkgname-$pkgver" @@ -31,6 +31,9 @@ build() { # http://code.google.com/p/libarchive/issues/detail?id=231 patch -Np0 <"$srcdir/test-with-zip-mtime.patch" + # http://code.google.com/p/libarchive/issues/detail?id=238 + patch -Np1 <"$srcdir/skip-fiemap-on-unavail.patch" + ./configure --prefix=/usr --without-xml2 make } diff --git a/testing/libarchive/skip-fiemap-on-unavail.patch b/core/libarchive/skip-fiemap-on-unavail.patch index d054aea4e..d054aea4e 100644 --- a/testing/libarchive/skip-fiemap-on-unavail.patch +++ b/core/libarchive/skip-fiemap-on-unavail.patch diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index 1f9b26e5c..7c07fcc93 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147985 2012-01-29 11:40:13Z ronald $ +# $Id: PKGBUILD 151647 2012-02-29 10:28:02Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot pkgver=4.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnuplot.info" @@ -13,12 +13,17 @@ license=('custom') depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra') install=gnuplot.install -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" + "lua_tikz.patch") +sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31' + 'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30') build() { cd $srcdir/$pkgname-$pkgver + # upstram patch to fix lua/tikz terminal + patch -Np0 -i ${srcdir}/lua_tikz.patch + # fix default source location; use the GDFONTPATH variable to modify at runtime sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c diff --git a/extra/gnuplot/lua_tikz.patch b/extra/gnuplot/lua_tikz.patch new file mode 100644 index 000000000..f9a939d47 --- /dev/null +++ b/extra/gnuplot/lua_tikz.patch @@ -0,0 +1,10 @@ +--- term/lua/gnuplot-tikz-444.lua Sun Nov 13 00:57:15 2011
++++ term/lua/gnuplot-tikz.lua Fri Nov 25 01:11:38 2011
+@@ -251,6 +251,7 @@
+ gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))
+ gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",
+ term.gp_version, term.gp_patchlevel,
++ _VERSION,
+ string.sub(term.lua_term_revision,7,-3),
+ pgf.REVISION,os.date()))
+ if font ~= "" then
\ No newline at end of file diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index 481c167b4..12d573ff3 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 147724 2012-01-27 15:42:58Z stephane $ +# $Id: PKGBUILD 151699 2012-02-29 23:23:35Z stephane $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org/projects/hwloc/" license=('BSD') -depends=('sh' 'pciutils') +depends=('sh' 'pciutils' 'cairo' 'libxml2') makedepends=('pkg-config') -optdepends=('cairo: Graphical output' 'libxml2: XML export') options=('!libtool' '!docs') source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2) sha1sums=('04326ebbf5a084164d72269f05e37ae23996c023') diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index a5988a0d5..7a897ad5a 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146925 2012-01-19 10:00:36Z thomas $ +# $Id: PKGBUILD 151643 2012-02-29 07:23:23Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=10 +pkgrel=11 epoch=1 _extramodules=extramodules-3.2-LIBRE _kernver="$(cat /lib/modules/${_extramodules}/version)" diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index ddba16c90..366b4d4ad 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145773 2011-12-31 06:32:37Z schiv $ +# $Id: PKGBUILD 151657 2012-02-29 20:04:42Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" arch=('i686' 'x86_64' 'mips64el') @@ -18,9 +18,9 @@ source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz backup=('etc/lyx/lyxrc.dist') install=lyx.install options=('emptydirs') -md5sums=('f6421fdf118ace93d259220e6a3c4431' - '1f65a736f015a5350f8efb41b2f13abd' - 'b70fdeab95ba4a6c3ff72410dfa61823') +sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f' + 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' + '56416642cc3da2a13b87b84e6b87c1a239f3d09a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index ed521586e..0d171589d 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148480 2012-02-02 09:45:02Z giovanni $ +# $Id: PKGBUILD 151621 2012-02-28 20:53:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial pkgver=2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') url="http://mercurial.selenic.com/" @@ -13,12 +13,15 @@ depends=('python2') optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" - 'mercurial.profile') + 'mercurial.profile' + 'mercurial-2.1-return-code.patch') md5sums=('d2ca44f8d0129ab50639143af99d9363' - '43e1d36564d4c7fbe9a091d3ea370a44') + '43e1d36564d4c7fbe9a091d3ea370a44' + '025e2ec8acc18a9b2a1b4f51f7bddbe3') package() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/mercurial-2.1-return-code.patch" python2 setup.py install --root="${pkgdir}/" --optimize=1 sed -i -e 's#env python#env python2#' \ diff --git a/extra/mercurial/mercurial-2.1-return-code.patch b/extra/mercurial/mercurial-2.1-return-code.patch new file mode 100644 index 000000000..8139badfd --- /dev/null +++ b/extra/mercurial/mercurial-2.1-return-code.patch @@ -0,0 +1,377 @@ + +# HG changeset patch +# User Matt Mackall <mpm@selenic.com> +# Date 1328911770 21600 +# Node ID a3dcc59054cac3a78d0d5e5402680b17a396d59e +# Parent d75aa756149bfd54b1f7f84b86072b3c1a50d683 +pull: backout change to return code + +This bit a number of people. + +diff --git a/mercurial/commands.py b/mercurial/commands.py +--- a/mercurial/commands.py ++++ b/mercurial/commands.py +@@ -4261,7 +4261,7 @@ + + def postincoming(ui, repo, modheads, optupdate, checkout): + if modheads == 0: +- return 1 ++ return + if optupdate: + movemarkfrom = repo['.'].node() + try: +@@ -4312,8 +4312,7 @@ + If SOURCE is omitted, the 'default' path will be used. + See :hg:`help urls` for more information. + +- Returns 0 on success, 1 if no changes found or an update had +- unresolved files. ++ Returns 0 on success, 1 if an update had unresolved files. + """ + source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) + other = hg.peer(repo, opts, source) +diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t +--- a/tests/test-bookmarks-pushpull.t ++++ b/tests/test-bookmarks-pushpull.t +@@ -44,7 +44,6 @@ + pulling from ../a + no changes found + importing bookmark X +- [1] + $ hg bookmark + X 0:4e3505fd9583 + Y 0:4e3505fd9583 +@@ -185,7 +184,6 @@ + no changes found + divergent bookmark X stored as X@1 + importing bookmark Z +- [1] + $ hg clone http://localhost:$HGPORT/ cloned-bookmarks + requesting all changes + adding changesets +diff --git a/tests/test-bundle.t b/tests/test-bundle.t +--- a/tests/test-bundle.t ++++ b/tests/test-bundle.t +@@ -85,7 +85,6 @@ + pulling from ../full.hg + searching for changes + no changes found +- [1] + + Pull full.hg into empty (using --cwd) + +@@ -120,7 +119,6 @@ + pulling from full.hg + searching for changes + no changes found +- [1] + + Pull full.hg into empty (using -R) + +@@ -128,7 +126,6 @@ + pulling from full.hg + searching for changes + no changes found +- [1] + + Rollback empty + +diff --git a/tests/test-convert.t b/tests/test-convert.t +--- a/tests/test-convert.t ++++ b/tests/test-convert.t +@@ -293,7 +293,6 @@ + pulling from ../a + searching for changes + no changes found +- [1] + $ touch bogusfile + + should fail +diff --git a/tests/test-hook.t b/tests/test-hook.t +--- a/tests/test-hook.t ++++ b/tests/test-hook.t +@@ -196,7 +196,6 @@ + listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} + listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} + importing bookmark bar +- [1] + $ cd ../a + + test that prepushkey can prevent incoming keys +diff --git a/tests/test-https.t b/tests/test-https.t +--- a/tests/test-https.t ++++ b/tests/test-https.t +@@ -160,7 +160,6 @@ + pulling from https://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ mv copy-pull/.hg/hgrc.bu copy-pull/.hg/hgrc + + cacert configured globally, also testing expansion of environment +@@ -172,13 +171,11 @@ + pulling from https://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ P=`pwd` hg -R copy-pull pull --insecure + warning: localhost certificate with fingerprint 91:4f:1a:ff:87:24:9c:09:b6:85:9b:88:b1:90:6d:30:75:64:91:ca not verified (check hostfingerprints or web.cacerts config setting) + pulling from https://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + + cacert mismatch + +@@ -191,7 +188,6 @@ + pulling from https://127.0.0.1:$HGPORT/ + searching for changes + no changes found +- [1] + $ hg -R copy-pull pull --config web.cacerts=pub-other.pem + abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob) + [255] +@@ -200,7 +196,6 @@ + pulling from https://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + + Test server cert which isn't valid yet + +@@ -260,7 +255,6 @@ + pulling from https://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + + Test https with cacert and fingerprint through proxy + +@@ -268,12 +262,10 @@ + pulling from https://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull https://127.0.0.1:$HGPORT/ + pulling from https://127.0.0.1:$HGPORT/ + searching for changes + no changes found +- [1] + + Test https with cert problems through proxy + +diff --git a/tests/test-mq-qimport-fail-cleanup.t b/tests/test-mq-qimport-fail-cleanup.t +--- a/tests/test-mq-qimport-fail-cleanup.t ++++ b/tests/test-mq-qimport-fail-cleanup.t +@@ -34,7 +34,6 @@ + b.patch + + $ hg pull -q -r 0 . # update phase +- [1] + $ hg qimport -r 0 + abort: revision 0 is not mutable + (see "hg help phases" for details) +diff --git a/tests/test-pending.t b/tests/test-pending.t +--- a/tests/test-pending.t ++++ b/tests/test-pending.t +@@ -102,7 +102,6 @@ + rollback completed + abort: pretxnchangegroup hook failed + pull 0000000000000000000000000000000000000000 +- [1] + + test external hook + +@@ -118,4 +117,3 @@ + rollback completed + abort: pretxnchangegroup hook exited with status 1 + pull 0000000000000000000000000000000000000000 +- [1] +diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t +--- a/tests/test-phases-exchange.t ++++ b/tests/test-phases-exchange.t +@@ -136,7 +136,6 @@ + pulling from ../alpha + searching for changes + no changes found +- [1] + $ hgph + o 4 public a-D - b555f63b6063 + | +@@ -344,7 +343,6 @@ + pulling from ../alpha + searching for changes + no changes found +- [1] + $ hgph + @ 6 public n-B - 145e75495359 + | +@@ -777,7 +775,6 @@ + pulling from ../mu + searching for changes + no changes found +- [1] + $ hgph + @ 11 draft A-secret - 435b5d83910c + | +@@ -930,7 +927,6 @@ + pulling from http://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ hg phase f54f1bb90ff3 + 2: draft + +diff --git a/tests/test-pull-r.t b/tests/test-pull-r.t +--- a/tests/test-pull-r.t ++++ b/tests/test-pull-r.t +@@ -100,5 +100,4 @@ + This used to abort: received changelog group is empty: + + $ hg pull -qr 1 ../repo +- [1] + +diff --git a/tests/test-pull.t b/tests/test-pull.t +--- a/tests/test-pull.t ++++ b/tests/test-pull.t +@@ -48,7 +48,6 @@ + pulling from http://foo@localhost:$HGPORT/ + searching for changes + no changes found +- [1] + + $ hg rollback --dry-run --verbose + repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) +@@ -78,7 +77,6 @@ + [255] + + $ hg pull -q file:../test +- [1] + + It's tricky to make file:// URLs working on every platform with + regular shell commands. +@@ -90,4 +88,3 @@ + + $ URL=`python -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"` + $ hg pull -q "$URL" +- [1] +diff --git a/tests/test-ssh.t b/tests/test-ssh.t +--- a/tests/test-ssh.t ++++ b/tests/test-ssh.t +@@ -80,7 +80,6 @@ + pulling from ssh://user@dummy/remote + searching for changes + no changes found +- [1] + + local change + +@@ -199,7 +198,6 @@ + no changes found + updating bookmark foo + importing bookmark foo +- [1] + $ hg book -d foo + $ hg push -B foo + pushing to ssh://user@dummy/remote +diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t +--- a/tests/test-subrepo.t ++++ b/tests/test-subrepo.t +@@ -580,7 +580,6 @@ + cloning subrepo s from $TESTTMP/sub/repo/s (glob) + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg -q -R repo2 pull -u +- [1] + $ echo 1 > repo2/s/a + $ hg -R repo2/s ci -m2 + $ hg -q -R repo2/s push +@@ -639,7 +638,6 @@ + pulling from issue1852a + searching for changes + no changes found +- [1] + + Try the same, but with pull -u + +diff --git a/tests/test-treediscovery-legacy.t b/tests/test-treediscovery-legacy.t +--- a/tests/test-treediscovery-legacy.t ++++ b/tests/test-treediscovery-legacy.t +@@ -48,7 +48,6 @@ + $ hg pull -R empty1 $remote + pulling from http://localhost:$HGPORT/ + no changes found +- [1] + $ hg push -R empty1 $remote + pushing to http://localhost:$HGPORT/ + no changes found +@@ -108,7 +107,6 @@ + pulling from http://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ hg push $remote + pushing to http://localhost:$HGPORT/ + searching for changes +@@ -233,7 +231,6 @@ + pulling from http://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ hg push $remote + pushing to http://localhost:$HGPORT/ + searching for changes +@@ -278,7 +275,6 @@ + pulling from http://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ hg push $remote + pushing to http://localhost:$HGPORT/ + searching for changes +diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t +--- a/tests/test-treediscovery.t ++++ b/tests/test-treediscovery.t +@@ -42,7 +42,6 @@ + $ hg pull -R empty1 $remote + pulling from http://localhost:$HGPORT/ + no changes found +- [1] + $ hg push -R empty1 $remote + pushing to http://localhost:$HGPORT/ + no changes found +@@ -102,7 +101,6 @@ + pulling from http://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ hg push $remote + pushing to http://localhost:$HGPORT/ + searching for changes +@@ -221,7 +219,6 @@ + pulling from http://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ hg push $remote + pushing to http://localhost:$HGPORT/ + searching for changes +@@ -266,7 +263,6 @@ + pulling from http://localhost:$HGPORT/ + searching for changes + no changes found +- [1] + $ hg push $remote + pushing to http://localhost:$HGPORT/ + searching for changes +diff --git a/tests/test-url-rev.t b/tests/test-url-rev.t +--- a/tests/test-url-rev.t ++++ b/tests/test-url-rev.t +@@ -141,7 +141,6 @@ + No new revs, no update: + + $ hg pull -qu +- [1] + + $ hg parents -q + 0:1f0dee641bb7 + diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index cf6d15f75..1edfbdc3d 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 150713 2012-02-21 01:06:35Z bisson $ +# $Id: PKGBUILD 151695 2012-02-29 21:30:41Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=3 +pkgrel=5 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -22,8 +22,8 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' '4e324e625c1f080b5c028be5092aa71adbf9bd99' '01394b8a952f5edc85d19df8335eeac3980320f4' - 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e' - '6cfcb7bbd34499b30e31dffca2f3e1a036010271' + 'eb1f63814b9adbd3d518e880fa3b38c375f0fe91' + '4537d1f58b299d463db5048129cb264511474b0b' '4f76f7f9ffc8315ff9924f793f272d4f6939b816') install=install @@ -34,7 +34,7 @@ build() { ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ - --enable-linux-caps \ + --enable-linuxcaps \ make } @@ -45,7 +45,7 @@ package() { make DESTDIR="${pkgdir}" install rmdir "${pkgdir}"/usr/{lib,sbin} - install -d "${pkgdir}"/var/lib/ntp + install -d -o 87 "${pkgdir}"/var/lib/ntp install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf diff --git a/extra/ntp/install b/extra/ntp/install index 926b4126e..7581ec12f 100644 --- a/extra/ntp/install +++ b/extra/ntp/install @@ -1,3 +1,9 @@ +post_install() { + getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null + getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null + true +} + post_upgrade() { if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then cat <<EOF @@ -16,4 +22,13 @@ EOF EOF fi + if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then + post_install + fi +} + +post_remove() { + getent passwd ntp &>/dev/null && userdel ntp >/dev/null + getent group ntp &>/dev/null && groupdel ntp >/dev/null + true } diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf index 49b2f2bb7..a27b22820 100644 --- a/extra/ntp/ntp.conf +++ b/extra/ntp/ntp.conf @@ -5,13 +5,13 @@ # - http://support.ntp.org/bin/view/Support/GettingStarted # - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon -# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/ +# Associate to public NTP pool servers; see http://www.pool.ntp.org/ server 0.pool.ntp.org server 1.pool.ntp.org server 2.pool.ntp.org # Only allow read-only access from localhost -restrict default nomodify nopeer +restrict default noquery nopeer restrict 127.0.0.1 restrict ::1 diff --git a/extra/ntp/ntpd.conf b/extra/ntp/ntpd.conf index e728db579..047961fde 100644 --- a/extra/ntp/ntpd.conf +++ b/extra/ntp/ntpd.conf @@ -1,5 +1,5 @@ # client options for "ntpd -q" - ntpdate equivalent -NTP_CLIENT_OPTION="-g" +NTP_CLIENT_OPTION="-g -u ntp" # arguments passed to ntpd when started -NTPD_ARGS="-g" +NTPD_ARGS="-g -u ntp" diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index aeaa6d084..229843e81 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,43 +1,33 @@ -# $Id: PKGBUILD 150800 2012-02-22 17:25:13Z stephane $ +# $Id: PKGBUILD 151701 2012-03-01 00:42:34Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi pkgver=1.5.4 -pkgrel=4 +pkgrel=5 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org" license=('custom') -depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc') -[ "$CARCH" = "mips64el" ] && \ -depends=('gcc-fortran' 'openssh' 'libtool' 'hwloc') +depends=('gcc' 'gcc-fortran' 'openssh' 'libtool' 'hwloc') +[ "$CARCH" = "mips64el" ] || depends+=('valgrind') makedepends=('inetutils') options=(!libtool) -source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c') +source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2 + openmpi-1.5.4-fix-fakeroot-execution.patch) +sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c' + 'ec46abb6f9e01daca910e4079b9abc036db9ed20') build() { cd "${srcdir}/${pkgname}-${pkgver}" -# Disable valgrind if [ "$CARCH" = "mips64el" ]; then - ./configure --prefix=/usr \ - --sysconfdir=/etc/${pkgname} \ - --mandir=/usr/share/man \ - --enable-mpi-f90 \ - --libdir=/usr/lib/${pkgname} \ - --with-threads=posix \ - --enable-mpi-threads \ - --enable-smp-locks \ - --without-valgrind \ - --enable-memchecker \ - --enable-debug \ - --enable-pretty-print-stacktrace \ - --without-slurm \ - --with-hwloc=external \ - --with-libltdl=/usr \ - FC=/usr/bin/gfortran \ - LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" + valgrind="--without-valgrind" else + valgrind="--with-valgrind" + fi + + # Fix fakeroot problem (FS#28644) + patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch + ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ --mandir=/usr/share/man \ @@ -45,7 +35,7 @@ build() { --libdir=/usr/lib/${pkgname} \ --with-threads=posix \ --enable-smp-locks \ - --with-valgrind \ + $valgrind \ --enable-memchecker \ --enable-debug \ --enable-pretty-print-stacktrace \ @@ -54,7 +44,6 @@ build() { --with-libltdl=/usr \ FC=/usr/bin/gfortran \ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" - fi make } @@ -73,7 +62,7 @@ package() { mv "${pkgdir}"/usr/bin/otfinfo{,mpi} # Openmpi's otfdump conflicts with the one from libotf - mv "${pkgdir}"/usr/bin/otfdump{,ompi} + mv "${pkgdir}"/usr/bin/otfdump{,ompi} # Remove dangling symlink rm "${pkgdir}"/usr/share/man/man1/orteCC.1 diff --git a/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch b/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch new file mode 100644 index 000000000..dc9dcfeae --- /dev/null +++ b/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch @@ -0,0 +1,43 @@ +Description: If running under Debian fakeroot then its important + that this hook is disabled; a new stat check was introduced in + 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT. +Author: James Page <james.page@ubuntu.com> +Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489 + +Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c +=================================================================== +--- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c 2012-02-15 12:59:39.986314651 +0000 ++++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000 +@@ -738,15 +738,6 @@ + check_result_t r1, r2, lp, lpp; + bool want_rcache = false, found_driver = false; + +- /* First, check if ummunotify is present on the system. If it is, +- then we don't need to do the following ptmalloc2 hacks. +- open/mmap on the device may fail during init, but if /dev/ummunotify +- exists, we assume that the user/administrator *wants* to use +- ummunotify. */ +- if (stat("/dev/ummunotify", &st) == 0) { +- return; +- } +- + /* Yes, checking for an MPI MCA parameter here is an abstraction + violation. Cope. Yes, even checking for *any* MCA parameter + here (without going through the MCA param API) is an +@@ -769,6 +760,15 @@ + return; + } + ++ /* Next, check if ummunotify is present on the system. If it is, ++ then we don't need to do the following ptmalloc2 hacks. ++ open/mmap on the device may fail during init, but if /dev/ummunotify ++ exists, we assume that the user/administrator *wants* to use ++ ummunotify. */ ++ if (stat("/dev/ummunotify", &st) == 0) { ++ return; ++ } ++ + /* Look for sentinel files (directories) to see if various network + drivers are loaded (yes, I know, further abstraction + violations...). + diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 68fb9962e..1491eaf99 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148904 2012-02-05 11:55:04Z ibiru $ +# $Id: PKGBUILD 151653 2012-02-29 18:44:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.0 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -17,34 +17,36 @@ options=('!libtool') _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop' 'declarative-fix-sigbus.patch' - 'fix-qurl.patch') + 'qtconfig.desktop' + 'fix-qgraphicsscene-regression.patch' + 'improved-filter-event.patch' + 'qurl-backward-compatibility.patch' + 'declarative-fix-sigbus.patch') md5sums=('e8a5fdbeba2927c948d9f477a6abe904' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'aac963d05a9d5733e2bfce9e26607f51' - '7bc255a36733d0fbc80c1902ade4beca') + 'c2e91fc028250a590e76effe234468e2' + '444ebeb716d7c7379835efb8aa88e6c8' + '7bc255a36733d0fbc80c1902ade4beca' + 'aac963d05a9d5733e2bfce9e26607f51') build() { cd "${srcdir}"/${_pkgfqn} # MIPS N32-specific fix, shouldn't affect correctness on other platforms. patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch" - # (FS#27757) - patch -p1 -i "${srcdir}"/fix-qurl.patch + # (FS#28707) + patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch + # (FS#27757) (KDEBUG#275469) + patch -p1 -i "${srcdir}"/improved-filter-event.patch + patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - if [ "${CARCH}" = "mips64el" ] ; then - export CXXFLAGS="${CXXFLAGS} -fpermissive" - # Raster renders incorrectly. - graphicssystem="" - else - graphicssystem="-graphicssystem raster" - fi + [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive" sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf @@ -65,7 +67,7 @@ build() { -no-phonon \ -no-phonon-backend \ -no-webkit \ - $graphicssystem \ + -graphicssystem raster \ -openssl-linked \ -nomake demos \ -nomake examples \ diff --git a/extra/qt/fix-qgraphicsscene-regression.patch b/extra/qt/fix-qgraphicsscene-regression.patch new file mode 100644 index 000000000..0c0a28a61 --- /dev/null +++ b/extra/qt/fix-qgraphicsscene-regression.patch @@ -0,0 +1,55 @@ +From 15c14584199dc43e4a309fc331f3144009008128 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Fri, 24 Feb 2012 00:42:34 +1100 +Subject: [PATCH] Revert "Don't rely on mapFromGlobal in + QGraphicsScenePrivate::itemsAtPosition." + +This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e. +The commit caused a regression whereby tooltips may be shown even if the +mouse is not over the item if it has the Qt::ItemIgnoresTransformations +flag and the QGraphicsView had been scaled. + +Task-number: QTBUG-17517 +Task-number: QTBUG-22663 +Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2 +Reviewed-by: Andy Shaw <andy.shaw@digia.com> +Reviewed-by: Robin Burchell <robin+qt@viroteck.net> +--- + src/gui/graphicsview/qgraphicsscene.cpp | 10 +++++++--- + 1 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp +index 14c0f3c..d1cdd4f 100644 +--- a/src/gui/graphicsview/qgraphicsscene.cpp ++++ b/src/gui/graphicsview/qgraphicsscene.cpp +@@ -1084,7 +1084,7 @@ void QGraphicsScenePrivate::enableMouseTrackingOnViews() + /*! + Returns all items for the screen position in \a event. + */ +-QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*screenPos*/, ++QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &screenPos, + const QPointF &scenePos, + QWidget *widget) const + { +@@ -1093,12 +1093,16 @@ QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*sc + if (!view) + return q->items(scenePos, Qt::IntersectsItemShape, Qt::DescendingOrder, QTransform()); + +- const QRectF pointRect(scenePos, QSizeF(1, 1)); ++ const QRectF pointRect(QPointF(widget->mapFromGlobal(screenPos)), QSizeF(1, 1)); + if (!view->isTransformed()) + return q->items(pointRect, Qt::IntersectsItemShape, Qt::DescendingOrder); + + const QTransform viewTransform = view->viewportTransform(); +- return q->items(pointRect, Qt::IntersectsItemShape, ++ if (viewTransform.type() <= QTransform::TxScale) { ++ return q->items(viewTransform.inverted().mapRect(pointRect), Qt::IntersectsItemShape, ++ Qt::DescendingOrder, viewTransform); ++ } ++ return q->items(viewTransform.inverted().map(pointRect), Qt::IntersectsItemShape, + Qt::DescendingOrder, viewTransform); + } + +-- +1.7.6 + diff --git a/extra/qt/improved-filter-event.patch b/extra/qt/improved-filter-event.patch new file mode 100644 index 000000000..b03cdbe94 --- /dev/null +++ b/extra/qt/improved-filter-event.patch @@ -0,0 +1,98 @@ +--- qt-opensource-4.8.0.old/src/gui/kernel/qapplication_x11.cpp 2011-12-16 03:22:33.918428374 -0500 ++++ qt-opensource-4.8.0.new/src/gui/kernel/qapplication_x11.cpp 2012-01-07 18:18:40.258246384 -0500 +@@ -4244,7 +4205,12 @@ bool QETWidget::translateMouseEvent(cons + && (nextEvent.xclient.message_type == ATOM(_QT_SCROLL_DONE) || + (nextEvent.xclient.message_type == ATOM(WM_PROTOCOLS) && + (Atom)nextEvent.xclient.data.l[0] == ATOM(_NET_WM_SYNC_REQUEST))))) { +- qApp->x11ProcessEvent(&nextEvent); ++ // As we may run through a significant number of a large class of non-MotionNotify ++ // events here, without returning to the event loop, first pass nextEvent to ++ // QAbstractEventDispatcher::filterEvent() to allow applications which override ++ // QAbstractEventDispatcher::filterEvent() to handle the event first. ++ if (!QAbstractEventDispatcher::instance()->filterEvent(&nextEvent)) ++ qApp->x11ProcessEvent(&nextEvent); + continue; + } else if (nextEvent.type != MotionNotify || + nextEvent.xmotion.window != event->xmotion.window || +--- qt-opensource-4.8.0.old/src/gui/kernel/qclipboard_x11.cpp 2011-12-08 00:06:02.000000000 -0500 ++++ qt-opensource-4.8.0.new/src/gui/kernel/qclipboard_x11.cpp 2012-01-07 18:30:35.298287639 -0500 +@@ -573,7 +573,11 @@ bool QX11Data::clipboardWaitForEvent(Win + + // process other clipboard events, since someone is probably requesting data from us + XEvent e; +- if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0)) ++ // Some applications may override QAbstractEventDispatcher::filterEvent(), so ++ // pass event to QAbstractEventDispatcher::filterEvent() before processing in ++ // x11ProcessEvent(). ++ if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0) && ++ !QAbstractEventDispatcher::instance()->filterEvent(&e)) + qApp->x11ProcessEvent(&e); + + now.start(); +--- qt-opensource-4.8.0.old/src/gui/kernel/qdnd_x11.cpp 2011-12-08 00:06:02.000000000 -0500 ++++ qt-opensource-4.8.0.new/src/gui/kernel/qdnd_x11.cpp 2012-01-07 18:28:13.841279478 -0500 +@@ -42,6 +42,7 @@ + #include "qplatformdefs.h" + + #include "qapplication.h" ++#include "qabstracteventdispatcher.h" + + #ifndef QT_NO_DRAGANDDROP + +@@ -1941,7 +1942,11 @@ Qt::DropAction QDragManager::drag(QDrag + timer.start(); + do { + XEvent event; +- if (XCheckTypedEvent(X11->display, ClientMessage, &event)) ++ // Some applications may override QAbstractEventDispatcher::filterEvent(), so ++ // pass event to QAbstractEventDispatcher::filterEvent() before processing in ++ // x11ProcessEvent(). ++ if (XCheckTypedEvent(X11->display, ClientMessage, &event) && ++ !QAbstractEventDispatcher::instance()->filterEvent(&event)) + qApp->x11ProcessEvent(&event); + + // sleep 50 ms, so we don't use up CPU cycles all the time. +--- qt-opensource-4.8.0.old/src/gui/kernel/qwidget_x11.cpp 2011-12-08 00:06:02.000000000 -0500 ++++ qt-opensource-4.8.0.new/src/gui/kernel/qwidget_x11.cpp 2012-01-07 18:29:26.286283657 -0500 +@@ -44,6 +44,7 @@ + #include "qdesktopwidget.h" + #include "qapplication.h" + #include "qapplication_p.h" ++#include "qabstracteventdispatcher.h" + #include "qnamespace.h" + #include "qpainter.h" + #include "qbitmap.h" +@@ -376,17 +377,22 @@ void qt_x11_wait_for_window_manager(QWid + do { + if (XEventsQueued(X11->display, QueuedAlready)) { + XNextEvent(X11->display, &ev); +- qApp->x11ProcessEvent(&ev); +- +- switch (state) { +- case Initial: +- if (ev.type == MapNotify && ev.xany.window == winid) +- state = Mapped; +- break; +- case Mapped: +- if (ev.type == Expose && ev.xany.window == winid) +- return; +- break; ++ // Some applications may override QAbstractEventDispatcher::filterEvent(), so ++ // pass event to QAbstractEventDispatcher::filterEvent() before processing in ++ // x11ProcessEvent(). ++ if (!QAbstractEventDispatcher::instance()->filterEvent(&ev)) { ++ qApp->x11ProcessEvent(&ev); ++ ++ switch (state) { ++ case Initial: ++ if (ev.type == MapNotify && ev.xany.window == winid) ++ state = Mapped; ++ break; ++ case Mapped: ++ if (ev.type == Expose && ev.xany.window == winid) ++ return; ++ break; ++ } + } + } else { + if (!XEventsQueued(X11->display, QueuedAfterFlush)) diff --git a/extra/qt/qurl-backward-compatibility.patch b/extra/qt/qurl-backward-compatibility.patch new file mode 100644 index 000000000..1c666dba4 --- /dev/null +++ b/extra/qt/qurl-backward-compatibility.patch @@ -0,0 +1,13 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp +--- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile 2011-10-03 22:44:32.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp 2011-10-27 12:58:35.706815049 -0500 +@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString & + QString QUrl::toLocalFile() const + { + // the call to isLocalFile() also ensures that we're parsed +- if (!isLocalFile()) ++ // Treat URLs with no scheme as local for backward compatibility ++ if (!isLocalFile() && (!d || !d->scheme.isEmpty())) + return QString(); + + QString tmp; diff --git a/extra/sdl_ttf/PKGBUILD b/extra/sdl_ttf/PKGBUILD index 5e325a316..7b9d66097 100644 --- a/extra/sdl_ttf/PKGBUILD +++ b/extra/sdl_ttf/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 146690 2012-01-16 11:37:07Z heftig $ +# $Id: PKGBUILD 151697 2012-02-29 21:54:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_ttf pkgver=2.0.11 -pkgrel=1 +pkgrel=2 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.libsdl.org/projects/SDL_ttf/" depends=('sdl>=1.2.12' 'freetype2') options=('!libtool') -source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz) -md5sums=('61e29bd9da8d245bc2471d1b2ce591aa') +source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz + bug1433.patch) +md5sums=('61e29bd9da8d245bc2471d1b2ce591aa' + 'f847697e18eec539aaf3ffb96996abbf') build() { cd "$srcdir/SDL_ttf-$pkgver" + + # Fix FS#28674 + patch -Ni "$srcdir/bug1433.patch" + ./configure --prefix=/usr --disable-static make } diff --git a/extra/sdl_ttf/bug1433.patch b/extra/sdl_ttf/bug1433.patch new file mode 100644 index 000000000..b402fb3e9 --- /dev/null +++ b/extra/sdl_ttf/bug1433.patch @@ -0,0 +1,11 @@ +--- SDL_ttf.c.orig 2012-02-12 16:36:41.859977617 +0100
++++ SDL_ttf.c 2012-02-12 16:36:53.696580159 +0100
+@@ -1747,7 +1747,7 @@
+ /* Copy the character from the pixmap */
+ src = glyph->pixmap.buffer;
+ dst = (Uint8*) textbuf->pixels;
+- for ( row = 0; row < glyph->bitmap.rows; ++row ) {
++ for ( row = 0; row < glyph->pixmap.rows; ++row ) {
+ memcpy( dst, src, glyph->pixmap.width );
+ src += glyph->pixmap.pitch;
+ dst += textbuf->pitch;
\ No newline at end of file diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 3573da9ec..cfc17bbf9 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 151381 2012-02-25 21:27:16Z andrea $ +# $Id: PKGBUILD 151614 2012-02-28 09:40:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') pkgver=1.3.8 -pkgrel=2 +pkgrel=3 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') @@ -33,7 +33,7 @@ build() { package_system-config-printer-common() { pkgdesc='Pygtk CUPS Configuration' - depends=('udev' 'pycups' 'dbus-python' 'pysmbc') + depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl') optdepends=('system-config-printer-gnome: for the GTK frontend' 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') replaces=('system-config-printer') @@ -78,7 +78,7 @@ package_system-config-printer-common() { package_system-config-printer-gnome() { pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend' - depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify' 'python-pycurl') + depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') optdependence=('gnome-keyring: password management') cd "${srcdir}"/${pkgbase}-${pkgver} diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index c84aa9217..b9572d2ad 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -10,7 +10,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers' 'linux-libre-xen-docs') # B # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" @@ -26,16 +26,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'i915-gpu-finish.patch') + 'i915-gpu-finish.patch' + 'ext4-options.patch') md5sums=('27c641c4f6785fc647cdd3e44963a55c' - '37a0fdc7ad19c9489faf09925b4fae5b' - 'a56e949b6c872d0d40ee3fd6969e0352' - '6685fcb15d021dff6e02667c60113577' + 'a97a83d5b003b3c9d87250e4eace45ce' + '1149b265c194f243c9249372602f0ac8' + 'e3a0f760de97df1f8852893507a0eef4' '67463f7a6e88305d7cd14a430e9efe92' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '4cd79aa147825837dc8bc9f6b736c0a0') + '4cd79aa147825837dc8bc9f6b736c0a0' + 'c8299cf750a84e12d60b372c8ca7e1e8') build() { cd "${srcdir}/linux-${_basekernel}" @@ -63,6 +65,10 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix ext4 module to mount ext3/2 correct + # https://bugs.archlinux.org/task/28653 + patch -Np1 -i "${srcdir}/ext4-options.patch" + cat "${srcdir}/config.${CARCH}" > ./.config # simpler if [ "${_kernelname}" != "" ]; then diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 index 0e11985ee..b2a825481 100644 --- a/kernels/linux-libre-xen/config.i686 +++ b/kernels/linux-libre-xen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.2.7-libre Kernel Configuration +# Linux/i386 3.2.8-libre Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/kernels/linux-libre-xen/config.x86_64 b/kernels/linux-libre-xen/config.x86_64 index 7bc5bd2e7..2899a7467 100644 --- a/kernels/linux-libre-xen/config.x86_64 +++ b/kernels/linux-libre-xen/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.2.7-libre Kernel Configuration +# Linux/x86_64 3.2.8-libre Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff --git a/kernels/linux-libre-xen/ext4-options.patch b/kernels/linux-libre-xen/ext4-options.patch new file mode 100644 index 000000000..812b05f04 --- /dev/null +++ b/kernels/linux-libre-xen/ext4-options.patch @@ -0,0 +1,49 @@ +Report: https://bbs.archlinux.org/profile.php?id=33804 +Signed-off-by: Tom Gundersen <teg@jklm.no> +Cc: Thomas Baechler <thomas@archlinux.org> +Cc: Tobias Powalowski <tobias.powalowski@googlemail.com> +Cc: Dave Reisner <d@falconindy.com> +--- + fs/ext4/super.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 502c61f..30de9cd 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1333,6 +1333,7 @@ enum { + Opt_inode_readahead_blks, Opt_journal_ioprio, + Opt_dioread_nolock, Opt_dioread_lock, + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, ++ Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum, + }; + + static const match_table_t tokens = { +@@ -1408,6 +1409,10 @@ static const match_table_t tokens = { + {Opt_init_itable, "init_itable=%u"}, + {Opt_init_itable, "init_itable"}, + {Opt_noinit_itable, "noinit_itable"}, ++ {Opt_nocheck, "nocheck"}, ++ {Opt_reservation, "reservation"}, ++ {Opt_noreservation, "noreservation"}, ++ {Opt_journal_inum, "journal=%u"}, + {Opt_err, NULL}, + }; + +@@ -1904,6 +1909,16 @@ set_qf_format: + case Opt_noinit_itable: + clear_opt(sb, INIT_INODE_TABLE); + break; ++#ifdef CONFIG_EXT4_USE_FOR_EXT23 ++ case Opt_nocheck: ++ case Opt_reservation: ++ case Opt_noreservation: ++ case Opt_journal_inum: ++ ext4_msg(sb, KERN_WARNING, ++ "ext3 mount option \"%s\" ignored " ++ "by ext4 module", p); ++ break; ++#endif + default: + ext4_msg(sb, KERN_ERR, + "Unrecognized mount option \"%s\" "
\ No newline at end of file diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 16b877724..b73d4aa77 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.2.7-1-LIBRE-XEN +KERNEL_VERSION=3.2.8-1-LIBRE-XEN post_install () { # updating module dependencies diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 970d0bcf9..b88777207 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,136 +1,152 @@ -# Maintainer: Figue <ffigue at gmail> +# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> +# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> # Contributor (Parabola): emulatorman <andre.paulista@adinet.com.uy> +# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> -# Changelog -# =6.0 -# * Build with PGO support -# =3.6.13 -# * Installed Privacy Extension by default -# * DDG is now the default search engine -# =3.6.9 -# * Added libnotify as required by configure -# =3.6.7 -# * Added duckduckgo.com secure search engine -# =3.6.4 -# * Disabled SafeBrowsing until we find a non-google alternative (25/6/10) -# * Disabled ContentHandlers and other Google/Yahoo! related services - -pkgname=icecat +# If you are updating this package, don't forget to update the version number in +# the value for 'browser.dictionaries.download.url' in 'libre.patch' + +_pgo=false + +_pkgname=icecat pkgver=10.0 pkgrel=1 -pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" + +if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi +if $_pgo; then + pkgname+='-pgo' +fi + +pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') -license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite3' 'libnotify' 'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme') -makedepends=('p7zip-libre' 'zip' 'unzip-libre' 'pkg-config' 'diffutils' 'python2-libre' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb') -options=(!buildflags !distcc) +license=('GPL2' 'MPL' 'LGPL') +depends=( + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' + 'nss>=3.13.1' + 'sqlite3' + 'startup-notification' +) +makedepends=( + 'autoconf2.13' + 'diffutils' + 'libidl2' + 'mesa' + 'pkg-config' + 'python2' + 'unzip' + 'wireless_tools' + 'yasm' + 'zip' +) +if $_pgo; then + makedepends+=('xorg-server-xvfb') + options=(!ccache) +fi + url="http://www.gnu.org/software/gnuzilla/" install=icecat.install source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig + mozconfig.pgo icecat.desktop icecat-safe.desktop - mozilla-firefox-1.0-lang.patch - firefox-version.patch - libvpx.patch -# Search engines - internet-archive.xml - jamendo-en.xml - logless-search.xml - scroogle-ssl-english.xml - yacy.xml - duck-duck-go-ssl.xml - duck-duck-go-lite.xml - Makefile.in -# Default options - firefox.js - region.properties) -md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' - '927c3ac9ad0ba682e0ec9b66ed8cc4d3' - 'e81ad01dbc16ba28bf92ba4b7c309ca7' - 'd93fe402b87cd000a869e1fd6badc6c9' - 'bd5db57c23c72a02a489592644f18995' - 'ff4654144499faf630271cddc2261b7c' - 'e5d6c83b98d2d2ac69ff4d277702ff55' - '462c68585461f8cdc23c93c46f6ee4cf' - '2d492295c4308f9bba9ece28d8b3af2d' - '937ac0e5392b060d93bd33e761fbfa51' - 'cf97082e77e3ef5f1bd74b1db9329965' - '24528ca3f7f1e1a0ba735231aa3ac1de' - 'c5f00b6b24222aacd5a749d1f59c4d24' - 'e1bda0854de7d764f7401c81bb82b5ef' - 'ff83f1796ee13d3aec494649491d93cc' - '9952048383966926eea6d67384102425' - 'f1c76e7e244257856a386ca2de69bdf0') + libre.patch + firefox-install-dir.patch + vendor.js + libvpx.patch) -build() { - ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR +if [ "$_pkgname" != "$pkgname" ]; then + provides+=("$_pkgname") + conflicts+=("$_pkgname") +fi - cd "${srcdir}/${pkgname}-${pkgver}/" - patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" - patch -Np1 -i "${srcdir}/libvpx.patch" - -# Solve missing reporter locales and preprocessor.pl - cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ +build() { + mv "$_pkgname-$pkgver" "$srcdir/mozilla-build" + cd "$srcdir/mozilla-build" -# Default prefs, remove Google stuff - cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ - cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/ + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname + patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff + patch -Np1 -i "$srcdir/libvpx.patch" # patch from Arch - cp "$srcdir/mozconfig" .mozconfig - patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" - patch -Np1 -i "$srcdir/firefox-version.patch" + if $_pgo; then + cat "$srcdir/mozconfig.pgo" >> .mozconfig + fi [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ - browser/base/Makefile.in + browser/base/Makefile.in - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-7.0" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & - LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" - kill $! || true + if $_pgo; then + LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" + kill $! || true + else + LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" + fi } package() { - ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR - - cd "${srcdir}/${pkgname}-${pkgver}/" + cd "$srcdir/mozilla-build" make -j1 -f client.mk DESTDIR="$pkgdir" install - msg2 "Finishing..." - install -m755 -d ${pkgdir}/usr/share/applications - install -m755 -d ${pkgdir}/usr/share/pixmaps - install -m644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png - install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/ - install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/ + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" + + brandingdir="browser/branding/unofficial" + icondir="$pkgdir/usr/share/icons/hicolor" + for i in 16x16 32x32 48x48; do + install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" + done - cd ${pkgdir}/usr/lib - ln -s ${ICECATDIR} icecat + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/icecat.desktop" "$pkgdir/usr/share/applications" + install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications" - rm -rf "$pkgdir"/usr/lib/icecat-7.0/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/icecat-7.0/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/icecat-7.0/hyphenation" + rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" + ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" + ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl} + rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} - #workaround for now - #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf /usr/lib/icecat-7.0/icecat-bin "$pkgdir/usr/lib/icecat-7.0/icecat" + # Fix a bug with https-everywhere (duplicate rules) + rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD" - msg2 "Removing proprietary and anti-privacy search engines" - rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml - msg2 "And provide better ones..." - install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/ - install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/ + # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" } + +md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' + '6f3a8fd65c416216a1b56b0c2d2d81aa' + 'ac29b01c189f20abae2f3eef1618ffc0' + 'e81ad01dbc16ba28bf92ba4b7c309ca7' + 'd93fe402b87cd000a869e1fd6badc6c9' + '145f453ef82f643711c10d97ec57a805' + '1e4bcac59e93d21fffa6a1d1ad235247' + 'c382e35315047e4ca368d09383b39b8d' + '5d418ecdbdb9f40597df6b978b0b5ee5') diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch new file mode 100644 index 000000000..b6f9700b3 --- /dev/null +++ b/libre/icecat/firefox-install-dir.patch @@ -0,0 +1,28 @@ +diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in +--- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000 ++++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000 +@@ -68,8 +68,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ +diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in +--- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000 ++++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000 +@@ -61,8 +61,8 @@ + datadir = @datadir@ + mandir = @mandir@ + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + TOP_DIST = @TOP_DIST@ + ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch index ab5dda540..8b2d74896 100644 --- a/libre/icecat/firefox-version.patch +++ b/libre/icecat/firefox-version.patch @@ -5,7 +5,7 @@ diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/bro include $(DEPTH)/config/autoconf.mk -+MOZ_APP_VERSION="7.0" ++MOZ_APP_VERSION="10.0" + include $(topsrcdir)/config/rules.mk diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch new file mode 100644 index 000000000..3dca93ee7 --- /dev/null +++ b/libre/icecat/libre.patch @@ -0,0 +1,66 @@ +--- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-26 23:11:39.000000000 -0500 ++++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-26 23:12:15.000000000 -0500 +@@ -74,7 +76,7 @@ + pref("extensions.update.autoUpdateDefault", true); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/10.0/"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -876,7 +878,7 @@ + pref("browser.bookmarks.editDialog.firstEditField", "namePicker"); + + // base url for the wifi geolocation network provider +-pref("geo.wifi.uri", "https://www.google.com/loc/json"); ++pref("geo.wifi.uri", "http://geomena.org"); + pref("geo.wifi.protocol", 0); + + // Whether to use a panel that looks like an OS X sheet for customization +--- icecat-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 07:34:23.000000000 -0500 ++++ icecat-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 19:59:04.000000000 -0500 +@@ -1,27 +1,19 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=Duck Duck Go (SSL) + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google +-browser.search.order.2=Yahoo ++browser.search.order.1=Duck Duck Go (SSL) ++browser.search.order.2=Duck Duck Go (Lite) + +-# This is the default set of web based feed handlers shown in the reader +-# selection UI +-browser.contentHandlers.types.0.title=Bloglines +-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s +-browser.contentHandlers.types.1.title=My Yahoo +-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +-browser.contentHandlers.types.2.title=Google +-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s + + # Keyword URL (for location bar searches) +-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= ++keyword.URL=https://duckduckgo.com/?q= + + # URL for site-specific search engines + # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site + # to be searched and the user's search query. Place them in the appropriate location + # for your locale's URL but do not translate them. +-browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms} + + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +--- icecat-9.0.1.orig/browser/app/Makefile.in 2011-12-27 00:22:26.000000000 -0500 ++++ icecat-9.0.1/browser/app/Makefile.in 2011-12-27 00:23:10.000000000 -0500 +@@ -269,7 +269,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX) + endif + endif + diff --git a/libre/icecat/libvpx.patch b/libre/icecat/libvpx.patch index 48b71c077..f883b8e08 100644 --- a/libre/icecat/libvpx.patch +++ b/libre/icecat/libvpx.patch @@ -1,5 +1,6 @@ ---- icecat-10.0/configure.in.orig 2012-02-28 13:42:56.601961717 -0200 -+++ icecat-10.0/configure.in 2012-02-28 13:45:39.311963210 -0200 +diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in +--- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000 ++++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000 @@ -5629,7 +5629,7 @@ dnl v0.9.6 one to check for. AC_TRY_COMPILE([ diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index a5810e33a..b769079d8 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -1,8 +1,9 @@ . $topsrcdir/browser/config/mozconfig -ac_add_options --disable-official-branding ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib + +# System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-jpeg @@ -13,53 +14,41 @@ ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman ac_add_options --with-pthreads -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --disable-safe-browsing -ac_add_options --enable-extensions=default +# Features ac_add_options --enable-startup-notification -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-smil -ac_add_options --enable-canvas3d -ac_add_options --enable-places -ac_add_options --enable-url-classifier - -ac_add_options --enable-optimize -ac_add_options --enable-strip -ac_add_options --enable-install-strip -ac_add_options --enable-jemalloc -ac_add_options --enable-xterm-updates -ac_add_options --enable-printing -ac_add_options --enable-xinerama -ac_add_options --with-distribution-id=org.gnu.gnuzilla -ac_add_options --with-user-appdir=.gnuzilla -ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --enable-gio -ac_add_options --disable-javaxpcom +ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests ac_add_options --disable-mochitest -ac_add_options --disable-debug ac_add_options --disable-installer -ac_add_options --disable-pedantic -ac_add_options --disable-static -ac_add_options --enable-gio -ac_add_options --disable-gnomevfs -ac_add_options --enable-libnotify +# Optimization +ac_add_options --enable-optimize -export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir + +# IceCat +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Parabola +ac_add_options --disable-safe-browsing +export BUILD_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 -# PGO -ac_add_options --enable-profile-guided-optimization -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' -mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' +# Build-generated diff --git a/libre/icecat/mozconfig.default b/libre/icecat/mozconfig.default new file mode 100644 index 000000000..01e047fc3 --- /dev/null +++ b/libre/icecat/mozconfig.default @@ -0,0 +1,63 @@ +# This is a better commented version of the default .mozconfig from 9.0.1 +ac_add_options --enable-application=browser + +ac_add_options --prefix=/usr/local +#ac_add_options --with-default-mozilla-five-home=/usr/local/lib + +# System libraries +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +#ac_add_options --with-system-png +ac_add_options --disable-system-cairo +#ac_add_options --with-pthreads + +ac_add_options --disable-toolkit-qt +ac_add_options --enable-toolkit-cairo-gtk2 +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-svg-renderer=cairo + +# Features +ac_add_options --enable-extensions="default spellcheck" +ac_add_options --enable-freetype2 +ac_add_options --enable-pango +ac_add_options --enable-crypto +#ac_add_options --enable-postscript +ac_add_options --enable-svg +ac_add_options --enable-xft + +ac_add_options --disable-chatzilla +ac_add_options --disable-accessibility +ac_add_options --disable-calendar +ac_add_options --disable-composer + +#ac_add_options --disable-jsd +#ac_add_options --disable-libxul +ac_add_options --disable-ipc +ac_add_options --disable-ldap +ac_add_options --disable-mailnews +ac_add_options --disable-negotiateauth +ac_add_options --disable-profilesharing +ac_add_options --disable-xinerama +ac_add_options --disable-xprint + +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +ac_add_options --disable-debug + +# Optimization +ac_add_options --disable-elf-dynstr-gc +ac_add_options --enable-optimize="-pipe -O3" +ac_add_options --enable-strip + +# IceCat +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla diff --git a/libre/icecat/mozconfig.firefox b/libre/icecat/mozconfig.firefox new file mode 100644 index 000000000..428503642 --- /dev/null +++ b/libre/icecat/mozconfig.firefox @@ -0,0 +1,46 @@ +# This is the .mozconfig used by Arch for Firefox +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 diff --git a/libre/icecat/mozconfig.old b/libre/icecat/mozconfig.old new file mode 100644 index 000000000..a790aee48 --- /dev/null +++ b/libre/icecat/mozconfig.old @@ -0,0 +1,78 @@ +# This is a better commented version of the .mozconfig used by the Parabola +# package < v9 +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-cairo +ac_add_options --with-pthreads + +ac_add_options --enable-default-toolkit=cairo-gtk2 + +# Features +ac_add_options --enable-extensions=default + +ac_add_options --enable-url-classifier +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --enable-canvas +ac_add_options --enable-canvas3d +ac_add_options --enable-places +ac_add_options --enable-smil +ac_add_options --enable-svg + +ac_add_options --disable-javaxpcom +ac_add_options --enable-libnotify +ac_add_options --enable-printing +ac_add_options --enable-xinerama +ac_add_options --enable-xterm-updates + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-update +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +ac_add_options --disable-debug + +# Optimization +ac_add_options --disable-pedantic +ac_add_options --disable-static +ac_add_options --enable-install-strip +ac_add_options --enable-jemalloc +ac_add_options --enable-optimize +ac_add_options --enable-strip + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# IceCat +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Parabola +ac_add_options --disable-safe-browsing +export BUILD_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo new file mode 100644 index 000000000..b0c249ebf --- /dev/null +++ b/libre/icecat/mozconfig.pgo @@ -0,0 +1,4 @@ +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js new file mode 100644 index 000000000..808d1b118 --- /dev/null +++ b/libre/icecat/vendor.js @@ -0,0 +1,5 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); diff --git a/multilib-testing/lib32-util-linux/PKGBUILD b/multilib-testing/lib32-util-linux/PKGBUILD deleted file mode 100644 index aeb1cbc80..000000000 --- a/multilib-testing/lib32-util-linux/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 66417 2012-02-24 16:16:14Z dreisner $ -# Maintainer: judd <jvinet@zeroflux.org> - -_pkgbasename=util-linux -pkgname=lib32-$_pkgbasename -pkgver=2.21 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux (32-bit)" -url='http://www.kernel.org/pub/linux/utils/util-linux/' -arch=('x86_64') -depends=('lib32-glibc' "$_pkgbasename") -makedepends=('gcc-multilib') -provides=('lib32-util-linux-ng') -conflicts=('lib32-util-linux-ng') -replaces=('lib32-util-linux-ng') -license=('GPL2') -options=('!libtool' '!emptydirs') -source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-$pkgver.tar.xz") -md5sums=('208aa058f4117759d2939d1be7d662fc') - -shopt -s extglob - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./autogen.sh - ./configure --without-ncurses --libdir=/usr/lib32 - - for lib in lib{mount,blkid,uuid}; do - make -C "$lib" - done -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - - make DESTDIR="$pkgdir" install - - # remove everything but libs - rm -rf "$pkgdir"/!(usr) "$pkgdir"/usr/!(lib32) -} diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD deleted file mode 100644 index 3cb3e08fc..000000000 --- a/staging/akonadi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 151576 2012-02-27 18:21:15Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=akonadi -pkgver=1.7.0 -pkgrel=2 -pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" -arch=('i686' 'x86_64') -url='http://pim.kde.org/akonadi' -license=('LGPL') -depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') -install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('804309dca70ede35b4a654ab764e9079') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/staging/akonadi/akonadi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/alex/PKGBUILD b/staging/alex/PKGBUILD deleted file mode 100644 index cc609e757..000000000 --- a/staging/alex/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 151489 2012-02-26 17:23:04Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Philip Nilsson <pnilsson@nullref.se> - -pkgname=alex -pkgver=3.0.1 -pkgrel=1 -pkgdesc='a lexical analyser generator for Haskell' -arch=('i686' 'x86_64') -url='http://www.haskell.org/alex/' -license=('custom:BSD3') -depends=('gmp') -makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1') -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -md5sums=('5dec239c89165d159faa2154bc0724cd') - -build() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname - runghc Setup.lhs build -} - -package() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs copy --destdir=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 - - # doc/ contains only license which already installed into proper place - rm -rf $pkgdir/usr/share/doc -} diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD deleted file mode 100644 index b7a8d537e..000000000 --- a/staging/avogadro/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 151591 2012-02-27 18:55:34Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Nick B <Shirakawasuna at gmail _dot_com> - -pkgname=avogadro -pkgver=1.0.3 -pkgrel=5 -pkgdesc="An advanced molecular editor based on Qt" -arch=('i686' 'x86_64') -url="http://avogadro.openmolecules.net/wiki/Main_Page" -license=('GPL2') -depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost') -install=avogadro.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'replace-qt4_automoc-with-qt4_wrap_cpp.patch' - 'fix-boost.patch' - 'fix-opengl-headers.patch') -md5sums=('92c2702c1980f70fb6d87a1a58147911' - 'aec516daab066c15326a9681f8f15abc' - '46282e4709429447e44a0a54d51ad2ec' - 'f420bfd22e3d5d8fcddc625cf5e711f6') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch - patch -p1 -i "${srcdir}"/fix-boost.patch - patch -p1 -i "${srcdir}"/fix-opengl-headers.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DQT_MKSPECS_RELATIVE=share/qt/mkspecs - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/avogadro/avogadro.install b/staging/avogadro/avogadro.install deleted file mode 100644 index 2eaa60550..000000000 --- a/staging/avogadro/avogadro.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/avogadro/fix-boost.patch b/staging/avogadro/fix-boost.patch deleted file mode 100644 index 8fb53ef12..000000000 --- a/staging/avogadro/fix-boost.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~ 2011-11-29 18:33:01.777291627 +0000 -+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-11-29 18:33:23.480814612 +0000 -@@ -149,7 +149,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~ 2011-11-29 18:37:15.449506548 +0000 -+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:37:52.729831744 +0000 -@@ -11,7 +11,7 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --QT4_WRAP_CPP(MOC_SRCS moleculelist.h) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) ---- avogadro-1.0.3/libavogadro/CMakeLists.txt~ 2011-11-29 19:41:34.066938217 +0000 -+++ avogadro-1.0.3/libavogadro/CMakeLists.txt 2011-11-29 19:42:53.084320315 +0000 -@@ -18,7 +18,7 @@ - # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp - # We should probably scan the header to verify the Q_OBJECT macro is used - string(REPLACE ".cpp" ".h" hdr_list "${src_list}") -- qt4_wrap_cpp(moc_files ${hdr_list}) -+ qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - # Now sort out the ui and qrc files, process them as appropriate - set(ui_plugin_files) - set(qrc_plugin_files) diff --git a/staging/avogadro/fix-opengl-headers.patch b/staging/avogadro/fix-opengl-headers.patch deleted file mode 100644 index e6e8bc3b5..000000000 --- a/staging/avogadro/fix-opengl-headers.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/camera.cpp~ 2012-02-27 18:35:52.109999585 +0000 -+++ avogadro-1.0.3/libavogadro/src/camera.cpp 2012-02-27 18:36:27.103053453 +0000 -@@ -25,6 +25,8 @@ - #include "camera.h" - #include "glwidget.h" - #include <avogadro/molecule.h> -+#include <Eigen/LU> -+#include <GL/glu.h> - - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~ 2012-02-27 18:37:28.535894209 +0000 -+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp 2012-02-27 18:37:46.912413557 +0000 -@@ -42,6 +42,7 @@ - #include <QColor> - #include <QVarLengthArray> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~ 2012-02-27 18:37:55.099014598 +0000 -+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp 2012-02-27 18:38:30.805395066 +0000 -@@ -70,6 +70,8 @@ - - #include <openbabel/mol.h> - -+#include <GL/glu.h> -+ - using namespace OpenBabel; - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~ 2012-02-27 18:36:53.646173944 +0000 -+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp 2012-02-27 18:37:10.739370227 +0000 -@@ -36,6 +36,7 @@ - #include <QFile> - #include <QDebug> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~ 2012-02-27 18:38:47.491928000 +0000 -+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp 2012-02-27 18:39:05.735115136 +0000 -@@ -44,6 +44,8 @@ - #include <QComboBox> - #include <QDebug> - -+#include <GL/glu.h> -+ - using namespace std; - using namespace OpenBabel; - using namespace Eigen; diff --git a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch deleted file mode 100644 index 11f58a505..000000000 --- a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch +++ /dev/null @@ -1,778 +0,0 @@ -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt 2011-11-29 18:49:58.520790652 +0100 -@@ -75,6 +75,42 @@ - zmatrix.h - ) - -+SET(libavogadro_MOC_HDRS -+ animation.h -+ atom.h -+ bond.h -+ color.h -+ colorbutton.h -+ colors/elementcolor.h -+ cube.h -+ elementdetail_p.h -+ elementtranslator.h -+ engine.h -+ engines/bsdyengine.h -+ extension.h -+ fragment.h -+ glwidget.h -+ mesh.h -+ molecule.h -+ moleculefile.h -+ moleculefile_p.h -+ periodictablescene_p.h -+ periodictableview.h -+ plotwidget.h -+ plugin.h -+ pluginmanager.h -+ primitive.h -+ protein.h -+ pythonengine_p.h -+ pythonerror.h -+ pythonextension_p.h -+ pythontool_p.h -+ residue.h -+ tool.h -+ toolgroup.h -+ zmatrix.h -+) -+ - set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS}) - # Also add in the qtiocompressor class - #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp) -@@ -113,7 +148,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --qt4_automoc(${libavogadro_SRCS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) -@@ -149,7 +184,7 @@ - COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}") - endforeach(headerFile ${libavogadro_HDRS}) - --add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) -+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) - set_target_properties(avogadro - PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 ) - target_link_libraries(avogadro ${AVO_LINK_LIBRARIES}) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp ---- avogadro-1.0.3/libavogadro/src/animation.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp 2011-11-29 18:48:47.967839537 +0100 -@@ -224,5 +224,3 @@ - } - - } // end namespace Avogadro -- --#include "animation.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp ---- avogadro-1.0.3/libavogadro/src/atom.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp 2011-11-29 18:48:39.561218412 +0100 -@@ -293,5 +293,3 @@ - } - - } // End namespace Avogadro -- --#include "atom.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp ---- avogadro-1.0.3/libavogadro/src/bond.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp 2011-11-29 18:49:00.067773985 +0100 -@@ -166,5 +166,3 @@ - } - - } // End namespace Avogadro -- --#include "bond.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp ---- avogadro-1.0.3/libavogadro/src/color.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp 2011-11-29 18:49:05.207746140 +0100 -@@ -152,5 +152,3 @@ - return "Generic Color"; - } - } -- --#include "color.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp ---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp 2011-11-29 18:49:11.987709410 +0100 -@@ -94,5 +94,3 @@ - } - - } // end namespace -- --#include "colorbutton.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp ---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp 2011-11-29 18:50:11.077389292 +0100 -@@ -63,7 +63,5 @@ - - } - --#include "elementcolor.moc" - //this is a static color plugin... - //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory) -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp ---- avogadro-1.0.3/libavogadro/src/cube.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp 2011-11-29 18:50:26.357306516 +0100 -@@ -322,5 +322,3 @@ - } - - } // End namespace Avogadro -- --#include "cube.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp ---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp 2011-11-29 18:50:37.680578505 +0100 -@@ -132,5 +132,3 @@ - } - - } // End namespace Avogadro -- --#include "elementdetail_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp ---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp 2011-11-29 18:50:48.160521729 +0100 -@@ -401,5 +401,3 @@ - } - - } // End namespace Avogadro -- --#include "elementtranslator.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp ---- avogadro-1.0.3/libavogadro/src/engine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp 2011-11-29 18:50:54.397154610 +0100 -@@ -377,5 +377,3 @@ - return m_molecule->bonds(); - } - } -- --#include "engine.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp ---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp 2011-11-29 18:51:18.733689435 +0100 -@@ -442,7 +442,5 @@ - } - - } -- --#include "bsdyengine.moc" - // This is a static engine... - // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory ) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp ---- avogadro-1.0.3/libavogadro/src/extension.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp 2011-11-29 18:51:56.360152261 +0100 -@@ -80,5 +80,3 @@ - } - - } -- --#include "extension.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp ---- avogadro-1.0.3/libavogadro/src/fragment.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp 2011-11-29 18:52:01.906788880 +0100 -@@ -82,5 +82,3 @@ - } - - } // End namespace Avogadro -- --#include "fragment.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp 2011-11-29 18:52:14.346721486 +0100 -@@ -1966,5 +1966,3 @@ - d->updateCache = true; - } - } -- --#include "glwidget.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp ---- avogadro-1.0.3/libavogadro/src/mesh.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp 2011-11-29 18:52:23.033341093 +0100 -@@ -231,5 +231,3 @@ - } - - } // End namespace Avogadro -- --#include "mesh.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp ---- avogadro-1.0.3/libavogadro/src/molecule.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp 2011-11-29 18:52:33.573283993 +0100 -@@ -1575,5 +1575,3 @@ - } - - } // End namespace Avogadro -- --#include "molecule.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp ---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp 2011-11-29 18:56:26.728687548 +0100 -@@ -22,23 +22,14 @@ - 02110-1301, USA. - **********************************************************************/ - --#include "moleculefile.h" -+#include "moleculefile_p.h" - - #include <avogadro/molecule.h> - --#include <QFile> - #include <QFileInfo> --#include <QStringList> --#include <QThread> - #include <QDebug> - #include <QPointer> - --#include <openbabel/mol.h> --#include <openbabel/obconversion.h> -- --// Included in obconversion.h --//#include <iostream> -- - namespace Avogadro { - - using OpenBabel::OBConversion; -@@ -578,164 +569,6 @@ - return false; - } - -- class ReadFileThread : public QThread -- { -- // Q_OBJECT -- -- public: -- ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -- { -- } -- -- void addConformer(const OpenBabel::OBMol &conformer) -- { -- unsigned int numAtoms = conformer.NumAtoms(); -- std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -- for (unsigned int i = 0; i < numAtoms; ++i) -- coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -- m_moleculeFile->m_conformers.push_back(coords); -- } -- -- void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -- { -- if (!c) { -- // this is the first molecule read -- m_moleculeFile->setConformerFile(true); -- addConformer(current); -- return; -- } -- -- if (!m_moleculeFile->isConformerFile()) -- return; -- -- // as long as we are not sure if this really is a -- // conformer/trajectory file, add the conformers -- addConformer(current); -- -- // performance: check only certain molecule 1-10,20,50 -- switch (c) { -- case 1: -- case 2: -- case 3: -- case 4: -- case 5: -- case 6: -- case 7: -- case 8: -- case 9: -- case 10: -- case 20: -- case 50: -- break; -- default: -- return; -- } -- -- if (first.NumAtoms() != current.NumAtoms()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- -- for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -- OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -- OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -- if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- } -- } -- -- void run() -- { -- // Check that the file can be read from disk -- if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -- // Cannot read the file -- m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- -- // Construct the OpenBabel objects, set the file type -- OpenBabel::OBConversion conv; -- OpenBabel::OBFormat *inFormat; -- if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -- // Input format not supported -- m_moleculeFile->m_error.append( -- QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -- return; -- } else { -- inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -- if (!inFormat || !conv.SetInFormat(inFormat)) { -- // Input format not supported -- m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- } -- -- // set any options -- if (!m_moleculeFile->m_fileOptions.isEmpty()) { -- foreach(const QString &option, -- m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -- conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -- } -- } -- -- // Now attempt to read the molecule in -- ifstream ifs; -- ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -- if (!ifs) // Should not happen, already checked file could be opened -- return; -- -- // read all molecules -- OpenBabel::OBMol firstOBMol, currentOBMol; -- unsigned int c = 0; -- conv.SetInStream(&ifs); -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- while (ifs.good() && conv.Read(¤tOBMol)) { -- if (!c) -- firstOBMol = currentOBMol; -- -- if (c > 20 && !m_moleculeFile->isConformerFile()) -- m_moleculeFile->setFirstReady(true); -- -- // detect conformer/trajectory files -- detectConformers(c, firstOBMol, currentOBMol); -- // store information about molecule -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -- // increment count -- ++c; -- } -- m_moleculeFile->streamposRef().pop_back(); -- -- // signle molecule files are not conformer files -- if (c == 1) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- } -- -- // check for empty titles -- for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -- if (!m_moleculeFile->titlesRef()[i].isEmpty()) -- continue; -- -- QString title; -- if (m_moleculeFile->isConformerFile()) -- title = tr("Conformer %1").arg(i+1); -- else -- title = tr("Molecule %1").arg(i+1); -- -- m_moleculeFile->titlesRef()[i] = title; -- } -- } -- -- MoleculeFile *m_moleculeFile; -- }; // end ReadFileThread class -- - MoleculeFile* MoleculeFile::readFile(const QString &fileName, - const QString &fileType, const QString &fileOptions, bool wait) - { -@@ -794,6 +627,3 @@ - } - - } // end namespace Avogadro -- --#include "moleculefile.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h ---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h 1970-01-01 01:00:00.000000000 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h 2011-11-29 18:57:43.108273764 +0100 -@@ -0,0 +1,202 @@ -+/********************************************************************** -+ MoleculeFile - Class representing molecule file. -+ -+ Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch -+ -+ This file is part of the Avogadro molecular editor project. -+ For more information, see <http://avogadro.openmolecules.net/> -+ -+ Avogadro is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ Avogadro is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301, USA. -+ **********************************************************************/ -+ -+#ifndef MOLECULEFILE_P_H -+#define MOLECULEFILE_P_H -+ -+#include "moleculefile.h" -+ -+#include <openbabel/mol.h> -+#include <openbabel/obconversion.h> -+ -+#include <QFile> -+#include <QStringList> -+#include <QThread> -+ -+namespace Avogadro { -+ -+ using OpenBabel::OBConversion; -+ using std::ifstream; -+ -+class ReadFileThread : public QThread -+{ -+ Q_OBJECT -+ -+ public: -+ ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -+ { -+ } -+ -+ void addConformer(const OpenBabel::OBMol &conformer) -+ { -+ unsigned int numAtoms = conformer.NumAtoms(); -+ std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -+ for (unsigned int i = 0; i < numAtoms; ++i) -+ coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -+ m_moleculeFile->m_conformers.push_back(coords); -+ } -+ -+ void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -+ { -+ if (!c) { -+ // this is the first molecule read -+ m_moleculeFile->setConformerFile(true); -+ addConformer(current); -+ return; -+ } -+ -+ if (!m_moleculeFile->isConformerFile()) -+ return; -+ -+ // as long as we are not sure if this really is a -+ // conformer/trajectory file, add the conformers -+ addConformer(current); -+ -+ // performance: check only certain molecule 1-10,20,50 -+ switch (c) { -+ case 1: -+ case 2: -+ case 3: -+ case 4: -+ case 5: -+ case 6: -+ case 7: -+ case 8: -+ case 9: -+ case 10: -+ case 20: -+ case 50: -+ break; -+ default: -+ return; -+ } -+ -+ if (first.NumAtoms() != current.NumAtoms()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ -+ for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -+ OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -+ OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -+ if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ } -+ } -+ -+ void run() -+ { -+ // Check that the file can be read from disk -+ if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -+ // Cannot read the file -+ m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ -+ // Construct the OpenBabel objects, set the file type -+ OpenBabel::OBConversion conv; -+ OpenBabel::OBFormat *inFormat; -+ if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -+ // Input format not supported -+ m_moleculeFile->m_error.append( -+ QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -+ return; -+ } else { -+ inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -+ if (!inFormat || !conv.SetInFormat(inFormat)) { -+ // Input format not supported -+ m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ } -+ -+ // set any options -+ if (!m_moleculeFile->m_fileOptions.isEmpty()) { -+ foreach(const QString &option, -+ m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -+ conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -+ } -+ } -+ -+ // Now attempt to read the molecule in -+ ifstream ifs; -+ ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -+ if (!ifs) // Should not happen, already checked file could be opened -+ return; -+ -+ // read all molecules -+ OpenBabel::OBMol firstOBMol, currentOBMol; -+ unsigned int c = 0; -+ conv.SetInStream(&ifs); -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ while (ifs.good() && conv.Read(¤tOBMol)) { -+ if (!c) -+ firstOBMol = currentOBMol; -+ -+ if (c > 20 && !m_moleculeFile->isConformerFile()) -+ m_moleculeFile->setFirstReady(true); -+ -+ // detect conformer/trajectory files -+ detectConformers(c, firstOBMol, currentOBMol); -+ // store information about molecule -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -+ // increment count -+ ++c; -+ } -+ m_moleculeFile->streamposRef().pop_back(); -+ -+ // signle molecule files are not conformer files -+ if (c == 1) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ } -+ -+ // check for empty titles -+ for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -+ if (!m_moleculeFile->titlesRef()[i].isEmpty()) -+ continue; -+ -+ QString title; -+ if (m_moleculeFile->isConformerFile()) -+ title = tr("Conformer %1").arg(i+1); -+ else -+ title = tr("Molecule %1").arg(i+1); -+ -+ m_moleculeFile->titlesRef()[i] = title; -+ } -+ } -+ -+ MoleculeFile *m_moleculeFile; -+}; -+ -+} // end namespace Avogadro -+ -+#endif // MOLECULEFILE_P_H -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp ---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -213,5 +213,3 @@ - } - - } // End namespace Avogadro -- --#include "periodictablescene_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp ---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp 2011-11-29 19:30:25.130970122 +0000 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -69,4 +69,3 @@ - - } // End namespace Avogadro - --#include "periodictableview.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp ---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp 2011-11-29 18:53:09.389756626 +0100 -@@ -27,7 +27,6 @@ - **********************************************************************/ - - #include "plotwidget.h" --#include "plotwidget.moc" - - #include <math.h> - #include <QDebug> -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp ---- avogadro-1.0.3/libavogadro/src/plugin.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp 2011-11-29 18:53:16.016387394 +0100 -@@ -65,5 +65,3 @@ - } - - } // end namespace Avogadro -- --#include "plugin.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp ---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp 2011-11-29 18:53:23.569679807 +0100 -@@ -784,5 +784,3 @@ - } - - } -- --#include "pluginmanager.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp ---- avogadro-1.0.3/libavogadro/src/primitive.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp 2011-11-29 18:53:29.139649631 +0100 -@@ -77,5 +77,3 @@ - } - - } -- --#include "primitive.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp ---- avogadro-1.0.3/libavogadro/src/protein.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp 2011-11-29 18:53:37.952935219 +0100 -@@ -978,5 +978,3 @@ - } - - } // End namespace Avogadro -- --#include "protein.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:58:02.354836165 +0100 -@@ -11,9 +11,9 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --qt4_automoc(moleculelist.cpp) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h) - --ADD_LIBRARY(python-module MODULE ${wrapper_SRCS}) -+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) - SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "") - if (WIN32) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp ---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:07.562214311 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:14.538843182 +0100 -@@ -70,4 +70,3 @@ - - } - --#include "moleculelist.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp 2011-11-29 18:53:45.492894371 +0100 -@@ -289,5 +289,3 @@ - - - } -- --#include "pythonengine_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp ---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:26.949426045 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:41.176015640 +0100 -@@ -112,4 +112,3 @@ - - } // namespace - --#include "pythonerror.moc" - -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp 2011-11-29 18:53:54.082847836 +0100 -@@ -340,5 +340,3 @@ - } - - } -- --#include "pythonextension_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp 2011-11-29 18:54:02.269470152 +0100 -@@ -344,5 +344,3 @@ - } - - } -- --#include "pythontool_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp ---- avogadro-1.0.3/libavogadro/src/residue.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp 2011-11-29 18:54:14.316071557 +0100 -@@ -160,6 +160,3 @@ - } - - } // End namespace Avogadro -- -- #include "residue.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp ---- avogadro-1.0.3/libavogadro/src/tool.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp 2011-11-29 18:55:05.515794184 +0100 -@@ -117,5 +117,3 @@ - } - - } // end namespace Avogadro -- --#include "tool.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp ---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp 2011-11-29 18:55:11.699094018 +0100 -@@ -206,5 +206,3 @@ - } - - } // end namespace Avogadro -- --#include "toolgroup.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp ---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp 2011-11-29 18:55:17.209064168 +0100 -@@ -149,5 +149,3 @@ - - - } // End namespace Avogadro -- --#include "zmatrix.moc" diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD deleted file mode 100644 index 0f6be7ab1..000000000 --- a/staging/boost/PKGBUILD +++ /dev/null @@ -1,118 +0,0 @@ -# $Id: PKGBUILD 151566 2012-02-27 18:05:58Z ibiru $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Kritoke <kritoke@gamebox.net> -# Contributor: Luca Roccia <little_rock@users.sourceforge.net> - -pkgbase=boost -pkgname=('boost-libs' 'boost') -pkgver=1.49.0 -_boostver=${pkgver//./_} -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.boost.org/" -makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz - exceptions.patch) -license=('custom') -md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca' - '9b44c28b36303152050c8c82469569c5') - -_stagedir="${srcdir}/stagedir" - -build() { - # set python path for bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools" - echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam - echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam - echo "using mpi ;" >> build/v2/user-config.jam - - cd "${srcdir}"/${pkgbase}_${_boostver} - # https://svn.boost.org/trac/boost/ticket/5731 - patch -p0 -i "${srcdir}/exceptions.patch" - - - # build bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" - ./build.sh cc - - _bindir="bin.linuxx86" - [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - - install -d "${_stagedir}"/usr/bin - install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - - # build tools - cd "${srcdir}/${pkgbase}_${_boostver}/tools/" - "${_stagedir}"/usr/bin/bjam --toolset=gcc - - # copy the tools - cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" - for i in *;do - install -m755 "${i}" "${_stagedir}/usr/bin/${i}" - done - - #boostbook needed by quickbook - cd "${srcdir}/${pkgbase}_${_boostver}/dist/" - cp -r share "${_stagedir}" - - # build libs - cd "${srcdir}/${pkgbase}_${_boostver}" - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - - "${_stagedir}"/usr/bin/bjam \ - release debug-symbols=off threading=multi \ - runtime-link=shared link=shared,static \ - cflags=-fno-strict-aliasing \ - toolset=gcc \ - --prefix="${_stagedir}" \ - -sTOOLS=gcc \ - --layout=system \ - ${MAKEFLAGS} \ - install -} - -package_boost() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Development" - depends=("boost-libs=${pkgver}") - optdepends=('python: for python bindings' - 'python2: for python2 bindings' - 'boost-build: to use boost jam for building your project.') - - install -d "${pkgdir}"/usr/{include,lib,share} - # headers/source files - cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ - - # static libs - cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - - # utilities (bjam, bcp, pyste) - cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ - - #boostbook - cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt -} - -package_boost-libs() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" - depends=('gcc-libs' 'bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') - - install -d "${pkgdir}/usr/lib" - #shared libs - cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt -} diff --git a/staging/boost/exceptions.patch b/staging/boost/exceptions.patch deleted file mode 100644 index 9faa71526..000000000 --- a/staging/boost/exceptions.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp ---- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 -+++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 -@@ -20,6 +20,7 @@ - - #include "boost/mpl/if.hpp" - #include "boost/mpl/integral_c.hpp" -+#include "boost/throw_exception.hpp" - - namespace boost { namespace numeric - { -@@ -159,9 +160,9 @@ struct def_overflow_handler - void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) - { - if ( r == cNegOverflow ) -- throw negative_overflow() ; -+ boost::throw_exception( negative_overflow() ) ; - else if ( r == cPosOverflow ) -- throw positive_overflow() ; -+ boost::throw_exception( positive_overflow() ) ; - } - } ; - - -Diff finished. Fri Jul 22 11:46:49 2011 diff --git a/staging/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD deleted file mode 100644 index 1faaf1fda..000000000 --- a/staging/ekiga/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 151595 2012-02-27 19:12:41Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tom K <tomk@runbox.com> - -pkgname=ekiga -pkgver=3.3.2 -pkgrel=3 -pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" -url="http://www.ekiga.org" -license=(GPL) -arch=(i686 x86_64) -depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') -makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') -optdepends=('evolution-data-server: Evolution integration') -options=(!emptydirs) -groups=('gnome-extra') -install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-schemas-install \ - --disable-scrollkeeper --enable-dbus - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/staging/ekiga/ekiga.install b/staging/ekiga/ekiga.install deleted file mode 100644 index b1d76a4a3..000000000 --- a/staging/ekiga/ekiga.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=ekiga - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - 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() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/staging/ghc/PKGBUILD b/staging/ghc/PKGBUILD deleted file mode 100644 index 3e46660ea..000000000 --- a/staging/ghc/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# $Id: PKGBUILD 151083 2012-02-24 18:59:29Z tdziedzic $ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Special note for devs looking to upgrade this package: -# ghc places a unique hash for each library when it is built. -# Libraries depend on versions specified by those hashes. -# This implies that all libraries need to be rebuilt when ghc is rebuilt. -# Also, due to dependency loop problems, haskell-ghc-paths and haddock -# do not carry version dependencies. You will have to remember to build them too. - -pkgname=ghc -pkgver=7.4.1 -pkgrel=2 -pkgdesc='The Glasgow Haskell Compiler' -arch=('i686' 'x86_64') -url='http://www.haskell.org/ghc/' -license=('custom') -depends=('perl' 'gmp>=5.0' 'gcc' 'libffi') -makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl') -checkdepends=('python2') -install='ghc.install' -groups=('haskell') -provides=('haskell-array=0.4.0.0' - 'haskell-base=4.5.0.0' - 'haskell-binary=0.5.1.0' - 'haskell-bin-package-db=0.0.0.0' - 'haskell-bytestring=0.9.2.1' - 'haskell-containers=0.4.2.1' - 'haskell-deepseq=1.3.0.0' - 'haskell-directory=1.1.0.2' - 'haskell-extensible-exceptions=0.1.1.4' - 'haskell-filepath=1.3.0.0' - 'haskell-ghc-prim=0.2.0.0' - 'haskell-haskell2010=1.1.0.1' - 'haskell-haskell98=2.0.0.1' - 'haskell-hoopl=3.8.7.3' - 'haskell-hpc=0.5.1.1' - 'haskell-integer-gmp=0.4.0.0' - 'haskell-old-locale=1.0.0.4' - 'haskell-old-time=1.1.0.0' - 'haskell-pretty=1.1.1.0' - 'haskell-process=1.1.0.1' - 'haskell-template-haskell=2.7.0.0' - 'haskell-time=1.4' - 'haskell-unix=2.5.1.0' - 'haskell-cabal=1.14.0' - ) -replaces=('haskell-array<0.4.0.0' - 'haskell-base<4.5.0.0' - 'haskell-binary<0.5.1.0' - 'haskell-bin-package-db<0.0.0.0' - 'haskell-bytestring<0.9.2.1' - 'haskell-containers<0.4.2.1' - 'haskell-deepseq<1.3.0.0' - 'haskell-directory<1.1.0.2' - 'haskell-extensible-exceptions<0.1.1.4' - 'haskell-filepath<1.3.0.0' - 'haskell-ghc-prim<0.2.0.0' - 'haskell-haskell2010<1.1.0.1' - 'haskell-haskell98<2.0.0.1' - 'haskell-hoopl<3.8.7.3' - 'haskell-hpc<0.5.1.1' - 'haskell-integer-gmp<0.4.0.0' - 'haskell-old-locale<1.0.0.4' - 'haskell-old-time<1.1.0.0' - 'haskell-pretty<1.1.1.0' - 'haskell-process<1.1.0.1' - 'haskell-template-haskell<2.7.0.0' - 'haskell-time<1.4' - 'haskell-unix<2.5.1.0' - 'haskell-cabal<1.14.0' - ) -source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" - "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" - 'build.mk') -md5sums=('5d86c420978b49cc60edea9bd4c36703' - '54bc9405c14c3226b6e3de3cd61e2777' - '82b67cdd24a2e434a4399f30f14b21a3') - -build() { - cd ghc-${pkgver} - - cp ${srcdir}/build.mk mk/build.mk - - ./configure \ - --prefix=/usr - - make -j4 -l8 -} - -check() { - cd ghc-${pkgver} - - # python2 rename - sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk - sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py - - # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856 - make THREADS=9 test - # might be some failures - #make fulltest -} - -package() { - cd ghc-${pkgver} - - make DESTDIR=${pkgdir} install - - install -d ${pkgdir}/usr/share/licenses/ghc - install -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/ghc -} diff --git a/staging/ghc/build.mk b/staging/ghc/build.mk deleted file mode 100644 index bc26a21fe..000000000 --- a/staging/ghc/build.mk +++ /dev/null @@ -1,175 +0,0 @@ -# ----------------------------------------------------------------------------- -# A Sample build.mk -# -# Uncomment one of the following BuildFlavour settings to get the desired -# overall build type, and then tweak the options in the relevant section -# below. - -# Uncomment one of these to select a build profile below: - -# Full build with max optimisation and everything enabled (very slow build) -BuildFlavour = perf - -# Fast build with optimised libraries, no profiling (RECOMMENDED): -#BuildFlavour = quick - -# Even faster build. NOT RECOMMENDED: the libraries will be -# completely unoptimised, so any code built with this compiler -# (including stage2) will run very slowly: -#BuildFlavour = quickest - -# Profile the stage2 compiler: -#BuildFlavour = prof - -# A development build, working on the stage 1 compiler: -#BuildFlavour = devel1 - -# A development build, working on the stage 2 compiler: -#BuildFlavour = devel2 - -# An unregisterised, optimised build of ghc, for porting: -#BuildFlavour = unreg - -GhcLibWays = v - -# -------- 1. A Performance/Distribution build-------------------------------- - -ifeq "$(BuildFlavour)" "perf" - -# perf matches the default settings, repeated here for comparison: - -SRC_HC_OPTS = -O -H64m -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O2 -fasm -GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -GhcLibWays += p - -ifeq "$(PlatformSupportsSharedLibs)" "YES" -GhcLibWays += dyn -endif - -endif - -# -------- A Fast build ------------------------------------------------------ - -ifeq "$(BuildFlavour)" "quickest" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O0 -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- A Fast build with optimised libs ---------------------------------- - -ifeq "$(BuildFlavour)" "quick" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- Profile the stage2 compiler --------------------------------------- - -ifeq "$(BuildFlavour)" "prof" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O -fasm -GhcLibHcOpts = -O -fasm - -GhcLibWays += p -GhcProfiled = YES - -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - - -# -------- A Development build (stage 1) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel1" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG -GhcStage2HcOpts = -Rghc-timing -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO -LAX_DEPENDENCIES = NO - -endif - -# -------- A Development build (stage 2) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel2" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O -fasm -GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO -LAX_DEPENDENCIES = NO - -# After stage 1 and the libraries have been built, you can uncomment this line: - -# stage=2 - -# Then stage 1 will not be touched by the build system, until -# you comment the line again. This is a useful trick for when you're -# working on stage 2 and want to freeze stage 1 and the libraries for -# a while. - -endif - -# -------- A Unregisterised build) ------------------------------------------- - -ifeq "$(BuildFlavour)" "unreg" - -GhcUnregisterised = YES -GhcWithNativeCodeGen = NO - -SRC_HC_OPTS = -O -H64m -GhcStage1HcOpts = -O -GhcStage2HcOpts = -O2 -GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# ----------------------------------------------------------------------------- -# Other settings that might be useful - -# NoFib settings -NoFibWays = -STRIP_CMD = : diff --git a/staging/ghc/ghc.install b/staging/ghc/ghc.install deleted file mode 100644 index c0200e4a6..000000000 --- a/staging/ghc/ghc.install +++ /dev/null @@ -1,10 +0,0 @@ -pre_upgrade() { - echo '==> Unregistering cabalized packages...' - [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \; - echo '==> Done.' -} - -post_upgrade() { - echo '==> All cabalized packages need to be reinstalled now.' - echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.' -} diff --git a/staging/ghc/print-provides-replaces.sh b/staging/ghc/print-provides-replaces.sh deleted file mode 100755 index 33d1da051..000000000 --- a/staging/ghc/print-provides-replaces.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. PKGBUILD - -if [[ ! -d src/ghc-${pkgver}/libraries ]]; then - echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/" - exit 1 -fi - -declare -A exclude -# no Win32 cause we're not building on windows -exclude['Win32']=1 -# no integer-simple because we use integer-gmp -exclude['integer-simple']=1 -# extract excluded libraries from ghc.mk -for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do - exclude[${exclude_pkg}]=1 -done - -cd src/ghc-${pkgver}/libraries - -# $1 is the name of the variable -# $2 is the string for the test, either '=' or '<' -print_var() { - printf "$1=(" - for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do - [[ ${exclude[${pkg}]} ]] && continue - version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal) - printf "'haskell-$pkg$2$version'\n " - done - # also add cabal - version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal) - printf "'haskell-cabal$2$version'\n " - echo -e '\b)' -} - -print_var 'provides' '=' -print_var 'replaces' '<' diff --git a/staging/happy/PKGBUILD b/staging/happy/PKGBUILD deleted file mode 100644 index c84247e5a..000000000 --- a/staging/happy/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 151112 2012-02-24 23:20:45Z tdziedzic $ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Contributor: simo <simo@archlinux.org> -# Contributor: Vesa Kaihlavirta <vegai@iki.fi> - -pkgname=happy -pkgver=1.18.9 -pkgrel=4 -pkgdesc="The Parser Generator for Haskell" -url="http://www.haskell.org/happy/" -arch=('i686' 'x86_64') -license=("custom:BSD3") -depends=('gmp') -makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4') -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('aeb565fe572f979f15a24db0df2de37d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - runhaskell Setup.lhs configure -O --prefix=/usr - runhaskell Setup.lhs build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - runhaskell Setup.lhs copy --destdir="${pkgdir}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/haskell-html/PKGBUILD b/staging/haskell-html/PKGBUILD deleted file mode 100644 index 44a3ea50b..000000000 --- a/staging/haskell-html/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=html -pkgname=haskell-html -pkgver=1.0.1.2 -pkgrel=10 -pkgdesc="HTML combinator library" -url="http://hackage.haskell.org/package/html" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' sh) -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-html/haskell-html.install b/staging/haskell-html/haskell-html.install deleted file mode 100644 index 768297e0a..000000000 --- a/staging/haskell-html/haskell-html.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-html -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-http/PKGBUILD b/staging/haskell-http/PKGBUILD deleted file mode 100644 index 79de205cc..000000000 --- a/staging/haskell-http/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=HTTP -pkgname=haskell-http -pkgver=4000.2.2 -pkgrel=1 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh' 'haskell-network=2.3.0.11-1' 'haskell-parsec=3.1.2-1' 'haskell-mtl=2.0.1.0-4') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('b61ff88ef8d699f73a6ed27c6abf6600') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-http/haskell-http.install b/staging/haskell-http/haskell-http.install deleted file mode 100644 index fdebb1cb8..000000000 --- a/staging/haskell-http/haskell-http.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-http -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-mtl/PKGBUILD b/staging/haskell-mtl/PKGBUILD deleted file mode 100644 index 315d81a73..000000000 --- a/staging/haskell-mtl/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=mtl -pkgname=haskell-mtl -pkgver=2.0.1.0 -pkgrel=4 -pkgdesc="Monad transformer library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh' 'haskell-transformers=0.2.2.0-4') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('934fa813625ef7e88a6a96a09815ff95') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-mtl/haskell-mtl.install b/staging/haskell-mtl/haskell-mtl.install deleted file mode 100644 index 9325811e8..000000000 --- a/staging/haskell-mtl/haskell-mtl.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-mtl -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-network/PKGBUILD b/staging/haskell-network/PKGBUILD deleted file mode 100644 index 59dc9334b..000000000 --- a/staging/haskell-network/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=network -pkgname=haskell-network -pkgver=2.3.0.11 -pkgrel=1 -pkgdesc="Networking-related facilities" -url="http://hackage.haskell.org/package/network" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh' 'haskell-parsec=3.1.2-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('cfe4922ac85685be9f86d4d34654f481') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-network/haskell-network.install b/staging/haskell-network/haskell-network.install deleted file mode 100644 index a56c31d0a..000000000 --- a/staging/haskell-network/haskell-network.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-network -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-parsec/PKGBUILD b/staging/haskell-parsec/PKGBUILD deleted file mode 100644 index e4f7da1e6..000000000 --- a/staging/haskell-parsec/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 - -_hkgname=parsec -pkgname=haskell-parsec -pkgver=3.1.2 -pkgrel=1 -pkgdesc="Monadic parser combinators" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh' 'haskell-mtl=2.0.1.0-4' 'haskell-text=0.11.1.13-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('c2a75dfd247ae4839e2602b62dc87487') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-parsec/haskell-parsec.install b/staging/haskell-parsec/haskell-parsec.install deleted file mode 100644 index dfa0701b9..000000000 --- a/staging/haskell-parsec/haskell-parsec.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-parsec -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-quickcheck/PKGBUILD b/staging/haskell-quickcheck/PKGBUILD deleted file mode 100644 index 7b27cfb0c..000000000 --- a/staging/haskell-quickcheck/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 - -_hkgname=QuickCheck -pkgname=haskell-quickcheck -pkgver=2.4.2 -pkgrel=1 -pkgdesc="Automatic testing of Haskell programs" -url="http://hackage.haskell.org/package/QuickCheck" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-quickcheck/haskell-quickcheck.install b/staging/haskell-quickcheck/haskell-quickcheck.install deleted file mode 100644 index c9e12fadc..000000000 --- a/staging/haskell-quickcheck/haskell-quickcheck.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-quickcheck -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-random/PKGBUILD b/staging/haskell-random/PKGBUILD deleted file mode 100644 index 3b929c3d6..000000000 --- a/staging/haskell-random/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> - -_hkgname=random -pkgname=haskell-random -pkgver=1.0.1.1 -pkgrel=1 -pkgdesc="A basic random number generation library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/staging/haskell-random/haskell-random.install b/staging/haskell-random/haskell-random.install deleted file mode 100644 index b6d807e1a..000000000 --- a/staging/haskell-random/haskell-random.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-random -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-regex-base/PKGBUILD b/staging/haskell-regex-base/PKGBUILD deleted file mode 100644 index 3b8ecb4bb..000000000 --- a/staging/haskell-regex-base/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-base -pkgname=haskell-regex-base -pkgver=0.93.2 -pkgrel=5 -pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-regex-base/haskell-regex-base.install b/staging/haskell-regex-base/haskell-regex-base.install deleted file mode 100644 index 3ad2fea28..000000000 --- a/staging/haskell-regex-base/haskell-regex-base.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-base -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-regex-compat/PKGBUILD b/staging/haskell-regex-compat/PKGBUILD deleted file mode 100644 index c880ff4f2..000000000 --- a/staging/haskell-regex-compat/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-compat -pkgname=haskell-regex-compat -pkgver=0.95.1 -pkgrel=1 -pkgdesc="Replaces and enhances Text.Regex" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d0573ab4e2f3de5faa61380b67333320') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-regex-compat/haskell-regex-compat.install b/staging/haskell-regex-compat/haskell-regex-compat.install deleted file mode 100644 index 898c0bba1..000000000 --- a/staging/haskell-regex-compat/haskell-regex-compat.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-compat -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-regex-posix/PKGBUILD b/staging/haskell-regex-posix/PKGBUILD deleted file mode 100644 index 1bed15490..000000000 --- a/staging/haskell-regex-posix/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-posix -pkgname=haskell-regex-posix -pkgver=0.95.1 -pkgrel=1 -pkgdesc="The posix regex backend for regex-base" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('41cbc6d2b99837b64e0cc457c2737cc8') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-regex-posix/haskell-regex-posix.install b/staging/haskell-regex-posix/haskell-regex-posix.install deleted file mode 100644 index 2b89fae7b..000000000 --- a/staging/haskell-regex-posix/haskell-regex-posix.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-posix -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-text/PKGBUILD b/staging/haskell-text/PKGBUILD deleted file mode 100644 index c4c9664f7..000000000 --- a/staging/haskell-text/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=text -pkgname=haskell-text -pkgver=0.11.1.13 -pkgrel=1 -pkgdesc="An efficient packed Unicode text type." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('62b781a5d9d4dab2b2a1dbf2dc1b593f') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/staging/haskell-text/haskell-text.install b/staging/haskell-text/haskell-text.install deleted file mode 100644 index 620db3921..000000000 --- a/staging/haskell-text/haskell-text.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-text -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-transformers/PKGBUILD b/staging/haskell-transformers/PKGBUILD deleted file mode 100644 index 8d4df2800..000000000 --- a/staging/haskell-transformers/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 151092 2012-02-24 20:41:57Z tdziedzic $ - -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Contributor: Rémy Oudompheng <remy@archlinux.org> - -_hkgname=transformers -pkgname=haskell-transformers -pkgver=0.2.2.0 -pkgrel=4 -pkgdesc="Concrete functor and monad transformers" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") -install=${pkgname}.install -md5sums=('3470ac66116900cd1ba84d3744474e49') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-transformers/haskell-transformers.install b/staging/haskell-transformers/haskell-transformers.install deleted file mode 100644 index eec2af6e1..000000000 --- a/staging/haskell-transformers/haskell-transformers.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-transformers -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-xhtml/PKGBUILD b/staging/haskell-xhtml/PKGBUILD deleted file mode 100644 index 4ec98da52..000000000 --- a/staging/haskell-xhtml/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=xhtml -pkgname=haskell-xhtml -pkgver=3000.2.0.5 -pkgrel=1 -pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants." -url="http://hackage.haskell.org/package/xhtml" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('d51e20de416b825aba6b874a221acfc4') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-xhtml/haskell-xhtml.install b/staging/haskell-xhtml/haskell-xhtml.install deleted file mode 100644 index d03b8a053..000000000 --- a/staging/haskell-xhtml/haskell-xhtml.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-xhtml -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/haskell-zlib/PKGBUILD b/staging/haskell-zlib/PKGBUILD deleted file mode 100644 index d47562b9d..000000000 --- a/staging/haskell-zlib/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package originally generated by cabal2arch 0.7.6 - -_hkgname=zlib -pkgname=haskell-zlib -pkgver=0.5.3.3 -pkgrel=3 -pkgdesc="Compression and decompression in the gzip and zlib formats" -url="http://hackage.haskell.org/package/zlib" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'zlib' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('1649e56d13ce2c6a6a9210227401dbbc') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/staging/haskell-zlib/haskell-zlib.install b/staging/haskell-zlib/haskell-zlib.install deleted file mode 100644 index d387b7b65..000000000 --- a/staging/haskell-zlib/haskell-zlib.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-zlib -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD deleted file mode 100644 index 2e55565d0..000000000 --- a/staging/kdeedu-kig/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 151579 2012-02-27 18:26:20Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kig -pkgver=4.8.0 -pkgrel=2 -pkgdesc="Interactive Geometry" -url="http://kde.org/applications/education/kig/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2") -sha1sums=('141a4c9230ab134dcf7016c2880357d9e52b8f69') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kig-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py -} diff --git a/staging/kdeedu-kig/kdeedu-kig.install b/staging/kdeedu-kig/kdeedu-kig.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdeedu-kig/kdeedu-kig.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD deleted file mode 100644 index 262262751..000000000 --- a/staging/kdeedu-rocs/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 151585 2012-02-27 18:44:01Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-rocs -pkgver=4.8.0 -pkgrel=2 -pkgdesc="Rocs Graph Theory" -url="http://kde.org/applications/education/rocs/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'boost-libs') -makedepends=('cmake' 'automoc4' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2") -sha1sums=('d29daa9633e2ba6e2d3e0c7155ade752216a8969') -options=('!makeflags') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../rocs-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libpst/PKGBUILD b/staging/libpst/PKGBUILD deleted file mode 100644 index c97bd201d..000000000 --- a/staging/libpst/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 151590 2012-02-27 18:55:08Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=libpst -pkgname=('libpst' 'libpst-docs') -pkgver=0.6.54 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.five-ten-sg.com/libpst/" -license=('GPL') -makedepends=('python2' 'boost') -source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz) -sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2 - make -} - -package_libpst() { - pkgdesc="Outlook .pst file converter" - depends=('gcc-libs') - optdepends=('boost-libs: for libpst python interface') - options=('!libtool' '!docs') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_libpst-docs() { - pkgdesc="Documentation for Outlook .pst file converter" - options=('!libtool') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install-htmlDATA - cd "${srcdir}/${pkgbase}-${pkgver}/html" - make DESTDIR="${pkgdir}" install-htmldevelDATA -} diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD deleted file mode 100644 index f94ccd70c..000000000 --- a/staging/libtorrent-rasterbar/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 151583 2012-02-27 18:40:10Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=libtorrent-rasterbar -pkgver=0.15.10 -pkgrel=1 -pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" -url="http://www.rasterbar.com/products/libtorrent/" -arch=('i686' 'x86_64') -license=('custom') -depends=('boost-libs' 'geoip' 'python2') -makedepends=('boost') -options=('!libtool' '!emptydirs') -source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4') - -build() { - cd "$srcdir/$pkgname-$pkgver" - export CFLAGS+=" -fvisibility=hidden" - export CXXFLAGS+=" -fvisibility=hidden" - ./configure --prefix=/usr \ - --enable-python-binding \ - --with-libgeoip=system - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD deleted file mode 100644 index cd450a1e4..000000000 --- a/staging/mkvtoolnix/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 151597 2012-02-27 20:17:39Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: xduugu <xduugu@gmx.com> - -pkgbase=mkvtoolnix -pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=5.3.0 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' - 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') -source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('2cd84ff24e1d9217dd3caf170f34e758') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Disable automagic curl dep used for online update checking - sed -i -e '/curl/d' configure.in - export CURL_CFLAGS="" CURL_LIBS="" - - export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - - autoreconf - - ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib \ - --disable-gui - rake - - mv src/mkvinfo{,-cli} - - ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib - rake -} - -package_mkvtoolnix-cli() { - pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" - depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2') - provides=('mkvtoolnix') - conflicts=('mkvtoolnix') - replaces=('mkvtoolnix') - - cd "${srcdir}/${pkgbase}-${pkgver}" - - rake DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/bin/mkvinfo - install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo - - rm -rf "${pkgdir}"/usr/bin/mmg - rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/applications - rm -rf "${pkgdir}"/usr/share/icons - rm -rf "${pkgdir}"/usr/share/mime -} - -package_mkvtoolnix-gtk() { - pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI" - depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils') - install=mkvtoolnix.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - - rake DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/bin/mkv* - install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk - sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop - - rm -rf "${pkgdir}"/usr/share/doc - rm -rf "${pkgdir}"/usr/share/locale - rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv* -} diff --git a/staging/mkvtoolnix/mkvtoolnix.install b/staging/mkvtoolnix/mkvtoolnix.install deleted file mode 100644 index 74d9eb2ef..000000000 --- a/staging/mkvtoolnix/mkvtoolnix.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - if [ -f usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime &> /dev/null - fi -} - -post_upgrade() { - post_install -} - -pre_remove() { - post_install -} diff --git a/staging/source-highlight/PKGBUILD b/staging/source-highlight/PKGBUILD deleted file mode 100644 index 39d08ac9c..000000000 --- a/staging/source-highlight/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 151593 2012-02-27 19:04:37Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=source-highlight -pkgver=3.1.6 -pkgrel=2 -pkgdesc="Convert source code to syntax highlighted document" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/src-highlite/" -license=('GPL') -depends=('gcc-libs' 'bash' 'boost-libs') -makedepends=('ctags' 'boost') -options=('!libtool') -install=$pkgname.install -source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz") -md5sums=('44856c15a5dc8694e30d92f640ed348f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-bash-completion=${pkgdir}/etc/bash_completion.d - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}/usr" install -} diff --git a/staging/source-highlight/source-highlight.install b/staging/source-highlight/source-highlight.install deleted file mode 100644 index 4fd1b3005..000000000 --- a/staging/source-highlight/source-highlight.install +++ /dev/null @@ -1,18 +0,0 @@ -info_dir=usr/share/info -info_files=(source-highlight.info source-highlight-lib.info) - -post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD deleted file mode 100644 index 5533afa39..000000000 --- a/testing/libarchive/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 151513 2012-02-27 05:06:31Z dreisner $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=libarchive -pkgver=3.0.3 -pkgrel=5 -pkgdesc="library that can create and read several streaming archive formats" -arch=('i686' 'x86_64') -url="http://libarchive.googlecode.com/" -license=('BSD') -depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" - 'interpret-non-posix-zips.patch' - 'test-with-zip-mtime.patch' - 'skip-fiemap-on-unavail.patch') -md5sums=('ca4090f0099432a9ac5a8b6618dc3892' - 'f02b88eb10877c7a7d527ed89c662e44' - '8366def6d7d70d424fa28a986c78c015' - 'efa7cbda9fc64a4f1392324d0b5707e2') -sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7' - '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc' - 'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f' - '05696eb87bf60520aff3a9d6afb4e40273ecca25e0a01a6d5a3669642f07b444') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # http://code.google.com/p/libarchive/issues/detail?id=225 - patch -Np0 <"$srcdir/interpret-non-posix-zips.patch" - - # http://code.google.com/p/libarchive/issues/detail?id=231 - patch -Np0 <"$srcdir/test-with-zip-mtime.patch" - - # http://code.google.com/p/libarchive/issues/detail?id=238 - patch -Np1 <"$srcdir/skip-fiemap-on-unavail.patch" - - ./configure --prefix=/usr --without-xml2 - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING -} diff --git a/testing/libarchive/interpret-non-posix-zips.patch b/testing/libarchive/interpret-non-posix-zips.patch deleted file mode 100644 index 63bc439d9..000000000 --- a/testing/libarchive/interpret-non-posix-zips.patch +++ /dev/null @@ -1,165 +0,0 @@ -Index: libarchive/archive_read_support_format_zip.c -=================================================================== ---- libarchive/archive_read_support_format_zip.c (revision 4189) -+++ libarchive/archive_read_support_format_zip.c (revision 4190) -@@ -217,14 +217,13 @@ - } - - /* -- * TODO: This is a performance sink because it forces -- * the read core to drop buffered data from the start -- * of file, which will then have to be re-read again -- * if this bidder loses. -+ * TODO: This is a performance sink because it forces the read core to -+ * drop buffered data from the start of file, which will then have to -+ * be re-read again if this bidder loses. - * -- * Consider passing in the winning bid value to subsequent -- * bidders so that this bidder in particular can avoid -- * seeking if it knows it's going to lose anyway. -+ * We workaround this a little by passing in the best bid so far so -+ * that later bidders can do nothing if they know they'll never -+ * outbid. But we can certainly do better... - */ - static int - archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid) -@@ -311,19 +310,29 @@ - external_attributes = archive_le32dec(p + 38); - zip_entry->local_header_offset = archive_le32dec(p + 42); - -+ /* If we can't guess the mode, leave it zero here; -+ when we read the local file header we might get -+ more information. */ -+ zip_entry->mode = 0; - if (zip_entry->system == 3) { - zip_entry->mode = external_attributes >> 16; -- } else { -- zip_entry->mode = AE_IFREG | 0777; - } - -- /* Do we need to parse filename here? */ -- /* Or can we wait until we read the local header? */ -+ /* We don't read the filename until we get to the -+ local file header. Reading it here would speed up -+ table-of-contents operations (removing the need to -+ find and read local file header to get the -+ filename) at the cost of requiring a lot of extra -+ space. */ -+ /* We don't read the extra block here. We assume it -+ will be duplicated at the local file header. */ - __archive_read_consume(a, - 46 + filename_length + extra_length + comment_length); - } - -- /* TODO: Sort zip entries. */ -+ /* TODO: Sort zip entries by file offset so that we -+ can optimize get_next_header() to use skip instead of -+ seek. */ - - return ARCHIVE_OK; - } -@@ -434,6 +443,11 @@ - return (30); - } - -+ /* TODO: It's worth looking ahead a little bit for a valid -+ * PK signature. In particular, that would make it possible -+ * to read some UUEncoded SFX files or SFX files coming from -+ * a network socket. */ -+ - return (0); - } - -Index: libarchive/test/test_compat_zip_6.zip.uu -=================================================================== ---- libarchive/test/test_compat_zip_6.zip.uu (revision 0) -+++ libarchive/test/test_compat_zip_6.zip.uu (revision 4190) -@@ -0,0 +1,10 @@ -+begin 755 test_compat_zip_6.zip -+M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@ -+M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD -+M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0- -+M"E!+`0(4"PH``````'@3-T`````````````````6````````````$``````` -+M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+ -+M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E -+M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B``````` -+` -+end -Index: libarchive/test/test_compat_zip.c -=================================================================== ---- libarchive/test/test_compat_zip.c (revision 4189) -+++ libarchive/test/test_compat_zip.c (revision 4190) -@@ -348,6 +348,53 @@ - free(p); - } - -+/* -+ * Issue 225: Errors extracting MSDOS Zip archives with directories. -+ */ -+static void -+compat_zip_6_verify(struct archive *a) -+{ -+ struct archive_entry *ae; -+ -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); -+ assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); -+ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); -+ assertEqualInt(1327314468, archive_entry_mtime(ae)); -+ assertEqualInt(0, archive_entry_size(ae)); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); -+ assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); -+ assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); -+ assertEqualInt(1327314476, archive_entry_mtime(ae)); -+ assertEqualInt(11, archive_entry_size(ae)); -+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); -+} -+ -+static void -+test_compat_zip_6(void) -+{ -+ const char *refname = "test_compat_zip_6.zip"; -+ struct archive *a; -+ void *p; -+ size_t s; -+ -+ extract_reference_file(refname); -+ p = slurpfile(&s, refname); -+ -+ assert((a = archive_read_new()) != NULL); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7)); -+ compat_zip_6_verify(a); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); -+ -+ assert((a = archive_read_new()) != NULL); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7)); -+ compat_zip_6_verify(a); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); -+} -+ - DEFINE_TEST(test_compat_zip) - { - test_compat_zip_1(); -@@ -355,6 +402,7 @@ - test_compat_zip_3(); - test_compat_zip_4(); - test_compat_zip_5(); -+ test_compat_zip_6(); - } - - -Index: Makefile.am -=================================================================== ---- Makefile.am (revision 4189) -+++ Makefile.am (revision 4190) -@@ -462,6 +462,7 @@ - libarchive/test/test_compat_zip_3.zip.uu \ - libarchive/test/test_compat_zip_4.zip.uu \ - libarchive/test/test_compat_zip_5.zip.uu \ -+ libarchive/test/test_compat_zip_6.zip.uu \ - libarchive/test/test_fuzz_1.iso.Z.uu \ - libarchive/test/test_fuzz.cab.uu \ - libarchive/test/test_fuzz.lzh.uu \ diff --git a/testing/libarchive/test-with-zip-mtime.patch b/testing/libarchive/test-with-zip-mtime.patch deleted file mode 100644 index 79e2f3c7e..000000000 --- a/testing/libarchive/test-with-zip-mtime.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: libarchive/test/test_compat_zip.c -=================================================================== ---- libarchive/test/test_compat_zip.c (revision 4197) -+++ libarchive/test/test_compat_zip.c (revision 4198) -@@ -359,12 +359,16 @@ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); - assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); -- assertEqualInt(1327314468, archive_entry_mtime(ae)); -+ /* Zip timestamps are local time, so vary by time zone. */ -+ /* TODO: A more complex assert would work here; we could -+ verify that it's within +/- 24 hours of a particular value. */ -+ /* assertEqualInt(1327314468, archive_entry_mtime(ae)); */ - assertEqualInt(0, archive_entry_size(ae)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); - assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); -- assertEqualInt(1327314476, archive_entry_mtime(ae)); -+ /* Zip timestamps are local time, so vary by time zone. */ -+ /* assertEqualInt(1327314476, archive_entry_mtime(ae)); */ - assertEqualInt(11, archive_entry_size(ae)); - assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); - } diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD deleted file mode 100644 index 6f36b2690..000000000 --- a/testing/mkinitcpio-busybox/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 151125 2012-02-25 01:54:20Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=mkinitcpio-busybox -pkgver=1.19.4 -pkgrel=1 -pkgdesc="base initramfs tools" -arch=('i686' 'x86_64') -url="http://www.busybox.net/" -license=('GPL') -depends=('glibc') -options=('!buildflags') -source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" - 'config') -sha256sums=('9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee' - '28dc775e12c40718b48e1dd6a63544ca9d8aa128f786577b27e4df73e1e8766a') - -build() { - cd "$srcdir/busybox-$pkgver" - - local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" - - sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ - "$srcdir/config" > .config - - make -} - -package() { - install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/lib/initcpio/busybox" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config deleted file mode 100644 index 3cd776e03..000000000 --- a/testing/mkinitcpio-busybox/config +++ /dev/null @@ -1,1013 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.19.2 -# Sun Oct 16 15:24:19 2011 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_DESKTOP is not set -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_INCLUDE_SUSv2 is not set -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_UNICODE_SUPPORT=y -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -# CONFIG_FEATURE_SYSTEMD is not set -# CONFIG_FEATURE_RTMINMAX is not set -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=0 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_USE_TERMIOS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -# CONFIG_FEATURE_REVERSE_SEARCH is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -# CONFIG_GUNZIP is not set -# CONFIG_GZIP is not set -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -# CONFIG_LZOP is not set -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_LZMA is not set -# CONFIG_UNXZ is not set -# CONFIG_XZ is not set -# CONFIG_UNZIP is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -# CONFIG_ID is not set -# CONFIG_GROUPS is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_BASE64 is not set -# CONFIG_WHO is not set -# CONFIG_USERS is not set -# CONFIG_CAL is not set -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -CONFIG_CP=y -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -CONFIG_CUT=y -CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -# CONFIG_FOLD is not set -# CONFIG_FSYNC is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -# CONFIG_STTY is not set -# CONFIG_SUM is not set -# CONFIG_SYNC is not set -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TRUE=y -# CONFIG_TTY is not set -CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHOAMI is not set -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_FGCONSOLE is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETFONT=y -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_PATCH is not set -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_REGEX_SEARCH is not set -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y -# CONFIG_FEATURE_ALLOW_EXEC is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_MAXDEPTH is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -# CONFIG_FEATURE_FIND_USER is not set -# CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set -# CONFIG_FEATURE_FIND_DEPTH is not set -# CONFIG_FEATURE_FIND_PAREN is not set -# CONFIG_FEATURE_FIND_SIZE is not set -# CONFIG_FEATURE_FIND_PRUNE is not set -# CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set -# CONFIG_FEATURE_FIND_REGEX is not set -# CONFIG_FEATURE_FIND_CONTEXT is not set -# CONFIG_FEATURE_FIND_LINKS is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_INIT=y -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="" -# CONFIG_MESG is not set -# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set - -# -# Login/Password Management Utilities -# -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set -# CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=0 -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELUSER is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_GETTY is not set -# CONFIG_LOGIN is not set -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -# CONFIG_MODINFO is not set -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -# CONFIG_INSMOD is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_DEPMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -# CONFIG_DEFAULT_MODULES_DIR is not set -# CONFIG_DEFAULT_DEPMOD_FILE is not set - -# -# Linux System Utilities -# -# CONFIG_BLOCKDEV is not set -# CONFIG_REV is not set -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKID is not set -# CONFIG_FEATURE_BLKID_TYPE is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -# CONFIG_MKFS_VFAT is not set -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -# CONFIG_MKSWAP is not set -# CONFIG_FEATURE_MKSWAP_UUID is not set -# CONFIG_MORE is not set -# CONFIG_MOUNT is not set -# CONFIG_FEATURE_MOUNT_FAKE is not set -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -# CONFIG_FEATURE_MOUNT_HELPERS is not set -# CONFIG_FEATURE_MOUNT_LABEL is not set -# CONFIG_FEATURE_MOUNT_NFS is not set -# CONFIG_FEATURE_MOUNT_CIFS is not set -# CONFIG_FEATURE_MOUNT_FLAGS is not set -# CONFIG_FEATURE_MOUNT_FSTAB is not set -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -# CONFIG_SWAPONOFF is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -# CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_VOLUMEID is not set - -# -# Filesystem/Volume identification -# -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set - -# -# Miscellaneous Utilities -# -# CONFIG_CONSPY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_SETSERIAL is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_UBIMKVOL is not set -# CONFIG_UBIRMVOL is not set -# CONFIG_UBIRSVOL is not set -# CONFIG_UBIUPDATEVOL is not set -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_IONICE is not set -# CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set -# CONFIG_FEATURE_LAST_FANCY is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETSID is not set -CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_VOLNAME is not set -# CONFIG_WALL is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NBDCLIENT is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -# CONFIG_NC_110_COMPAT is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_WHOIS is not set -CONFIG_FEATURE_IPV6=y -# CONFIG_FEATURE_UNIX_LOCAL is not set -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -# CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -CONFIG_NETSTAT=y -CONFIG_FEATURE_NETSTAT_WIDE=y -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -# CONFIG_TCPSVD is not set -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y -# CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -# CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -# CONFIG_UDPSVD is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -# CONFIG_ZCIP is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -CONFIG_FEATURE_MIME_CHARSET="" -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set - -# -# Process Utilities -# -# CONFIG_IOSTAT is not set -# CONFIG_MPSTAT is not set -# CONFIG_NMETER is not set -# CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set -# CONFIG_PSTREE is not set -# CONFIG_PWDX is not set -# CONFIG_SMEMCAP is not set -CONFIG_UPTIME=y -# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -# CONFIG_PKILL is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -# CONFIG_FEATURE_SHOW_THREADS is not set -# CONFIG_WATCH is not set - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Shells -# -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -# CONFIG_ASH_IDLE_TIMEOUT is not set -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_CTTYHACK=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -# CONFIG_SH_MATH_SUPPORT_64 is not set -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_FEATURE_SH_HISTFILESIZE is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -# CONFIG_FEATURE_SYSLOGD_CFG is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -# CONFIG_FEATURE_KLOGD_KLOGCTL is not set -# CONFIG_LOGGER is not set diff --git a/testing/nspr/PKGBUILD b/testing/nspr/PKGBUILD deleted file mode 100644 index 61895f9fa..000000000 --- a/testing/nspr/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 150956 2012-02-24 10:04:36Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -pkgname=nspr -pkgver=4.9 -pkgrel=1 -pkgdesc="Netscape Portable Runtime" -arch=(i686 x86_64) -url="http://www.mozilla.org/projects/nspr/" -license=('MPL' 'GPL') -depends=('glibc') -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=('aa0c960b23a9d66a3c30c3e6ba80a99a' - 'bce1611f3117b53fc904cab549c09967') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - if [ "$CARCH" = "x86_64" ]; then - confflags="--enable-64bit" - else - confflags="" - fi - - sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - -i mozilla/nsprpub/config/rules.mk - - ./mozilla/nsprpub/configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --includedir=/usr/include/nspr \ - --enable-optimize \ - --disable-debug ${confflags} - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - NSPR_LIBS=`./config/nspr-config --libs` - NSPR_CFLAGS=`./config/nspr-config --cflags` - NSPR_VERSION=`./config/nspr-config --version` - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \ - -e "s,%prefix%,/usr," \ - -e "s,%exec_prefix%,/usr/bin," \ - -e "s,%includedir%,/usr/include/nspr," \ - -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \ - -e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \ - -e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc" - - chmod 644 ${pkgdir}/usr/lib/*.a - - rm -rf "${pkgdir}/usr/bin/compile-et.pl" \ - "${pkgdir}/usr/bin/prerr.properties" \ - "${pkgdir}/usr/share/aclocal/nspr.m4" \ - "${pkgdir}/usr/include/nspr/md" -} diff --git a/testing/nspr/nspr.pc.in b/testing/nspr/nspr.pc.in deleted file mode 100644 index 1d8f4a0ca..000000000 --- a/testing/nspr/nspr.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSPR -Description: The Netscape Portable Runtime -Version: %NSPR_VERSION% -Libs: %FULL_NSPR_LIBS% -Cflags: %FULL_NSPR_CFLAGS% diff --git a/testing/nss/PKGBUILD b/testing/nss/PKGBUILD deleted file mode 100644 index d24c3c91c..000000000 --- a/testing/nss/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# $Id: PKGBUILD 150999 2012-02-24 13:00:04Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=nss -pkgver=3.13.3 -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.9 -depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh') -makedepends=('perl') -options=('!strip') -source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}/src/${pkgname}-${pkgver}.tar.gz - nss-no-rpath.patch - nss.pc.in - nss-config.in - add_spi+cacert_ca_certs.patch - ssl-renegotiate-transitional.patch) -sha1sums=('6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6' - 'c8fcdb153af9d39689243119adb475905a657284' - 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' - 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' - '3d89f29e321d7df7269b7ae6d219654543feaa6a' - '8a964a744ba098711b80c0d279a2993524e8eb92') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}/mozilla" - # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only - patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch" - # Adds transitional SSL renegotiate support - patch from Debian - patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch" - # Removes rpath - patch -Np2 -i "${srcdir}/nss-no-rpath.patch" - - # Respect LDFLAGS - sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ - -i security/coreconf/rules.mk - - # Generate certdata.c from certdata.txt - cd security/nss/lib/ckfw/builtins - make generate - - cd "${srcdir}/${pkgname}-${pkgver}" - export BUILD_OPT=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` - export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` - export XCFLAGS="${CFLAGS}" - - [ "$CARCH" = "x86_64" ] && export USE_64=1 - - make -j 1 -C mozilla/security/coreconf - make -j 1 -C mozilla/security/dbm - make -j 1 -C mozilla/security/nss -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/include/nss" - - NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - - sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr/bin,g" \ - -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,${pkgver},g" \ - -e "s,%NSS_VERSION%,${pkgver},g" > \ - "${pkgdir}/usr/lib/pkgconfig/nss.pc" - ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" - chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc - - sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \ - -e "s,@prefix@,/usr/bin,g" \ - -e "s,@exec_prefix@,/usr/bin,g" \ - -e "s,@includedir@,/usr/include/nss,g" \ - -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ - -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ - -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ - > "${pkgdir}/usr/bin/nss-config" - chmod 755 "${pkgdir}/usr/bin/nss-config" - - for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ - libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so - do - install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" - done - - install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/" - install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/" - - for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do - install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" - done - - install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" -} diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/testing/nss/add_spi+cacert_ca_certs.patch deleted file mode 100644 index bf7e2ca16..000000000 --- a/testing/nss/add_spi+cacert_ca_certs.patch +++ /dev/null @@ -1,568 +0,0 @@ -## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adds the SPI Inc. and CAcert.org CA certificates - -Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -=================================================================== ---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:32:14.000000000 +0100 -+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:35:07.577861466 +0100 -@@ -23475,3 +23475,558 @@ - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 1 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 -+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 -+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 -+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 -+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 -+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 -+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 -+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 -+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 -+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 -+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 -+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 -+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 -+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 -+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 -+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 -+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 -+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 -+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 -+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 -+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 -+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 -+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 -+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 -+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 -+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 -+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 -+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 -+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 -+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 -+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 -+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 -+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 -+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 -+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 -+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 -+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 -+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 -+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 -+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 -+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 -+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 -+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 -+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 -+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 -+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 -+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 -+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 -+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 -+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 -+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 -+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 -+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 -+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 -+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 -+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 -+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 -+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 -+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 -+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 -+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 -+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 -+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 -+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 -+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 -+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 -+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 -+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 -+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 -+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 -+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 -+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 -+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 -+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 -+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 -+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 -+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 -+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 -+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 -+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 -+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 -+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 -+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 -+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 -+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 -+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 -+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 -+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 -+\103 -+END -+ -+# Trust for Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 -+\166\316\217\063 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 3 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 -+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 -+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 -+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 -+\063\040\122\157\157\164 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 -+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 -+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 -+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 -+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 -+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 -+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 -+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 -+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 -+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 -+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 -+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 -+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 -+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 -+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 -+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 -+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 -+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 -+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 -+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 -+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 -+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 -+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 -+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 -+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 -+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 -+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 -+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 -+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 -+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 -+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 -+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 -+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 -+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 -+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 -+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 -+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 -+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 -+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 -+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 -+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 -+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 -+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 -+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 -+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 -+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 -+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 -+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 -+END -+ -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 -+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 -+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 -+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 -+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 -+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 -+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 -+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 -+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 -+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 -+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 -+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 -+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 -+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 -+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 -+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 -+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 -+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 -+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 -+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 -+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 -+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 -+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 -+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 -+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 -+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 -+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 -+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 -+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 -+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 -+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 -+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 -+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 -+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 -+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 -+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 -+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 -+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 -+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 -+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 -+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 -+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 -+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 -+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 -+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 -+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 -+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 -+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 -+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 -+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 -+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 -+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 -+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 -+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 -+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 -+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 -+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 -+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 -+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 -+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 -+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 -+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 -+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 -+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 -+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 -+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 -+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 -+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 -+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 -+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 -+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 -+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 -+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 -+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 -+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 -+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 -+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 -+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 -+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 -+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 -+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 -+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 -+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 -+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 -+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 -+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 -+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 -+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 -+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 -+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 -+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 -+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 -+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 -+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 -+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 -+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 -+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 -+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 -+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 -+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 -+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 -+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 -+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 -+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 -+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 -+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 -+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 -+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 -+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 -+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 -+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 -+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 -+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 -+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 -+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 -+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 -+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 -+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 -+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 -+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 -+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 -+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 -+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 -+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 -+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 -+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 -+\243\140 -+END -+ -+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 -+\251\220\103\034 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/testing/nss/nss-config.in b/testing/nss/nss-config.in deleted file mode 100644 index f8f893e71..000000000 --- a/testing/nss/nss-config.in +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ - -major_version=@MOD_MAJOR_VERSION@ -minor_version=@MOD_MINOR_VERSION@ -patch_version=@MOD_PATCH_VERSION@ - -usage() -{ - cat <<EOF -Usage: nss-config [OPTIONS] [LIBRARIES] -Options: - [--prefix[=DIR]] - [--exec-prefix[=DIR]] - [--includedir[=DIR]] - [--libdir[=DIR]] - [--version] - [--libs] - [--cflags] -Dynamic Libraries: - nss - nssutil - ssl - smime -EOF - exit $1 -} - -if test $# -eq 0; then - usage 1 1>&2 -fi - -lib_ssl=yes -lib_smime=yes -lib_nss=yes -lib_nssutil=yes - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --includedir=*) - includedir=$optarg - ;; - --includedir) - echo_includedir=yes - ;; - --libdir=*) - libdir=$optarg - ;; - --libdir) - echo_libdir=yes - ;; - --version) - echo ${major_version}.${minor_version}.${patch_version} - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - ssl) - lib_ssl=yes - ;; - smime) - lib_smime=yes - ;; - nss) - lib_nss=yes - ;; - nssutil) - lib_nssutil=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -# Set variables that may be dependent upon other variables -if test -z "$exec_prefix"; then - exec_prefix=`pkg-config --variable=exec_prefix nss` -fi -if test -z "$includedir"; then - includedir=`pkg-config --variable=includedir nss` -fi -if test -z "$libdir"; then - libdir=`pkg-config --variable=libdir nss` -fi - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_includedir" = "yes"; then - echo $includedir -fi - -if test "$echo_libdir" = "yes"; then - echo $libdir -fi - -if test "$echo_cflags" = "yes"; then - echo -I$includedir -fi - -if test "$echo_libs" = "yes"; then - libdirs="-Wl,-rpath-link,$libdir -L$libdir" - if test -n "$lib_ssl"; then - libdirs="$libdirs -lssl${major_version}" - fi - if test -n "$lib_smime"; then - libdirs="$libdirs -lsmime${major_version}" - fi - if test -n "$lib_nss"; then - libdirs="$libdirs -lnss${major_version}" - fi - if test -n "$lib_nssutil"; then - libdirs="$libdirs -lnssutil${major_version}" - fi - echo $libdirs -fi - diff --git a/testing/nss/nss-no-rpath.patch b/testing/nss/nss-no-rpath.patch deleted file mode 100644 index 35ea57315..000000000 --- a/testing/nss/nss-no-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 -+++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 -@@ -52,9 +52,9 @@ - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' - endif - endif - diff --git a/testing/nss/nss.pc.in b/testing/nss/nss.pc.in deleted file mode 100644 index d47b9e146..000000000 --- a/testing/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 -Cflags: -I${includedir} diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch deleted file mode 100644 index f457c5551..000000000 --- a/testing/nss/ssl-renegotiate-transitional.patch +++ /dev/null @@ -1,21 +0,0 @@ -Enable transitional scheme for ssl renegotiation: - -(from mozilla/security/nss/lib/ssl/ssl.h) -Disallow unsafe renegotiation in server sockets only, but allow clients -to continue to renegotiate with vulnerable servers. -This value should only be used during the transition period when few -servers have been upgraded. - -diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c -index f1d1921..c074360 100644 ---- a/mozilla/security/nss/lib/ssl/sslsock.c -+++ b/mozilla/security/nss/lib/ssl/sslsock.c -@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { - PR_FALSE, /* noLocks */ - PR_FALSE, /* enableSessionTickets */ - PR_FALSE, /* enableDeflate */ -- 2, /* enableRenegotiation (default: requires extension) */ -+ 3, /* enableRenegotiation (default: transitional) */ - PR_FALSE, /* requireSafeNegotiation */ - }; - diff --git a/testing/shadow/LICENSE b/testing/shadow/LICENSE deleted file mode 100644 index c5ab15a56..000000000 --- a/testing/shadow/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 1990 - 1994, Julianne Frances Haugh - * Copyright (c) 1996 - 2000, Marek Michałkiewicz - * Copyright (c) 2001 - 2006, Tomasz Kłoczko - * Copyright (c) 2007 - 2009, Nicolas François - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the copyright holders or contributors may not be used to - * endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD deleted file mode 100644 index 5757df664..000000000 --- a/testing/shadow/PKGBUILD +++ /dev/null @@ -1,132 +0,0 @@ -# $Id: PKGBUILD 151351 2012-02-25 15:53:24Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> - -pkgname=shadow -pkgver=4.1.5 -pkgrel=4 -pkgdesc="Password and account management tool suite with support for shadow files and PAM" -arch=('i686' 'x86_64') -url='http://pkg-shadow.alioth.debian.org/' -license=('BSD') -groups=('base') -depends=('bash' 'pam' 'acl') -backup=(etc/login.defs - etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel} - etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} - etc/pam.d/{chfn,chgpasswd,groupmems,chsh} - etc/default/useradd) -options=('!libtool') -install='shadow.install' -source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig} - LICENSE - adduser - chgpasswd - chpasswd - defaults.pam - login - login.defs - newusers - passwd - shadow.cron.daily - useradd.defaults - nscd-error-reporting.patch - xstrdup.patch - shadow-strncpy-usage.patch - shadow-add-missing-include.patch - userdel-avoid-bad-mem-access.patch - write-utmp-wtmp-entries.patch) -sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41' - '0a31aafceb948a91fe7370a6378cafd6fd883145' - '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' - '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' - '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' - '12427b1ca92a9b85ca8202239f0d9f50198b818f' - '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - '895aad07c192b288b457e19dd7b8c55841b4ad22' - 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' - '12427b1ca92a9b85ca8202239f0d9f50198b818f' - '611be25d91c3f8f307c7fe2485d5f781e5dee75f' - '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' - '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' - 'ae6eebb842c433ac4022c493294a13ed68e06acc' - '6010fffeed1fc6673ad9875492e1193b1a847b53' - '21e12966a6befb25ec123b403cd9b5c492fe5b16' - '0697a21f7519de30821da7772677035652df4ad2' - 'e1dd93d82c6eba76b5f17a9fefad4bbc513cff5b' - 'bcef8558c9123b396d2d4df26c815a951f97a91a') - -build() { - cd "$pkgname-$pkgver" - - # avoid transitive linking issues with binutils 2.22 - sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am - - # link to glibc's crypt(3) - LDFLAGS+=" -lcrypt" - - # need to offer these upstream - patch -Np1 <"$srcdir/xstrdup.patch" - patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" - - # backports queued for 4.1.5.1 - patch -Np1 <"$srcdir/shadow-add-missing-include.patch" - patch -Np1 <"$srcdir/nscd-error-reporting.patch" - - # sent to ML - patch -Np0 <"$srcdir/userdel-avoid-bad-mem-access.patch" - - # revert to fix FS#28543 - patch -RNp1 <"$srcdir/write-utmp-wtmp-entries.patch" - - # supress etc/pam.d/*, we provide our own - sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in - - ./configure \ - --prefix=/usr \ - --libdir=/lib \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --with-libpam \ - --without-selinux - - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # license - install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE" - - # interactive useradd - install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser" - - # useradd defaults - install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" - - # cron job - install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow" - - # login.defs - install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" - - # PAM config - custom - install -dm755 "$pkgdir/etc/pam.d" - install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{login,passwd,chgpasswd,chpasswd,newusers} - - # PAM config - from tarball - install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" - - # we use the 'useradd' PAM file for other similar utilities - for file in chage chfn chsh groupadd groupdel groupmod shadow \ - useradd usermod userdel; do - install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" - done - - # Remove su - using su from coreutils instead - rm "$pkgdir/bin/su" - find "$pkgdir/usr/share/man" -name 'su.1' -delete -} diff --git a/testing/shadow/adduser b/testing/shadow/adduser deleted file mode 100644 index a5d7fd4fa..000000000 --- a/testing/shadow/adduser +++ /dev/null @@ -1,399 +0,0 @@ -#!/bin/bash -# -# Copyright 1995 Hrvoje Dogan, Croatia. -# Copyright 2002, 2003, 2004 Stuart Winter, West Midlands, England, UK. -# Copyright 2004 Slackware Linux, Inc., Concord, CA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -########################################################################## -# Program: /usr/sbin/adduser -# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux -# Author : Stuart Winter <stuart@polplex.co.uk> -# Based on the original Slackware adduser by Hrvoje Dogan -# with modifications by Patrick Volkerding -# Version: 1.09 -########################################################################## -# Usage..: adduser [<new_user_name>] -########################################################################## -# History # -########### -# v1.09 - 07/06/04 -# * Added standard Slackware script licence to the head of this file. -# v1.08 - 25/04/04 -# * Disallow user names that begin with a numeric because useradd -# (from shadow v4.03) does not allow them. <sw> -# v1.07 - 07/03/03 -# * When supplying a null string for the uid (meaning 'Choose next available'), -# if there were file names in the range 'a-z' in the pwd then the -# egrep command considered these files rather than the null string. -# The egrep expression is now in quotes. -# Reported & fixed by Vadim O. Ustiansky <sw> -# v1.06 - 31/03/03 -# * Ask to chown user.group the home directory if it already exists. -# This helps reduce later confusion when adding users whose home dir -# already exists (mounted partition for example) and is owned -# by a user other than the user to which the directory is being -# assigned as home. Default is not to chown. -# Brought to my attention by mRgOBLIN. <sw> -# v1.05 - 04/01/03 -# * Advise & prevent users from creating logins with '.' characters -# in the user name. <sw> -# * Made pending account creation info look neater <sw> -# v1.04 - 09/06/02 -# * Catered for shadow-4.0.3's 'useradd' binary that no longer -# will let you create a user that has any uppercase chars in it -# This was reported on the userlocal.org forums -# by 'xcp' - thanks. <sw,pjv> -# v1.03 - 20/05/02 -# * Support 'broken' (null lines in) /etc/passwd and -# /etc/group files <sw> -# * For recycling UIDs (default still 'off'), we now look in -# /etc/login.defs for the UID_MIN value and use it -# If not found then default to 1000 <sw> -# v1.02 - 10/04/02 -# * Fix user-specified UID bug. <pjv> -# v1.01 - 23/03/02 -# * Match Slackware indenting style, simplify. <pjv> -# v1.00 - 22/03/02 -# * Created -####################################################################### - -# Path to files -pfile=/etc/passwd -gfile=/etc/group -sfile=/etc/shells - -# Paths to binaries -useradd=/usr/sbin/useradd -chfn=/usr/bin/chfn -passwd=/usr/bin/passwd - -# Defaults -defhome=/home -defshell=/bin/bash -defgroup=users - -# Determine what the minimum UID is (for UID recycling) -# (we ignore it if it's not at the beginning of the line (i.e. commented out with #)) -export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)" -# If we couldn't find it, set it to the default of 1000 -if [ -z "$recycleUIDMIN" ]; then - export recycleUIDMIN=1000 # this is the default from Slackware's /etc/login.defs -fi - - -# This setting enables the 'recycling' of older unused UIDs. -# When you userdel a user, it removes it from passwd and shadow but it will -# never get used again unless you specify it expliticly -- useradd (appears to) just -# look at the last line in passwd and increment the uid. I like the idea of -# recycling uids but you may have very good reasons not to (old forgotten -# confidential files still on the system could then be owned by this new user). -# We'll set this to no because this is what the original adduser shell script -# did and it's what users expect. -recycleuids=no - -# Function to read keyboard input. -# bash1 is broken (even ash will take read -ep!), so we work around -# it (even though bash1 is no longer supported on Slackware). -function get_input() { - local output - if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then - echo -n "${1} " >&2 # fudge for use with bash v1 - read output - else # this should work with any other /bin/sh - read -ep "${1} " output - fi - echo $output -} - -# Function to display the account info -function display () { - local goose - goose="$(echo $2 | cut -d ' ' -f 2-)" # lop off the prefixed argument useradd needs - echo -n "$1 " - # If it's null then display the 'other' information - if [ -z "$goose" -a ! -z "$3" ]; then - echo "$3" - else - echo "$goose" - fi -} - -# Function to check whether groups exist in the /etc/group file -function check_group () { - local got_error group - if [ ! -z "$@" ]; then - for group in $@ ; do - local uid_not_named="" uid_not_num="" - grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes - grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes - if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then - echo "- Group '$group' does not exist" - got_error=yes - fi - done - fi - # Return exit code of 1 if at least one of the groups didn't exist - if [ ! -z "$got_error" ]; then - return 1 - fi -} - -#: Read the login name for the new user :# -# -# Remember that most Mail Transfer Agents are case independant, so having -# 'uSer' and 'user' may cause confusion/things to break. Because of this, -# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase, -# and we must reject them, too. - -# Set the login variable to the command line param -echo -LOGIN="$1" -needinput=yes -while [ ! -z $needinput ]; do - if [ -z "$LOGIN" ]; then - while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done - fi - grep "^${LOGIN}:" $pfile >/dev/null 2>&1 # ensure it's not already used - if [ $? -eq 0 ]; then - echo "- User '$LOGIN' already exists; please choose another" - unset LOGIN - elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then - echo "- User names cannot begin with a number; please choose another" - unset LOGIN - elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase - echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another" - unset LOGIN - elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then - echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another" - unset LOGIN - else - unset needinput - fi -done - -# Display the user name passed from the shell if it hasn't changed -if [ "$1" = "$LOGIN" ]; then - echo "Login name for new user: $LOGIN" -fi - -#: Get the UID for the user & ensure it's not already in use :# -# -# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because -# when you change password for the uid, it finds the first match in /etc/passwd -# which isn't necessarily the correct user -# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")" - grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "- That UID is already in use; please choose another" - elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then - echo "- UIDs are numerics only" - else - unset needinput - fi -done -# If we were given a UID, then syntax up the variable to pass to useradd -if [ ! -z "$_UID" ]; then - U_ID="-u ${_UID}" -else - # Will we be recycling UIDs? - if [ "$recycleuids" = "yes" ]; then - U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)" - fi -fi - -#: Get the initial group for the user & ensure it exists :# -# -# We check /etc/group for both the text version and the group ID number -echo -needinput=yes -while [ ! -z "$needinput" ]; do - GID="$(get_input "Initial group [ ${defgroup} ]:")" - check_group "$GID" - if [ $? -gt 0 ]; then - echo "- Please choose another" - else - unset needinput - fi -done -# Syntax the variable ready for useradd -if [ -z "$GID" ]; then - GID="-g ${defgroup}" -else - GID="-g ${GID}" -fi - -#: Get additional groups for the user :# -# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - AGID="$(get_input "Additional groups (comma separated) []:")" - AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing - if [ ! -z "$AGID" ]; then - check_group "$AGID" # check all groups at once (treated as N # of params) - if [ $? -gt 0 ]; then - echo "- Please re-enter the group(s)" - else - unset needinput # we found all groups specified - AGID="-G $(echo "$AGID" | tr ' ' ,)" - fi - else - unset needinput # we don't *have* to have additional groups - fi -done - -#: Get the new user's home dir :# -# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")" - if [ -z "$HME" ]; then - HME="${defhome}/${LOGIN}" - fi - # Warn the user if the home dir already exists - if [ -d "$HME" ]; then - echo "- Warning: '$HME' already exists !" - getyn="$(get_input " Do you wish to change the home directory path ? (Y/n) ")" - if [ "$(echo $getyn | grep -i "n")" ]; then - unset needinput - # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME - getyn="$(get_input " Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")" - if [ "$(echo $getyn | grep -i "y")" ]; then - CHOWNHOMEDIR=$HME # set this to the home directory - fi - fi - else - unset needinput - fi -done -HME="-d ${HME}" - -#: Get the new user's shell :# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - unset got_error - SHL="$(get_input "Shell [ ${defshell} ]")" - if [ -z "$SHL" ]; then - SHL="${defshell}" - fi - # Warn the user if the shell doesn't exist in /etc/shells or as a file - if [ -z "$(grep "^${SHL}$" $sfile)" ]; then - echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)" - got_error=yes - fi - if [ ! -f "$SHL" ]; then - echo "- Warning: ${SHL} does not exist as a file" - got_error=yes - fi - if [ ! -z "$got_error" ]; then - getyn="$(get_input " Do you wish to change the shell ? (Y/n) ")" - if [ "$(echo $getyn | grep -i "n")" ]; then - unset needinput - fi - else - unset needinput - fi -done -SHL="-s ${SHL}" - -#: Get the expiry date :# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")" - if [ ! -z "$EXP" ]; then - # Check to see whether the expiry date is in the valid format - if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then - echo "- That is not a valid expiration date" - else - unset needinput - EXP="-e ${EXP}" - fi - else - unset needinput - fi -done - -# Display the info about the new impending account -echo -echo "New account will be created as follows:" -echo -echo "---------------------------------------" -display "Login name.......: " "$LOGIN" -display "UID..............: " "$_UID" "[ Next available ]" -display "Initial group....: " "$GID" -display "Additional groups: " "$AGID" "[ None ]" -display "Home directory...: " "$HME" -display "Shell............: " "$SHL" -display "Expiry date......: " "$EXP" "[ Never ]" -echo - -echo "This is it... if you want to bail out, hit Control-C. Otherwise, press" -echo "ENTER to go ahead and make the account." -read junk - -echo -echo "Creating new account..." -echo -echo - -# Add the account to the system -CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN"" -$CMD - -if [ $? -gt 0 ]; then - echo "- Error running useradd command -- account not created!" - echo "(cmd: $CMD)" - exit 1 -fi - -# chown the home dir ? We can only do this once the useradd has -# completed otherwise the user name doesn't exist. -if [ ! -z "${CHOWNHOMEDIR}" ]; then - chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}" -fi - -# Set the finger information -$chfn "$LOGIN" -if [ $? -gt 0 ]; then - echo "- Warning: an error occurred while setting finger information" -fi - -# Set a password -$passwd "$LOGIN" -if [ $? -gt 0 ]; then - echo "* WARNING: An error occured while setting the password for" - echo " this account. Please manually investigate this *" - exit 1 -fi - -echo -echo -echo "Account setup complete." -exit 0 - diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd deleted file mode 100644 index 8f49f5cc8..000000000 --- a/testing/shadow/chgpasswd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -account required pam_permit.so -password include system-auth diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd deleted file mode 100644 index 5d447985a..000000000 --- a/testing/shadow/chpasswd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so sha512 shadow diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam deleted file mode 100644 index a7bf8a4a5..000000000 --- a/testing/shadow/defaults.pam +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/testing/shadow/login b/testing/shadow/login deleted file mode 100644 index b8555f89c..000000000 --- a/testing/shadow/login +++ /dev/null @@ -1,21 +0,0 @@ -#%PAM-1.0 -auth required pam_securetty.so -auth requisite pam_nologin.so -auth required pam_unix.so nullok -auth required pam_tally.so onerr=succeed file=/var/log/faillog -# use this to lockout accounts for 10 minutes after 3 failed attempts -#auth required pam_tally.so deny=2 unlock_time=600 onerr=succeed file=/var/log/faillog -account required pam_access.so -account required pam_time.so -account required pam_unix.so -#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so sha512 shadow use_authtok -session required pam_unix.so -session required pam_env.so -session required pam_motd.so -session required pam_limits.so -session optional pam_mail.so dir=/var/spool/mail standard -session optional pam_lastlog.so -session optional pam_loginuid.so --session optional pam_ck_connector.so nox11 --session optional pam_systemd.so diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs deleted file mode 100644 index 2500ee447..000000000 --- a/testing/shadow/login.defs +++ /dev/null @@ -1,197 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. -# If unspecified, some arbitrary (and possibly incorrect) value will -# be assumed. All other items are optional - if not specified then -# the described action or option will be inhibited. -# -# Comment lines (lines beginning with "#") and blank lines are ignored. -# -# Modified for Linux. --marekm - -# -# Delay in seconds before being allowed another attempt after a login failure -# -FAIL_DELAY 3 - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# QMAIL_DIR is for Qmail -# -#QMAIL_DIR Maildir -MAIL_DIR /var/spool/mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# *REQUIRED* The default PATH settings, for superuser and normal users. -# -# (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# UMASK Default "umask" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -UMASK 077 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 -# System accounts -SYS_UID_MIN 500 -SYS_UID_MAX 999 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 1000 -GID_MAX 60000 -# System accounts -SYS_GID_MIN 500 -SYS_GID_MAX 999 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 5 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - diff --git a/testing/shadow/newusers b/testing/shadow/newusers deleted file mode 100644 index 5d447985a..000000000 --- a/testing/shadow/newusers +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so sha512 shadow diff --git a/testing/shadow/nscd-error-reporting.patch b/testing/shadow/nscd-error-reporting.patch deleted file mode 100644 index a4075756e..000000000 --- a/testing/shadow/nscd-error-reporting.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/upstream/trunk/lib/nscd.c b/upstream/trunk/lib/nscd.c -index 227c205..7adb58f 100644 ---- a/lib/nscd.c -+++ b/lib/nscd.c -@@ -39,8 +39,11 @@ int nscd_flush_cache (const char *service) - /* nscd is not installed, or it is installed but uses an - interpreter that is missing. Probably the former. */ - return 0; -+ } else if (code == 1) { -+ /* nscd is installed, but it isn't active. */ -+ return 0; - } else if (code != 0) { -- (void) fprintf (stderr, _("%s: nscd exited with status %d"), -+ (void) fprintf (stderr, _("%s: nscd exited with status %d\n"), - Prog, code); - (void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog); - return -1; diff --git a/testing/shadow/passwd b/testing/shadow/passwd deleted file mode 100644 index ab56da496..000000000 --- a/testing/shadow/passwd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so sha512 shadow use_authtok -password required pam_unix.so sha512 shadow nullok diff --git a/testing/shadow/shadow-add-missing-include.patch b/testing/shadow/shadow-add-missing-include.patch deleted file mode 100644 index 5c9e946ef..000000000 --- a/testing/shadow/shadow-add-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur shadow-4.1.4.2+svn3283/libmisc/copydir.c shadow-4.1.4.2+svn3283.new/libmisc/copydir.c ---- shadow-4.1.4.2+svn3283/libmisc/copydir.c 2010-09-05 11:35:26.000000000 -0400 -+++ shadow-4.1.4.2+svn3283.new/libmisc/copydir.c 2011-06-26 01:26:52.000000000 -0400 -@@ -34,6 +34,7 @@ - - #ident "$Id: copydir.c 3283 2010-09-05 15:34:42Z nekral-guest $" - -+#include <stdarg.h> - #include <assert.h> - #include <sys/stat.h> - #include <sys/types.h> diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch deleted file mode 100644 index 5aba8fa01..000000000 --- a/testing/shadow/shadow-strncpy-usage.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c ---- shadow-4.1.5/src/usermod.c.orig 2012-02-13 08:19:43.792146449 -0500 -+++ shadow-4.1.5/src/usermod.c 2012-02-13 08:21:19.375114500 -0500 -@@ -182,7 +182,7 @@ - struct tm *tp; - - if (date < 0) { -- strncpy (buf, "never", maxsize); -+ strncpy (buf, "never", maxsize - 1); - } else { - time_t t = (time_t) date; - tp = gmtime (&t); -diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c ---- shadow-4.1.5/src/login.c.orig 2012-02-13 08:19:50.951994454 -0500 -+++ shadow-4.1.5/src/login.c 2012-02-13 08:21:04.490430937 -0500 -@@ -752,7 +752,8 @@ - _("%s login: "), hostn); - } else { - strncpy (loginprompt, _("login: "), -- sizeof (loginprompt)); -+ sizeof (loginprompt) - 1); -+ loginprompt[sizeof (loginprompt) - 1] = '\0'; - } - - retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt); diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily deleted file mode 100755 index 1931a793e..000000000 --- a/testing/shadow/shadow.cron.daily +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Verify integrity of password and group files -/usr/sbin/pwck -r -/usr/sbin/grpck -r - diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install deleted file mode 100644 index 14384c333..000000000 --- a/testing/shadow/shadow.install +++ /dev/null @@ -1,9 +0,0 @@ -post_upgrade() { - grpck -r >/dev/null 2>&1 - if [ $? -eq 2 ]; then - printf '%s\n' \ - "==> Warning: /etc/group or /etc/gshadow are inconsistent." \ - " Run 'grpck' to correct this." - fi - return 0 -} diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults deleted file mode 100644 index b800b1777..000000000 --- a/testing/shadow/useradd.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# useradd defaults file for ArchLinux -# original changes by TomK -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel -CREATE_MAIL_SPOOL=no diff --git a/testing/shadow/userdel-avoid-bad-mem-access.patch b/testing/shadow/userdel-avoid-bad-mem-access.patch deleted file mode 100644 index 1d36562b2..000000000 --- a/testing/shadow/userdel-avoid-bad-mem-access.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: src/userdel.c -=================================================================== ---- src/userdel.c (revision 3713) -+++ src/userdel.c (working copy) -@@ -329,26 +329,33 @@ - } - - if (NULL == pwd) { -+ char gr_name[GROUP_NAME_MAX_LENGTH + 1]; -+ -+ /* make a copy of the group name before we delete it. -+ * we can't use ->gr_name after the group is deleted -+ * for logging purposes */ -+ snprintf(gr_name, GROUP_NAME_MAX_LENGTH, "%s", grp->gr_name); -+ - /* - * We can remove this group, it is not the primary - * group of any remaining user. - */ -- if (gr_remove (grp->gr_name) == 0) { -+ if (gr_remove (gr_name) == 0) { - fprintf (stderr, - _("%s: cannot remove entry '%s' from %s\n"), -- Prog, grp->gr_name, gr_dbname ()); -+ Prog, gr_name, gr_dbname ()); - fail_exit (E_GRP_UPDATE); - } - - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_GROUP, Prog, - "deleting group", -- grp->gr_name, AUDIT_NO_ID, -+ gr_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, - "removed group '%s' owned by '%s'\n", -- grp->gr_name, user_name)); -+ gr_name, user_name)); - - #ifdef SHADOWGRP - if (sgr_locate (user_name) != NULL) { -@@ -361,12 +368,12 @@ - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_GROUP, Prog, - "deleting shadow group", -- grp->gr_name, AUDIT_NO_ID, -+ gr_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, - "removed shadow group '%s' owned by '%s'\n", -- grp->gr_name, user_name)); -+ gr_name, user_name)); - - } - #endif /* SHADOWGRP */ diff --git a/testing/shadow/write-utmp-wtmp-entries.patch b/testing/shadow/write-utmp-wtmp-entries.patch deleted file mode 100644 index b4272ca61..000000000 --- a/testing/shadow/write-utmp-wtmp-entries.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: upstream/trunk/src/login.c -=================================================================== ---- a/src/login.c (revision 3437) -+++ b/src/login.c (revision 3438) -@@ -126,10 +126,12 @@ - static void setup_tty (void); - static void process_flags (int argc, char *const *argv); - static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *user); -+#ifndef USE_PAM - static void update_utmp (const char *user, - const char *tty, - const char *host, - /*@null@*/const struct utmp *utent); -+#endif /* ! USE_PAM */ - - #ifndef USE_PAM - static struct faillog faillog; -@@ -471,6 +473,7 @@ - return failent_user; - } - -+#ifndef USE_PAM - /* - * update_utmp - Update or create an utmp entry in utmp, wtmp, utmpw, and - * wtmpx -@@ -496,6 +499,7 @@ - free (utx); - #endif /* USE_UTMPX */ - } -+#endif /* ! USE_PAM */ - - /* - * login - create a new login session for a user -@@ -1208,11 +1212,13 @@ - } - } - -+#ifndef USE_PAM - /* - * The utmp entry needs to be updated to indicate the new status - * of the session, the new PID and SID. - */ - update_utmp (username, tty, hostname, utent); -+#endif /* ! USE_PAM */ - - /* The pwd and spwd entries for the user have been copied. - * diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch deleted file mode 100644 index bce434264..000000000 --- a/testing/shadow/xstrdup.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 -+++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 -@@ -61,5 +61,6 @@ - - char *xstrdup (const char *str) - { -+ if(str == NULL) return NULL; - return strcpy (xmalloc (strlen (str) + 1), str); - } diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD deleted file mode 100644 index 9b871e433..000000000 --- a/testing/util-linux/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 151587 2012-02-27 18:50:38Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=util-linux -pkgver=2.21 -pkgrel=3 -pkgdesc="Miscellaneous system utilities for Linux" -url="http://www.kernel.org/pub/linux/utils/util-linux/" -arch=('i686' 'x86_64') -groups=('base') -depends=('udev') -conflicts=('util-linux-ng') -provides=("util-linux-ng=${pkgver}") -license=('GPL2') -options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.xz - libmount-canonicalize-all-paths-from-fs-tab.patch - lib-canonicalize-always-remove-tailing-slash.patch - libmount-canonicalize-targets-from-fstab-on-mount-a.patch - mount-new-cleanup-mount-a-return-codes.patch - libmount-use-mount.-type-s-for-NFS-only.patch) -optdepends=('perl: for chkdupexe support') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h - - patch -p1 -i ../libmount-canonicalize-all-paths-from-fs-tab.patch - patch -p1 -i ../lib-canonicalize-always-remove-tailing-slash.patch - patch -p1 -i ../libmount-canonicalize-targets-from-fstab-on-mount-a.patch - patch -p1 -i ../mount-new-cleanup-mount-a-return-codes.patch - patch -p1 -i ../libmount-use-mount.-type-s-for-NFS-only.patch - - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --enable-write \ - --enable-raw \ - --disable-wall \ - --enable-new-mount - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - - install -dm755 var/lib/hwclock - - # delete stray empty dir, fixed upstream - rm -r usr/share/man/ru -} -md5sums=('208aa058f4117759d2939d1be7d662fc' - 'c4011222a19b020d9b8465c3c7e443f6' - '8c1bf7b10e22e2b835441e6ae2d804d6' - '7b92423c588ed35229a9a166349c29a9' - 'c483ab2d52609b5857d096b256a5075c' - 'e31037773db7f3244b71db434f60e6f0') diff --git a/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch b/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch deleted file mode 100644 index 3b830a2ad..000000000 --- a/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 28074a0952469aebf021821d95238cfb964d13ff Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 24 Feb 2012 21:26:11 +0100 -Subject: [PATCH 09/12] lib/canonicalize: always remove tailing slash - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - lib/canonicalize.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/lib/canonicalize.c b/lib/canonicalize.c -index ab32c10..fd18af4 100644 ---- a/lib/canonicalize.c -+++ b/lib/canonicalize.c -@@ -174,9 +174,16 @@ canonicalize_path(const char *path) - if (path == NULL) - return NULL; - -- if (!myrealpath(path, canonical, PATH_MAX+1)) -- return strdup(path); -- -+ if (!myrealpath(path, canonical, PATH_MAX+1)) { -+ char *res = strdup(path); -+ if (res) { -+ p = strrchr(res, '/'); -+ /* delete trailing slash */ -+ if (p && p > res && *(p + 1) == '\0') -+ *p = '\0'; -+ } -+ return res; -+ } - - p = strrchr(canonical, '/'); - if (p && strncmp(p, "/dm-", 4) == 0 && isdigit(*(p + 4))) { --- -1.7.9.2 - diff --git a/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch b/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch deleted file mode 100644 index 05961aa35..000000000 --- a/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 59e32a1f240c5f6a1d64d5e71a4a357245c34eaf Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 24 Feb 2012 20:25:43 +0100 -Subject: [PATCH 07/12] libmount: canonicalize all paths from (fs)tab - -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=797216 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - libmount/src/tab.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmount/src/tab.c b/libmount/src/tab.c -index 37f47bd..f10c1de 100644 ---- a/libmount/src/tab.c -+++ b/libmount/src/tab.c -@@ -456,7 +456,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { - char *p; - -- if (!fs->target || !mnt_fs_is_swaparea(fs) || -+ if (!fs->target || mnt_fs_is_swaparea(fs) || - (*fs->target == '/' && *(fs->target + 1) == '\0')) - continue; - --- -1.7.9.2 - diff --git a/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch b/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch deleted file mode 100644 index 46ff55260..000000000 --- a/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6eba938376c2c870d9258ef9d7b6a3690cfa78dd Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 24 Feb 2012 22:52:45 +0100 -Subject: [PATCH 11/12] libmount: canonicalize targets from fstab on mount -a - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - libmount/src/tab.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/libmount/src/tab.c b/libmount/src/tab.c -index 66a9e4d..21b05c7 100644 ---- a/libmount/src/tab.c -+++ b/libmount/src/tab.c -@@ -830,8 +830,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - { - char *root = NULL; - struct libmnt_fs *src_fs; -- const char *src, *tgt; -- char *xsrc = NULL; -+ const char *src; -+ char *xsrc = NULL, *tgt; - int flags = 0, rc = 0; - - assert(tb); -@@ -852,7 +852,7 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - src = xsrc = mnt_resolve_spec(mnt_fs_get_source(fstab_fs), - tb->cache); - -- tgt = mnt_fs_get_target(fstab_fs); -+ tgt = mnt_resolve_path(mnt_fs_get_target(fstab_fs), tb->cache); - - if (tgt && src && root) { - struct libmnt_iter itr; -@@ -870,7 +870,7 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - * network filesystem source paths. - */ - if (t && s && r && -- strcmp(t, tgt) == 0 && -+ streq_except_trailing_slash(t, tgt) && - streq_except_trailing_slash(s, src) && - strcmp(r, root) == 0) - break; -@@ -881,6 +881,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - - if (xsrc && !tb->cache) - free(xsrc); -+ if (!tb->cache) -+ free(tgt); - - free(root); - return rc; --- -1.7.9.2 - diff --git a/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch b/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch deleted file mode 100644 index 9041ab742..000000000 --- a/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9bf9690114b7432144caf815e149e35640bc3ad0 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Mon, 27 Feb 2012 16:43:12 +0100 -Subject: [PATCH] libmount: use mount.<type> -s for NFS only - -Unfortunately, it seems that for example mount.cifs don't care about -the API, so we need exception like the original mount(8). - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - libmount/src/context_mount.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c -index 8cbc25b..a0c5951 100644 ---- a/libmount/src/context_mount.c -+++ b/libmount/src/context_mount.c -@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt) - args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */ - args[i++] = mnt_fs_get_target(cxt->fs); /* 3 */ - -- if (mnt_context_is_sloppy(cxt)) -+ /* -+ * TODO: remove the exception for "nfs", -s is documented -+ * for years should be usable everywhere. -+ */ -+ if (mnt_context_is_sloppy(cxt) && -+ type && startswith(type, "nfs")) - args[i++] = "-s"; /* 4 */ - if (mnt_context_is_fake(cxt)) - args[i++] = "-f"; /* 5 */ --- -1.7.9.2 - diff --git a/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch b/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch deleted file mode 100644 index 274246416..000000000 --- a/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 16b73aae8cb73df2974fd75c2a42ec3b92535851 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 24 Feb 2012 23:03:22 +0100 -Subject: [PATCH 12/12] mount: (new) cleanup mount -a return codes - -New return codes: - - 0 : all mounted (or all ignored) - 64 : some mounted, some failed - 32 : all failed - -Note that already mounted or ignored (filtered out by -t or -O) -filesystems don't affect the final return code. - -The original mount(8) returns 0 instead of 64, so the situation -"some mounted, some failed" cannot be detected. - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/mount.8 | 4 ++++ - sys-utils/mount.c | 23 +++++++++++++++++------ - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/sys-utils/mount.8 b/sys-utils/mount.8 -index f1cff74..d18881b 100644 ---- a/sys-utils/mount.8 -+++ b/sys-utils/mount.8 -@@ -2759,6 +2759,10 @@ mount failure - .TP - .BR 64 - some mount succeeded -+.RE -+ -+The command mount -a returns 0 (all success), 32 (all failed) or 64 (some -+failed, some success). - - .SH NOTES - The syntax of external mount helpers is: -diff --git a/sys-utils/mount.c b/sys-utils/mount.c -index 17991b0..3fbac04 100644 ---- a/sys-utils/mount.c -+++ b/sys-utils/mount.c -@@ -182,6 +182,8 @@ static int mount_all(struct libmnt_context *cxt) - struct libmnt_fs *fs; - int mntrc, ignored, rc = MOUNT_EX_SUCCESS; - -+ int nsucc = 0, nerrs = 0; -+ - itr = mnt_new_iter(MNT_ITER_FORWARD); - if (!itr) { - warn(_("failed to initialize libmount iterator")); -@@ -197,31 +199,40 @@ static int mount_all(struct libmnt_context *cxt) - printf(ignored == 1 ? _("%-25s: ignored\n") : - _("%-25s: already mounted\n"), - tgt); -- - } else if (mnt_context_is_fork(cxt)) { - if (mnt_context_is_verbose(cxt)) - printf("%-25s: mount successfully forked\n", tgt); - } else { -- rc |= mk_exit_code(cxt, mntrc); -+ mk_exit_code(cxt, mntrc); /* to print warnings */ - - if (mnt_context_get_status(cxt)) { -- rc |= MOUNT_EX_SOMEOK; -+ nsucc++; - - if (mnt_context_is_verbose(cxt)) - printf("%-25s: successfully mounted\n", tgt); -- } -+ } else -+ nerrs++; - } - } - - if (mnt_context_is_parent(cxt)) { - /* wait for mount --fork children */ -- int nerrs = 0, nchildren = 0; -+ int nchildren = 0; -+ -+ nerrs = 0, nsucc = 0; - - rc = mnt_context_wait_for_children(cxt, &nchildren, &nerrs); - if (!rc && nchildren) -- rc = nchildren == nerrs ? MOUNT_EX_FAIL : MOUNT_EX_SOMEOK; -+ nsucc = nchildren - nerrs; - } - -+ if (nerrs == 0) -+ rc = MOUNT_EX_SUCCESS; /* all success */ -+ else if (nsucc == 0) -+ rc = MOUNT_EX_FAIL; /* all failed */ -+ else -+ rc = MOUNT_EX_SOMEOK; /* some success, some failed */ -+ - mnt_free_iter(itr); - return rc; - } --- -1.7.9.2 - diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD deleted file mode 100644 index 2e125cbee..000000000 --- a/testing/ypserv/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 151498 2012-02-26 19:05:20Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ypserv -pkgver=2.27 -pkgrel=1 -pkgdesc='Linux NIS Server' -arch=('i686' 'x86_64') -url='http://www.linux-nis.org/nis/ypserv/' -license=('GPL2') -depends=('gdbm' 'openslp' 'inetutils') -optdepends=('gawk: for printcap support') -backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') -source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - confpost.patch - 'yppasswd' - 'ypserv') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../confpost.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup - install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf - install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets - install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv - install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd -} -md5sums=('fd9c43aec932a92be07b723c647b02a4' - '8acb314f30d6e531ac9efa8655f68ccb' - '4bc84c48ed1bb9659698853acb5cfd76' - 'c40befe5932f1b42efaced6b46809303') diff --git a/testing/ypserv/confpost.patch b/testing/ypserv/confpost.patch deleted file mode 100644 index 489e4368a..000000000 --- a/testing/ypserv/confpost.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h ---- ypserv-2.27/conf_post.h.qdbm 2012-02-01 14:18:01.780846425 +0100 -+++ ypserv-2.27/conf_post.h 2012-02-01 14:18:01.780846425 +0100 -@@ -0,0 +1,10 @@ -+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since -+ * libraries gdbm and qdbm have same symbol names. */ -+#undef HAVE_COMPAT_LIBGDBM -+#ifdef HAVE_LIBGDBM -+#define HAVE_COMPAT_LIBGDBM -+#endif -+#ifdef HAVE_LIBQDBM -+#define HAVE_COMPAT_LIBGDBM -+#endif -+ diff --git a/testing/ypserv/yppasswd b/testing/ypserv/yppasswd deleted file mode 100755 index c2b00b2ca..000000000 --- a/testing/ypserv/yppasswd +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting NIS Password Daemon" - /usr/sbin/rpc.yppasswdd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon yppasswd - stat_done - fi - ;; - stop) - stat_busy "Stopping NIS Password Daemon" - killall -q /usr/sbin/rpc.yppasswdd - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon yppasswd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/ypserv/ypserv b/testing/ypserv/ypserv deleted file mode 100755 index c36e6901b..000000000 --- a/testing/ypserv/ypserv +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting NIS Server" - /usr/sbin/ypserv - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ypserv - stat_done - fi - ;; - stop) - stat_busy "Stopping NIS Server" - killall -q /usr/sbin/ypserv - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ypserv - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/~mtjm/debootstrap/PKGBUILD b/~mtjm/debootstrap/PKGBUILD new file mode 100644 index 000000000..8da48c3a0 --- /dev/null +++ b/~mtjm/debootstrap/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Michał Masłowski <mtjm@mtjm.eu> + +pkgname=debootstrap +_version=1.0.29 +_ubuntu=1 +_trisquel=5.0 +_trisquelrev=2 +pkgver=$_version.$_ubuntu.$_trisquel.$_trisquelrev +pkgrel=1 +pkgdesc="Bootstrap a basic Trisquel system" +arch=('any') +url="http://packages.trisquel.info/source/dagda/debootstrap" +license=('custom') +depends=('sh') +makedepends=('makedev') +backup=() +source=("http://archive.trisquel.info/trisquel/pool/main/d/debootstrap/debootstrap_${_version}ubuntu${_ubuntu}+${_trisquel}trisquel${_trisquelrev}.tar.gz") +md5sums=('22f8ddf5e11153c6fae8309a579e3376') + +package() { + cd "$srcdir/source" + sed -i 's;MAKEDEV := /sbin/MAKEDEV;MAKEDEV := /usr/sbin/MAKEDEV;' Makefile # fix Arch compatibility + sed -i 's; consoleonly;;' Makefile # doesn't work, not sure why + make all # not in build, since it needs root priviledges + make DESTDIR="$pkgdir/" install + install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m644 debian/copyright "${pkgdir}/usr/share/licenses/$pkgname" +} + +# vim:set ts=2 sw=2 et: |
