diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/.template/Makefile | 8 | ||||
| -rw-r--r-- | package/.templatelib/Makefile | 10 | ||||
| -rw-r--r-- | package/.templateprog/Makefile | 6 | ||||
| -rw-r--r-- | package/bison/Makefile | 28 | ||||
| -rw-r--r-- | package/bison/patches/patch-Makefile_in | 27 | ||||
| -rw-r--r-- | package/bison/patches/patch-doc_bison_help | 11 | ||||
| -rw-r--r-- | package/curl/Makefile | 18 | ||||
| -rw-r--r-- | package/cyassl/Makefile | 28 | ||||
| -rw-r--r-- | package/flex/Makefile | 34 | ||||
| -rw-r--r-- | package/flex/patches/patch-Makefile_in | 10 | ||||
| -rw-r--r-- | package/flex/patches/patch-conf_in | 20 | ||||
| -rw-r--r-- | package/gnutls/Makefile | 41 | ||||
| -rw-r--r-- | package/htpdate/Makefile | 18 | ||||
| -rw-r--r-- | package/htpdate/patches/patch-Makefile | 33 | ||||
| -rw-r--r-- | package/htpdate/patches/patch-htpdate_c | 6 | ||||
| -rw-r--r-- | package/kodi/Makefile | 4 | ||||
| -rw-r--r-- | package/libgcrypt/Makefile | 28 | ||||
| -rw-r--r-- | package/libjpeg-turbo/Makefile | 2 | ||||
| -rw-r--r-- | package/libressl/Makefile | 4 | ||||
| -rw-r--r-- | package/libtasn1/Makefile | 20 | ||||
| -rw-r--r-- | package/openjdk7/Makefile | 6 | ||||
| -rw-r--r-- | package/openjdk7/patches/openadk.patch | 1159 |
22 files changed, 1096 insertions, 425 deletions
diff --git a/package/.template/Makefile b/package/.template/Makefile index 2536da873..f60be74bb 100644 --- a/package/.template/Makefile +++ b/package/.template/Makefile @@ -15,7 +15,7 @@ PKG_BUILDDEP:= add packages which need to be compiled PKG_URL:= add project url PKG_SITES:= add download url without package name # alternatively use a pre-defined set of mirrors, see mk/mirrors.mk: -#PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sub/path/} +#PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=sub/path/) # if more than one binary package is created, add symbol names of all here # leave variable empty, when no binary package is created. You can set it @@ -53,11 +53,11 @@ PKG_SITES:= add download url without package name #PKGCS_WITH_GNUTLS:= libgnutls # if downloaded package is not ending with .tar.xz use following -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +#DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) #CONFIG_STYLE:= manual # use following to add ./configure options @@ -74,4 +74,4 @@ $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPE $(IDIR_@UPKG@)/usr/bin # please remove ALL above comments, before commiting -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/.templatelib/Makefile b/package/.templatelib/Makefile index e89b61bfa..0ba543c83 100644 --- a/package/.templatelib/Makefile +++ b/package/.templatelib/Makefile @@ -8,21 +8,21 @@ PKG_VERSION:= @VER@ PKG_RELEASE:= 1 PKG_HASH:= add sha256 checksum of package here PKG_DESCR:= add short description -PKG_SECTION:= libs +PKG_SECTION:= libs/misc PKG_URL:= add project url PKG_SITES:= add download url without package name PKG_OPTS:= dev # if downloaded package is not ending with .tar.xz use following -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +#DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) @PKG@-install: $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/lib - $(CP) $(WRKINST)/usr/lib/@PKG@*.so* \ + $(CP) $(WRKINST)/usr/lib/lib@PKG@*.so* \ $(IDIR_@UPKG@)/usr/lib -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/.templateprog/Makefile b/package/.templateprog/Makefile index cb58e77a9..919e85807 100644 --- a/package/.templateprog/Makefile +++ b/package/.templateprog/Makefile @@ -15,15 +15,15 @@ PKG_URL:= add project url PKG_SITES:= add download url without package name # if downloaded package is not ending with .tar.xz use following -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +#DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) @PKG@-install: $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \ $(IDIR_@UPKG@)/usr/bin -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/bison/Makefile b/package/bison/Makefile index f548b25e2..ad07639cf 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -1,33 +1,33 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bison -PKG_VERSION:= 3.0.2 +PKG_VERSION:= 3.0.4 PKG_RELEASE:= 1 -PKG_HASH:= a2c3e8528bdb50567d6fa26deeb493dc5ccd7e277b865251608a9e43ac928f3c +PKG_HASH:= a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 PKG_DESCR:= parser generator PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host flex-host bison-host HOST_BUILDDEP:= m4-host flex-host PKG_URL:= http://www.gnu.org/software/bison/ -PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} +PKG_SITES:= $(MASTER_SITE_GNU:=bison/) -include ${ADK_TOPDIR}/mk/host.mk -include ${ADK_TOPDIR}/mk/package.mk +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call HOST_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call HOST_template,BISON,bison,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,BISON,bison,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) TARGET_LDFLAGS+= -lrt XAKE_FLAGS+= M4=m4 bison-install: - ${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison - ${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin - ${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison - $(CP) ./files/yacc ${IDIR_BISON}/usr/bin + $(INSTALL_DIR) $(IDIR_BISON)/usr/bin $(IDIR_BISON)/usr/share/bison + $(INSTALL_BIN) $(WRKINST)/usr/bin/bison $(IDIR_BISON)/usr/bin + $(INSTALL_BIN) ./files/yacc $(IDIR_BISON)/usr/bin + $(CP) $(WRKINST)/usr/share/bison/* $(IDIR_BISON)/usr/share/bison -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in deleted file mode 100644 index cf6ade9c5..000000000 --- a/package/bison/patches/patch-Makefile_in +++ /dev/null @@ -1,27 +0,0 @@ ---- bison-3.0.1.orig/Makefile.in 2013-11-12 14:57:09.000000000 +0100 -+++ bison-3.0.1/Makefile.in 2013-11-27 18:46:46.000000000 +0100 -@@ -5134,22 +5134,12 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $( - doc/refcard.pdf: doc/refcard.tex - $(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex - $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT) -- $(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp -- $(AM_V_at) src/bison$(EXEEXT) --help >>doc/bison.help.tmp -+ echo "3.0.1" >doc/bison.help.tmp -+ echo "no help" >>doc/bison.help.tmp - $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@ - - # Depend on configure to get version number changes. - $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure -- $(AM_V_GEN)$(HELP2MAN) \ -- --include=$(top_srcdir)/doc/bison.x \ -- --output=$@.t src/bison$(EXEEXT) -- $(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \ -- $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \ -- touch $@; \ -- else \ -- mv $@.t $@; \ -- fi -- $(AM_V_at)rm -f $@*.t - - .gv.eps: - $(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'` diff --git a/package/bison/patches/patch-doc_bison_help b/package/bison/patches/patch-doc_bison_help deleted file mode 100644 index c2b452fdf..000000000 --- a/package/bison/patches/patch-doc_bison_help +++ /dev/null @@ -1,11 +0,0 @@ ---- bison-3.0.1.orig/doc/bison.help 2013-11-12 14:57:56.000000000 +0100 -+++ bison-3.0.1/doc/bison.help 2013-11-27 18:41:48.000000000 +0100 -@@ -4,7 +4,7 @@ Written by Robert Corbett and Richard St - Copyright (C) 2013 Free Software Foundation, Inc. - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. --Usage: src/bison [OPTION]... FILE -+Usage: bison [OPTION]... FILE - Generate a deterministic LR or generalized LR (GLR) parser employing - LALR(1), IELR(1), or canonical LR(1) parser tables. IELR(1) and - canonical LR(1) support is experimental. diff --git a/package/curl/Makefile b/package/curl/Makefile index b80dd5f35..7f0cda615 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.39.0 +PKG_VERSION:= 7.40.0 PKG_RELEASE:= 1 -PKG_HASH:= a3a7c2b9e7416c728469eb4cb5b61e9161335df4278329e1d9cc3c194e25d795 +PKG_HASH:= c2e0705a13e53f8f924d1eaeb2ab94f59a9e162007c489b9ab0c96238bddf84b PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_DEPENDS:= libcurl @@ -26,7 +26,7 @@ PKGSS_LIBCURL:= zlib PKG_FLAVOURS_CURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable ipv6 support -PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL +PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL WITH_CYASSL PKGCD_WITHOUT_SSL:= use no ssl PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp @@ -34,6 +34,9 @@ PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_GNUTLS:= use gnutls for crypto PKGCS_WITH_GNUTLS:= libgnutls ca-certificates libgmp PKGCB_WITH_GNUTLS:= gnutls +PKGCD_WITH_CYASSL:= use cyassl for crypto +PKGCS_WITH_CYASSL:= cyassl ca-certificates +PKGCB_WITH_CYASSL:= cyassl include ${ADK_TOPDIR}/mk/package.mk @@ -55,10 +58,15 @@ CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \ --without-ssl \ --without-axtls endif +ifeq (${ADK_PACKAGE_LIBCURL_WITH_CYASSL},y) +CONFIGURE_ARGS+= --with-cyassl="${STAGING_TARGET_DIR}/usr" \ + --without-ssl \ + --without-gnutls \ + --without-axtls +endif CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t -CONFIGURE_ARGS+= --disable-thread \ - --enable-cookies \ +CONFIGURE_ARGS+= --enable-cookies \ --enable-crypto-auth \ --enable-nonblocking \ --enable-file \ diff --git a/package/cyassl/Makefile b/package/cyassl/Makefile new file mode 100644 index 000000000..2db3b9584 --- /dev/null +++ b/package/cyassl/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= cyassl +PKG_VERSION:= 3.3.0 +PKG_RELEASE:= 1 +PKG_HASH:= 7ce5f704ec4ad72e4b955aeec732ad8a38e8dcd1f93bfc79dfda7c4bc894c67e +PKG_DESCR:= portable embedded ssl library +PKG_SECTION:= libs/crypto +PKG_URL:= http://www.wolfssl.com +PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,CYASSL,cyassl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIGURE_ARGS+= --disable-examples +CONFIGURE_ENV+= C_EXTRA_FLAGS='$(TARGET_CFLAGS)' + +cyassl-install: + $(INSTALL_DIR) $(IDIR_CYASSL)/usr/lib + $(CP) $(WRKINST)/usr/lib/libcyassl*.so* \ + $(IDIR_CYASSL)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/flex/Makefile b/package/flex/Makefile index 1bf505504..b5477a623 100644 --- a/package/flex/Makefile +++ b/package/flex/Makefile @@ -1,38 +1,36 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= flex -PKG_VERSION:= 2.5.35 -PKG_RELEASE:= 3 -PKG_HASH:= a6fe3ac80b5f89769d833efde712f95bb0255bcf9089fa324636a9b8a005c717 +PKG_VERSION:= 2.5.39 +PKG_RELEASE:= 1 +PKG_HASH:= c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 PKG_DESCR:= fast lexical analyzer PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host HOST_BUILDDEP:= m4-host PKG_URL:= http://flex.sourceforge.net/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=flex/) PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk -include ${ADK_TOPDIR}/mk/host.mk -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call HOST_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call HOST_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) hostpost-install: (cd $(STAGING_HOST_DIR)/usr/bin; ln -sf flex lex) flex-install: - ${INSTALL_DIR} ${IDIR_FLEX}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin + $(INSTALL_DIR) $(IDIR_FLEX)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/flex $(IDIR_FLEX)/usr/bin # workaround for dev subpackage - ${INSTALL_DIR} ${IDIR_FLEX_DEV}/usr/lib - ${CP} ${WRKINST}/usr/lib/libfl.a \ - ${IDIR_FLEX_DEV}/usr/lib + $(INSTALL_DIR) $(IDIR_FLEX_DEV)/usr/lib + $(CP) $(WRKINST)/usr/lib/libfl.a \ + $(IDIR_FLEX_DEV)/usr/lib -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/flex/patches/patch-Makefile_in b/package/flex/patches/patch-Makefile_in deleted file mode 100644 index 6c8103d00..000000000 --- a/package/flex/patches/patch-Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- flex-2.5.35.orig/Makefile.in 2008-02-26 22:34:10.000000000 +0100 -+++ flex-2.5.35/Makefile.in 2010-10-04 23:21:19.000000000 +0200 -@@ -483,7 +483,6 @@ libfl.a: $(libfl_a_OBJECTS) $(libfl_a_DE - libfl_pic.a: $(libfl_pic_a_OBJECTS) $(libfl_pic_a_DEPENDENCIES) - -rm -f libfl_pic.a - $(libfl_pic_a_AR) libfl_pic.a $(libfl_pic_a_OBJECTS) $(libfl_pic_a_LIBADD) -- $(RANLIB) libfl_pic.a - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" diff --git a/package/flex/patches/patch-conf_in b/package/flex/patches/patch-conf_in deleted file mode 100644 index b0391feb7..000000000 --- a/package/flex/patches/patch-conf_in +++ /dev/null @@ -1,20 +0,0 @@ ---- flex-2.5.35.orig/conf.in 2008-02-26 22:34:02.000000000 +0100 -+++ flex-2.5.35/conf.in 2010-10-04 23:18:48.000000000 +0200 -@@ -162,7 +162,7 @@ - - /* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be -- automatically deduced at run-time. -+ automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -@@ -190,7 +190,7 @@ - /* Define to rpl_realloc if the replacement function should be used. */ - #undef realloc - --/* Define to `unsigned' if <sys/types.h> does not define. */ -+/* Define to `unsigned int' if <sys/types.h> does not define. */ - #undef size_t - - /* Define as `fork' if `vfork' does not work. */ diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 2b57275a8..8510913eb 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -1,12 +1,12 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.3.10 +PKG_VERSION:= 3.3.12 PKG_RELEASE:= 1 -PKG_HASH:= e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219 +PKG_HASH:= 67ab3e92c5d48f3323b897d7c1aa0bb2af6f3a84f5bd9931cda163a7ff32299b PKG_DESCR:= transport layer security library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp @@ -18,6 +18,7 @@ PKG_LIBNAME:= libgnutls PKG_OPTS:= dev PKG_BUILDDEP_UCLIBC:= libiconv-tiny +PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL PKGSD_GNUTLS_UTILS:= transport layer security utilities @@ -31,12 +32,12 @@ PKG_FLAVOURS_LIBGNUTLS:= WITH_CRYPTODEV PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux PKGFB_WITH_CRYPTODEV:= cryptodev-linux -include ${ADK_TOPDIR}/mk/package.mk +include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS},${PKG_OPTS})) -$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GNUTLS_UTILS},${PKGSD_GNUTLS_UTILS},${PKGSC_GNUTLS_UTILS})) -$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_EXTRA})) -$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_OPENSSL})) +$(eval $(call PKG_template,LIBGNUTLS,libgnutls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS),$(PKG_OPTS))) +$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_GNUTLS_UTILS),$(PKGSD_GNUTLS_UTILS),$(PKGSC_GNUTLS_UTILS))) +$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS_EXTRA))) +$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS_OPENSSL))) ifneq ($(ADK_PACKAGE_LIBGNUTLS_WITH_CRYPTODEV),) CONFIGURE_ARGS+= --enable-cryptodev @@ -49,22 +50,22 @@ CONFIGURE_ARGS+= --disable-rpath \ CONFIGURE_ENV+= ac_cv_prog_AR='$(TARGET_CROSS)ar' libgnutls-install: - ${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutls.so* ${IDIR_LIBGNUTLS}/usr/lib + $(INSTALL_DIR) $(IDIR_LIBGNUTLS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgnutls.so* $(IDIR_LIBGNUTLS)/usr/lib libgnutls-extra-install: - ${INSTALL_DIR} ${IDIR_LIBGNUTLS_EXTRA}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutlsxx.so* \ - ${IDIR_LIBGNUTLS_EXTRA}/usr/lib + $(INSTALL_DIR) $(IDIR_LIBGNUTLS_EXTRA)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgnutlsxx.so* \ + $(IDIR_LIBGNUTLS_EXTRA)/usr/lib libgnutls-openssl-install: - ${INSTALL_DIR} ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so* \ - ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib + $(INSTALL_DIR) $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgnutls-openssl.so* \ + $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib gnutls-utils-install: - ${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin - ${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \ - ${IDIR_GNUTLS_UTILS}/usr/bin + $(INSTALL_DIR) $(IDIR_GNUTLS_UTILS)/usr/bin + $(CP) $(WRKINST)/usr/bin/((cert,srp,psk)tool,gnutls-{cli,serv}) \ + $(IDIR_GNUTLS_UTILS)/usr/bin -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile index 3a64b566d..a51790985 100644 --- a/package/htpdate/Makefile +++ b/package/htpdate/Makefile @@ -1,27 +1,25 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= htpdate -PKG_VERSION:= 1.0.5 +PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 -PKG_HASH:= f465059495eae91437eb5eec7af92f1374eb3836f50926e8e5718818abf91e9a +PKG_HASH:= 0d75f91cb61f8869c8298d198fa52b9a139ae505b366e9d4d331af8bc1c04880 PKG_DESCR:= hypertext time protocol implementation PKG_SECTION:= net/ntp PKG_URL:= http://www.vervest.org/htp/ PKG_SITES:= http://www.vervest.org/htp/archive/c/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include $(ADK_TOPDIR)/mk/package.mk -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,HTPDATE,htpdate,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) CONFIG_STYLE:= manual htpdate-install: - ${INSTALL_DIR} ${IDIR_HTPDATE}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/htpdate ${IDIR_HTPDATE}/usr/sbin/ + $(INSTALL_DIR) $(IDIR_HTPDATE)/usr/sbin + $(INSTALL_BIN) $(WRKBUILD)/htpdate $(IDIR_HTPDATE)/usr/sbin/ -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/htpdate/patches/patch-Makefile b/package/htpdate/patches/patch-Makefile index 9afe7bc70..b7b80f427 100644 --- a/package/htpdate/patches/patch-Makefile +++ b/package/htpdate/patches/patch-Makefile @@ -1,35 +1,34 @@ ---- htpdate-1.0.4.orig/Makefile 2008-10-13 21:04:08.000000000 +0200 -+++ htpdate-1.0.4/Makefile 2010-02-05 22:49:58.954334284 +0100 -@@ -2,8 +2,8 @@ prefix = /usr +--- htpdate-1.1.1.orig/Makefile 2014-02-07 09:55:26.000000000 +0100 ++++ htpdate-1.1.1/Makefile 2015-02-03 06:09:46.000000000 +0100 +@@ -2,12 +2,10 @@ prefix = $(DESTDIR)/usr bindir = ${prefix}/bin mandir = ${prefix}/share/man -CC = gcc -CFLAGS += -Wall -O2 +-#CFLAGS += -Wall -pedantic -ansi -O2 +CC ?= gcc -+CFLAGS ?= -Wall -O2 - #CFLAGS += -Wall -pedantic -ansi -O2 ++CFLAGS ?= INSTALL = /usr/bin/install -c -@@ -15,15 +15,14 @@ htpdate: htpdate.c - $(CC) $(CFLAGS) -o htpdate htpdate.c +-STRIP = /usr/bin/strip -s + + all: htpdate + +@@ -15,16 +13,11 @@ htpdate: htpdate.c + $(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o htpdate htpdate.c install: all - $(STRIP) htpdate -- mkdir -p $(bindir) -- $(INSTALL) -m 755 htpdate $(bindir)/htpdate + mkdir -p $(bindir) + $(INSTALL) -m 755 htpdate $(bindir)/htpdate - mkdir -p $(mandir)/man8 -- $(INSTALL) -m 644 htpdate.8.gz $(mandir)/man8/htpdate.8.gz -+ mkdir -p $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 htpdate $(DESTDIR)$(bindir)/htpdate -+ mkdir -p $(DESTDIR)$(mandir)/man8 -+ $(INSTALL) -m 644 htpdate.8.gz $(DESTDIR)$(mandir)/man8/htpdate.8.gz +- $(INSTALL) -m 644 htpdate.8 $(mandir)/man8/htpdate.8 +- gzip -f -9 $(mandir)/man8/htpdate.8 clean: rm -rf htpdate uninstall: -- rm -rf $(bindir)/htpdate + rm -rf $(bindir)/htpdate - rm -rf $(mandir)/man8/htpdate.8.gz -+ rm -rf $(DESTDIR)$(bindir)/htpdate -+ rm -rf $(DESTDIR)$(mandir)/man8/htpdate.8.gz diff --git a/package/htpdate/patches/patch-htpdate_c b/package/htpdate/patches/patch-htpdate_c index c8294b11c..ce7ad41c3 100644 --- a/package/htpdate/patches/patch-htpdate_c +++ b/package/htpdate/patches/patch-htpdate_c @@ -1,5 +1,5 @@ ---- htpdate-1.0.4.orig/htpdate.c 2008-10-13 21:04:08.000000000 +0200 -+++ htpdate-1.0.4/htpdate.c 2010-02-05 22:48:28.624323989 +0100 +--- htpdate-1.1.1.orig/htpdate.c 2014-10-28 21:29:36.000000000 +0100 ++++ htpdate-1.1.1/htpdate.c 2015-02-03 06:07:38.000000000 +0100 @@ -353,6 +353,7 @@ static int setclock( double timedelta, i } @@ -17,7 +17,7 @@ static void showhelp() { puts("htpdate version "VERSION"\n\ -@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid +@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid -s set time\n\ -t turn off sanity time check\n\ -u run daemon as user\n\ diff --git a/package/kodi/Makefile b/package/kodi/Makefile index a8a6836f5..7e90ba9ed 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi PKG_VERSION:= 14.0 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_HASH:= 11746d95cc59361f36ce6ea9d0d36bbd9ec3376e991f5ec1720f8ff740b91192 PKG_DESCR:= software media player PKG_SECTION:= mm/video @@ -119,7 +119,6 @@ CONFIGURE_ARGS+= --disable-optical-drive \ --disable-mid \ --disable-debug \ --enable-alsa \ - --enable-libvorbisenc \ --enable-texturepacker \ --enable-udev \ --with-ffmpeg=shared @@ -181,7 +180,6 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) CONFIGURE_ARGS+= --disable-x11 \ --disable-sdl \ --enable-gles \ - --enable-neon \ --enable-codec=imxvpu endif diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index c27485875..d308952fa 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -1,12 +1,12 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libgcrypt -PKG_VERSION:= 1.6.1 +PKG_VERSION:= 1.6.2 PKG_RELEASE:= 1 -PKG_HASH:= 7c1007197bef49c3b8740cf6af8b4eb4eb74c7a69796ebcf555d928c287255de +PKG_HASH:= 936921644b9c81e2395e18a554a9a5f9252aae3976f8afc3e4229ee9d785e627 PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error @@ -15,24 +15,24 @@ PKG_URL:= http://directory.fsf.org/project/libgcrypt PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz -include ${ADK_TOPDIR}/mk/package.mk +include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) CONFIGURE_ARGS+= --disable-asm \ - --with-gpg-error-prefix="${STAGING_TARGET_DIR}/usr" + --with-gpg-error-prefix="$(STAGING_TARGET_DIR)/usr" post-install: # provides own automake macros - ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/share/aclocal - ${CP} ${WRKINST}/usr/share/aclocal/libgcrypt.m4 \ - ${STAGING_HOST_DIR}/usr/share/aclocal + $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal + $(CP) $(WRKINST)/usr/share/aclocal/libgcrypt.m4 \ + $(STAGING_HOST_DIR)/usr/share/aclocal libgcrypt-install: - ${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgcrypt.so* \ - ${IDIR_LIBGCRYPT}/usr/lib + $(INSTALL_DIR) $(IDIR_LIBGCRYPT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgcrypt.so* \ + $(IDIR_LIBGCRYPT)/usr/lib -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libjpeg-turbo/Makefile b/package/libjpeg-turbo/Makefile index 63f01f594..99e4512cf 100644 --- a/package/libjpeg-turbo/Makefile +++ b/package/libjpeg-turbo/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9 PKG_DESCR:= jpeg image library PKG_SECTION:= libs/image +PKG_BUILDDEP_IBM_X40:= yasm-host +PKG_BUILDDEP_QEMU_X86:= yasm-host PKG_URL:= http://libjpeg-turbo.virtualgl.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/} PKG_OPTS:= dev diff --git a/package/libressl/Makefile b/package/libressl/Makefile index dc799370c..943f804b1 100644 --- a/package/libressl/Makefile +++ b/package/libressl/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libressl -PKG_VERSION:= 2.1.2 +PKG_VERSION:= 2.1.3 PKG_RELEASE:= 1 -PKG_HASH:= 07c05f12e5d49dbfcf82dd23b6b4877b7cdb1c8e4c8dd27cb4d9e5758a6caf52 +PKG_HASH:= eb2f370971408fb10af6453e556465c8eee728ac333bf1eb47ec1a5112304f7c PKG_DESCR:= ssl library PKG_SECTION:= libs/crypto PKG_URL:= http://www.libressl.org diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index 3b825b131..a19045b1e 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -1,28 +1,28 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libtasn1 -PKG_VERSION:= 4.0 +PKG_VERSION:= 4.2 PKG_RELEASE:= 1 -PKG_HASH:= 41d044f7644bdd1c4f8a5c15ac1885ca1fcbf32f5f6dd4760a19278b979857fe +PKG_HASH:= 693b41cb36c2ac02d5990180b0712a79a591168e93d85f7fcbb75a0a0be4cdbb PKG_DESCR:= asn.1 and der structures manipulation library PKG_SECTION:= libs/crypto PKG_URL:= http://www.gnupg.org/ -PKG_SITES:= ${MASTER_SITE_GNU:=libtasn1/} +PKG_SITES:= $(MASTER_SITE_GNU:=libtasn1/) PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz -include ${ADK_TOPDIR}/mk/package.mk +include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBTASN1,libtasn1,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) CONFIGURE_ARGS+= --disable-gtk-doc-html libtasn1-install: - ${INSTALL_DIR} ${IDIR_LIBTASN1}/usr/lib - ${CP} ${WRKINST}/usr/lib/libtasn1.so* ${IDIR_LIBTASN1}/usr/lib + $(INSTALL_DIR) $(IDIR_LIBTASN1)/usr/lib + $(CP) $(WRKINST)/usr/lib/libtasn1.so* $(IDIR_LIBTASN1)/usr/lib -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index e8fa299a3..893c3c62b 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openjdk7 -PKG_VERSION:= 2.4.7 -PKG_RELEASE:= 9 -PKG_HASH:= b66973bef7808f8fb03be64e44d312ea2d13590a68a6a4e6690dbcdd1947459d +PKG_VERSION:= 2.5.3 +PKG_RELEASE:= 1 +PKG_HASH:= f4f2922cfec262496e935f81c1d39af66a789f69aa12d1ceee51bcca8934f1f0 PKG_DESCR:= java virtual machine PKG_SECTION:= dev/lang PKG_BUILDDEP:= openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch index e6a83cc7b..22b7ea2c4 100644 --- a/package/openjdk7/patches/openadk.patch +++ b/package/openjdk7/patches/openadk.patch @@ -1,16 +1,16 @@ -diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in ---- icedtea-2.4.7.orig/Makefile.in 2014-04-15 23:20:44.689988653 -0500 -+++ icedtea-2.4.7/Makefile.in 2015-01-15 20:05:28.339161934 -0600 -@@ -712,7 +712,7 @@ +diff -Nur icedtea-2.5.3.orig/Makefile.in icedtea-2.5.3/Makefile.in +--- icedtea-2.5.3.orig/Makefile.in 2014-10-14 22:58:02.003534712 -0500 ++++ icedtea-2.5.3/Makefile.in 2015-01-17 23:31:24.893466195 -0600 +@@ -692,7 +692,7 @@ $(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES) # Bootstrapping patches -ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \ +ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \ - patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \ - patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \ - patches/boot/demos.patch patches/boot/fphexconstants.patch \ -@@ -2720,7 +2720,7 @@ + patches/boot/corba-idlj.patch patches/boot/corba-no-gen.patch \ + patches/boot/corba-orb.patch patches/boot/demos.patch \ + patches/boot/fphexconstants.patch \ +@@ -2585,7 +2585,7 @@ stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp @BUILD_JAMVM_TRUE@ cd jamvm/jamvm && \ @BUILD_JAMVM_TRUE@ ./autogen.sh --with-java-runtime-library=openjdk7 \ @@ -19,13 +19,13 @@ diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in @BUILD_JAMVM_TRUE@ $(MAKE) ; \ @BUILD_JAMVM_TRUE@ $(MAKE) install @BUILD_JAMVM_TRUE@ mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server -diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk.patch ---- icedtea-2.4.7.orig/patches/openadk.patch 1969-12-31 18:00:00.000000000 -0600 -+++ icedtea-2.4.7/patches/openadk.patch 2015-01-15 20:47:04.615139096 -0600 -@@ -0,0 +1,743 @@ +diff -Nur icedtea-2.5.3.orig/patches/openadk.patch icedtea-2.5.3/patches/openadk.patch +--- icedtea-2.5.3.orig/patches/openadk.patch 1969-12-31 18:00:00.000000000 -0600 ++++ icedtea-2.5.3/patches/openadk.patch 2015-01-19 11:28:19.304281493 -0600 +@@ -0,0 +1,1450 @@ +diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make -+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2014-02-20 19:51:45.000000000 +0100 -++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2014-06-17 17:39:28.697018938 +0200 ++--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2014-05-20 21:50:38.000000000 -0500 +++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2015-01-17 21:09:09.641544482 -0600 +@@ -39,20 +39,20 @@ + + offsets_arm.s: mkoffsets @@ -52,8 +52,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + endif + endif +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2014-02-20 19:51:45.000000000 +0100 -++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-06-17 17:39:28.701018968 +0200 ++--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2014-05-20 21:50:38.000000000 -0500 +++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2015-01-17 21:09:09.645544482 -0600 +@@ -112,7 +112,6 @@ + # include <string.h> + # include <syscall.h> @@ -62,7 +62,7 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + # include <sys/ipc.h> + # include <sys/shm.h> + # include <link.h> -+@@ -650,9 +649,7 @@ ++@@ -664,9 +663,7 @@ + os::Linux::set_glibc_version(str); + } else { + // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version() @@ -73,7 +73,7 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + os::Linux::set_glibc_version(_gnu_libc_version); + } + -+@@ -2951,10 +2948,7 @@ ++@@ -2948,10 +2945,7 @@ + // If we are running with earlier version, which did not have symbol versions, + // we should use the base version. + void* os::Linux::libnuma_dlsym(void* handle, const char *name) { @@ -85,7 +85,7 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + return f; + } + -+@@ -5329,7 +5323,21 @@ ++@@ -5612,7 +5606,21 @@ + // Linux doesn't yet have a (official) notion of processor sets, + // so just return the system wide load average. + int os::loadavg(double loadavg[], int nelem) { @@ -109,8 +109,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + + void os::pause() { +diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp -+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2014-02-20 19:51:45.000000000 +0100 -++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2014-06-17 17:39:28.705018998 +0200 ++--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2014-05-20 21:50:38.000000000 -0500 +++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2015-01-17 21:09:09.645544482 -0600 +@@ -253,7 +253,7 @@ + #elif defined(__APPLE__) + inline int g_isnan(double f) { return isnan(f); } @@ -132,8 +132,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + + // Wide characters +diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile -+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2014-06-17 17:39:28.705018998 +0200 ++--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2015-01-17 21:09:09.645544482 -0600 +@@ -79,7 +79,7 @@ + OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB + endif @@ -144,8 +144,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + endif + +diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile -+--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile 2014-06-17 17:39:28.705018998 +0200 ++--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile 2015-01-17 21:09:09.645544482 -0600 +@@ -64,7 +64,7 @@ + COMPILER_WARNINGS_FATAL=true + endif @@ -156,9 +156,9 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + ifeq ($(PLATFORM), solaris) + #LIBSCTP = -lsctp +diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk -+--- openjdk.orig/jdk/make/common/Defs.gmk 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/common/Defs.gmk 2014-06-17 17:39:28.705018998 +0200 -+@@ -204,7 +204,7 @@ ++--- openjdk.orig/jdk/make/common/Defs.gmk 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/common/Defs.gmk 2015-01-17 21:09:09.649544482 -0600 ++@@ -207,7 +207,7 @@ + ifeq ($(PLATFORM), macosx) + FREETYPE_HEADERS_PATH = /usr/X11R6/include + else @@ -168,8 +168,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + endif + endif +diff -Nur openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk -+--- openjdk.orig/jdk/make/common/Sanity.gmk 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/common/Sanity.gmk 2014-06-17 17:39:28.705018998 +0200 ++--- openjdk.orig/jdk/make/common/Sanity.gmk 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/common/Sanity.gmk 2015-01-17 21:09:09.649544482 -0600 +@@ -91,8 +91,7 @@ + sane-ld_run_path \ + sane-alt_bootdir \ @@ -180,10 +180,29 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + + ifdef OPENJDK + sanity-all:: sane-freetype ++diff -Nur openjdk.orig/jdk/make/common/shared/Defs-utils.gmk openjdk/jdk/make/common/shared/Defs-utils.gmk ++--- openjdk.orig/jdk/make/common/shared/Defs-utils.gmk 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2015-01-19 11:27:10.932282117 -0600 ++@@ -157,13 +157,13 @@ ++ TRUE = $(UTILS_COMMAND_PATH)true ++ UNAME = $(UTILS_COMMAND_PATH)uname ++ UNIQ = $(UTILS_USR_BIN_PATH)uniq ++-UNZIP = $(UTILS_USR_BIN_PATH)unzip +++UNZIP = unzip ++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx ++ XARGS = $(UTILS_USR_BIN_PATH)xargs ++ WC = $(UTILS_USR_BIN_PATH)wc ++ WHICH = $(UTILS_USR_BIN_PATH)which ++ YACC = $(UTILS_CCS_BIN_PATH)yacc ++-ZIPEXE = $(UTILS_DEVTOOL_PATH)zip +++ZIPEXE = zip ++ ++ # Special cases ++ #RM is defined by GNU Make as 'rm -f' +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk -+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/common/shared/Platform.gmk 2014-06-17 17:39:28.705018998 +0200 -+@@ -160,9 +160,6 @@ ++--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/common/shared/Platform.gmk 2015-01-17 21:09:09.649544482 -0600 ++@@ -170,9 +170,6 @@ + else + mach := $(shell uname -m) + endif @@ -194,8 +213,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + i[3-9]86) \ + echo i586 \ +diff -Nur openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk -+--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/common/shared/Sanity.gmk 2014-06-17 17:39:28.705018998 +0200 ++--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/common/shared/Sanity.gmk 2015-01-17 21:09:09.649544482 -0600 +@@ -114,11 +114,6 @@ + elif [ -f /etc/lsb-release ] ; then \ + $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \ @@ -252,8 +271,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + # If a sanity file doesn't exist, just make sure it's dir exists + $(SANITY_FILES): +diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile -+--- openjdk.orig/jdk/make/java/net/Makefile 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/java/net/Makefile 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/make/java/net/Makefile 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/java/net/Makefile 2015-01-17 21:09:09.649544482 -0600 +@@ -25,7 +25,7 @@ + + BUILDDIR = ../.. @@ -264,18 +283,18 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + include $(BUILDDIR)/common/Defs.gmk + +diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile -+--- openjdk.orig/jdk/make/java/nio/Makefile 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/java/nio/Makefile 2014-06-17 17:39:28.709019029 +0200 -+@@ -373,7 +373,7 @@ ++--- openjdk.orig/jdk/make/java/nio/Makefile 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/java/nio/Makefile 2015-01-17 21:09:09.653544482 -0600 ++@@ -403,7 +403,7 @@ + endif + + ifeq ($(PLATFORM), linux) +- OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL) ++ OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread $(LIBDL) -+ ifdef USE_SYSTEM_GIO ++ ifeq ($(SYSTEM_GIO), true) + OTHER_LDLIBS += $(GIO_LIBS) + OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO -+@@ -927,7 +927,7 @@ ++@@ -960,7 +960,7 @@ + + $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) + $(prep-target) @@ -284,7 +303,7 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC)) + + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR -+@@ -963,7 +963,7 @@ ++@@ -996,7 +996,7 @@ + + $(GENUC_EXE) : $(GENUC_SRC) + $(prep-target) @@ -294,8 +313,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR + $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java +diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk -+--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/sun/awt/mawt.gmk 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/sun/awt/mawt.gmk 2015-01-17 21:09:09.653544482 -0600 +@@ -151,22 +151,6 @@ + #endif + @@ -350,12 +369,12 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk +- $(wildcard /usr/include/X11/extensions)) +-endif + -+ ifeq ($(PLATFORM), macosx)) ++ ifeq ($(PLATFORM), macosx) + CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ +diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile -+--- openjdk.orig/jdk/make/sun/xawt/Makefile 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/make/sun/xawt/Makefile 2014-06-17 17:39:28.709019029 +0200 -+@@ -292,16 +292,10 @@ ++--- openjdk.orig/jdk/make/sun/xawt/Makefile 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/make/sun/xawt/Makefile 2015-01-17 21:09:09.653544482 -0600 ++@@ -295,16 +295,10 @@ + SIZERS = $(SIZER).32 + SIZERS_C = $(SIZER_32_C) + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 @@ -372,7 +391,7 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + endif # 32 + endif # !macosx + endif # solaris -+@@ -337,11 +331,7 @@ ++@@ -340,11 +334,7 @@ + WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class + XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt + @@ -385,7 +404,7 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + + $(SIZERS): $(SIZERS_C) + $(prep-target) -+@@ -364,7 +354,7 @@ ++@@ -367,7 +357,7 @@ + $(CHMOD) +w $@;\ + else \ + $(ECHO) GENERATING $@; \ @@ -395,20 +414,20 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ + $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java -+--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2015-01-17 21:09:09.653544482 -0600 +@@ -69,7 +69,7 @@ + */ + static { + java.security.AccessController.doPrivileged( +- new sun.security.action.LoadLibraryAction("net")); ++ new sun.security.action.LoadLibraryAction("javanet")); ++ init(); + } + -+ /** +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java -+--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2015-01-17 21:09:09.653544482 -0600 +@@ -78,7 +78,7 @@ + */ + static { @@ -419,8 +438,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + + /** +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java -+--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2015-01-17 21:09:09.657544482 -0600 +@@ -47,7 +47,7 @@ + */ + static { @@ -431,8 +450,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + } + +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java -+--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2015-01-17 21:09:09.657544482 -0600 +@@ -267,7 +267,7 @@ + static { + preferIPv6Address = java.security.AccessController.doPrivileged( @@ -443,8 +462,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + } + +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java -+--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2015-01-17 21:09:09.657544482 -0600 +@@ -53,7 +53,7 @@ + private static final int defaultIndex; /* index of defaultInterface */ + @@ -454,9 +473,146 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + init(); + defaultInterface = DefaultInterface.getDefault(); + if (defaultInterface != null) { ++diff -Nur openjdk.orig/jdk/src/share/classes/java/util/CurrencyData.properties openjdk/jdk/src/share/classes/java/util/CurrencyData.properties ++--- openjdk.orig/jdk/src/share/classes/java/util/CurrencyData.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/java/util/CurrencyData.properties 2015-01-17 21:11:08.833543391 -0600 ++@@ -1,5 +1,5 @@ ++ # ++-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. +++# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. ++ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ # ++ # This code is free software; you can redistribute it and/or modify it ++@@ -26,10 +26,9 @@ ++ formatVersion=1 ++ ++ # Version of the currency code information in this class. ++-# It is a serial number that accompanies with each amendment, such as ++-# 'MAxxx.doc' +++# It is a serial number that accompanies with each amendment. ++ ++-dataVersion=151 +++dataVersion=159 ++ ++ # List of all valid ISO 4217 currency codes. ++ # To ensure compatibility, do not remove codes. ++@@ -49,11 +48,12 @@ ++ NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\ ++ PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\ ++ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\ ++- SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ +++ SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ ++ TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\ ++ UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ ++ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\ ++- XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZWD716-ZWL932-ZWN942-ZWR935 +++ XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\ +++ ZWN942-ZWR935 ++ ++ ++ # Mappings from ISO 3166 country codes to ISO 4217 currency codes. ++@@ -71,7 +71,7 @@ ++ # ++ # The table is based on the following web sites: ++ # http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/db_en.html ++-# http://www.bsi-global.com/iso4217currency +++# http://www.currency-iso.org/iso_index/iso_tables.htm ++ # http://www.cia.gov/cia/publications/factbook/indexgeo.html ++ ++ # AFGHANISTAN ++@@ -105,7 +105,7 @@ ++ # AUSTRIA ++ AT=EUR ++ # AZERBAIJAN ++-AZ=AZM;2005-12-31-20-00-00;AZN +++AZ=AZN ++ # BAHAMAS ++ BS=BSD ++ # BAHRAIN ++@@ -378,7 +378,7 @@ ++ # MOROCCO ++ MA=MAD ++ # MOZAMBIQUE ++-MZ=MZM;2006-06-30-22-00-00;MZN +++MZ=MZN ++ # MYANMAR ++ MM=MMK ++ # NAMIBIA ++@@ -440,7 +440,7 @@ ++ # REUNION ++ RE=EUR ++ # ROMANIA ++-RO=ROL;2005-06-30-21-00-00;RON +++RO=RON ++ # RUSSIAN FEDERATION ++ RU=RUB ++ # RWANDA ++@@ -463,6 +463,8 @@ ++ WS=WST ++ # SAN MARINO ++ SM=EUR +++# SOUTH SUDAN +++SS=SSP ++ # SAO TOME AND PRINCIPE ++ ST=STD ++ # SAUDI ARABIA ++@@ -532,7 +534,7 @@ ++ # TUNISIA ++ TN=TND ++ # TURKEY ++-TR=TRL;2004-12-31-22-00-00;TRY +++TR=TRY ++ # TURKMENISTAN ++ TM=TMT ++ # TURKS AND CAICOS ISLANDS ++@@ -558,7 +560,7 @@ ++ # VANUATU ++ VU=VUV ++ # VENEZUELA ++-VE=VEB;2008-01-01-04-00-00;VEF +++VE=VEF ++ # VIET NAM ++ VN=VND ++ # VIRGIN ISLANDS, BRITISH ++@@ -572,7 +574,7 @@ ++ # YEMEN ++ YE=YER ++ # ZAMBIA ++-ZM=ZMK +++ZM=ZMW ++ # ZIMBABWE ++ ZW=ZWL ++ ++@@ -583,7 +585,7 @@ ++ minor0=\ ++ ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\ ++ GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\ ++- TPE-TRL-VUV-XAF-XOF-XPF +++ TPE-TRL-UGX-VND-VUV-XAF-XOF-XPF ++ minor1= ++ minor3=\ ++ BHD-IQD-JOD-KWD-LYD-OMR-TND ++diff -Nur openjdk.orig/jdk/src/share/classes/java/util/LocaleISOData.java openjdk/jdk/src/share/classes/java/util/LocaleISOData.java ++--- openjdk.orig/jdk/src/share/classes/java/util/LocaleISOData.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/java/util/LocaleISOData.java 2015-01-17 21:09:30.541544290 -0600 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -433,6 +433,7 @@ ++ + "SN" + "SEN" // Senegal, Republic of ++ + "SO" + "SOM" // Somalia, Somali Republic ++ + "SR" + "SUR" // Suriname, Republic of +++ + "SS" + "SSD" // South Sudan ++ + "ST" + "STP" // Sao Tome and Principe, Democratic Republic of ++ + "SV" + "SLV" // El Salvador, Republic of ++ + "SX" + "SXM" // Sint Maarten (Dutch part) +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java -+--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2015-01-17 21:09:09.657544482 -0600 +@@ -76,6 +76,6 @@ + + static { @@ -466,8 +622,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + } + } +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java -+--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2015-01-17 21:09:09.657544482 -0600 +@@ -95,7 +95,7 @@ + }}); + if (b != null && b.booleanValue()) { @@ -478,8 +634,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + } + } +diff -Nur openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java -+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2014-06-17 17:39:28.709019029 +0200 ++--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2015-01-17 21:09:09.657544482 -0600 +@@ -483,7 +483,7 @@ + return; + loaded = true; @@ -489,9 +645,142 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + java.security.AccessController + .doPrivileged(new sun.security.action.LoadLibraryAction("nio")); + // IOUtil must be initialized; Its native methods are called from ++diff -Nur openjdk.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties ++--- openjdk.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties 2015-01-17 21:09:30.541544290 -0600 ++@@ -35,4 +35,4 @@ ++ # This notice and attribution to Taligent may not be removed. ++ # Taligent is a registered trademark of Taligent, Inc. ++ ++-PEN=S/ +++PEN=S/. ++diff -Nur openjdk.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties ++--- openjdk.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties 2015-01-17 21:09:30.541544290 -0600 ++@@ -35,4 +35,5 @@ ++ # This notice and attribution to Taligent may not be removed. ++ # Taligent is a registered trademark of Taligent, Inc. ++ +++EUR=\u20AC ++ LTL=Lt ++diff -Nur openjdk.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties ++--- openjdk.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties 2015-01-17 21:09:30.541544290 -0600 ++@@ -35,4 +35,5 @@ ++ # This notice and attribution to Taligent may not be removed. ++ # Taligent is a registered trademark of Taligent, Inc. ++ +++EUR=\u20AC ++ LVL=Ls ++diff -Nur openjdk.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties ++--- openjdk.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties 2015-01-17 21:09:30.541544290 -0600 ++@@ -1,5 +1,5 @@ ++ # ++-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +++# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. ++ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ # ++ # This code is free software; you can redistribute it and/or modify it ++@@ -26,7 +26,7 @@ ++ # ++ # COPYRIGHT AND PERMISSION NOTICE ++ # ++-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved. +++# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. ++ # Distributed under the Terms of Use in http://www.unicode.org/copyright.html. ++ # ++ # Permission is hereby granted, free of charge, to any person obtaining ++@@ -226,6 +226,7 @@ ++ SOS=SOS ++ SRD=SRD ++ SRG=SRG +++SSP=SSP ++ STD=STD ++ SVC=SVC ++ SYP=SYP ++@@ -277,6 +278,7 @@ ++ YUM=YUM ++ ZAR=ZAR ++ ZMK=ZMK +++ZMW=ZMW ++ ZWD=ZWD ++ ZWL=ZWL ++ ZWN=ZWN ++@@ -443,6 +445,7 @@ ++ sos=Somali Shilling ++ srd=Surinamese Dollar ++ srg=Surinamese Guilder +++ssp=South Sudanese Pound ++ std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra ++ svc=Salvadoran Col\u00f3n ++ syp=Syrian Pound ++@@ -486,7 +489,9 @@ ++ xpd=Palladium ++ xpf=CFP Franc ++ xpt=Platinum +++xsu=Sucre ++ xts=Testing Currency Code +++xua=ADB Unit of Account ++ xxx=Unknown Currency ++ yer=Yemeni Rial ++ yum=Yugoslavian New Dinar (1994-2002) ++diff -Nur openjdk.orig/jdk/src/share/classes/sun/util/resources/LocaleNames.properties openjdk/jdk/src/share/classes/sun/util/resources/LocaleNames.properties ++--- openjdk.orig/jdk/src/share/classes/sun/util/resources/LocaleNames.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/share/classes/sun/util/resources/LocaleNames.properties 2015-01-17 21:09:30.541544290 -0600 ++@@ -1077,6 +1077,7 @@ ++ SN=Senegal ++ SO=Somalia ++ SR=Suriname +++SS=South Sudan ++ ST=Sao Tome And Principe ++ SV=El Salvador ++ SX=Sint Maarten (Dutch part) ++diff -Nur openjdk.orig/jdk/src/solaris/bin/mipsel/jvm.cfg openjdk/jdk/src/solaris/bin/mipsel/jvm.cfg ++--- openjdk.orig/jdk/src/solaris/bin/mipsel/jvm.cfg 1969-12-31 18:00:00.000000000 -0600 +++++ openjdk/jdk/src/solaris/bin/mipsel/jvm.cfg 2015-01-17 21:09:09.661544482 -0600 ++@@ -0,0 +1,38 @@ +++# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +++# +++# This code is free software; you can redistribute it and/or modify it +++# under the terms of the GNU General Public License version 2 only, as +++# published by the Free Software Foundation. Oracle designates this +++# particular file as subject to the "Classpath" exception as provided +++# by Oracle in the LICENSE file that accompanied this code. +++# +++# This code is distributed in the hope that it will be useful, but WITHOUT +++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +++# version 2 for more details (a copy is included in the LICENSE file that +++# accompanied this code). +++# +++# You should have received a copy of the GNU General Public License version +++# 2 along with this work; if not, write to the Free Software Foundation, +++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +++# +++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +++# or visit www.oracle.com if you need additional information or have any +++# questions. +++# +++# List of JVMs that can be used as an option to java, javac, etc. +++# Order is important -- first in this list is the default JVM. +++# NOTE that this both this file and its format are UNSUPPORTED and +++# WILL GO AWAY in a future release. +++# +++# You may also select a JVM in an arbitrary location with the +++# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported +++# and may not be available in a future release. +++# +++-client KNOWN +++-server KNOWN +++-hotspot ERROR +++-classic WARN +++-native ERROR +++-green ERROR +diff -Nur openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java -+--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-06-17 17:39:28.713019059 +0200 ++--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2015-01-17 21:09:09.661544482 -0600 +@@ -247,7 +247,7 @@ + + static { @@ -502,8 +791,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + + } +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c -+--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-06-17 17:39:28.713019059 +0200 ++--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2015-01-17 21:09:09.661544482 -0600 +@@ -246,7 +246,8 @@ + if (wcs == NULL) + return NULL; @@ -515,8 +804,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + mbs = (char *) malloc(n * sizeof(char)); + if (mbs == NULL) { +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c -+--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2014-06-17 17:39:28.713019059 +0200 ++--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2015-01-17 21:09:09.669544482 -0600 +@@ -27,9 +27,6 @@ + #include <X11/Xutil.h> + #include <X11/Xos.h> @@ -554,8 +843,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + Window get_xawt_root_shell(JNIEnv *env) { + static jclass classXRootWindow = NULL; +diff -Nur openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java -+--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-04-12 01:23:06.000000000 +0200 -++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-06-17 17:39:28.713019059 +0200 ++--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2015-01-17 21:09:09.669544482 -0600 +@@ -159,7 +159,7 @@ + + static { @@ -565,51 +854,175 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + init0(); + + // start the address listener thread -+diff -Nur openjdk.orig/jdk/src/solaris/bin/mipsel/jvm.cfg openjdk/jdk/src/solaris/bin/mipsel/jvm.cfg -+--- openjdk.orig/jdk/src/solaris/bin/mipsel/jvm.cfg 1970-01-01 01:00:00.000000000 +0100 -++++ openjdk/jdk/src/solaris/bin/mipsel/jvm.cfg 2014-04-12 01:23:06.000000000 +0200 -+@@ -0,0 +1,38 @@ -++# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -++# -++# This code is free software; you can redistribute it and/or modify it -++# under the terms of the GNU General Public License version 2 only, as -++# published by the Free Software Foundation. Oracle designates this -++# particular file as subject to the "Classpath" exception as provided -++# by Oracle in the LICENSE file that accompanied this code. -++# -++# This code is distributed in the hope that it will be useful, but WITHOUT -++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -++# version 2 for more details (a copy is included in the LICENSE file that -++# accompanied this code). -++# -++# You should have received a copy of the GNU General Public License version -++# 2 along with this work; if not, write to the Free Software Foundation, -++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -++# -++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -++# or visit www.oracle.com if you need additional information or have any -++# questions. -++# -++# List of JVMs that can be used as an option to java, javac, etc. -++# Order is important -- first in this list is the default JVM. -++# NOTE that this both this file and its format are UNSUPPORTED and -++# WILL GO AWAY in a future release. -++# -++# You may also select a JVM in an arbitrary location with the -++# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported -++# and may not be available in a future release. -++# -++-client KNOWN -++-server KNOWN -++-hotspot ERROR -++-classic WARN -++-native ERROR -++-green ERROR ++diff -Nur openjdk.orig/jdk/test/java/util/Currency/tablea1.txt openjdk/jdk/test/java/util/Currency/tablea1.txt ++--- openjdk.orig/jdk/test/java/util/Currency/tablea1.txt 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/test/java/util/Currency/tablea1.txt 2015-01-17 21:09:30.541544290 -0600 ++@@ -1,12 +1,12 @@ ++ # ++ # ++-# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA151.doc ++-# (As of 7 April 2011) +++# Amendments up until ISO 4217 AMENDMENT NUMBER 159 +++# (As of 15 August 2014) ++ # ++ ++ # Version ++ FILEVERSION=1 ++-DATAVERSION=151 +++DATAVERSION=159 ++ ++ # ISO 4217 currency data ++ AF AFN 971 2 ++@@ -23,7 +23,7 @@ ++ AU AUD 36 2 ++ AT EUR 978 2 ++ # MA 129 ++-AZ AZM 31 2 2005-12-31-20-00-00 AZN 944 2 +++AZ AZN 944 2 ++ BS BSD 44 2 ++ BH BHD 48 3 ++ BD BDT 50 2 ++@@ -96,7 +96,7 @@ ++ GM GMD 270 2 ++ GE GEL 981 2 ++ DE EUR 978 2 ++-GH GHC 288 2 2007-07-01-00-00-00 GHS 936 2 +++GH GHS 936 2 ++ GI GIP 292 2 ++ GR EUR 978 2 ++ GL DKK 208 2 ++@@ -135,14 +135,14 @@ ++ KW KWD 414 3 ++ KG KGS 417 2 ++ LA LAK 418 2 ++-LV LVL 428 2 +++LV LVL 428 2 2013-12-31-22-00-00 EUR 978 2 ++ LB LBP 422 2 ++ #LS ZAR 710 2 ++ LS LSL 426 2 ++ LR LRD 430 2 ++ LY LYD 434 3 ++ LI CHF 756 2 ++-LT LTL 440 2 +++LT LTL 440 2 2014-12-31-22-00-00 EUR 978 2 ++ LU EUR 978 2 ++ MO MOP 446 2 ++ MK MKD 807 2 ++@@ -166,7 +166,7 @@ ++ MS XCD 951 2 ++ MA MAD 504 2 ++ # MA 130 ++-MZ MZM 508 2 2006-06-30-22-00-00 MZN 943 2 +++MZ MZN 943 2 ++ MM MMK 104 2 ++ # MA 134 ++ ME EUR 978 2 ++@@ -200,7 +200,7 @@ ++ PR USD 840 2 ++ QA QAR 634 2 ++ RE EUR 978 2 ++-RO ROL 946 2 2005-06-30-21-00-00 RON 946 2 +++RO RON 946 2 ++ RU RUB 643 2 ++ RW RWF 646 0 ++ SH SHP 654 2 ++@@ -227,6 +227,7 @@ ++ SB SBD 90 2 ++ SO SOS 706 2 ++ ZA ZAR 710 2 +++SS SSP 728 2 ++ ES EUR 978 2 ++ LK LKR 144 2 ++ SD SDG 938 2 ++@@ -255,7 +256,7 @@ ++ TM TMT 934 2 ++ TC USD 840 2 ++ TV AUD 36 2 ++-UG UGX 800 2 +++UG UGX 800 0 ++ UA UAH 980 2 ++ AE AED 784 2 ++ GB GBP 826 2 ++@@ -266,14 +267,14 @@ ++ UY UYU 858 2 ++ UZ UZS 860 2 ++ VU VUV 548 0 ++-VE VEB 862 2 2008-01-01-04-00-00 VEF 937 2 ++-VN VND 704 2 +++VE VEF 937 2 +++VN VND 704 0 ++ VG USD 840 2 ++ VI USD 840 2 ++ WF XPF 953 0 ++ EH MAD 504 2 ++ YE YER 886 2 ++-ZM ZMK 894 2 +++ZM ZMW 967 2 ++ ZW ZWL 932 2 ++ #XAU XAU 959 ++ #XBA XBA 955 ++diff -Nur openjdk.orig/jdk/test/java/util/Currency/ValidateISO4217.java openjdk/jdk/test/java/util/Currency/ValidateISO4217.java ++--- openjdk.orig/jdk/test/java/util/Currency/ValidateISO4217.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/test/java/util/Currency/ValidateISO4217.java 2015-01-17 21:09:30.541544290 -0600 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -22,7 +22,7 @@ ++ */ ++ /* ++ * @test ++- * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 +++ * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759 ++ * @summary Validate ISO 4217 data for Currency class. ++ */ ++ ++@@ -92,7 +92,7 @@ ++ ++ /* Codes that are obsolete, do not have related country */ ++ static final String otherCodes = ++- "ADP-AFA-ATS-AYM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-NLG-PTE-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZWD-ZWN-ZWR"; +++ "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-PTE-ROL-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-VEB-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZMK-ZWD-ZWN-ZWR"; ++ ++ static boolean err = false; ++ ++diff -Nur openjdk.orig/jdk/test/sun/text/resources/LocaleData openjdk/jdk/test/sun/text/resources/LocaleData ++--- openjdk.orig/jdk/test/sun/text/resources/LocaleData 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk/jdk/test/sun/text/resources/LocaleData 2015-01-17 21:09:30.541544290 -0600 ++@@ -574,7 +574,6 @@ ++ FormatData/es_PA/NumberElements/0=. ++ FormatData/es_PA/NumberElements/1=, ++ FormatData/es_PA/NumberElements/2=; ++-CurrencyNames/es_PE/PEN=S/ ++ FormatData/es_PE/NumberPatterns/0=#,##0.###;-#,##0.### ++ # FormatData/es_PE/NumberPatterns/1=S/#,##0.00;S/-#,##0.00 # Changed; see bug 4122840 ++ FormatData/es_PE/NumberPatterns/2=#,##0% ++@@ -7012,3 +7011,19 @@ ++ FormatData/sl/DateTimePatterns/4=EEEE, dd. MMMM y ++ FormatData/sl/DateTimePatterns/5=dd. MMMM y ++ +++# bug 7085757 +++CurrencyNames//SSP=SSP +++CurrencyNames//ssp=South Sudanese Pound +++CurrencyNames//xsu=Sucre +++CurrencyNames//xua=ADB Unit of Account +++LocaleNames//SS=South Sudan +++LocaleNames/en/SS=South Sudan +++ +++# bug 7028073 +++CurrencyNames/es_PE/PEN=S/. +++ +++# bug 7195759 +++CurrencyNames//ZMW=ZMW +++ +++# bug 8021121 +++CurrencyNames/lv_LV/EUR=\u20AC +diff -Nur openjdk-boot.orig/corba/make/common/shared/Defs-utils.gmk openjdk-boot/corba/make/common/shared/Defs-utils.gmk -+--- openjdk-boot.orig/corba/make/common/shared/Defs-utils.gmk 2014-01-21 06:46:58.000000000 -0600 -++++ openjdk-boot/corba/make/common/shared/Defs-utils.gmk 2015-01-15 20:14:56.947156399 -0600 ++--- openjdk-boot.orig/corba/make/common/shared/Defs-utils.gmk 2014-08-18 12:20:52.000000000 -0500 +++++ openjdk-boot/corba/make/common/shared/Defs-utils.gmk 2015-01-17 04:48:06.742083397 -0600 +@@ -136,12 +136,12 @@ + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname @@ -626,44 +1039,19 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + + # Special cases + #RM is defined by GNU Make as 'rm -f' -+diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make -+--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make 2014-02-20 12:51:45.000000000 -0600 -++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make 2015-01-15 20:12:14.711157805 -0600 -+@@ -288,7 +288,7 @@ -+ LIBS_VM += $(LIBS) -+ endif -+ ifeq ($(JVM_VARIANT_ZEROSHARK), true) -+- LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS) -++ LIBS_VM += $(LLVM_LIBS) -+ LFLAGS_VM += $(LLVM_LDFLAGS) -+ endif -+ +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make openjdk-boot/hotspot/make/linux/makefiles/zero.make -+--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make 2014-02-20 12:51:45.000000000 -0600 -++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make 2015-01-15 20:12:14.711157805 -0600 ++--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make 2014-05-20 21:50:38.000000000 -0500 +++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make 2015-01-17 04:48:06.782083396 -0600 +@@ -33,4 +33,4 @@ + + # Make sure libffi is included + CFLAGS += $(LIBFFI_CFLAGS) +-LIBS_VM += $(LIBFFI_LIBS) ++LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic -+diff -Nur openjdk-boot.orig/jdk/make/common/Sanity.gmk openjdk-boot/jdk/make/common/Sanity.gmk -+--- openjdk-boot.orig/jdk/make/common/Sanity.gmk 2014-04-11 18:23:06.000000000 -0500 -++++ openjdk-boot/jdk/make/common/Sanity.gmk 2015-01-15 20:12:14.711157805 -0600 -+@@ -91,8 +91,7 @@ -+ sane-ld_run_path \ -+ sane-alt_bootdir \ -+ sane-bootdir \ -+- sane-local-bootdir \ -+- sane-alsa-headers -++ sane-local-bootdir -+ -+ ifdef OPENJDK -+ sanity-all:: sane-freetype +diff -Nur openjdk-boot.orig/jdk/make/common/shared/Defs-utils.gmk openjdk-boot/jdk/make/common/shared/Defs-utils.gmk -+--- openjdk-boot.orig/jdk/make/common/shared/Defs-utils.gmk 2014-04-11 18:23:06.000000000 -0500 -++++ openjdk-boot/jdk/make/common/shared/Defs-utils.gmk 2015-01-15 20:45:49.051139347 -0600 -+@@ -153,13 +153,13 @@ ++--- openjdk-boot.orig/jdk/make/common/shared/Defs-utils.gmk 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/make/common/shared/Defs-utils.gmk 2015-01-17 04:48:06.794083396 -0600 ++@@ -157,13 +157,13 @@ + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq @@ -680,68 +1068,9 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + + # Special cases + #RM is defined by GNU Make as 'rm -f' -+diff -Nur openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk openjdk-boot/jdk/make/common/shared/Sanity.gmk -+--- openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk 2014-04-11 18:23:06.000000000 -0500 -++++ openjdk-boot/jdk/make/common/shared/Sanity.gmk 2015-01-15 20:12:14.715157805 -0600 -+@@ -114,11 +114,6 @@ -+ elif [ -f /etc/lsb-release ] ; then \ -+ $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \ -+ fi) -+- ALSA_INCLUDE=/usr/include/alsa/version.h -+- ALSA_LIBRARY=/usr/lib/libasound.so -+- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \ -+- $(SED) -e 's@.*"\(.*\)".*@\1@' ) -+- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION)) -+ endif -+ -+ ifeq ($(PLATFORM), macosx) -+@@ -225,7 +220,6 @@ -+ sane-compiler \ -+ sane-link \ -+ sane-cacerts \ -+- sane-alsa-headers \ -+ sane-ant_version \ -+ sane-zip_version \ -+ sane-unzip_version \ -+@@ -1381,35 +1375,6 @@ -+ endif -+ endif -+ -+-###################################################### -+-# Check that ALSA headers and libs are installed and -+-# that the header has the right version. We only -+-# need /usr/include/alsa/version.h and /usr/lib/libasound.so -+-###################################################### -+- -+-ifdef REQUIRED_ALSA_VERSION -+- ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION)) -+-endif -+-sane-alsa-headers: -+-ifdef REQUIRED_ALSA_VERSION -+- @if [ "$(ALSA_CHECK)" != "missing" ] ; then \ -+- if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \ -+- $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \ -+- " You have the following ALSA version installed: $${alsa_version} \n" \ -+- " Please reinstall ALSA (drivers and lib). You can download \n" \ -+- " the source distribution from http://www.alsa-project.org \n" \ -+- " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ -+- "" >> $(ERROR_FILE) ; \ -+- fi ; \ -+- else \ -+- $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \ -+- " Please install ALSA (drivers and lib). You can download the \n" \ -+- " source distribution from http://www.alsa-project.org or go to \n" \ -+- " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ -+- "" >> $(ERROR_FILE) ; \ -+- fi -+-endif -+- -+ # If a sanity file doesn't exist, just make sure it's dir exists -+ $(SANITY_FILES): -+ -@$(prep-target) +diff -Nur openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile -+--- openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2014-04-11 18:23:06.000000000 -0500 -++++ openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile 2015-01-15 20:12:14.715157805 -0600 ++--- openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile 2015-01-17 04:48:06.814083396 -0600 +@@ -72,6 +72,7 @@ + -DUSE_PORTS=TRUE \ + -DUSE_PLATFORM_MIDI_OUT=TRUE \ @@ -750,19 +1079,397 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + -I$(SHARE_SRC)/native/com/sun/media/sound + + # -+diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk -+--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk 2014-04-11 18:23:06.000000000 -0500 -++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk 2015-01-15 20:12:14.715157805 -0600 -+@@ -270,12 +270,6 @@ -+ endif # !HEADLESS -+ endif # PLATFORM ++diff -Nur openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties ++--- openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties 2015-01-17 04:49:18.150082743 -0600 ++@@ -1,5 +1,5 @@ ++ # ++-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. +++# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. ++ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ # ++ # This code is free software; you can redistribute it and/or modify it ++@@ -26,10 +26,9 @@ ++ formatVersion=1 + -+-ifeq ($(PLATFORM), linux) -+- # Checking for the X11/extensions headers at the additional location -+- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ -+- $(wildcard /usr/include/X11/extensions)) -+-endif -+- -+ ifeq ($(PLATFORM), macosx)) -+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ -+ -I$(OPENWIN_HOME)/include ++ # Version of the currency code information in this class. ++-# It is a serial number that accompanies with each amendment, such as ++-# 'MAxxx.doc' +++# It is a serial number that accompanies with each amendment. ++ ++-dataVersion=151 +++dataVersion=159 ++ ++ # List of all valid ISO 4217 currency codes. ++ # To ensure compatibility, do not remove codes. ++@@ -49,11 +48,12 @@ ++ NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\ ++ PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\ ++ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\ ++- SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ +++ SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ ++ TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\ ++ UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ ++ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\ ++- XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZWD716-ZWL932-ZWN942-ZWR935 +++ XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\ +++ ZWN942-ZWR935 ++ ++ ++ # Mappings from ISO 3166 country codes to ISO 4217 currency codes. ++@@ -71,7 +71,7 @@ ++ # ++ # The table is based on the following web sites: ++ # http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/db_en.html ++-# http://www.bsi-global.com/iso4217currency +++# http://www.currency-iso.org/iso_index/iso_tables.htm ++ # http://www.cia.gov/cia/publications/factbook/indexgeo.html ++ ++ # AFGHANISTAN ++@@ -105,7 +105,7 @@ ++ # AUSTRIA ++ AT=EUR ++ # AZERBAIJAN ++-AZ=AZM;2005-12-31-20-00-00;AZN +++AZ=AZN ++ # BAHAMAS ++ BS=BSD ++ # BAHRAIN ++@@ -378,7 +378,7 @@ ++ # MOROCCO ++ MA=MAD ++ # MOZAMBIQUE ++-MZ=MZM;2006-06-30-22-00-00;MZN +++MZ=MZN ++ # MYANMAR ++ MM=MMK ++ # NAMIBIA ++@@ -440,7 +440,7 @@ ++ # REUNION ++ RE=EUR ++ # ROMANIA ++-RO=ROL;2005-06-30-21-00-00;RON +++RO=RON ++ # RUSSIAN FEDERATION ++ RU=RUB ++ # RWANDA ++@@ -463,6 +463,8 @@ ++ WS=WST ++ # SAN MARINO ++ SM=EUR +++# SOUTH SUDAN +++SS=SSP ++ # SAO TOME AND PRINCIPE ++ ST=STD ++ # SAUDI ARABIA ++@@ -532,7 +534,7 @@ ++ # TUNISIA ++ TN=TND ++ # TURKEY ++-TR=TRL;2004-12-31-22-00-00;TRY +++TR=TRY ++ # TURKMENISTAN ++ TM=TMT ++ # TURKS AND CAICOS ISLANDS ++@@ -558,7 +560,7 @@ ++ # VANUATU ++ VU=VUV ++ # VENEZUELA ++-VE=VEB;2008-01-01-04-00-00;VEF +++VE=VEF ++ # VIET NAM ++ VN=VND ++ # VIRGIN ISLANDS, BRITISH ++@@ -572,7 +574,7 @@ ++ # YEMEN ++ YE=YER ++ # ZAMBIA ++-ZM=ZMK +++ZM=ZMW ++ # ZIMBABWE ++ ZW=ZWL ++ ++@@ -583,7 +585,7 @@ ++ minor0=\ ++ ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\ ++ GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\ ++- TPE-TRL-VUV-XAF-XOF-XPF +++ TPE-TRL-UGX-VND-VUV-XAF-XOF-XPF ++ minor1= ++ minor3=\ ++ BHD-IQD-JOD-KWD-LYD-OMR-TND ++diff -Nur openjdk-boot.orig/jdk/src/share/classes/java/util/LocaleISOData.java openjdk-boot/jdk/src/share/classes/java/util/LocaleISOData.java ++--- openjdk-boot.orig/jdk/src/share/classes/java/util/LocaleISOData.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/src/share/classes/java/util/LocaleISOData.java 2015-01-17 04:48:06.858083395 -0600 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -433,6 +433,7 @@ ++ + "SN" + "SEN" // Senegal, Republic of ++ + "SO" + "SOM" // Somalia, Somali Republic ++ + "SR" + "SUR" // Suriname, Republic of +++ + "SS" + "SSD" // South Sudan ++ + "ST" + "STP" // Sao Tome and Principe, Democratic Republic of ++ + "SV" + "SLV" // El Salvador, Republic of ++ + "SX" + "SXM" // Sint Maarten (Dutch part) ++diff -Nur openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties openjdk-boot/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties ++--- openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties 2015-01-17 04:48:06.866083395 -0600 ++@@ -35,4 +35,4 @@ ++ # This notice and attribution to Taligent may not be removed. ++ # Taligent is a registered trademark of Taligent, Inc. ++ ++-PEN=S/ +++PEN=S/. ++diff -Nur openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties openjdk-boot/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties ++--- openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties 2015-01-17 04:48:06.874083395 -0600 ++@@ -35,4 +35,5 @@ ++ # This notice and attribution to Taligent may not be removed. ++ # Taligent is a registered trademark of Taligent, Inc. ++ +++EUR=\u20AC ++ LTL=Lt ++diff -Nur openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties openjdk-boot/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties ++--- openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties 2015-01-17 04:48:06.874083395 -0600 ++@@ -35,4 +35,5 @@ ++ # This notice and attribution to Taligent may not be removed. ++ # Taligent is a registered trademark of Taligent, Inc. ++ +++EUR=\u20AC ++ LVL=Ls ++diff -Nur openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties openjdk-boot/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties ++--- openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties 2015-01-17 04:48:06.878083395 -0600 ++@@ -1,5 +1,5 @@ ++ # ++-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +++# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. ++ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ # ++ # This code is free software; you can redistribute it and/or modify it ++@@ -26,7 +26,7 @@ ++ # ++ # COPYRIGHT AND PERMISSION NOTICE ++ # ++-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved. +++# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. ++ # Distributed under the Terms of Use in http://www.unicode.org/copyright.html. ++ # ++ # Permission is hereby granted, free of charge, to any person obtaining ++@@ -226,6 +226,7 @@ ++ SOS=SOS ++ SRD=SRD ++ SRG=SRG +++SSP=SSP ++ STD=STD ++ SVC=SVC ++ SYP=SYP ++@@ -277,6 +278,7 @@ ++ YUM=YUM ++ ZAR=ZAR ++ ZMK=ZMK +++ZMW=ZMW ++ ZWD=ZWD ++ ZWL=ZWL ++ ZWN=ZWN ++@@ -443,6 +445,7 @@ ++ sos=Somali Shilling ++ srd=Surinamese Dollar ++ srg=Surinamese Guilder +++ssp=South Sudanese Pound ++ std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra ++ svc=Salvadoran Col\u00f3n ++ syp=Syrian Pound ++@@ -486,7 +489,9 @@ ++ xpd=Palladium ++ xpf=CFP Franc ++ xpt=Platinum +++xsu=Sucre ++ xts=Testing Currency Code +++xua=ADB Unit of Account ++ xxx=Unknown Currency ++ yer=Yemeni Rial ++ yum=Yugoslavian New Dinar (1994-2002) ++diff -Nur openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/LocaleNames.properties openjdk-boot/jdk/src/share/classes/sun/util/resources/LocaleNames.properties ++--- openjdk-boot.orig/jdk/src/share/classes/sun/util/resources/LocaleNames.properties 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/src/share/classes/sun/util/resources/LocaleNames.properties 2015-01-17 04:48:06.878083395 -0600 ++@@ -1077,6 +1077,7 @@ ++ SN=Senegal ++ SO=Somalia ++ SR=Suriname +++SS=South Sudan ++ ST=Sao Tome And Principe ++ SV=El Salvador ++ SX=Sint Maarten (Dutch part) ++diff -Nur openjdk-boot.orig/jdk/test/java/util/Currency/tablea1.txt openjdk-boot/jdk/test/java/util/Currency/tablea1.txt ++--- openjdk-boot.orig/jdk/test/java/util/Currency/tablea1.txt 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/test/java/util/Currency/tablea1.txt 2015-01-17 04:48:06.898083395 -0600 ++@@ -1,12 +1,12 @@ ++ # ++ # ++-# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA151.doc ++-# (As of 7 April 2011) +++# Amendments up until ISO 4217 AMENDMENT NUMBER 159 +++# (As of 15 August 2014) ++ # ++ ++ # Version ++ FILEVERSION=1 ++-DATAVERSION=151 +++DATAVERSION=159 ++ ++ # ISO 4217 currency data ++ AF AFN 971 2 ++@@ -23,7 +23,7 @@ ++ AU AUD 36 2 ++ AT EUR 978 2 ++ # MA 129 ++-AZ AZM 31 2 2005-12-31-20-00-00 AZN 944 2 +++AZ AZN 944 2 ++ BS BSD 44 2 ++ BH BHD 48 3 ++ BD BDT 50 2 ++@@ -96,7 +96,7 @@ ++ GM GMD 270 2 ++ GE GEL 981 2 ++ DE EUR 978 2 ++-GH GHC 288 2 2007-07-01-00-00-00 GHS 936 2 +++GH GHS 936 2 ++ GI GIP 292 2 ++ GR EUR 978 2 ++ GL DKK 208 2 ++@@ -135,14 +135,14 @@ ++ KW KWD 414 3 ++ KG KGS 417 2 ++ LA LAK 418 2 ++-LV LVL 428 2 +++LV LVL 428 2 2013-12-31-22-00-00 EUR 978 2 ++ LB LBP 422 2 ++ #LS ZAR 710 2 ++ LS LSL 426 2 ++ LR LRD 430 2 ++ LY LYD 434 3 ++ LI CHF 756 2 ++-LT LTL 440 2 +++LT LTL 440 2 2014-12-31-22-00-00 EUR 978 2 ++ LU EUR 978 2 ++ MO MOP 446 2 ++ MK MKD 807 2 ++@@ -166,7 +166,7 @@ ++ MS XCD 951 2 ++ MA MAD 504 2 ++ # MA 130 ++-MZ MZM 508 2 2006-06-30-22-00-00 MZN 943 2 +++MZ MZN 943 2 ++ MM MMK 104 2 ++ # MA 134 ++ ME EUR 978 2 ++@@ -200,7 +200,7 @@ ++ PR USD 840 2 ++ QA QAR 634 2 ++ RE EUR 978 2 ++-RO ROL 946 2 2005-06-30-21-00-00 RON 946 2 +++RO RON 946 2 ++ RU RUB 643 2 ++ RW RWF 646 0 ++ SH SHP 654 2 ++@@ -227,6 +227,7 @@ ++ SB SBD 90 2 ++ SO SOS 706 2 ++ ZA ZAR 710 2 +++SS SSP 728 2 ++ ES EUR 978 2 ++ LK LKR 144 2 ++ SD SDG 938 2 ++@@ -255,7 +256,7 @@ ++ TM TMT 934 2 ++ TC USD 840 2 ++ TV AUD 36 2 ++-UG UGX 800 2 +++UG UGX 800 0 ++ UA UAH 980 2 ++ AE AED 784 2 ++ GB GBP 826 2 ++@@ -266,14 +267,14 @@ ++ UY UYU 858 2 ++ UZ UZS 860 2 ++ VU VUV 548 0 ++-VE VEB 862 2 2008-01-01-04-00-00 VEF 937 2 ++-VN VND 704 2 +++VE VEF 937 2 +++VN VND 704 0 ++ VG USD 840 2 ++ VI USD 840 2 ++ WF XPF 953 0 ++ EH MAD 504 2 ++ YE YER 886 2 ++-ZM ZMK 894 2 +++ZM ZMW 967 2 ++ ZW ZWL 932 2 ++ #XAU XAU 959 ++ #XBA XBA 955 ++diff -Nur openjdk-boot.orig/jdk/test/java/util/Currency/ValidateISO4217.java openjdk-boot/jdk/test/java/util/Currency/ValidateISO4217.java ++--- openjdk-boot.orig/jdk/test/java/util/Currency/ValidateISO4217.java 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/test/java/util/Currency/ValidateISO4217.java 2015-01-17 04:48:06.898083395 -0600 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -22,7 +22,7 @@ ++ */ ++ /* ++ * @test ++- * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 +++ * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759 ++ * @summary Validate ISO 4217 data for Currency class. ++ */ ++ ++@@ -92,7 +92,7 @@ ++ ++ /* Codes that are obsolete, do not have related country */ ++ static final String otherCodes = ++- "ADP-AFA-ATS-AYM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-NLG-PTE-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZWD-ZWN-ZWR"; +++ "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-PTE-ROL-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-VEB-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZMK-ZWD-ZWN-ZWR"; ++ ++ static boolean err = false; ++ ++diff -Nur openjdk-boot.orig/jdk/test/sun/text/resources/LocaleData openjdk-boot/jdk/test/sun/text/resources/LocaleData ++--- openjdk-boot.orig/jdk/test/sun/text/resources/LocaleData 2014-10-01 21:17:19.000000000 -0500 +++++ openjdk-boot/jdk/test/sun/text/resources/LocaleData 2015-01-17 04:48:06.934083395 -0600 ++@@ -574,7 +574,6 @@ ++ FormatData/es_PA/NumberElements/0=. ++ FormatData/es_PA/NumberElements/1=, ++ FormatData/es_PA/NumberElements/2=; ++-CurrencyNames/es_PE/PEN=S/ ++ FormatData/es_PE/NumberPatterns/0=#,##0.###;-#,##0.### ++ # FormatData/es_PE/NumberPatterns/1=S/#,##0.00;S/-#,##0.00 # Changed; see bug 4122840 ++ FormatData/es_PE/NumberPatterns/2=#,##0% ++@@ -7012,3 +7011,19 @@ ++ FormatData/sl/DateTimePatterns/4=EEEE, dd. MMMM y ++ FormatData/sl/DateTimePatterns/5=dd. MMMM y ++ +++# bug 7085757 +++CurrencyNames//SSP=SSP +++CurrencyNames//ssp=South Sudanese Pound +++CurrencyNames//xsu=Sucre +++CurrencyNames//xua=ADB Unit of Account +++LocaleNames//SS=South Sudan +++LocaleNames/en/SS=South Sudan +++ +++# bug 7028073 +++CurrencyNames/es_PE/PEN=S/. +++ +++# bug 7195759 +++CurrencyNames//ZMW=ZMW +++ +++# bug 8021121 +++CurrencyNames/lv_LV/EUR=\u20AC |