diff options
Diffstat (limited to 'abs')
125 files changed, 1775 insertions, 3413 deletions
diff --git a/abs/core/acl/PKGBUILD b/abs/core/acl/PKGBUILD index 099eb04..96c51fd 100644 --- a/abs/core/acl/PKGBUILD +++ b/abs/core/acl/PKGBUILD @@ -1,35 +1,34 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id$ +# Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl -pkgver=2.2.47 -pkgrel=10 -pkgdesc="Library for filesystem ACL support" -arch=(i686 x86_64) -url="http://oss.sgi.com/projects/xfs/" +pkgver=2.2.51 +pkgrel=1 +pkgdesc="Access control list utilities, libraries and headers" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/acl" license=('LGPL') -groups=('base') -depends=('attr>=2.4.41') +depends=('attr>=2.4.46') replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') options=('!libtool') -source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_${pkgver}-1.tar.gz) -md5sums=('a11e4571a54a0b1ae83010d1e68a64c2') +source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) +sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225') build() { - cd $startdir/src/acl-$pkgver - autoconf - ./configure --prefix=$startdir/pkg/usr - make || return 1 - make prefix=$startdir/pkg/usr/ install install-lib install-dev + cd "${srcdir}"/${pkgname}-${pkgver} - # tidy up - cd $startdir/pkg + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib + make +} - mkdir -v lib - mv -v usr/lib/libacl.so* lib/ - ln -sv ../../lib/libacl.so.1 usr/lib/libacl.so +package() { + cd "${srcdir}/${pkgname}-${pkgver}" - mv -v usr/libexec/libacl.{a,la} usr/lib/ - rm -rf $startdir/pkg/usr/libexec + make DIST_ROOT="${pkgdir}" install install-lib install-dev + + # tidy up + rm -f ${pkgdir}/lib/libacl.a + chmod 0755 ${pkgdir}/lib/libacl.so.*.*.* } diff --git a/abs/core/attr/PKGBUILD b/abs/core/attr/PKGBUILD index 5be563f..229f36f 100644 --- a/abs/core/attr/PKGBUILD +++ b/abs/core/attr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82618 2010-06-15 04:05:25Z allan $ +# $Id$ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=attr -pkgver=2.4.44 +pkgver=2.4.46 pkgrel=1 pkgdesc="Extended attribute support library for ACL support" -arch=(i686 x86_64) -url="http://oss.sgi.com/projects/xfs/" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/attr" license=('LGPL') depends=('glibc') makedepends=('gettext') @@ -13,24 +13,25 @@ replaces=('xfsattr') provides=('xfsattr') conflicts=('xfsattr') options=('!libtool') -source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz) -sha256sums=('e01fa00686072a02dddf994e6217be950f51c1dc0852ad2e210c48b6e8de793a') +source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) +sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f') build() { - cd $srcdir/attr-$pkgver - autoconf - ./configure --prefix=/usr - sed -i -e 's/man2//g' man/Makefile - make || return 1 - make prefix=${pkgdir}/usr install install-lib install-dev + cd "${srcdir}"/${pkgname}-${pkgver} + + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib + make +} - # tidy up - cd "${pkgdir}" +package() { + cd "${srcdir}"/${pkgname}-${pkgver} - mkdir -v lib - mv -v usr/lib/libattr.so* lib/ - ln -sv ../../lib/libattr.so.1 usr/lib/libattr.so + make DIST_ROOT="${pkgdir}" install install-lib install-dev - mv -v usr/libexec/libattr.{a,la} usr/lib/ - rm -rvf usr/libexec + # tidy up + rm -f "${pkgdir}"/lib/libattr.a + chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.* + # remove conflicting manpages + rm -rf "${pkgdir}"/usr/share/man/man2 } diff --git a/abs/core/diffutils/PKGBUILD b/abs/core/diffutils/PKGBUILD index 6f0c432..6cf0ff4 100644 --- a/abs/core/diffutils/PKGBUILD +++ b/abs/core/diffutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79537 2010-05-04 12:05:07Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=diffutils pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Utility programs used for creating patch files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/diffutils" @@ -12,16 +12,16 @@ license=('GPL3') groups=('base') depends=('glibc' 'sh') install=diffutils.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) md5sums=('7624eb7e6b53ea3ce38958a092d2216e') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/ffmpeg-svn/PKGBUILD b/abs/core/ffmpeg-svn/PKGBUILD index 1e9ac93..6d3a132 100644 --- a/abs/core/ffmpeg-svn/PKGBUILD +++ b/abs/core/ffmpeg-svn/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg-svn -pkgver=26326 +pkgver=26402 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') url="http://ffmpeg.org/" license=('GPL') -depends=('bzip2' 'lame' 'sdl' 'libtheora' 'libvorbis' 'faac' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva>=1.0.4' 'openjpeg') -makedepends=('yasm') -options=('force') +depends=('bzip2' 'lame' 'sdl' 'libtheora' 'libvorbis' 'faac' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva>=1.0.4' 'openjpeg' 'rtmpdump') +makedepends=('yasm' 'subversion') +#epoch=1 provides=("ffmpeg=`date +%Y%m%d`") conflicts=('ffmpeg') @@ -31,9 +31,9 @@ build() { msg "SVN checkout done or server timeout" msg "Starting make..." - rm -rf "{$_svnmod}-build" - mkdir "${_svnmod}-build" - cd "${_svnmod}-build" + rm -rf "${srcdir}/${_svnmod}/{$_svnmod}-build" + mkdir -p "${srcdir}/${_svnmod}/${_svnmod}-build" + cd "${srcdir}/${_svnmod}/${_svnmod}-build" "${srcdir}/${_svnmod}/configure" \ --prefix=/usr \ @@ -53,6 +53,7 @@ build() { --enable-libopencore_amrwb \ --enable-libschroedinger \ --enable-libopenjpeg \ + --enable-librtmp \ --enable-version3 \ --enable-nonfree \ --enable-runtime-cpudetect \ @@ -63,7 +64,7 @@ build() { } package() { - cd "${srcdir}/${_svnmod}-build" + cd "${srcdir}/${_svnmod}/${_svnmod}-build" make DESTDIR="${pkgdir}" install || return 1 make DESTDIR="${pkgdir}" install-man || return 1 } diff --git a/abs/core/glib2/PKGBUILD b/abs/core/glib2/PKGBUILD index f1738b7..c3ec618 100644 --- a/abs/core/glib2/PKGBUILD +++ b/abs/core/glib2/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 99447 2010-11-14 19:35:34Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.26.1 +pkgver=2.28.8 pkgrel=1 -pkgdesc="Common C routines used by GTK+ 2.4 and other libs" +pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) license=('LGPL') -depends=('pcre>=8.02') +depends=('pcre>=8.12') makedepends=('pkgconfig' 'python2') +checkdepends=('pygobject' 'dbus-python') options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz glib2.sh glib2.csh) -sha256sums=('7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5' +sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') @@ -25,6 +26,10 @@ build() { --with-pcre=system \ --disable-fam make +} + +package() { + cd "${srcdir}/glib-${pkgver}" make DESTDIR="${pkgdir}" install install -d "${pkgdir}/etc/profile.d" @@ -35,3 +40,9 @@ build() { chmod -x "${_i}" done } + +check() { + cd "${srcdir}/glib-${pkgver}" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' gio/tests/gdbus-testserver.py + make -k check || true +} diff --git a/abs/core/hdparm/PKGBUILD b/abs/core/hdparm/PKGBUILD index b68bffe..4bc267f 100644 --- a/abs/core/hdparm/PKGBUILD +++ b/abs/core/hdparm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97491 2010-10-30 19:08:52Z tpowa $ +# $Id$ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hdparm -pkgver=9.35 +pkgver=9.37 pkgrel=1 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" -arch=('i686' 'x86_64') +arch=(i686 x86_64) depends=('glibc') optdepends=('sh: required by idectl and ultrabayd') source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz @@ -14,31 +14,29 @@ license=('BSD') url="http://sourceforge.net/projects/hdparm/" optdepends=('bash: for wiper.sh script') options=('emptydirs') +md5sums=('0bb94ddd1bedd5c02b1ca62f1caaf6de' + '74e368f384166a7710b447573cda120a') build() { cd ${srcdir}/${pkgname}-${pkgver} - + # Fix Range input/output error when wiping Intel G2 and OCZ drives + patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch + # build - make || return 1 + make } + package() { cd ${srcdir}/${pkgname}-${pkgver} - # install mkdir -p ${pkgdir}/{usr,sbin} make DESTDIR=${pkgdir} install install -m755 contrib/idectl ${pkgdir}/sbin install -m755 contrib/ultrabayd ${pkgdir}/sbin - # install wiper.sh script - # Fix Range input/output error when wiping Intel G2 and OCZ drives - patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch - install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh #install license file install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT } -md5sums=('520996cc36b69212c3907df351296702' - '5b99485ee6881de8e009597bffba7eea') diff --git a/abs/core/hdparm/wiper.sh.2_6.max-ranges.patch b/abs/core/hdparm/wiper.sh.2_6.max-ranges.patch index 61d197b..c55f7b1 100644 --- a/abs/core/hdparm/wiper.sh.2_6.max-ranges.patch +++ b/abs/core/hdparm/wiper.sh.2_6.max-ranges.patch @@ -14,9 +14,9 @@ export verbose=0 commit="" +max_ranges=-1 + destroy_me="" argc=$# arg="" - while [ $argc -gt 0 ]; do @@ -51,6 +52,10 @@ commit=yes elif [ "$1" = "--verbose" ]; then diff --git a/abs/core/jack/PKGBUILD b/abs/core/jack/PKGBUILD index 14cb175..e9f7898 100644 --- a/abs/core/jack/PKGBUILD +++ b/abs/core/jack/PKGBUILD @@ -1,37 +1,39 @@ -# $Id: PKGBUILD 86981 2010-08-08 11:15:35Z schiv $ -# Maintainer: tobias <tobias@archlinux.net> -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id$ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=jack _longname=jack-audio-connection-kit -pkgver=0.118.0 -pkgrel=4 +pkgver=0.121.2 +pkgrel=2 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') license=('GPL' 'LGPL') -depends=('libsamplerate') -makedepends=('doxygen' 'libffado') -optdepends=('libffado: FireWire support') +depends=('libsamplerate' 'readline') +makedepends=('doxygen' 'libffado' 'celt-0.7') +optdepends=('libffado: FireWire support' + 'celt-0.7: NetJACK driver') url="http://jackaudio.org/" options=('!libtool') -provides=("${_longname}=${pkgver}") -replaces=("${_longname}") +provides=("$_longname=$pkgver") +replaces=("$_longname") changelog=$pkgname.changelog -source=(http://jackaudio.org/downloads/${_longname}-${pkgver}.tar.gz) -md5sums=('d58e29a55f285d54e75134cec8e02a10') +source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz") +md5sums=('06c080349455afd4d217d6a8f9393e01') build() { - cd ${srcdir}/${_longname}-${pkgver} + cd "$srcdir/$_longname-$pkgver" - ./configure --prefix=/usr --libdir=/usr/lib - make || return 1 + ./configure --prefix=/usr \ + --libdir=/usr/lib + make } package() { - cd ${srcdir}/${_longname}-${pkgver} + cd "$srcdir/$_longname-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/abs/core/jack/jack.changelog b/abs/core/jack/jack.changelog index 6ad096e..54b9df6 100644 --- a/abs/core/jack/jack.changelog +++ b/abs/core/jack/jack.changelog @@ -1,7 +1,12 @@ -8 Aug 2010 (GMT+8) Ray Rashif <schivmeister@gmail.com> +29 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 0.121.2-2: + Added celt support with celt-0.7 from community + Will not bring celt to extra as it's very unstable + +8 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> * 0.118.0-4 : - Testing build. Built against libffado - for FireWire support (see FS#19626) Removed init scripts (no longer in tarball; unsupported). @@ -13,3 +18,4 @@ * jack.changelog : Added this changelog. + Only important changes will be logged. diff --git a/abs/core/libxft/PKGBUILD b/abs/core/libxft/PKGBUILD index 62bd015..4759400 100644 --- a/abs/core/libxft/PKGBUILD +++ b/abs/core/libxft/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 55090 2009-10-11 22:04:17Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxft -pkgver=2.1.14 +pkgver=2.2.0 pkgrel=1 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" -depends=('fontconfig>=2.6.0' 'libxrender' 'sh') +depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') options=('!libtool') source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2) -md5sums=('254e62a233491e0e1251636536163e20') +sha1sums=('ed29784259f4e26df78141035560ae8a7c62e83f') build() { - cd ${startdir}/src/libXft-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 + cd "${srcdir}/libXft-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libxrandr/PKGBUILD b/abs/core/libxrandr/PKGBUILD index 9c64cc8..8839b6b 100644 --- a/abs/core/libxrandr/PKGBUILD +++ b/abs/core/libxrandr/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 29289 2009-03-07 18:44:39Z jgc $ +# $Id$ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libxrandr -pkgver=1.3.0 +pkgver=1.3.2 pkgrel=1 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" -depends=('libxext>=1.0.5' 'libxrender' 'randrproto>=1.3.0') -makedepends=('pkgconfig') +depends=('libxext' 'libxrender' 'randrproto') +makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -md5sums=('68eb59c3b7524db6ffd78746ee893d1d') +sha1sums=('0c844a4c5237f96794f0c18a5af16dc5ab7a36ec') build() { cd "${srcdir}/libXrandr-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc + make + make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libxtst/PKGBUILD b/abs/core/libxtst/PKGBUILD index bcdf92d..be55b65 100644 --- a/abs/core/libxtst/PKGBUILD +++ b/abs/core/libxtst/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97591 2010-10-31 16:11:54Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxtst pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Testing -- Resource extension library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,6 +18,10 @@ build() { cd "${srcdir}/libXtst-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/libXtst-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index 71a5961..076bac7 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=3 +pkgrel=4 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -58,7 +58,7 @@ build() { cp pause_mythcommflag ${pkgdir}/etc/logrotate.d/ } md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' - '448f7ff4b4acc78e2ada919d8149d014' + '10ad1a4da669adccd01e0be6e5e4a3ed' '9ae2cd7a0c42d57ad8b5f515d7d60196' '1274bad3fb7296f00acd2d44804bad14' '47225fa9b6c953d56f6ede84d921a300' @@ -75,7 +75,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' '15f3143d2b1369da431e4268029aba40' '3d0adf26280cde55a0c47188fff34826' '93aaa2940e33ec9ebb305b839ac46a3e' - '495e44151a06b2cc13e3fa103d6b4a1e' + 'b2c3dd48a4abb976eda2d5fbf22a173a' 'b527b01d119d3bc33b8fa69bdf1082bb' 'c537c44156d8404016cc4b405b092d45' '4e66f302a77f1a857476e7f289d0c157' diff --git a/abs/core/linhes-scripts/screenshooter.sh b/abs/core/linhes-scripts/screenshooter.sh index 72f6cc0..1cb7a78 100644..100755 --- a/abs/core/linhes-scripts/screenshooter.sh +++ b/abs/core/linhes-scripts/screenshooter.sh @@ -5,6 +5,9 @@ # Email: bob@stormlogic.com # # If you run into problems with this script, please send me email +# +# Maintained by Michael Hanson <mihanson@linhes.org> +# # This is alpha code to auto-generate thumbnails for previews in MythVideo. # It won't currently work on some filenames that have spaces in them. @@ -24,42 +27,44 @@ Usage() { echo "USAGE:" - echo `basename $0` "-v PATHNAME [-s SECONDS] [-c] [-b HOSTNAME] [-u USERNAME] [-p PASSWORD] [-o]" - echo "-v: pathname to Video" + echo `basename $0` "-f FILENAME [-s SECONDS] [-c] [-b HOSTNAME] [-u USERNAME] [-p PASSWORD] [-v]" + echo "-f: video filename" echo "-s: number of Seconds to skip before capturing (270 by default)" echo "-c: Clobber any previous screenshot found for this video (off by default)" - echo "-b: mysql server (Backend) hostname (localhost by default)" + echo "-b: mysql server (Backend) hostname (default: dbhost in /etc/systemconfig)" echo "-u: mysql Username (mythtv by default)" echo "-p: mysql Password (mythtv by default)" - echo "-o: verbOse mode (off by default)" + echo "-v: verbose mode (off by default)" echo "-x: check for valid video eXtension (off by default)" echo - echo "EXAMPLE: $0 -v /myth/video/HDTV/shuttle.mpg -c -s 30" + echo "EXAMPLE: $0 -f shuttle.mpg -c -s 30" exit 3 } +. /etc/systemconfig + if [ -z $1 ]; then Usage fi -V_MISSING=1 +F_MISSING=1 -while getopts "v:sbupochx" FLAG ; do +while getopts "f:sbupvcx" FLAG ; do case "$FLAG" in - v) VIDEO_PATHNAME="$OPTARG" - V_MISSING=0;; + f) FILENAME="$OPTARG" + F_MISSING=0;; s) SKIPAHEAD="$OPTARG";; c) CLOBBER=1;; b) BACKEND_HOSTNAME="$OPTARG";; u) DBUSERNAME="$OPTARG";; p) DBPASSWORD="$OPTARG";; - o) VERBOSE=1;; + v) VERBOSE=1;; x) EXTENSION_CHECK=1;; *) Usage;; esac done -if [ $V_MISSING == 1 ]; then +if [ $F_MISSING == 1 ]; then Usage fi @@ -68,82 +73,75 @@ fi # SKIPAHEAD is the number of seconds to skip ahead before starting the frame capture. # Set it to an arbitrary value if none is specified. SKIPAHEAD=${SKIPAHEAD:-"270"} -BACKEND_HOSTNAME=${BACKEND_HOSTNAME:-"localhost"} +BACKEND_HOSTNAME=${BACKEND_HOSTNAME:-${dbhost}} DBUSERNAME=${DBUSERNAME:-"mythtv"} DBPASSWORD=${DBPASSWORD:-"mythtv"} -# Defaults to quiet. -VERBOSE=${VERBOSE:-0} +# Defaults to quiet. +VERBOSE=${VERBOSE:-0} # Unless otherwise told, do not clobber existing cover files. CLOBBER=${CLOBBER:-0} # Unless otherwise told, do not check the file extension against # MythTV's list of registered video file types. EXTENSION_CHECK=${EXTENSION_CHECK:-0} -VIDEO_CAPTURE_HOME=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select data from settings where value='VideoArtworkDir' limit 1") -if [ ! -d "$VIDEO_CAPTURE_HOME" ] ; then - echo "Directory $VIDEO_CAPTURE_HOME does not exist, nowhere to put the screen shot!" - echo "Have you configured MythVideo yet?" +SG_VIDEOS=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe \ + "SELECT dirname FROM storagegroup WHERE groupname='Videos'") +if [ ! -d "${SG_VIDEOS}" ] ; then + echo "Directory $SG_VIDEOS does not exist, nowhere to put the screen shot!" + echo "Have you configured Storage Groups yet?" exit 1 fi -VIDEO_HOME=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select data from settings where value='VideoStartupDir' limit 1") -if [ ! -d "$VIDEO_HOME" ] ; then - echo "Directory $VIDEO_HOME does not exist, nowhere to put the screen shot!" - echo "Have you configured MythVideo yet?" +SG_SCREEN=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe \ + "SELECT dirname FROM storagegroup WHERE groupname='Screenshots'") +if [ ! -d "${SG_SCREEN}" ] ; then + echo "Directory $SG_SCREEN does not exist, nowhere to put the screen shot!" + echo "Have you configured Storage Groups yet?" exit 1 fi -VIDEO_FILENAME=$(basename "$VIDEO_PATHNAME") -VIDEO_EXTENSION=${VIDEO_FILENAME##*.} +VIDEO_EXTENSION=${FILENAME##*.} # Since we cron'd lets first make sure the validity of the file if [ "$EXTENSION_CHECK" == "1" ]; then - EXCHECK=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select f_ignore from videotypes where extension=\"$VIDEO_EXTENSION\";") - #excheck returns blank, it found nothing. + EXCHECK=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe "select f_ignore from videotypes where extension='${VIDEO_EXTENSION}';") + #excheck returns blank, it found nothing. if [ "$EXCHECK" == "" ]; then if [ "$VERBOSE" == "1" ]; then echo "$VIDEO_EXTENSION does not appear to be a valid media file, skipping." fi exit 1 - else + else # It is valid, but should we ignore it. If so then excheck will equal 1. - if [ "EXCHECK" == "1" ]; then + if [ "EXCHECK" == "1" ]; then if [ "$VERBOSE" == "1" ]; then echo "$VIDEO_EXTENSION is set to ignore." fi exit 1 fi - # It is valid, it's not set to ignore. + # It is valid, it's not set to ignore. if [ "$VERBOSE" == "1" ]; then echo "$VIDEO_EXTENSION appears in the Database, checking further." fi - EXCHECK=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select title from videometadata where filename=\"$VIDEO_PATHNAME\";") + EXCHECK=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe "select title from videometadata where filename LIKE '%${FILENAME}';") #Right, the file is supposed to be playable. Has it been imported to the Db yet? if [ "$EXCHECK" == "" ] ; then - if [ "$VERBOSE" == "1" ]; then + if [ "$VERBOSE" == "1" ]; then echo "$VIDEO_FILENAME does not exist in the database." - fi + fi exit 1 - # If you decide you want the system to 'auto import' the video then comment out - # the exit line and uncomment the rest of it. Bewarned, this is sucky SQL at - # the best but will give sensible defaults. - # - # if [ "$VERBOSE" == "1" ]; then - # echo "Importing $VIDEO_FILENAME in to database." - # fi - # mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "insert into videometadata (intid, title, director, plot, rating, inetref, year, userrating, length, showlevel, filename, coverfile, childid, browse, playcommand, category) values (' ', '$VIDEO_FILENAME', 'Unknown', 'Unknown', 'NR', '00000000', 1895, 0.0, 0, 1, '$VIDEO_PATHNAME', 'No Cover', -1, 1, ' ', 0);" fi fi fi if [ "$CLOBBER" -eq 0 ]; then # Since we're not clobbering, first check to see if this video already has a coverfile entry in MySQL: - SQL_CMD="select coverfile from videometadata where filename=\"$VIDEO_PATHNAME\";" - CURRENT_COVERFILE=`mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -B -e "$SQL_CMD" | tail -1` - - if [[ "$CURRENT_COVERFILE" != "" ]] && [[ "$CURRENT_COVERFILE" != "No Cover" ]]; then + SQL_CMD="SELECT coverfile FROM videometadata WHERE filename LIKE '%${FILENAME}';" + CURRENT_COVERFILE=`mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -B -e "$SQL_CMD" | tail -1` + + if [[ "$CURRENT_COVERFILE" != "" ]] && [[ "$CURRENT_COVERFILE" != " " ]] && [[ "$CURRENT_COVERFILE" != "No Cover" ]]; then # there's already a cover file for this video - if [ "$VERBOSE" == "1" ]; then - echo "$VIDEO_FILENAME has cover file, skipping." + if [ "$VERBOSE" == "1" ]; then + echo "$FILENAME has cover file, skipping." fi exit 2 fi @@ -151,7 +149,7 @@ fi # Swap the video file extension for png. Should work assuming the extension only appears ONCE! -VIDEO_CAPTURE_PATHNAME="$VIDEO_CAPTURE_HOME/$VIDEO_FILENAME.png" +VIDEO_CAPTURE_PATHNAME="$SG_SCREEN/${FILENAME%.*}.png" # How many frames of video to capture. We'll grab the last frame as our screenshot. if [ "$VIDEO_EXTENSION" == "m4v" ]; then @@ -163,13 +161,17 @@ fi SHOTFILE="000000"$FRAMES_TO_CAPTURE".png" VIDEO_STATS="/tmp/screenshooter_video_stats.txt" +# Get the full path of the video file, less the storage group prefix +FULL_PATH=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe \ + "SELECT filename FROM videometadata WHERE filename LIKE '%${FILENAME}';") + cd /tmp # The video we're processing may be shorter than SKIPAHEAD seconds. # Keep trying to capture until we find a SKIPAHEAD value within the length of the video. # Give up if we reach 0 seconds. while [ ! -f "$SHOTFILE" ]; do - /usr/bin/mplayer -ss $SKIPAHEAD -vf scale=640:-2 -ao null -vo png -quiet -frames $FRAMES_TO_CAPTURE -identify "$VIDEO_PATHNAME" &> $VIDEO_STATS & + /usr/bin/mplayer -ss $SKIPAHEAD -vf scale=640:-2 -ao null -vo png -quiet -frames $FRAMES_TO_CAPTURE -identify "$SG_VIDEOS/$FULL_PATH" &> $VIDEO_STATS & TIMEOUT=9 # Some video formats will play audio only. This loop gives the above command 20 seconds to @@ -182,7 +184,7 @@ while [ ! -f "$SHOTFILE" ]; do fi sleep 1 done - + SKIPAHEAD=$(expr $SKIPAHEAD / 2) if [ "$SKIPAHEAD" -le 0 ]; then break @@ -205,20 +207,18 @@ if [ -f "$SHOTFILE" ]; then VIDEO_LENGTH_IN_MINUTES=$(expr $VIDEO_LENGTH_IN_INTEGER_SECONDS / 60) fi - SQL_CMD="update videometadata set length=\"$MIN_LENGTH\" where filename=\"$VIDEO_PATHNAME\";" - mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -e "$SQL_CMD" + SQL_CMD="UPDATE videometadata SET length = '${MIN_LENGTH}' WHERE filename LIKE '%$FILENAME';" + mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -e "$SQL_CMD" - # put the screenshot pathname and any runlength info into videometadatatable - # Pre-escape any single or double quotes for the SQL command. VIDEO_CAPTURE_PATHNAME=`echo $VIDEO_CAPTURE_PATHNAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` - VIDEO_PATHNAME=`echo $VIDEO_PATHNAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` - SQL_CMD="update videometadata set coverfile=\"$VIDEO_CAPTURE_PATHNAME\", length=\"$VIDEO_LENGTH_IN_MINUTES\" where filename=\"$VIDEO_PATHNAME\";" + FILENAME=`echo $FILENAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` + SQL_CMD="UPDATE videometadata SET coverfile = '${VIDEO_CAPTURE_PATHNAME}', length = '${VIDEO_LENGTH_IN_MINUTES}' WHERE filename LIKE '%${FILENAME}';" - mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -e "$SQL_CMD" + mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -e "$SQL_CMD" else - echo "No image could be captured from $VIDEO_PATHNAME" + echo "No image could be captured from $FILENAME" exit 1 fi diff --git a/abs/core/linhes-scripts/screenshooter.sh.orig b/abs/core/linhes-scripts/screenshooter.sh.orig new file mode 100644 index 0000000..72f6cc0 --- /dev/null +++ b/abs/core/linhes-scripts/screenshooter.sh.orig @@ -0,0 +1,224 @@ +#!/bin/bash + +# Written by Bob Igo from the MythTV Store at http://MythiC.TV +# with contributions from TJC and Sarah Hayes +# Email: bob@stormlogic.com +# +# If you run into problems with this script, please send me email + +# This is alpha code to auto-generate thumbnails for previews in MythVideo. +# It won't currently work on some filenames that have spaces in them. +# It's surely just a matter of escaping or quoting, but I have yet to find +# the right incantation. + +# example usage: +# find -L /myth/video -wholename '*.covers' -prune -o -name '*.resume' -o -type f -exec screenshooter.sh -v {} \; + +# limitations: +# -- +# In an MBE/SBE/FE setup this might get the settings for the wrong machine... +# The script has no AI to know if a grabbed frame is useful to identify the video, only that it was able to grab it. +# Doesn't clean up after itself if videos are deleted, though MythTV may do this on its own. +# Minimum theoretical compatible video length is 4 seconds. Shorter videos will not work with this version. +# Surely more limitations I can't think of because it's my baby :) + +Usage() { + echo "USAGE:" + echo `basename $0` "-v PATHNAME [-s SECONDS] [-c] [-b HOSTNAME] [-u USERNAME] [-p PASSWORD] [-o]" + echo "-v: pathname to Video" + echo "-s: number of Seconds to skip before capturing (270 by default)" + echo "-c: Clobber any previous screenshot found for this video (off by default)" + echo "-b: mysql server (Backend) hostname (localhost by default)" + echo "-u: mysql Username (mythtv by default)" + echo "-p: mysql Password (mythtv by default)" + echo "-o: verbOse mode (off by default)" + echo "-x: check for valid video eXtension (off by default)" + echo + echo "EXAMPLE: $0 -v /myth/video/HDTV/shuttle.mpg -c -s 30" + exit 3 +} + +if [ -z $1 ]; then + Usage +fi + +V_MISSING=1 + +while getopts "v:sbupochx" FLAG ; do + case "$FLAG" in + v) VIDEO_PATHNAME="$OPTARG" + V_MISSING=0;; + s) SKIPAHEAD="$OPTARG";; + c) CLOBBER=1;; + b) BACKEND_HOSTNAME="$OPTARG";; + u) DBUSERNAME="$OPTARG";; + p) DBPASSWORD="$OPTARG";; + o) VERBOSE=1;; + x) EXTENSION_CHECK=1;; + *) Usage;; + esac +done + +if [ $V_MISSING == 1 ]; then + Usage +fi + +# Declaring Variables here and assigning sensible defaults. + +# SKIPAHEAD is the number of seconds to skip ahead before starting the frame capture. +# Set it to an arbitrary value if none is specified. +SKIPAHEAD=${SKIPAHEAD:-"270"} +BACKEND_HOSTNAME=${BACKEND_HOSTNAME:-"localhost"} +DBUSERNAME=${DBUSERNAME:-"mythtv"} +DBPASSWORD=${DBPASSWORD:-"mythtv"} +# Defaults to quiet. +VERBOSE=${VERBOSE:-0} +# Unless otherwise told, do not clobber existing cover files. +CLOBBER=${CLOBBER:-0} +# Unless otherwise told, do not check the file extension against +# MythTV's list of registered video file types. +EXTENSION_CHECK=${EXTENSION_CHECK:-0} + +VIDEO_CAPTURE_HOME=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select data from settings where value='VideoArtworkDir' limit 1") +if [ ! -d "$VIDEO_CAPTURE_HOME" ] ; then + echo "Directory $VIDEO_CAPTURE_HOME does not exist, nowhere to put the screen shot!" + echo "Have you configured MythVideo yet?" + exit 1 +fi + +VIDEO_HOME=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select data from settings where value='VideoStartupDir' limit 1") +if [ ! -d "$VIDEO_HOME" ] ; then + echo "Directory $VIDEO_HOME does not exist, nowhere to put the screen shot!" + echo "Have you configured MythVideo yet?" + exit 1 +fi + +VIDEO_FILENAME=$(basename "$VIDEO_PATHNAME") +VIDEO_EXTENSION=${VIDEO_FILENAME##*.} +# Since we cron'd lets first make sure the validity of the file +if [ "$EXTENSION_CHECK" == "1" ]; then + EXCHECK=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select f_ignore from videotypes where extension=\"$VIDEO_EXTENSION\";") + #excheck returns blank, it found nothing. + if [ "$EXCHECK" == "" ]; then + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_EXTENSION does not appear to be a valid media file, skipping." + fi + exit 1 + else + # It is valid, but should we ignore it. If so then excheck will equal 1. + if [ "EXCHECK" == "1" ]; then + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_EXTENSION is set to ignore." + fi + exit 1 + fi + # It is valid, it's not set to ignore. + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_EXTENSION appears in the Database, checking further." + fi + EXCHECK=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select title from videometadata where filename=\"$VIDEO_PATHNAME\";") + #Right, the file is supposed to be playable. Has it been imported to the Db yet? + if [ "$EXCHECK" == "" ] ; then + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_FILENAME does not exist in the database." + fi + exit 1 + # If you decide you want the system to 'auto import' the video then comment out + # the exit line and uncomment the rest of it. Bewarned, this is sucky SQL at + # the best but will give sensible defaults. + # + # if [ "$VERBOSE" == "1" ]; then + # echo "Importing $VIDEO_FILENAME in to database." + # fi + # mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "insert into videometadata (intid, title, director, plot, rating, inetref, year, userrating, length, showlevel, filename, coverfile, childid, browse, playcommand, category) values (' ', '$VIDEO_FILENAME', 'Unknown', 'Unknown', 'NR', '00000000', 1895, 0.0, 0, 1, '$VIDEO_PATHNAME', 'No Cover', -1, 1, ' ', 0);" + fi + fi +fi + +if [ "$CLOBBER" -eq 0 ]; then + # Since we're not clobbering, first check to see if this video already has a coverfile entry in MySQL: + SQL_CMD="select coverfile from videometadata where filename=\"$VIDEO_PATHNAME\";" + CURRENT_COVERFILE=`mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -B -e "$SQL_CMD" | tail -1` + + if [[ "$CURRENT_COVERFILE" != "" ]] && [[ "$CURRENT_COVERFILE" != "No Cover" ]]; then + # there's already a cover file for this video + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_FILENAME has cover file, skipping." + fi + exit 2 + fi +fi + + +# Swap the video file extension for png. Should work assuming the extension only appears ONCE! +VIDEO_CAPTURE_PATHNAME="$VIDEO_CAPTURE_HOME/$VIDEO_FILENAME.png" + +# How many frames of video to capture. We'll grab the last frame as our screenshot. +if [ "$VIDEO_EXTENSION" == "m4v" ]; then + FRAMES_TO_CAPTURE="90" +else + FRAMES_TO_CAPTURE="05" +fi + +SHOTFILE="000000"$FRAMES_TO_CAPTURE".png" +VIDEO_STATS="/tmp/screenshooter_video_stats.txt" + +cd /tmp + +# The video we're processing may be shorter than SKIPAHEAD seconds. +# Keep trying to capture until we find a SKIPAHEAD value within the length of the video. +# Give up if we reach 0 seconds. +while [ ! -f "$SHOTFILE" ]; do + /usr/bin/mplayer -ss $SKIPAHEAD -vf scale=640:-2 -ao null -vo png -quiet -frames $FRAMES_TO_CAPTURE -identify "$VIDEO_PATHNAME" &> $VIDEO_STATS & + TIMEOUT=9 + + # Some video formats will play audio only. This loop gives the above command 20 seconds to + # finish, otherwise it gets killed. + while [ -n "`ps -p $! --no-heading`" ]; do + TIMEOUT=$(expr $TIMEOUT - 1) + if [ "$TIMEOUT" -le 0 ]; then + kill -9 $! + break + fi + sleep 1 + done + + SKIPAHEAD=$(expr $SKIPAHEAD / 2) + if [ "$SKIPAHEAD" -le 0 ]; then + break + fi +done + +if [ -f "$SHOTFILE" ]; then + # Now, the video_capture is taken, and the name of the shot is in $SHOTFILE + # Rename it and move it to the place where video_captures live. + /bin/mv -f "$SHOTFILE" "$VIDEO_CAPTURE_PATHNAME" + /bin/rm -f 000000*png + chown mythtv: "$VIDEO_CAPTURE_PATHNAME" + + # We've got the shotfile nailed, now calculate video run length. + VIDEO_LENGTH_IN_SECONDS=`grep ID_LENGTH $VIDEO_STATS | awk -F'=' '{print $2}'` + VIDEO_LENGTH_IN_INTEGER_SECONDS=${VIDEO_LENGTH_IN_SECONDS/%.*/} + if [ $VIDEO_LENGTH_IN_INTEGER_SECONDS -lt 60 ]; then + VIDEO_LENGTH_IN_MINUTES="1" + else + VIDEO_LENGTH_IN_MINUTES=$(expr $VIDEO_LENGTH_IN_INTEGER_SECONDS / 60) + fi + + SQL_CMD="update videometadata set length=\"$MIN_LENGTH\" where filename=\"$VIDEO_PATHNAME\";" + mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -e "$SQL_CMD" + + + # put the screenshot pathname and any runlength info into videometadatatable + + # Pre-escape any single or double quotes for the SQL command. + + VIDEO_CAPTURE_PATHNAME=`echo $VIDEO_CAPTURE_PATHNAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` + VIDEO_PATHNAME=`echo $VIDEO_PATHNAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` + SQL_CMD="update videometadata set coverfile=\"$VIDEO_CAPTURE_PATHNAME\", length=\"$VIDEO_LENGTH_IN_MINUTES\" where filename=\"$VIDEO_PATHNAME\";" + + mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -e "$SQL_CMD" +else + echo "No image could be captured from $VIDEO_PATHNAME" + exit 1 +fi diff --git a/abs/core/linhes-scripts/shootscreens.sh b/abs/core/linhes-scripts/shootscreens.sh index d3e8845..2d78e3c 100644..100755 --- a/abs/core/linhes-scripts/shootscreens.sh +++ b/abs/core/linhes-scripts/shootscreens.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -x # Written by Bob Igo from the MythTV Store at http://MythiC.TV # Email: bob@stormlogic.com @@ -34,4 +35,4 @@ fi killall -9 osd_cat osd_cat --barmode=percentage --percentage=100 --pos=middle --align=center --color=white --text="Video Thumbnails Generated!" --font=$FONT --shadow=3 --color=yellow --delay=3 & fi -}
\ No newline at end of file +} diff --git a/abs/core/lvm2/ChangeLog b/abs/core/lvm2/ChangeLog deleted file mode 100644 index 5809ab5..0000000 --- a/abs/core/lvm2/ChangeLog +++ /dev/null @@ -1,103 +0,0 @@ -2010-07-11 Thomas Bächler <thomas@archlinux.org> - - * lvm2/device-mapper 2.02.70-1 - * Upstream update - * Do not move the dmeventd manpage, has been fixed upstream - * Remove all the || return 1 in PKGBUILD - -2010-07-01 Eric Belanger <eric@archlinux.org> - - * lvm2/device-mapper 2.02.69-1 - * Upstream update - * Moved dmeventd man page from lvm2 to device-mapper package - -2010-06-25 Eric Belanger <eric@archlinux.org> - - * lvm2/device-mapper 2.02.68-1 - * Upstream update - * Fixed tr path in lvmdump - -2010-04-05 Eric Belanger <eric@archlinux.org> - - * lvm2/device-mapper 2.02.62-1 - * Upstream update - * Fixed license - -2010-02-27 Eric Belanger <eric@archlinux.org> - - * lvm2/device-mapper 2.02.61-1 - * Upstream update - -2010-01-24 Thomas Bächler <thomas@archlinux.org> - * lvm2/device-mapper 2.02.60-2 - * Rebuilt without -Wl,--as-needed, it breaks dmeventd monitoring - -2010-01-24 Thomas Bächler <thomas@archlinux.org> - * lvm2/device-mapper update to 2.02.60-1 - * Clean up PKGBUILD, fix internal paths to dmeventd and its helpers - -2009-11-27 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.56-1 - * device-mapper 1.02.40-1 - * Upstream update - -2009-10-31 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.54-1 - * device-mapper 1.02.39-1 - * Upstream update - * Enabled the device-mapper event daemon - * Moved the udev rule from /etc to /lib - -2009-09-27 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.53-1 - * device-mapper 1.02.38-1 - * Upstream update - -2009-09-18 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.52-1 - * device-mapper 1.02.37-1 - * Upstream update - * Implemented split packages - * PKGBUILD clean up - * Renamed pkgconfig file (close FS#15909) - -2009-07-09 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.48-1 - * device-mapper 1.02.33-1 - * Upstream update - * Removed unneeded readline depends (close FS#15205) - -2009-05-24 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.47-1 - * device-mapper 1.02.32-1 - * Upstream update - * Added dmsetup.static - -2009-03-07 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.45-1 - * device-mapper 1.02.31-1 - * Upstream update - -2009-01-31 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.44-1 - * device-mapper 1.02.30-1 - * Upstream update - * Added bash depends - * Added readline depends - * Added pkgconfig file - -2008-11-11 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.43-1 - * device-mapper 1.02.29-1 - * Upstream update - * Disabled SMP build - * Added ChangeLog diff --git a/abs/core/lvm2/PKGBUILD b/abs/core/lvm2/PKGBUILD index 7c893c7..b54e9f6 100644 --- a/abs/core/lvm2/PKGBUILD +++ b/abs/core/lvm2/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 97356 2010-10-30 01:06:16Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.77 +pkgver=2.02.86 _pkgverlvm=${pkgver} pkgrel=1 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') groups=('base') -conflicts=('mkinitcpio<0.5.99') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz lvm2_install - lvm2_hook) + lvm2_hook + 11-dm-initramfs.rules) +md5sums=('3b42dec4d15ad106302a35149082a20e' + 'dcb82506d732cc7b10159a89b579dba8' + '8d613b84a175cd85f752a75198e40e15' + '69e40679cd8b3658bfc619e48baae125') +sha1sums=('f435b389cc11c8f415244fe382f3839d1676770c' + '7f108b2f2056eb050fc898bf5190ecf9145aed8a' + 'a0e0513c2efb183006e57e595d93ce18be297928' + 'f6a554eea9557c3c236df2943bb6e7e723945c41') build() { cd "${srcdir}/LVM2.${_pkgverlvm}" @@ -24,7 +32,7 @@ build() { --includedir=/usr/include --with-usrlibdir=/usr/lib \ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules - make || return 1 + make } package_device-mapper() { @@ -34,12 +42,14 @@ package_device-mapper() { cd "${srcdir}/LVM2.${_pkgverlvm}" make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" } package_lvm2() { pkgdesc="Logical Volume Manager 2 utilities" depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.5.99') + conflicts=('lvm' 'mkinitcpio<0.7') backup=('etc/lvm/lvm.conf') options=('!makeflags') @@ -55,6 +65,3 @@ package_lvm2() { install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" } -md5sums=('e3cb5b86668ff08b337524f63ad82cde' - 'f781c9f5dd4f9934952c687b73d26a18' - '95bed25bdbc2c2d8500e7a07aeff7f65') diff --git a/abs/core/lvm2/lvm2_hook b/abs/core/lvm2/lvm2_hook index 13183c6..874b91d 100644 --- a/abs/core/lvm2/lvm2_hook +++ b/abs/core/lvm2/lvm2_hook @@ -4,7 +4,8 @@ run_hook () /sbin/modprobe -q dm-mod >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi # If the lvmwait= parameter has been specified on the command line @@ -17,9 +18,8 @@ run_hook () [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" - msg "Scanning logical volumes..." - eval /sbin/lvm vgscan --ignorelockingfailure $LVMQUIET msg "Activating logical volumes..." - eval /sbin/lvm vgchange --ignorelockingfailure --ignoremonitoring -ay $LVMQUIET + [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit + eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET fi } diff --git a/abs/core/lvm2/lvm2_install b/abs/core/lvm2/lvm2_install index 4ce9f18..94175b5 100644 --- a/abs/core/lvm2/lvm2_install +++ b/abs/core/lvm2/lvm2_install @@ -1,20 +1,19 @@ # vim: set ft=sh: -install () +build() { MODULES=" dm-mod dm-snapshot dm-mirror" BINARIES="" FILES="" SCRIPT="lvm2" - add_dir "/dev/mapper" add_binary "/sbin/lvm" add_binary "/sbin/dmsetup" - add_binary "/sbin/dmeventd" add_file "/lib/udev/rules.d/10-dm.rules" add_file "/lib/udev/rules.d/13-dm-disk.rules" add_file "/lib/udev/rules.d/95-dm-notify.rules" add_file "/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" } help () diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD index 945a798..27cd4fb 100644 --- a/abs/core/mplayer/PKGBUILD +++ b/abs/core/mplayer/PKGBUILD @@ -1,55 +1,72 @@ -# $Id: PKGBUILD 97113 2010-10-26 14:11:03Z ibiru $ +# $Id$ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> -pkgname=mplayer -pkgver=32492 +pkgbase=mplayer +pkgname=('mplayer' 'mencoder') +pkgver=33805 pkgrel=2 -pkgdesc="A movie player for linux" arch=('i686' 'x86_64') -depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' - 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'libvdpau>=0.4' - 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx') +makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' +'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' +'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass') license=('GPL') url="http://www.mplayerhq.hu/" -makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm') -backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop mplayer.png) -md5sums=('01beb068608d3977fbb84b0b28935cee' - '647b9f4ab5284a7fef3f84f992214e77' - 'd00874ccc644b7f43d6ef1c942fcef28') +options=(!buildflags !emptydirs) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop) +md5sums=('512a0309ba5979a41ae93b740f4592f4' + 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { - # Custom CFLAGS break the mplayer build - unset CFLAGS LDFLAGS - - cd ${srcdir}/${pkgname} - - ./configure --prefix=/usr \ - --enable-runtime-cpudetection \ - --disable-gui \ - --disable-arts \ - --disable-liblzo \ - --disable-speex \ - --disable-openal \ - --disable-fribidi \ - --disable-libdv \ - --disable-musepack \ - --disable-esd \ - --disable-mga \ - --enable-xvmc \ - --language=all \ - --confdir=/etc/mplayer - - [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak - - make - make -j1 DESTDIR=${pkgdir} install - install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/ - install -dm755 ${pkgdir}/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf - rm -rf ${pkgdir}/usr/share/mplayer/font - #desktop file FS#14770 - install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop - install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png + cd ${srcdir}/${pkgname} + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-gui \ + --disable-arts \ + --disable-liblzo \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --disable-ass-internal \ + --disable-pulse \ + --enable-xvmc \ + --language=all \ + --confdir=/etc/mplayer + [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak + + make +} + +package_mplayer() { + pkgdesc="A movie player for linux" + install=mplayer.install + backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') + depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' + 'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass') + + cd ${srcdir}/${pkgbase} + + make DESTDIR=${pkgdir} install-mplayer install-mplayer-man + install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/ + install -dm755 ${pkgdir}/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf + rm -rf ${pkgdir}/usr/share/mplayer/font + #desktop file FS#14770 + install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop + install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png +} + +package_mencoder() { + pkgdesc="Free command line video decoding, encoding and filtering tool" + depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass') + + cd ${srcdir}/${pkgbase} + make DESTDIR=${pkgdir} install-mencoder install-mencoder-man + find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; } diff --git a/abs/core/mplayer/__changlog b/abs/core/mplayer/__changlog new file mode 100644 index 0000000..fdf7dab --- /dev/null +++ b/abs/core/mplayer/__changlog @@ -0,0 +1 @@ +-disable pulse and remove libpulse deps in PKGBUILD diff --git a/abs/core/mplayer/mplayer.desktop b/abs/core/mplayer/mplayer.desktop index e3229d0..07acea1 100644 --- a/abs/core/mplayer/mplayer.desktop +++ b/abs/core/mplayer/mplayer.desktop @@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器 Comment[pl]=Odtwarzaj filmy i muzykę Icon=mplayer TryExec=mplayer -Exec=mplayer -really-quiet %F +Exec=mplayer %F Terminal=false NoDisplay=true Categories=GTK;AudioVideo;Audio;Video;Player;TV; diff --git a/abs/core/mplayer/mplayer.install b/abs/core/mplayer/mplayer.install new file mode 100644 index 0000000..660593c --- /dev/null +++ b/abs/core/mplayer/mplayer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/abs/core/ntp/PKGBUILD b/abs/core/ntp/PKGBUILD index 69669c7..290b6b2 100755..100644 --- a/abs/core/ntp/PKGBUILD +++ b/abs/core/ntp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 117473 2011-04-03 17:50:26Z andrea $ +# $Id$ # Maintainer: kevin <kevin@archlinux.org> pkgname=ntp diff --git a/abs/core/ntp/changelog b/abs/core/ntp/changelog index e69de29..528a078 100644 --- a/abs/core/ntp/changelog +++ b/abs/core/ntp/changelog @@ -0,0 +1,25 @@ +2011-04-03 andrea <andrea@archlinux.org> + + * ntp 4.2.6p3-3 + - Use 'ntpd -p' to get the PID in ntpd + - Don't run the ntp client in background in ntpdate + +2011-03-28 andrea <andrea@archlinux.org> + + * ntp 4.2.6p3-2 + - Improved daemon scripts + +2010-10-16 kevin <kevin@archlinux.org> + + * ntp 4.2.6p3 + - Implemented FS#18469, replace ntpdate with ntpd -q + - Removed LIBS + - Removed old IPv6 and nano patch + +2010-10-16 kevin <kevin@archlinux.org> + + * ntp 4.2.6p2 + - Added changelog + - Set LIBS to use librt since configure doesn't set it + - Convert PKGBUILD to build()/package() format + - removed "|| return 1" diff --git a/abs/core/ntp/fix-ipv6.patch b/abs/core/ntp/fix-ipv6.patch deleted file mode 100644 index eecd766..0000000 --- a/abs/core/ntp/fix-ipv6.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ntp-4.2.4p7-orig/configure.ac 2009-06-18 14:48:12.151346763 +0200 -+++ ntp-4.2.4p7/configure.ac 2009-06-18 14:50:07.054692531 +0200 -@@ -4456,6 +4456,7 @@ - [ - AC_LANG_PROGRAM( - [ -+ #define _GNU_SOURCE - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> diff --git a/abs/core/ntp/ntp-4.2.4_p7-nano.patch b/abs/core/ntp/ntp-4.2.4_p7-nano.patch deleted file mode 100644 index b31ea0a..0000000 --- a/abs/core/ntp/ntp-4.2.4_p7-nano.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://bugs.gentoo.org/270483 - -ripped from fedora - ---- ntp-4.2.4p7/include/ntp_syscall.h -+++ ntp-4.2.4p7/include/ntp_syscall.h -@@ -14,5 +14,13 @@ - # include <sys/timex.h> - #endif - -+#if defined(ADJ_NANO) && !defined(MOD_NANO) -+#define MOD_NANO ADJ_NANO -+#endif -+ -+#if defined(ADJ_TAI) && !defined(MOD_TAI) -+#define MOD_TAI ADJ_TAI -+#endif -+ - #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD diff --git a/abs/core/ntp/ntp-client.conf b/abs/core/ntp/ntp-client.conf index e728db5..e728db5 100755..100644 --- a/abs/core/ntp/ntp-client.conf +++ b/abs/core/ntp/ntp-client.conf diff --git a/abs/core/ntp/ntp.conf b/abs/core/ntp/ntp.conf index 7f888e4..7f888e4 100755..100644 --- a/abs/core/ntp/ntp.conf +++ b/abs/core/ntp/ntp.conf diff --git a/abs/core/ntp/ntpd b/abs/core/ntp/ntpd index 825efc1..825efc1 100755..100644 --- a/abs/core/ntp/ntpd +++ b/abs/core/ntp/ntpd diff --git a/abs/core/ntp/ntpdate b/abs/core/ntp/ntpdate index 99508f4..99508f4 100755..100644 --- a/abs/core/ntp/ntpdate +++ b/abs/core/ntp/ntpdate diff --git a/abs/core/pcre/ChangeLog b/abs/core/pcre/ChangeLog deleted file mode 100644 index cdff568..0000000 --- a/abs/core/pcre/ChangeLog +++ /dev/null @@ -1,40 +0,0 @@ -2010-03-24 Eric Belanger <eric@archlinux.org> - - * pcre 8.02-1 - * Upstream update - -2010-01-23 Eric Belanger <eric@archlinux.org> - - * pcre 8.01-1 - * Upstream update - -2009-10-26 Eric Belanger <eric@archlinux.org> - - * pcre 8.00-1 - * Upstream update - -2009-04-13 Eric Belanger <eric@archlinux.org> - - * pcre 7.9-1 - * Upstream update - -2008-10-19 Eric Belanger <eric@archlinux.org> - - * Updated url - -2008-09-05 Eric Belanger <eric@archlinux.org> - - * pcre 7.8-1 - * Upstream update - * Fixed license - -2008-07-07 Eric Belanger <eric@archlinux.org> - - * pcre 7.7-2 - * Added libpcre-7.7-buffer-overflow.patch to fix buffer overflow (close FS#10845) - -2008-05-10 Eric Belanger <eric@archlinux.org> - - * pcre 7.7-1 - * Upstream update - * Added ChangeLog diff --git a/abs/core/pcre/PKGBUILD b/abs/core/pcre/PKGBUILD index d31e23c..83dfe94 100644 --- a/abs/core/pcre/PKGBUILD +++ b/abs/core/pcre/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 84661 2010-07-03 04:01:39Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre -pkgver=8.10 +pkgver=8.12 pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64') url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs') options=('!libtool') source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2) -md5sums=('780867a700e9d4e4b9cb47aa5453e4b2') -sha1sums=('8b345da0f835b2caabff071b0b5bab40564652be') +md5sums=('f14a9fef3c92f3fc6c5ac92d7a2c7eb3') +sha1sums=('2219b372bff53ee29a7e44ecf5977ad15df01cea') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -26,11 +26,11 @@ build() { package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - + # grep uses pcre, so we need the libs in /lib install -dm755 "${pkgdir}"/lib mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/ - ln -sf ../../lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so - + ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so + install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/pcre/libpcre-7.7-buffer-overflow.patch b/abs/core/pcre/libpcre-7.7-buffer-overflow.patch deleted file mode 100644 index a27987f..0000000 --- a/abs/core/pcre/libpcre-7.7-buffer-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -NrU5 pcre-7.7.orig/pcre_compile.c pcre-7.7/pcre_compile.c ---- pcre-7.7.orig/pcre_compile.c 2008-06-18 17:08:49.000000000 +0200 -+++ pcre-7.7/pcre_compile.c 2008-06-18 17:11:04.000000000 +0200 -@@ -4929,11 +4929,11 @@ - { - if (code == cd->start_code + 1 + LINK_SIZE && - (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) - { - cd->external_options = newoptions; -- options = newoptions; -+ options = *optionsptr = newoptions; - } - else - { - if ((options & PCRE_IMS) != (newoptions & PCRE_IMS)) - { diff --git a/abs/core/perl_modules/perl-class-methodmaker/PKGBUILD b/abs/core/perl_modules/perl-class-methodmaker/PKGBUILD index 29da312..4b5ac7c 100644 --- a/abs/core/perl_modules/perl-class-methodmaker/PKGBUILD +++ b/abs/core/perl_modules/perl-class-methodmaker/PKGBUILD @@ -1,23 +1,24 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-class-methodmaker -pkgver=2.11 -pkgrel=1 +pkgver=2.18 +pkgrel=4 pkgdesc="Create generic class methods" arch=('i686' 'x86_64') -url="http://search.cpan.org/~schwigon/Class-MethodMaker" +url="http://search.cpan.org/dist/Class-MethodMaker" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-$pkgver.tar.gz) +source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/Class-MethodMaker-${pkgver}.tar.gz") +md5sums=('99435d78e0a1754b102fe39597c6c3df') build() { - cd $startdir/src/Class-MethodMaker-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/Class-MethodMaker-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } -md5sums=('61ed8327e50b99e574c5f5ce1a835d36') diff --git a/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD b/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD index f8ac29a..bc561d6 100644 --- a/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD +++ b/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD @@ -1,23 +1,31 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id$ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-crypt-ssleay -pkgver=0.57 +pkgver=0.58 pkgrel=3 pkgdesc="OpenSSL glue that provides LWP https support" arch=('i686' 'x86_64') -url="http://search.cpan.org/~DLAND/Crypt-SSLeay" +url="http://search.cpan.org/dist/Crypt-SSLeay" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +depends=('openssl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DL/DLAND/Crypt-SSLeay-$pkgver.tar.gz) -md5sums=('82264180f5911dce33dbd85e24b1f36b') +source=(http://www.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-$pkgver.tar.gz) +md5sums=('fbf3d12e58462cee00ea63239c0b13c7') build() { - cd $startdir/src/Crypt-SSLeay-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd "${srcdir}/Crypt-SSLeay-${pkgver}" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/Crypt-SSLeay-${pkgver}" + make install DESTDIR="${pkgdir}" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-dbi/PKGBUILD b/abs/core/perl_modules/perl-dbi/PKGBUILD index c6c5599..8bc53e3 100644 --- a/abs/core/perl_modules/perl-dbi/PKGBUILD +++ b/abs/core/perl_modules/perl-dbi/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: eric <eric@archlinux.org> +# $Id$ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Matt Thompson <mattt@defunct.ca> + pkgname=perl-dbi _realname=DBI -pkgver=1.601 -pkgrel=1 +pkgver=1.616 +pkgrel=2 pkgdesc="Database independent interface for Perl" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') +depends=('perl>=5.12.1') options=(!emptydirs) source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('d80677bd8113ec8cb0438b8703f3c418') +md5sums=('799313e54a693beb635b47918458f7c4') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" + # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } + # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-digest-sha1/PKGBUILD b/abs/core/perl_modules/perl-digest-sha1/PKGBUILD index 7bf6976..d65b0d1 100644 --- a/abs/core/perl_modules/perl-digest-sha1/PKGBUILD +++ b/abs/core/perl_modules/perl-digest-sha1/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id$ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-sha1 _realname=Digest-SHA1 -pkgver=2.11 -pkgrel=4 -pkgdesc="Perl Module: Interface to the SHA-1 Algorithm." +pkgver=2.13 +pkgrel=2 +pkgdesc="Perl interface to the SHA-1 Algorithm" arch=(i686 x86_64) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" @@ -15,17 +15,24 @@ options=(!emptydirs) source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) replaces=('digest-sha1') provides=('digest-sha1') -md5sums=('2449bfe21d6589c96eebf94dae24df6b') -groups=('shepherd-dep') +md5sums=('bd22388f268434f2b24f64e28bf1aa35') + build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} + # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-error/PKGBUILD b/abs/core/perl_modules/perl-error/PKGBUILD index c804210..2a4437c 100644 --- a/abs/core/perl_modules/perl-error/PKGBUILD +++ b/abs/core/perl_modules/perl-error/PKGBUILD @@ -1,27 +1,35 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: Dale Blount <dale@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> pkgname=perl-error _realname=Error -pkgver=0.17015 -pkgrel=1 +pkgver=0.17016 +pkgrel=2 pkgdesc="Perl/CPAN Error module - Error/exception handling in an OO-ish way" url="http://search.cpan.org/dist/${_realname}/" -arch=(i686 x86_64) +arch=(any) license=('PerlArtistic' 'GPL') depends=('perl>=5.10.0') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/${_realname}-${pkgver}.tar.gz) +md5sums=('eedcd3c6970568dd32092b5334328eff') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } + diff --git a/abs/core/perl_modules/perl-extutils-depends/PKGBUILD b/abs/core/perl_modules/perl-extutils-depends/PKGBUILD deleted file mode 100644 index 5e044d6..0000000 --- a/abs/core/perl_modules/perl-extutils-depends/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 46675 2009-07-19 15:31:27Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> -# Contributor: Arjan Timmerman <arjan@soulfly.nl> - -pkgname=perl-extutils-depends -_realname=ExtUtils-Depends -pkgver=0.302 -pkgrel=1 -pkgdesc="The Perl depends module" -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://gtk2-perl.sourceforge.net/" -depends=('perl>=5.10.0') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -replaces=('extutils-depends') -options=('!emptydirs') -md5sums=('db46426f0599668da95c21b53b532508') - -build() { - cd ${srcdir}/${_realname}-${pkgver} - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 -} -package() { - cd ${srcdir}/${_realname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name 'perllocal.pod' -delete -} diff --git a/abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD b/abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD deleted file mode 100644 index 4c575bc..0000000 --- a/abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 28969 2009-03-04 02:50:24Z kevin $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> -# Contributor: Arjan Timmerman <arjan@soulfly.nl> - -pkgname=perl-extutils-pkgconfig -_realname=ExtUtils-PkgConfig -pkgver=1.12 -pkgrel=1 -pkgdesc="The Perl Pkgconfig module" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -depends=('perl>=5.10.0') -replaces=('extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -options=('!emptydirs') -md5sums=('8fc5c0b30cfda2048ec87ae418cc3508') - -build() { - cd ${srcdir}/${_realname}-${pkgver} - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 -} -package() { - cd ${srcdir}/${_realname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name 'perllocal.pod' -delete -} diff --git a/abs/core/perl_modules/perl-html-parser/PKGBUILD b/abs/core/perl_modules/perl-html-parser/PKGBUILD index 43c3b8a..e507ceb 100644 --- a/abs/core/perl_modules/perl-html-parser/PKGBUILD +++ b/abs/core/perl_modules/perl-html-parser/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id$ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis +# Contributor: Firmicus <francois.archlinux.org> pkgname=perl-html-parser _realname=HTML-Parser -pkgver=3.56 -pkgrel=3 +pkgver=3.68 +pkgrel=2 pkgdesc="Perl HTML parser class" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-html-tagset' 'perl>=5.10.0') +depends=('perl-html-tagset' 'perl>=5.12.1') options=(!emptydirs) -replaces=('html-parser') -provides=('html-parser') source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('bddc432e5ed9df4d4153a62234f04fc2') +md5sums=('5550b2da7aa94341f1e8a17a4ac20c68') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make MAN1EXT=1p MAN3EXT=3pm || return 1 - make install MAN1EXT=1p MAN3EXT=3pm DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-html-tagset/PKGBUILD b/abs/core/perl_modules/perl-html-tagset/PKGBUILD index 047f39c..b7bb3bc 100644 --- a/abs/core/perl_modules/perl-html-tagset/PKGBUILD +++ b/abs/core/perl_modules/perl-html-tagset/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-html-tagset _realname=HTML-Tagset -pkgver=3.10 -pkgrel=3 +pkgver=3.20 +pkgrel=2 pkgdesc="Data tables useful in parsing HTML" -arch=(i686 x86_64) +arch=(any) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.10.0') @@ -15,17 +15,22 @@ replaces=('html-tagset') provides=('html-tagset') options=(!emptydirs) source=(http://www.cpan.org/authors/id/P/PE/PETDANCE/${_realname}-${pkgver}.tar.gz) -md5sums=('89bdd351272ccd285fa61c5b2ce451ab') +md5sums=('d2bfa18fe1904df7f683e96611e87437') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make MAN1EXT=1p MAN3EXT=3pm || return 1 - make install MAN1EXT=1p MAN3EXT=3pm DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-mailtools/PKGBUILD b/abs/core/perl_modules/perl-mailtools/PKGBUILD index fae63ee..9c0271f 100644 --- a/abs/core/perl_modules/perl-mailtools/PKGBUILD +++ b/abs/core/perl_modules/perl-mailtools/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-mailtools _realname=MailTools -pkgver=2.04 +pkgver=2.08 pkgrel=1 pkgdesc="Perl module that provides email tools" -arch=(i686 x86_64) +arch=(any) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.10.0') options=(!emptydirs) source=(http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/${_realname}-${pkgver}.tar.gz) -md5sums=('d21ea4f375d1e5f3da6b0a4e8ba1e2c6') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } -# vim: ts=2 sw=2 et ft=sh +md5sums=('0245bf7985c6661e0cf31a59657a18f0') diff --git a/abs/core/perl_modules/perl-net-upnp/PKGBUILD b/abs/core/perl_modules/perl-net-upnp/PKGBUILD index 26db326..a49bd6e 100755..100644 --- a/abs/core/perl_modules/perl-net-upnp/PKGBUILD +++ b/abs/core/perl_modules/perl-net-upnp/PKGBUILD @@ -1,23 +1,27 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Drew Gilbert <gilbert dot drew at gmail dot com> + pkgname=perl-net-upnp -pkgver=1.4.1 -pkgrel=1 -pkgdesc="Net::UPnP::AV::MediaServer - Perl extension for UPnP." -arch=(i686 x86_64) -url="http://search.cpan.org/~sbeck/DateManip-$pkgver/" +pkgver=1.4.2 +pkgrel=3 +pkgdesc="Perl Module UPnP" +arch=('i686' 'x86_64') +url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/" +license=('BSD' 'PerlArtistic') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-${pkgver}.tar.gz") depends=('perl') -source=(http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/DateManip-$pkgver.tar.gz) -source=http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-1.4.1.tar.gz +md5sums=('bc009fd76b565df40a70aca49af82a7d') + build() { - cd $startdir/src/Net-UPnP-$pkgver - # Force module installation to "current" perl directories. - /usr/bin/perl Makefile.PL \ - INSTALLARCHLIB=/usr/lib/perl5/current/${CARCH}-linux-thread-multi \ - INSTALLSITELIB=/usr/lib/perl5/site_perl/current \ - INSTALLSITEARCH=/usr/lib/perl5/site_perl/current/${CARCH}-linux-thread-multi - make || return 1 - make DESTDIR=$startdir/pkg install + cd "${srcdir}/Net-UPnP-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR="${pkgdir}" - # remove perllocal.pod, .packlist, and empty dirs. - /bin/rm -rf $startdir/pkg/usr/lib/perl5/current - /bin/rm -rf $startdir/pkg/usr/lib/perl5/site_perl/current/${CARCH}-linux-thread-multi + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-net-upnp/perl-config-simple/PKGBUILD b/abs/core/perl_modules/perl-net-upnp/perl-config-simple/PKGBUILD deleted file mode 100644 index a566dbc..0000000 --- a/abs/core/perl_modules/perl-net-upnp/perl-config-simple/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Cecil H. Watson <knoppmyth@gmail.com - -pkgname=perl-config-simple -_realname=Config-Simple -pkgver=4.59 -pkgrel=1 -pkgdesc="Simple configuration file class for perl" -arch=(i686 x86_64) -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perlxml' 'perl>=5.10.0') -options=('!emptydirs') -source=(ftp://ftp.cpan.org/pub/CPAN/authors/id/S/SH/SHERZODR/${_realname}-${pkgver}.tar.gz) -md5sums=('96513b61c7db591339ce2577878a3b32') - -build() { - cd ${startdir}/src/${_realname}-${pkgver} - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - - find ${startdir}/pkg -name '.packlist' -delete - find ${startdir}/pkg -name 'perllocal.pod' -delete -} diff --git a/abs/core/perl_modules/perl-params-validate/PKGBUILD b/abs/core/perl_modules/perl-params-validate/PKGBUILD index f65387f..2dd4124 100644 --- a/abs/core/perl_modules/perl-params-validate/PKGBUILD +++ b/abs/core/perl_modules/perl-params-validate/PKGBUILD @@ -2,22 +2,29 @@ # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=0.91 -pkgrel=1 +pkgver=0.98 +pkgrel=2 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64') -url="http://search.cpan.org/~DROLSKY/Params-Validate" +url="http://search.cpan.org/dist/Params-Validate" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-$pkgver.tar.gz) -md5sums=('22c5467a1d4673374a1b7b2dbcfd473e') +source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") +md5sums=('6dacb26b1bdb6338b6eed45cd86958bb') build() { - cd $startdir/src/Params-Validate-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd Params-Validate-${pkgver} + + perl ./Build.PL --installdirs=vendor + + ./Build +} +package(){ + cd Params-Validate-${pkgver} + + ./Build install --destdir=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-term-readkey/PKGBUILD b/abs/core/perl_modules/perl-term-readkey/PKGBUILD index 4c4fdee..33397b2 100644 --- a/abs/core/perl_modules/perl-term-readkey/PKGBUILD +++ b/abs/core/perl_modules/perl-term-readkey/PKGBUILD @@ -1,28 +1,36 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-term-readkey -pkgver=2.30 -pkgrel=2 -pkgdesc="A perl module dedicated to providing simple control over terminal driver modes." +_realname=TermReadKey +pkgver=2.30.01 +pkgrel=4 +pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64') license=('custom') depends=('perl>=5.10.0' 'glibc') -url="http://cpan.org/modules/by-module/Term" -source=(http://cpan.org/modules/by-module/Term/TermReadKey-$pkgver.tar.gz) -md5sums=('f0ef2cea8acfbcc58d865c05b0c7e1ff') +url="http://search.cpan.org/~stsi/${_realname}/" +source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) options=('!emptydirs') +md5sums=('6c099eddb76ec9b92179f1ed929be71a') + build() { - cd $startdir/src/TermReadKey-$pkgver - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -d $startdir/pkg/usr/share/licenses/$pkgname/ - head -7 README > $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + cd ${srcdir}/TermReadKey-$pkgver + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/TermReadKey-$pkgver + make DESTDIR=${pkgdir} install + install -d ${pkgdir}/usr/share/licenses/$pkgname/ + head -7 README > ${pkgdir}/usr/share/licenses/$pkgname/LICENSE # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } diff --git a/abs/core/perl_modules/perl-timedate/PKGBUILD b/abs/core/perl_modules/perl-timedate/PKGBUILD index fc72d6a..bd7d0e3 100644 --- a/abs/core/perl_modules/perl-timedate/PKGBUILD +++ b/abs/core/perl_modules/perl-timedate/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-timedate _realname=TimeDate -pkgver=1.16 -pkgrel=3 +pkgver=1.20 +pkgrel=2 pkgdesc="Date formating subroutines" -arch=(i686 x86_64) +arch=(any) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.10.0') @@ -15,18 +15,23 @@ source=(http://www.cpan.org/authors/id/G/GB/GBARR/${_realname}-${pkgver}.tar.gz) options=(!emptydirs) replaces=('timedate') provides=('timedate') -md5sums=('b3cc35a7cabd106ac8829d2f2ff4bd9d') +md5sums=('7da7452bce4c684e4238e6d09b390200') build() { - cd $startdir/src/${_realname}-${pkgver} + cd $srcdir/${_realname}-${pkgver} # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd $srcdir/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-tk/PKGBUILD b/abs/core/perl_modules/perl-tk/PKGBUILD index 7aa281d..21efbdb 100644 --- a/abs/core/perl_modules/perl-tk/PKGBUILD +++ b/abs/core/perl_modules/perl-tk/PKGBUILD @@ -1,40 +1,40 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# $Id$ +# Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk -_realname=Tk -#stable pkgver=804.027 -pkgver=804.028 -pkgrel=2 -pkgdesc="This module/script allows perl to interface with tk" +_cpanname=Tk +pkgver=804.029 +pkgrel=3 +pkgdesc="A graphical user interface toolkit for Perl" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/${_cpanname}" license=('PerlArtistic' 'GPL' 'custom') -arch=(i686 x86_64) -depends=('libx11' 'libpng' 'libjpeg' 'tk' 'perl>=5.10.0') -# -# Using an "unauthorized" version because the official -# release does not build under perl 5.10 -#source=(http://cpan.org/authors/id/N/NI/NI-S/${_realname}-${pkgver}.tar.gz) -# -source=(http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${_realname}-${pkgver}.tar.gz) -md5sums=('7153c1c411b0dd005a0660179e5c5900') -url="http://search.cpan.org/dist/${_realname}/" -options=(!emptydirs) +depends=('libx11' 'libpng' 'libjpeg' 'tk' 'perl') +options=('!emptydirs') replaces=('perltk') provides=('perltk') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) +md5sums=('f4aebe6fcdb309a8480514f2ccf8117c') build() { - cd ${startdir}/src/${_realname}-${pkgver} - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 + cd $srcdir/${_cpanname}-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor /bin/chmod -R u+w * - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + # The Xlib header is wrong... + sed -i 's/XKeycodeToKeysym\(.*\)unsigned int/XKeycodeToKeysym\1KeyCode/' pTk/Xlib.h + make +} + +#check() { +# cd $srcdir/${_cpanname}-$pkgver +# make test +#} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd $srcdir/${_cpanname}-$pkgver + make install DESTDIR=$pkgdir # license install -D -m644 pTk/license.terms \ @@ -42,4 +42,3 @@ build() { install -D -m644 pTk/Tix.license \ ${startdir}/pkg/usr/share/licenses/${pkgname}/tix.license } -# vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-xml-libxslt/PKGBUILD b/abs/core/perl_modules/perl-xml-libxslt/PKGBUILD index 503e401..708898b 100644 --- a/abs/core/perl_modules/perl-xml-libxslt/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-libxslt/PKGBUILD @@ -1,23 +1,30 @@ +# Id:$ # Maintainer: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-libxslt -pkgver=1.68 -pkgrel=1 +pkgver=1.70 +pkgrel=6 pkgdesc="Interface to the gnome libxslt library " arch=('i686' 'x86_64') -url="http://search.cpan.org/~PAJAS/XML-LibXSLT" -license=('GPL' 'PerlArtistic') -depends=('perl-xml-libxml>=1.67' 'libxslt') -options=('!emptydirs') +url="http://search.cpan.org/dist/XML-LibXSLT" +license=('GPL') +depends=('perl-xml-libxml' 'libxslt') source=(http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXSLT-$pkgver.tar.gz) -md5sums=('23265ad14469b3eede5833f205198a6f') +md5sums=('c63a7913999de076e5c911810f69b392') build() { cd $srcdir/XML-LibXSLT-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$pkgdir || return 1 - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check () { + cd $srcdir/XML-LibXSLT-$pkgver + make test +} + +package() { + cd $srcdir/XML-LibXSLT-$pkgver + make install DESTDIR=$pkgdir } diff --git a/abs/core/perl_modules/perl-xml-twig/PKGBUILD b/abs/core/perl_modules/perl-xml-twig/PKGBUILD index b15b94b..b20735d 100644 --- a/abs/core/perl_modules/perl-xml-twig/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-twig/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: damir <damir@archlinux.org> # Maintainer/Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-xml-twig _realname=XML-Twig -pkgver=3.32 -pkgrel=2 +pkgver=3.34 +pkgrel=3 pkgdesc="A module for easy processing of XML" -arch=('i686' 'x86_64') +arch=('any') url="http://search.cpan.org/dist/${_realname}/" license=('GPL' 'PerlArtistic') -depends=('perlxml>=2.23' 'perl-text-iconv' 'perl>=5.10.0') +depends=('perl-xml-parser>=2.23' 'perl-text-iconv' 'perl>=5.12.0') options=('!emptydirs') source=(http://www.cpan.org/authors/id/M/MI/MIROD/${_realname}-${pkgver}.tar.gz) -md5sums=('9df9dcab00aa093c4e540caa5cb759fa') +md5sums=('88a24e3e09b2fc1e252f7662d1291f9a') build() { - cd $startdir/src/${_realname}-${pkgver} - perl Makefile.PL -y INSTALLDIRS=vendor || return 1 - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL -y INSTALLDIRS=vendor + make + make test +} - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/pm-utils/02-logging-append.patch b/abs/core/pm-utils/02-logging-append.patch new file mode 100644 index 0000000..987e057 --- /dev/null +++ b/abs/core/pm-utils/02-logging-append.patch @@ -0,0 +1,19 @@ +Author: James Westby <james.westby@ubuntu.com> +Description: Do not clear the log file on each operation, but instead append to it. + This makes debugging of several suspends much easier. +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255 +Bug-Ubuntu: https://launchpad.net/bugs/410352 + +Index: pm-utils/pm/pm-functions.in +=================================================================== +--- pm-utils.orig/pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200 ++++ pm-utils/pm/pm-functions.in 2010-07-05 18:41:24.126325221 +0200 +@@ -271,7 +271,7 @@ + return 1 + fi + export LOGGING=true +- exec > "$1" 2>&1 ++ exec >> "$1" 2>&1 + } + + check_suspend() { [ -n "$SUSPEND_MODULE" ]; } diff --git a/abs/core/pm-utils/12-fix-intel-audio-powersave-hook.patch b/abs/core/pm-utils/12-fix-intel-audio-powersave-hook.patch new file mode 100644 index 0000000..2d884da --- /dev/null +++ b/abs/core/pm-utils/12-fix-intel-audio-powersave-hook.patch @@ -0,0 +1,40 @@ +From: Florian Kriener <florian@kriener.org> +To: submit@bugs.debian.org +Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug) +Date: Sat, 25 Sep 2010 11:27:30 +0200 + +In the script intel-audio-powersave is this loop + +for dev in /sys/module/snd_*/parameters/power_save; do + [ -w "$dev/parameters/power_save" ] || continue + printf "Setting power savings for $s to %d..." "$dev##*/" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. +done + +I think it should be + +for dev in /sys/module/snd_*; do + [ -w "$dev/parameters/power_save" ] || continue + printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. +done + + +This fixes the two bugs. + +diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave +index 36675a8..da63e40 100644 +--- a/pm/power.d/intel-audio-powersave ++++ b/pm/power.d/intel-audio-powersave +@@ -20,9 +20,9 @@ EOF + + audio_powersave() { + [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA +- for dev in /sys/module/snd_*/parameters/power_save; do ++ for dev in /sys/module/snd_*; do + [ -w "$dev/parameters/power_save" ] || continue +- printf "Setting power savings for $s to %d..." "$dev##*/" "$1" ++ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. + done + } diff --git a/abs/core/pm-utils/13-49bluetooth-sync.patch b/abs/core/pm-utils/13-49bluetooth-sync.patch new file mode 100644 index 0000000..b41f32c --- /dev/null +++ b/abs/core/pm-utils/13-49bluetooth-sync.patch @@ -0,0 +1,43 @@ +From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Mon, 31 Jan 2011 15:30:01 +0100 +Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused + +The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't +synchronous, i. e. it doesn't wait until the module usage count actually drops +to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some +models/older kernels you need to do that to fix suspend problems), as at that +point the module is still in use. + +On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to +unload, so use 100 ms wait steps with a timeout of 2 seconds. + +Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759 +Bug-Ubuntu: https://launchpad.net/bugs/698331 +--- + pm/sleep.d/49bluetooth | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/pm/sleep.d/49bluetooth b/pm/sleep.d/49bluetooth +index d46ba49..0dc1909 100755 +--- a/pm/sleep.d/49bluetooth ++++ b/pm/sleep.d/49bluetooth +@@ -12,6 +12,15 @@ suspend_bluetooth() + if grep -q enabled /proc/acpi/ibm/bluetooth; then + savestate ibm_bluetooth enable + echo disable > /proc/acpi/ibm/bluetooth ++ ++ # wait for up to 2 seconds for the module to actually get ++ # unused ++ TIMEOUT=20 ++ while [ $TIMEOUT -ge 0 ]; do ++ [ `cat /sys/module/btusb/refcnt` = 0 ] && break ++ TIMEOUT=$((TIMEOUT-1)) ++ sleep 0.1 ++ done + else + savestate ibm_bluetooth disable + fi +-- +1.7.2.3 + diff --git a/abs/core/pm-utils/14-disable-sata-alpm.patch b/abs/core/pm-utils/14-disable-sata-alpm.patch new file mode 100644 index 0000000..7b54949 --- /dev/null +++ b/abs/core/pm-utils/14-disable-sata-alpm.patch @@ -0,0 +1,26 @@ +Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware. +Author: Martin Pitt <martin.pitt@ubuntu.com> +Bug-Ubuntu: https://launchpad.net/bugs/539467 + +Index: pm-utils/pm/power.d/sata_alpm +=================================================================== +--- pm-utils.orig/pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100 ++++ pm-utils/pm/power.d/sata_alpm 2011-02-01 15:53:28.954867786 +0100 +@@ -2,7 +2,7 @@ + + . "${PM_FUNCTIONS}" + +-SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true} ++SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false} + + help() { + cat <<EOF +@@ -16,7 +16,7 @@ + + This hook has 1 parameter: + SATA_ALPM_ENABLE = whether to use SATA ALPM on battery. +-Defaults to "true". ++Defaults to "false". + + EOF + } diff --git a/abs/core/pm-utils/PKGBUILD b/abs/core/pm-utils/PKGBUILD index b0c71c4..6e2aed5 100644 --- a/abs/core/pm-utils/PKGBUILD +++ b/abs/core/pm-utils/PKGBUILD @@ -1,37 +1,48 @@ -# $Id: PKGBUILD 98218 2010-11-04 21:31:12Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=pm-utils pkgver=1.4.1 -pkgrel=1 +pkgrel=3 pkgdesc="Utilities and scripts for suspend and hibernate power management" arch=('i686' 'x86_64') url="http://pm-utils.freedesktop.org" license=('GPL') -depends=('bash' 'procps' 'vbetool' 'pm-quirks') -optdepends=('upower') +depends=('bash' 'procps' 'pm-quirks') makedepends=('xmlto' 'docbook-xml' 'docbook-xsl') source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz +02-logging-append.patch +12-fix-intel-audio-powersave-hook.patch +13-49bluetooth-sync.patch +14-disable-sata-alpm.patch 11netcfg) md5sums=('1742a556089c36c3a89eb1b957da5a60' + 'a45149617bf3eb8dc32e6d9e22ae715d' + 'edada31a7d722763513fbe705d95d19d' + '298f78b873c03c025700d5da619ac134' + 'd0040f7d30b6a0dd195b5401abbbbdb9' '9839687c8787d99fd4ff36aa3238c27b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/02-logging-append.patch" + patch -Np1 -i "${srcdir}/12-fix-intel-audio-powersave-hook.patch" + patch -Np1 -i "${srcdir}/13-49bluetooth-sync.patch" + patch -Np1 -i "${srcdir}/14-disable-sata-alpm.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var - make || return 1 -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install || return 1 + make + make DESTDIR="${pkgdir}" install # install additional hooks install -m755 "${srcdir}/11netcfg" "${pkgdir}/usr/lib/pm-utils/sleep.d/" + # nm >=0.8.2 has native udev suspend/resume support rm -f "${pkgdir}/usr/lib/pm-utils/sleep.d/55NetworkManager" + + # Remove hooks that cause hardware failure or don't make sense at all + rm -f "${pkgdir}/usr/lib/pm-utils/power.d/"{harddrive,disable_wol} } diff --git a/abs/core/python_modules/python-geoip/PKGBUILD b/abs/core/python_modules/python-geoip/PKGBUILD index 7d69154..cd095c6 100644 --- a/abs/core/python_modules/python-geoip/PKGBUILD +++ b/abs/core/python_modules/python-geoip/PKGBUILD @@ -3,7 +3,7 @@ pkgname=python-geoip pkgver=1.2.4 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library." arch=(i686 x86_64) url="http://www.maxmind.com/app/python" @@ -15,7 +15,7 @@ provides=('geoip-python') build() { cd ${startdir}/src/GeoIP-Python-${pkgver} - python2 setup.py build install --root=${startdir}/pkg + python2 setup.py build install --root=${pkgdir}/ } md5sums=('50f820d854476efaf3b7af733ffe4236') diff --git a/abs/core/python_modules/python-lxml/PKGBUILD b/abs/core/python_modules/python-lxml/PKGBUILD index 606ec54..df85c69 100644 --- a/abs/core/python_modules/python-lxml/PKGBUILD +++ b/abs/core/python_modules/python-lxml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: $ +# $Id$ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,8 +6,8 @@ # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=python-lxml -pkgver=2.2.6 -pkgrel=4 +pkgver=2.3 +pkgrel=1 pkgdesc="Python binding for the libxml2 and libxslt libraries" arch=('i686' 'x86_64') license=('BSD' 'GPL' 'custom') @@ -16,19 +16,15 @@ depends=('python2' 'libxslt') optdepends=("beautiful-soup: support for parsing not well formed HTML") conflicts=('lxml') replaces=('lxml') -source=(http://codespeak.net/lxml/lxml-$pkgver.tgz) -md5sums=('b1f700fb22d7ee9b977ee3eceb65b20c') - -build() { - /bin/true -} +source=("http://codespeak.net/lxml/lxml-${pkgver}.tgz") +md5sums=('a245a015fd59b63e220005f263e1682a') package() { cd ${srcdir}/lxml-$pkgver - python2 setup.py install --root=${pkgdir} || return 1 + python2 setup.py install --root="${pkgdir}" --optimize=1 - install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1 - install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt || return 1 - install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt || return 1 + install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt + install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt } diff --git a/abs/core/run-parts/PKGBUILD b/abs/core/run-parts/PKGBUILD index a668496..73c3598 100644 --- a/abs/core/run-parts/PKGBUILD +++ b/abs/core/run-parts/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 95110 2010-10-15 10:41:20Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> +# $Id$ pkgname=run-parts -pkgver=3.4.1 +pkgver=4.0.2 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64') url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') -source=("http://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") -md5sums=('d488563ad7ea356d83f848becb1a3a4a') +source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") build() { - cd $srcdir/debianutils-$pkgver - ./configure --prefix=/usr - make run-parts || return 1 + cd $srcdir/debianutils-$pkgver + ./configure --prefix=/usr + make run-parts } package() { - cd $srcdir/debianutils-$pkgver - install -D -m755 run-parts $pkgdir/usr/bin/run-parts - install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 + cd $srcdir/debianutils-$pkgver + install -D -m755 run-parts $pkgdir/usr/bin/run-parts + install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 } - +md5sums=('bb96bc981174c97ad825816ed118d297') diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index e186f99..828e54c 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=24 +pkgrel=25 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/smartd/run b/abs/core/runit-scripts/runitscripts/services/smartd/run index 15ed769..b8eafb6 100755 --- a/abs/core/runit-scripts/runitscripts/services/smartd/run +++ b/abs/core/runit-scripts/runitscripts/services/smartd/run @@ -3,11 +3,6 @@ . /etc/rc.conf . /etc/rc.d/functions - stat_runit "Starting smartd" - /usr/sbin/smartd -n -c /etc/smartd.conf -q never &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon smartd - stat_done - fi +stat_runit "Starting smartd" + + exec /usr/sbin/smartd -n -c /etc/smartd.conf -q never &>/dev/null diff --git a/abs/core/tar/PKGBUILD b/abs/core/tar/PKGBUILD index d4dd25b..3bde59b 100644 --- a/abs/core/tar/PKGBUILD +++ b/abs/core/tar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98542 2010-11-11 03:48:12Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=tar -pkgver=1.25 +pkgver=1.26 pkgrel=1 pkgdesc="Utility used to store, backup, and transport files" arch=('i686' 'x86_64') @@ -13,16 +13,20 @@ groups=('base') depends=('glibc' 'sh') options=('!emptydirs') install=tar.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz tar.1) -md5sums=('6e497f861c77bbba2f7da4e10270995b' +md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1' 'e0538778516a284e3558c454b2576c2f') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin + FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin make +} + +check() { + cd ${srcdir}/$pkgname-$pkgver make check } diff --git a/abs/core/tar/__changelog b/abs/core/tar/__changelog new file mode 100644 index 0000000..4c86946 --- /dev/null +++ b/abs/core/tar/__changelog @@ -0,0 +1 @@ +added FORCE_UNSAFE_CONFIGURE=1 to configure line of PKGBUILD diff --git a/abs/core/tar/tar.install b/abs/core/tar/tar.install index 2f36c3c..8de1f97 100644 --- a/abs/core/tar/tar.install +++ b/abs/core/tar/tar.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(tar.info tar.info-1 tar.info-2) post_install() { diff --git a/abs/core/util-linux-ng/PKGBUILD b/abs/core/util-linux-ng/PKGBUILD deleted file mode 100644 index 6653137..0000000 --- a/abs/core/util-linux-ng/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 86506 2010-08-02 14:22:19Z tpowa $ -# Maintainer: judd <jvinet@zeroflux.org> -pkgname=util-linux-ng -pkgver=2.18 -pkgrel=3 -pkgdesc="Miscellaneous system utilities for Linux" -url="http://userweb.kernel.org/~kzak/util-linux-ng/" -arch=('i686' 'x86_64') -groups=('base') -depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem') -replaces=('linux32' 'util-linux') -conflicts=('linux32' 'util-linux' 'e2fsprogs<1.41.8-2') -provides=('linux32' 'util-linux') -license=('GPL2') -options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.18/${pkgname}-${pkgver}.tar.bz2 - fix-findmnt.patch - util-linux-ng-nilfs2.patch - util-linux-ng-cfdisk.patch) -optdepends=('perl: for chkdupexe support') -install=util-linux-ng.install -md5sums=('2f5f71e6af969d041d73ab778c141a77' - '7346673932b165faadde2fa2a9c1cd3a' - 'aa1f210aa22363605363b7b14b8f7a78' - 'e6d9309d44c258b25a7fb0b70f94f94e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c || return 1 - mkdir -p "${pkgdir}/var/lib/hwclock" || return 1 - # fix findmnt - patch -p1 -i "${srcdir}/fix-findmnt.patch" - # add nilfs2 support, included in next upstream release - patch -Np1 -i "${srcdir}/util-linux-ng-nilfs2.patch" - # fix cfdisk partition changing, included in next upstream release - patch -Np1 -i "${srcdir}/util-linux-ng-cfdisk.patch" - - autoreconf || return 1 - automake || return 1 - ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev --enable-partx || return 1 - make HAVE_SLN=yes ADD_RAW=yes || return 1 - make HAVE_SLN=yes ADD_RAW=yes DESTDIR="${pkgdir}" install || return 1 - # remove files - rm -f "${pkgdir}/bin/kill" - rm -f "${pkgdir}/usr/share/man/man1/kill.1" - rm -f "${pkgdir}/usr/share/man/man5/nfs.5" - rm -f "${pkgdir}/usr/share/info/dir" -} diff --git a/abs/core/util-linux-ng/fix-findmnt.patch b/abs/core/util-linux-ng/fix-findmnt.patch deleted file mode 100644 index bf6574c..0000000 --- a/abs/core/util-linux-ng/fix-findmnt.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 -Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> -Date: Sun Jul 4 20:02:57 2010 +0200 - - libmount: fix merge_optstr (do not truncate 3 trailing characters) - - I believe this is the correct fix. - - Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> - -diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c -index 5dbcfa6..680e1fc 100644 ---- a/shlibs/mount/src/tab_parse.c -+++ b/shlibs/mount/src/tab_parse.c -@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs) - if (!strcmp(vfs, fs)) - return strdup(vfs); /* e.g. "aaa" and "aaa" */ - -- sz = strlen(vfs) + strlen(fs) + 2; -+ /* leave space for leading "r[ow],", "," and trailing zero */ -+ sz = strlen(vfs) + strlen(fs) + 5; - res = malloc(sz); - if (!res) - return NULL; diff --git a/abs/core/util-linux-ng/util-linux-ng-cfdisk.patch b/abs/core/util-linux-ng/util-linux-ng-cfdisk.patch deleted file mode 100644 index bc60e43..0000000 --- a/abs/core/util-linux-ng/util-linux-ng-cfdisk.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Mon, 19 Jul 2010 22:52:58 +0200 -Subject: [PATCH] cfdisk: get_string not calculating correct limits - -Reported-by: James L. Hammons <jlhamm@acm.org> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - fdisk/cfdisk.c | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c -index 7fa0b19..e7955fe 100644 ---- a/fdisk/cfdisk.c -+++ b/fdisk/cfdisk.c -@@ -421,6 +421,11 @@ fdexit(int ret) { - exit(ret); - } - -+/* -+ * Note that @len is size of @str buffer. -+ * -+ * Returns number of read bytes (without \0). -+ */ - static int - get_string(char *str, int len, char *def) { - size_t cells = 0, i = 0; -@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) { - break; - default: - #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) -- if (i < len && iswprint(c)) { -+ if (i + 1 < len && iswprint(c)) { - wchar_t wc = (wchar_t) c; - char s[MB_CUR_MAX + 1]; - int sz = wctomb(s, wc); -@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) { - putchar(BELL); - } - #else -- if (i < len && isprint(c)) { -+ if (i + 1 < len && isprint(c)) { - mvaddch(y, x + cells, c); - if (use_def) { - clrtoeol(); -@@ -2405,7 +2410,7 @@ change_id(int i) { - - sprintf(def, "%02X", new_id); - mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: ")); -- if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT) -+ if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT) - return; - - if (len != GS_DEFAULT) { --- -1.7.2.1 - diff --git a/abs/core/util-linux-ng/util-linux-ng-nilfs2.patch b/abs/core/util-linux-ng/util-linux-ng-nilfs2.patch deleted file mode 100644 index 3ac215b..0000000 --- a/abs/core/util-linux-ng/util-linux-ng-nilfs2.patch +++ /dev/null @@ -1,276 +0,0 @@ -From b44b8600d4096de8203c1fb0702bbc95ee51017f Mon Sep 17 00:00:00 2001 -From: Jiro SEKIBA <jir@unicus.jp> -Date: Tue, 13 Jul 2010 09:12:56 +0200 -Subject: [PATCH] libblkid: add nilfs2 filesystem superblock probe - -This patch implements nilfs2_idinfo to proble nilfs2 partition. -The patch probes uuid, label, version and verify crc check sum of -superblock. - -Signed-off-by: Jiro SEKIBA <jir@unicus.jp> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - shlibs/blkid/src/superblocks/Makefile.am | 1 + - shlibs/blkid/src/superblocks/nilfs.c | 120 ++++++++++++++++++++++++++++ - shlibs/blkid/src/superblocks/superblocks.c | 1 + - shlibs/blkid/src/superblocks/superblocks.h | 1 + - 4 files changed, 123 insertions(+), 0 deletions(-) - create mode 100644 shlibs/blkid/src/superblocks/nilfs.c - -diff --git a/shlibs/blkid/src/superblocks/Makefile.am b/shlibs/blkid/src/superblocks/Makefile.am -index 39b074b..1501fab 100644 ---- a/shlibs/blkid/src/superblocks/Makefile.am -+++ b/shlibs/blkid/src/superblocks/Makefile.am -@@ -47,4 +47,5 @@ libblkid_superblocks_la_SOURCES = \ - drbd.c \ - vmfs.c \ - befs.c \ -+ nilfs.c \ - exfat.c -diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/shlibs/blkid/src/superblocks/nilfs.c -new file mode 100644 -index 0000000..c7aba35 ---- /dev/null -+++ b/shlibs/blkid/src/superblocks/nilfs.c -@@ -0,0 +1,120 @@ -+/* -+ * Copyright (C) 2010 by Jiro SEKIBA <jir@unicus.jp> -+ * -+ * This file may be redistributed under the terms of the -+ * GNU Lesser General Public License -+ */ -+#include <stddef.h> -+#include <string.h> -+ -+#include "superblocks.h" -+#include "crc32.h" -+ -+struct nilfs_super_block { -+ uint32_t s_rev_level; -+ uint16_t s_minor_rev_level; -+ uint16_t s_magic; -+ -+ uint16_t s_bytes; -+ -+ uint16_t s_flags; -+ uint32_t s_crc_seed; -+ uint32_t s_sum; -+ -+ uint32_t s_log_block_size; -+ -+ uint64_t s_nsegments; -+ uint64_t s_dev_size; -+ uint64_t s_first_data_block; -+ uint32_t s_blocks_per_segment; -+ uint32_t s_r_segments_percentage; -+ -+ uint64_t s_last_cno; -+ uint64_t s_last_pseg; -+ uint64_t s_last_seq; -+ uint64_t s_free_blocks_count; -+ -+ uint64_t s_ctime; -+ -+ uint64_t s_mtime; -+ uint64_t s_wtime; -+ uint16_t s_mnt_count; -+ uint16_t s_max_mnt_count; -+ uint16_t s_state; -+ uint16_t s_errors; -+ uint64_t s_lastcheck; -+ -+ uint32_t s_checkinterval; -+ uint32_t s_creator_os; -+ uint16_t s_def_resuid; -+ uint16_t s_def_resgid; -+ uint32_t s_first_ino; -+ -+ uint16_t s_inode_size; -+ uint16_t s_dat_entry_size; -+ uint16_t s_checkpoint_size; -+ uint16_t s_segment_usage_size; -+ -+ uint8_t s_uuid[16]; -+ char s_volume_name[80]; -+ -+ uint32_t s_c_interval; -+ uint32_t s_c_block_max; -+ uint32_t s_reserved[192]; -+}; -+ -+/* nilfs2 magic string */ -+#define NILFS_SB_MAGIC "\x34\x34" -+/* nilfs2 super block offset */ -+#define NILFS_SB_OFF 0x400 -+/* nilfs2 super block offset in kB */ -+#define NILFS_SB_KBOFF (NILFS_SB_OFF >> 10) -+/* nilfs2 magic string offset within super block */ -+#define NILFS_MAG_OFF 6 -+ -+static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag) -+{ -+ struct nilfs_super_block *sb; -+ static unsigned char sum[4]; -+ const int sumoff = offsetof(struct nilfs_super_block, s_sum); -+ size_t bytes; -+ uint32_t crc; -+ -+ sb = blkid_probe_get_sb(pr, mag, struct nilfs_super_block); -+ if (!sb) -+ return -1; -+ -+ bytes = le32_to_cpu(sb->s_bytes); -+ crc = crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff); -+ crc = crc32(crc, sum, 4); -+ crc = crc32(crc, (unsigned char *)sb + sumoff + 4, bytes - sumoff - 4); -+ -+ if (crc != le32_to_cpu(sb->s_sum)) -+ return -1; -+ -+ if (strlen(sb->s_volume_name)) -+ blkid_probe_set_label(pr, (unsigned char *) sb->s_volume_name, -+ sizeof(sb->s_volume_name)); -+ -+ blkid_probe_set_uuid(pr, sb->s_uuid); -+ blkid_probe_sprintf_version(pr, "%u", le32_to_cpu(sb->s_rev_level)); -+ -+ return 0; -+} -+ -+const struct blkid_idinfo nilfs2_idinfo = -+{ -+ .name = "nilfs", -+ .usage = BLKID_USAGE_FILESYSTEM, -+ .probefunc = probe_nilfs2, -+ .magics = -+ { -+ { -+ .magic = NILFS_SB_MAGIC, -+ .len = 2, -+ .kboff = NILFS_SB_KBOFF, -+ .sboff = NILFS_MAG_OFF -+ }, -+ { NULL } -+ } -+}; -diff --git a/shlibs/blkid/src/superblocks/superblocks.c b/shlibs/blkid/src/superblocks/superblocks.c -index b80c10b..3d66d98 100644 ---- a/shlibs/blkid/src/superblocks/superblocks.c -+++ b/shlibs/blkid/src/superblocks/superblocks.c -@@ -140,6 +140,7 @@ static const struct blkid_idinfo *idinfos[] = - &bfs_idinfo, - &vmfs_fs_idinfo, - &befs_idinfo, -+ &nilfs2_idinfo, - &exfat_idinfo - }; - -diff --git a/shlibs/blkid/src/superblocks/superblocks.h b/shlibs/blkid/src/superblocks/superblocks.h -index 74cb974..a79d7cb 100644 ---- a/shlibs/blkid/src/superblocks/superblocks.h -+++ b/shlibs/blkid/src/superblocks/superblocks.h -@@ -65,6 +65,7 @@ extern const struct blkid_idinfo vmfs_volume_idinfo; - extern const struct blkid_idinfo vmfs_fs_idinfo; - extern const struct blkid_idinfo drbd_idinfo; - extern const struct blkid_idinfo befs_idinfo; -+extern const struct blkid_idinfo nilfs2_idinfo; - extern const struct blkid_idinfo exfat_idinfo; - - /* --- -1.7.2.1 -From 67bb0074eec2b154d15bd3dd77b482c3d6125761 Mon Sep 17 00:00:00 2001 -From: Jiro SEKIBA <jir@unicus.jp> -Date: Tue, 13 Jul 2010 09:14:08 +0200 -Subject: [PATCH] tests: add nilfs2 test for libblkid - -Signed-off-by: Jiro SEKIBA <jir@unicus.jp> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - tests/expected/blkid/low-probe-nilfs2 | 7 +++++++ - tests/ts/blkid/images-fs/nilfs2.img.bz2 | Bin 0 -> 795 bytes - 2 files changed, 7 insertions(+), 0 deletions(-) - create mode 100644 tests/expected/blkid/low-probe-nilfs2 - create mode 100644 tests/ts/blkid/images-fs/nilfs2.img.bz2 - -diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2 -new file mode 100644 -index 0000000..bfd8fcd ---- /dev/null -+++ b/tests/expected/blkid/low-probe-nilfs2 -@@ -0,0 +1,7 @@ -+ID_FS_LABEL=test-nilfs2 -+ID_FS_LABEL_ENC=test-nilfs2 -+ID_FS_TYPE=nilfs -+ID_FS_USAGE=filesystem -+ID_FS_UUID=524025fb-6d31-40e6-baad-1db36cfdf806 -+ID_FS_UUID_ENC=524025fb-6d31-40e6-baad-1db36cfdf806 -+ID_FS_VERSION=2 -diff --git a/tests/ts/blkid/images-fs/nilfs2.img.bz2 b/tests/ts/blkid/images-fs/nilfs2.img.bz2 -new file mode 100644 -index 0000000000000000000000000000000000000000..a9762eb1ace9f1999aaad3c40f1d836668d856ac -GIT binary patch -literal 795 -zcmZ>Y%CIzaj8qGbG`Ml9n}H$iKM?$BcJi+ANKl`nz?|O0@_@lbK*y;^z=e@R;iM8v -z^#R6D2YV7HdVE!LUvc5DPv^n~3?@drY>Er`xpEzs%?rp}D3rOt`HEDABm)D32?GP; -z0!EREipv^IOn^)V240{j^Q<Hzqs++;Mp8zSMhpyWZZoCW1WqjeK1)#Iz#6seeHv~( -zmxJ_T@69=2^IA3QjKnD|>vorkjN+>MH*4-%s37X<)*F#v)Rf{P;KEe-N=h(9AxK5r -zNaB>=<>ixS2R?swwRU~FskVY@0E2@ILyiK&T}MB??Mn}*D~htZ3cdTZRH0!*OIOhp -zuF1Yi0SZB_TmsB4k61&aUN!_Ugm_J068*5`gF*w#0teARmnpo_kuT2~GOf!|DtB62 -z!)T++5$eFKB*GXf;<I9F!NQM?v;8`}*7b6px{&k4S4E)bP}5GYFDbo;*GrVLFkN9@ -z@@Z9sSb~JGco?eycMA(Q^Ph&Ju|ft>1p%^G=UuLqkPtM9ycck)X|u7g*QFMo>QK!; -zURQKH*iWxuZsIwzh@rOT!@1{s7L*D22$pQI7i2k@S1M-~SA2Zm@7XFsJ@fXR;7eg< -zQ4&<W_Vc7f@7p(fvkiM$nYo*^O$-78_-wK~RVMkbV1D8JQ`OC<q49;V$o`^l=O3L4 -zcH6Z3#E!YsGG`s)RMF~EOO1d3>aY{zarw_8qLWfhCp?&^`$6=_69yh&WHm7`bFf@V -z(PE04u!6IgDET?h6*ny4n=k(V{?{W7DhkUTSQr9X7>p_oxG=CVFtI2!vN$jZD6(v3 -z;O=l+m1w{)gHeLB;X+0N+bk2QBw&h}z@#bCHj{nH7h4xLj+2u!PE3DPVsFhCSH8Sp -zT}DV?fa{Ns2bOWHVhs!t%xc}wps|W$-`>x&rn$fKjBA>})U}{HMs?HV9M&t-a)KVS -zYg}FWIQh_-FYD!hutchUy`86XxmogM<nBjObNPCsG{5_M%3n}$Xkh3NkUdt<dS{}a -Lh>ElVLy7|cD)2Ck - -literal 0 -HcmV?d00001 - --- -1.7.2.1 -From 1326e1dfa5c1d06ff7521b8c8162452799164239 Mon Sep 17 00:00:00 2001 -From: Jiro SEKIBA <jir@unicus.jp> -Date: Thu, 15 Jul 2010 13:40:27 +0900 -Subject: [PATCH] libblkid: fix typo filesystem name nilfs to nilfs2 - -The correct filesystem name is nilfs2, not nilfs. - -Signed-off-by: Jiro SEKIBA <jir@unicus.jp> ---- - shlibs/blkid/src/superblocks/nilfs.c | 2 +- - tests/expected/blkid/low-probe-nilfs2 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/shlibs/blkid/src/superblocks/nilfs.c -index c7aba35..bf16918 100644 ---- a/shlibs/blkid/src/superblocks/nilfs.c -+++ b/shlibs/blkid/src/superblocks/nilfs.c -@@ -104,7 +104,7 @@ static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag) - - const struct blkid_idinfo nilfs2_idinfo = - { -- .name = "nilfs", -+ .name = "nilfs2", - .usage = BLKID_USAGE_FILESYSTEM, - .probefunc = probe_nilfs2, - .magics = -diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2 -index bfd8fcd..c6c9cab 100644 ---- a/tests/expected/blkid/low-probe-nilfs2 -+++ b/tests/expected/blkid/low-probe-nilfs2 -@@ -1,6 +1,6 @@ - ID_FS_LABEL=test-nilfs2 - ID_FS_LABEL_ENC=test-nilfs2 --ID_FS_TYPE=nilfs -+ID_FS_TYPE=nilfs2 - ID_FS_USAGE=filesystem - ID_FS_UUID=524025fb-6d31-40e6-baad-1db36cfdf806 - ID_FS_UUID_ENC=524025fb-6d31-40e6-baad-1db36cfdf806 --- -1.7.2.1 - diff --git a/abs/core/util-linux-ng/util-linux-ng.install b/abs/core/util-linux-ng/util-linux-ng.install deleted file mode 100644 index b057db9..0000000 --- a/abs/core/util-linux-ng/util-linux-ng.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=/usr/share/info -filelist=(ipc.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - diff --git a/abs/core/x264/PKGBUILD b/abs/core/x264/PKGBUILD index 169184a..c482e04 100644 --- a/abs/core/x264/PKGBUILD +++ b/abs/core/x264/PKGBUILD @@ -3,16 +3,16 @@ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20101116 +pkgver=20110803 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') url="http://www.videolan.org/developers/x264.html" license=('GPL') depends=('glibc') -makedepends=('yasm') +optdepends=('gpac: For gpac support') +makedepends=('yasm' 'gpac') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${pkgver}-2245.tar.bz2) -md5sums=('18a03ff761a290e84cb9f75e716fa5dc') build() { cd "${srcdir}/${pkgname}-snapshot-${pkgver}-2245" || return 1 @@ -34,3 +34,4 @@ package() { } # vim:set ts=2 sw=2 et: +md5sums=('6148c89b85b1136e8047882037a57c07') diff --git a/abs/core/xf86-input-evdev/PKGBUILD b/abs/core/xf86-input-evdev/PKGBUILD index 55c7faa..c6776bd 100644 --- a/abs/core/xf86-input-evdev/PKGBUILD +++ b/abs/core/xf86-input-evdev/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 88543 2010-08-24 08:25:22Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <Alexander@archlinux.org pkgname=xf86-input-evdev pkgver=2.6.0 -pkgrel=1 +pkgrel=4 pkgdesc="X.org evdev input driver" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') makedepends=('xorg-server-devel') conflicts=('xorg-server<1.9.0') -options=('!libtool' !makeflags) -groups=('xorg-input-drivers') +options=('!libtool' '!makeflags') +groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('fb6f7a6f5168ae07efe890e4ace9fb8af1d4e1e0') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('f33fe9413bde68936d8909206a13e8a1') diff --git a/abs/core/xf86-input-evdev/initialize-valuators.patch b/abs/core/xf86-input-evdev/initialize-valuators.patch deleted file mode 100644 index 47b02db..0000000 --- a/abs/core/xf86-input-evdev/initialize-valuators.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ed47c7f33e315f163a6aebeb3e1c8947004576fd Mon Sep 17 00:00:00 2001 -From: Bartosz Brachaczek <b.brachaczek@gmail.com> -Date: Tue, 10 Aug 2010 20:31:00 +0000 -Subject: evdev: Revert "Set all valuators for relative motion events (#24737)" - -It isn't necessary to post zero-deltas to X Server. In order not to post -uninitialized "v" array we should rather simply initialize it. - -This reverts commit c1f16a4f59a584ab4546c2f16e20b06703042057. - -Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com> -Tested-by: Bartek Iwaniec <hash87@gmail.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/evdev.c b/src/evdev.c -index 5ea230c..bdac330 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -386,7 +386,7 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v, - for (i = 0; i < REL_CNT; i++) - { - int map = pEvdev->axis_map[i]; -- if (map != -1) -+ if (pEvdev->delta[i] && map != -1) - { - v[map] = pEvdev->delta[i]; - if (map < first) --- -cgit v0.8.3-6-g21f6 -From ec6cb31cc47eed3ccba4c906ca6c54b99136e9eb Mon Sep 17 00:00:00 2001 -From: Bartosz Brachaczek <b.brachaczek@gmail.com> -Date: Tue, 10 Aug 2010 20:31:37 +0000 -Subject: evdev: Initialize valuators array. (#24737) - -The array needs to be filled with zeros, otherwise we may end up sending -it with random values if non-zero values aren't in one row (which is the -case for A4Tech X-750F which sends REL_MISC events without a reason). - -X.Org Bug 24737 <http://bugs.freedesktop.org/show_bug.cgi?id=24737> - -Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com> -Tested-by: Bartek Iwaniec <hash87@gmail.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/evdev.c b/src/evdev.c -index bdac330..512e957 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -661,7 +661,7 @@ static void - EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - { - int num_v = 0, first_v = 0; -- int v[MAX_VALUATORS]; -+ int v[MAX_VALUATORS] = {}; - EvdevPtr pEvdev = pInfo->private; - - EvdevProcessValuators(pInfo, v, &num_v, &first_v); --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core/xfsprogs/PKGBUILD b/abs/core/xfsprogs/PKGBUILD index 0c2af21..8d2e53b 100644 --- a/abs/core/xfsprogs/PKGBUILD +++ b/abs/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 90211 2010-09-09 07:35:10Z tpowa $ +# $Id$ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=xfsprogs -pkgver=3.1.4 +pkgver=3.1.5 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64') @@ -10,16 +10,20 @@ url="http://oss.sgi.com/projects/xfs/" groups=('base') depends=('util-linux-ng>=2.16') options=('!makeflags' '!libtool') -source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${pkgver}.tar.gz) +# We mirror the sources as upstream tends to move them once a new release is out +source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") +md5sums=('b1db37749e2b4149a0dd178abff956be') build() { cd "${srcdir}/${pkgname}-${pkgver}" export OPTIMIZER="-march=${CARCH/_/-} -O1" export DEBUG=-DNDEBUG - make || return 1 + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DIST_ROOT="${pkgdir}" install install-dev || return 1 + make DIST_ROOT="${pkgdir}" install install-dev + chown -R root $pkgdir + chgrp -R root $pkgdir } -md5sums=('74081975f148bcabcab26c4c3496ede9') diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD index c9d7fcf..37bb2de 100644 --- a/abs/extra/boost/PKGBUILD +++ b/abs/extra/boost/PKGBUILD @@ -1,74 +1,81 @@ -# $Id: PKGBUILD 89256 2010-08-30 13:49:46Z remy $ +# $Id$ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> -# TU: Kritoke <kritoke@gamebox.net> +# Contributor: Kritoke <kritoke@gamebox.net> # Contributor: Luca Roccia <little_rock@users.sourceforge.net> pkgbase=boost pkgname=('boost-libs' 'boost') -pkgver=1.44.0 -_boostver=1_44_0 +pkgver=1.47.0 +_boostver=${pkgver//./_} pkgrel=1 arch=('i686' 'x86_64') url="http://www.boost.org/" -makedepends=('python2' 'bzip2' 'zlib') +makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) license=('custom') -options=('!ccache') _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 : 2.6 : /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 # build bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools/jam/src" - ./build.sh cc || return 1 + cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" + ./build.sh cc _bindir="bin.linuxx86" [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - install -m755 -d "${_stagedir}"/usr/bin - install -m755 ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam || return 1 + install -d "${_stagedir}"/usr/bin + install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - # build bcp - cd "${srcdir}/${pkgbase}_${_boostver}/tools/bcp" - ../jam/src/${_bindir}/bjam --toolset=gcc || return 1 - install -m755 "${srcdir}/${pkgbase}_${_boostver}/dist/bin/bcp" \ - ${_stagedir}/usr/bin/bcp || return 1 + # 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=multi" + # 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 - ./tools/jam/src/${_bindir}/bjam \ - release debug-symbols=off threading=single,multi \ - runtime-link=shared link=shared,static \ - cflags=-fno-strict-aliasing \ - toolset=gcc \ - --prefix="${_stagedir}" \ - -sTOOLS=gcc \ - --layout=tagged \ - install || return 1 - - # build pyste - cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install" - python2 setup.py install --root=${_stagedir} || return 1 + "${_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=('python2: for python bindings') + optdepends=('python2: for python2 bindings') - install -dm 755 "${pkgdir}"/usr/{include,lib} + install -d "${pkgdir}"/usr/{include,lib,share} # headers/source files cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ @@ -78,21 +85,25 @@ package_boost() { # 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 || return 1 + "${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') + depends=('gcc-libs' 'bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') - install -dm 755 "${pkgdir}/usr/lib" + 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 || return 1 + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt } -md5sums=('085fce4ff2089375105d72475d730e15') +md5sums=('ff180a5276bec773a7625cac7e2288e8') diff --git a/abs/extra/boost/__changelog b/abs/extra/boost/__changelog new file mode 100644 index 0000000..f0c532d --- /dev/null +++ b/abs/extra/boost/__changelog @@ -0,0 +1,3 @@ +* remove 'python' dep (aka python3) +* change python 2.7 refrence to 2.6 +* remove python optdep for the libs package diff --git a/abs/extra/celt-0.7/PKGBUILD b/abs/extra/celt-0.7/PKGBUILD new file mode 100644 index 0000000..59b9e9c --- /dev/null +++ b/abs/extra/celt-0.7/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Lauri Niskanen <ape@ape3000.com> + +pkgname=celt-0.7 +_realname=celt +pkgver=0.7.1 +pkgrel=2 +pkgdesc="Low-latency audio communication codec" +arch=('i686' 'x86_64') +url="http://www.celt-codec.org" +license=('BSD') +depends=('libogg') +provides=('celt=$pkgver') +conflicts=('celt') +options=('!libtool') +source=(http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz) +md5sums=('c7f6b8346e132b1a48dae0eff77ea9f0') + +build() { + cd "$srcdir/$_realname-$pkgver" + + ./configure --prefix=/usr + make + make DESTDIR="$pkgdir/" install +} + +package() { + cd "$srcdir/$_realname-$pkgver" + + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/BSD" +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/community/cksfv/PKGBUILD b/abs/extra/community/cksfv/PKGBUILD index b82aa60..da4ba00 100644 --- a/abs/extra/community/cksfv/PKGBUILD +++ b/abs/extra/community/cksfv/PKGBUILD @@ -2,15 +2,15 @@ # Contributor: Wijnand Modderman <wijanand+aur@archlinux.nl> pkgname=cksfv -pkgver=1.3.12 +pkgver=1.3.14 pkgrel=1 pkgdesc="SFV (Simple File Verification) Checker" arch=('i686' 'x86_64') url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/" license=('GPL') depends=('glibc') -source=(http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.bz2) -md5sums=('1d277da8bafaec9ddadb92ece4999590') +source=(http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.gz) +md5sums=('2e15289753ea0b90b6ea86993f93b383') build() { cd $startdir/src/$pkgname-$pkgver diff --git a/abs/extra/community/libmodplug/PKGBUILD b/abs/extra/community/libmodplug/PKGBUILD index 12c67db..3065783 100644 --- a/abs/extra/community/libmodplug/PKGBUILD +++ b/abs/extra/community/libmodplug/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id$ +# Maintainer: +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> pkgname=libmodplug -pkgver=0.8.4 +pkgver=0.8.8.3 pkgrel=1 pkgdesc="A MOD playing library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://modplug-xmms.sourceforge.net/" -license=('GPL') -depends=(gcc-libs) -source=(http://downloads.sf.net/sourceforge/modplug-xmms/libmodplug-${pkgver}.tar.gz) -md5sums=('091bd1168a524a4f36fc61f95209e7e4') +license=('custom') +depends=('gcc-libs') options=('!libtool') +source=("http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz") +md5sums=('8a9c713f0f56894163ddc61f9a0d1f71') build() { - cd ${startdir}/src/libmodplug-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install + make } +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/extra/community/libnetfilter_queue/PKGBUILD b/abs/extra/community/libnetfilter_queue/PKGBUILD index 986c916..0240b96 100644 --- a/abs/extra/community/libnetfilter_queue/PKGBUILD +++ b/abs/extra/community/libnetfilter_queue/PKGBUILD @@ -1,7 +1,10 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> # Maintainer: Filip Wojciechowski, filip at loka dot pl + pkgname=libnetfilter_queue -pkgver=0.0.16 +pkgver=1.0.0 pkgrel=1 pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter" arch=('i686' 'x86_64') @@ -11,11 +14,11 @@ depends=(libnfnetlink) makedepends=(pkgconfig) options=('!libtool') source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('b36664e6cd39edbfe46b416a86118add') +md5sums=('af6a9ea350f63a13609bc3b47b5c395c') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make || return 1 - make DESTDIR=$startdir/pkg install + make DESTDIR=$pkgdir install } diff --git a/abs/extra/community/libnfnetlink/PKGBUILD b/abs/extra/community/libnfnetlink/PKGBUILD index 2e0242e..7577f65 100644 --- a/abs/extra/community/libnfnetlink/PKGBUILD +++ b/abs/extra/community/libnfnetlink/PKGBUILD @@ -1,5 +1,9 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Kevin Edmonds <edmondskevin@hotmail.com> +# Maintainer: Filip Wojciechowski, filip at loka dot pl pkgname=libnfnetlink -pkgver=0.0.40 +pkgver=1.0.0 pkgrel=1 pkgdesc="low-level library for netfilter related kernel/userspace communication" depends=(glibc) @@ -8,7 +12,7 @@ license=('GPL') arch=('i686' 'x86_64') options=('!libtool') source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('3fe19dc4b05ba7e7e6216123097c2819') +md5sums=('016fdec8389242615024c529acc1adb8') build() { cd $startdir/src/$pkgname-$pkgver diff --git a/abs/extra/geoip/PKGBUILD b/abs/extra/geoip/PKGBUILD index 9ae74ba..936aa57 100644 --- a/abs/extra/geoip/PKGBUILD +++ b/abs/extra/geoip/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Manolis Tzanidakis <manolis@archlinux.org> pkgname=geoip -pkgver=1.4.6 +pkgver=1.4.7 pkgrel=1 pkgdesc="Non-DNS IP-to-country resolver C library & utils" arch=(i686 x86_64) @@ -13,13 +13,22 @@ depends=('zlib') backup=(etc/geoip/GeoIP.conf) options=('!libtool') source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz) -md5sums=('cb14b1beeb40631a12676b11ca0c309a') build() { - cd ${startdir}/src/GeoIP-${pkgver} + cd ${srcdir}/GeoIP-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip make || return 1 +} + +check() { + + cd ${srcdir}/GeoIP-${pkgver} make check || return 1 - make DESTDIR=${startdir}/pkg install + } +package() { + cd ${srcdir}/GeoIP-${pkgver} + make DESTDIR=${startdir}/pkg install +} +md5sums=('a802175d5b7e2b57b540a7dd308d9205') diff --git a/abs/extra/hwloc/PKGBUILD b/abs/extra/hwloc/PKGBUILD new file mode 100644 index 0000000..d8023b9 --- /dev/null +++ b/abs/extra/hwloc/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer : Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Sylvain HENRY <hsyl20@yahoo.fr> +# Contributor: Hervé YVIQUEL <elldekaa@gmail.com> + +pkgname=hwloc +pkgver=1.2 +pkgrel=1 +pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" +arch=('i686' 'x86_64') +url="http://www.open-mpi.org/projects/hwloc/" +license=('BSD') +depends=('sh') +makedepends=('pkg-config') +optdepends=('cairo: Graphical output' 'libxml2: XML export') +options=('!libtool' '!docs') +source=(http://www.open-mpi.org/software/hwloc/v1.2/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('43886dfdddda5bfbaa841976275e7bf643453d7b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/abs/extra/libass/PKGBUILD b/abs/extra/libass/PKGBUILD new file mode 100644 index 0000000..508e232 --- /dev/null +++ b/abs/extra/libass/PKGBUILD @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> + +pkgname=libass +pkgver=0.9.13 +pkgrel=1 +pkgdesc="A portable library for SSA/ASS subtitles rendering" +arch=('i686' 'x86_64') +url="http://code.google.com/p/libass/" +license=('BSD') +depends=('enca' 'fontconfig' 'libpng') +makedepends=('pkgconfig') +options=(!libtool) +source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +md5sums=('d99381922dcbeb7a766d2e7825cca193') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/extra/libbonobo/PKGBUILD b/abs/extra/libbonobo/PKGBUILD index de48e25..c061ba4 100644 --- a/abs/extra/libbonobo/PKGBUILD +++ b/abs/extra/libbonobo/PKGBUILD @@ -1,30 +1,29 @@ -# $Id: PKGBUILD 29425 2009-03-08 17:32:56Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libbonobo -pkgver=2.24.3 +pkgver=2.32.1 pkgrel=1 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('orbit2>=2.14.17' 'libxml2>=2.7.3' 'dbus-glib>=0.78') +depends=('orbit2' 'libxml2' 'glib2') makedepends=('intltool' 'pkgconfig' 'flex') options=('!libtool') backup=('etc/bonobo-activation/bonobo-activation-config.xml') -replaces=('bonobo-activation') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.24/libbonobo-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.32/libbonobo-${pkgver}.tar.bz2 bonobo-activation-config.xml) install=libbonobo.install +sha256sums=('9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b' + '081de245c42de10ebeea3cbcd819c5ce5d0a15b9bdde9c2098302b1e14965af2') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/bonobo || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/" || return 1 + --libexecdir=/usr/lib/bonobo + make + make DESTDIR="${pkgdir}" install + install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/" } -md5sums=('b217cef6a187505290c66c5bf8225d38' - '6392efaca30a26f826eafc4b8ccbc01f') diff --git a/abs/extra/libbonobo/bonobo-activation-config.xml b/abs/extra/libbonobo/bonobo-activation-config.xml index 65ee75f..3db19f7 100644 --- a/abs/extra/libbonobo/bonobo-activation-config.xml +++ b/abs/extra/libbonobo/bonobo-activation-config.xml @@ -5,7 +5,6 @@ <searchpath> <!-- Examples: --> <item>/usr/lib/bonobo/servers</item> - <item>/opt/gnome/lib/bonobo/servers</item> <!-- <item>/usr/local/gnome2/lib/bonobo/servers</item> --> <!-- <item>/usr/local/lib/bonobo/servers</item> --> <!-- <item>/opt/gnome2/bonobo-activation/lib/bonobo/servers</item> --> diff --git a/abs/extra/libbonobo/libbonobo.install b/abs/extra/libbonobo/libbonobo.install index 1794e4a..5cc04eb 100644 --- a/abs/extra/libbonobo/libbonobo.install +++ b/abs/extra/libbonobo/libbonobo.install @@ -1,7 +1,3 @@ -post_install() { - /bin/true -} - post_upgrade() { ldconfig -r . PID=`pidof bonobo-activation-server` @@ -9,15 +5,3 @@ post_upgrade() { killall -HUP bonobo-activation-server 2>&1 fi } - -pre_remove() { - /bin/true -} - -post_remove() { - /bin/true -} - -op=$1 -shift -$op $* diff --git a/abs/extra/libbonoboui/PKGBUILD b/abs/extra/libbonoboui/PKGBUILD index 7118102..fd99d28 100644 --- a/abs/extra/libbonoboui/PKGBUILD +++ b/abs/extra/libbonoboui/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 29428 2009-03-08 17:35:50Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libbonoboui -pkgver=2.24.3 +pkgver=2.24.5 pkgrel=1 pkgdesc="User Interface library for Bonobo" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL' 'LGPL') -depends=('libgnomecanvas>=2.20.1.1' 'libgnome>=2.24.1') -makedepends=('perlxml' 'pkgconfig') +depends=('libgnomecanvas' 'libgnome') +makedepends=('intltool' 'pkgconfig') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --localstatedir=/var --disable-static + make + make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop" } -md5sums=('3a754b1df0a4d5fd4836a05020a0bb4a') diff --git a/abs/extra/libva/PKGBUILD b/abs/extra/libva/PKGBUILD index dcd999f..18c2971 100644 --- a/abs/extra/libva/PKGBUILD +++ b/abs/extra/libva/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva -pkgver=1.0.7 +pkgver=1.0.14 pkgrel=1 pkgdesc="Video Acceleration (VA) API for Linux" arch=('i686' 'x86_64') @@ -11,14 +11,11 @@ depends=('libgl' 'libdrm>=2.4.23' 'libxfixes') makedepends=('mesa') optdepends=('vdpau-video: VDPAU backend for VA API') options=('!libtool') -source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2 - libva-dont-install-tests.patch) -md5sums=('3903b0463e2892f8afbd631daa5619ae' - '0a9bd14c36545c0e9819dfe32ea80f41') +source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2) +md5sums=('9a7eba239bffa3b40d7a49e3bb4fb6fb') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i "${srcdir}/libva-dont-install-tests.patch" ./autogen.sh ./configure --prefix=/usr \ --enable-i965-driver \ @@ -33,4 +30,3 @@ package() { } # vim:set ts=2 sw=2 et: - diff --git a/abs/extra/libva/libva-dont-install-tests.patch b/abs/extra/libva/libva-dont-install-tests.patch deleted file mode 100644 index 43e4cba..0000000 --- a/abs/extra/libva/libva-dont-install-tests.patch +++ /dev/null @@ -1,47 +0,0 @@ -Don't install some useeless tests programs - - ---- test/basic/Makefile.am~ 2010-02-12 09:42:10.000000000 -0500 -+++ test/basic/Makefile.am 2010-03-10 13:36:50.449834525 -0500 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ -+check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ - test_07 test_08 test_09 test_10 test_11 - - AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA ---- test/decode/Makefile.am~ 2010-02-12 09:42:10.000000000 -0500 -+++ test/decode/Makefile.am 2010-03-10 13:37:09.636843464 -0500 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = mpeg2vldemo -+check_PROGRAMS = mpeg2vldemo - - AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA - ---- test/encode/Makefile.am~ 2010-02-12 09:42:10.000000000 -0500 -+++ test/encode/Makefile.am 2010-03-10 13:37:26.701846294 -0500 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = h264encode -+check_PROGRAMS = h264encode - - AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA - ---- test/putsurface/Makefile.am~ 2010-03-10 13:18:55.270697040 -0500 -+++ test/putsurface/Makefile.am 2010-03-10 13:38:08.106713556 -0500 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = putsurface -+check_PROGRAMS = putsurface - - AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA - diff --git a/abs/extra/libva/patch1.patch b/abs/extra/libva/patch1.patch deleted file mode 100644 index b455857..0000000 --- a/abs/extra/libva/patch1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- test/basic/Makefile.am.orig 2010-11-10 00:34:13.000000000 +0000 -+++ test/basic/Makefile.am 2010-11-10 00:34:54.000000000 +0000 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ -+check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ - test_07 test_08 test_09 test_10 test_11 - - AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 diff --git a/abs/extra/libwnck/PKGBUILD b/abs/extra/libwnck/PKGBUILD deleted file mode 100644 index f7e8baa..0000000 --- a/abs/extra/libwnck/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 99757 2010-11-17 12:00:58Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=libwnck -pkgver=2.30.6 -pkgrel=1 -pkgdesc="Window Navigator Construction Kit" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('gtk2>=2.22.0' 'startup-notification>=0.10' 'libxres' 'gdk-pixbuf2') -makedepends=('libxt>=1.0.6' 'intltool' 'gobject-introspection') -options=('!libtool') -url="http://www.gnome.org/" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make || return 1 -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/abs/extra/libxfce4util/PKGBUILD b/abs/extra/libxfce4util/PKGBUILD deleted file mode 100644 index dea44e6..0000000 --- a/abs/extra/libxfce4util/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 80806 2010-05-22 12:57:44Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: tobias <tobias funnychar archlinux.org> - -pkgname=libxfce4util -pkgver=4.6.2 -pkgrel=1 -pkgdesc="Basic utility non-GUI functions for Xfce" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.xfce.org/" -depends=("glib2>=2.24.1") -makedepends=('pkgconfig') -options=('!libtool') -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9c3129d827d480f0906c575e7a13f1e9') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --disable-static - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 -} diff --git a/abs/extra/libxfcegui4/PKGBUILD b/abs/extra/libxfcegui4/PKGBUILD deleted file mode 100644 index c947d2f..0000000 --- a/abs/extra/libxfcegui4/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 80816 2010-05-22 13:17:01Z andyrtr $ -# Maintainer: tobias <tobias funnychar archlinux.org> - -pkgname=libxfcegui4 -pkgver=4.6.4 -pkgrel=1 -pkgdesc="Various gtk widgets for Xfce" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.xfce.org/" -depends=('startup-notification' "xfconf>=4.6.2" "libglade>=2.6.4" 'hicolor-icon-theme') -makedepends=('pkgconfig' 'intltool') -options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('88de59b222cb9977f93a4c61011c1e1f') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --disable-static # --enable-xinerama - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 -} diff --git a/abs/extra/libxfcegui4/libxfcegui4.install b/abs/extra/libxfcegui4/libxfcegui4.install deleted file mode 100644 index fee9e5d..0000000 --- a/abs/extra/libxfcegui4/libxfcegui4.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - diff --git a/abs/extra/miro/PKGBUILD b/abs/extra/miro/PKGBUILD index df3e83c..e0a8d7f 100644 --- a/abs/extra/miro/PKGBUILD +++ b/abs/extra/miro/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro -pkgver=3.5 +pkgver=4.0.2 pkgrel=2 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'gnome-python' makedepends=('pkgconfig') install=miro.install source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz) -sha1sums=('a5e72b39e3a1bb5ec918bd8fddeb6b079f44c9b3') +sha1sums=('22342897ca748fa19738c9c1c510510f314fa7eb') build() { cd "${srcdir}/${pkgname}-${pkgver}/linux" diff --git a/abs/extra/openmpi/PKGBUILD b/abs/extra/openmpi/PKGBUILD new file mode 100644 index 0000000..7dd1084 --- /dev/null +++ b/abs/extra/openmpi/PKGBUILD @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +pkgname=openmpi +pkgver=1.5.3 +pkgrel=4 +pkgdesc="High performance message passing library (MPI)" +arch=('i686' 'x86_64') +url="http://www.open-mpi.org" +license=('custom') +depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc') +makedepends=('net-tools') +options=(!libtool) +source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('669565c708deab82ad4069d82675b2020eb0e0c6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./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 \ + --with-valgrind \ + --enable-memchecker \ + --enable-debug \ + --enable-pretty-print-stacktrace \ + --without-slurm \ + --with-hwloc=external \ + --with-libltdl=/usr \ + FC=/usr/bin/gfortran \ + LDFLAGS='-Wl,-z,noexecstack' + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # Openmpi's otfinfo conflicts with the one from texlive + mv "${pkgdir}"/usr/bin/otfinfo "${pkgdir}"/usr/bin/otfinfompi + + # Openmpi's otfdump conflicts with the one from libotf + mv "${pkgdir}"/usr/bin/otfdump "${pkgdir}"/usr/bin/otfdumpompi + + # Symlink points to non-existing ortec++.1 + rm "${pkgdir}"/usr/share/man/man1/orteCC.1 + + install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d + echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/abs/extra/polkit-gnome/PKGBUILD b/abs/extra/polkit-gnome/PKGBUILD deleted file mode 100644 index f9b3607..0000000 --- a/abs/extra/polkit-gnome/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: onestep_ua <onestep@ukr.net> - -pkgname=polkit-gnome -pkgver=0.97 -pkgrel=1 -pkgdesc="PolicyKit integration for the GNOME desktop" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/PolicyKit" -license=('LGPL') -depends=('polkit>=0.98' 'gtk2>=2.21.8') -makedepends=('intltool') -replaces=('policykit-gnome') -options=(!libtool !makeflags) -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2) -md5sums=('17a75ee1aafa19ae4f79052c8cde75b6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/OnlyShowIn=GNOME/NotShowIn=KDE/' src/polkit-gnome-authentication-agent-1.desktop.in.in - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \ - --disable-static --disable-introspection - make - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install -} diff --git a/abs/extra/polkit/PKGBUILD b/abs/extra/polkit/PKGBUILD index 62f3f8b..3a55ddc 100644 --- a/abs/extra/polkit/PKGBUILD +++ b/abs/extra/polkit/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 90717 2010-09-15 14:26:53Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit -pkgver=0.98 -pkgrel=1 +pkgver=0.101 +pkgrel=2 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64) license=('LGPL') url="http://www.freedesktop.org/wiki/Software/PolicyKit" -depends=('glib2>=2.25.15' 'pam' 'expat>=2.0.1') -makedepends=('intltool>=0.41.1' 'gtk-doc>=1.15' 'gobject-introspection>=0.9.5') +depends=('glib2' 'pam' 'expat') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection') replaces=('policykit') options=('!libtool') source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz - polkit-git-fixes.patch + CVE-2011-1485.patch polkit.pam) -md5sums=('96e583a1177ba5436f034a2fee55f5fa' - 'c5aaa13d6eeda5cec224b273acba9420' +md5sums=('f925ac93aba3c072977370c1e27feb7f' + '4d858b8ab602614d7db2bc8574f6fd29' '6564f95878297b954f0572bc1610dd15') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/polkit-git-fixes.patch" - libtoolize --force - autoreconf + patch -Np1 -i "${srcdir}/CVE-2011-1485.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ --disable-static --enable-gtk-doc diff --git a/abs/extra/polkit/polkit-0.98-1-i686-build.log.1 b/abs/extra/polkit/polkit-0.98-1-i686-build.log.1 deleted file mode 100644 index 3d40277..0000000 --- a/abs/extra/polkit/polkit-0.98-1-i686-build.log.1 +++ /dev/null @@ -1,403 +0,0 @@ -patching file src/polkit/polkitcheckauthorizationflags.h -patching file src/polkit/polkiterror.h -patching file src/polkit/polkitimplicitauthorization.h -patching file src/polkitagent/Makefile.am -patching file src/polkitagent/polkitagenthelperprivate.c -patching file src/polkitbackend/polkitbackendsessionmonitor.c -libtoolize: putting auxiliary files in `.'. -libtoolize: linking file `./ltmain.sh' -libtoolize: You should add the contents of the following files to `aclocal.m4': -libtoolize: `/usr/share/aclocal/libtool.m4' -libtoolize: `/usr/share/aclocal/ltoptions.m4' -libtoolize: `/usr/share/aclocal/ltversion.m4' -libtoolize: `/usr/share/aclocal/lt~obsolete.m4' -libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and -libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. -libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. -/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD -/usr/share/aclocal/libxosd.m4:9: run info '(automake)Extending aclocal' -/usr/share/aclocal/libxosd.m4:9: or see http://sources.redhat.com/automake/automake.html#Extending-aclocal -checking for a BSD-compatible install... /bin/install -c -checking whether build environment is sane... yes -checking for a thread-safe mkdir -p... /bin/mkdir -p -checking for gawk... gawk -checking whether make sets $(MAKE)... yes -checking whether to enable maintainer-specific portions of Makefiles... no -checking for style of include used by make... GNU -checking for gcc... gcc -checking whether the C compiler works... yes -checking for C compiler default output file name... a.out -checking for suffix of executables... -checking whether we are cross compiling... no -checking for suffix of object files... o -checking whether we are using the GNU C compiler... yes -checking whether gcc accepts -g... yes -checking for gcc option to accept ISO C89... none needed -checking dependency style of gcc... gcc3 -checking for library containing strerror... none required -checking for gcc... (cached) gcc -checking whether we are using the GNU C compiler... (cached) yes -checking whether gcc accepts -g... (cached) yes -checking for gcc option to accept ISO C89... (cached) none needed -checking dependency style of gcc... (cached) gcc3 -checking for gcc... (cached) gcc -checking whether we are using the GNU C compiler... (cached) yes -checking whether gcc accepts -g... (cached) yes -checking for gcc option to accept ISO C89... (cached) none needed -checking dependency style of gcc... (cached) gcc3 -checking how to run the C preprocessor... gcc -E -checking for grep that handles long lines and -e... /bin/grep -checking for egrep... /bin/grep -E -checking for ANSI C header files... yes -checking build system type... i686-pc-linux-gnu -checking host system type... i686-pc-linux-gnu -checking how to print strings... printf -checking for a sed that does not truncate output... /bin/sed -checking for fgrep... /bin/grep -F -checking for ld used by gcc... /usr/bin/ld -checking if the linker (/usr/bin/ld) is GNU ld... yes -checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B -checking the name lister (/usr/bin/nm -B) interface... BSD nm -checking whether ln -s works... yes -checking the maximum length of command line arguments... 1572864 -checking whether the shell understands some XSI constructs... yes -checking whether the shell understands "+="... yes -checking for /usr/bin/ld option to reload object files... -r -checking for objdump... objdump -checking how to recognize dependent libraries... pass_all -checking for ar... ar -checking for strip... strip -checking for ranlib... ranlib -checking command to parse /usr/bin/nm -B output from gcc object... ok -checking for sys/types.h... yes -checking for sys/stat.h... yes -checking for stdlib.h... yes -checking for string.h... yes -checking for memory.h... yes -checking for strings.h... yes -checking for inttypes.h... yes -checking for stdint.h... yes -checking for unistd.h... yes -checking for dlfcn.h... yes -checking for objdir... .libs -checking if gcc supports -fno-rtti -fno-exceptions... no -checking for gcc option to produce PIC... -fPIC -DPIC -checking if gcc PIC flag -fPIC -DPIC works... yes -checking if gcc static flag -static works... yes -checking if gcc supports -c -o file.o... yes -checking if gcc supports -c -o file.o... (cached) yes -checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes -checking whether -lc should be explicitly linked in... no -checking dynamic linker characteristics... GNU/Linux ld.so -checking how to hardcode library paths into programs... immediate -checking whether stripping libraries is possible... yes -checking if libtool supports shared libraries... yes -checking whether to build shared libraries... yes -checking whether to build static libraries... no -checking whether make sets $(MAKE)... (cached) yes -checking whether ln -s works... yes -checking for special C compiler options needed for large files... no -checking for _FILE_OFFSET_BITS value needed for large files... 64 -checking whether gcc and cc understand -c and -o together... yes -checking for xsltproc... /usr/bin/xsltproc -checking for pkg-config... /usr/bin/pkg-config -checking pkg-config is at least version 0.9.0... yes -checking for gtkdoc-check... /usr/bin/gtkdoc-check -checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase -checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf -checking whether to build gtk-doc documentation... yes -checking for GLIB... yes -checking expat.h usability... yes -checking expat.h presence... yes -checking for expat.h... yes -checking for XML_ParserCreate in -lexpat... yes -checking for clearenv... yes -checking for pam_start in -lpam... yes -checking for sigtimedwait in -lc... yes -checking how to call pam_strerror... two arguments -checking security/pam_modutil.h usability... yes -checking security/pam_modutil.h presence... yes -checking for security/pam_modutil.h... yes -checking security/pam_ext.h usability... yes -checking security/pam_ext.h presence... yes -checking for security/pam_ext.h... yes -checking for pam_vsyslog in -lpam... yes -checking for /etc/redhat-release... no -checking for /etc/SuSE-release... no -checking for /etc/gentoo-release... no -checking for /etc/pardus-release... no -Linux distribution autodetection failed, specify the distribution to target using --with-os-type= -checking for INTROSPECTION... yes -checking whether NLS is requested... yes -checking for intltool >= 0.40.0... 0.41.1 found -checking for intltool-update... /usr/bin/intltool-update -checking for intltool-merge... /usr/bin/intltool-merge -checking for intltool-extract... /usr/bin/intltool-extract -checking for xgettext... /usr/bin/xgettext -checking for msgmerge... /usr/bin/msgmerge -checking for msgfmt... /usr/bin/msgfmt -checking for gmsgfmt... /usr/bin/msgfmt -checking for perl... /usr/bin/perl -checking for perl >= 5.8.1... 5.12.1 -checking for XML::Parser... ok -checking locale.h usability... yes -checking locale.h presence... yes -checking for locale.h... yes -checking for LC_MESSAGES... yes -checking libintl.h usability... yes -checking libintl.h presence... yes -checking for libintl.h... yes -checking for ngettext in libc... yes -checking for dgettext in libc... yes -checking for bind_textdomain_codeset... yes -checking for msgfmt... (cached) /usr/bin/msgfmt -checking for dcgettext... yes -checking if msgfmt accepts -c... yes -checking for gmsgfmt... (cached) /usr/bin/msgfmt -checking for xgettext... (cached) /usr/bin/xgettext -configure: creating ./config.status -config.status: creating Makefile -config.status: creating actions/Makefile -config.status: creating data/Makefile -config.status: creating data/polkit-1 -config.status: creating data/polkit-gobject-1.pc -config.status: creating data/polkit-backend-1.pc -config.status: creating data/polkit-agent-1.pc -config.status: creating src/Makefile -config.status: creating src/polkit/Makefile -config.status: creating src/polkitbackend/Makefile -config.status: creating src/polkitagent/Makefile -config.status: creating src/polkitd/Makefile -config.status: creating src/programs/Makefile -config.status: creating src/examples/Makefile -config.status: creating src/nullbackend/Makefile -config.status: creating docs/version.xml -config.status: creating docs/extensiondir.xml -config.status: creating docs/Makefile -config.status: creating docs/polkit/Makefile -config.status: creating docs/man/Makefile -config.status: creating po/Makefile.in -config.status: creating config.h -config.status: executing depfiles commands -config.status: executing libtool commands -config.status: executing default-1 commands -config.status: executing po/stamp-it commands - - polkit 0.98 - ================= - - prefix: /usr - libdir: ${exec_prefix}/lib - libexecdir: /usr/lib/polkit-1 - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - datadir: ${datarootdir} - sysconfdir: /etc - localstatedir: /var - docdir: ${datarootdir}/doc/${PACKAGE_TARNAME} - - compiler: gcc - cflags: -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security - cppflags: - xsltproc: /usr/bin/xsltproc - introspection: yes - - Distribution/OS: unknown - authentication framework: pam - PAM support: yes - - PAM file auth: system-auth - PAM file account: system-auth - PAM file password: system-auth - PAM file session: system-auth - - Maintainer mode: no - Building verbose mode: no - Building api docs: yes - Building man pages: yes - - -NOTE: The directory /etc/polkit-1/localauthority must be owned - by root and have mode 700 - -NOTE: The directory /var/lib/polkit-1 must be owned - by root and have mode 700 - -NOTE: The file /usr/lib/polkit-1/polkit-agent-helper-1 must be owned - by root and have mode 4755 (setuid root binary) - -NOTE: The file ${exec_prefix}/bin/pkexec must be owned by root and - have mode 4755 (setuid root binary) - -make all-recursive -make[1]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98' -Making all in actions -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions' -LC_ALL=C /usr/bin/intltool-merge -x -u -c ../po/.intltool-merge-cache ../po org.freedesktop.policykit.policy.in org.freedesktop.policykit.policy -Generating and caching the translation database -Merging translations into org.freedesktop.policykit.policy. -CREATED org.freedesktop.policykit.policy -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions' -Making all in data -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data' -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data' -Making all in src -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -Making all in polkit -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitenumtypes.c.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \ - polkitenumtypes.c.tmp && mv polkitenumtypes.c.tmp polkitenumtypes.c -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitenumtypes.h.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \ - polkitenumtypes.h.tmp && mv polkitenumtypes.h.tmp polkitenumtypes.h -make all-am -make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' - CC libpolkit_gobject_1_la-polkitenumtypes.lo - CC libpolkit_gobject_1_la-polkitactiondescription.lo - CC libpolkit_gobject_1_la-polkitauthorityfeatures.lo - CC libpolkit_gobject_1_la-polkitdetails.lo - CC libpolkit_gobject_1_la-polkitauthority.lo - CC libpolkit_gobject_1_la-polkiterror.lo - CC libpolkit_gobject_1_la-polkitsubject.lo - CC libpolkit_gobject_1_la-polkitunixprocess.lo - CC libpolkit_gobject_1_la-polkitunixsession.lo - CC libpolkit_gobject_1_la-polkitsystembusname.lo - CC libpolkit_gobject_1_la-polkitidentity.lo - CC libpolkit_gobject_1_la-polkitunixuser.lo - CC libpolkit_gobject_1_la-polkitunixgroup.lo - CC libpolkit_gobject_1_la-polkitauthorizationresult.lo - CC libpolkit_gobject_1_la-polkitcheckauthorizationflags.lo - CC libpolkit_gobject_1_la-polkitimplicitauthorization.lo - CC libpolkit_gobject_1_la-polkittemporaryauthorization.lo - CC libpolkit_gobject_1_la-polkitpermission.lo - CCLD libpolkit-gobject-1.la -/usr/bin/g-ir-scanner -v \ - --namespace Polkit \ - --nsversion=1.0 \ - --include=Gio-2.0 \ - --library=polkit-gobject-1 \ - --output Polkit-1.0.gir \ - --pkg=glib-2.0 \ - --pkg=gobject-2.0 \ - --pkg=gio-2.0 \ - --libtool=../../libtool \ - -I../../src \ - -D_POLKIT_COMPILATION \ - ./polkit.h \ - ./polkittypes.h \ - ./polkitactiondescription.h \ - ./polkitauthority.h \ - ./polkitauthorizationresult.h \ - ./polkitcheckauthorizationflags.h \ - ./polkitdetails.h \ - ./polkitenumtypes.h \ - ./polkiterror.h \ - ./polkitidentity.h \ - ./polkitimplicitauthorization.h \ - ./polkitsubject.h \ - ./polkitsystembusname.h \ - ./polkittemporaryauthorization.h \ - ./polkitunixgroup.h \ - ./polkitunixprocess.h \ - ./polkitunixsession.h \ - ./polkitunixuser.h \ - ./polkitpermission.h \ - -g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -I../../src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -c -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectitVM7V/Polkit-1.0.o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectitVM7V/Polkit-1.0.c -g-ir-scanner: link: ../../libtool --mode=link --tag=CC --silent gcc -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectitVM7V/Polkit-1.0 -export-dynamic -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -L. -lpolkit-gobject-1 -pthread -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectitVM7V/Polkit-1.0.o -/usr/bin/g-ir-compiler Polkit-1.0.gir -o Polkit-1.0.typelib -make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -Making all in polkitbackend -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend' - CC libpolkit_backend_1_la-polkitbackendauthority.lo - CC libpolkit_backend_1_la-polkitbackendinteractiveauthority.lo - CC libpolkit_backend_1_la-polkitbackendlocalauthority.lo - CC libpolkit_backend_1_la-polkitbackendactionpool.lo - CC libpolkit_backend_1_la-polkitbackendsessionmonitor.lo - CC libpolkit_backend_1_la-polkitbackendconfigsource.lo - CC libpolkit_backend_1_la-polkitbackendactionlookup.lo - CC libpolkit_backend_1_la-polkitbackendlocalauthorizationstore.lo - CCLD libpolkit-backend-1.la -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend' -Making all in polkitagent -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitagentenumtypes.c.template polkitagentlistener.h) > \ - polkitagentenumtypes.c.tmp && mv polkitagentenumtypes.c.tmp polkitagentenumtypes.c -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitagentenumtypes.h.template polkitagentlistener.h) > \ - polkitagentenumtypes.h.tmp && mv polkitagentenumtypes.h.tmp polkitagentenumtypes.h -(echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c -touch marshal.stamp -make all-am -make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' - CC libpolkit_agent_1_la-polkitagentenumtypes.lo - CC libpolkit_agent_1_la-polkitagentmarshal.lo - CC libpolkit_agent_1_la-polkitagentsession.lo - CC libpolkit_agent_1_la-polkitagenttextlistener.lo - CC libpolkit_agent_1_la-polkitagentlistener.lo - CC polkit_agent_helper_1-polkitagenthelperprivate.o - CC polkit_agent_helper_1-polkitagenthelper-pam.o - CCLD libpolkit-agent-1.la - CCLD polkit-agent-helper-1 -make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -Making all in polkitd -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd' - CC polkitd-main.o - CC polkitd-gposixsignal.o - CCLD polkitd -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd' -Making all in nullbackend -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend' - CC libnullbackend_la-nullbackend.lo - CC libnullbackend_la-polkitbackendnullauthority.lo - CCLD libnullbackend.la -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend' -Making all in programs -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs' - CC libpkexec_action_lookup_la-pkexec-action-lookup.lo - CC pkexec-pkexec.o - CC pkcheck-pkcheck.o - CC pkaction-pkaction.o - CCLD pkaction - CCLD pkcheck - CCLD libpkexec-action-lookup.la - CCLD pkexec -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs' -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -make[3]: Nothing to be done for `all-am'. -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -Making all in docs -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs' -Making all in man -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man' -/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl polkit.xml -/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl polkitd.xml -/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl pklocalauthority.xml -/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl pkexec.xml -/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl pkcheck.xml -Note: Writing polkitd.8 -Note: Writing pkcheck.1 -/usr/bin/xsltproc -nonet --stringparam man.base.url.for.relative.links /usr/share/gtk-doc/html/polkit-1/ --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl pkaction.xml -Note: Writing pkexec.1 -Note: Writing polkit.8 -Note: Writing pklocalauthority.8 -Note: Writing pkaction.1 -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man' -Making all in polkit -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit' -gtk-doc: Scanning header files -Can't locate gtkdoc-common.pl in @INC (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl /usr/lib/perl5/site_perl/5.10.1 /usr/share/perl5/site_perl/5.10.1 /usr/lib/perl5/current /usr/lib/perl5/site_perl/current . /usr/share/gtk-doc/data) at /usr/bin/gtkdoc-scan line 44. -make[3]: *** [scan-build.stamp] Error 2 -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit' -make[2]: *** [all-recursive] Error 1 -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs' -make[1]: *** [all-recursive] Error 1 -make[1]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98' -make: *** [all] Error 2 -[1m Aborting...(B[m diff --git a/abs/extra/polkit/polkit-0.98-1-i686-build.log.2 b/abs/extra/polkit/polkit-0.98-1-i686-build.log.2 deleted file mode 100644 index 5368acc..0000000 --- a/abs/extra/polkit/polkit-0.98-1-i686-build.log.2 +++ /dev/null @@ -1,386 +0,0 @@ -patching file src/polkit/polkitcheckauthorizationflags.h -patching file src/polkit/polkiterror.h -patching file src/polkit/polkitimplicitauthorization.h -patching file src/polkitagent/Makefile.am -patching file src/polkitagent/polkitagenthelperprivate.c -patching file src/polkitbackend/polkitbackendsessionmonitor.c -libtoolize: putting auxiliary files in `.'. -libtoolize: linking file `./ltmain.sh' -libtoolize: You should add the contents of the following files to `aclocal.m4': -libtoolize: `/usr/share/aclocal/libtool.m4' -libtoolize: `/usr/share/aclocal/ltoptions.m4' -libtoolize: `/usr/share/aclocal/ltversion.m4' -libtoolize: `/usr/share/aclocal/lt~obsolete.m4' -libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and -libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. -libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. -/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD -/usr/share/aclocal/libxosd.m4:9: run info '(automake)Extending aclocal' -/usr/share/aclocal/libxosd.m4:9: or see http://sources.redhat.com/automake/automake.html#Extending-aclocal -checking for a BSD-compatible install... /bin/install -c -checking whether build environment is sane... yes -checking for a thread-safe mkdir -p... /bin/mkdir -p -checking for gawk... gawk -checking whether make sets $(MAKE)... yes -checking whether to enable maintainer-specific portions of Makefiles... no -checking for style of include used by make... GNU -checking for gcc... gcc -checking whether the C compiler works... yes -checking for C compiler default output file name... a.out -checking for suffix of executables... -checking whether we are cross compiling... no -checking for suffix of object files... o -checking whether we are using the GNU C compiler... yes -checking whether gcc accepts -g... yes -checking for gcc option to accept ISO C89... none needed -checking dependency style of gcc... gcc3 -checking for library containing strerror... none required -checking for gcc... (cached) gcc -checking whether we are using the GNU C compiler... (cached) yes -checking whether gcc accepts -g... (cached) yes -checking for gcc option to accept ISO C89... (cached) none needed -checking dependency style of gcc... (cached) gcc3 -checking for gcc... (cached) gcc -checking whether we are using the GNU C compiler... (cached) yes -checking whether gcc accepts -g... (cached) yes -checking for gcc option to accept ISO C89... (cached) none needed -checking dependency style of gcc... (cached) gcc3 -checking how to run the C preprocessor... gcc -E -checking for grep that handles long lines and -e... /bin/grep -checking for egrep... /bin/grep -E -checking for ANSI C header files... yes -checking build system type... i686-pc-linux-gnu -checking host system type... i686-pc-linux-gnu -checking how to print strings... printf -checking for a sed that does not truncate output... /bin/sed -checking for fgrep... /bin/grep -F -checking for ld used by gcc... /usr/bin/ld -checking if the linker (/usr/bin/ld) is GNU ld... yes -checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B -checking the name lister (/usr/bin/nm -B) interface... BSD nm -checking whether ln -s works... yes -checking the maximum length of command line arguments... 1572864 -checking whether the shell understands some XSI constructs... yes -checking whether the shell understands "+="... yes -checking for /usr/bin/ld option to reload object files... -r -checking for objdump... objdump -checking how to recognize dependent libraries... pass_all -checking for ar... ar -checking for strip... strip -checking for ranlib... ranlib -checking command to parse /usr/bin/nm -B output from gcc object... ok -checking for sys/types.h... yes -checking for sys/stat.h... yes -checking for stdlib.h... yes -checking for string.h... yes -checking for memory.h... yes -checking for strings.h... yes -checking for inttypes.h... yes -checking for stdint.h... yes -checking for unistd.h... yes -checking for dlfcn.h... yes -checking for objdir... .libs -checking if gcc supports -fno-rtti -fno-exceptions... no -checking for gcc option to produce PIC... -fPIC -DPIC -checking if gcc PIC flag -fPIC -DPIC works... yes -checking if gcc static flag -static works... yes -checking if gcc supports -c -o file.o... yes -checking if gcc supports -c -o file.o... (cached) yes -checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes -checking whether -lc should be explicitly linked in... no -checking dynamic linker characteristics... GNU/Linux ld.so -checking how to hardcode library paths into programs... immediate -checking whether stripping libraries is possible... yes -checking if libtool supports shared libraries... yes -checking whether to build shared libraries... yes -checking whether to build static libraries... no -checking whether make sets $(MAKE)... (cached) yes -checking whether ln -s works... yes -checking for special C compiler options needed for large files... no -checking for _FILE_OFFSET_BITS value needed for large files... 64 -checking whether gcc and cc understand -c and -o together... yes -checking for xsltproc... /usr/bin/xsltproc -checking for pkg-config... /usr/bin/pkg-config -checking pkg-config is at least version 0.9.0... yes -checking for gtkdoc-check... /usr/bin/gtkdoc-check -checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase -checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf -checking whether to build gtk-doc documentation... yes -checking for GLIB... yes -checking expat.h usability... yes -checking expat.h presence... yes -checking for expat.h... yes -checking for XML_ParserCreate in -lexpat... yes -checking for clearenv... yes -checking for pam_start in -lpam... yes -checking for sigtimedwait in -lc... yes -checking how to call pam_strerror... two arguments -checking security/pam_modutil.h usability... yes -checking security/pam_modutil.h presence... yes -checking for security/pam_modutil.h... yes -checking security/pam_ext.h usability... yes -checking security/pam_ext.h presence... yes -checking for security/pam_ext.h... yes -checking for pam_vsyslog in -lpam... yes -checking for /etc/redhat-release... no -checking for /etc/SuSE-release... no -checking for /etc/gentoo-release... no -checking for /etc/pardus-release... no -Linux distribution autodetection failed, specify the distribution to target using --with-os-type= -checking for INTROSPECTION... yes -checking whether NLS is requested... yes -checking for intltool >= 0.40.0... 0.41.1 found -checking for intltool-update... /usr/bin/intltool-update -checking for intltool-merge... /usr/bin/intltool-merge -checking for intltool-extract... /usr/bin/intltool-extract -checking for xgettext... /usr/bin/xgettext -checking for msgmerge... /usr/bin/msgmerge -checking for msgfmt... /usr/bin/msgfmt -checking for gmsgfmt... /usr/bin/msgfmt -checking for perl... /usr/bin/perl -checking for perl >= 5.8.1... 5.12.1 -checking for XML::Parser... ok -checking locale.h usability... yes -checking locale.h presence... yes -checking for locale.h... yes -checking for LC_MESSAGES... yes -checking libintl.h usability... yes -checking libintl.h presence... yes -checking for libintl.h... yes -checking for ngettext in libc... yes -checking for dgettext in libc... yes -checking for bind_textdomain_codeset... yes -checking for msgfmt... (cached) /usr/bin/msgfmt -checking for dcgettext... yes -checking if msgfmt accepts -c... yes -checking for gmsgfmt... (cached) /usr/bin/msgfmt -checking for xgettext... (cached) /usr/bin/xgettext -configure: creating ./config.status -config.status: creating Makefile -config.status: creating actions/Makefile -config.status: creating data/Makefile -config.status: creating data/polkit-1 -config.status: creating data/polkit-gobject-1.pc -config.status: creating data/polkit-backend-1.pc -config.status: creating data/polkit-agent-1.pc -config.status: creating src/Makefile -config.status: creating src/polkit/Makefile -config.status: creating src/polkitbackend/Makefile -config.status: creating src/polkitagent/Makefile -config.status: creating src/polkitd/Makefile -config.status: creating src/programs/Makefile -config.status: creating src/examples/Makefile -config.status: creating src/nullbackend/Makefile -config.status: creating docs/version.xml -config.status: creating docs/extensiondir.xml -config.status: creating docs/Makefile -config.status: creating docs/polkit/Makefile -config.status: creating docs/man/Makefile -config.status: creating po/Makefile.in -config.status: creating config.h -config.status: config.h is unchanged -config.status: executing depfiles commands -config.status: executing libtool commands -config.status: executing default-1 commands -config.status: executing po/stamp-it commands - - polkit 0.98 - ================= - - prefix: /usr - libdir: ${exec_prefix}/lib - libexecdir: /usr/lib/polkit-1 - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - datadir: ${datarootdir} - sysconfdir: /etc - localstatedir: /var - docdir: ${datarootdir}/doc/${PACKAGE_TARNAME} - - compiler: gcc - cflags: -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security - cppflags: - xsltproc: /usr/bin/xsltproc - introspection: yes - - Distribution/OS: unknown - authentication framework: pam - PAM support: yes - - PAM file auth: system-auth - PAM file account: system-auth - PAM file password: system-auth - PAM file session: system-auth - - Maintainer mode: no - Building verbose mode: no - Building api docs: yes - Building man pages: yes - - -NOTE: The directory /etc/polkit-1/localauthority must be owned - by root and have mode 700 - -NOTE: The directory /var/lib/polkit-1 must be owned - by root and have mode 700 - -NOTE: The file /usr/lib/polkit-1/polkit-agent-helper-1 must be owned - by root and have mode 4755 (setuid root binary) - -NOTE: The file ${exec_prefix}/bin/pkexec must be owned by root and - have mode 4755 (setuid root binary) - -make all-recursive -make[1]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98' -Making all in actions -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions' -LC_ALL=C /usr/bin/intltool-merge -x -u -c ../po/.intltool-merge-cache ../po org.freedesktop.policykit.policy.in org.freedesktop.policykit.policy -Found cached translation database -Merging translations into org.freedesktop.policykit.policy. -CREATED org.freedesktop.policykit.policy -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions' -Making all in data -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data' -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data' -Making all in src -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -Making all in polkit -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitenumtypes.c.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \ - polkitenumtypes.c.tmp && mv polkitenumtypes.c.tmp polkitenumtypes.c -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitenumtypes.h.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \ - polkitenumtypes.h.tmp && mv polkitenumtypes.h.tmp polkitenumtypes.h -make all-am -make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' - CC libpolkit_gobject_1_la-polkitenumtypes.lo - CC libpolkit_gobject_1_la-polkitactiondescription.lo - CC libpolkit_gobject_1_la-polkitauthorityfeatures.lo - CC libpolkit_gobject_1_la-polkitdetails.lo - CC libpolkit_gobject_1_la-polkitauthority.lo - CC libpolkit_gobject_1_la-polkiterror.lo - CC libpolkit_gobject_1_la-polkitsubject.lo - CC libpolkit_gobject_1_la-polkitunixprocess.lo - CC libpolkit_gobject_1_la-polkitunixsession.lo - CC libpolkit_gobject_1_la-polkitsystembusname.lo - CC libpolkit_gobject_1_la-polkitidentity.lo - CC libpolkit_gobject_1_la-polkitunixuser.lo - CC libpolkit_gobject_1_la-polkitunixgroup.lo - CC libpolkit_gobject_1_la-polkitauthorizationresult.lo - CC libpolkit_gobject_1_la-polkitcheckauthorizationflags.lo - CC libpolkit_gobject_1_la-polkitimplicitauthorization.lo - CC libpolkit_gobject_1_la-polkittemporaryauthorization.lo - CC libpolkit_gobject_1_la-polkitpermission.lo - CCLD libpolkit-gobject-1.la -/usr/bin/g-ir-scanner -v \ - --namespace Polkit \ - --nsversion=1.0 \ - --include=Gio-2.0 \ - --library=polkit-gobject-1 \ - --output Polkit-1.0.gir \ - --pkg=glib-2.0 \ - --pkg=gobject-2.0 \ - --pkg=gio-2.0 \ - --libtool=../../libtool \ - -I../../src \ - -D_POLKIT_COMPILATION \ - ./polkit.h \ - ./polkittypes.h \ - ./polkitactiondescription.h \ - ./polkitauthority.h \ - ./polkitauthorizationresult.h \ - ./polkitcheckauthorizationflags.h \ - ./polkitdetails.h \ - ./polkitenumtypes.h \ - ./polkiterror.h \ - ./polkitidentity.h \ - ./polkitimplicitauthorization.h \ - ./polkitsubject.h \ - ./polkitsystembusname.h \ - ./polkittemporaryauthorization.h \ - ./polkitunixgroup.h \ - ./polkitunixprocess.h \ - ./polkitunixsession.h \ - ./polkitunixuser.h \ - ./polkitpermission.h \ - -g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -I../../src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -c -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectQrHJGc/Polkit-1.0.o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectQrHJGc/Polkit-1.0.c -g-ir-scanner: link: ../../libtool --mode=link --tag=CC --silent gcc -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectQrHJGc/Polkit-1.0 -export-dynamic -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -L. -lpolkit-gobject-1 -pthread -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectQrHJGc/Polkit-1.0.o -/usr/bin/g-ir-compiler Polkit-1.0.gir -o Polkit-1.0.typelib -make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -Making all in polkitbackend -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend' - CC libpolkit_backend_1_la-polkitbackendauthority.lo - CC libpolkit_backend_1_la-polkitbackendinteractiveauthority.lo - CC libpolkit_backend_1_la-polkitbackendlocalauthority.lo - CC libpolkit_backend_1_la-polkitbackendactionpool.lo - CC libpolkit_backend_1_la-polkitbackendsessionmonitor.lo - CC libpolkit_backend_1_la-polkitbackendconfigsource.lo - CC libpolkit_backend_1_la-polkitbackendactionlookup.lo - CC libpolkit_backend_1_la-polkitbackendlocalauthorizationstore.lo - CCLD libpolkit-backend-1.la -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend' -Making all in polkitagent -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h -(echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c -touch marshal.stamp -make all-am -make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' - CC libpolkit_agent_1_la-polkitagentenumtypes.lo - CC libpolkit_agent_1_la-polkitagentmarshal.lo - CC libpolkit_agent_1_la-polkitagentsession.lo - CC libpolkit_agent_1_la-polkitagentlistener.lo - CC libpolkit_agent_1_la-polkitagenttextlistener.lo - CC polkit_agent_helper_1-polkitagenthelperprivate.o - CC polkit_agent_helper_1-polkitagenthelper-pam.o - CCLD libpolkit-agent-1.la - CCLD polkit-agent-helper-1 -make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -Making all in polkitd -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd' - CC polkitd-main.o - CCLD polkitd -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd' -Making all in nullbackend -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend' - CC libnullbackend_la-nullbackend.lo - CC libnullbackend_la-polkitbackendnullauthority.lo - CCLD libnullbackend.la -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend' -Making all in programs -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs' - CC libpkexec_action_lookup_la-pkexec-action-lookup.lo - CC pkexec-pkexec.o - CC pkcheck-pkcheck.o - CC pkaction-pkaction.o - CCLD pkaction - CCLD pkcheck - CCLD libpkexec-action-lookup.la - CCLD pkexec -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs' -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -make[3]: Nothing to be done for `all-am'. -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -Making all in docs -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs' -Making all in man -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man' -make[3]: Nothing to be done for `all'. -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man' -Making all in polkit -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit' -gtk-doc: Scanning header files -Can't locate gtkdoc-common.pl in @INC (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl /usr/lib/perl5/site_perl/5.10.1 /usr/share/perl5/site_perl/5.10.1 /usr/lib/perl5/current /usr/lib/perl5/site_perl/current . /usr/share/gtk-doc/data) at /usr/bin/gtkdoc-scan line 44. -make[3]: *** [scan-build.stamp] Error 2 -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit' -make[2]: *** [all-recursive] Error 1 -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs' -make[1]: *** [all-recursive] Error 1 -make[1]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98' -make: *** [all] Error 2 -[1m Aborting...(B[m diff --git a/abs/extra/polkit/polkit-0.98-1-i686-build.log.3 b/abs/extra/polkit/polkit-0.98-1-i686-build.log.3 deleted file mode 100644 index ffa5596..0000000 --- a/abs/extra/polkit/polkit-0.98-1-i686-build.log.3 +++ /dev/null @@ -1,386 +0,0 @@ -patching file src/polkit/polkitcheckauthorizationflags.h -patching file src/polkit/polkiterror.h -patching file src/polkit/polkitimplicitauthorization.h -patching file src/polkitagent/Makefile.am -patching file src/polkitagent/polkitagenthelperprivate.c -patching file src/polkitbackend/polkitbackendsessionmonitor.c -libtoolize: putting auxiliary files in `.'. -libtoolize: linking file `./ltmain.sh' -libtoolize: You should add the contents of the following files to `aclocal.m4': -libtoolize: `/usr/share/aclocal/libtool.m4' -libtoolize: `/usr/share/aclocal/ltoptions.m4' -libtoolize: `/usr/share/aclocal/ltversion.m4' -libtoolize: `/usr/share/aclocal/lt~obsolete.m4' -libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and -libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. -libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. -/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD -/usr/share/aclocal/libxosd.m4:9: run info '(automake)Extending aclocal' -/usr/share/aclocal/libxosd.m4:9: or see http://sources.redhat.com/automake/automake.html#Extending-aclocal -checking for a BSD-compatible install... /bin/install -c -checking whether build environment is sane... yes -checking for a thread-safe mkdir -p... /bin/mkdir -p -checking for gawk... gawk -checking whether make sets $(MAKE)... yes -checking whether to enable maintainer-specific portions of Makefiles... no -checking for style of include used by make... GNU -checking for gcc... gcc -checking whether the C compiler works... yes -checking for C compiler default output file name... a.out -checking for suffix of executables... -checking whether we are cross compiling... no -checking for suffix of object files... o -checking whether we are using the GNU C compiler... yes -checking whether gcc accepts -g... yes -checking for gcc option to accept ISO C89... none needed -checking dependency style of gcc... gcc3 -checking for library containing strerror... none required -checking for gcc... (cached) gcc -checking whether we are using the GNU C compiler... (cached) yes -checking whether gcc accepts -g... (cached) yes -checking for gcc option to accept ISO C89... (cached) none needed -checking dependency style of gcc... (cached) gcc3 -checking for gcc... (cached) gcc -checking whether we are using the GNU C compiler... (cached) yes -checking whether gcc accepts -g... (cached) yes -checking for gcc option to accept ISO C89... (cached) none needed -checking dependency style of gcc... (cached) gcc3 -checking how to run the C preprocessor... gcc -E -checking for grep that handles long lines and -e... /bin/grep -checking for egrep... /bin/grep -E -checking for ANSI C header files... yes -checking build system type... i686-pc-linux-gnu -checking host system type... i686-pc-linux-gnu -checking how to print strings... printf -checking for a sed that does not truncate output... /bin/sed -checking for fgrep... /bin/grep -F -checking for ld used by gcc... /usr/bin/ld -checking if the linker (/usr/bin/ld) is GNU ld... yes -checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B -checking the name lister (/usr/bin/nm -B) interface... BSD nm -checking whether ln -s works... yes -checking the maximum length of command line arguments... 1572864 -checking whether the shell understands some XSI constructs... yes -checking whether the shell understands "+="... yes -checking for /usr/bin/ld option to reload object files... -r -checking for objdump... objdump -checking how to recognize dependent libraries... pass_all -checking for ar... ar -checking for strip... strip -checking for ranlib... ranlib -checking command to parse /usr/bin/nm -B output from gcc object... ok -checking for sys/types.h... yes -checking for sys/stat.h... yes -checking for stdlib.h... yes -checking for string.h... yes -checking for memory.h... yes -checking for strings.h... yes -checking for inttypes.h... yes -checking for stdint.h... yes -checking for unistd.h... yes -checking for dlfcn.h... yes -checking for objdir... .libs -checking if gcc supports -fno-rtti -fno-exceptions... no -checking for gcc option to produce PIC... -fPIC -DPIC -checking if gcc PIC flag -fPIC -DPIC works... yes -checking if gcc static flag -static works... yes -checking if gcc supports -c -o file.o... yes -checking if gcc supports -c -o file.o... (cached) yes -checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes -checking whether -lc should be explicitly linked in... no -checking dynamic linker characteristics... GNU/Linux ld.so -checking how to hardcode library paths into programs... immediate -checking whether stripping libraries is possible... yes -checking if libtool supports shared libraries... yes -checking whether to build shared libraries... yes -checking whether to build static libraries... no -checking whether make sets $(MAKE)... (cached) yes -checking whether ln -s works... yes -checking for special C compiler options needed for large files... no -checking for _FILE_OFFSET_BITS value needed for large files... 64 -checking whether gcc and cc understand -c and -o together... yes -checking for xsltproc... /usr/bin/xsltproc -checking for pkg-config... /usr/bin/pkg-config -checking pkg-config is at least version 0.9.0... yes -checking for gtkdoc-check... /usr/bin/gtkdoc-check -checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase -checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf -checking whether to build gtk-doc documentation... yes -checking for GLIB... yes -checking expat.h usability... yes -checking expat.h presence... yes -checking for expat.h... yes -checking for XML_ParserCreate in -lexpat... yes -checking for clearenv... yes -checking for pam_start in -lpam... yes -checking for sigtimedwait in -lc... yes -checking how to call pam_strerror... two arguments -checking security/pam_modutil.h usability... yes -checking security/pam_modutil.h presence... yes -checking for security/pam_modutil.h... yes -checking security/pam_ext.h usability... yes -checking security/pam_ext.h presence... yes -checking for security/pam_ext.h... yes -checking for pam_vsyslog in -lpam... yes -checking for /etc/redhat-release... no -checking for /etc/SuSE-release... no -checking for /etc/gentoo-release... no -checking for /etc/pardus-release... no -Linux distribution autodetection failed, specify the distribution to target using --with-os-type= -checking for INTROSPECTION... yes -checking whether NLS is requested... yes -checking for intltool >= 0.40.0... 0.41.1 found -checking for intltool-update... /usr/bin/intltool-update -checking for intltool-merge... /usr/bin/intltool-merge -checking for intltool-extract... /usr/bin/intltool-extract -checking for xgettext... /usr/bin/xgettext -checking for msgmerge... /usr/bin/msgmerge -checking for msgfmt... /usr/bin/msgfmt -checking for gmsgfmt... /usr/bin/msgfmt -checking for perl... /usr/bin/perl -checking for perl >= 5.8.1... 5.12.1 -checking for XML::Parser... ok -checking locale.h usability... yes -checking locale.h presence... yes -checking for locale.h... yes -checking for LC_MESSAGES... yes -checking libintl.h usability... yes -checking libintl.h presence... yes -checking for libintl.h... yes -checking for ngettext in libc... yes -checking for dgettext in libc... yes -checking for bind_textdomain_codeset... yes -checking for msgfmt... (cached) /usr/bin/msgfmt -checking for dcgettext... yes -checking if msgfmt accepts -c... yes -checking for gmsgfmt... (cached) /usr/bin/msgfmt -checking for xgettext... (cached) /usr/bin/xgettext -configure: creating ./config.status -config.status: creating Makefile -config.status: creating actions/Makefile -config.status: creating data/Makefile -config.status: creating data/polkit-1 -config.status: creating data/polkit-gobject-1.pc -config.status: creating data/polkit-backend-1.pc -config.status: creating data/polkit-agent-1.pc -config.status: creating src/Makefile -config.status: creating src/polkit/Makefile -config.status: creating src/polkitbackend/Makefile -config.status: creating src/polkitagent/Makefile -config.status: creating src/polkitd/Makefile -config.status: creating src/programs/Makefile -config.status: creating src/examples/Makefile -config.status: creating src/nullbackend/Makefile -config.status: creating docs/version.xml -config.status: creating docs/extensiondir.xml -config.status: creating docs/Makefile -config.status: creating docs/polkit/Makefile -config.status: creating docs/man/Makefile -config.status: creating po/Makefile.in -config.status: creating config.h -config.status: config.h is unchanged -config.status: executing depfiles commands -config.status: executing libtool commands -config.status: executing default-1 commands -config.status: executing po/stamp-it commands - - polkit 0.98 - ================= - - prefix: /usr - libdir: ${exec_prefix}/lib - libexecdir: /usr/lib/polkit-1 - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - datadir: ${datarootdir} - sysconfdir: /etc - localstatedir: /var - docdir: ${datarootdir}/doc/${PACKAGE_TARNAME} - - compiler: gcc - cflags: -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security - cppflags: - xsltproc: /usr/bin/xsltproc - introspection: yes - - Distribution/OS: unknown - authentication framework: pam - PAM support: yes - - PAM file auth: system-auth - PAM file account: system-auth - PAM file password: system-auth - PAM file session: system-auth - - Maintainer mode: no - Building verbose mode: no - Building api docs: yes - Building man pages: yes - - -NOTE: The directory /etc/polkit-1/localauthority must be owned - by root and have mode 700 - -NOTE: The directory /var/lib/polkit-1 must be owned - by root and have mode 700 - -NOTE: The file /usr/lib/polkit-1/polkit-agent-helper-1 must be owned - by root and have mode 4755 (setuid root binary) - -NOTE: The file ${exec_prefix}/bin/pkexec must be owned by root and - have mode 4755 (setuid root binary) - -make all-recursive -make[1]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98' -Making all in actions -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions' -LC_ALL=C /usr/bin/intltool-merge -x -u -c ../po/.intltool-merge-cache ../po org.freedesktop.policykit.policy.in org.freedesktop.policykit.policy -Found cached translation database -Merging translations into org.freedesktop.policykit.policy. -CREATED org.freedesktop.policykit.policy -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions' -Making all in data -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data' -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data' -Making all in src -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -Making all in polkit -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitenumtypes.c.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \ - polkitenumtypes.c.tmp && mv polkitenumtypes.c.tmp polkitenumtypes.c -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitenumtypes.h.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \ - polkitenumtypes.h.tmp && mv polkitenumtypes.h.tmp polkitenumtypes.h -make all-am -make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' - CC libpolkit_gobject_1_la-polkitenumtypes.lo - CC libpolkit_gobject_1_la-polkitactiondescription.lo - CC libpolkit_gobject_1_la-polkitdetails.lo - CC libpolkit_gobject_1_la-polkitauthorityfeatures.lo - CC libpolkit_gobject_1_la-polkitauthority.lo - CC libpolkit_gobject_1_la-polkiterror.lo - CC libpolkit_gobject_1_la-polkitsubject.lo - CC libpolkit_gobject_1_la-polkitunixprocess.lo - CC libpolkit_gobject_1_la-polkitunixsession.lo - CC libpolkit_gobject_1_la-polkitsystembusname.lo - CC libpolkit_gobject_1_la-polkitidentity.lo - CC libpolkit_gobject_1_la-polkitunixuser.lo - CC libpolkit_gobject_1_la-polkitunixgroup.lo - CC libpolkit_gobject_1_la-polkitauthorizationresult.lo - CC libpolkit_gobject_1_la-polkitcheckauthorizationflags.lo - CC libpolkit_gobject_1_la-polkitimplicitauthorization.lo - CC libpolkit_gobject_1_la-polkittemporaryauthorization.lo - CC libpolkit_gobject_1_la-polkitpermission.lo - CCLD libpolkit-gobject-1.la -/usr/bin/g-ir-scanner -v \ - --namespace Polkit \ - --nsversion=1.0 \ - --include=Gio-2.0 \ - --library=polkit-gobject-1 \ - --output Polkit-1.0.gir \ - --pkg=glib-2.0 \ - --pkg=gobject-2.0 \ - --pkg=gio-2.0 \ - --libtool=../../libtool \ - -I../../src \ - -D_POLKIT_COMPILATION \ - ./polkit.h \ - ./polkittypes.h \ - ./polkitactiondescription.h \ - ./polkitauthority.h \ - ./polkitauthorizationresult.h \ - ./polkitcheckauthorizationflags.h \ - ./polkitdetails.h \ - ./polkitenumtypes.h \ - ./polkiterror.h \ - ./polkitidentity.h \ - ./polkitimplicitauthorization.h \ - ./polkitsubject.h \ - ./polkitsystembusname.h \ - ./polkittemporaryauthorization.h \ - ./polkitunixgroup.h \ - ./polkitunixprocess.h \ - ./polkitunixsession.h \ - ./polkitunixuser.h \ - ./polkitpermission.h \ - -g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -I../../src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -c -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectow0jkH/Polkit-1.0.o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectow0jkH/Polkit-1.0.c -g-ir-scanner: link: ../../libtool --mode=link --tag=CC --silent gcc -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectow0jkH/Polkit-1.0 -export-dynamic -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -L. -lpolkit-gobject-1 -pthread -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectow0jkH/Polkit-1.0.o -/usr/bin/g-ir-compiler Polkit-1.0.gir -o Polkit-1.0.typelib -make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -Making all in polkitbackend -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend' - CC libpolkit_backend_1_la-polkitbackendauthority.lo - CC libpolkit_backend_1_la-polkitbackendinteractiveauthority.lo - CC libpolkit_backend_1_la-polkitbackendlocalauthority.lo - CC libpolkit_backend_1_la-polkitbackendactionpool.lo - CC libpolkit_backend_1_la-polkitbackendsessionmonitor.lo - CC libpolkit_backend_1_la-polkitbackendconfigsource.lo - CC libpolkit_backend_1_la-polkitbackendactionlookup.lo - CC libpolkit_backend_1_la-polkitbackendlocalauthorizationstore.lo - CCLD libpolkit-backend-1.la -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend' -Making all in polkitagent -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h -(echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c -touch marshal.stamp -make all-am -make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' - CC libpolkit_agent_1_la-polkitagentenumtypes.lo - CC libpolkit_agent_1_la-polkitagentmarshal.lo - CC libpolkit_agent_1_la-polkitagentsession.lo - CC libpolkit_agent_1_la-polkitagentlistener.lo - CC libpolkit_agent_1_la-polkitagenttextlistener.lo - CC polkit_agent_helper_1-polkitagenthelperprivate.o - CC polkit_agent_helper_1-polkitagenthelper-pam.o - CCLD libpolkit-agent-1.la - CCLD polkit-agent-helper-1 -make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -Making all in polkitd -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd' - CC polkitd-main.o - CCLD polkitd -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd' -Making all in nullbackend -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend' - CC libnullbackend_la-nullbackend.lo - CC libnullbackend_la-polkitbackendnullauthority.lo - CCLD libnullbackend.la -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend' -Making all in programs -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs' - CC libpkexec_action_lookup_la-pkexec-action-lookup.lo - CC pkexec-pkexec.o - CC pkcheck-pkcheck.o - CC pkaction-pkaction.o - CCLD pkaction - CCLD pkcheck - CCLD libpkexec-action-lookup.la - CCLD pkexec -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs' -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -make[3]: Nothing to be done for `all-am'. -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -Making all in docs -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs' -Making all in man -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man' -make[3]: Nothing to be done for `all'. -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man' -Making all in polkit -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit' -gtk-doc: Scanning header files -Can't locate gtkdoc-common.pl in @INC (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl /usr/lib/perl5/site_perl/5.10.1 /usr/share/perl5/site_perl/5.10.1 /usr/lib/perl5/current /usr/lib/perl5/site_perl/current . /usr/share/gtk-doc/data) at /usr/bin/gtkdoc-scan line 44. -make[3]: *** [scan-build.stamp] Error 2 -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit' -make[2]: *** [all-recursive] Error 1 -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs' -make[1]: *** [all-recursive] Error 1 -make[1]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98' -make: *** [all] Error 2 -[1m Aborting...(B[m diff --git a/abs/extra/polkit/polkit-0.98-1-i686-build.log.4 b/abs/extra/polkit/polkit-0.98-1-i686-build.log.4 deleted file mode 100644 index f390773..0000000 --- a/abs/extra/polkit/polkit-0.98-1-i686-build.log.4 +++ /dev/null @@ -1,386 +0,0 @@ -patching file src/polkit/polkitcheckauthorizationflags.h -patching file src/polkit/polkiterror.h -patching file src/polkit/polkitimplicitauthorization.h -patching file src/polkitagent/Makefile.am -patching file src/polkitagent/polkitagenthelperprivate.c -patching file src/polkitbackend/polkitbackendsessionmonitor.c -libtoolize: putting auxiliary files in `.'. -libtoolize: linking file `./ltmain.sh' -libtoolize: You should add the contents of the following files to `aclocal.m4': -libtoolize: `/usr/share/aclocal/libtool.m4' -libtoolize: `/usr/share/aclocal/ltoptions.m4' -libtoolize: `/usr/share/aclocal/ltversion.m4' -libtoolize: `/usr/share/aclocal/lt~obsolete.m4' -libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and -libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. -libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. -/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD -/usr/share/aclocal/libxosd.m4:9: run info '(automake)Extending aclocal' -/usr/share/aclocal/libxosd.m4:9: or see http://sources.redhat.com/automake/automake.html#Extending-aclocal -checking for a BSD-compatible install... /bin/install -c -checking whether build environment is sane... yes -checking for a thread-safe mkdir -p... /bin/mkdir -p -checking for gawk... gawk -checking whether make sets $(MAKE)... yes -checking whether to enable maintainer-specific portions of Makefiles... no -checking for style of include used by make... GNU -checking for gcc... gcc -checking whether the C compiler works... yes -checking for C compiler default output file name... a.out -checking for suffix of executables... -checking whether we are cross compiling... no -checking for suffix of object files... o -checking whether we are using the GNU C compiler... yes -checking whether gcc accepts -g... yes -checking for gcc option to accept ISO C89... none needed -checking dependency style of gcc... gcc3 -checking for library containing strerror... none required -checking for gcc... (cached) gcc -checking whether we are using the GNU C compiler... (cached) yes -checking whether gcc accepts -g... (cached) yes -checking for gcc option to accept ISO C89... (cached) none needed -checking dependency style of gcc... (cached) gcc3 -checking for gcc... (cached) gcc -checking whether we are using the GNU C compiler... (cached) yes -checking whether gcc accepts -g... (cached) yes -checking for gcc option to accept ISO C89... (cached) none needed -checking dependency style of gcc... (cached) gcc3 -checking how to run the C preprocessor... gcc -E -checking for grep that handles long lines and -e... /bin/grep -checking for egrep... /bin/grep -E -checking for ANSI C header files... yes -checking build system type... i686-pc-linux-gnu -checking host system type... i686-pc-linux-gnu -checking how to print strings... printf -checking for a sed that does not truncate output... /bin/sed -checking for fgrep... /bin/grep -F -checking for ld used by gcc... /usr/bin/ld -checking if the linker (/usr/bin/ld) is GNU ld... yes -checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B -checking the name lister (/usr/bin/nm -B) interface... BSD nm -checking whether ln -s works... yes -checking the maximum length of command line arguments... 1572864 -checking whether the shell understands some XSI constructs... yes -checking whether the shell understands "+="... yes -checking for /usr/bin/ld option to reload object files... -r -checking for objdump... objdump -checking how to recognize dependent libraries... pass_all -checking for ar... ar -checking for strip... strip -checking for ranlib... ranlib -checking command to parse /usr/bin/nm -B output from gcc object... ok -checking for sys/types.h... yes -checking for sys/stat.h... yes -checking for stdlib.h... yes -checking for string.h... yes -checking for memory.h... yes -checking for strings.h... yes -checking for inttypes.h... yes -checking for stdint.h... yes -checking for unistd.h... yes -checking for dlfcn.h... yes -checking for objdir... .libs -checking if gcc supports -fno-rtti -fno-exceptions... no -checking for gcc option to produce PIC... -fPIC -DPIC -checking if gcc PIC flag -fPIC -DPIC works... yes -checking if gcc static flag -static works... yes -checking if gcc supports -c -o file.o... yes -checking if gcc supports -c -o file.o... (cached) yes -checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes -checking whether -lc should be explicitly linked in... no -checking dynamic linker characteristics... GNU/Linux ld.so -checking how to hardcode library paths into programs... immediate -checking whether stripping libraries is possible... yes -checking if libtool supports shared libraries... yes -checking whether to build shared libraries... yes -checking whether to build static libraries... no -checking whether make sets $(MAKE)... (cached) yes -checking whether ln -s works... yes -checking for special C compiler options needed for large files... no -checking for _FILE_OFFSET_BITS value needed for large files... 64 -checking whether gcc and cc understand -c and -o together... yes -checking for xsltproc... /usr/bin/xsltproc -checking for pkg-config... /usr/bin/pkg-config -checking pkg-config is at least version 0.9.0... yes -checking for gtkdoc-check... /usr/bin/gtkdoc-check -checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase -checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf -checking whether to build gtk-doc documentation... yes -checking for GLIB... yes -checking expat.h usability... yes -checking expat.h presence... yes -checking for expat.h... yes -checking for XML_ParserCreate in -lexpat... yes -checking for clearenv... yes -checking for pam_start in -lpam... yes -checking for sigtimedwait in -lc... yes -checking how to call pam_strerror... two arguments -checking security/pam_modutil.h usability... yes -checking security/pam_modutil.h presence... yes -checking for security/pam_modutil.h... yes -checking security/pam_ext.h usability... yes -checking security/pam_ext.h presence... yes -checking for security/pam_ext.h... yes -checking for pam_vsyslog in -lpam... yes -checking for /etc/redhat-release... no -checking for /etc/SuSE-release... no -checking for /etc/gentoo-release... no -checking for /etc/pardus-release... no -Linux distribution autodetection failed, specify the distribution to target using --with-os-type= -checking for INTROSPECTION... yes -checking whether NLS is requested... yes -checking for intltool >= 0.40.0... 0.41.1 found -checking for intltool-update... /usr/bin/intltool-update -checking for intltool-merge... /usr/bin/intltool-merge -checking for intltool-extract... /usr/bin/intltool-extract -checking for xgettext... /usr/bin/xgettext -checking for msgmerge... /usr/bin/msgmerge -checking for msgfmt... /usr/bin/msgfmt -checking for gmsgfmt... /usr/bin/msgfmt -checking for perl... /usr/bin/perl -checking for perl >= 5.8.1... 5.12.1 -checking for XML::Parser... ok -checking locale.h usability... yes -checking locale.h presence... yes -checking for locale.h... yes -checking for LC_MESSAGES... yes -checking libintl.h usability... yes -checking libintl.h presence... yes -checking for libintl.h... yes -checking for ngettext in libc... yes -checking for dgettext in libc... yes -checking for bind_textdomain_codeset... yes -checking for msgfmt... (cached) /usr/bin/msgfmt -checking for dcgettext... yes -checking if msgfmt accepts -c... yes -checking for gmsgfmt... (cached) /usr/bin/msgfmt -checking for xgettext... (cached) /usr/bin/xgettext -configure: creating ./config.status -config.status: creating Makefile -config.status: creating actions/Makefile -config.status: creating data/Makefile -config.status: creating data/polkit-1 -config.status: creating data/polkit-gobject-1.pc -config.status: creating data/polkit-backend-1.pc -config.status: creating data/polkit-agent-1.pc -config.status: creating src/Makefile -config.status: creating src/polkit/Makefile -config.status: creating src/polkitbackend/Makefile -config.status: creating src/polkitagent/Makefile -config.status: creating src/polkitd/Makefile -config.status: creating src/programs/Makefile -config.status: creating src/examples/Makefile -config.status: creating src/nullbackend/Makefile -config.status: creating docs/version.xml -config.status: creating docs/extensiondir.xml -config.status: creating docs/Makefile -config.status: creating docs/polkit/Makefile -config.status: creating docs/man/Makefile -config.status: creating po/Makefile.in -config.status: creating config.h -config.status: config.h is unchanged -config.status: executing depfiles commands -config.status: executing libtool commands -config.status: executing default-1 commands -config.status: executing po/stamp-it commands - - polkit 0.98 - ================= - - prefix: /usr - libdir: ${exec_prefix}/lib - libexecdir: /usr/lib/polkit-1 - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - datadir: ${datarootdir} - sysconfdir: /etc - localstatedir: /var - docdir: ${datarootdir}/doc/${PACKAGE_TARNAME} - - compiler: gcc - cflags: -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security - cppflags: - xsltproc: /usr/bin/xsltproc - introspection: yes - - Distribution/OS: unknown - authentication framework: pam - PAM support: yes - - PAM file auth: system-auth - PAM file account: system-auth - PAM file password: system-auth - PAM file session: system-auth - - Maintainer mode: no - Building verbose mode: no - Building api docs: yes - Building man pages: yes - - -NOTE: The directory /etc/polkit-1/localauthority must be owned - by root and have mode 700 - -NOTE: The directory /var/lib/polkit-1 must be owned - by root and have mode 700 - -NOTE: The file /usr/lib/polkit-1/polkit-agent-helper-1 must be owned - by root and have mode 4755 (setuid root binary) - -NOTE: The file ${exec_prefix}/bin/pkexec must be owned by root and - have mode 4755 (setuid root binary) - -make all-recursive -make[1]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98' -Making all in actions -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions' -LC_ALL=C /usr/bin/intltool-merge -x -u -c ../po/.intltool-merge-cache ../po org.freedesktop.policykit.policy.in org.freedesktop.policykit.policy -Found cached translation database -Merging translations into org.freedesktop.policykit.policy. -CREATED org.freedesktop.policykit.policy -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/actions' -Making all in data -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data' -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/data' -Making all in src -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -Making all in polkit -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitenumtypes.c.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \ - polkitenumtypes.c.tmp && mv polkitenumtypes.c.tmp polkitenumtypes.c -( top_builddir=`cd ../.. && pwd`; \ - cd . && glib-mkenums --template polkitenumtypes.h.template polkitcheckauthorizationflags.h polkiterror.h polkitimplicitauthorization.h polkitauthorityfeatures.h) > \ - polkitenumtypes.h.tmp && mv polkitenumtypes.h.tmp polkitenumtypes.h -make all-am -make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' - CC libpolkit_gobject_1_la-polkitenumtypes.lo - CC libpolkit_gobject_1_la-polkitactiondescription.lo - CC libpolkit_gobject_1_la-polkitauthorityfeatures.lo - CC libpolkit_gobject_1_la-polkitdetails.lo - CC libpolkit_gobject_1_la-polkitauthority.lo - CC libpolkit_gobject_1_la-polkiterror.lo - CC libpolkit_gobject_1_la-polkitsubject.lo - CC libpolkit_gobject_1_la-polkitunixprocess.lo - CC libpolkit_gobject_1_la-polkitunixsession.lo - CC libpolkit_gobject_1_la-polkitsystembusname.lo - CC libpolkit_gobject_1_la-polkitidentity.lo - CC libpolkit_gobject_1_la-polkitunixuser.lo - CC libpolkit_gobject_1_la-polkitunixgroup.lo - CC libpolkit_gobject_1_la-polkitauthorizationresult.lo - CC libpolkit_gobject_1_la-polkitcheckauthorizationflags.lo - CC libpolkit_gobject_1_la-polkitimplicitauthorization.lo - CC libpolkit_gobject_1_la-polkittemporaryauthorization.lo - CC libpolkit_gobject_1_la-polkitpermission.lo - CCLD libpolkit-gobject-1.la -/usr/bin/g-ir-scanner -v \ - --namespace Polkit \ - --nsversion=1.0 \ - --include=Gio-2.0 \ - --library=polkit-gobject-1 \ - --output Polkit-1.0.gir \ - --pkg=glib-2.0 \ - --pkg=gobject-2.0 \ - --pkg=gio-2.0 \ - --libtool=../../libtool \ - -I../../src \ - -D_POLKIT_COMPILATION \ - ./polkit.h \ - ./polkittypes.h \ - ./polkitactiondescription.h \ - ./polkitauthority.h \ - ./polkitauthorizationresult.h \ - ./polkitcheckauthorizationflags.h \ - ./polkitdetails.h \ - ./polkitenumtypes.h \ - ./polkiterror.h \ - ./polkitidentity.h \ - ./polkitimplicitauthorization.h \ - ./polkitsubject.h \ - ./polkitsystembusname.h \ - ./polkittemporaryauthorization.h \ - ./polkitunixgroup.h \ - ./polkitunixprocess.h \ - ./polkitunixsession.h \ - ./polkitunixuser.h \ - ./polkitpermission.h \ - -g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -I../../src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/ -c -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectb52bsO/Polkit-1.0.o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectb52bsO/Polkit-1.0.c -g-ir-scanner: link: ../../libtool --mode=link --tag=CC --silent gcc -o /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectb52bsO/Polkit-1.0 -export-dynamic -march=i686 -mtune=generic -O2 -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wformat -Wformat-security -L. -lpolkit-gobject-1 -pthread -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 /data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit/tmp-introspectb52bsO/Polkit-1.0.o -/usr/bin/g-ir-compiler Polkit-1.0.gir -o Polkit-1.0.typelib -make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkit' -Making all in polkitbackend -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend' - CC libpolkit_backend_1_la-polkitbackendauthority.lo - CC libpolkit_backend_1_la-polkitbackendinteractiveauthority.lo - CC libpolkit_backend_1_la-polkitbackendlocalauthority.lo - CC libpolkit_backend_1_la-polkitbackendactionpool.lo - CC libpolkit_backend_1_la-polkitbackendsessionmonitor.lo - CC libpolkit_backend_1_la-polkitbackendconfigsource.lo - CC libpolkit_backend_1_la-polkitbackendactionlookup.lo - CC libpolkit_backend_1_la-polkitbackendlocalauthorizationstore.lo - CCLD libpolkit-backend-1.la -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitbackend' -Making all in polkitagent -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h -(echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal ./polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c -touch marshal.stamp -make all-am -make[4]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' - CC libpolkit_agent_1_la-polkitagentenumtypes.lo - CC libpolkit_agent_1_la-polkitagentmarshal.lo - CC libpolkit_agent_1_la-polkitagentsession.lo - CC libpolkit_agent_1_la-polkitagentlistener.lo - CC libpolkit_agent_1_la-polkitagenttextlistener.lo - CC polkit_agent_helper_1-polkitagenthelperprivate.o - CC polkit_agent_helper_1-polkitagenthelper-pam.o - CCLD libpolkit-agent-1.la - CCLD polkit-agent-helper-1 -make[4]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitagent' -Making all in polkitd -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd' - CC polkitd-main.o - CCLD polkitd -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/polkitd' -Making all in nullbackend -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend' - CC libnullbackend_la-nullbackend.lo - CC libnullbackend_la-polkitbackendnullauthority.lo - CCLD libnullbackend.la -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/nullbackend' -Making all in programs -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs' - CC libpkexec_action_lookup_la-pkexec-action-lookup.lo - CC pkexec-pkexec.o - CC pkcheck-pkcheck.o - CC pkaction-pkaction.o - CCLD pkaction - CCLD pkcheck - CCLD libpkexec-action-lookup.la - CCLD pkexec -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src/programs' -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -make[3]: Nothing to be done for `all-am'. -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/src' -Making all in docs -make[2]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs' -Making all in man -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man' -make[3]: Nothing to be done for `all'. -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/man' -Making all in polkit -make[3]: Entering directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit' -gtk-doc: Scanning header files -Can't locate gtkdoc-common.pl in @INC (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl /usr/lib/perl5/site_perl/5.10.1 /usr/share/perl5/site_perl/5.10.1 /usr/lib/perl5/current /usr/lib/perl5/site_perl/current . /usr/share/gtk-doc/data) at /usr/bin/gtkdoc-scan line 44. -make[3]: *** [scan-build.stamp] Error 2 -make[3]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs/polkit' -make[2]: *** [all-recursive] Error 1 -make[2]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98/docs' -make[1]: *** [all-recursive] Error 1 -make[1]: Leaving directory `/data/linhes_pkgbuild/abs/extra/polkit/src/polkit-0.98' -make: *** [all] Error 2 -[1m Aborting...(B[m diff --git a/abs/extra/polkit/polkit-git-fixes.patch b/abs/extra/polkit/polkit-git-fixes.patch deleted file mode 100644 index a0d35e8..0000000 --- a/abs/extra/polkit/polkit-git-fixes.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/src/polkit/polkitcheckauthorizationflags.h b/src/polkit/polkitcheckauthorizationflags.h -index 94aa070..4baa0d1 100644 ---- a/src/polkit/polkitcheckauthorizationflags.h -+++ b/src/polkit/polkitcheckauthorizationflags.h -@@ -30,10 +30,6 @@ - - G_BEGIN_DECLS - --GType polkit_check_authorization_flags_get_type (void) G_GNUC_CONST; -- --#define POLKIT_TYPE_CHECK_AUTHORIZATION_FLAGS (polkit_check_authorization_flags_get_type ()) -- - /** - * PolkitCheckAuthorizationFlags: - * @POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE: No flags set. -diff --git a/src/polkit/polkiterror.h b/src/polkit/polkiterror.h -index b31583d..e49cabf 100644 ---- a/src/polkit/polkiterror.h -+++ b/src/polkit/polkiterror.h -@@ -40,10 +40,6 @@ G_BEGIN_DECLS - - GQuark polkit_error_quark (void); - --GType polkit_error_get_type (void) G_GNUC_CONST; -- --#define POLKIT_TYPE_ERROR (polkit_error_get_type ()) -- - /** - * PolkitError: - * @POLKIT_ERROR_FAILED: The operation failed. -diff --git a/src/polkit/polkitimplicitauthorization.h b/src/polkit/polkitimplicitauthorization.h -index 9e5c51c..dee2611 100644 ---- a/src/polkit/polkitimplicitauthorization.h -+++ b/src/polkit/polkitimplicitauthorization.h -@@ -30,10 +30,6 @@ - - G_BEGIN_DECLS - --GType polkit_implicit_authorization_get_type (void) G_GNUC_CONST; -- --#define POLKIT_TYPE_IMPLICIT_AUTHORIZATION (polkit_implicit_authorization_get_type ()) -- - /** - * PolkitImplicitAuthorization: - * @POLKIT_IMPLICIT_AUTHORIZATION_UNKNOWN: Unknown whether the subject is authorized, never returned in any public API. -diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am -index d2fc9c8..96ffd7c 100644 ---- a/src/polkitagent/Makefile.am -+++ b/src/polkitagent/Makefile.am -@@ -46,6 +46,7 @@ libpolkit_agent_1includedir=$(includedir)/polkit-1/polkitagent - - libpolkit_agent_1include_HEADERS = \ - polkitagent.h \ -+ polkitagentenumtypes.h \ - polkitagenttypes.h \ - polkitagentsession.h \ - polkitagentlistener.h \ -diff --git a/src/polkitagent/polkitagenthelperprivate.c b/src/polkitagent/polkitagenthelperprivate.c -index d4495dd..8f0c878 100644 ---- a/src/polkitagent/polkitagenthelperprivate.c -+++ b/src/polkitagent/polkitagenthelperprivate.c -@@ -48,8 +48,8 @@ _polkit_clearenv (void) - gboolean - send_dbus_message (const char *cookie, const char *user) - { -- PolkitAuthority *authority; -- PolkitIdentity *identity; -+ PolkitAuthority *authority = NULL; -+ PolkitIdentity *identity = NULL; - GError *error; - gboolean ret; - -diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c -index e91ad84..495f752 100644 ---- a/src/polkitbackend/polkitbackendsessionmonitor.c -+++ b/src/polkitbackend/polkitbackendsessionmonitor.c -@@ -116,7 +116,7 @@ static gboolean - ensure_database (PolkitBackendSessionMonitor *monitor, - GError **error) - { -- gboolean ret; -+ gboolean ret = FALSE; - - if (monitor->database != NULL) - { diff --git a/abs/extra/smartmontools/PKGBUILD b/abs/extra/smartmontools/PKGBUILD index ecb4fd5..fe12bd5 100644 --- a/abs/extra/smartmontools/PKGBUILD +++ b/abs/extra/smartmontools/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jani Talikka <jani.talikka@gmail.com> pkgname=smartmontools -pkgver=5.40 +pkgver=5.41 pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives." url="http://smartmontools.sourceforge.net" @@ -12,20 +12,17 @@ license=('GPL') arch=('i686' 'x86_64') depends=('gcc-libs') backup=('etc/smartd.conf') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ - smartd) +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +install=smartmontools.install build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/src/linux-2.6.37-LinHES + ./configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/src/linux-2.6.39-LinHES make || return 1 } package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/etc/rc.d - install -D -m 755 ../smartd ${pkgdir}/etc/rc.d/smartd } -md5sums=('0f0be0239914ad87830a4fff594bda5b' - '850f98b6792b7642ff193a49a2f1139d') +md5sums=('4577886bea79d4ff12bd9a7d323ce692') diff --git a/abs/extra/smartmontools/__changelog b/abs/extra/smartmontools/__changelog new file mode 100644 index 0000000..8e0d8a6 --- /dev/null +++ b/abs/extra/smartmontools/__changelog @@ -0,0 +1,2 @@ +* remove the rc script. runit script in runit-scripts pkg +* added smartmontools.install diff --git a/abs/extra/smartmontools/smartmontools.install b/abs/extra/smartmontools/smartmontools.install new file mode 100644 index 0000000..f2baacd --- /dev/null +++ b/abs/extra/smartmontools/smartmontools.install @@ -0,0 +1,24 @@ +#!/bin/bash + +post_install() { + + echo "" + echo "==> Configure your /etc/smart.conf config file and then" + echo "==> $ sudo add_service.sh smartd" + echo "==> to start the monitoring service." + +} + +post_upgrade() { + + post_install + +} + +pre_remove() { + + if [ -L /service/smartd ]; then + remove_service.sh smartd + fi + +} diff --git a/abs/extra/strace/PKGBUILD b/abs/extra/strace/PKGBUILD index c965f24..5a33af7 100644 --- a/abs/extra/strace/PKGBUILD +++ b/abs/extra/strace/PKGBUILD @@ -1,21 +1,27 @@ -# $Id: PKGBUILD 13699 2008-09-27 22:25:37Z giovanni $ +# $Id$ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> + pkgname=strace -pkgver=4.5.18 +pkgver=4.6 pkgrel=1 pkgdesc="A useful diagnositic, instructional, and debugging tool" arch=('i686' 'x86_64') -license=('custom') url="http://sourceforge.net/projects/strace/" -depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/strace/strace-$pkgver.tar.bz2) -md5sums=('e9449fcee97e6a8ed73934c883c870e0') +license=('custom') +depends=('perl') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.xz) +md5sums=('e537b2b1afeec70c0e6e27a0d0fd671e') build() { - cd $startdir/src/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - install -Dm644 COPYRIGHT ${startdir}/pkg/usr/share/licenses/strace/COPYRIGHT + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + + install -Dm644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/extra/strace/no_linux_socket_h.patch b/abs/extra/strace/no_linux_socket_h.patch deleted file mode 100644 index f1c3598..0000000 --- a/abs/extra/strace/no_linux_socket_h.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- strace-4.5.12.orig/configure.ac -+++ strace-4.5.12/configure.ac -@@ -193,8 +193,7 @@ - - AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname) - AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h libaio.h], [], []) --AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], -- [], [], [#include <linux/socket.h>]) -+AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h]) - AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) - AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>]) - ---- strace-4.5.12.orig/configure -+++ strace-4.5.12/configure -@@ -6945,7 +6945,6 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <linux/socket.h> - - #include <$ac_header> - _ACEOF diff --git a/abs/extra/subversion/PKGBUILD b/abs/extra/subversion/PKGBUILD index a903a21..eab07f3 100644 --- a/abs/extra/subversion/PKGBUILD +++ b/abs/extra/subversion/PKGBUILD @@ -4,7 +4,7 @@ pkgname=subversion pkgver=1.6.13 -pkgrel=3 +pkgrel=4 pkgdesc="Replacement for CVS, another versioning system (SVN)" arch=('i686' 'x86_64') license=('apache' 'bsd') diff --git a/abs/extra/thunar/PKGBUILD b/abs/extra/thunar/PKGBUILD deleted file mode 100644 index 9f6c5b2..0000000 --- a/abs/extra/thunar/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 80836 2010-05-22 14:19:16Z andyrtr $ -# Maintainer: andyrtr <andyrtr funnychar archlinux.org> -# Contributor: Andrew Simmons <andrew.simmons@gmail.com> - -pkgname=thunar -pkgver=1.0.2 -pkgrel=1 -pkgdesc="new modern file manager for Xfce" -arch=('i686' 'x86_64') -license=('GPL2' 'LGPL2.1') -url="http://thunar.xfce.org" -groups=('xfce4') -depends=('libexif>=0.6.19' 'hicolor-icon-theme' 'fam' 'gtk2' 'exo>=0.3.107' \ - 'libxfce4util>=4.6.2' 'hal>=0.5.14' 'libpng' 'libjpeg>=8.0.1' \ - 'startup-notification') -makedepends=('intltool' 'pkgconfig' 'xfce4-panel>=4.6.4') -optdepends=('gamin: a fam replacement to make thunar monitor changes to files on the fly' - 'xfce4-panel: for trash applet') -options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/1.0/Thunar-${pkgver}.tar.bz2) -md5sums=('c91073202d373a1f9951a1240083c36d') - -build() { - cd ${srcdir}/Thunar-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --disable-static \ - --disable-gnome-thumbnailers --enable-exif --enable-pcre - make || return 1 -} - -package() { - cd ${srcdir}/Thunar-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - sed -i 's:x-directory/gnome-default-handler;::' \ - ${pkgdir}/usr/share/applications/Thunar-folder-handler.desktop -} diff --git a/abs/extra/thunar/__changelog b/abs/extra/thunar/__changelog deleted file mode 100644 index 630ddfa..0000000 --- a/abs/extra/thunar/__changelog +++ /dev/null @@ -1 +0,0 @@ -remove dep for desktop-file-utils diff --git a/abs/extra/thunar/thunar.install b/abs/extra/thunar/thunar.install deleted file mode 100644 index 28fdb48..0000000 --- a/abs/extra/thunar/thunar.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - diff --git a/abs/extra/valgrind/PKGBUILD b/abs/extra/valgrind/PKGBUILD new file mode 100644 index 0000000..0ac6fd4 --- /dev/null +++ b/abs/extra/valgrind/PKGBUILD @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Dan McGee <dan@archlinux.org> +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=valgrind +pkgver=3.6.1 +pkgrel=2 +pkgdesc="A tool to help find memory-management problems in programs" +arch=('i686' 'x86_64') +license=('GPL') +url="http://valgrind.org/" +depends=('glibc>=2.14' 'glibc<2.15' 'perl') +makedepends=('gdb') +options=('!emptydirs') +source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 + valgrind-3.6.1-glibc-2.14.patch + glibc-patch-version.patch) +md5sums=('2c3aa122498baecc9d69194057ca88f5' + '560032ce5d27ef0c7c1af32c3fd45833' + 'b657f0ebdde3d9aefc9fd16f9e653702') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # make sure our CFLAGS are respected + sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in + + # glibc-2.14 compatibility + patch -Np1 -i ${srcdir}/valgrind-3.6.1-glibc-2.14.patch + + # prevent need to rebuild with glibc patch level version bumps + patch -Np1 -i ${srcdir}/glibc-patch-version.patch + + if [ "${CARCH}" = "x86_64" ]; then + ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit + else + ./configure --prefix=/usr --mandir=/usr/share/man + fi + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/abs/extra/valgrind/glibc-patch-version.patch b/abs/extra/valgrind/glibc-patch-version.patch new file mode 100644 index 0000000..2c6830a --- /dev/null +++ b/abs/extra/valgrind/glibc-patch-version.patch @@ -0,0 +1,52 @@ +Saves having to rebuild valgrind on glibc-x.x.* patch level releases + +diff -Naur valgrind-3.5.0-old//glibc-2.X.supp.in valgrind-3.5.0/glibc-2.X.supp.in +--- valgrind-3.5.0-old//glibc-2.X.supp.in 2009-08-19 23:37:48.000000000 +1000 ++++ valgrind-3.5.0/glibc-2.X.supp.in 2010-05-22 19:43:08.088007038 +1000 +@@ -168,9 +168,9 @@ + Memcheck:Param + socketcall.sendto(msg) + fun:__sendto_nocancel +- obj:/*libc-@GLIBC_VERSION@.so +- obj:/*libc-@GLIBC_VERSION@.so +- obj:/*libc-@GLIBC_VERSION@.so ++ obj:/*libc-@GLIBC_VERSION@*.so ++ obj:/*libc-@GLIBC_VERSION@*.so ++ obj:/*libc-@GLIBC_VERSION@*.so + } + { + glibc24-64bit-padding-1c +@@ -180,7 +180,7 @@ + fun:__nscd_get_map_ref + fun:nscd_get*_r + fun:*nscd* +- obj:/*libc-@GLIBC_VERSION@.so ++ obj:/*libc-@GLIBC_VERSION@*.so + } + + +@@ -199,18 +199,18 @@ + Memcheck:Param + socketcall.sendto(msg) + fun:send +- obj:/*libc-@GLIBC_VERSION@.so +- obj:/*libc-@GLIBC_VERSION@.so +- obj:/*libc-@GLIBC_VERSION@.so ++ obj:/*libc-@GLIBC_VERSION@*.so ++ obj:/*libc-@GLIBC_VERSION@*.so ++ obj:/*libc-@GLIBC_VERSION@*.so + } + { + X11-64bit-padding-4b + Memcheck:Param + socketcall.send(msg) + fun:send +- obj:/*libc-@GLIBC_VERSION@.so +- obj:/*libc-@GLIBC_VERSION@.so +- obj:/*libc-@GLIBC_VERSION@.so ++ obj:/*libc-@GLIBC_VERSION@*.so ++ obj:/*libc-@GLIBC_VERSION@*.so ++ obj:/*libc-@GLIBC_VERSION@*.so + } + + ##----------------------------------------------------------------------## diff --git a/abs/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch b/abs/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch new file mode 100644 index 0000000..7fd2170 --- /dev/null +++ b/abs/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch @@ -0,0 +1,67 @@ +--- valgrind/configure.in.jj 2010-10-21 03:14:02.000000000 +0200 ++++ valgrind/configure.in 2010-11-05 17:09:18.674455299 +0100 +@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.14) ++ AC_MSG_RESULT(2.14 family) ++ AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + aix5) + AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) + AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) +@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in + + *) + AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13]) ++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) + AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) + AC_MSG_ERROR([or Darwin libc]) + ;; +--- valgrind/config.h.in.jj 2010-10-20 22:20:49.000000000 +0200 ++++ valgrind/config.h.in 2010-11-05 17:08:33.863454886 +0100 +@@ -33,6 +33,9 @@ + /* Define to 1 if you're using glibc 2.13.x */ + #undef GLIBC_2_13 + ++/* Define to 1 if you're using glibc 2.14.x */ ++#undef GLIBC_2_14 ++ + /* Define to 1 if you're using glibc 2.2.x */ + #undef GLIBC_2_2 + +--- valgrind/configure.jj 2010-10-21 03:16:18.000000000 +0200 ++++ valgrind/configure 2010-11-05 17:09:39.163455396 +0100 +@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_13 1" >>confde + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.14) ++ echo "$as_me:$LINENO: result: 2.14 family" >&5 ++echo "${ECHO_T}2.14 family" >&6 ++ ++cat >>confdefs.h <<\_ACEOF ++#define GLIBC_2_14 1 ++_ACEOF ++ ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + aix5) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5 + $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; } +@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 + $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } +- as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5 ++ as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 + as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5 + as_fn_error "or Darwin libc" "$LINENO" 5 + ;; diff --git a/abs/extra/x11vnc/PKGBUILD b/abs/extra/x11vnc/PKGBUILD index 543a7ab..8e6835f 100644 --- a/abs/extra/x11vnc/PKGBUILD +++ b/abs/extra/x11vnc/PKGBUILD @@ -2,20 +2,28 @@ # Maintainer: damir <damir@archlinux.org> pkgname=x11vnc -pkgver=0.9.9 +pkgver=0.9.12 pkgrel=1 pkgdesc="a VNC server for real X displays" arch=("i686" "x86_64") license=("GPL2") -#source=(http://dl.sourceforge.net/sourceforge/libvncserver/$pkgname-$pkgver.tar.gz) url="http://www.karlrunge.com/x11vnc/" -source=("http://x11vnc.sourceforge.net/dev/$pkgname-$pkgver.tar.gz") -depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') +source=("http://downloads.sourceforge.net/libvncserver/${pkgname}-${pkgver}.tar.gz") +depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' + 'libxdamage' 'libxrandr' 'avahi' 'recordproto') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure + + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man make || return 1 - make prefix=$startdir/pkg/usr install || return 1 + +} + +package() { + + cd ${srcdir}/${pkgname}-${pkgver} + make prefix=${pkgdir}/usr install || return 1 + } -md5sums=('874008821a0588a73ec7fbe09b747bb0') +md5sums=('1498a68d02aa7b6c97bf746c073c8d00') diff --git a/abs/extra/xfce4-panel/PKGBUILD b/abs/extra/xfce4-panel/PKGBUILD deleted file mode 100644 index f11c0b1..0000000 --- a/abs/extra/xfce4-panel/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 80831 2010-05-22 13:45:04Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: tobias <tobias funnychar archlinux.org> - -pkgname=xfce4-panel -pkgver=4.6.4 -pkgrel=1 -pkgdesc="Panel for the Xfce desktop environment" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.xfce.org/" -groups=('xfce4') -depends=("libxfcegui4>=4.6.4" 'exo>=0.3.107' 'libwnck' 'hicolor-icon-theme') -makedepends=('pkgconfig' "xfconf>=4.6.2" 'intltool') -options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('82f10a42aefca4cc26a6633e7478cc65') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --disable-static - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 -} diff --git a/abs/extra/xfce4-panel/xfce4-panel.install b/abs/extra/xfce4-panel/xfce4-panel.install deleted file mode 100644 index 21b79d2..0000000 --- a/abs/extra/xfce4-panel/xfce4-panel.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/abs/extra/xine-ui/ChangeLog b/abs/extra/xine-ui/ChangeLog deleted file mode 100644 index bfb45aa..0000000 --- a/abs/extra/xine-ui/ChangeLog +++ /dev/null @@ -1,27 +0,0 @@ -2010-03-23 Eric Belanger <eric@archlinux.org> - - * xine-ui 0.99.6-1 - * Upstream update - * Cleaned up depends - * Removed optdepends - * Replaced lirc makedepends by lirc-utils - * Added shared-mime-info depends - -2010-01-19 Eric Belanger <eric@archlinux.org> - - * xine-ui 0.99.5-6 - * Rebuilt for libpng 1.4 and libjpeg 8 - * Added install scriptlet to update icon cache - -2009-06-18 Eric Belanger <eric@archlinux.org> - - * xine-ui 0.99.5-5 - * Rebuilt against readline 6.0.00 - -2008-08-19 Eric Belanger <eric@archlinux.org> - - * xine-ui 0.99.5-4 - * Added xine and xine-remote binaries (missing in 0.99.5-3) - * Added missing libxt makedepends - * Replaced .install file by an optdepends - * Added ChangeLog diff --git a/abs/extra/xine-ui/PKGBUILD b/abs/extra/xine-ui/PKGBUILD index 4c5471f..59ae0cb 100644 --- a/abs/extra/xine-ui/PKGBUILD +++ b/abs/extra/xine-ui/PKGBUILD @@ -1,41 +1,43 @@ -# $Id: PKGBUILD 77076 2010-04-10 16:09:26Z andrea $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-ui pkgver=0.99.6 -pkgrel=1 +pkgrel=2 pkgdesc="A free video player for Unix" arch=('i686' 'x86_64') license=('GPL') url="http://www.xine-project.org" depends=('xine-lib' 'curl' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft' 'libxxf86vm' 'readline' 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' - 'lirc-utils') + 'desktop-file-utils' 'lirc-utils') makedepends=('libxt') options=('!emptydirs' '!strip') -install=${pkgname}.install +install=xine-ui.install source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz - lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch fix_lirc.diff) + lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch + fix_lirc.diff xine-ui-xdg.diff) md5sums=('d468b4e7fe39ff19888261e1da9be914' '4f06f63f5fd55b08a648e5d63f881898' '9f5acaf14f3945aa2ce428631d09cd47' - '0174bd096756b9c6f47e9b8b5ff6e145') + '0174bd096756b9c6f47e9b8b5ff6e145' + '5972b4061acf3b553760de9ae2178d38') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" || return 1 - patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" || return 1 - patch -p1 < "${srcdir}/fix_lirc.diff" || return 1 - autoconf || return 1 - + patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" + patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" + patch -p1 < "${srcdir}/fix_lirc.diff" + patch -p1 < "${srcdir}/xine-ui-xdg.diff" + autoconf ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-x --enable-lirc --without-aalib --enable-debug || return 1 - make || return 1 + --with-x --enable-lirc --without-aalib --enable-debug + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/applications" mv "${pkgdir}/usr/share/xine/desktop/xine.desktop" "${pkgdir}/usr/share/applications" } diff --git a/abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1 b/abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1 deleted file mode 100644 index d1d33d7..0000000 --- a/abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1 +++ /dev/null @@ -1,2 +0,0 @@ -/data/linhes_pkgbuild/abs/extra/xine-ui/PKGBUILD: line 25: cd: /data/linhes_pkgbuild/abs/extra/xine-ui/src/xine-ui-0.99.6: No such file or directory -[1m Aborting...(B[m diff --git a/abs/extra/xine-ui/xine-ui-xdg.diff b/abs/extra/xine-ui/xine-ui-xdg.diff new file mode 100644 index 0000000..959d674 --- /dev/null +++ b/abs/extra/xine-ui/xine-ui-xdg.diff @@ -0,0 +1,206 @@ +--- xine-ui-0.99.6.orig/src/xitk/common.h ++++ xine-ui-0.99.6/src/xitk/common.h +@@ -331,6 +331,5 @@ typedef struct { + int use_root_window; + + int ssaver_enabled; +- int ssaver_timeout; + + int skip_by_chapter; +--- xine-ui-0.99.6.orig/src/xitk/main.c ++++ xine-ui-0.99.6/src/xitk/main.c +@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) { + if (sigprocmask (SIG_BLOCK, &vo_mask, NULL)) + fprintf (stderr, "sigprocmask() failed.\n"); + ++ signal(SIGCHLD, SIG_IGN); ++ + gGui = (gGui_t *) calloc(1, sizeof(gGui_t)); + + gGui->stream = NULL; +--- xine-ui-0.99.6.orig/src/xitk/panel.c ++++ xine-ui-0.99.6/src/xitk/panel.c +@@ -356,7 +356,6 @@ void panel_update_runtime_display(void) + * Update slider thread. + */ + static void *slider_loop(void *dummy) { +- int screensaver_timer = 0; + int status, speed; + int pos, secs; + int i = 0; +@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) { + else + video_window_set_mrl((char *)gGui->mmk.mrl); + +- if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) { +- +- if(gGui->ssaver_timeout) { +- +- if(!(i % 2)) +- screensaver_timer++; +- +- if(screensaver_timer >= gGui->ssaver_timeout) { +- screensaver_timer = 0; +- video_window_reset_ssaver(); +- +- } +- } +- } ++ video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)); + + if(gGui->logo_mode == 0) { + +@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) { + stream_infos_update_infos(); + + } ++ } else { ++ video_window_suspend_ssaver(0); + } + } + +--- xine-ui-0.99.6.orig/src/xitk/videowin.c ++++ xine-ui-0.99.6/src/xitk/videowin.c +@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi + + /* The old window should be destroyed now */ + if(old_video_window != None) { ++ /* Screensaver control is tied to our window id */ ++ video_window_suspend_ssaver(0); ++ + XDestroyWindow(gGui->video_display, old_video_window); + + if(gGui->cursor_grabbed) +@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X + + } + +-void video_window_reset_ssaver(void) { ++void video_window_suspend_ssaver(int do_suspend) { ++ static int was_suspended; + +- if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) { ++ do_suspend = do_suspend && gGui->ssaver_enabled; + +-#ifdef HAVE_XTESTEXTENSION +- if(gVw.have_xtest == True) { +- +- gVw.fake_key_cur++; +- +- if(gVw.fake_key_cur >= 2) +- gVw.fake_key_cur = 0; +- +- XLockDisplay(gGui->video_display); +- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime); +- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime); +- XSync(gGui->video_display, False); +- XUnlockDisplay(gGui->video_display); ++ if(was_suspended != do_suspend) { ++ if(fork() == 0) { ++ char window_id[30]; ++ char *args[] = { "xdg-screensaver", NULL, window_id, NULL }; ++ int fd; ++ ++ for(fd = 3; fd < 256; fd++) ++ close(fd); ++ ++ args[1] = do_suspend ? "suspend" : "resume"; ++ sprintf(window_id, "%lu", (unsigned long)gGui->video_window); ++ execvp(args[0], args); ++ _exit(0); + } +- else +-#endif +- { +- /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */ +- /* assuming its location and permission will not change during run time of xine-ui. */ +- { +- static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL }; +- static char *gssaver_path = NULL; +- +- if(!gssaver_path) { +- char *path = getenv("PATH"); +- +- if(!path) +- path = "/usr/local/bin:/usr/bin"; +- do { +- char *p, *pbuf; +- int plen; +- +- for(p = path; *path && *path != ':'; path++) +- ; +- if(p == path) +- plen = 1, p = "."; +- else +- plen = path - p; +- asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]); +- if ( access(pbuf, X_OK) ) { +- free(pbuf); +- gssaver_path = ""; +- } else +- gssaver_path = pbuf; +- } while(!gssaver_path[0] && *path++); +- } +- if(gssaver_path[0] && (fork() == 0)) { +- execv(gssaver_path, gssaver_args); +- exit(0); +- } +- } + +- XLockDisplay(gGui->video_display); +- XResetScreenSaver(gGui->video_display); +- XUnlockDisplay(gGui->video_display); +- } ++ was_suspended = do_suspend; + } + } + ++void video_window_reset_ssaver(void) { ++ video_window_suspend_ssaver(1); ++} ++ + void video_window_get_frame_size(int *w, int *h) { + if(w) + *w = gVw.frame_width; +--- xine-ui-0.99.6.orig/src/xitk/videowin.h ++++ xine-ui-0.99.6/src/xitk/videowin.h +@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag, + void video_window_update_logo(void); + void video_window_change_skins(int); + ++void video_window_suspend_ssaver(int do_suspend); + void video_window_reset_ssaver(void); + + void video_window_get_frame_size(int *w, int *h); +--- xine-ui-0.99.6.orig/src/xitk/event.c ++++ xine-ui-0.99.6/src/xitk/event.c +@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat + gGui->skip_by_chapter = cfg->num_value; + panel_update_nextprev_tips(); + } +-static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) { +- gGui->ssaver_timeout = cfg->num_value; +-} + + static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) { + +@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam + snapshot_loc_cb, + CONFIG_NO_DATA); + +- gGui->ssaver_timeout = +- xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10, +- _("Screensaver reset interval (s)"), +- _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."), +- CONFIG_LEVEL_ADV, +- ssaver_timeout_cb, +- CONFIG_NO_DATA); +- + gGui->skip_by_chapter = + xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1, + _("Chapter hopping"), + + + + + diff --git a/abs/extra/xine-ui/xine-ui.install b/abs/extra/xine-ui/xine-ui.install index 8afc566..3b3aff7 100644 --- a/abs/extra/xine-ui/xine-ui.install +++ b/abs/extra/xine-ui/xine-ui.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { |