openSUSE Commits
Threads by month
- ----- 2025 -----
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2012
- 1 participants
- 1367 discussions
Hello community,
here is the log from the commit of package patchinfo.1035 for openSUSE:11.4:Update checked in at 2012-10-31 16:15:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:11.4:Update/patchinfo.1035 (Old)
and /work/SRC/openSUSE:11.4:Update/.patchinfo.1035.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patchinfo.1035", Maintainer is ""
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
_patchinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _patchinfo ++++++
<patchinfo incident="1035">
<packager>mvyskocil</packager>
<issue tracker="bnc" id="785433">VUL-0: java-1_6_0-openjdk: multiple vulnerabilites (tracker bug)</issue>
<category>security</category>
<rating>important</rating>
<summary>java-1_6_0-openjdk: update to 1.11.5</summary>
<description>java 1.6.0 openjdk / icedtea was updated to 1.11.5 (bnc#785433)
* Security fixes
- S6631398, CVE-2012-3216: FilePermission improved path checking
- S7093490: adjust package access in rmiregistry
- S7143535, CVE-2012-5068: ScriptEngine corrected permissions
- S7167656, CVE-2012-5077: Multiple Seeders are being created
- S7169884, CVE-2012-5073: LogManager checks do not work correctly for sub-types
- S7169888, CVE-2012-5075: Narrowing resource definitions in JMX RMI connector
- S7172522, CVE-2012-5072: Improve DomainCombiner checking
- S7186286, CVE-2012-5081: TLS implementation to better adhere to RFC
- S7189103, CVE-2012-5069: Executors needs to maintain state
- S7189490: More improvements to DomainCombiner checking
- S7189567, CVE-2012-5085: java net obselete protocol
- S7192975, CVE-2012-5071: Conditional usage check is wrong
- S7195194, CVE-2012-5084: Better data validation for Swing
- S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved
- S7195919, CVE-2012-5079: (sl) ServiceLoader can throw CCE without needing to create instance
- S7198296, CVE-2012-5089: Refactor classloader usage
- S7158800: Improve storage of symbol tables
- S7158801: Improve VM CompileOnly option
- S7158804: Improve config file parsing
- S7176337: Additional changes needed for 7158801 fix
- S7198606, CVE-2012-4416: Improve VM optimization
* Backports
- S7175845: "jar uf" changes file permissions unexpectedly
- S7177216: native2ascii changes file permissions of input file
- S7199153: TEST_BUG: try-with-resources syntax pushed to 6-open repo
* Bug fixes
- PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default</description>
<issue tracker="cve" id="CVE-2012-3216"/><issue tracker="cve" id="CVE-2012-4416"/><issue tracker="cve" id="CVE-2012-5068"/><issue tracker="cve" id="CVE-2012-5069"/><issue tracker="cve" id="CVE-2012-5071"/><issue tracker="cve" id="CVE-2012-5072"/><issue tracker="cve" id="CVE-2012-5073"/><issue tracker="cve" id="CVE-2012-5075"/><issue tracker="cve" id="CVE-2012-5077"/><issue tracker="cve" id="CVE-2012-5079"/><issue tracker="cve" id="CVE-2012-5081"/><issue tracker="cve" id="CVE-2012-5084"/><issue tracker="cve" id="CVE-2012-5085"/><issue tracker="cve" id="CVE-2012-5086"/><issue tracker="cve" id="CVE-2012-5089"/></patchinfo>--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package java-1_6_0-openjdk for openSUSE:11.4:Update checked in at 2012-10-31 16:15:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:11.4:Update/java-1_6_0-openjdk (Old)
and /work/SRC/openSUSE:11.4:Update/.java-1_6_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_6_0-openjdk", Maintainer is "bnc-team-java(a)forge.provo.novell.com"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.dbQWMc/_old 2012-10-31 16:15:39.000000000 +0100
+++ /var/tmp/diff_new_pack.dbQWMc/_new 2012-10-31 16:15:39.000000000 +0100
@@ -1 +1 @@
-<link package='java-1_6_0-openjdk.846' cicount='copy' />
+<link package='java-1_6_0-openjdk.1035' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0

31 Oct '12
Hello community,
here is the log from the commit of package java-1_6_0-openjdk.1035 for openSUSE:11.4:Update checked in at 2012-10-31 16:15:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:11.4:Update/java-1_6_0-openjdk.1035 (Old)
and /work/SRC/openSUSE:11.4:Update/.java-1_6_0-openjdk.1035.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_6_0-openjdk.1035", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2012-10-22 00:44:18.403455820 +0200
+++ /work/SRC/openSUSE:11.4:Update/.java-1_6_0-openjdk.1035.new/java-1_6_0-openjdk.changes 2012-10-31 16:15:35.000000000 +0100
@@ -0,0 +1,899 @@
+-------------------------------------------------------------------
+Fri Oct 19 09:40:07 UTC 2012 - mvyskocil(a)suse.com
+
+- update to 1.11.5 (bnc#785433)
+* Security fixes
+ - S6631398, CVE-2012-3216: FilePermission improved path checking
+ - S7093490: adjust package access in rmiregistry
+ - S7143535, CVE-2012-5068: ScriptEngine corrected permissions
+ - S7167656, CVE-2012-5077: Multiple Seeders are being created
+ - S7169884, CVE-2012-5073: LogManager checks do not work correctly for sub-types
+ - S7169888, CVE-2012-5075: Narrowing resource definitions in JMX RMI connector
+ - S7172522, CVE-2012-5072: Improve DomainCombiner checking
+ - S7186286, CVE-2012-5081: TLS implementation to better adhere to RFC
+ - S7189103, CVE-2012-5069: Executors needs to maintain state
+ - S7189490: More improvements to DomainCombiner checking
+ - S7189567, CVE-2012-5085: java net obselete protocol
+ - S7192975, CVE-2012-5071: Conditional usage check is wrong
+ - S7195194, CVE-2012-5084: Better data validation for Swing
+ - S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved
+ - S7195919, CVE-2012-5079: (sl) ServiceLoader can throw CCE without needing to create instance
+ - S7198296, CVE-2012-5089: Refactor classloader usage
+ - S7158800: Improve storage of symbol tables
+ - S7158801: Improve VM CompileOnly option
+ - S7158804: Improve config file parsing
+ - S7176337: Additional changes needed for 7158801 fix
+ - S7198606, CVE-2012-4416: Improve VM optimization
+* Backports
+ - S7175845: "jar uf" changes file permissions unexpectedly
+ - S7177216: native2ascii changes file permissions of input file
+ - S7199153: TEST_BUG: try-with-resources syntax pushed to 6-open repo
+* Bug fixes
+ - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default
+
+-------------------------------------------------------------------
+Mon Sep 3 11:59:29 UTC 2012 - mvyskocil(a)suse.cz
+
+- update to 1.11.4 (bnc#777499)
+* Security fixes
+ - S7162476, CVE-2012-1682: XMLDecoder security issue via ClassFinder
+ - S7163201, CVE-2012-0547: Simplify toolkit internals references
+* OpenJDK
+ - S7182135: Impossible to use some editors directly
+ - S7185678: java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java failed with NPE
+
+-------------------------------------------------------------------
+Mon Aug 20 08:56:23 UTC 2012 - meissner(a)suse.com
+
+- fixed gnome-java-bridge.jar file permissions. bnc#770040
+
+-------------------------------------------------------------------
+Thu Jun 14 11:04:42 UTC 2012 - mvyskocil(a)suse.cz
+
+- update to 1.11.3 (bnc#766802)
+* Security fixes
+ - S7079902, CVE-2012-1711: Refine CORBA data models
+ - S7110720: Issue with vm config file loadingIssue with vm config file loading
+ - S7143606, CVE-2012-1717: File.createTempFile should be improved for temporary files created by the platform.
+ - S7143614, CVE-2012-1716: SynthLookAndFeel stability improvement
+ - S7143617, CVE-2012-1713: Improve fontmanager layout lookup operations
+ - S7143851, CVE-2012-1719: Improve IIOP stub and tie generation in RMIC
+ - S7143872, CVE-2012-1718: Improve certificate extension processing
+ - S7145239: Finetune package definition restriction
+ - S7152811, CVE-2012-1723: Issues in client compiler
+ - S7157609, CVE-2012-1724: Issues with loop
+ - S7160677: missing else in fix for 7152811
+ - S7160757, CVE-2012-1725: Problem with hotspot/runtime_classfile
+* Bug fixes
+ - PR1018: JVM fails due to SEGV during rendering some Unicode characters (part of 6886358)
+ - RH789154: javac error messages no longer contain the full path to the offending file:
+ - PR797: Compiler error message does not display entire file name and path
+ - PR881: Sign tests (wsse.policy.basic) failures with OpenJDK6
+ - PR886: 6-1.11.1 fails to build CACAO on ppc
+ - Specify both source and target in IT_GET_DTDTYPE_CHECK.
+ - Install nss.cfg into j2re-image too.
+ - PR584: Don't use shared Eden in incremental mode.
+* Backports
+ - S6792400: Avoid loading of Normalizer resources for simple uses
+- use versioned desktop files to avoid fileconflict with openjdk7
+- add openjdk-6-src-b24-zero-increase-stack-size.patch by Dinar Valeev
+- add xorg-x11 BuildRequires to have xprop (by reddwarf an opensuse)
+- license update: GPL-2.0-with-classpath-exception (by cfarrell)
+
+-------------------------------------------------------------------
+Thu Feb 16 13:42:09 UTC 2012 - mvyskocil(a)suse.cz
+
+- update to 1.11.1 (bnc#747208)
+* Security fixes
+ - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+ - S7088367, CVE-2011-3563: Fix issues in java sound
+ - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+ - S7110687, CVE-2012-0503: Issues with TimeZone class
+ - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in ObjectStreamClass
+ - S7110704, CVE-2012-0506: Issues with some method in corba
+ - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+ - S7118283, CVE-2012-0501: Better input parameter checking in zip file processing
+ - S7126960, CVE-2011-5035: (httpserver) Add property to limit number of request headers to the HTTP Server
+* Bug fixes
+ - PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
+* openSUSE fixes
+- apply ppc patch also on s390/s390x (thanks rudi)
+- add a 3 more void-return fixes to ppc patch (thanks rudi)
+- adjusted patch110 to fix ppc build. (thanks marcus)
+- there is no architecture called arm, so use macro instead
+- fix a stuff needed for gjc-based build
+ * change compiler flags in configure to gjc compatible
+ * added no-werror patch for openjdk-ecj
+ * avoid all aditional checking packages in this mode
+ * temporary remove memory size increase
+ * exclude patch110 in this case - TBD later
+- definitelly drop noarch feature as it never worked well
+- add arm to 32bit architectures
+- remove rhino as a runtime dependency, as it's repackaged and
+ installed in the jvm's tree
+- enable build --with-parallel-jobs
+- add automake as buildrequire to avoid implicit dependency (thanks coolo)
+
+-------------------------------------------------------------------
+Mon Oct 24 07:45:45 UTC 2011 - mvyskocil(a)suse.cz
+
+- update to 1.10.4 (bnc#725167)
+- Security fixes
+ * S7000600, CVE-2011-3547: InputStream skip() information leak
+ * S7019773, CVE-2011-3548: mutable static AWTKeyStroke.ctor
+ * S7023640, CVE-2011-3551: Java2D TransformHelper integer overflow
+ * S7032417, CVE-2011-3552: excessive default UDP socket limit under SecurityManager
+ * S7046794, CVE-2011-3553: JAX-WS stack-traces information leak
+ * S7046823, CVE-2011-3544: missing SecurityManager checks in scripting engine
+ * S7055902, CVE-2011-3521: IIOP deserialization code execution
+ * S7057857, CVE-2011-3554: insufficient pack200 JAR files uncompress error checks
+ * S7064341, CVE-2011-3389: HTTPS: block-wise chosen-plaintext attack against SSL/TLS (BEAST)
+ * S7070134, CVE-2011-3558: HotSpot crashes with sigsegv from PorterStemmer
+ * S7077466, CVE-2011-3556: RMI DGC server remote code execution
+ * S7083012, CVE-2011-3557: RMI registry privileged code execution
+ * S7096936, CVE-2011-3560: missing checkSetFactory calls in HttpsURLConnection
+- Bug fixes
+ - RH727195: Japanese font mappings are broken
+- Backports
+ - S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog
+
+-------------------------------------------------------------------
+Thu Aug 4 08:46:55 UTC 2011 - mvyskocil(a)suse.cz
+
+- update to 1.10.3
+- Bug fixes
+ * PR748: Icedtea6 fails to build with Linux 3.0.
+ * PR744: icedtea6-1.10.2 : patching error
+- Backports:
+ * S7037283, RH712211: Null Pointer Exception in SwingUtilities2.
+ * S6769607, PR677: Modal frame hangs for a while.
+ * S6578583: Modality is broken in windows vista home premium from jdk1.7 b02 onwards.
+ * S6610244: modal dialog closes with fatal error if -Xcheck:jni is set
+- don't touch java and javac alternatives anymore
+
+-------------------------------------------------------------------
+Tue Jun 14 09:23:00 UTC 2011 - mvyskocil(a)suse.cz
+
+- fix build on 11.1/i586 distros
+ * add icedtea6-replace-gcc-stack-marking.patch
+
+-------------------------------------------------------------------
+Thu Jun 9 11:24:10 UTC 2011 - mvyskocil(a)suse.cz
+
+- fix bnc#698739: icedtea6-1.10.2 released
+- update to openjdk b22, hotspot 20b11
+ see following links for more details
+ http://blog.fuseyism.com/index.php/2011/04/04/icedtea6-1101-released/
+ http://blog.fuseyism.com/index.php/2011/03/02/icedtea6-110-released/
+- Security fixes
+ * S6213702, CVE-2011-0872: (so) non-blocking sockets with TCP urgent disabled get still selected for read ops (win)
+ * S6618658, CVE-2011-0865: Vulnerability in deserialization
+ * S7012520, CVE-2011-0815: Heap overflow vulnerability in FileDialog.show()
+ * S7013519, CVE-2011-0822, CVE-2011-0862: Integer overflows in 2D code
+ * S7013969, CVE-2011-0867: NetworkInterface.toString can reveal bindings
+ * S7013971, CVE-2011-0869: Vulnerability in SAAJ
+ * S7016340, CVE-2011-0870: Vulnerability in SAAJ
+ * S7016495, CVE-2011-0868: Crash in Java 2D transforming an image with scale close to zero
+ * S7020198, CVE-2011-0871: ImageIcon creates Component with null acc
+ * S7020373, CVE-2011-0864: JSR rewriting can overflow memory address size variables
+- Backports
+ * S7023591, S7027667: Clipped antialiased rectangles are filled, not drawn.
+ Add missing privileged block around access to the sun.awt.nativedebug
+ property.
+ * S7032388, PR682: Make HotSpot work on machines without cmov instruction again
+ * S7031385, PR680: Incorrect register allocation in orderAccess_linux_x86.inline.hpp
+ * S7043054: REGRESSION - wrong userBounds in Paint.createContext()
+ * S7043963, RH698295: Window manager workaround in AWT was not applied to mutter. Now it is.
+Bug fixes:
+ * G356743: Support libpng 1.5.
+ * RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
+ * PR600: HS19 upgrade broke CACAO build on ARM
+ * PR616, PR99: Don’t statically link libstdc++ or libgcc
+ * PR632: patches/security/20110215/6878713.patch breaks shark zero build
+ * PR103: Usage of native2ascii during bootstrap
+ * PR633: IcedTea installs javaws manpages on x86 even with –disable-webstart
+ * PR635: zero fails to build on icedtea6 trunk 20110217 with hs20
+ * PR586: Sources missing from src.zip
+ * PR639: Add missing include line, paths and LLVM flags for Shark.
++++ 702 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:11.4:Update/.java-1_6_0-openjdk.1035.new/java-1_6_0-openjdk.changes
New:
----
check-build.sh
fontconfig.SuSE.properties
generate-fedora-zip.sh
icedtea6-1.10.2-bouncycastle-provider-support.patch
icedtea6-1.11.5.tar.gz
icedtea6-1.11.5.tar.gz.sig
java-1.6.0-openjdk-accessible-toolkit.patch
java-1.6.0-openjdk-java-access-bridge-idlj.patch
java-1.6.0-openjdk-java-access-bridge-security.patch
java-1.6.0-openjdk-java-access-bridge-tck.patch
java-1.6.0-openjdk-optflags.patch
java-1_6_0-openjdk-rpmlintrc
java-1_6_0-openjdk-suse-desktop-files.patch
java-1_6_0-openjdk.changes
java-1_6_0-openjdk.spec
java-access-bridge-1.23.0.tar.bz2
jaxp144_03.zip
jdk6-jaf-b20.zip
jdk6-jaxws2_1_6-2011_06_13.zip
mauve-2008-10-22.tar.bz2
mauve_tests
openjdk-6-src-b09-gcc4-warningfixes.patch
openjdk-6-src-b14-no-return-in-nonvoid-function-ix86.patch
openjdk-6-src-b14-no-return-in-nonvoid-function.patch
openjdk-6-src-b14-undefined-operation.patch
openjdk-6-src-b17-no-efect.patch
openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch
openjdk-6-src-b20-array-subscript-has-type-char.patch
openjdk-6-src-b20-defined-but-not-used.patch
openjdk-6-src-b20-gcj-workaround.patch
openjdk-6-src-b20-initialized-after.patch
openjdk-6-src-b20-may-be-used-uninitialized.patch
openjdk-6-src-b20-no-multiline-comments.patch
openjdk-6-src-b20-no-werror.patch
openjdk-6-src-b20-stringcompare.patch
openjdk-6-src-b20-suggest-parentheses.patch
openjdk-6-src-b20-unused-variable.patch
openjdk-6-src-b24-14_nov_2011-fedora.tar.gz
openjdk-6-src-b24-zero-increase-stack-size.patch
openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch
openjdk-ecj-6-src-b22-no-werror.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_6_0-openjdk.spec ++++++
++++ 1125 lines (skipped)
++++++ check-build.sh ++++++
#!/bin/bash
# The JVM needs LOTS of virtual memory when compiling the big stuff:
if [ `ulimit -v` -le 2048000 ] ; then
echo "build does not work on `hostname`: not enough memory"
exit 1
fi
exit 0
++++++ fontconfig.SuSE.properties ++++++
#
# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Sun designates this
# particular file as subject to the "Classpath" exception as provided
# by Sun in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
# have any questions.
#
# Uses SUSE 10.2 fonts and file paths.
version=1
# Component Font Mappings
dialog.plain.latin-1=DejaVu Sans
dialog.plain.japanese-x0208=Sazanami Gothic
dialog.plain.korean=UnDotum
dialog.bold.latin-1=DejaVu Sans Bold
dialog.bold.japanese-x0208=Sazanami Gothic
dialog.bold.korean=UnDotum Bold
dialog.italic.latin-1=DejaVu Sans Oblique
dialog.italic.japanese-x0208=Sazanami Gothic
dialog.italic.korean=UnDotum
dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
dialog.bolditalic.japanese-x0208=Sazanami Gothic
dialog.bolditalic.korean=UnDotum Bold
sansserif.plain.latin-1=DejaVu Sans
sansserif.plain.japanese-x0208=Sazanami Gothic
sansserif.plain.korean=UnDotum
sansserif.bold.latin-1=DejaVu Sans Bold
sansserif.bold.japanese-x0208=Sazanami Gothic
sansserif.bold.korean=UnDotum Bold
sansserif.italic.latin-1=DejaVu Sans Oblique
sansserif.italic.japanese-x0208=Sazanami Gothic
sansserif.italic.korean=UnDotum
sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
sansserif.bolditalic.japanese-x0208=Sazanami Gothic
sansserif.bolditalic.korean=UnDotum Bold
serif.plain.latin-1=DejaVu Serif
serif.plain.japanese-x0208=Sazanami Mincho
serif.plain.korean=UnBatang
serif.bold.latin-1=DejaVu Serif Bold
serif.bold.japanese-x0208=Sazanami Mincho
serif.bold.korean=UnBatang Bold
serif.italic.latin-1=DejaVu Serif Oblique
serif.italic.japanese-x0208=Sazanami Mincho
serif.italic.korean=UnBatang
serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
serif.bolditalic.japanese-x0208=Sazanami Mincho
serif.bolditalic.korean=UnBatang Bold
monospaced.plain.latin-1=DejaVu Sans Mono
monospaced.plain.japanese-x0208=Sazanami Mincho
monospaced.plain.korean=UnDotum
monospaced.bold.latin-1=DejaVu Sans Mono Bold
monospaced.bold.japanese-x0208=Sazanami Mincho
monospaced.bold.korean=UnDotum Bold
monospaced.italic.latin-1=DejaVu Sans Mono Oblique
monospaced.italic.japanese-x0208=Sazanami Mincho
monospaced.italic.korean=UnDotum
monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
monospaced.bolditalic.japanese-x0208=Sazanami Mincho
monospaced.bolditalic.korean=UnDotum Bold
dialoginput.plain.latin-1=DejaVu Sans Mono
dialoginput.plain.japanese-x0208=Sazanami Gothic
dialoginput.plain.korean=UnDotum
dialoginput.bold.latin-1=DejaVu Sans Mono Bold
dialoginput.bold.japanese-x0208=Sazanami Gothic
dialoginput.bold.korean=UnDotum Bold
dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
dialoginput.italic.japanese-x0208=Sazanami Gothic
dialoginput.italic.korean=UnDotum
dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
dialoginput.bolditalic.korean=UnDotum Bold
allfonts.chinese-big5=AR PL Mingti2L Big5
allfonts.chinese-gb18030=AR PL SungtiL GB
# Search Sequences
sequence.allfonts=latin-1
sequence.allfonts.Big5=chinese-big5,latin-1
sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1
sequence.allfonts.EUC-KR=korean,latin-1
sequence.allfonts.GB18030=chinese-gb18030,latin-1
sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean
# Font File Names
filename.DejaVu_Sans=/usr/share/fonts/truetype/DejaVuSans.ttf
filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/DejaVuSans-Bold.ttf
filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/DejaVuSans-Oblique.ttf
filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/DejaVuSansMono.ttf
filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/DejaVuSansMono-Bold.ttf
filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Serif=/usr/share/fonts/truetype/DejaVuSerif.ttf
filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/DejaVuSerif-Bold.ttf
filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/DejaVuSerif-Italic.ttf
filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSerif-BoldItalic.ttf
filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami-gothic.ttf
filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami-mincho.ttf
filename.AR_PL_SungtiL_GB=/usr/share/fonts/truetype/gbsn00lp.ttf
filename.AR_PL_Mingti2L_Big5=/usr/share/fonts/truetype/bsmi00lp.ttf
filename.UnDotum=/usr/share/fonts/truetype/UnDotum.ttf
filename.UnDotum_Bold=/usr/share/fonts/truetype/UnDotumBold.ttf
filename.UnBatang=/usr/share/fonts/truetype/UnBatang.ttf
filename.UnBatang_Bold=/usr/share/fonts/truetype/UnBatangBold.ttf
# AWT X11 font paths
awtfontpath.japanese-x0201=/usr/share/fonts/truetype
awtfontpath.japanese-x0208=/usr/share/fonts/truetype
awtfontpath.japanese-iso10646-1=/usr/share/fonts/truetype
awtfontpath.korean=/usr/share/fonts/truetype
awtfontpath.latin-1=/usr/share/fonts/truetype
++++++ generate-fedora-zip.sh ++++++
#!/bin/sh
# Untar openjdk source tarball.
mkdir openjdk
tar xzf $1 -C openjdk
# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
# PR146/S6713083
# Remove binaries
rm -f \
openjdk/jdk/test/sun/management/windows/revokeall.exe \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
rm -f \
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
rm -f \
openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
# Remove test sources with questionable license headers.
rm -f \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
openjdk/jdk/test/java/util/Locale/LocaleTest.java \
openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
# Remove J2DBench sources, some of which have questionable license
# headers.
rm -rf \
openjdk/jdk/src/share/demo/java2d/J2DBench
# Create new tarball with new name.
pushd openjdk > /dev/null
tar czf ../$(basename $1 .tar.gz)-fedora.tar.gz *
popd > /dev/null
# Remove old unzipped openjdk dir.
rm -rf openjdk
++++++ icedtea6-1.10.2-bouncycastle-provider-support.patch ++++++
Index: icedtea6-1.10.2/openjdk/jdk/src/share/lib/security/java.security
===================================================================
--- icedtea6-1.10.2.orig/openjdk/jdk/src/share/lib/security/java.security
+++ icedtea6-1.10.2/openjdk/jdk/src/share/lib/security/java.security
@@ -52,6 +52,9 @@ security.provider.6=com.sun.security.sas
security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
security.provider.8=sun.security.smartcardio.SunPCSC
security.provider.9=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
+# bouncycastle.org API support
+# will be enabled after installation of bouncycastle.rpm
+#security.provider.10=org.bouncycastle.jce.provider.BouncyCastleProvider
#
# Select the source of seed data for SecureRandom. By default an
++++++ java-1.6.0-openjdk-accessible-toolkit.patch ++++++
diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java openjdk/jdk/src/share/classes/java/awt/Toolkit.java
--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
+++ openjdk/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
@@ -871,7 +871,11 @@
return null;
}
});
- loadAssistiveTechnologies();
+ try {
+ loadAssistiveTechnologies();
+ } catch ( AWTError error) {
+ // ignore silently
+ }
} finally {
// Make sure to always re-enable the JIT.
java.lang.Compiler.enable();
++++++ java-1.6.0-openjdk-java-access-bridge-idlj.patch ++++++
--- oldjava-access-bridge-1.23.0/idlgen/Makefile.am 2008-06-03 02:47:29.000000000 -0400
+++ java-access-bridge-1.23.0/idlgen/Makefile.am 2008-07-31 15:13:26.000000000 -0400
@@ -3,7 +3,7 @@
JARFILES=../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
CLASSES=$(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class)
JAR=jar
-IDLJ_FLAGS=-emitAll $(IDLJ_IDLDIRS)
+IDLJ_FLAGS=-J-client -emitAll $(IDLJ_IDLDIRS)
BONOBO_ACT_IDLFILES=$(wildcard $(BONOBO_ACT_IDLDIR)/*.idl)
BONOBO_IDLFILES=$(wildcard $(BONOBO_IDLDIR)/*.idl)
--- oldjava-access-bridge-1.23.0/idlgen/Makefile.in 2008-06-23 23:34:59.000000000 -0400
+++ java-access-bridge-1.23.0/idlgen/Makefile.in 2008-07-31 15:13:45.000000000 -0400
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -140,7 +140,7 @@
SUBDIRS = org
JARFILES = ../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
CLASSES = $(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class)
-IDLJ_FLAGS = -emitAll $(IDLJ_IDLDIRS)
+IDLJ_FLAGS = -J-client -emitAll $(IDLJ_IDLDIRS)
BONOBO_ACT_IDLFILES = $(wildcard $(BONOBO_ACT_IDLDIR)/*.idl)
BONOBO_IDLFILES = $(wildcard $(BONOBO_IDLDIR)/*.idl)
AT_SPI_IDLFILES = $(wildcard $(AT_SPI_IDLDIR)/*.idl)
@@ -253,8 +253,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -279,8 +279,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -290,13 +290,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
++++++ java-1.6.0-openjdk-java-access-bridge-security.patch ++++++
--- openjdk/jdk/src/share/lib/security/java.security-src
+++ openjdk/jdk/src/share/lib/security/java.security
@@ -131,7 +131,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
#
# List of comma-separated packages that start with or equal this string
@@ -143,7 +143,7 @@
# by default, none of the class loaders supplied with the JDK call
# checkPackageDefinition.
#
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.
+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
#
# Determines whether this properties file can be appended to
++++++ java-1.6.0-openjdk-java-access-bridge-tck.patch ++++++
--- java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java.orig 2008-05-22 11:27:00.000000000 -0400
+++ java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java 2008-05-22 11:28:02.000000000 -0400
@@ -34,6 +34,9 @@
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleText;
import javax.accessibility.AccessibleEditableText;
+import java.security.PrivilegedAction;
+import java.security.AccessController;
+
public class JavaBridge {
@@ -332,7 +335,11 @@
System.err.println ("Java Accessibility Bridge for GNOME loaded.\n");
// Not sure what kind of arguments should be sent to ORB
- String vm_rev = System.getProperty("java.version");
+ String vm_rev = (String) AccessController.doPrivileged(new PrivilegedAction() {
+ public java.lang.Object run() {
+ return System.getProperty("java.version");
+ }
+ });
if (vm_rev.compareTo("1.4.0") < 0) {
System.err.println("WARNING: Java Accessibility Bridge " +
++++++ java-1.6.0-openjdk-optflags.patch ++++++
--- configure.ac 2011-03-02 19:34:58.692136324 +0100
+++ configure.ac 2011-03-25 14:56:40.798290097 +0100
@@ -18,6 +18,9 @@
AC_PROG_CC
AC_PROG_CXX
+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
+AC_SUBST(ALT_OPT_CFLAGS)
+
IT_FIND_TOOL([MAKE], [make])
IT_FIND_TOOL([GZIP], [gzip])
IT_FIND_TOOL([ANT], [ant])
++++++ java-1_6_0-openjdk-rpmlintrc ++++++
# This is correct, the devel means a Java compiler
addFilter("devel-dependency java-1_6_0-openjdk-devel")
# those patches are applied in %build phase after unpacking of openjdk
# this is a false positive
addFilter("patch-not-applied Patch1")
addFilter("patch-not-applied Patch2")
addFilter("patch-not-applied Patch3")
addFilter("patch-not-applied Patch4")
addFilter("patch-not-applied Patch104")
addFilter("patch-not-applied Patch105")
addFilter("patch-not-applied Patch106")
addFilter("patch-not-applied Patch107")
addFilter("patch-not-applied Patch108")
addFilter("patch-not-applied Patch109")
# no need to fix this warning in demo package
addFilter("shared-lib-calls-exit .*demo")
# those files are intended to be modified
addFilter("non-etc-or-var-file-marked-as-conffile .*/security.*")
# in most of the cases it does not make any sense
# and openjdk spec is big, ugly and full of comments help me
# with merging with fc specs ;-)
addFilter("macro-in-comment")
# This is indented - bnc#530046
addFilter("unstripped-binary-or-object .*libjvm.so")
++++++ java-1_6_0-openjdk-suse-desktop-files.patch ++++++
Index: icedtea6-1.11.1/jconsole.desktop.in
===================================================================
--- icedtea6-1.11.1.orig/jconsole.desktop.in
+++ icedtea6-1.11.1/jconsole.desktop.in
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Monitoring & Management Console
+GenericName=OpenJDK Monitoring & Management Console
Comment=Monitor and manage OpenJDK applications
Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
+Categories=Development;Profiling;
Version=1.0
Index: icedtea6-1.11.1/policytool.desktop.in
===================================================================
--- icedtea6-1.11.1.orig/policytool.desktop.in
+++ icedtea6-1.11.1/policytool.desktop.in
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Policy Tool
+GenericName=OpenJDK Policy Tool
Comment=Manage OpenJDK policy files
Exec=@ABS_JAVA_HOME_DIR@/bin/policytool
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
+Categories=Utility;Security;
Version=1.0
++++++ mauve_tests ++++++
++++ 2571 lines (skipped)
++++++ openjdk-6-src-b09-gcc4-warningfixes.patch ++++++
--- openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2008/02/05
+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2008/02/05
@@ -566,23 +566,23 @@
if (!JNU_IsNull(env, fontDescriptorName)) {
nativename = (char *) JNU_GetStringPlatformChars(env, fontDescriptorName, NULL);
} else {
nativename = "";
}
fdata->flist[i].xlfd = malloc(strlen(nativename)
+ strlen(defaultXLFD));
jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
nativename, size * 10);
- if (nativename != NULL && nativename != "")
+ if (*nativename)
JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
/*
* set charset_name
*/
charsetName =
(*env)->GetObjectField(env, fontDescriptor,
fontDescriptorIDs.charsetName);
fdata->flist[i].charset_name = (char *)
--- openjdk/jdk/src/solaris/bin/jexec.c 2008/05/09 07:38:55 1.1
+++ openjdk/jdk/src/solaris/bin/jexec.c 2008/05/09 07:40:14
@@ -221,6 +221,7 @@
* implies an error in the exec. */
free(nargv);
errorExit(errno, BAD_EXEC_MSG);
+ return 0; // make gcc happy
}
++++++ openjdk-6-src-b14-no-return-in-nonvoid-function-ix86.patch ++++++
--- ./openjdk/hotspot/src/cpu/x86/vm/x86_32.ad 2008-11-22 00:11:18.000000000 +0000
+++ ./openjdk/hotspot/src/cpu/x86/vm/x86_32.ad.new 2009-01-19 10:06:47.376623479 +0000
@@ -1061,6 +1061,7 @@
Unimplemented();
+ return NULL;
}
#ifndef PRODUCT
++++++ openjdk-6-src-b14-no-return-in-nonvoid-function.patch ++++++
--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-01-14 09:26:13.088856122 +0000
+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-01-14 09:46:41.132855902 +0000
@@ -142,6 +142,7 @@
#endif /* MITSHM */
#endif /* !HEADLESS */
+ return JNI_TRUE;
}
@@ -464,6 +465,7 @@
return JNI_TRUE;
#endif /* !HEADLESS */
+ return JNI_TRUE;
}
--- ./openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2008-11-22 00:11:18.000000000 +0000
+++ ./openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp.new 2009-01-14 10:59:57.400855524 +0000
@@ -493,6 +493,7 @@
err.report_and_die();
ShouldNotReachHere();
+ return 0;
}
void os::Linux::init_thread_fpu_state(void) {
--- ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp 2008-11-22 00:11:18.000000000 +0000
+++ ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp.new 2009-01-14 11:00:56.052855681 +0000
@@ -594,6 +594,7 @@
err.report_and_die();
ShouldNotReachHere();
+ return 0;
}
void os::Linux::init_thread_fpu_state(void) {
--- ./openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2009-01-13 08:46:35.000000000 +0000
+++ ./openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.new 2009-01-14 11:02:21.805690939 +0000
@@ -221,6 +221,7 @@
sprintf(buf, fmt, sig);
fatal(buf);
+ return 0;
}
void os::Linux::init_thread_fpu_state(void)
--- ./contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp 2009-01-13 08:46:27.000000000 +0000
+++ ./contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp.new 2009-01-14 11:02:40.288925505 +0000
@@ -154,6 +154,7 @@
sprintf(buf, fmt, sig);
fatal(buf);
+ return 0;
}
void os::Linux::init_thread_fpu_state(void)
++++++ openjdk-6-src-b14-undefined-operation.patch ++++++
--- ./openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp 2008-11-22 00:11:18.000000000 +0000
+++ ./openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp.new 2009-01-19 07:38:31.832949048 +0000
@@ -1937,7 +1937,7 @@
off.load_item();
src.load_item();
- LIR_Opr reg = reg = rlock_result(x, x->basic_type());
+ LIR_Opr reg = rlock_result(x, x->basic_type());
if (x->is_volatile() && os::is_MP()) __ membar_acquire();
get_Object_unsafe(reg, src.result(), off.result(), type, x->is_volatile());
++++++ openjdk-6-src-b17-no-efect.patch ++++++
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
@@ -344,8 +344,9 @@ inline bool is_object_aligned(intptr_t o
//----------------------------------------------------------------------------------------------------
// Utility macros for compilers
// used to silence compiler warnings
+// suppress also statement has no effect
-#define Unused_Variable(var) var
+#define Unused_Variable(var) (var) = (var)
//----------------------------------------------------------------------------------------------------
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp
@@ -42,7 +42,7 @@ class typeArrayKlass : public arrayKlass
static klassOop create_klass(BasicType type, int scale, const char* name_str,
TRAPS);
static inline klassOop create_klass(BasicType type, int scale, TRAPS) {
- return create_klass(type, scale, external_name(type), CHECK_NULL);
+ return create_klass(type, scale, external_name(type), THREAD); CHECK2_(NULL);
}
int oop_size(oop obj) const;
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/exceptions.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/utilities/exceptions.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/exceptions.hpp
@@ -178,6 +178,8 @@ class Exceptions {
#define CHECK THREAD); if (HAS_PENDING_EXCEPTION) return ; (0
#define CHECK_(result) THREAD); if (HAS_PENDING_EXCEPTION) return result; (0
+//MV: same as a CHECK_(result), but for usage outside of func call, so it not have no effect statement (0)
+#define CHECK2_(result) if (HAS_PENDING_EXCEPTION) return result
#define CHECK_0 CHECK_(0)
#define CHECK_NH CHECK_(Handle())
#define CHECK_NULL CHECK_(NULL)
++++++ openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch ++++++
unchanged:
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
@@ -935,6 +935,7 @@ void BytecodeInterpreter::layout_interpr
address CppInterpreter::return_entry(TosState state, int length) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address CppInterpreter::deopt_entry(TosState state, int length) {
@@ -955,6 +956,7 @@ bool CppInterpreter::contains(address pc
#else
return false; // make frame::print_value_on work
#endif // !PRODUCT
+ return false; //make gcc happy
}
// Result handlers and convertors
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp
@@ -88,6 +88,7 @@ void frame::patch_pc(Thread* thread, add
bool frame::safe_for_sender(JavaThread *thread) {
ShouldNotCallThis();
+ return false; // make gcc happy
}
void frame::pd_gc_epilog() {
@@ -95,6 +96,7 @@ void frame::pd_gc_epilog() {
bool frame::is_interpreted_frame_valid(JavaThread *thread) const {
ShouldNotCallThis();
+ return false; // make gcc happy
}
BasicType frame::interpreter_frame_result(oop* oop_result,
@@ -159,6 +161,7 @@ int frame::frame_size() const {
#else
return 0; // make javaVFrame::print_value work
#endif // PRODUCT
+ return 0; // make gcc happy
}
intptr_t* frame::interpreter_frame_tos_at(jint offset) const {
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
@@ -71,6 +71,7 @@ inline intptr_t* frame::sender_sp() cons
inline intptr_t* frame::link() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
#ifdef CC_INTERP
@@ -133,14 +134,17 @@ inline void frame::set_saved_oop_result(
inline oop frame::saved_oop_result(RegisterMap* map) const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
inline bool frame::is_older(intptr_t* id) const {
ShouldNotCallThis();
+ return false; // make gcc happy
}
inline intptr_t* frame::entry_frame_argument_at(int offset) const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
inline intptr_t* frame::unextended_sp() const {
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
@@ -41,9 +41,11 @@ void InlineCacheBuffer::assemble_ic_buff
address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
@@ -37,10 +37,12 @@ address InterpreterGenerator::generate_m
return NULL;
Unimplemented();
+ return NULL;
}
address InterpreterGenerator::generate_abstract_entry() {
return ShouldNotCallThisEntry();
+ return NULL;
}
int AbstractInterpreter::size_activation(methodOop method,
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
@@ -42,15 +42,18 @@ class NativeInstruction VALUE_OBJ_CLASS_
public:
bool is_jump() {
ShouldNotCallThis();
+ return false; // make gcc happy
}
bool is_safepoint_poll() {
ShouldNotCallThis();
+ return false; // make gcc happy
}
};
inline NativeInstruction* nativeInstruction_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeCall : public NativeInstruction {
@@ -61,18 +64,22 @@ class NativeCall : public NativeInstruct
address instruction_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address return_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address destination() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void set_destination_mt_safe(address dest) {
@@ -89,25 +96,30 @@ class NativeCall : public NativeInstruct
static bool is_call_before(address return_address) {
ShouldNotCallThis();
+ return false; // make gcc happy
}
};
inline NativeCall* nativeCall_before(address return_address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
inline NativeCall* nativeCall_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeMovConstReg : public NativeInstruction {
public:
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
intptr_t data() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void set_data(intptr_t x) {
@@ -117,12 +129,14 @@ class NativeMovConstReg : public NativeI
inline NativeMovConstReg* nativeMovConstReg_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeMovRegMem : public NativeInstruction {
public:
int offset() const {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
void set_offset(intptr_t x) {
@@ -136,6 +150,7 @@ class NativeMovRegMem : public NativeIns
inline NativeMovRegMem* nativeMovRegMem_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeJump : public NativeInstruction {
@@ -146,6 +161,7 @@ class NativeJump : public NativeInstruct
address jump_destination() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void set_jump_destination(address dest) {
@@ -163,12 +179,14 @@ class NativeJump : public NativeInstruct
inline NativeJump* nativeJump_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
class NativeGeneralJump : public NativeInstruction {
public:
address jump_destination() const {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
static void insert_unconditional(address code_pos, address entry) {
@@ -182,4 +200,5 @@ class NativeGeneralJump : public NativeI
inline NativeGeneralJump* nativeGeneralJump_at(address address) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp
@@ -32,8 +32,10 @@ const int ConcreteRegisterImpl::max_fpr
const char* RegisterImpl::name() const {
ShouldNotCallThis();
+ return ""; // make gcc happy
}
const char* FloatRegisterImpl::name() const {
ShouldNotCallThis();
+ return ""; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
@@ -32,6 +32,7 @@ void Relocation::pd_set_data_value(addre
address Relocation::pd_call_destination(address orig_addr) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
void Relocation::pd_set_call_destination(address x) {
@@ -40,6 +41,7 @@ void Relocation::pd_set_call_destination
address Relocation::pd_get_address_from_code() {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
address* Relocation::pd_address_in_code() {
@@ -49,6 +51,7 @@ address* Relocation::pd_address_in_code(
int Relocation::pd_breakpoint_size() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
void Relocation::pd_swap_in_breakpoint(address x,
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
@@ -69,6 +69,7 @@ nmethod *SharedRuntime::generate_native_
#else
ShouldNotCallThis();
#endif // SHARK
+ return NULL; // make gcc happy
}
int Deoptimization::last_frame_adjust(int callee_parameters,
@@ -78,6 +79,7 @@ int Deoptimization::last_frame_adjust(in
uint SharedRuntime::out_preserve_stack_slots() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
static RuntimeStub* generate_empty_runtime_stub(const char* name) {
@@ -112,4 +114,5 @@ int SharedRuntime::c_calling_convention(
VMRegPair *regs,
int total_args_passed) {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp
@@ -28,16 +28,20 @@
VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
VtableStub* VtableStubs::create_itable_stub(int vtable_index) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
int VtableStub::pd_code_size_limit(bool is_vtable_stub) {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
int VtableStub::pd_code_alignment() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
Index: icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -33,6 +33,7 @@ address os::current_stack_pointer() {
frame os::get_sender_for_C_frame(frame* fr) {
ShouldNotCallThis();
+ return *fr; // make gcc happy
}
frame os::current_frame() {
@@ -62,6 +63,7 @@ char* os::non_memory_address_word() {
// This is the value for x86; works pretty well for PPC too.
return (char *) -1;
#endif // SPARC
+ return (char *) -1; // make gcc happy
}
void os::initialize_thread() {
@@ -70,16 +72,19 @@ void os::initialize_thread() {
address os::Linux::ucontext_get_pc(ucontext_t* uc) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
ExtendedPC os::fetch_frame_from_context(void* ucVoid,
intptr_t** ret_sp,
intptr_t** ret_fp) {
ShouldNotCallThis();
+ return NULL; // make gcc happy
}
frame os::fetch_frame_from_context(void* ucVoid) {
ShouldNotCallThis();
+ return *(frame*)ucVoid; // make gcc happy
}
#ifdef HOTSPOT_ASM
@@ -242,6 +248,7 @@ void os::Linux::init_thread_fpu_state(vo
int os::Linux::get_fpu_control_word() {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
void os::Linux::set_fpu_control_word(int fpu) {
@@ -264,6 +271,7 @@ bool os::is_allocatable(size_t bytes) {
return addr != NULL;
#endif // _LP64
+ return false; // make gcc happy
}
///////////////////////////////////////////////////////////////////////////////
@@ -386,6 +394,7 @@ void os::print_context(outputStream* st,
extern "C" {
int SpinPause() {
+ return 0; // make gcc happy
}
int SafeFetch32(int *adr, int errValue) {
@@ -475,6 +484,7 @@ extern "C" {
long long unsigned int oldval,
long long unsigned int newval) {
ShouldNotCallThis();
+ return 0; // make gcc happy
}
};
#endif // !_LP64
Index: icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+++ icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
@@ -95,6 +95,7 @@
void* ucontext,
bool isInJava) {
ShouldNotCallThis();
+ return false;
}
// These routines are only used on cpu architectures that
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2012/01/25 13:21:54 1.1
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2012/01/25 13:22:02
@@ -28,6 +28,7 @@
int MethodHandles::adapter_conversion_ops_supported_mask() {
ShouldNotCallThis();
+ return 0;
}
void MethodHandles::generate_method_handle_stub(MacroAssembler* masm,
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2012/02/01 23:57:44 1.1
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2012/02/01 23:58:51
@@ -57,6 +57,7 @@
RegisterOrConstant MacroAssembler::delayed_value_impl(
intptr_t* delayed_value_addr, Register tmpl, int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant(tmpl);
}
void MacroAssembler::store_oop(jobject obj) {
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2012/02/01 23:59:21 1.1
+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2012/02/01 23:59:38
@@ -34,5 +34,6 @@
Register tmp,
int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant(tmp);
}
};
++++++ openjdk-6-src-b20-array-subscript-has-type-char.patch ++++++
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
@@ -287,12 +287,12 @@ int hashstr(const void *t) {
register int sum = 0;
register const char *s = (const char *)t;
- while( ((c = s[k]) != '\0') && (k < MAXID-1) ) { // Get characters till nul
+ while( ((c = s[(int)k]) != '\0') && (k < MAXID-1) ) { // Get characters till nul
c = (c<<1)+1; // Characters are always odd!
- sum += c + (c<<shft[k++]); // Universal hash function
+ sum += c + (c<<shft[(int)k++]); // Universal hash function
}
assert( k < (MAXID), "Exceeded maximum name length");
- return (int)((sum+xsum[k]) >> 1); // Hash key, un-modulo'd table size
+ return (int)((sum+xsum[(int)k]) >> 1); // Hash key, un-modulo'd table size
}
//------------------------------hashptr--------------------------------------
++++++ openjdk-6-src-b20-defined-but-not-used.patch ++++++
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
@@ -42,32 +42,6 @@ char *toUpper(const char *str) {
return result;
}
-// Utilities to characterize effect statements
-static bool is_def(int usedef) {
- switch(usedef) {
- case Component::DEF:
- case Component::USE_DEF: return true; break;
- }
- return false;
-}
-
-static bool is_use(int usedef) {
- switch(usedef) {
- case Component::USE:
- case Component::USE_DEF:
- case Component::USE_KILL: return true; break;
- }
- return false;
-}
-
-static bool is_kill(int usedef) {
- switch(usedef) {
- case Component::KILL:
- case Component::USE_KILL: return true; break;
- }
- return false;
-}
-
//---------------------------ChainList Methods-------------------------------
ChainList::ChainList() {
}
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dfa.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/dfa.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dfa.cpp
@@ -29,10 +29,6 @@
static bool debug_output = false;
static bool debug_output1 = false; // top level chain rules
-//---------------------------Access to internals of class State----------------
-static const char *sLeft = "_kids[0]";
-static const char *sRight = "_kids[1]";
-
//---------------------------DFA productions-----------------------------------
static const char *dfa_production = "DFA_PRODUCTION";
static const char *dfa_production_set_valid = "DFA_PRODUCTION__SET_VALID";
++++++ openjdk-6-src-b20-gcj-workaround.patch ++++++
Index: icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java
===================================================================
--- icedtea6-1.9.7.orig/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java
+++ icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java
@@ -1,28 +1,3 @@
-/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
package com.sun.source.tree;
/**
++++++ openjdk-6-src-b20-initialized-after.patch ++++++
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
@@ -243,19 +243,19 @@ class ReferenceProcessor : public CHeapO
// constructor
ReferenceProcessor():
_span((HeapWord*)NULL, (HeapWord*)NULL),
- _discoveredSoftRefs(NULL), _discoveredWeakRefs(NULL),
- _discoveredFinalRefs(NULL), _discoveredPhantomRefs(NULL),
_discovering_refs(false),
_discovery_is_atomic(true),
- _enqueuing_is_done(false),
_discovery_is_mt(false),
_discovered_list_needs_barrier(false),
_bs(NULL),
+ _enqueuing_is_done(false),
+ _processing_is_mt(false),
+ _next_id(0),
_is_alive_non_header(NULL),
_num_q(0),
_max_num_q(0),
- _processing_is_mt(false),
- _next_id(0)
+ _discoveredSoftRefs(NULL), _discoveredWeakRefs(NULL),
+ _discoveredFinalRefs(NULL), _discoveredPhantomRefs(NULL)
{}
ReferenceProcessor(MemRegion span, bool atomic_discovery,
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/code/dependencies.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/code/dependencies.hpp
@@ -419,15 +419,15 @@ class Dependencies: public ResourceObj {
public:
DepStream(Dependencies* deps)
- : _deps(deps),
- _code(NULL),
+ : _code(NULL),
+ _deps(deps),
_bytes(deps->content_bytes())
{
initial_asserts(deps->size_in_bytes());
}
DepStream(nmethod* code)
- : _deps(NULL),
- _code(code),
+ :_code(code),
+ _deps(NULL),
_bytes(code->dependencies_begin())
{
initial_asserts(code->dependencies_size());
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
@@ -152,7 +152,7 @@ class FilterIntoCSClosure: public OopClo
public:
FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl,
G1CollectedHeap* g1, OopClosure* oc) :
- _dcto_cl(dcto_cl), _g1(g1), _oc(oc)
+ _g1(g1), _oc(oc), _dcto_cl(dcto_cl)
{}
template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
@@ -187,7 +187,7 @@ public:
FilterAndMarkInHeapRegionAndIntoCSClosure(G1CollectedHeap* g1,
OopsInHeapRegionClosure* oc,
ConcurrentMark* cm)
- : _g1(g1), _oc(oc), _cm(cm) { }
+ : _g1(g1), _cm(cm), _oc(oc) { }
template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
@@ -711,7 +711,7 @@ class SymbolHashMapEntry : public CHeapO
void set_value(u2 value) { _value = value; }
SymbolHashMapEntry(unsigned int hash, symbolOop symbol, u2 value)
- : _hash(hash), _symbol(symbol), _value(value), _next(NULL) {}
+ : _hash(hash), _next(NULL), _symbol(symbol), _value(value) {}
}; // End SymbolHashMapEntry class
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/generation.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/generation.hpp
@@ -692,7 +692,8 @@ class OneContigSpaceCardGeneration: publ
int level, GenRemSet* remset,
ContiguousSpace* space) :
CardGeneration(rs, initial_byte_size, level, remset),
- _the_space(space), _min_heap_delta_bytes(min_heap_delta_bytes)
+ _min_heap_delta_bytes(min_heap_delta_bytes),
+ _the_space(space)
{}
inline bool is_in(const void* p) const;
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/watermark.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/watermark.hpp
@@ -46,8 +46,8 @@ class WaterMark VALUE_OBJ_CLASS_SPEC {
void set_point(HeapWord* p) { _point = p; }
// Constructors
- WaterMark(Space* s, HeapWord* p) : _space(s), _point(p) {};
- WaterMark() : _space(NULL), _point(NULL) {};
+ WaterMark(Space* s, HeapWord* p) : _point(p), _space(s) {};
+ WaterMark() : _point(NULL), _space(NULL) {};
};
inline bool operator==(const WaterMark& x, const WaterMark& y) {
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
@@ -90,11 +90,11 @@ class CollectorPolicy : public CHeapObj
bool _all_soft_refs_clear;
CollectorPolicy() :
- _min_alignment(1),
- _max_alignment(1),
_initial_heap_byte_size(0),
_max_heap_byte_size(0),
_min_heap_byte_size(0),
+ _min_alignment(1),
+ _max_alignment(1),
_size_policy(NULL),
_should_clear_all_soft_refs(false),
_all_soft_refs_clear(false)
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
@@ -50,7 +50,7 @@ class GenerationCounters: public CHeapOb
// This constructor is only meant for use with the PSGenerationCounters
// constructor. The need for such an constructor should be eliminated
// when VirtualSpace and PSVirtualSpace are unified.
- GenerationCounters() : _name_space(NULL), _current_size(NULL), _virtual_space(NULL) {}
+ GenerationCounters() : _current_size(NULL), _virtual_space(NULL), _name_space(NULL) {}
public:
GenerationCounters(const char* name, int ordinal, int spaces,
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/space.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/space.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/space.hpp
@@ -351,7 +351,7 @@ public:
DirtyCardToOopClosure(Space* sp, OopClosure* cl,
CardTableModRefBS::PrecisionStyle precision,
HeapWord* boundary) :
- _sp(sp), _cl(cl), _precision(precision), _boundary(boundary),
+ _cl(cl), _sp(sp), _precision(precision), _boundary(boundary),
_min_done(NULL) {
NOT_PRODUCT(_last_bottom = NULL);
NOT_PRODUCT(_last_explicit_min_done = NULL);
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
@@ -329,8 +329,8 @@ class VM_FindDeadlocks: public VM_Operat
outputStream* _out;
public:
- VM_FindDeadlocks(bool concurrent_locks) : _concurrent_locks(concurrent_locks), _out(NULL), _deadlocks(NULL) {};
- VM_FindDeadlocks(outputStream* st) : _concurrent_locks(true), _out(st), _deadlocks(NULL) {};
+ VM_FindDeadlocks(bool concurrent_locks) : _concurrent_locks(concurrent_locks), _deadlocks(NULL), _out(NULL) {};
+ VM_FindDeadlocks(outputStream* st) : _concurrent_locks(true), _deadlocks(NULL), _out(st) {};
~VM_FindDeadlocks();
DeadlockCycle* result() { return _deadlocks; };
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/callnode.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/callnode.hpp
@@ -319,8 +319,8 @@ public:
// A plain safepoint advertises no memory effects (NULL):
const TypePtr* adr_type = NULL)
: MultiNode( edges ),
- _jvms(jvms),
_oop_map(NULL),
+ _jvms(jvms),
_adr_type(adr_type)
{
init_class_id(Class_SafePoint);
@@ -858,8 +858,8 @@ protected:
public:
AbstractLockNode(const TypeFunc *tf)
: CallNode(tf, NULL, TypeRawPtr::BOTTOM),
- _coarsened(false),
- _eliminate(false)
+ _eliminate(false),
+ _coarsened(false)
{
#ifndef PRODUCT
_counter = NULL;
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/type.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/type.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/type.hpp
@@ -582,7 +582,7 @@ class TypePtr : public Type {
public:
enum PTR { TopPTR, AnyNull, Constant, Null, NotNull, BotPTR, lastPTR };
protected:
- TypePtr( TYPES t, PTR ptr, int offset ) : Type(t), _ptr(ptr), _offset(offset) {}
+ TypePtr( TYPES t, PTR ptr, int offset ) : Type(t), _offset(offset), _ptr(ptr) {}
virtual bool eq( const Type *t ) const;
virtual int hash() const; // Type specific hashing
static const PTR ptr_meet[lastPTR][lastPTR];
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/machnode.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/machnode.hpp
@@ -845,7 +845,7 @@ public:
uint _block_num;
- labelOper() : _block_num(0), _label(0) {}
+ labelOper() : _label(0), _block_num(0) {}
labelOper(Label* label, uint block_num) : _label(label), _block_num(block_num) {}
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/runtime.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/runtime.hpp
@@ -74,8 +74,8 @@ private:
NamedCounter(const char *n, CounterTag tag = NoTag):
_name(n),
_count(0),
- _next(NULL),
- _tag(tag) {}
+ _tag(tag),
+ _next(NULL) { }
const char * name() const { return _name; }
int count() const { return _count; }
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/block.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/block.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/block.hpp
@@ -54,7 +54,7 @@ protected:
public:
Arena *_arena; // Arena to allocate in
- Block_Array(Arena *a) : _arena(a), _size(OptoBlockListSize) {
+ Block_Array(Arena *a) : _size(OptoBlockListSize), _arena(a) {
debug_only(_limit=0);
_blocks = NEW_ARENA_ARRAY( a, Block *, OptoBlockListSize );
for( int i = 0; i < OptoBlockListSize; i++ ) {
@@ -590,7 +590,7 @@ class CFGEdge : public ResourceObj {
CFGEdge(Block *from, Block *to, float freq, int from_pct, int to_pct) :
_from(from), _to(to), _freq(freq),
- _from_pct(from_pct), _to_pct(to_pct), _state(open) {
+ _state(open), _from_pct(from_pct), _to_pct(to_pct) {
_infrequent = from_infrequent() || to_infrequent();
}
@@ -638,11 +638,11 @@ class Trace : public ResourceObj {
public:
Trace(Block *b, Block **next_list, Block **prev_list) :
- _first(b),
- _last(b),
+ _id(b->_pre_order),
_next_list(next_list),
_prev_list(prev_list),
- _id(b->_pre_order) {
+ _first(b),
+ _last(b) {
set_next(b, NULL);
set_prev(b, NULL);
};
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
@@ -308,9 +308,9 @@ public:
: _parent(0), _next(0), _child(0),
_head(head), _tail(tail),
_phase(phase),
+ _nest(0), _irreducible(0), _has_call(0), _has_sfpt(0), _rce_candidate(0),
_required_safept(NULL),
- _allow_optimizations(true),
- _nest(0), _irreducible(0), _has_call(0), _has_sfpt(0), _rce_candidate(0)
+ _allow_optimizations(true)
{ }
// Is 'l' a member of 'this'?
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/subnode.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/subnode.hpp
@@ -285,7 +285,7 @@ class BoolNode : public Node {
virtual uint size_of() const;
public:
const BoolTest _test;
- BoolNode( Node *cc, BoolTest::mask t): _test(t), Node(0,cc) {
+ BoolNode( Node *cc, BoolTest::mask t): Node(0,cc),_test(t) {
init_class_id(Class_Bool);
}
// Convert an arbitrary int value to a Bool or other suitable predicate.
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
@@ -145,7 +145,7 @@ class ImplicitExceptionTable VALUE_OBJ_C
implicit_null_entry *adr( uint idx ) const { return &_data[2*idx]; }
ReallocMark _nesting; // assertion check for reallocations
public:
- ImplicitExceptionTable( ) : _data(0), _size(0), _len(0) { }
+ ImplicitExceptionTable( ) : _size(0), _len(0), _data(0) { }
// (run-time) construction from nmethod
ImplicitExceptionTable( const nmethod *nm );
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
@@ -166,13 +166,13 @@ void MatchList::output(FILE *fp) {
ArchDesc::ArchDesc()
: _globalNames(cmpstr,hashstr, Form::arena),
- _globalDefs(cmpstr,hashstr, Form::arena),
- _preproc_table(cmpstr,hashstr, Form::arena),
_idealIndex(cmpstr,hashstr, Form::arena),
+ _globalDefs(cmpstr,hashstr, Form::arena),
+ _cisc_spill_operand(NULL),
+ _chainRules(cmpstr,hashstr, Form::arena),
_internalOps(cmpstr,hashstr, Form::arena),
_internalMatch(cmpstr,hashstr, Form::arena),
- _chainRules(cmpstr,hashstr, Form::arena),
- _cisc_spill_operand(NULL) {
+ _preproc_table(cmpstr,hashstr, Form::arena) {
// Initialize the opcode to MatchList table with NULLs
for( int i=0; i<_last_opcode; ++i ) {
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/forms.hpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/forms.hpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/forms.hpp
@@ -145,7 +145,7 @@ public:
// Public Methods
Form(int formType=0, int line=0)
- : _next(NULL), _linenum(line), _ftype(formType) { };
+ : _ftype(formType), _next(NULL), _linenum(line) { };
~Form() {};
virtual bool ideal_only() const {
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
@@ -29,8 +29,8 @@
//----------------------------ADLParser----------------------------------------
// Create a new ADL parser
ADLParser::ADLParser(FileBuff& buffer, ArchDesc& archDesc)
- : _buf(buffer), _AD(archDesc),
- _globalNames(archDesc.globalNames()) {
+ : _globalNames(archDesc.globalNames()),
+ _buf(buffer), _AD(archDesc) {
_AD._syntax_errs = _AD._semantic_errs = 0; // No errors so far this file
_AD._warnings = 0; // No warnings either
_curline = _ptr = NULL; // No pointers into buffer yet
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/arena.cpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/arena.cpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/arena.cpp
@@ -71,7 +71,7 @@ Arena::Arena() {
}
Arena::Arena( Arena *a )
-: _chunk(a->_chunk), _hwm(a->_hwm), _max(a->_max), _first(a->_first) {
+: _first(a->_first), _chunk(a->_chunk), _hwm(a->_hwm), _max(a->_max) {
set_size_in_bytes(a->size_in_bytes());
}
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
@@ -52,11 +52,11 @@ public:
// doubled in size; the total amount of EXTRA times all hash functions are
// computed for the doubling is no more than the current size - thus the
// doubling in size costs no more than a constant factor in speed.
-Dict::Dict(CmpKey initcmp, Hash inithash) : _hash(inithash), _cmp(initcmp), _arena(NULL) {
+Dict::Dict(CmpKey initcmp, Hash inithash) : _arena(NULL), _hash(inithash), _cmp(initcmp) {
init();
}
-Dict::Dict(CmpKey initcmp, Hash inithash, Arena *arena) : _hash(inithash), _cmp(initcmp), _arena(arena) {
+Dict::Dict(CmpKey initcmp, Hash inithash, Arena *arena) : _arena(arena), _hash(inithash), _cmp(initcmp) {
init();
}
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
@@ -29,7 +29,7 @@ using namespace std;
//------------------------------FileBuff---------------------------------------
// Create a new parsing buffer
-FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _fp(fptr), _AD(archDesc) {
+FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _AD(archDesc), _fp(fptr) {
_err = fseek(_fp->_fp, 0, SEEK_END); // Seek to end of file
if (_err) {
file_error(SEMERR, 0, "File seek error reading input file");
@@ -93,7 +93,7 @@ char *FileBuff::get_line(void) {
// Create a new region in a FileBuff.
FileBuffRegion::FileBuffRegion( FileBuff* bufr, int soln, int ln,
int off, int len)
-: _bfr(bufr), _sol(soln), _line(ln), _offset(off), _length(len) {
+: _bfr(bufr), _offset(off), _length(len), _sol(soln), _line(ln) {
_next = NULL; // No chained regions
}
Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
===================================================================
--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
+++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
@@ -182,8 +182,8 @@ void RegisterForm::output(FILE *fp) {
RegDef::RegDef(char *regname, char *callconv, char *c_conv, char * idealtype, char * encode, char * concrete)
: _regname(regname), _callconv(callconv), _c_conv(c_conv),
_idealtype(idealtype),
- _register_encode(encode),
_concrete(concrete),
+ _register_encode(encode),
_register_num(0) {
// Chunk and register mask are determined by the register number
@@ -219,7 +219,7 @@ void RegDef::output(FILE *fp) {
//------------------------------RegClass---------------------------------------
// Construct a register class into which registers will be inserted
-RegClass::RegClass(const char *classid) : _stack_or_reg(false), _classid(classid), _regDef(cmpstr,hashstr, Form::arena) {
+RegClass::RegClass(const char *classid) : _classid(classid), _regDef(cmpstr,hashstr, Form::arena), _stack_or_reg(false) {
}
// record a register in this class
@@ -358,12 +358,12 @@ void FrameForm::output(FILE *fp) {
PipelineForm::PipelineForm()
: _reslist ()
, _resdict (cmpstr, hashstr, Form::arena)
- , _classdict (cmpstr, hashstr, Form::arena)
, _rescount (0)
, _maxcycleused (0)
, _stages ()
, _stagecnt (0)
, _classlist ()
+ , _classdict (cmpstr, hashstr, Form::arena)
, _classcnt (0)
, _noplist ()
, _nopcnt (0)
@@ -581,7 +581,7 @@ void Peephole::output(FILE *fp) {
}
//------------------------------PeepMatch--------------------------------------
-PeepMatch::PeepMatch(char *rule) : _max_position(0), _rule(rule) {
+PeepMatch::PeepMatch(char *rule) : _rule(rule), _max_position(0) {
}
PeepMatch::~PeepMatch() {
}
@@ -639,8 +639,8 @@ void PeepMatch::output(FILE *fp) {
//------------------------------PeepConstraint---------------------------------
PeepConstraint::PeepConstraint(int left_inst, char* left_op, char* relation,
int right_inst, char* right_op)
- : _left_inst(left_inst), _left_op(left_op), _relation(relation),
- _right_inst(right_inst), _right_op(right_op), _next(NULL) {}
+ : _next(NULL), _left_inst(left_inst), _left_op(left_op), _relation(relation),
+ _right_inst(right_inst), _right_op(right_op) {}
PeepConstraint::~PeepConstraint() {
}
++++++ openjdk-6-src-b20-may-be-used-uninitialized.patch ++++++
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
@@ -3196,12 +3196,12 @@ Interface *ADLParser::mem_interface_pars
//------------------------------cond_interface_parse---------------------------
Interface *ADLParser::cond_interface_parse(void) {
- char *equal;
- char *not_equal;
- char *less;
- char *greater_equal;
- char *less_equal;
- char *greater;
+ char *equal = NULL;
+ char *not_equal = NULL;
+ char *less = NULL;
+ char *greater_equal = NULL;
+ char *less_equal = NULL;
+ char *greater = NULL;
const char *equal_format = "eq";
const char *not_equal_format = "ne";
const char *less_format = "lt";
++++++ openjdk-6-src-b20-no-multiline-comments.patch ++++++
Index: icedtea6-1.9.1/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp
===================================================================
--- icedtea6-1.9.1.orig/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp
+++ icedtea6-1.9.1/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp
@@ -200,6 +200,7 @@ size_t os::Linux::default_guard_size(os:
return (thr_type == java_thread ? 0 : page_size());
}
+/*
// Java thread:
//
// Low memory addresses
@@ -232,6 +233,7 @@ size_t os::Linux::default_guard_size(os:
//
// ** P1 (aka bottom) and size ( P2 = P1 - size) are the address and stack size returned from
// pthread_attr_getstack()
+*/
static void current_stack_region(address* bottom, size_t* size) {
if (os::Linux::is_initial_thread()) {
Index: icedtea6-1.9.1/openjdk/hotspot/src/cpu/x86/vm/frame_x86.hpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/cpu/x86/vm/frame_x86.hpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/cpu/x86/vm/frame_x86.hpp
@@ -22,6 +22,7 @@
*
*/
+/*
// A frame represents a physical stack frame (an activation). Frames can be
// C or Java frames, and the Java frames can be interpreted or compiled.
// In contrast, vframes represent source-level activations, so that one physical frame
@@ -85,6 +86,7 @@
// will truncate the unused space on succesive method calls.
//
// ------------------------------ C++ interpreter ----------------------------------------
+*/
public:
enum {
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
@@ -25,6 +25,7 @@
# include "incls/_precompiled.incl"
# include "incls/_codeBuffer.cpp.incl"
+/*
// The structure of a CodeSection:
//
// _start -> +----------------+
@@ -71,6 +72,7 @@
// When the code and relocations are copied to the code cache,
// the empty parts of each section are removed, and everything
// is copied into contiguous locations.
+*/
typedef CodeBuffer::csize_t csize_t; // file-local definition
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp
@@ -2196,6 +2196,7 @@ bool ciTypeFlow::clone_loop_heads(Loop*
return rslt;
}
+/*
// ------------------------------------------------------------------
// ciTypeFlow::clone_loop_head
//
@@ -2222,6 +2223,7 @@ bool ciTypeFlow::clone_loop_heads(Loop*
// v v
// exit
//
+*/
ciTypeFlow::Block* ciTypeFlow::clone_loop_head(Loop* lp, StateVector* temp_vector, JsrSet* temp_set) {
Block* head = lp->head();
Block* tail = lp->tail();
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/compiledIC.hpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/code/compiledIC.hpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/compiledIC.hpp
@@ -22,6 +22,7 @@
*
*/
+/*
//-----------------------------------------------------------------------------
// The CompiledIC represents a compiled inline cache.
//
@@ -51,6 +52,7 @@
// The class automatically inserts transition stubs (using the InlineCacheBuffer) when an MT-unsafe
// transition is made to a stub.
//
+*/
class CompiledIC;
class CompiledICInfo {
@@ -155,6 +157,7 @@ inline CompiledIC* CompiledIC_at(Relocat
}
+/*
//-----------------------------------------------------------------------------
// The CompiledStaticCall represents a call to a static method in the compiled
//
@@ -171,6 +174,7 @@ inline CompiledIC* CompiledIC_at(Relocat
// Interpreted code: Calls to stub that set methodOop reference
//
//
+*/
class CompiledStaticCall;
class StaticCallInfo {
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp
@@ -22,6 +22,7 @@
*
*/
+/*
//
//
// Compute stack layouts for each instruction in method.
@@ -84,6 +85,7 @@
// returns to).
//
// (Note this comment is borrowed form the original author of the algorithm)
+*/
#include "incls/_precompiled.incl"
#include "incls/_generateOopMap.cpp.incl"
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/klassVtable.hpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/oops/klassVtable.hpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/klassVtable.hpp
@@ -227,6 +227,7 @@ class itableMethodEntry VALUE_OBJ_CLASS_
friend class klassItable;
};
+/*
//
// Format of an itable
//
@@ -245,6 +246,7 @@ class itableMethodEntry VALUE_OBJ_CLASS_
// -- vtable for interface 2 ---
// ...
//
+*/
class klassItable : public ResourceObj {
private:
instanceKlassHandle _klass; // my klass
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/callnode.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.cpp
@@ -1210,6 +1210,7 @@ Node *AllocateArrayNode::make_ideal_leng
//=============================================================================
uint LockNode::size_of() const { return sizeof(*this); }
+/*
// Redundant lock elimination
//
// There are various patterns of locking where we release and
@@ -1331,6 +1332,7 @@ uint LockNode::size_of() const { return
// expansion of the Lock and Unlock macro nodes to make the operation a NOP
//
//=============================================================================
+*/
//
// Utility function to skip over uninteresting control nodes. Nodes skipped are:
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/graphKit.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/graphKit.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/graphKit.cpp
@@ -1987,6 +1987,7 @@ Node* GraphKit::dstore_rounding(Node* n)
: n;
}
+/*
//=============================================================================
// Generate a fast path/slow path idiom. Graph looks like:
// [foo] indicates that 'foo' is a parameter
@@ -2021,6 +2022,7 @@ Node* GraphKit::dstore_rounding(Node* n)
//=============================================================================
// Code is structured as a series of driver functions all called 'do_XXX' that
// call a set of helper functions. Helper functions first, then drivers.
+*/
//------------------------------null_check_oop---------------------------------
// Null check oop. Set null-path control into Region in slot 3.
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/idealKit.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/idealKit.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/idealKit.cpp
@@ -52,11 +52,13 @@ IdealKit::IdealKit(PhaseGVN &gvn, Node*
}
}
+/*
//-------------------------------if_then-------------------------------------
// Create: if(left relop right)
// / \
// iffalse iftrue
// Push the iffalse cvstate onto the stack. The iftrue becomes the current cvstate.
+*/
void IdealKit::if_then(Node* left, BoolTest::mask relop,
Node* right, float prob, float cnt, bool push_new_state) {
assert((state() & (BlockS|LoopS|IfThenS|ElseS)), "bad state for new If");
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/loopopts.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/loopopts.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/loopopts.cpp
@@ -1586,6 +1586,7 @@ Node* PhaseIdealLoop::short_circuit_if(I
return con;
}
+/*
//------------------------------ insert_if_before_proj -------------------------------------
// Insert a new if before an if projection (* - new node)
//
@@ -1608,6 +1609,7 @@ Node* PhaseIdealLoop::short_circuit_if(I
// * new-proj proj
// (returned)
//
+*/
ProjNode* PhaseIdealLoop::insert_if_before_proj(Node* left, bool Signed, BoolTest::mask relop, Node* right, ProjNode* proj) {
IfNode* iff = proj->in(0)->as_If();
IdealLoopTree *loop = get_loop(proj);
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/output.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/output.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/output.cpp
@@ -2683,6 +2683,7 @@ void Scheduling::ComputeRegisterAntidepe
//------------------------------garbage_collect_pinch_nodes-------------------------------
+/*
// Garbage collect pinch nodes for reuse by other blocks.
//
// The block scheduler's insertion of anti-dependence
@@ -2707,6 +2708,7 @@ void Scheduling::ComputeRegisterAntidepe
// wired into the graph because the register is never
// used or def'ed in the block.
//
+*/
void Scheduling::garbage_collect_pinch_nodes() {
#ifndef PRODUCT
if (_cfg->C->trace_opto_output()) tty->print("Reclaimed pinch nodes:");
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/prims/unsafe.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/prims/unsafe.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/prims/unsafe.cpp
@@ -37,6 +37,7 @@
#define UNSAFE_ENTRY(result_type, header) \
JVM_ENTRY(result_type, header)
+/*
// Can't use UNSAFE_LEAF because it has the signature of a straight
// call into the runtime (just like JVM_LEAF, funny that) but it's
// called like a Java Native and thus the wrapper built for it passes
@@ -47,6 +48,7 @@
// wrapper and we get sick.
//#define UNSAFE_LEAF(result_type, header) \
// JVM_LEAF(result_type, header)
+*/
#define UNSAFE_END JVM_END
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dfa.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/dfa.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dfa.cpp
@@ -383,14 +383,14 @@ void ArchDesc::buildDFA(FILE* fp) {
_attributes.output(fp);
fprintf(fp, "\n");
fprintf(fp, "//------------------------- Macros -----------------------------------------\n");
- // #define DFA_PRODUCTION(result, rule, cost)\
- // _cost[ (result) ] = cost; _rule[ (result) ] = rule;
+/* // #define DFA_PRODUCTION(result, rule, cost)\
+ // _cost[ (result) ] = cost; _rule[ (result) ] = rule; */
fprintf(fp, "#define %s(result, rule, cost)\\\n", dfa_production);
fprintf(fp, " _cost[ (result) ] = cost; _rule[ (result) ] = rule;\n");
fprintf(fp, "\n");
- // #define DFA_PRODUCTION__SET_VALID(result, rule, cost)\
- // DFA_PRODUCTION( (result), (rule), (cost) ); STATE__SET_VALID( (result) );
+/* // #define DFA_PRODUCTION__SET_VALID(result, rule, cost)\
+ // DFA_PRODUCTION( (result), (rule), (cost) ); STATE__SET_VALID( (result) );*/
fprintf(fp, "#define %s(result, rule, cost)\\\n", dfa_production_set_valid);
fprintf(fp, " %s( (result), (rule), (cost) ); STATE__SET_VALID( (result) );\n", dfa_production);
fprintf(fp, "\n");
++++++ openjdk-6-src-b20-no-werror.patch ++++++
Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/gcc.make
===================================================================
--- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/gcc.make
+++ icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/gcc.make
@@ -118,7 +118,7 @@ else
endif
# Compiler warnings are treated as errors
-WARNINGS_ARE_ERRORS = -Werror
+WARNINGS_ARE_ERRORS = -Wall
# Except for a few acceptable ones
# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
@@ -130,7 +130,8 @@ else
ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
endif
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+# gcc 4.5 produces a lot of errors expecially in autogenarated files, so turn -Weror off
+CFLAGS_WARN/DEFAULT = $(ACCEPTABLE_WARNINGS)
# Special cases
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
Index: icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk
===================================================================
--- icedtea6-1.9.7.orig/openjdk/jdk/make/common/Defs-linux.gmk
+++ icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk
@@ -153,9 +153,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G
#
# Treat compiler warnings as errors, if warnings not allowed
#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- GCC_WARNINGS += -Werror
-endif
+#ifeq ($(COMPILER_WARNINGS_FATAL),true)
+# GCC_WARNINGS += -Wall
+#endif
#
# Misc compiler options
Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make
===================================================================
--- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/adlc.make
+++ icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make
@@ -62,7 +62,8 @@ CPPFLAGS += -DASSERT
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
# Compiler warnings are treated as errors
-CFLAGS_WARN = -Werror
+# XXX: Who could fix all those stupid errors on gcc 4.5?
+#CFLAGS_WARN = -Wall
CFLAGS += $(CFLAGS_WARN)
OBJECTNAMES = \
Index: icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk
===================================================================
--- icedtea6-1.9.7.orig/openjdk/corba/make/common/Defs-linux.gmk
+++ icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk
@@ -143,9 +143,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G
#
# Treat compiler warnings as errors, if warnings not allowed
#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- GCC_WARNINGS += -Werror
-endif
+#ifeq ($(COMPILER_WARNINGS_FATAL),true)
+# GCC_WARNINGS += -Wall
+#endif
#
# Misc compiler options
Index: icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make
===================================================================
--- icedtea6-1.9.7.orig/openjdk/hotspot/make/solaris/makefiles/gcc.make
+++ icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make
@@ -111,10 +111,10 @@ endif
# Compiler warnings are treated as errors
-WARNINGS_ARE_ERRORS = -Werror
+WARNINGS_ARE_ERRORS = -Wall
# Enable these warnings. See 'info gcc' about details on these options
ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
+CFLAGS_WARN/DEFAULT = $(ADDITIONAL_WARNINGS)
# Special cases
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
++++++ openjdk-6-src-b20-stringcompare.patch ++++++
Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c
===================================================================
--- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c
+++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c
@@ -574,7 +574,7 @@ awtJNI_GetFontData(JNIEnv * env, jobject
jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
nativename, size * 10);
- if (nativename != NULL && nativename != "")
+ if (nativename != NULL && strcmp(nativename, ""))
JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
/*
++++++ openjdk-6-src-b20-suggest-parentheses.patch ++++++
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
@@ -4278,8 +4278,8 @@ int ADLParser::get_int(void) {
skipws(); // Skip whitespace before identifier
start = end = _ptr; // Start points at first character
c = *end; // Grab character to test
- while ((c >= '0') && (c <= '9')
- || ((c == '-') && (end == start))) {
+ while (((c >= '0') && (c <= '9'))
+ || (((c == '-') && (end == start)))) {
end++; // Increment end pointer
c = *end; // Grab character to test
}
++++++ openjdk-6-src-b20-unused-variable.patch ++++++
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp
@@ -126,6 +126,7 @@ class ConstantPoolCacheEntry VALUE_OBJ_C
void set_bytecode_2(Bytecodes::Code code);
void set_f1(oop f1) {
oop existing_f1 = _f1; // read once
+ existing_f1 = existing_f1; // suppress compiler warning
assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
oop_store(&_f1, f1);
}
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp
@@ -70,6 +70,7 @@ class AllocationStats VALUE_OBJ_CLASS_SP
_splitBirths = split_birth? 1 : 0;
_splitDeaths = 0;
_returnedBytes = 0;
+ dummy = dummy; //suppress compiler warning
}
AllocationStats() {
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp
@@ -375,6 +375,7 @@ class Bytecode_loadconstant: public Byte
assert(stdc == Bytecodes::_ldc ||
stdc == Bytecodes::_ldc_w ||
stdc == Bytecodes::_ldc2_w, "load constant");
+ stdc = stdc; //suppress compiler warning
}
int index() const;
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/regalloc.hpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/regalloc.hpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/regalloc.hpp
@@ -108,6 +108,7 @@ public:
assert( n->_idx < _node_regs_max_index, "Exceeded _node_regs array");
OptoReg::Name first = _node_regs[n->_idx].first();
OptoReg::Name second = _node_regs[n->_idx].second();
+ second = second; //suppress compiler warning
assert( !OptoReg::is_valid(second) || second == first+1, "" );
assert(OptoReg::is_reg(first), "out of range");
return Matcher::_regEncode[first];
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
@@ -807,7 +807,6 @@ void ADLParser::reg_parse(void) {
//------------------------------encode_parse-----------------------------------
void ADLParser::encode_parse(void) {
EncodeForm *encBlock; // Information about instruction/operand encoding
- char *desc = NULL; // String representation of encode rule
_AD.getForm(&encBlock);
if ( encBlock == NULL) {
@@ -2094,7 +2093,6 @@ void ADLParser::pipe_class_parse(Pipelin
//------------------------------peep_parse-------------------------------------
void ADLParser::peep_parse(void) {
Peephole *peep; // Pointer to current peephole rule form
- char *desc = NULL; // String representation of rule
skipws(); // Skip leading whitespace
@@ -2658,10 +2656,7 @@ void ADLParser::peep_constraint_parse(Pe
//
void ADLParser::peep_replace_parse(Peephole &peep) {
int lparen = 0; // keep track of parenthesis nesting depth
- int rparen = 0; // keep track of parenthesis nesting depth
- int icount = 0; // count of instructions in rule for naming
char *str = NULL;
- char *token = NULL;
skipws();
// Check for open paren
@@ -2753,7 +2748,6 @@ Predicate *ADLParser::pred_parse(void) {
char *rule = NULL; // String representation of predicate
skipws(); // Skip leading whitespace
- int line = linenum();
if ( (rule = get_paren_expr("pred expression", true)) == NULL ) {
parse_err(SYNERR, "incorrect or missing expression for 'predicate'\n");
return NULL;
@@ -3016,7 +3010,6 @@ Opcode * ADLParser::opcode_parse(Instruc
char *secondary = NULL;
char *tertiary = NULL;
- char *val = NULL;
Opcode *opcode = NULL;
// Get value of the instruction's opcode
@@ -3086,7 +3079,6 @@ Opcode * ADLParser::opcode_parse(Instruc
//------------------------------interface_parse--------------------------------
Interface *ADLParser::interface_parse(void) {
char *iface_name = NULL; // Name of interface class being used
- char *iface_code = NULL; // Describe components of this class
// Get interface class name
skipws(); // Skip whitespace
@@ -4646,7 +4638,6 @@ bool ADLParser::handle_preproc_token() {
// line count.
// Maybe handle certain preprocessor constructs: #ifdef, #ifndef, #else, #endif
void ADLParser::skipws_common(bool do_preproc) {
- char *start = _ptr;
char *next = _ptr + 1;
if (*_ptr == '\0') {
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
@@ -294,7 +294,6 @@ void ArchDesc::inspectOperands() {
// Find result type for match.
const char *result = op->reduce_result();
- bool has_root = false;
// Construct a MatchList for this entry
buildMatchList(op->_matrule, result, rootOp, pred, cost);
@@ -394,7 +393,7 @@ const char *ArchDesc::reduceRight(char
//------------------------------check_optype-----------------------------------
void ArchDesc::check_optype(MatchRule *mrule) {
- MatchRule *rule = mrule;
+ // MatchRule *rule = mrule;
// !!!!!
// // Cycle through the list of match rules
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
@@ -249,8 +249,6 @@ void FileBuffRegion::print( ostream& os
if( !len ) return; // All done; exit
// Here we require at least 2 lines
- int off1 = _length - len + skip; // Length of line 1
- int off2 = off1 + _sol; // Offset to start of line 2
char *s2 = _bfr->get_line(); // Start of line 2
char *s3 = strchr( s2, '\n' )+1; // Start of line 3 (unread)
if( len <= (s3-s2) ) { // It all fits on the next line
@@ -259,7 +257,6 @@ void FileBuffRegion::print( ostream& os
}
// Here we require at least 3 lines
- int off3 = off2 + (int)(s3-s2); // Offset to start of line 3
s3 = _bfr->get_line(); // Start of line 3 (read)
const char *s4 = strchr( s3, '\n' )+1;// Start of line 4 (unread)
if( len < (s4-s3) ) { // It all fits on the next 2 lines
++++++ openjdk-6-src-b24-zero-increase-stack-size.patch ++++++
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:01.000000000 -0400
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:00.000000000 -0400
@@ -32,11 +32,11 @@
//
define_pd_global(bool, DontYieldALot, false);
-define_pd_global(intx, ThreadStackSize, 1536);
+define_pd_global(intx, ThreadStackSize, 1664);
#ifdef _LP64
-define_pd_global(intx, VMThreadStackSize, 1024);
+define_pd_global(intx, VMThreadStackSize, 1664);
#else
-define_pd_global(intx, VMThreadStackSize, 512);
+define_pd_global(intx, VMThreadStackSize, 1152);
#endif // _LP64
define_pd_global(intx, SurvivorRatio, 8);
define_pd_global(intx, CompilerThreadStackSize, 0);
--- openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
+++ openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
@@ -83,9 +83,9 @@
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
diff -up openjdk/corba/make/common/shared/Defs-java.gmk.ppc openjdk/corba/make/common/shared/Defs-java.gmk
--- openjdk/corba/make/common/shared/Defs-java.gmk.ppc 2012-03-24 11:44:34.450072733 +0100
+++ openjdk/corba/make/common/shared/Defs-java.gmk 2012-03-24 11:44:53.300073137 +0100
@@ -79,9 +79,9 @@ JAVAC_JVM_FLAGS =
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
++++++ openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch ++++++
Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c
===================================================================
--- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/bin/jexec.c
+++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c
@@ -221,6 +221,9 @@ int main(int argc, const char * argv[])
* implies an error in the exec. */
free(nargv);
errorExit(errno, BAD_EXEC_MSG);
+
+ /* Just supress compiler warning */
+ return 0;
}
Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
===================================================================
--- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
@@ -138,10 +138,12 @@ jboolean XShared_initIDs(JNIEnv *env, jb
}
}
- return JNI_TRUE;
#endif /* MITSHM */
#endif /* !HEADLESS */
+
+ /* Supress compiler warning */
+ return JNI_TRUE;
}
@@ -463,8 +465,10 @@ jboolean XShared_initSurface(JNIEnv *env
return JNI_FALSE;
}
- return JNI_TRUE;
#endif /* !HEADLESS */
+
+ /* Suppress compiler warning */
+ return JNI_TRUE;
}
Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
===================================================================
--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -494,6 +494,9 @@ JVM_handle_linux_signal(int sig,
err.report_and_die();
ShouldNotReachHere();
+
+ /*Supress compiler warnings*/
+ return -1;
}
void os::Linux::init_thread_fpu_state(void) {
Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad
===================================================================
--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad
+++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad
@@ -1133,6 +1133,7 @@ uint MachSpillCopyNode::implementation(
Unimplemented();
+ return -1; //avoid compiler warning
}
#ifndef PRODUCT
++++++ openjdk-ecj-6-src-b22-no-werror.patch ++++++
Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make
+++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make
@@ -60,8 +60,8 @@ CPPFLAGS += -DASSERT
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
# Compiler warnings are treated as errors
-CFLAGS_WARN = -Werror
-CFLAGS += $(CFLAGS_WARN)
+#CFLAGS_WARN = -Werror
+#CFLAGS += $(CFLAGS_WARN)
OBJECTNAMES = \
adlparse.o \
Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make
+++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make
@@ -135,7 +135,7 @@ else
ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
endif
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+CFLAGS_WARN/DEFAULT = $(ACCEPTABLE_WARNINGS)
# Special cases
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make
+++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make
@@ -116,7 +116,7 @@ endif
WARNINGS_ARE_ERRORS = -Werror
# Enable these warnings. See 'info gcc' about details on these options
ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
+CFLAGS_WARN/DEFAULT = $(ADDITIONAL_WARNINGS)
# Special cases
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
Index: icedtea6-1.10.4/openjdk-ecj/corba/make/common/Defs-linux.gmk
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/corba/make/common/Defs-linux.gmk
+++ icedtea6-1.10.4/openjdk-ecj/corba/make/common/Defs-linux.gmk
@@ -143,9 +143,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G
#
# Treat compiler warnings as errors, if warnings not allowed
#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- GCC_WARNINGS += -Werror
-endif
+#ifeq ($(COMPILER_WARNINGS_FATAL),true)
+# GCC_WARNINGS += -Werror
+#endif
#
# Misc compiler options
Index: icedtea6-1.10.4/openjdk-ecj/jdk/make/common/Defs-linux.gmk
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/jdk/make/common/Defs-linux.gmk
+++ icedtea6-1.10.4/openjdk-ecj/jdk/make/common/Defs-linux.gmk
@@ -153,9 +153,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G
#
# Treat compiler warnings as errors, if warnings not allowed
#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- GCC_WARNINGS += -Werror
-endif
+#ifeq ($(COMPILER_WARNINGS_FATAL),true)
+# GCC_WARNINGS += -Werror
+#endif
#
# Misc compiler options
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package java-1_6_0-openjdk for openSUSE:12.1:Update checked in at 2012-10-31 16:15:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update/java-1_6_0-openjdk (Old)
and /work/SRC/openSUSE:12.1:Update/.java-1_6_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_6_0-openjdk", Maintainer is "bnc-team-java(a)forge.provo.novell.com"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.BLrrd8/_old 2012-10-31 16:15:33.000000000 +0100
+++ /var/tmp/diff_new_pack.BLrrd8/_new 2012-10-31 16:15:33.000000000 +0100
@@ -1 +1 @@
-<link package='java-1_6_0-openjdk.846' cicount='copy' />
+<link package='java-1_6_0-openjdk.1032' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt4-devel-doc for openSUSE:12.2:Update checked in at 2012-10-31 16:01:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/libqt4-devel-doc (Old)
and /work/SRC/openSUSE:12.2:Update/.libqt4-devel-doc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4-devel-doc", Maintainer is "DMueller(a)suse.com"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
_link
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
<link package='libqt4-devel-doc.1022' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dbus-1-x11 for openSUSE:12.1:Update checked in at 2012-10-31 16:01:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update/dbus-1-x11 (Old)
and /work/SRC/openSUSE:12.1:Update/.dbus-1-x11.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1-x11", Maintainer is "THoenig(a)suse.com"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.Dg7r3W/_old 2012-10-31 16:01:06.000000000 +0100
+++ /var/tmp/diff_new_pack.Dg7r3W/_new 2012-10-31 16:01:06.000000000 +0100
@@ -1 +1 @@
-<link package='dbus-1-x11.937' cicount='copy' />
+<link package='dbus-1-x11.1001' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dbus-1 for openSUSE:12.1:Update checked in at 2012-10-31 16:01:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update/dbus-1 (Old)
and /work/SRC/openSUSE:12.1:Update/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1", Maintainer is "THoenig(a)suse.com"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.2EHAli/_old 2012-10-31 16:01:04.000000000 +0100
+++ /var/tmp/diff_new_pack.2EHAli/_new 2012-10-31 16:01:04.000000000 +0100
@@ -1 +1 @@
-<link package='dbus-1.937' cicount='copy' />
+<link package='dbus-1.1001' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dbus-1.1001 for openSUSE:12.1:Update checked in at 2012-10-31 16:01:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update/dbus-1.1001 (Old)
and /work/SRC/openSUSE:12.1:Update/.dbus-1.1001.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1.1001", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2012-10-22 00:44:18.403455820 +0200
+++ /work/SRC/openSUSE:12.1:Update/.dbus-1.1001.new/dbus-1-x11.changes 2012-10-31 16:01:04.000000000 +0100
@@ -0,0 +1,1595 @@
+-------------------------------------------------------------------
+Wed Oct 10 13:14:55 CEST 2012 - thoenig(a)suse.de
+
+- Replace patches for CVE-2012-3524 with upstream patches
+ (bnc#697105).
+ 23fe78ceefb6cefcd58a49c77d1154b68478c8d2
+ 4b351918b9f70eaedbdb3ab39208bc1f131efae0
+ 57ae3670508bbf4ec57049de47c9cae727a64802
+ f68dbdc3e6f895012ce33939fb524accf31bcca5
+
+-------------------------------------------------------------------
+Wed Oct 10 11:22:06 CEST 2012 - thoenig(a)suse.de
+
+- Add patch dbus-cve-2012-3524-fallout-fix.patch to address
+ fallout caused by CVE-2012-3524 (bnc#783657). Based on upstream
+ patch f68dbdc3e6f895012ce33939fb524accf31bcca5 .
+
+-------------------------------------------------------------------
+Wed Sep 19 15:46:27 CEST 2012 - thoenig(a)suse.de
+
+- Add patch for CVE-2012-3524 to fix getenv() vulnerability in
+ suids (bnc#697105)
+
+-------------------------------------------------------------------
+Wed Oct 12 09:47:55 UTC 2011 - coolo(a)suse.com
+
+- add patch to enable X11 autolaunch even if configure thinks
+ it can't be done (bnc#707817)
+
+-------------------------------------------------------------------
+Wed Oct 12 00:32:50 CEST 2011 - dmueller(a)suse.de
+
+- update to version 1.5.8:
+ * Clean up dead code, and make more warnings fatal in development builds
+ (fd.o #39231, fd.o #41012; Simon McVittie)
+ * Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie)
+ * Add _DBUS_STATIC_ASSERT and use it to check invariants
+ * Fix a small memory leak, and a failure to report errors, when updating
+ a service file entry for activation (fd.o #39230, Simon McVittie)
+ * Clean up (non-abstract) Unix sockets on bus daemon exit
+ * On systems that use libcap-ng but not systemd, drop supplemental groups
+ when switching to the daemon user (Red Hat #726953, Steve Grubb)
+
+-------------------------------------------------------------------
+Fri Sep 30 20:07:53 UTC 2011 - coolo(a)suse.com
+
+- add libtool as buildrequire to make the spec file more reliable
+
+-------------------------------------------------------------------
+Sun Sep 18 17:17:12 UTC 2011 - jengelh(a)medozas.de
+
+- Remove redundant tags/sections from specfile
+ (cf. packaging guidelines)
+
+-------------------------------------------------------------------
+Mon Aug 1 14:37:16 CEST 2011 - vuntz(a)opensuse.org
+
+- Update to version 1.5.6:
+ + Potentially incompatible (Bustle and similar debugging tools
+ will need changes to work as intended):
+ - Do not allow match rules to "eavesdrop" (receive messages
+ intended for a different recipient) by mistake: eavesdroppers
+ must now opt-in to this behaviour by putting
+ "eavesdrop='true'" in the match rule, which will not have any
+ practical effect on buses where eavesdropping is not allowed
+ (fdo#37890)
+ + Other changes:
+ - D-Bus Specification version 0.18 (fdo#37890, fdo#39450,
+ fdo#38252):
+ . add the "eavesdrop" keyword to match rules
+ . define eavesdropping, unicast messages and broadcast messages
+ . stop claiming that match rules are needed to match unicast
+ messages to you
+ . promote the type system to be a top-level section
+ - Use DBUS_ERROR_OBJECT_PATH_IN_USE if
+ dbus_connection_try_register_object_path or
+ dbus_connection_try_register_fallback fails, not
+ ...ADDRESS_IN_USE, and simplify object-path registration
+ (fdo#38874)
+ - Consistently use atomic operations on everything that is ever
+ manipulated via atomic ops, as was done for changes to
+ DBusConnection's refcount in 1.4.12 (fdo#38005)
+ - Fix a file descriptor leak when connecting to a TCP socket
+ (fdo#37258)
+ - Make "make check" in a clean tree work, by not running tests
+ until test data has been set up (fdo#34405)
+ - The dbus-daemon no longer busy-loops if it has a very large
+ number of file descriptors (fdo#23194)
+ - Refactor message flow through dispatching to avoid locking
+ violations if the bus daemon's message limit is hit; remove
+ the per-connection link cache, which was meant to improve
+ performance, but now reduces it (fdo#34393)
+ - Some cmake fixes
+ - Remove dead code, mainly from DBusString (fdo#38570,
+ fdo#39610)
+ - Stop storing two extra byte order indicators in each D-Bus
+ message (fdo#38287)
+ - Add an optional Stats interface which can be used to get
+ statistics from a running dbus-daemon if enabled at configure
+ time with --enable-stats (fdo#34040)
+ - Fix various typos (fdo#27227, fdo#38284)
+ - Documentation (fdo#36156):
+ . let xsltproc be overridden as usual: ./configure
+ XSLTPROC=myxsltproc
+ . install more documentation automatically, including
+ man2html output
+ . put dbus.devhelp in the right place (it must go in
+ ${htmldir})
+ - Unix-specific:
+ . look for system services in /lib/dbus-1/system-services in
+ addition to all the other well-known locations; note that
+ this should always be /lib, even on platforms where shared
+ libraries on the root FS would go in /lib64,
+ /lib/x86_64-linux-gnu or similar (fdo#35229)
+ . opt-in to fd passing on Solaris (fdo#33465)
+ - Windows-specific:
+ . fix use of a mutex for autolaunch server detection
+ . don't crash on malloc failure in
+ _dbus_printf_string_upper_bound
+- Manually create /lib/dbus-1/system-services in %install so that
+ we can own it.
+
+-------------------------------------------------------------------
+Fri Jul 1 10:07:55 CEST 2011 - vuntz(a)opensuse.org
+
+- Update to version 1.5.4:
+ + Security (local denial of service):
+ - Byte-swap foreign-endian messages correctly, preventing a
+ long-standing local DoS if foreign-endian messages are
+ relayed through the dbus-daemon (fdo#38120, deb#629938, no
+ CVE number yet)
+ + New things:
+ - The constant to use for an infinite timeout now has a name,
+ DBUS_TIMEOUT_INFINITE.
+ - If GLib and DBus-GLib are already installed, more tests will be built,
+ providing better coverage.(fdo#34570)
+ + Changes:
+ - Consistently use atomic operations for the DBusConnection's
+ refcount, fixing potential threading problems (fdo#38005)
+ - Don't use -Wl,--gc-sections by default: in practice the size
+ decrease is small (300KiB on x86-64) and it frequently
+ doesn't work in unusual toolchains. (fdo#33466)
+ - Use #!/bin/sh for run-with-tmp-session-bus.sh, making it work
+ on *BSD (fdo#35880)
+ - Use ln -fs to set up dbus for systemd, which should fix
+ reinstallation when not using a DESTDIR (fdo#37870)
+ - Windows-specific changes:
+ . don't try to build dbus-daemon-launch-helper (fdo#37838)
+- Changes from version 1.5.2:
+ + Notes for distributors:
+ - This version of D-Bus no longer uses -fPIE by default.
+ + Changes:
+ + D-Bus Specification v0.17
+ . Reserve the extra characters used in signatures by GVariant
+ (fdo#34529)
+ . Define the ObjectManager interface (fdo#34869)
+ + Don't force -fPIE: distributions and libtool know better than
+ we do whether it's desirable (fdo#16621, fdo#27215)
+ + Allow --disable-gc-sections, in case your toolchain offers
+ the -ffunction-sections, -fdata-sections and
+ -Wl,--gc-sections options but they're broken, as seen on
+ Solaris (fdo#33466)
+ + Install dbus-daemon and dbus-daemon-launch-helper in a more
+ normal way (fdo#14512)
+ + Ensure that maintainers upload documentation with the right
+ permissions (fdo#36130)
+ + Don't force users of libdbus to be linked against
+ -lpthread, -lrt (fdo#32827)
+ + Log system-bus activation information to syslog (fdo#35705)
+ + Log messages dropped due to quotas to syslog (fdo#35358)
+ + Make the nonce-tcp transport work on Unix (fdo#34569)
+ + On Unix, if /var/lib/dbus/machine-id cannot be read, try
+ /etc/machine-id (fdo#35228)
+ + In the regression tests, don't report fds as "leaked" if they
+ were open on startup (fdo#35173)
+ + Make dbus-monitor bail out if asked to monitor more than one
+ bus, rather than silently using the last one (fdo#26548)
+ + Clarify documentation (fdo#35182)
+ + Clean up minor dead code and some incorrect error handling
+ (fdo#33128, fdo#29881)
+ + Check that compiler options are supported before using them
+ (fdo#19681)
+ + Windows:
+ . Remove obsolete workaround for winioctl.h (fdo#35083)
+
+-------------------------------------------------------------------
+Tue Jun 28 08:03:00 UTC 2011 - aj(a)suse.de
+
+- Fix filelist to own a directory.
+- Do not package html files twice.
+
+-------------------------------------------------------------------
+Wed May 18 14:04:24 UTC 2011 - coolo(a)novell.com
+
+- buildrequire update-desktop-files for mimetypes.prov
+
+-------------------------------------------------------------------
++++ 1398 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.1:Update/.dbus-1.1001.new/dbus-1-x11.changes
New Changes file:
--- /dev/null 2012-10-22 00:44:18.403455820 +0200
+++ /work/SRC/openSUSE:12.1:Update/.dbus-1.1001.new/dbus-1.changes 2012-10-31 16:01:04.000000000 +0100
@@ -0,0 +1,1595 @@
+-------------------------------------------------------------------
+Wed Oct 10 13:14:55 CEST 2012 - thoenig(a)suse.de
+
+- Replace patches for CVE-2012-3524 with upstream patches
+ (bnc#697105).
+ 23fe78ceefb6cefcd58a49c77d1154b68478c8d2
+ 4b351918b9f70eaedbdb3ab39208bc1f131efae0
+ 57ae3670508bbf4ec57049de47c9cae727a64802
+ f68dbdc3e6f895012ce33939fb524accf31bcca5
+
+-------------------------------------------------------------------
+Wed Oct 10 11:22:06 CEST 2012 - thoenig(a)suse.de
+
+- Add patch dbus-cve-2012-3524-fallout-fix.patch to address
+ fallout caused by CVE-2012-3524 (bnc#783657). Based on upstream
+ patch f68dbdc3e6f895012ce33939fb524accf31bcca5 .
+
+-------------------------------------------------------------------
+Wed Sep 19 15:45:51 CEST 2012 - thoenig(a)suse.de
+
+- Add patch for CVE-2012-3524 to fix getenv() vulnerability in
+ suids (bnc#697105)
+
+-------------------------------------------------------------------
+Wed Oct 12 09:47:55 UTC 2011 - coolo(a)suse.com
+
+- add patch to enable X11 autolaunch even if configure thinks
+ it can't be done (bnc#707817)
+
+-------------------------------------------------------------------
+Wed Oct 12 00:32:50 CEST 2011 - dmueller(a)suse.de
+
+- update to version 1.5.8:
+ * Clean up dead code, and make more warnings fatal in development builds
+ (fd.o #39231, fd.o #41012; Simon McVittie)
+ * Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie)
+ * Add _DBUS_STATIC_ASSERT and use it to check invariants
+ * Fix a small memory leak, and a failure to report errors, when updating
+ a service file entry for activation (fd.o #39230, Simon McVittie)
+ * Clean up (non-abstract) Unix sockets on bus daemon exit
+ * On systems that use libcap-ng but not systemd, drop supplemental groups
+ when switching to the daemon user (Red Hat #726953, Steve Grubb)
+
+-------------------------------------------------------------------
+Fri Sep 30 20:07:53 UTC 2011 - coolo(a)suse.com
+
+- add libtool as buildrequire to make the spec file more reliable
+
+-------------------------------------------------------------------
+Sun Sep 18 17:17:12 UTC 2011 - jengelh(a)medozas.de
+
+- Remove redundant tags/sections from specfile
+ (cf. packaging guidelines)
+
+-------------------------------------------------------------------
+Mon Aug 1 14:37:16 CEST 2011 - vuntz(a)opensuse.org
+
+- Update to version 1.5.6:
+ + Potentially incompatible (Bustle and similar debugging tools
+ will need changes to work as intended):
+ - Do not allow match rules to "eavesdrop" (receive messages
+ intended for a different recipient) by mistake: eavesdroppers
+ must now opt-in to this behaviour by putting
+ "eavesdrop='true'" in the match rule, which will not have any
+ practical effect on buses where eavesdropping is not allowed
+ (fdo#37890)
+ + Other changes:
+ - D-Bus Specification version 0.18 (fdo#37890, fdo#39450,
+ fdo#38252):
+ . add the "eavesdrop" keyword to match rules
+ . define eavesdropping, unicast messages and broadcast messages
+ . stop claiming that match rules are needed to match unicast
+ messages to you
+ . promote the type system to be a top-level section
+ - Use DBUS_ERROR_OBJECT_PATH_IN_USE if
+ dbus_connection_try_register_object_path or
+ dbus_connection_try_register_fallback fails, not
+ ...ADDRESS_IN_USE, and simplify object-path registration
+ (fdo#38874)
+ - Consistently use atomic operations on everything that is ever
+ manipulated via atomic ops, as was done for changes to
+ DBusConnection's refcount in 1.4.12 (fdo#38005)
+ - Fix a file descriptor leak when connecting to a TCP socket
+ (fdo#37258)
+ - Make "make check" in a clean tree work, by not running tests
+ until test data has been set up (fdo#34405)
+ - The dbus-daemon no longer busy-loops if it has a very large
+ number of file descriptors (fdo#23194)
+ - Refactor message flow through dispatching to avoid locking
+ violations if the bus daemon's message limit is hit; remove
+ the per-connection link cache, which was meant to improve
+ performance, but now reduces it (fdo#34393)
+ - Some cmake fixes
+ - Remove dead code, mainly from DBusString (fdo#38570,
+ fdo#39610)
+ - Stop storing two extra byte order indicators in each D-Bus
+ message (fdo#38287)
+ - Add an optional Stats interface which can be used to get
+ statistics from a running dbus-daemon if enabled at configure
+ time with --enable-stats (fdo#34040)
+ - Fix various typos (fdo#27227, fdo#38284)
+ - Documentation (fdo#36156):
+ . let xsltproc be overridden as usual: ./configure
+ XSLTPROC=myxsltproc
+ . install more documentation automatically, including
+ man2html output
+ . put dbus.devhelp in the right place (it must go in
+ ${htmldir})
+ - Unix-specific:
+ . look for system services in /lib/dbus-1/system-services in
+ addition to all the other well-known locations; note that
+ this should always be /lib, even on platforms where shared
+ libraries on the root FS would go in /lib64,
+ /lib/x86_64-linux-gnu or similar (fdo#35229)
+ . opt-in to fd passing on Solaris (fdo#33465)
+ - Windows-specific:
+ . fix use of a mutex for autolaunch server detection
+ . don't crash on malloc failure in
+ _dbus_printf_string_upper_bound
+- Manually create /lib/dbus-1/system-services in %install so that
+ we can own it.
+
+-------------------------------------------------------------------
+Fri Jul 1 10:07:55 CEST 2011 - vuntz(a)opensuse.org
+
+- Update to version 1.5.4:
+ + Security (local denial of service):
+ - Byte-swap foreign-endian messages correctly, preventing a
+ long-standing local DoS if foreign-endian messages are
+ relayed through the dbus-daemon (fdo#38120, deb#629938, no
+ CVE number yet)
+ + New things:
+ - The constant to use for an infinite timeout now has a name,
+ DBUS_TIMEOUT_INFINITE.
+ - If GLib and DBus-GLib are already installed, more tests will be built,
+ providing better coverage.(fdo#34570)
+ + Changes:
+ - Consistently use atomic operations for the DBusConnection's
+ refcount, fixing potential threading problems (fdo#38005)
+ - Don't use -Wl,--gc-sections by default: in practice the size
+ decrease is small (300KiB on x86-64) and it frequently
+ doesn't work in unusual toolchains. (fdo#33466)
+ - Use #!/bin/sh for run-with-tmp-session-bus.sh, making it work
+ on *BSD (fdo#35880)
+ - Use ln -fs to set up dbus for systemd, which should fix
+ reinstallation when not using a DESTDIR (fdo#37870)
+ - Windows-specific changes:
+ . don't try to build dbus-daemon-launch-helper (fdo#37838)
+- Changes from version 1.5.2:
+ + Notes for distributors:
+ - This version of D-Bus no longer uses -fPIE by default.
+ + Changes:
+ + D-Bus Specification v0.17
+ . Reserve the extra characters used in signatures by GVariant
+ (fdo#34529)
+ . Define the ObjectManager interface (fdo#34869)
+ + Don't force -fPIE: distributions and libtool know better than
+ we do whether it's desirable (fdo#16621, fdo#27215)
+ + Allow --disable-gc-sections, in case your toolchain offers
+ the -ffunction-sections, -fdata-sections and
+ -Wl,--gc-sections options but they're broken, as seen on
+ Solaris (fdo#33466)
+ + Install dbus-daemon and dbus-daemon-launch-helper in a more
+ normal way (fdo#14512)
+ + Ensure that maintainers upload documentation with the right
+ permissions (fdo#36130)
+ + Don't force users of libdbus to be linked against
+ -lpthread, -lrt (fdo#32827)
+ + Log system-bus activation information to syslog (fdo#35705)
+ + Log messages dropped due to quotas to syslog (fdo#35358)
+ + Make the nonce-tcp transport work on Unix (fdo#34569)
+ + On Unix, if /var/lib/dbus/machine-id cannot be read, try
+ /etc/machine-id (fdo#35228)
+ + In the regression tests, don't report fds as "leaked" if they
+ were open on startup (fdo#35173)
+ + Make dbus-monitor bail out if asked to monitor more than one
+ bus, rather than silently using the last one (fdo#26548)
+ + Clarify documentation (fdo#35182)
+ + Clean up minor dead code and some incorrect error handling
+ (fdo#33128, fdo#29881)
+ + Check that compiler options are supported before using them
+ (fdo#19681)
+ + Windows:
+ . Remove obsolete workaround for winioctl.h (fdo#35083)
+
+-------------------------------------------------------------------
+Tue Jun 28 08:03:00 UTC 2011 - aj(a)suse.de
+
+- Fix filelist to own a directory.
+- Do not package html files twice.
+
+-------------------------------------------------------------------
+Wed May 18 14:04:24 UTC 2011 - coolo(a)novell.com
+
+- buildrequire update-desktop-files for mimetypes.prov
+
+-------------------------------------------------------------------
++++ 1398 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.1:Update/.dbus-1.1001.new/dbus-1.changes
New:
----
baselibs.conf
dbus-1-x11.changes
dbus-1-x11.spec
dbus-1-x11.spec.in
dbus-1.5.8.tar.gz
dbus-1.changes
dbus-1.desktop
dbus-1.spec
dbus-cve-2012-3524-1.patch
dbus-cve-2012-3524-2.patch
dbus-cve-2012-3524-3.patch
dbus-cve-2012-3524-4.patch
dbus-do-autolaunch.patch
dbus-log-deny.patch
dbus_at_console.ck
pre_checkin.sh
rc.boot.dbus
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
#
# spec file for package dbus-1-x11
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: dbus-1-x11
%define _name dbus
BuildRequires: xorg-x11-devel
Url: http://dbus.freedesktop.org/
Summary: D-Bus Message Bus System
License: GPL-2.0+ or AFL-2.1
Group: System/Daemons
# COMMON1-BEGIN
# COMMON1-BEGIN
BuildRequires: audit-devel
BuildRequires: doxygen
BuildRequires: libexpat-devel
BuildRequires: libtool
BuildRequires: libzio
BuildRequires: pkg-config
BuildRequires: update-desktop-files
Version: 1.5.8
Release: 0
# bug437293
%ifarch ppc64
Obsoletes: dbus-1-64bit
%endif
#
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
Source1: rc.boot.dbus
Source2: dbus-1.desktop
Source3: dbus_at_console.ck
Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo(a)suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
Patch2: dbus-cve-2012-3524-1.patch
Patch3: dbus-cve-2012-3524-2.patch
Patch4: dbus-cve-2012-3524-3.patch
Patch5: dbus-cve-2012-3524-4.patch
%if 0%{?suse_version} > 1100
%bcond_without selinux
%else
%bcond_with selinux
%endif
%if %{with selinux}
BuildRequires: libselinux-devel
%endif
BuildRequires: libcap-ng-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# COMMON1-END
# COMMON1-END
%description
D-Bus contains some tools that require Xlib to be installed, those are
in this separate package so server systems need not install X.
%prep
# COMMON2-BEGIN
# COMMON2-BEGIN
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
autoreconf -fi
export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC"
export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
%if 0%{?suse_version} > 1000
export CFLAGS="$CFLAGS -fstack-protector"
export CXXFLAGS="$CXXFLAGS -fstack-protector"
export V=1
%endif
%configure \
--disable-static \
--with-pic \
--bindir=/bin \
--libexecdir=/lib/%{name} \
--libdir=/%{_lib} \
--with-init-scripts=suse \
--enable-inotify \
--enable-doxygen-docs \
%if %{with selinux}
--enable-selinux \
%endif
--enable-libaudit \
--with-console-auth-dir=/var/run/dbus/at_console/ \
--with-systemdsystemunitdir=/lib/systemd/system
make %{?_smp_mflags}
doxygen -u && doxygen
./cleanup-man-pages.sh
%install
# COMMON2-END
# COMMON2-END
tdir=$(mktemp -d)
make DESTDIR=$tdir install
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_mandir}/man1
mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir}
mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1
rm -rf $tdir
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
%{_bindir}/dbus-launch
%{_mandir}/man1/dbus-launch.1*
%changelog
++++++ dbus-1.spec ++++++
#
# spec file for package dbus-1
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: dbus-1
%define _name dbus
Url: http://dbus.freedesktop.org/
Summary: D-Bus Message Bus System
License: GPL-2.0+ or AFL-2.1
Group: System/Daemons
# COMMON1-BEGIN
BuildRequires: audit-devel
BuildRequires: doxygen
BuildRequires: libexpat-devel
BuildRequires: libtool
BuildRequires: libzio
BuildRequires: pkg-config
BuildRequires: update-desktop-files
Version: 1.5.8
Release: 0
# bug437293
%ifarch ppc64
Obsoletes: dbus-1-64bit
%endif
#
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
Source1: rc.boot.dbus
Source2: dbus-1.desktop
Source3: dbus_at_console.ck
Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo(a)suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
Patch2: dbus-cve-2012-3524-1.patch
Patch3: dbus-cve-2012-3524-2.patch
Patch4: dbus-cve-2012-3524-3.patch
Patch5: dbus-cve-2012-3524-4.patch
%if 0%{?suse_version} > 1100
%bcond_without selinux
%else
%bcond_with selinux
%endif
%if %{with selinux}
BuildRequires: libselinux-devel
%endif
BuildRequires: libcap-ng-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# COMMON1-END
PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd /sbin/insserv /etc/init.d/boot.localfs
%package -n dbus-1-devel
Summary: Developer package for D-Bus
Group: Development/Libraries/Other
Requires: %{name} = %{version}
Requires: glibc-devel
%package -n dbus-1-devel-doc
Summary: Developer documentation package for D-Bus
Group: Development/Libraries/Other
Requires: %{name} = %{version}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description
D-Bus is a message bus system, a simple way for applications to talk to
one another. D-Bus supplies both a system daemon and a
per-user-login-session daemon. Also, the message bus is built on top of
a general one-to-one message passing framework, which can be used by
any two apps to communicate directly (without going through the message
bus daemon).
%description -n dbus-1-devel
D-Bus is a message bus system, a simple way for applications to talk to
one another. D-Bus supplies both a system daemon and a
per-user-login-session daemon. Also, the message bus is built on top of
a general one-to-one message passing framework, which can be used by
any two apps to communicate directly (without going through the message
bus daemon).
%description -n dbus-1-devel-doc
D-Bus is a message bus system, a simple way for applications to talk to
one another. D-BUS supplies both a system daemon and a
per-user-login-session daemon. Also, the message bus is built on top of
a general one-to-one message passing framework, which can be used by
any two apps to communicate directly (without going through the message
bus daemon).
%prep
# COMMON2-BEGIN
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
autoreconf -fi
export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC"
export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
%if 0%{?suse_version} > 1000
export CFLAGS="$CFLAGS -fstack-protector"
export CXXFLAGS="$CXXFLAGS -fstack-protector"
export V=1
%endif
%configure \
--disable-static \
--with-pic \
--bindir=/bin \
--libexecdir=/lib/%{name} \
--libdir=/%{_lib} \
--with-init-scripts=suse \
--enable-inotify \
--enable-doxygen-docs \
%if %{with selinux}
--enable-selinux \
%endif
--enable-libaudit \
--with-console-auth-dir=/var/run/dbus/at_console/ \
--with-systemdsystemunitdir=/lib/systemd/system
make %{?_smp_mflags}
doxygen -u && doxygen
./cleanup-man-pages.sh
%install
# COMMON2-END
make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/etc/init.d
mkdir -p %{buildroot}/usr/sbin
install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus
install -d %{buildroot}/%{_localstatedir}/run/dbus
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
install -m 0644 %SOURCE2 \
%{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
mkdir -p %{buildroot}/lib/dbus-1/system-services
mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services
mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
mv -f %{buildroot}/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/
rm -f %{buildroot}/%{_lib}/*.la
# devel stuff must not be in /lib
%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so
%{__rm} -v %{buildroot}/%{_lib}/lib%{name}.so
# fix up pkgconfig file
sed -e 's@^\(libdir=\).*@\1%{_libdir}@' %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc
#
rm -f %{buildroot}/bin/dbus-launch
rm -f %{buildroot}/%{_mandir}/man1/dbus-launch.1*
chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
#
install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
%pre
/usr/sbin/groupadd -r messagebus 2> /dev/null || :
/usr/sbin/useradd -r -o -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || :
%if 0%{?suse_version:1}
%preun
%{stop_on_removal dbus}
%post
/bin/dbus-uuidgen --ensure
%{insserv_force_if_yast dbus}
/sbin/ldconfig
%{run_permissions}
%verifyscript
%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
%postun
%{insserv_cleanup}
/sbin/ldconfig
%endif
%files
%defattr(-, root, root)
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
%dir %{_datadir}/dbus-1/interfaces
%dir %{_localstatedir}/lib/dbus
%dir /lib/dbus-1
%dir /lib/dbus-1/system-services
%doc AUTHORS COPYING HACKING NEWS README
%dir %{_sysconfdir}/dbus-1
%dir %{_sysconfdir}/dbus-1/session.d
%dir %{_sysconfdir}/dbus-1/system.d
%config(noreplace) %{_sysconfdir}/dbus-1/session.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.conf
%{_sysconfdir}/init.d/dbus
%{_sysconfdir}/ConsoleKit
/bin/dbus-cleanup-sockets
/bin/dbus-daemon
/bin/dbus-monitor
/bin/dbus-send
/bin/dbus-uuidgen
/%{_lib}/libdbus-1.so.*
%{_mandir}/man1/dbus-cleanup-sockets.1.*
%{_mandir}/man1/dbus-daemon.1.*
%{_mandir}/man1/dbus-monitor.1.*
%{_mandir}/man1/dbus-send.1.*
%{_mandir}/man1/dbus-uuidgen.1.*
%{_sbindir}/rcdbus
# See doc/system-activation.txt in source tarball for the rationale
# behind these permissions
%attr(4750,root,messagebus) %verify(not mode) /lib/%{name}/dbus-daemon-launch-helper
%ghost %{_localstatedir}/run/dbus
%ghost %{_localstatedir}/lib/dbus/machine-id
%dir /lib/systemd
%dir /lib/systemd/system
/lib/systemd/system/dbus.service
/lib/systemd/system/dbus.socket
%dir /lib/systemd/system/dbus.target.wants
/lib/systemd/system/dbus.target.wants/dbus.socket
%dir /lib/systemd/system/multi-user.target.wants
/lib/systemd/system/multi-user.target.wants/dbus.service
%dir /lib/systemd/system/sockets.target.wants
/lib/systemd/system/sockets.target.wants/dbus.socket
%files -n dbus-1-devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/libdbus-1.so
%dir %{_libdir}/dbus-1.0
%{_libdir}/dbus-1.0/include
%{_libdir}/pkgconfig/dbus-1.pc
%files -n dbus-1-devel-doc
%defattr(-,root,root)
%dir %{_datadir}/doc/dbus
%{_datadir}/doc/dbus/api/
%doc %{_datadir}/doc/dbus/dbus-faq.html
%doc %{_datadir}/doc/dbus/dbus-specification.html
%doc %{_datadir}/doc/dbus/dbus-test-plan.html
%doc %{_datadir}/doc/dbus/dbus-tutorial.html
%doc %{_datadir}/doc/dbus/diagram.*
%doc %{_datadir}/doc/dbus/system-activation.txt
%doc doc/*.txt doc/file-boilerplate.c doc/TODO
%{_datadir}/susehelp
%changelog
++++++ baselibs.conf ++++++
dbus-1
dbus-1-devel
++++++ dbus-1-x11.spec.in ++++++
#
# spec file for package dbus-1-x11 (Version 1.4.1)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: dbus-1-x11
%define _name dbus
BuildRequires: xorg-x11-devel
Url: http://dbus.freedesktop.org/
License: GPL2+ or AFL 2.1
Group: System/Daemons
Summary: D-Bus Message Bus System
# COMMON1-BEGIN
# COMMON1-END
%description
D-Bus contains some tools that require Xlib to be installed, those are
in this separate package so server systems need not install X.
%prep
# COMMON2-BEGIN
# COMMON2-END
tdir=$(mktemp -d)
make DESTDIR=$tdir install
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_mandir}/man1
mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir}
mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1
rm -rf $tdir
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
%{_bindir}/dbus-launch
%{_mandir}/man1/dbus-launch.1*
%changelog
++++++ dbus-1.desktop ++++++
[Desktop Entry]
Name=D-Bus API Documentation
DocPath=/usr/share/doc/packages/dbus-1-devel/html/index.html
X-DOC-SearchMethod=htdig
++++++ dbus-cve-2012-3524-1.patch ++++++
diff -urN a/configure.ac b/configure.ac
--- a/configure.ac 2012-10-10 14:40:44.400318811 +0200
+++ b/configure.ac 2012-10-10 14:40:56.523041459 +0200
@@ -570,7 +570,7 @@
AC_SEARCH_LIBS(socket,[socket network])
AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
-AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull)
+AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull __secure_getenv)
AC_CHECK_HEADERS([syslog.h])
if test "x$ac_cv_header_syslog_h" = "xyes"; then
diff -urN a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
--- a/dbus/dbus-keyring.c 2012-10-10 14:40:44.331320050 +0200
+++ b/dbus/dbus-keyring.c 2012-10-10 14:40:56.523041459 +0200
@@ -717,6 +717,13 @@
DBusCredentials *our_credentials;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
+ if (_dbus_check_setuid ())
+ {
+ dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
+ "Unable to create DBus keyring when setuid");
+ return NULL;
+ }
keyring = NULL;
error_set = FALSE;
diff -urN a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
--- a/dbus/dbus-sysdeps.c 2012-10-10 14:40:44.351319935 +0200
+++ b/dbus/dbus-sysdeps.c 2012-10-10 14:40:56.526041358 +0200
@@ -182,6 +182,11 @@
const char*
_dbus_getenv (const char *varname)
{
+ /* Don't respect any environment variables if the current process is
+ * setuid. This is the equivalent of glibc's __secure_getenv().
+ */
+ if (_dbus_check_setuid ())
+ return NULL;
return getenv (varname);
}
diff -urN a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
--- a/dbus/dbus-sysdeps.h 2012-10-10 14:40:44.331320050 +0200
+++ b/dbus/dbus-sysdeps.h 2012-10-10 14:40:56.528041293 +0200
@@ -87,6 +87,7 @@
void _dbus_abort (void) _DBUS_GNUC_NORETURN;
+dbus_bool_t _dbus_check_setuid (void);
const char* _dbus_getenv (const char *varname);
dbus_bool_t _dbus_setenv (const char *varname,
const char *value);
diff -urN a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
--- a/dbus/dbus-sysdeps-unix.c 2012-10-10 14:40:44.360319729 +0200
+++ b/dbus/dbus-sysdeps-unix.c 2012-10-10 14:40:56.526041358 +0200
@@ -3349,6 +3349,13 @@
DBusString uuid;
dbus_bool_t retval;
+ if (_dbus_check_setuid ())
+ {
+ dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
+ "Unable to autolaunch when setuid");
+ return FALSE;
+ }
+
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
retval = FALSE;
@@ -3466,6 +3473,13 @@
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
+ if (_dbus_check_setuid ())
+ {
+ dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
+ "Unable to find launchd socket when setuid");
+ return FALSE;
+ }
+
i = 0;
argv[i] = "launchctl";
++i;
@@ -3506,6 +3520,13 @@
dbus_bool_t valid_socket;
DBusString socket_path;
+ if (_dbus_check_setuid ())
+ {
+ dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
+ "Unable to find launchd socket when setuid");
+ return FALSE;
+ }
+
if (!_dbus_string_init (&socket_path))
{
_DBUS_SET_OOM (error);
@@ -3963,4 +3984,57 @@
return configure_time_path;
}
+/**
+ * **NOTE**: If you modify this function, please also consider making
+ * the corresponding change in GLib. See
+ * glib/gutils.c:g_check_setuid().
+ *
+ * Returns TRUE if the current process was executed as setuid (or an
+ * equivalent __libc_enable_secure is available). See:
+ * http://osdir.com/ml/linux.lfs.hardened/2007-04/msg00032.html
+ */
+dbus_bool_t
+_dbus_check_setuid (void)
+{
+ /* TODO: get __libc_enable_secure exported from glibc.
+ * See http://www.openwall.com/lists/owl-dev/2012/08/14/1
+ */
+#if 0 && defined(HAVE_LIBC_ENABLE_SECURE)
+ {
+ /* See glibc/include/unistd.h */
+ extern int __libc_enable_secure;
+ return __libc_enable_secure;
+ }
+#elif defined(HAVE_ISSETUGID)
+ /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */
+ return issetugid ();
+#else
+ uid_t ruid, euid, suid; /* Real, effective and saved user ID's */
+ gid_t rgid, egid, sgid; /* Real, effective and saved group ID's */
+
+ static dbus_bool_t check_setuid_initialised;
+ static dbus_bool_t is_setuid;
+
+ if (_DBUS_UNLIKELY (!check_setuid_initialised))
+ {
+#ifdef HAVE_GETRESUID
+ if (getresuid (&ruid, &euid, &suid) != 0 ||
+ getresgid (&rgid, &egid, &sgid) != 0)
+#endif /* HAVE_GETRESUID */
+ {
+ suid = ruid = getuid ();
+ sgid = rgid = getgid ();
+ euid = geteuid ();
+ egid = getegid ();
+ }
+
+ check_setuid_initialised = TRUE;
+ is_setuid = (ruid != euid || ruid != suid ||
+ rgid != egid || rgid != sgid);
+
+ }
+ return is_setuid;
+#endif
+}
+
/* tests in dbus-sysdeps-util.c */
diff -urN a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
--- a/dbus/dbus-sysdeps-win.c 2012-10-10 14:40:44.343319996 +0200
+++ b/dbus/dbus-sysdeps-win.c 2012-10-10 14:40:56.526041358 +0200
@@ -3593,6 +3593,12 @@
return FALSE;
}
+dbus_bool_t
+_dbus_check_setuid (void)
+{
+ return FALSE;
+}
+
/** @} end of sysdeps-win */
/* tests in dbus-sysdeps-util.c */
++++++ dbus-cve-2012-3524-2.patch ++++++
>From 4b351918b9f70eaedbdb3ab39208bc1f131efae0 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters(a)verbum.org>
Date: Fri, 28 Sep 2012 01:35:22 +0000
Subject: hardening: Ensure _dbus_check_setuid() is initialized threadsafe manner
This is a highly theoretical concern, but we might as well.
https://bugs.freedesktop.org/show_bug.cgi?id=52202
---
diff --git a/dbus/dbus-sysdeps-pthread.c b/dbus/dbus-sysdeps-pthread.c
index c9ec9e5..c60457b 100644
--- a/dbus/dbus-sysdeps-pthread.c
+++ b/dbus/dbus-sysdeps-pthread.c
@@ -275,6 +275,11 @@ check_monotonic_clock (void)
dbus_bool_t
_dbus_threads_init_platform_specific (void)
{
+ /* These have static variables, and we need to handle both the case
+ * where dbus_threads_init() has been called and when it hasn't;
+ * so initialize them before any threads are allowed to enter.
+ */
check_monotonic_clock ();
+ (void) _dbus_check_setuid ();
return dbus_threads_init (&pthread_functions);
}
--
cgit v0.9.0.2-2-gbebe
++++++ dbus-cve-2012-3524-3.patch ++++++
>From 57ae3670508bbf4ec57049de47c9cae727a64802 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters(a)verbum.org>
Date: Fri, 28 Sep 2012 16:01:56 +0000
Subject: hardening: Remove activation helper handling for DBUS_VERBOSE
It's not really useful.
See https://bugs.freedesktop.org/show_bug.cgi?id=52202#c17
---
diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index ab9d601..7864e0f 100644
--- a/bus/activation-helper.c
+++ b/bus/activation-helper.c
@@ -140,17 +140,11 @@ out_all:
return desktop_file;
}
-/* Cleares the environment, except for DBUS_VERBOSE and DBUS_STARTER_x */
+/* Clears the environment, except for DBUS_STARTER_x */
static dbus_bool_t
clear_environment (DBusError *error)
{
const char *starter_env = NULL;
-#ifdef DBUS_ENABLE_VERBOSE_MODE
- const char *debug_env = NULL;
-
- /* are we debugging */
- debug_env = _dbus_getenv ("DBUS_VERBOSE");
-#endif
/* we save the starter */
starter_env = _dbus_getenv ("DBUS_STARTER_ADDRESS");
@@ -165,12 +159,6 @@ clear_environment (DBusError *error)
}
#endif
-#ifdef DBUS_ENABLE_VERBOSE_MODE
- /* restore the debugging environment setting if set */
- if (debug_env)
- _dbus_setenv ("DBUS_VERBOSE", debug_env);
-#endif
-
/* restore the starter */
if (starter_env)
_dbus_setenv ("DBUS_STARTER_ADDRESS", starter_env);
--
cgit v0.9.0.2-2-gbebe
++++++ dbus-cve-2012-3524-4.patch ++++++
>From f68dbdc3e6f895012ce33939fb524accf31bcca5 Mon Sep 17 00:00:00 2001
From: Geoffrey Thomas <gthomas(a)mokafive.com>
Date: Fri, 28 Sep 2012 05:02:06 +0000
Subject: activation-helper: Ensure DBUS_STARTER_ADDRESS is set correctly
The fix for CVE-2012-3524 filters out all environment variables if
libdbus is used from a setuid program, to prevent various spoofing
attacks.
Unfortunately, the activation helper is a setuid program linking
libdbus, and this creates a regression for launched programs using
DBUS_STARTER_ADDRESS, since it will no longer exist.
Fix this by hardcoding the starter address to the default system bus
address.
Signed-off-by: Geoffrey Thomas <gthomas(a)mokafive.com>
Signed-off-by: Colin Walters <walters(a)verbum.org>
---
diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index 7864e0f..cbc00d2 100644
--- a/bus/activation-helper.c
+++ b/bus/activation-helper.c
@@ -140,15 +140,12 @@ out_all:
return desktop_file;
}
-/* Clears the environment, except for DBUS_STARTER_x */
+/* Clears the environment, except for DBUS_STARTER_x,
+ * which we hardcode to the system bus.
+ */
static dbus_bool_t
clear_environment (DBusError *error)
{
- const char *starter_env = NULL;
-
- /* we save the starter */
- starter_env = _dbus_getenv ("DBUS_STARTER_ADDRESS");
-
#ifndef ACTIVATION_LAUNCHER_TEST
/* totally clear the environment */
if (!_dbus_clearenv ())
@@ -159,11 +156,8 @@ clear_environment (DBusError *error)
}
#endif
- /* restore the starter */
- if (starter_env)
- _dbus_setenv ("DBUS_STARTER_ADDRESS", starter_env);
-
- /* set the type, which must be system if we got this far */
+ /* Ensure the bus is set to system */
+ _dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS);
_dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system");
return TRUE;
--
cgit v0.9.0.2-2-gbebe
++++++ dbus-do-autolaunch.patch ++++++
From: Stephan Kulow <coolo(a)suse.de>
We want x11 autolaunch even if we have no x11 in the build environment
Index: dbus-1.5.8/dbus/dbus-sysdeps-unix.c
===================================================================
--- dbus-1.5.8.orig/dbus/dbus-sysdeps-unix.c 2011-09-21 19:20:06.000000000 +0200
+++ dbus-1.5.8/dbus/dbus-sysdeps-unix.c 2011-10-12 11:39:26.099779864 +0200
@@ -3339,7 +3339,7 @@ _dbus_get_autolaunch_address (const char
DBusString *address,
DBusError *error)
{
-#ifdef DBUS_ENABLE_X11_AUTOLAUNCH
+#if 1
/* Perform X11-based autolaunch. (We also support launchd-based autolaunch,
* but that's done elsewhere, and if it worked, this function wouldn't
* be called.) */
++++++ dbus-log-deny.patch ++++++
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -48,7 +48,7 @@
<!-- Holes must be punched in service configuration files for
name ownership and sending method calls -->
<deny own="*"/>
- <deny send_type="method_call"/>
+ <deny send_type="method_call" log="true"/>
<!-- Signals and reply messages (method returns, errors) are allowed
by default -->
++++++ dbus_at_console.ck ++++++
#!/bin/bash
#
# use consolekit to support legacy at_console setting
#
reason="$1"
dir=/var/run/dbus/at_console
# for at_console we are only interested in local sessions
test "$CK_SESSION_IS_LOCAL" = true || exit 0
test "$reason" = "session_added" -o "$reason" = "session_removed" || exit 0
sessid=${CK_SESSION_ID##*/}
sessid=${sessid//[^A-Za-z0-9]/_}
test -n "$sessid" || exit 1
name=`getent passwd "$CK_SESSION_USER_UID" 2>/dev/null | awk -F: '{print $1}'`
test -n "$name" || exit 1
if test "$reason" = "session_added"; then
mkdir -p "$dir/$name"
touch "$dir/$name/$sessid"
else
rm "$dir/$name/$sessid"
rmdir "$dir/$name"
fi
++++++ pre_checkin.sh ++++++
#!/bin/bash
# vim:sw=4 et
# This script is called automatically during autobuild checkin.
cp -lf dbus-1.changes dbus-1-x11.changes
for spec in dbus-1-x11.spec; do
cp -f $spec.in $spec
for n in $(seq 1 10); do
grep -q "COMMON$n-BEGIN" dbus-1.spec || continue
{ sed -n -e "1,/COMMON$n-BEGIN/p" $spec
sed -n -e "/COMMON$n-BEGIN/,/COMMON$n-END/p" dbus-1.spec
sed -n -e "/COMMON$n-END/,\$p" $spec.in; } > $spec.tmp && mv $spec.tmp $spec
done
# assuming hilbert has no such dir
#if test -x /mounts/work/src/bin/tools/prepare_spec; then
# /mounts/work/src/bin/tools/prepare_spec $spec > $spec.tmp && mv $spec.tmp $spec
#fi
done
osc service localrun format_spec_file
++++++ rc.boot.dbus ++++++
#!/bin/sh
# Author: Timo Hoenig <thoenig(a)suse.de>
#
# /etc/init.d/dbus
#
### BEGIN INIT INFO
# Provides: dbus
# Required-Start: $local_fs
# Should-Start:
# Required-Stop: $local_fs
# Should-Stop:
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: D-Bus is a message bus system for applications to talk to one another.
# Description: D-Bus supplies both a system daemon and a per-user-login-session daemon.
# Also, the message bus is built on top of a general one-to-one message
# passing framework, which can be used by any two apps to communicate
# directly (without going through the message bus daemon).
### END INIT INFO
DBUS_DAEMON_BIN=/bin/dbus-daemon
test -x $DBUS_DAEMON_BIN || exit 5
DBUS_DAEMON_PARAMETER="--system";
DBUS_DAEMON_PID_DIR="/var/run/dbus"
DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid
DBUS_MACHINE_ID_DIR="/var/lib/dbus"
DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id
DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen
CONSOLEKIT_DAEMON_BIN="/usr/sbin/console-kit-daemon"
CONSOLEKIT_PID_DIR="/var/run/ConsoleKit"
CONSOLEKIT_PID=$CONSOLEKIT_PID_DIR/pid
# Source LSB init functions
# providing start_daemon, killproc, pidofproc,
# log_success_msg, log_failure_msg and log_warning_msg.
# This is currently not used by UnitedLinux based distributions and
# not needed for init scripts for UnitedLinux only. If it is used,
# the functions from rc.status should not be sourced or used.
#. /lib/lsb/init-functions
. /etc/rc.status
# Reset status of this service
rc_reset
case "$1" in
start)
if [ -x $DBUS_UUIIDGEN_BIN -a ! -e $DBUS_MACHINE_ID ] ; then
if [ ! -d $DBUS_MACHINE_ID_DIR ] ; then
mkdir -p $DBUS_MACHINE_ID_DIR
chown messagebus:messagebus $DBUS_MACHINE_ID_DIR
fi
echo -n "Creating universally unique ID..."
$DBUS_UUIIDGEN_BIN --ensure
rc_status -v
fi
if checkproc -k -p $DBUS_DAEMON_PID $DBUS_DAEMON_BIN ; then
echo "D-Bus already started. Not starting."
exit 0
fi
if [ ! -d $DBUS_DAEMON_PID_DIR ] ; then
mkdir -p $DBUS_DAEMON_PID_DIR
chown messagebus:messagebus $DBUS_DAEMON_PID_DIR
fi
if [ -e $DBUS_DAEMON_PID ] ; then
echo "Removing stale PID file $DBUS_DAEMON_PID."
rm -f $DBUS_DAEMON_PID
fi
echo -n "Starting D-Bus daemon"
start_daemon -f $DBUS_DAEMON_BIN $DBUS_DAEMON_PARAMETER
rc_status -v
;;
stop)
echo -n "Shutting down D-Bus daemon"
if [ -x $CONSOLEKIT_DAEMON_BIN ] ; then
killproc -p $CONSOLEKIT_PID -TERM $CONSOLEKIT_DAEMON_BIN
fi
killproc -p $DBUS_DAEMON_PID -TERM $DBUS_DAEMON_BIN
rc_status -v
;;
try-restart)
$0 status >/dev/null && $0 restart
rc_status
;;
restart)
$0 stop
$0 start
rc_status
;;
force-reload)
$0 reload
rc_status
;;
reload)
echo -n "Reload service D-Bus daemon"
dbus-send --type=method_call --system --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
rc_status -v
;;
status)
echo -n "Checking for service D-Bus daemon"
checkproc -k -p $DBUS_DAEMON_PID $DBUS_DAEMON_BIN
if [ $? -eq 7 ]; then
rc_failed 3
fi
rc_status -v
;;
probe)
## Optional: Probe for the necessity of a reload, print out the
## argument to this init script which is required for a reload.
## Note: probe is not (yet) part of LSB (as of 1.2)
# test /etc/FOO/FOO.conf -nt /var/run/FOO.pid && echo reload
;;
*)
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
exit 1
;;
esac
rc_exit
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dbus-1-x11 for openSUSE:12.2:Update checked in at 2012-10-31 16:01:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/dbus-1-x11 (Old)
and /work/SRC/openSUSE:12.2:Update/.dbus-1-x11.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1-x11", Maintainer is "THoenig(a)suse.com"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.uY3h4J/_old 2012-10-31 16:01:02.000000000 +0100
+++ /var/tmp/diff_new_pack.uY3h4J/_new 2012-10-31 16:01:02.000000000 +0100
@@ -1 +1 @@
-<link package='dbus-1-x11.937' cicount='copy' />
+<link package='dbus-1-x11.1001' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dbus-1 for openSUSE:12.2:Update checked in at 2012-10-31 16:00:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/dbus-1 (Old)
and /work/SRC/openSUSE:12.2:Update/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1", Maintainer is "THoenig(a)suse.com"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.yzmBGF/_old 2012-10-31 16:01:00.000000000 +0100
+++ /var/tmp/diff_new_pack.yzmBGF/_new 2012-10-31 16:01:00.000000000 +0100
@@ -1 +1 @@
-<link package='dbus-1.937' cicount='copy' />
+<link package='dbus-1.1001' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0