net-p2p/freenet-bin: Revbump this and make users fix up the previous screw-up

svn path=/sunrise/; revision=4644

diff --git a/net-p2p/freenet-bin/ChangeLog b/net-p2p/freenet-bin/ChangeLog
index 3a613d7283f55b3bca01cc1a4747c8ca42fce751..e01a824a417cad1e189a22ac174c5b5d908f00fd 100644 (file)
--- a/net-p2p/freenet-bin/ChangeLog
+++ b/net-p2p/freenet-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Sep 2007; Jakub Moc <jakub@gentoo.org> -freenet-bin-0.7.1061.ebuild,
+  +freenet-bin-0.7.1061-r1.ebuild:
+  Revbump this and make users fix up the previous screw-up
+
   14 Sep 2007; Jakub Moc <jakub@gentoo.org> freenet-bin-0.7.1061.ebuild:
   Use $RANDOM bash built-in instead of the dd hack
 

diff --git a/net-p2p/freenet-bin/Manifest b/net-p2p/freenet-bin/Manifest
index d70192286acac32d7d16cfc9bb5ec2abf32f0e15..89670c738146cf9ccfc2d7b303669f2c1feeb40b 100644 (file)
--- a/net-p2p/freenet-bin/Manifest
+++ b/net-p2p/freenet-bin/Manifest
@@ -3,6 +3,6 @@ DIST freenet-r15122-snapshot.jar 2131696 RMD160 416483369415688b6dcf090e3e4f2246
 DIST freenet07.tar.gz 383366 RMD160 d6f7baee05c1fe2d713fa345fae10bc25287b61e SHA1 8e9ddde6420f5cc24824467747b7a3bcbc21b15c SHA256 aae56bd0d2ed7d80217b1eccab1cf3a946a517df83fc6c1a9de7b95fd82724aa
 DIST update.sh 3115 RMD160 e65f151e06b5a6425dcb59f03b4874ec1e8b5047 SHA1 e024bcfc443982fcc3d888088ef427943fa62f71 SHA256 df80518672316ae8d330e08ef50f170eabacd9003eeac975a400523d0f61922c
 DIST wrapper.conf 1706 RMD160 413f4fec1f60b6d4651f1ffd945e6d9ec2275e39 SHA1 8ec5648d5677325a867118e687f1e05cfe4a417a SHA256 f56a8e897297107c3ea2c95da5f321556e1ac82e87d81f339610f8bb27ecd88b
-EBUILD freenet-bin-0.7.1061.ebuild 2510 RMD160 9089cc43f2bececc8170c01d7250ced338ec144c SHA1 4ba2651e70f0ebd33dec92fa4f65ebccf84948c4 SHA256 88cf201bd057edfbea56a15cc05a7b0c82e1529acc905a14963ac83629a0da04
-MISC ChangeLog 2197 RMD160 b1842bc295415fa7f27804eb3fb68e6d9e4e8928 SHA1 fdff38a65e7480e730e1a8e17edf2c90361966c2 SHA256 1458c4644aa11dc1a8f4f695b1ddbe9e4aea0b0210fb2865f153932b641b1fce
+EBUILD freenet-bin-0.7.1061-r1.ebuild 2922 RMD160 c159c2353742b670a49e3e2505075ccacac980b7 SHA1 82e788f969c0984017e4669f0f72450b61b213b1 SHA256 1c50465feba44406d5deaa25edcfefd0d01771b1eb6f2e148895ddefd79a9df7
+MISC ChangeLog 2366 RMD160 d095b497feeb2bf8c5bd1a8673681fdfef0caecc SHA1 cafba29bbab44564b3a87408c622369d5ab10d82 SHA256 518d27c3530e37201141c413063f02cabe0f1302b8553cf8879fb239ac66acd5
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-p2p/freenet-bin/freenet-bin-0.7.1061.ebuild b/net-p2p/freenet-bin/freenet-bin-0.7.1061-r1.ebuild
similarity index 85%
rename from net-p2p/freenet-bin/freenet-bin-0.7.1061.ebuild
rename to net-p2p/freenet-bin/freenet-bin-0.7.1061-r1.ebuild
index 65fd0b507b1382d79f2f2e32a9a5cdac40955cc1..0124cc25e7b089cd1bcfa573791d236c926dbdbb 100644 (file)
--- a/net-p2p/freenet-bin/freenet-bin-0.7.1061.ebuild
+++ b/net-p2p/freenet-bin/freenet-bin-0.7.1061-r1.ebuild
@@ -32,6 +32,14 @@ RESTRICT="userpriv"
 QA_TEXTRELS="opt/freenet/lib/libwrapper-linux-x86-32.so"
 
 pkg_setup() {
+       # previous versions created a passwordless login for freenet user
+       if has_version "<${CATEGORY}/${PN}-0.7.1061-r1" ; then
+               error "Previous versions created user account with a passwordless login shell."
+               error "You must unmerge the old version first and delete that user account."
+               error "emerge -C \\<${CATEGORY}/${PN}-0.7.1061-r1; userdel freenet, groudel freenet"
+               die "Insecure version installed!"
+       fi
+
        local PASSWD=$(printf "%04hX%04hX%04hX%04hX\n" ${RANDOM} ${RANDOM} ${RANDOM} ${RANDOM})
        enewgroup freenet
        enewuser freenet -1 /bin/sh /opt/freenet freenet -p ${PASSWD}