Commit 2a0fc048 authored by Phil Miller's avatar Phil Miller

* sync with archlinux 2010-05-16-17:00

parent ce47e022
# $Id: PKGBUILD 60792 2009-12-07 05:18:18Z eric $
# $Id: PKGBUILD 77205 2010-04-11 13:15:21Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=acl
pkgver=2.2.48
pkgver=2.2.49
pkgrel=1
pkgdesc="Library for filesystem ACL support"
arch=('i686' 'x86_64')
url="http://oss.sgi.com/projects/xfs/"
url="http://savannah.nongnu.org/projects/acl"
license=('LGPL')
groups=('base')
depends=('attr>=2.4.41')
replaces=('xfsacl')
provides=('xfsacl')
conflicts=('xfsacl')
options=('!libtool')
source=(http://konnektion.ath.cx/sources/core/acl/acl-${pkgver}.src.tar.gz)
sha256sums=('b45e21549c9752ad9b99862cce79d7ec5ef4b32c3e95a39f79f0a8442b86476e')
source=(http://mirrors.zerg.biz/nongnu/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
sha256sums=('b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5')
build() {
cd $srcdir/acl-$pkgver
......
......@@ -9,7 +9,7 @@ pkgdesc="Firmware for the AR9170 wireless drivers"
arch=('any')
url="http://wireless.kernel.org/en/users/Drivers/ar9170"
license=('custom')
source=(http://konnektion.ath.cx/sources/core/${pkgname}/${pkgname}.tar.gz)
source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}.tar.gz)
md5sums=('258fb8056e7522a44e07fa2172153893')
build() {
......
......@@ -14,7 +14,7 @@ replaces=('xfsattr')
provides=('xfsattr')
conflicts=('xfsattr')
options=('!libtool')
source=(http://konnektion.ath.cx/sources/core/attr/attr-${pkgver}.src.tar.gz)
source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz)
sha256sums=('e01fa00686072a02dddf994e6217be950f51c1dc0852ad2e210c48b6e8de793a')
build() {
......
#
# KDEmod, mod[ded|ular] KDE packages for Arch Linux, part of chakra-project.org
#
# maintainer (i686): Jan Mette (funkyou) <funkyou @ kdemod.ath.cx>
# maintainer (x86_64): Martin Sandsmark (PhinnFort) <sandsmark @ kdemod.ath.cx>
# maintainer (x86_64): Phil Miller (Amnnon82) <philm @ chakra-project.org>
# include global config
source ../_buildsystem/${current_repo}-${_arch}_cfg.conf
pkgname=aufs2-util
pkgver=20100514
pkgrel=1chakra
pkgdesc="Another Unionfs Implementation that supports NFS branches"
arch=('i686' 'x86_64')
url="http://aufs.sourceforge.net/"
license=('GPL2')
depends=('glibc')
makedepends=('aufs2>=2.6.33_20100514' 'kernel26-headers')
replaces=('aufs-utils')
source=($pkgname-$pkgver.tar.gz)
md5sums=('411d4e94420d7b8c9a9bca620957292a')
options=('!splithdr' '!splitdbg')
build() {
cd $srcdir/$pkgname-$pkgver || return 1
# build
make || return 1
# install
#mkdir -p $pkgdir/{sbin,usr/bin,etc/default/aufs}
make DESTDIR=$pkgdir install || return 1
rm $pkgdir/usr/lib/libau.so.2
rm $pkgdir/usr/lib/libau.so
ln -sf libau.so.2.2 $pkgdir/usr/lib/libau.so.2
ln -sf libau.so.2.2 $pkgdir/usr/lib/libau.so
}
#!/bin/sh
#AUFS2VERSION=""
#KERNELVERSION=2.6.33
GITSNAPSHOT=20100514
# aufs2 (no -xx) for the latest -rc version.
if [ ! -d aufs2-util.git/.git ]; then
git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git aufs2-util.git
else
git pull
fi
cd aufs2-util.git
#git checkout origin/aufs2${AUFS2VERSION}
#*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
cd ..
rm -rf aufs2-util-${GITSNAPSHOT}
cp -a aufs2-util.git aufs2-util-${GITSNAPSHOT}
tar -czf aufs2-util-${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-util-${GITSNAPSHOT}
#
# KDEmod, mod[ded|ular] KDE packages for Arch Linux, part of chakra-project.org
#
# maintainer (i686): Jan Mette (funkyou) <funkyou @ kdemod.ath.cx>
# maintainer (x86_64): Martin Sandsmark (PhinnFort) <sandsmark @ kdemod.ath.cx>
# maintainer (x86_64): Phil Miller (Amnnon82) <philm @ chakra-project.org>
# include global config
source ../_buildsystem/${current_repo}-${_arch}_cfg.conf
pkgname=aufs2
pkgver=2.6.33_20100514
pkgrel=1chakra
_kernver=${pkgver%_*}-ARCH
pkgdesc="Another Unionfs Implementation"
arch=('i686' 'x86_64')
url="http://aufs.sourceforge.net/"
license=('GPL2')
depends=('kernel26>=2.6.33.4' 'kernel26<2.6.34')
makedepends=('kernel26-headers>=2.6.33' 'kernel26-headers<2.6.34')
replaces=('aufs')
install=${pkgname}.install
source=("${pkgname}-${pkgver}.tar.gz" 'writefix.patch')
options=(!makeflags)
md5sums=('0bf267301bd89f9d64a104b722da9cec'
'a31931b296cb37d5c9bec1ffd31e7fc1')
build() {
cd ${srcdir}/${pkgname}-${pkgver} || return 1
msg "add patches"
patch -Np1 -i $startdir/writefix.patch || return 1
msg "start config"
sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \
config.mk || return 1
if [ "${CARCH}" = "x86_64" ]; then
inot64=" y"
else
inot64=""
fi
sed -i "s|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 =${inot64}|" \
config.mk || return 1
# build
make KDIR=/usr/src/linux-${_kernver} || return 1
# install
install -D -m644 fs/aufs/aufs.ko \
$pkgdir/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko || return 1
# tweak the install script for the right kernel version
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
$startdir/$pkgname.install || return 1
# install include files
install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/src/linux-$_kernver/include/linux/aufs_type.h || return 1
}
post_install() {
KERNEL_VERSION=2.6.33-ARCH
depmod $KERNEL_VERSION
}
post_upgrade() {
KERNEL_VERSION=2.6.33-ARCH
depmod $KERNEL_VERSION
}
post_remove() {
KERNEL_VERSION=2.6.33-ARCH
depmod $KERNEL_VERSION
}
op=$1
shift
$op $*
#!/bin/sh
AUFS2VERSION="-33"
KERNELVERSION=2.6.33
GITSNAPSHOT=20100420
# aufs2 (no -xx) for the latest -rc version.
git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git
cd aufs2-standalone.git
git checkout origin/aufs2${AUFS2VERSION}
#*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
cd ..
rm -rf aufs2-${KERNELVERSIN}_${GITSNAPSHOT}
cp -a aufs2-standalone.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}
tar -czf aufs2-${KERNELVERSION}_${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}
diff --git a/fs/aufs/dynop.c b/fs/aufs/dynop.c
index 73c6195..a59aff0 100644
--- a/fs/aufs/dynop.c
+++ b/fs/aufs/dynop.c
@@ -176,22 +176,22 @@ static void dy_fop(struct au_dykey *key, const void *h_op,
AuDbg("%s\n", au_sbtype(h_sb));
- DySetFopForce(owner); /* force */
+ DySetFopForce(owner); /* force */
DySetFop(llseek);
DySetFop(read);
- DySetFop(write);
+ DySetFopForce(write); /* force */
DySetFop(aio_read);
- DySetFop(aio_write);
+ DySetFopForce(aio_write); /* force */
DySetFop(readdir);
DySetFop(poll);
DySetFop(ioctl);
- DySetFop(unlocked_ioctl);
+ DySetFopForce(unlocked_ioctl); /* force */
DySetFop(compat_ioctl);
DySetFop(mmap);
- DySetFopForce(open); /* force */
+ DySetFopForce(open); /* force */
DySetFop(flush);
- DySetFopForce(release); /* force */
- DySetFop(fsync);
+ DySetFopForce(release); /* force */
+ DySetFopForce(fsync); /* force */
DySetFop(aio_fsync);
DySetFop(fasync);
DySetFop(lock);
@@ -199,7 +199,7 @@ static void dy_fop(struct au_dykey *key, const void *h_op,
DySetFop(get_unmapped_area);
DySetFop(check_flags);
DySetFop(flock);
- DySetFop(splice_write);
+ DySetFopForce(splice_write); /* force */
DySetFop(splice_read);
DySetFop(setlease);
# $Id: PKGBUILD 59490 2009-11-24 04:57:35Z allan $
# $Id: PKGBUILD 77795 2010-04-18 03:56:24Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=autoconf
pkgver=2.65
pkgrel=1
pkgrel=2
pkgdesc="A GNU tool for automatically configuring source code"
arch=('any')
license=('GPL2' 'GPL3' 'custom')
......@@ -19,6 +19,10 @@ build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr
make || return 1
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install || return 1
# license exception
......
......@@ -2,6 +2,7 @@ infodir=/usr/share/info
filelist=(autoconf.info)
post_install() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done
......@@ -12,9 +13,8 @@ post_upgrade() {
}
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
# vim:set ts=2 sw=2 et:
......@@ -2,7 +2,7 @@
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgname=b43-fwcutter
pkgver=012
pkgver=013
pkgrel=1
pkgdesc="firmware extractor for the bcm43xx kernel module"
url="http://linuxwireless.org/en/users/Drivers/b43"
......@@ -10,7 +10,7 @@ depends=('glibc')
license=('GPL')
arch=('i686' 'x86_64')
source=(http://bu3sch.de/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2)
md5sums=('69eadf67b459f313a8d6b37aaabef96c')
md5sums=('3547ec6c474ac1bc2c4a5bb765b791a4')
build()
{
......
# $Id: PKGBUILD 66503 2010-01-31 12:15:27Z allan $
# $Id: PKGBUILD 76037 2010-04-06 14:44:45Z allan $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=bash
_patchlevel=002 #prepare for some patches
_patchlevel=005 #prepare for some patches
pkgver=4.1.$_patchlevel
pkgrel=2
pkgrel=1
pkgdesc="The GNU Bourne Again shell"
arch=('i686' 'x86_64')
license=('GPL')
......@@ -34,7 +34,7 @@ build() {
patch -Np0 -i ${p} || return 1
done
patch -Np0 -i ../enable-system-config-files.patch || return 1
patch -Np0 -i $srcdir/enable-system-config-files.patch || return 1
./configure --prefix=/usr --with-curses --enable-readline \
--without-bash-malloc --with-installed-readline \
......@@ -60,4 +60,7 @@ md5sums=('9800d8724815fd84994d9be65ab5e7b8'
'51725defa4c2dec49c1bc15883e0bee2'
'196697769f1667a8a1aed608811129c6'
'582dea5671b557f783e18629c2f77b68'
'118d465095d4a4706eb1d34696a2666a')
'118d465095d4a4706eb1d34696a2666a'
'120f7cf039a40d35fe375e59d6f17adc'
'336ee037fc2cc1e2350b05097fbdc87c'
'9471e666797f0b03eb2175ed752a9550')
# $Id: PKGBUILD 72655 2010-03-19 03:19:22Z allan $
# $Id: PKGBUILD 77602 2010-04-16 11:58:22Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=binutils
pkgver=2.20.1
pkgrel=1
pkgrel=2
_date=20100318
pkgdesc="A set of programs to assemble and manipulate binary and object files"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/binutils/"
license=('GPL')
groups=('base')
depends=('glibc>=2.11.1-2' 'zlib')
depends=('glibc>=2.11.1-3' 'zlib')
options=('!libtool' '!distcc' '!ccache')
install=binutils.install
source=(http://konnektion.ath.cx/sources/core/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
md5sums=('c153213a20a5075bd98d7f12fbd38a51')
mksource() {
......@@ -46,19 +46,23 @@ build() {
make configure-host || return 1
make tooldir=${pkgdir}/usr || return 1
}
package() {
cd ${srcdir}/build
make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
install -m644 ${srcdir}/include/libiberty.h ${pkgdir}/usr/include
if [ "${CARCH}" = "x86_64" ]; then
# Rebuild libiberty.a with -fPIC
make -C libiberty clean
make CFLAGS="$CFLAGS -fPIC" -C libiberty
install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib
# Rebuild libbfd.a with -fPIC
make -C bfd clean
make CFLAGS="$CFLAGS -fPIC" -C bfd
install -m644 bfd/libbfd.a ${pkgdir}/usr/lib
fi
# Rebuild libiberty.a with -fPIC
make -C libiberty clean
make CFLAGS="$CFLAGS -fPIC" -C libiberty
install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib
# Rebuild libbfd.a with -fPIC
make -C bfd clean
# hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd
install -m644 bfd/libbfd.a ${pkgdir}/usr/lib
rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
......
# $Id: PKGBUILD 13092 2008-09-25 22:04:38Z ronald $
# $Id: PKGBUILD 77956 2010-04-19 06:57:14Z allan $
# Maintainer:
# Contributor: Judd Vinet <judd@archlinux.org>
pkgname=bridge-utils
pkgver=1.4
pkgrel=2
pkgdesc="Layer2 ethernet bridging for Linux"
arch=(i686 x86_64)
pkgrel=3
pkgdesc="Utilities for configuring the Linux ethernet bridge"
arch=('i686' 'x86_64')
url="http://www.linuxfoundation.org/en/Net:Bridge"
license=('GPL2')
backup=('etc/conf.d/bridges')
depends=('glibc')
source=(http://downloads.sourceforge.net/bridge/bridge-utils-$pkgver.tar.gz \
bridges.conf.d)
md5sums=('0182fcac3a2b307113bbec34e5f1c673'
'f5d691282653580dd5fd4a1092ef365b')
build() {
cd $srcdir/$pkgname-$pkgver
......@@ -19,11 +22,12 @@ build() {
autoconf
./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
make || return 1
}
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install || return 1
# install config file
install -D -m644 ../bridges.conf.d $startdir/pkg/etc/conf.d/bridges
install -Dm644 $srcdir/bridges.conf.d $pkgdir/etc/conf.d/bridges
}
md5sums=('0182fcac3a2b307113bbec34e5f1c673'
'f5d691282653580dd5fd4a1092ef365b')
\ No newline at end of file
......@@ -2,14 +2,14 @@
pkgname=broadcom-wl
pkgver=5.60.48.36
pkgrel=1
pkgrel=2
pkgdesc="Broadcom 802.11abg Networking Drivers"
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86_32
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
url="http://www.broadcom.com/support/802.11/linux_sta.php"
license=('MIXED/Proprietary')
depends=('kernel26>=2.6.29' 'kernel26<2.6.33')
depends=('kernel26>=2.6.33' 'kernel26<2.6.34')
makedepends=(kernel26-headers)
install=broadcom-wl.install
source=("http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-${ARCH}-v${pkgver}.tar.gz")
......@@ -19,8 +19,10 @@ md5sums=(0466d863405e1ab99d5e288fe886e852)
build() {
# Adding line license
sed -i '190i\MODULE_LICENSE("Mixed/Proprietary"); \n' ${srcdir}/src/wl/sys/wl_linux.c
sed -i 's/linux\/autoconf.h/generated\/autoconf.h/' ${srcdir}/src/include/linuxver.h
# Building
KBUILD_NOPEDANTIC=1 make -C /lib/modules/$(uname -r)/build M=`pwd` || return 1
install -D -m 755 wl.ko ${pkgdir}/lib/modules/$(uname -r)/kernel/drivers/net/wireless/wl.ko || return 1
}
# $Id: PKGBUILD 57442 2009-10-31 15:25:46Z pierre $
# $Id: PKGBUILD 76140 2010-04-07 22:28:05Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=ca-certificates
pkgver=20090814
pkgrel=2
pkgrel=3
pkgdesc='Common CA certificates'
arch=('any')
url='http://packages.qa.debian.org/c/ca-certificates.html'
license=('MPL' 'GPL')
source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz")
depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
makedepends=('ruby')
makedepends=('ruby' 'python')
install=ca-certificates.install
backup=('etc/ca-certificates.conf')
md5sums=('307052c985bec7f9a00eb84293eef779')
......
......@@ -3,7 +3,7 @@ post_install() {
}
post_upgrade() {
usr/sbin/update-ca-certificates
usr/sbin/update-ca-certificates --fresh
}
pre_remove() {
......@@ -18,4 +18,4 @@ pre_remove() {
post_remove() {
# remove the cert file if it is empty
[[ -s etc/ssl/certs/ca-certificates.crt ]] || rm -f etc/ssl/certs/ca-certificates.crt
}
\ No newline at end of file
}
# $Id: PKGBUILD 72643 2010-03-19 03:05:11Z allan $
# $Id: PKGBUILD 78357 2010-04-22 02:43:20Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: ezzetabi <ezzetabi at gawab dot com>
pkgname=cloog-ppl
pkgver=0.15.8
pkgver=0.15.9
pkgrel=1
pkgdesc="Library that generates loops for scanning polyhedra"
arch=('i686' 'x86_64')
url="http://www.cloog.org/"
license=('GPL')
depends=('ppl>=0.10.2-3')
depends=('ppl')
options=('!libtool')
source=(ftp://gcc.gnu.org/pub/gcc/infrastructure/${pkgname}-${pkgver}.tar.gz)
md5sums=('b27bc188e3e99dca2923ce9323b8fb63')
md5sums=('806e001d1b1a6b130069ff6274900af5')
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr --infodir=/usr/share/info \
--with-bits=gmp --with-ppl=/usr
make || return 1
make
make check
}
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir/ install
}
# $Id: PKGBUILD 73375 2010-03-25 12:23:27Z andrea $
# $Id: PKGBUILD 76967 2010-04-09 10:09:44Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Contributor: damir <damir@archlinux.org>
......@@ -6,17 +6,17 @@
pkgname=cmake
pkgver=2.8.1
pkgrel=1
pkgrel=2
pkgdesc="A cross-platform open-source make system"
arch=('i686' 'x86_64')
license=('custom')
url="http://www.cmake.org"
depends=('expat' 'curl' 'gcc-libs' 'shared-mime-info')
# makedepends=('qt')
# optdepends=('qt: cmake-gui')
makedepends=('qt')
optdepends=('qt: cmake-gui')
install=${pkgname}.install
source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
md5sums=('a92ad653f9ccc1595d16cd9707f49acc')
md5sums=('feadc2e5ebbfed0efc90178583503725')
build() {
cd $srcdir/$pkgname-$pkgver
......@@ -24,11 +24,9 @@ build() {
--mandir=/share/man \
--docdir=/share/doc/cmake \
--system-libs \
--qt-gui \
--parallel=2
make || return 1
# --qt-gui \
}
package() {
......
# $Id: PKGBUILD 72649 2010-03-19 03:09:56Z allan $
# $Id: PKGBUILD 78872 2010-04-29 10:18:00Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=coreutils
pkgver=8.4
pkgrel=2
pkgver=8.5
pkgrel=1
pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
arch=('i686' 'x86_64')
license=('GPL3')
......@@ -17,19 +17,17 @@ replaces=('sh-utils' 'fileutils' 'textutils' 'mktemp')
backup=('etc/pam.d/su')
install=${pkgname}.install
options=('!emptydirs')
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
coreutils-i18n.patch
coreutils-uname.patch
coreutils-pam.patch
coreutils-6.10-configuration.patch
advcopy-0.2b-8.4.patch
su)
md5sums=('56f549854d723d9dcebb77919019df55'
'f88e6b4ce09e6d453f595d46d2a153b2'
md5sums=('55170ed640e300f5b81640c6f4641513'
'f92a989319c4c741d7c28d8fa6e01616'
'c4fcca138b6abf6d443d48a6f0cd8833'
'7efee4d5b3653711f9e229493316841c'
'dd4f472de8380104af3ac0ef920fae8b'
'57e881e7968d6747dba774128a830350'
'aad79a2aa6d566c375d7bdd1b0767278'
'12ef00fbc3a8c9594fea6aa55daff2aa'
'fa85e5cce5d723275b14365ba71a8aad')
build() {
......@@ -43,9 +41,6 @@ build() {
# from gentoo portage
patch -Np1 -i $srcdir/coreutils-uname.patch || return 1
# add progress bar to 'cp'
patch -Np1 -i $srcdir/advcopy-0.2b-8.4.patch || return 1
autoreconf -v
./configure --prefix=/usr \
--enable-install-program=su \
......@@ -74,6 +69,5 @@ build() {
ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep
mv chroot $pkgdir/usr/sbin
ln -sf test [
install -Dm644 $srcdir/su ${pkgdir}/etc/pam.d/su
}
......@@ -79,28 +79,14 @@ diff -urNp coreutils-8.4-orig/tests/Makefile.am coreutils-8.4/tests/Makefile.am
tail-2/inotify-hash-abuse2 \
tail-2/F-vs-rename \
tail-2/inotify-rotate \
diff -urNp coreutils-8.4-orig/tests/test-lib.sh coreutils-8.4/tests/test-lib.sh
--- coreutils-8.4-orig/tests/test-lib.sh 2010-01-03 18:06:20.000000000 +0100
+++ coreutils-8.4/tests/test-lib.sh 2010-01-14 10:28:17.000000000 +0100
@@ -218,8 +218,8 @@ skip_if_()
require_selinux_()
{
- case `ls -Zd .` in
- '? .'|'unlabeled .')
+ case `ls --scontext -d . | cut -f1 -d" "` in
+ '?'|'unlabeled')
skip_test_ "this system (or maybe just" \
"the current file system) lacks SELinux support"
;;
diff -urNp coreutils-8.4-orig/tests/touch/no-dereference coreutils-8.4/tests/touch/no-dereference
--- coreutils-8.4-orig/tests/touch/no-dereference 2010-01-12 15:36:17.000000000 +0100
+++ coreutils-8.4/tests/touch/no-dereference 2010-01-14 10:28:17.000000000 +0100
@@ -46,6 +46,8 @@ test -f nowhere && fail=1
grep '^#define HAVE_UTIMENSAT' "$CONFIG_HEADER" > /dev/null ||
grep '^#define HAVE_LUTIMES' "$CONFIG_HEADER" > /dev/null ||
grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null ||
grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null ||
skip_test_ 'this system lacks the utimensat function'
+grep '^#define HAVE_WORKINGKOJI' "$CONFIG_HEADER" > /dev/null ||
+grep '^#define HAVE_WORKINGKOJI 1' "$CONFIG_HEADER" > /dev/null ||
+ skip_test_ 'rest of the test disabled due to koji lack of utimensat function'
# Changing time of dangling symlink is okay.
......
diff -urNp coreutils-8.0-orig/lib/linebuffer.h coreutils-8.0/lib/linebuffer.h
--- coreutils-8.0-orig/lib/linebuffer.h 2009-10-06 10:59:48.000000000 +0200
+++ coreutils-8.0/lib/linebuffer.h 2009-10-07 10:07:16.000000000 +0200
diff -urNp coreutils-8.5-orig/lib/linebuffer.h coreutils-8.5/lib/linebuffer.h
--- coreutils-8.5-orig/lib/linebuffer.h 2010-04-23 15:44:00.000000000 +0200
+++ coreutils-8.5/lib/linebuffer.h 2010-04-26 14:24:33.000000000 +0200
@@ -21,6 +21,11 @@
# include <stdio.h>
......@@ -23,9 +23,9 @@ diff -urNp coreutils-8.0-orig/lib/linebuffer.h coreutils-8.0/lib/linebuffer.h
};
/* Initialize linebuffer LINEBUFFER for use. */
diff -urNp coreutils-8.0-orig/src/cut.c coreutils-8.0/src/cut.c
--- coreutils-8.0-orig/src/cut.c 2009-09-23 10:25:44.000000000 +0200
+++ coreutils-8.0/src/cut.c 2009-10-07 10:07:16.000000000 +0200
diff -urNp coreutils-8.5-orig/src/cut.c coreutils-8.5/src/cut.c
--- coreutils-8.5-orig/src/cut.c 2010-04-20 21:52:04.000000000 +0200
+++ coreutils-8.5/src/cut.c 2010-04-26 14:24:33.000000000 +0200
@@ -28,6 +28,11 @@
#include <assert.h>
#include <getopt.h>
......@@ -489,7 +489,7 @@ diff -urNp coreutils-8.0-orig/src/cut.c coreutils-8.0/src/cut.c
@@ -757,6 +1075,8 @@ main (int argc, char **argv)
bool ok;