From 19f42937be8f6619a85663cb71e24c05b7e8b6d2 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 28 Apr 2011 22:32:07 +0000 Subject: Thu Apr 28 22:32:07 UTC 2011 --- community/cairo-compmgr/PKGBUILD | 8 +- community/dwm/PKGBUILD | 18 +- community/dwm/dwm.install | 17 - community/go/PKGBUILD | 6 +- community/kdenlive/PKGBUILD | 12 +- community/nut/PKGBUILD | 4 +- community/podofo/PKGBUILD | 6 +- community/redis/PKGBUILD | 9 +- community/texmaker/PKGBUILD | 4 +- extra/git/PKGBUILD | 14 +- extra/k9copy/PKGBUILD | 19 +- extra/libvncserver/PKGBUILD | 26 +- extra/lighttpd/PKGBUILD | 6 +- extra/lighttpd/lighttpd.rc.d | 2 +- extra/mono/PKGBUILD | 8 +- .../25-ntfs-config-write-policy.fdi | 42 ++ extra/ntfs-3g_ntfsprogs/PKGBUILD | 47 +++ extra/octave/PKGBUILD | 29 +- extra/octave/octave-3.4.0-gcc46.patch | 24 ++ extra/qhull/PKGBUILD | 49 +++ extra/qhull/qhull-2010.1-cmake-install.patch | 98 +++++ extra/qhull/qhull-2010.1-overflows.patch | 50 +++ extra/xchm/PKGBUILD | 14 +- extra/xsp/PKGBUILD | 8 +- staging/rasqal/PKGBUILD | 28 ++ staging/redland/PKGBUILD | 77 ++++ staging/redland/rpath.diff | 11 + staging/slv2/PKGBUILD | 32 ++ staging/slv2/slv2.changelog | 23 ++ staging/slv2/slv2.install | 14 + testing/coreutils/PKGBUILD | 69 ++++ testing/coreutils/coreutils-pam.patch | 428 +++++++++++++++++++++ testing/coreutils/coreutils-uname.patch | 173 +++++++++ testing/coreutils/coreutils.install | 21 + testing/coreutils/su.pam | 9 + testing/cronie/PKGBUILD | 12 +- testing/cronie/cron.deny | 1 + testing/cronie/crontab | 1 + testing/gnome-control-center/PKGBUILD | 14 +- .../gnome-control-center.install | 13 +- testing/libwebkit/PKGBUILD | 17 +- testing/libwebkit/gcc46.patch | 11 + testing/rasqal/PKGBUILD | 16 +- testing/redland/PKGBUILD | 25 +- testing/slv2/PKGBUILD | 6 +- testing/soprano/PKGBUILD | 8 +- 46 files changed, 1369 insertions(+), 160 deletions(-) create mode 100644 extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi create mode 100644 extra/ntfs-3g_ntfsprogs/PKGBUILD create mode 100644 extra/octave/octave-3.4.0-gcc46.patch create mode 100644 extra/qhull/PKGBUILD create mode 100644 extra/qhull/qhull-2010.1-cmake-install.patch create mode 100644 extra/qhull/qhull-2010.1-overflows.patch create mode 100644 staging/rasqal/PKGBUILD create mode 100644 staging/redland/PKGBUILD create mode 100644 staging/redland/rpath.diff create mode 100644 staging/slv2/PKGBUILD create mode 100644 staging/slv2/slv2.changelog create mode 100644 staging/slv2/slv2.install create mode 100644 testing/coreutils/PKGBUILD create mode 100644 testing/coreutils/coreutils-pam.patch create mode 100644 testing/coreutils/coreutils-uname.patch create mode 100644 testing/coreutils/coreutils.install create mode 100644 testing/coreutils/su.pam create mode 100644 testing/cronie/cron.deny create mode 100644 testing/cronie/crontab create mode 100644 testing/libwebkit/gcc46.patch diff --git a/community/cairo-compmgr/PKGBUILD b/community/cairo-compmgr/PKGBUILD index 2ece2b9bf..a023590bf 100644 --- a/community/cairo-compmgr/PKGBUILD +++ b/community/cairo-compmgr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42740 2011-03-20 09:26:47Z bluewind $ +# $Id: PKGBUILD 45705 2011-04-27 13:34:55Z bluewind $ # Maintainer: Florian Pritz # Contributor: Adam Hani Schakaki (krzd) # Contributor: Det @@ -10,14 +10,14 @@ pkgname=cairo-compmgr pkgver=git20110320 _commit=711fc7275b79cc802dc69658eb714ddc50666c06 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A Cairo based composite manager" arch=(i686 x86_64) url="http://cairo-compmgr.tuxfamily.org/" license=(GPL) -makedepends=(gettext gtk-doc "intltool>=0.41" gconf git) -depends=("gtk2>=2.16.0" "vala>=0.11.6" libsm) +makedepends=(gettext gtk-doc "intltool>=0.41" git) +depends=("gtk2>=2.16.0" "vala>=0.11.6" libsm gconf) install=cairo-compmgr.install options=(!libtool) #source=(http://download.tuxfamily.org/ccm/$pkgname/$pkgname-$pkgver.tar.gz) diff --git a/community/dwm/PKGBUILD b/community/dwm/PKGBUILD index fe5428ca6..5236301dc 100644 --- a/community/dwm/PKGBUILD +++ b/community/dwm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 18861 2010-06-16 09:09:52Z spupykin $ +# $Id: PKGBUILD 45679 2011-04-27 08:57:46Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Dag Odenhall # Contributor: Grigorios Bouzakis @@ -13,7 +13,7 @@ license=('MIT') options=(zipman) depends=('libx11' 'libxinerama') install=dwm.install -source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz \ +source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz config.h dwm.desktop) md5sums=('f0b422bfeaa812d66c6dd15c3cc92a6b' @@ -26,13 +26,15 @@ build() { cp $srcdir/config.h config.h sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk - sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk - sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk + sed -i 's/^CFLAGS = -g/#CFLAGS += -g/g' config.mk + sed -i 's/^#CFLAGS = -std/CFLAGS += -std/g' config.mk + sed -i 's/^LDFLAGS = -g/#LDFLAGS += -g/g' config.mk + sed -i 's/^#LDFLAGS = -s/LDFLAGS += -s/g' config.mk - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 || return 1 - make PREFIX=/usr DESTDIR=$pkgdir install || return 1 + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 + make PREFIX=/usr DESTDIR=$pkgdir install - install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE && \ - install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README && \ + install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README install -m644 -D $srcdir/dwm.desktop $pkgdir//etc/X11/sessions/dwm.desktop } diff --git a/community/dwm/dwm.install b/community/dwm/dwm.install index d4fa27e62..7415613df 100644 --- a/community/dwm/dwm.install +++ b/community/dwm/dwm.install @@ -4,25 +4,8 @@ pre_install() { /bin/true } -post_install() { - /bin/true -} - pre_upgrade() { echo "-- Edit config.h in PKGBUILD's directory (generally /var/abs/community/x11/dwm/)" echo "-- and rebuild package if you want to change settings." /bin/true } - -post_upgrade() { - /bin/true -} - -pre_remove() { - /bin/true -} - -post_remove() { - /bin/true -} - diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 55f26f725..fc6229e0a 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -5,9 +5,9 @@ # Contributor: Christian Himpel pkgname=go -pkgver=2011_02_15 -_pkgver=2011-02-15 +pkgver=r56 pkgrel=1 +epoch=1 pkgdesc='Google Go compiler and tools (release version)' arch=('i686' 'x86_64') url="http://golang.org/" @@ -48,7 +48,7 @@ build() { mkdir -p "$GOROOT/bin" cd "$GOROOT/src" - hg update release.$_pkgver + hg update release.$pkgver . ./make.bash } diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 70e1ab84c..d13e3dab9 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 43713 2011-03-29 10:19:44Z spupykin $ +# $Id: PKGBUILD 45687 2011-04-27 09:20:17Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Zuf # Contributor: Darwin Bautista pkgname=kdenlive -pkgver=0.7.8 -pkgrel=3 +pkgver=0.8 +pkgrel=1 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64') url="http://www.kdenlive.org/" license=('GPL') -depends=('kdebase-runtime' 'mlt' 'dvgrab') +depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz') makedepends=('automoc4' 'cmake' 'gettext') install=kdenlive.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7011d0c6b26f7f2350065defef3d9a76') +md5sums=('26170b4360285e8a7bf53fd122d8854e') build() { export LDFLAGS="$LDFLAGS -lX11" cd "${srcdir}" - mkdir build + mkdir build || true cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index e44333a5f..5ac4a6796 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Slash pkgname=nut -pkgver=16.9 +pkgver=16.10 pkgrel=1 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64') source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('1f5a56a372023f4dcfc5a31fef61f5dd') +md5sums=('7b360d0cc7fed5361f1220385af7aa1b') build() { cd ${pkgname}-${pkgver} diff --git a/community/podofo/PKGBUILD b/community/podofo/PKGBUILD index d6dee8ed0..05c69f99e 100644 --- a/community/podofo/PKGBUILD +++ b/community/podofo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42262 2011-03-15 21:34:00Z giovanni $ +# $Id: PKGBUILD 45713 2011-04-27 19:09:19Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > # Contributor: Preecha Patumchareonpol pkgname=podofo -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="A C++ library to work with the PDF file format" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff') makedepends=('cmake') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('2a9ac8cbb5e6575dbc00f083ad8996fb') +md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0') build() { cd ${pkgname}-${pkgver} diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 88f47bdf2..f790238a5 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 44372 2011-04-06 16:45:50Z spupykin $ +# $Id: PKGBUILD 45690 2011-04-27 09:20:54Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan-Erik Rediger # Contributor: nofxx .com> pkgname=redis -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') -url="http://code.google.com/p/redis" +url="http://redis.io/" +#url="http://code.google.com/p/redis" license=('BSD') depends=('bash') makedepends=('gcc>=3.1' 'make' 'pkgconfig') @@ -17,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('c98260dfab860da934d465e829ad0866' +md5sums=('fe6395bbd2cadc45f4f20f6bbe05ed09' 'bf61968d18d0e42529880f5c488ea9ed' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index bf7469df0..39d6c2a99 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Paulo Matias pkgname=texmaker -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc='Free cross-platform latex editor' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.xm1math.net/texmaker/index.html" license=('GPL') depends=('poppler-qt' 'ghostscript') source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0e96cbd3e8171363c2858fbe96eb1baa') +md5sums=('d375c8f486fe44f3f2a2a7d2ddac08f3') build() { cd ${pkgname}-${pkgver} diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index d7fde405c..63b14b164 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 118450 2011-04-07 01:40:08Z dan $ +# $Id: PKGBUILD 120940 2011-04-27 15:41:06Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.4.4 +pkgver=1.7.5 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -13,7 +13,9 @@ makedepends=('python2') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' 'perl-term-readkey: git svn' + 'perl-mime-tools: git send-email' 'perl-net-smtp-ssl: git send-email TLS support' + 'perl-authen-sasl: git send-email TLS support' 'python2: various helper scripts' 'subversion: git svn' 'cvsps: git cvsimport') @@ -69,11 +71,11 @@ package() { install -D -m644 $srcdir/git-daemon.conf $pkgdir/etc/conf.d/git-daemon.conf } -md5sums=('1313f71d62fa100b32fa313769a85f2a' - '5812f4fca4afc6c81e06f485111ec8ab' +md5sums=('7f0bc26a6e87d251c9b09fa05a186ed3' + '94cf18c292f0db30046092ef306bf57c' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('5c3e738b01a4021ade56abebfdcce8825d2a50868e5c7befb65102f497387aa0' - 'fa2ce1fd34a81dac1d8fca466dcd823ce1ed800ec5cb98d8bb2b0967deed19d0' +sha256sums=('7d293c5c0e544188d9b9ea94036cc56b39fbe045ead6f8ced00ad02a8854142d' + 'ced2319cbb48a4aa10bc5b1e1167a5de3b694eb9d256e68d978dbe86d997bee9' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/k9copy/PKGBUILD b/extra/k9copy/PKGBUILD index 4c53891b7..dfc334918 100644 --- a/extra/k9copy/PKGBUILD +++ b/extra/k9copy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87453 2010-08-13 20:02:16Z giovanni $ +# $Id: PKGBUILD 120930 2011-04-27 13:07:03Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Stefano Zamprogno pkgname=k9copy -pkgver=2.3.6 +pkgver=2.3.7 pkgrel=1 pkgdesc="A small utility which allows the copy of DVD under Linux" arch=('i686' 'x86_64') @@ -12,14 +12,19 @@ license=('GPL') depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor') makedepends=('automoc4' 'cmake') install=k9copy.install -source=(http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz) -md5sums=('c062dcb141a0320afe9dae0d36f87965') +source=("http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz") +md5sums=('bbfda2937f5027d31495df67dc29efa4') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop - cmake -DCMAKE_INSTALL_PREFIX=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-Source" + + make DESTDIR="${pkgdir}" install } diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD index e66042a65..a2d9302ee 100644 --- a/extra/libvncserver/PKGBUILD +++ b/extra/libvncserver/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 63372 2010-01-17 12:51:49Z andrea $ +# $Id: PKGBUILD 120955 2011-04-27 19:24:20Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=libvncserver -pkgver=0.9.7 -pkgrel=3 -pkgdesc="The vnc library" +pkgver=0.9.8 +pkgrel=1 +pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server" arch=('i686' 'x86_64') url="http://libvncserver.sourceforge.net/" license=('GPL') -depends=('libjpeg>=8' 'zlib') +depends=('libjpeg' 'zlib') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz) -md5sums=('14af5bdae461df4666c18e5f83c150c4') +source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz") +md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3') build() { - cd $srcdir/LibVNCServer-$pkgver - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}/LibVNCServer-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/LibVNCServer-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index d713582b6..346f19858 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118904 2011-04-09 11:33:06Z pierre $ +# $Id: PKGBUILD 120925 2011-04-27 13:05:01Z pierre $ # Maintainer: Pierre Schmitz pkgname=lighttpd pkgver=1.4.28 -pkgrel=5 +pkgrel=6 pkgdesc='a secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ options=('!libtool' 'emptydirs') source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf') md5sums=('586eb535d31ac299652495b058dd87c4' - 'eadffcda24d0d996032f8555ce9623c2' + '369f2eea6231342b514ca4777bf395c8' '913e2157fa78d990c32146f387d44c2b' '2803a9ee7f20409c69f1566d2d90720e') diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d index 32fdd0d08..345e889ae 100644 --- a/extra/lighttpd/lighttpd.rc.d +++ b/extra/lighttpd/lighttpd.rc.d @@ -44,7 +44,7 @@ test_config() { fi local piddir=$(dirname "$(get_pid_file)") - if [ ! -d "{$piddir}" ]; then + if [ ! -d "${piddir}" ]; then install -d -m755 -o http -g http "${piddir}" fi diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index fd54cc79f..d4fec3349 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112872 2011-03-07 12:41:38Z daniel $ +# $Id: PKGBUILD 120910 2011-04-27 09:25:47Z daniel $ # Maintainer: Daniel Isenmann # Contributor: Brice Carpentier pkgname=mono -pkgver=2.10.1 -pkgrel=2 +pkgver=2.10.2 +pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11') @@ -16,7 +16,7 @@ provides=('monodoc') conflicts=('monodoc') source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mono.rc.d) -md5sums=('ae8d1875447527599e68dd6c1d82bc11' +md5sums=('bff057dc3e56b8841bbb1abe053858bb' '8315e46c6a6e9625502521fc0ad1a322') build() { diff --git a/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi b/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi new file mode 100644 index 000000000..54195d8b3 --- /dev/null +++ b/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi @@ -0,0 +1,42 @@ + + + + + volume.fstype + volume.mount.valid_options + volume.unmount.valid_options + ntfs-3g + ro + atime + noatime + relatime + fake_rw + no_def_opts + default_permissions + umask= + fmask= + dmask= + uid= + gid= + show_sys_files + silent + force + remove_hiberfile + locale= + streams_interface= + debug + no_detatch + sync + dirsync + nodiratime + noexec + quiet + remount + exec + recover + norecover + lazy + ntfs-3g + + + diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD new file mode 100644 index 000000000..d9968d181 --- /dev/null +++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 120898 2011-04-27 08:00:36Z ronald $ +# Maintainer: Ronald van Haren +# Contributor: Thomas Bächler + +pkgbase=ntfs-3g_ntfsprogs +pkgname=('ntfs-3g' 'ntfsprogs') +pkgver=2011.4.12 +pkgrel=1 +url="http://www.tuxera.com" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('glibc' 'fuse') +makedepends=('pkgconfig') +options=('!libtool') +source=(http://tuxera.com/opensource/${pkgbase}-${pkgver}.tgz + 25-ntfs-config-write-policy.fdi) +sha1sums=('a4340ae611a3f26089f7d5601a86a5847517bff7' + '200029f2999a2c284fd30ae25734abf6459c3501') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \ + --with-fuse=external --disable-static --disable-gnome-vfs \ + --mandir=/usr/share/man + make +} + +package_ntfs-3g() { + pkgdesc="Stable read and write NTFS driver" + + for DIR in src libntfs-3g include; do + cd "${srcdir}/${pkgbase}-${pkgver}/${DIR}" + make DESTDIR="${pkgdir}" install + done + + ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs" + install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor" + install -m644 "${srcdir}/25-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/" +} + +package_ntfsprogs() { + pkgdesc="NTFS filesystem utilities" + depends=('util-linux' 'ntfs-3g') + + cd "${srcdir}/${pkgbase}-${pkgver}/ntfsprogs" + make DESTDIR="${pkgdir}" install +} diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index f7a6000e6..ce71a53e1 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,42 +1,38 @@ -# $Id: PKGBUILD 103149 2010-12-15 21:12:17Z ronald $ +# $Id: PKGBUILD 120945 2011-04-27 18:09:04Z ronald $ # Maintainer: Ronald van Haren # Contributor : shining # Contributor : cyberdune pkgname=octave -pkgver=3.2.4 +pkgver=3.4.0 pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" license=('GPL') -depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs') +depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull') makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting' 'umfpack: LU decomposition of some large sparse matrices') -source=("ftp://ftp.octave.org/pub/octave/octave-$pkgver.tar.bz2" - 'octave-3.2.0_as_needed.patch' 'octave-3.2.0_parallel_make.patch' 'imread.patch') +source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" + octave-3.4.0-gcc46.patch) options=('!emptydirs') -install=octave.install -md5sums=('608196657f4fa010420227b77333bb71' - '33c8886cd908ace40f8b60334df1c34f' - 'd59d783a8d7e8d8306caed4b2b8671a4' - '72d33ba1a862244f970cf259923815d9') +#install=octave.install +sha1sums=('936a8fc962abd96e7568fb5909ec2a4d7997a1a8' + '791c905a80510783e5f9c556c12f02400887fbec') build() { cd ${srcdir}/${pkgname}-${pkgver} - # gentoo patches - patch -Np1 -i ${srcdir}/octave-3.2.0_as_needed.patch - patch -Np1 -i ${srcdir}/octave-3.2.0_parallel_make.patch - patch -Np0 -i ${srcdir}/imread.patch - + # fedora gcc46 patch + patch -Np1 -i ${srcdir}/octave-3.4.0-gcc46.patch + # http://www.nabble.com/Random-rounding-errors-td16010966.html FFLAGS="-O -ffloat-store" \ ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static + --enable-shared --disable-static --disable-docs make } @@ -45,5 +41,4 @@ package(){ cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - } diff --git a/extra/octave/octave-3.4.0-gcc46.patch b/extra/octave/octave-3.4.0-gcc46.patch new file mode 100644 index 000000000..c174204ac --- /dev/null +++ b/extra/octave/octave-3.4.0-gcc46.patch @@ -0,0 +1,24 @@ +diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h +--- octave-3.4.0/liboctave/oct-alloc.h.gcc46 2011-02-08 03:00:51.000000000 -0700 ++++ octave-3.4.0/liboctave/oct-alloc.h 2011-02-08 09:41:23.984081687 -0700 +@@ -23,6 +23,8 @@ along with Octave; see the file COPYING. + #if !defined (octave_oct_alloc_h) + #define octave_oct_alloc_h 1 + ++#include ++ + class + OCTAVE_API + octave_allocator +diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc +--- octave-3.4.0/src/pr-output.cc.gcc46 2011-02-08 03:00:52.000000000 -0700 ++++ octave-3.4.0/src/pr-output.cc 2011-02-08 09:55:16.149662744 -0700 +@@ -3024,7 +3024,7 @@ abs (T x) + } + + #define INSTANTIATE_ABS(T) \ +- template /* static */ inline T abs (T) ++ template /* static */ T abs (T) + + INSTANTIATE_ABS(signed char); + INSTANTIATE_ABS(short); diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD new file mode 100644 index 000000000..ebd94380f --- /dev/null +++ b/extra/qhull/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 120895 2011-04-27 06:52:39Z ronald $ +# Maintainer: Ronald van Haren +# Contributor: Stefan Husmann +# Contributor: Jason Taylor +# Contributor: Darwin Bautista + +pkgname=qhull +pkgver=2010.1 +pkgrel=1 +pkgdesc="A general dimension code for computing convex hulls and related structures" +arch=('i686' 'x86_64') +url="http://www.qhull.org/" +license=('custom') +depends=('glibc') +makedepends=('cmake') +source=(http://www.qhull.org/download/$pkgname-$pkgver-src.tgz + qhull-2010.1-cmake-install.patch + qhull-2010.1-overflows.patch) +options=('!libtool') +sha1sums=('ed480912e03efdd767195c06c7e8c252c78112b1' + '0a7747eb13c2e07c25882c1f0f5c0dfb4ef1c8c0' + '21295d57af2f8cdfc775512fa44fe90f49d89c41') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # gentoo patches + patch -Np1 -i ${srcdir}/qhull-2010.1-cmake-install.patch + patch -Np1 -i ${srcdir}/qhull-2010.1-overflows.patch + + [ -d build ] || mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DDOC_INSTALL_DIR=/usr/share/doc \ + -DLIB_INSTALL_DIR=/usr/lib .. + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + + make DESTDIR=$pkgdir install + + # install manpages + install -Dm644 $srcdir/$pkgname-$pkgver/html/rbox.man $pkgdir/usr/share/man/man1/rbox.1 + install -Dm644 $srcdir/$pkgname-$pkgver/html/qhull.man $pkgdir/usr/share/man/man1/qhull.1 + + # Install license + install -Dm644 $srcdir/$pkgname-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/license.txt" +} diff --git a/extra/qhull/qhull-2010.1-cmake-install.patch b/extra/qhull/qhull-2010.1-cmake-install.patch new file mode 100644 index 000000000..9e1914d13 --- /dev/null +++ b/extra/qhull/qhull-2010.1-cmake-install.patch @@ -0,0 +1,98 @@ +diff -Nur qhull-2010.1.orig/CMakeLists.txt qhull-2010.1/CMakeLists.txt +--- qhull-2010.1.orig/CMakeLists.txt 2010-10-03 23:04:04.000000000 +0100 ++++ qhull-2010.1/CMakeLists.txt 2010-10-03 23:26:54.000000000 +0100 +@@ -1,8 +1,44 @@ + project(qhull) +-cmake_minimum_required(VERSION 2.4) +-if(COMMAND cmake_policy) +- cmake_policy(SET CMP0003 NEW) +-endif(COMMAND cmake_policy) ++cmake_minimum_required(VERSION 2.6) ++ ++ ++set(QHULL_VERSION "2010.1") ++ ++if(INCLUDE_INSTALL_DIR) ++else() ++set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include) ++endif() ++if(LIB_INSTALL_DIR) ++else() ++set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) ++endif() ++if(BIN_INSTALL_DIR) ++else() ++set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) ++endif() ++if(DOC_INSTALL_DIR) ++else() ++set(DOC_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/qhull) ++endif() ++ ++message(STATUS) ++message(STATUS "========== qhull Build Information ==========") ++message(STATUS "Build Version: ${QHULL_VERSION}") ++message(STATUS "Install Prefix (CMAKE_INSTALL_PREFIX): ${CMAKE_INSTALL_PREFIX}") ++message(STATUS "Binary Directory (BIN_INSTALL_DIR): ${BIN_INSTALL_DIR}") ++message(STATUS "Library Directory (LIB_INSTALL_DIR): ${LIB_INSTALL_DIR}") ++message(STATUS "Include Directory (INCLUDE_INSTALL_DIR): ${INCLUDE_INSTALL_DIR}") ++message(STATUS "Documentation Directory (DOC_INSTALL_DIR): ${DOC_INSTALL_DIR}") ++message(STATUS) ++message(STATUS "To change any of these options, override them using -D{OPTION_NAME} on the commandline.") ++message(STATUS "To build and install qhull, run \"make\" and \"make install\"") ++message(STATUS) ++ + + add_subdirectory(src) ++option(WITH_STATIC_LIBS "Build with a static library" OFF) ++option(WITH_DOCS "Install HTML documentation" OFF) + ++if (WITH_DOCS) ++install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}) ++endif (WITH_DOCS) +diff -Nur qhull-2010.1.orig/src/CMakeLists.txt qhull-2010.1/src/CMakeLists.txt +--- qhull-2010.1.orig/src/CMakeLists.txt 2010-10-03 23:04:04.000000000 +0100 ++++ qhull-2010.1/src/CMakeLists.txt 2010-10-04 00:23:47.000000000 +0100 +@@ -23,8 +23,25 @@ + + file(GLOB qhull_hdr *.h) + +-add_library(qhull ${qhull_src}) ++add_library(qhull SHARED ${qhull_src}) + target_link_libraries(qhull m) ++if(UNIX) ++ if(APPLE) ++ set_target_properties(qhull PROPERTIES ++ INSTALL_NAME_DIR "${LIB_INSTALL_DIR}") ++ else(APPLE) ++ set_target_properties(qhull PROPERTIES ++ INSTALL_RPATH "${LIB_INSTALL_DIR}" ++ INSTALL_RPATH_USE_LINK_PATH TRUE ++ BUILD_WITH_INSTALL_RPATH FALSE) ++ endif(APPLE) ++endif(UNIX) ++ ++if(WITH_STATIC_LIBS) ++ add_library(qhullstatic STATIC ${qhull_src}) ++ set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull") ++ install(TARGETS qhullstatic ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) ++endif(WITH_STATIC_LIBS) + + set(qhullcmd_SOURCES unix.c) + set(rbox_SOURCES rbox.c) +@@ -36,6 +53,7 @@ + + add_executable(qhullcmd ${qhullcmd_SOURCES}) + target_link_libraries(qhullcmd qhull) ++set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull") + + add_executable(rbox ${rbox_SOURCES}) + target_link_libraries(rbox qhull) +@@ -52,3 +70,7 @@ + add_executable(qhalf ${qhalf_SOURCES}) + target_link_libraries(qhalf qhull) + ++install(TARGETS qhull qhullcmd rbox qconvex qdelaunay qvoronoi qhalf ++ RUNTIME DESTINATION ${BIN_INSTALL_DIR} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}) ++install(FILES ${qhull_hdr} DESTINATION ${INCLUDE_INSTALL_DIR}/qhull) diff --git a/extra/qhull/qhull-2010.1-overflows.patch b/extra/qhull/qhull-2010.1-overflows.patch new file mode 100644 index 000000000..df4aa3da1 --- /dev/null +++ b/extra/qhull/qhull-2010.1-overflows.patch @@ -0,0 +1,50 @@ +From 176c01851026125f574a8223ad49ec58b2b58ec0 Mon Sep 17 00:00:00 2001 +From: Johannes Obermayr +Date: Fri, 23 Jul 2010 20:02:19 +0200 +Subject: [PATCH] Fix some serious compiler warnings causing build breakage on openSUSE. + +--- + src/global.c | 2 +- + src/rboxlib.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/global.c b/src/global.c +index 3c6141a..4c9f56c 100644 +--- a/src/global.c ++++ b/src/global.c +@@ -614,7 +614,7 @@ void qh_initflags(char *command) { + if (command <= &qh qhull_command[0] || command > &qh qhull_command[0] + sizeof(qh qhull_command)) { + if (command != &qh qhull_command[0]) { + *qh qhull_command= '\0'; +- strncat( qh qhull_command, command, sizeof( qh qhull_command)); ++ strncat(qh qhull_command, command, sizeof(qh qhull_command)-strlen(qh qhull_command)-1); + } + while (*s && !isspace(*s)) /* skip program name */ + s++; +diff --git a/src/rboxlib.c b/src/rboxlib.c +index 4f11d22..17d01ac 100644 +--- a/src/rboxlib.c ++++ b/src/rboxlib.c +@@ -124,7 +124,7 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) { + } + + *command= '\0'; +- strncat(command, rbox_command, sizeof(command)); ++ strncat(command, rbox_command, sizeof(command)-strlen(command)-1); + + while (*s && !isspace(*s)) /* skip program name */ + s++; +@@ -346,8 +346,8 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) { + } + }else if (israndom) { + seed= (int)time(&timedata); +- sprintf(seedbuf, " t%d", seed); /* appends an extra t, not worth removing */ +- strncat(command, seedbuf, sizeof(command)); ++ printf(seedbuf, " t%d", seed); /* appends an extra t, not worth removing */ ++ strncat(command, seedbuf, sizeof(command)-strlen(command)-1); + t= strstr(command, " t "); + if (t) + strcpy(t+1, t+3); /* remove " t " */ +-- +1.6.1 + diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD index 809e0ed05..c94f86115 100644 --- a/extra/xchm/PKGBUILD +++ b/extra/xchm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108735 2011-02-02 18:31:26Z giovanni $ +# $Id: PKGBUILD 120950 2011-04-27 19:00:34Z giovanni $ # Maintainer: Giovanni Scafora pkgname=xchm -pkgver=1.18 +pkgver=1.19 pkgrel=1 pkgdesc="A cross-platform GUI front-end to chmlib" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ install=xchm.install source=(http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz xchm.desktop xchm.xml) -md5sums=('07d7a910b3216301a002be5630c71866' +md5sums=('c9d65971801e044d51476f57e91909fc' '31fb9692b9ee9f2a205f58b9ff4bc4fe' '4102b0a393f5c60236143cc034664dd0') @@ -21,12 +21,12 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install || return 1 - install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop" || return 1 - install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml" || return 1 + make DESTDIR=${pkgdir} install + install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop" + install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml" } diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD index e78ba6aa7..85730ab32 100644 --- a/extra/xsp/PKGBUILD +++ b/extra/xsp/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 111514 2011-02-27 11:35:42Z daniel $ +# $Id: PKGBUILD 120915 2011-04-27 09:28:00Z daniel $ # Maintainer: Daniel Isenmann # Contributor: Tobias Kieslich pkgname=xsp -pkgver=2.10 +pkgver=2.10.2 pkgrel=1 pkgdesc="A simple webserver based on mono - provides ASP.NET support" arch=(i686 x86_64) license=('custom') url="http://www.go-mono.com" -depends=('mono>=2.10.1' 'sqlite3') +depends=('mono>=2.10.2' 'sqlite3') options=(!makeflags) install=${pkgname}.install source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp) -md5sums=('aec9369a00a9728801ea2587a1a8fd9c' +md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6' '9575bd7d6f64d51ba05bdd6370665858' '35d921df0fefc30f47a438c95d420efc' 'c917c07f68b945691506c29750db482f') diff --git a/staging/rasqal/PKGBUILD b/staging/rasqal/PKGBUILD new file mode 100644 index 000000000..c246d1528 --- /dev/null +++ b/staging/rasqal/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 121005 2011-04-27 20:12:19Z andrea $ +# Maintainer: AndyRTR +# Contributor: Lawrence Lee + +pkgname=rasqal +pkgver=0.9.25 +pkgrel=2 +pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" +url="http://librdf.org/rasqal" +license=('GPL' 'LGPL') +arch=('i686' 'x86_64') +depends=('raptor>=2.0.2' 'mpfr') +options=('!libtool') +source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) +md5sums=('ee12d7ad59c581eb65db89c851672c0a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --disable-static \ + --enable-release + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/redland/PKGBUILD b/staging/redland/PKGBUILD new file mode 100644 index 000000000..f8b337c91 --- /dev/null +++ b/staging/redland/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 121010 2011-04-27 20:14:39Z andrea $ +# Maintainer: AndyRTR +# Contributor: Francois Charette + +pkgbase=redland +pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') +pkgver=1.0.13 +pkgrel=2 +url="http://librdf.org/" +license=("GPL") +arch=('i686' 'x86_64') +makedepends=('rasqal>=0.9.25' 'raptor>=2.0.2' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +options=('!libtool') +source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz + rpath.diff) +md5sums=('96c15f36f842ad7e1c9d225e4ca97b68' + 'acc85e784f01a656bd56777f95880787') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --enable-release \ + --disable-static \ + --with-raptor=system \ + --with-rasqal=system \ + --with-sqlite=3 + + # nuke rpath + patch -Np0 -i ${srcdir}/rpath.diff + + make +} + +package_redland() { + pkgdesc="Library that provides a high-level interface to RDF data" + depends=('rasqal>=0.9.25' 'raptor>=2.0.2' 'libtool') + + cd ${srcdir}/${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} install + rm -rf ${pkgdir}/usr/lib/redland +} + +package_redland-storage-mysql() { + pkgdesc="MySQL storage support for Redland" + depends=('redland' 'libmysqlclient') + + cd ${srcdir}/${pkgbase}-${pkgver} + install -dm755 ${pkgdir}/usr/lib/redland + install -m755 src/.libs/librdf_storage_mysql.so ${pkgdir}/usr/lib/redland/librdf_storage_mysql.so +} + +package_redland-storage-postgresql() { + pkgdesc="PostgreSQL storage support for Redland" + depends=('redland' 'postgresql-libs') + + cd ${srcdir}/${pkgbase}-${pkgver} + install -dm755 ${pkgdir}/usr/lib/redland + install -m755 src/.libs/librdf_storage_postgresql.so ${pkgdir}/usr/lib/redland/ +} + +package_redland-storage-virtuoso() { + pkgdesc="Virtuoso storage support for Redland" + depends=('redland' 'unixodbc' 'db') + + cd ${srcdir}/${pkgbase}-${pkgver} + install -dm755 ${pkgdir}/usr/lib/redland + install -m755 src/.libs/librdf_storage_virtuoso.so ${pkgdir}/usr/lib/redland/ +} + +package_redland-storage-sqlite() { + pkgdesc="SQLite storage support for Redland" + depends=('redland' 'sqlite3' 'db') + + cd ${srcdir}/${pkgbase}-${pkgver} + install -dm755 ${pkgdir}/usr/lib/redland + install -m755 src/.libs/librdf_storage_sqlite.so ${pkgdir}/usr/lib/redland/ +} diff --git a/staging/redland/rpath.diff b/staging/redland/rpath.diff new file mode 100644 index 000000000..831bc80ed --- /dev/null +++ b/staging/redland/rpath.diff @@ -0,0 +1,11 @@ +--- libtool 2011-02-20 10:46:47.000000000 +0100 ++++ libtool.new 2011-02-20 10:52:58.285764909 +0100 +@@ -324,7 +324,7 @@ + + # Flag to hardcode $libdir into a binary during linking. + # This must work even if $libdir does not exist +-hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" ++hardcode_libdir_flag_spec=" " + + # If ld is used when linking, flag to hardcode $libdir into a binary + # during linking. This must work even if $libdir does not exist. diff --git a/staging/slv2/PKGBUILD b/staging/slv2/PKGBUILD new file mode 100644 index 000000000..bc8c1b69a --- /dev/null +++ b/staging/slv2/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 120997 2011-04-27 20:04:54Z andrea $ +# Maintainer: Ray Rashif +# Contributor: Leslie P. Polzer + +pkgname=slv2 +pkgver=0.6.6 +pkgrel=5 +pkgdesc="Library for LV2 hosts" +arch=('i686' 'x86_64') +url="http://drobilla.net/software/slv2" +license=('GPL') +depends=('redland>=1.0.13' 'lv2core' 'jack') +makedepends=('python2') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2) +md5sums=('b8e8e0e82dd04324fcd533e8acd1ce85') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf configure --prefix=/usr + python2 waf build $MAKEFLAGS +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf install --destdir="$pkgdir/" +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/slv2/slv2.changelog b/staging/slv2/slv2.changelog new file mode 100644 index 000000000..f394a5067 --- /dev/null +++ b/staging/slv2/slv2.changelog @@ -0,0 +1,23 @@ +22 Feb 2011 (GMT+8) Ray Rashif + + * 0.6.6-3: + raptor rebuild + +24 Nov 2010 (GMT+8) Ray Rashif + + * PKGBUILD : + Get rid of sed and use python2 directly for waf. + waf fix for python transition already included previously (unlogged). + Release only (no need binary update; no runtime python requirement). + +9 Aug 2010 (GMT+8) Ray Rashif + + * 0.6.6-2 : + Brought into extra from community for ardour + - adds "LV2" plug-ins support + + * PKGBUILD : + Minor cosmetic ammendments. + + * slv2.changelog : + Added this changelog. diff --git a/staging/slv2/slv2.install b/staging/slv2/slv2.install new file mode 100644 index 000000000..c980ddfab --- /dev/null +++ b/staging/slv2/slv2.install @@ -0,0 +1,14 @@ +post_install() { + echo "Updating Shared Library Links" + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD new file mode 100644 index 000000000..e63b4f02f --- /dev/null +++ b/testing/coreutils/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 120920 2011-04-27 11:05:23Z allan $ +# Maintainer: Allan McRae +# Contributor: judd + +pkgname=coreutils +pkgver=8.12 +pkgrel=1 +pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/coreutils" +groups=('base') +depends=('glibc' 'shadow' 'pam' 'acl' 'gmp' 'libcap') +replaces=('mktemp') +backup=('etc/pam.d/su') +install=${pkgname}.install +options=('!emptydirs') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz + coreutils-uname.patch + coreutils-pam.patch + su.pam) +md5sums=('0f7d43c2d2e24314b43a6c6267e25b90' + 'c4fcca138b6abf6d443d48a6f0cd8833' + 'aad79a2aa6d566c375d7bdd1b0767278' + 'fa85e5cce5d723275b14365ba71a8aad') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # added su wheel group pam patch (from fedora git) + patch -Np1 -i ${srcdir}/coreutils-pam.patch + + # linux specific uname improvement (from gentoo portage) + patch -Np1 -i ${srcdir}/coreutils-uname.patch + + autoreconf -v + ./configure --prefix=/usr \ + --enable-install-program=su \ + --enable-no-install-program=groups,hostname,kill,uptime \ + --enable-pam + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make RUN_EXPENSIVE_TESTS=yes check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + cd ${pkgdir}/usr/bin + install -dm755 ${pkgdir}/{bin,usr/sbin} + + # binaries required by FHS + _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ + mkdir mknod mv pwd rm rmdir stty su sync true uname" + mv ${_fhs} ${pkgdir}/bin + + # binaries required by various Arch scripts + _bin="cut dir dircolors du install mkfifo readlink shred \ + sleep touch tr vdir" + mv ${_bin} ${pkgdir}/bin + ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep + + mv chroot ${pkgdir}/usr/sbin + install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su +} diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch new file mode 100644 index 000000000..e61908f3f --- /dev/null +++ b/testing/coreutils/coreutils-pam.patch @@ -0,0 +1,428 @@ +diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac +--- coreutils-8.4-orig/configure.ac 2010-01-11 18:20:42.000000000 +0100 ++++ coreutils-8.4/configure.ac 2010-02-12 10:17:46.000000000 +0100 +@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then + AC_SUBST([GNULIB_WARN_CFLAGS]) + fi + ++dnl Give the chance to enable PAM ++AC_ARG_ENABLE(pam, dnl ++[ --enable-pam Enable use of the PAM libraries], ++[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM]) ++LIB_PAM="-ldl -lpam -lpam_misc" ++AC_SUBST(LIB_PAM)]) ++ + AC_FUNC_FORK + + optional_bin_progs= +diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi +--- coreutils-8.4-orig/doc/coreutils.texi 2010-01-03 18:06:20.000000000 +0100 ++++ coreutils-8.4/doc/coreutils.texi 2010-02-12 10:17:46.000000000 +0100 +@@ -15081,8 +15081,11 @@ to certain shells, etc.). + @findex syslog + @command{su} can optionally be compiled to use @code{syslog} to report + failed, and optionally successful, @command{su} attempts. (If the system +-supports @code{syslog}.) However, GNU @command{su} does not check if the +-user is a member of the @code{wheel} group; see below. ++supports @code{syslog}.) ++ ++This version of @command{su} has support for using PAM for ++authentication. You can edit @file{/etc/pam.d/su} to customize its ++behaviour. + + The program accepts the following options. Also see @ref{Common options}. + +@@ -15124,6 +15127,8 @@ environment variables except @env{TERM}, + @env{PATH} to a compiled-in default value. Change to @var{user}'s home + directory. Prepend @samp{-} to the shell's name, intended to make it + read its login startup file(s). ++Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables ++are preserved as well for PAM functionality. + + @item -m + @itemx -p +@@ -15163,33 +15168,6 @@ Exit status: + the exit status of the subshell otherwise + @end display + +-@cindex wheel group, not supported +-@cindex group wheel, not supported +-@cindex fascism +-@subsection Why GNU @command{su} does not support the @samp{wheel} group +- +-(This section is by Richard Stallman.) +- +-@cindex Twenex +-@cindex MIT AI lab +-Sometimes a few of the users try to hold total power over all the +-rest. For example, in 1984, a few users at the MIT AI lab decided to +-seize power by changing the operator password on the Twenex system and +-keeping it secret from everyone else. (I was able to thwart this coup +-and give power back to the users by patching the kernel, but I +-wouldn't know how to do that in Unix.) +- +-However, occasionally the rulers do tell someone. Under the usual +-@command{su} mechanism, once someone learns the root password who +-sympathizes with the ordinary users, he or she can tell the rest. The +-``wheel group'' feature would make this impossible, and thus cement the +-power of the rulers. +- +-I'm on the side of the masses, not that of the rulers. If you are +-used to supporting the bosses and sysadmins in whatever they do, you +-might find this idea strange at first. +- +- + @node timeout invocation + @section @command{timeout}: Run a command with a time limit + +diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am +--- coreutils-8.4-orig/src/Makefile.am 2010-01-03 18:06:20.000000000 +0100 ++++ coreutils-8.4/src/Makefile.am 2010-02-12 10:17:46.000000000 +0100 +@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP) + uptime_LDADD += $(GETLOADAVG_LIBS) + + # for crypt +-su_LDADD += $(LIB_CRYPT) ++su_LDADD += $(LIB_CRYPT) @LIB_PAM@ + + # for various ACL functions + copy_LDADD += $(LIB_ACL) +diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c +--- coreutils-8.4-orig/src/su.c 2010-02-12 10:15:15.000000000 +0100 ++++ coreutils-8.4/src/su.c 2010-02-12 10:24:29.000000000 +0100 +@@ -37,6 +37,16 @@ + restricts who can su to UID 0 accounts. RMS considers that to + be fascist. + ++#ifdef USE_PAM ++ ++ Actually, with PAM, su has nothing to do with whether or not a ++ wheel group is enforced by su. RMS tries to restrict your access ++ to a su which implements the wheel group, but PAM considers that ++ to be fascist, and gives the user/sysadmin the opportunity to ++ enforce a wheel group by proper editing of /etc/pam.conf ++ ++#endif ++ + Compile-time options: + -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. + -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. +@@ -53,6 +63,15 @@ + #include + #include + ++#ifdef USE_PAM ++# include ++# include ++# include ++# include ++# include ++# include ++#endif /* USE_PAM */ ++ + #include "system.h" + #include "getpass.h" + +@@ -120,10 +139,17 @@ + /* The user to become if none is specified. */ + #define DEFAULT_USER "root" + ++#ifndef USE_PAM + char *crypt (char const *key, char const *salt); ++#endif + +-static void run_shell (char const *, char const *, char **, size_t) ++static void run_shell (char const *, char const *, char **, size_t, ++ const struct passwd *) ++#ifdef USE_PAM ++ ; ++#else + ATTRIBUTE_NORETURN; ++#endif + + /* If true, pass the `-f' option to the subshell. */ + static bool fast_startup; +@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su + } + #endif + ++#ifdef USE_PAM ++static pam_handle_t *pamh = NULL; ++static int retval; ++static struct pam_conv conv = { ++ misc_conv, ++ NULL ++}; ++ ++#define PAM_BAIL_P if (retval) { \ ++ pam_end(pamh, PAM_SUCCESS); \ ++ return 0; \ ++} ++#define PAM_BAIL_P_VOID if (retval) { \ ++ pam_end(pamh, PAM_SUCCESS); \ ++return; \ ++} ++#endif ++ + /* Ask the user for a password. ++ If PAM is in use, let PAM ask for the password if necessary. + Return true if the user gives the correct password for entry PW, + false if not. Return true without asking for a password if run by UID 0 + or if PW has an empty password. */ +@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su + static bool + correct_password (const struct passwd *pw) + { ++#ifdef USE_PAM ++ struct passwd *caller; ++ char *tty_name, *ttyn; ++ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh); ++ PAM_BAIL_P; ++ ++ if (getuid() != 0 && !isatty(0)) { ++ fprintf(stderr, "standard in must be a tty\n"); ++ exit(1); ++ } ++ ++ caller = getpwuid(getuid()); ++ if(caller != NULL && caller->pw_name != NULL) { ++ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name); ++ PAM_BAIL_P; ++ } ++ ++ ttyn = ttyname(0); ++ if (ttyn) { ++ if (strncmp(ttyn, "/dev/", 5) == 0) ++ tty_name = ttyn+5; ++ else ++ tty_name = ttyn; ++ retval = pam_set_item(pamh, PAM_TTY, tty_name); ++ PAM_BAIL_P; ++ } ++ retval = pam_authenticate(pamh, 0); ++ PAM_BAIL_P; ++ retval = pam_acct_mgmt(pamh, 0); ++ if (retval == PAM_NEW_AUTHTOK_REQD) { ++ /* password has expired. Offer option to change it. */ ++ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); ++ PAM_BAIL_P; ++ } ++ PAM_BAIL_P; ++ /* must be authenticated if this point was reached */ ++ return 1; ++#else /* !USE_PAM */ + char *unencrypted, *encrypted, *correct; + #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP + /* Shadow passwd stuff for SVR3 and maybe other systems. */ +@@ -241,6 +324,7 @@ correct_password (const struct passwd *p + encrypted = crypt (unencrypted, correct); + memset (unencrypted, 0, strlen (unencrypted)); + return STREQ (encrypted, correct); ++#endif /* !USE_PAM */ + } + + /* Update `environ' for the new shell based on PW, with SHELL being +@@ -254,12 +338,18 @@ modify_environment (const struct passwd + /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. + Unset all other environment variables. */ + char const *term = getenv ("TERM"); ++ char const *display = getenv ("DISPLAY"); ++ char const *xauthority = getenv ("XAUTHORITY"); + if (term) + term = xstrdup (term); + environ = xmalloc ((6 + !!term) * sizeof (char *)); + environ[0] = NULL; + if (term) + xsetenv ("TERM", term); ++ if (display) ++ xsetenv ("DISPLAY", display); ++ if (xauthority) ++ xsetenv ("XAUTHORITY", xauthority); + xsetenv ("HOME", pw->pw_dir); + xsetenv ("SHELL", shell); + xsetenv ("USER", pw->pw_name); +@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw + { + #ifdef HAVE_INITGROUPS + errno = 0; +- if (initgroups (pw->pw_name, pw->pw_gid) == -1) ++ if (initgroups (pw->pw_name, pw->pw_gid) == -1) { ++#ifdef USE_PAM ++ pam_close_session(pamh, 0); ++ pam_end(pamh, PAM_ABORT); ++#endif + error (EXIT_CANCELED, errno, _("cannot set groups")); ++ } + endgrent (); + #endif + if (setgid (pw->pw_gid)) +@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw + error (EXIT_CANCELED, errno, _("cannot set user id")); + } + ++#ifdef USE_PAM ++static int caught=0; ++/* Signal handler for parent process later */ ++static void su_catch_sig(int sig) ++{ ++ ++caught; ++} ++ ++int ++pam_copyenv (pam_handle_t *pamh) ++{ ++ char **env; ++ ++ env = pam_getenvlist(pamh); ++ if(env) { ++ while(*env) { ++ if (putenv (*env)) ++ xalloc_die (); ++ env++; ++ } ++ } ++ return(0); ++} ++#endif ++ + /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. + If COMMAND is nonzero, pass it to the shell with the -c option. + Pass ADDITIONAL_ARGS to the shell as more arguments; there +@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw + + static void + run_shell (char const *shell, char const *command, char **additional_args, +- size_t n_additional_args) ++ size_t n_additional_args, const struct passwd *pw) + { + size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; + char const **args = xnmalloc (n_args, sizeof *args); + size_t argno = 1; ++#ifdef USE_PAM ++ int child; ++ sigset_t ourset; ++ int status; ++ ++ retval = pam_open_session(pamh,0); ++ if (retval != PAM_SUCCESS) { ++ fprintf (stderr, "could not open session\n"); ++ exit (1); ++ } ++ ++/* do this at the last possible moment, because environment variables may ++ be passed even in the session phase ++*/ ++ if(pam_copyenv(pamh) != PAM_SUCCESS) ++ fprintf (stderr, "error copying PAM environment\n"); ++ ++ /* Credentials should be set in the parent */ ++ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) { ++ pam_close_session(pamh, 0); ++ fprintf(stderr, "could not set PAM credentials\n"); ++ exit(1); ++ } ++ ++ child = fork(); ++ if (child == 0) { /* child shell */ ++ change_identity (pw); ++ pam_end(pamh, 0); ++#endif + + if (simulate_login) + { + char *arg0; + char *shell_basename; + ++ if(chdir(pw->pw_dir)) ++ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); ++ + shell_basename = last_component (shell); + arg0 = xmalloc (strlen (shell_basename) + 2); + arg0[0] = '-'; +@@ -344,6 +496,67 @@ run_shell (char const *shell, char const + error (0, errno, "%s", shell); + exit (exit_status); + } ++#ifdef USE_PAM ++ } else if (child == -1) { ++ fprintf(stderr, "can not fork user shell: %s", strerror(errno)); ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); ++ pam_close_session(pamh, 0); ++ pam_end(pamh, PAM_ABORT); ++ exit(1); ++ } ++ /* parent only */ ++ sigfillset(&ourset); ++ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) { ++ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME); ++ caught = 1; ++ } ++ if (!caught) { ++ struct sigaction action; ++ action.sa_handler = su_catch_sig; ++ sigemptyset(&action.sa_mask); ++ action.sa_flags = 0; ++ sigemptyset(&ourset); ++ if (sigaddset(&ourset, SIGTERM) ++ || sigaddset(&ourset, SIGALRM) ++ || sigaction(SIGTERM, &action, NULL) ++ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) { ++ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME); ++ caught = 1; ++ } ++ } ++ if (!caught) { ++ do { ++ int pid; ++ ++ pid = waitpid(-1, &status, WUNTRACED); ++ ++ if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) { ++ kill(getpid(), WSTOPSIG(status)); ++ /* once we get here, we must have resumed */ ++ kill(pid, SIGCONT); ++ } ++ } while (0 != WIFSTOPPED(status)); ++ } ++ ++ if (caught) { ++ fprintf(stderr, "\nSession terminated, killing shell..."); ++ kill (child, SIGTERM); ++ } ++ /* Not checking retval on this because we need to call close session */ ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); ++ retval = pam_close_session(pamh, 0); ++ PAM_BAIL_P_VOID; ++ retval = pam_end(pamh, PAM_SUCCESS); ++ PAM_BAIL_P_VOID; ++ if (caught) { ++ sleep(2); ++ kill(child, SIGKILL); ++ fprintf(stderr, " ...killed.\n"); ++ exit(-1); ++ } ++ exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status) ++ : WTERMSIG (status) + 128); ++#endif /* USE_PAM */ + } + + /* Return true if SHELL is a restricted shell (one not returned by +@@ -511,9 +724,9 @@ main (int argc, char **argv) + shell = xstrdup (shell ? shell : pw->pw_shell); + modify_environment (pw, shell); + ++#ifndef USE_PAM + change_identity (pw); +- if (simulate_login && chdir (pw->pw_dir) != 0) +- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); ++#endif + + /* error() flushes stderr, but does not check for write failure. + Normally, we would catch this via our atexit() hook of +@@ -523,5 +736,5 @@ main (int argc, char **argv) + if (ferror (stderr)) + exit (EXIT_CANCELED); + +- run_shell (shell, command, argv + optind, MAX (0, argc - optind)); ++ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw); + } diff --git a/testing/coreutils/coreutils-uname.patch b/testing/coreutils/coreutils-uname.patch new file mode 100644 index 000000000..b458abeba --- /dev/null +++ b/testing/coreutils/coreutils-uname.patch @@ -0,0 +1,173 @@ +On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. + +Prob not suitable for upstream seeing as how it's 100% linux-specific +http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html + +Patch originally by Carlos E. Gorges , but +heavily reworked to suck less. + +To add support for additional platforms, check out the show_cpuinfo() +func in the linux/arch// source tree of the kernel. + +--- coreutils/src/uname.c ++++ coreutils/src/uname.c +@@ -50,6 +50,11 @@ + # include + #endif + ++#if defined(__linux__) ++# define USE_PROCINFO ++# define UNAME_HARDWARE_PLATFORM ++#endif ++ + #include "system.h" + #include "error.h" + #include "quote.h" +@@ -138,6 +143,117 @@ + exit (status); + } + ++#if defined(USE_PROCINFO) ++ ++# if defined(__s390__) || defined(__s390x__) ++# define CPUINFO_FILE "/proc/sysinfo" ++# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" ++# else ++# define CPUINFO_FILE "/proc/cpuinfo" ++# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" ++# endif ++ ++# define PROCINFO_PROCESSOR 0 ++# define PROCINFO_HARDWARE_PLATFORM 1 ++ ++static void __eat_cpuinfo_space(char *buf) ++{ ++ /* first eat trailing space */ ++ char *tmp = buf + strlen(buf) - 1; ++ while (tmp > buf && isspace(*tmp)) ++ *tmp-- = '\0'; ++ /* then eat leading space */ ++ tmp = buf; ++ while (*tmp && isspace(*tmp)) ++ tmp++; ++ if (tmp != buf) ++ memmove(buf, tmp, strlen(tmp)+1); ++ /* finally collapse whitespace */ ++ tmp = buf; ++ while (tmp[0] && tmp[1]) { ++ if (isspace(tmp[0]) && isspace(tmp[1])) { ++ memmove(tmp, tmp+1, strlen(tmp)); ++ continue; ++ } ++ ++tmp; ++ } ++} ++ ++static int __linux_procinfo(int x, char *fstr, size_t s) ++{ ++ FILE *fp; ++ ++ char *procinfo_keys[] = { ++ /* --processor --hardware-platform */ ++ #if defined(__alpha__) ++ "cpu model", "system type" ++ #elif defined(__arm__) ++ "Processor", "Hardware" ++ #elif defined(__avr32__) ++ "processor", "cpu family" ++ #elif defined(__bfin__) ++ "CPU", "BOARD Name" ++ #elif defined(__cris__) ++ "cpu", "cpu model" ++ #elif defined(__frv__) ++ "CPU-Core", "System" ++ #elif defined(__i386__) || defined(__x86_64__) ++ "model name", "vendor_id" ++ #elif defined(__ia64__) ++ "family", "vendor" ++ #elif defined(__hppa__) ++ "cpu", "model" ++ #elif defined(__m68k__) ++ "CPU", "MMU" ++ #elif defined(__mips__) ++ "cpu model", "system type" ++ #elif defined(__powerpc__) || defined(__powerpc64__) ++ "cpu", "machine" ++ #elif defined(__s390__) || defined(__s390x__) ++ "Type", "Manufacturer" ++ #elif defined(__sh__) ++ "cpu type", "machine" ++ #elif defined(sparc) || defined(__sparc__) ++ "type", "cpu" ++ #elif defined(__vax__) ++ "cpu type", "cpu" ++ #else ++ "unknown", "unknown" ++ #endif ++ }; ++ ++ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { ++ char key[65], value[257], eol, *ret = NULL; ++ ++ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { ++ __eat_cpuinfo_space(key); ++ if (!strcmp(key, procinfo_keys[x])) { ++ __eat_cpuinfo_space(value); ++ ret = value; ++ break; ++ } ++ if (eol != '\n') { ++ /* we need two fscanf's here in case the previous ++ * length limit caused us to read right up to the ++ * newline ... doing "%*[^\n]\n" wont eat the newline ++ */ ++ fscanf(fp, "%*[^\n]"); ++ fscanf(fp, "\n"); ++ } ++ } ++ fclose(fp); ++ ++ if (ret) { ++ strncpy(fstr, ret, s); ++ return 0; ++ } ++ } ++ ++ return -1; ++} ++ ++#endif ++ + /* Print ELEMENT, preceded by a space if something has already been + printed. */ + +@@ -250,10 +344,14 @@ main (int argc, char **argv) + if (toprint & PRINT_PROCESSOR) + { + char const *element = unknown; +-#if HAVE_SYSINFO && defined SI_ARCHITECTURE ++#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) + { + static char processor[257]; ++#if defined(USE_PROCINFO) ++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) ++#else + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) ++#endif + element = processor; + } + #endif +@@ -306,9 +404,13 @@ main (int argc, char **argv) + if (element == unknown) + { + static char hardware_platform[257]; ++#if defined(USE_PROCINFO) ++ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) ++#else + size_t s = sizeof hardware_platform; + static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; + if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) ++#endif + element = hardware_platform; + } + #endif diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install new file mode 100644 index 000000000..8caae6686 --- /dev/null +++ b/testing/coreutils/coreutils.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(coreutils.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file.gz $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.gz $infodir/dir 2> /dev/null + done +} + diff --git a/testing/coreutils/su.pam b/testing/coreutils/su.pam new file mode 100644 index 000000000..cf15f40f1 --- /dev/null +++ b/testing/coreutils/su.pam @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/cronie/PKGBUILD b/testing/cronie/PKGBUILD index 6ae8c0714..13b1ef8fa 100644 --- a/testing/cronie/PKGBUILD +++ b/testing/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.7 -pkgrel=5 +pkgrel=6 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -11,13 +11,18 @@ arch=('i686' 'x86_64') depends=('pam' 'bash' 'run-parts') source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'cron.deny' + 'crontab' 'pam.d' 'rc.d') sha1sums=('c6644ba0e58bcb14e0bb3f925e3e8cc3f0d47a7f' + '0f279b8fb820340267d578dc85511c980715f91e' + '4059bc4ccb75f08b0d4970940799e5d9722b339f' '6d8aef6880935b3dcc3e28481111d036544eeae5' 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') -backup=('etc/anacrontab' +backup=('etc/crontab' + 'etc/anacrontab' 'etc/conf.d/crond' 'etc/pam.d/crond' 'etc/cron.deny') @@ -52,11 +57,12 @@ package() { install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond + install -Dm644 ../crontab "${pkgdir}"/etc/crontab + install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab - touch "${pkgdir}"/etc/cron.deny install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING } diff --git a/testing/cronie/cron.deny b/testing/cronie/cron.deny new file mode 100644 index 000000000..06e685cc8 --- /dev/null +++ b/testing/cronie/cron.deny @@ -0,0 +1 @@ +# without this file, only users listed in /etc/cron.allow can use crontab diff --git a/testing/cronie/crontab b/testing/cronie/crontab new file mode 100644 index 000000000..f2ce71030 --- /dev/null +++ b/testing/cronie/crontab @@ -0,0 +1 @@ +# without this file, crond disables inotify support at startup diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD index 6b8d4b321..97f803ce8 100644 --- a/testing/gnome-control-center/PKGBUILD +++ b/testing/gnome-control-center/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 120752 2011-04-26 11:03:14Z heftig $ +# $Id: PKGBUILD 120905 2011-04-27 08:37:19Z ibiru $ # Maintainer: Jan de Groot pkgname=gnome-control-center -pkgver=3.0.1 +pkgver=3.0.1.1 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gconf' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice') +depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop') optdepends=('mesa-demos: provides glxinfo for graphics information' 'apg: adds password generation for user accounts') makedepends=('gnome-doc-utils' 'intltool' 'networkmanager') @@ -16,7 +16,7 @@ install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('90dde4b3db8b7a9c973f71e15601fd176ad6746cfef63c818fbdfd2254a8e99f') +sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,10 +29,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-control-center-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + make DESTDIR="${pkgdir}" install } diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install index 8f0bc46fb..eb703319f 100644 --- a/testing/gnome-control-center/gnome-control-center.install +++ b/testing/gnome-control-center/gnome-control-center.install @@ -1,18 +1,19 @@ pkgname=gnome-control-center post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} +post_upgrade() { + post_install $1 } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install $1 } diff --git a/testing/libwebkit/PKGBUILD b/testing/libwebkit/PKGBUILD index e5a75d6af..1e32e8195 100644 --- a/testing/libwebkit/PKGBUILD +++ b/testing/libwebkit/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 116332 2011-03-22 22:04:47Z ibiru $ +# $Id: PKGBUILD 121025 2011-04-27 21:44:28Z ibiru $ # Maintainer: Andreas Radke pkgbase=libwebkit pkgname=(libwebkit libwebkit3) -pkgver=1.3.13 +pkgver=1.4.0 pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') url="http://webkitgtk.org/" license=('custom') -depends=('libxt' 'libxslt' 'sqlite3' 'icu>=4.6' 'gstreamer0.10-base' 'libsoup' 'enchant') +depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant') makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') options=('!libtool') install=libwebkit.install -source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz) -md5sums=('984adaafac545a89c24351fd4dbd743c') +source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz gcc46.patch) +md5sums=('10c969db3b5484c71df1aa9a338377ff' + '970a2fa91b9827dff8e9b9edb4867701') build() { cd "${srcdir}/webkit-${pkgver}" + patch -Np1 -i "${srcdir}/gcc46.patch" mkdir build-gtk{2,3} ( cd build-gtk2 && _build --with-gtk=2.0 ) @@ -26,10 +28,9 @@ build() { _build() { PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ - --enable-video --enable-introspection \ + --enable-introspection \ --with-font-backend=freetype --enable-gtk-doc \ - --enable-jit --with-unicode-backend=icu \ - --enable-3d-transforms --enable-mathml \ + --with-unicode-backend=icu \ --enable-spellcheck "$@" make all stamp-po } diff --git a/testing/libwebkit/gcc46.patch b/testing/libwebkit/gcc46.patch new file mode 100644 index 000000000..befd892d4 --- /dev/null +++ b/testing/libwebkit/gcc46.patch @@ -0,0 +1,11 @@ +Index: trunk/Source/WebCore/dom/make_names.pl +=================================================================== +--- trunk/Source/WebCore/dom/make_names.pl (revision 73989) ++++ trunk/Source/WebCore/dom/make_names.pl (revision 84123) +@@ -66,5 +66,5 @@ + $gccLocation = "/usr/bin/gcc"; + } +-my $preprocessor = $gccLocation . " -E -P -x c++"; ++my $preprocessor = $gccLocation . " -E -x c++"; + + GetOptions( diff --git a/testing/rasqal/PKGBUILD b/testing/rasqal/PKGBUILD index 6844bb6b5..b353c6437 100644 --- a/testing/rasqal/PKGBUILD +++ b/testing/rasqal/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 110912 2011-02-23 06:19:55Z andyrtr $ +# $Id: PKGBUILD 120960 2011-04-27 19:27:24Z andrea $ # Maintainer: AndyRTR # Contributor: Lawrence Lee pkgname=rasqal -pkgver=0.9.25 +epoch=1 +pkgver=0.9.21 pkgrel=1 -pkgdesc="a free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" +pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" url="http://librdf.org/rasqal" license=('GPL' 'LGPL') arch=('i686' 'x86_64') -depends=('raptor>=2.0.0' 'mpfr') +depends=('raptor1' 'mpfr') options=('!libtool') +replaces=('rasqal-compat') +conflicts=('rasqal-compat') source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) -md5sums=('ee12d7ad59c581eb65db89c851672c0a') +md5sums=('55b67ec92a059ef8979d46486b00a032') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ --disable-static \ - --enable-release \ - --with-raptor=system + --enable-release make } diff --git a/testing/redland/PKGBUILD b/testing/redland/PKGBUILD index f2a25aaa0..1ae150d37 100644 --- a/testing/redland/PKGBUILD +++ b/testing/redland/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 110595 2011-02-20 10:39:16Z andyrtr $ +# $Id: PKGBUILD 120965 2011-04-27 19:29:40Z andrea $ # Maintainer: AndyRTR # Contributor: Francois Charette pkgbase=redland +epoch=1 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') -pkgver=1.0.13 +pkgver=1.0.12 pkgrel=1 url="http://librdf.org/" license=("GPL") arch=('i686' 'x86_64') -makedepends=('rasqal>=0.9.24' 'raptor>=2.0.0' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +makedepends=('rasqal>=0.9.21' 'raptor1' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') options=('!libtool') source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz - rpath.diff) -md5sums=('96c15f36f842ad7e1c9d225e4ca97b68' + rpath.diff) +md5sums=('40f37a5ad97fdfbf984f78dcea0c6115' 'acc85e784f01a656bd56777f95880787') build() { @@ -33,9 +34,11 @@ build() { package_redland() { pkgdesc="Library that provides a high-level interface to RDF data" - depends=('rasqal>=0.9.24' 'raptor>=2.0.0' 'libtool') + depends=('rasqal>=0.9.21' 'raptor1' 'libtool') + replaces=('redland-compat' 'redland-compat-devel') + conflicts=('redland-compat' 'redland-compat-devel') - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/usr/lib/redland } @@ -44,7 +47,7 @@ package_redland-storage-mysql() { pkgdesc="MySQL storage support for Redland" depends=('redland' 'libmysqlclient') - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} install -dm755 ${pkgdir}/usr/lib/redland install -m755 src/.libs/librdf_storage_mysql.so ${pkgdir}/usr/lib/redland/librdf_storage_mysql.so } @@ -53,7 +56,7 @@ package_redland-storage-postgresql() { pkgdesc="PostgreSQL storage support for Redland" depends=('redland' 'postgresql-libs') - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} install -dm755 ${pkgdir}/usr/lib/redland install -m755 src/.libs/librdf_storage_postgresql.so ${pkgdir}/usr/lib/redland/ } @@ -62,7 +65,7 @@ package_redland-storage-virtuoso() { pkgdesc="Virtuoso storage support for Redland" depends=('redland' 'unixodbc' 'db') - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} install -dm755 ${pkgdir}/usr/lib/redland install -m755 src/.libs/librdf_storage_virtuoso.so ${pkgdir}/usr/lib/redland/ } @@ -71,7 +74,7 @@ package_redland-storage-sqlite() { pkgdesc="SQLite storage support for Redland" depends=('redland' 'sqlite3' 'db') - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} install -dm755 ${pkgdir}/usr/lib/redland install -m755 src/.libs/librdf_storage_sqlite.so ${pkgdir}/usr/lib/redland/ } diff --git a/testing/slv2/PKGBUILD b/testing/slv2/PKGBUILD index 300d19d08..c57af2dde 100644 --- a/testing/slv2/PKGBUILD +++ b/testing/slv2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 110735 2011-02-21 22:14:42Z schiv $ +# $Id: PKGBUILD 120979 2011-04-27 19:40:32Z andrea $ # Maintainer: Ray Rashif # Contributor: Leslie P. Polzer pkgname=slv2 pkgver=0.6.6 -pkgrel=3 +pkgrel=4 pkgdesc="Library for LV2 hosts" arch=('i686' 'x86_64') url="http://drobilla.net/software/slv2" license=('GPL') -depends=('redland>=1.0.13' 'lv2core' 'jack') +depends=('redland>=1.0.12' 'lv2core' 'jack') makedepends=('python2') install=$pkgname.install changelog=$pkgname.changelog diff --git a/testing/soprano/PKGBUILD b/testing/soprano/PKGBUILD index d5ebcdb44..80c4634ae 100644 --- a/testing/soprano/PKGBUILD +++ b/testing/soprano/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 120527 2011-04-24 17:41:42Z andyrtr $ +# $Id: PKGBUILD 120970 2011-04-27 19:34:01Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=soprano pkgver=2.6.0 -pkgrel=3 +pkgrel=4 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') -depends=('qt' 'clucene' 'redland-compat' 'libiodbc' 'raptor1') -makedepends=('cmake' 'openjdk6' 'doxygen' 'redland-compat-devel>=>=1.0.12-3' 'rasqal-compat-devel>=>=0.9.21-2') +depends=('qt' 'clucene' 'redland-storage-virtuoso' 'libiodbc') +makedepends=('cmake' 'openjdk6' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('03ae49e87c6ec99e57d0433c2650846f') -- cgit v1.2.3-54-g00ecf