I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixups to Slackware scripts

Browse Source
This commit is contained in:
sponge
2009-11-04 10:27:02 +00:00
parent b65865b854
commit 5190b2db1f
6 changed files with 213 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
Slackware/i2p-base/doinst.sh
View File

@ -1,43 +1,155 @@
#!/bin/sh #!/bin/sh
#
#
# Now in the future we only need to look for '#I2P' and '#/I2P'
# for modifications to rc.local and rc.local_shutdown.
# I was a moron for not doing it this way in the first place :-) -- Sponge
#
#
touch /etc/rc.d/rc.local touch /etc/rc.d/rc.local
touch /etc/rc.d/rc.local_shutdown touch /etc/rc.d/rc.local_shutdown
I2PRCA=`grep -c /etc/rc.d/rc.local -e i2p`
I2PRCB=`grep -c /etc/rc.d/rc.local_shutdown -e i2p`
echo echo
echo -n "Check 1: /etc/rc.d/rc.local "
I2PRCA=`grep -c /etc/rc.d/rc.local -e '/etc/rc.d/rc.i2p'`
if [ $I2PRCA -eq 0 ] ; then if [ $I2PRCA -eq 0 ] ; then
echo '#I2P' >> /etc/rc.d/rc.local
echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
echo " sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local echo " sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
echo "fi" >> /etc/rc.d/rc.local echo "fi" >> /etc/rc.d/rc.local
echo "/etc/rc.d/rc.local modified." echo '#/I2P' >> /etc/rc.d/rc.local
echo "modified."
else else
echo "/etc/rc.d/rc.local looks OK" echo -n "looks OK so far,"
# Fix old installs, or where people have modified.
echo -n " Check 1A: "
I2PRCC=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
if [ $I2PRCC -eq 0 ] ; then
DATA=$(cat /etc/rc.d/rc.local | sed -re 's/if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/#I2P\n\( cd \/tmp ; rm -Rf i2p-*.tmp \)\nif \[ -x \/etc\/rc.d\/rc.i2p \] ; then/')
echo "${DATA}" > /etc/rc.d/rc.local
echo -n "additional modifications applied,"
else
echo -n "looks OK so far,"
fi
echo -n " Check 1B: "
I2PRCE=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
if [ $I2PRCE -eq 0 ] ; then
DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/i2p-\*\.tmp/p' | sed '$d' )
DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/i2p-\*\.tmp/,$p' | sed -n '/^fi/,$p' | sed "1d")
echo "${DATATOP}" > /etc/rc.d/rc.local
echo '#I2P' >> /etc/rc.d/rc.local
echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
echo " sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
echo "fi" >> /etc/rc.d/rc.local
echo '#/I2P' >> /etc/rc.d/rc.local
echo "${DATABOT}" >> /etc/rc.d/rc.local
echo -n "additional modifications applied,"
else
echo -n "looks ok so far,"
fi
echo -n " Check 1C: "
I2PRCF=`grep -c /etc/rc.d/rc.local -e '#/I2P'`
if [ $I2PRCF -eq 0 ] ; then
DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/^#I2P/p' | sed '$d' )
DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
echo "${DATATOP}" > /etc/rc.d/rc.local
echo '#I2P' >> /etc/rc.d/rc.local
echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
echo " sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
echo "fi" >> /etc/rc.d/rc.local
echo '#/I2P' >> /etc/rc.d/rc.local
echo "${DATABOT}" >> /etc/rc.d/rc.local
echo -n "additional modifications applied,"
else
echo -n "looks ok so far,"
fi
echo " Done."
fi fi
echo -n "Check 2: /etc/rc.d/rc.local_shutdown "
I2PRCB=`grep -c /etc/rc.d/rc.local_shutdown -e '/etc/rc.d/rc.i2p'`
if [ $I2PRCB -eq 0 ] ; then if [ $I2PRCB -eq 0 ] ; then
echo "#I2P" >> /etc/rc.d/rc.local_shutdown
echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
echo " sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown echo " sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
echo "fi" >> /etc/rc.d/rc.local_shutdown echo "fi" >> /etc/rc.d/rc.local_shutdown
echo "/etc/rc.d/rc.local_shutdown modified." echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
echo "modified."
else else
echo "/etc/rc.d/rc.local_shutdown looks OK" echo -n "looks OK so far,"
# Fix old installs
echo -n " Check 1A: "
I2PRCG=`grep -c /etc/rc.d/rc.local_shutdown -e '#I2P'`
if [ $I2PRCG -eq 0 ] ; then
DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/p' | sed '$d' )
DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/,$p' | sed -n '/^fi/,$p' | sed "1d")
echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
echo '#I2P' >> /etc/rc.d/rc.local_shutdown
echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
echo " sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
echo "fi" >> /etc/rc.d/rc.local_shutdown
echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
echo -n "additional modifications applied,"
else
echo -n "looks OK so far,"
fi
echo -n " Check 1B: "
I2PRCH=`grep -c /etc/rc.d/rc.local_shutdown -e '#/I2P'`
if [ $I2PRCH -eq 0 ] ; then
DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^#I2P/p' | sed '$d' )
DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
echo '#I2P' >> /etc/rc.d/rc.local_shutdown
echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
echo " sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
echo "fi" >> /etc/rc.d/rc.local_shutdown
echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
echo -n "additional modifications applied,"
else
echo -n "looks OK so far,"
fi
echo " Done."
fi fi
if [ -f /etc/rc.d/rc.i2p ] ; then if [ -f /etc/rc.d/rc.i2p ] ; then
if [ -x /etc/rc.d/rc.i2p ] ; then if [ -x /etc/rc.d/rc.i2p ] ; then
chmod +x /etc/rc.d/rc.i2p.new chmod +x /etc/rc.d/rc.i2p.new
fi fi
echo # Hopefully get admin's attention.
echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -e "\007" ; sleep 0.3
echo "It apears that you already have /etc/rc.d/rc.i2p" echo "It apears that you already have /etc/rc.d/rc.i2p"
echo "You may wish to replace it with /etc/rc.d/rc.i2p.new" echo "You should replace it with /etc/rc.d/rc.i2p.new as soon as possible"
echo echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -ne "\007" ; sleep 0.3
echo -e "\007" ; sleep 0.3
else else
mv /etc/rc.d/rc.i2p.new /etc/rc.d/rc.i2p mv /etc/rc.d/rc.i2p.new /etc/rc.d/rc.i2p
echo echo
echo "Installation finished. The i2p start/stop script has been" echo "Installation finished. The i2p start/stop script has been"
echo "installed on /etc/rc.d directory. You should chmod +x" echo "installed in /etc/rc.d . You should chmod +x"
echo '/etc/rc.d/rc.i2p to start it on boot.' echo '/etc/rc.d/rc.i2p to start it on boot.'
echo echo
fi fi

55
Slackware/i2p-base/i2p-base.SlackBuild
View File

@ -1,46 +1,57 @@
#!/bin/sh #!/bin/sh
# Heavily based on the Slackware 12.1 SlackBuild #
# Slackware build script for i2p # Heavily based on the Slackware 12.2 SlackBuild
# Slackware build script for I2P
#
# PLEASE READ THIS: # PLEASE READ THIS:
# Probably you will never have to update i2p packages with upgradepkg, # How to start I2P:
# just because i2p have an auto-update function. # After installpkg command, doinst.sh will execute a post-installation script
# How to start i2p: # needed by I2P. After that you have to chmod +x /etc/rc.d/rc.i2p and start
# After installpkg command, doinst.sh will execute a postinstallation script # I2P service with /etc/rc.d/rc.i2p start.
# needed by i2p. After that you have to chmod +x /etc/rc.d/rc.i2p and start #
# i2p service with /etc/rc.d/rc.i2p start.
# Now tell your browser to user this proxy: localhost on port 4444 and open # Now tell your browser to user this proxy: localhost on port 4444 and open
# this page: http://localhost:7657/index.jsp # this page: http://localhost:7657/index.jsp
# Here you can configure i2p, watch network status and navigate anonimously. #
# Here you can configure I2P, watch network status and navigate anonimously.
# It's suggested to subscribe to various dns host, like i2host.i2p # It's suggested to subscribe to various dns host, like i2host.i2p
# For any additional information, visit i2host.i2p and forum.i2p # For any additional information, visit i2host.i2p and forum.i2p
#
CWD=$(pwd) CWD=$(pwd)
TMP=/tmp TMP=/tmp
PKG=/$TMP/package-base-i2p PKG=/$TMP/package-base-i2p
rm -rf $PKG
mkdir -p $PKG
# put here installation dir, without first and last /
# es: usr/local
NAME=i2p-base NAME=i2p-base
VERSION=0.0.1 VERSION=0.0.2
BUILD=1sponge BUILD=1sponge
ARCH=noarch ARCH=noarch
INSTALL_DIR=opt INSTALL_DIR=opt
# Less than slackware 13?
SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
if [ $SLKPLT -lt 13 ] ; then
EXT=tgz
else
EXT=txz
fi
rm -rf $PKG
mkdir -p $PKG
cd $PKG cd $PKG
chown -R root:root . chown -R root:root .
mkdir -p $PKG/etc/rc.d mkdir -p $PKG/etc/rc.d
mkdir -p $PKG/install mkdir -p $PKG/install
sed "s|directory|/$INSTALL_DIR/i2p/i2prouter|g" $CWD/rc.i2p_def > $PKG/etc/rc.d/rc.i2p.new sed "s|directory|/$INSTALL_DIR/i2p/i2prouter|g" "$CWD/rc.i2p_def" > $PKG/etc/rc.d/rc.i2p.new
chmod 644 $PKG/etc/rc.d/rc.i2p.new chmod 644 $PKG/etc/rc.d/rc.i2p.new
sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh cat "$CWD/doinst.sh" > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc cat "$CWD/slack-desc" > $PKG/install/slack-desc
cd $PKG cd $PKG
# #
# Not really that important to exec this. # Not really that important to exec this
#requiredbuilder -v -y -s $CWD $PKG # as there aren't any deps we don't know.
# #
cat $CWD/slack-required > $PKG/install/slack-required # requiredbuilder -v -y -s $CWD $PKG
makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.tgz #
cat "$CWD/slack-required" > $PKG/install/slack-required
makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT

30
Slackware/i2p-base/rc.i2p_def
View File

@ -9,6 +9,22 @@ i2p_stop() {
/bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory stop )" /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory stop )"
} }
i2p_restart() {
/bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory restart)"
}
i2p_status() {
/bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory status )"
}
i2p_console() {
/bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory console )"
}
i2p_dump() {
/bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory dump )"
}
case "$1" in case "$1" in
'start') 'start')
i2p_start i2p_start
@ -17,11 +33,19 @@ case "$1" in
i2p_stop i2p_stop
;; ;;
'restart') 'restart')
i2p_stop i2p_restart
i2p_start ;;
'status')
i2p_status
;;
'console')
i2p_console
;;
'dump')
i2p_dump
;; ;;
*) *)
echo "usage $0 start|stop|restart" echo "usage $0 start|stop|restart|status|console|dump"
;; ;;
esac esac

45
Slackware/i2p/i2p.SlackBuild
View File

@ -1,28 +1,35 @@
#!/bin/sh #!/bin/sh
# Heavily based on the Slackware 12.1 SlackBuild #
# Slackware build script for i2p # Heavily based on the Slackware 12.2 SlackBuild
# Slackware build script for I2P
#
# PLEASE READ THIS: # PLEASE READ THIS:
# Probably you will never have to update i2p packages with upgradepkg, # Probably you will never have to update I2P packages with upgradepkg,
# just because i2p have an auto-update function. # just because I2P has an auto-update function.
# How to start i2p: # Really you should not ever use any "upgrade" method.
# After installpkg command, doinst.sh will execute a postinstallation script #
# needed by i2p. After that you have to chmod +x /etc/rc.d/rc.i2p and start # The correct way to upgrade is to:
# i2p service with /etc/rc.d/rc.i2p start. # 1: install the upgrade
# Now tell your browser to user this proxy: localhost on port 4444 and open # 2: remove the old package
# this page: http://localhost:7657/index.jsp #
# Here you can configure i2p, watch network status and navigate anonimously. # It is a terrible shame that upgradepkg doesn't do this, infact,
# It's suggested to subscribe to various dns host, like i2host.i2p # it would actually be the correct way for *any* package!
# For any additional information, visit i2host.i2p and forum.i2p #
#
BUILD=1sponge BUILD=1sponge
# put here installation dir, without first and last /
# eg: usr/local
INSTALL_DIR=opt INSTALL_DIR=opt
NAME=i2p NAME=i2p
ARCH=noarch ARCH=noarch
# Less than slackware 13?
SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
if [ $SLKPLT -lt 13 ] ; then
EXT=tgz
else
EXT=txz
fi
# #
# This mess is here due to the totally moronic way i2p does versioning. # This mess is here due to the totally moronic way i2p does versioning.
@ -117,7 +124,7 @@ cd $PKG
# requiredbuilder fucks up REALLY bad, and thinks java is perl?! # requiredbuilder fucks up REALLY bad, and thinks java is perl?!
# It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS! # It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS!
# #
#requiredbuilder -v -y -s $CWD $PKG # requiredbuilder -v -y -s $CWD $PKG
# #
cat $CWD/slack-required > $PKG/install/slack-required cat $CWD/slack-required > $PKG/install/slack-required
makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.tgz makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT

3
history.txt
View File

@ -1,3 +1,6 @@
2009-11-04 sponge
* Fixups to Slackware scripts
2009-10-31 zzz 2009-10-31 zzz
* Console: * Console:
- More tagging - More tagging

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 10; public final static long BUILD = 11;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;