echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debian: refresh patches

Browse Source
This commit is contained in:
kytv
2013-05-15 13:39:24 +00:00
parent aa2715cced
commit de6bb12b95
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
debian/patches/0001-path-substitution.patch vendored
View File

@ -112,7 +112,7 @@ Debian wrapper.config to try to prevent confusion.
if [ -n "$FIXED_COMMAND" ] if [ -n "$FIXED_COMMAND" ]
then then
COMMAND="$FIXED_COMMAND" COMMAND="$FIXED_COMMAND"
@@ -912,9 +863,6 @@ @@ -920,9 +871,6 @@
# The string passed to eval must handles spaces in paths correctly. # The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA" COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
eval $COMMAND_LINE eval $COMMAND_LINE
@ -122,7 +122,7 @@ Debian wrapper.config to try to prevent confusion.
else else
eval echo `gettext '$APP_LONG_NAME is already running.'` eval echo `gettext '$APP_LONG_NAME is already running.'`
exit 1 exit 1
@@ -1038,9 +986,6 @@ @@ -1046,9 +994,6 @@
# The string passed to eval must handles spaces in paths correctly. # The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA" COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
eval $COMMAND_LINE eval $COMMAND_LINE
@ -132,28 +132,34 @@ Debian wrapper.config to try to prevent confusion.
else else
eval echo `gettext '$APP_LONG_NAME is already running.'` eval echo `gettext '$APP_LONG_NAME is already running.'`
exit 1 exit 1
@@ -1850,18 +1795,9 @@ @@ -1858,24 +1803,9 @@
status status
;; ;;
- 'install') - 'install')
- installdaemon - installdaemon
- if [ ! `grep ^RUN_AS_USER $0` ]; then - if [ ! `grep ^RUN_AS_USER $0` ]; then
- echo
- showsetusermesg - showsetusermesg
- fi - fi
- echo - echo
- echo "You may want to disable the browser from launching at startup at" - echo "You may want to disable the browser from launching at startup at"
- echo "http://127.0.0.1:7657/configclients" - echo "http://127.0.0.1:7657/configclients"
- echo
- echo "I2P_CONFIG_DIR is currently set to $I2P_CONFIG_DIR."
- echo "Change the value in $0 if this is not"
- echo "appropriate for your configuration."
- ;; - ;;
- -
- 'remove' | 'uninstall') - 'remove' | 'uninstall')
- removedaemon - removedaemon
- ;;
+ 'install' | 'remove' | 'uninstall') + 'install' | 'remove' | 'uninstall')
+ echo "Use \"dpkg-reconfigure i2p\" to configure the initscript." + echo "Use \"dpkg-reconfigure i2p\" to configure the initscript."
+ exit 1 + exit 1
;;
'dump') 'dump')
checkUser "" "$COMMAND"
--- a/installer/resources/runplain.sh --- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh +++ b/installer/resources/runplain.sh
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@

2
debian/patches/0003-renaming-jcpuid.patch vendored
View File

@ -8,7 +8,7 @@ Subject: rename jcpuid
--- a/core/c/jcpuid/build.sh --- a/core/c/jcpuid/build.sh
+++ b/core/c/jcpuid/build.sh +++ b/core/c/jcpuid/build.sh
@@ -74,12 +74,8 @@ @@ -75,12 +75,8 @@
exit 0;; exit 0;;
esac esac