[arch-commits] Commit in python-pg8000/repos/community-any (3 files)
Chih-Hsuan Yen
yan12125 at archlinux.org
Sun Mar 7 13:49:56 UTC 2021
Date: Sunday, March 7, 2021 @ 13:49:56
Author: yan12125
Revision: 886019
archrelease: copy trunk to community-any
Added:
python-pg8000/repos/community-any/PKGBUILD
(from rev 886018, python-pg8000/trunk/PKGBUILD)
Deleted:
python-pg8000/repos/community-any/PKGBUILD
python-pg8000/repos/community-any/scram.diff
------------+
PKGBUILD | 157 ++++++++++++++++++++++++++++-------------------------------
scram.diff | 13 ----
2 files changed, 76 insertions(+), 94 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-07 13:49:42 UTC (rev 886018)
+++ PKGBUILD 2021-03-07 13:49:56 UTC (rev 886019)
@@ -1,81 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
-# Contributor: quomoow <quomoow at gmail.com>
-
-pkgname=python-pg8000
-pkgver=1.17.0
-pkgrel=2
-pkgdesc="Pure-Python PostgreSQL database driver, DB-API compatible"
-arch=(any)
-url='https://github.com/tlocke/pg8000'
-license=(BSD)
-makedepends=(python-setuptools)
-checkdepends=(python-pytest python-pytest-mock python-pytest-benchmark
- python-pytz postgresql)
-depends=(python python-scramp)
-source=("https://files.pythonhosted.org/packages/source/p/pg8000/pg8000-$pkgver.tar.gz"{,.asc}
- scram.diff)
-sha256sums=('14198c5afeb289106e40ee6e5e4c0529c5369939f6ca588a028b371a75fe20dd'
- 'SKIP'
- '71cccb7b33863dc94f93251b8f7cbff93e9505e120e7b9213c4ede2feb4a8e1c')
-validpgpkeys=(
- 'D5681B7EC7292511C4CC1450892B00AB699851E8' # Tony Locke <tlocke at tlocke.org.uk>, proven by https://keybase.io/tlocke
-)
-
-prepare() {
- cd pg8000-$pkgver
-
- # Remove upper bounds of dependencies
- sed --in-place=.orig -r 's#,?<[0-9.]+,?##;s#==([0-9.]+)#>=\1#' setup.py
- diff -u setup.py{.orig,} || true
-
- # Partial backport of https://github.com/tlocke/pg8000/commit/18eee18f7525bf3026339d206790d4d5843cf055
- patch -Np1 -i ../scram.diff
-}
-
-build() {
- cd pg8000-$pkgver
- python setup.py build
-}
-
-check() {
- cd pg8000-$pkgver
-
- export PGDATA="$srcdir/postgres-testdata"
- export PGHOST=127.0.0.1
- export PGPORT=$((49152+$RANDOM%10000))
-
- # See https://github.com/tlocke/pg8000#tests about database initialization steps for testing
- initdb --username=postgres --auth=trust
- openssl req -subj "/CN=self-signed" -nodes -x509 -newkey rsa:4096 -days 1 -keyout "$PGDATA/self-signed.key" -out "$PGDATA/self-signed.crt"
- cat <<EOF >> "$PGDATA/postgresql.conf"
-ssl = on
-ssl_cert_file = 'self-signed.crt'
-ssl_key_file = 'self-signed.key'
-password_encryption = 'scram-sha-256'
-EOF
-
- pg_ctl start -o "-k '' -h $PGHOST -p $PGPORT" -l "$srcdir/postgresql.log"
- # Change the password for postgres after password_encryption is specified, so that the role has a valid SCRAM secret
- psql -U postgres -c "
- CREATE EXTENSION hstore;
- ALTER ROLE postgres PASSWORD 'pw';
- "
-
- # should overwrite pg_hba.conf, or unexpected matches may happen against existing entries
- cat <<EOF > "$PGDATA/pg_hba.conf"
-host pg8000_md5 all 127.0.0.1/32 md5
-host pg8000_gss all 127.0.0.1/32 gss
-host pg8000_password all 127.0.0.1/32 password
-host pg8000_scram_sha_256 all 127.0.0.1/32 scram-sha-256
-host all all 127.0.0.1/32 trust
-EOF
- pg_ctl reload
- PYTHONPATH="$PWD" pytest test
- pg_ctl stop
-}
-
-package() {
- cd pg8000-$pkgver
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
- install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
-}
Copied: python-pg8000/repos/community-any/PKGBUILD (from rev 886018, python-pg8000/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-03-07 13:49:56 UTC (rev 886019)
@@ -0,0 +1,76 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Contributor: quomoow <quomoow at gmail.com>
+
+pkgname=python-pg8000
+pkgver=1.18.0
+pkgrel=1
+pkgdesc="Pure-Python PostgreSQL database driver, DB-API compatible"
+arch=(any)
+url='https://github.com/tlocke/pg8000'
+license=(BSD)
+makedepends=(python-setuptools)
+checkdepends=(python-pytest python-pytest-mock python-pytest-benchmark
+ python-pytz postgresql)
+depends=(python python-scramp)
+source=("https://files.pythonhosted.org/packages/source/p/pg8000/pg8000-$pkgver.tar.gz"{,.asc})
+sha256sums=('35baf2c8bf5445e85f516449474b547dbbd0e08c0baa3a6b20aa355a92eb72da'
+ 'SKIP')
+validpgpkeys=(
+ 'D5681B7EC7292511C4CC1450892B00AB699851E8' # Tony Locke <tlocke at tlocke.org.uk>, proven by https://keybase.io/tlocke
+)
+
+prepare() {
+ cd pg8000-$pkgver
+
+ # Remove upper bounds of dependencies
+ sed --in-place=.orig -r 's#,?<[0-9.]+,?##;s#==([0-9.]+)#>=\1#' setup.py
+ diff -u setup.py{.orig,} || true
+}
+
+build() {
+ cd pg8000-$pkgver
+ python setup.py build
+}
+
+check() {
+ cd pg8000-$pkgver
+
+ export PGDATA="$srcdir/postgres-testdata"
+ export PGHOST=127.0.0.1
+ export PGPORT=$((49152+$RANDOM%10000))
+
+ # See https://github.com/tlocke/pg8000#tests about database initialization steps for testing
+ initdb --username=postgres --auth=trust
+ openssl req -subj "/CN=self-signed" -nodes -x509 -newkey rsa:4096 -days 1 -keyout "$PGDATA/self-signed.key" -out "$PGDATA/self-signed.crt"
+ cat <<EOF >> "$PGDATA/postgresql.conf"
+ssl = on
+ssl_cert_file = 'self-signed.crt'
+ssl_key_file = 'self-signed.key'
+password_encryption = 'scram-sha-256'
+EOF
+
+ pg_ctl start -o "-k '' -h $PGHOST -p $PGPORT" -l "$srcdir/postgresql.log"
+ # Change the password for postgres after password_encryption is specified, so that the role has a valid SCRAM secret
+ psql -U postgres -c "
+ CREATE EXTENSION hstore;
+ ALTER ROLE postgres PASSWORD 'pw';
+ "
+
+ # should overwrite pg_hba.conf, or unexpected matches may happen against existing entries
+ cat <<EOF > "$PGDATA/pg_hba.conf"
+host pg8000_md5 all 127.0.0.1/32 md5
+host pg8000_gss all 127.0.0.1/32 gss
+host pg8000_password all 127.0.0.1/32 password
+host pg8000_scram_sha_256 all 127.0.0.1/32 scram-sha-256
+host all all 127.0.0.1/32 trust
+EOF
+ pg_ctl reload
+ PYTHONPATH="$PWD" pytest test
+ pg_ctl stop
+}
+
+package() {
+ cd pg8000-$pkgver
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+ install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+}
Deleted: scram.diff
===================================================================
--- scram.diff 2021-03-07 13:49:42 UTC (rev 886018)
+++ scram.diff 2021-03-07 13:49:56 UTC (rev 886019)
@@ -1,13 +0,0 @@
-diff --git a/pg8000/core.py b/pg8000/core.py
-index 8c4c512..8c544b1 100644
---- a/pg8000/core.py
-+++ b/pg8000/core.py
-@@ -492,7 +492,7 @@ class CoreConnection():
- elif auth_code == 10:
- # AuthenticationSASL
- mechanisms = [
-- m.decode('ascii') for m in data[4:-1].split(NULL_BYTE)]
-+ m.decode('ascii') for m in data[4:-2].split(NULL_BYTE)]
-
- self.auth = ScramClient(
- mechanisms, self.user.decode('utf8'),
More information about the arch-commits
mailing list