aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-04-10 19:47:23 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2017-04-10 19:47:33 +0000
commitcabe8f1d9ef3a825bffe31ebb91c35acd2492764 (patch)
tree92ed6133e33f6123591b76e1c6fe405a0e4f03da
parent88843ef7320b735c9552681c074fc1adbcf25e99 (diff)
downloadaports-cabe8f1d9ef3a825bffe31ebb91c35acd2492764.tar.bz2
aports-cabe8f1d9ef3a825bffe31ebb91c35acd2492764.tar.xz
main/pam-pgsql: upgrade to 0.7.3.2
-rw-r--r--main/pam-pgsql/APKBUILD26
-rw-r--r--main/pam-pgsql/CVE-2013-0191.patch11
2 files changed, 7 insertions, 30 deletions
diff --git a/main/pam-pgsql/APKBUILD b/main/pam-pgsql/APKBUILD
index 46e5f22b5d..4620c3aabd 100644
--- a/main/pam-pgsql/APKBUILD
+++ b/main/pam-pgsql/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=pam-pgsql
-pkgver=0.7.3.1
-pkgrel=3
+pkgver=0.7.3.2
+pkgrel=0
pkgdesc="PAM module to authenticate using a PostgreSQL database"
url="http://sourceforge.net/projects/pam-pgsql/"
arch="all"
@@ -13,23 +13,12 @@ makedepends="$depends_dev linux-pam-dev postgresql-dev libgcrypt-dev
bsd-compat-headers"
install=""
subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/project/pam-pgsql/pam-pgsql/0.7/pam-pgsql-$pkgver.tar.gz
- CVE-2013-0191.patch"
+source="http://downloads.sourceforge.net/project/pam-pgsql/pam-pgsql/0.7/pam-pgsql-$pkgver.tar.gz"
-_builddir="$srcdir"/pam-pgsql-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- update_config_sub || return 1
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
+builddir="$srcdir"/pam-pgsql-$pkgver
build() {
- cd "$_builddir"
+ cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -39,9 +28,8 @@ build() {
}
package() {
- cd "$_builddir"
+ cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="16cb40a16ee1f286906a0d5a90254731 pam-pgsql-0.7.3.1.tar.gz
-4a8640edb8eaee4456fa91ad8c22ab7f CVE-2013-0191.patch"
+sha512sums="d5766e56a13b0b4762fba10d624d12f130f2675f1f1772eaaf275b599f44adcf98287c2636462ba3faf46af139eb1bd157918c0c783040796562f37dec17a6d9 pam-pgsql-0.7.3.2.tar.gz"
diff --git a/main/pam-pgsql/CVE-2013-0191.patch b/main/pam-pgsql/CVE-2013-0191.patch
deleted file mode 100644
index d03fc30822..0000000000
--- a/main/pam-pgsql/CVE-2013-0191.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/backend_pgsql.c.orig 2013-02-07 13:06:48.982679657 +0000
-+++ ./src/backend_pgsql.c 2013-02-07 13:09:00.973830056 +0000
-@@ -258,7 +258,7 @@
- if(pg_execParam(conn, &res, options->query_auth, service, user, passwd, rhost) == PAM_SUCCESS) {
- if(PQntuples(res) == 0) {
- rc = PAM_USER_UNKNOWN;
-- } else {
-+ } else if (!PQgetisnull(res, 0, 0)) {
- char *stored_pw = PQgetvalue(res, 0, 0);
- if (!strcmp(stored_pw, (tmp = password_encrypt(options, user, passwd, stored_pw)))) rc = PAM_SUCCESS;
- free (tmp);