commit: b806c8f21fafafef17643da079060f2d628bcc4d Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Jul 30 19:58:05 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sat Jul 30 20:18:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b806c8f2
dev-java/jdbc-postgresql: drop 9.4_p1206-r1 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/26670 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-java/jdbc-postgresql/Manifest | 1 - .../jdbc-postgresql-9.4_p1201-remove-osgi.patch | 37 ------ .../jdbc-postgresql-9.4_p1204-remove-sspi.patch | 138 --------------------- .../jdbc-postgresql-9.4_p1206-r1.ebuild | 110 ---------------- 4 files changed, 286 deletions(-) diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest index bc169c1a1736..581a031b564b 100644 --- a/dev-java/jdbc-postgresql/Manifest +++ b/dev-java/jdbc-postgresql/Manifest @@ -1,2 +1 @@ DIST postgresql-jdbc-42.4.0.src.tar.gz 966868 BLAKE2B 0a8bffcfbba4ddedcbd77717b6bca2f4e7cd9fe4597c6edb5a2ac8fbea788c692377ae713723aa7342895f857aff7eca0825eedd36cff69f3760b11cbb7b666c SHA512 816967923f54d5c2ad856e3ae2612987fa52234acc6b487f492d56614ac241d9542abd40a1f868ad6d895a45de28f7a0d586f8486dc719600238bcc3ef40819a -DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae350407fafeb23d9d4bdb130c17996373b4211e0d56d1a76bc5737401dc6fc6618d2a891943d096b0f60f0770ff6ce859ade3e7a178d SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch deleted file mode 100644 index 15b1860d2aa7..000000000000 --- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/build.xml 2015-02-18 17:44:58.000000000 +0100 -+++ b/build.xml 2015-03-23 02:19:03.951945663 +0100 -@@ -403,34 +403,6 @@ - <attribute name="Implementation-Vendor" value="PostgreSQL Global Development Group" /> - </manifest> - </jar> -- -- <!-- add OSGi meta information --> -- <property name="osgidir" value="${builddir}/osgi"/> -- <mkdir dir="${osgidir}"/> -- -- <!-- create a bnd file named after the JAR file so that bnd wrap tool find it --> -- <echo file="${osgidir}/${artifact.version.string}.bnd"> --Bundle-ManifestVersion: 2 -- --Bundle-Name: PostgreSQL JDBC Driver ${jdbc.version.upper} --Bundle-SymbolicName: org.postgresql.${jdbc.version} --Bundle-Version: ${osgi.version} -- --Bundle-Vendor: PostgreSQL Global Development Group --Bundle-Copyright: Copyright (c) 2003-2015, PostgreSQL Global Development Group --Bundle-License: http://www.postgresql.org/about/licence/ --Bundle-DocURL: http://jdbc.postgresql.org/ -- --Bundle-Classpath: . --Bundle-Activator: org.postgresql.osgi.PGBundleActivator --Require-Capability: osgi.ee;filter:="(&(|(osgi.ee=J2SE)(osgi.ee=JavaSE))(version>=${java.specification.version}))" --Export-Package: org.postgresql*; version=${fullversion} --Import-Package: javax.sql, javax.transaction.xa, javax.naming, *;resolution:=optional -- </echo> -- -- <!-- run wrap task from bnd --> -- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="dependency.build.classpath"/> -- <bndwrap jars="${artifact.jar.build}" output="${artifact.jar}" definitions="${osgidir}"/> - </target> - - <!-- create a distribution with docs, dependencies, and driver jar --> diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch deleted file mode 100644 index 16996892b192..000000000000 --- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- a/org/postgresql/core/v3/ConnectionFactoryImpl.java 2015-10-09 20:55:53.000000000 +0200 -+++ b/org/postgresql/core/v3/ConnectionFactoryImpl.java 2015-10-14 20:42:48.816753341 +0200 -@@ -32,7 +32,6 @@ - import org.postgresql.hostchooser.HostChooserFactory; - import org.postgresql.hostchooser.HostRequirement; - import org.postgresql.hostchooser.HostStatus; --import org.postgresql.sspi.SSPIClient; - import org.postgresql.util.GT; - import org.postgresql.util.HostSpec; - import org.postgresql.util.MD5Digest; -@@ -394,11 +393,7 @@ - // or an authentication request - - String password = PGProperty.PASSWORD.get(info); -- -- /* SSPI negotiation state, if used */ -- SSPIClient sspiClient = null; - -- try { - authloop: - while (true) - { -@@ -514,88 +509,16 @@ - case AUTH_REQ_SSPI: - /* - * Use GSSAPI if requested on all platforms, via JSSE. -- * -- * For SSPI auth requests, if we're on Windows attempt native SSPI -- * authentication if available, and if not disabled by setting a -- * kerberosServerName. On other platforms, attempt JSSE GSSAPI -- * negotiation with the SSPI server. -- * -- * Note that this is slightly different to libpq, which uses SSPI -- * for GSSAPI where supported. We prefer to use the existing Java -- * JSSE Kerberos support rather than going to native (via JNA) calls -- * where possible, so that JSSE system properties etc continue -- * to work normally. -- * -- * Note that while SSPI is often Kerberos-based there's no guarantee -- * it will be; it may be NTLM or anything else. If the client responds -- * to an SSPI request via GSSAPI and the other end isn't using Kerberos -- * for SSPI then authentication will fail. - */ -- final String gsslib = PGProperty.GSS_LIB.get(info); -- final boolean usespnego = PGProperty.USE_SPNEGO.getBoolean(info); -- -- boolean useSSPI = false; -+ org.postgresql.gss.MakeGSS.authenticate(pgStream, host, -+ user, password, -+ PGProperty.JAAS_APPLICATION_NAME.get(info), -+ PGProperty.KERBEROS_SERVER_NAME.get(info), -+ logger, -+ PGProperty.USE_SPNEGO.getBoolean(info)); -+ -+ break; - -- /* -- * Use SSPI if we're in auto mode on windows and have a -- * request for SSPI auth, or if it's forced. Otherwise -- * use gssapi. If the user has specified a Kerberos server -- * name we'll always use JSSE GSSAPI. -- */ -- if (gsslib.equals("gssapi")) -- logger.debug("Using JSSE GSSAPI, param gsslib=gssapi"); -- else if (areq == AUTH_REQ_GSS && !gsslib.equals("sspi")) -- logger.debug("Using JSSE GSSAPI, gssapi requested by server and gsslib=sspi not forced"); -- else -- { -- /* Determine if SSPI is supported by the client */ -- sspiClient = new SSPIClient(pgStream, -- PGProperty.SSPI_SERVICE_CLASS.get(info), -- /* Use negotiation for SSPI, or if explicitly requested for GSS */ -- areq == AUTH_REQ_SSPI || (areq == AUTH_REQ_GSS && usespnego), -- logger); -- -- useSSPI = sspiClient.isSSPISupported(); -- logger.debug("SSPI support detected: " + useSSPI); -- -- if (!useSSPI) { -- /* No need to dispose() if no SSPI used */ -- sspiClient = null; -- -- if (gsslib.equals("sspi")) -- throw new PSQLException("SSPI forced with gsslib=sspi, but SSPI not available; set loglevel=2 for details", -- PSQLState.CONNECTION_UNABLE_TO_CONNECT); -- } -- -- logger.debug("Using SSPI: " + useSSPI + ", gsslib="+gsslib+" and SSPI support detected"); -- } -- -- if (useSSPI) -- { -- /* SSPI requested and detected as available */ -- sspiClient.startSSPI(); -- } -- else -- { -- /* Use JGSS's GSSAPI for this request */ -- org.postgresql.gss.MakeGSS.authenticate(pgStream, host, -- user, password, -- PGProperty.JAAS_APPLICATION_NAME.get(info), -- PGProperty.KERBEROS_SERVER_NAME.get(info), -- logger, -- usespnego); -- } -- -- break; -- -- case AUTH_REQ_GSS_CONTINUE: -- /* -- * Only called for SSPI, as GSS is handled by an inner loop -- * in MakeGSS. -- */ -- sspiClient.continueSSPI(l_msgLen - 8); -- break; -- - case AUTH_REQ_OK: - /* Cleanup after successful authentication */ - if (logger.logDebug()) -@@ -616,18 +539,6 @@ - throw new PSQLException(GT.tr("Protocol error. Session setup failed."), PSQLState.PROTOCOL_VIOLATION); - } - } -- } finally { -- /* Cleanup after successful or failed authentication attempts */ -- if (sspiClient != null) -- { -- try { -- sspiClient.dispose(); -- } catch (RuntimeException ex) { -- logger.log("Unexpected error during SSPI context disposal", ex); -- } -- -- } -- } - - } - diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild deleted file mode 100644 index b5bfb41864b6..000000000000 --- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_PN="postgresql-jdbc" -MY_PV="${PV/_p/-}" -MY_P="${MY_PN}-${MY_PV}.src" - -DESCRIPTION="JDBC Driver for PostgreSQL" -SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"; -HOMEPAGE="https://jdbc.postgresql.org/"; - -LICENSE="POSTGRESQL" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" -IUSE="test" - -# it does not compile with jdk 11, newer versions should be fine -# BUILD FAILED -# /var/tmp/portage/dev-java/jdbc-postgresql-9.4_p1206-r1/work/postgresql-jdbc-9.4-1206.src/build.xml:197: Unknown JDK version. -DEPEND=" - virtual/jdk:1.8 - doc? ( - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - ) - test? ( - dev-db/postgresql[server] - dev-java/ant-junit:0 - dev-java/hamcrest-core:1.3 - dev-java/junit:4 - dev-java/xml-commons-resolver:0 - )" -RDEPEND=">=virtual/jre-1.8:*" - -RESTRICT="test" # Requires external postgresql server setup - -S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src" - -HTML_DOCS=( build/doc/pgjdbc.html ) - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_DOC_TARGET="publicapi" - -src_prepare() { - default - - # Strip build.xml of maven deps - sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die - sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die - sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die - sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die - sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die - - # Remove SSPI, it pulls in Waffle-JNA and is only used on Windows - sed -i -e '/<include.*sspi/c\' build.xml || die - rm -vrf org/postgresql/sspi || die "Error removing sspi" - eapply "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch - - # FIXME @someone who cares: enable through osgi flag? - sed -i -e '/<include.*osgi/c\' build.xml || die - sed -i -e '/<test.*osgi/c\' build.xml || die - rm -vrf org/postgresql/osgi || die "Error removing osgi" - rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests" - eapply "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch - - java-pkg_clean -} - -src_compile() { - EANT_BUILD_TARGET="release-version jar" - java-pkg-2_src_compile - - # There is a task that creates this doc but I didn't find a way how to use system catalog - # to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead. - if use doc; then - mkdir -p "${S}/build/doc" || die - xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \ - "${S}/doc/pgjdbc.xml" || die - fi -} - -src_test() { - einfo "In order to run the tests successfully, you have to have:" - einfo "1) PostgreSQL server running" - einfo "2) database 'test' defined with user 'test' with password 'test'" - einfo " as owner of the database" - einfo "3) plpgsql support in the 'test' database" - einfo - einfo "You can find a general info on how to perform these steps at" - einfo "https://wiki.gentoo.org/wiki/PostgreSQL"; - - ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "hamcrest-core-1.3,junit-4,xml-commons-resolver") -} - -src_install() { - java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar - - if use doc ; then - java-pkg_dojavadoc build/publicapi - einstalldocs - fi - - use source && java-pkg_dosrc org -}
