From 169692d736d5a7e2cdeeebeab3cd64a608c33f6b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 2 May 2015 07:47:35 +0200 Subject: [PATCH] Remove shlib/ Cleanup of files that haven't been used, touched, or I suspect, even noticed for a long time. Reviewed-by: Rich Salz --- Makefile.org | 4 +- shlib/Makefile.hpux10-cc | 34 -------------- shlib/README | 1 - shlib/hpux10-cc.sh | 92 ------------------------------------- shlib/irix.sh | 7 --- shlib/sco5-shared-gcc.sh | 48 ------------------- shlib/sco5-shared-installed | 28 ----------- shlib/sco5-shared.sh | 48 ------------------- shlib/solaris-sc4.sh | 42 ----------------- shlib/solaris.sh | 36 --------------- shlib/sun.sh | 8 ---- shlib/svr5-shared-gcc.sh | 48 ------------------- shlib/svr5-shared-installed | 27 ----------- shlib/svr5-shared.sh | 48 ------------------- shlib/win32.bat | 18 -------- shlib/win32dll.bat | 13 ------ 16 files changed, 2 insertions(+), 500 deletions(-) delete mode 100644 shlib/Makefile.hpux10-cc delete mode 100644 shlib/README delete mode 100644 shlib/hpux10-cc.sh delete mode 100644 shlib/irix.sh delete mode 100755 shlib/sco5-shared-gcc.sh delete mode 100755 shlib/sco5-shared-installed delete mode 100755 shlib/sco5-shared.sh delete mode 100755 shlib/solaris-sc4.sh delete mode 100644 shlib/solaris.sh delete mode 100644 shlib/sun.sh delete mode 100755 shlib/svr5-shared-gcc.sh delete mode 100755 shlib/svr5-shared-installed delete mode 100755 shlib/svr5-shared.sh delete mode 100755 shlib/win32.bat delete mode 100755 shlib/win32dll.bat diff --git a/Makefile.org b/Makefile.org index dcc2c447bc..0676a39540 100644 --- a/Makefile.org +++ b/Makefile.org @@ -167,7 +167,7 @@ SHELL=/bin/sh TOP= . ONEDIRS=out tmp -EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS +EDIRS= times doc bugs util include certs ms demos VMS WDIRS= windows LIBS= libcrypto.a libssl.a SHARED_CRYPTO=libcrypto$(SHLIB_EXT) @@ -406,7 +406,7 @@ libclean: rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib clean: libclean - rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c + rm -f *.o core a.out fluff rehash.time testlog make.log cctest cctest.c rm -rf *.bak certs/.0 @set -e; target=clean; $(RECURSIVE_BUILD_CMD) rm -f $(LIBS) tags TAGS diff --git a/shlib/Makefile.hpux10-cc b/shlib/Makefile.hpux10-cc deleted file mode 100644 index 89c28dcf46..0000000000 --- a/shlib/Makefile.hpux10-cc +++ /dev/null @@ -1,34 +0,0 @@ -# Makefile.hpux-cc - -major=0.9.8 - -slib=libssl -sh_slib=$(slib).sl.$(major) - -clib=libcrypto -sh_clib=$(clib).sl.$(major) - -all : $(clib).sl $(slib).sl - - -$(clib)_pic.a : $(clib).a - echo "Copying $? to $@" - cp -p $? $@ - -$(slib)_pic.a : $(slib).a - echo "Copying $? to $@" - cp -p $? $@ - -$(sh_clib) : $(clib)_pic.a - ld -b -s -z +h $@ -o $@ -Fl $(clib)_pic.a -ldld -lc - -$(clib).sl : $(sh_clib) - rm -f $@ - ln -s $? $@ - -$(sh_slib) : $(slib)_pic.a $(clib).sl - ld -b -s -z +h $@ -o $@ -Fl $(slib)_pic.a -ldld -lc - -$(slib).sl : $(sh_slib) - rm -f $@ - ln -s $? $@ diff --git a/shlib/README b/shlib/README deleted file mode 100644 index fea07a59ea..0000000000 --- a/shlib/README +++ /dev/null @@ -1 +0,0 @@ -Only the windows NT and, linux builds have been tested for SSLeay 0.8.0 diff --git a/shlib/hpux10-cc.sh b/shlib/hpux10-cc.sh deleted file mode 100644 index ceeb8c5236..0000000000 --- a/shlib/hpux10-cc.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/usr/bin/sh -# -# Run this script from the OpenSSL root directory: -# sh shlib/hpux10-cc.sh -# -# HP-UX (10.20) shared library installation: -# Compile and install OpenSSL with best possible optimization: -# - shared libraries are compiled and installed with +O4 optimization -# - executable(s) are compiled and installed with +O4 optimization -# - static libraries are compiled and installed with +O3 optimization, -# to avoid the time consuming +O4 link-time optimization when using -# these libraries. (The shared libs are already optimized during build -# at +O4.) -# -# This script must be run with appropriate privileges to install into -# /usr/local/ssl. HP-UX prevents used executables and shared libraries -# from being deleted or overwritten. Stop all processes using already -# installed items of OpenSSL. -# -# WARNING: At high optimization levels, HP's ANSI-C compiler can chew up -# large amounts of memory and CPU time. Make sure to have at least -# 128MB of RAM available and that your kernel is configured to allow -# at least 128MB data size (maxdsiz parameter which can be obtained -# by multiplying 'echo maxdsiz/D | adb -k /stand/vmunix /dev/kmem' -# by 'getconf PAGE_SIZE'). -# The installation process can take several hours, even on fast -# machines. +O4 optimization of the libcrypto.sl shared library may -# take 1 hour on a C200 (200MHz PA8200 CPU), +O3 compilation of -# fcrypt_b.c can take 20 minutes on this machine. Stay patient. -# -# SITEFLAGS: site specific flags. I do use +DAportable, since I have to -# support older PA1.1-type CPUs. Your mileage may vary. -# +w1 enables enhanced warnings, useful when working with snaphots. -# -SITEFLAGS="+DAportable +w1" -# -# Set the default additions to build with HP-UX. -# -D_REENTRANT must/should be defined on HP-UX manually, since we do call -# Configure directly. -# +Oall increases the optimization done. -# -MYFLAGS="-D_REENTRANT +Oall $SITEFLAGS" - -# Configure for pic and build the static pic libraries -perl5 Configure no-shared hpux-parisc-cc-o4 +Z ${MYFLAGS} -make clean -make DIRS="crypto ssl" -# Rename the static pic libs and build dynamic libraries from them -# Be prepared to see a lot of warnings about shared libraries being built -# with optimizations higher than +O2. When using these libraries, it is -# not possible to replace internal library functions with functions from -# the program to be linked. -# -make -f shlib/Makefile.hpux10-cc - -# Copy the libraries to /usr/local/ssl/lib (they have to be in their -# final location when linking applications). -# If the directories are still there, no problem. -mkdir /usr/local -mkdir /usr/local/ssl -mkdir /usr/local/ssl/lib -chmod 444 lib*_pic.a -chmod 555 lib*.sl.0.9.8 -cp -p lib*_pic.a lib*.sl.0.9.8 /usr/local/ssl/lib -(cd /usr/local/ssl/lib ; ln -sf libcrypto.sl.0.9.8 libcrypto.sl ; ln -sf libssl.sl.0.9.8 libssl.sl) - -# Reconfigure without pic to compile the executables. Unfortunately, while -# performing this task we have to recompile the library components, even -# though we use the already installed shared libs anyway. -# -perl5 Configure no-shared hpux-parisc-cc-o4 ${MYFLAGS} - -make clean - -# Hack the Makefiles to pick up the dynamic libraries during linking -# -sed 's/^PEX_LIBS=.*$/PEX_LIBS=-L\/usr\/local\/ssl\/lib/' Makefile.ssl >xxx; mv xxx Makefile.ssl -sed 's/-L\.\.//' apps/Makefile.ssl >xxx; mv xxx apps/Makefile.ssl -sed 's/-L\.\.//' test/Makefile.ssl >xxx; mv xxx test/Makefile.ssl -# Build the static libs and the executables in one make. -make -# Install everything -make install - -# Finally build the static libs with +O3. This time we only need the libraries, -# once created, they are simply copied into place. -# -perl5 Configure no-shared hpux-parisc-cc ${MYFLAGS} -make clean -make DIRS="crypto ssl" -chmod 644 libcrypto.a libssl.a -cp -p libcrypto.a libssl.a /usr/local/ssl/lib diff --git a/shlib/irix.sh b/shlib/irix.sh deleted file mode 100644 index 22e4e6ad50..0000000000 --- a/shlib/irix.sh +++ /dev/null @@ -1,7 +0,0 @@ -FLAGS="-DTERMIOS -O2 -mips2 -DB_ENDIAN -fomit-frame-pointer -Wall -Iinclude" -SHFLAGS="-DPIC -fpic" - -gcc -c -Icrypto $SHFLAGS $FLAGS -o crypto.o crypto/crypto.c -ld -shared -o libcrypto.so crypto.o -gcc -c -Issl $SHFLAGS $FLAGS -o ssl.o ssl/ssl.c -ld -shared -o libssl.so ssl.o diff --git a/shlib/sco5-shared-gcc.sh b/shlib/sco5-shared-gcc.sh deleted file mode 100755 index fe4a457b52..0000000000 --- a/shlib/sco5-shared-gcc.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -major="0" -minor="9.7b" - -slib=libssl -sh_slib=$slib.so.$major.$minor - -clib=libcrypto -sh_clib=$clib.so.$major.$minor - -FLAGS="-O3 -fomit-frame-pointer" -SHFLAGS="-DPIC -fPIC" - -touch $sh_clib -touch $sh_slib - -echo collecting all object files for $clib.so -OBJS= -find . -name \*.o -print > allobjs -for obj in `ar t libcrypto.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $clib.so -gcc -G -o $sh_clib -h $sh_clib $OBJS -lnsl -lsocket - -rm -f $clib.so -ln -s $sh_clib $clib.so - -echo collecting all object files for $slib.so -OBJS= -for obj in `ar t libssl.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $slib.so -gcc -G -o $sh_slib -h $sh_slib $OBJS -L. -lcrypto - -rm -f $slib.so -ln -s $sh_slib $slib.so - -mv libRSAglue.a libRSAglue.a.orig -mv libcrypto.a libcrypto.a.orig -mv libssl.a libssl.a.orig - diff --git a/shlib/sco5-shared-installed b/shlib/sco5-shared-installed deleted file mode 100755 index 509902833f..0000000000 --- a/shlib/sco5-shared-installed +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -major="0" -minor="9.7b" - -slib=libssl -sh_slib=$slib.so.$major.$minor - -clib=libcrypto -sh_clib=$clib.so.$major.$minor - -# If you want them in /usr/local/lib then change INSTALLTOP to point there. -#INSTALLTOP=/usr/local/ssl/lib -INSTALLTOP=/usr/local/lib - -cp -p $sh_clib $INSTALLTOP -cp -p $sh_slib $INSTALLTOP - -PWD=`pwd` -cd $INSTALLTOP -rm -f $INSTALLTOP/$clib.so -ln -s $INSTALLTOP/$sh_clib $clib.so - -rm -f $INSTALLTOP/$slib.so -ln -s $INSTALLTOP/$sh_slib $slib.so - -cd $PWD - diff --git a/shlib/sco5-shared.sh b/shlib/sco5-shared.sh deleted file mode 100755 index b3365d9f51..0000000000 --- a/shlib/sco5-shared.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -major="0" -minor="9.7b" - -slib=libssl -sh_slib=$slib.so.$major.$minor - -clib=libcrypto -sh_clib=$clib.so.$major.$minor - -FLAGS="-O -DFILIO_H -Kalloca" -SHFLAGS="-Kpic -DPIC" - -touch $sh_clib -touch $sh_slib - -echo collecting all object files for $clib.so -OBJS= -find . -name \*.o -print > allobjs -for obj in `ar t libcrypto.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $clib.so -cc -G -o $sh_clib -h $sh_clib $OBJS -lnsl -lsocket - -rm -f $clib.so -ln -s $sh_clib $clib.so - -echo collecting all object files for $slib.so -OBJS= -for obj in `ar t libssl.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $slib.so -cc -G -o $sh_slib -h $sh_slib $OBJS -L. -lcrypto - -rm -f $slib.so -ln -s $sh_slib $slib.so - -mv libRSAglue.a libRSAglue.a.orig -mv libcrypto.a libcrypto.a.orig -mv libssl.a libssl.a.orig - diff --git a/shlib/solaris-sc4.sh b/shlib/solaris-sc4.sh deleted file mode 100755 index b0766b35f7..0000000000 --- a/shlib/solaris-sc4.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -major="1" - -slib=libssl -sh_slib=$slib.so.$major - -clib=libcrypto -sh_clib=$clib.so.$major - -echo collecting all object files for $clib.so -OBJS= -find . -name \*.o -print > allobjs -for obj in `ar t libcrypto.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $clib.so -cc -G -o $sh_clib -h $sh_clib $OBJS -lnsl -lsocket - -rm -f $clib.so -ln -s $sh_clib $clib.so - -echo collecting all object files for $slib.so -OBJS= -for obj in `ar t libssl.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $slib.so -cc -G -o $sh_slib -h $sh_slib $OBJS -L. -lcrypto - -rm -f $slib.so -ln -s $sh_slib $slib.so - -rm -f allobjs - -mv libRSAglue.a libRSAglue.a.orig -mv libcrypto.a libcrypto.a.orig -mv libssl.a libssl.a.orig diff --git a/shlib/solaris.sh b/shlib/solaris.sh deleted file mode 100644 index 03475f12b4..0000000000 --- a/shlib/solaris.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -echo "#define DATE \"`date`\"" >crypto/date.h - -major="0" -minor="8.0" -slib=libssl -clib=libcrypto -CC=gcc -CPP='gcc -E' -AS=as -#FLAGS='-DTERMIO -O3 -DL_ENDIAN -fomit-frame-pointer -mv8 -Wall' -FLAGS='-DTERMIO -g2 -ggdb -DL_ENDIAN -Wall -DREF_CHECK -DCRYPTO_MDEBUG' -INCLUDE='-Iinclude -Icrypto -Issl' -SHFLAGS='-DPIC -fpic' - -CFLAGS="$FLAGS $INCLUDE $SHFLAGS" -ASM_OBJ=""; - -echo compiling bignum assember -$AS -o bn_asm.o crypto/bn/asm/sparc.s -CFLAGS="$CFLAGS -DBN_ASM" -ASM_OBJ="$ASM_OBJ bn_asm.o" - -echo compiling $clib -$CC -c $CFLAGS -DCFLAGS="\"$FLAGS\"" -o crypto.o crypto/crypto.c - -echo linking $clib.so -gcc $CFLAGS -shared -o $clib.so.$major.$minor crypto.o $ASM_OBJ -lnsl -lsocket - -echo compiling $slib.so -$CC -c $CFLAGS -o ssl.o ssl/ssl.c - -echo building $slib.so -gcc $CFLAGS -shared -o $slib.so ssl.o -L. -lcrypto - diff --git a/shlib/sun.sh b/shlib/sun.sh deleted file mode 100644 index a890bbd376..0000000000 --- a/shlib/sun.sh +++ /dev/null @@ -1,8 +0,0 @@ -FLAGS="-DTERMIO -O3 -DB_ENDIAN -fomit-frame-pointer -mv8 -Wall -Iinclude" -SHFLAGS="-DPIC -fpic" - -gcc -c -Icrypto $SHFLAGS -fpic $FLAGS -o crypto.o crypto/crypto.c -ld -G -z text -o libcrypto.so crypto.o - -gcc -c -Issl $SHFLAGS $FLAGS -o ssl.o ssl/ssl.c -ld -G -z text -o libssl.so ssl.o diff --git a/shlib/svr5-shared-gcc.sh b/shlib/svr5-shared-gcc.sh deleted file mode 100755 index c5d0cc56ac..0000000000 --- a/shlib/svr5-shared-gcc.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/sh - -major="0" -minor="9.7b" - -slib=libssl -sh_slib=$slib.so.$major.$minor - -clib=libcrypto -sh_clib=$clib.so.$major.$minor - -FLAGS="-O3 -DFILIO_H -fomit-frame-pointer -pthread" -SHFLAGS="-DPIC -fPIC" - -touch $sh_clib -touch $sh_slib - -echo collecting all object files for $clib.so -OBJS= -find . -name \*.o -print > allobjs -for obj in `ar t libcrypto.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $clib.so -gcc -G -o $sh_clib -h $sh_clib $OBJS -lnsl -lsocket - -rm -f $clib.so -ln -s $sh_clib $clib.so - -echo collecting all object files for $slib.so -OBJS= -for obj in `ar t libssl.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $slib.so -gcc -G -o $sh_slib -h $sh_slib $OBJS -L. -lcrypto - -rm -f $slib.so -ln -s $sh_slib $slib.so - -mv libRSAglue.a libRSAglue.a.orig -mv libcrypto.a libcrypto.a.orig -mv libssl.a libssl.a.orig - diff --git a/shlib/svr5-shared-installed b/shlib/svr5-shared-installed deleted file mode 100755 index b1def35d5c..0000000000 --- a/shlib/svr5-shared-installed +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/sh - -major="0" -minor="9.7b" - -slib=libssl -sh_slib=$slib.so.$major.$minor - -clib=libcrypto -sh_clib=$clib.so.$major.$minor - -# If you want them in /usr/local/lib then change INSTALLTOP to point there. -#INSTALLTOP=/usr/local/ssl/lib -INSTALLTOP=/usr/local/lib - -cp -p $sh_clib $INSTALLTOP -cp -p $sh_slib $INSTALLTOP - -PWD=`pwd` -cd $INSTALLTOP -rm -f $INSTALLTOP/$clib.so -ln -s $INSTALLTOP/$sh_clib $clib.so - -rm -f $INSTALLTOP/$slib.so -ln -s $INSTALLTOP/$sh_slib $slib.so - -cd $PWD diff --git a/shlib/svr5-shared.sh b/shlib/svr5-shared.sh deleted file mode 100755 index 9edf26e9a7..0000000000 --- a/shlib/svr5-shared.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/sh - -major="0" -minor="9.7b" - -slib=libssl -sh_slib=$slib.so.$major.$minor - -clib=libcrypto -sh_clib=$clib.so.$major.$minor - -FLAGS="-O -DFILIO_H -Kalloca -Kthread" -SHFLAGS="-Kpic -DPIC" - -touch $sh_clib -touch $sh_slib - -echo collecting all object files for $clib.so -OBJS= -find . -name \*.o -print > allobjs -for obj in `ar t libcrypto.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $clib.so -cc -G -o $sh_clib -h $sh_clib $OBJS -lnsl -lsocket - -rm -f $clib.so -ln -s $sh_clib $clib.so - -echo collecting all object files for $slib.so -OBJS= -for obj in `ar t libssl.a` -do - OBJS="$OBJS `grep $obj allobjs`" -done - -echo linking $slib.so -cc -G -o $sh_slib -h $sh_slib $OBJS -L. -lcrypto - -rm -f $slib.so -ln -s $sh_slib $slib.so - -mv libRSAglue.a libRSAglue.a.orig -mv libcrypto.a libcrypto.a.orig -mv libssl.a libssl.a.orig - diff --git a/shlib/win32.bat b/shlib/win32.bat deleted file mode 100755 index 2b0faaa17b..0000000000 --- a/shlib/win32.bat +++ /dev/null @@ -1,18 +0,0 @@ -rem win32 dll build - -set OPTIONS1=-DDES_ASM -DBN_ASM -DBF_ASM -DFLAT_INC -Iout -Itmp -DL_ENDIAN -set OPTIONS2=/W3 /WX /Ox /Gs0 /GF /Gy /nologo - -set OPTIONS=%OPTIONS1% %OPTIONS2% - -rem ml /coff /c crypto\bf\asm\b-win32.asm -rem ml /coff /c crypto\des\asm\c-win32.asm -rem ml /coff /c crypto\des\asm\d-win32.asm -rem ml /coff /c crypto\bn\asm\x86nt32.asm - -cl /Focrypto.obj -DWIN32 %OPTIONS% -c crypto\crypto.c -cl /Fossl.obj -DWIN32 %OPTIONS% -c ssl\ssl.c -cl /Foeay.obj -DWIN32 %OPTIONS% -c apps\eay.c - -cl /Fessleay.exe %OPTIONS% eay.obj ssl.obj crypto.obj crypto\bf\asm\b-win32.obj crypto\des\asm\c-win32.obj crypto\des\asm\d-win32.obj crypto\bn\asm\x86nt32.obj user32.lib gdi32.lib ws2_32.lib - diff --git a/shlib/win32dll.bat b/shlib/win32dll.bat deleted file mode 100755 index 844e3537c8..0000000000 --- a/shlib/win32dll.bat +++ /dev/null @@ -1,13 +0,0 @@ -rem win32 dll build - -set OPTIONS1=-DDES_ASM -DBN_ASM -DBF_ASM -DFLAT_INC -Iout -Itmp -DL_ENDIAN -set OPTIONS2=/W3 /WX /Ox /Gf /nologo - -set OPTIONS=%OPTIONS1% %OPTIONS2% - -cl /Felibeay32.dll /GD /MD /LD -DWIN32 %OPTIONS% ms\libeay32.def crypto\crypto.c crypto\bf\asm\b-win32.obj crypto\des\asm\c-win32.obj crypto\des\asm\d-win32.obj crypto\bn\asm\x86nt32.obj user32.lib gdi32.lib ws2_32.lib - -cl /Fessleay32.dll /GD /MD /LD -DWIN32 %OPTIONS% ms\ssleay32.def ssl\ssl.c libeay32.lib - -cl /Fessleay.exe /MD -DWIN32 %OPTIONS% apps\eay.c ssleay32.lib libeay32.lib user32.lib ws2_32.lib - -- 2.34.1