diff --git a/Makefile b/Makefile index 3aafb05..f688b99 100644 --- a/Makefile +++ b/Makefile @@ -15,13 +15,13 @@ publish-zstd: NAME=zstd VERSION=1.4.4 ./publish-m.sh publish-nsis: - NAME=nsis VERSION=3.0.4.1 ./publish.sh + NAME=nsis VERSION=3.0.4.2 ./publish.sh publish-nsis-resources: NAME=nsis-resources VERSION=3.4.1 ./publish.sh publish-winCodeSign: - NAME=winCodeSign VERSION=2.5.0 ./publish.sh + NAME=winCodeSign VERSION=2.6.0 ./publish.sh publish-wine-mac: ./publish-wine-mac.sh diff --git a/winCodeSign/linux/Dockerfile b/winCodeSign/linux/Dockerfile index 3b3b0e1..86b8dce 100644 --- a/winCodeSign/linux/Dockerfile +++ b/winCodeSign/linux/Dockerfile @@ -1,16 +1,8 @@ -FROM buildpack-deps:xenial-curl +FROM buildpack-deps:bionic-curl -RUN apt-get -qq update && apt-get -qq dist-upgrade && apt-get install -qq libssl-dev libcurl4-openssl-dev libgsf-1-dev autoconf build-essential unzip libtool +RUN apt-get -qq update && apt-get -qq upgrade && apt-get install -qq libssl-dev libcurl4-openssl-dev libgsf-1-dev autoconf build-essential unzip libtool -## Download and install osslsigncode -#RUN curl -L "http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fosslsigncode%2Ffiles%2Fosslsigncode%2F&ts=1413463046&use_mirror=optimate" | tar -xz -#WORKDIR osslsigncode-1.7.1 -#RUN ./configure && make && make install - -RUN curl -L https://github.com/electron-userland/electron-builder-binaries/files/1821437/osslsigncode-osslsigncode-e72a1937d1a13e87074e4584f012f13e03fc1d64.zip -o f.zip && unzip f.zip && \ - cd osslsigncode-osslsigncode-e72a1937d1a13e87074e4584f012f13e03fc1d64 && \ - ./autogen.sh - -RUN cd osslsigncode-osslsigncode-e72a1937d1a13e87074e4584f012f13e03fc1d64 && ./configure CFLAGS='-g -O3' GSF_LIBS='-l:libgsf-1.a -lgobject-2.0 -lglib-2.0 -lxml2 -l:libz.a -l:libbz2.a' && make install +RUN curl -L https://github.com/mtrojnar/osslsigncode/archive/master.zip -o f.zip && unzip f.zip && \ + cd osslsigncode-master && ./autogen.sh && ./configure CFLAGS='-g -O3' GSF_LIBS='-l:libgsf-1.a -lgobject-2.0 -lglib-2.0 -lxml2 -l:libz.a -l:libbz2.a' && make install CMD cp /usr/local/bin/osslsigncode /files diff --git a/winCodeSign/linux/build.sh b/winCodeSign/linux/build.sh index 06d6595..985ec72 100755 --- a/winCodeSign/linux/build.sh +++ b/winCodeSign/linux/build.sh @@ -1,7 +1,7 @@ #!/bin/bash echo "Building osslsigncode docker image" -docker build -t electron-builder-binaries/osslsigncode:1.7.1 . +docker build -t electron-builder-binaries/osslsigncode:2.0.1 . echo "Building osslsigncode binary" -docker run -v `pwd`:/files electron-builder-binaries/osslsigncode:1.7.1 \ No newline at end of file +docker run -v `pwd`:/files electron-builder-binaries/osslsigncode:2.0.1 \ No newline at end of file diff --git a/winCodeSign/linux/osslsigncode b/winCodeSign/linux/osslsigncode index 5d2b388..f5207de 100755 Binary files a/winCodeSign/linux/osslsigncode and b/winCodeSign/linux/osslsigncode differ