# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ -freenet-0.7_p1155.ebuild, +freenet-0.7_p1155-r1.ebuild,
+ -freenet-9999.ebuild, +freenet-9999-r1.ebuild, files/freenet,
+ files/freenet.old, files/wrapper.conf.patch, +files/wrapper1.conf:
+ Update install location
+
08 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
-freenet-0.7_p1154.ebuild, +freenet-0.7_p1155.ebuild:
New upstream release
AUX ext.patch 4954 RMD160 57fb8ecf9be8900a1ad54306d5c4df1eef6acd80 SHA1 3f9eaacdac0165f22ab6fe368140b820b93191b2 SHA256 206205dcf18ae6ad641fcb9f620b605aea47ed6b078296b41476ac3074045325
-AUX freenet 476 RMD160 feff89049a1107a5be2f99951634ab3192403420 SHA1 c71427613ca58e6336d2de19f4544dbf623712bb SHA256 19d3fcebd56a2578e330518d0dd41ba504102c993a23305d2f596520f6403de8
-AUX freenet.old 452 RMD160 c07cd94a5f7ec882824b14a4f0e26cba05c1480c SHA1 beaf4d84a50ad3658160434d2de3379dafd81ec0 SHA256 af03d1479f8b42a5e7b7747486c40d76ebef99c5ed19fdcb185af03123f8c232
-AUX wrapper.conf.patch 691 RMD160 a4f534fb81d20972d80d16a579a5f493918149d1 SHA1 e280d06f42e310cd96f207f5ffdb28ed18364425 SHA256 354dc64eab82bbc312ac226fab56932da7d7fc085bef2a8eb0092229f112ce1d
+AUX freenet 704 RMD160 0deb810401bb95c488e389b6c207312783dd0040 SHA1 ef22ce8d16b1317739bb03b1954b91a70e1141a0 SHA256 a6afc449cec8f57860a24f7e1e8e14457fc5149c751f40ba775798821a5d3c81
+AUX freenet.old 680 RMD160 be4c017aa2696b798fafbadacaa50dd247b0689e SHA1 8cb1b300824070832db04586a434a0b3c8d23086 SHA256 62b94e1d320205899783090def844837d9ff4dfd43dcda21ea77ba49a9c4bd29
+AUX wrapper.conf.patch 691 RMD160 ed7b8a05893e00a9277ffb692d19344705bd4b09 SHA1 61ced02c9bf5b2c1baaa2fc32c56967b91e9e9f6 SHA256 4e570bf68091ef364f3194ae7233d5ba4d59eef97f5e936fdbf6b0174d8591e9
+AUX wrapper1.conf 1792 RMD160 9223ed3fd640840021294ef0302ee1e15501f5f9 SHA1 d5dc1932052b744f3a14bec8ba41af53b4e4c5df SHA256 a5e28c8f908a3de603c01f1722690795df914edde4df27657a2496ba71c37f35
DIST freenet-0.7_p1155.tar.bz2 2112880 RMD160 a1f6b80820b0e295ebb2ba18360af1d54351218a SHA1 6dea82cd63a1db8e97a03f03154c68da85106a0c SHA256 095a2bc04c4886455780fbfbb7940446f90dabff28c028c57997ae6394a1f6d4
DIST seednodes-20080721.fref 37077 RMD160 4b7aca1d3864a42f4bbece5cf7d9b410888feebe SHA1 93fa0bbae17e15cbf073ad9da9070de023c265f5 SHA256 37f075bc40611f0db15e3e5012aebbd6a14775f2a70e90ab7838b5f91fa42ac1
-DIST wrapper-20080330.conf 1667 RMD160 77c0e4d379521ce10da408dd35ec0ebb5c82f4a9 SHA1 7f8679579c47e2c0644d26c67c26d779bf6f8d75 SHA256 70a98acb43b43b00b45bda40de5745ba188d366dd69c5d97968aa4494b7441f0
-EBUILD freenet-0.7_p1155.ebuild 2819 RMD160 5c4d35f08f27654c62f5f0bbd91c0f4145dbe613 SHA1 2bcef40f0700c1c5ad7c21c421e93867f189c315 SHA256 4900d38de7a7ffad848fd3a56fa13038fef0e95dbc9cc7da370bb6e09a69c0c4
-EBUILD freenet-9999.ebuild 3343 RMD160 2f401a4debb89de9ac595f5011dbc816a50a2c61 SHA1 f4d7b46ec92dd9cf291689c5080b5938e18e1c2d SHA256 a510b4d314a48475b496c204a31f7fe2713a287ad9bf7c44d975ff0b10624e2d
-MISC ChangeLog 11394 RMD160 812b89aadc5331c9c1aa140ffca100c3160f446f SHA1 827b8284b3570d8832343100e63d20c9ae9f5723 SHA256 392b2abd99df713ef797077f3ad2b7dbd58f92d04e7bd4971922407d9a8552a6
+EBUILD freenet-0.7_p1155-r1.ebuild 3197 RMD160 affcb9a57ac75e6d8fc720ae15c4d6bd8162438e SHA1 80781881c3cce67c08632557a3159a16bdc2cc51 SHA256 44529a2e5038e59c6e268a572a085bb05105b26590139b99b22e6ed6f6fa48c2
+EBUILD freenet-9999-r1.ebuild 3421 RMD160 d4e38a8de26a7bce4f2a9b6cc31fd7d238cd33db SHA1 1bb2200522e88247c5cf1e62f7debe9e546d2199 SHA256 d9908ad1c6562d37af06bb8ccf86a7380c790eeffc19e075534d5f26b279bf1a
+MISC ChangeLog 11672 RMD160 2a3c3c0eef85f9d4e3d1ce3febd450a9884b049d SHA1 b37c15b4d152e624cd9c1e05ab85441ac1564aea SHA256 a095ecd4f521d23585c2a63647dabf26e02ff1fe269f1539e81d0628481eaac0
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
# Distributed under the terms of the GNU General Public License v2
start() {
- start-stop-daemon --start --chuid freenet --exec /bin/sh /opt/freenet/run.sh start 2>/dev/null
- eend 0
+ if ! [[ -e /opt/freenet/freenet.ini ]] && [[ -e /var/freenet/freenet.ini ]]; then
+ start-stop-daemon --start --chuid freenet --exec /bin/sh /var/freenet/run.sh start 2>/dev/null
+ eend 0
+ else
+ echo "Please move freenet to the new location with the following command:"
+ echo " mv /opt/freenet /var/freenet"
+ eend 1
+ fi
}
status() {
- start-stop-daemon --start --chuid freenet --exec /bin/sh /opt/freenet/run.sh status 2>/dev/null
+ start-stop-daemon --start --chuid freenet --exec /bin/sh /var/freenet/run.sh status 2>/dev/null
eend 0
}
stop() {
- start-stop-daemon --start --chuid freenet --exec /bin/sh /opt/freenet/run.sh stop 2>/dev/null
+ start-stop-daemon --start --chuid freenet --exec /bin/sh /var/freenet/run.sh stop 2>/dev/null
eend 0
}
# Distributed under the terms of the GNU General Public License v2
start() {
- start-stop-daemon --start --chuid freenet --exec /opt/freenet/run.sh start 2>/dev/null
- eend 0
+ if ! [[ -e /opt/freenet/freenet.ini ]] && [[ -e /var/freenet/freenet.ini ]]; then
+ start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh start 2>/dev/null
+ eend 0
+ else
+ echo "Please move freenet to the new location with the following command:"
+ echo " mv /opt/freenet /var/freenet"
+ eend 1
+ fi
}
status() {
- start-stop-daemon --start --chuid freenet --exec /opt/freenet/run.sh status 2>/dev/null
+ start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh status 2>/dev/null
eend 0
}
stop() {
- start-stop-daemon --start --chuid freenet --exec /opt/freenet/run.sh stop 2>/dev/null
+ start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh stop 2>/dev/null
eend 0
}
---- wrapper.conf 2008-03-30 16:12:53.000000000 +0200
-+++ wrapper.conf.new 2008-03-30 16:16:12.000000000 +0200
+--- wrapper.conf 2008-08-10 16:00:36.000000000 +0200
++++ wrapper.conf.new 2008-08-10 16:01:50.000000000 +0200
@@ -1,8 +1,10 @@
wrapper.java.command=java\r
-wrapper.working.dir=../\r
-+wrapper.working.dir=/opt/freenet/\r
++wrapper.working.dir=/var/freenet/\r
wrapper.java.mainclass=freenet.node.NodeStarter\r
-wrapper.java.classpath.1=freenet.jar\r
-wrapper.java.classpath.2=freenet-ext.jar\r
--- /dev/null
+wrapper.java.command=java
+wrapper.working.dir=/var/freenet/
+wrapper.java.mainclass=freenet.node.NodeStarter
+wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar
+wrapper.java.classpath.2=/usr/share/java-service-wrapper/lib/wrapper.jar
+wrapper.java.classpath.3=/usr/share/db-je-3.2/lib/je.jar
+wrapper.java.classpath.4=/usr/share/fec/lib/fec.jar
+wrapper.java.library.path.1=lib
+wrapper.java.initmemory=60
+wrapper.java.maxmemory=128
+wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
+wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
+wrapper.java.additional.3=-enableassertions:freenet
+wrapper.app.parameter.1=freenet.ini
+wrapper.console.format=PM
+wrapper.console.loglevel=INFO
+wrapper.logfile=wrapper.log
+wrapper.logfile.format=LPTM
+wrapper.logfile.loglevel=INFO
+wrapper.logfile.maxsize=2M
+wrapper.logfile.maxfiles=3
+wrapper.syslog.loglevel=NONE
+wrapper.console.title=Freenet 0.7
+wrapper.jvm_exit.timeout=120
+wrapper.restart.reload_configuration=TRUE
+wrapper.filter.trigger.1=java.lang.OutOfMemoryError
+wrapper.filter.action.1=RESTART
+
+# Name of the service
+wrapper.ntservice.name=freenet-darknet
+
+# Display name of the service
+wrapper.ntservice.displayname=Freenet 0.7 darknet
+
+# Description of the service
+wrapper.ntservice.description=The Free Network Project daemon
+
+# Service dependencies. Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed. AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false
+
+wrapper.ntservice.process_priority=BELOW_NORMAL
+
+# Start services with a different user than SYSTEM
+# SEE http://wrapper.tanukisoftware.org/doc/english/prop-ntservice-account.html BEFORE PROCEEDING !
+
# $Header: $
EAPI=1
-WRAPPER_DATE=20080330
inherit eutils java-pkg-2 java-ant-2 multilib
DESCRIPTION="An encrypted network without censorship"
HOMEPAGE="http://www.freenetproject.org/"
SRC_URI="http://dev.gentooexperimental.org/~tommy/distfiles/${P}.tar.bz2
- http://dev.gentoo.org/~tommy/distfiles/${P}.tar.bz2
- http://dev.gentooexperimental.org/~tommy/distfiles/wrapper-${WRAPPER_DATE}.conf
- http://dev.gentoo.org/~tommy/distfiles/wrapper-${WRAPPER_DATE}.conf"
+ http://dev.gentoo.org/~tommy/distfiles/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
pkg_setup() {
java-pkg-2_pkg_setup
enewgroup freenet
- enewuser freenet -1 -1 /opt/freenet freenet
+ grep /opt/freenet /etc/passwd >/dev/null
+ if [ $? == "0" ]; then
+ ewarn " "
+ ewarn "Changing freenet homedir from /opt/freenet to /var/freenet"
+ ewarn " "
+ usermod -d /var/freenet freenet || die "Was not able to change freenet homedir from /opt/freenet to /var/freenet"
+ else
+ enewuser freenet -1 -1 /var/freenet freenet
+ fi
}
src_unpack() {
unpack "${P}".tar.bz2
cd "${S}"
- cp "${DISTDIR}"/wrapper-${WRAPPER_DATE}.conf wrapper.conf
- epatch "${FILESDIR}"/wrapper.conf.patch
+ cp "${FILESDIR}"/wrapper1.conf wrapper.conf
epatch "${FILESDIR}"/ext.patch
sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed"
+ sed -i -e "s:opt/:var/:g" run.sh || die "sed failed"
mkdir -p lib
cd lib
java-pkg_jar-from db-je-3.2
fi
dodoc license/README license/LICENSE.Mantissa \
AUTHORS README
- insinto /opt/freenet
+ insinto /var/freenet
doins seednodes.fref wrapper.conf run.sh
- dodir /opt/freenet/bin
- dosym /usr/bin/wrapper /opt/freenet/bin/wrapper
- dodir /opt/freenet/$(get_libdir)
- dosym ../../../usr/$(get_libdir)/java-service-wrapper/libwrapper.so /opt/freenet/$(get_libdir)/libwrapper.so
- fperms +x /opt/freenet/run.sh
+ dodir /var/freenet/bin
+ dosym /usr/bin/wrapper /var/freenet/bin/wrapper
+ dodir /var/freenet/$(get_libdir)
+ dosym ../../../usr/$(get_libdir)/java-service-wrapper/libwrapper.so /var/freenet/$(get_libdir)/libwrapper.so
+ dosym ../../../usr/$(get_libdir)/libNativeThread.so /var/freenet/$(get_libdir)/libNativeThread.so
+ use x86 && dosym ../../../usr/$(get_libdir)/libfec8so /var/freenet/$(get_libdir)/libfec8.so
+ use x86 && dosym ../../../usr/$(get_libdir)/libfec16so /var/freenet/$(get_libdir)/libfec16.so
+ fperms +x /var/freenet/run.sh
}
pkg_postinst () {
elog "1. Start freenet with /etc/init.d/freenet start."
elog "2. Open localhost:8888 in your browser for the web interface."
- elog
+ elog " "
elog "If you dont know trusted people running freenet,"
elog "enable opennet (\"insecure mode\") on the config page to get started."
- elog
- if use amd64;then
- if has_version =dev-java/blackdown-jdk-1.4*;then
- elog "Freenet does not run with 64bit blackdown-jdk,"
- elog "please make sure that either system-vm or the"
- elog "user-vm for freenet uses sun-jdk or some other"
- elog "vm (other vms are untested)."
- elog
- fi
+ elog " "
+ chown freenet:freenet /var/freenet
+ if [[ -e /opt/freenet/freenet.ini ]] && ! [[ -e /var/freenet/freenet.ini ]]; then
+ ewarn " "
+ ewarn "Please move freenet to the new location with the following command:"
+ ewarn " mv /opt/freenet /var/freenet"
+ ewarn " "
fi
- chown freenet:freenet /opt/freenet
}
pkg_postrm() {
- elog "If you dont want to use freenet any more"
- elog "and dont want to keep your identity/other stuff"
- elog "remember to do 'rm -rf /opt/freenet' to remove everything"
+ if [ -z has_version ]; then
+ elog "If you dont want to use freenet any more"
+ elog "and dont want to keep your identity/other stuff"
+ elog "remember to do 'rm -rf /var/freenet' to remove everything"
+ fi
}
EAPI=1
DATE=20080721
-DATE2=20080330
ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/freenet"
ESVN_OPTIONS="--ignore-externals"
inherit eutils java-pkg-2 java-ant-2 multilib subversion
DESCRIPTION="An encrypted network without censorship"
HOMEPAGE="http://www.freenetproject.org/"
SRC_URI="http://dev.gentooexperimental.org/~tommy/distfiles/seednodes-${DATE}.fref
- http://dev.gentoo.org/~tommy/distfiles/seednodes-${DATE}.fref
- http://dev.gentooexperimental.org/~tommy/distfiles/wrapper-${DATE2}.conf
- http://dev.gentoo.org/~tommy/distfiles/wrapper-${DATE2}.conf"
+ http://dev.gentoo.org/~tommy/distfiles/seednodes-${DATE}.fref"
LICENSE="GPL-2"
SLOT="0"
pkg_setup() {
java-pkg-2_pkg_setup
enewgroup freenet
- enewuser freenet -1 -1 /opt/freenet freenet
+ grep /opt/freenet /etc/passwd >/dev/null
+ if [ $? == "0" ]; then
+ ewarn " "
+ ewarn "Changing freenet homedir from /opt/freenet to /var/freen$
+ ewarn " "
+ usermod -d /var/freenet freenet || die "Was not able to change $
+ else
+ enewuser freenet -1 -1 /var/freenet freenet
+ fi
}
src_unpack() {
subversion_src_unpack
cd "${S}"
cp "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref
- cp "${DISTDIR}"/wrapper-${DATE2}.conf wrapper.conf
- sed -i -e 's:./bin/wrapper:/opt/freenet/bin/wrapper:g' \
- -e 's:./wrapper.conf:/opt/freenet/wrapper.conf:g' \
- -e 's:PIDDIR=".":PIDDIR="/opt/freenet/":g' \
+ cp "${FILESDIR}"/wrapper1.conf wrapper.conf
+ sed -i -e 's:./bin/wrapper:/var/freenet/bin/wrapper:g' \
+ -e 's:./wrapper.conf:/var/freenet/wrapper.conf:g' \
+ -e 's:PIDDIR=".":PIDDIR="/var/freenet/":g' \
-e 's:#RUN_AS_USER=:RUN_AS_USER=freenet:g' run.sh || die "sed failed"
sed -ie "s:@custom@:${MY_FREENET_LATEST}:g" src/freenet/node/Version.java
- epatch "${FILESDIR}"/wrapper.conf.patch
epatch "${FILESDIR}"/ext.patch
sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed"
mkdir -p lib
java-pkg_jar-from fec
}
-src_compile() {
- #workaround for installed blackdown-jdk-1.4
- #freenet does not compile with it
- if has_version =dev-java/sun-jdk-1.6*; then
- GENTOO_VM="sun-jdk-1.6" java-pkg-2_src_compile
- elif has_version =dev-java/sun-jdk-1.5*; then
- GENTOO_VM="sun-jdk-1.5" java-pkg-2_src_compile
- else
- die ">=dev-java/sun-jdk-1.5 not found"
- fi
-}
-
src_install() {
mv lib/freenet-cvs-snapshot.jar freenet.jar
java-pkg_dojar freenet.jar
- doinitd "${FILESDIR}"/freenet
- insinto /opt/freenet
+ if has_version =sys-apps/baselayout-2*; then
+ doinitd "${FILESDIR}"/freenet
+ else
+ newinitd "${FILESDIR}"/freenet.old freenet
+ fi
+ insinto /var/freenet
doins wrapper.conf run.sh seednodes.fref
- dodir /opt/freenet/bin
- dosym /usr/bin/wrapper /opt/freenet/bin/wrapper
- dodir /opt/freenet/$(get_libdir)
- dosym ../../../usr/$(get_libdir)/java-service-wrapper/libwrapper.so /opt/freenet/$(get_libdir)/libwrapper.so
- fperms +x /opt/freenet/run.sh
+ dodir /var/freenet/bin
+ dosym /usr/bin/wrapper /var/freenet/bin/wrapper
+ dodir /var/freenet/$(get_libdir)
+ dosym ../../../usr/$(get_libdir)/java-service-wrapper/libwrapper.so /var/freenet/$(get_libdir)/libwrapper.so
+ fperms +x /var/freenet/run.sh
}
pkg_postinst () {
elog "1. Start freenet with /etc/init.d/freenet start."
elog "2. Open localhost:8888 in your browser for the web interface."
- elog
+ elog " "
elog "If you dont know trusted people running freenet,"
elog "enable opennet (\"insecure mode\") on the config page to get started."
- elog
- chown freenet:freenet /opt/freenet
+ elog " "
+ chown freenet:freenet /var/freenet
+ if [[ -e /opt/freenet/freenet.ini ]] && ! [[ -e /var/freenet/freenet.ini ]]; then
+ ewarn " "
+ ewarn "Please move freenet to the new location with the following command:"
+ ewarn " mv /opt/freenet /var/freenet"
+ ewarn " "
+ fi
}
pkg_postrm() {
- elog "If you dont want to use freenet any more"
- elog "and dont want to keep your identity/other stuff"
- elog "remember to do 'rm -rf /opt/freenet' to remove everything"
+ if [ -z has_version ]; then
+ elog "If you dont want to use freenet any more"
+ elog "and dont want to keep your identity/other stuff"
+ elog "remember to do 'rm -rf /opt/freenet' to remove everything"
+ fi
}
projects / ~andy / sunrise / commitdiff