[arch-commits] Commit in python-pykerberos/repos (6 files)
Felix Yan
fyan at archlinux.org
Mon Apr 18 14:28:46 UTC 2016
Date: Monday, April 18, 2016 @ 16:28:45
Author: fyan
Revision: 171357
archrelease: copy trunk to community-i686, community-x86_64
Added:
python-pykerberos/repos/community-i686/PKGBUILD
(from rev 171356, python-pykerberos/trunk/PKGBUILD)
python-pykerberos/repos/community-i686/issue15.patch
(from rev 171356, python-pykerberos/trunk/issue15.patch)
python-pykerberos/repos/community-x86_64/PKGBUILD
(from rev 171356, python-pykerberos/trunk/PKGBUILD)
python-pykerberos/repos/community-x86_64/issue15.patch
(from rev 171356, python-pykerberos/trunk/issue15.patch)
Deleted:
python-pykerberos/repos/community-i686/PKGBUILD
python-pykerberos/repos/community-x86_64/PKGBUILD
--------------------------------+
/PKGBUILD | 94 +++++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 42 -----------------
community-i686/issue15.patch | 22 +++++++++
community-x86_64/PKGBUILD | 42 -----------------
community-x86_64/issue15.patch | 22 +++++++++
5 files changed, 138 insertions(+), 84 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-04-18 14:28:11 UTC (rev 171356)
+++ community-i686/PKGBUILD 2016-04-18 14:28:45 UTC (rev 171357)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgbase=python-pykerberos
-pkgname=('python-pykerberos' 'python2-pykerberos')
-pkgver=1.1.10
-pkgrel=1
-pkgdesc="High-level interface to Kerberos"
-arch=('i686' 'x86_64')
-license=('Apache')
-url="https://github.com/02strich/pykerberos"
-makedepends=('python-setuptools' 'python2-setuptools' 'krb5' 'git')
-source=("git+https://github.com/02strich/pykerberos.git#tag=v$pkgver")
-sha512sums=('SKIP')
-
-prepare() {
- cp -a pykerberos{,-py2}
-}
-
-build() {
- cd "$srcdir"/pykerberos
- python setup.py build
-
- cd "$srcdir"/pykerberos-py2
- python2 setup.py build
-}
-
-package_python-pykerberos() {
- depends=('python' 'krb5')
-
- cd pykerberos
- python setup.py install --root="${pkgdir}" --optimize=1
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-pykerberos() {
- depends=('python2' 'krb5')
-
- cd pykerberos-py2
- python2 setup.py install --root="${pkgdir}" --optimize=1
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: python-pykerberos/repos/community-i686/PKGBUILD (from rev 171356, python-pykerberos/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-04-18 14:28:45 UTC (rev 171357)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=python-pykerberos
+pkgname=('python-pykerberos' 'python2-pykerberos')
+pkgver=1.1.10
+pkgrel=2
+pkgdesc="High-level interface to Kerberos"
+arch=('i686' 'x86_64')
+license=('Apache')
+url="https://github.com/02strich/pykerberos"
+makedepends=('python-setuptools' 'python2-setuptools' 'krb5' 'git')
+source=("git+https://github.com/02strich/pykerberos.git#tag=v$pkgver"
+ issue15.patch)
+sha512sums=('SKIP'
+ 'e0f413924a5f2acf6d48e3df860a301fa5d270edffd47e56c1d04ab972357a6d1934ceea3dc91b446ebb2eddcd39eb6ef312e39ec7b566027e180428191d8f9e')
+
+prepare() {
+ # https://github.com/02strich/pykerberos/issues/15
+ (cd pykerberos; patch -p1 -i ../issue15.patch)
+
+ cp -a pykerberos{,-py2}
+}
+
+build() {
+ cd "$srcdir"/pykerberos
+ python setup.py build
+
+ cd "$srcdir"/pykerberos-py2
+ python2 setup.py build
+}
+
+package_python-pykerberos() {
+ depends=('python' 'krb5')
+
+ cd pykerberos
+ python setup.py install --root="${pkgdir}" --optimize=1
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python2-pykerberos() {
+ depends=('python2' 'krb5')
+
+ cd pykerberos-py2
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: python-pykerberos/repos/community-i686/issue15.patch (from rev 171356, python-pykerberos/trunk/issue15.patch)
===================================================================
--- community-i686/issue15.patch (rev 0)
+++ community-i686/issue15.patch 2016-04-18 14:28:45 UTC (rev 171357)
@@ -0,0 +1,22 @@
+From 6eabbd87690948f7aa489e28f2c216130218d465 Mon Sep 17 00:00:00 2001
+From: Bernie Hackett <bernie at 10gen.com>
+Date: Thu, 25 Feb 2016 15:22:51 -0800
+Subject: [PATCH] Don't free stack allocated buffer #15
+
+---
+ src/kerberosgss.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kerberosgss.c b/src/kerberosgss.c
+index 86788da..99436c8 100644
+--- a/src/kerberosgss.c
++++ b/src/kerberosgss.c
+@@ -603,7 +603,7 @@ int authenticate_gss_client_wrap(gss_client_state* state, const char* challenge,
+ if (output_token.value)
+ gss_release_buffer(&min_stat, &output_token);
+
+- if (input_token.value)
++ if (!user && input_token.value)
+ gss_release_buffer(&min_stat, &input_token);
+
+ return ret;
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-04-18 14:28:11 UTC (rev 171356)
+++ community-x86_64/PKGBUILD 2016-04-18 14:28:45 UTC (rev 171357)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgbase=python-pykerberos
-pkgname=('python-pykerberos' 'python2-pykerberos')
-pkgver=1.1.10
-pkgrel=1
-pkgdesc="High-level interface to Kerberos"
-arch=('i686' 'x86_64')
-license=('Apache')
-url="https://github.com/02strich/pykerberos"
-makedepends=('python-setuptools' 'python2-setuptools' 'krb5' 'git')
-source=("git+https://github.com/02strich/pykerberos.git#tag=v$pkgver")
-sha512sums=('SKIP')
-
-prepare() {
- cp -a pykerberos{,-py2}
-}
-
-build() {
- cd "$srcdir"/pykerberos
- python setup.py build
-
- cd "$srcdir"/pykerberos-py2
- python2 setup.py build
-}
-
-package_python-pykerberos() {
- depends=('python' 'krb5')
-
- cd pykerberos
- python setup.py install --root="${pkgdir}" --optimize=1
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-pykerberos() {
- depends=('python2' 'krb5')
-
- cd pykerberos-py2
- python2 setup.py install --root="${pkgdir}" --optimize=1
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: python-pykerberos/repos/community-x86_64/PKGBUILD (from rev 171356, python-pykerberos/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-04-18 14:28:45 UTC (rev 171357)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=python-pykerberos
+pkgname=('python-pykerberos' 'python2-pykerberos')
+pkgver=1.1.10
+pkgrel=2
+pkgdesc="High-level interface to Kerberos"
+arch=('i686' 'x86_64')
+license=('Apache')
+url="https://github.com/02strich/pykerberos"
+makedepends=('python-setuptools' 'python2-setuptools' 'krb5' 'git')
+source=("git+https://github.com/02strich/pykerberos.git#tag=v$pkgver"
+ issue15.patch)
+sha512sums=('SKIP'
+ 'e0f413924a5f2acf6d48e3df860a301fa5d270edffd47e56c1d04ab972357a6d1934ceea3dc91b446ebb2eddcd39eb6ef312e39ec7b566027e180428191d8f9e')
+
+prepare() {
+ # https://github.com/02strich/pykerberos/issues/15
+ (cd pykerberos; patch -p1 -i ../issue15.patch)
+
+ cp -a pykerberos{,-py2}
+}
+
+build() {
+ cd "$srcdir"/pykerberos
+ python setup.py build
+
+ cd "$srcdir"/pykerberos-py2
+ python2 setup.py build
+}
+
+package_python-pykerberos() {
+ depends=('python' 'krb5')
+
+ cd pykerberos
+ python setup.py install --root="${pkgdir}" --optimize=1
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python2-pykerberos() {
+ depends=('python2' 'krb5')
+
+ cd pykerberos-py2
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: python-pykerberos/repos/community-x86_64/issue15.patch (from rev 171356, python-pykerberos/trunk/issue15.patch)
===================================================================
--- community-x86_64/issue15.patch (rev 0)
+++ community-x86_64/issue15.patch 2016-04-18 14:28:45 UTC (rev 171357)
@@ -0,0 +1,22 @@
+From 6eabbd87690948f7aa489e28f2c216130218d465 Mon Sep 17 00:00:00 2001
+From: Bernie Hackett <bernie at 10gen.com>
+Date: Thu, 25 Feb 2016 15:22:51 -0800
+Subject: [PATCH] Don't free stack allocated buffer #15
+
+---
+ src/kerberosgss.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kerberosgss.c b/src/kerberosgss.c
+index 86788da..99436c8 100644
+--- a/src/kerberosgss.c
++++ b/src/kerberosgss.c
+@@ -603,7 +603,7 @@ int authenticate_gss_client_wrap(gss_client_state* state, const char* challenge,
+ if (output_token.value)
+ gss_release_buffer(&min_stat, &output_token);
+
+- if (input_token.value)
++ if (!user && input_token.value)
+ gss_release_buffer(&min_stat, &input_token);
+
+ return ret;
More information about the arch-commits
mailing list