/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jan 21 15:06:26 PST 2013
changeset 5c5bde48dfb9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5c5bde48dfb9
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jan 21 19:56:33 2013 +0000
Only copy tz.properties if the destination exists. Do it verbosely.
2013-01-14 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(add-tzdata-support): Only copy tz.properties if
destination exists. Do it verbosely.
(clean-add-tzdata-support): Only remove tz.properties
if present and do so verbosely.
(add-tzdata-support-debug): Same as add-tzdata-support
but for debug.
(clean-add-tzdata-support-debug): Same as
clean-add-tzdata-support but for debug.
(add-tzdata-support-ecj): Same as add-tzdata-support
but for bootstrap.
(clean-add-tzdata-support-ecj): Same as
clean-add-tzdata-support but for bootstrap.
changeset cc35a9049bdd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cc35a9049bdd
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jan 21 21:46:50 2013 +0000
PR1119: Detect whether required methods in java.security.cert.X509{Cert,CRL}Selector are actually missing.
2013-01-21 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
of java.security.cert.X509{Cert,CRL}Selector
dependent on the necessary methods being missing.
* configure.ac:
Add IT_CHECK_FOR_METHOD calls for the
missing java.security.cert.X509{Cert,CRL}Selector
methods added in 1.5.
changeset 3465dd7f9596 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3465dd7f9596
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jan 21 22:34:53 2013 +0000
Make the inclusion of javax.security.auth.kerberos.KerberosTicket dependent on getSessionKeyType() being missing.
2013-01-21 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
of javax.security.auth.kerberos.KerberosTicket
dependent on getSessionKeyType() being missing.
* configure.ac:
Add IT_CHECK_FOR_METHOD calls for
getSessionKeyType() which is missing in some
older versions of GCJ and GNU Classpath (<0.99).
diffstat:
ChangeLog | 38 ++++++++++++++++++++++++++++++++++
Makefile.am | 67 +++++++++++++++++++++++++++++++++++++++++++++++------------
configure.ac | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 129 insertions(+), 14 deletions(-)
diffs (209 lines):
diff -r de38248f4db4 -r 3465dd7f9596 ChangeLog
--- a/ChangeLog Fri Jan 11 17:11:43 2013 +0000
+++ b/ChangeLog Mon Jan 21 22:34:53 2013 +0000
@@ -1,3 +1,41 @@
+2013-01-21 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
+ of javax.security.auth.kerberos.KerberosTicket
+ dependent on getSessionKeyType() being missing.
+ * configure.ac:
+ Add IT_CHECK_FOR_METHOD calls for
+ getSessionKeyType() which is missing in some
+ older versions of GCJ and GNU Classpath (<0.99).
+
+2013-01-21 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
+ of java.security.cert.X509{Cert,CRL}Selector
+ dependent on the necessary methods being missing.
+ * configure.ac:
+ Add IT_CHECK_FOR_METHOD calls for the
+ missing java.security.cert.X509{Cert,CRL}Selector
+ methods added in 1.5.
+
+2013-01-14 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (add-tzdata-support): Only copy tz.properties if
+ destination exists. Do it verbosely.
+ (clean-add-tzdata-support): Only remove tz.properties
+ if present and do so verbosely.
+ (add-tzdata-support-debug): Same as add-tzdata-support
+ but for debug.
+ (clean-add-tzdata-support-debug): Same as
+ clean-add-tzdata-support but for debug.
+ (add-tzdata-support-ecj): Same as add-tzdata-support
+ but for bootstrap.
+ (clean-add-tzdata-support-ecj): Same as
+ clean-add-tzdata-support but for bootstrap.
+
2013-01-11 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r de38248f4db4 -r 3465dd7f9596 Makefile.am
--- a/Makefile.am Fri Jan 11 17:11:43 2013 +0000
+++ b/Makefile.am Mon Jan 21 22:34:53 2013 +0000
@@ -63,13 +63,9 @@
# Sources used from OpenJDK.
-# PR54274 - sun.security.other requires missing X509CRLSelector methods
# PR54275 - sun.security.sasl requires missing Sasl.CREDENTIALS field
ICEDTEA_BOOTSTRAP_CLASSES = \
- $(SHARE)/java/security/cert/X509CRLSelector.java \
- $(SHARE)/java/security/cert/X509CertSelector.java \
- $(SHARE)/javax/security/sasl/Sasl.java \
- $(SHARE)/javax/security/auth/kerberos/KerberosTicket.java
+ $(SHARE)/javax/security/sasl/Sasl.java
#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure
if LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER
@@ -96,6 +92,37 @@
endif
endif
+# PR54274 - sun.security.other requires missing X509CRLSelector methods
+if LACKS_JAVA_SECURITY_CERT_X509CERTSELECTOR_GETSUBJECT
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/security/cert/X509CertSelector.java
+else
+if LACKS_JAVA_SECURITY_CERT_X509CERTSELECTOR_SETISSUER
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/security/cert/X509CertSelector.java
+else
+if LACKS_JAVA_SECURITY_CERT_X509CERTSELECTOR_SETSUBJECT
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/security/cert/X509CertSelector.java
+endif
+endif
+endif
+if LACKS_JAVA_SECURITY_CERT_X509CRLSELECTOR_ADDISSUER
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/security/cert/X509CRLSelector.java
+if LACKS_JAVA_SECURITY_CERT_X509CRLSELECTOR_SETISSUERS
+else
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/security/cert/X509CRLSelector.java
+endif
+endif
+
+# PR41686 - Building sun.security.jgss.GSSUtil requires javax.security.auth.kerberos.KerberosTicket.getSessionKeyType()
+if LACKS_JAVAX_SECURITY_AUTH_KERBEROS_KERBEROSTICKET_GETSESSIONKEYTYPE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/javax/security/auth/kerberos/KerberosTicket.java
+endif
+
# Flags
MEMORY_LIMIT = -J-Xmx1024m
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -1765,24 +1792,32 @@
stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
if WITH_TZDATA_DIR
- cp $(abs_top_builddir)/tz.properties \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+ if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+ cp -v $(abs_top_builddir)/tz.properties \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ; \
+ fi
endif
touch stamps/add-tzdata-support.stamp
clean-add-tzdata-support:
- rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+ if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+ rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+ fi
rm -f stamps/add-tzdata-support.stamp
stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
if WITH_TZDATA_DIR
- cp $(abs_top_builddir)/tz.properties \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+ if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+ cp -v $(abs_top_builddir)/tz.properties \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+ fi
endif
touch stamps/add-tzdata-support-debug.stamp
clean-add-tzdata-support-debug:
- rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+ if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+ rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+ fi
rm -f stamps/add-tzdata-support-debug.stamp
stamps/add-archive.stamp: stamps/icedtea.stamp
@@ -1947,13 +1982,17 @@
stamps/add-tzdata-support-ecj.stamp: stamps/icedtea-ecj.stamp
if WITH_TZDATA_DIR
- cp $(abs_top_builddir)/tz.properties \
- $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+ if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+ cp -v $(abs_top_builddir)/tz.properties \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+ fi
endif
touch stamps/add-tzdata-support-ecj.stamp
clean-add-tzdata-support-ecj:
- rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+ if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+ rm -vf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+ fi
rm -f stamps/add-tzdata-support-ecj.stamp
stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
diff -r de38248f4db4 -r 3465dd7f9596 configure.ac
--- a/configure.ac Fri Jan 11 17:11:43 2013 +0000
+++ b/configure.ac Mon Jan 21 22:34:53 2013 +0000
@@ -78,6 +78,44 @@
IT_CHECK_FOR_CONSTRUCTOR([JAVAX_MANAGEMENT_STANDARDMBEAN_MXBEAN_TWO_ARG],[javax.management.StandardMBean],[Class.class,Boolean.TYPE],[Object.class, true])
IT_CHECK_FOR_CONSTRUCTOR([JAVAX_MANAGEMENT_STANDARDMBEAN_MXBEAN_THREE_ARG],[javax.management.StandardMBean],[Object.class,Class.class,Boolean.TYPE],[new Object(), Object.class, true])
+# PR54274 - sun.security.other requires missing X509CRLSelector methods
+IT_CHECK_FOR_METHOD([JAVA_SECURITY_CERT_X509CRLSELECTOR_ADDISSUER],
+ [java.security.cert.X509CRLSelector.addIssuer(X500Principal)],
+ [java.security.cert.X509CRLSelector],
+ ["addIssuer",javax.security.auth.x500.X500Principal.class],
+ [new java.security.cert.X509CRLSelector().addIssuer(null)]
+)
+IT_CHECK_FOR_METHOD([JAVA_SECURITY_CERT_X509CERTSELECTOR_SETSUBJECT],
+ [java.security.cert.X509CertSelector.setSubject(X500Principal)],
+ [java.security.cert.X509CertSelector],
+ ["setSubject",javax.security.auth.x500.X500Principal.class],
+ [new java.security.cert.X509CertSelector().setSubject(new javax.security.auth.x500.X500Principal(""))]
+)
+IT_CHECK_FOR_METHOD([JAVA_SECURITY_CERT_X509CERTSELECTOR_GETSUBJECT],
+ [java.security.cert.X509CertSelector.getSubject()],
+ [java.security.cert.X509CertSelector],
+ ["getSubject"],
+ [new java.security.cert.X509CertSelector().getSubject()]
+)
+IT_CHECK_FOR_METHOD([JAVA_SECURITY_CERT_X509CERTSELECTOR_SETISSUER],
+ [java.security.cert.X509CertSelector.setIssuer(X500Principal)],
+ [java.security.cert.X509CertSelector],
+ ["setIssuer",javax.security.auth.x500.X500Principal.class],
+ [new java.security.cert.X509CertSelector().setIssuer(new javax.security.auth.x500.X500Principal(""))]
+)
+IT_CHECK_FOR_METHOD([JAVA_SECURITY_CERT_X509CRLSELECTOR_SETISSUERS],
+ [java.security.cert.X509CRLSelector.setIssuers(Collection<X500Principal>)],
+ [java.security.cert.X509CRLSelector],
+ ["setIssuers",java.util.Collection.class],
+ [new java.security.cert.X509CRLSelector().setIssuers(new java.util.ArrayList<javax.security.auth.x500.X500Principal>())]
+)
+IT_CHECK_FOR_METHOD([JAVAX_SECURITY_AUTH_KERBEROS_KERBEROSTICKET_GETSESSIONKEYTYPE],
+ [javax.security.auth.kerberos.KerberosTicket.getSessionKeyType()],
+ [javax.security.auth.kerberos.KerberosTicket],
+ ["getSessionKeyType"],
+ [new javax.security.auth.kerberos.KerberosTicket(null,null,null,null,0,null,null,null,null,null,null).getSessionKeyType()]
+)
+
# Use xvfb-run if found to run gui tests (check-jdk).
AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
AC_SUBST(XVFB_RUN_CMD)
More information about the distro-pkg-dev
mailing list