sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (06a69706aceff163542dc96bba3fab84e82e66ec)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (06a69706aceff163542dc96bba3fab84e82e66ec)
- Date: Fri, 29 Mar 2019 18:21:14 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
ChangeLog | 3 ++
crypto/libressl/CONFLICTS | 1
crypto/libressl/HISTORY | 3 ++
crypto/libressl/UP_TRIGGERS | 6 +++++
crypto/openssl-1.1/BUILD | 45
+++++++++++++++++++++++++++++++++++++++++
crypto/openssl-1.1/CONFIGURE | 6 +++++
crypto/openssl-1.1/CONFLICTS | 2 +
crypto/openssl-1.1/DEPENDS | 17 +++++++++++++++
crypto/openssl-1.1/DETAILS | 36 ++++++++++++++++++++++++++++++++
crypto/openssl-1.1/HISTORY | 3 ++
crypto/openssl-1.1/INSTALL | 1
crypto/openssl-1.1/PRE_REMOVE | 25 ++++++++++++++++++++++
crypto/openssl-1.1/PROVIDES | 1
crypto/openssl-1.1/UP_TRIGGERS | 22 ++++++++++++++++++++
crypto/openssl-1.1/XX | 2 +
crypto/openssl-1.1/openssl.gpg |binary
crypto/openssl/CONFLICTS | 1
crypto/openssl/HISTORY | 3 ++
18 files changed, 177 insertions(+)
New commits:
commit 06a69706aceff163542dc96bba3fab84e82e66ec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libressl - conflicts openssl-1.1
commit 970fe8a6d36c3ecaf03501b4e26d7702145bca43
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
openssl - conflicts openssl-1.1
commit fbe5b9c56e3c031075eafd10b4c6aee3d302e621
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
add openssl 1.1.1b
diff --git a/ChangeLog b/ChangeLog
index b68917f..4236c72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * crypto/openssl-1.1: added, modern openssl
+
2019-03-19 Vlad Glagolev <stealth AT sourcemage.org>
* utils/progress: new spell, coreutils progress viewer
diff --git a/crypto/libressl/CONFLICTS b/crypto/libressl/CONFLICTS
index f76cdec..117e987 100755
--- a/crypto/libressl/CONFLICTS
+++ b/crypto/libressl/CONFLICTS
@@ -1 +1,2 @@
conflicts openssl
+conflicts openssl-1.1
diff --git a/crypto/libressl/HISTORY b/crypto/libressl/HISTORY
index d724007..a363d93 100644
--- a/crypto/libressl/HISTORY
+++ b/crypto/libressl/HISTORY
@@ -1,3 +1,6 @@
+2019-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS UP_TRIGGERS: add openssl-1.1
+
2018-12-16 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: added devel 2.9.0, shifted 2.8.3 to stable, 2.7.5 to old,
2.5.5 is deprecated
diff --git a/crypto/libressl/UP_TRIGGERS b/crypto/libressl/UP_TRIGGERS
index 78fccd9..694a3ab 100755
--- a/crypto/libressl/UP_TRIGGERS
+++ b/crypto/libressl/UP_TRIGGERS
@@ -4,6 +4,12 @@ if spell_ok openssl;then
done
fi &&
+if spell_ok openssl-1.1;then
+ for each in $(show_up_depends openssl-1.1 1); do
+ up_trigger $each cast_self
+ done
+fi &&
+
if spell_ok $SPELL; then
local NEW_SPELL_BRANCH="$(echo $VERSION | cut -d. -f1,2)" &&
local OLD_SPELL_BRANCH="$(installed_version $SPELL | cut -d. -f1,2)" &&
diff --git a/crypto/openssl-1.1/BUILD b/crypto/openssl-1.1/BUILD
new file mode 100755
index 0000000..a02344f
--- /dev/null
+++ b/crypto/openssl-1.1/BUILD
@@ -0,0 +1,45 @@
+# 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
+}
diff --git a/crypto/openssl-1.1/CONFIGURE b/crypto/openssl-1.1/CONFIGURE
new file mode 100755
index 0000000..6aeff9b
--- /dev/null
+++ b/crypto/openssl-1.1/CONFIGURE
@@ -0,0 +1,6 @@
+if ! grep -q "sse" /proc/cpuinfo ; then
+message "Detected NO SSE support." &&
+message "Enabling SSE support when none exists can lead to a" &&
+message "broken installation. You are advised to disable it." &&
+config_query OPENSSL_SSE "Are you sure you want to enable SSE support?" n
+fi
diff --git a/crypto/openssl-1.1/CONFLICTS b/crypto/openssl-1.1/CONFLICTS
new file mode 100755
index 0000000..9b343d5
--- /dev/null
+++ b/crypto/openssl-1.1/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts libressl
+conflicts openssl
\ No newline at end of file
diff --git a/crypto/openssl-1.1/DEPENDS b/crypto/openssl-1.1/DEPENDS
new file mode 100755
index 0000000..5404b88
--- /dev/null
+++ b/crypto/openssl-1.1/DEPENDS
@@ -0,0 +1,17 @@
+depends perl &&
+depends smgl-fhs &&
+
+optional_depends zlib \
+ "zlib-dynamic" \
+ "no-zlib" \
+ "for zlib compression" &&
+
+optional_depends krb5 \
+ "" \
+ "no-krb5" \
+ "for Kerberos v5 authentication" &&
+
+suggest_depends ca-certificates \
+ "" \
+ "" \
+ "adds root certificates"
diff --git a/crypto/openssl-1.1/DETAILS b/crypto/openssl-1.1/DETAILS
new file mode 100755
index 0000000..714ee34
--- /dev/null
+++ b/crypto/openssl-1.1/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=openssl-1.1
+ SPELLX=openssl
+ VERSION=1.1.1b
+ 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
+
LICENSE[0]=http://www.cgicentral.net/400CS/Docs/openssl/LICENSE.openssl.html
+ KEYWORDS="crypto"
+ SHORT="library for providing encrypted transport layers"
+cat << EOF
+The OpenSSL Project is a collaborative effort to develop a robust,
+commercial-grade, full-featured, and Open Source toolkit implementing the
Secure
+Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as
+well as a full-strength general purpose cryptography library. The project is
+managed by a worldwide community of volunteers that use the Internet to
+communicate, plan, and develop the OpenSSL toolkit and its related
+documentation. OpenSSL is based on the excellent SSLeay library developed by
+Eric A. Young and Tim J. Hudson. The OpenSSL toolkit is licensed under an
+Apache-style licence, which basically means that you are free to get and use
it
+for commercial and non-commercial purposes subject to some simple license
+conditions.
+EOF
diff --git a/crypto/openssl-1.1/HISTORY b/crypto/openssl-1.1/HISTORY
new file mode 100644
index 0000000..27c91f7
--- /dev/null
+++ b/crypto/openssl-1.1/HISTORY
@@ -0,0 +1,3 @@
+2019-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.1b
+ spell created - based on openssl
\ No newline at end of file
diff --git a/crypto/openssl-1.1/INSTALL b/crypto/openssl-1.1/INSTALL
new file mode 100755
index 0000000..bcb3d8f
--- /dev/null
+++ b/crypto/openssl-1.1/INSTALL
@@ -0,0 +1 @@
+make MANDIR="$INSTALL_ROOT/usr/share/man" install
diff --git a/crypto/openssl-1.1/PRE_REMOVE b/crypto/openssl-1.1/PRE_REMOVE
new file mode 100755
index 0000000..adceeb8
--- /dev/null
+++ b/crypto/openssl-1.1/PRE_REMOVE
@@ -0,0 +1,25 @@
+# check for exported variable by libressl
+if [[ -n "$WGET_RECAST_REQUIRED" ]] && is_depends_enabled wget
$(get_spell_provider wget SSL); then
+ message "${MESSAGE_COLOR}Building static wget now so that it doesn't get
borked${DEFAULT_COLOR}" &&
+
+ # make sure wget sources are in-place
+ summon wget &&
+
+ RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
+ PATH="${PATH//$RUN_COMPILER_DIR:/}" &&
+ (
+ # this links statically against old libraries still
+ export OPTS="--with-ssl=openssl --disable-pcre" && # TODO: our pcre
spell doesn't install a static library yet
+ export CUSTOM_CFLAGS="-static" &&
+ # $4 is grimoire version, not installed version -- internal sorcery
interface, too?
+ local TMP_WGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget | awk '{if
(NR == 3) print $4}')" &&
+
+ delve -c start config_loc wget &&
+ # LDFLAGS+="-ldl" is required for static linking
+ sedit "s:@LIBS@:@LIBS@ -ldl:" "$TMP_WGET_DIR/src/Makefile.in" &&
+ # get a new wget binary built
+ delve BUILD wget &&
+ # and installed
+ install -vm 755 "$TMP_WGET_DIR/src/wget" "$INSTALL_ROOT/usr/bin/wget"
+ ) || exit 1 # for some reason 'return 1' doesn't work here
+fi
diff --git a/crypto/openssl-1.1/PROVIDES b/crypto/openssl-1.1/PROVIDES
new file mode 100755
index 0000000..fe0d4a2
--- /dev/null
+++ b/crypto/openssl-1.1/PROVIDES
@@ -0,0 +1 @@
+SSL
diff --git a/crypto/openssl-1.1/UP_TRIGGERS b/crypto/openssl-1.1/UP_TRIGGERS
new file mode 100755
index 0000000..811c1ac
--- /dev/null
+++ b/crypto/openssl-1.1/UP_TRIGGERS
@@ -0,0 +1,22 @@
+# 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
diff --git a/crypto/openssl-1.1/XX b/crypto/openssl-1.1/XX
new file mode 100644
index 0000000..1e9d088
--- /dev/null
+++ b/crypto/openssl-1.1/XX
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..2b53d0d
Binary files /dev/null and b/crypto/openssl-1.1/openssl.gpg differ
diff --git a/crypto/openssl/CONFLICTS b/crypto/openssl/CONFLICTS
index 4ac1907..e3deb80 100755
--- a/crypto/openssl/CONFLICTS
+++ b/crypto/openssl/CONFLICTS
@@ -1 +1,2 @@
conflicts libressl
+conflicts openssl-1.1
\ No newline at end of file
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index ee05eb2..1a6e560 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2019-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add openssl-1.1
+
2019-03-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.2r, SECURITY_PATCH++
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (06a69706aceff163542dc96bba3fab84e82e66ec), Treeve Jelbert, 03/29/2019
Archive powered by MHonArc 2.6.24.