diff options
Diffstat (limited to 'source/n/stunnel')
| -rw-r--r-- | source/n/stunnel/doinst.sh | 2 | ||||
| -rw-r--r-- | source/n/stunnel/generate-stunnel-key.sh | 2 | ||||
| -rwxr-xr-x | source/n/stunnel/stunnel.SlackBuild | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/n/stunnel/doinst.sh b/source/n/stunnel/doinst.sh index 0d6e88963..21f004b02 100644 --- a/source/n/stunnel/doinst.sh +++ b/source/n/stunnel/doinst.sh @@ -9,4 +9,4 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } -config etc/stunnel/stunnel.cnf.new +config etc/stunnel/openssl.cnf.new diff --git a/source/n/stunnel/generate-stunnel-key.sh b/source/n/stunnel/generate-stunnel-key.sh index e1e852808..6b344964b 100644 --- a/source/n/stunnel/generate-stunnel-key.sh +++ b/source/n/stunnel/generate-stunnel-key.sh @@ -4,7 +4,7 @@ USE_DH=0 openssl req -new -x509 -days 365 -nodes \ -config ./stunnel.cnf -out stunnel.pem -keyout stunnel.pem -test $USE_DH -eq 0 || openssl gendh 512 >> stunnel.pem +test $USE_DH -eq 0 || openssl gendh >> stunnel.pem openssl x509 -subject -dates -fingerprint -noout \ -in stunnel.pem diff --git a/source/n/stunnel/stunnel.SlackBuild b/source/n/stunnel/stunnel.SlackBuild index f988a3c4e..e8940bb36 100755 --- a/source/n/stunnel/stunnel.SlackBuild +++ b/source/n/stunnel/stunnel.SlackBuild @@ -28,7 +28,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -37,8 +37,8 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -98,7 +98,7 @@ make -i install DESTDIR=$PKG # Get rid of key, so nobody tries to use it: rm -f $PKG/etc/stunnel/stunnel.pem # Add cnf: -cat tools/stunnel.cnf > $PKG/etc/stunnel/stunnel.cnf.new +cat tools/openssl.cnf > $PKG/etc/stunnel/openssl.cnf.new cat $CWD/generate-stunnel-key.sh > $PKG/etc/stunnel/generate-stunnel-key.sh chmod 755 $PKG/etc/stunnel/generate-stunnel-key.sh |