diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2016-06-30 20:26:57 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:31:18 +0200 |
| commit | d31c50870d0bee042ce660e445c9294a59a3a65b (patch) | |
| tree | 6bfc0de3c95267b401b620c2c67859557dc60f97 /source/n/stunnel | |
| parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
| download | current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz | |
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!
The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2. The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system. Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
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 0d6e8896..21f004b0 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 e1e85280..6b344964 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 f988a3c4..e8940bb3 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 |