update to build-1468 final

5 files changed, 78 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b146a651d9c9..01b752603518 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freenet
 	pkgdesc = An encrypted network without censorship
-	pkgver = 0.7.5.1468
-	pkgrel = 2
+	pkgver = 0.7.5.1468.29.g38c543c
+	pkgrel = 3
 	url = https://downloads.freenetproject.org
 	install = freenet.install
 	arch = any
@@ -13,23 +13,25 @@ pkgbase = freenet
 	makedepends = apache-ant-contrib
 	makedepends = git
 	depends = java-runtime
-	depends = bcprov151
+	depends = bcprov151>=1.52
 	depends = gmp
 	depends = java-service-wrapper
 	noextract = lzma465.tar.bz2
 	noextract = league-lzmajio-0.95-0-gd38bf5c.tar.gz
 	noextract = jBitcollider-0.8.zip
 	noextract = mantissa-7.2-src.zip
-	noextract = *.jar
+	noextract = db4o-7.4-java.zip
+	noextract = commons-compress.jar
+	noextract = db4o.jar
 	backup = opt/freenet/wrapper.config
 	backup = opt/freenet/conf/freenet.ini
-	source = git+https://github.com/freenet/fred.git#commit=ad3fc4a
+	source = git+https://github.com/freenet/fred.git#commit=38c543c
 	source = git+https://github.com/freenet/contrib.git
 	source = git+https://github.com/freenet/plugin-JSTUN.git
 	source = git+https://github.com/freenet/plugin-UPnP.git
 	source = git+https://github.com/freenet/plugin-KeyUtils.git
+	source = git+https://github.com/freenet/plugin-WebOfTrust.git#branch=next
 	source = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref
-	source = WebOfTrust.jar::https://downloads.freenetproject.org/alpha/plugins/WebOfTrust/WebOfTrust-build0013.jar
 	source = https://downloads.freenetproject.org/contrib/jar/latest/commons-compress.jar
 	source = https://downloads.freenetproject.org/contrib/jar/latest/db4o.jar
 	source = https://raw.githubusercontent.com/i2p/i2p.i2p/master/core/c/jcpuid/src/jcpuid.c
@@ -44,27 +46,29 @@ pkgbase = freenet
 	source = league-lzmajio-0.95-0-gd38bf5c.tar.gz::https://codeload.github.com/league/lzmajio/legacy.tar.gz/0.95
 	source = https://downloads.sourceforge.net/project/bitcollider/jBitcollider%20%28Java%29/0.8/jBitcollider-0.8.zip
 	source = https://www.spaceroots.org/software/mantissa/mantissa-7.2-src.zip
+	source = https://downloads.freenetproject.org/contrib/db4o-7.4-java.zip
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = c8a96950fe4c469084905a3de54a0f89e811d39e50d46b91d052ec1d2985512d
 	sha256sums = 16924be3c8f1322b659f3ff08060a43f45f2e8de6f95af28d86fe9876e79008d
 	sha256sums = bb98650344e65138d694dfa54f89b5690088cc14f42d1ace2ae0063d35f417bd
 	sha256sums = f1ecddb5395892e0b2e6282bc3a1437d06afa52758057850ecccfa0a79c45c5d
 	sha256sums = 9ec758801a9864ae10caf851ee60ed22c3ef44428e77689c203d9b890921a6d2
 	sha256sums = 24fed7935fcbfc6eb022e04abe8b9d22fda88eae8c1f73daf99e8f28a420d05f
-	sha256sums = 10ee7592556225883e11bc13019736f77ba27e5fcce8cdc82048975317ca8c8b
+	sha256sums = 23301d421c1fd1d076ef2c8371881477924c03db21b19a8ca180a8db6349dfaa
 	sha256sums = 3e48a77324277569b93a6e4082ddcf4303435c86ebd005594f164cb0047997b3
 	sha256sums = c449771efa8819b31565ae7e46787e9aee7afbbc4664e27a96d1fd2f2a4ca4fa
-	sha256sums = 60930e055217f885135ff016175aeebc2582dcc391ff9f6340717e20ef597ec3
+	sha256sums = e83c19b6f9137539ab4dd66a5bf1a5207b4b351eb808688d963f1081852be022
 	sha256sums = ac83d727d6301e75cf1d441a1a1e72ba06ea119fa53a3bae65b3373108abf213
 	sha256sums = c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e
 	sha256sums = 265f7ed2dd4fecb058884d3f8974674b06e0be46131c3b2bc6a310373937d2ef
 	sha256sums = b36482ee9e919c669bb1797ff7e50f57edf505af67664e280fe1dff361861044
 	sha256sums = e438135d69139ed4fa44400f416ea73935d16afe50dfe490b7bba0602ee89476
+	sha256sums = 73f307a8cbd114fdc0af8daa067994a2cdc364c4053e6734d16b8dd1d5a0469f
 
 pkgname = freenet
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..c3490185dc10
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+contrib/
+fred/
+plugin-*/
+src/
+pkg/
+
+*.jar
+*.zip
+*.pkg.tar
+*.c
+*.h
+*.tar.gz
+*.tar.bz2
+seednodes.fref
diff --git a/PKGBUILD b/PKGBUILD
index 2eeff5606c2f..d8f16f0ecf20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,7 @@
 # Contributors:
 #
 
-#_fred=#tag=build01467 # build-1467 2014-11-23
-_fred=#commit=ad3fc4a  # allow building keyutils plugin from source
+_fred=#commit=38c543c  # build-1468 2015-07-11
 #_fred=#branch=next    # git HEAD
 
 # comment out to run unit tests
@@ -11,11 +10,11 @@ BUILDENV+=('!check')
 
 # plugins failing to build:
 # 'WebOfTrust'
-_plugins=('JSTUN' 'UPnP' 'KeyUtils')
+_plugins=('WebOfTrust' 'JSTUN' 'UPnP' 'KeyUtils')
 
 pkgname=freenet
-pkgver=0.7.5.1468
-pkgrel=2
+pkgver=0.7.5.1468.29.g38c543c
+pkgrel=3
 
 _pkgver=0.7.5
 pkgdesc="An encrypted network without censorship"
@@ -24,7 +23,7 @@ license=('GPL2')
 arch=('any')
 install='freenet.install'
 
-depends=('java-runtime' 'bcprov151' 'gmp' 'java-service-wrapper')
+depends=('java-runtime' 'bcprov151>=1.52' 'gmp' 'java-service-wrapper')
 makedepends=('java-environment' 'unzip' 'apache-ant' 'apache-ant-contrib' 'git')
 checkdepends=('junit')
 
@@ -37,12 +36,14 @@ backup=('opt/freenet/wrapper.config'
 _deps=("https://downloads.sourceforge.net/project/sevenzip/LZMA%20SDK/4.65/lzma465.tar.bz2"
        "league-lzmajio-0.95-0-gd38bf5c.tar.gz::https://codeload.github.com/league/lzmajio/legacy.tar.gz/0.95"
        "https://downloads.sourceforge.net/project/bitcollider/jBitcollider%20%28Java%29/0.8/jBitcollider-0.8.zip"
-       "https://www.spaceroots.org/software/mantissa/mantissa-7.2-src.zip")
+       "https://www.spaceroots.org/software/mantissa/mantissa-7.2-src.zip"
+       "${url}/contrib/db4o-7.4-java.zip")
 
 noextract=('lzma465.tar.bz2'
            'league-lzmajio-0.95-0-gd38bf5c.tar.gz'
            'jBitcollider-0.8.zip'
            'mantissa-7.2-src.zip'
+           'db4o-7.4-java.zip'
            *."jar")
 
 # here we have only java-commons-compress and java-db4o coming
@@ -52,17 +53,18 @@ source=("git+https://github.com/freenet/fred.git${_fred}"
         "git+https://github.com/freenet/plugin-JSTUN.git"
         "git+https://github.com/freenet/plugin-UPnP.git"
         "git+https://github.com/freenet/plugin-KeyUtils.git"
-        #"git+https://github.com/freenet/plugin-WebOfTrust.git"
+        "git+https://github.com/freenet/plugin-WebOfTrust.git#branch=next"
         "${url}/alpha/opennet/seednodes.fref"
-        "WebOfTrust.jar::${url}/alpha/plugins/WebOfTrust/WebOfTrust-build0013.jar"
+        #"https://downloads.freenetproject.org/alpha/freenet-ext.jar"
+        #"http://www.aqute.biz/repo/biz/aQute/bnd/0.0.401/bnd.jar"
+        #"WebOfTrust.jar::${url}/alpha/plugins/WebOfTrust/WebOfTrust-build0013.jar"
         "${url}/contrib/jar/latest/commons-compress.jar"
         "${url}/contrib/jar/latest/db4o.jar"
         "https://raw.githubusercontent.com/i2p/i2p.i2p/master/core/c/jcpuid/src/jcpuid.c"
         "https://raw.githubusercontent.com/i2p/i2p.i2p/master/core/c/jcpuid/include/jcpuid.h"
         'fred.properties' 'contrib.properties' 'run.sh'
         'freenet.service' 'freenet.ini' 'wrapper.config'
-        "${_deps[@]}"
-)
+        "${_deps[@]}")
 
 sha256sums=('SKIP'
             'SKIP'
@@ -70,25 +72,26 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'c8a96950fe4c469084905a3de54a0f89e811d39e50d46b91d052ec1d2985512d'
+            'SKIP'
             '16924be3c8f1322b659f3ff08060a43f45f2e8de6f95af28d86fe9876e79008d'
             'bb98650344e65138d694dfa54f89b5690088cc14f42d1ace2ae0063d35f417bd'
             'f1ecddb5395892e0b2e6282bc3a1437d06afa52758057850ecccfa0a79c45c5d'
             '9ec758801a9864ae10caf851ee60ed22c3ef44428e77689c203d9b890921a6d2'
             '24fed7935fcbfc6eb022e04abe8b9d22fda88eae8c1f73daf99e8f28a420d05f'
-            '10ee7592556225883e11bc13019736f77ba27e5fcce8cdc82048975317ca8c8b'
+            '23301d421c1fd1d076ef2c8371881477924c03db21b19a8ca180a8db6349dfaa'
             '3e48a77324277569b93a6e4082ddcf4303435c86ebd005594f164cb0047997b3'
             'c449771efa8819b31565ae7e46787e9aee7afbbc4664e27a96d1fd2f2a4ca4fa'
-            '60930e055217f885135ff016175aeebc2582dcc391ff9f6340717e20ef597ec3'
+            'e83c19b6f9137539ab4dd66a5bf1a5207b4b351eb808688d963f1081852be022'
             'ac83d727d6301e75cf1d441a1a1e72ba06ea119fa53a3bae65b3373108abf213'
             'c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e'
             '265f7ed2dd4fecb058884d3f8974674b06e0be46131c3b2bc6a310373937d2ef'
             'b36482ee9e919c669bb1797ff7e50f57edf505af67664e280fe1dff361861044'
-            'e438135d69139ed4fa44400f416ea73935d16afe50dfe490b7bba0602ee89476')
+            'e438135d69139ed4fa44400f416ea73935d16afe50dfe490b7bba0602ee89476'
+            '73f307a8cbd114fdc0af8daa067994a2cdc364c4053e6734d16b8dd1d5a0469f')
 
 pkgver() {
     cd "$srcdir/fred"
-    echo "${_pkgver}.$(git describe |cut -d- -f3 |sed 's/build0//')"
+    echo "${_pkgver}.$(git describe |sed 's/build0//;s/-/./g')"
 }
 
 prepare() {
@@ -107,14 +110,14 @@ prepare() {
     mkdir -p contrib/freenet-ext/{dist,lib}
 
     # had a hard time building these two sources, we'll use the binaries
-    for dep in db4o commons-compress ;do
+    for dep in commons-compress ;do
         cp "$srcdir/${dep}.jar" contrib/freenet-ext/dist
     done
 
     # this is done to satisfy ant
     ln -sf /usr/share/java/wrapper.jar contrib/freenet-ext/dist/
     ln -sf /usr/share/java/{bcprov,hamcrest-core,junit}.jar lib/
-    cp "$srcdir"/{lzma465.tar.bz2,league-lzmajio-0.95-0-gd38bf5c.tar.gz,jBitcollider-0.8.zip,mantissa-7.2-src.zip} contrib/freenet-ext/lib
+    cp "$srcdir"/{lzma465.tar.bz2,league-lzmajio-0.95-0-gd38bf5c.tar.gz,jBitcollider-0.8.zip,mantissa-7.2-src.zip,db4o-7.4-java.zip} contrib/freenet-ext/lib
 
     # we're going to compile our own c libraries
     cd "$srcdir/contrib"
@@ -140,10 +143,17 @@ build() {
     build_jbigi
     build_jcpuid
     build_fec
+    #build_db4o
 
     msg "Building Freenet-ext..."
     cd "$srcdir/fred/contrib/freenet-ext"
-    ant package -propertyfile "$srcdir/contrib.properties"
+    ant -propertyfile "$srcdir/contrib.properties"
+
+    cd dist
+    for dep in bitcollider-core commons-compress db4o lzmajio mantissa wrapper; do
+        unzip -nq "${dep}.jar"
+    done
+    jar uf freenet-ext.jar com net org SevenZip
 
     msg "Building Freenet..."
     cd "$srcdir/fred"
@@ -151,9 +161,6 @@ build() {
         -f build-clean.xml
 
     build_plugins
-
-    # not needed anymore
-    rm -f contrib/freenet-ext/dist/wrapper.jar
 }
 
 build_jbigi() {
@@ -184,13 +191,23 @@ build_fec() {
     msg "Building onion-fec..."
     cd "$srcdir/contrib/onion-fec/src/csrc"
 
-    CFLAGS+=" -I${JAVA_HOME}/include" make
+    CFLAGS+=" -I${JAVA_HOME}/include" \
+        make
+
     _DEST="../../bin/lib/linux-${_arch}"
     mkdir -p "$_DEST"
     cp libfec*.so "$_DEST"
     plain "done"
 }
 
+build_db4o() {
+    msg "Building db4o..."
+    cd "$srcdir/contrib/db4o"
+    ln -sf "$srcdir/db4o-7.4/src" .
+    ant
+    plain "done"
+}
+
 build_plugins() {
     for plugin in ${_plugins[@]}; do
         msg "Building Plugin ${plugin}..."
@@ -198,7 +215,8 @@ build_plugins() {
         ant dist \
             -Dfreenet-cvs-snapshot.location=../fred/dist/freenet.jar \
             -Dfreenet-ext.location=../contrib/freenet-ext/dist/freenet-ext.jar \
-            -Djunit.location=/usr/share/java/junit.jar
+            -Djunit.location=/usr/share/java/junit.jar \
+            -Dtest.skip=true -Djavac.target.version=1.6
     done
 }
 
@@ -220,16 +238,17 @@ package() {
     install -dm700 "$pkgdir"/run/freenet
     install -dm750 "$pkgdir"/opt/freenet/{downloads,lib,conf/node,persistent-temp,tmp,plugins/data,user/{data,certs}}
 
-    install -m640 "$srcdir"/{wrapper.config,run.sh}             "$pkgdir"/opt/freenet
-    install -m640 "$srcdir"/freenet.ini                         "$pkgdir"/opt/freenet/conf
-    install -m640 "$srcdir"/seednodes.fref                      "$pkgdir"/opt/freenet/conf/node
-    install -m640 contrib/freenet-ext/dist/* dist/freenet.jar   "$pkgdir"/opt/freenet/lib
+    install -m640 "$srcdir"/{wrapper.config,run.sh}            "$pkgdir"/opt/freenet
+    install -m640 "$srcdir"/freenet.ini                        "$pkgdir"/opt/freenet/conf
+    install -m640 "$srcdir"/seednodes.fref                     "$pkgdir"/opt/freenet/conf/node
+    install -m640 contrib/freenet-ext/dist/freenet-ext.jar \
+                  dist/freenet.jar                             "$pkgdir"/opt/freenet/lib
 
     # plugins
     for plugin in ${_plugins[@]}; do
     install -m640 "$srcdir"/plugin-${plugin}/dist/${plugin}.jar "$pkgdir"/opt/freenet/plugins
     done
-    install -m640 "$srcdir"/WebOfTrust.jar           "$pkgdir"/opt/freenet/plugins
+    #install -m640 "$srcdir"/WebOfTrust.jar           "$pkgdir"/opt/freenet/plugins
 
     echo "pluginmanager.loadplugin=$(echo ${_plugins[@]}|sed 's| |;|g')" \
         >>"$pkgdir"/opt/freenet/conf/freenet.ini
diff --git a/contrib.properties b/contrib.properties
index c6b4d212cc13..5f450e70ebb4 100644
--- a/contrib.properties
+++ b/contrib.properties
@@ -1,9 +1,9 @@
 javac.target.version = 1.6
 extlib.use-mirrors   = local
 
+extlib.commons-compress.suppress = true
 extlib.wrapper.suppress  = true
-extlib.db4o.suppress     = true
+extlib.db4o.suppress     = false
 extlib.lzma.suppress     = false
 extlib.lzmajio.suppress  = false
 extlib.mantissa.suppress = false
-extlib.commons-compress.suppress = true
diff --git a/freenet.ini b/freenet.ini
index d3323be598e5..584d94d581f2 100644
--- a/freenet.ini
+++ b/freenet.ini
@@ -28,3 +28,4 @@ fcp.enabled=true
 fcp.port=9481
 security-levels.physicalThreatLevel=LOW
 security-levels.networkThreatLevel=NORMAL
+pluginmanager.loadplugin=KeyUtils;JSTUN;UPnP;WebOfTrust