Drop openssl-compat package

This commit is contained in:
Michael Tremer
2015-04-23 14:28:41 +02:00
parent 37de68c965
commit 45ff420ec7
5 changed files with 23 additions and 105 deletions

View File

@@ -1,2 +0,0 @@
usr/lib/libcrypto.so.0.9.8
usr/lib/libssl.so.0.9.8

View File

@@ -0,0 +1,20 @@
lib/security/pam_mysql.so
usr/lib/gnupg/gpgkeys_ldap
usr/lib/gnupg/gpgkeys_hkp
usr/lib/gnupg/gpgkeys_curl
usr/lib/apache/libphp5.so
usr/lib/squid/digest_ldap_auth
usr/lib/squid/basic_ldap_auth
usr/lib/squid/digest_edirectory_auth
usr/lib/squid/ext_kerberos_ldap_group_acl
usr/lib/squid/ext_edirectory_userip_acl
usr/lib/squid/ext_ldap_group_acl
usr/lib/python2.7/lib-dynload/_ssl.so
usr/lib/python2.7/lib-dynload/_hashlib.so
usr/lib/collectd/write_http.so
usr/lib/collectd/ascent.so
usr/lib/collectd/curl_xml.so
usr/lib/collectd/apache.so
usr/lib/collectd/bind.so
usr/lib/collectd/curl.so
usr/bin/php

View File

@@ -136,6 +136,9 @@ esac
#Extract files
tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
# Remove old openssl libraries
rm -vf /usr/lib/libcrypto.so.0.9.8 /usr/lib/libssl.so.0.9.8
# Check diskspace on boot
BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`

View File

@@ -1,102 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 0.9.8zf
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = c69a4a679233f7df189e1ad6659511ec
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch
# Apply our CFLAGS
cd $(DIR_APP) && sed -i Configure \
-e "s/-O3 -fomit-frame-pointer/$(CFLAGS)/g"
cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config
cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure
# Support for engines is disabled, because the shared objects from the
# new version of openssl cannot be loaded by the old one.
cd $(DIR_APP) && ./Configure \
--prefix=/usr \
--openssldir=/etc/ssl \
shared linux-elf \
zlib-dynamic \
no-engines \
no-asm 386 \
-DSSL_FORBID_ENULL
cd $(DIR_APP) && make depend
cd $(DIR_APP) && make
cd $(DIR_APP) && install -v -m 755 libcrypto.so.0.9.8 /usr/lib
cd $(DIR_APP) && install -v -m 755 libssl.so.0.9.8 /usr/lib
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -462,7 +462,6 @@ buildipfire() {
ipfiremake xtables-addons USPACE="1"
ipfiremake openssl
[ "${TARGET_ARCH}" = "i586" ] && ipfiremake openssl SSE2="1"
ipfiremake openssl-compat
ipfiremake libgpg-error
ipfiremake libgcrypt
ipfiremake libassuan