sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (7d27dab46ceea2f46a0c46e785452e582385917b)

From: Remko van der Vossen <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (7d27dab46ceea2f46a0c46e785452e582385917b)
Date: Fri, 31 May 2019 19:43:01 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

ChangeLog | 1
crypto/openssl-1.1/BUILD | 46
-----------------------------------------
crypto/openssl-1.1/CONFLICTS | 3 --
crypto/openssl-1.1/DEPENDS | 12 ----------
crypto/openssl-1.1/DETAILS | 16 --------------
crypto/openssl-1.1/HISTORY | 3 ++
crypto/openssl-1.1/INSTALL | 2 -
crypto/openssl-1.1/PROVIDES | 1
crypto/openssl-1.1/UP_TRIGGERS | 24 +--------------------
crypto/openssl-1.1/XX | 2 -
dev/null |binary
11 files changed, 10 insertions(+), 100 deletions(-)

New commits:
commit 7d27dab46ceea2f46a0c46e785452e582385917b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

openssl-1.1: deprecated in favor of openssl

diff --git a/ChangeLog b/ChangeLog
index 0889a5b..3733643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2019-05-31 Remko van der Vossen <wich AT sourcemage.org>
* java/openjdk12: new spell, JDK 12
+ * crypto/openssl-1.1: deprecated

2019-05-30 Eric Sandall <sandalle AT sourcemage.org>
* protect_special_libs: Export LD_LIBRARY_PATH to include $PROTECT
path
diff --git a/crypto/openssl-1.1/BUILD b/crypto/openssl-1.1/BUILD
index a02344f..27ba77d 100755
--- a/crypto/openssl-1.1/BUILD
+++ b/crypto/openssl-1.1/BUILD
@@ -1,45 +1 @@
-# again check if it's there or net and only then use the variable
-# else one would lose sse support on a new system
-if ! grep -q "sse" /proc/cpuinfo ; then
- if [[ $OPENSSL_SSE == n ]]; then
- OPTS="no-sse2 $OPTS"
- fi
-fi &&
-OPTS="$OPENSSL_TLSEXT $OPTS" &&
-OPTS="--prefix=${INSTALL_ROOT}/usr \
- --openssldir=${INSTALL_ROOT}/etc/ssl \
- --libdir=lib \
- enable-md2 \
- shared \
- threads \
- $OPTS" &&
-setarch ${HOST%%-*} ./config $OPTS &&
-
-make && {
-
- local OLD_SPELL_VERSION=""
- spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ] &&
- grep -q '^wget:openssl-1.1:on' "$DEPENDS_STATUS" # any internal
sorcery interface to this data?
- then
- message "Building wget now so that it doesn't get borked" &&
- summon wget &&
- RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
- PATH="${PATH//$RUN_COMPILER_DIR:/}" &&
- (
- OPTS="--with-ssl=openssl"
-
- delve -c start BUILD wget && # this links against old
libraries still
- local TEMPWGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget |
- head -n 3 | tail -n 1 | awk '{ print $4 }')" &&
- # $4 is grimoire version, not installed version --
internal sorcery interface, too?
- cd "$TEMPWGET_DIR/src" &&
- rm wget &&
- cp -vf $SOURCE_DIRECTORY/lib{ssl,crypto}.so* "$INSTALL_ROOT/usr/lib/" &&
- make wget && # race to get a new library
wget built
- install -m 755 wget /usr/bin/wget && # and installed
- cd - &&
- ldconfig
- )
-fi
-}
+true
diff --git a/crypto/openssl-1.1/CONFLICTS b/crypto/openssl-1.1/CONFLICTS
index 9b343d5..ab288db 100755
--- a/crypto/openssl-1.1/CONFLICTS
+++ b/crypto/openssl-1.1/CONFLICTS
@@ -1,2 +1 @@
-conflicts libressl
-conflicts openssl
\ No newline at end of file
+conflicts openssl-1.1 y
diff --git a/crypto/openssl-1.1/DEPENDS b/crypto/openssl-1.1/DEPENDS
deleted file mode 100755
index 42c2ddf..0000000
--- a/crypto/openssl-1.1/DEPENDS
+++ /dev/null
@@ -1,12 +0,0 @@
-depends perl &&
-depends smgl-fhs &&
-
-optional_depends zlib \
- "zlib-dynamic" \
- "no-zlib" \
- "for zlib compression" &&
-
-suggest_depends ca-certificates \
- "" \
- "" \
- "adds root certificates"
diff --git a/crypto/openssl-1.1/DETAILS b/crypto/openssl-1.1/DETAILS
index 03f7e02f..59bab06 100755
--- a/crypto/openssl-1.1/DETAILS
+++ b/crypto/openssl-1.1/DETAILS
@@ -1,21 +1,7 @@
SPELL=openssl-1.1
- SPELLX=openssl
VERSION=1.1.1c
+ PATCHLEVEL=1
SECURITY_PATCH=1
- SOURCE=$SPELLX-$VERSION.tar.gz
- SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
- SOURCE_URL[1]=ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/$SOURCE
-
SOURCE_URL[2]=ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/$SOURCE
- SOURCE_URL[3]=ftp://ftp.mirror.ac.uk/sites/ftp.openssl.org/source/$SOURCE
- SOURCE_URL[4]=ftp://sunsite.uio.no/pub/security/openssl/source/$SOURCE
- SOURCE2=$SOURCE.asc
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
- SOURCE2_URL[2]=${SOURCE_URL[2]}.asc
- SOURCE2_URL[3]=${SOURCE_URL[3]}.asc
- SOURCE2_URL[4]=${SOURCE_URL[4]}.asc
- SOURCE2_IGNORE=signature
- SOURCE_GPG="openssl.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.openssl.org/
ENTERED=20190329
diff --git a/crypto/openssl-1.1/HISTORY b/crypto/openssl-1.1/HISTORY
index 3ecd5fd..f9190e6 100644
--- a/crypto/openssl-1.1/HISTORY
+++ b/crypto/openssl-1.1/HISTORY
@@ -1,3 +1,6 @@
+2019-05-31 Remko van der Vossen <wich AT sourcemage.org>
+ * Deprecated in favor of openssl
+
2019-05-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.1c, SECURITY_PATCH=1
* DEPENDS: remove invalid optional dependency on krb5
diff --git a/crypto/openssl-1.1/INSTALL b/crypto/openssl-1.1/INSTALL
index bcb3d8f..27ba77d 100755
--- a/crypto/openssl-1.1/INSTALL
+++ b/crypto/openssl-1.1/INSTALL
@@ -1 +1 @@
-make MANDIR="$INSTALL_ROOT/usr/share/man" install
+true
diff --git a/crypto/openssl-1.1/PROVIDES b/crypto/openssl-1.1/PROVIDES
deleted file mode 100755
index fe0d4a2..0000000
--- a/crypto/openssl-1.1/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-SSL
diff --git a/crypto/openssl-1.1/UP_TRIGGERS b/crypto/openssl-1.1/UP_TRIGGERS
index 811c1ac..922f219 100755
--- a/crypto/openssl-1.1/UP_TRIGGERS
+++ b/crypto/openssl-1.1/UP_TRIGGERS
@@ -1,22 +1,2 @@
-# this makes ABI changes automatically cast those that depend on openssl via
an up_trigger
-
-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0
-
-if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ] || \
- [ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]; then
- for each in $(show_up_depends $SPELL 1); do
- up_trigger $each cast_self
- done
-fi &&
-
-if spell_ok libressl; then
- for each in $(show_up_depends libressl 1); do
- up_trigger $each cast_self
- done
-fi &&
-
-if spell_ok openssl; then
- for each in $(show_up_depends openssl 1); do
- up_trigger $each cast_self
- done
-fi
+up_trigger openssl-1.1 dispel_self
+up_trigger openssl cast_self
diff --git a/crypto/openssl-1.1/XX b/crypto/openssl-1.1/XX
deleted file mode 100644
index 1e9d088..0000000
--- a/crypto/openssl-1.1/XX
+++ /dev/null
@@ -1,2 +0,0 @@
-cast -c borgbackup ca-certificates crda git kdelibs4support krb5 libarchive
libevent \
-libsasl libssh libzip m2crypto mosh openssh python3 python qca-qt5 qtbase
ruby-2.6
diff --git a/crypto/openssl-1.1/openssl.gpg b/crypto/openssl-1.1/openssl.gpg
deleted file mode 100644
index 2b53d0d..0000000
Binary files a/crypto/openssl-1.1/openssl.gpg and /dev/null differ

[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (7d27dab46ceea2f46a0c46e785452e582385917b), Remko van der Vossen, 05/31/2019