From 2e7abbf3871812351d72fca6c0caf33bf592029b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 6 Aug 2014 10:09:55 +0200 Subject: [PATCH] openssl: removed; not necessary anymore after switching to libressl. --- common/shlibs | 2 - srcpkgs/libssl | 1 - srcpkgs/openssl-crehash | 1 - srcpkgs/openssl-devel | 1 - srcpkgs/openssl/patches/ca-dir.patch | 33 ------ .../patches/fix-soname-and-rpath.patch | 17 --- srcpkgs/openssl/template | 103 ------------------ 7 files changed, 158 deletions(-) delete mode 120000 srcpkgs/libssl delete mode 120000 srcpkgs/openssl-crehash delete mode 120000 srcpkgs/openssl-devel delete mode 100644 srcpkgs/openssl/patches/ca-dir.patch delete mode 100644 srcpkgs/openssl/patches/fix-soname-and-rpath.patch delete mode 100644 srcpkgs/openssl/template diff --git a/common/shlibs b/common/shlibs index 8e702a17ca..7c0249f4b0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -157,8 +157,6 @@ libnl-route-3.so.200 libnl3-3.2.1_1 libnl-nf-3.so.200 libnl3-3.2.1_1 libnl-genl-3.so.200 libnl3-3.2.1_1 libnl-cli-3.so.200 libnl3-3.2.1_1 -libssl.so.1 libssl-1.0.0_1 -libcrypto.so.1 libssl-1.0.0_1 libreadline.so.6 readline-6.3_1 libhistory.so.6 readline-6.3_1 libxfconf-0.so.2 xfconf-4.9.1_1 diff --git a/srcpkgs/libssl b/srcpkgs/libssl deleted file mode 120000 index fc538edfef..0000000000 --- a/srcpkgs/libssl +++ /dev/null @@ -1 +0,0 @@ -openssl \ No newline at end of file diff --git a/srcpkgs/openssl-crehash b/srcpkgs/openssl-crehash deleted file mode 120000 index fc538edfef..0000000000 --- a/srcpkgs/openssl-crehash +++ /dev/null @@ -1 +0,0 @@ -openssl \ No newline at end of file diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel deleted file mode 120000 index fc538edfef..0000000000 --- a/srcpkgs/openssl-devel +++ /dev/null @@ -1 +0,0 @@ -openssl \ No newline at end of file diff --git a/srcpkgs/openssl/patches/ca-dir.patch b/srcpkgs/openssl/patches/ca-dir.patch deleted file mode 100644 index 41d1386d3d..0000000000 --- a/srcpkgs/openssl/patches/ca-dir.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200 -+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200 -@@ -53,7 +53,7 @@ - $X509="$openssl x509"; - $PKCS12="$openssl pkcs12"; - --$CATOP="./demoCA"; -+$CATOP="/etc/ssl"; - $CAKEY="cakey.pem"; - $CAREQ="careq.pem"; - $CACERT="cacert.pem"; ---- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200 -+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200 -@@ -68,7 +68,7 @@ - X509="$OPENSSL x509" - PKCS12="openssl pkcs12" - --if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi -+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi - CAKEY=./cakey.pem - CAREQ=./careq.pem - CACERT=./cacert.pem ---- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200 -+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200 -@@ -39,7 +39,7 @@ - #################################################################### - [ CA_default ] - --dir = ./demoCA # Where everything is kept -+dir = /etc/ssl # Where everything is kept - certs = $dir/certs # Where the issued certs are kept - crl_dir = $dir/crl # Where the issued crl are kept - database = $dir/index.txt # database index file. diff --git a/srcpkgs/openssl/patches/fix-soname-and-rpath.patch b/srcpkgs/openssl/patches/fix-soname-and-rpath.patch deleted file mode 100644 index 88071ae1ea..0000000000 --- a/srcpkgs/openssl/patches/fix-soname-and-rpath.patch +++ /dev/null @@ -1,17 +0,0 @@ -Do not hardcode rpath into binaries and do not use full version for -the soname, just the major version. - ---- Makefile.shared.orig 2010-04-09 15:36:01.171506321 +0200 -+++ Makefile.shared 2010-04-09 15:41:25.848516655 +0200 -@@ -151,9 +151,9 @@ DO_GNU_SO=$(CALC_VERSIONS); \ - SHLIB_SUFFIX=; \ - ALLSYMSFLAGS='-Wl,--whole-archive'; \ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ -- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" -+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB.1$$SHLIB_SUFFIX" - --DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(CFLAGS)" - - #This is rather special. It's a special target with which one can link - #applications without bothering with any features that have anything to diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template deleted file mode 100644 index 3265fa2abd..0000000000 --- a/srcpkgs/openssl/template +++ /dev/null @@ -1,103 +0,0 @@ -# Template file for 'openssl' -pkgname=openssl -_openssl_version=1.0.1 -version=${_openssl_version}h -revision=3 -bootstrap=yes -short_desc="Secure Socket Layer and cryptographic library - runtime utilities" -maintainer="Juan RP " -license="BSD" -homepage="http://www.openssl.org/" -distfiles="https://www.openssl.org/source/$pkgname-$version.tar.gz" -checksum=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 - -if [ "$CHROOT_READY" ]; then - hostmakedepends="perl" -fi - -depends="openssl-crehash" -makedepends="zlib-devel" -conflicts="libressl-openssl>=0" - -conf_files="/etc/ssl/openssl.cnf" -make_dirs=" - /etc/ssl/certs 0755 root root - /etc/ssl/private 0750 root root" - -do_configure() { - local _opts - - case "$XBPS_TARGET_MACHINE" in - arm*) _target="linux-armv4";; - i686*) _target="linux-elf";; - x86_64*) _target="linux-x86_64"; _opts="enable-ec_nistp_64_gcc_128";; - mips*) msg_error "$pkgver: unknow cross arch\n";; - esac - - sed -i '/^"linux-armv4/s/-DTERMIO/-DTERMIOS/' Configure - sed -i '/^"linux-x86_64/s/-DTERMIO/-DTERMIOS/' Configure - sed -i '/^"linux-elf/s/-DTERMIO/-DTERMIOS/' Configure - sed -i 's/defined(linux)/0/' crypto/ui/ui_openssl.c - - if [ -z "$CHROOT_READY" ]; then - CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include" - LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib" - fi - - ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ - shared zlib enable-md2 threads ${_opts} \ - ${_target} -Wa,--noexecstack "${CFLAGS}" -} - -do_build() { - make -} - -do_install() { - local _sover="1.0.0" - - make INSTALL_PREFIX=${DESTDIR} MANDIR=/usr/share/man install - - chmod 755 ${DESTDIR}/usr/lib/engines/*.so - for _solib_ in libssl.so libcrypto.so; do - chmod 755 ${DESTDIR}/usr/lib/${_solib_}.${_sover} - cd ${DESTDIR}/usr/lib - ln -sf ${_solib_}.${_sover} ${_solib_}.1 - ln -sf ${_solib_}.${_sover} ${_solib_} - done - # Rename conflicting manpages. - mv ${DESTDIR}/usr/share/man/man1/passwd.1 \ - ${DESTDIR}/usr/share/man/man1/openssl-passwd.1 -} - -openssl-crehash_package() { - noarch=yes - replaces="openssl<1.0.1h_3" - depends="perl" - short_desc+=" - c_rehash script" - pkg_install() { - vmove usr/bin/c_rehash - } -} - -openssl-devel_package() { - conflicts="libressl-devel>=0" - depends="zlib-devel libssl>=${version}_${revision}" - short_desc="Secure Socket Layer and cryptographic library - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - vmove usr/share/man/man3 - } -} - -libssl_package() { - short_desc="Secure Sockets Layer and Cryptographic library" - replaces="openssl<1.0.1f_2" - pkg_install() { - vmove "usr/lib/*.so.*" - vmove usr/lib/engines - } -}