Changeset 1850e89


Ignore:
Timestamp:
Sep 7, 2009 5:33:29 PM (11 years ago)
Author:
mkvore-commit <mkvore-commit@…>
Branches:
master
Children:
5eccc01
Parents:
1f1d089
Message:

removes a bug in SAM v1 and v2 (introduced when merging with v3)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • apps/sam/java/src/net/i2p/sam/SAMHandler.java

    r1f1d089 r1850e89  
    125125     */
    126126    protected final boolean writeString(String str) {
    127         if (_log.shouldLog(Log.DEBUG))
    128             _log.debug("Sending the client: [" + str + "]");
    129         return writeString(str, socket);
     127        synchronized (socketWLock) {
     128            if (_log.shouldLog(Log.DEBUG))
     129                _log.debug("Sending the client: [" + str + "]");
     130            return writeString(str, socket);
     131        }
    130132    }
    131133
  • core/c/jbigi/build.sh

    r1f1d089 r1850e89  
    1616mkdir -p lib/
    1717mkdir -p bin/local
    18 VER=4.2.4
     18VER=4.3.1
    1919
    2020if [ "$1" != "dynamic" -a ! -d gmp-$VER ]
    2121then
    22         TAR=gmp-$VER.tar.bz2
     22        TAR=gmp-$VER.tar.lzma
    2323        if [ ! -f $TAR ]
    2424        then
    25                 echo "GMP tarball $TAR not found. You must download it from http://gmplib.org/"
    26                 exit 1
     25            echo "Downloading ftp://ftp.gmplib.org/pub/gmp-4.3.1/gmp-4.3.1.tar.lzma"
     26            wget ftp://ftp.gmplib.org/pub/gmp-4.3.1/gmp-4.3.1.tar.lzma
    2727        fi
    2828
     
    3030
    3131        echo "Extracting GMP..."
    32         tar -xjf gmp-$VER.tar.bz2
     32        tar -xf gmp-$VER.tar.lzma --lzma
    3333fi
    3434
     
    4343                        ../../gmp-$VER/configure --with-pic;;
    4444                *)
    45                         ../../gmp-$VER/configure;;
     45                        ../../gmp-$VER/configure --with-pic;;
    4646        esac
    4747        make
     
    5555cd ../..
    5656
    57 I2P=~/i2p
     57I2P=~/i2p/i2p
    5858if [ ! -f $I2P/lib/i2p.jar ]
    5959then
  • core/c/jcpuid/build.sh

    r1f1d089 r1850e89  
    3838        COMPILEFLAGS="-fPIC -Wall"
    3939        INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
    40         LINKFLAGS="-shared -static -static-libgcc -Wl,-soname,libjcpuid-x86-linux.so"
     40        LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
    4141        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
    4242esac
     
    4444echo "Compiling C code..."
    4545rm -f $LIBFILE
    46 $CC $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
     46$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
    4747strip $LIBFILE
    4848echo Built $LIBFILE
  • history.txt

    r1f1d089 r1850e89  
     12009-09-07 mkvore
     2    * removes a SAM v1&2 bug
     3
    142009-09-04 zzz
    25    * SessionKeyManager, OCMOSJ, Garlic:
Note: See TracChangeset for help on using the changeset viewer.