Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (42dc6943aa3ded0da0da5c81c2279b202d75c124)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (42dc6943aa3ded0da0da5c81c2279b202d75c124)
  • Date: Thu, 9 Apr 2020 10:58:53 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

crypto/gnutls/BUILD | 1 +
crypto/gnutls/DEPENDS | 7 ++++++-
crypto/gnutls/DETAILS | 2 +-
crypto/gnutls/HISTORY | 4 ++++
mail/libetpan/DEPENDS | 4 +++-
mail/libetpan/DETAILS | 4 ++--
mail/libetpan/HISTORY | 5 +++++
7 files changed, 22 insertions(+), 5 deletions(-)

New commits:
commit 42dc6943aa3ded0da0da5c81c2279b202d75c124
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libetpan: version 1.9.4, some deps

commit ce90bffb9326f5872b31f06fda87c23d28ba7012
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gnutls: use /etc/ssl/certs as default trust store

diff --git a/crypto/gnutls/BUILD b/crypto/gnutls/BUILD
index 1dc6a68..9924bab 100755
--- a/crypto/gnutls/BUILD
+++ b/crypto/gnutls/BUILD
@@ -1,4 +1,5 @@
if [[ "$GNUTLS_BRANCH" == stable-old ]]; then
OPTS="--enable-openssl-compatibility ${OPTS}"
fi &&
+OPTS="--with-default-trust-store-dir=$INSTALL_ROOT/etc/ssl/certs $OPTS" &&
default_build
diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index befc086..096e662 100755
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -42,4 +42,9 @@ optional_depends "p11-kit" \
optional_depends "libunistring" \
"--without-included-unistring" \
"--with-included-unistring" \
- "for system unistring support"
+ "for system unistring support" &&
+
+suggest_depends ca-certificates \
+ "" \
+ "" \
+ "adds root certificates"
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 5edf1bf..0ec9adb 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnutls
-
+ PATCHLEVEL=1
if [[ -z $GNUTLS_BRANCH ]]; then
GNUTLS_BRANCH="stable"
fi
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 10dd1b6..b28b82e 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,7 @@
+2020-04-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS, BUILD: use ca-certificates as trust store
+ * DETAILS: PATCHLEVEL++
+
2020-04-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.6.13
SECURITY_PATCH++, fix CVE-2019-3829 CVE-2020-11501
diff --git a/mail/libetpan/DEPENDS b/mail/libetpan/DEPENDS
index 366d024..d8caa50 100755
--- a/mail/libetpan/DEPENDS
+++ b/mail/libetpan/DEPENDS
@@ -6,7 +6,9 @@ then
elif [[ ${LIBETPAN_TLS} == "SSL" ]]
then
depends SSL "--with-openssl --without-gnutls"
-fi
&&
+fi &&
+optional_depends curl "--with-curl" "--without-curl" "for newsfeeds" &&
+optional_depends expat "--with-expat" "--without-expat" "for newsfeeds" &&
if [ "$CVS" = "y" ]; then
depends CVS
fi
diff --git a/mail/libetpan/DETAILS b/mail/libetpan/DETAILS
index c0a23ef..94eb070 100755
--- a/mail/libetpan/DETAILS
+++ b/mail/libetpan/DETAILS
@@ -7,11 +7,11 @@ if [ "$CVS" = "y" ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-sfcvs
else
- VERSION=1.6
+ VERSION=1.9.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL=https://github.com/dinhviethoa/$SPELL/archive/$VERSION.tar.gz
-
SOURCE_HASH=sha512:e3f19cfe231e8cadbb6cba3a765611e3aaeb260fa78e05cea1153a59015abe547c0f3a8b84c6b41cbbd17d04a4c7ab7b14d1b1b44a1a4b24ac124cb200a191a5
+
SOURCE_HASH=sha512:7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
fi
WEB_SITE=http://libetpan.sf.net
ENTERED=20040828
diff --git a/mail/libetpan/HISTORY b/mail/libetpan/HISTORY
index 0301695..a6d93da 100644
--- a/mail/libetpan/HISTORY
+++ b/mail/libetpan/HISTORY
@@ -1,3 +1,8 @@
+2020-04-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.4 (un-breaks
+ it for openssl 1.1)
+ * DEPENDS: added curl and expat
+
2015-11-11 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.6




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (42dc6943aa3ded0da0da5c81c2279b202d75c124), Thomas Orgis, 04/09/2020

Archive powered by MHonArc 2.6.24.

Top of Page