Debian:
Add dependency on libjetty8-java and libservlet3.0-java packages Remove those binaries in debian builds Prep for dependency on libservlet2.5-java package Prep for dependency on libtomcat6-java package Prep for dependency on libtomcat7-java package Prep for dependency on libjakarta-taglibs-standard-java package Prep for dependency on libjstl1.1-java package Add build properties for building with packages Rework of apps/jetty/build.xml for building with packages Redefine debian/ as the files for the jessie build Make debian-alt directories for ubuntu builds Move debian/changelog to debian-alt/trusty/changelog Move debian-alt/jessie/changelog to debian/changelog Add apps/jetty/jettylib/jsp-api.jar to classpath for jsp builds
This commit is contained in:
@ -18,6 +18,8 @@
|
||||
<pathelement location="../../../core/java/build/obj" />
|
||||
<pathelement location="../../ministreaming/java/build/obj" />
|
||||
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
|
||||
<!-- jsp-api.jar only present for debian builds -->
|
||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||
</classpath>
|
||||
</depend>
|
||||
</target>
|
||||
@ -37,9 +39,15 @@
|
||||
srcdir="./src"
|
||||
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
|
||||
destdir="./build/obj"
|
||||
includeAntRuntime="false"
|
||||
classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" >
|
||||
includeAntRuntime="false" >
|
||||
<compilerarg line="${javac.compilerargs}" />
|
||||
<classpath>
|
||||
<pathelement location="../../../core/java/build/i2p.jar" />
|
||||
<pathelement location="../../ministreaming/java/build/mstreaming.jar" />
|
||||
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
|
||||
<!-- jsp-api.jar only present for debian builds -->
|
||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
|
||||
@ -258,6 +258,8 @@
|
||||
<classpath>
|
||||
<pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
|
||||
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
|
||||
<!-- jsp-api.jar only present for debian builds -->
|
||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
|
||||
<pathelement location="../../jetty/jettylib/commons-el.jar" />
|
||||
<pathelement location="${ant.home}/lib/ant.jar" />
|
||||
@ -282,6 +284,8 @@
|
||||
<classpath>
|
||||
<pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
|
||||
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
|
||||
<!-- jsp-api.jar only present for debian builds -->
|
||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
|
||||
<pathelement location="../../jetty/jettylib/commons-el.jar" />
|
||||
<pathelement location="build/i2ptunnel.jar" />
|
||||
|
||||
@ -1,6 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project basedir="." default="all" name="jetty">
|
||||
|
||||
<!-- This copies jars, with some modifications and renaming,
|
||||
from the jetty-distribution directory to the jettylib directory.
|
||||
This is disabled if the property with-libjetty8-java=true.
|
||||
|
||||
This copies jars, with some modifications and renaming,
|
||||
from the apache-tomcat-deployer and apache-tomcat directories to the jettylib directory.
|
||||
This is disabled if the property with-libservlet2.5-java=true.
|
||||
|
||||
This also builds the small helper jar jetty-i2p.jar from
|
||||
the source in the java/ directory.
|
||||
-->
|
||||
|
||||
<property name="jetty.ver" value="8.1.17.v20150415" />
|
||||
<property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
|
||||
<property name="jetty.sha1" value="ce7bcd1bdcdac4cf130467f6d55155b9e1517e71" />
|
||||
@ -22,16 +34,24 @@
|
||||
- updating to a new Jetty version by changing ${jetty.ver} and ${jetty.sha1} above.
|
||||
-->
|
||||
|
||||
<target name="ensureJettylib" >
|
||||
<available property="jetty.zip.extracted" file="${jetty.base}" type="dir" />
|
||||
<!-- verify everything we need is in jettylib/ -->
|
||||
<target name="ensureJettylib" depends="ensureJettylib1, copyJettylib" />
|
||||
|
||||
<target name="ensureJettylib1" >
|
||||
<condition property="jetty.zip.extracted" >
|
||||
<or>
|
||||
<istrue value="${with-libjetty8-java}" />
|
||||
<available file="${jetty.base}" type="dir" />
|
||||
</or>
|
||||
</condition>
|
||||
<condition property="jetty.zip.available" >
|
||||
<or>
|
||||
<istrue value="${jetty.zip.extracted}" />
|
||||
<available file="${jetty.filename}" type="file" />
|
||||
</or>
|
||||
</condition>
|
||||
<ant target="copyJettylib" />
|
||||
</target>
|
||||
|
||||
<!--
|
||||
<target name="ensureJettylib" depends="extractJettylib" />
|
||||
-->
|
||||
@ -62,6 +82,7 @@
|
||||
|
||||
<condition property="verified.already" >
|
||||
<or>
|
||||
<istrue value="${with-libjetty8-java}" />
|
||||
<istrue value="${jetty.zip.extracted}" />
|
||||
<and>
|
||||
<available file="${jetty.filename}" />
|
||||
@ -94,8 +115,15 @@
|
||||
<unzip src="${jetty.filename}" dest="." />
|
||||
</target>
|
||||
|
||||
<target name="copyJettylib" depends="extractJettylib" >
|
||||
<target name="mkJettylibdir" >
|
||||
<mkdir dir="jettylib" />
|
||||
</target>
|
||||
|
||||
<!-- Jetty and tomcat files -->
|
||||
<target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib" />
|
||||
|
||||
<!-- Jetty files only -->
|
||||
<target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty8-java}" >
|
||||
<!-- We copy everything to names without the version numbers so we
|
||||
can update them later. Where there was something similar in Jetty 5/6,
|
||||
we use the same names so they will overwrite the Jetty 5/6 jar on upgrade.
|
||||
@ -157,7 +185,6 @@
|
||||
<zipfileset excludes="META-INF/LICENSE.txt META-INF/NOTICE.txt" src="../../installer/lib/launch4j/lib/commons-logging.jar" />
|
||||
</jar>
|
||||
-->
|
||||
<ant target="copyTomcatLib" />
|
||||
</target>
|
||||
|
||||
<!-- Tomcat util jar.
|
||||
@ -169,7 +196,7 @@
|
||||
Apparently this is only required for precompilation of jsps, so this is put in
|
||||
with the JspC compiler jasper-runtime.jar below.
|
||||
-->
|
||||
<target name="buildTomcatUtilJar" >
|
||||
<target name="buildTomcatUtilJar" unless="${with-libservlet2.5-java}" >
|
||||
<!-- take only what we need from the tomcat-coyote jar -->
|
||||
<jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
|
||||
<zipfileset src="${tomcat2.lib}/tomcat-coyote.jar"
|
||||
@ -192,15 +219,20 @@
|
||||
If we go to Tomcat 7:
|
||||
tomcat-api.jar + tomcat-util.jar: Add to javax.servlet.jar (as of Tomcat 7 / Jetty 8)
|
||||
-->
|
||||
<target name="copyTomcatLib" >
|
||||
<jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
|
||||
<zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
|
||||
<zipfileset src="${tomcat2.lib.small}/tomcat-coyote-util.jar" />
|
||||
</jar>
|
||||
<target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
|
||||
|
||||
<target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
|
||||
<jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
|
||||
<zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
|
||||
<zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="copyTomcatLib2" unless="${with-libtomcat6-java}" >
|
||||
<jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
|
||||
<zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
|
||||
<zipfileset src="${tomcat2.lib.small}/tomcat-coyote-util.jar" />
|
||||
</jar>
|
||||
<!--
|
||||
<jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
|
||||
<zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/servlet-api.jar" />
|
||||
@ -215,6 +247,9 @@
|
||||
<jar destfile="jettylib/commons-logging.jar" update="true" >
|
||||
<zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="copyTomcatLib3" unless="${with-libtomcat7-java}" >
|
||||
<jar destfile="jettylib/jasper-compiler.jar" >
|
||||
<manifest>
|
||||
<attribute name="Note" value="Intentionally empty" />
|
||||
|
||||
@ -345,6 +345,8 @@
|
||||
<classpath>
|
||||
<pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
|
||||
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
|
||||
<!-- jsp-api.jar only present for debian builds -->
|
||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
|
||||
<pathelement location="../../jetty/jettylib/commons-el.jar" />
|
||||
<pathelement location="${ant.home}/lib/ant.jar" />
|
||||
@ -378,6 +380,8 @@
|
||||
<classpath>
|
||||
<pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
|
||||
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
|
||||
<!-- jsp-api.jar only present for debian builds -->
|
||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
|
||||
<pathelement location="../../jetty/jettylib/commons-el.jar" />
|
||||
<pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
|
||||
|
||||
@ -11,14 +11,15 @@
|
||||
<pathelement path="${classpath}" />
|
||||
<pathelement location="${bin}" />
|
||||
<pathelement location="${lib}/javax.servlet.jar"/>
|
||||
<pathelement location="WEB-INF/lib/jstl.jar" />
|
||||
<pathelement location="WEB-INF/lib/standard.jar" />
|
||||
<pathelement location="${lib}/jasper-runtime.jar" />
|
||||
<pathelement location="${lib}/javax.servlet.jar" />
|
||||
<pathelement location="${lib}/commons-logging.jar" />
|
||||
<pathelement location="${lib}/commons-el.jar" />
|
||||
<pathelement location="${ant.home}/lib/ant.jar" />
|
||||
<pathelement location="../../../core/java/build/i2p.jar" />
|
||||
<!-- jsp-api.jar only present for debian builds -->
|
||||
<pathelement location="${lib}/jsp-api.jar" />
|
||||
<pathelement location="WEB-INF/lib/jstl.jar" />
|
||||
<pathelement location="WEB-INF/lib/standard.jar" />
|
||||
<pathelement location="${lib}/jasper-runtime.jar" />
|
||||
<pathelement location="${lib}/commons-logging.jar" />
|
||||
<pathelement location="${lib}/commons-el.jar" />
|
||||
<pathelement location="${ant.home}/lib/ant.jar" />
|
||||
<pathelement location="../../../core/java/build/i2p.jar" />
|
||||
</path>
|
||||
|
||||
<property name="javac.compilerargs" value="" />
|
||||
|
||||
@ -25,6 +25,8 @@
|
||||
<classpath>
|
||||
<pathelement location="../../core/java/build/obj" />
|
||||
<pathelement location="../jetty/jettylib/javax.servlet.jar" />
|
||||
<!-- jsp-api.jar only present for debian builds -->
|
||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||
<pathelement location="../jetty/jettylib/jetty-i2p.jar" />
|
||||
</classpath>
|
||||
</depend>
|
||||
@ -40,6 +42,8 @@
|
||||
<compilerarg line="${javac.compilerargs}" />
|
||||
<classpath>
|
||||
<pathelement location="../jetty/jettylib/javax.servlet.jar" />
|
||||
<!-- jsp-api.jar only present for debian builds -->
|
||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||
<pathelement location="../jetty/jettylib/jetty-i2p.jar" />
|
||||
<pathelement location="../../core/java/build/i2p.jar" />
|
||||
</classpath>
|
||||
|
||||
@ -117,3 +117,15 @@ javac.version=1.6
|
||||
### Debian/Ubuntu packages ###
|
||||
# Don't include geoip files, we will use geoip-database package
|
||||
#with-geoip-database=true
|
||||
# Don't include jetty files, we will use libjetty8-java package
|
||||
#with-libjetty8-java=true
|
||||
# Don't include tomcat files, we will use libservlet2.5-java package
|
||||
#with-libservlet2.5-java=true
|
||||
# Don't include tomcat juli files, we will use libtomcat6-java package
|
||||
#with-libtomcat6-java=true
|
||||
# Don't build with bundled tomcat 6, we will use libtomcat7-java package
|
||||
#with-libtomcat7-java=true
|
||||
# Don't include standard.jar, we will use libjakarta-taglibs-standard-java package
|
||||
#with-libjakarta-taglibs-standard-java=true
|
||||
# Don't include jstl.jar, we will use libjstl1.1-java package
|
||||
#with-libjstl1.1-java=true
|
||||
|
||||
67
build.xml
67
build.xml
@ -764,6 +764,7 @@
|
||||
</javadoc>
|
||||
<echo message="Warning, javadoc embeds timestamps in the output, run with 'TZ=UTC ant javadoc' if you plan to distribute" />
|
||||
</target>
|
||||
|
||||
<target name="javadoc-zip" depends="javadoc">
|
||||
<zip destfile="javadoc.zip" basedir="build" level="9" includes="javadoc\**" />
|
||||
</target>
|
||||
@ -1062,6 +1063,7 @@
|
||||
<copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
|
||||
</target>
|
||||
|
||||
<!-- This is the target called by debian/rules -->
|
||||
<target name="preppkg-unix" depends="preppkg-base, prep-script-translation" >
|
||||
<copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
|
||||
<copy file="installer/resources/eepget" todir="pkg-temp/" />
|
||||
@ -1140,7 +1142,8 @@
|
||||
<copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
|
||||
</target>
|
||||
|
||||
<target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos">
|
||||
<!-- see targets below for conditional copying -->
|
||||
<target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty-unlesspkg, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg">
|
||||
<!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
|
||||
<!-- Also remove deletelist.txt used for updater only -->
|
||||
<delete>
|
||||
@ -1148,10 +1151,6 @@
|
||||
</delete>
|
||||
<copy file="build/i2p.jar" todir="pkg-temp/lib/" />
|
||||
<copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
|
||||
<!-- all jetty stuff -->
|
||||
<copy todir="pkg-temp/lib" >
|
||||
<fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
|
||||
</copy>
|
||||
<copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
|
||||
<copy file="build/streaming.jar" todir="pkg-temp/lib/" />
|
||||
<copy file="build/router.jar" todir="pkg-temp/lib/" />
|
||||
@ -1170,8 +1169,6 @@
|
||||
<copy file="build/susimail.war" todir="pkg-temp/webapps/" />
|
||||
<copy file="build/susidns.war" todir="pkg-temp/webapps/" />
|
||||
<copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
|
||||
<copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
|
||||
<copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
|
||||
<copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
|
||||
<copy file="apps/i2psnark/i2psnark.config" todir="pkg-temp/" />
|
||||
<copy file="installer/resources/blocklist.txt" todir="pkg-temp/" />
|
||||
@ -1204,16 +1201,38 @@
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
|
||||
<copy todir="pkg-temp/lib" >
|
||||
<fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="copytomcat-unlesspkg" unless="${with-libservlet2.5-java}" >
|
||||
<copy todir="pkg-temp/lib" >
|
||||
<fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="copyjstl-unlesspkg" unless="${with-libjstl1.1-java}" >
|
||||
<copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
|
||||
</target>
|
||||
|
||||
<target name="copystandard-unlesspkg" unless="${with-libjakarta-taglibs-standard-java}" >
|
||||
<copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
|
||||
</target>
|
||||
|
||||
<!-- does NOT include launch4j licenses for Windows builds -->
|
||||
<target name="preplicenses">
|
||||
<target name="preplicenses" depends="preplicenses-unlesspkg" >
|
||||
<copy file="LICENSE.txt" todir="pkg-temp/" />
|
||||
<copy todir="pkg-temp/licenses/" >
|
||||
<fileset dir="licenses/" />
|
||||
</copy>
|
||||
<copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
|
||||
<copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
|
||||
</target>
|
||||
|
||||
<target name="preplicenses-unlesspkg" unless="${with-libjetty8-java}" >
|
||||
<copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
|
||||
</target>
|
||||
|
||||
<!-- DOES include launch4j licenses for Windows builds -->
|
||||
<target name="preplicenses-windows" depends="preplicenses">
|
||||
@ -1989,6 +2008,14 @@
|
||||
<fileset dir="../i2p-${Extended.Version}/installer/lib/" />
|
||||
<fileset dir="../i2p-${Extended.Version}/Slackware" />
|
||||
<fileset dir="../i2p-${Extended.Version}/_MTN" />
|
||||
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
|
||||
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
|
||||
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
|
||||
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
|
||||
<!-- anything added above, add in debian-release-tarball also -->
|
||||
</delete>
|
||||
<tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
|
||||
<tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}">
|
||||
@ -1998,6 +2025,12 @@
|
||||
<exclude name="**/*.sh"/>
|
||||
<exclude name="installer/resources/geoip.txt"/>
|
||||
<exclude name="installer/resources/geoipv6.dat.gz"/>
|
||||
<exclude name="apps/jetty/apache-tomcat/**"/>
|
||||
<exclude name="apps/jetty/apache-tomcat-deployer/**"/>
|
||||
<exclude name="apps/jetty/jetty-distribution-*/**"/>
|
||||
<exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
|
||||
<exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
|
||||
<!-- anything added above, add in debian-release-tarball also -->
|
||||
</tarfileset>
|
||||
<tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
|
||||
<exclude name="debian/**" />
|
||||
@ -2033,6 +2066,14 @@
|
||||
<fileset dir="../i2p-${Extended.Version}/installer/lib/" />
|
||||
<fileset dir="../i2p-${Extended.Version}/Slackware" />
|
||||
<fileset dir="../i2p-${Extended.Version}/_MTN" />
|
||||
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
|
||||
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
|
||||
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
|
||||
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
|
||||
<!-- anything added above, add in debian-tarball also -->
|
||||
</delete>
|
||||
<tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
|
||||
<tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}">
|
||||
@ -2040,6 +2081,14 @@
|
||||
<exclude name="debian/**"/>
|
||||
<exclude name="debian-alt/**"/>
|
||||
<exclude name="**/*.sh"/>
|
||||
<exclude name="installer/resources/geoip.txt"/>
|
||||
<exclude name="installer/resources/geoipv6.dat.gz"/>
|
||||
<exclude name="apps/jetty/apache-tomcat/**"/>
|
||||
<exclude name="apps/jetty/apache-tomcat-deployer/**"/>
|
||||
<exclude name="apps/jetty/jetty-distribution-*/**"/>
|
||||
<exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
|
||||
<exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
|
||||
<!-- anything added above, add in debian-tarball also -->
|
||||
</tarfileset>
|
||||
<tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
|
||||
<exclude name="debian/**" />
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
The files in ../debian/ are for launchpad (trusty/utopic/vivid/wily).
|
||||
The files in ../debian/ are for jessie/stable.
|
||||
Alternates are in the subdirectories here.
|
||||
|
||||
trusty may be copied to utopic and vivid.
|
||||
They do not have libjetty8-java.
|
||||
wily has libjetty8-java.
|
||||
|
||||
tails-jessie and tails-wheezy are currently the same as
|
||||
jessie and wheezy, respectively. If they diverge, put the changes here.
|
||||
|
||||
@ -10,15 +14,9 @@ Note on systemd:
|
||||
# and is only Ubuntu as of "Saucy". The official packages will enable this for Debian unstable and
|
||||
# Ubuntu Saucy (and newer)
|
||||
|
||||
Files are extracted from the following
|
||||
packages on deb.i2p2.no and will need to be updated
|
||||
for 0.9.25 or later:
|
||||
|
||||
wheezy:
|
||||
i2p_0.9.23-2~deb7u+1.debian.tar.xz
|
||||
precise:
|
||||
i2p_0.9.23-2~precise+1.debian.tar.xz
|
||||
jessie:
|
||||
i2p_0.9.24-1~deb8u+1.debian.tar.xz
|
||||
unstable:
|
||||
i2p_0.9.24-1.debian.tar.xz
|
||||
Through release 0.9.25, the debian/ directory was not current for the release;
|
||||
any changes required for the build were checked in after the release.
|
||||
Starting with release 0.9.26, we will attempt to test debian builds
|
||||
before the release, and check in any required changes to debian/
|
||||
and debian-alt/ before the release, so that the files
|
||||
may actually be used to build the release.
|
||||
|
||||
@ -1,8 +1,14 @@
|
||||
i2p (0.9.25-1~deb8u+1) stable; urgency=medium
|
||||
i2p (0.9.25-1ubuntu1) trusty; urgency=medium
|
||||
|
||||
* Backport to Jessie
|
||||
* New upstream version 0.9.25
|
||||
|
||||
-- zzz on i2p <zzz@i2pmail.org> Tue, 29 Mar 2016 18:12:12 +0000
|
||||
-- zzz on i2p (key signing) <zzz@i2pmail.org> Sat, 26 Mar 2016 12:12:12 +0000
|
||||
|
||||
i2p (0.9.24-1ubuntu1) trusty; urgency=medium
|
||||
|
||||
* Upload to PPA
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 30 Jan 2016 14:12:27 +0000
|
||||
|
||||
i2p (0.9.24-1) unstable; urgency=medium
|
||||
|
||||
@ -112,7 +118,6 @@ i2p (0.9.20-3) unstable; urgency=medium
|
||||
* Add datagram exception to the apparmor profile
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 20 Jun 2015 11:22:28 +0000
|
||||
|
||||
i2p (0.9.20-2) unstable; urgency=medium
|
||||
|
||||
[str4d]
|
||||
@ -326,11 +331,9 @@ i2p (0.9.16-1) unstable; urgency=medium
|
||||
- Translation updates
|
||||
- Update GeoIP data
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 01 Nov 2014 23:34:28 +0000
|
||||
|
||||
i2p (0.9.15-1) unstable; urgency=medium
|
||||
|
||||
* New Upstream Version
|
||||
* New Upstream release
|
||||
- Add support for Ed25519 signatures
|
||||
- i2psnark move to separate config file for each torrent to better support
|
||||
per-torrent settings
|
||||
@ -367,10 +370,14 @@ i2p (0.9.14.1-1) unstable; urgency=medium
|
||||
- Console:
|
||||
+ Fix update buttons
|
||||
+ Don't filter parameter names starting with "nofilter_"
|
||||
+ Re-allow configadvanced, news URL, and unsigned update URL if routerconsole.advanced=true
|
||||
+ Re-allow plugin install if routerconsole.advanced=true or routerconsole.enablePluginInstall=true
|
||||
+ Only allow whitelisted plugin signers, unless routerconsole.allowUntrustedPlugins=true
|
||||
+ Re-allow clients.config changes if routerconsole.advanced=true or routerconsole.enableClientChange=true
|
||||
+ Re-allow configadvanced, news URL, and unsigned update URL if
|
||||
routerconsole.advanced=true
|
||||
+ Re-allow plugin install if routerconsole.advanced=true or
|
||||
routerconsole.enablePluginInstall=true
|
||||
+ Only allow whitelisted plugin signers, unless
|
||||
routerconsole.allowUntrustedPlugins=true
|
||||
+ Re-allow clients.config changes if routerconsole.advanced=true or
|
||||
routerconsole.enableClientChange=true
|
||||
+ More escaping
|
||||
- i2psnark: Fix add torrent form
|
||||
- ExecNamingService: Remove
|
||||
@ -394,10 +401,12 @@ i2p (0.9.14-1) unstable; urgency=high
|
||||
- Several i2psnark improvements and fixes (GUI and DHT), including changes
|
||||
for better compatibility with Vuze
|
||||
* Other
|
||||
- Reseeding now fetches a signed zip file containing router infos for security and speed
|
||||
- Reseeding now fetches a signed zip file containing router infos for
|
||||
security and speed
|
||||
- Use JVM's AES implementation if it is faster
|
||||
- More advanced options shown in the i2ptunnel edit pages
|
||||
- Per-message reliabilitiy settings in I2CP and error propagation back from router to client
|
||||
- Per-message reliabilitiy settings in I2CP and error propagation back
|
||||
from router to client
|
||||
- Lots of findbugs fixes and cleanups
|
||||
- Support signature types in SAM, bump rev to 3.1
|
||||
- New event log page in console
|
||||
@ -439,94 +448,46 @@ i2p (0.9.11-3) unstable; urgency=medium
|
||||
|
||||
i2p (0.9.11-1) unstable; urgency=medium
|
||||
|
||||
* New Upstream Version
|
||||
* Debconf: New Japanese and Korean translations
|
||||
* New release
|
||||
* Debconf: New Korean and Polish translations
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 08 Feb 2014 22:31:59 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 09 Feb 2014 00:00:00 +0000
|
||||
|
||||
i2p (0.9.10-1) unstable; urgency=medium
|
||||
|
||||
* New Upstream Version
|
||||
* New release
|
||||
* Remove /var/lib/i2p when i2p package is purged.
|
||||
* Bump standards version to 3.9.5 (no changes needed)
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Wed, 22 Jan 2014 16:00:24 +0000
|
||||
|
||||
i2p (0.9.9-1deb8u1) unstable; urgency=medium
|
||||
i2p (0.9.9-1) unstable; urgency=medium
|
||||
|
||||
* New Upstream Version
|
||||
* Drop from debian/patches (already in 0.9.9):
|
||||
- 0006-allow-webapps-to-be-preseeded.patch
|
||||
- 0007-geoipv6-fix.patch
|
||||
- 0008-IPv6-categories-in-netdb.patch
|
||||
- 0009-mark-ipv6-only-as-experimental.patch
|
||||
- 0010-snark-start-torrent-by-default.patch
|
||||
- 0011-fix-start-and-start-all-buttons.patch
|
||||
- 0012-add-no.i2p-registrar.patch
|
||||
- 0013-persistent-keying-for-SOCKS-tunnels.patch
|
||||
- 0014-post-limiter.patch
|
||||
- 0015-home-remove-config-when-restoring-default.patch
|
||||
- 0016-new-netdb-categories.patch
|
||||
- 0017-updated-trac-links.patch
|
||||
* New Upstream release
|
||||
* debconf:
|
||||
- Updated French translation
|
||||
- New Romanian translation
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 07 Dec 2013 18:17:24 +0000
|
||||
|
||||
i2p (0.9.8.1-deb8u1) stable; urgency=low
|
||||
|
||||
* Change initscript to grant read/write permissions to members of the i2psvc
|
||||
group.
|
||||
* Postinst: Silence a misleading warning
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Thu, 07 Nov 2013 00:22:48 +0000
|
||||
|
||||
i2p (0.9.8.1-1deb1) stable; urgency=low
|
||||
|
||||
* New upstream version 0.9.8.1. Initially I was not going to build 0.9.8.1
|
||||
packages since 0.9.8.1 was a Windows-only point release but I thought it
|
||||
would be good to have it in Tails. At the same time we may as well
|
||||
cherry-pick some easy bugfixes/updates from mtn.
|
||||
* debian/rules: Set the builddistribution specific versions
|
||||
* use xz for the 'debian' quilt 3.0 tarball
|
||||
* Cherry-picked fixes/updates:
|
||||
- Allow webapps.config to be preseeded by distributions
|
||||
- IPv6:
|
||||
+ GeoIPv6 fixes (ticket #1096)
|
||||
+ Add IPv6 NetDB categories
|
||||
+ Mark IPv6-only as experimental
|
||||
- I2PSnark:
|
||||
+ Start torrent by default
|
||||
+ Fix start and start-all buttons on text browsers and Opera
|
||||
(ticket #1093)
|
||||
- I2PTunnel:
|
||||
+ Post limiter
|
||||
+ Persistent keying for SOCKS tunnels (ticket #1088)
|
||||
- Add no.i2p registrar
|
||||
- Remove config when restoring default settings
|
||||
- Additional NetDB categories
|
||||
- Change Trac links to HTTPS
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 05 Nov 2013 17:34:38 +0000
|
||||
|
||||
i2p (0.9.8-1) stable; urgency=low
|
||||
i2p (0.9.8-1) unstable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
* Debconf: updated Swedish translation
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 30 Sep 2013 16:14:40 +0000
|
||||
|
||||
i2p (0.9.7.1-1) stable; urgency=low
|
||||
i2p (0.9.7.1-1) unstable; urgency=low
|
||||
|
||||
* New upstream version 0.9.7.1
|
||||
* Compress packages with xz
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 10 Aug 2013 19:02:24 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 10 Aug 2013 22:10:08 +0000
|
||||
|
||||
i2p (0.9.7-2) unstable; urgency=low
|
||||
|
||||
* Bugfix: Add missing ; to i2prouter script.
|
||||
* Test scripts with "sh -n" in the build target
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 16 Jul 2013 11:08:48 +0000
|
||||
|
||||
@ -542,15 +503,16 @@ i2p (0.9.7-1) unstable; urgency=low
|
||||
i2p (0.9.6-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* i2prouter: allow overrides to be set in /etc/default/i2p
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 27 May 2013 23:18:54 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 27 May 2013 00:00:00 +0000
|
||||
|
||||
i2p (0.9.5-2) unstable; urgency=low
|
||||
|
||||
* debian/i2p.postinst: Explicitly set permissions on /etc/i2p/wrapper.config
|
||||
to compensate for stricter umasks. Fixes #906.
|
||||
to compensate for stricter umasks.
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 31 Mar 2013 12:53:43 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 31 Mar 2013 12:50:17 +0000
|
||||
|
||||
i2p (0.9.5-1) unstable; urgency=low
|
||||
|
||||
@ -561,19 +523,19 @@ i2p (0.9.5-1) unstable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 08 Mar 2013 23:04:51 +0000
|
||||
|
||||
i2p (0.9.4+repack-3) unstable; urgency=low
|
||||
i2p (0.9.4-3) unstable; urgency=low
|
||||
|
||||
* Backport fix from MTN for ticket #817
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 22 Dec 2012 13:07:47 +0000
|
||||
|
||||
i2p (0.9.4+repack-2) unstable; urgency=low
|
||||
i2p (0.9.4-2) unstable; urgency=low
|
||||
|
||||
* Add missing build-dep on libservice-wrapper-java
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 17 Dec 2012 20:40:07 +0000
|
||||
|
||||
i2p (0.9.4+repack-1) unstable; urgency=low
|
||||
i2p (0.9.4-1) stable; urgency=low
|
||||
|
||||
* explicitly prefer openjdk-*-headless over default-jre-headless. Debian
|
||||
Squeeze has default-jre-headless set to gij. Performance with gij is
|
||||
@ -610,10 +572,10 @@ i2p (0.9.4+repack-1) unstable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 17 Dec 2012 23:59:59 +0000
|
||||
|
||||
i2p (0.9.3+repack-1) unstable; urgency=low
|
||||
i2p (0.9.3-1) stable; urgency=low
|
||||
|
||||
* New Upstream release
|
||||
* Upstream changelog:
|
||||
* Upstream changelog (full details in history.txt):
|
||||
- Active Queue Management
|
||||
- I2PSnark DHT: Several bug fixes, enable by default.
|
||||
- Priority queues
|
||||
@ -644,19 +606,19 @@ i2p (0.9.3+repack-1) unstable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 27 Oct 2012 16:47:37 +0000
|
||||
|
||||
i2p (0.9.2+repack-2) unstable; urgency=high
|
||||
i2p (0.9.2-2) stable; urgency=high
|
||||
|
||||
* Fix stupid bug in i2prouter
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 22 Sep 2012 13:57:39 +0000
|
||||
|
||||
i2p (0.9.2+repack-1) stable; urgency=low
|
||||
i2p (0.9.2-1) stable; urgency=low
|
||||
|
||||
* New upstream release (see history.txt for details)
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 21 Sep 2012 18:13:32 +0000
|
||||
|
||||
i2p (0.9.1+repack-1) unstable; urgency=low
|
||||
i2p (0.9.1-1) stable; urgency=low
|
||||
|
||||
* New upstream version 0.9.1
|
||||
* Don't depend on Debian's/Ubuntu's version of Jetty. Jetty6 is going away
|
||||
@ -671,13 +633,13 @@ i2p (0.9.1+repack-1) unstable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 30 Jul 2012 17:41:04 +0000
|
||||
|
||||
i2p (0.9-1) unstable; urgency=low
|
||||
i2p (0.9-1) stable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Wed, 02 May 2012 16:33:11 +0000
|
||||
|
||||
i2p (0.8.13-2) unstable; urgency=low
|
||||
i2p (0.8.13-2) stable; urgency=low
|
||||
|
||||
* Fix bug in postinst cause by changes to adduser's behaviour.
|
||||
|
||||
@ -724,38 +686,38 @@ i2p (0.8.12-1) stable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 06 Jan 2012 02:49:03 +0000
|
||||
|
||||
i2p (0.8.11+repack-2) stable; urgency=medium
|
||||
i2p (0.8.11-2) stable; urgency=medium
|
||||
|
||||
* Fix STUPID bug running I2P with i2prouter. Thanks soundwave.
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 08 Nov 2011 20:02:05 +0000
|
||||
|
||||
i2p (0.8.11+repack-1) stable; urgency=low
|
||||
i2p (0.8.11-1) stable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
* sv and uk debconf translation updates
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 07 Nov 2011 19:20:15 +0000
|
||||
|
||||
i2p (0.8.10+repack-1) stable; urgency=medium
|
||||
i2p (0.8.10-1) stable; urgency=medium
|
||||
|
||||
* New upstream version
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Thu, 20 Oct 2011 05:25:04 +0000
|
||||
|
||||
i2p (0.8.9+repack-1) stable; urgency=medium
|
||||
i2p (0.8.9-1) stable; urgency=medium
|
||||
|
||||
* New upstream version
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 11 Oct 2011 19:55:08 +0000
|
||||
|
||||
i2p (0.8.8+repack-3) UNRELEASED; urgency=low
|
||||
i2p (0.8.8-3) UNRELEASED; urgency=low
|
||||
|
||||
* Add dump option to initscript
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 06 Sep 2011 12:42:22 +0000
|
||||
|
||||
i2p (0.8.8+repack-2) stable; urgency=medium
|
||||
i2p (0.8.8-2) stable; urgency=medium
|
||||
|
||||
* Backport patch from mtn 04ec606 to fix trac #515
|
||||
* Fix trac ticket #514 ("debconf values are overwritten upon
|
||||
@ -765,7 +727,7 @@ i2p (0.8.8+repack-2) stable; urgency=medium
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 02 Sep 2011 23:32:32 +0000
|
||||
|
||||
i2p (0.8.8+repack-1) stable; urgency=low
|
||||
i2p (0.8.8-1) stable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
|
||||
144
debian/changelog
vendored
144
debian/changelog
vendored
@ -1,14 +1,8 @@
|
||||
i2p (0.9.25-1ubuntu1) trusty; urgency=medium
|
||||
i2p (0.9.25-1~deb8u+1) stable; urgency=medium
|
||||
|
||||
* New upstream version 0.9.25
|
||||
* Backport to Jessie
|
||||
|
||||
-- zzz on i2p (key signing) <zzz@i2pmail.org> Sat, 26 Mar 2016 12:12:12 +0000
|
||||
|
||||
i2p (0.9.24-1ubuntu1) trusty; urgency=medium
|
||||
|
||||
* Upload to PPA
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 30 Jan 2016 14:12:27 +0000
|
||||
-- zzz on i2p <zzz@i2pmail.org> Tue, 29 Mar 2016 18:12:12 +0000
|
||||
|
||||
i2p (0.9.24-1) unstable; urgency=medium
|
||||
|
||||
@ -118,6 +112,7 @@ i2p (0.9.20-3) unstable; urgency=medium
|
||||
* Add datagram exception to the apparmor profile
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 20 Jun 2015 11:22:28 +0000
|
||||
|
||||
i2p (0.9.20-2) unstable; urgency=medium
|
||||
|
||||
[str4d]
|
||||
@ -331,9 +326,11 @@ i2p (0.9.16-1) unstable; urgency=medium
|
||||
- Translation updates
|
||||
- Update GeoIP data
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 01 Nov 2014 23:34:28 +0000
|
||||
|
||||
i2p (0.9.15-1) unstable; urgency=medium
|
||||
|
||||
* New Upstream release
|
||||
* New Upstream Version
|
||||
- Add support for Ed25519 signatures
|
||||
- i2psnark move to separate config file for each torrent to better support
|
||||
per-torrent settings
|
||||
@ -370,14 +367,10 @@ i2p (0.9.14.1-1) unstable; urgency=medium
|
||||
- Console:
|
||||
+ Fix update buttons
|
||||
+ Don't filter parameter names starting with "nofilter_"
|
||||
+ Re-allow configadvanced, news URL, and unsigned update URL if
|
||||
routerconsole.advanced=true
|
||||
+ Re-allow plugin install if routerconsole.advanced=true or
|
||||
routerconsole.enablePluginInstall=true
|
||||
+ Only allow whitelisted plugin signers, unless
|
||||
routerconsole.allowUntrustedPlugins=true
|
||||
+ Re-allow clients.config changes if routerconsole.advanced=true or
|
||||
routerconsole.enableClientChange=true
|
||||
+ Re-allow configadvanced, news URL, and unsigned update URL if routerconsole.advanced=true
|
||||
+ Re-allow plugin install if routerconsole.advanced=true or routerconsole.enablePluginInstall=true
|
||||
+ Only allow whitelisted plugin signers, unless routerconsole.allowUntrustedPlugins=true
|
||||
+ Re-allow clients.config changes if routerconsole.advanced=true or routerconsole.enableClientChange=true
|
||||
+ More escaping
|
||||
- i2psnark: Fix add torrent form
|
||||
- ExecNamingService: Remove
|
||||
@ -401,12 +394,10 @@ i2p (0.9.14-1) unstable; urgency=high
|
||||
- Several i2psnark improvements and fixes (GUI and DHT), including changes
|
||||
for better compatibility with Vuze
|
||||
* Other
|
||||
- Reseeding now fetches a signed zip file containing router infos for
|
||||
security and speed
|
||||
- Reseeding now fetches a signed zip file containing router infos for security and speed
|
||||
- Use JVM's AES implementation if it is faster
|
||||
- More advanced options shown in the i2ptunnel edit pages
|
||||
- Per-message reliabilitiy settings in I2CP and error propagation back
|
||||
from router to client
|
||||
- Per-message reliabilitiy settings in I2CP and error propagation back from router to client
|
||||
- Lots of findbugs fixes and cleanups
|
||||
- Support signature types in SAM, bump rev to 3.1
|
||||
- New event log page in console
|
||||
@ -448,46 +439,94 @@ i2p (0.9.11-3) unstable; urgency=medium
|
||||
|
||||
i2p (0.9.11-1) unstable; urgency=medium
|
||||
|
||||
* New release
|
||||
* Debconf: New Korean and Polish translations
|
||||
* New Upstream Version
|
||||
* Debconf: New Japanese and Korean translations
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 09 Feb 2014 00:00:00 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 08 Feb 2014 22:31:59 +0000
|
||||
|
||||
i2p (0.9.10-1) unstable; urgency=medium
|
||||
|
||||
* New release
|
||||
* New Upstream Version
|
||||
* Remove /var/lib/i2p when i2p package is purged.
|
||||
* Bump standards version to 3.9.5 (no changes needed)
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Wed, 22 Jan 2014 16:00:24 +0000
|
||||
|
||||
i2p (0.9.9-1) unstable; urgency=medium
|
||||
i2p (0.9.9-1deb8u1) unstable; urgency=medium
|
||||
|
||||
* New Upstream release
|
||||
* New Upstream Version
|
||||
* Drop from debian/patches (already in 0.9.9):
|
||||
- 0006-allow-webapps-to-be-preseeded.patch
|
||||
- 0007-geoipv6-fix.patch
|
||||
- 0008-IPv6-categories-in-netdb.patch
|
||||
- 0009-mark-ipv6-only-as-experimental.patch
|
||||
- 0010-snark-start-torrent-by-default.patch
|
||||
- 0011-fix-start-and-start-all-buttons.patch
|
||||
- 0012-add-no.i2p-registrar.patch
|
||||
- 0013-persistent-keying-for-SOCKS-tunnels.patch
|
||||
- 0014-post-limiter.patch
|
||||
- 0015-home-remove-config-when-restoring-default.patch
|
||||
- 0016-new-netdb-categories.patch
|
||||
- 0017-updated-trac-links.patch
|
||||
* debconf:
|
||||
- Updated French translation
|
||||
- New Romanian translation
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 07 Dec 2013 18:17:24 +0000
|
||||
|
||||
i2p (0.9.8-1) unstable; urgency=low
|
||||
i2p (0.9.8.1-deb8u1) stable; urgency=low
|
||||
|
||||
* Change initscript to grant read/write permissions to members of the i2psvc
|
||||
group.
|
||||
* Postinst: Silence a misleading warning
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Thu, 07 Nov 2013 00:22:48 +0000
|
||||
|
||||
i2p (0.9.8.1-1deb1) stable; urgency=low
|
||||
|
||||
* New upstream version 0.9.8.1. Initially I was not going to build 0.9.8.1
|
||||
packages since 0.9.8.1 was a Windows-only point release but I thought it
|
||||
would be good to have it in Tails. At the same time we may as well
|
||||
cherry-pick some easy bugfixes/updates from mtn.
|
||||
* debian/rules: Set the builddistribution specific versions
|
||||
* use xz for the 'debian' quilt 3.0 tarball
|
||||
* Cherry-picked fixes/updates:
|
||||
- Allow webapps.config to be preseeded by distributions
|
||||
- IPv6:
|
||||
+ GeoIPv6 fixes (ticket #1096)
|
||||
+ Add IPv6 NetDB categories
|
||||
+ Mark IPv6-only as experimental
|
||||
- I2PSnark:
|
||||
+ Start torrent by default
|
||||
+ Fix start and start-all buttons on text browsers and Opera
|
||||
(ticket #1093)
|
||||
- I2PTunnel:
|
||||
+ Post limiter
|
||||
+ Persistent keying for SOCKS tunnels (ticket #1088)
|
||||
- Add no.i2p registrar
|
||||
- Remove config when restoring default settings
|
||||
- Additional NetDB categories
|
||||
- Change Trac links to HTTPS
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 05 Nov 2013 17:34:38 +0000
|
||||
|
||||
i2p (0.9.8-1) stable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
* Debconf: updated Swedish translation
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 30 Sep 2013 16:14:40 +0000
|
||||
|
||||
i2p (0.9.7.1-1) unstable; urgency=low
|
||||
i2p (0.9.7.1-1) stable; urgency=low
|
||||
|
||||
* New upstream version 0.9.7.1
|
||||
* Compress packages with xz
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 10 Aug 2013 22:10:08 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 10 Aug 2013 19:02:24 +0000
|
||||
|
||||
i2p (0.9.7-2) unstable; urgency=low
|
||||
|
||||
* Bugfix: Add missing ; to i2prouter script.
|
||||
* Test scripts with "sh -n" in the build target
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 16 Jul 2013 11:08:48 +0000
|
||||
|
||||
@ -503,16 +542,15 @@ i2p (0.9.7-1) unstable; urgency=low
|
||||
i2p (0.9.6-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* i2prouter: allow overrides to be set in /etc/default/i2p
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 27 May 2013 00:00:00 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 27 May 2013 23:18:54 +0000
|
||||
|
||||
i2p (0.9.5-2) unstable; urgency=low
|
||||
|
||||
* debian/i2p.postinst: Explicitly set permissions on /etc/i2p/wrapper.config
|
||||
to compensate for stricter umasks.
|
||||
to compensate for stricter umasks. Fixes #906.
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 31 Mar 2013 12:50:17 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 31 Mar 2013 12:53:43 +0000
|
||||
|
||||
i2p (0.9.5-1) unstable; urgency=low
|
||||
|
||||
@ -523,19 +561,19 @@ i2p (0.9.5-1) unstable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 08 Mar 2013 23:04:51 +0000
|
||||
|
||||
i2p (0.9.4-3) unstable; urgency=low
|
||||
i2p (0.9.4+repack-3) unstable; urgency=low
|
||||
|
||||
* Backport fix from MTN for ticket #817
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 22 Dec 2012 13:07:47 +0000
|
||||
|
||||
i2p (0.9.4-2) unstable; urgency=low
|
||||
i2p (0.9.4+repack-2) unstable; urgency=low
|
||||
|
||||
* Add missing build-dep on libservice-wrapper-java
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 17 Dec 2012 20:40:07 +0000
|
||||
|
||||
i2p (0.9.4-1) stable; urgency=low
|
||||
i2p (0.9.4+repack-1) unstable; urgency=low
|
||||
|
||||
* explicitly prefer openjdk-*-headless over default-jre-headless. Debian
|
||||
Squeeze has default-jre-headless set to gij. Performance with gij is
|
||||
@ -572,10 +610,10 @@ i2p (0.9.4-1) stable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 17 Dec 2012 23:59:59 +0000
|
||||
|
||||
i2p (0.9.3-1) stable; urgency=low
|
||||
i2p (0.9.3+repack-1) unstable; urgency=low
|
||||
|
||||
* New Upstream release
|
||||
* Upstream changelog (full details in history.txt):
|
||||
* Upstream changelog:
|
||||
- Active Queue Management
|
||||
- I2PSnark DHT: Several bug fixes, enable by default.
|
||||
- Priority queues
|
||||
@ -606,19 +644,19 @@ i2p (0.9.3-1) stable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 27 Oct 2012 16:47:37 +0000
|
||||
|
||||
i2p (0.9.2-2) stable; urgency=high
|
||||
i2p (0.9.2+repack-2) unstable; urgency=high
|
||||
|
||||
* Fix stupid bug in i2prouter
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 22 Sep 2012 13:57:39 +0000
|
||||
|
||||
i2p (0.9.2-1) stable; urgency=low
|
||||
i2p (0.9.2+repack-1) stable; urgency=low
|
||||
|
||||
* New upstream release (see history.txt for details)
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 21 Sep 2012 18:13:32 +0000
|
||||
|
||||
i2p (0.9.1-1) stable; urgency=low
|
||||
i2p (0.9.1+repack-1) unstable; urgency=low
|
||||
|
||||
* New upstream version 0.9.1
|
||||
* Don't depend on Debian's/Ubuntu's version of Jetty. Jetty6 is going away
|
||||
@ -633,13 +671,13 @@ i2p (0.9.1-1) stable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 30 Jul 2012 17:41:04 +0000
|
||||
|
||||
i2p (0.9-1) stable; urgency=low
|
||||
i2p (0.9-1) unstable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Wed, 02 May 2012 16:33:11 +0000
|
||||
|
||||
i2p (0.8.13-2) stable; urgency=low
|
||||
i2p (0.8.13-2) unstable; urgency=low
|
||||
|
||||
* Fix bug in postinst cause by changes to adduser's behaviour.
|
||||
|
||||
@ -686,38 +724,38 @@ i2p (0.8.12-1) stable; urgency=low
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 06 Jan 2012 02:49:03 +0000
|
||||
|
||||
i2p (0.8.11-2) stable; urgency=medium
|
||||
i2p (0.8.11+repack-2) stable; urgency=medium
|
||||
|
||||
* Fix STUPID bug running I2P with i2prouter. Thanks soundwave.
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 08 Nov 2011 20:02:05 +0000
|
||||
|
||||
i2p (0.8.11-1) stable; urgency=low
|
||||
i2p (0.8.11+repack-1) stable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
* sv and uk debconf translation updates
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 07 Nov 2011 19:20:15 +0000
|
||||
|
||||
i2p (0.8.10-1) stable; urgency=medium
|
||||
i2p (0.8.10+repack-1) stable; urgency=medium
|
||||
|
||||
* New upstream version
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Thu, 20 Oct 2011 05:25:04 +0000
|
||||
|
||||
i2p (0.8.9-1) stable; urgency=medium
|
||||
i2p (0.8.9+repack-1) stable; urgency=medium
|
||||
|
||||
* New upstream version
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 11 Oct 2011 19:55:08 +0000
|
||||
|
||||
i2p (0.8.8-3) UNRELEASED; urgency=low
|
||||
i2p (0.8.8+repack-3) UNRELEASED; urgency=low
|
||||
|
||||
* Add dump option to initscript
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 06 Sep 2011 12:42:22 +0000
|
||||
|
||||
i2p (0.8.8-2) stable; urgency=medium
|
||||
i2p (0.8.8+repack-2) stable; urgency=medium
|
||||
|
||||
* Backport patch from mtn 04ec606 to fix trac #515
|
||||
* Fix trac ticket #514 ("debconf values are overwritten upon
|
||||
@ -727,7 +765,7 @@ i2p (0.8.8-2) stable; urgency=medium
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 02 Sep 2011 23:32:32 +0000
|
||||
|
||||
i2p (0.8.8-1) stable; urgency=low
|
||||
i2p (0.8.8+repack-1) stable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
|
||||
|
||||
4
debian/control
vendored
4
debian/control
vendored
@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 7.0.50~)
|
||||
,ant-optional
|
||||
,debconf
|
||||
,openjdk-7-jdk
|
||||
,libjetty8-java, libservlet3.0-java
|
||||
,dh-apparmor
|
||||
,gettext
|
||||
,libgmp-dev (>= 2:5.0.5)
|
||||
@ -72,7 +73,8 @@ Priority: optional
|
||||
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
|
||||
openjdk-8-jre-headless | openjdk-7-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless,
|
||||
libecj-java,
|
||||
geoip-database
|
||||
geoip-database,
|
||||
libjetty8-java, libservlet3.0-java
|
||||
Replaces: i2p ( << 0.8.6-5)
|
||||
Breaks: i2p (<< 0.8.6-5)
|
||||
Recommends: libjbigi-jni, ttf-dejavu
|
||||
|
||||
70
debian/i2p-router.install
vendored
70
debian/i2p-router.install
vendored
@ -20,36 +20,64 @@ pkg-temp/webapps usr/share/i2p
|
||||
|
||||
|
||||
pkg-temp/lib/BOB.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/commons-el.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/i2p.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jrobin.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jstl.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/router.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/sam.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/standard.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/streaming.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/systray4j.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/systray.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with libjetty8-java
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
#pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
|
||||
# following two are from libservlet3.0-java which is a dependency of libjetty8-java
|
||||
#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with libservlet2.5-java
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
pkg-temp/lib/commons-el.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with libtomcat6-java
|
||||
# ubuntu: only in precise trusty vivid
|
||||
# debian: only in wheezy
|
||||
# todo: see if libtomcat7-java will work
|
||||
# legacy name, contains only tomcat-juli, not commons-logging
|
||||
pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with libjakarta-taglibs-standard-java
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
pkg-temp/lib/jstl.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with libjstl1.1-java
|
||||
# ubuntu: in precise trusty vivid wily xenial
|
||||
# debian: in wheezy jessie stretch sid
|
||||
pkg-temp/lib/standard.jar usr/share/i2p/lib
|
||||
|
||||
58
debian/i2p-router.links
vendored
58
debian/i2p-router.links
vendored
@ -3,4 +3,60 @@ usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGP
|
||||
usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
|
||||
usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
|
||||
|
||||
usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
|
||||
usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
|
||||
|
||||
|
||||
# comment out if not building with libjetty8-java
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
|
||||
usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
|
||||
usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
|
||||
usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
|
||||
# legacy name in lib/
|
||||
usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
|
||||
usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
|
||||
usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
|
||||
usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
|
||||
usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
|
||||
usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
|
||||
usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
|
||||
usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
|
||||
# legacy name in lib/
|
||||
usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
|
||||
# legacy name in lib/
|
||||
usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
|
||||
# following two are from libservlet3.0-java which is a dependency of libjetty8-java
|
||||
# legacy name in lib/
|
||||
usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
|
||||
# combined into javax.servlet.jar in non-package builds
|
||||
usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
|
||||
|
||||
|
||||
# comment out if not building with libservlet2.5-java
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
|
||||
|
||||
|
||||
# comment out if not building with libtomcat6-java
|
||||
# ubuntu: only in precise trusty vivid
|
||||
# debian: only in wheezy
|
||||
# todo: see if libtomcat7-java will work
|
||||
# legacy name, contains only tomcat-juli, not commons-logging
|
||||
#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
|
||||
#usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
|
||||
# combined into jasper-runtime.jar in non-package builds
|
||||
#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
|
||||
|
||||
|
||||
# comment out if not building with libjakarta-taglibs-standard-java
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
|
||||
|
||||
|
||||
# comment out if not building with libjstl1.1-java
|
||||
# ubuntu: in precise trusty vivid wily xenial
|
||||
# debian: in wheezy jessie stretch sid
|
||||
#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
|
||||
|
||||
5
debian/repack.sh
vendored
5
debian/repack.sh
vendored
@ -31,6 +31,11 @@ bzcat "$tarball" | tar --wildcards --delete '*/installer/lib/*' \
|
||||
--delete '*/debian-alt/*' \
|
||||
--delete '*/installer/resources/geoip.txt' \
|
||||
--delete '*/installer/resources/geoipv6.dat.gz' \
|
||||
--delete '*/apps/jetty/apache-tomcat/*' \
|
||||
--delete '*/apps/jetty/apache-tomcat-deployer/*' \
|
||||
--delete '*/apps/jetty/jetty-distribution-*/*' \
|
||||
--delete '*/apps/susidns/src/WEB-INF/lib/jstl.jar' \
|
||||
--delete '*/apps/susidns/src/WEB-INF/lib/standard.jar' \
|
||||
--delete '*/debian/*' > "$tdir/${fname}"
|
||||
|
||||
echo "Compressing filtered tarball..."
|
||||
|
||||
54
debian/rules
vendored
54
debian/rules
vendored
@ -76,8 +76,60 @@ endif
|
||||
@/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
|
||||
@/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
|
||||
@/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
|
||||
@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
|
||||
@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
|
||||
|
||||
# debian and ubuntu: everywhere
|
||||
@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
|
||||
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
@/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
|
||||
ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
|
||||
ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
|
||||
ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
|
||||
ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
|
||||
ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
|
||||
ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
|
||||
ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
|
||||
ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
|
||||
ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
|
||||
ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
|
||||
ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
|
||||
ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
|
||||
ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
|
||||
ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
|
||||
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
|
||||
#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
|
||||
#ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
|
||||
#ln -sf /usr/share/java/servlet-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
|
||||
|
||||
# ubuntu: only in precise trusty vivid
|
||||
# debian: only in wheezy
|
||||
#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
|
||||
#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
|
||||
#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
|
||||
#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
|
||||
#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
|
||||
|
||||
# debian and ubuntu: everywhere
|
||||
#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
|
||||
#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
|
||||
#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
|
||||
#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
|
||||
#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
|
||||
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
#@/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
|
||||
#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
|
||||
|
||||
# debian and ubuntu: everywhere
|
||||
#@/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
|
||||
#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
|
||||
|
||||
TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
|
||||
echo router.updateDisabled=true > $(I2P)/router.config
|
||||
mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
|
||||
|
||||
Reference in New Issue
Block a user