diff options
| -rw-r--r-- | core/util-linux/PKGBUILD | 26 | ||||
| -rw-r--r-- | extra/gnutls/PKGBUILD | 1 |
2 files changed, 5 insertions, 22 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 7680e2afb..818051b79 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.20 -pkgrel=3 +pkgver=2.20.1 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64' 'mips64el') @@ -15,23 +15,13 @@ conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') provides=('linux32' "util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2 - agetty-typo.patch - write-freopen.patch - dmesg-non-printk.patch - dmesg-space.patch - dont-close-0.patch - fix-remount.patch) +#source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2) optdepends=('perl: for chkdupexe support') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # patches from master - for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch dont-close-0.patch fix-remount.patch; do - patch -Np1 -i "${srcdir}/${patch}" - done - # hardware clock sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h @@ -52,10 +42,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('4dcacdbdafa116635e52b977d9d0e879' - '13838c6dd8df686e0f01ad0f236d2690' - '465817ff8f7c08411c8011ee91b50318' - 'f3ca75a1a22a2a739c5c22d92dc07ab0' - 'd9768f0b42d36d72c02ac7797b922ba1' - '37eae52af90c214dda73874c701fa246' - '344c780b9e08826dd8befe4271b41ed3') +md5sums=('079b37517fd4e002a2e6e992e8b4e361') diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 441a988e0..388da42fd 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -10,7 +10,6 @@ license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -<<<<<<< HEAD depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') [ "$CARCH" = "mips64el" ] || makedepends=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz |