diff options
| author | ryoon <ryoon@pkgsrc.org> | 2014-01-02 01:16:35 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2014-01-02 01:16:35 +0000 |
| commit | cb195e4fe2187d67087a7353dc2fe30246f0e455 (patch) | |
| tree | f80772bea2510da1ce03aab87fb588bc5b9dc012 | |
| parent | b16ae962483f15723c3d893bfa6e93c0dc61ecfa (diff) | |
| download | pkgsrc-cb195e4fe2187d67087a7353dc2fe30246f0e455.tar.gz | |
Update to 1.7.45 (7u45)
I cannot find release notes for OpenJDK7, I will quote from Oracle's
JDK 7u40 and 7u45 release notes.
Changelog:
7u45:
Olson Data 2013d
JDK 7u45 contains Olson time zone data version 2013d. For more information, refer to Timezone Data Versions in the JRE Software.
Protections Against Unauthorized Redistribution of Java Applications
Starting with 7u45, application developers can specify new JAR manifest file attributes:
Application-Name: This attribute provides a secure title for your RIA.
Caller-Allowable-Codebase: This attribute specifies the codebase/locations from which JavaScript is allowed to call Applet classes.
JavaScript to Java calls will be allowed without any security dialog prompt only if:
JAR is signed by a trusted CA, has the Caller-Allowable-Codebase manifest entry and JavaScript runs on the domain that matches it.
JAR is unsigned and JavaScript calls happens from the same domain as the JAR location.
The JavaScript to Java (LiveConnect) security dialog prompt is shown once per Applet classLoader instance.
Application-Library-Allowable-Codebase: If the JNLP file or HTML page is in a different location than the JAR file, the Application-Library-Allowable-Codebase attribute identifies the locations from which your RIA can be expected to be started.
If the attribute is not present or if the attribute and location do not match, then the location of the JNLP file or HTML page is displayed in the security prompt shown to the user.
Note that the RIA can still be started in any of the above cases.
Developers can refer to JAR File Manifest Attributes for more information.
Restore Security Prompts
A new button is available in the Java Control Panel (JCP) to clear previously remembered trust decisions. A trust decision occurs when the user has selected the Do not show this again option in a security prompt. To show prompts that were previously hidden, click Restore Security Prompts. When asked to confirm the selection, click Restore All. The next time an application is started, the security prompt for that application is shown.
See Restore Security Prompts under the Security section of the Java Control Panel.
JAXP Changes
Starting from JDK 7u45, the following new processing limits are added to the JAXP FEATURE_SECURE_PROCESSING feature.
totalEntitySizeLimit
maxGeneralEntitySizeLimit
maxParameterEntitySizeLimit
For more information, see the new Processing Limits lesson in the JAXP Tutorial.
TimeZone.setDefault Change
The java.util.TimeZone.setDefault(TimeZone) method has been changed to throw a SecurityException if the method is called by any code with which the security manager's checkPermission call denies PropertyPermission("user.timezone", "write"). The new system property jdk.util.TimeZone.allowSetDefault (a boolean) is provided so that the compatible behavior can be enabled. The property will be evaluated only once when the java.util.TimeZone class is loaded and initialized.
Bug Fixes
This release contains fixes for security vulnerabilities. For more information, see Oracle Critical Patch Update Advisory.
This release fixes the following security vulnerabilities found in 7u40 and
earlier.
CVE-2013-5782
CVE-2013-5830
CVE-2013-5809
CVE-2013-5829
CVE-2013-5814
CVE-2013-5824
CVE-2013-5788
CVE-2013-5787
CVE-2013-5789
CVE-2013-5817
CVE-2013-5842
CVE-2013-5843
CVE-2013-5832
CVE-2013-5850
CVE-2013-5838
CVE-2013-5805
CVE-2013-5806
CVE-2013-5846
CVE-2013-5810
CVE-2013-5844
CVE-2013-5777
CVE-2013-5852
CVE-2013-5802
CVE-2013-5775
CVE-2013-5804
CVE-2013-5812
CVE-2013-3829
CVE-2013-5783
CVE-2013-5825
CVE-2013-4002
CVE-2013-5823
CVE-2013-5778
CVE-2013-5801
CVE-2013-5776
CVE-2013-5818
CVE-2013-5819
CVE-2013-5831
CVE-2013-5820
CVE-2013-5851
CVE-2013-5840
CVE-2013-5774
CVE-2013-5848
CVE-2013-5780
CVE-2013-5800
CVE-2013-5849
CVE-2013-5790
CVE-2013-5784
CVE-2013-5797
CVE-2013-5772
CVE-2013-5803
CVE-2013-5854
7u40:
Retina Display support on Mac OS X
Retina screens will now display content correctly. Previously rendering had been blurry. See 8000629.
Deployment Rule Set
Deployment rule set allows a desktop administrator to control the level of Java client compatibility and default prompts across an organization.
New Security Warnings for Unsigned and Self-Signed Applications
New warnings are added in the dialogs for Unsigned and Self-Signed applications.
From the dialogs for Unsigned and Self-Signed applets, "Remember this decision" option has been removed. In addition, the previously remembered decisions for self-signed and unsigned applets will be ignored.
For more information, see Security Dialogs.
Local Applets return NULL for DocumentBase
Beginning with JDK 7u40, an applet's getDocumentBase() method will return NULL when the applet is running from the local file system.
If applet needs to load resource, here are the options:
If the resource is in the applet's JAR(s), the user should be able to load it with class ClassLoader getResoruceAsStream directly, without needing the codebase information.
If the resource is in an arbitrary location, which is not inside the applet's JAR(s), the user must have other ways to get to that location, since it is not part of the applet resource. For example, the user.home java system property, provided their applet has all-permissions.
JAXP Security Improvements
JDK 7u40 release contains Java API for XML Processing (JAXP) 1.5, which adds the ability to restrict the set of network protocols that may be used to fetch external resources. For more information, see JEP 185: JAXP 1.5: Restrict Fetching of External Resources.
Default x.509 Certificates Have Longer Key Length
Starting from 7u40, the use of x.509 certificates with RSA keys less than 1024 bits in length is restricted. This restriction is applied via the Java Security property, jdk.certpath.disabledAlgorithms. The default value of jdk.certpath.disabledAlgorithms is now as follows:
jdk.certpath.disabledAlgorithms=MD2, RSA keySize < 1024
In order to avoid the compatibility issue, users who use X.509 certificates with RSA keys less than 1024 bits, are recommended to update their certificates with stronger keys. As a workaround, at their own risk, users can adjust the key size to permit smaller key sizes through the security property jdk.certpath.disabledAlgorithms.
For more information, see Java PKI Programmer's Guide or JSSE Reference Guide.
Bug Fixes
For a list of bug fixes included in this release, see JDK 7u40 Bug Fixes page.
Bug ID Component Description
8001161 client-libs [macosx] EmbeddedFrame doesn't become active window
8004316 client-libs Printing an image using AUTOSENSE fails to print
8015375 client-libs Edits to text components hang for clipboard access
7068471 client-libs NPE in sun.font.FontConfigManager.getFontConfigFont() when libfontconfig.so is not installed
7105640 client-libs Unix printing does not check the result of exec'd lpr/lp command
7113017 client-libs Use POSIX compliant include file headers in sun/awt/medialib/mlib_types.h
7151427 client-libs Potential memory leak in error handling code in X11SurfaceData.c
7152519 client-libs Dependency on non-POSIX header file <link.h> causes portability problem
7181199 client-libs [macosx] Startup is much slower in headless mode for apps using Fonts
7181438 client-libs [OGL] Incorrect alpha used, during blit from SW to the texture.
8004821 client-libs Graphics2D.drawPolygon() fails with IllegalPathStateException
8004859 client-libs Graphics.getClipBounds/getClip return difference nonequivalent bounds, depending from transform.
8008535 client-libs JDK7 Printing : CJK and Latin Text in a string overlap.
8012381 client-libs [macosx] : Collation selection ignored when printing on MacOSX
8013810 client-libs PrintServiceLookup.lookupPrintServices() does not return consistent result
8015334 client-libs Memory leak when kerning is used on Windows
8015556 client-libs [macosx] surrogate pairs do not render properly (show up as boxes or incorrect glyphs)
8015606 client-libs Text is not rendered correctly if destination buffer is custom
8019201 client-libs Regression: java.awt.image.ConvolveOp throws java.awt.image.ImagingOpException
8011059 client-libs [macosx] Make JDK demos look perfect on retina displays
6550588 client-libs java.awt.Desktop cannot open file with Windows UNC filename
7107957 client-libs AWT: Native code should include fcntl.h and unistd.h rather than sys/fcntl.h and sys/unistd.h
7109977 client-libs [macosx] MixingInHwPanel.java test fails on Mac trying to click in the reserved corner
7124520 client-libs [macosx] re:6373505 Toolkit.getScreenResolution() != GraphicsConfiguration.getNormalizingTransform()
7130662 client-libs GTK file dialog crashes with a NPE
7146572 client-libs enableInputMethod(false) does not work in the TextArea and TextField on the linux platform
7154778 client-libs [macosx] NSView-based implementation of sun.awt.EmbeddedFrame
7155378 client-libs Need utils api/field which determines the dead key
7161437 client-libs [macosx] awt.FileDialog doesn't respond appropriately for mac when selecting folders
7170655 client-libs Frame size does not follow font size change with XToolkit
7170996 client-libs Regression : Cannot use IME on JComboBox Japanese(7026055) II
7175183 client-libs [macosx] Objective-C exception thrown when switching monitor configuration
7179050 client-libs [macosx] Make LWAWT be able to run on AppKit thread
7181710 client-libs [macosx] jawt_md.h shipped with jdk is outdated
7193169 client-libs The code example in javadoc of Component.java misses 'implements' keyword
7194469 client-libs Pressing the Enter key results in an alert tone beep when focus is TextField
7194902 client-libs [macosx] closed/java/awt/Button/DoubleActionEventTest/DoubleActionEventTest failed since jdk8b49
7196547 client-libs [macosx] Implement dead key detection for KeyEvent
7197619 client-libs Using modifiers for the dead key detection on Windows
7198229 client-libs [macosx] Painting during resizing of the frame should be more smooth
7199180 client-libs [macosx] Dead keys handling for input methods
7199783 client-libs Setting cursor on DragSourceContext does not work on OSX
8000423 client-libs Diacritic is not applyed to a base letter on Linux
8000435 client-libs [macosx] Button painting error under Java 7 on Mac
8000629 client-libs [macosx] Blurry rendering with Java 7 on Retina display
8003169 client-libs [macosx] JVM crash after disconnecting from projector
8004344 client-libs A crash in ToolkitErrorHandler() in XlibWrapper.c
8005405 client-libs [macosx] Drag and Drop: wrong animation when dropped outside any drop target.
8005465 client-libs [macosx] Evaluate if checking for the -XstartOnFirstThread is still needed in awt.m
8005932 client-libs Java 7 on mac os x only provides text clipboard formats
8005997 client-libs [macosx] Printer Dialog opens an additional title bar
8006417 client-libs JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X
8006634 client-libs Unify LWCToolkit.invokeAndWait() and sun.awt.datatransfer.ToolkitThreadBlockedHandler
8006941 client-libs [macosx] Deadlock in drag and drop
8008660 client-libs Failure in 2D Queue Flusher thread on Mac
8009012 client-libs [macosx] DisplayChangedListener is not implemented in LWWindowPeer/CGraphicsEnvironment
8009911 client-libs [macosx] SWT app freeze when going full screen using Java 7 on Mac
8011686 client-libs [macosx] AWT accidentally disables the NSApplicationDelegate of SWT, causing loss of OS X integration functionality
8012586 client-libs [x11] Modal dialogs for fullscreen window may show behind its owner
8014821 client-libs Regression: Focus issues with Oracle WebCenter Capture applet
8015303 client-libs [macosx] Application launched via custom URL Scheme does not receive URL
8019265 client-libs [macosx] apple.laf.useScreenMenuBar regression comparing with jdk6
8020038 client-libs [macosx] Incorrect usage of invokeLater() and likes in callbacks called via JNI from AppKit thread
8020298 client-libs [macosx] Incorrect merge in the lwawt code.
8020371 client-libs [macosx] applets with Drag and Drop fail with IllegalArgumentException
8021381 client-libs JavaFX scene included in Swing JDialog not starting from Web Start
7186794 client-libs Setter not found. PropertyDescriptor(PropertyDescriptor,PropertyDescriptor)
7187618 client-libs PropertyDescriptor Performance Slow (continue)
7189112 client-libs java.beans.Introspector misses write methods
7192955 client-libs Introspector overide PropertyDescriptor for generic type field defined in super class
8013416 client-libs Java Bean Persistence with XMLEncoder
8013557 client-libs XMLEncoder in 1.7 can't encode objects initialized in no argument constructor
8009168 client-libs accessibility.properties syntax issue
8020983 client-libs OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
4199622 client-libs RFE: JComboBox shouldn't sending ActionEvents for keyboard navigation
4310381 client-libs Text in multi-row/col JTabbedPane tabs can be truncated/clipped
4631925 client-libs JColor Chooser is not fully accessible
6337518 client-libs Null Arrow Button Throws Exception in BasicComboBoxUI
6436314 client-libs Vector could be created with appropriate size in DefaultComboBoxModel
6671481 client-libs NPE at javax.swing.plaf.basic.BasicTreeUI$Handler.handleSelection
6877495 client-libs JTextField and JTextArea does not support supplementary characters
7024118 client-libs possible hardcoded mnemonic for JFileChooser metal and motif l&f
7032018 client-libs The file list in JFileChooser does not have an accessible name
7032436 client-libs When running with the Nimbus look and feel, the JFileChooser does not display mnemonics
7049024 client-libs DnD fails with JTextArea and JTextField
7055065 client-libs Regression : JDK 7 : NullPointerException when sorting JTable with empty cell
7068740 client-libs If you wrap a JTable in a JLayer you can't use the page up and page down cmds
7089914 client-libs Focus on image icons are not visible in javaws cache with high contrast mode
7123767 client-libs Wrong tooltip location in Multi-Monitor configurations
7124525 client-libs [macosx] No animation on certain Swing components in Aqua LaF
7129742 client-libs Unable to view focus in Non-Editable TextArea
7132385 client-libs [macosx] IconifyTest of RepaintManager could use some delay
7147075 client-libs JTextField doesn't get focus or loses focus forever
7154030 client-libs java.awt.Component.hide() does not repaint parent component
7155298 client-libs Editable TextArea/TextField are blocking GUI applications from exit
7155887 client-libs ComboBox does not display focus outline in GTK L&F
7163696 client-libs JCK Swing interactive test JScrollBarTest0013 fails with Nimbus and GTK L&Fs
7163828 client-libs [macosx] White-on-yellow "Got Milk?" tooltip in SwingSet2 is empty.
7167780 client-libs Hang javasoft.sqe.tests.api.javax.swing.Timer.Ctor2Tests
7181403 client-libs Invalid MouseEvent conversion with SwingUtilities.convertMouseEvent
7184945 client-libs [macosx] NPE in AquaComboBoxUI since jdk7u6b17, jdk8b47
7188612 client-libs JTable's AccessibleJTable throws IllegalComponentStateException instead of null
7194184 client-libs JColorChooser swatch cannot accessed from keyboard
7197320 client-libs [macosx] Full Screen option missing when Window.documentModified
7199708 client-libs FileChooser crashs when opening large folder
8002077 client-libs Possible mnemonic issue on JFileChooser Save button on nimbus L&F
8002114 client-libs fix failed for 7160951: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar
8003400 client-libs JTree scrolling problem when using large model in WindowsLookAndFeel.
8003830 client-libs NullPointerException in BasicTreeUI.Actions when getPathBounds returns null
8004298 client-libs NPE in WindowsTreeUI.ensureRowsAreVisible
8004866 client-libs [macosx] HiDPI support in Aqua L&F
8005019 client-libs JTable passes row index instead of length when inserts selection interval
8007006 client-libs [macosx] Closing subwindow loses main window menus.
8008366 client-libs [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar
8013370 client-libs Null pointer exception when adding more than 9 accelators to a JMenuBar
7038105 core-libs File.isHidden() should return true for pagefile.sys and hiberfil.sys
8003992 core-libs File and other classes in java.io do not handle embedded nulls properly
8007609 core-libs WinNTFileSystem_md.c should correctly check value returned from realloc
8011950 core-libs java.io.File.createTempFile enters infinite loop when passed invalid data
8016063 core-libs getFinalAttributes should use FindClose
7103957 core-libs NegativeArraySizeException while initializing class IntegerCache
7193463 core-libs Terminator.setup should ignore IAE when registering signal handlers
8000817 core-libs Reinstate accidentally removed sleep() from ProcessBuilder/Basic.java
8003228 core-libs (props) sun.jnu.encoding should be set to UTF-8 [macosx]
8016046 core-libs (process) Strict validation of input should be security manager case only [win]
8021946 core-libs Disabling sun.reflect.Reflection.getCallerCaller(int) by default breaks several frameworks and libraries
6984705 core-libs JSR 292 method handle creation should not go through JNI
7058630 core-libs JSR 292 method handle proxy violates contract for Object methods
8005345 core-libs JSR 292: JDK performance tweaks
8016814 core-libs sun.reflect.Reflection.getCallerClass returns the wrong stack frame
6512101 core-libs NetworkInterface#getDisplayName() method returns wrong encoding for Japanese OS
6953455 core-libs CookieStore.add() cannot handle null URI parameter, contrary to the API specification
7078386 core-libs NetworkInterface.getNetworkInterfaces() may return corrupted results on linux
7084560 core-libs Crash in net.dll
7118907 core-libs InetAddress.isReachable() should return false if sendto fails with EHOSTUNREACH
7163874 core-libs InetAddress.isReachable should support pinging 0.0.0.0
7181353 core-libs Update error message to distinguish native OOM and java OOM in net
7188755 core-libs Crash due to missing synchronization on gconf_client in DefaultProxySelector.c
7190254 core-libs NetworkInterface getFlags implementation should support full integer bit range for flags value
7199219 core-libs Proxy-Connection headers set incorrectly when a HttpClient is retrieved from the Keep Alive Cache
7199862 core-libs Make sure that a connection is still alive when retrieved from KeepAliveCache in certain cases
8000525 core-libs Java.net.httpcookie api does not support 2-digit year format
8007315 core-libs HttpURLConnection.filterHeaderField method returns null where empty string is expected
8009650 core-libs HttpClient available() check throws SocketException when connection has been closed
8010282 core-libs sun.net.www.protocol.jar.JarFileFactory.close(JarFile) should be thread-safe
8011234 core-libs Performance regression with ftp protocol when uploading in image mode
8013140 core-libs Heap corruption with NetworkInterface.getByInetAddress() and long i/f name
6429204 core-libs (se) Concurrent Selector.register and SelectionKey.interestOps can ignore interestOps
6633549 core-libs (dc) Include-mode filtering of IPv6 sources does not block datagrams on Linux
7115070 core-libs (fs) lookupPrincipalByName/lookupPrincipalByGroupName should treat ESRCH as not found.
7129029 core-libs (fs) Unix file system provider should be buildable on platforms that don't support O_NOFOLLOW
7132889 core-libs (se) AbstractSelectableChannel.register and configureBlocking not safe from asynchronous close
7146506 core-libs (fc) Add EACCES check to the return of fcntl native method
7152948 core-libs (dc) DatagramDispatcher.c should memset msghdr to make it portable to other platforms
7156873 core-libs (zipfs) FileSystems.newFileSystem(uri, env) fails for uri with escaped octets
7157656 core-libs (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0
7166048 core-libs (se) EPollArrayWrapper.c no longer needs to define epoll data structures
7168172 core-libs (fs) Files.isReadable slow on Windows
7172826 core-libs (se) Selector based on the Solaris event port mechanism
7179305 core-libs (fs) Method name sun.nio.fs.UnixPath.getPathForExecptionMessage is misspelled
7190219 core-libs (bf) CharBuffer.put(String,int,int) modifies position even if BufferOverflowException thrown
7190897 core-libs (fs) Files.isWritable method returns false when the path is writable (win)
7191556 core-libs (fs) UnixNativeDispatcher.getextmntent should be moved into platform specific code
7191587 core-libs (se) SelectionKey.interestOps does not defer changing the interest set to the next select [macosx]
8002390 core-libs (zipfs) Problems moving files between zip file systems
8009751 core-libs (se) Selector spin when select, close and interestOps(0) invoked at same time (lnx)
8011128 core-libs (fs) Files.createDirectory fails if the resoved path is exactly 248 characters long
8012019 core-libs (fc) Thread.interrupt triggers hang in FileChannelImpl.pread (win)
6183404 core-libs Many eudc characters are incorrectly mapped in MS936 and GBK converter
6610897 core-libs New constructor in sun.tools.java.ClassPath builds a path using File.separator instead of File.pathS
7187876 core-libs ClassCastException in TCPTransport.executeAcceptLoop
7131459 core-libs [Fmt-De] DecimalFormat produces wrong format() results when close to a tie
7163865 core-libs Performance improvement for DateFormatSymbols.getZoneIndex(String)
8000529 core-libs Regression : SimpleDateFormat incorrectly parses dates formatted with Z and z pattern letters
8005277 core-libs Regression in JDK 7 in Bidi implementation
8020054 core-libs (tz) Support tzdata2013d
7164256 core-libs EnumMap clone doesn't clear the entrySet keeping a reference to the original Map
7166055 core-libs Javadoc for WeakHashMap contains misleading advice
7198073 core-libs (prefs) user prefs not saved [macosx]
8011200 core-libs (coll) Optimize empty ArrayList and HashMap
8019381 core-libs HashMap.isEmpty is non-final, potential issues for get/remove
7132378 core-libs Race in FutureTask if used with explicit set and get ( not Runnable )
7161229 core-libs PriorityBlockingQueue keeps hard reference to last removed element
7110151 core-libs To use underlying platform's zlib library for Java zlib support
7166955 core-libs (pack200) JNI_GetCreatedJavaVMs needs additional checking
7188852 core-libs Move implementation of De/Inflater.getBytesRead/Writtten() to java from native
8005466 core-libs JAR file entry hash table uses too much memory (zip_util.c)
7163898 core-libs add isLoggable() check to doLog()
8010309 core-libs Improve PlatformLogger.isLoggable performance by direct mapping from an integer to Level
8017174 core-libs NPE when using Logger.getAnonymousLogger or LogManager.getLogManager().getLogger
8020228 core-libs Restore the translated version of logging_xx.properties
7042126 core-libs (alt-rt) HashMap.clone implementation should be re-examined
8006593 core-libs Initialization bottleneck in Maps due to use of j.u.Random
7094176 core-libs (tz) Incorrect TimeZone display name when DST not applicable / disabled
8009638 core-libs Wrong comment for PL in LocaleISOData, 1989 forward Poland is Republic of Poland
8015570 core-libs Use long comparison in Rule.getRules().
7174887 core-libs Deadlock in jndi ldap connection cleanup
8000487 core-libs Java JNDI connection library on ldap conn is not honoring configured timeout
7110104 core-svc It should be possible to stop and start JMX Agent at runtime.
7164191 core-svc properties.putAll API may fail with ConcurrentModifcationException on multi-thread scenario
7173044 core-svc Memory monitor demo hangs the system if MemoryUsage obj returns -1 .
8015604 core-svc JDP packets containing ideographic characters are broken
8001621 core-svc Update awk scripts that check output from jps/jcmd
8002048 core-svc Protocol for discovery of manageable Java processes on a network
8008089 core-svc Delete OS dependent check in JdkFinder.getExecutable()
8003192 deploy Need to be able to launch 'About Java' from command line
8017164 deploy Invalid URL to GetJava web page could be formed in deployJava.js in some cases
8020390 deploy LSP: LocalSecurityPolicy is initialized too soon
8021585 deploy Setting trace level 5 in console does not enable all tracing.
8021907 deploy DRS: certificate element algorithm is supposed to default to SHA-256
8008377 deploy https dialog: 'More information' is open below the main dialog on Linux
8020941 deploy DRS: Make ruleset element version attribute mandatory
8006165 deploy firefox freeze with java.com version detect applet
8010636 deploy User responsibilities are not updated with all clsid's with jre 6u32 and higher
8015640 deploy REGRESSION: Security boxes appear 2 times with uppercase jnlp codebase
8015842 deploy Multi JREs: Unable to use the selected version to load an non-jnlp applet
8016005 deploy Remote debugging for applets in a browser is no longer working
8016225 deploy The behavior after System.exit() is different between JRE 1.7_21 and JRE 1.7_17
8017218 deploy REGRESSION:Fail to detect Java after upgrade to 7u25 on IE (PnP fails to register plugin in IE)
8017249 deploy Plug-in does not report version
8019177 deploy getdocument base should behave the same as getcodebase for file applets
8019425 deploy Local Security Policy: Any "run" rule must have at least one application qualifier
8019870 deploy JCP shows link to security policy when one doesn't exist
8020160 deploy LSP: rename LocalSecurityPolicy (LSP) to DeploymentRuleSet (DRS)
8022042 deploy Java Plugin Runtime parameter for setting classpath does not work
8000555 deploy BasicService.showDocument() API fails to launch the browser in Windows XP
8009768 deploy -XX:MaxGCPauseMillis value set in control panel is ignored by javaws
8010014 deploy Unable to execute javaws -uninstall
8017776 deploy Swing Event Thread does not use JNLP class loader
8000692 embedded Remove old KERNEL code
8005722 embedded Assert in c1_LIR.hpp incorrect wrt to number of register operands
7171028 globalization dots are missed in the datetime for Slovanian
7189611 globalization Venezuela current Currency should be Bs.F.
6340864 hotspot Implement vectorization optimizations in hotspot-server
6443505 hotspot Ideal() function for CmpLTMask
6658428 hotspot C2 doesn't inline java method if corresponding intrinsic failed to inline.
6711908 hotspot JVM needs direct access to some annotations
6910461 hotspot Register allocator may insert spill code at wrong insertion index
6910464 hotspot Lookupswitch and Tableswitch default branches not recognized as safepoints
7023639 hotspot JSR 292 method handle invocation needs a fast path for compiled code
7023898 hotspot Intrinsify AtomicLongFieldUpdater.getAndIncrement()
7092905 hotspot C2: Keep track of the number of dead nodes
7119644 hotspot Increase superword's vector size up to 256 bits
7145024 hotspot Crashes in ucrypto related to C2
7147064 hotspot assert(allocates2(pc)) failed: not in CodeBuffer memory: 0xffffffff778d9d60 <= 0xffffffff778da69c <=
7147416 hotspot LogCompilation tool does not work with post parse inlining
7147464 hotspot Java crashed while executing method with over 8k of dneg operations
7147740 hotspot add assertions to check stack alignment on VM entry from generated code (x64)
7147744 hotspot CTW: assert(false) failed: infinite EA connection graph build
7148109 hotspot C2 compiler consumes too much heap resources
7148486 hotspot At a method handle call returning with an exception may call the runtime with misaligned stack (x64)
7152955 hotspot print_method crashes with null root
7152957 hotspot VM crashes with assert(false) failed: bad AD file
7152961 hotspot InlineTree::should_not_inline may exit prematurely
7154997 hotspot assert(false) failed: not G1 barrier raw StoreP
7161796 hotspot PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror
7162094 hotspot LateInlineCallGenerator::do_late_inline crashed on uninitialized _call_node
7169782 hotspot C2: SIGSEGV in LShiftLNode::Ideal(PhaseGVN*, bool)
7169934 hotspot pow(x,y) or x64 computes incorrect result when x<0 and y is an odd integer
7170053 hotspot crash in C2 when using -XX:+CountCompiledCalls
7170463 hotspot C2 should recognize "obj.getClass() == A.class" code pattern
7171890 hotspot C1: add Class.isInstance intrinsic
7172640 hotspot C2: instrinsic implementations in LibraryCallKit should use argument() instead of pop()
7172843 hotspot C1: fix "assert(has_printable_bci()) failed: _printable_bci should have been set"
7173340 hotspot C2: code cleanup: use PhaseIterGVN::replace_edge(Node*, int, Node*) where applicable
7174218 hotspot remove AtomicLongCSImpl intrinsics
7177003 hotspot C1: LogCompilation support
7177923 hotspot SIGBUS on sparc in compiled code for java.util.Calendar.clear()
7181658 hotspot CTW: assert(t->meet(t0) == t) failed: Not monotonic
7187454 hotspot stack overflow in C2 compiler thread on Solaris x86
7188276 hotspot JSR 292: assert(ct == T_OBJECT) failed: rt=T_OBJECT, ct=13
7190310 hotspot Inlining WeakReference.get(), and hoisting $referent may lead to non-terminating loops
7192167 hotspot JSR 292: C1 has old broken code which needs to be removed
7192406 hotspot JSR 292: C2 needs exact return type information for invokedynamic and invokehandle call sites
7192963 hotspot assert(_in[req-1] == this) failed: Must pass arg count to 'new'
7192964 hotspot assert(false) failed: bad AD file
7192965 hotspot assert(is_aligned_sets(size)) failed: mask is not aligned, adjacent sets
7193318 hotspot C2: remove number of inputs requirement from Node's new operator
7196242 hotspot JSR 292: vm/mlvm/indy/stress/java/loopsAndThreads crashed
7197033 hotspot missing ResourceMark for assert in Method::bci_from()
7198499 hotspot TraceTypeProfile as diagnostic option
7199010 hotspot incorrect vector alignment
7200001 hotspot failed C1 OSR compile doesn't get recompiled with C2
7200163 hotspot add CodeComments functionality to assember stubs
7200233 hotspot C2: can't use expand rules for vector instruction rules
7201026 hotspot add vector for shift's count
8000232 hotspot NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
8000263 hotspot JSR 292: signature types may appear to be unloaded
8000313 hotspot C2 should use jlong for 64bit values
8000592 hotspot Improve adlc usability
8000740 hotspot remove LinkWellKnownClasses
8000805 hotspot JMM issue: short loads are non-atomic
8000821 hotspot JSR 292: C1 fails to call virtual method (JRUBY-6920)
8001077 hotspot remove ciMethod::will_link
8001101 hotspot C2: more general vector rule subsetting
8001183 hotspot incorrect results of char vectors right shift operaiton
8001635 hotspot assert(in_bb(n)) failed: must be
8002294 hotspot assert(VM_Version::supports_ssse3()) failed:
8003135 hotspot HotSpot inlines and hoists the Thread.currentThread().isInterrupted() out of the loop
8003983 hotspot LogCompilation tool is broken since c1 support
8004741 hotspot Missing compiled exception handle table entry for multidimensional array allocation
8004835 hotspot Improve AES intrinsics on x86
8005033 hotspot clear high word for integer pop count on SPARC
8005055 hotspot pass outputStream to more opto debug routines
8005418 hotspot JSR 292: virtual dispatch bug in 292 impl
8005419 hotspot Improve intrinsics code performance on x86 by using AVX2
8005439 hotspot no message about inline method if it specifed by CompileCommand
8005522 hotspot use fast-string instructions on x86 for zeroing
8005544 hotspot Use 256bit YMM registers in arraycopy stubs on x86
8005821 hotspot C2: -XX:+PrintIntrinsics is broken
8005956 hotspot C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block
8006031 hotspot LibraryCallKit::inline_array_copyOf disabled unintentionally with 7172640
8006095 hotspot C1: SIGSEGV w/ -XX:+LogCompilation
8006430 hotspot TraceTypeProfile is a product flag while it should be a diagnostic flag
8006807 hotspot C2 crash due to out of bounds array access in Parse::do_multianewarray
8007144 hotspot Incremental inlining mistakes some call sites for dead ones and doesn't inline them
8007294 hotspot ReduceFieldZeroing doesn't check for dependent load and can lead to incorrect execution
8007402 hotspot Code cleanup to remove Parfait false positive
8007439 hotspot C2: adding successful message of inlining
8007959 hotspot Use expensive node logic for more math nodes
8008555 hotspot Debugging code in compiled method sometimes leaks memory
8009460 hotspot C2compiler crash in machnode::in_regmask(unsigned int)
8009472 hotspot Print additional information for 8004640 failure.
8009761 hotspot Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates
8010437 hotspot guarantee(this->is8bit(imm8)) failed: Short forward jump exceeds 8-bit offset
8010770 hotspot Zero: back port of 8000780 to HS24 broke JSR 292
8011102 hotspot Clear AVX registers after return from JNI call
8011901 hotspot Unsafe.getAndAddLong(obj, off, delta) does not work properly with long deltas
8014189 hotspot JVM crash with SEGV in ConnectionGraph::record_for_escape_analysis()
8016157 hotspot During CTW: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block
8020215 hotspot Different execution plan when using JIT vs interpreter
8020433 hotspot Crash when using -XX:+RestoreMXCSROnJNICalls
4988100 hotspot oop_verify_old_oop appears to be dead
6725714 hotspot par compact - add a table to speed up bitmap searches
6761744 hotspot Hotspot crashes if process size limit is exceeded
6818524 hotspot G1: use ergonomic resizing of PLABs
6921087 hotspot G1: remove per-GC-thread expansion tables from the fine-grain remembered sets
7041879 hotspot G1: introduce stress testing parameter to cause frequent evacuation failures
7068625 hotspot Testing 8 bytes of card table entries at a time speeds up card-scanning
7114678 hotspot G1: various small fixes, code cleanup, and refactoring
7122222 hotspot GC log is limited to 2G for 32-bit
7127697 hotspot G1: remove dead code after recent concurrent mark changes
7130974 hotspot G1: Remove G1ParCopyHelper
7131629 hotspot Generalize the CMS free list code
7143490 hotspot G1: Remove HeapRegion::_top_at_conc_mark_count
7143511 hotspot G1: Another instance of high GC Worker Other time (50ms)
7143858 hotspot G1: Back to back young GCs with the second GC having a minimally sized eden
7145441 hotspot G1: collection set chooser-related cleanup
7146246 hotspot G1: expose some of the -XX flags that drive which old regions to collect during mixed GCs
7147724 hotspot G1: hang in SurrogateLockerThread::manipulatePLL
7151089 hotspot PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
7152791 hotspot wbapi tests fail on cygwin
7157073 hotspot G1: type change size_t -> uint for region counts / indexes
7158457 hotspot stress: jdk7 u4 core dumps during megacart stress test run
7158682 hotspot G1: Handle leak when running nsk.sysdict tests
7160613 hotspot VerifyRememberedSets doesn't work with CompressedOops
7163848 hotspot G1: Log GC Cause for a GC
7167437 hotspot Can't build on linux without precompiled headers
7168294 hotspot G1: Some Full GCs incorrectly report GC cause as "No GC"
7169056 hotspot Add gigabyte unit to proper_unit_for_byte_size() and byte_size_in_proper_unit()
7169062 hotspot CMS: Assertion failed with -XX:+ObjectAlignmentInBytes=64
7171936 hotspot LOG_G incorrectly defined in globalDefinitions.hpp
7172279 hotspot G1: Clean up TraceGen0Time and TraceGen1Time data gathering
7172388 hotspot G1: _total_full_collections should not be incremented for concurrent cycles
7173460 hotspot G1: java/lang/management/MemoryMXBean/CollectionUsageThreshold.java failes with G1
7173712 hotspot G1: Duplicated code in G1UpdateRSOrPushRefOopClosure::do_oop_nv()
7173959 hotspot Jvm crashed during coherence exabus (tmb) testing
7176220 hotspot 'Full GC' events miss date stamp information occasionally
7176479 hotspot G1: JVM crashes on T5-8 system with 1.5 TB heap
7178361 hotspot G1: Make sure that PrintGC and PrintGCDetails use the same timing for the GC pause
7182260 hotspot G1: Fine grain RSet freeing bottleneck
7184772 hotspot G1: Incorrect assert in HeapRegionLinkedList::add_as_head()
7185699 hotspot G1: Prediction model discrepancies
7186737 hotspot Unable to allocate bit maps or card tables for parallel gc for the requested heap
7188176 hotspot The JVM should differentiate between T and M series and adjust GC ergonomics
7192128 hotspot G1: Extend fix for 6948537 to G1's BOT
7193157 hotspot G1: Make some develpflags available in product builds
7194409 hotspot os::javaTimeNanos() shows hot on CPU_CLK_UNHALTED profiles
7194633 hotspot G1: Assertion and guarantee failures in block offset table
7197666 hotspot java -d64 -version core dumps in a box with lots of memory
7197906 hotspot BlockOffsetArray::power_to_cards_back() needs to handle > 32 bit shifts
7198130 hotspot G1: PrintReferenceGC output comes out of order
7200261 hotspot G1: Liveness counting inconsistencies during marking verification
8000311 hotspot G1: ParallelGCThreads==0 broken
8000831 hotspot Heap verification output incorrect/incomplete
8001424 hotspot G1: Rename certain G1-specific flags
8001425 hotspot G1: Change the default values for certain G1 specific flags
8004170 hotspot G1: Verbose GC output is not getting flushed to log file using JDK 8
8005032 hotspot G1: Cleanup serial reference processing closures in concurrent marking
8006242 hotspot G1: WorkerDataArray<T>::verify() too strict for double calculations
8006894 hotspot G1: Number of marking threads missing from PrintFlagsFinal output
8006954 hotspot GC Cause equals No GC for CMS background collection in the trace GC event
8007003 hotspot ParNew sends the heap summary too early
8007036 hotspot G1: Too many old regions added to last mixed GC
8007221 hotspot G1: concurrent phase durations do not state the time units ("secs")
8008546 hotspot WRONG G1CONFIDENCEPERCENT RESULTS IN GUARANTEE(VARIANCE() > -1.0) FAILED
8008737 hotspot The trace event vm/gc/heap/summary is missing for CMS
8008790 hotspot Promotion failed tracing event for all GCs
8008916 hotspot G1: Evacuation failed tracing event
8008917 hotspot CMS: Concurrent mode failure tracing event
8008918 hotspot Reference statistics events for the tracing framework
8008920 hotspot Tracing events for heap statistics
8009032 hotspot Implement evacuation info event
8009232 hotspot Improve stats gathering code for reference processor
8009536 hotspot G1: Apache Lucene hang during reference processing
8009723 hotspot CMS logs "concurrent mode failure" twice when using (disabling) -XX:-UseCMSCompactAtFullCollection
8009940 hotspot G1: assert(_finger == _heap_end) failed, concurrentMark.cpp:809
8009992 hotspot Prepare tracing of promotion failed for integration of evacuation failed
8010090 hotspot GC ID has the wrong type
8010289 hotspot PSParallelCompact::marking_phase should use instance GCTracer
8010294 hotspot Refactor HeapInspection to make it more reusable
8010463 hotspot G1: Crashes with -UseTLAB and heap verification
8010514 hotspot G1: Concurrent mode failure tracing event
8010780 hotspot G1: Eden occupancy/capacity output wrong after a full GC
8010916 hotspot Add tenuring threshold to young garbage collection events
8011891 hotspot The vm/gc/heap/heap_summary_after_gc event for CMS contains old data
8012086 hotspot The object count event should only send events for instances occupying more than 0.5% of the heap
8012102 hotspot CollectedHeap::ensure_parsability is not always called during heap inspection
8012335 hotspot G1: TemplateInterpreter do_oop_store passes a compressed oop to g1_write_barrier_post
8012455 hotspot Missing time and date stamps for PrintGCApplicationConcurrentTime and PrintGCApplicationStoppedTime
8012572 hotspot ProblemList.txt : Exclude sun/tools/jmap/Basic.sh for short term
8012715 hotspot G1: GraphKit accesses PtrQueue::_index as int but is size_t
8013934 hotspot Garbage collection event for CMS has wrong cause for System.gc()
8015237 hotspot Parallelize string table scanning during strong root processing
8015683 hotspot object_count_after_gc should have the same timestamp for all events
8015972 hotspot Refactor the sending of the object count after GC event
8016170 hotspot GC id variable in gcTrace.cpp should use typedef GCId
8016556 hotspot G1: Use ArrayAllocator for BitMaps
8017070 hotspot G1: assert(_card_counts[card_num] <= G1ConcRSHotCardLimit) failed
8005849 hotspot JEP 167: Event-Based JVM Tracing
8006757 hotspot Refactor Socket and File I/O tracing
8007000 hotspot Some JFR OS events missing on OS X
8012979 hotspot TestJavaMonitorWait fails on Windows
8013941 hotspot Remove JFR TestGCEventExplicit and TestGCEventImplict
8014064 hotspot Event recording/recording_setting has erroneous metadata
8014894 hotspot Possible to create unparsable JFR file
8015621 hotspot Only allow event (type) to be configured once per .jfc file
8016131 hotspot nsk/sysdict/vm/stress/chain tests crash the VM in 'entry_frame_is_first()'
8016222 hotspot Enable all Exceptions disables errors Errors
8016315 hotspot object_alloc events are in the wrong producer in default.jfc
8016622 hotspot Reenable TestDefaultPresets
8019921 hotspot No CPULoad-events when recording a GlassFish instance
8020367 hotspot Cannot get default presets from FlightRecorderMBean
8020701 hotspot Avoid crashes in WatcherThread
6294277 hotspot java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
6843375 hotspot Debuggee VM crashes performing mark-sweep-compact
7093328 hotspot JVMTI: jvmtiPrimitiveFieldCallback always report 0's for static primitives
7123170 hotspot JCK vm/jvmti/ResourceExhausted/resexh001/resexh00101/ tests fails since 7u4 b02
7160924 hotspot jvmti: GetPhase returns incorrect phase before VMInit event is issued
7178846 hotspot IterateThroughHeap: heap_iteration_callback passes a negative size for big array
7182152 hotspot Instrumentation hot swap test incorrect monitor count
7187046 hotspot Crash in ClassFileParser on solaris-ia32 during RetransformClasses
8000459 hotspot assert(java_lang_String::is_instance(entry)) failure with various mlvm tests
6444286 hotspot Possible naked oop related to biased locking revocation safepoint in jni_exit()
6871190 hotspot Don't terminate JVM if it is running in a non-interactive session
6995781 hotspot RFE: Native Memory Tracking (Phase 1)
7107135 hotspot Stack guard pages are no more protected after loading a shared library with executable stack
7116786 hotspot RFE: Detailed information on VerifyErrors
7127792 hotspot Add the ability to change an existing PeriodicTask's execution interval
7129724 hotspot MAC: Core file location is wrong in crash report
7148126 hotspot ConstantPoolCacheEntry::print prints to wrong stream
7150046 hotspot SIGILL on sparcv9 fastdebug
7150058 hotspot Allocate symbols from null boot loader to an arena for NMT
7151532 hotspot DCmd for hotspot native memory tracking
7152031 hotspot Hotspot needs updated xawt path [macosx]
7152671 hotspot RFE: Windows decoder should add some std dirs to the symbol search path
7157695 hotspot Add windows implementation of socket interface
7159772 hotspot instanceKlass::all_fields_count() returns incorrect total field count
7161732 hotspot Improve handling of thread_id in OSThread
7167142 hotspot Issue warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
7167406 hotspot (Zero) Fix for InvokeDynamic needed
7170638 hotspot enable support for dtrace compatible sdt probes on GNU/Linux
7172708 hotspot 32/64 bit type issues on Windows after Mac OS X port
7176856 hotspot add the JRE name to the error log
7177409 hotspot Perf regression in JVM_GetClassDeclaredFields after generic signature changes
7179383 hotspot MaxDirectMemorySize argument parsing is broken for values >2G
7181986 hotspot NMT ON: Assertion failure when running jdi ExpiredRequestDeletionTest
7181989 hotspot NMT ON: Assertion failure when NMT checks thread's native stack base address
7182543 hotspot NMT ON: Aggregate a few NMT related bugs
7185614 hotspot NMT ON: "check by caller" assertion failed on nsk ThreadMXBean test
7186778 hotspot MachO decoder implementation for MacOSX
7187429 hotspot NMT ON: Merge failure should cause NMT to shutdown
7188594 hotspot Print statistic collected by NMT with VM flag
7191124 hotspot Optimized build is broken due to inconsistent use of DEBUG_ONLY and NOT_PRODUCT macros in NMT
7192916 hotspot Hotspot development launcher should use DYLD_LIBRARY_PATH on OS X
7199092 hotspot NMT: NMT needs to deal overlapped virtual memory ranges
7200092 hotspot Make NMT a bit friendlier to work with
7200297 hotspot jdwp and hprof code do not handle multiple sun.boot.library.path elements correctly
8001592 hotspot NMT: assertion failed: assert(_amount >= amt) failed: Just check: memBaseline.hpp:180
8002273 hotspot NMT to report JNI memory leaks when -Xcheck:jni is on
8003487 hotspot NMT: incorrect assertion in VMMemPointerIterator::remove_released_region method (memSnapshot.cpp)
8003591 hotspot Abstract_VM_Version::internal_vm_info_string needs to stringify FLOAT_ARCH for ease of use
8004713 hotspot Stackoverflowerror thrown when thread stack straddles 0x8000000 in 32 bit jvms
8004902 hotspot correctness fixes motivated by contended locking work (6607129)
8004903 hotspot VMThread::execute() calls Thread::check_for_valid_safepoint_state() on concurrent VM ops
8005048 hotspot NMT: #loaded classes needs to just show the # defined classes
8005936 hotspot PrintNMTStatistics doesn't work for normal JVM exit
8006431 hotspot os::Bsd::initialize_system_info() sets _physical_memory too large
8007779 hotspot os::die() on solaris should generate core file
8008071 hotspot Crashed in promote_malloc_records() with Kitchensink after 19 days
8008081 hotspot Print outs do not have matching arguments
8009302 hotspot Mac OS X: JVM crash on infinite recursion on Appkit Thread
8009777 hotspot NMT: add new NMT dcmd to control auto shutdown option
8011161 hotspot NMT: Memory leak when encountering out of memory error while initializing memory snapshot
8011952 hotspot Missing ResourceMarks in TraceMethodHandles
8012212 hotspot Want to link against kstat on solaris x86 as well as sparc
8013398 hotspot Adjust number of stack guard pages on systems with large memory page size
8013651 hotspot NMT: reserve/release sequence id's in incorrect order due to race
8014611 hotspot reserve_and_align() assumptions are invalid on windows
8016074 hotspot NMT: assertion failed: assert(thread->thread_state() == from) failed: coming from wrong thread state
6310967 hotspot SA: jstack -m produce failures in output
7087969 hotspot GarbageCollectorMXBean notification contains ticks vs millis
7133111 hotspot libsaproc debug print should be printed as unsigned long to fit large numbers on 64bit platform
7145358 hotspot SA throws ClassCastException for partially loaded ConstantPool
7148488 hotspot Need a mechanism to test the diagnostic framework parser
7154641 hotspot Servicability agent should work on platforms other than x86, sparc
7160570 hotspot Intrinsification support for tracing framework
7162063 hotspot libsaproc debug print should format size_t correctly on 64bit platform
7162400 hotspot Intermittent java.io.IOException: Bad file number during HotSpotVirtualMachine.executeCommand
7162726 hotspot Wrong filter predicate of visible locals in SA JSJavaFrame
7175133 hotspot jinfo failed to get system properties after 6924259
7177128 hotspot SA cannot get correct system properties after 7126277
7178741 hotspot SA: jstack -m produce UnalignedAddressException in output (Linux)
7196045 hotspot Possible JVM deadlock in ThreadTimesClosure when using HotspotInternal non-public API.
8000973 hotspot SA on windows thread inspection is broken
8004840 hotspot Jstack seems to output unnecessary information in 7u9
8006400 hotspot Add support for defining trace types in closed code
8006423 hotspot SA: NullPointerException in sun.jvm.hotspot.debugger.bsd.BsdThread.getContext(BsdThread.java:67)
8007005 hotspot JEP 167 tracing gives negative time stamps for certain event fields
8007085 hotspot EnableTracing prints garbage for Compilation: [Java Method
8007147 hotspot Trace event ExecuteVMOperation may get dangling pointer
8007150 hotspot Event based tracing is missing truncated field in stack trace content type
8007312 hotspot null check signal semaphore in os::signal_notify windows
8007804 hotspot Need to be able to access Performance counter by name from JVM
8008088 hotspot SA can hang the VM
8008102 hotspot SA on OS X does not stop the attached process
8008208 hotspot Event tracing for code cache subsystems can give wrong timestamps
8011400 hotspot missing define OPENJDK for windows builds
8011882 hotspot Replace spin loops as back off when suspending
8012210 hotspot Make TracingTime available when INCLUDE_TRACE = 0
8012714 hotspot Assign the unique traceid directly to the Klass upon creation
8013117 hotspot Thread-local trace_buffer has wrong type and name
8014411 hotspot Decrease lock order rank for event tracing locks
8014420 hotspot Default JDP address does not match the one assigned by IANA
8014478 hotspot EnableTracing: output from multiple threads may be mixed together
8015576 hotspot CMS: svc agent throws java.lang.RuntimeException: No type named "FreeList" in database
8016735 hotspot Remove superfluous EnableInvokeDynamic warning from UnlockDiagnosticVMOptions check
8020547 hotspot Event based tracing needs a UNICODE string type
8021353 hotspot Event based tracing is missing thread exit
7157734 hotspot hotspot test scripts not testing 64-bit JVM under JPRT/JTREG.
8010084 hotspot Race in runtime/NMT/BaselineWithParameter.java
7086516 install Need to add "Java" items to Windows Start Menu
7155405 install Vendor in rpm packages is still Sun Microsystems
7166327 install JRE uninstall does not recover jarfile reg entry on 64bit systems
7175065 install [IPS] Change the license line width to 72 characters
7177044 install NLS: Relocate untranslatable resources from translatable rc files
7182211 install JCP - (TM) is not removed from Java(TM) Update
7184019 install drop installer.dll in the jre bin dir, so it's up-to-date during uninstall after PnP
7184404 install MacOS AU needs to support a scheduled update check
7189314 install Typo, wrong Symlink path to JavaControlPanel.prefPane
7195788 install jre installer for MacOS - first character "J" for Java is dropped in Japanese "welcome" message
7199031 install NLS: Need to update the translation for the sdk installer
8007045 install Mac Installer should invoke verify page after install completes
8007261 install jfxrt.jar should be pack200 compressed
8007713 install Incomplete Java VisualVM installation
8008143 install Automate the generation of rtfd files at build time
8009319 install Update information link in the Windows Control Panel entry for Java still points to java.sun.com
8012038 install init installed by jdk v1.7.0_17 rpm on linux is broken; correction included
8016680 install wrapper.jreboth target missed with push for 8016471
8011986 other-libs [corba] idlj generates read/write union helper methods that throw wrong exception in some cases
4504275 other-libs CORBA boolean type unions do not generate compilable code from idlj
7056731 other-libs Race condition in CORBA code causes re-use of ABORTed connections
8011122 other-libs Update JDK7 with Java DB 10.8.3.0
8007748 other-libs MacOSX build error : cast of type 'SEL' to 'uintptr_t' (aka 'unsigned long') is deprecated; use sel_getName instead
8009928 performance PSR:PERF Increase default string table size
8004846 security-libs Time-specific certpath validation applies to OCSP response validity period
8004873 security-libs Arrayindexoutofboundsexception for jce decrypting
7109096 security-libs keytool -genkeypair needn't call -selfcert
7149012 security-libs jarsigner needs not warn about cert expiration if the jar has a TSA timestamp
7152121 security-libs Krb5LoginModule no longer handles keyTabNames with "file:" prefix
7153343 security-libs Dependency on non-POSIX header file <link.h> causes portability problem
7158329 security-libs NPE in sun.security.krb5.Credentials.acquireDefaultCreds()
7172149 security-libs ArrayIndexOutOfBoundsException from Signature.verify
7184815 security-libs [macosx] Need to read Kerberos config in files
7194472 security-libs FileKeyTab.java test fails on Windows
7201053 security-libs Krb5LoginModule shows NPE when both useTicketCache and storeKey are set to true
8009617 security-libs jarsigner fails when TSA response contains a status string
8011313 security-libs OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined
8011745 security-libs Unknown CertificateChoices
8011867 security-libs Accept unknown PKCS #9 attributes
8020940 security-libs Valid OCSP responses are rejected for backdated enquiries
7165807 security-libs Non optimized initialization of NSS crypto library leads to scalability issues
7201205 security-libs Add Makefile configuration option to build with unlimited crypto in OpenJDK.
7179879 security-libs SSLSocket connect times out instead of throwing socket closed exception
7200295 security-libs CertificateRequest message is wrapping when using large numbers of Certs
8012082 security-libs SASL: auth-conf negotiated, but unencrypted data is accepted, reset to unencrypt
8017173 security-libs XMLCipher with RSA_OAEP Key Transport algorithm can't be instantiated
8002344 security-libs Krb5LoginModule config class does not return proper KDC list from DNS
8014196 security-libs ktab creates a file with zero kt_vno
7201156 tools jar tool fails to convert file separation characters for list and extract
7160084 tools javac fails to compile an apparently valid class/interface combination
7178324 tools Crash when compiling for(i : x) try(AutoCloseable x = ...) {}
7181320 tools javac NullPointerException for switch labels with cast to String expressions
8004094 tools Javac compiler error - synthetic method accessor generated with duplicate name
8015668 tools overload resolution: performance regression in JDK 7
8000743 tools docencoding not available to stylesheet
7185778 tools javah error "Not a valid class name" on class names with dollar signs
6470730 tools Disconnect button leads to wrong popup message
8014048 tools Online user guide of jconsole points incorrect link
7151434 tools java -jar -XX crashes java launcher
7155300 tools Include pthread.h on all POSIX platforms except Solaris to improve portability
8007333 tools [launcher] removes multiple back slashes
8004264 tools Integrate new version of Java VisualVM based on VisualVM 1.3.5 into 7u14
8014891 xml Redundant setting of external access properties in setFeatures
7166896 xml DocumentBuilder.parse(String uri) is not IPv6 enabled. It throws MalformedURLException
8008738 xml Issue in com.sun.org.apache.xml.internal.serializer.Encodings causes some JCK tests to fail intermittently
8003147 xml port fix for BCEL bug 39695 to our copy bundled as part of jaxp
8013900 xml More warnings compiling jaxp
8015016 xml Improve JAXP 1.5 error message
8016153 xml Property http://javax.xml.XMLConstants/property/accessExternalDTD is not recognized.
8022548 xml SPECJVM2008 has errors introduced in 7u40-b34
25 files changed, 199 insertions, 333 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 4cdcad586a1..d3569806ad8 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2013/12/31 17:11:36 abs Exp $ +# $NetBSD: Makefile,v 1.58 2014/01/02 01:16:35 ryoon Exp $ -DISTNAME= openjdk-1.7.25-20130626 -PKGNAME= openjdk7-1.7.25 -PKGREVISION= 4 +DISTNAME= openjdk-1.7.45-20140101 +PKGNAME= openjdk7-1.7.45 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.bz2 diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST index 36c9126d584..dce08fe24bc 100644 --- a/lang/openjdk7/PLIST +++ b/lang/openjdk7/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2013/07/04 14:13:05 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.12 2014/01/02 01:16:35 ryoon Exp $ bin/openjdk7-jar bin/openjdk7-java bin/openjdk7-javac @@ -386,7 +386,6 @@ java/openjdk7/jre/lib/${ARCH}/libjdwp.so java/openjdk7/jre/lib/${ARCH}/libjpeg.so java/openjdk7/jre/lib/${ARCH}/libjsdt.diz java/openjdk7/jre/lib/${ARCH}/libjsdt.so -java/openjdk7/jre/lib/${ARCH}/libjsig.diz java/openjdk7/jre/lib/${ARCH}/libjsig.so java/openjdk7/jre/lib/${ARCH}/libjsound.so java/openjdk7/jre/lib/${ARCH}/liblcms.so @@ -397,8 +396,6 @@ java/openjdk7/jre/lib/${ARCH}/libnet.so java/openjdk7/jre/lib/${ARCH}/libnio.so java/openjdk7/jre/lib/${ARCH}/libnpt.diz java/openjdk7/jre/lib/${ARCH}/libnpt.so -java/openjdk7/jre/lib/${ARCH}/librmi.so -java/openjdk7/jre/lib/${ARCH}/libsaproc.diz java/openjdk7/jre/lib/${ARCH}/libsaproc.so java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so java/openjdk7/jre/lib/${ARCH}/libsunec.so @@ -407,9 +404,7 @@ java/openjdk7/jre/lib/${ARCH}/libverify.diz java/openjdk7/jre/lib/${ARCH}/libverify.so java/openjdk7/jre/lib/${ARCH}/libzip.so java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt -java/openjdk7/jre/lib/${ARCH}/server/libjsig.diz java/openjdk7/jre/lib/${ARCH}/server/libjsig.so -java/openjdk7/jre/lib/${ARCH}/server/libjvm.diz java/openjdk7/jre/lib/${ARCH}/server/libjvm.so java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so java/openjdk7/jre/lib/applet/.keep @@ -463,7 +458,6 @@ java/openjdk7/jre/lib/security/cacerts java/openjdk7/jre/lib/security/java.policy java/openjdk7/jre/lib/security/java.security java/openjdk7/jre/lib/security/local_policy.jar -java/openjdk7/jre/lib/servicetag/jdk_header.png java/openjdk7/jre/lib/sound.properties java/openjdk7/jre/lib/zi/Africa/Abidjan java/openjdk7/jre/lib/zi/Africa/Accra @@ -951,7 +945,6 @@ java/openjdk7/man/ja_JP.UTF-8/man1/jsadebugd.1 java/openjdk7/man/ja_JP.UTF-8/man1/jstack.1 java/openjdk7/man/ja_JP.UTF-8/man1/jstat.1 java/openjdk7/man/ja_JP.UTF-8/man1/jstatd.1 -java/openjdk7/man/ja_JP.UTF-8/man1/jvisualvm.1 java/openjdk7/man/ja_JP.UTF-8/man1/keytool.1 java/openjdk7/man/ja_JP.UTF-8/man1/native2ascii.1 java/openjdk7/man/ja_JP.UTF-8/man1/orbd.1 @@ -991,7 +984,6 @@ java/openjdk7/man/man1/jsadebugd.1 java/openjdk7/man/man1/jstack.1 java/openjdk7/man/man1/jstat.1 java/openjdk7/man/man1/jstatd.1 -java/openjdk7/man/man1/jvisualvm.1 java/openjdk7/man/man1/keytool.1 java/openjdk7/man/man1/native2ascii.1 java/openjdk7/man/man1/orbd.1 diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 2f21b1a0e92..728e1e5d49c 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2013/12/31 17:11:36 abs Exp $ +$NetBSD: distinfo,v 1.35 2014/01/02 01:16:35 ryoon Exp $ SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f @@ -9,36 +9,9 @@ Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2 RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7 Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes -SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4 -RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe -Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes -SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 08d0003078162c038ed67bb3d59cd2e4073cf4dd -RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 4ea4bd473635d99d9740c10bb815e019f7ad09d5 -Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 3422188 bytes -SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = f7578bfdfc7a952cd83306c97fa87ebf921a0461 -RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 74c570fa6ab6e175871229acc45edbb1e9c759ce -Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 3837091 bytes -SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = e9153bab724d415b30b42e320a878aeceb71ed64 -RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 8d9742b9288ed5eb965bc7fd50fe709f047665af -Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 3486566 bytes SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 60ff45ed4c027209fc855919227bb175c60ede08 RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = e98c534a6804ecd794d1ffd8975e0c705cf8938c Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 4082640 bytes -SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = baa7e0b2010c1cf918a88654b36db39935e532a4 -RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 791f8db986905f2477adcb1784fea957cd9501d2 -Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 3622007 bytes -SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = e18704c72646ef4f66e37ea7a2feb8dad9008079 -RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = b661b7a434d7d3c27614a2527b0fb2ed065d1f05 -Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = 20011172 bytes -SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = d7994e2a485c3e4eca44e81f4215bb4c35b54d04 -RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = bb9ba4fc83ec276c5e8decd53a6523eca1f6b819 -Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = 21142004 bytes -SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = b9445fa4cc4674ba8b9330e45ae65c597f5fca10 -RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = aa2443fa202f3ed8694b6d0e4031622b5da52283 -Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = 20874080 bytes -SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = aa44be237fac1b7c9b4044ea32cab9a0c2fb3ab2 -RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 5422564d6a5ba590b0906fdbb9de20091d7dabf2 -Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 21676584 bytes SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890 RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770 Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes @@ -57,25 +30,22 @@ Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818 Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes -SHA1 (openjdk7/openjdk-1.7.25-20130626.tar.bz2) = 321507c7414d9791f91957cccae4abeaccfdc4ee -RMD160 (openjdk7/openjdk-1.7.25-20130626.tar.bz2) = e49134aecb30fe81d62efa8b1a6e432e58fd4f92 -Size (openjdk7/openjdk-1.7.25-20130626.tar.bz2) = 51508647 bytes +SHA1 (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = 8c1bb4ce614210eaaa3ec46309cd2533c64e1ce4 +RMD160 (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = e4ecfabe920ba796d8f07a9a42899fe6b8bd09ed +Size (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = 51817743 bytes SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1 RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0 Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6 -SHA1 (patch-aa) = 6c27af8648ef893100a965ef2a009439e7bae6af +SHA1 (patch-aa) = 656265823146be3fd6efee470fccff5fdc4b2a59 SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998 SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 -SHA1 (patch-ad) = 93ddbb82e8999c581e56e7bc3c194ff87e68d8b9 SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8 -SHA1 (patch-af) = 203f61a448989130552a2fbef73f93d1734f4f66 SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88 SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2 SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec -SHA1 (patch-aj) = b8f7f80e41ccc4fe9bb167d857c6a286b3b09f0a SHA1 (patch-ak) = 45beaba484a74fb47f74bec786c418781dc478e2 -SHA1 (patch-al) = f52ad9a838357f03348344f09cabf00157bb18cd +SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175 SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703 SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503 @@ -90,19 +60,16 @@ SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423 SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273 SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6 SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a -SHA1 (patch-bj) = 072939cfa9bc5d358393702f71cf98cae87b1743 -SHA1 (patch-bk) = cb6f2da6fb2bbecb981dbf454603c851c48f75bc -SHA1 (patch-bl) = 34b829c6768fc67c0c0471880ce642284be602bb SHA1 (patch-bn) = e90012a3acbdeec1fe97d53ffa11816379ac90e9 SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2 -SHA1 (patch-corba_make_common_shared_Platform.gmk) = 0b15483bb55eb5d5f67d3fcab6b687a76de64e33 +SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd -SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = d0060b60463f3695a9a9d2e60841266233fd589d +SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 28be4be89a94373ed5f8bee67b581df6d5f2a28c SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b -SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = eade4a72ac2d826bb7eb8b84bf49219519ead4bd +SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = c9410ce77a10565e2a811ae053704d9e58978c02 SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a SHA1 (patch-hotspot_make_solaris_makefiles_jvmg.make) = 4b14c61707d739f612943c41ab7f3ccc34106a18 SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 5163ebc52439f6fe1cdfde87b9b930744a485e70 @@ -111,32 +78,32 @@ SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 9fbe6b4e8d SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850 SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5 SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43 -SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = dfa30c806ceacd2598483a8e1138c2c757462311 +SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = d72c16b90479c5df0dc33f3b30916b0552dcc17a SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c -SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 7099b9bc230869edced8d521513173ab5bd0fa3f +SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 3b97d40cd82b807acb45227935f0c7a58fdf7b89 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666 SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2 SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 -SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = cf7c6226ad7c322f43df900be0e69686ca3a7a57 -SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 57b4c2a2851ce1bc11faf6066ed274695d856c97 -SHA1 (patch-jdk_make_com_sun_Makefile) = 7b3b8163a4343b820f50b00babd4363c141ada67 +SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68 +SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2 +SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664 SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50 SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6 -SHA1 (patch-jdk_make_common_Program.gmk) = e2ac51824f54baeb65d3323adc87dec100c7ed0a +SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239 SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2 -SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = bb5d55282bf100986c397e41b1be4d25e73232dc +SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91 SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005 -SHA1 (patch-jdk_make_java_instrument_Makefile) = c9bd9bf27d9f2971d59762320e5cf9d25c2c4852 +SHA1 (patch-jdk_make_java_instrument_Makefile) = ddd552847d384ebbceff3b4561551d204c4e9d5a SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c -SHA1 (patch-jdk_make_java_npt_Makefile) = bf7505c30fe3e9014399bc5ce618c5dc40aef62b +SHA1 (patch-jdk_make_java_npt_Makefile) = f79db8f4bc1388ce95dd5adfd54ba13665bebe47 SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30 SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125b3460 @@ -152,14 +119,13 @@ SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.ja SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994 SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5 SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155 -SHA1 (patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h) = 23ea055894e3a77dc9e3be1c627d4b0dde342221 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da308daafc135db38e4513347a39368ba SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4 SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716 SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 86ce16bd53c85bc3830ef3f21d52f9a8107b5350 SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50 -SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = f65f616965c2e1149b72297d7c9b803d7adc4e8a +SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = d509a6ed567493024e3ce5de8986912da99f4a9d SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480 SHA1 (patch-jdk_test_Makefile) = d747987549c2f6e9eb42233edae02d8eae6b4584 SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa index a97c6079e79..7aefcdcfe2e 100644 --- a/lang/openjdk7/patches/patch-aa +++ b/lang/openjdk7/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.9 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-aa,v 1.10 2014/01/02 01:16:35 ryoon Exp $ DragonFly support. ---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2013-05-29 03:57:57.000000000 +0000 +--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-01-01 05:50:05.000000000 +0000 +++ hotspot/src/os/bsd/vm/os_bsd.cpp -@@ -131,8 +131,11 @@ +@@ -126,8 +126,11 @@ # include <inttypes.h> # include <sys/ioctl.h> @@ -17,39 +17,17 @@ DragonFly support. #endif #ifdef __APPLE__ -@@ -342,7 +345,12 @@ void os::Bsd::initialize_system_info() { - int mib[2]; +@@ -340,6 +343,7 @@ void os::Bsd::initialize_system_info() { size_t len; int cpu_val; -+#ifdef HW_USERMEM64 -+ uint64_t mem_val; -+#else - u_long mem_val; -+#endif + julong mem_val; + struct rlimit limits; /* get processors count via hw.ncpus sysctl */ mib[0] = CTL_HW; -@@ -359,21 +367,26 @@ void os::Bsd::initialize_system_info() { - * instead of hw.physmem because we need size of allocatable memory - */ - mib[0] = CTL_HW; -+#ifdef HW_USERMEM64 -+ mib[1] = HW_USERMEM64; -+#else - mib[1] = HW_USERMEM; -+#endif - len = sizeof(mem_val); -- if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) -+ if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) { - _physical_memory = mem_val; -- else -+#ifdef HW_USERMEM64 -+ if (_physical_memory < mem_val) -+ _physical_memory = (julong)-1; -+#endif -+ } else +@@ -370,14 +374,11 @@ void os::Bsd::initialize_system_info() { _physical_memory = 256*1024*1024; // fallback (XXXBSD?) + } -#ifdef __OpenBSD__ - { @@ -67,7 +45,7 @@ DragonFly support. #endif } #else -@@ -2165,7 +2178,9 @@ void * os::dll_load(const char *filename +@@ -2222,7 +2223,9 @@ void * os::dll_load(const char *filename {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -77,16 +55,16 @@ DragonFly support. {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, -@@ -3668,7 +3683,7 @@ OSReturn os::set_native_priority(Thread* +@@ -3880,7 +3883,7 @@ OSReturn os::set_native_priority(Thread* #ifdef __OpenBSD__ // OpenBSD pthread_setprio starves low priority threads return OS_OK; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); + return (ret == 0) ? OS_OK : OS_ERR; #elif defined(__APPLE__) || defined(__NetBSD__) - struct sched_param sp; -@@ -3696,7 +3711,7 @@ OSReturn os::get_native_priority(const T +@@ -3909,7 +3912,7 @@ OSReturn os::get_native_priority(const T } errno = 0; diff --git a/lang/openjdk7/patches/patch-ad b/lang/openjdk7/patches/patch-ad deleted file mode 100644 index 7daca0a5394..00000000000 --- a/lang/openjdk7/patches/patch-ad +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2013/06/15 09:31:05 jperkin Exp $ - -DragonFly support. - ---- corba/make/common/shared/Platform.gmk.orig 2012-08-10 16:10:07.000000000 +0000 -+++ corba/make/common/shared/Platform.gmk -@@ -238,6 +238,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD) - REQUIRED_OS_VERSION = 6.0 - endif - -+ifeq ($(SYSTEM_UNAME), DragonFly) -+ PLATFORM = bsd -+ OS_NAME = dragonfly -+ OS_VENDOR = DragonFlyBSD -+ REQUIRED_OS_VERSION = 2.4 -+endif -+ - ifeq ($(SYSTEM_UNAME), Darwin) - PLATFORM = bsd - OS_NAME = darwin -@@ -318,9 +325,9 @@ ifeq ($(PLATFORM), bsd) - REQUIRED_FREE_SPACE=1500000 - # How much RAM does this machine have: - ifeq ($(OS_VENDOR), OpenBSD) -- MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) -+ MB_OF_MEMORY=$(shell /sbin/sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) - else -- MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) -+ MB_OF_MEMORY=$(shell (/sbin/sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) - endif - endif - diff --git a/lang/openjdk7/patches/patch-af b/lang/openjdk7/patches/patch-af deleted file mode 100644 index adfd8f66143..00000000000 --- a/lang/openjdk7/patches/patch-af +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-af,v 1.4 2013/06/15 09:31:05 jperkin Exp $ - -Use tools from pkgsrc. - ---- jdk/make/common/shared/Defs-utils.gmk.orig 2013-05-29 03:57:57.000000000 +0000 -+++ jdk/make/common/shared/Defs-utils.gmk -@@ -286,7 +286,14 @@ ifeq ($(PLATFORM),bsd) - endif - ifeq ($(OS_VENDOR), NetBSD) - NAWK = $(UTILS_USR_BIN_PATH)awk -- ZIPEXE = $(UTILS_DEVTOOL_PATH)zip -- UNZIP = $(UTILS_DEVTOOL_PATH)unzip -+ ZIPEXE = $(PKGSRC_ZIPEXE) -+ UNZIP = $(PKGSRC_UNZIP) -+ UNZIPSFX = $(PKGSRC_UNZIPSFX) -+ endif -+ ifeq ($(OS_VENDOR), DragonFlyBSD) -+ NAWK = $(UTILS_USR_BIN_PATH)awk -+ ZIPEXE = $(PKGSRC_ZIPEXE) -+ UNZIP = $(PKGSRC_UNZIP) -+ UNZIPSFX = $(PKGSRC_UNZIPSFX) - endif - endif diff --git a/lang/openjdk7/patches/patch-aj b/lang/openjdk7/patches/patch-aj deleted file mode 100644 index c511e3a1736..00000000000 --- a/lang/openjdk7/patches/patch-aj +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aj,v 1.5 2013/06/15 09:31:05 jperkin Exp $ - -DragonFly support. - ---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2013-05-29 03:57:58.000000000 +0000 -+++ jdk/src/solaris/native/java/net/NetworkInterface.c -@@ -60,13 +60,11 @@ - #include <sys/param.h> - #include <sys/ioctl.h> - #include <sys/sockio.h> --#if defined(__FreeBSD__) || defined(__APPLE__) -+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) - #include <net/ethernet.h> - #include <net/if_var.h> --#elif defined(__OpenBSD__) -+#elif defined(__OpenBSD__) || defined(__NetBSD__) - #include <netinet/if_ether.h> --#elif defined(__NetBSD__) --#include <net/if_ether.h> - #endif - #include <net/if_dl.h> - #include <netinet/in_var.h> diff --git a/lang/openjdk7/patches/patch-al b/lang/openjdk7/patches/patch-al index 44558c8f689..49caa2af2fd 100644 --- a/lang/openjdk7/patches/patch-al +++ b/lang/openjdk7/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.4 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-al,v 1.5 2014/01/02 01:16:35 ryoon Exp $ DragonFly support. ---- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig 2013-06-01 14:10:31.000000000 +0000 +--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig 2014-01-01 05:53:43.000000000 +0000 +++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java @@ -28,6 +28,8 @@ package sun.nio.fs; import java.nio.file.spi.FileSystemProvider; @@ -28,20 +28,22 @@ DragonFly support. @SuppressWarnings("unchecked") private static FileSystemProvider createProvider(final String cn) { return AccessController -@@ -64,11 +74,15 @@ public class DefaultFileSystemProvider { +@@ -64,13 +74,17 @@ public class DefaultFileSystemProvider { public static FileSystemProvider create() { String osname = AccessController .doPrivileged(new GetPropertyAction("os.name")); -+ String fileSystemProvider = System -+ .getProperty("java.nio.file.spi.DefaultFileSystemProvider"); -+ if (validFileSystemProviders.contains(fileSystemProvider)) -+ return createProvider(fileSystemProvider); ++ String fileSystemProvider = System ++ .getProperty("java.nio.file.spi.DefaultFileSystemProvider"); ++ if (validFileSystemProviders.contains(fileSystemProvider)) ++ return createProvider(fileSystemProvider); if (osname.equals("SunOS")) return createProvider("sun.nio.fs.SolarisFileSystemProvider"); if (osname.equals("Linux")) return createProvider("sun.nio.fs.LinuxFileSystemProvider"); -- if (osname.endsWith("BSD") || osname.equals("Darwin") || osname.contains("OS X")) -+ if (osname.endsWith("BSD") || osname.equals("Darwin") || osname.contains("OS X") || osname.equals("DragonFly")) + if (osname.equals("Darwin") || osname.contains("OS X")) + return createProvider("sun.nio.fs.MacOSXFileSystemProvider"); +- if (osname.endsWith("BSD")) ++ if (osname.endsWith("BSD") || osname.equals("DragonFly")) return createProvider("sun.nio.fs.BsdFileSystemProvider"); throw new AssertionError("Platform not recognized"); } diff --git a/lang/openjdk7/patches/patch-bj b/lang/openjdk7/patches/patch-bj deleted file mode 100644 index eddf9120c6e..00000000000 --- a/lang/openjdk7/patches/patch-bj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bj,v 1.3 2013/06/15 09:31:05 jperkin Exp $ - -DragonFly support. - ---- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2012-08-10 16:28:55.000000000 +0000 -+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp -@@ -252,6 +252,9 @@ inline int g_isnan(float f) { return is - inline int g_isnan(double f) { return isnand(f); } - #elif defined(__APPLE__) - inline int g_isnan(double f) { return isnan(f); } -+#elif defined(__DragonFly__) -+inline int g_isnan(float f) { return __isnanf(f); } -+inline int g_isnan(double f) { return __isnand(f); } - #elif defined(LINUX) || defined(_ALLBSD_SOURCE) - inline int g_isnan(float f) { return isnanf(f); } - inline int g_isnan(double f) { return isnan(f); } diff --git a/lang/openjdk7/patches/patch-bk b/lang/openjdk7/patches/patch-bk deleted file mode 100644 index 4f1566c2a75..00000000000 --- a/lang/openjdk7/patches/patch-bk +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bk,v 1.3 2013/06/15 09:31:05 jperkin Exp $ - -DragonFly support. - ---- jdk/make/java/npt/Makefile.orig 2013-05-29 03:57:57.000000000 +0000 -+++ jdk/make/java/npt/Makefile -@@ -76,7 +76,7 @@ endif - - # Add location of iconv headers - ifeq ($(PLATFORM), bsd) -- ifneq ($(OS_NAME), netbsd) -+ ifeq ($(OS_NAME), freebsd) - CPPFLAGS += -I$(PACKAGE_PATH)/include - OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv - endif diff --git a/lang/openjdk7/patches/patch-bl b/lang/openjdk7/patches/patch-bl deleted file mode 100644 index edbdfd3bf5b..00000000000 --- a/lang/openjdk7/patches/patch-bl +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bl,v 1.3 2013/06/15 09:31:05 jperkin Exp $ - -DragonFly support. - ---- jdk/make/java/instrument/Makefile.orig 2013-05-29 03:57:57.000000000 +0000 -+++ jdk/make/java/instrument/Makefile -@@ -115,7 +115,7 @@ ifneq (,$(findstring $(PLATFORM), macosx - LDFLAGS += -Wl,--whole-archive - LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a - LDFLAGS += -Wl,--no-whole-archive -- ifneq ($(OS_NAME), netbsd) -+ ifeq ($(OS_NAME), freebsd) - # Use CPPFLAGS instead of OTHER_INCLUDES to force this last - CPPFLAGS += -I$(PACKAGE_PATH)/include - OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv diff --git a/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk b/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk index 9f328ce0cd2..33241cf3554 100644 --- a/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk +++ b/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk @@ -1,10 +1,10 @@ -$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.2 2013/06/23 17:39:43 jperkin Exp $ +$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.3 2014/01/02 01:16:35 ryoon Exp $ Avoid warnings when building in a zone. Disable multiarch support. ---- corba/make/common/shared/Platform.gmk.orig 2013-06-21 13:12:15.317583446 +0000 +--- corba/make/common/shared/Platform.gmk.orig 2014-01-01 05:49:21.000000000 +0000 +++ corba/make/common/shared/Platform.gmk @@ -115,7 +115,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) ARCH := $(shell isainfo -n) @@ -24,3 +24,29 @@ Disable multiarch support. endif # Platform settings specific to Linux +@@ -238,6 +238,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD) + REQUIRED_OS_VERSION = 6.0 + endif + ++ifeq ($(SYSTEM_UNAME), DragonFly) ++ PLATFORM = bsd ++ OS_NAME = dragonfly ++ OS_VENDOR = DragonFlyBSD ++ REQUIRED_OS_VERSION = 2.4 ++endif ++ + ifeq ($(SYSTEM_UNAME), Darwin) + PLATFORM = bsd + OS_NAME = darwin +@@ -318,9 +325,9 @@ ifeq ($(PLATFORM), bsd) + REQUIRED_FREE_SPACE=1500000 + # How much RAM does this machine have: + ifeq ($(OS_VENDOR), OpenBSD) +- MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) ++ MB_OF_MEMORY=$(shell /sbin/sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) + else +- MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) ++ MB_OF_MEMORY=$(shell (/sbin/sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) + endif + endif + diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_dtrace.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_dtrace.make index 4314aaaaab6..d78864fff0c 100644 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_dtrace.make +++ b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_dtrace.make @@ -1,12 +1,12 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_dtrace.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-hotspot_make_solaris_makefiles_dtrace.make,v 1.2 2014/01/02 01:16:35 ryoon Exp $ Enable DTrace support with GCC. ---- hotspot/make/solaris/makefiles/dtrace.make.orig 2012-08-10 16:23:13.000000000 +0000 +--- hotspot/make/solaris/makefiles/dtrace.make.orig 2014-01-01 05:50:04.000000000 +0000 +++ hotspot/make/solaris/makefiles/dtrace.make -@@ -30,13 +30,6 @@ +@@ -29,13 +29,6 @@ + ifneq ("${TYPE}", "CORE") - ifneq ("${TYPE}", "KERNEL") -ifdef USE_GCC - @@ -18,7 +18,7 @@ Enable DTrace support with GCC. JVM_DB = libjvm_db LIBJVM_DB = libjvm_db.so LIBJVM_DB_G = libjvm$(G_SUFFIX)_db.so -@@ -63,14 +56,23 @@ DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Pla +@@ -62,14 +55,23 @@ DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Pla DTRACE = dtrace DTRACE.o = $(DTRACE).o @@ -45,12 +45,12 @@ Enable DTrace support with GCC. # making libjvm_db # Use mapfile with libjvm_db.so -@@ -384,8 +386,6 @@ dtraceCheck: +@@ -383,8 +385,6 @@ dtraceCheck: endif # ifneq ("${dtraceFound}", "") -endif # ifdef USE_GCC - - else # KERNEL build + else # CORE build dtraceCheck: diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make index 0856293b928..3e24fd528ad 100644 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make +++ b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make @@ -1,12 +1,12 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.2 2013/06/23 17:39:43 jperkin Exp $ +$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.3 2014/01/02 01:16:35 ryoon Exp $ GCC support. Disable SunOS multiarch. ---- hotspot/make/solaris/makefiles/gcc.make.orig 2012-08-10 16:23:14.000000000 +0000 +--- hotspot/make/solaris/makefiles/gcc.make.orig 2014-01-01 05:50:04.000000000 +0000 +++ hotspot/make/solaris/makefiles/gcc.make -@@ -66,11 +66,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG) +@@ -70,11 +70,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG) VM_PICFLAG/AOUT = VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) @@ -30,7 +30,7 @@ Disable SunOS multiarch. ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) -@@ -82,7 +94,8 @@ ARCHFLAG/amd64 = -m64 -march=k8 +@@ -86,7 +98,8 @@ ARCHFLAG/amd64 = -m64 -march=k8 # Optional sub-directory in /usr/lib where BUILDARCH libraries are kept. ISA_DIR=$(ISA_DIR/$(BUILDARCH)) @@ -40,7 +40,7 @@ Disable SunOS multiarch. ISA_DIR/i486= ISA_DIR/sparcv9=/64 -@@ -103,6 +116,11 @@ ifdef CC_INTERP +@@ -107,6 +120,11 @@ ifdef CC_INTERP CFLAGS += -DCC_INTERP endif @@ -52,7 +52,7 @@ Disable SunOS multiarch. # Keep temporary files (.ii, .s) ifdef NEED_ASM CFLAGS += -save-temps -@@ -113,9 +131,18 @@ endif +@@ -117,9 +135,18 @@ endif # Compiler warnings are treated as errors WARNINGS_ARE_ERRORS = -Werror @@ -74,7 +74,7 @@ Disable SunOS multiarch. # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) -@@ -173,7 +200,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME +@@ -177,7 +204,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME endif # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj @@ -83,7 +83,7 @@ Disable SunOS multiarch. # Build shared library SHARED_FLAG = -shared -@@ -181,17 +208,34 @@ SHARED_FLAG = -shared +@@ -185,15 +212,32 @@ SHARED_FLAG = -shared #------------------------------------------------------------------------ # Debug flags @@ -128,5 +128,3 @@ Disable SunOS multiarch. +ifdef MINIMIZE_RAM_USAGE + CFLAGS += -DMINIMIZE_RAM_USAGE +endif - - MCS = /usr/ccs/bin/mcs diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_vm.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_vm.make index 20d8df03b3c..06a27a720ff 100644 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_vm.make +++ b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_vm.make @@ -1,8 +1,8 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_vm.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-hotspot_make_solaris_makefiles_vm.make,v 1.2 2014/01/02 01:16:35 ryoon Exp $ GCC support. ---- hotspot/make/solaris/makefiles/vm.make.orig 2013-02-19 23:21:59.000000000 +0000 +--- hotspot/make/solaris/makefiles/vm.make.orig 2014-01-01 05:50:04.000000000 +0000 +++ hotspot/make/solaris/makefiles/vm.make @@ -59,7 +59,11 @@ INCLUDES += $(Src_Dirs_I:%=-I%) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) @@ -17,7 +17,7 @@ GCC support. else ifeq (${VERSION}, debug) SYMFLAG = -g -@@ -132,7 +136,7 @@ LIBS += -ldl -lthread -lsocket $(LIBM) - +@@ -137,7 +141,7 @@ LIBS += -ldl -lthread -lsocket $(LIBM) - endif # 502 endif # 505 else @@ -25,8 +25,8 @@ GCC support. +LIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc endif # sparcWorks - ifeq ("${Platform_arch}", "sparc") -@@ -268,16 +272,19 @@ ifeq ($(LINK_INTO),AOUT) + LIBS += -lkstat +@@ -271,16 +275,19 @@ ifeq ($(LINK_INTO),AOUT) LIBS_VM = $(LIBS) else LIBJVM.o = $(JVM_OBJ_FILES) diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp index 2688a5508bd..5b5bed230cc 100644 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp +++ b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp @@ -1,11 +1,11 @@ -$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp,v 1.2 2014/01/02 01:16:35 ryoon Exp $ GCC support. ---- hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp.orig 2012-08-10 16:24:45.000000000 +0000 +--- hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp.orig 2014-01-01 05:50:05.000000000 +0000 +++ hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp -@@ -237,7 +237,22 @@ frame os::get_sender_for_C_frame(frame* - return frame(fr->sender_sp(), fr->link(), fr->sender_pc()); +@@ -241,7 +241,22 @@ address os::current_stack_pointer() { + return (address)_get_current_sp(); } +#ifdef AMD64 @@ -27,7 +27,7 @@ GCC support. frame os::current_frame() { intptr_t* fp = _get_current_fp(); // it's inlined so want current fp -@@ -951,6 +966,11 @@ add_func_t* os::atomic_add_func +@@ -937,7 +952,12 @@ add_func_t* os::atomic_add_func extern "C" void _solaris_raw_setup_fpu(address ptr); void os::setup_fpu() { address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std(); @@ -39,3 +39,4 @@ GCC support. +#endif } #endif // AMD64 + diff --git a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp index 70ed1cd8d30..bc211c6d8c2 100644 --- a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp +++ b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp @@ -1,19 +1,10 @@ -$NetBSD: patch-hotspot_src_os_solaris_vm_os__solaris.cpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-hotspot_src_os_solaris_vm_os__solaris.cpp,v 1.2 2014/01/02 01:16:35 ryoon Exp $ Misc SunOS casts. ---- hotspot/src/os/solaris/vm/os_solaris.cpp.orig 2012-08-10 16:24:27.000000000 +0000 +--- hotspot/src/os/solaris/vm/os_solaris.cpp.orig 2014-01-01 05:50:05.000000000 +0000 +++ hotspot/src/os/solaris/vm/os_solaris.cpp -@@ -630,7 +630,7 @@ static bool assign_distribution(processo - const processorid_t limit_id = max_id + 1; - // Make up markers for available processors. - bool* available_id = NEW_C_HEAP_ARRAY(bool, limit_id); -- for (uint c = 0; c < limit_id; c += 1) { -+ for (processorid_t c = 0; c < limit_id; c += 1) { - available_id[c] = false; - } - for (uint a = 0; a < id_length; a += 1) { -@@ -653,7 +653,7 @@ static bool assign_distribution(processo +@@ -650,7 +650,7 @@ static bool assign_distribution(processo // ... find the next available processor in the board. for (uint slot = 0; slot < processors_per_board; slot += 1) { uint try_id = board * processors_per_board + slot; @@ -22,7 +13,7 @@ Misc SunOS casts. distribution[assigned] = try_id; available_id[try_id] = false; assigned += 1; -@@ -661,7 +661,7 @@ static bool assign_distribution(processo +@@ -658,7 +658,7 @@ static bool assign_distribution(processo } } board += 1; @@ -31,7 +22,7 @@ Misc SunOS casts. board = 0; } } -@@ -718,7 +718,7 @@ bool os::bind_to_processor(uint processo +@@ -715,7 +715,7 @@ bool os::bind_to_processor(uint processo bool os::getenv(const char* name, char* buffer, int len) { char* val = ::getenv( name ); if ( val == NULL @@ -40,7 +31,7 @@ Misc SunOS casts. if (len > 0) buffer[0] = 0; // return a null string return false; } -@@ -925,7 +925,7 @@ void os::init_system_properties_values() +@@ -922,7 +922,7 @@ void os::init_system_properties_values() strcpy(library_path, common_path); } else { int inserted = 0; @@ -49,7 +40,7 @@ Misc SunOS casts. uint_t flags = path->dls_flags & LA_SER_MASK; if (((flags & LA_SER_LIBPATH) == 0) && !inserted) { strcat(library_path, common_path); -@@ -1059,7 +1059,8 @@ extern "C" void* java_start(void* thread +@@ -1047,7 +1047,8 @@ extern "C" void* java_start(void* thread // in java_to_os_priority. So we save the native priority // in the osThread and recall it here. @@ -59,7 +50,7 @@ Misc SunOS casts. if ( UseThreadPriorities ) { int prio = osthr->native_priority(); if (ThreadPriorityVerbose) { -@@ -2855,7 +2856,7 @@ void os::numa_make_global(char *addr, si +@@ -2994,7 +2995,7 @@ void os::numa_make_global(char *addr, si // Get the number of the locality groups. size_t os::numa_get_groups_num() { size_t n = Solaris::lgrp_nlgrps(Solaris::lgrp_cookie()); @@ -68,7 +59,7 @@ Misc SunOS casts. } // Get a list of leaf locality groups. A leaf lgroup is group that -@@ -2867,7 +2868,7 @@ size_t os::numa_get_leaf_groups(int *ids +@@ -3006,7 +3007,7 @@ size_t os::numa_get_leaf_groups(int *ids return 1; } int result_size = 0, top = 1, bottom = 0, cur = 0; @@ -77,7 +68,7 @@ Misc SunOS casts. int r = Solaris::lgrp_children(Solaris::lgrp_cookie(), ids[cur], (Solaris::lgrp_id_t*)&ids[top], size - top); if (r == -1) { -@@ -2987,7 +2988,7 @@ char *os::scan_pages(char *start, char* +@@ -3126,7 +3127,7 @@ char *os::scan_pages(char *start, char* } if ((validity[i] & 2) != 0 && page_expected->lgrp_id > 0) { @@ -86,7 +77,7 @@ Misc SunOS casts. break; } } -@@ -4714,7 +4715,7 @@ const char * signames[] = { +@@ -5025,7 +5026,7 @@ const char * signames[] = { const char* os::exception_name(int exception_code, char* buf, size_t size) { if (0 < exception_code && exception_code <= SIGRTMAX) { // signal @@ -95,7 +86,7 @@ Misc SunOS casts. jio_snprintf(buf, size, "%s", signames[exception_code]); } else { jio_snprintf(buf, size, "SIG%d", exception_code); -@@ -5051,7 +5052,7 @@ void os::init(void) { +@@ -5362,7 +5363,7 @@ void os::init(void) { // If the pagesize of the VM is greater than 8K determine the appropriate // number of initial guard pages. The user can change this with the // command line arguments, if needed. @@ -104,7 +95,7 @@ Misc SunOS casts. StackYellowPages = 1; StackRedPages = 1; StackShadowPages = round_to((StackShadowPages*8*K), vm_page_size()) / vm_page_size(); -@@ -5072,7 +5073,7 @@ jint os::init_2(void) { +@@ -5383,7 +5384,7 @@ jint os::init_2(void) { // Allocate a single page and mark it as readable for safepoint polling. Also // use this first mmap call to check support for MAP_ALIGN. @@ -113,7 +104,7 @@ Misc SunOS casts. page_size, MAP_PRIVATE | MAP_ALIGN, PROT_READ); -@@ -5126,7 +5127,7 @@ jint os::init_2(void) { +@@ -5437,7 +5438,7 @@ jint os::init_2(void) { // stack on a power of 2 boundary. The real fix for this // should be to fix the guard page mechanism. diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp index 199d66f7782..85f0da401d0 100644 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp +++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp @@ -1,8 +1,8 @@ -$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.2 2013/06/26 12:52:35 ryoon Exp $ +$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.3 2014/01/02 01:16:35 ryoon Exp $ SunOS fixes. ---- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2013-06-25 13:37:39.000000000 +0000 +--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2014-01-01 05:50:08.000000000 +0000 +++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp @@ -31,6 +31,10 @@ // globally used constants & types, class (forward) @@ -23,12 +23,13 @@ SunOS fixes. // checking for nanness #ifdef SOLARIS #ifdef SPARC -@@ -252,7 +257,7 @@ inline int g_isnan(float f) { return is +@@ -252,6 +257,9 @@ inline int g_isnan(float f) { return is inline int g_isnan(double f) { return isnand(f); } #elif defined(__APPLE__) inline int g_isnan(double f) { return isnan(f); } --#elif defined(__DragonFly__) +#elif defined(__DragonFly__) && __DragonFly_version < 300500 - inline int g_isnan(float f) { return __isnanf(f); } - inline int g_isnan(double f) { return __isnand(f); } ++inline int g_isnan(float f) { return __isnanf(f); } ++inline int g_isnan(double f) { return __isnand(f); } #elif defined(LINUX) || defined(_ALLBSD_SOURCE) + inline int g_isnan(float f) { return isnanf(f); } + inline int g_isnan(double f) { return isnan(f); } diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile index 674fc591af5..4737d90502d 100644 --- a/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-jdk_make_com_sun_Makefile,v 1.1 2013/06/02 06:12:28 ryoon Exp $ +$NetBSD: patch-jdk_make_com_sun_Makefile,v 1.2 2014/01/02 01:16:35 ryoon Exp $ * From rhino.patch. ---- jdk/make/com/sun/Makefile.orig 2012-08-10 17:21:29.000000000 +0000 +--- jdk/make/com/sun/Makefile.orig 2014-01-01 05:53:33.000000000 +0000 +++ jdk/make/com/sun/Makefile @@ -31,13 +31,6 @@ BUILDDIR = ../.. PRODUCT = sun @@ -22,8 +22,8 @@ $NetBSD: patch-jdk_make_com_sun_Makefile,v 1.1 2013/06/02 06:12:28 ryoon Exp $ SUBDIRS_desktop = image SUBDIRS_enterprise = crypto/provider jndi \ org rowset net/httpserver --SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo -+SUBDIRS_misc = script tracing servicetag nio demo +-SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo ++SUBDIRS_misc = script tracing nio demo # Omit mirror since it's built with the apt tool. SUBDIRS_tools = tools diff --git a/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk b/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk index 4a93fdb06c4..533b319d0c6 100644 --- a/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk +++ b/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk @@ -1,8 +1,8 @@ -$NetBSD: patch-jdk_make_common_Program.gmk,v 1.2 2013/06/23 17:39:43 jperkin Exp $ +$NetBSD: patch-jdk_make_common_Program.gmk,v 1.3 2014/01/02 01:16:35 ryoon Exp $ GCC support. ---- jdk/make/common/Program.gmk.orig 2013-06-18 09:09:41.950128156 +0000 +--- jdk/make/common/Program.gmk.orig 2014-01-01 05:53:33.000000000 +0000 +++ jdk/make/common/Program.gmk @@ -65,7 +65,10 @@ program: $(ACTUAL_PROGRAM) ifndef CROSS_COMPILE_ARCH @@ -16,27 +16,23 @@ GCC support. include $(BUILDDIR)/common/Mapfile-vers.gmk endif -@@ -110,12 +113,13 @@ ifneq (,$(findstring $(PLATFORM), linux +@@ -110,10 +113,11 @@ ifneq (,$(findstring $(PLATFORM), linux LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli OTHER_LDLIBS += -ljli ifeq ($(PLATFORM), solaris) + LDFLAGS += -R ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/jli ifeq ($(ARCH_DATA_MODEL), 32) - LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli -- LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli -+# LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli -+# LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli ++# LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli else # ! ARCH_DATA_MODEL 64-bit - LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli -- LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli -+# LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli -+# LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli ++# LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli endif # ARCH_DATA_MODEL endif # PLATFORM SOLARIS ifeq ($(PLATFORM), linux) -@@ -124,6 +128,9 @@ ifneq (,$(findstring $(PLATFORM), linux +@@ -121,6 +125,9 @@ ifneq (,$(findstring $(PLATFORM), linux + LDFLAGS += -Wl,--allow-shlib-undefined LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli - LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli endif # PLATFORM LINUX + ifeq ($(SYSTEM_ZLIB),true) + OTHER_LDLIBS += $(ZLIB_LIBS) diff --git a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-utils.gmk b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-utils.gmk index b9561d200d2..b1b43d9bc01 100644 --- a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-utils.gmk +++ b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-utils.gmk @@ -1,14 +1,34 @@ -$NetBSD: patch-jdk_make_common_shared_Defs-utils.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $ +$NetBSD: patch-jdk_make_common_shared_Defs-utils.gmk,v 1.2 2014/01/02 01:16:35 ryoon Exp $ Use pkgsrc zip commands. ---- jdk/make/common/shared/Defs-utils.gmk.orig 2013-03-10 22:22:12.950670029 +0000 +--- jdk/make/common/shared/Defs-utils.gmk.orig 2014-01-01 05:53:33.000000000 +0000 +++ jdk/make/common/shared/Defs-utils.gmk -@@ -254,3 +254,7 @@ ifeq ($(PLATFORM), macosx) - # Builtin shell command, no -e option needed +@@ -259,6 +259,10 @@ ifeq ($(PLATFORM), macosx) ECHO = echo endif -+ + +ZIPEXE = $(PKGSRC_ZIPEXE) +UNZIP = $(PKGSRC_UNZIP) +UNZIPSFX = $(PKGSRC_UNZIPSFX) ++ + # BSD specific + ifeq ($(PLATFORM),bsd) + BASENAME = $(UTILS_USR_BIN_PATH)basename +@@ -286,7 +290,14 @@ ifeq ($(PLATFORM),bsd) + endif + ifeq ($(OS_VENDOR), NetBSD) + NAWK = $(UTILS_USR_BIN_PATH)awk +- ZIPEXE = $(UTILS_DEVTOOL_PATH)zip +- UNZIP = $(UTILS_DEVTOOL_PATH)unzip ++ ZIPEXE = $(PKGSRC_ZIPEXE) ++ UNZIP = $(PKGSRC_UNZIP) ++ UNZIPSFX = $(PKGSRC_UNZIPSFX) ++ endif ++ ifeq ($(OS_VENDOR), DragonFlyBSD) ++ NAWK = $(UTILS_USR_BIN_PATH)awk ++ ZIPEXE = $(PKGSRC_ZIPEXE) ++ UNZIP = $(PKGSRC_UNZIP) ++ UNZIPSFX = $(PKGSRC_UNZIPSFX) + endif + endif diff --git a/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile b/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile index 76e11be1d88..8f4cdf65e0f 100644 --- a/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile @@ -1,10 +1,19 @@ -$NetBSD: patch-jdk_make_java_instrument_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $ +$NetBSD: patch-jdk_make_java_instrument_Makefile,v 1.2 2014/01/02 01:16:35 ryoon Exp $ Need libiconv. ---- jdk/make/java/instrument/Makefile.orig 2013-02-20 17:07:30.000000000 +0000 +--- jdk/make/java/instrument/Makefile.orig 2014-01-01 05:53:33.000000000 +0000 +++ jdk/make/java/instrument/Makefile -@@ -119,6 +119,9 @@ else +@@ -115,7 +115,7 @@ ifneq (,$(findstring $(PLATFORM), macosx + LDFLAGS += -Wl,--whole-archive + LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a + LDFLAGS += -Wl,--no-whole-archive +- ifneq ($(OS_NAME), netbsd) ++ ifeq ($(OS_NAME), freebsd) + # Use CPPFLAGS instead of OTHER_INCLUDES to force this last + CPPFLAGS += -I$(PACKAGE_PATH)/include + OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv +@@ -131,6 +131,9 @@ else OTHER_LDLIBS += -ldl ifeq ($(PLATFORM), solaris) LDFLAGS += -R \$$ORIGIN/jli diff --git a/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile b/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile index 64123cff7ca..642c41c2db5 100644 --- a/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-jdk_make_java_npt_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $ +$NetBSD: patch-jdk_make_java_npt_Makefile,v 1.2 2014/01/02 01:16:35 ryoon Exp $ GCC needs libiconv. ---- jdk/make/java/npt/Makefile.orig 2013-02-20 17:07:30.000000000 +0000 +--- jdk/make/java/npt/Makefile.orig 2014-01-01 05:53:33.000000000 +0000 +++ jdk/make/java/npt/Makefile @@ -38,6 +38,12 @@ FILES_m = mapfile-vers @@ -17,3 +17,12 @@ GCC needs libiconv. SRCDIR=$(SHARE_SRC)/npt PSRCDIR=$(PLATFORM_SRC)/npt +@@ -76,7 +82,7 @@ endif + + # Add location of iconv headers + ifeq ($(PLATFORM), bsd) +- ifneq ($(OS_NAME), netbsd) ++ ifeq ($(OS_NAME), freebsd) + CPPFLAGS += -I$(PACKAGE_PATH)/include + OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv + endif diff --git a/lang/openjdk7/patches/patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h b/lang/openjdk7/patches/patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h deleted file mode 100644 index 63259cdf417..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Avoid uLong conflicts on !BSD. - ---- jdk/src/share/native/com/sun/java/util/jar/pack/defines.h.orig 2013-06-14 21:08:03.030278224 +0000 -+++ jdk/src/share/native/com/sun/java/util/jar/pack/defines.h -@@ -93,7 +93,7 @@ extern int assert_failed(const char*); - // bytes and byte arrays - - typedef unsigned int uint; --#if !defined(_ALLBSD_SOURCE) || (defined(_ALLBSD_SOURCE) && defined(NO_ZLIB)) -+#if defined(NO_ZLIB) - #ifdef _LP64 - typedef unsigned int uLong; // Historical zlib, should be 32-bit. - #else diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c index e8be58fc9e6..64060006f94 100644 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c +++ b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c @@ -1,8 +1,8 @@ -$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $ +$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.2 2014/01/02 01:16:35 ryoon Exp $ Zones support. ---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2013-02-20 17:07:30.000000000 +0000 +--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2014-01-01 05:53:43.000000000 +0000 +++ jdk/src/solaris/native/java/net/NetworkInterface.c @@ -43,6 +43,7 @@ #include <fcntl.h> @@ -12,7 +12,23 @@ Zones support. #endif #ifdef __linux__ -@@ -1525,7 +1526,8 @@ static short getSubnet(JNIEnv *env, int +@@ -60,13 +61,11 @@ + #include <sys/param.h> + #include <sys/ioctl.h> + #include <sys/sockio.h> +-#if defined(__FreeBSD__) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) + #include <net/ethernet.h> + #include <net/if_var.h> +-#elif defined(__OpenBSD__) ++#elif defined(__OpenBSD__) || defined(__NetBSD__) + #include <netinet/if_ether.h> +-#elif defined(__NetBSD__) +-#include <net/if_ether.h> + #endif + #include <net/if_dl.h> + #include <netinet/in_var.h> +@@ -1528,7 +1527,8 @@ static short getSubnet(JNIEnv *env, int @@ -22,7 +38,7 @@ Zones support. /** * Solaris specific DLPI code to get hardware address from a device. -@@ -1542,11 +1544,18 @@ static int getMacFromDevice(JNIEnv *env, +@@ -1545,11 +1545,18 @@ static int getMacFromDevice(JNIEnv *env, int flags = 0; /** |