Changeset 1af23a4


Ignore:
Timestamp:
Oct 10, 2016 12:31:28 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
72105e2
Parents:
6b7d22c2
Message:

Debian: Don't use glassfish-javaee.jar for jstl.jar (ticket #1793)

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r6b7d22c2 r1af23a4  
    12671267
    12681268    <!-- todo handle alt package too -->
     1269    <!--
     1270       glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    12691271    <target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
     1272    -->
     1273    <target name="copyjstl-unlesspkg" >
    12701274        <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
    12711275    </target>
     
    21932197            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
    21942198            <!-- libjstl1.1-java or glassfish-javaee -->
     2199          <!--
    21952200            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     2201           -->
    21962202            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    21972203            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     
    22762282           -->
    22772283            <!-- libjstl1.1-java or glassfish-javaee -->
     2284          <!--
    22782285            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     2286           -->
    22792287            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    22802288            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
  • debian-alt/README.txt

    r6b7d22c2 r1af23a4  
    1919and debian-alt/ before the release, so that the files
    2020may actually be used to build the release.
     21
     22See additional documentation in the doc/ directory.
  • debian-alt/doc/debian-build.txt

    r6b7d22c2 r1af23a4  
    6363reprepro includedeb stable i2p_0.9.xx-1_all.deb
    6464# if you already got the source from launchpad
    65 # with reprepro update, skip this?
     65# with reprepro update, skip this.
    6666reprepro includedsc stable i2p_0.9.XX-1.dsc
    6767
  • debian-alt/precise/i2p-router.install

    r6b7d22c2 r1af23a4  
    6565# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
    6666# ubuntu and debian: everywhere
    67 #pkg-temp/lib/jstl.jar usr/share/i2p/lib
     67# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     68pkg-temp/lib/jstl.jar usr/share/i2p/lib
    6869
    6970
  • debian-alt/precise/i2p-router.links

    r6b7d22c2 r1af23a4  
    6868
    6969# comment out if not building with glassfish-javaee
    70 usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
     70# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     71#usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
    7172usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
    7273
  • debian-alt/precise/rules

    r6b7d22c2 r1af23a4  
    132132        @# debian and ubuntu: everywhere
    133133        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
    134         ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     134        @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     135        @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    135136        ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
    136137
  • debian-alt/trusty/rules

    r6b7d22c2 r1af23a4  
    131131        @# debian and ubuntu: everywhere
    132132        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
    133         ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     133        @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     134        @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    134135        ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
    135136
  • debian/i2p-router.install

    r6b7d22c2 r1af23a4  
    6565# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
    6666# ubuntu and debian: everywhere
    67 #pkg-temp/lib/jstl.jar usr/share/i2p/lib
     67# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     68pkg-temp/lib/jstl.jar usr/share/i2p/lib
    6869
    6970
  • debian/i2p-router.links

    r6b7d22c2 r1af23a4  
    6868
    6969# comment out if not building with glassfish-javaee
    70 usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
     70# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     71#usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
    7172usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
    7273
  • debian/rules

    r6b7d22c2 r1af23a4  
    131131        @# debian and ubuntu: everywhere
    132132        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
    133         ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     133        @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     134        @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    134135        ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
    135136
  • history.txt

    r6b7d22c2 r1af23a4  
     12016-10-10 zzz
     2 * Debian: Don't use glassfish-javaee.jar for jstl.jar (ticket #1793)
     3
     42016-10-06 zzz
     5 * GeoIP: Update from Maxmind 2016-10-04
     6
    172016-10-02 zzz
    28 * Crypto: Add EdDSA private key spec constructor for hash
     
    511 * SusiMail:
    612   - Show settings button even if no messages
    7    - Add nonce to forms
     13   - Add nonce to forms (thx Kevin Froman)
    814
    9152016-09-24 zzz
    1016 * DesktopGUI: Enable by default on Windows
    1117 * i2ptunnel:
    12    - Accept default 'mysite.i2p' as a valid spoof host
     18   - Don't accept default 'mysite.i2p' as a valid spoof host
    1319   - Don't wrap destination in status message box
    1420 * Reseed: Remove user.mx24.eu as requested
     
    6672
    67732016-06-25 zzz
    68  * SSU peer testing: Add implementation (ticket #1752; proposal #126)
     74 * SSU peer testing: Add IPv6 implementation (ticket #1752; proposal #126)
    6975 * Utils: Improve random seed initialization
    7076
  • router/java/src/net/i2p/router/RouterVersion.java

    r6b7d22c2 r1af23a4  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 12;
     21    public final static long BUILD = 13;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.