From b6b14913685c4a5cf39fb3fd33aa1231c1af7a9a Mon Sep 17 00:00:00 2001 From: sponge Date: Mon, 2 Feb 2009 01:22:31 +0000 Subject: [PATCH] Final Slackbuild cleanups, ant slackpkg target added. --- Slackware/README | 21 +++++++++++++++------ Slackware/i2p-base/build.xml | 8 ++++++++ Slackware/i2p/blocklist.txt | 11 ----------- Slackware/i2p/build.xml | 8 ++++++++ Slackware/i2p/doinst.sh | 34 +++++++++++++++++++++++++++++++--- Slackware/i2p/i2p.SlackBuild | 5 ++++- Slackware/i2p/readme.txt | 16 +++++++++++----- Slackware/i2p/slack-desc | 4 +--- build.xml | 6 ++++++ history.txt | 4 ++++ 10 files changed, 88 insertions(+), 29 deletions(-) create mode 100644 Slackware/i2p-base/build.xml delete mode 100644 Slackware/i2p/blocklist.txt create mode 100644 Slackware/i2p/build.xml diff --git a/Slackware/README b/Slackware/README index 9228a0f5a..494ffa420 100644 --- a/Slackware/README +++ b/Slackware/README @@ -1,21 +1,30 @@ -You will need atleast monotone > = 0.41 to get the most recent build source +ou will need atleast monotone > = 0.41 to get the most recent build source and connect it to an already running i2p router. OR: -You may download the actual source from -http://mirror.i2p2.de/i2psource_0.7.tar.bz2 for the "stable" releases. - +You may download the actual "stable" source from +http://code.google.com/p/i2p/downloads/list You will need to follwing tools to build the i2p and i2p-base packages: bash >= 3.1.017 +requiredbuilder >= 0.16.3 ( http://www.stabellini.net/requiredbuilder.html ) jre >= 6u11 jdk >= 6u11 - apache-ant >= 1.7.1 perl >= 5.10.0 python >= 2.5.2 Reccomended: -monotone >= 0.41 (from pkgs.dr.ea.ms) +monotone >= 0.41 ( http://pkgs.dr.ea.ms ) + +See also: + +i2p/readme.txt + +AND + +i2p-base/readme.txt + +for information and handy tips. diff --git a/Slackware/i2p-base/build.xml b/Slackware/i2p-base/build.xml new file mode 100644 index 000000000..f8def337e --- /dev/null +++ b/Slackware/i2p-base/build.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Slackware/i2p/blocklist.txt b/Slackware/i2p/blocklist.txt deleted file mode 100644 index 1ac6548e9..000000000 --- a/Slackware/i2p/blocklist.txt +++ /dev/null @@ -1,11 +0,0 @@ -# To enable set router.blocklist.enable=true on configadvanced.jsp and restart. -# Add additional entries as desired, sorting not required. -# Warning - a large list will increase memory usage. -# Please do not block too broadly, it will segment and harm the network. -# Also you must update this list yourself, it is not overwritten by the update process. -# For example, http://www.bluetack.co.uk/config/splist.zip is very broad and includes Tor users, it is not recommended. -# A more reasonable list: http://www.bluetack.co.uk/config/level1.zip -# -Fucktard Floodfill Flooder:159.226.40.7 -Friend of the Fucktard Floodfill Flooder:159.226.40.3 -Fucktard Class O Unreachable:Do51O6vNvAYQRCK-~REhrblGHHOKGwH4RkpGp75nnNs= diff --git a/Slackware/i2p/build.xml b/Slackware/i2p/build.xml new file mode 100644 index 000000000..0683bdeb0 --- /dev/null +++ b/Slackware/i2p/build.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Slackware/i2p/doinst.sh b/Slackware/i2p/doinst.sh index 7493c7010..91dd09721 100644 --- a/Slackware/i2p/doinst.sh +++ b/Slackware/i2p/doinst.sh @@ -7,7 +7,7 @@ INST_DIR=directory echo for i in *.config ; { if [ -f $INST_DIR/$i ] ; then - echo "Please check $i, as there is a new version." + echo "Please check ${INST_DIR}${i}, as there is a new version." cp $i $INST_DIR/$i.new else cp $i $INST_DIR/$i @@ -15,6 +15,36 @@ for i in *.config ; { } ) + +( cd $INST_DIR + if [ -f blocklist.txt ] ; then + echo "Please check ${INST_DIR}blocklist.txt, as there is a new version." + else + mv blocklist.txt.new blocklist.txt + fi +) + +( cd $INST_DIR/eepsite + if [ -f jetty.xml ] ; then + rm jetty.xml.new + else + mv jetty.xml.new jetty.xml + fi +) + +( cd $INST_DIR/eepsite/docroot + if [ -f index.html ] ; then + rm index.html.new + else + mv index.html.new index.html + fi + if [ -f favicon.ico ] ; then + rm favicon.ico.new + else + mv favicon.ico.new favicon.ico + fi +) + echo echo "FINISHING I2P INSTALLATION. PLEASE WAIT." @@ -23,8 +53,6 @@ sh postinstall.sh || ( echo "ERROR: failed execution of postinstall.sh. Please" echo "cd into i2p installation directory and run " echo "postinstall.sh manually with ./postinstall.sh" - echo "It is also reccomended to set router.blocklist.enable=true " - echo "in the router.config file." exit 1 ) diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild index bc077b53c..421033356 100755 --- a/Slackware/i2p/i2p.SlackBuild +++ b/Slackware/i2p/i2p.SlackBuild @@ -76,8 +76,11 @@ mkdir -p $PKG/$INSTALL_DIR/ cp -a ../i2p $PKG/$INSTALL_DIR/ mkdir -p $PKG/install -mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install +mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new +mv $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml.new +mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html.new +mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/Slackware/i2p/readme.txt b/Slackware/i2p/readme.txt index 7ad3f1bec..2c6d4fa50 100644 --- a/Slackware/i2p/readme.txt +++ b/Slackware/i2p/readme.txt @@ -6,9 +6,11 @@ on i2p.SlackBuild and rebuild the package. You will also need to do the same in the base-i2p package. Installation and Upgrade: -Probably you will never have to update i2p packages with upgradepkg, -just because I2P has an auto-update function. However using upgradepkg -lowers the demand on the I2P network as a whole, and is by far faster. +Probably you will never have to update i2p packages. However if you do, +be sure to installpkg first, then removepkg or custom config files can +be lost with upgradepkg. I2P has an auto-update function. However using +installpkg then removepkg lowers the demand on the I2P network as a +whole, and is by far faster. After installpkg command, doinst.sh will execute a postinstallation script needed by I2P. Be sure to also install the base-i2p package. @@ -26,8 +28,12 @@ sh /etc/rc.d/rc.i2p start Now tell your browser to user this proxy: localhost on port 4444 and open this page: http://localhost:7657/index.jsp Here you can configure I2P, watch network status and navigate anonimously. -It's suggested to subscribe to various addressbook hosts, see the faqs on -http://www.i2p2.i2p/ or http://www.i2p2.de/ +It's suggested to subscribe to various addressbook hosts so that you can +get to the many available eepsites and other service on I2P. These are not +set up by default for security reasons. + +Please see the faqs on http://www.i2p2.i2p/ or http://www.i2p2.de/ on how +to subscribe to the various addressbook services. To stop I2P: /etc/rc.d/rc.i2p stop diff --git a/Slackware/i2p/slack-desc b/Slackware/i2p/slack-desc index 7915f5cef..281e5e894 100644 --- a/Slackware/i2p/slack-desc +++ b/Slackware/i2p/slack-desc @@ -14,8 +14,6 @@ i2p: data is wrapped with several layers of encryption, and the network is i2p: both distributed and dynamic, with no trusted parties. i2p: Many applications are available that interface with I2P, including i2p: mail, peer-peer file sharing, IRC chat, and others. -i2p: +i2p: WARNING: To upgrade installpkg FIRST _THEN_ removepkg. i2p: For more information, see: http://www.i2p2.de/ i2p: -i2p: This package requires i2p-base. -i2p: diff --git a/build.xml b/build.xml index 9b69a13f3..b4a374697 100644 --- a/build.xml +++ b/build.xml @@ -15,6 +15,7 @@ + @@ -437,6 +438,11 @@ + + + + + diff --git a/history.txt b/history.txt index 91c0abf15..f94b1369a 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2009-02-02 sponge + * Final? cleanups to Slackbuilds. + * ant target for Slackbuilds. + 2009-02-01 sponge * Slackbuild files... if we can have them for Debian, why not :-)