Author: baggins Date: Wed Feb 1 12:07:19 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- started update to 10.0
---- Files affected:
packages/xulrunner:
xulrunner-ppc.patch (1.1 -> 1.2) , xulrunner-rpath.patch (1.6 -> 1.7) ,
xulrunner-ssl_oldapi.patch (1.3 -> 1.4) , xulrunner.spec (1.209 -> 1.210)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner-ppc.patch
diff -u packages/xulrunner/xulrunner-ppc.patch:1.1
packages/xulrunner/xulrunner-ppc.patch:1.2
--- packages/xulrunner/xulrunner-ppc.patch:1.1 Fri Jul 3 15:31:55 2009
+++ packages/xulrunner/xulrunner-ppc.patch Wed Feb 1 13:07:13 2012
@@ -1,9 +1,9 @@
--- mozilla/xpcom/glue/nsTArray.h~ 2009-06-29 18:15:32.000000000 +0200
+++ mozilla/xpcom/glue/nsTArray.h 2009-07-02 09:49:47.623908821 +0200
@@ -43,7 +43,14 @@
- #include "nsQuickSort.h"
#include "nsDebug.h"
#include "nsTraceRefcnt.h"
+ #include "mozilla/Util.h"
+#ifdef inline
+#define crappy_inline inline
+#undef inline
================================================================
Index: packages/xulrunner/xulrunner-rpath.patch
diff -u packages/xulrunner/xulrunner-rpath.patch:1.6
packages/xulrunner/xulrunner-rpath.patch:1.7
--- packages/xulrunner/xulrunner-rpath.patch:1.6 Wed Jan 18 20:04:50 2012
+++ packages/xulrunner/xulrunner-rpath.patch Wed Feb 1 13:07:13 2012
@@ -26,8 +26,8 @@
endif
GENERATE_CACHE = \
-- $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g
"$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call
core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e
"populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');"
&& \
-+
LD_PRELOAD=$(LIBXUL_DIST)/lib/libxpcom.so:$(LIBXUL_DIST)/lib/libmozalloc.so:$(LIBXUL_DIST)/lib/libxul.so:$(LIBXUL_DIST)/lib/libmozjs.so
$(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g
"$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call
core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e
"populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');"
&& \
+- $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g
"$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call
core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e
"populate_startupcache('$(PRECOMPILE_DIR)', '$(OMNIJAR_NAME)',
'startupCache.zip');" && \
++
LD_PRELOAD=$(LIBXUL_DIST)/lib/libxpcom.so:$(LIBXUL_DIST)/lib/libmozalloc.so:$(LIBXUL_DIST)/lib/libxul.so:$(LIBXUL_DIST)/lib/libmozjs.so
$(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g
"$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call
core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e
"populate_startupcache('$(PRECOMPILE_DIR)', '$(OMNIJAR_NAME)',
'startupCache.zip');" && \
rm -rf jsloader && \
$(UNZIP) startupCache.zip && \
rm startupCache.zip && \
================================================================
Index: packages/xulrunner/xulrunner-ssl_oldapi.patch
diff -u packages/xulrunner/xulrunner-ssl_oldapi.patch:1.3
packages/xulrunner/xulrunner-ssl_oldapi.patch:1.4
--- packages/xulrunner/xulrunner-ssl_oldapi.patch:1.3 Thu Mar 24 12:15:48 2011
+++ packages/xulrunner/xulrunner-ssl_oldapi.patch Wed Feb 1 13:07:13 2012
@@ -198,7 +198,7 @@
#include "nsIBadCertListener2.h"
#include "nsISSLErrorListener.h"
#include "nsIObjectInputStream.h"
-@@ -899,6 +900,20 @@ void nsNSSSocketInfo::SetHandshakeInProgress(PRBool aIsIn)
+@@ -899,6 +900,20 @@ void nsNSSSocketInfo::SetHandshakeInProgress(bool aIsIn)
}
}
@@ -216,26 +216,26 @@
+ mBadCertUIStatus = aNewStatus;
+}
+
- void nsNSSSocketInfo::SetAllowTLSIntoleranceTimeout(PRBool aAllow)
+ void nsNSSSocketInfo::SetAllowTLSIntoleranceTimeout(bool aAllow)
{
mAllowTLSIntoleranceTimeout = aAllow;
-@@ -908,7 +923,8 @@ void nsNSSSocketInfo::SetAllowTLSIntoleranceTimeout(PRBool
aAllow)
+@@ -908,7 +923,8 @@ void nsNSSSocketInfo::SetAllowTLSIntoleranceTimeout(bool
aAllow)
- PRBool nsNSSSocketInfo::HandshakeTimeout()
+ bool nsNSSSocketInfo::HandshakeTimeout()
{
- if (!mHandshakeInProgress || !mAllowTLSIntoleranceTimeout)
+ if (!mHandshakeInProgress || !mAllowTLSIntoleranceTimeout ||
+ mBadCertUIStatus == bcuis_active)
- return PR_FALSE;
+ return false;
return ((PRIntervalTime)(PR_IntervalNow() - mHandshakeStartTime)
-@@ -1949,6 +1965,37 @@ isTLSIntoleranceError(PRInt32 err, PRBool
withInitialCleartext)
- return PR_FALSE;
+@@ -1949,6 +1965,37 @@ isTLSIntoleranceError(PRInt32 err, bool
withInitialCleartext)
+ return false;
}
-+static PRBool
++static bool
+isClosedConnectionAfterBadCertUIWasShown(PRInt32 bytesTransfered,
-+ PRBool wasReading,
++ bool wasReading,
+ PRInt32 err,
+ nsNSSSocketInfo::BadCertUIStatusType
aBadCertUIStatus)
+{
@@ -246,7 +246,7 @@
+ // Retry on a simple connection close.
+
+ if (wasReading && 0 == bytesTransfered)
-+ return PR_TRUE;
++ return true;
+
+ if (0 > bytesTransfered)
+ {
@@ -254,19 +254,19 @@
+ {
+ case PR_CONNECT_RESET_ERROR:
+ case PR_END_OF_FILE_ERROR:
-+ return PR_TRUE;
++ return true;
+ default:
+ break;
+ }
+ }
+ }
+
-+ return PR_FALSE;
++ return false;
+}
+
PRInt32
nsSSLThread::checkHandshake(PRInt32 bytesTransfered,
- PRBool wasReading,
+ bool wasReading,
@@ -2000,6 +2047,12 @@ nsSSLThread::checkHandshake(PRInt32 bytesTransfered,
return bytesTransfered;
}
@@ -313,21 +313,21 @@
+ NS_BADCERTLISTENER_CONTRACTID);
+ }
+ if (badCertHandler) {
-+ PRBool retVal = PR_TRUE;
++ bool retVal = true;
+ PRInt16 addType = nsIBadCertListener::UNINIT_ADD_FLAG;
+ nsIInterfaceRequestor *csi =
static_cast<nsIInterfaceRequestor*>(infoObject);
+ infoObject->SetBadCertUIStatus(nsNSSSocketInfo::bcuis_active);
+ if (remaining_display_errors &
nsICertOverrideService::ERROR_UNTRUSTED) {
+ rv = badCertHandler->ConfirmUnknownIssuer(csi, ix509, &addType,
&retVal);
-+ if (NS_FAILED(rv)) retVal = PR_FALSE;
++ if (NS_FAILED(rv)) retVal = false;
+ }
+ if (retVal && (remaining_display_errors &
nsICertOverrideService::ERROR_MISMATCH)) {
+ rv = badCertHandler->ConfirmMismatchDomain(csi, hostString, ix509,
&retVal);
-+ if (NS_FAILED(rv)) retVal = PR_FALSE;
++ if (NS_FAILED(rv)) retVal = false;
+ }
+ if (retVal && (remaining_display_errors &
nsICertOverrideService::ERROR_TIME)) {
+ rv = badCertHandler->ConfirmCertExpired(csi, ix509, &retVal);
-+ if (NS_FAILED(rv)) retVal = PR_FALSE;
++ if (NS_FAILED(rv)) retVal = false;
+ }
+ nsCOMPtr<nsICertOverrideService> overrideService =
+ do_GetService(NS_CERTOVERRIDE_CONTRACTID);
@@ -339,7 +339,7 @@
+ infoObject->SetBadCertUIStatus(nsNSSSocketInfo::bcuis_was_shown);
+ if (retVal)
+ return SECSuccess;
-+ suppressMessage = PR_TRUE;
++ suppressMessage = true;
+ }
}
}
@@ -350,7 +350,7 @@
+++ b/security/manager/ssl/src/nsNSSIOLayer.h
@@ -189,6 +189,13 @@ public:
- void SetAllowTLSIntoleranceTimeout(PRBool aAllow);
+ void SetAllowTLSIntoleranceTimeout(bool aAllow);
+ enum BadCertUIStatusType {
+ bcuis_not_shown, bcuis_active, bcuis_was_shown
@@ -359,13 +359,13 @@
+ void SetBadCertUIStatus(BadCertUIStatusType aNewStatus);
+ BadCertUIStatusType GetBadCertUIStatus() { return mBadCertUIStatus; }
+
- nsresult GetExternalErrorReporting(PRBool* state);
- nsresult SetExternalErrorReporting(PRBool aState);
+ bool GetExternalErrorReporting();
+ nsresult RememberCAChain(CERTCertList *aCertList);
@@ -225,6 +232,7 @@ protected:
- PRPackedBool mHandshakeInProgress;
- PRPackedBool mAllowTLSIntoleranceTimeout;
- PRPackedBool mRememberClientAuthCertificate;
+ bool mHandshakeInProgress;
+ bool mAllowTLSIntoleranceTimeout;
+ bool mRememberClientAuthCertificate;
+ BadCertUIStatusType mBadCertUIStatus;
PRIntervalTime mHandshakeStartTime;
PRInt32 mPort;
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.209
packages/xulrunner/xulrunner.spec:1.210
--- packages/xulrunner/xulrunner.spec:1.209 Sun Jan 22 17:06:20 2012
+++ packages/xulrunner/xulrunner.spec Wed Feb 1 13:07:13 2012
@@ -25,15 +25,15 @@
Summary: XULRunner - Mozilla Runtime Environment for XUL+XPCOM
applications
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla
aplikacji XUL+XPCOM
Name: xulrunner
-Version: 9.0.1
-Release: 1
+Version: 10.0
+Release: 0.1
Epoch: 2
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications
# Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so
lets use it
# instead of waiting for mozilla to copy file on ftp.
Source0:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 7cf2bd379792a9b232267c6a79680566
+# Source0-md5: 13c61203ccfa583e5a54b4dc22f41233
Patch0: %{name}-install.patch
Patch1: %{name}-rpath.patch
Patch3: %{name}-nss_cflags.patch
@@ -45,7 +45,6 @@
# http://pkgs.fedoraproject.org/gitweb/?p=xulrunner.git;a=tree
Patch9: %{name}-gtkmozembed.patch
Patch10: %{name}-linux3.patch
-Patch11: %{name}-libpng.patch
URL: https://developer.mozilla.org/en/XULRunner
%{!?with_qt:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: alsa-lib-devel
@@ -192,7 +191,6 @@
%patch8 -p1
%patch9 -p2
%patch10 -p1
-%patch11 -p2
# config/rules.mk is patched by us and js/src/config/rules.mk
# is supposed to be exact copy
@@ -426,6 +424,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.210 2012/02/01 12:07:13 baggins
+- started update to 10.0
+
Revision 1.209 2012/01/22 16:06:20 lisu
- place R: python-ply in devel subpackage
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-ppc.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-rpath.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-ssl_oldapi.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.209&r2=1.210&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
