Changeset 094cf14 for debian


Ignore:
Timestamp:
Apr 7, 2016 2:38:30 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
5a2975b
Parents:
5c8eab9
Message:

Debian:
Prep for dependency on libtomcat7
Doesn't work yet, breaks susidns.
glassfish-javaee for jstl.jar and standard.jar version 1.2 won't work with tomcat7,
it's ancient and not compatible with recent el libs.
Add back option to depend on libjakarta-taglibs-standard and libjstl1.1-java which are version 1.1.2,
but not clear if they will work with tomcat7 either, even though they are
dependencies of libjetty8-extra-java.
We switched from JSTL 1.1.2 to JSTL 1.2 when we went from Jetty 5 to Jetty 6 in 2012.
1.2 libs are not available anywhere except for Glassfish, and
Debian only has the ancient Java EE 5 Glassfish 2.1.
Not clear there's any way to get susidns (and bote) to work with both Tomcat 6 and 7.

  • Fix wrong jsp-api version
  • Fix other minor errors in install and links files.
  • Log stack trace for Jetty warnings if log level is WARN
  • SusiDNS: Move standard.jar and jstl.jar out of WEB-INF/lib, where Tomcat 7 build refuses to find them
Location:
debian
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    r5c8eab9 r094cf14  
    55Priority: optional
    66Bugs: mailto:zzz@i2pmail.org
    7 Homepage: https://geti2p.net
     7Homepage: https://geti2p.net/
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
     
    4646Priority: optional
    4747Depends: ${shlibs:Depends}, i2p-router
    48 Homepage: http://www.i2p2.de/jbigi
     48Homepage: https://geti2p.net/
    4949Description: Java Big Integer library
    5050 This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
  • debian/i2p-router.install

    r5c8eab9 r094cf14  
    5757
    5858
    59 # uncomment if not building with libservlet2.5-java
    60 # ubuntu: only in wily
    61 # debian: in wheezy jessie stretch sid
     59# uncomment if not building with either libtomcat6-java or libtomcat7-java
    6260pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    63 
    64 
    65 # uncomment if not building with libtomcat6-java
    66 # ubuntu: only in precise trusty vivid
    67 # debian: only in wheezy
    68 # todo: see if libtomcat7-java will work
    6961# legacy name, contains only tomcat-juli, not commons-logging
    7062pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     
    7264
    7365
    74 # uncomment if not building with glassfish-javaee
     66# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
    7567# ubuntu and debian: everywhere
    7668#pkg-temp/lib/jstl.jar usr/share/i2p/lib
     69
     70
     71# uncomment if not building with either glassfish-javaee or libjstl1.1-java
     72# ubuntu and debian: everywhere
    7773#pkg-temp/lib/standard.jar usr/share/i2p/lib
  • debian/i2p-router.links

    r5c8eab9 r094cf14  
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    55
    6 usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
     6usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
    77
    88
     
    3434
    3535
    36 # comment out if not building with libservlet2.5-java
    37 # ubuntu: only in wily
    38 # debian: in wheezy jessie stretch sid
    39 #usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
    40 
    41 
    4236# comment out if not building with libtomcat6-java
    4337# ubuntu: only in precise trusty vivid
    4438# debian: only in wheezy
    45 # todo: see if libtomcat7-java will work
    4639# legacy name, contains only tomcat-juli, not commons-logging
    4740#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
     
    4942# combined into jasper-runtime.jar in non-package builds
    5043#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     44# combined into commons-el.jar in non-package builds
     45#usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     46# following is from libservlet2.5-java which is a dependency of libtomcat6-java
     47# legacy name in lib/
     48#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
     49
     50
     51# comment out if not building with libtomcat7-java
     52# ubuntu: only in precise trusty vivid
     53# debian: only in wheezy
     54# legacy name, contains only tomcat-juli, not commons-logging
     55#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
     56#usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     57# combined into jasper-runtime.jar in non-package builds
     58#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     59# tomcat 7 only
     60#usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
     61#usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
     62# combined into commons-el.jar in non-package builds
     63#usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     64# following is from libservlet3.0-java which is a dependency of libtomcat7-java
     65# legacy name in lib/
     66#usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar
    5167
    5268
    5369# comment out if not building with glassfish-javaee
    54 # ubuntu and debian: everywhere
    5570usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
    5671usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
     72
     73
     74# comment out if not building with libjakarta-taglibs-standard-java
     75# ubuntu and debian: everywhere
     76#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
     77
     78
     79# comment out if not building with libjstl1.1-java
     80# ubuntu and debian: everywhere
     81#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
  • debian/rules

    r5c8eab9 r094cf14  
    102102        @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    103103        ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    104         ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    105 
    106         @# ubuntu: only in wily
    107         @# debian: in wheezy jessie stretch sid
    108         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    109         @#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
    110         @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     104        ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    111105
    112106        @# ubuntu: only in precise trusty vivid
     
    114108        @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
    115109        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    116         @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    117110        @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    118111        @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    119112        @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     113        @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     114        @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
     115        @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    120116
    121117        @# debian and ubuntu: everywhere
    122         @#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     118        @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    123119        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    124         @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    125120        @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     121        @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     122        @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    126123        @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    127124        @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     125        @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     126        @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
     127        @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    128128
    129129        @# debian and ubuntu: everywhere
    130130        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
    131         ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
    132         ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
     131        ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     132        ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     133
     134        @# debian and ubuntu: everywhere
     135        @#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
     136        @#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     137
     138        @# debian and ubuntu: everywhere
     139        @#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
     140        @#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    133141
    134142        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
Note: See TracChangeset for help on using the changeset viewer.