public inbox for [email protected]
help / color / mirror / Atom feed[pgAdmin4][Patch] - RPM/DEB dependency for Kerberos
2+ messages / 2 participants
[nested] [flat]
* [pgAdmin4][Patch] - RPM/DEB dependency for Kerberos
@ 2021-01-20 11:08 Khushboo Vashi <[email protected]>
2021-01-20 12:40 ` Re: [pgAdmin4][Patch] - RPM/DEB dependency for Kerberos Akshay Joshi <[email protected]>
0 siblings, 1 reply; 2+ messages in thread
From: Khushboo Vashi @ 2021-01-20 11:08 UTC (permalink / raw)
To: pgadmin-hackers
Hi,
Please find the attached patch to add the RPM/DEB dependency for Kerberos
to the -server package rather than -web packages and to handle the OSError
while importing the gssapi.
Thanks,
Khushboo
Attachments:
[application/octet-stream] kerberos_dep.patch (3.1K, 3-kerberos_dep.patch)
download | inline diff:
diff --git a/pkg/debian/build.sh b/pkg/debian/build.sh
index 810e9c868..ac7a08309 100755
--- a/pkg/debian/build.sh
+++ b/pkg/debian/build.sh
@@ -35,7 +35,7 @@ cat << EOF > "${SERVERROOT}/DEBIAN/control"
Package: ${APP_NAME}-server
Version: ${APP_LONG_VERSION}
Architecture: ${OS_ARCH}
-Depends: python3, libpq5 (>= 11.0)
+Depends: python3, libpq5 (>= 11.0), libgssapi-krb5-2
Recommends: postgresql-client | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
Maintainer: pgAdmin Development Team <[email protected]>
Description: The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -76,7 +76,7 @@ cat << EOF > "${WEBROOT}/DEBIAN/control"
Package: ${APP_NAME}-web
Version: ${APP_LONG_VERSION}
Architecture: all
-Depends: ${APP_NAME}-server, apache2, libapache2-mod-wsgi-py3, libgssapi-krb5-2
+Depends: ${APP_NAME}-server, apache2, libapache2-mod-wsgi-py3
Maintainer: pgAdmin Development Team <[email protected]>
Description: The web interface for pgAdmin, hosted under Apache HTTPD. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
EOF
diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh
index 48be6e549..ca1eb20a6 100755
--- a/pkg/redhat/build.sh
+++ b/pkg/redhat/build.sh
@@ -52,7 +52,7 @@ Summary: The core server package for pgAdmin.
License: PostgreSQL
URL: https://www.pgadmin.org/
-Requires: python3, postgresql-libs >= 11
+Requires: python3, postgresql-libs >= 11, krb5-libs
%description
The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -131,9 +131,9 @@ Summary: The web interface for pgAdmin, hosted under Apache HTTPD.
License: PostgreSQL
URL: https://www.pgadmin.org/
%if 0%{?rhel} && 0%{?rhel} == 7
-Requires: ${APP_NAME}-server, httpd, pgadmin4-python3-mod_wsgi, krb5-libs
+Requires: ${APP_NAME}-server, httpd, pgadmin4-python3-mod_wsgi
%else
-Requires: ${APP_NAME}-server, httpd, python3-mod_wsgi, krb5-libs
+Requires: ${APP_NAME}-server, httpd, python3-mod_wsgi
%endif
%description
diff --git a/web/pgadmin/authenticate/kerberos.py b/web/pgadmin/authenticate/kerberos.py
index 5e03499b3..57aa1e0f0 100644
--- a/web/pgadmin/authenticate/kerberos.py
+++ b/web/pgadmin/authenticate/kerberos.py
@@ -35,6 +35,11 @@ except ImportError:
# Instead throw the runtime error, when the server attempts
# to use this authentication method.
KERBEROS_AUTH_AVAILABLE = False
+except OSError:
+ # On Windows, it fails with OSError, when KFW libraries not found.
+ # Instead throw the runtime error, when the server attempts
+ # to use this authentication method.
+ KERBEROS_AUTH_AVAILABLE = False
# Set the Kerberos config file
if config.KRB_KTNAME and config.KRB_KTNAME != '<KRB5_KEYTAB_FILE>':
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: [pgAdmin4][Patch] - RPM/DEB dependency for Kerberos
2021-01-20 11:08 [pgAdmin4][Patch] - RPM/DEB dependency for Kerberos Khushboo Vashi <[email protected]>
@ 2021-01-20 12:40 ` Akshay Joshi <[email protected]>
0 siblings, 0 replies; 2+ messages in thread
From: Akshay Joshi @ 2021-01-20 12:40 UTC (permalink / raw)
To: Khushboo Vashi <[email protected]>; +Cc: pgadmin-hackers
Thanks, patch applied.
On Wed, Jan 20, 2021 at 4:38 PM Khushboo Vashi <
[email protected]> wrote:
> Hi,
>
> Please find the attached patch to add the RPM/DEB dependency for Kerberos
> to the -server package rather than -web packages and to handle the OSError
> while importing the gssapi.
>
> Thanks,
> Khushboo
>
--
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Principal Software Architect*
*EDB Postgres <http://edbpostgres.com>*
*Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~2021-01-20 12:40 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2021-01-20 11:08 [pgAdmin4][Patch] - RPM/DEB dependency for Kerberos Khushboo Vashi <[email protected]>
2021-01-20 12:40 ` Akshay Joshi <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox