Changeset 31032cd


Ignore:
Timestamp:
Oct 22, 2010 9:11:09 AM (9 years ago)
Author:
z3d <z3d@…>
Branches:
master
Children:
1bff62e3
Parents:
8ccad29 (diff), 7ff873b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '42f7898ab54db310e16aa6fbedb1b078afe0ae18'

and '9d4166108eac930384ccb9c5859eede93f4d63ed'

Files:
6 added
10 edited

Legend:

Unmodified
Added
Removed
  • Slackware/i2p-base/rc.i2p_def

    r8ccad29 r31032cd  
    33
    44i2p_start() {
    5  /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory start )"
     5 # Check if router is up first!
     6 /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory status )" > /dev/null
     7 if [ ! $? -eq 0 ] ; then {
     8  # I2p is already running, so tell the user.
     9  echo "I2P is already running..."
     10  i2p_status
     11 }
     12 else
     13 {
     14  # Just in-case there are leftover junk in /tmp...
     15  rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
     16  # Now that all junk is cleaned up, start.
     17  /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory start )"
     18 }
     19 fi
    620}
    721
    822i2p_stop() {
    923 /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory stop )"
     24 rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
    1025}
    1126
    1227i2p_restart() {
    13  /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory restart)"
     28 # We want a FULL cycle here, not the wrappers idea of this!
     29 i2p_stop
     30 i2p_start
    1431}
    1532
  • Slackware/i2p/i2p.SlackBuild

    r8ccad29 r31032cd  
    8686
    8787#############################################################################
    88 # Preconfigureation to make package smaller
     88# Preconfigureation to make package smaller, and...
     89# we keep as much as reasonable in the installation directory.
     90# This makes the install map fairly well to the standard installation.
     91# It also makes it easier to find the log and pid files!
    8992#############################################################################
    9093cd $PKG/$INSTALL_DIR/i2p
    9194
    9295# wrapper.config $INSTALL_PATH and $SYSTEM_java_io_tmpdir
    93 sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" wrapper.config > a
    94 sed "s|\$SYSTEM_java_io_tmpdir|/var/tmp|g" a > wrapper.config
     96sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" wrapper.config > a
     97sed "s|\$SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > wrapper.config
    9598# eepget %INSTALL_PATH
    96 sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" eepget > a
     99sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" eepget > a
    97100rm eepget
    98101mv a eepget
    99102# runplain.sh %INSTALL_PATH and %SYSTEM_java_io_tmpdir
    100 sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" runplain.sh > a
    101 sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > runplain.sh
     103sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" runplain.sh > a
     104sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > runplain.sh
    102105# i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir
    103 sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" i2prouter > a
    104 sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > i2prouter
     106sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" i2prouter > a
     107sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > i2prouter
    105108
    106109chmod 744 ./i2prouter
  • apps/susimail/src/src/i2p/susi/util/Config.java

    r8ccad29 r31032cd  
    4343         *
    4444         * @param name
    45          * @return
    4645         */
    4746        public static String getProperty( String name )
     
    9998         * @param name
    10099         * @param defaultValue
    101          * @return
    102100         */
    103101        public static String getProperty( String name, String defaultValue )
     
    110108         * @param name
    111109         * @param defaultValue
    112          * @return
    113110         */
    114111        public static int getProperty( String name, int defaultValue )
  • apps/susimail/src/src/i2p/susi/util/Folder.java

    r8ccad29 r31032cd  
    271271         * Returns the element on the current page on the given position.
    272272         *
    273          * @param Position of the element on the current page.
     273         * @param x Position of the element on the current page.
    274274         * @return Element on the current page on the given position.
    275275         */
     
    332332         *
    333333         * @param element
    334          * @return
     334         * @return index
    335335         */
    336336        private int getIndexOf( Object element )
     
    349349         *
    350350         * @param element
    351          * @return
     351         * @return The next element
    352352         */
    353353        public Object getNextElement( Object element )
     
    370370         *
    371371         * @param element
    372          * @return
     372         * @return The previous element
    373373         */
    374374        public Object getPreviousElement( Object element )
     
    389389         *
    390390         * @param i
    391          * @return
     391         * @return Element at index i
    392392         */
    393393        private Object getElement( int i )
     
    405405        /**
    406406         * Returns true, if folder shows points to the last page.
    407          *
    408          * @return
    409407         */
    410408        public boolean isLastPage()
     
    415413        /**
    416414         * Returns true, if folder shows points to the first page.
    417          *
    418          * @return
    419415         */
    420416        public boolean isFirstPage()
     
    428424         *
    429425         * @param element
    430          * @return
    431426         */
    432427        public boolean isLastElement( Object element )
     
    442437         *
    443438         * @param element
    444          * @return
    445439         */
    446440        public boolean isFirstElement( Object element )
  • apps/susimail/src/src/i2p/susi/webmail/Attachment.java

    r8ccad29 r31032cd  
    5757                this.buffer = buffer;
    5858        }
    59         /**
    60          * @return
    61          */
     59
    6260        public String getTransferEncoding() {
    6361                // TODO Auto-generated method stub
    6462                return transferEncoding;
    6563        }
    66         /**
    67          * @return
    68          */
     64
    6965        public String getContentType() {
    7066                // TODO Auto-generated method stub
     
    8379                this.transferEncoding = transferEncoding;
    8480        }
    85         /**
    86          * @param string
    87          */
     81
    8882        public void setData(String data ) {
    8983                this.data = data;
  • apps/susimail/src/src/i2p/susi/webmail/Mail.java

    r8ccad29 r31032cd  
    7979        /**
    8080         *
    81          * @param address
    82          * @return
     81         * @param address E-mail address to be validated
     82         * @return Is the e-mail address valid?
    8383         */
    8484        public static boolean validateAddress( String address )
     
    106106        /**
    107107         * @param address
    108          * @return
    109108         */
    110109        public static String getAddress(String address )
  • apps/susimail/src/src/i2p/susi/webmail/MailCache.java

    r8ccad29 r31032cd  
    4848         * Fetch any needed data from pop3 server.
    4949         *
    50          * @param id message id to get
     50         * @param uidl message id to get
    5151         * @param headerOnly fetch only header lines?
    52          * @return
     52         * @return An e-mail
    5353         */
    5454        public Mail getMail( String uidl, boolean headerOnly ) {
  • apps/susimail/src/src/i2p/susi/webmail/RequestWrapper.java

    r8ccad29 r31032cd  
    6868        /**
    6969         * @param b
    70          * @return
    7170         */
    7271        public HttpSession getSession(boolean b) {
     
    7574
    7675        /**
    77          * @param key
    78          * @return
     76         * @param name Specific parameter key
     77         * @return parameter value
    7978         */
    8079        public String getParameter(String name ) {
     
    8281        }
    8382
    84         /**
    85          * @return
    86          */
    8783        public HttpSession getSession() {
    8884                return httpRequest.getSession();
     
    9086
    9187        /**
    92          * @return
     88         * @return List of request parameter names
    9389         */
    9490        public Enumeration getParameterNames() {
     
    107103
    108104        /**
    109          * @return
     105         * @return The total length of the content.
    110106         */
    111107        public int getContentLength() {
     
    114110
    115111        /**
    116          * @return
     112         * @return The content type of the request.
    117113         */
    118114        public String getContentType() {
     
    120116        }
    121117
    122         /**
    123          *
    124          * @param partName
    125          * @return
    126          */
    127118        public String getContentType( String partName )
    128119        {
     
    144135                return result;
    145136        }
    146         /**
    147          * @param string
    148          * @return
    149          */
     137
    150138        public Object getAttribute(String string) {
    151139                return httpRequest.getAttribute( string );
    152140        }
    153141
    154         /**
    155          * @param new_subject
    156          * @param string
    157          * @return
    158          */
    159142        public String getParameter( String name, String defaultValue )
    160143        {
     
    185168                return result;
    186169        }
    187         /**
    188          * @param new_filename
    189          * @return
    190          */
     170
    191171        public String getFilename(String partName )
    192172        {
     
    199179                return result;
    200180        }
    201         /**
    202          * @param new_filename
    203          * @return
    204          */
     181
    205182        public InputStream getInputStream(String partName )
    206183        {
  • history.txt

    r8ccad29 r31032cd  
     12010-10-22 sponge
     2    * Sanity and some fixs for slackware package
     3
     42010-10-22 sponge
     5    * Fix rc.i2p for slackware package
     6
    172010-10-10 sponge
    28    * Fulfill Request for name resolving in BOB
  • router/java/src/net/i2p/router/RouterVersion.java

    r8ccad29 r31032cd  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 04;
     21    public final static long BUILD = 05;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.