summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFantix King2015-02-28 16:34:05 +0800
committerFantix King2015-12-30 05:07:58 +0800
commit7dbef44a70836d3f83aa4ac00541da024ea43698 (patch)
tree2c6c6ab146f50d1a63e0f436c48868611de7210d
parent099e20a6a7c745d5bd7716cbb289519e33ac4d0f (diff)
downloadaur-7dbef44a70836d3f83aa4ac00541da024ea43698.tar.gz
1.13.1-1.1
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD27
-rw-r--r--krb5-1.13.1-x32.patch12
-rw-r--r--krb5-config_LDFLAGS.patch4
4 files changed, 38 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 52dcbf76cd7..e26bdd3347e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Dec 29 21:06:17 UTC 2015
+# Tue Dec 29 21:07:48 UTC 2015
pkgbase = libx32-krb5
pkgdesc = The Kerberos network authentication system (x32 ABI)
- pkgver = 1.12.1
- pkgrel = 1
+ pkgver = 1.13.1
+ pkgrel = 1.1
url = http://web.mit.edu/kerberos/
arch = x86_64
license = custom
@@ -15,10 +15,12 @@ pkgbase = libx32-krb5
depends = libx32-keyutils
depends = krb5
options = !emptydirs
- source = http://web.mit.edu/kerberos/dist/krb5/1.12/krb5-1.12.1-signed.tar
+ source = http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.1-signed.tar
source = krb5-config_LDFLAGS.patch
- sha1sums = d59e8dc0fc9e1890e109cd033756539984e3d3fe
- sha1sums = 09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa
+ source = krb5-1.13.1-x32.patch
+ sha1sums = 2832695845d6c4cb0e7a622df4885f18acbd94cf
+ sha1sums = f125824ed37f31e6fd2fdb6a437be8ff1c3700ab
+ sha1sums = 928c1367fd48e055fa4ffcad01fd70d1beea22af
pkgname = libx32-krb5
diff --git a/PKGBUILD b/PKGBUILD
index cf49be58ccf..f0755581e13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 104719 2014-01-24 21:00:48Z bluewind $
-# Upstream Maintainer: Florian Pritz <flo@xinu.at>
+# $Id: PKGBUILD 127768 2015-02-16 02:18:22Z fyan $
+# Maintainer: Florian Pritz <flo@xinu.at>
# Contributor: St├ęphane Gaudreault <stephane@archlinux.org>
-# Maintainer: Fantix King <fantix.king at gmail.com>
+# x32 Maintainer: Fantix King <fantix.king at gmail.com>
_pkgbasename=krb5
pkgname=libx32-$_pkgbasename
-pkgver=1.12.1
-pkgrel=1
+pkgver=1.13.1
+pkgrel=1.1
pkgdesc="The Kerberos network authentication system (x32 ABI)"
arch=('x86_64')
url="http://web.mit.edu/kerberos/"
license=('custom')
depends=('libx32-e2fsprogs' 'libx32-libldap' 'libx32-keyutils' "$_pkgbasename")
makedepends=('perl' 'gcc-multilib-x32' 'bison')
-source=("http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.12/${_pkgbasename}-${pkgver}-signed.tar"
- krb5-config_LDFLAGS.patch)
-sha1sums=('d59e8dc0fc9e1890e109cd033756539984e3d3fe'
- '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa')
+source=("http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.13/${_pkgbasename}-${pkgver}-signed.tar"
+ krb5-config_LDFLAGS.patch
+ krb5-1.13.1-x32.patch)
+sha1sums=('2832695845d6c4cb0e7a622df4885f18acbd94cf'
+ 'f125824ed37f31e6fd2fdb6a437be8ff1c3700ab'
+ '928c1367fd48e055fa4ffcad01fd70d1beea22af')
options=('!emptydirs')
prepare() {
tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
- cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
# cf https://bugs.gentoo.org/show_bug.cgi?id=448778
- (cd build-tools; patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch; cd ..)
+ patch -p1 -i "${srcdir}"/krb5-config_LDFLAGS.patch
+
+ # x32
+ patch -p1 -i "${srcdir}"/krb5-1.13.1-x32.patch
}
build() {
diff --git a/krb5-1.13.1-x32.patch b/krb5-1.13.1-x32.patch
new file mode 100644
index 00000000000..eef8046a8a6
--- /dev/null
+++ b/krb5-1.13.1-x32.patch
@@ -0,0 +1,12 @@
+diff -ru krb5-1.13.1.orig/src/configure krb5-1.13.1/src/configure
+--- krb5-1.13.1.orig/src/configure 2015-02-12 11:17:07.000000000 +0800
++++ krb5-1.13.1/src/configure 2015-02-28 16:25:56.867892499 +0800
+@@ -8687,7 +8687,7 @@
+ *-*-linux* | *-*-gnu* | *-*-*bsd* | *-*-solaris*)
+ # All Unix-like platforms need -D__linux__ for iaesx64.s to
+ # use the System V x86-64 calling convention.
+- aesni_flags="-D__linux__ -f elf -m $aesni_machine"
++ aesni_flags="-D__linux__ -f elfx32 -m x32"
+ ;;
+ esac
+ if test "x$aesni_obj" != x && test "x$aesni_flags" != x; then
diff --git a/krb5-config_LDFLAGS.patch b/krb5-config_LDFLAGS.patch
index 0b300cb44a3..1b850867398 100644
--- a/krb5-config_LDFLAGS.patch
+++ b/krb5-config_LDFLAGS.patch
@@ -1,6 +1,6 @@
Bug #448778
---- krb5-1.11/src/krb5-config.in 2012-12-18 02:47:04.000000000 +0000
-+++ krb5-1.11/src/krb5-config.in 2012-12-28 07:13:16.582693363 +0000
+--- krb5-1.11/src/build-tools/krb5-config.in 2012-12-18 02:47:04.000000000 +0000
++++ krb5-1.11/src/build-tools/krb5-config.in 2012-12-28 07:13:16.582693363 +0000
@@ -217,7 +217,7 @@
-e 's#\$(PROG_RPATH)#'$libdir'#' \
-e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \