[icedtea-web/f16] Initial check-in of 1.1.1
Deepak Bhole
dbhole at fedoraproject.org
Wed Aug 3 21:15:21 UTC 2011
commit f98ae2407df6c4ff772aa069931a15d8d27ee4fa
Author: Deepak Bhole <dbhole at redhat.com>
Date: Wed Aug 3 17:14:56 2011 -0400
Initial check-in of 1.1.1
.gitignore | 1 +
icedtea-web-1.1.1-PR768.patch | 12 ++++++
icedtea-web-1.1.1-PR769.patch | 21 +++++++++++
icedtea-web.spec | 81 +++++++++++++++++++++++++++--------------
sources | 2 +-
5 files changed, 88 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7ee5df..0f0bc81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/icedtea-web-1.0.2.tar.gz
/icedtea-web-1.0.3.tar.gz
/icedtea-web-1.0.4.tar.gz
+/icedtea-web-1.1.1.tar.gz
diff --git a/icedtea-web-1.1.1-PR768.patch b/icedtea-web-1.1.1-PR768.patch
new file mode 100644
index 0000000..627c677
--- /dev/null
+++ b/icedtea-web-1.1.1-PR768.patch
@@ -0,0 +1,12 @@
+diff -r f9c1a27fada9 -r db6914cf15be netx/net/sourceforge/jnlp/tools/JarSigner.java
+--- a/netx/net/sourceforge/jnlp/tools/JarSigner.java Thu Jul 21 15:13:34 2011 -0400
++++ b/netx/net/sourceforge/jnlp/tools/JarSigner.java Wed Aug 03 14:11:11 2011 -0400
+@@ -284,7 +284,7 @@
+ if (shouldHaveSignature)
+ totalSignableEntries++;
+
+- if (isSigned) {
++ if (shouldHaveSignature && isSigned) {
+ for (int i = 0; i < signers.length; i++) {
+ CertPath certPath = signers[i].getSignerCertPath();
+ if (!certs.containsKey(certPath))
diff --git a/icedtea-web-1.1.1-PR769.patch b/icedtea-web-1.1.1-PR769.patch
new file mode 100644
index 0000000..d4c2728
--- /dev/null
+++ b/icedtea-web-1.1.1-PR769.patch
@@ -0,0 +1,21 @@
+diff -r db6914cf15be netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java
+--- a/netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java Wed Aug 03 14:11:11 2011 -0400
++++ b/netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java Wed Aug 03 17:06:33 2011 -0400
+@@ -222,7 +222,7 @@
+
+ // If the certificate is not explicitly trusted, we
+ // need to prompt the user
+- if (!isExplicitlyTrusted(chain, authType)) {
++ if (!isExplicitlyTrusted(chain, authType) && hostName != null) {
+
+ try {
+ HostnameChecker checker = HostnameChecker
+@@ -235,6 +235,8 @@
+ CNMatched = false;
+ ce = e;
+ }
++ } else if (!isExplicitlyTrusted(chain, authType)) {
++ CNMatched = false;
+ }
+
+ if (!trusted || !CNMatched) {
diff --git a/icedtea-web.spec b/icedtea-web.spec
index 19a5a11..7eec635 100644
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@ -5,10 +5,10 @@
%define multilib_arches ppc64 sparc64 x86_64
# Version of java
-%define javaver 1.6.0
+%define javaver 1.7.0
# Alternatives priority
-%define priority 16000
+%define priority 17000
%ifarch %{ix86}
%define archinstall i386
@@ -28,24 +28,34 @@
%ifarch %{multilib_arches}
%define javadir %{_jvmdir}/java-%{javaver}-openjdk.%{_arch}
%define jredir %{_jvmdir}/jre-%{javaver}-openjdk.%{_arch}
+%define jre6dir %{_jvmdir}/jre-1.6.0-openjdk.%{_arch}
%define javaplugin libjavaplugin.so.%{_arch}
%else
%define javadir %{_jvmdir}/java-%{javaver}-openjdk
%define jredir %{_jvmdir}/jre-%{javaver}-openjdk
+%define jre6dir {_jvmdir}/jre-1.6.0-openjdk
%define javaplugin libjavaplugin.so
%endif
-Name: icedtea-web
-Version: 1.0.4
-Release: 1%{?dist}
-Summary: Additional Java components for OpenJDK
+%define binsuffix .itweb
+
+Name: icedtea-web
+Version: 1.1.1
+Release: 1%{?dist}
+Summary: Additional Java components for OpenJDK
Group: Applications/Internet
License: LGPLv2+ and GPLv2 with exceptions
URL: http://icedtea.classpath.org/wiki/IcedTea-Web
Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz
-BuildRequires: java-1.6.0-openjdk-devel
+# Fix PR768: Signed applets/Web start apps don't work with OpenJDK7 and up
+Patch0: icedtea-web-1.1.1-PR768.patch
+
+# Fix PR769: IcedTea-Web plugin does not work with some ssl sites with OpenJDK7
+Patch1: icedtea-web-1.1.1-PR769.patch
+
+BuildRequires: java-1.7.0-openjdk-devel
BuildRequires: desktop-file-utils
BuildRequires: gecko-devel
BuildRequires: glib2-devel
@@ -68,7 +78,7 @@ Requires(postun): %{_sbindir}/alternatives
Provides: java-plugin = %{javaver}
Provides: java-1.6.0-openjdk-plugin = %{min_openjdk_version}
-Obsoletes: java-1.6.0-openjdk-plugin < %{min_openjdk_version}
+Obsoletes: java-1.6.0-openjdk-plugin <= %{min_openjdk_version}
# IcedTea is only built on these archs for now
ExclusiveArch: x86_64 i686
@@ -90,20 +100,26 @@ This package contains Javadocs for the IcedTea-Web project.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
./configure \
--with-pkgversion=fedora-%{release}-%{_arch} \
- --docdir=%{_javadocdir}/%{name} \
- --prefix=%{jredir}/
+ --docdir=%{_datadir}/javadoc/%{name} \
+ --with-jdk-home=%{javadir} \
+ --libdir=%{_libdir} \
+ --program-suffix=%{binsuffix} \
+ --prefix=%{_prefix}
make CXXFLAGS="$RPM_OPT_FLAGS"
%install
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# Remove pluginappletviewer ... it is unused and will be removed in 1.1
-rm -f $RPM_BUILD_ROOT%{jredir}/bin/pluginappletviewer
+# Move javaws man page to a more specific name
+mv $RPM_BUILD_ROOT/%{_mandir}/man1/javaws.1 $RPM_BUILD_ROOT/%{_mandir}/man1/javaws-itweb.1
# Install desktop files.
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
@@ -113,45 +129,54 @@ desktop-file-install --vendor ''\
desktop-file-install --vendor ''\
--dir $RPM_BUILD_ROOT%{_datadir}/applications itweb-settings.desktop
-%posttrans
-alternatives --remove %{javaplugin} \
- %{javadir}/jre/lib/%{archinstall}/gcjwebplugin.so 2>/dev/null
+%post
+if [ $1 -gt 1 ]
+then
alternatives --remove %{javaplugin} \
- %{jredir}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null
+ %{jre6dir}/lib/%{archinstall}/IcedTeaPlugin.so 2>/dev/null
+fi
+
+%posttrans
+update-desktop-database &> /dev/null || :
alternatives \
--install %{_libdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
- %{jredir}/lib/%{archinstall}/IcedTeaPlugin.so %{priority} \
- --slave %{_bindir}/javaws javaws %{jredir}/bin/javaws \
- --slave %{_mandir}/man1/javaws.1 javaws.1 \
- %{jredir}/man/man1/javaws.1
+ %{_libdir}/IcedTeaPlugin.so %{priority} \
+ --slave %{_bindir}/javaws javaws %{_prefix}/bin/javaws%{binsuffix} \
+ --slave %{_mandir}/man1/javaws.1.gz javaws.1.gz \
+ %{_mandir}/man1/javaws-itweb.1.gz
exit 0
%postun
+update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ]
then
alternatives --remove %{javaplugin} \
- %{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
+ %{_libdir}/IcedTeaPlugin.so
fi
exit 0
%files
%defattr(-,root,root,-)
-%{jredir}/bin/*
-%{jredir}/lib/*
-%{jredir}/man/man1/*
-%{_datadir}/pixmaps/javaws.png
-%{_datadir}/applications/javaws.desktop
-%{_datadir}/applications/itweb-settings.desktop
+%{_prefix}/bin
+%{_libdir}
+%{_datadir}/applications
+%{_datadir}/icedtea-web
+%{_datadir}/man
+%{_datadir}/pixmaps
%doc NEWS README COPYING
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}
+%{_datadir}/javadoc/%{name}
%doc COPYING
%changelog
+* Wed Aug 03 2011 Deepak Bhole <dbhole at redhat.com> 1.1.1-1
+- Bump to 1.1.1
+- Added patch for PR768 and PR769
+
* Wed Jul 20 2011 Deepak Bhole <dbhole at redhat.com> 1.0.4-1
- Bump to 1.0.4
- Fixed rhbz#718164: Home directory path disclosure to untrusted applications
diff --git a/sources b/sources
index 746cb45..3a9ead7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b871fad4776a6d2fd69156e62bab4ba icedtea-web-1.0.4.tar.gz
+16017dc91f7216e0631b759db1eebecb icedtea-web-1.1.1.tar.gz
More information about the scm-commits
mailing list