freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 1.6.2.

Browse Source
This commit is contained in:
Jung-uk Kim
2016-02-11 23:45:10 +00:00
parent 87559b13c9
commit d20bd649d5
13 changed files with 214 additions and 4784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/icedtea-web/Makefile
+56 -63
View File
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= icedtea-web
PORTVERSION= 1.5.2
PORTVERSION= 1.6.2
CATEGORIES= java www
MASTER_SITES= http://icedtea.wildebeest.org/download/source/ \
http://icedtea.classpath.org/download/source/
@@ -11,9 +11,12 @@ COMMENT= Free Java plug-in and Java Web Start for OpenJDK
LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
bash:${PORTSDIR}/shells/bash \
gsed:${PORTSDIR}/textproc/gsed
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
TEST_DEPENDS= ${HAMCREST_JAR}:${PORTSDIR}/java/hamcrest \
${JUNIT_JAR}:${PORTSDIR}/java/junit
GNU_CONFIGURE= yes
USE_JAVA= yes
@@ -22,7 +25,7 @@ JAVA_VENDOR= openjdk
USE_PERL5= build
USE_XORG= x11
USES= desktop-file-utils gmake perl5 pkgconfig shebangfix
SHEBANG_FILES= javac.in jrunscript.in launcher/launchers.in
SHEBANG_FILES= jrunscript.in launcher/launchers.in
WANT_GNOME= yes
@@ -30,58 +33,55 @@ EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -dc
EXTRACT_AFTER_ARGS= | ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} -xf -
PLIST_FILES= bin/itweb-javaws \
bin/itweb-policyeditor \
bin/itweb-settings \
man/man1/itweb-javaws.1.gz \
man/man1/itweb-policyeditor.1.gz \
man/man1/itweb-settings.1.gz \
share/applications/itweb-javaws.desktop \
share/applications/itweb-policyeditor.desktop \
share/applications/itweb-settings.desktop \
share/pixmaps/itweb-javaws.png
PORTDATA= javaws_splash.png netx.jar
PORTDOCS= netx
CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}"
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}"
CONFIGURE_ARGS+= --with-jre-home="${JAVA_HOME}/jre"
CONFIGURE_ARGS+= --with-junit="${JUNIT_JAR}"
CONFIGURE_ARGS+= --with-rhino="${RHINO_JAR}"
CONFIGURE_ARGS+= --with-tagsoup="${TAGSOUP_JAR}"
.for opt in asm chrome chromium ecj epiphany firefox jacoco midori opera
CONFIGURE_ARGS+= --without-${opt}
.endfor
CONFIGURE_ENV= BIN_BASH=${bash_CMD}
CONFIGURE_SHELL= ${bash_CMD}
CONFIGURE_ARGS= --with-asm=no --with-ecj=no --with-emma=no --with-jacoco=no
CONFIGURE_ARGS+=--with-jdk-home="${JAVA_HOME}"
CONFIGURE_ARGS+=--with-jre-home="${JAVA_HOME}/jre"
CONFIGURE_ARGS+=--with-tagsoup=no
CONFIGURE_ENV= BIN_BASH=${bash_CMD}
TEST_TARGET= check
OPTIONS_DEFINE= DOCS PLUGIN RHINO TAGSOUP
OPTIONS_DEFAULT=DOCS PLUGIN
OPTIONS_SUB= yes
OPTIONS_DEFINE= PLUGIN RHINO TEST
OPTIONS_DEFAULT=PLUGIN
PLUGIN_DESC= Enable the browser plug-in
RHINO_DESC= Add support for Proxy Auto Config files
TEST_DESC= Add support for running regression test
TAGSOUP_DESC= Enable cleaning up of malformed JNLP files
DOCS_CONFIGURE_ENABLE= docs
PLUGIN_CONFIGURE_ENABLE=plugin
DOCS_PORTDOCS= netx
RHINO_BUILD_DEPENDS= ${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
RHINO_RUN_DEPENDS= ${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
RHINO_CONFIGURE_OFF= --with-rhino=no
RHINO_CONFIGURE_ON= --with-rhino=${JAVASHAREDIR}/rhino/rhino.jar
TEST_BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
TEST_CONFIGURE_OFF= --with-junit=no
TEST_CONFIGURE_ON= --with-junit=${JAVALIBDIR}/junit.jar
PLUGIN_PLIST_FILES= lib/IcedTeaPlugin.so
RHINO_RUN_DEPENDS= ${RHINO_BUILD_DEPENDS}
RHINO_VARS= RHINO_JAR="${JAVASHAREDIR}/rhino/rhino.jar"
RHINO_VARS_OFF= RHINO_JAR=no
TAGSOUP_BUILD_DEPENDS= ${JAVALIBDIR}/tagsoup.jar:${PORTSDIR}/textproc/tagsoup
TAGSOUP_RUN_DEPENDS= ${TAGSOUP_BUILD_DEPENDS}
TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
TAGSOUP_VARS_OFF= TAGSOUP_JAR=no
PLUGIN_CONFIGURE_ENABLE=plugin
PLUGIN_PORTDOCS= plugin
PLUGIN_TEST_TARGET= plugin-tests
PLUGIN_USE= GNOME=glib20
PLUGIN_USES= gecko webplugin:native
PLUGIN_VARS= WEBPLUGIN_DIR=${PREFIX}/lib
PLUGIN_VARS+= WEBPLUGIN_FILES=IcedTeaPlugin.so
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPLUGIN}
PORTDATA+= plugin.jar
PORTDOCS+= plugin
WEBPLUGIN_DIR= ${PREFIX}/lib
WEBPLUGIN_FILES=IcedTeaPlugin.so
.endif
HAMCREST_JAR= ${JAVALIBDIR}/hamcrest.jar
JUNIT_JAR= ${JAVALIBDIR}/junit.jar
.include <bsd.port.pre.mk>
.if ${JAVA_PORT_VERSION} == "1.8.0"
EXTRA_PATCHES= ${PATCHDIR}/extrapatch-jdk8
.elif ${JAVA_PORT_VERSION} == "1.6.0"
.if ${JAVA_PORT_VERSION} == "1.6.0"
pre-extract:
@${ECHO_MSG}
@${ECHO_MSG} "IMPORTANT: To build IcedTea-Web ${PORTVERSION}, you have to turn on 'ICEDTEA' option"
@@ -91,30 +91,23 @@ pre-extract:
.endif
post-patch:
${REINPLACE_CMD} -e 's|^sed\([[:space:]]\)|gsed\1|' \
-e 's|\([[:space:]]\)sed\([[:space:]]\)|\1gsed\2|g' \
${WRKSRC}/Makefile.in ${WRKSRC}/html-gen.sh
${REINPLACE_CMD} -e 's|^Icon=javaws|Icon=itweb-javaws|' \
${WRKSRC}/*.desktop.in
${CP} -fp ${FILESDIR}/*.html \
${WRKSRC}/netx/net/sourceforge/jnlp/resources
.if ${PORT_OPTIONS:MTEST}
post-build:
@${ECHO_MSG}
@${ECHO_MSG} "Run \"make test\" to execute regression test."
@${ECHO_MSG}
.endif
post-install:
${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/*.desktop ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/javaws.png \
${STAGEDIR}${PREFIX}/share/pixmaps/itweb-javaws.png
.if ${PORT_OPTIONS:MTEST}
test: build
@(cd ${WRKSRC}; ${MAKE_CMD} check)
.if ${PORT_OPTIONS:MPLUGIN}
@(cd ${WRKSRC}; ${MAKE_CMD} plugin-tests)
.endif
.endif
.for lang in cs de en pl
.for man in javaws policyeditor
${MV} ${STAGEDIR}${MANPREFIX}/man/${lang:Nen}/man1/${man}.1 \
${STAGEDIR}${MANPREFIX}/man/${lang:Nen}/man1/itweb-${man}.1
.endfor
.endfor
@${ECHO_MSG}
@${ECHO_MSG} "Run \"make test\" to execute regression test."
@${ECHO_MSG}
.include <bsd.port.post.mk>
java/icedtea-web/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (icedtea-web-1.5.2.tar.gz) = b29e8ff2533cc6521a6509a002001f4c97c80a004460063156d003898da13bf3
SIZE (icedtea-web-1.5.2.tar.gz) = 1583105
SHA256 (icedtea-web-1.6.2.tar.gz) = ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300
SIZE (icedtea-web-1.6.2.tar.gz) = 1824557
java/icedtea-web/files/AUTHORS.html
-39
View File
@@ -1,39 +0,0 @@
The following people have made contibutions to this project.<br>
Please keep this list in alphabetical order.<br>
<br>
<center>
<br><img src="jamIcon.jpg" alt="Jam Icon" width="87" height="84"><br><br>
Lillian Angel &lt;<a href="mailto:langel@redhat.com?subject=IcedTea-Web">langel@redhat.com</a>&gt;<br>
Andrew Azores &lt;<a href="mailto:aazores@redhat.com?subject=IcedTea-Web">aazores@redhat.com</a>&gt;<br>
Deepak Bhole &lt;<a href="mailto:dbhole@redhat.com?subject=IcedTea-Web">dbhole@redhat.com</a>&gt;<br>
Ricardo Martín Camarero &lt;<a href="mailto:rickyepoderi@yahoo.es?subject=IcedTea-Web">rickyepoderi@yahoo.es</a>&gt;<br>
Danesh Dadachanji &lt;<a href="mailto:ddadacha@redhat.com?subject=IcedTea-Web">ddadacha@redhat.com</a>&gt;<br>
Adam Domurad &lt;<a href="mailto:adomurad@redhat.com?subject=IcedTea-Web">adomurad@redhat.com</a>&gt;<br>
Thomas Fitzsimmons &lt;<a href="mailto:fitzsim@redhat.com?subject=IcedTea-Web">fitzsim@redhat.com</a>&gt;<br>
Mark Greenwood &lt;<a href="mailto:mark@dcs.shef.ac.uk?subject=IcedTea-Web">mark@dcs.shef.ac.uk</a>&gt;<br>
Peter Hatina &lt;<a href="mailto:phatina@redhat.com?subject=IcedTea-Web">phatina@redhat.com</a>&gt;<br>
Andrew John Hughes &lt;<a href="mailto:ahughes@redhat.com?subject=IcedTea-Web">ahughes@redhat.com</a>&gt;<br>
Matthias Klose &lt;<a href="mailto:doko@ubuntu.com?subject=IcedTea-Web">doko@ubuntu.com</a>&gt;<br>
Alexandr Kolouch &lt;<a href="mailto:skolnag@gmail.com?subject=IcedTea-Web">skolnag@gmail.com</a>&gt;<br>
Michał Górny &lt;<a href="mailto: mgorny@gentoo.org ?subject=IcedTea-Web"> mgorny@gentoo.org </a>&gt;<br>
Jan Kmetko &lt;<a href="mailto:jan.kmetko.ml@gmail.com?subject=IcedTea-Web">jan.kmetko.ml@gmail.com</a>&gt;<br>
Francis Kung &lt;<a href="mailto:fkung@redhat.com?subject=IcedTea-Web">fkung@redhat.com</a>&gt;<br>
Denis Lila &lt;<a href="mailto:dlila@redhat.com?subject=IcedTea-Web">dlila@redhat.com</a>&gt;<br>
DJ Lucas &lt;<a href="mailto:dj@lucasit.com?subject=IcedTea-Web">dj@lucasit.com</a>&gt;<br>
Omair Majid &lt;<a href="mailto:omajid@redhat.com?subject=IcedTea-Web">omajid@redhat.com</a>&gt;<br>
Jon A. Maxwell &lt;<a href="mailto:jmaxwell@users.sourceforge.net?subject=IcedTea-Web">jmaxwell@users.sourceforge.net</a>&gt;<br>
Thomas Meyer &lt;<a href="mailto:thomas@m3y3r.de?subject=IcedTea-Web">thomas@m3y3r.de</a>&gt;<br>
Saad Mohammad &lt;<a href="mailto:smohammad@redhat.com?subject=IcedTea-Web">smohammad@redhat.com</a>&gt;<br>
Martin Olsson&ensp;&ensp;&lt;<a href="mailto:martin@minimum.se?subject=IcedTea-Web">martin@minimum.se</a>&gt;<br>
Andrew Su &lt;<a href="mailto:asu@redhat.com?subject=IcedTea-Web">asu@redhat.com</a>&gt;<br>
Joshua Sumali &lt;<a href="mailto:jsumali@redhat.com?subject=IcedTea-Web">jsumali@redhat.com</a>&gt;<br>
Jiri Vanek &lt;<a href="mailto:jvanek@redhat.com?subject=IcedTea-Web">jvanek@redhat.com</a>&gt;<br>
Mark Wielaard &lt;<a href="mailto:mark@klomp.org?subject=IcedTea-Web">mark@klomp.org</a>&gt;<br>
Jacob Wisor&ensp;&ensp;&lt;<a href="mailto:gitne@excite.co.jp?subject=IcedTea-Web">gitne@excite.co.jp</a>&gt;<br>
Man Lung Wong &lt;<a href="mailto:mwong@redhat.com?subject=IcedTea-Web">mwong@redhat.com</a>&gt;<br>
<br>
This project also includes code from the following projects:<br>
<br>
OpenJDK &lt;<a href="http://openjdk.java.net/">http://openjdk.java.net/</a>&gt;<br>
Netx &lt;<a href="http://jnlp.sourceforge.net/netx/">http://jnlp.sourceforge.net/netx/</a>&gt;<br>
</center>
java/icedtea-web/files/COPYING.html
-340
View File
@@ -1,340 +0,0 @@
&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;GNU GENERAL PUBLIC LICENSE<br>
&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp; Version 2, June 1991<br>
<br>
Copyright (C) 1989, 1991 Free Software Foundation, Inc.<br>
&ensp;&ensp;&ensp;&ensp; 51 Franklin Street, Fifth Floor, Boston, MA&ensp;&ensp;02110-1301&ensp;&ensp;USA<br>
Everyone is permitted to copy and distribute verbatim copies<br>
of this license document, but changing it is not allowed.<br>
<br>
&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;Preamble<br>
<br>
&ensp;&ensp;The licenses for most software are designed to take away your<br>
freedom to share and change it.&ensp;&ensp;By contrast, the GNU General Public<br>
License is intended to guarantee your freedom to share and change free<br>
software--to make sure the software is free for all its users.&ensp;&ensp;This<br>
General Public License applies to most of the Free Software<br>
Foundation's software and to any other program whose authors commit to<br>
using it.&ensp;&ensp;(Some other Free Software Foundation software is covered by<br>
the GNU Library General Public License instead.)&ensp;&ensp;You can apply it to<br>
your programs, too.<br>
<br>
&ensp;&ensp;When we speak of free software, we are referring to freedom, not<br>
price.&ensp;&ensp;Our General Public Licenses are designed to make sure that you<br>
have the freedom to distribute copies of free software (and charge for<br>
this service if you wish), that you receive source code or can get it<br>
if you want it, that you can change the software or use pieces of it<br>
in new free programs; and that you know you can do these things.<br>
<br>
&ensp;&ensp;To protect your rights, we need to make restrictions that forbid<br>
anyone to deny you these rights or to ask you to surrender the rights.<br>
These restrictions translate to certain responsibilities for you if you<br>
distribute copies of the software, or if you modify it.<br>
<br>
&ensp;&ensp;For example, if you distribute copies of such a program, whether<br>
gratis or for a fee, you must give the recipients all the rights that<br>
you have.&ensp;&ensp;You must make sure that they, too, receive or can get the<br>
source code.&ensp;&ensp;And you must show them these terms so they know their<br>
rights.<br>
<br>
&ensp;&ensp;We protect your rights with two steps: (1) copyright the software, and<br>
(2) offer you this license which gives you legal permission to copy,<br>
distribute and/or modify the software.<br>
<br>
&ensp;&ensp;Also, for each author's protection and ours, we want to make certain<br>
that everyone understands that there is no warranty for this free<br>
software.&ensp;&ensp;If the software is modified by someone else and passed on, we<br>
want its recipients to know that what they have is not the original, so<br>
that any problems introduced by others will not reflect on the original<br>
authors' reputations.<br>
<br>
&ensp;&ensp;Finally, any free program is threatened constantly by software<br>
patents.&ensp;&ensp;We wish to avoid the danger that redistributors of a free<br>
program will individually obtain patent licenses, in effect making the<br>
program proprietary.&ensp;&ensp;To prevent this, we have made it clear that any<br>
patent must be licensed for everyone's free use or not licensed at all.<br>
<br>
&ensp;&ensp;The precise terms and conditions for copying, distribution and<br>
modification follow.<br>
<br>
&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;GNU GENERAL PUBLIC LICENSE<br>
&ensp;&ensp; TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION<br>
<br>
&ensp;&ensp;0. This License applies to any program or other work which contains<br>
a notice placed by the copyright holder saying it may be distributed<br>
under the terms of this General Public License.&ensp;&ensp;The "Program", below,<br>
refers to any such program or work, and a "work based on the Program"<br>
means either the Program or any derivative work under copyright law:<br>
that is to say, a work containing the Program or a portion of it,<br>
either verbatim or with modifications and/or translated into another<br>
language.&ensp;&ensp;(Hereinafter, translation is included without limitation in<br>
the term "modification".)&ensp;&ensp;Each licensee is addressed as "you".<br>
<br>
Activities other than copying, distribution and modification are not<br>
covered by this License; they are outside its scope.&ensp;&ensp;The act of<br>
running the Program is not restricted, and the output from the Program<br>
is covered only if its contents constitute a work based on the<br>
Program (independent of having been made by running the Program).<br>
Whether that is true depends on what the Program does.<br>
<br>
&ensp;&ensp;1. You may copy and distribute verbatim copies of the Program's<br>
source code as you receive it, in any medium, provided that you<br>
conspicuously and appropriately publish on each copy an appropriate<br>
copyright notice and disclaimer of warranty; keep intact all the<br>
notices that refer to this License and to the absence of any warranty;<br>
and give any other recipients of the Program a copy of this License<br>
along with the Program.<br>
<br>
You may charge a fee for the physical act of transferring a copy, and<br>
you may at your option offer warranty protection in exchange for a fee.<br>
<br>
&ensp;&ensp;2. You may modify your copy or copies of the Program or any portion<br>
of it, thus forming a work based on the Program, and copy and<br>
distribute such modifications or work under the terms of Section 1<br>
above, provided that you also meet all of these conditions:<br>
<br>
&ensp;&ensp;&ensp;&ensp;a) You must cause the modified files to carry prominent notices<br>
&ensp;&ensp;&ensp;&ensp;stating that you changed the files and the date of any change.<br>
<br>
&ensp;&ensp;&ensp;&ensp;b) You must cause any work that you distribute or publish, that in<br>
&ensp;&ensp;&ensp;&ensp;whole or in part contains or is derived from the Program or any<br>
&ensp;&ensp;&ensp;&ensp;part thereof, to be licensed as a whole at no charge to all third<br>
&ensp;&ensp;&ensp;&ensp;parties under the terms of this License.<br>
<br>
&ensp;&ensp;&ensp;&ensp;c) If the modified program normally reads commands interactively<br>
&ensp;&ensp;&ensp;&ensp;when run, you must cause it, when started running for such<br>
&ensp;&ensp;&ensp;&ensp;interactive use in the most ordinary way, to print or display an<br>
&ensp;&ensp;&ensp;&ensp;announcement including an appropriate copyright notice and a<br>
&ensp;&ensp;&ensp;&ensp;notice that there is no warranty (or else, saying that you provide<br>
&ensp;&ensp;&ensp;&ensp;a warranty) and that users may redistribute the program under<br>
&ensp;&ensp;&ensp;&ensp;these conditions, and telling the user how to view a copy of this<br>
&ensp;&ensp;&ensp;&ensp;License.&ensp;&ensp;(Exception: if the Program itself is interactive but<br>
&ensp;&ensp;&ensp;&ensp;does not normally print such an announcement, your work based on<br>
&ensp;&ensp;&ensp;&ensp;the Program is not required to print an announcement.)<br>
<br>
These requirements apply to the modified work as a whole.&ensp;&ensp;If<br>
identifiable sections of that work are not derived from the Program,<br>
and can be reasonably considered independent and separate works in<br>
themselves, then this License, and its terms, do not apply to those<br>
sections when you distribute them as separate works.&ensp;&ensp;But when you<br>
distribute the same sections as part of a whole which is a work based<br>
on the Program, the distribution of the whole must be on the terms of<br>
this License, whose permissions for other licensees extend to the<br>
entire whole, and thus to each and every part regardless of who wrote it.<br>
<br>
Thus, it is not the intent of this section to claim rights or contest<br>
your rights to work written entirely by you; rather, the intent is to<br>
exercise the right to control the distribution of derivative or<br>
collective works based on the Program.<br>
<br>
In addition, mere aggregation of another work not based on the Program<br>
with the Program (or with a work based on the Program) on a volume of<br>
a storage or distribution medium does not bring the other work under<br>
the scope of this License.<br>
<br>
&ensp;&ensp;3. You may copy and distribute the Program (or a work based on it,<br>
under Section 2) in object code or executable form under the terms of<br>
Sections 1 and 2 above provided that you also do one of the following:<br>
<br>
&ensp;&ensp;&ensp;&ensp;a) Accompany it with the complete corresponding machine-readable<br>
&ensp;&ensp;&ensp;&ensp;source code, which must be distributed under the terms of Sections<br>
&ensp;&ensp;&ensp;&ensp;1 and 2 above on a medium customarily used for software interchange; or,<br>
<br>
&ensp;&ensp;&ensp;&ensp;b) Accompany it with a written offer, valid for at least three<br>
&ensp;&ensp;&ensp;&ensp;years, to give any third party, for a charge no more than your<br>
&ensp;&ensp;&ensp;&ensp;cost of physically performing source distribution, a complete<br>
&ensp;&ensp;&ensp;&ensp;machine-readable copy of the corresponding source code, to be<br>
&ensp;&ensp;&ensp;&ensp;distributed under the terms of Sections 1 and 2 above on a medium<br>
&ensp;&ensp;&ensp;&ensp;customarily used for software interchange; or,<br>
<br>
&ensp;&ensp;&ensp;&ensp;c) Accompany it with the information you received as to the offer<br>
&ensp;&ensp;&ensp;&ensp;to distribute corresponding source code.&ensp;&ensp;(This alternative is<br>
&ensp;&ensp;&ensp;&ensp;allowed only for noncommercial distribution and only if you<br>
&ensp;&ensp;&ensp;&ensp;received the program in object code or executable form with such<br>
&ensp;&ensp;&ensp;&ensp;an offer, in accord with Subsection b above.)<br>
<br>
The source code for a work means the preferred form of the work for<br>
making modifications to it.&ensp;&ensp;For an executable work, complete source<br>
code means all the source code for all modules it contains, plus any<br>
associated interface definition files, plus the scripts used to<br>
control compilation and installation of the executable.&ensp;&ensp;However, as a<br>
special exception, the source code distributed need not include<br>
anything that is normally distributed (in either source or binary<br>
form) with the major components (compiler, kernel, and so on) of the<br>
operating system on which the executable runs, unless that component<br>
itself accompanies the executable.<br>
<br>
If distribution of executable or object code is made by offering<br>
access to copy from a designated place, then offering equivalent<br>
access to copy the source code from the same place counts as<br>
distribution of the source code, even though third parties are not<br>
compelled to copy the source along with the object code.<br>
<br>
&ensp;&ensp;4. You may not copy, modify, sublicense, or distribute the Program<br>
except as expressly provided under this License.&ensp;&ensp;Any attempt<br>
otherwise to copy, modify, sublicense or distribute the Program is<br>
void, and will automatically terminate your rights under this License.<br>
However, parties who have received copies, or rights, from you under<br>
this License will not have their licenses terminated so long as such<br>
parties remain in full compliance.<br>
<br>
&ensp;&ensp;5. You are not required to accept this License, since you have not<br>
signed it.&ensp;&ensp;However, nothing else grants you permission to modify or<br>
distribute the Program or its derivative works.&ensp;&ensp;These actions are<br>
prohibited by law if you do not accept this License.&ensp;&ensp;Therefore, by<br>
modifying or distributing the Program (or any work based on the<br>
Program), you indicate your acceptance of this License to do so, and<br>
all its terms and conditions for copying, distributing or modifying<br>
the Program or works based on it.<br>
<br>
&ensp;&ensp;6. Each time you redistribute the Program (or any work based on the<br>
Program), the recipient automatically receives a license from the<br>
original licensor to copy, distribute or modify the Program subject to<br>
these terms and conditions.&ensp;&ensp;You may not impose any further<br>
restrictions on the recipients' exercise of the rights granted herein.<br>
You are not responsible for enforcing compliance by third parties to<br>
this License.<br>
<br>
&ensp;&ensp;7. If, as a consequence of a court judgment or allegation of patent<br>
infringement or for any other reason (not limited to patent issues),<br>
conditions are imposed on you (whether by court order, agreement or<br>
otherwise) that contradict the conditions of this License, they do not<br>
excuse you from the conditions of this License.&ensp;&ensp;If you cannot<br>
distribute so as to satisfy simultaneously your obligations under this<br>
License and any other pertinent obligations, then as a consequence you<br>
may not distribute the Program at all.&ensp;&ensp;For example, if a patent<br>
license would not permit royalty-free redistribution of the Program by<br>
all those who receive copies directly or indirectly through you, then<br>
the only way you could satisfy both it and this License would be to<br>
refrain entirely from distribution of the Program.<br>
<br>
If any portion of this section is held invalid or unenforceable under<br>
any particular circumstance, the balance of the section is intended to<br>
apply and the section as a whole is intended to apply in other<br>
circumstances.<br>
<br>
It is not the purpose of this section to induce you to infringe any<br>
patents or other property right claims or to contest validity of any<br>
such claims; this section has the sole purpose of protecting the<br>
integrity of the free software distribution system, which is<br>
implemented by public license practices.&ensp;&ensp;Many people have made<br>
generous contributions to the wide range of software distributed<br>
through that system in reliance on consistent application of that<br>
system; it is up to the author/donor to decide if he or she is willing<br>
to distribute software through any other system and a licensee cannot<br>
impose that choice.<br>
<br>
This section is intended to make thoroughly clear what is believed to<br>
be a consequence of the rest of this License.<br>
<br>
&ensp;&ensp;8. If the distribution and/or use of the Program is restricted in<br>
certain countries either by patents or by copyrighted interfaces, the<br>
original copyright holder who places the Program under this License<br>
may add an explicit geographical distribution limitation excluding<br>
those countries, so that distribution is permitted only in or among<br>
countries not thus excluded.&ensp;&ensp;In such case, this License incorporates<br>
the limitation as if written in the body of this License.<br>
<br>
&ensp;&ensp;9. The Free Software Foundation may publish revised and/or new versions<br>
of the General Public License from time to time.&ensp;&ensp;Such new versions will<br>
be similar in spirit to the present version, but may differ in detail to<br>
address new problems or concerns.<br>
<br>
Each version is given a distinguishing version number.&ensp;&ensp;If the Program<br>
specifies a version number of this License which applies to it and "any<br>
later version", you have the option of following the terms and conditions<br>
either of that version or of any later version published by the Free<br>
Software Foundation.&ensp;&ensp;If the Program does not specify a version number of<br>
this License, you may choose any version ever published by the Free Software<br>
Foundation.<br>
<br>
&ensp;&ensp;10. If you wish to incorporate parts of the Program into other free<br>
programs whose distribution conditions are different, write to the author<br>
to ask for permission.&ensp;&ensp;For software which is copyrighted by the Free<br>
Software Foundation, write to the Free Software Foundation; we sometimes<br>
make exceptions for this.&ensp;&ensp;Our decision will be guided by the two goals<br>
of preserving the free status of all derivatives of our free software and<br>
of promoting the sharing and reuse of software generally.<br>
<br>
&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;NO WARRANTY<br>
<br>
&ensp;&ensp;11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY<br>
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.&ensp;&ensp;EXCEPT WHEN<br>
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES<br>
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED<br>
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF<br>
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&ensp;&ensp;THE ENTIRE RISK AS<br>
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.&ensp;&ensp;SHOULD THE<br>
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,<br>
REPAIR OR CORRECTION.<br>
<br>
&ensp;&ensp;12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING<br>
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR<br>
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,<br>
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING<br>
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED<br>
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY<br>
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER<br>
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE<br>
POSSIBILITY OF SUCH DAMAGES.<br>
<br>
&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp; END OF TERMS AND CONDITIONS<br>
<br>
&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;How to Apply These Terms to Your New Programs<br>
<br>
&ensp;&ensp;If you develop a new program, and you want it to be of the greatest<br>
possible use to the public, the best way to achieve this is to make it<br>
free software which everyone can redistribute and change under these terms.<br>
<br>
&ensp;&ensp;To do so, attach the following notices to the program.&ensp;&ensp;It is safest<br>
to attach them to the start of each source file to most effectively<br>
convey the exclusion of warranty; and each file should have at least<br>
the "copyright" line and a pointer to where the full notice is found.<br>
<br>
&ensp;&ensp;&ensp;&ensp;&lt;one line to give the program's name and a brief idea of what it does.&gt;<br>
&ensp;&ensp;&ensp;&ensp;Copyright (C) &lt;year&gt;&ensp;&ensp;&lt;name of author&gt;<br>
<br>
&ensp;&ensp;&ensp;&ensp;This program is free software; you can redistribute it and/or modify<br>
&ensp;&ensp;&ensp;&ensp;it under the terms of the GNU General Public License as published by<br>
&ensp;&ensp;&ensp;&ensp;the Free Software Foundation; either version 2 of the License, or<br>
&ensp;&ensp;&ensp;&ensp;(at your option) any later version.<br>
<br>
&ensp;&ensp;&ensp;&ensp;This program is distributed in the hope that it will be useful,<br>
&ensp;&ensp;&ensp;&ensp;but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
&ensp;&ensp;&ensp;&ensp;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.&ensp;&ensp;See the<br>
&ensp;&ensp;&ensp;&ensp;GNU General Public License for more details.<br>
<br>
&ensp;&ensp;&ensp;&ensp;You should have received a copy of the GNU General Public License<br>
&ensp;&ensp;&ensp;&ensp;along with this program; if not, write to the Free Software<br>
&ensp;&ensp;&ensp;&ensp;Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA&ensp;&ensp;02110-1301&ensp;&ensp;USA<br>
<br>
<br>
Also add information on how to contact you by electronic and paper mail.<br>
<br>
If the program is interactive, make it output a short notice like this<br>
when it starts in an interactive mode:<br>
<br>
&ensp;&ensp;&ensp;&ensp;Gnomovision version 69, Copyright (C) year&ensp;&ensp;name of author<br>
&ensp;&ensp;&ensp;&ensp;Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.<br>
&ensp;&ensp;&ensp;&ensp;This is free software, and you are welcome to redistribute it<br>
&ensp;&ensp;&ensp;&ensp;under certain conditions; type `show c' for details.<br>
<br>
The hypothetical commands `show w' and `show c' should show the appropriate<br>
parts of the General Public License.&ensp;&ensp;Of course, the commands you use may<br>
be called something other than `show w' and `show c'; they could even be<br>
mouse-clicks or menu items--whatever suits your program.<br>
<br>
You should also get your employer (if you work as a programmer) or your<br>
school, if any, to sign a "copyright disclaimer" for the program, if<br>
necessary.&ensp;&ensp;Here is a sample; alter the names:<br>
<br>
&ensp;&ensp;Yoyodyne, Inc., hereby disclaims all copyright interest in the program<br>
&ensp;&ensp;`Gnomovision' (which makes passes at compilers) written by James Hacker.<br>
<br>
&ensp;&ensp;&lt;signature of Ty Coon&gt;, 1 April 1989<br>
&ensp;&ensp;Ty Coon, President of Vice<br>
<br>
This General Public License does not permit incorporating your program into<br>
proprietary programs.&ensp;&ensp;If your program is a subroutine library, you may<br>
consider it more useful to permit linking proprietary applications with the<br>
library.&ensp;&ensp;If this is what you want to do, use the GNU Library General<br>
Public License instead of this License.<br>
java/icedtea-web/files/ChangeLog.html
-2905
View File
File diff suppressed because it is too large Load Diff
java/icedtea-web/files/NEWS.html
-83
View File
@@ -1,83 +0,0 @@
Key:<br>
<br>
SX&ensp;&ensp;- <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=X">http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=X</a><br>
PRX - <a href="http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=X">http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=X</a><br>
RHX - <a href="https://bugzilla.redhat.com/show_bug.cgi?id=X">https://bugzilla.redhat.com/show_bug.cgi?id=X</a><br>
DX&ensp;&ensp;- <a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X">http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X</a><br>
GX&ensp;&ensp;- <a href="http://bugs.gentoo.org/show_bug.cgi?id=X">http://bugs.gentoo.org/show_bug.cgi?id=X</a><br>
<br>
CVE-XXXX-YYYY: <a href="http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY">http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY</a><br>
<br>
<b>New in release 1.5 (2014-04-02):<br></b>
* IcedTea-Web now using tagsoup as default (tagsoup dependence) sanitizer for input<br>
* JDK older then 1.5 no longer supported<br>
* IcedTea-Web is now following XDG .config and .cache specification(RH947647)<br>
* A console for debugging plugin and javaws<br>
* Dialogs center on screen before becoming visible<br>
* Support for u45 and u51 new manifest attributes (Application-Name, Codebase, Permissions, Trusted-only)<br>
* Custom applet permission policies panel in itweb-settings control panel<br>
* javaws -version flag<br>
* New PolicyEditor for easily adding/removing permissions to individual applets<br>
* Cache Viewer<br>
&ensp;&ensp;- Can be closed by ESC key<br>
&ensp;&ensp;- Enabling and disabling of operational buttons is handled properly<br>
&ensp;&ensp;- Time consuming operations are indicated by a mouse busy cursor<br>
&ensp;&ensp;- "Size" and "Last Modified" columns display localized data<br>
* NetX<br>
&ensp;&ensp;- PR1465 - java.io.FileNotFoundException while trying to download a JAR file<br>
&ensp;&ensp;- Netx can now parse malformed jnlp files using tagsoup<br>
&ensp;&ensp;- PR1026 - Apps fail to run because of the nanoxml parser's strict XML validation<br>
&ensp;&ensp;- PR1473 - javaws should not depend on name of local file<br>
&ensp;&ensp;- Redesigned About dialogue layout and contents<br>
&ensp;&ensp;- Console made aware of plugin messages<br>
* Plugin<br>
&ensp;&ensp;- PR854: Resizing an applet several times causes 100% CPU load<br>
&ensp;&ensp;- PR1271: icedtea-web does not handle 'javascript:'-protocol URLs<br>
&ensp;&ensp;- RH976833: Multiple applets on one page cause deadlock<br>
&ensp;&ensp;- Pipes moved into XDG_RUNTIME_DIR<br>
&ensp;&ensp;- Added debug to file<br>
&ensp;&ensp;- RH1010958: insecure temporary file use flaw in LiveConnect implementation<br>
* Common<br>
&ensp;&ensp;- PR1474: Can't get javaws to use SOCKS proxy<br>
&ensp;&ensp;- Man page for itweb-settings<br>
* Security Updates<br>
&ensp;&ensp;- CVE-2012-4540, RH869040: Heap-based buffer overflow after triggering event attached to applet<br>
<br>
<b>New in release 1.4 (2013-XX-XX):<br></b>
* Added cs localization<br>
* Added de localization<br>
* Added pl localization<br>
* Splash screen for javaws and plugin<br>
* Better error reporting for plugin via Error-splash-screen<br>
* All IcedTea-Web dialogues are centered to middle of active screen<br>
* Download indicator made compact for more then one jar<br>
* User can select its own JVM via itw-settings and deploy.properties.<br>
* Added extended applets security settings and dialogue<br>
* Security updates<br>
&ensp;&ensp;- CVE-2013-1926, RH916774: Class-loader incorrectly shared for applets with same relative-path.<br>
&ensp;&ensp;- CVE-2013-1927, RH884705: fixed gifar vulnerabilit<br>
&ensp;&ensp;- CVE-2012-3422, RH840592: Potential read from an uninitialized memory location<br>
&ensp;&ensp;- CVE-2012-3423, RH841345: Incorrect handling of not 0-terminated strings<br>
* NetX<br>
&ensp;&ensp;- PR1027: DownloadService is not supported by IcedTea-Web<br>
&ensp;&ensp;- PR725: JNLP applications will prompt for creating desktop shortcuts every time they are run<br>
&ensp;&ensp;- PR1292: Javaws does not resolve versioned jar names with periods correctly<br>
* Plugin<br>
&ensp;&ensp;- PR1106: Buffer overflow in plugin table-<br>
&ensp;&ensp;- PR1166: Embedded JNLP File is not supported in applet tag<br>
&ensp;&ensp;- PR1217: Add command line arguments for plugins<br>
&ensp;&ensp;- PR1189: Icedtea-plugin requires code attribute when using jnlp_href<br>
&ensp;&ensp;- PR1198: JSObject is not passed to javascript correctly<br>
&ensp;&ensp;- PR1260: IcedTea-Web should not rely on GTK<br>
&ensp;&ensp;- PR1157: Applets can hang browser after fatal exception<br>
&ensp;&ensp;- PR580: <a href="http://www.horaoficial.cl/">http://www.horaoficial.cl/</a> loads improperly<br>
* Common<br>
&ensp;&ensp;- PR1049: Extension jnlp's signed jar with the content of only META-INF/* is considered<br>
&ensp;&ensp;- PR955: regression: SweetHome3D fails to run<br>
&ensp;&ensp;- PR1145: IcedTea-Web can cause ClassCircularityError<br>
&ensp;&ensp;- PR1161: X509VariableTrustManager does not work correctly with OpenJDK7<br>
&ensp;&ensp;- PR822: Applets fail to load if jars have different signers<br>
&ensp;&ensp;- PR1186: System.getProperty("deployment.user.security.trusted.cacerts") is null<br>
&ensp;&ensp;- PR909: The Java applet at <a href="http://de.gosupermodel.com/games/wardrobegame.jsp">http://de.gosupermodel.com/games/wardrobegame.jsp</a> fails<br>
&ensp;&ensp;- PR1299: WebStart doesn't read socket proxy settings from firefox correctly<br>
<br>
java/icedtea-web/files/extrapatch-jdk8
-1281
View File
File diff suppressed because it is too large Load Diff
java/icedtea-web/files/patch-Makefile.in
+41 -60
View File
@@ -1,6 +1,6 @@
--- Makefile.in.orig 2014-08-15 03:08:34.349127000 -0400
+++ Makefile.in 2014-10-21 18:14:35.000000000 -0400
@@ -309,9 +309,9 @@
--- Makefile.in.orig 2016-02-03 13:49:10 UTC
+++ Makefile.in
@@ -338,9 +338,9 @@ ECHO_WHITELIST = if [ -f $(REPRODUCERS_C
#end of exported autoconf copies
# binary names
@@ -12,25 +12,22 @@
# the launcher needs to know $(bindir) and $(datadir) which can be different at
# make-time from configure-time
@@ -852,34 +852,36 @@
@@ -900,10 +900,10 @@ install-exec-local:
@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
- ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/
- ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
- ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
- ${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
+ ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/itweb-javaws.png
+ ${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
# all generated manpages are installed in swarm
install-data-local:
${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
- ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1
+ ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1/itweb-javaws.1
${INSTALL_DATA} $(NETX_SRCDIR)/itweb-settings.1 $(DESTDIR)$(mandir)/man1
- ${INSTALL_DATA} $(NETX_SRCDIR)/policyeditor.1 $(DESTDIR)$(mandir)/man1
+ ${INSTALL_DATA} $(NETX_SRCDIR)/policyeditor.1 $(DESTDIR)$(mandir)/man1/itweb-policyeditor.1
@ENABLE_DOCS_TRUE@ ${mkinstalldirs} $(DESTDIR)$(htmldir)
@@ -913,12 +913,14 @@ install-data-local:
@ENABLE_DOCS_TRUE@ (cd ${abs_top_builddir}/docs/netx; \
@ENABLE_DOCS_TRUE@ for files in $$(find . -type f); \
@ENABLE_DOCS_TRUE@ do \
@@ -46,42 +43,26 @@
+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ done)
uninstall-local:
rm -f $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
# all generated manpages must be removed one by one
@@ -928,7 +930,7 @@ uninstall-local:
rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
- rm -f $(DESTDIR)$(mandir)/man1/javaws.1
+ rm -f $(DESTDIR)$(mandir)/man1/itweb-javaws.1
rm -f $(DESTDIR)$(mandir)/man1/itweb-settings.1
- rm -f $(DESTDIR)$(mandir)/man1/policyeditor.1
+ rm -f $(DESTDIR)$(mandir)/man1/itweb-policyeditor.1
rm -f $(DESTDIR)$(bindir)/$(javaws)
rm -f $(DESTDIR)$(bindir)/$(itweb_settings)
rm -f $(DESTDIR)$(bindir)/$(policyeditor)
@@ -1042,10 +1044,10 @@
find $(NETX_SRCDIR) -name '*.java' | sort > $@ ; \
for src in $(NETX_EXCLUDE_SRCS) ; \
do \
- sed -i "/$${src}/ d" $@ ; \
+ sed -i -e "/$${src}/ d" $@ ; \
done
-@WITH_RHINO_FALSE@ sed -i '/RhinoBasedPacEvaluator/ d' $@
-@HAVE_JAVA7_FALSE@ sed -i '/VariableX509TrustManagerJDK7/ d' $@
+@WITH_RHINO_FALSE@ sed -i -e '/RhinoBasedPacEvaluator/ d' $@
+@HAVE_JAVA7_FALSE@ sed -i -e '/VariableX509TrustManagerJDK7/ d' $@
stamps/netx-html-gen.stamp:
(cd $$NETX_SRCDIR/..; \
@@ -1059,7 +1061,7 @@
mkdir -p stamps
touch $@
-stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp stamps/netx-html-gen.stamp
+stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp
mkdir -p $(NETX_DIR)
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(NETX_DIR) \
@@ -1070,7 +1072,8 @@
rm -r $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
rm -r $(ICONS_DEST_DIR)/javaws.png
- KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 javaws.1 policyeditor.1" ; \
+ KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 itweb-javaws.1 itweb-policyeditor.1" ; \
KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
for file in $$KNOWN_MANS ; do \
for dir in $$KNOWN_DIRS ; do \
@@ -1161,7 +1163,7 @@ stamps/generate-docs.stamp: stamps/netx.
echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \
for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \
ID=`echo "$$LANG_ID" | head -c 2` ; \
- ENCOD=`echo "$$LANG_ID" | tail -c 6 -` ; \
+ ENCOD=`echo "$$LANG_ID" | tail -c 6` ; \
export LANG=$$LANG_ID; \
mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \
echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \
@@ -1203,7 +1205,8 @@ stamps/netx.stamp: netx-source-files.txt
(cd $(NETX_RESOURCE_DIR); \
for files in $$(find . -type f); \
do \
@@ -91,7 +72,7 @@
$(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
done)
cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
@@ -1100,7 +1103,7 @@
@@ -1233,7 +1236,7 @@ clean-netx:
rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
clean-desktop-files:
@@ -100,7 +81,7 @@
rm -f itweb-settings.desktop
launcher.build/$(javaws): launcher/launchers.in
@@ -1133,7 +1136,7 @@
@@ -1266,7 +1269,7 @@ clean-launchers:
fi
javaws.desktop: javaws.desktop.in
@@ -109,7 +90,7 @@
itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \
@@ -1141,7 +1144,7 @@
@@ -1274,7 +1277,7 @@ itweb-settings.desktop: $(srcdir)/itweb-
policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
sed 's#PATH_TO_POLICYEDITOR#$(bindir)/$(policyeditor)#' \
@@ -118,16 +99,16 @@
# documentation
@@ -1252,7 +1255,7 @@
@@ -1400,7 +1403,7 @@ stamps/netx-dist-tests-prepare-reproduce
notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
$(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
$(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
if [ -n "$$notSrcFiles" ] ; then \
- cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
+ tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
fi ; \
cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
if [ -f $(META_MANIFEST) ]; \
@@ -1307,7 +1310,7 @@
@@ -1465,7 +1468,7 @@ stamps/change-dots-to-paths.stamp: stamp
path="`dirname $$slashed_dir`" ; \
file="`basename $$slashed_dir`.jar" ; \
echo "copying $$dir.jar to $$path as $$file" ; \
@@ -136,16 +117,16 @@
cp $$dir".jar" "$$path"/"$$file" ; \
fi ; \
done ; \
@@ -1435,7 +1438,7 @@
whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
@@ -1598,7 +1601,7 @@ $(REPRODUCERS_CLASS_NAMES):
whiteListed=$(RUN_WHITELIST_FILTER); \
cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
class_names= ; \
- for test in `find -type f` ; do \
+ for test in `find . -type f` ; do \
class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
INLCUDE="NO" ; \
@@ -1625,7 +1628,7 @@
INCLUDE="NO" ; \
@@ -1783,7 +1786,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
$(UNIT_CLASS_NAMES):
cd $(NETX_UNIT_TEST_DIR) ; \
class_names= ; \
@@ -154,7 +135,7 @@
class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
class_names="$$class_names $$class_name" ; \
@@ -1636,10 +1639,7 @@
@@ -1794,10 +1797,7 @@ stamps/run-netx-unit-tests.stamp: stamps
$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES)
filename=" " ; \
cd $(NETX_UNIT_TEST_SRCDIR) ; \
@@ -165,10 +146,10 @@
+ tar -c -f - `find . -type f \! -iname "*.java"` | tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \
cd $(NETX_UNIT_TEST_DIR) ; \
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) ; \
@@ -2131,9 +2131,7 @@
CLASSPATH=$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR)) ; \
@@ -2095,9 +2095,7 @@ clean-test-code-coverage-tools-jacoco:
@ENABLE_PLUGIN_TRUE@ $(PLUGIN_TEST_SRCS) ;
@ENABLE_PLUGIN_TRUE@ $(BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
@ENABLE_PLUGIN_TRUE@ $(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect/*.class ;
-@ENABLE_PLUGIN_TRUE@ cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
-@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect ;
java/icedtea-web/files/patch-configure
+36
View File
@@ -0,0 +1,36 @@
--- configure.orig 2016-02-03 13:49:09 UTC
+++ configure
@@ -10114,14 +10114,10 @@ if test "${with_junit+set}" = set; then
JUNIT_JAR=no
;;
*)
- if test -f "${withval}"; then
- JUNIT_JAR="${withval}"
- elif test -z "${withval}"; then
+ if test -z "${withval}"; then
JUNIT_JAR=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- as_fn_error $? "\"The junit jar ${withval} was not found.\"" "$LINENO" 5
+ JUNIT_JAR="${withval}"
fi
;;
esac
@@ -10186,14 +10182,10 @@ if test "${with_hamcrest+set}" = set; th
HAMCREST_JAR=no
;;
*)
- if test -f "${withval}"; then
- HAMCREST_JAR="${withval}"
- elif test -z "${withval}"; then
+ if test -z "${withval}"; then
HAMCREST_JAR=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- as_fn_error $? "\"The hamcrest jar ${withval} was not found.\"" "$LINENO" 5
+ HAMCREST_JAR="${withval}"
fi
;;
esac
java/icedtea-web/files/patch-html-gen.sh
+20
View File
@@ -0,0 +1,20 @@
--- html-gen.sh.orig 2016-02-03 13:47:43 UTC
+++ html-gen.sh
@@ -74,7 +74,7 @@ else
unset REPO_URL
fi
-start_time="$(date +%s.%N)"
+start_time="$(date +%s)"
if [ ! -e html-gen ]; then
echo "No html-gen directory, exiting. See Makefile.am for usage"
@@ -168,7 +168,7 @@ done
sed -i -r 's|(\*\ .*):|<u>\1</u>:|' ChangeLog.html # Underline changed files in ChangeLog, eg "* Makefile.am:"
-end_time="$(date +%s.%N)"
+end_time="$(date +%s)"
print_debug "HTML generation complete"
print_debug "Total elapsed time: $(echo "$end_time - $start_time" | bc )"
java/icedtea-web/files/patch-netx-XDesktopEntry.java
-11
View File
@@ -1,11 +0,0 @@
--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2014-08-14 06:15:47.054833000 -0400
+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java 2014-10-17 17:37:24.000000000 -0400
@@ -103,7 +103,7 @@
}
//Shortcut executes the jnlp as it was with system preferred java. It should work fine offline
- fileContents += "Exec=" + "javaws" + " \"" + file.getSourceLocation() + "\"\n";
+ fileContents += "Exec=" + "itweb-javaws" + " \"" + file.getSourceLocation() + "\"\n";
return new StringReader(fileContents);
java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java
+28
View File
@@ -0,0 +1,28 @@
--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2016-02-03 13:47:43 UTC
+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java
@@ -78,7 +78,7 @@ import net.sourceforge.jnlp.security.dia
*/
public class XDesktopEntry {
- public static final String JAVA_ICON_NAME = "javaws";
+ public static final String JAVA_ICON_NAME = "itweb-javaws";
private JNLPFile file = null;
private int iconSize = -1;
@@ -202,14 +202,14 @@ public class XDesktopEntry {
//Shortcut executes the jnlp as it was with system preferred java. It should work fine offline
//absolute - works in case of self built
String exec = System.getProperty("icedtea-web.bin.location");
- String pathResult = findOnPath(new String[]{"javaws", System.getProperty("icedtea-web.bin.name")});
+ String pathResult = findOnPath(new String[]{"itweb-javaws", System.getProperty("icedtea-web.bin.name")});
if (pathResult != null) {
return pathResult;
}
if (exec != null) {
return exec;
}
- return "javaws";
+ return "itweb-javaws";
}
java/icedtea-web/pkg-plist
+31
View File
@@ -0,0 +1,31 @@
bin/itweb-javaws
bin/itweb-policyeditor
bin/itweb-settings
%%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so
man/cs/man1/icedtea-web-plugin.1.gz
man/cs/man1/icedtea-web.1.gz
man/cs/man1/itweb-javaws.1.gz
man/cs/man1/itweb-policyeditor.1.gz
man/cs/man1/itweb-settings.1.gz
man/de/man1/icedtea-web-plugin.1.gz
man/de/man1/icedtea-web.1.gz
man/de/man1/itweb-javaws.1.gz
man/de/man1/itweb-policyeditor.1.gz
man/de/man1/itweb-settings.1.gz
man/man1/icedtea-web-plugin.1.gz
man/man1/icedtea-web.1.gz
man/man1/itweb-javaws.1.gz
man/man1/itweb-policyeditor.1.gz
man/man1/itweb-settings.1.gz
man/pl/man1/icedtea-web-plugin.1.gz
man/pl/man1/icedtea-web.1.gz
man/pl/man1/itweb-javaws.1.gz
man/pl/man1/itweb-policyeditor.1.gz
man/pl/man1/itweb-settings.1.gz
share/applications/itweb-javaws.desktop
share/applications/itweb-policyeditor.desktop
share/applications/itweb-settings.desktop
%%DATADIR%%/javaws_splash.png
%%DATADIR%%/netx.jar
%%PLUGIN%%%%DATADIR%%/plugin.jar
share/pixmaps/itweb-javaws.png