From 7d8a4f93e15f61418ea89666b57063111700dc7e Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 22:49:59 +0000 Subject: mythexport: Upgrade to 2.2.3 -- needs testing --- abs/extra/mythexport/PKGBUILD | 38 ++++++++++--- abs/extra/mythexport/mythexport-2.2.3-1.src.tar.gz | 1 + abs/extra/mythexport/mythexport.install | 65 ++++++++++++++++++++++ abs/extra/mythexport/mythexport.lighttpd.include | 3 + 4 files changed, 100 insertions(+), 7 deletions(-) create mode 120000 abs/extra/mythexport/mythexport-2.2.3-1.src.tar.gz create mode 100644 abs/extra/mythexport/mythexport.lighttpd.include diff --git a/abs/extra/mythexport/PKGBUILD b/abs/extra/mythexport/PKGBUILD index 3cd04f3..6fd3000 100644 --- a/abs/extra/mythexport/PKGBUILD +++ b/abs/extra/mythexport/PKGBUILD @@ -2,16 +2,40 @@ # Maintainer: Cecil Watson pkgname=mythexport -pkgver=2.0.71 -pkgrel=5 -pkgdesc="Script to export recordings for portable devices." +pkgver=2.2.3 +pkgrel=1 +pkgdesc="Export MythTV recording to portable media players" arch=('i686' 'x86_64') license=('GPL3') -depends=('atomicparsley' 'perl-config-simple' 'perl-net-upnp' 'perl-proc-daemon' 'perl-proc-pid-file') -url="http://linhes.org/" -source=(ftp://ftp.knoppmyth.net/R6/sources/mythexport.tar.bz2) +depends=('atomicparsley' 'perl-config-simple' 'perl-net-upnp' + 'perl-proc-daemon' 'perl-proc-pid-file') +optdepends=('lighttpd: For web based interaction') +url="http://www.ubuntuupdates.org/mythexport" +source=(https://launchpad.net/ubuntu/natty/+source/${pkgname}/${pkgver}-0ubuntu1/+files/${pkgname}_${pkgver}.orig.tar.gz + mythexport.lighttpd.include) install=mythexport.install build() { - cp -a mythexport/* $startdir/pkg + + /bin/true + +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + cp -a ./usr ${pkgdir}/ || return 1 + + # Install lighttpd include file + install -D -m644 ${srcdir}/mythexport.lighttpd.include ${pkgdir}/etc/mythexport/mythexport.lighttpd.include + + # Compress man pages + gzip -9 *.1 + install -D -m644 mythexport.1.gz ${pkgdir}/usr/share/man/man1/mythexport.1.gz || return 1 + install -D -m644 mythimport.1.gz ${pkgdir}/usr/share/man/man1/mythimport.1.gz || return 1 + + # Standard GPL3 license text already in distro + rm -f ${pkgdir}/COPYING + } +md5sums=('a780c00536a4680ce7d79057658971c8' + 'b08404255abcc99a35e9c1ab8e0dec57') diff --git a/abs/extra/mythexport/mythexport-2.2.3-1.src.tar.gz b/abs/extra/mythexport/mythexport-2.2.3-1.src.tar.gz new file mode 120000 index 0000000..3d55272 --- /dev/null +++ b/abs/extra/mythexport/mythexport-2.2.3-1.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/mythexport-2.2.3-1.src.tar.gz \ No newline at end of file diff --git a/abs/extra/mythexport/mythexport.install b/abs/extra/mythexport/mythexport.install index edd60f5..a6a2085 100644 --- a/abs/extra/mythexport/mythexport.install +++ b/abs/extra/mythexport/mythexport.install @@ -3,8 +3,73 @@ post_install() { mysql -u root mythconverg < /usr/share/mythtv/mythexport.sql ln -s /usr/share/mythtv/mythexport /data/srv/httpd/htdocs/ ln -s /myth/archive /usr/share/mythtv/mythexport/video + + COUNT=`grep -c "include \"/etc/mythexport/mythexport.lighttpd.include\"" /etc/lighttpd/conf.include` + + if [ $COUNT == 0 ] ; then + echo "==> Adding mythexport.lighttpd.include to conf.include" + echo "include \"/etc/mythexport/mythexport.lighttpd.include\"" >> \ + /etc/lighttpd/conf.include + fi + + echo "" + echo "==> Forcing a re-read of lighttpd's configuration file." + echo "" + /sbin/sv hup /service/lighttpd + + echo "" + echo "==> Add the mythexport service to start the mythexport daemon" + echo "==> $ sudo add_service.sh mythexport" + echo "" + + echo "" + echo "==> For move information on setup and configuration:" + echo "==> http://www.linhes.org/bugs/projects/linhes/wiki/HOWTO_Setup_MythExport_for_iPod" + echo "" + +} + +post_upgrade() { + + COUNT=`grep -c "include \"/etc/mythexport/mythexport.lighttpd.include\"" /etc/lighttpd/conf.include` + + if [ $COUNT == 0 ] ; then + echo "==> Adding mythexport.lighttpd.include to conf.include" + echo "include \"/etc/mythexport/mythexport.lighttpd.include\"" >> \ + /etc/lighttpd/conf.include + fi + + echo "" + echo "==> Forcing a re-read of lighttpd's configuration file." + echo "" + /sbin/sv hup /service/lighttpd + } +pre_remove() { + + remove_service.sh mythexport + +} + +post_remove() { + + COUNT=`grep -c "include \"/etc/mythexport/mythexport.lighttpd.include\"" /etc/lighttpd/conf.include` + + if [ $COUNT -gt 0 ] ; then + echo "==> Removing mythexport.lighttpd.include from conf.include" + sed -e 's#include \"/etc/mythexport/mythexport.lighttpd.include\"##' -i \ + /etc/lighttpd/conf.include + fi + + echo "" + echo "==> Forcing re-read of lighttpd's configuration file." + echo "" + /sbin/sv hup /service/lighttpd +} + + + op=$1 shift $op $* diff --git a/abs/extra/mythexport/mythexport.lighttpd.include b/abs/extra/mythexport/mythexport.lighttpd.include new file mode 100644 index 0000000..b846507 --- /dev/null +++ b/abs/extra/mythexport/mythexport.lighttpd.include @@ -0,0 +1,3 @@ +$HTTP["url"] =~ "/mythexport/" { + cgi.assign = ( ".cgi" => "/usr/bin/perl" ) + } -- cgit v0.12 From daf5a55912f10a1d4053e173f286eb2c59cea1dd Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 22:50:37 +0000 Subject: runit-scripts: Add mythexport --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runit-scripts-2.1.1-23.src.tar.gz | 1 + abs/core/runit-scripts/runitscripts/services/mythexport/finish | 4 ++++ abs/core/runit-scripts/runitscripts/services/mythexport/run | 10 ++++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 120000 abs/core/runit-scripts/runit-scripts-2.1.1-23.src.tar.gz create mode 100755 abs/core/runit-scripts/runitscripts/services/mythexport/finish create mode 100755 abs/core/runit-scripts/runitscripts/services/mythexport/run diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index f6cace4..aa7b767 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=22 +pkgrel=23 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runit-scripts-2.1.1-23.src.tar.gz b/abs/core/runit-scripts/runit-scripts-2.1.1-23.src.tar.gz new file mode 120000 index 0000000..0f2b2fa --- /dev/null +++ b/abs/core/runit-scripts/runit-scripts-2.1.1-23.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/runit-scripts-2.1.1-23.src.tar.gz \ No newline at end of file diff --git a/abs/core/runit-scripts/runitscripts/services/mythexport/finish b/abs/core/runit-scripts/runitscripts/services/mythexport/finish new file mode 100755 index 0000000..b7fa7a6 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/mythexport/finish @@ -0,0 +1,4 @@ +#!/bin/bash + +# runit only knows about the run script wrapper, so kill the daemon ourselves + kill `pidof -o %PPID -x /usr/bin/mythexport-daemon` >/dev/null 2>&1 diff --git a/abs/core/runit-scripts/runitscripts/services/mythexport/run b/abs/core/runit-scripts/runitscripts/services/mythexport/run new file mode 100755 index 0000000..45f77fd --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/mythexport/run @@ -0,0 +1,10 @@ +#!/bin/bash + +/sbin/chpst -u mythtv /usr/bin/mythexport-daemon + +PID=`pidof -o %PPID -x /usr/bin/mythexport-daemon` + +# Wait until daemon dies, else runit can't supervise us + while [ "`pidof -o %PPID -x /usr/bin/mythexport-daemon`" == "$PID" ]; do + sleep 2 + done -- cgit v0.12 From 7bb3e1c97f4c18c533abff00ad2da119aaa29a59 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 3 Aug 2011 18:00:13 -0500 Subject: rrd_stats: Update index.html to match local-website. ref #17 --- abs/extra/rrd_stats/PKGBUILD | 4 ++-- abs/extra/rrd_stats/rrd_stats.tgz | Bin 8444 -> 8944 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/rrd_stats/PKGBUILD b/abs/extra/rrd_stats/PKGBUILD index 1f987e4..6df24f4 100644 --- a/abs/extra/rrd_stats/PKGBUILD +++ b/abs/extra/rrd_stats/PKGBUILD @@ -1,6 +1,6 @@ pkgname=rrd_stats pkgver=1 -pkgrel=18 +pkgrel=19 pkgdesc="graph system stats" arch=('i686' 'x86_64') url="" @@ -18,4 +18,4 @@ build() { chown -R http:users $startdir/pkg/data/srv/httpd chmod -R 755 $startdir/pkg/data/srv/httpd } -md5sums=('e3d5f7d56fd1a3f26af0226ddcc53bfa') +md5sums=('4398623b9a8afb62743509e35c15b683') diff --git a/abs/extra/rrd_stats/rrd_stats.tgz b/abs/extra/rrd_stats/rrd_stats.tgz index 4f1f3f5..6532648 100644 Binary files a/abs/extra/rrd_stats/rrd_stats.tgz and b/abs/extra/rrd_stats/rrd_stats.tgz differ -- cgit v0.12 From 6a332588e14116977841fba80c063c59011d0ea0 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 23:03:29 +0000 Subject: runit-scripts: change lighttpd to start with lighttpd-angel (To accept signals) --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runit-scripts-2.1.1-24.src.tar.gz | 1 + abs/core/runit-scripts/runitscripts/services/lighttpd/run | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 120000 abs/core/runit-scripts/runit-scripts-2.1.1-24.src.tar.gz diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index aa7b767..e186f99 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=23 +pkgrel=24 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runit-scripts-2.1.1-24.src.tar.gz b/abs/core/runit-scripts/runit-scripts-2.1.1-24.src.tar.gz new file mode 120000 index 0000000..46a0e4a --- /dev/null +++ b/abs/core/runit-scripts/runit-scripts-2.1.1-24.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/runit-scripts-2.1.1-24.src.tar.gz \ No newline at end of file diff --git a/abs/core/runit-scripts/runitscripts/services/lighttpd/run b/abs/core/runit-scripts/runitscripts/services/lighttpd/run index 798690c..f9c574d 100755 --- a/abs/core/runit-scripts/runitscripts/services/lighttpd/run +++ b/abs/core/runit-scripts/runitscripts/services/lighttpd/run @@ -4,5 +4,10 @@ export TERM=linux . /etc/rc.d/functions stat_runit "Starting lighttpd" +if [ ! -d /var/run/lighttpd ] ; then + mkdir -p /var/run/lighttpd + chown http /var/run/lighttpd +fi -exec /usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf +# Using -angel to start lighttpd allows lighttpd to accept signals +exec /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf -- cgit v0.12 From 2ba0826ab4c85aa4caf1613cfdb77123935a16b4 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 23:10:38 +0000 Subject: tzdata: update to most recent --- abs/core/tzdata/PKGBUILD | 10 +++++----- abs/core/tzdata/tzdata-2011h-1.src.tar.gz | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) create mode 120000 abs/core/tzdata/tzdata-2011h-1.src.tar.gz diff --git a/abs/core/tzdata/PKGBUILD b/abs/core/tzdata/PKGBUILD index b09c6c6..17d0d3c 100644 --- a/abs/core/tzdata/PKGBUILD +++ b/abs/core/tzdata/PKGBUILD @@ -2,10 +2,10 @@ # Maintainer: Andreas Radke pkgname=tzdata -pkgver=2011g +pkgver=2011h pkgrel=1 _tzcode=2011g -_tzdata=2011g +_tzdata=2011h pkgdesc="Sources for time zone and daylight saving time data" arch=('i686' 'x86_64') url="http://www.twinsun.com/tz/tz-link.htm" @@ -17,9 +17,6 @@ options=('!emptydirs') source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \ ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ Makefile.patch) -md5sums=('ecb564279b28c5b184421c525d997d6c' - 'a068c27e7e426fdb12ab0c88506df20d' - 'a64ed97d1fc03c66ee8612c0d9f40507') build() { cd ${srcdir} @@ -43,3 +40,6 @@ package() { rm "${pkgdir}/usr/share/zoneinfo/localtime" } +md5sums=('ecb564279b28c5b184421c525d997d6c' + '546d27b6c1e5e1097bd512651815017f' + 'a64ed97d1fc03c66ee8612c0d9f40507') diff --git a/abs/core/tzdata/tzdata-2011h-1.src.tar.gz b/abs/core/tzdata/tzdata-2011h-1.src.tar.gz new file mode 120000 index 0000000..cbba652 --- /dev/null +++ b/abs/core/tzdata/tzdata-2011h-1.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/tzdata-2011h-1.src.tar.gz \ No newline at end of file -- cgit v0.12 From 02797173a65f18a0309e12699c7020eb015704cb Mon Sep 17 00:00:00 2001 From: James Meyer Date: Wed, 3 Aug 2011 18:33:05 -0500 Subject: remove a bunch of symlinks created by makepkg. mp.py will now remove these, so the hopefully we won't see any more of them accidently committed. --- abs/core/gdk-pixbuf/gdk-pixbuf-0.22.0-7.src.tar.gz | 1 - abs/core/lirc/lirc-0.9.0-5.src.tar.gz | 1 - abs/core/mythtv/stable-0.24/mythtv/mythtv-0.24-18.src.tar.gz | 1 - abs/core/pacman/pacman-3.5.3-2.src.tar.gz | 1 - abs/core/pacman/pacman-3.5.3-3.src.tar.gz | 1 - abs/core/pacman/pacman-3.5.3-4.src.tar.gz | 1 - abs/core/parted/parted-3.0-3.src.tar.gz | 1 - abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz | 1 - abs/core/system-templates/system-templates-2.0-4.src.tar.gz | 1 - abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz | 1 - abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz | 1 - abs/extra/community/js/js-1.8.5-3.src.tar.gz | 1 - abs/extra/community/transmission-cli/transmission-cli-2.33-1.src.tar.gz | 1 - abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz | 1 - abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-1.src.tar.gz | 1 - abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-2.src.tar.gz | 1 - 16 files changed, 16 deletions(-) delete mode 120000 abs/core/gdk-pixbuf/gdk-pixbuf-0.22.0-7.src.tar.gz delete mode 120000 abs/core/lirc/lirc-0.9.0-5.src.tar.gz delete mode 120000 abs/core/mythtv/stable-0.24/mythtv/mythtv-0.24-18.src.tar.gz delete mode 120000 abs/core/pacman/pacman-3.5.3-2.src.tar.gz delete mode 120000 abs/core/pacman/pacman-3.5.3-3.src.tar.gz delete mode 120000 abs/core/pacman/pacman-3.5.3-4.src.tar.gz delete mode 120000 abs/core/parted/parted-3.0-3.src.tar.gz delete mode 120000 abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz delete mode 120000 abs/core/system-templates/system-templates-2.0-4.src.tar.gz delete mode 120000 abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz delete mode 120000 abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz delete mode 120000 abs/extra/community/js/js-1.8.5-3.src.tar.gz delete mode 120000 abs/extra/community/transmission-cli/transmission-cli-2.33-1.src.tar.gz delete mode 120000 abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz delete mode 120000 abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-1.src.tar.gz delete mode 120000 abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-2.src.tar.gz diff --git a/abs/core/gdk-pixbuf/gdk-pixbuf-0.22.0-7.src.tar.gz b/abs/core/gdk-pixbuf/gdk-pixbuf-0.22.0-7.src.tar.gz deleted file mode 120000 index a56fab5..0000000 --- a/abs/core/gdk-pixbuf/gdk-pixbuf-0.22.0-7.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/gdk-pixbuf-0.22.0-7.src.tar.gz \ No newline at end of file diff --git a/abs/core/lirc/lirc-0.9.0-5.src.tar.gz b/abs/core/lirc/lirc-0.9.0-5.src.tar.gz deleted file mode 120000 index c758f27..0000000 --- a/abs/core/lirc/lirc-0.9.0-5.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/lirc-0.9.0-5.src.tar.gz \ No newline at end of file diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythtv-0.24-18.src.tar.gz b/abs/core/mythtv/stable-0.24/mythtv/mythtv-0.24-18.src.tar.gz deleted file mode 120000 index 0d26793..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/mythtv-0.24-18.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/mythtv-0.24-18.src.tar.gz \ No newline at end of file diff --git a/abs/core/pacman/pacman-3.5.3-2.src.tar.gz b/abs/core/pacman/pacman-3.5.3-2.src.tar.gz deleted file mode 120000 index 3ed024f..0000000 --- a/abs/core/pacman/pacman-3.5.3-2.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/pacman-3.5.3-2.src.tar.gz \ No newline at end of file diff --git a/abs/core/pacman/pacman-3.5.3-3.src.tar.gz b/abs/core/pacman/pacman-3.5.3-3.src.tar.gz deleted file mode 120000 index 2736d3b..0000000 --- a/abs/core/pacman/pacman-3.5.3-3.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/pacman-3.5.3-3.src.tar.gz \ No newline at end of file diff --git a/abs/core/pacman/pacman-3.5.3-4.src.tar.gz b/abs/core/pacman/pacman-3.5.3-4.src.tar.gz deleted file mode 120000 index 1404e78..0000000 --- a/abs/core/pacman/pacman-3.5.3-4.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/pacman-3.5.3-4.src.tar.gz \ No newline at end of file diff --git a/abs/core/parted/parted-3.0-3.src.tar.gz b/abs/core/parted/parted-3.0-3.src.tar.gz deleted file mode 120000 index 0aea576..0000000 --- a/abs/core/parted/parted-3.0-3.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/parted-3.0-3.src.tar.gz \ No newline at end of file diff --git a/abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz b/abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz deleted file mode 120000 index 9fba9d2..0000000 --- a/abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/runit-scripts-2.1.1-22.src.tar.gz \ No newline at end of file diff --git a/abs/core/system-templates/system-templates-2.0-4.src.tar.gz b/abs/core/system-templates/system-templates-2.0-4.src.tar.gz deleted file mode 120000 index 111669c..0000000 --- a/abs/core/system-templates/system-templates-2.0-4.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/system-templates-2.0-4.src.tar.gz \ No newline at end of file diff --git a/abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz b/abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz deleted file mode 120000 index ab7d945..0000000 --- a/abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/xf86-video-intel-2.15.0-3.src.tar.gz \ No newline at end of file diff --git a/abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz b/abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz deleted file mode 120000 index 9a73c20..0000000 --- a/abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/gpac-0.4.5-7.src.tar.gz \ No newline at end of file diff --git a/abs/extra/community/js/js-1.8.5-3.src.tar.gz b/abs/extra/community/js/js-1.8.5-3.src.tar.gz deleted file mode 120000 index c86d2e3..0000000 --- a/abs/extra/community/js/js-1.8.5-3.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/js-1.8.5-3.src.tar.gz \ No newline at end of file diff --git a/abs/extra/community/transmission-cli/transmission-cli-2.33-1.src.tar.gz b/abs/extra/community/transmission-cli/transmission-cli-2.33-1.src.tar.gz deleted file mode 120000 index 62ea8f8..0000000 --- a/abs/extra/community/transmission-cli/transmission-cli-2.33-1.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/transmission-cli-2.33-1.src.tar.gz \ No newline at end of file diff --git a/abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz b/abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz deleted file mode 120000 index 2c17669..0000000 --- a/abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/gptfdisk-0.7.2-1.src.tar.gz \ No newline at end of file diff --git a/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-1.src.tar.gz b/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-1.src.tar.gz deleted file mode 120000 index fd34bee..0000000 --- a/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-1.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/mkvtoolnix-4.9.1-1.src.tar.gz \ No newline at end of file diff --git a/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-2.src.tar.gz b/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-2.src.tar.gz deleted file mode 120000 index 8b28405..0000000 --- a/abs/extra/mkvtoolnix/mkvtoolnix-4.9.1-2.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/mkvtoolnix-4.9.1-2.src.tar.gz \ No newline at end of file -- cgit v0.12 From ace56a4b6bf67c39d90980cf233b05541d8ac5b9 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 4 Aug 2011 00:10:18 +0000 Subject: mpd: Reject. Closes #741 --- abs/extra/mpd/PKGBUILD | 51 ----------------------------------------------- abs/extra/mpd/mpd | 36 --------------------------------- abs/extra/mpd/mpd.install | 18 ----------------- 3 files changed, 105 deletions(-) delete mode 100644 abs/extra/mpd/PKGBUILD delete mode 100755 abs/extra/mpd/mpd delete mode 100644 abs/extra/mpd/mpd.install diff --git a/abs/extra/mpd/PKGBUILD b/abs/extra/mpd/PKGBUILD deleted file mode 100644 index 302126b..0000000 --- a/abs/extra/mpd/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 98460 2010-11-09 13:34:29Z andrea $ -# Maintainer: Andrea Scarpino -# Contributor: Damir Perisa -# Contributor: Ben - -pkgname=mpd -pkgver=0.15.15 -pkgrel=1 -pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" -arch=('i686' 'x86_64') -license=('GPL') -url="http://mpd.wikia.com/wiki/Server" -depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' - 'sqlite3' 'libsamplerate' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag') -makedepends=('pkgconfig') -install=${pkgname}.install -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" - 'mpd') -md5sums=('af0972af6237771acc420d2452fa627a' - 'e5669c2bff4031928531e52475addeb1') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --enable-lastfm \ - --disable-cue \ - --disable-sidplay \ - --disable-pulse - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # set ours dirs in mpd.conf file - sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example - sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example - sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example - sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example - sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example - sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example - sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example - sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example - - install -Dm644 doc/mpdconf.example ${pkgdir}/usr/share/mpd/mpd.conf.example - - install -Dm755 ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd - install -d ${pkgdir}/var/{lib/mpd/playlists,log/mpd} -} diff --git a/abs/extra/mpd/mpd b/abs/extra/mpd/mpd deleted file mode 100755 index 6134e2e..0000000 --- a/abs/extra/mpd/mpd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting Music Player Daemon" - [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd - /usr/bin/mpd /etc/mpd.conf &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mpd - stat_done - fi - ;; - stop) - stat_busy "Stopping Music Player Daemon" - /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/extra/mpd/mpd.install b/abs/extra/mpd/mpd.install deleted file mode 100644 index 885505a..0000000 --- a/abs/extra/mpd/mpd.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - post_upgrade - echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)" -} - -post_upgrade() { - getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null - getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null - for dir in /var/{lib,log}/mpd; do - chown -R mpd:mpd "$dir" 1>/dev/null - done -} - -post_remove() { - getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null - getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null - [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null -} -- cgit v0.12 From 01d52f6a9106824b577e6b6dd4d51ab287d7de15 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 00:17:41 -0500 Subject: linhes-theme: change color of disabled button text. closes #246 --- abs/core/linhes-theme/PKGBUILD | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 13ca5cc..8b43941 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -2,18 +2,17 @@ # Maintainer: Cecil Watson pkgname=linhes-theme -pkgver=1 -pkgrel=13 +pkgver=1.4 +pkgrel=1 pkgdesc="Default LinHES theme." arch=('i686' 'x86_64') license=('GPL2') url="http://linhes.org/" -source=(ftp://ftp.knoppmyth.net/R6/sources/linhes-theme-1.3.tar.bz2) +source=(ftp://ftp.knoppmyth.net/R6/sources/linhes-theme-1.4.tar.bz2) build() { cd $startdir/src/ mkdir -p $startdir/pkg/usr/share/mythtv/themes cp -a LinHES $startdir/pkg/usr/share/mythtv/themes } - -md5sums=('e243d40c5e76f78b1d98ec038ebe2da5') +md5sums=('5f67ba0e244a1027c7d473b1a2b159fe') -- cgit v0.12 From 8485eec6bfa435f6bfc84f8fce88586795742467 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Thu, 4 Aug 2011 10:29:11 -0500 Subject: python-parted: v 3.8 to match parted 2.3 --- abs/core/python_modules/python-parted/PKGBUILD | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/abs/core/python_modules/python-parted/PKGBUILD b/abs/core/python_modules/python-parted/PKGBUILD index 862405c..e00fa93 100644 --- a/abs/core/python_modules/python-parted/PKGBUILD +++ b/abs/core/python_modules/python-parted/PKGBUILD @@ -1,28 +1,17 @@ pkgname=python-parted __pkgname=pyparted -pkgver=2.0.12 -pkgver=3.4 +pkgver=3.8 pkgrel=4 pkgdesc="Python bindings for libparted" arch=('i686' 'x86_64') license=('LGPL' 'MPL') -depends=('python2' 'parted' 'python-decorator') +depends=('python2' 'parted=>3.0' 'python-decorator') options=('!libtool') source=(https://fedorahosted.org/releases/p/y/pyparted/pyparted-${pkgver}.tar.gz) url="https://fedorahosted.org/pyparted/" build() { cd "${srcdir}/${__pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + python2 setup.py install --prefix=/usr --root="${pkgdir}" } -package(){ - cd "${srcdir}/${__pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -} -md5sums=('8fc485db0b88e59bbdfc4be8ba4068fa') -md5sums=('cc064f12110a6f0d0c236ee7b18fee88') -md5sums=('f244958142c9fd3ff5ee95f578e2f76d') -md5sums=('7f5d06bd6336f3a699840d8639ab8a0d') -md5sums=('f244958142c9fd3ff5ee95f578e2f76d') -md5sums=('cc064f12110a6f0d0c236ee7b18fee88') +md5sums=('e9cd0c94c71ac17755f71a8e1561eac2') -- cgit v0.12 From 24dae363a3bc25af8d072b2215eecb11777da049 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Thu, 4 Aug 2011 12:35:38 -0500 Subject: linhes-config: remove larch packages after system install & remove larch from pacman.conf mv_install.py: exit if parted is not found --- abs/core/LinHES-config/PKGBUILD | 6 +++--- abs/core/LinHES-config/mv_install.py | 1 + abs/core/LinHES-config/systemconfig.sh | 11 +++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 2289196..2df19dd 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -pkgrel=21 +pkgrel=23 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -101,13 +101,13 @@ build() { install -m 0755 issue $startdir/pkg/etc/issue } -md5sums=('c1f6bd445284408767ab8ab4c4164aed' +md5sums=('c737f8538aea20fcb5f3903957e80837' '1a4694fcd694b362c339bda781ed0f3e' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' 'd7a8cd4a0060399ae22e69f74e04eb07' '7a45287a07145fde5aa664583d4f6fba' - 'f88d2fb88339a4bf8ec9217a3fbcdef7' + '39ca949f82123a5e84902d761a6f9ca2' '8ac1cfd2eca0f641737da0d0aca416a7' '9ae8d79f620c6d19973c55c32a921874' '95526b4d3dec6c9341088fb6511d831a' diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py index 9dcc7b7..694a0b8 100755 --- a/abs/core/LinHES-config/mv_install.py +++ b/abs/core/LinHES-config/mv_install.py @@ -7,6 +7,7 @@ try: import parted except: print "module parted not found" + sys.exit(1) def usage(): print "help text:" diff --git a/abs/core/LinHES-config/systemconfig.sh b/abs/core/LinHES-config/systemconfig.sh index 218f705..dce8c74 100755 --- a/abs/core/LinHES-config/systemconfig.sh +++ b/abs/core/LinHES-config/systemconfig.sh @@ -10,6 +10,17 @@ echo "----------------------start of systemconfig $@ ----------------------" . $MV_ROOT/bin/networkconfig.sh postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype` +for i in larch liblarch larch-profiles larch-live +do + pacman -Q $i + if [ $? == 0 ] + then + pacman -R $i --noconfirm + fi +done + + sed -i '/larch/d' /etc/pacman.conf + systemconfig.py -m $@ rc=$? echo "systemconfig.py exit code $rc" -- cgit v0.12 From 7681a52889415179b104adb0aebac6f9742faa84 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Thu, 4 Aug 2011 12:36:08 -0500 Subject: pacman: Add SyncFirst to pacman.conf on upgrade, remove larch from pacman.conf on upgrade --- abs/core/pacman/PKGBUILD | 2 +- abs/core/pacman/pacman.install | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index e25f7a7..80dabe4 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.3 -pkgrel=4 +pkgrel=5 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index a3066bc..c066733 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -9,6 +9,7 @@ post_upgrade() { if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then _warnupgrade fi + _updateconf echo ">>>" echo ">>> ATTENTION! ATTENTION! ATTENTION!" echo ">>> /etc/pacman.conf has changed. If you have customized your" @@ -18,6 +19,21 @@ post_upgrade() { echo ">>>" } +_updateconf() { + pacconf="/etc/pacman.conf" + #add SyncFirst + grep -q SyncFirst $pacconf + if [ $? -eq 1 ] + then + sed -i '/\[options\]/ a\SyncFirst = pacman ' $pacconf + fi + #remove larch + sed -i '/larch/d' $pacconf + +} + + + _warnupgrade() { echo ">>>" echo ">>> The pacman database format has changed as of pacman 3.5.0." -- cgit v0.12 From bb07edb449b1c718b49ec6fb98a7453cf8387b95 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 13:21:52 -0500 Subject: util-linux-ng: Removed. Replaced by util-linux --- abs/core/util-linux-ng/PKGBUILD | 49 ---- abs/core/util-linux-ng/fix-findmnt.patch | 24 -- abs/core/util-linux-ng/util-linux-ng-cfdisk.patch | 57 ----- abs/core/util-linux-ng/util-linux-ng-nilfs2.patch | 276 ---------------------- abs/core/util-linux-ng/util-linux-ng.install | 21 -- 5 files changed, 427 deletions(-) delete mode 100644 abs/core/util-linux-ng/PKGBUILD delete mode 100644 abs/core/util-linux-ng/fix-findmnt.patch delete mode 100644 abs/core/util-linux-ng/util-linux-ng-cfdisk.patch delete mode 100644 abs/core/util-linux-ng/util-linux-ng-nilfs2.patch delete mode 100644 abs/core/util-linux-ng/util-linux-ng.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 -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 -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 - -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 -Date: Mon, 19 Jul 2010 22:52:58 +0200 -Subject: [PATCH] cfdisk: get_string not calculating correct limits - -Reported-by: James L. Hammons -Signed-off-by: Karel Zak ---- - 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 -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 -Signed-off-by: Karel Zak ---- - 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 -+ * -+ * This file may be redistributed under the terms of the -+ * GNU Lesser General Public License -+ */ -+#include -+#include -+ -+#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 -Date: Tue, 13 Jul 2010 09:14:08 +0200 -Subject: [PATCH] tests: add nilfs2 test for libblkid - -Signed-off-by: Jiro SEKIBA -Signed-off-by: Karel Zak ---- - 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^QvorkjN+>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;1p%^G=UuLqkPtM9ycck)X|u7g*QFMo>QK!; -zURQKH*iWxuZsIwzh@rOT!@1{s7L*D22$pQI7i2k@S1M-~SA2Zm@7XFsJ@fXR;7eg< -zQ4&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`86XxmogMElVLy7|cD)2Ck - -literal 0 -HcmV?d00001 - --- -1.7.2.1 -From 1326e1dfa5c1d06ff7521b8c8162452799164239 Mon Sep 17 00:00:00 2001 -From: Jiro SEKIBA -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 ---- - 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 -} - -- cgit v0.12 From 8f4fbbbe69ae28a434c5945a7cc28d010d3aa6c1 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 4 Aug 2011 19:39:04 +0000 Subject: miro: update to 4.0.2 --- abs/extra/miro/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 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" -- cgit v0.12 From 85fb50abe2018af71bbc65ded247e781f2ad75ff Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 4 Aug 2011 19:39:38 +0000 Subject: linhes-scripts: Update screenshooter.sh for 0.24/R7. More below... Moderately tested. Verbosity does not always seem to work. Command line switches have changed. -f FILENAME does NOT require a full path. -v is now for verbose mode. --- abs/core/linhes-scripts/PKGBUILD | 6 +- abs/core/linhes-scripts/screenshooter.sh | 114 ++++++------- abs/core/linhes-scripts/screenshooter.sh.orig | 224 ++++++++++++++++++++++++++ abs/core/linhes-scripts/shootscreens.sh | 3 +- 4 files changed, 286 insertions(+), 61 deletions(-) mode change 100644 => 100755 abs/core/linhes-scripts/screenshooter.sh create mode 100644 abs/core/linhes-scripts/screenshooter.sh.orig mode change 100644 => 100755 abs/core/linhes-scripts/shootscreens.sh 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 old mode 100644 new mode 100755 index 72f6cc0..1cb7a78 --- 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 +# # 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 old mode 100644 new mode 100755 index d3e8845..2d78e3c --- 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 +} -- cgit v0.12 From db772905df3ee766ee10874d54e2f061b46abc87 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 4 Aug 2011 20:30:43 +0000 Subject: subversion: Recompile due to broken dep with db. --- abs/extra/subversion/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') -- cgit v0.12 From d9a38ed21c59b9d71331528add4ae4a9f526d7bd Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 4 Aug 2011 21:02:32 +0000 Subject: ffmpeg-svn: update to latest --- abs/core/ffmpeg-svn/PKGBUILD | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 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 } -- cgit v0.12 From 0c83ce8883d7c353049974197679731e33b410f2 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 4 Aug 2011 21:03:02 +0000 Subject: x264: update to most recent snapshot 20110803 --- abs/core/x264/PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 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') -- cgit v0.12 From aa24f35a4f8c5d5e7f203d60bab0e16bda3ef40d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 16:31:24 -0500 Subject: celt-0.7: Initial inclusion. Dep of jack. --- abs/extra/celt-0.7/PKGBUILD | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 abs/extra/celt-0.7/PKGBUILD 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 +# Contributor: Sven-Hendrik Haase +# Contributor: Lauri Niskanen + +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: -- cgit v0.12 From 27b46664045c2aab50de79ace14901874288e6ab Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 16:38:07 -0500 Subject: jack: Bump to latest. --- abs/core/jack/PKGBUILD | 36 +++++++++++++++++++----------------- abs/core/jack/jack.changelog | 10 ++++++++-- 2 files changed, 27 insertions(+), 19 deletions(-) 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 -# Maintainer: Ray Rashif +# $Id$ +# Maintainer: Ray Rashif +# Contributor: tobias # Contributor: Robert Emil Berge 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 +29 Jul 2011 (GMT+8) Ray Rashif + + * 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 * 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. -- cgit v0.12 From e26d2a72d84f0b0ca0370ffa09ca10d465b96079 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 16:41:18 -0500 Subject: libass: Initial inclusion. Dep of mplayer --- abs/extra/libass/PKGBUILD | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 abs/extra/libass/PKGBUILD 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 +# Contributor: G_Syme + +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" +} -- cgit v0.12 From 18d5b0d34e3319ff989588a36165b95d3d45683c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 17:10:40 -0500 Subject: mplayer: Bump to latest. refs #647 --- abs/core/mplayer/PKGBUILD | 107 +++++++++++++++++++++++---------------- abs/core/mplayer/__changlog | 1 + abs/core/mplayer/mplayer.desktop | 2 +- abs/core/mplayer/mplayer.install | 11 ++++ 4 files changed, 75 insertions(+), 46 deletions(-) create mode 100644 abs/core/mplayer/__changlog create mode 100644 abs/core/mplayer/mplayer.install 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 # Contributor: Hugo Doria -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 +} -- cgit v0.12 From 12cb37bdafb85bee1a95b27ca7bf6fe19fd6bf2a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 17:16:40 -0500 Subject: python-lxml: Bump to latest. --- abs/core/python_modules/python-lxml/PKGBUILD | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) 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 # Contributor: Jaroslav Lichtblau # Contributor: Angel 'angvp' Velasquez @@ -6,8 +6,8 @@ # Contributor: Guillem Rieu 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 } -- cgit v0.12 From 6b1c57fc65f2287e030430c04e955ede3a74de26 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 17:31:55 -0500 Subject: tar: Bump to latest. ref #647 --- abs/core/tar/PKGBUILD | 14 +++++++++----- abs/core/tar/__changelog | 1 + abs/core/tar/tar.install | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 abs/core/tar/__changelog 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 # Contributor: Andreas Radke 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() { -- cgit v0.12 From 6c3099aff3af9a3b217a5eeb12336c0dc09b8652 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 17:38:30 -0500 Subject: libxrandr: Bump to latest. ref #647 --- abs/core/libxrandr/PKGBUILD | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 # Contributor: Jan de Groot 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}/" } -- cgit v0.12 From 66be0cdc0ed7d5802527e7228adee01f4a17127d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 17:54:10 -0500 Subject: pcre: Bump to latest. Dep of glib2 --- abs/core/pcre/ChangeLog | 40 ------------------------- abs/core/pcre/PKGBUILD | 16 +++++----- abs/core/pcre/libpcre-7.7-buffer-overflow.patch | 16 ---------- 3 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 abs/core/pcre/ChangeLog delete mode 100644 abs/core/pcre/libpcre-7.7-buffer-overflow.patch 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 - - * pcre 8.02-1 - * Upstream update - -2010-01-23 Eric Belanger - - * pcre 8.01-1 - * Upstream update - -2009-10-26 Eric Belanger - - * pcre 8.00-1 - * Upstream update - -2009-04-13 Eric Belanger - - * pcre 7.9-1 - * Upstream update - -2008-10-19 Eric Belanger - - * Updated url - -2008-09-05 Eric Belanger - - * pcre 7.8-1 - * Upstream update - * Fixed license - -2008-07-07 Eric Belanger - - * pcre 7.7-2 - * Added libpcre-7.7-buffer-overflow.patch to fix buffer overflow (close FS#10845) - -2008-05-10 Eric Belanger - - * 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 # Contributor: Eric Belanger # Contributor: John Proctor 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)) - { -- cgit v0.12 From 7a80bfb7738f90a5232afc3c39f8ded4e9dba21a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 18:12:20 -0500 Subject: glib2: Bump to latest. refs #647 --- abs/core/glib2/PKGBUILD | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) 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 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 +} -- cgit v0.12 From 4bc7b0f67aa62aa9455b940cb7ec14661be98193 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 4 Aug 2011 23:36:19 +0000 Subject: smartmontools: update to 5.41 --- abs/extra/smartmontools/PKGBUILD | 13 +++++-------- abs/extra/smartmontools/__changelog | 2 ++ abs/extra/smartmontools/smartmontools.install | 24 ++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 abs/extra/smartmontools/__changelog create mode 100644 abs/extra/smartmontools/smartmontools.install 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 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 + +} -- cgit v0.12 From 8ca639078819fb0229652e9feb47c9550fe8747f Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 4 Aug 2011 23:36:41 +0000 Subject: runit-scripts: fix smartd run file and remove unnecessary finish file. --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runitscripts/services/smartd/run | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) 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 -- cgit v0.12 From ceefe4ae64d97bfd1e6c439ab58575d4c237da1f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 18:39:33 -0500 Subject: polkit: Bump to latest. refs #647 --- abs/extra/polkit/PKGBUILD | 20 +- abs/extra/polkit/polkit-0.98-1-i686-build.log.1 | 403 ------------------------ abs/extra/polkit/polkit-0.98-1-i686-build.log.2 | 386 ----------------------- abs/extra/polkit/polkit-0.98-1-i686-build.log.3 | 386 ----------------------- abs/extra/polkit/polkit-0.98-1-i686-build.log.4 | 386 ----------------------- abs/extra/polkit/polkit-git-fixes.patch | 85 ----- 6 files changed, 9 insertions(+), 1657 deletions(-) delete mode 100644 abs/extra/polkit/polkit-0.98-1-i686-build.log.1 delete mode 100644 abs/extra/polkit/polkit-0.98-1-i686-build.log.2 delete mode 100644 abs/extra/polkit/polkit-0.98-1-i686-build.log.3 delete mode 100644 abs/extra/polkit/polkit-0.98-1-i686-build.log.4 delete mode 100644 abs/extra/polkit/polkit-git-fixes.patch 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 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 - Aborting...(B 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 - Aborting...(B 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 - Aborting...(B 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 - Aborting...(B 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) - { -- cgit v0.12 From 83629991aaa6c5f57298084225217f7d0eefe20e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 18:57:21 -0500 Subject: libbonobo: Bump to latest. --- abs/extra/libbonobo/PKGBUILD | 21 ++++++++++----------- abs/extra/libbonobo/bonobo-activation-config.xml | 1 - abs/extra/libbonobo/libbonobo.install | 16 ---------------- 3 files changed, 10 insertions(+), 28 deletions(-) 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 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 @@ /usr/lib/bonobo/servers - /opt/gnome/lib/bonobo/servers 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 $* -- cgit v0.12 From 9159a95daa9b38fe99b2251f169f86b52a1ab772 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Fri, 5 Aug 2011 00:00:15 +0000 Subject: x11vnc: update to 0.9.12 --- abs/extra/x11vnc/PKGBUILD | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) 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 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') -- cgit v0.12 From 2f3f600f377fbc7ed2d641afcc8bf3fd16376470 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Fri, 5 Aug 2011 00:00:41 +0000 Subject: libxtst: Recompile due to missing header --- abs/core/libxtst/PKGBUILD | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 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}" -- cgit v0.12 From a17f74ee89c3c3120613ae61db77333f366970dc Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:01:45 -0500 Subject: libbonoboui: Bump to latest. --- abs/extra/libbonoboui/PKGBUILD | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 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') -- cgit v0.12 From 6fe8dba764d4ea695c7fd13a176b1da8a5678af8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:07:44 -0500 Subject: perl-term-readkey: Bump to latest. --- abs/core/perl_modules/perl-term-readkey/PKGBUILD | 40 ++++++++++++++---------- 1 file changed, 24 insertions(+), 16 deletions(-) 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 # Contributor: Wael Nasreddine +# Contributor: Francois Charette 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 } -- cgit v0.12 From bc01c8a7d55772a990654896e62588a8b4de31fe Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:10:43 -0500 Subject: perl-html-parser: Bump to latest. --- abs/core/perl_modules/perl-html-parser/PKGBUILD | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) 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 +# $Id$ +# Maintainer: kevin # Contributor: Manolis Tzanidakis +# Contributor: Firmicus 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 -- cgit v0.12 From c53c52370d58d70ead2c1ca90edec98eaef241cf Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:14:27 -0500 Subject: perl-xml-libxslt: Bump to latest. --- abs/core/perl_modules/perl-xml-libxslt/PKGBUILD | 31 +++++++++++++++---------- 1 file changed, 19 insertions(+), 12 deletions(-) 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 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 } -- cgit v0.12 From f4e30933186913f5460488865b782143e96bef6e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:17:56 -0500 Subject: perl-crypt-ssleay: Bump to latest. --- abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD | 32 +++++++++++++++--------- 1 file changed, 20 insertions(+), 12 deletions(-) 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 # Contributor: François Charette 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 } -- cgit v0.12 From 9e83df866147c642659e76ba24928da80262142c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:23:32 -0500 Subject: perl-mailtools: Bump to latest. --- abs/core/perl_modules/perl-mailtools/PKGBUILD | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) 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 # Contributor: Eric Johnson 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') -- cgit v0.12 From 6e05ce803604c61f90f13d5b1c5957aaba52ac88 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Fri, 5 Aug 2011 00:24:17 +0000 Subject: python-geoip: Recompile after new geoip. Ref #778 --- abs/core/python_modules/python-geoip/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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') -- cgit v0.12 From cba3949376b9d4e976a57f1e57623978cb476cfd Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Fri, 5 Aug 2011 00:25:05 +0000 Subject: geoip: Update to 1.4.7 (Note: 1.4.8 would not compile) Ref #778 --- abs/extra/geoip/PKGBUILD | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) 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 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') -- cgit v0.12 From 9f1b63060d86a86ce82b0fb45b7eb944124e3598 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:26:53 -0500 Subject: perl-class-methodmaker: Bump to latest. --- .../perl_modules/perl-class-methodmaker/PKGBUILD | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) 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 # Contributor: François Charette 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') -- cgit v0.12 From 74446333a41f97880efeab3796a5a86923521ccf Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:28:41 -0500 Subject: perl-digest-sha1: Bump to latest. --- abs/core/perl_modules/perl-digest-sha1/PKGBUILD | 33 +++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) 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 +# $Id$ +# Maintainer: kevin # 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 -- cgit v0.12 From 9ab2d21e911b81ae3d223e8c04b026c99989f70c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:31:01 -0500 Subject: perl-xml-twig: Bump to latest. --- abs/core/perl_modules/perl-xml-twig/PKGBUILD | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) 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 # Maintainer/Contributor: Francois Charette 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 } -- cgit v0.12 From 6cd1392031d07af98179dfcb300ed89423e77f15 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:34:34 -0500 Subject: perl-error: Bump to latest. --- abs/core/perl_modules/perl-error/PKGBUILD | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) 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 # Contributor: Dale Blount 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 } + -- cgit v0.12 From 70ba151b467269379b2d952ec3b0d1462839b621 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:37:15 -0500 Subject: perl-dbi: Bump to latest. --- abs/core/perl_modules/perl-dbi/PKGBUILD | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) 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 +# $Id$ +# Maintainer: kevin # Contributor: Matt Thompson + 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 -- cgit v0.12 From 6abc7b836c9aa305f448d55bcac3361be783ac13 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:40:44 -0500 Subject: perl-tk: Bump to latest. --- abs/core/perl_modules/perl-tk/PKGBUILD | 55 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 28 deletions(-) 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 +# $Id$ +# Maintainer: François Charette # Contributor: Jason Chu +# Contributor: Juergen Hoetzel 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 -- cgit v0.12 From 9a8225576f627905015e7d4b38b3bb79ad250a9b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:42:11 -0500 Subject: perl-html-tagset: Bump to latest. --- abs/core/perl_modules/perl-html-tagset/PKGBUILD | 27 +++++++++++++++---------- 1 file changed, 16 insertions(+), 11 deletions(-) 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 # 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 -- cgit v0.12 From 9375bcca61ac04cc18fa8c180baadde32858a453 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:44:37 -0500 Subject: perl-net-upnp: Bump to latest. --- abs/core/perl_modules/perl-net-upnp/PKGBUILD | 40 ++++++++++++---------- .../perl-net-upnp/perl-config-simple/PKGBUILD | 25 -------------- 2 files changed, 22 insertions(+), 43 deletions(-) mode change 100755 => 100644 abs/core/perl_modules/perl-net-upnp/PKGBUILD delete mode 100644 abs/core/perl_modules/perl-net-upnp/perl-config-simple/PKGBUILD diff --git a/abs/core/perl_modules/perl-net-upnp/PKGBUILD b/abs/core/perl_modules/perl-net-upnp/PKGBUILD old mode 100755 new mode 100644 index 26db326..a49bd6e --- 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 +# Contributor: Drew Gilbert + 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 =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 -} -- cgit v0.12 From 2a9f8c8e3874d5db66fe32c2b33ce6a293f05810 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:45:51 -0500 Subject: perl-params-validate: Bump to latest. --- .../perl_modules/perl-params-validate/PKGBUILD | 31 +++++++++++++--------- 1 file changed, 19 insertions(+), 12 deletions(-) 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 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 } -- cgit v0.12 From d8bcf2956b47404b24895896cab2b64171cea079 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 19:46:58 -0500 Subject: perl-timedate: Bump to latest. --- abs/core/perl_modules/perl-timedate/PKGBUILD | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) 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 # 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 -- cgit v0.12 From d20d3b04fcc53fc9b45f7279812d84af4e124159 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 20:00:18 -0500 Subject: xine-ui: Bump to latest. ref #647 --- abs/extra/xine-ui/ChangeLog | 27 --- abs/extra/xine-ui/PKGBUILD | 32 ++-- .../xine-ui/xine-ui-0.99.6-1-i686-build.log.1 | 2 - abs/extra/xine-ui/xine-ui-xdg.diff | 206 +++++++++++++++++++++ abs/extra/xine-ui/xine-ui.install | 1 + 5 files changed, 224 insertions(+), 44 deletions(-) delete mode 100644 abs/extra/xine-ui/ChangeLog delete mode 100644 abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1 create mode 100644 abs/extra/xine-ui/xine-ui-xdg.diff 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 - - * 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 - - * 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 - - * xine-ui 0.99.5-5 - * Rebuilt against readline 6.0.00 - -2008-08-19 Eric Belanger - - * 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 +# $Id$ +# Maintainer: Eric Bélanger 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 - Aborting...(B 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() { -- cgit v0.12 From bc596e575efa3f11c955d7555a18aaefdfa1b579 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 20:04:56 -0500 Subject: diffutils: Bump to latest. ref #647 --- abs/core/diffutils/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 # Contributor: Andreas Radke 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 } -- cgit v0.12 From 2640ec67728a78acdda7c0b8d5ce477646fbdd05 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 20:08:29 -0500 Subject: xf86-input-evdev: Bump to latest. --- abs/core/xf86-input-evdev/PKGBUILD | 18 ++++--- .../xf86-input-evdev/initialize-valuators.patch | 61 ---------------------- 2 files changed, 11 insertions(+), 68 deletions(-) delete mode 100644 abs/core/xf86-input-evdev/initialize-valuators.patch diff --git a/abs/core/xf86-input-evdev/PKGBUILD b/abs/core/xf86-input-evdev/PKGBUILD index 55c7faa..2bc3d6b 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 # Contributor: Alexander Baldeck -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 -Tested-by: Bartek Iwaniec -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer ---- -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 -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 - -Signed-off-by: Bartosz Brachaczek -Tested-by: Bartek Iwaniec -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer ---- -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 -- cgit v0.12 From 020c1b453a49bf922d32d416916393ae297d3cf0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 20:15:08 -0500 Subject: xf86-input-evdev: oops, xorg conflict fix. --- abs/core/xf86-input-evdev/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/xf86-input-evdev/PKGBUILD b/abs/core/xf86-input-evdev/PKGBUILD index 2bc3d6b..c6776bd 100644 --- a/abs/core/xf86-input-evdev/PKGBUILD +++ b/abs/core/xf86-input-evdev/PKGBUILD @@ -4,14 +4,14 @@ pkgname=xf86-input-evdev pkgver=2.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="X.org evdev input driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +conflicts=('xorg-server<1.9.0') options=('!libtool' '!makeflags') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -- cgit v0.12 From 54b13f938af2f5dc0b7b31f2c1711fcb863e7614 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 20:21:53 -0500 Subject: pm-utils: Bump to latest. ref #647 --- abs/core/pm-utils/02-logging-append.patch | 19 ++++++++++ .../12-fix-intel-audio-powersave-hook.patch | 40 ++++++++++++++++++++ abs/core/pm-utils/13-49bluetooth-sync.patch | 43 ++++++++++++++++++++++ abs/core/pm-utils/14-disable-sata-alpm.patch | 26 +++++++++++++ abs/core/pm-utils/PKGBUILD | 31 +++++++++++----- 5 files changed, 149 insertions(+), 10 deletions(-) create mode 100644 abs/core/pm-utils/02-logging-append.patch create mode 100644 abs/core/pm-utils/12-fix-intel-audio-powersave-hook.patch create mode 100644 abs/core/pm-utils/13-49bluetooth-sync.patch create mode 100644 abs/core/pm-utils/14-disable-sata-alpm.patch 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 +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 +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 +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 +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 < # Contributor: Thayer Williams # Contributor: Giovanni Scafora 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} } -- cgit v0.12 From 1589df68abc561454b3248c5f0113a61e2e5c71e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 20:24:10 -0500 Subject: hdparm: Bump to latest. ref #647 --- abs/core/hdparm/PKGBUILD | 22 ++++++++++------------ abs/core/hdparm/wiper.sh.2_6.max-ranges.patch | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) 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 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 -- cgit v0.12 From cecf2e7e8b9ed84fdf4cfcdaceb5e9e4fc0f2cff Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 20:31:38 -0500 Subject: ntp: Bump to latest. ref #647 --- abs/core/ntp/PKGBUILD | 2 +- abs/core/ntp/changelog | 25 +++++++++++++++++++++++++ abs/core/ntp/fix-ipv6.patch | 10 ---------- abs/core/ntp/ntp-4.2.4_p7-nano.patch | 20 -------------------- abs/core/ntp/ntp-client.conf | 0 abs/core/ntp/ntp.conf | 0 abs/core/ntp/ntpd | 0 abs/core/ntp/ntpdate | 0 8 files changed, 26 insertions(+), 31 deletions(-) mode change 100755 => 100644 abs/core/ntp/PKGBUILD delete mode 100644 abs/core/ntp/fix-ipv6.patch delete mode 100644 abs/core/ntp/ntp-4.2.4_p7-nano.patch mode change 100755 => 100644 abs/core/ntp/ntp-client.conf mode change 100755 => 100644 abs/core/ntp/ntp.conf mode change 100755 => 100644 abs/core/ntp/ntpd mode change 100755 => 100644 abs/core/ntp/ntpdate diff --git a/abs/core/ntp/PKGBUILD b/abs/core/ntp/PKGBUILD old mode 100755 new mode 100644 index 69669c7..290b6b2 --- 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 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 + + * 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 + + * ntp 4.2.6p3-2 + - Improved daemon scripts + +2010-10-16 kevin + + * ntp 4.2.6p3 + - Implemented FS#18469, replace ntpdate with ntpd -q + - Removed LIBS + - Removed old IPv6 and nano patch + +2010-10-16 kevin + + * 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 - #include - #include 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 - #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 old mode 100755 new mode 100644 diff --git a/abs/core/ntp/ntp.conf b/abs/core/ntp/ntp.conf old mode 100755 new mode 100644 diff --git a/abs/core/ntp/ntpd b/abs/core/ntp/ntpd old mode 100755 new mode 100644 diff --git a/abs/core/ntp/ntpdate b/abs/core/ntp/ntpdate old mode 100755 new mode 100644 -- cgit v0.12 From ecbe167fad5e81512157a5280dd00b0826f6103d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 20:43:27 -0500 Subject: openmpi: Initial Inclusion. Dep of boost --- abs/extra/openmpi/PKGBUILD | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 abs/extra/openmpi/PKGBUILD 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 +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 +} -- cgit v0.12 From 46f188df004f591f2e1f3e0137de974c33f085df Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 20:46:08 -0500 Subject: hwloc: Initial Inclusion. Dep of openmpi --- abs/extra/hwloc/PKGBUILD | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 abs/extra/hwloc/PKGBUILD 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 +# Contributor: Sylvain HENRY +# Contributor: Hervé YVIQUEL + +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 +} -- cgit v0.12 From d4fe086215e4697ebb12f8a0d30e5a1b23775a16 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 21:09:39 -0500 Subject: valgrind: Initial inclusion. Dep of openmpi --- abs/extra/valgrind/PKGBUILD | 45 +++++++++++++++ abs/extra/valgrind/glibc-patch-version.patch | 52 +++++++++++++++++ abs/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch | 67 ++++++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 abs/extra/valgrind/PKGBUILD create mode 100644 abs/extra/valgrind/glibc-patch-version.patch create mode 100644 abs/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch 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 +# Maintainer: Allan McRae + +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 + ;; -- cgit v0.12 From d61c08fda7fecb7a5f609f0fe75c13802c02842a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 21:52:39 -0500 Subject: boost: Bump to latest. --- abs/extra/boost/PKGBUILD | 84 +++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 36 deletions(-) diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD index c9d7fcf..9c78494 100644 --- a/abs/extra/boost/PKGBUILD +++ b/abs/extra/boost/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 89256 2010-08-30 13:49:46Z remy $ +# $Id$ # Maintainer: kevin # Contributor: Giovanni Scafora -# TU: Kritoke +# Contributor: Kritoke # Contributor: Luca Roccia 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' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) license=('custom') -options=('!ccache') +md5sums=('ff180a5276bec773a7625cac7e2288e8') _stagedir="${srcdir}/stagedir" @@ -22,53 +22,62 @@ build() { # set python path for bjam cd "${srcdir}/${pkgbase}_${_boostver}/tools" echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam + echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam + echo "using mpi ;" >> build/v2/user-config.jam # 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=('python: for python bindings' + '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 +87,24 @@ 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') -- cgit v0.12 From 689cef158ff5eddbe7be7d860075a514e34b0615 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 4 Aug 2011 22:18:13 -0500 Subject: polkit-gnome: Removed. --- abs/extra/polkit-gnome/PKGBUILD | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 abs/extra/polkit-gnome/PKGBUILD 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 -# Contributor: onestep_ua - -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 -} -- cgit v0.12 From 57be4c1f6f74dc119a977a9cab85555414dc3dda Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 14:24:19 -0500 Subject: run-parts: Bump to latest. --- abs/core/run-parts/PKGBUILD | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) 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 +# $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') -- cgit v0.12 From 449ef1741d7dd025c0a342ff39e00c38216d3ba0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 14:27:52 -0500 Subject: cksfv: Bump to latest. --- abs/extra/community/cksfv/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 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 -- cgit v0.12 From d2be0c2b153e6b8b13c0ab876e62fb71868aca13 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 14:30:08 -0500 Subject: libxft: Bump to latest. --- abs/core/libxft/PKGBUILD | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 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}/" } -- cgit v0.12 From 76aac49ec7e21a14b0ca6c7a25f8ff89c93daea6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 14:33:59 -0500 Subject: libva: Bump to latest. --- abs/extra/libva/PKGBUILD | 10 ++---- abs/extra/libva/libva-dont-install-tests.patch | 47 -------------------------- abs/extra/libva/patch1.patch | 11 ------ 3 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 abs/extra/libva/libva-dont-install-tests.patch delete mode 100644 abs/extra/libva/patch1.patch 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 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 -- cgit v0.12 From b0f52a18b099e7bc461ac855f5123be1113a41c7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 14:41:31 -0500 Subject: libmodplug: Bump to latest. --- abs/extra/community/libmodplug/PKGBUILD | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) 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 +# $Id$ +# Maintainer: +# Contributor: Jan de Groot # Contributor: Patrick Leslie Polzer 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" +} -- cgit v0.12 From 8f4faaa77e24e9ff85ec7a4992ba751560218c13 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 14:46:12 -0500 Subject: xfsprogs: Bump to latest. --- abs/core/xfsprogs/PKGBUILD | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 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') -- cgit v0.12 From 305753e103888a633c1dd32073fb5fe35b5f0a80 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 14:51:40 -0500 Subject: acl: Bump to latest. --- abs/core/acl/PKGBUILD | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 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 +# $Id$ +# Maintainer: Thomas Bächler 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.*.*.* } -- cgit v0.12 From c17edabbc0e0118a3432339620f9ce9e23080e7c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 14:53:20 -0500 Subject: attr: Bump to latest. --- abs/core/attr/PKGBUILD | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) 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 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 } -- cgit v0.12 From e1da8f3a5c013b91a66645790b637a2bed9335eb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 15:00:01 -0500 Subject: lvm2: Bump to latest. --- abs/core/lvm2/ChangeLog | 103 --------------------------------------------- abs/core/lvm2/PKGBUILD | 27 +++++++----- abs/core/lvm2/lvm2_hook | 8 ++-- abs/core/lvm2/lvm2_install | 5 +-- 4 files changed, 23 insertions(+), 120 deletions(-) delete mode 100644 abs/core/lvm2/ChangeLog 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 - - * 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 - - * lvm2/device-mapper 2.02.69-1 - * Upstream update - * Moved dmeventd man page from lvm2 to device-mapper package - -2010-06-25 Eric Belanger - - * lvm2/device-mapper 2.02.68-1 - * Upstream update - * Fixed tr path in lvmdump - -2010-04-05 Eric Belanger - - * lvm2/device-mapper 2.02.62-1 - * Upstream update - * Fixed license - -2010-02-27 Eric Belanger - - * lvm2/device-mapper 2.02.61-1 - * Upstream update - -2010-01-24 Thomas Bächler - * lvm2/device-mapper 2.02.60-2 - * Rebuilt without -Wl,--as-needed, it breaks dmeventd monitoring - -2010-01-24 Thomas Bächler - * 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 - - * lvm2 2.02.56-1 - * device-mapper 1.02.40-1 - * Upstream update - -2009-10-31 Eric Belanger - - * 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 - - * lvm2 2.02.53-1 - * device-mapper 1.02.38-1 - * Upstream update - -2009-09-18 Eric Belanger - - * 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 - - * 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 - - * lvm2 2.02.47-1 - * device-mapper 1.02.32-1 - * Upstream update - * Added dmsetup.static - -2009-03-07 Eric Belanger - - * lvm2 2.02.45-1 - * device-mapper 1.02.31-1 - * Upstream update - -2009-01-31 Eric Belanger - - * 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 - - * 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 +# $Id$ +# Maintainer: Eric Bélanger # Maintainer: Thomas Bächler 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 () -- cgit v0.12 From be5265a6fbad290bddfae4181a2ff093e1d273fb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 15:03:32 -0500 Subject: strace: Bump to latest. --- abs/extra/strace/PKGBUILD | 26 ++++++++++++++++---------- abs/extra/strace/no_linux_socket_h.patch | 22 ---------------------- 2 files changed, 16 insertions(+), 32 deletions(-) delete mode 100644 abs/extra/strace/no_linux_socket_h.patch 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 # Contributor: Tom Newsom + 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 ]) -+AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h]) - AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include ]) - AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include ]) - ---- 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 - - #include <$ac_header> - _ACEOF -- cgit v0.12 From acaeacde6a09acb6c329e8c52f6d64bd0e88d365 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 15:06:08 -0500 Subject: libnetfilter_queue: Bump to latest. --- abs/extra/community/libnetfilter_queue/PKGBUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 # Contributor: Kevin Edmonds # 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 } -- cgit v0.12 From a7f747182451fd90c342fea4e6fe67978519219f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 15:09:31 -0500 Subject: libnfnetlink: Bump to latest. --- abs/extra/community/libnfnetlink/PKGBUILD | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 +# Contributor: Kevin Edmonds +# 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 -- cgit v0.12 From ee0e70fee3f84792d1c020c6fc848fc63227e4d7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 15:26:32 -0500 Subject: enca: Bump to latest. --- abs/extra/community/enca/PKGBUILD | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/abs/extra/community/enca/PKGBUILD b/abs/extra/community/enca/PKGBUILD index 1bbd7db..e398023 100644 --- a/abs/extra/community/enca/PKGBUILD +++ b/abs/extra/community/enca/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD,v 1.7 2009/02/27 12:40:33 sergej Exp $ -# Maintainer: Sergej Pupykin +# $Id$ +# Maintainer: Giovanni Scafora # Contributor: Filip Dvorak pkgname=enca -pkgver=1.9 -pkgrel=4 +pkgver=1.13 +pkgrel=1 pkgdesc="Charset analyser and converter" -arch=(i686 x86_64) -url="http://trific.ath.cx/software/enca" +arch=('i686' 'x86_64') +url="http://freshmeat.net/projects/enca/" options=('!libtool') -license=("GPL") -depends=() -source=(http://archlinux-stuff.googlecode.com/files/enca-$pkgver.tar.bz2) -md5sums=('b3581e28d68d452286fb0bfe58bed3b3') +license=('GPL') +depends=('recode' 'sh') +source=(http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('762bead5d9a0a5e55024e1102baaa89d') build() { - cd $startdir/src/enca-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/enca + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --with-librecode=/usr \ + --enable-external make || return 1 - make DESTDIR=$startdir/pkg install + make DESTDIR="${pkgdir}" install || return 1 } - -- cgit v0.12 From 6b21c39ac1b2ba54d4e5949d6cdd8f53f1bad4eb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 15:31:09 -0500 Subject: sysstat: Bump to latest. --- abs/extra/sysstat/PKGBUILD | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/abs/extra/sysstat/PKGBUILD b/abs/extra/sysstat/PKGBUILD index 12f5afe..07c36c2 100644 --- a/abs/extra/sysstat/PKGBUILD +++ b/abs/extra/sysstat/PKGBUILD @@ -1,35 +1,38 @@ -# $Id: PKGBUILD,v 1.24 2009/05/25 09:04:21 sergej Exp $ +# $Id$ # Maintainer: Sergej Pupykin # Contributor: Martin Devera pkgname=sysstat -pkgver=9.0.3 +pkgver=10.0.1 pkgrel=1 -pkgdesc="A collection of performance monitoring tools" +pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64') url="http://pagesperso-orange.fr/sebastien.godard/" license=('GPL') -depends=(glibc) +depends=('lm_sensors') +optdepends=('tk: to use isag' + 'gnuplot: to use isag') options=(zipman) source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat) -md5sums=('0b464951596db934418259737cf50a31' +md5sums=('a8b12230452dc0e0b6cae5fd5ec3c579' 'ad46159609a2c13b4a46b506ff847bf6') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-install-isag \ + --mandir=/usr/share/man \ + --enable-install-isag \ --disable-man-group - make || return 1 - make DESTDIR=$pkgdir install || return 1 - - install -D -m 644 sysstat.sysconfig $pkgdir/etc/sysstat/sysstat && \ - install -D -m 744 sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat && \ - install -D -m 744 sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat && \ - install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat || return 1 + make +} +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -D -m 644 sysstat.sysconfig $pkgdir/etc/sysstat/sysstat + install -D -m 744 cron/sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat + install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat + install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat chown -R root:root $pkgdir } -- cgit v0.12 From 742d4dd32ba3970447f7a67ee9abeab07ea8bf01 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Fri, 5 Aug 2011 23:17:00 +0000 Subject: boost: update to 1.47 --- abs/extra/boost/PKGBUILD | 11 +++++------ abs/extra/boost/__changelog | 3 +++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 abs/extra/boost/__changelog diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD index 9c78494..37bb2de 100644 --- a/abs/extra/boost/PKGBUILD +++ b/abs/extra/boost/PKGBUILD @@ -11,18 +11,17 @@ _boostver=${pkgver//./_} pkgrel=1 arch=('i686' 'x86_64') url="http://www.boost.org/" -makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) license=('custom') -md5sums=('ff180a5276bec773a7625cac7e2288e8') _stagedir="${srcdir}/stagedir" build() { # set python path for bjam cd "${srcdir}/${pkgbase}_${_boostver}/tools" - echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam - echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam + echo "using 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 @@ -74,8 +73,7 @@ build() { package_boost() { pkgdesc="Free peer-reviewed portable C++ source libraries - Development" depends=("boost-libs=${pkgver}") - optdepends=('python: for python bindings' - 'python2: for python2 bindings') + optdepends=('python2: for python2 bindings') install -d "${pkgdir}"/usr/{include,lib,share} # headers/source files @@ -108,3 +106,4 @@ package_boost-libs() { install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt } +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 -- cgit v0.12 From 9cc464bde03a97d6cbea14420b1b2ee32ca3ca00 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Sat, 6 Aug 2011 01:01:01 +0000 Subject: xfce4 related pkg cleanup --- .../perl_modules/perl-extutils-depends/PKGBUILD | 31 ------------------ .../perl_modules/perl-extutils-pkgconfig/PKGBUILD | 30 ------------------ abs/extra/libwnck/PKGBUILD | 25 --------------- abs/extra/libxfce4util/PKGBUILD | 28 ---------------- abs/extra/libxfcegui4/PKGBUILD | 28 ---------------- abs/extra/libxfcegui4/libxfcegui4.install | 12 ------- abs/extra/thunar/PKGBUILD | 37 ---------------------- abs/extra/thunar/__changelog | 1 - abs/extra/thunar/thunar.install | 14 -------- abs/extra/xfce4-panel/PKGBUILD | 30 ------------------ abs/extra/xfce4-panel/xfce4-panel.install | 11 ------- 11 files changed, 247 deletions(-) delete mode 100644 abs/core/perl_modules/perl-extutils-depends/PKGBUILD delete mode 100644 abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD delete mode 100644 abs/extra/libwnck/PKGBUILD delete mode 100644 abs/extra/libxfce4util/PKGBUILD delete mode 100644 abs/extra/libxfcegui4/PKGBUILD delete mode 100644 abs/extra/libxfcegui4/libxfcegui4.install delete mode 100644 abs/extra/thunar/PKGBUILD delete mode 100644 abs/extra/thunar/__changelog delete mode 100644 abs/extra/thunar/thunar.install delete mode 100644 abs/extra/xfce4-panel/PKGBUILD delete mode 100644 abs/extra/xfce4-panel/xfce4-panel.install 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 -# Contributor: Sarah Hay -# Contributor: Arjan Timmerman - -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 -# Contributor: Sarah Hay -# Contributor: Arjan Timmerman - -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/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 -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 -# Contributor: tobias - -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 - -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/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 -# Contributor: Andrew Simmons - -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/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 -# Contributor: tobias - -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 -} -- cgit v0.12 From bcfb3dc1bd231f91914f917149164d41a2f3ce0a Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 5 Aug 2011 20:13:44 -0500 Subject: mkinitcpio: add usb disk & nfs support. refs #758 refs #763 closes #763 --- abs/core/mkinitcpio/PKGBUILD | 11 +++++++---- abs/core/mkinitcpio/__changelog | 5 +++++ abs/core/mkinitcpio/mkinitcpio.conf.patch | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 abs/core/mkinitcpio/__changelog create mode 100644 abs/core/mkinitcpio/mkinitcpio.conf.patch diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD index c5b823d..01645d0 100644 --- a/abs/core/mkinitcpio/PKGBUILD +++ b/abs/core/mkinitcpio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131019 2011-07-09 14:04:52Z thomas $ # Maintainer: Thomas Bächler + pkgname=mkinitcpio pkgver=0.7.2 -pkgrel=1 +pkgrel=5 pkgdesc="Modular initramfs image creation utility" arch=(any) url="http://www.archlinux.org/" @@ -17,11 +17,14 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd' 'klibc-module-init-tools' 'klibc-udev') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz mkinitcpio.conf.patch) backup=(etc/mkinitcpio.conf) -sha256sums=('b7282c78ef3144f5547a4012f334b0beb575b7108a5f6a006289a1e78aa9823d') package() { cd $srcdir/${pkgname}-${pkgver} + patch -p0 < $srcdir/mkinitcpio.conf.patch make DESTDIR="${pkgdir}" install } + +md5sums=('e11670a7d4802b2ef20cab4b3815168a' + 'b697144048288424b2380d044103ec34') diff --git a/abs/core/mkinitcpio/__changelog b/abs/core/mkinitcpio/__changelog new file mode 100644 index 0000000..89a1a22 --- /dev/null +++ b/abs/core/mkinitcpio/__changelog @@ -0,0 +1,5 @@ +added "usb" and net to the modules line in mkinitcpio.conf ++HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput" + +MODULES="nfs" + diff --git a/abs/core/mkinitcpio/mkinitcpio.conf.patch b/abs/core/mkinitcpio/mkinitcpio.conf.patch new file mode 100644 index 0000000..68ab648 --- /dev/null +++ b/abs/core/mkinitcpio/mkinitcpio.conf.patch @@ -0,0 +1,20 @@ +--- mkinitcpio.conf.orig 2011-08-06 00:04:15.991131194 +0000 ++++ mkinitcpio.conf 2011-08-06 00:04:02.791130644 +0000 +@@ -4,7 +4,7 @@ + # run. Advanced users may wish to specify all system modules + # in this array. For instance: + # MODULES="piix ide_disk reiserfs" +-MODULES="" ++MODULES="nfs" + + # BINARIES + # This setting includes any additional binaries a given user may +@@ -54,7 +54,7 @@ + # + ## This setup loads an lvm2 volume group on a usb device. + # HOOKS="base udev usb lvm2 filesystems" +-HOOKS="base udev autodetect pata scsi sata filesystems usbinput" ++HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput " + + # COMPRESSION + # Use this to compress the initramfs image. With kernels earlier than -- cgit v0.12 From ba2331b07d1becfbed66e0bca81536ef7fee4759 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 20:54:02 -0500 Subject: qt: Bump to latest. refs #647 --- abs/core/qt/PKGBUILD | 91 ++++++++++++++-------- abs/core/qt/__changelog | 3 - abs/core/qt/assistant.desktop | 7 +- abs/core/qt/designer.desktop | 8 +- abs/core/qt/fix-multisampling-with-ati-card.patch | 25 ------ .../qt/fix-scroll-when-last-item-is-removed.patch | 38 --------- abs/core/qt/linguist.desktop | 11 +-- abs/core/qt/qt.install | 1 + abs/core/qt/qtconfig.desktop | 2 + 9 files changed, 75 insertions(+), 111 deletions(-) delete mode 100644 abs/core/qt/fix-multisampling-with-ati-card.patch delete mode 100644 abs/core/qt/fix-scroll-when-last-item-is-removed.patch diff --git a/abs/core/qt/PKGBUILD b/abs/core/qt/PKGBUILD index e1ee827..9c2d93f 100644 --- a/abs/core/qt/PKGBUILD +++ b/abs/core/qt/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 94734 2010-10-10 14:30:15Z andrea $ +# $Id$ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz -pkgname=qt -pkgver=4.7.0 -pkgrel=4 -pkgdesc='A cross-platform application and UI framework' +pkgbase=qt +pkgname=('qt' 'qt-private-headers') +pkgver=4.7.3 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') -depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme') -optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' - 'unixodbc: ODBC driver' - 'libxinerama: Xinerama support' - 'libxcursor: Xcursor support' - 'libxfixes: Xfixes support') -makedepends=('mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'gtk2') -install="${pkgname}.install" +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' + 'mysql' 'unixodbc' 'gtk2') options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" - 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'fix-scroll-when-last-item-is-removed.patch' - 'fix-multisampling-with-ati-card.patch') + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop' + 'qtbug-16292.patch') +md5sums=('49b96eefb1224cc529af6fe5608654fe' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd' + 'dc7ed8c2e8c68a175f7f05a34dccc937') build() { unset QMAKESPEC @@ -33,17 +32,19 @@ build() { export PATH=${QT4DIR}/bin:${PATH} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - cd $srcdir/$_pkgfqn + # FS#24601 + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" - # Already fixed in 4.7.1 - patch -Np1 -i ${srcdir}/fix-scroll-when-last-item-is-removed.patch - patch -Np1 -i ${srcdir}/fix-multisampling-with-ati-card.patch + cd $srcdir/$_pkgfqn - sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf + # Already fixed upstream + patch -p1 -i "${srcdir}"/qtbug-16292.patch + + sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf - ./configure -v -confirm-license -opensource \ + ./configure -confirm-license -opensource \ -prefix /usr \ -docdir /usr/share/doc/qt \ -plugindir /usr/lib/qt/plugins \ @@ -86,8 +87,20 @@ build() { make } -package() { - cd $srcdir/$_pkgfqn +package_qt() { + pkgdesc='A cross-platform application and UI framework' + depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') + install='qt.install' + + cd $srcdir/$_pkgfqn make INSTALL_ROOT=$pkgdir install # install missing icons and desktop files @@ -111,10 +124,20 @@ package() { find ${pkgdir}/usr/lib -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; } -md5sums=('3a2f25b9b115037277f4fb759194a7a5' - 'a445c6917086d80f1cfc1e40cb6b0132' - 'd457f0a0ad68a3861c3cadefe3b42ded' - '668331d9798a0e2b94381efb7be4c513' - 'c29f2993d6a0f73d756d2fa36e130e1c' - 'ef20c34afc5be5ed62f2935be66d9402' - 'b2e0f134bbb848ebef41134a45a36ee9') + +package_qt-private-headers(){ + pkgdesc="Qt private headers for development" + depends=("qt=${pkgver}") + + install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script} + + for i in QtCore QtDeclarative QtGui QtScript; do + cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \ + ${pkgdir}/usr/include/${i}/ + done + + for i in corelib declarative gui script; do + cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/ + done +} diff --git a/abs/core/qt/__changelog b/abs/core/qt/__changelog index d92474d..2abf977 100644 --- a/abs/core/qt/__changelog +++ b/abs/core/qt/__changelog @@ -1,4 +1 @@ remove cups support -added QtWebKit_Flash.patch to fix crash with Flash 10.1 and webkit browsers like mythbrowser. http://trac.webkit.org/changeset/61307 This shouldn't be needed in qt versions 4.6.4 or later. - -upgrade to 4.7.0 diff --git a/abs/core/qt/assistant.desktop b/abs/core/qt/assistant.desktop index 1b9f0a7..a9e98c4 100644 --- a/abs/core/qt/assistant.desktop +++ b/abs/core/qt/assistant.desktop @@ -1,8 +1,9 @@ [Desktop Entry] -Exec=/usr/bin/assistant Name=Qt Assistant -GenericName=Qt Document Browser +Comment=Shows Qt documentation and examples +Exec=/usr/bin/assistant Icon=assistant Terminal=false +Encoding=UTF-8 Type=Application -Categories=Qt;Development;Documentation +Categories=Qt;Development;Documentation; diff --git a/abs/core/qt/designer.desktop b/abs/core/qt/designer.desktop index 8f36273..9b7b6e9 100644 --- a/abs/core/qt/designer.desktop +++ b/abs/core/qt/designer.desktop @@ -1,9 +1,11 @@ [Desktop Entry] -Exec=/usr/bin/designer Name=Qt Designer GenericName=Interface Designer -MimeType=application/x-designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer Icon=designer +MimeType=application/x-designer; Terminal=false +Encoding=UTF-8 Type=Application -Categories=Qt;Development;GUIDesigner +Categories=Qt;Development; diff --git a/abs/core/qt/fix-multisampling-with-ati-card.patch b/abs/core/qt/fix-multisampling-with-ati-card.patch deleted file mode 100644 index c215c2c..0000000 --- a/abs/core/qt/fix-multisampling-with-ati-card.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Wed, 25 Aug 2010 14:07:40 +1000 -Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers - ---- - src/opengl/qgl_win.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp -index 5ab944a..8eb6177 100644 ---- a/src/opengl/qgl_win.cpp -+++ b/src/opengl/qgl_win.cpp -@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc) - iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB; - iAttributes[i++] = TRUE; - iAttributes[i++] = WGL_COLOR_BITS_ARB; -- iAttributes[i++] = 32; -+ iAttributes[i++] = 24; - iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB; - iAttributes[i++] = d->glFormat.doubleBuffer(); - if (d->glFormat.stereo()) { --- -1.7.2.1 - diff --git a/abs/core/qt/fix-scroll-when-last-item-is-removed.patch b/abs/core/qt/fix-scroll-when-last-item-is-removed.patch deleted file mode 100644 index 8656702..0000000 --- a/abs/core/qt/fix-scroll-when-last-item-is-removed.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 -From: Frank Reininghaus -Date: Wed, 22 Sep 2010 10:19:59 +0200 -Subject: [PATCH] QTreeView: do not scroll to top if last item is removed - -When the last item is the current item and is removed, -QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's -viewItems member is cleared. This commit makes sure that viewItems is -restored by calling QTreeView::doItemsLayout() in this case, preventing -that the scroll bar range is set to zero temporarily and the view is -scrolled to the top unexpectedly (this was a regression in 4.7.0: -QTBUG-13567). - -Merge-request: 2481 -Reviewed-by: Olivier Goffart ---- - src/gui/itemviews/qtreeview.cpp | 4 ++++ - tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index b797776..40b51fe 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() - if (!viewportSize.isValid()) - viewportSize = QSize(0, 0); - -+ if (viewItems.isEmpty()) { -+ q->doItemsLayout(); -+ } -+ - int itemsInViewport = 0; - if (uniformRowHeights) { - if (defaultItemHeight <= 0) --- -1.6.1 - diff --git a/abs/core/qt/linguist.desktop b/abs/core/qt/linguist.desktop index 94e92c1..8cbe865 100644 --- a/abs/core/qt/linguist.desktop +++ b/abs/core/qt/linguist.desktop @@ -1,9 +1,10 @@ [Desktop Entry] -Exec=/usr/bin/linguist Name=Qt Linguist -GenericName=Translation Tool -MimeType=application/x-linguist +Comment=Add translations to Qt applications +Exec=/usr/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false +Encoding=UTF-8 Type=Application -Icon=linguist -Categories=Qt;Development;Translation +Categories=Qt;Development; diff --git a/abs/core/qt/qt.install b/abs/core/qt/qt.install index e70c054..81ce5c4 100644 --- a/abs/core/qt/qt.install +++ b/abs/core/qt/qt.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/abs/core/qt/qtconfig.desktop b/abs/core/qt/qtconfig.desktop index 7c221e5..46dcf9e 100644 --- a/abs/core/qt/qtconfig.desktop +++ b/abs/core/qt/qtconfig.desktop @@ -4,5 +4,7 @@ Comment=Configure Qt behavior, styles, fonts Exec=/usr/bin/qtconfig Icon=qtlogo Terminal=false +Encoding=UTF-8 Type=Application Categories=Qt;Settings; +NoDisplay=true -- cgit v0.12 From 9632d9914981c369d0bdc1e486f108f229db7410 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 5 Aug 2011 21:11:43 -0500 Subject: mkinitcpio: added mkinitcpio-nfs-utils to depends line --- abs/core/mkinitcpio/PKGBUILD | 4 ++-- abs/core/mkinitcpio/__changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD index 01645d0..66f4cae 100644 --- a/abs/core/mkinitcpio/PKGBUILD +++ b/abs/core/mkinitcpio/PKGBUILD @@ -3,12 +3,12 @@ pkgname=mkinitcpio pkgver=0.7.2 -pkgrel=5 +pkgrel=6 pkgdesc="Modular initramfs image creation utility" arch=(any) url="http://www.archlinux.org/" license=('GPL') -depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' +depends=('mkinitcpio-busybox>=1.16.1-2' 'mkinitcpio-nfs-utils' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2009.01-2' 'udev>=171-2' 'file' 'gzip' 'which') optdepends=('xz: Use lzma or xz compression for the initramfs image' diff --git a/abs/core/mkinitcpio/__changelog b/abs/core/mkinitcpio/__changelog index 89a1a22..c8dbb63 100644 --- a/abs/core/mkinitcpio/__changelog +++ b/abs/core/mkinitcpio/__changelog @@ -3,3 +3,4 @@ added "usb" and net to the modules line in mkinitcpio.conf MODULES="nfs" +added depends: mkinitcpio-nfs-utils -- cgit v0.12 From 1cd2a5f6b60f85be880bb56d4a61351dc62bb06f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:43:04 -0500 Subject: smplayer: Bump to latest. --- abs/extra/community/smplayer/ChangeLog | 12 ++++++++++++ abs/extra/community/smplayer/PKGBUILD | 29 +++++++++++++++++------------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/abs/extra/community/smplayer/ChangeLog b/abs/extra/community/smplayer/ChangeLog index a40f9a4..e8397b3 100644 --- a/abs/extra/community/smplayer/ChangeLog +++ b/abs/extra/community/smplayer/ChangeLog @@ -1,3 +1,15 @@ +2010-02-23 Ionut Biru + * smplayer 0.6.9-2 + * changed exec argument from %U to %F in smplayer.desktop + +2010-02-22 Ionut Biru + * smplayer 0.6.9-1 + * Upstream update + +2009-07-25 Allan McRae + * smplayer 0.6.8-1 + * Upstream update + 2009-03-13 Allan McRae * smplayer 0.6.7-1 * Upstream update diff --git a/abs/extra/community/smplayer/PKGBUILD b/abs/extra/community/smplayer/PKGBUILD index 3aa1d3d..0928e4b 100644 --- a/abs/extra/community/smplayer/PKGBUILD +++ b/abs/extra/community/smplayer/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 29947 2009-03-14 00:58:48Z allan $ -# Maintainer: Allan McRae +# $Id$ +# Maintainer : Ionut Biru +# Contributor: Allan McRae # Contributor: Alessio 'mOLOk' Bolognino # Contributor: shamrok - + pkgname=smplayer -pkgver=0.6.7 -pkgrel=2 -pkgdesc="A complete front-end for MPlayer" +pkgver=0.6.9 +pkgrel=3 +pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64') -url="http://smplayer.sourceforge.net/" +url="http://smplayer.sourceforge.net/" license=('GPL') -depends=('qt' 'mplayer') +depends=('qt>=4.7.1' 'mplayer') source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2) -md5sums=('306b99374ad89cee93f1ad6fa94dea71') +md5sums=('dfe874b386509de5df78537489f95004') -build() { +build() { cd ${srcdir}/${pkgname}-${pkgver} # remove broken translation sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro - make PREFIX=/usr || return 1 - make PREFIX=${pkgdir}/usr install || return 1 + make PREFIX=/usr + make PREFIX=${pkgdir}/usr install install -dm755 ${pkgdir}/usr/share/pixmaps ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \ ${pkgdir}/usr/share/pixmaps/ + + sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop + sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' \ + ${pkgdir}/usr/share/applications/smplayer_enqueue.desktop } -- cgit v0.12 From ad2f28b7bca8b2664f47284739e95af7a47882fc Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:48:18 -0500 Subject: zvbi: Bump to latest. --- abs/extra/community/zvbi/PKGBUILD | 30 +++++++++++++----------- abs/extra/community/zvbi/fix-includes.patch | 36 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 abs/extra/community/zvbi/fix-includes.patch diff --git a/abs/extra/community/zvbi/PKGBUILD b/abs/extra/community/zvbi/PKGBUILD index f638f29..9bc150c 100644 --- a/abs/extra/community/zvbi/PKGBUILD +++ b/abs/extra/community/zvbi/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck +# $Id$ +# Maintainer: +# Contributor: Alexander Baldeck # Contributor: dorphell pkgname=zvbi -pkgver=0.2.26 -pkgrel=1 -pkgdesc="zvbi is needed for zapping" +pkgver=0.2.33 +pkgrel=3 +pkgdesc="VBI capture and decoding library" +url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" arch=(i686 x86_64) -depends=('libpng') +depends=('libpng' 'libx11') license=('GPL') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/zapping/$pkgname-$pkgver.tar.bz2) -url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" +source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2 + fix-includes.patch) +md5sums=('1741a6045c3eedfb611d645f2da69ac8' + '38766bc59e1571133d0399f0102da653') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make prefix=$startdir/pkg/usr install + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-includes.patch" + ./configure --prefix=/usr --disable-static --mandir=/usr/share/man + make + make DESTDIR="${pkgdir}" install } -md5sums=('82805319ca61f6ffd7b7bb64d7433448') diff --git a/abs/extra/community/zvbi/fix-includes.patch b/abs/extra/community/zvbi/fix-includes.patch new file mode 100644 index 0000000..2825264 --- /dev/null +++ b/abs/extra/community/zvbi/fix-includes.patch @@ -0,0 +1,36 @@ +Add proper #includes so that we do not get undef errors to S_ISCHR +during linking. + +Signed-off-by: Alex Chiang +--- +--- zvbi-0.2.33.orig/src/io-dvb.c ++++ zvbi-0.2.33/src/io-dvb.c +@@ -29,6 +29,8 @@ + #include + #include + #include ++#include ++#include + + #ifndef HAVE_S64_U64 + /* Linux 2.6.x asm/types.h defines __s64 and __u64 only +--- zvbi-0.2.33.orig/src/io-v4l.c ++++ zvbi-0.2.33/src/io-v4l.c +@@ -42,6 +42,7 @@ static const char rcsid [] = + #include + #include /* timeval */ + #include /* fd_set, uid_t */ ++#include /* S_ISCHR */ + #include /* for (_)videodev.h */ + #include + +--- zvbi-0.2.33.orig/contrib/ntsc-cc.c ++++ zvbi-0.2.33/contrib/ntsc-cc.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #ifdef HAVE_GETOPT_LONG + # include -- cgit v0.12 From f7a2bfb73c6ce06100f4d0934739168288224dae Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:52:07 -0500 Subject: libart-lgpl: Bump to latest. --- abs/core/libart-lgpl/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/libart-lgpl/PKGBUILD b/abs/core/libart-lgpl/PKGBUILD index f56c0b3..92d659f 100644 --- a/abs/core/libart-lgpl/PKGBUILD +++ b/abs/core/libart-lgpl/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: Jan de Groot pkgname=libart-lgpl -pkgver=2.3.20 +pkgver=2.3.21 pkgrel=1 pkgdesc="A library for high-performance 2D graphics" url="http://www.levien.com/libart/" @@ -9,8 +9,8 @@ arch=(i686 x86_64) license=('LGPL') depends=('glibc') source=(http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${pkgver}.tar.bz2) -md5sums=('d0ce67f2ebcef1e51a83136c69242a73') options=('!libtool') +sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa') build() { cd ${startdir}/src/libart_lgpl-${pkgver} -- cgit v0.12 From c617d53e582f72632481607391100049553eb9b6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:53:55 -0500 Subject: libxi: Bump to latest. --- abs/core/libxi/PKGBUILD | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/abs/core/libxi/PKGBUILD b/abs/core/libxi/PKGBUILD index 6abbf85..42fabdc 100644 --- a/abs/core/libxi/PKGBUILD +++ b/abs/core/libxi/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 57676 2009-11-01 14:14:29Z jgc $ +# $Id$ # Maintainer: Jan de Groot pkgname=libxi -pkgver=1.3 -pkgrel=2 +pkgver=1.4.3 +pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org" -depends=('libxext>=1.1' 'inputproto>=2.0') -makedepends=('pkgconfig') -options=(!libtool force) +depends=('libxext' 'inputproto') +makedepends=('pkgconfig' 'xorg-util-macros') +options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -md5sums=('8df4ece9bd1efb02c28acb2b6f485e09') +sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b') build() { cd "${srcdir}/libXi-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make +} + +package() { + cd "${srcdir}/libXi-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -- cgit v0.12 From 0e32f8fd433f06daab293116512e20d76fa4a5f7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:58:54 -0500 Subject: libdrm: Bump to latest. --- abs/core/libdrm/PKGBUILD | 10 +++++----- abs/core/libdrm/no-pthread-stubs.patch | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD index b93c2dd..aa350d5 100644 --- a/abs/core/libdrm/PKGBUILD +++ b/abs/core/libdrm/PKGBUILD @@ -2,20 +2,20 @@ # Maintainer: Jan de Groot pkgname=libdrm -pkgver=2.4.25 +pkgver=2.4.26 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) license=('custom') -depends=('glibc') +depends=('glibc' 'libpciaccess') options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING) -sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194' - 'af2d9871565ea4cf524873f897691a18b2bba944' - 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') +md5sums=('062569426773f69b11a47a7712bba770' + 'c722c8406507b7e3a8da7a3030d1d9cf' + 'ba65e71c481b94ef0fb6c23c7f21ffa1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/abs/core/libdrm/no-pthread-stubs.patch b/abs/core/libdrm/no-pthread-stubs.patch index 6602f87..348c2a7 100644 --- a/abs/core/libdrm/no-pthread-stubs.patch +++ b/abs/core/libdrm/no-pthread-stubs.patch @@ -1,34 +1,35 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac --- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 +++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE +@@ -47,10 +47,6 @@ + LT_INIT([disable-static]) + -PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) -AC_SUBST(PTHREADSTUBS_CFLAGS) -AC_SUBST(PTHREADSTUBS_LIBS) - - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) + AC_SUBST(PCIACCESS_CFLAGS) + AC_SUBST(PCIACCESS_LIBS) --- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,13 +26,12 @@ +@@ -26,14 +26,13 @@ $(WARN_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/intel \ - $(PTHREADSTUBS_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ -+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@ +-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ ++libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ libdrm_intel_la_SOURCES = \ - intel_atomic.h \ + intel_bufmgr.c \ --- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 @@ -26,13 +26,12 @@ -- cgit v0.12 From e7d2326eb2251c13ada5812e2f0e213d75bac884 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 22:01:03 -0500 Subject: apr-util: Bump to latest. --- abs/core/apr-util/PKGBUILD | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/abs/core/apr-util/PKGBUILD b/abs/core/apr-util/PKGBUILD index b44720c..0af3cc8 100644 --- a/abs/core/apr-util/PKGBUILD +++ b/abs/core/apr-util/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 72241 2010-03-13 20:27:07Z jgc $ +# $Id$ # Maintainer: Jan de Groot # Maintainer: Pierre Schmitz pkgname=apr-util -pkgver=1.3.9 -pkgrel=4 +pkgver=1.3.12 +pkgrel=2 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" -depends=('apr>=1.4.2' 'gdbm' 'expat' 'db>=4.8' 'libldap' 'unixodbc') +depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('29dd557f7bd891fc2bfdffcfa081db59') +md5sums=('0f671b037ca62751a8a7005578085560') build() { - cd "${srcdir}/apr-util-${pkgver}" + cd "${srcdir}/apr-util-${pkgver}" + ./configure --prefix=/usr --with-apr=/usr \ + --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ + --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap + make +} - ./configure --prefix=/usr --with-apr=/usr \ - --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ - --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 +package() { + cd "${srcdir}/apr-util-${pkgver}" + make DESTDIR="${pkgdir}" install } -- cgit v0.12 From 3c4ac9c70b9d9c27327efd580d54e9738b79a108 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 22:09:46 -0500 Subject: dcraw: Bump to latest. --- abs/extra/dcraw/PKGBUILD | 53 ++++++++++++++++++++++++------------------- abs/extra/dcraw/dcraw.install | 6 +---- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/abs/extra/dcraw/PKGBUILD b/abs/extra/dcraw/PKGBUILD index 8468c92..8ae9657 100644 --- a/abs/extra/dcraw/PKGBUILD +++ b/abs/extra/dcraw/PKGBUILD @@ -1,41 +1,48 @@ -# $Id: PKGBUILD 84664 2010-07-03 05:41:46Z allan $ +# $Id$ # Maintainer: tobias # Contributor: Tobias Kieslich -# Note for rebuilders: -# dcraw.c is released as pure C file, not as a package with a changing version -# number in the name. The name of the file to be downloaded is always the same! -# So if you are a bad boy (Santa knows everything!) and build as root, this file -# will be saved in /var/cache/pacman/src . Therefore, rebuilding a later version -# likely will fail due to an MD5 error. If so, delete the files from the cache -# to force a new download. - pkgname=dcraw -pkgver=1.438 +pkgver=9.08 pkgrel=1 pkgdesc="A command line based converter for digicams raw output" arch=('i686' 'x86_64') url="http://www.cybercom.net/~dcoffin/dcraw/" license=('custom') depends=('lcms') -source=(http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.c - http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.1 +source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz license.txt) +md5sums=('eb1d365c27495a513c0768b2f696ba66' + '110b4604a6dacd5537339c4082e9e12a') +sha1sums=('1282402201ca48f922d9167ad078aa58cb18593e' + '502c8f0ac7434d48f5dcb2eefe7599627cb69454') build() { - cd "${srcdir}" - gcc -o dcraw ${CFLAGS} dcraw.c -lm -ljpeg -llcms + cd "${srcdir}/${pkgname}" + gcc ${CFLAGS} -O3 -o dcraw dcraw.c -lm -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\" } package() { - cd "${srcdir}" - install -Dm755 ${pkgname} "${pkgdir}"/usr/bin/${pkgname} - - # install a manpage, provided separately on authors homepage - install -Dm644 ${pkgname}.1 "${pkgdir}"/usr/share/man/man1/${pkgname}.1 + cd "${srcdir}/${pkgname}" + install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw + install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1 - install -Dm644 license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt + for langchar in \ + fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \ + ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \ + zh_TW.big5 zh_CN.gb2312 + do + lang=$(echo $langchar | cut -d. -f1) + char=$(echo $langchar | cut -d. -f2-) + if [ -f dcraw_${lang}.1 ]; then + mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1 + iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1 + mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1 + cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1 + fi + mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES + msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po + done + + install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } -md5sums=('108f0c14a5be4d092c7ffa8460044fb3' - '6ba2a797c4ad698589f83171d6b36396' - '110b4604a6dacd5537339c4082e9e12a') diff --git a/abs/extra/dcraw/dcraw.install b/abs/extra/dcraw/dcraw.install index 0b3d1bf..2635964 100644 --- a/abs/extra/dcraw/dcraw.install +++ b/abs/extra/dcraw/dcraw.install @@ -1,7 +1,7 @@ post_install() { cat << EOF -NOTE for drcaw: +NOTE for dcraw: ---- ==> dcraw provides the simple commandline tools for raw conversion. If you ==> are looking for a more sophisticated way consider gimp-ufraw, which @@ -11,7 +11,3 @@ NOTE for drcaw: EOF } - -post_upgrade() { - post_install $1 -} -- cgit v0.12 From 5b37c394102e30e4751fd925dae8c299bc4432df Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 22:16:13 -0500 Subject: vsftpd: Bump to latest. --- abs/extra/community/vsftpd/PKGBUILD | 62 +++++++++------------ abs/extra/community/vsftpd/__changelog | 1 + abs/extra/community/vsftpd/vsftpd.d | 93 ++++++++++++++++++++----------- abs/extra/community/vsftpd/vsftpd.install | 5 -- 4 files changed, 88 insertions(+), 73 deletions(-) create mode 100644 abs/extra/community/vsftpd/__changelog diff --git a/abs/extra/community/vsftpd/PKGBUILD b/abs/extra/community/vsftpd/PKGBUILD index 32a4007..78ba1c5 100644 --- a/abs/extra/community/vsftpd/PKGBUILD +++ b/abs/extra/community/vsftpd/PKGBUILD @@ -1,52 +1,44 @@ -# $Id: PKGBUILD 29700 2009-03-11 22:18:56Z hugo $ +# $Id$ # Maintainer: Andreas Radke # Contributor: judd pkgname=vsftpd -pkgver=2.1.0 -pkgrel=4 +pkgver=2.3.4 +pkgrel=2 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64') -license=('GPL') -backup=(etc/vsftpd.conf etc/xinetd.d/vsftpd) -url="http://vsftpd.beasts.org/" -#makedepends=('vim') -depends=('glibc' 'pam' 'tcp_wrappers>=7.6-8' 'openssl>=0.9.8j-1' 'libcap>=2.16') +url="https://security.appspot.com/vsftpd.html" +license=('GPL2') +depends=('openssl') +backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') install=vsftpd.install -source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \ - vsftpd.xinetd vsftpd.d run) -md5sums=('7890b54e7ffa6106ffbdfda53f47fa41' - 'b07fd4609c70063c1d6b20142910c1a6' - 'e46ed8e4c4a6e6a3de59f60b98e4f569' - '8abbed7cc75f9a9d2944e0e83c8dd90d') +source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz" + 'vsftpd.xinetd' 'vsftpd.d' 'run') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # build-time config sed \ - -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \ -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ -i builddefs.h - make CFLAGS="${CFLAGS}" || return 1 - install -D -m755 vsftpd ${pkgdir}/usr/sbin/vsftpd || return 1 - install -D -m644 vsftpd.conf ${pkgdir}/etc/vsftpd.conf || return 1 - install -D -m644 vsftpd.8 ${pkgdir}/usr/share/man/man8/vsftpd.8 || return 1 - install -D -m644 vsftpd.conf.5 ${pkgdir}/usr/share/man/man5/vsftpd.conf.5 || return 1 - install -D -m644 ../vsftpd.xinetd ${pkgdir}/etc/xinetd.d/vsftpd || return 1 - install -D -m755 ../vsftpd.d ${pkgdir}/etc/rc.d/vsftpd || return 1 - mkdir -p $startdir/pkg/usr/share/empty -# ex ${pkgdir}/etc/vsftpd.conf <<_EOF -#2 -#i -## -## Use this to use vsftpd in standalone mode, otherwise it runs through (x)inetd -##listen=YES -#. -#w -#q -#_EOF -#} # Below added for LinHES mkdir -p $startdir/pkg/etc/sv/vsftpd/supervise install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/vsftpd/ + make CFLAGS="${CFLAGS}" } + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd" + install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf" + install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8" + install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5" + install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd" + install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd" + + install -d -m755 "${pkgdir}/usr/share/empty" +} +md5sums=('2ea5d19978710527bb7444d93b67767a' + 'b07fd4609c70063c1d6b20142910c1a6' + '60060a6c7db3b3b7baa1561a302e6923' + '8abbed7cc75f9a9d2944e0e83c8dd90d') diff --git a/abs/extra/community/vsftpd/__changelog b/abs/extra/community/vsftpd/__changelog new file mode 100644 index 0000000..82615f6 --- /dev/null +++ b/abs/extra/community/vsftpd/__changelog @@ -0,0 +1 @@ +-Add back run file and modify PKGBUILD to install run diff --git a/abs/extra/community/vsftpd/vsftpd.d b/abs/extra/community/vsftpd/vsftpd.d index b43a6d0..2731085 100644 --- a/abs/extra/community/vsftpd/vsftpd.d +++ b/abs/extra/community/vsftpd/vsftpd.d @@ -1,40 +1,67 @@ #!/bin/bash +daemon_name=vsftpd + . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/vsftpd` +get_pid() { + pidof -o %PPID $daemon_name +} + case "$1" in - start) - stat_busy "Starting vsftpd FTP Daemon" - if [ -z "$PID" ]; then - /usr/sbin/vsftpd & - PID=`pidof -o %PPID /usr/sbin/vsftpd` - if [ -z $PID ]; then - stat_fail - else - add_daemon vsftpd - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping vsftpd FTP Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon vsftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name & + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" esac + +exit 0 diff --git a/abs/extra/community/vsftpd/vsftpd.install b/abs/extra/community/vsftpd/vsftpd.install index 3bbb2cc..48f134e 100644 --- a/abs/extra/community/vsftpd/vsftpd.install +++ b/abs/extra/community/vsftpd/vsftpd.install @@ -9,14 +9,9 @@ post_install() { echo ">>> Also, you should add it to your MODULES array in rc.conf, so" echo ">>> it will be activated automatically at boot-up." fi -# Below added for LinHES - add_service.sh vsftpd } post_upgrade() { post_install $1 } -post_remove() { - remove_service.sh vsftpd -} -- cgit v0.12 From d55995f590d34a5db2a9671750b6bfbc79544652 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 23:59:46 -0500 Subject: sdl_image: Bump to latest. --- abs/extra/sdl_image/PKGBUILD | 27 +++++++++------------ abs/extra/sdl_image/SDL_image-IMG_lbm.patch | 28 ---------------------- .../sdl_image/SDL_image-buffer-overflow.patch | 13 ---------- 3 files changed, 11 insertions(+), 57 deletions(-) delete mode 100644 abs/extra/sdl_image/SDL_image-IMG_lbm.patch delete mode 100644 abs/extra/sdl_image/SDL_image-buffer-overflow.patch diff --git a/abs/extra/sdl_image/PKGBUILD b/abs/extra/sdl_image/PKGBUILD index f3ab8cb..062490b 100644 --- a/abs/extra/sdl_image/PKGBUILD +++ b/abs/extra/sdl_image/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot +# $Id$ +# Maintainer: Allan McRae # Contributor: Tom Newsom + pkgname=sdl_image -pkgver=1.2.6 -pkgrel=3 +pkgver=1.2.10 +pkgrel=2 pkgdesc="A simple library to load images of various formats as SDL surfaces" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('LGPL') -depends=('sdl>=1.2.13' 'libpng' 'libjpeg' 'libtiff' 'zlib') +depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib') options=('!libtool') url="http://www.libsdl.org/projects/SDL_image/" -source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz - SDL_image-IMG_lbm.patch - SDL_image-buffer-overflow.patch) -md5sums=('b866dc4f647517bdaf57f6ffdefd013e' - '81424f716513845f27e1b69459343327' - 'e774a12d1a07b788233f6c15aca05780') +source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz) +md5sums=('6c06584b31559e2b59f2b982d0d1f628') build() { - cd ${startdir}/src/SDL_image-${pkgver} - patch -Np2 -i ${startdir}/src/SDL_image-IMG_lbm.patch || return 1 - patch -Np2 -i ${startdir}/src/SDL_image-buffer-overflow.patch || return 1 + cd ${srcdir}/SDL_image-${pkgver} ./configure --prefix=/usr make || return 1 - make DESTDIR=${startdir}/pkg install + make DESTDIR=${pkgdir} install } diff --git a/abs/extra/sdl_image/SDL_image-IMG_lbm.patch b/abs/extra/sdl_image/SDL_image-IMG_lbm.patch deleted file mode 100644 index cc4a29b..0000000 --- a/abs/extra/sdl_image/SDL_image-IMG_lbm.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- trunk/SDL_image/IMG_lbm.c 2007/07/20 04:37:11 3341 -+++ trunk/SDL_image/IMG_lbm.c 2008/01/03 20:05:34 3521 -@@ -28,6 +28,7 @@ - EHB and HAM (specific Amiga graphic chip modes) support added by Marc Le Douarain - (http://www.multimania.com/mavati) in December 2003. - Stencil and colorkey fixes by David Raulo (david.raulo AT free DOT fr) in February 2004. -+ Buffer overflow fix in RLE decompression by David Raulo in January 2008. - */ - - #include -@@ -328,7 +329,7 @@ - count ^= 0xFF; - count += 2; /* now it */ - -- if ( !SDL_RWread( src, &color, 1, 1 ) ) -+ if ( ( count > remainingbytes ) || !SDL_RWread( src, &color, 1, 1 ) ) - { - error="error reading BODY chunk"; - goto done; -@@ -339,7 +340,7 @@ - { - ++count; - -- if ( !SDL_RWread( src, ptr, count, 1 ) ) -+ if ( ( count > remainingbytes ) || !SDL_RWread( src, ptr, count, 1 ) ) - { - error="error reading BODY chunk"; - goto done; diff --git a/abs/extra/sdl_image/SDL_image-buffer-overflow.patch b/abs/extra/sdl_image/SDL_image-buffer-overflow.patch deleted file mode 100644 index 0be82dc..0000000 --- a/abs/extra/sdl_image/SDL_image-buffer-overflow.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- trunk/SDL_image/IMG_gif.c 2007/12/28 08:17:23 3461 -+++ trunk/SDL_image/IMG_gif.c 2007/12/28 16:43:56 3462 -@@ -418,6 +418,10 @@ - static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp; - register int i; - -+ /* Fixed buffer overflow found by Michael Skladnikiewicz */ -+ if (input_code_size > MAX_LWZ_BITS) -+ return -1; -+ - if (flag) { - set_code_size = input_code_size; - code_size = set_code_size + 1; -- cgit v0.12 From ba3a1ea626a4c6ebd9b584fa0454d9d387f16a15 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:01:08 -0500 Subject: libmms: Bump to latest. --- abs/extra/libmms/PKGBUILD | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/abs/extra/libmms/PKGBUILD b/abs/extra/libmms/PKGBUILD index 230b082..d0101a6 100644 --- a/abs/extra/libmms/PKGBUILD +++ b/abs/extra/libmms/PKGBUILD @@ -2,20 +2,24 @@ #Maintainer: Jan de Groot pkgname=libmms -pkgver=0.5 +pkgver=0.6.2 pkgrel=1 pkgdesc="MMS stream protocol library" arch=(i686 x86_64) -url="https://launchpad.net/libmms" +url="http://sourceforge.net/projects/libmms/" license=(LGPL) -depends=('glib2>=2.16.4') +depends=('glib2') options=('!libtool') -source=(http://launchpad.net/libmms/trunk/${pkgver}/+download/libmms-${pkgver}.tar.gz) +source=(http://download.sourceforge.net/libmms/${pkgname}-${pkgver}.tar.gz) +md5sums=('9f63aa363deb4874e072a45850161bff') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('cf83053ec891f14e73a04c84d9de08ee') -- cgit v0.12 From 596ac66af7bbad98dc6c4ae3cac41fe8aaec45c7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:03:02 -0500 Subject: libidl2: Bump to latest. --- abs/extra/libidl2/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/extra/libidl2/PKGBUILD b/abs/extra/libidl2/PKGBUILD index 488909a..3e78a0b 100644 --- a/abs/extra/libidl2/PKGBUILD +++ b/abs/extra/libidl2/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 30208 2009-03-17 17:59:14Z jgc $ +# $Id$ # Maintainer: dorphell # Committer: Judd Vinet pkgname=libidl2 -pkgver=0.8.13 +pkgver=0.8.14 pkgrel=1 pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL" arch=(i686 x86_64) license=('LGPL') -depends=('glib2>=2.20.0' 'texinfo') +depends=('glib2>=2.24.0' 'texinfo') makedepends=('pkgconfig') install=libidl2.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-${pkgver}.tar.bz2) url="http://www.gnome.org" -md5sums=('b43b289a859eb38a710f70622c46e571') +sha256sums=('c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220') build() { cd "${srcdir}/libIDL-${pkgver}" ./configure --prefix=/usr || return 1 make || return 1 make DESTDIR="${pkgdir}" install || return 1 - + rm -f "${pkgdir}/usr/share/info/dir" gzip -9nf "${pkgdir}/usr/share/info/"* } -- cgit v0.12 From 6a8ac4457e0cb334f336d8292a23861c4b48e11f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:04:47 -0500 Subject: help2man: Bump to latest. --- abs/extra/help2man/PKGBUILD | 18 ++++--- .../help2man/help2man-1.37.1-respect-LDFLAGS.patch | 11 ----- .../help2man/help2man-1.38.2-1-i686-build.log.1 | 56 ---------------------- 3 files changed, 12 insertions(+), 73 deletions(-) delete mode 100644 abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch delete mode 100644 abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1 diff --git a/abs/extra/help2man/PKGBUILD b/abs/extra/help2man/PKGBUILD index c9dc9fb..fff2829 100644 --- a/abs/extra/help2man/PKGBUILD +++ b/abs/extra/help2man/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 83522 2010-06-21 22:45:22Z giovanni $ +# $Id$ # Maintainer: Giovanni Scafora # Contributor: Paul Mattal pkgname=help2man -pkgver=1.38.2 +pkgver=1.40.4 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/help2man/" license=('GPL') depends=('perl-locale-gettext') -source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('426671c6fe79e5ef2233303367eab5a6') +install=help2man.install +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('4d79dc7cb7c20019c2a3650d35259c45') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -20,6 +21,11 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --libdir=/lib - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch b/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch deleted file mode 100644 index a314c27..0000000 --- a/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in 2009-11-14 07:21:34.000000000 +0100 -+++ b/Makefile.in 2010-02-10 12:23:35.000000000 +0100 -@@ -103,7 +103,7 @@ - - preload: $(preload).so - $(preload).so: $(srcdir)/$(preload).c -- $(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS) - - man: $(target).1 - $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m diff --git a/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1 b/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1 deleted file mode 100644 index 2f886ba..0000000 --- a/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1 +++ /dev/null @@ -1,56 +0,0 @@ -checking for perl... perl -checking for module Locale::gettext... yes -checking for msgfmt... /usr/bin/msgfmt -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 for library containing dlsym... -ldl -checking for library containing bindtextdomain... none required -checking for a BSD-compatible install... /bin/install -c -checking for makeinfo... /usr/bin/makeinfo -checking for install-info... /usr/bin/install-info -configure: creating ./config.status -config.status: creating Makefile -perl help2man.PL --with-gettext -gcc -march=i686 -mtune=generic -O2 -pipe -o bindtextdomain.so -fPIC -shared bindtextdomain.c -ldl -Extracting help2man (with variable substitutions) -./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/bin -/bin/install -c bindtextdomain.so /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib -for lang in de fi fr pl pt_BR ru sv vi; \ - do \ - ./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/$lang/LC_MESSAGES; \ - /bin/install -c -m 644 $(perl -e 'print +(grep -f, map "$_/$ARGV[0]", map +(length) ? $_ : ".", split ":", $ENV{VPATH} || ".")[0]' po/$lang.gmo) \ - /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/$lang/LC_MESSAGES/help2man.mo; \ - ./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/$lang/man1; \ - /bin/install -c -m 644 $(perl -e 'print +(grep -f, map "$_/$ARGV[0]", map +(length) ? $_ : ".", split ":", $ENV{VPATH} || ".")[0]' help2man.$lang.1) \ - /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/$lang/man1/help2man.1; \ - done -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/bin -./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/de/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib -mkdir: cannot create directory `/data/linhes_pkgbuild/abs/extra/help2man/pkg/lib': File exists -make: *** [install_base] Error 1 -make: *** Waiting for unfinished jobs.... -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/de/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/fi/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/fi/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/fr/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/fr/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/pl/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/pl/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/pt_BR/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/pt_BR/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/ru/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/ru/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/sv/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/sv/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/vi/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/vi/man1 - Aborting...(B -- cgit v0.12 From 7b2494e31b77d773f705764080aa0e61f653bda5 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:12:12 -0500 Subject: apache-ant: Bump to latest. --- abs/extra/apache-ant/PKGBUILD | 80 +++++++++++++++++------------- abs/extra/apache-ant/ant_diagnostics.patch | 23 +++++++++ abs/extra/apache-ant/apache-ant.csh | 2 + abs/extra/apache-ant/apache-ant.sh | 3 ++ 4 files changed, 74 insertions(+), 34 deletions(-) create mode 100644 abs/extra/apache-ant/ant_diagnostics.patch create mode 100644 abs/extra/apache-ant/apache-ant.csh create mode 100644 abs/extra/apache-ant/apache-ant.sh diff --git a/abs/extra/apache-ant/PKGBUILD b/abs/extra/apache-ant/PKGBUILD index 663cc19..eaafed4 100644 --- a/abs/extra/apache-ant/PKGBUILD +++ b/abs/extra/apache-ant/PKGBUILD @@ -1,41 +1,53 @@ -# $Id: PKGBUILD 24082 2009-01-12 21:42:39Z paul $ +# $Id$ # Contributor: Andrew Wright # Maintainer: Paul Mattal pkgname=apache-ant -pkgver=1.7.1 -pkgrel=1 -pkgdesc="Ant is a java-based build tool." -arch=(i686 x86_64) +pkgver=1.8.2 +pkgrel=2 +pkgdesc="A java-based build tool" +arch=('any') license=('APACHE') url="http://ant.apache.org/" -depends=('java-runtime') -makedepends=('java-environment') -noextract=('junit3.8.1.zip') -source=(http://archive.apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2 - http://heanet.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip) -md5sums=('0d68db4a1ada5c91bcbf53cefd0c2fd7' '5110326e4b7f7497dfa60ede4b626751') - -build() { - cd ${startdir}/src || return 1 - unzip junit3.8.1.zip || return 1 - - cd ${startdir}/src/${pkgname}-${pkgver} - if [ -f /etc/profile.d/java-gcj-compat.sh ]; then - . /etc/profile.d/java-gcj-compat.sh - elif [ -f /etc/profile.d/jdk.sh ]; then - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh - fi - - # we need the junit jar in the classpath to build ant - export CLASSPATH="${startdir}/src/junit3.8.1/junit.jar" - - # build - mkdir dist || return 1 - ./build.sh -Ddist.dir=dist/ dist || return 1 - - # install - export ANT_HOME="${startdir}/pkg/usr" - ./build.sh install-lite || return 1 +depends=('java-environment') +optdepends=('junit: to jave junit on the classpath in javac tasks') +source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 + ${pkgname}.sh ${pkgname}.csh + ant_diagnostics.patch) +md5sums=('9e9ae9fc7352960191489a1286fb0928' + '593ee6ebd9b8ec321534a028e686880f' + '475b684eb8202c09cbb51496cd8ee1e0' + 'cbaab423be40a6e63f0fde901b91eb50') + +package() { + # install profile.d script + install -dm755 "${pkgdir}"/etc/profile.d + install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/ + + # Get the ANT_HOME env var + source "${srcdir}"/${pkgname}.sh + + cd "${srcdir}"/${pkgname}-${pkgver} + install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib} + + install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib + cp -Rp ./etc "${pkgdir}"/${ANT_HOME} + + # Do not copy Windows .bat/.cmd files + find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ + -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \; + + # symlink to junit so it's on the javac build path for ant + # matches behavior on ubuntu 9 and makes sense for compatibility + # http://bugs.archlinux.org/task/15229 + ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/ + + # fix python2 path + sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py + + # The license says the NOTICE file should be redistributed for derivative + # works, so lets supply it. + cd "${srcdir}"/${pkgname}-${pkgver} + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${pkgname} } diff --git a/abs/extra/apache-ant/ant_diagnostics.patch b/abs/extra/apache-ant/ant_diagnostics.patch new file mode 100644 index 0000000..38148b4 --- /dev/null +++ b/abs/extra/apache-ant/ant_diagnostics.patch @@ -0,0 +1,23 @@ +--- a/src/main/org/apache/tools/ant/Diagnostics.java ++++ b/src/main/org/apache/tools/ant/Diagnostics.java +@@ -179,7 +179,10 @@ + * @param clazz the class to get the information from. + * @since Ant 1.8.0 + */ +- private static URL getClassLocation(Class clazz) { ++ private static URL getClassLocation(Class clazz) { ++ if (clazz.getProtectionDomain().getCodeSource() == null) { ++ return null; ++ } + return clazz.getProtectionDomain().getCodeSource().getLocation(); + } + +@@ -241,7 +244,7 @@ + } + Transformer transformer = null; + try { +- transformer = transformerFactory.newTransformer(); ++ transformer = transformerFactory.newTransformer(); + } catch (Exception e) { + // ignore + ignoreThrowable(e); diff --git a/abs/extra/apache-ant/apache-ant.csh b/abs/extra/apache-ant/apache-ant.csh new file mode 100644 index 0000000..b6a6d58 --- /dev/null +++ b/abs/extra/apache-ant/apache-ant.csh @@ -0,0 +1,2 @@ +setenv ANT_HOME /usr/share/java/apache-ant +setenv PATH ${PATH}:${ANT_HOME}/bin diff --git a/abs/extra/apache-ant/apache-ant.sh b/abs/extra/apache-ant/apache-ant.sh new file mode 100644 index 0000000..ab602fb --- /dev/null +++ b/abs/extra/apache-ant/apache-ant.sh @@ -0,0 +1,3 @@ +export ANT_HOME=/usr/share/java/apache-ant +export PATH=$PATH:$ANT_HOME/bin + -- cgit v0.12 From 98d1e86bb32b7e3e060da019fbb32e5644658702 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:16:11 -0500 Subject: conky: Bump to latest. --- abs/extra/conky/PKGBUILD | 58 ++++++++++++++++++++++++------------- abs/extra/conky/current-power.patch | 12 ++++++++ 2 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 abs/extra/conky/current-power.patch diff --git a/abs/extra/conky/PKGBUILD b/abs/extra/conky/PKGBUILD index 0b27d0b..d542937 100644 --- a/abs/extra/conky/PKGBUILD +++ b/abs/extra/conky/PKGBUILD @@ -1,29 +1,47 @@ -# $Id: PKGBUILD 15346 2008-10-12 21:48:59Z giovanni $ -# Maintainer: James Rayner -# Contributor: MrGreen +# $Id$ +# Contributor: Giovanni Scafora +# Contributor: James Rayner +# Contributor: Partha Chowdhury +# Maintainer: Gaetan Bisson pkgname=conky -pkgver=1.8.0 -pkgrel=1 -pkgdesc="Conky is an advanced, highly configurable system monitor for X based on torsmo" +pkgver=1.8.1 +pkgrel=3 +pkgdesc='An advanced, highly configurable system monitor for X based on torsmo' arch=('i686' 'x86_64') -url="http://conky.sourceforge.net/" +url='http://conky.sourceforge.net/' license=('custom') replaces=('torsmo') -depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage') -makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2) +makedepends=('pkg-config') +depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') +backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'current-power.patch') + +sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f' + '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --enable-xft --enable-mpd --enable-double-buffer \ - --enable-proc-uptime --enable-seti --enable-wlan --enable-rss --enable-smapi - make || return 1 - make DESTDIR=$startdir/pkg install - mkdir -p $startdir/pkg/etc/xdg/ - mv $startdir/pkg/usr/etc/conky/ $startdir/pkg/etc/xdg/ - rmdir $startdir/pkg/usr/etc - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../current-power.patch # See FS#21984 + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-ibm \ + --enable-curl \ + --enable-rss \ + --enable-weather-xoap \ + --enable-imlib2 \ + --disable-lua \ + --enable-wlan \ + + make } -md5sums=('494cbaf1108cfdb977fc80454d9b13e2') +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/extra/conky/current-power.patch b/abs/extra/conky/current-power.patch new file mode 100644 index 0000000..1e7cf5a --- /dev/null +++ b/abs/extra/conky/current-power.patch @@ -0,0 +1,12 @@ +diff -aur old/src/linux.c new/src/linux.c +--- old/src/linux.c 2010-10-05 23:29:36.000000000 +0200 ++++ new/src/linux.c 2010-12-06 22:18:59.346667183 +0100 +@@ -1671,6 +1671,8 @@ + the tradition! */ + else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0) + sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate); ++ else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0) ++ sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate); + else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0) + sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity); + else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0) -- cgit v0.12 From fd8ebb392cd04e7c59ae0dd696d93f0ef509b89c Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 6 Aug 2011 00:21:15 -0500 Subject: linhes-config: fix hobbitlclient init. --- abs/core/LinHES-config/PKGBUILD | 6 +++--- abs/core/LinHES-config/timezip.py | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 2df19dd..ebc35f9 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -pkgrel=23 +pkgrel=26 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -107,11 +107,11 @@ md5sums=('c737f8538aea20fcb5f3903957e80837' '985891a43f7c4c983eb2a362162f1a0f' 'd7a8cd4a0060399ae22e69f74e04eb07' '7a45287a07145fde5aa664583d4f6fba' - '39ca949f82123a5e84902d761a6f9ca2' + 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '8ac1cfd2eca0f641737da0d0aca416a7' '9ae8d79f620c6d19973c55c32a921874' '95526b4d3dec6c9341088fb6511d831a' - 'bf32873c56d04c45ff0682f4e345e517' + 'ecf9e5df20683a769c4a8a8f2d65de85' 'e459ed069317bccb20351f037a9df3d2' '83be9a3bc72179909773479c74d13b38' '6aff504ed5e860adc1b7317cd0780900' diff --git a/abs/core/LinHES-config/timezip.py b/abs/core/LinHES-config/timezip.py index ca20921..4e494be 100755 --- a/abs/core/LinHES-config/timezip.py +++ b/abs/core/LinHES-config/timezip.py @@ -106,9 +106,10 @@ def selectvars(): result = cursor.fetchone() try: hobbitclient=result[0] - except TypeError: + except: + hobbitclient="1" + else: hobbitclient="1" - def insertvars(): @@ -184,7 +185,7 @@ def insertvars(): #hobbitclient cursor.execute("select * from settings where value='HostServiceHobbitclient' and hostname=(%s)",(thishostname)) result = cursor.fetchone() - if ( tz != ""): + if ( hobbitclient != ""): if (result == None): cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostServiceHobbitclient',(%s),(%s))",(hobbitclient,thishostname)) print "inserting hobbitcleint" -- cgit v0.12 From e7b31175f84daf5c900f5229b32d76fc7ed44746 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:23:17 -0500 Subject: mediatomb: Bump to latest. --- abs/extra/community/mediatomb/PKGBUILD | 88 ++-- abs/extra/community/mediatomb/gcc46.patch | 10 + .../mediatomb/mediatomb-0.11.0+glibc-2.10.patch | 23 - .../community/mediatomb/mediatomb-gcc-4.3.patch | 24 - abs/extra/community/mediatomb/mediatomb.conf | 26 +- abs/extra/community/mediatomb/mediatomb.install | 9 + abs/extra/community/mediatomb/mediatomb.rc | 94 ++-- abs/extra/community/mediatomb/tonewjs.patch | 564 +++++++++++++++++++++ 8 files changed, 690 insertions(+), 148 deletions(-) create mode 100644 abs/extra/community/mediatomb/gcc46.patch delete mode 100644 abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch delete mode 100644 abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch create mode 100644 abs/extra/community/mediatomb/mediatomb.install mode change 100755 => 100644 abs/extra/community/mediatomb/mediatomb.rc create mode 100644 abs/extra/community/mediatomb/tonewjs.patch diff --git a/abs/extra/community/mediatomb/PKGBUILD b/abs/extra/community/mediatomb/PKGBUILD index aaf4d58..606314a 100644 --- a/abs/extra/community/mediatomb/PKGBUILD +++ b/abs/extra/community/mediatomb/PKGBUILD @@ -1,57 +1,49 @@ -# Orginal Contributor: William Rea +# $Id$ +# Contributor: William Rea # Contributor: Nikhil Bysani -# Contributor: Mika Hynnä - -# 20090525: -# + makedepends=('gcc' 'patch' 'make') -# + mediatomb-0.11.0+glibc-2.10.patch +# Contributor: Mika Hynnä +# Maintainer: Jonathan Conder pkgname=mediatomb -pkgver=0.11.0 -pkgrel=10 -pkgdesc="A UPnP mediaserver" +pkgver=0.12.1 +pkgrel=5 +pkgdesc="Free UPnP/DLNA media server" arch=('i686' 'x86_64') -url="http://mediatomb.sourceforge.net" +url="http://mediatomb.cc/" license=('GPL') -depends=('libexif' 'taglib' 'sqlite3' 'expat' 'spidermonkey' 'curl' 'ffmpeg') -makedepends=('gcc' 'patch' 'make') -backup=(etc/conf.d/mediatomb) -source=( - http://mesh.dl.sourceforge.net/sourceforge/mediatomb/mediatomb-$pkgver.tar.gz \ - mediatomb.rc \ - mediatomb.conf \ - http://kapsi.fi/~ighea/arch/mediatomb-gcc-4.3.patch - mediatomb-0.11.0+glibc-2.10.patch -) - -build() -{ - cd $startdir/src/mediatomb-$pkgver || return 1 - patch -Np1 < ../mediatomb-gcc-4.3.patch || return 1 - patch -Np0 < ../mediatomb-0.11.0+glibc-2.10.patch || return 1 - - sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure - sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure.ac - sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i src/metadata/ffmpeg_handler.cc - - - ./configure --prefix=/usr --enable-mysql=no --enable-libmagic=yes \ - --enable-libjs=yes --enable-ffmpeg --with-ffmpeg-h=/usr/include/ || return 1 - - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 +depends=('curl' 'ffmpegthumbnailer' 'js' 'libexif' 'libmp4v2' 'sqlite3' 'taglib') +backup=('etc/conf.d/mediatomb') +install=mediatomb.install +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'mediatomb.rc' + 'mediatomb.conf' + 'gcc46.patch' + 'tonewjs.patch') +md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2' + 'aa1191ec508d8bd4b3b9a5fe48efc079' + 'bec297e4178332a26b42bbde873b94cd' + '0ae34c0d73b76e3d215887834c3c08cf' + 'd9e02a9956eecf5ff645bddf6dac0331') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/gcc46.patch + patch -Np1 -i $srcdir/tonewjs.patch + + ./configure --prefix=/usr \ + --disable-mysql \ + --enable-libmagic \ + --enable-libjs \ + --enable-ffmpeg + make +} - # rc-script - mkdir -p $startdir/pkg/etc/rc.d/ || return 1 - install -m0755 ../mediatomb.rc $startdir/pkg/etc/rc.d/mediatomb || return 1 +package() { + cd "$srcdir/$pkgname-$pkgver" - # config-file - mkdir -p $startdir/pkg/etc/conf.d/ || return 1 - install -m0644 ../mediatomb.conf $startdir/pkg/etc/conf.d/mediatomb || return 1 + make DESTDIR="$pkgdir/" install + install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb" + install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb" + install -d "$pkgdir/var/lib/mediatomb" } -md5sums=('661f08933830d920de21436fe122fb15' - 'a7ff197d5760b20b04675ba67bfd9e86' - 'a4cbd08c32c93f116363a29bef60e21d' - 'eda28d01e035b3237566da5b1aad7712' - '3b895eabee88a0697b4fd0c30af6cab2') diff --git a/abs/extra/community/mediatomb/gcc46.patch b/abs/extra/community/mediatomb/gcc46.patch new file mode 100644 index 0000000..0f4fe49 --- /dev/null +++ b/abs/extra/community/mediatomb/gcc46.patch @@ -0,0 +1,10 @@ +--- a/src/zmm/object.h ++++ b/src/zmm/object.h +@@ -33,6 +33,7 @@ + #define __ZMM_OBJECT_H__ + + #include // for size_t ++#include + #include "atomic.h" + + namespace zmm diff --git a/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch b/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch deleted file mode 100644 index b1436c1..0000000 --- a/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/tools.cc (revisione 2018) -+++ src/tools.cc (copia locale) -@@ -303,8 +303,8 @@ - Ref buf(new StringBuffer(len / 2)); - for (int i = 0; i < len; i += 2) - { -- char *chi = strchr(HEX_CHARS, ptr[i]); -- char *clo = strchr(HEX_CHARS, ptr[i + 1]); -+ const char *chi = strchr(HEX_CHARS, ptr[i]); -+ const char *clo = strchr(HEX_CHARS, ptr[i + 1]); - int hi, lo; - - if (chi) -@@ -397,7 +397,7 @@ - char clo = data[i++]; - int hi, lo; - -- char *pos; -+ const char *pos; - - pos = strchr(hex, chi); - if (!pos) - diff --git a/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch b/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch deleted file mode 100644 index 9440bec..0000000 --- a/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch +++ /dev/null @@ -1,24 +0,0 @@ -# GCC-4.3 compatibility patch by Mika Hynnä (ighea) -# ---- mediatomb-0.11.0/src/url.cc 2008-03-02 00:48:36.000000000 +0200 -+++ mediatomb-0.11.0.new/src/url.cc 2008-04-14 00:53:21.000000000 +0300 -@@ -75,7 +75,7 @@ - - if (only_header) - { -- curl_easy_setopt(curl_handle, CURLOPT_NOBODY); -+ curl_easy_setopt(curl_handle, CURLOPT_NOBODY,0); - curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl); - curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, - (void *)buffer.getPtr()); ---- mediatomb-0.11.0/src/metadata/id3_handler.cc 2008-03-02 00:48:36.000000000 +0200 -+++ mediatomb-0.11.0.new/src/metadata/id3_handler.cc 2008-04-14 01:22:36.000000000 +0300 -@@ -36,6 +36,8 @@ - - #ifdef HAVE_ID3 - -+#include -+ - #ifdef HAVE_CONFIG_H - #undef HAVE_CONFIG_H // else utils.h from the id3 library tries to import "config.h" - diff --git a/abs/extra/community/mediatomb/mediatomb.conf b/abs/extra/community/mediatomb/mediatomb.conf index 339bd9e..798018d 100644 --- a/abs/extra/community/mediatomb/mediatomb.conf +++ b/abs/extra/community/mediatomb/mediatomb.conf @@ -1,5 +1,23 @@ -# User to run the mediatomb as: -USER="" -# Extra parameters to pass to the daemon: -PARAMS="" +# +# Parameters to be passed to mediatomb +# +# Port to listen on +MT_PORT='50500' + +# User and group to run as +MT_USER='nobody' +MT_GROUP='nobody' + +# Location of the PID file +MT_PIDFILE='/var/run/mediatomb.pid' + +# Location of the log file +MT_LOGFILE='/var/log/mediatomb.log' + +# Location of the config file/database +MT_HOME='/var/lib/mediatomb' +MT_CFGDIR='.mediatomb' + +# User defined command line options +MT_OPTIONS='' diff --git a/abs/extra/community/mediatomb/mediatomb.install b/abs/extra/community/mediatomb/mediatomb.install new file mode 100644 index 0000000..56f6ef9 --- /dev/null +++ b/abs/extra/community/mediatomb/mediatomb.install @@ -0,0 +1,9 @@ +post_install() { + echo 'Warning: the MediaTomb web interface exposes your filesystem to the network' + echo 'For maximum security, set in your MediaTomb config file' +} + +post_upgrade() { + # TODO: disable next update + post_install +} diff --git a/abs/extra/community/mediatomb/mediatomb.rc b/abs/extra/community/mediatomb/mediatomb.rc old mode 100755 new mode 100644 index b3333cc..7b93012 --- a/abs/extra/community/mediatomb/mediatomb.rc +++ b/abs/extra/community/mediatomb/mediatomb.rc @@ -1,58 +1,54 @@ #!/bin/bash -DESC="MediaTomb UPnP A/V Media Server" +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/mediatomb -USER="" +MT_OPTIONS="-p $MT_PORT -u $MT_USER -g $MT_GROUP -P $MT_PIDFILE \ + -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS" -if [ "$(whoami)" != "root" ];then - echo "You must be root to start/restart/stop services." - exit 1 -fi +case "$1" in + start) + stat_busy "Starting Mediatomb UPnP Media Server" -. /etc/rc.conf -. /etc/rc.d/functions + chown "$MT_USER:$MT_GROUP" "$MT_HOME" -[ -r "/etc/conf.d/mediatomb" ] && . /etc/conf.d/mediatomb + if ! pidof -o %PPID /usr/bin/mediatomb &> /dev/null; then + rm -f "$MT_PIDFILE" + fi -PID=`pidof -o %PPID /usr/bin/mediatomb` + PID="$(cat "$MT_PIDFILE" 2> /dev/null)" -case "$1" in - start) - stat_busy "Starting $DESC" - if [ -z "$PID" ]; then - if [ -n "$USER" ]; then - echo -n "Starting as user: $USER" - su - $USER -c "/usr/bin/mediatomb -d $PARAMS &> /dev/null" || stat_fail - else - /usr/bin/mediatomb -d $PARAMS &> /dev/null || stat_fail - fi - PID=`pidof -o %PPID /usr/bin/mediatomb` - if [ -z "$PID" ]; then exit 1;fi - echo $PID > /var/run/mediatomb.pid - add_daemon mediatomb - stat_done - else - echo -n "Already running!" - stat_fail - fi - ;; - stop) - stat_busy "Stopping $DESC" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - echo -n "Not started!" - stat_fail - else - rm /var/run/mediatomb.pid - rm_daemon mediatomb - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + if [ -z "$PID" ] && /usr/bin/mediatomb -d $MT_OPTIONS; then + add_daemon mediatomb + stat_done + else + stat_fail + fi + ;; + + stop) + stat_busy "Stopping Mediatomb UPnP Media Server" + + PID="$(cat "$MT_PIDFILE" 2> /dev/null)" + + if [ -n "$PID" ] && kill "$PID" &> /dev/null; then + rm -f "$MT_PIDFILE" + rm_daemon mediatomb + stat_done + else + stat_fail + fi + ;; + + restart) + "$0" stop + sleep 1 + "$0" start + ;; + + *) + echo "usage: $0 {start|stop|restart}" + ;; esac +exit 0 diff --git a/abs/extra/community/mediatomb/tonewjs.patch b/abs/extra/community/mediatomb/tonewjs.patch new file mode 100644 index 0000000..1159685 --- /dev/null +++ b/abs/extra/community/mediatomb/tonewjs.patch @@ -0,0 +1,564 @@ +diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in +--- mediatomb-0.12.1-back/build/Makefile.in.tonewjs 2010-04-08 00:40:15.000000000 +0200 ++++ mediatomb-0.12.1-back/build/Makefile.in 2011-04-19 17:17:01.343509944 +0200 +@@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ ++CXXFLAGS = -fpermissive @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@ + DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@ +diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc +--- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs 2011-04-18 13:10:48.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/import_script.cc 2011-04-18 13:29:36.000000000 +0200 +@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref + try + { + load(scriptPath); +- root = JS_NewScriptObject(cx, script); +- JS_AddNamedRoot(cx, &root, "ImportScript"); ++ root = JS_NewObject(cx, NULL, script, NULL); ++ JS_AddNamedObjectRoot(cx, &root, "ImportScript"); + } + catch (Exception ex) + { +@@ -117,7 +117,7 @@ ImportScript::~ImportScript() + #endif + + if (root) +- JS_RemoveRoot(cx, &root); ++ JS_RemoveObjectRoot(cx, &root); + + #ifdef JS_THREADSAFE + JS_EndRequest(cx); +diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc +--- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs 2011-04-18 13:29:55.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/js_functions.cc 2011-04-19 16:48:04.009229611 +0200 +@@ -49,7 +49,7 @@ using namespace zmm; + extern "C" { + + JSBool +-js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++js_print(JSContext *cx, uintN argc, jsval *argv) + { + uintN i; + JSString *str; +@@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u + if (!str) + return JS_TRUE; + argv[i] = STRING_TO_JSVAL(str); +- log_js("%s\n", JS_GetStringBytes(str)); ++ char * log_str = JS_EncodeString(cx, str); ++ log_js("%s\n", log_str); ++ JS_free(cx, log_str); + } + return JS_TRUE; + } + + JSBool +-js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++js_copyObject(JSContext *cx, uintN argc, jsval *argv) + { + jsval arg; + JSObject *js_cds_obj; + JSObject *js_cds_clone_obj; + +- Script *self = (Script *)JS_GetPrivate(cx, obj); ++ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); + + try + { +@@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o + + self->cdsObject2jsObject(cds_obj, js_cds_clone_obj); + +- *rval = OBJECT_TO_JSVAL(js_cds_clone_obj); ++ JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj)); + + return JS_TRUE; + +@@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o + } + + JSBool +-js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++js_addCdsObject(JSContext *cx, uintN argc, jsval *argv) + { + try + { +@@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject + Ref p2i; + Ref i2i; + +- Script *self = (Script *)JS_GetPrivate(cx, obj); ++ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); + + if (self == NULL) + { +@@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject + if (!str) + path = _("/"); + else +- path = JS_GetStringBytes(str); ++ path = JS_EncodeString(cx, str); + + JSString *cont = JS_ValueToString(cx, argv[2]); + if (cont) + { +- containerclass = JS_GetStringBytes(cont); ++ containerclass = JS_EncodeString(cx, cont); + if (!string_ok(containerclass) || containerclass == "undefined") + containerclass = nil; + } + + if (self->whoami() == S_PLAYLIST) +- js_orig_obj = self->getObjectProperty(obj, _("playlist")); ++ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist")); + else if (self->whoami() == S_IMPORT) +- js_orig_obj = self->getObjectProperty(obj, _("orig")); ++ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig")); + + if (js_orig_obj == NULL) + { +@@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject + JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length()); + if (!str2) + return JS_TRUE; +- *rval = STRING_TO_JSVAL(str2); +- ++ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); + return JS_TRUE; + } + catch (ServerShutdownException se) +@@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject + return JS_TRUE; + } + +-static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr) ++static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr) + { + try + { +@@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS + { + str = JS_ValueToString(cx, argv[0]); + if (str) +- result = JS_GetStringBytes(str); ++ result = JS_EncodeString(cx, str); + } + + if (result != nil) +@@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS + JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length()); + if (!str2) + return JS_TRUE; +- *rval = STRING_TO_JSVAL(str2); ++ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); + } + } + catch (ServerShutdownException se) +@@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS + } + + +-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv) + { +- return convert_charset_generic(cx, obj, argc, argv, rval, F2I); ++ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I); + } + +-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv) + { +- return convert_charset_generic(cx, obj, argc, argv, rval, M2I); +-} ++ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); } + +-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv) + { +- return convert_charset_generic(cx, obj, argc, argv, rval, P2I); ++ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I); + } + +-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv) + { +- return convert_charset_generic(cx, obj, argc, argv, rval, J2I); ++ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I); + } + + } // extern "C" +diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h +--- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs 2010-03-25 15:58:05.000000000 +0100 ++++ mediatomb-0.12.1-back/src/scripting/js_functions.h 2011-04-18 13:59:29.000000000 +0200 +@@ -40,18 +40,18 @@ + extern "C" { + + /// \brief Log output. +-JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); ++JSBool js_print(JSContext *cx, uintN argc, jsval *argv); + + /// \brief Adds an object to the database. +-JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); ++JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv); + + /// \brief Makes a copy of an CDS object. +-JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); ++JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv); + +-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); +-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); +-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); +-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); ++JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv); ++JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv); ++JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv); ++JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv); + + } // extern "C" + +diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc +--- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs 2011-04-18 13:34:14.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc 2011-04-18 13:51:59.000000000 +0200 +@@ -46,9 +46,9 @@ using namespace zmm; + extern "C" { + + static JSBool +-js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++js_readln(JSContext *cx, uintN argc, jsval *argv) + { +- PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj); ++ PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); + + String line; + +@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj, + + JSString *jsline = JS_NewStringCopyZ(cx, line.c_str()); + +- *rval = STRING_TO_JSVAL(jsline); ++ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline)); + + return JS_TRUE; + } +@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri + + String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); + load(scriptPath); +- root = JS_NewScriptObject(cx, script); +- JS_AddNamedRoot(cx, &root, "PlaylistScript"); ++ root = JS_NewObject(cx, NULL, script, NULL); ++ JS_AddNamedObjectRoot(cx, &root, "PlaylistScript"); + } + catch (Exception ex) + { +@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr + #endif + + if (root) +- JS_RemoveRoot(cx, &root); ++ JS_RemoveObjectRoot(cx, &root); + + #ifdef JS_THREADSAFE + JS_EndRequest(cx); +diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc +--- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs 2011-04-18 13:53:07.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/script.cc 2011-04-19 18:26:34.460338804 +0200 +@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj + str = JS_ValueToString(cx, val); + if (! str) + return nil; +- return JS_GetStringBytes(str); ++ return JS_EncodeString(cx, str); + } + + int Script::getBoolProperty(JSObject *obj, String name) +@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function + try + { + common_script = _load(common_scr_path); +- common_root = JS_NewScriptObject(cx, common_script); +- JS_AddNamedRoot(cx, &common_root, "common-script"); ++ common_root = JS_NewObject(cx, NULL, common_script, NULL); ++ JS_AddNamedObjectRoot(cx, &common_root, "common-script"); + _execute(common_script); + } + catch (Exception e) + { + if (common_root) +- JS_RemoveRoot(cx, &common_root); ++ JS_RemoveObjectRoot(cx, &common_root); + + log_js("Unable to load %s: %s\n", common_scr_path.c_str(), + e.getMessage().c_str()); +@@ -460,7 +460,7 @@ Script::~Script() + JS_BeginRequest(cx); + #endif + if (common_root) +- JS_RemoveRoot(cx, &common_root); ++ JS_RemoveObjectRoot(cx, &common_root); + + /* + * scripts are unrooted and will be cleaned up by GC +@@ -504,11 +504,11 @@ void Script::initGlobalObject() + static JSClass global_class = + { + "global", /* name */ +- JSCLASS_HAS_PRIVATE, /* flags */ ++ JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */ + JS_PropertyStub, /* add property */ + JS_PropertyStub, /* del property */ + JS_PropertyStub, /* get property */ +- JS_PropertyStub, /* set property */ ++ JS_StrictPropertyStub, /* set property */ + JS_EnumerateStandardClasses, /* enumerate */ + JS_ResolveStub, /* resolve */ + JS_ConvertStub, /* convert */ +@@ -517,7 +517,7 @@ void Script::initGlobalObject() + }; + + /* create the global object here */ +- glob = JS_NewObject(cx, &global_class, NULL, NULL); ++ glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL); + if (! glob) + throw _Exception(_("Scripting: could not initialize glboal class")); + +@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS + throw _Exception(_("Scripting: JS_DefineFunctions failed")); + } + +-JSScript *Script::_load(zmm::String scriptPath) ++JSObject *Script::_load(zmm::String scriptPath) + { + if (glob == NULL) + initGlobalObject(); + +- JSScript *scr; ++ JSObject *scr; + + String scriptText = read_text_file(scriptPath); + +@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri + + void Script::load(zmm::String scriptPath) + { +- if (script) +- JS_DestroyScript(cx, script); +- + script = _load((scriptPath)); + } + + +-void Script::_execute(JSScript *scr) ++void Script::_execute(JSObject *scr) + { + jsval ret_val; + +@@ -662,7 +659,7 @@ Ref Script::jsObject2cdsObjec + JSObject *js_meta = getObjectProperty(js, _("meta")); + if (js_meta) + { +- JS_AddNamedRoot(cx, &js_meta, "meta"); ++ JS_AddNamedObjectRoot(cx, &js_meta, "meta"); + /// \todo: only metadata enumerated in MT_KEYS is taken + for (int i = 0; i < M_MAX; i++) + { +@@ -687,7 +684,7 @@ Ref Script::jsObject2cdsObjec + } + } + } +- JS_RemoveRoot(cx, &js_meta); ++ JS_RemoveObjectRoot(cx, &js_meta); + } + + // stuff that has not been exported to js +diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h +--- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs 2011-04-18 12:56:14.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/script.h 2011-04-18 12:56:51.000000000 +0200 +@@ -66,8 +66,8 @@ public: + JSRuntime *rt; + JSContext *cx; + JSObject *glob; +- JSScript *script; +- JSScript *common_script; ++ JSObject *script; ++ JSObject *common_script; + + public: + Script(zmm::Ref runtime); +@@ -115,8 +115,8 @@ private: + JSObject *common_root; + + void initGlobalObject(); +- JSScript *_load(zmm::String scriptPath); +- void _execute(JSScript *scr); ++ JSObject *_load(zmm::String scriptPath); ++ void _execute(JSObject *scr); + zmm::Ref _p2i; + zmm::Ref _j2i; + zmm::Ref _f2i; +--- mediatomb-0.12.1/configure.tonewjs 2011-07-04 20:20:00.290227110 +1200 ++++ mediatomb-0.12.1/configure 2011-07-04 20:20:28.186894644 +1200 +@@ -23784,14 +23784,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" + + else + +- LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS" +- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 +-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } +-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then ++ LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS" ++ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 ++$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } ++if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmozjs $LIBS" ++LIBS="-lmozjs185 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23835,12 +23835,12 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then +- ac_cv_lib_mozjs_JS_NewObject=yes ++ ac_cv_lib_mozjs185_JS_NewObject=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_mozjs_JS_NewObject=no ++ ac_cv_lib_mozjs185_JS_NewObject=no + fi + + rm -rf conftest.dSYM +@@ -23848,12 +23848,12 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 +-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } +-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 ++$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } ++if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then + +- JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs" +- MOZLIB=mozjs ++ JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185" ++ MOZLIB=mozjs185 + + else + +@@ -24020,13 +24020,13 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" + else + + unset ac_cv_lib_smjs_JS_NewObject +- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 +-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } +-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then ++ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 ++$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } ++if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmozjs $LIBS" ++LIBS="-lmozjs185 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24070,12 +24070,12 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then +- ac_cv_lib_mozjs_JS_NewObject=yes ++ ac_cv_lib_mozjs185_JS_NewObject=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_mozjs_JS_NewObject=no ++ ac_cv_lib_mozjs185_JS_NewObject=no + fi + + rm -rf conftest.dSYM +@@ -24083,12 +24083,12 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 +-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } +-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 ++$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } ++if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then + +- MOZLIB=mozjs +- JS_LIBS="-lmozjs" ++ MOZLIB=mozjs185 ++ JS_LIBS="-lmozjs185" + + else + +@@ -24239,15 +24239,15 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" + + else + +- LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs" +- unset ac_cv_lib_mozjs_JS_NewObject +- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 +-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } +-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then ++ LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185" ++ unset ac_cv_lib_mozjs185_JS_NewObject ++ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 ++$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } ++if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmozjs $LIBS" ++LIBS="-lmozjs185 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24291,12 +24291,12 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then +- ac_cv_lib_mozjs_JS_NewObject=yes ++ ac_cv_lib_mozjs185_JS_NewObject=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_mozjs_JS_NewObject=no ++ ac_cv_lib_mozjs185_JS_NewObject=no + fi + + rm -rf conftest.dSYM +@@ -24304,12 +24304,12 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 +-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } +-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 ++$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } ++if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then + +- JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs" +- MOZLIB=mozjs ++ JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185" ++ MOZLIB=mozjs185 + + else + -- cgit v0.12 From ef0f97e8177b389a1ce15a3cb106ce529609fe8c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:25:51 -0500 Subject: ffmpegthumbnailer: Initial inclusion. Dep of mediatomb --- abs/extra/ffmpegthumbnailer/PKGBUILD | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 abs/extra/ffmpegthumbnailer/PKGBUILD diff --git a/abs/extra/ffmpegthumbnailer/PKGBUILD b/abs/extra/ffmpegthumbnailer/PKGBUILD new file mode 100644 index 0000000..8be79eb --- /dev/null +++ b/abs/extra/ffmpegthumbnailer/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ +# Maintainer: Ronald van Haren +# Contributor: boromil@gmail.com + +pkgname=ffmpegthumbnailer +pkgver=2.0.6 +pkgrel=1 +pkgdesc="Lightweight video thumbnailer that can be used by file managers." +url="http://code.google.com/p/ffmpegthumbnailer/" +license=('GPL2') +arch=('i686' 'x86_64') +depends=('ffmpeg' 'libjpeg' 'libpng') +optdepends=('gvfs: support for gio uris') +source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz) +options=(!libtool) +md5sums=('5003ceaadc1c5a1be1dbb34739a12bab') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --enable-gio + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + + -- cgit v0.12 From 5cf5c67b5a6561f77eaeb264c582ceeba2f00c47 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:37:07 -0500 Subject: ncdu: Bump to latest. --- abs/extra/community/ncdu/PKGBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/abs/extra/community/ncdu/PKGBUILD b/abs/extra/community/ncdu/PKGBUILD index fb61b63..a9f83e6 100644 --- a/abs/extra/community/ncdu/PKGBUILD +++ b/abs/extra/community/ncdu/PKGBUILD @@ -1,6 +1,7 @@ # Contributor: lp76 +# Maintainer: Daenyth pkgname=ncdu -pkgver=1.4 +pkgver=1.7 pkgrel=1 pkgdesc="An NCurses version of the famous old 'du' unix command" arch=('i686' 'x86_64') @@ -8,12 +9,13 @@ url="http://dev.yorhel.nl/ncdu/" license=('MIT') depends=('ncurses') source=(http://dev.yorhel.nl/download/$pkgname-$pkgver.tar.gz) -md5sums=('07f01579f7c9852033139ae9fa2414c9') +md5sums=('172047c29d232724cc62e773e82e592a') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr + + ./configure --prefix=/usr || return 1 make || return 1 make DESTDIR=$pkgdir install || return 1 - install -D COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE } -- cgit v0.12 From f11b93d266edfbc081e7b78204103dcf43f7f92c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:39:25 -0500 Subject: libgnomecanvas: Bump to latest. --- abs/extra/libgnomecanvas/PKGBUILD | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/abs/extra/libgnomecanvas/PKGBUILD b/abs/extra/libgnomecanvas/PKGBUILD index 7e419ed..9a5fac2 100644 --- a/abs/extra/libgnomecanvas/PKGBUILD +++ b/abs/extra/libgnomecanvas/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 30223 2009-03-17 18:18:11Z jgc $ +# $Id$ # Maintainer: Jan de Groot pkgname=libgnomecanvas -pkgver=2.26.0 +pkgver=2.30.3 pkgrel=1 pkgdesc="The GNOME Canvas library" arch=(i686 x86_64) license=('LGPL') -depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.20') +depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21') makedepends=('pkgconfig' 'intltool') options=('!libtool') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9bbc635e5ae70e63af071af74ba7e72f') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --disable-static \ + --enable-glade + make + make DESTDIR="${pkgdir}" install } -- cgit v0.12 From 3ca405f85ad235d170859610b72fffba13b7f142 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:52:22 -0500 Subject: htop: Bump to latest. --- abs/extra/htop/ChangeLog | 21 +++++++++++++++------ abs/extra/htop/PKGBUILD | 35 ++++++++++++++++++++++++----------- abs/extra/htop/htop-treeview.patch | 12 ------------ 3 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 abs/extra/htop/htop-treeview.patch diff --git a/abs/extra/htop/ChangeLog b/abs/extra/htop/ChangeLog index 7d77d0b..ea57762 100644 --- a/abs/extra/htop/ChangeLog +++ b/abs/extra/htop/ChangeLog @@ -1,8 +1,17 @@ +2011-05-17 Angel Velasquez + * Added patch to fix --sort-key (closes FS#23224) + +2009-09-21 Eric Belanger + + * htop 0.8.3-1 + * Upstream update + * Built with vserver and openvz support (close FS#12755) + 2008-12-09 Alexander Fehr - * htop-0.8.1-1: - New upstream release. - New maintainer. - Added patch to fix FS#12235. - Enabled Unicode support. - Added ChangeLog. + * htop-0.8.1-1: + * New upstream release + * New maintainer + * Added patch to fix FS#12235 + * Enabled Unicode support + * Added ChangeLog diff --git a/abs/extra/htop/PKGBUILD b/abs/extra/htop/PKGBUILD index 95b9660..05c8826 100644 --- a/abs/extra/htop/PKGBUILD +++ b/abs/extra/htop/PKGBUILD @@ -1,22 +1,35 @@ -# $Id: PKGBUILD 21081 2008-12-09 17:41:11Z alexanderf $ -# Maintainer: Alexander Fehr +# $Id$ +# Maintainer: Angel Velasquez +# Contributor: Eric Belanger +# Contributor: Daniel J Griffiths pkgname=htop -pkgver=0.8.3 -pkgrel=1 +pkgver=0.9 +pkgrel=2 pkgdesc="Interactive process viewer" arch=('i686' 'x86_64') url="http://htop.sourceforge.net/" license=('GPL') depends=('ncurses') +makedepends=('python2') options=('!emptydirs') -source=(http://downloads.sourceforge.net/htop/htop-$pkgver.tar.gz) +changelog=ChangeLog +source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz + htop.c.patch) +md5sums=('7c5507f35f363f3f40183a2ba3c561f8' + '750e8ad8476c5d9738da2a2bc7a7c2b6') build() { - cd "$srcdir/htop-$pkgver" - sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c || return 1 - ./configure --prefix=/usr --enable-unicode || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure + sed -i 's|python|python2|' scripts/MakeHeader.py + patch -Np0 -i $srcdir/htop.c.patch + ./configure --prefix=/usr --enable-unicode --enable-openvz \ + --enable-vserver + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } -md5sums=('5c9f093f9eaddf6e77aa6d54c2116d0c') diff --git a/abs/extra/htop/htop-treeview.patch b/abs/extra/htop/htop-treeview.patch deleted file mode 100644 index bcf6334..0000000 --- a/abs/extra/htop/htop-treeview.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur htop-0.8.1.orig/ProcessList.c htop-0.8.1/ProcessList.c ---- htop-0.8.1.orig/ProcessList.c 2008-09-23 08:23:14.000000000 +0200 -+++ htop-0.8.1/ProcessList.c 2008-12-09 15:14:56.000000000 +0100 -@@ -331,7 +331,7 @@ - - for (int i = Vector_size(this->processes) - 1; i >= 0; i--) { - Process* process = (Process*) (Vector_get(this->processes, i)); -- if (process->tgid == pid || (process->tgid == process->pid && process->ppid == pid)) { -+ if (process->tgid == pid || process->ppid == pid) { - Process* process = (Process*) (Vector_take(this->processes, i)); - Vector_add(children, process); - } -- cgit v0.12 From bb92086e89a343649e7aab3372b08c0c337d90bd Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 00:56:47 -0500 Subject: grep: Bump to latest. --- abs/core/grep/PKGBUILD | 14 +++++++++----- abs/core/grep/grep.install | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/abs/core/grep/PKGBUILD b/abs/core/grep/PKGBUILD index ee4628f..918ef58 100644 --- a/abs/core/grep/PKGBUILD +++ b/abs/core/grep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91020 2010-09-21 03:26:36Z allan $ +# $Id$ # Maintainer: Allan McRae # Contributor: judd pkgname=grep -pkgver=2.7 +pkgver=2.9 pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64') @@ -14,16 +14,20 @@ depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('6dd9931a52501519d7779a27cf953326') +md5sums=('25e41b2aa201104354740961ef36005a') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --bindir=/bin --without-included-regex - make || return 1 + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make check } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/abs/core/grep/grep.install b/abs/core/grep/grep.install index ba97d89..7cd3130 100644 --- a/abs/core/grep/grep.install +++ b/abs/core/grep/grep.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(grep.info) post_install() { -- cgit v0.12 From 856636fb0b73724edf39d0fb3057f545f82fc39e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 01:01:37 -0500 Subject: nano: Bump to latest. --- abs/core/nano/PKGBUILD | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/abs/core/nano/PKGBUILD b/abs/core/nano/PKGBUILD index 4b3b2d1..c58f7d1 100644 --- a/abs/core/nano/PKGBUILD +++ b/abs/core/nano/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 87034 2010-08-09 17:54:43Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke # Contributor: Judd pkgname=nano -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=1 pkgdesc="Pico editor clone with enhancements" arch=('i686' 'x86_64') license=('GPL') url="http://www.nano-editor.org" groups=('base') -depends=('glibc' 'ncurses') -source=(http://www.nano-editor.org/dist/v2.2/nano-${pkgver}.tar.gz) -backup=(etc/nanorc) +depends=('ncurses' 'sh') +backup=('etc/nanorc') install=nano.install -md5sums=('77a10a49589f975ce98350a4527a2ebf') +source=(http://www.nano-editor.org/dist/v2.2/${pkgname}-${pkgver}.tar.gz) +md5sums=('03233ae480689a008eb98feb1b599807') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --enable-color --enable-nanorc \ - --enable-multibuffer --disable-wrapping-as-root + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-color \ + --enable-nanorc \ + --enable-multibuffer \ + --disable-wrapping-as-root make } -- cgit v0.12 From 9f709796b8d27d9c98385c4d16e10a3f4e2ceadf Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 6 Aug 2011 13:03:54 -0500 Subject: initscripts: remove tty1 --- abs/core/initscripts/PKGBUILD | 8 +++++--- abs/core/initscripts/__changelog | 3 ++- abs/core/initscripts/inittab.patch | 10 ++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 abs/core/initscripts/inittab.patch diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD index 0e07da3..98f7856 100644 --- a/abs/core/initscripts/PKGBUILD +++ b/abs/core/initscripts/PKGBUILD @@ -5,7 +5,7 @@ pkgname=initscripts pkgver=2011.06.4 -pkgrel=3 +pkgrel=4 pkgdesc="System initialization/bootup scripts" arch=('i686' 'x86_64') url="http://www.archlinux.org" @@ -20,7 +20,7 @@ optdepends=('bridge-utils: Network bridging support' 'wireless_tools: Wireless networking') install=initscripts.install source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz" - 'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch') + 'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch' 'inittab.patch') @@ -31,6 +31,7 @@ package() { patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1 patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 patch -p0 < ${srcdir}/rc.multi.patch || exit 1 + patch -p0 < ${srcdir}/inittab.patch || exit 1 make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless.example } @@ -38,4 +39,5 @@ md5sums=('34cbe55f3f42069c59237db935d0511b' '027576534885b8d5dded9be546057b12' 'eaa31b96513d834b50d116cb51f9ebbe' '73abaf06450104bddf16d409015f81ab' - 'a166ea014a1c75860b14fc98825686cc') + 'a166ea014a1c75860b14fc98825686cc' + '521bbd001633d14b08e5471bea584ee4') diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog index 58bfd36..52f3642 100644 --- a/abs/core/initscripts/__changelog +++ b/abs/core/initscripts/__changelog @@ -1,7 +1,8 @@ -Patch init scripts +Patch init scripts (remove tty1, linhes header) patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1 patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 patch -p0 < ${srcdir}/rc.multi.patch || exit 1 + patch -p0 < ${srcdir}/inittab.patch || exit 1 rename wireless.conf -> wireless.conf.example diff --git a/abs/core/initscripts/inittab.patch b/abs/core/initscripts/inittab.patch new file mode 100644 index 0000000..d92bfed --- /dev/null +++ b/abs/core/initscripts/inittab.patch @@ -0,0 +1,10 @@ +--- inittab.orig 2011-08-06 17:44:17.563781289 +0000 ++++ inittab 2011-08-06 17:44:36.440448743 +0000 +@@ -24,7 +24,6 @@ + su:S:wait:/sbin/sulogin -p + + # -8 options fixes umlauts problem on login +-c1:2345:respawn:/sbin/agetty -8 -s 38400 tty1 linux + c2:2345:respawn:/sbin/agetty -8 -s 38400 tty2 linux + c3:2345:respawn:/sbin/agetty -8 -s 38400 tty3 linux + c4:2345:respawn:/sbin/agetty -8 -s 38400 tty4 linux -- cgit v0.12 From f7317c8282e9bfa0d071c29ab6285d40fe66c4fc Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 6 Aug 2011 13:04:13 -0500 Subject: mkinitcpio: add mkinitcpio-nfs-utils=>0.2 --- abs/core/mkinitcpio/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD index 66f4cae..69be999 100644 --- a/abs/core/mkinitcpio/PKGBUILD +++ b/abs/core/mkinitcpio/PKGBUILD @@ -3,12 +3,12 @@ pkgname=mkinitcpio pkgver=0.7.2 -pkgrel=6 +pkgrel=8 pkgdesc="Modular initramfs image creation utility" arch=(any) url="http://www.archlinux.org/" license=('GPL') -depends=('mkinitcpio-busybox>=1.16.1-2' 'mkinitcpio-nfs-utils' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' +depends=('mkinitcpio-busybox>=1.16.1-2' 'mkinitcpio-nfs-utils=>0.2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2009.01-2' 'udev>=171-2' 'file' 'gzip' 'which') optdepends=('xz: Use lzma or xz compression for the initramfs image' -- cgit v0.12 From d80eeccbe728ee24f473a6944754c68b781488d9 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 6 Aug 2011 13:12:36 -0500 Subject: linhes-config: remove tatir support --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/install_functions.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index ebc35f9..3821d1b 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -pkgrel=26 +pkgrel=27 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -106,7 +106,7 @@ md5sums=('c737f8538aea20fcb5f3903957e80837' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' 'd7a8cd4a0060399ae22e69f74e04eb07' - '7a45287a07145fde5aa664583d4f6fba' + 'd705eb26cd25862bf0e84cc9964bd3db' 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '8ac1cfd2eca0f641737da0d0aca416a7' '9ae8d79f620c6d19973c55c32a921874' diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh index 83a2bed..8f24835 100755 --- a/abs/core/LinHES-config/install_functions.sh +++ b/abs/core/LinHES-config/install_functions.sh @@ -148,11 +148,11 @@ if [ $found_remote -eq 1 ] then scan_for_hpg_receiver fi -printhl " Scanning for TatIR" -if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null -then - /usr/bin/PyroUsb.py > /dev/null 2>&1 & -fi +# printhl " Scanning for TatIR" +# if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null +# then +# /usr/bin/PyroUsb.py > /dev/null 2>&1 & +# fi if [ $found_remote -eq 1 ] then -- cgit v0.12 From 9709ca528ca5dfbdb6ec6ea283ac6670e8f33b9d Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 6 Aug 2011 13:12:54 -0500 Subject: tatir: make pkg for deletion --- abs/extra/tatir/__delete | 1 + 1 file changed, 1 insertion(+) create mode 100644 abs/extra/tatir/__delete diff --git a/abs/extra/tatir/__delete b/abs/extra/tatir/__delete new file mode 100644 index 0000000..61aca57 --- /dev/null +++ b/abs/extra/tatir/__delete @@ -0,0 +1 @@ +this pkg is marked to be removed -- cgit v0.12