| 1 |
tommy 14/06/01 10:29:19 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: freenet-0.7.5_p1462.ebuild |
| 5 |
Removed: freenet-0.7.5_p1456.ebuild |
| 6 |
freenet-0.7.5_p1455.ebuild |
| 7 |
Log: |
| 8 |
Version bump, use --user instead of --chuid for init script, fixes bug 488958, drop old |
| 9 |
|
| 10 |
(Portage version: 2.2.6-r1/cvs/Linux x86_64, signed Manifest commit with key 0x35899067) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.182 net-p2p/freenet/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/ChangeLog?rev=1.182&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/ChangeLog?rev=1.182&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/ChangeLog?r1=1.181&r2=1.182 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v |
| 22 |
retrieving revision 1.181 |
| 23 |
retrieving revision 1.182 |
| 24 |
diff -u -r1.181 -r1.182 |
| 25 |
--- ChangeLog 30 Mar 2014 19:14:05 -0000 1.181 |
| 26 |
+++ ChangeLog 1 Jun 2014 10:29:19 -0000 1.182 |
| 27 |
@@ -1,6 +1,14 @@ |
| 28 |
# ChangeLog for net-p2p/freenet |
| 29 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.181 2014/03/30 19:14:05 pacho Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.182 2014/06/01 10:29:19 tommy Exp $ |
| 32 |
+ |
| 33 |
+*freenet-0.7.5_p1462 (01 Jun 2014) |
| 34 |
+ |
| 35 |
+ 01 Jun 2014; Thomas Sachau (Tommy[D]) <tommy@g.o> |
| 36 |
+ -freenet-0.7.5_p1455.ebuild, -freenet-0.7.5_p1456.ebuild, |
| 37 |
+ +freenet-0.7.5_p1462.ebuild: |
| 38 |
+ Version bump, use --user instead of --chuid for init script, fixes bug |
| 39 |
+ 488958, drop old |
| 40 |
|
| 41 |
*freenet-0.7.5_p1459-r1 (30 Mar 2014) |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 net-p2p/freenet/freenet-0.7.5_p1462.ebuild |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1462.ebuild?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1462.ebuild?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: freenet-0.7.5_p1462.ebuild |
| 52 |
=================================================================== |
| 53 |
# Copyright 1999-2014 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1462.ebuild,v 1.1 2014/06/01 10:29:19 tommy Exp $ |
| 56 |
|
| 57 |
EAPI="5" |
| 58 |
DATE=20130915 |
| 59 |
JAVA_PKG_IUSE="doc source" |
| 60 |
|
| 61 |
inherit eutils java-pkg-2 java-ant-2 multilib systemd user |
| 62 |
|
| 63 |
DESCRIPTION="An encrypted network without censorship" |
| 64 |
HOMEPAGE="https://freenetproject.org/" |
| 65 |
SRC_URI="https://github.com/${PN}/fred-official/archive/build0${PV#*p}.zip -> ${P}.zip |
| 66 |
mirror://gentoo/seednodes-${DATE}.fref.bz2 |
| 67 |
mirror://gentoo/freenet-ant-1.7.1.jar" |
| 68 |
|
| 69 |
LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0" |
| 70 |
SLOT="0" |
| 71 |
KEYWORDS="~amd64 ~x86" |
| 72 |
IUSE="test" |
| 73 |
|
| 74 |
CDEPEND="dev-java/bcprov:1.49 |
| 75 |
dev-java/commons-compress:0 |
| 76 |
dev-db/db-je:3.3 |
| 77 |
dev-java/fec:0 |
| 78 |
dev-java/java-service-wrapper:0 |
| 79 |
dev-java/db4o-jdk11:0 |
| 80 |
dev-java/db4o-jdk12:0 |
| 81 |
dev-java/db4o-jdk5:0 |
| 82 |
dev-java/jbitcollider-core:0 |
| 83 |
dev-java/lzma:0 |
| 84 |
dev-java/lzmajio:0 |
| 85 |
dev-java/mersennetwister:0" |
| 86 |
DEPEND="app-arch/unzip |
| 87 |
>=virtual/jdk-1.6 |
| 88 |
${CDEPEND} |
| 89 |
test? ( dev-java/junit:0 |
| 90 |
dev-java/ant-junit:0 ) |
| 91 |
dev-java/ant-core:0" |
| 92 |
RDEPEND=">=virtual/jre-1.6 |
| 93 |
net-libs/nativebiginteger:0 |
| 94 |
${CDEPEND}" |
| 95 |
PDEPEND="net-libs/NativeThread:0" |
| 96 |
|
| 97 |
JAVA_PKG_BSFIX_NAME+=" build-clean.xml" |
| 98 |
JAVA_ANT_REWRITE_CLASSPATH="yes" |
| 99 |
JAVA_ANT_CLASSPATH_TAGS+=" javadoc" |
| 100 |
JAVA_ANT_ENCODING="utf8" |
| 101 |
|
| 102 |
EANT_BUILD_TARGET="package" |
| 103 |
EANT_TEST_TARGET="unit" |
| 104 |
EANT_BUILD_XML="build-clean.xml" |
| 105 |
EANT_GENTOO_CLASSPATH="bcprov-1.49,commons-compress,db4o-jdk5,db4o-jdk12,db4o-jdk11,db-je-3.3,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister" |
| 106 |
EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true" |
| 107 |
|
| 108 |
S=${WORKDIR}/fred-official-build0${PV#*p} |
| 109 |
|
| 110 |
pkg_setup() { |
| 111 |
has_version dev-java/icedtea[cacao] && { |
| 112 |
ewarn "dev-java/icedtea was built with cacao USE flag." |
| 113 |
ewarn "freenet may compile with it, but it will refuse to run." |
| 114 |
ewarn "Please remerge dev-java/icedtea without cacao USE flag," |
| 115 |
ewarn "if you plan to use it for running freenet." |
| 116 |
} |
| 117 |
java-pkg-2_pkg_setup |
| 118 |
enewgroup freenet |
| 119 |
enewuser freenet -1 -1 /var/freenet freenet |
| 120 |
} |
| 121 |
|
| 122 |
src_unpack() { |
| 123 |
unpack ${P}.zip seednodes-${DATE}.fref.bz2 |
| 124 |
mv "${WORKDIR}"/freenet-fred-* "${S}" |
| 125 |
} |
| 126 |
|
| 127 |
java_prepare() { |
| 128 |
cp "${FILESDIR}"/freenet-0.7.5_p1422-wrapper.conf freenet-wrapper.conf || die |
| 129 |
cp "${FILESDIR}"/run.sh-20090501 run.sh || die |
| 130 |
epatch "${FILESDIR}"/0.7.5_p1321-ext.patch |
| 131 |
|
| 132 |
sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \ |
| 133 |
freenet-wrapper.conf || die "sed failed" |
| 134 |
|
| 135 |
echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf |
| 136 |
|
| 137 |
local i=2 pkg jars jar |
| 138 |
local ifs_original=${IFS} |
| 139 |
IFS="," |
| 140 |
for pkg in ${EANT_GENTOO_CLASSPATH} ; do |
| 141 |
jars="$(java-pkg_getjars ${pkg})" |
| 142 |
for jar in ${jars} ; do |
| 143 |
echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf |
| 144 |
done |
| 145 |
done |
| 146 |
IFS=${ifs_original} |
| 147 |
echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf |
| 148 |
|
| 149 |
cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die |
| 150 |
} |
| 151 |
|
| 152 |
EANT_TEST_EXTRA_ARGS="-Dtest.skip=false" |
| 153 |
|
| 154 |
src_test() { |
| 155 |
java-pkg-2_src_test |
| 156 |
} |
| 157 |
|
| 158 |
src_install() { |
| 159 |
java-pkg_dojar dist/freenet.jar |
| 160 |
java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar |
| 161 |
if has_version =sys-apps/baselayout-2*; then |
| 162 |
doinitd "${FILESDIR}"/freenet |
| 163 |
else |
| 164 |
newinitd "${FILESDIR}"/freenet.old freenet |
| 165 |
fi |
| 166 |
systemd_dounit "${FILESDIR}"/freenet.service |
| 167 |
dodoc AUTHORS || die |
| 168 |
newdoc README.md README || die |
| 169 |
insinto /etc |
| 170 |
doins freenet-wrapper.conf || die |
| 171 |
insinto /var/freenet |
| 172 |
doins run.sh || die |
| 173 |
newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref || die |
| 174 |
fperms +x /var/freenet/run.sh |
| 175 |
dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so |
| 176 |
use doc && java-pkg_dojavadoc javadoc |
| 177 |
use source && java-pkg_dosrc src |
| 178 |
} |
| 179 |
|
| 180 |
pkg_postinst() { |
| 181 |
elog " " |
| 182 |
elog "1. Start freenet with /etc/init.d/freenet start." |
| 183 |
elog "2. Open localhost:8888 in your browser for the web interface." |
| 184 |
#workaround for previously existing freenet user |
| 185 |
[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \ |
| 186 |
freenet:freenet /var/freenet |
| 187 |
} |
| 188 |
|
| 189 |
pkg_postrm() { |
| 190 |
if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then |
| 191 |
elog " " |
| 192 |
elog "If you dont want to use freenet any more" |
| 193 |
elog "and dont want to keep your identity/other stuff" |
| 194 |
elog "remember to do 'rm -rf /var/freenet' to remove everything" |
| 195 |
fi |
| 196 |
} |
Archives