Changeset a3a17a4f


Ignore:
Timestamp:
Nov 25, 2017 6:59:04 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
752c17c
Parents:
7f6ba8cd
Message:

Debian: Replace glassfish-javaee with libtaglibs-standard-* (ticket #2093)
Only for stretch and later, zesty and later
Copy more files for previous stretch setup to xenial

Files:
2 added
13 edited

Legend:

Unmodified
Added
Removed

  • apps/routerconsole/java/build.xml

    r7f6ba8cd ra3a17a4f  
    129129                <!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more -->
    130130                <!-- All new jetty 7 jars should have been in 0.9.6, added in 0.9.7 -->
    131                 <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar jetty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-util.jar jetty-webapp.jar" />
     131                <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar jstlel.jar jetty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-util.jar jetty-webapp.jar" />
    132132                <attribute name="Implementation-Version" value="${full.version}" />
    133133                <attribute name="Built-By" value="${build.built-by}" />

  • apps/susidns/src/build.xml

    r7f6ba8cd ra3a17a4f  
    2424                <pathelement location="${lib}/tomcat-util-scan.jar" />
    2525                <pathelement location="${lib}/jasper-el.jar" />
     26                <pathelement location="lib/jstlel.jar" />
    2627
    2728                <pathelement location="lib/jstl.jar" />

  • build.properties

    r7f6ba8cd ra3a17a4f  
    1212javasedocs.url=http://docs.oracle.com/javase/7/docs/api/
    1313javaeedocs.url=http://docs.oracle.com/javaee/7/api/
    14 # The following link is dead, perhaps temporarily,
    15 # perhaps not, as they move 7 and 8 to unsupported status.
    16 #jettydocs.url=http://download.eclipse.org/jetty/stable-8/apidocs/
     14# The following link is for 9.4.x
     15#jettydocs.url=http://download.eclipse.org/jetty/stable-9/apidocs/
    1716jettydocs.url=http://download.eclipse.org/jetty/9.2.21.v20170120/apidocs/
    1817wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/
    … …  
    148147# Don't include tomcat files, we will use libtomcat8-java package
    149148#with-libtomcat8-java=true
     149# Don't include jstl.jar and standard.jar, we will use libtaglibs-standard-* packages
     150#with-libtaglibs-standard=true
    150151# Don't include jstl.jar and standard.jar, we will use glassfish-javaee package
    151152#with-glassfish-javaee=true

  • build.xml

    r7f6ba8cd ra3a17a4f  
    12751275    </target>
    12761276
    1277     <!-- todo handle alt package too -->
    12781277    <!--
    1279        glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    1280     <target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
     1278       jstl.jar
     1279       glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail,
     1280       and libjstl1.1-java isn't sufficient,
     1281       so we only skip it with libtaglibs-standard
    12811282    -->
    1282     <target name="copyjstl-unlesspkg" >
     1283    <target name="copyjstl-unlesspkg" unless="${with-libtaglibs-standard}" >
    12831284        <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
    12841285    </target>
    12851286
    1286     <!-- todo handle alt package too -->
    1287     <target name="copystandard-unlesspkg" unless="${with-glassfish-javaee}" >
     1287    <!-- standard.jar -->
     1288    <target name="copystandard-unlesspkg" depends="copystandard-unlesspkg1, copystandard-unlesspkg2" />
     1289    <target name="copystandard-unlesspkg1" >
     1290        <condition property="with-any-standard-pkg" >
     1291            <or>
     1292                <istrue value="${with-libtaglibs-standard}" />
     1293                <istrue value="${with-glassfish-javaee}" />
     1294                <istrue value="${libjakarta-taglibs-standard-java}" />
     1295            </or>
     1296
     1297        </condition>
     1298    </target>
     1299    <target name="copystandard-unlesspkg2" unless="${with-any-standard-pkg}" >
    12881300        <copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" />
    12891301    </target>
    … …  
    22702282            <!-- libtomcat8-java -->
    22712283            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    2272             <!-- libjstl1.1-java or glassfish-javaee -->
    2273           <!--
     2284            <!-- libjstl1.1-java or glassfish-javaee or libtaglibs-standard -->
    22742285            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    2275            -->
    2276             <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
     2286            <!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard -->
    22772287            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    22782288            <!-- anything added above, add in debian-release-tarball also -->
    … …  
    22882298                <exclude name="apps/jetty/jetty-distribution-*/**"/>
    22892299                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    2290           <!--
    22912300                <exclude name="apps/susidns/src/lib/jstl.jar" />
    2292            -->
    22932301                <exclude name="apps/susidns/src/lib/standard.jar" />
    22942302                <!-- anything added above, add in debian-release-tarball also -->
    … …  
    24162424            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
    24172425            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    2418           <!--
    24192426            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    2420            -->
    24212427            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    24222428            <!-- anything added above, add in debian-tarball also -->
    … …  
    24322438                <exclude name="apps/jetty/jetty-distribution-*/**"/>
    24332439                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    2434           <!--
    24352440                <exclude name="apps/susidns/src/lib/jstl.jar" />
    2436            -->
    24372441                <exclude name="apps/susidns/src/lib/standard.jar" />
    24382442                <!-- anything added above, add in debian-tarball also -->

  • debian-alt/README.txt

    r7f6ba8cd ra3a17a4f  
    1010xenial may be copied to yakkety, zesty.
    1111
    12 tails-jessie and tails-wheezy are currently the same as
    13 jessie and wheezy, respectively. If they diverge, put the changes here.
     12Not maintained:
     13wheezy files are not maintained. Use the precise files instead.
     14jessie files may not be maintained. Use the trusty files instead.
    1415
    1516Note on systemd:

  • debian-alt/buster/control

    r7f6ba8cd ra3a17a4f  
    1010 ,openjdk-8-jdk
    1111 ,libjetty9-java (>= 9.2.22)
    12  ,glassfish-javaee
     12 ,libtaglibs-standard-jstlel-java
    1313 ,libtomcat8-java
    1414 ,dh-apparmor
    … …  
    7676 openjdk-8-jre-headless | java8-runtime-headless,
    7777 libjetty9-java,
    78  glassfish-javaee,
     78 libtaglibs-standard-jstlel-java,
    7979 libtomcat8-java,
    8080 geoip-database,

  • debian-alt/buster/rules

    r7f6ba8cd ra3a17a4f  
    5353        rm -f $(CURDIR)/override.properties
    5454        rm -f $(CURDIR)/apps/susidns/src/lib/standard.jar
     55        rm -f $(CURDIR)/apps/susidns/src/lib/jstl.jar
     56        rm -f $(CURDIR)/apps/susidns/src/lib/jstlel.jar
    5557        debconf-updatepo
    5658
    … …  
    120122        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    121123
    122         @# debian and ubuntu: everywhere
    123         @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
     124        @# debian and ubuntu: stretch+, zesty+
     125        @/bin/echo -e "with-libtaglibs-standard=true" >> $(CURDIR)/override.properties
     126        ln -sf /usr/share/java/taglibs-standard-spec.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     127        ln -sf /usr/share/java/taglibs-standard-impl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     128        ln -sf /usr/share/java/taglibs-standard-jstlel.jar $(CURDIR)/apps/susidns/src/lib/jstlel.jar
     129
     130        @# debian and ubuntu: everywhere
     131        @#/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
    124132        @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    125133        @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    126         ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     134        @#ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
    127135
    128136        @# debian and ubuntu: everywhere

  • debian-alt/doc/debian-build.txt

    r7f6ba8cd ra3a17a4f  
    7474reprepro -v update precise
    7575reprepro -v update trusty
    76 reprepro -v update vivid
    7776reprepro -v update xenial
    7877reprepro -v update zesty

  • debian-alt/doc/dependencies.txt

    r7f6ba8cd ra3a17a4f  
    99instructions are at https://geti2p.net/debian
    1010
    11 This document is current as of release 0.9.30, 2017-05-03.
     11This document is current as of release 0.9.33, scheduled 2018-01
    1212
    1313
    … …  
    5252  They are removed in the Debian source package.
    5353
    54 * glassfish-javaee
     54* libtaglibs-standard-*-java (stretch and later, zesty and later only)
     55  Provides JSTL 1.2, solves the glassfish-javaee problem described below.
     56
     57* glassfish-javaee (wheezy, jessie, xenial and earlier only)
    5558  We need jstl.jar and standard.jar version 1.2.
    5659  This is an ancient and terrible package, but it's the only place we've found version 1.2 jars.

  • debian/control

    r7f6ba8cd ra3a17a4f  
    1111 ,openjdk-7-jdk
    1212 ,libjetty9-java
    13  ,glassfish-javaee
     13 ,libtaglibs-standard-jstlel-java
    1414 ,libtomcat8-java
    1515 ,dh-apparmor
    … …  
    8282 libgetopt-java,
    8383 libjetty9-java,
    84  glassfish-javaee,
     84 libtaglibs-standard-jstlel-java,
    8585 libtomcat8-java
    8686Replaces: i2p ( << 0.8.6-5)

  • debian/i2p-router.install

    r7f6ba8cd ra3a17a4f  
    6464
    6565
    66 # uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
     66# uncomment if not building with either glassfish-javaee, libjakarta-taglibs-standard-java or libtaglibs-standard
    6767# ubuntu and debian: everywhere
    6868# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    69 pkg-temp/lib/jstl.jar usr/share/i2p/lib
     69#pkg-temp/lib/jstl.jar usr/share/i2p/lib
    7070
    7171
    72 # uncomment if not building with either glassfish-javaee or libjstl1.1-java
     72# uncomment if not building with either glassfish-javaee, libjstl1.1-java or libtaglibs-standard
    7373# ubuntu and debian: everywhere
    7474#pkg-temp/lib/standard.jar usr/share/i2p/lib

  • debian/i2p-router.links

    r7f6ba8cd ra3a17a4f  
    5252
    5353
     54# comment out if not building with libtaglibs-standard
     55usr/share/java/taglibs-standard-spec.jar usr/share/i2p/lib/jstl.jar
     56usr/share/java/taglibs-standard-impl.jar usr/share/i2p/lib/standard.jar
     57usr/share/java/taglibs-standard-jstlel.jar usr/share/i2p/lib/jstlel.jar
     58
     59
    5460# comment out if not building with glassfish-javaee
    5561# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    5662#usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
    57 usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
     63#usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
    5864
    5965

  • debian/rules

    r7f6ba8cd ra3a17a4f  
    5353        rm -f $(CURDIR)/override.properties
    5454        rm -f $(CURDIR)/apps/susidns/src/lib/standard.jar
     55        rm -f $(CURDIR)/apps/susidns/src/lib/jstl.jar
     56        rm -f $(CURDIR)/apps/susidns/src/lib/jstlel.jar
    5557        debconf-updatepo
    5658
    … …  
    120122        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    121123
    122         @# debian and ubuntu: everywhere
    123         @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
     124        @# debian and ubuntu: stretch+, zesty+
     125        @/bin/echo -e "with-libtaglibs-standard=true" >> $(CURDIR)/override.properties
     126        ln -sf /usr/share/java/taglibs-standard-spec.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     127        ln -sf /usr/share/java/taglibs-standard-impl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     128        ln -sf /usr/share/java/taglibs-standard-jstlel.jar $(CURDIR)/apps/susidns/src/lib/jstlel.jar
     129
     130        @# debian and ubuntu: everywhere
     131        @#/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
    124132        @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    125133        @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    126         ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     134        @#ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
    127135
    128136        @# debian and ubuntu: everywhere
Note: See TracChangeset for help on using the changeset viewer.