Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d0a580ff69389681ac7b6e4ac1f76db0d2082844)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (d0a580ff69389681ac7b6e4ac1f76db0d2082844)
  • Date: Sat, 23 Aug 2014 04:08:54 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ftp/curl/BUILD | 4 ----
ftp/curl/CONFIGURE | 2 +-
ftp/curl/DEPENDS | 39 ++++++++++++++++++++++-----------------
ftp/curl/HISTORY | 3 +++
libs/upower/DETAILS | 4 ++--
libs/upower/HISTORY | 3 +++
science-libs/glpk/DEPENDS | 4 ++--
science-libs/glpk/DETAILS | 2 +-
science-libs/glpk/HISTORY | 4 ++++
9 files changed, 38 insertions(+), 27 deletions(-)

New commits:
commit d0a580ff69389681ac7b6e4ac1f76db0d2082844
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

curl - support libressl

commit 7bc8e1ac4064e51c37f5b6eed2a2854d8077a4af
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

upower: => 0.99.1

commit b5b0fe641ac74a113749ec5e87ada51ae572fffe
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

glpk: => 4.55

diff --git a/ftp/curl/BUILD b/ftp/curl/BUILD
index 5c046dd..95f5f02 100755
--- a/ftp/curl/BUILD
+++ b/ftp/curl/BUILD
@@ -1,7 +1,3 @@
-if [[ "$CURL_SSL" == "none" ]]; then
- OPTS="--without-gnutls --without-nss --without-ssl $OPTS"
-fi &&
-
if [[ "$CFLAGS" != "${CFLAGS//-DPIC/}" ]]; then
CFLAGS="${CFLAGS//-DPIC/}" &&
CPPFLAGS="$CPPFLAGS -DPIC "
diff --git a/ftp/curl/CONFIGURE b/ftp/curl/CONFIGURE
index b865856..308a954 100755
--- a/ftp/curl/CONFIGURE
+++ b/ftp/curl/CONFIGURE
@@ -1 +1 @@
-config_query_list CURL_SSL "Which SSL lib do you want?" none openssl gnutls
nss polarssl
+config_query_list CURL_SSL "Which SSL lib do you want?" none libressl
openssl gnutls nss polarssl
diff --git a/ftp/curl/DEPENDS b/ftp/curl/DEPENDS
index 58bae98..db721df 100755
--- a/ftp/curl/DEPENDS
+++ b/ftp/curl/DEPENDS
@@ -1,30 +1,35 @@
depends zlib &&

-if [[ "$CURL_SSL" == "gnutls" ]]; then
+case $CURL_SSL in
+ gnutls)
depends gnutls \
"--with-gnutls \
- --with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
- --without-ssl --without-nss --without-polarssl" &&
- depends ca-certificates
-elif [[ "$CURL_SSL" == "SSL" ]]; then
+ --without-ssl --without-nss --without-polarssl"
+ ;;
+ libressl | openssl)
depends SSL \
"--with-ssl \
- --without-ca-bundle \
- --with-ca-path=$INSTALL_ROOT/etc/ssl/certs \
- --without-gnutls --without-nss --without-polarssl" &&
- depends ca-certificates
-elif [[ "$CURL_SSL" == "nss" ]]; then
+ --without-gnutls --without-nss --without-polarssl"
+ ;;
+ nss)
depends -sub PEM nss \
"--with-nss \
- --with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
- --without-gnutls --without-ssl --without-polarssl" &&
- depends ca-certificates
-elif [[ "$CURL_SSL" == "polarssl" ]]; then
+ --without-gnutls --without-ssl --without-polarssl"
+ ;;
+ polarssl)
depends polarssl \
"--with-polarssl \
- --with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
- --without-ssl --without-nss --without-gnutls" &&
- depends ca-certificates
+ --without-ssl --without-nss --without-gnutls"
+ ;;
+ none)
+ OPTS+=" --without-gnutls --without-nss --without-ssl"
+ ;;
+esac &&
+
+if [[ "$CURL_SSL" == "none" ]]; then
+ OPTS+=" --without-ca-bundle"
+else
+ depends ca-certificates
"--with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt"
fi &&

optional_depends krb5 \
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 46a04c2..0838d6c 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2014-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE, DEPENDS, BUILD: also support libressl, cleanup
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
index 43d6498..106c5f0 100755
--- a/libs/upower/DETAILS
+++ b/libs/upower/DETAILS
@@ -1,6 +1,6 @@
SPELL=upower
- VERSION=0.9.23
-
SOURCE_HASH=sha512:526ef95e43faf61744ba2bbf80bae23bc5c8672130563a87a7f18f00d85b16e2069814ad70dd66ce6ce698037b522d78579cc2135e2af0c2a636230cfa662c6d
+ VERSION=0.99.1
+
SOURCE_HASH=sha512:3a413234226a957e8dcb60a1b8a73a4d1b9eb34705b01b404580a34c2a9e61a30b20e8ccefe72dc3457ea305beb910fc02ce76469982c95cbf0ed6bc785b7783
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index c8a2d28..fbe61e2 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2014-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.99.1
+
2013-10-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.23

diff --git a/science-libs/glpk/DEPENDS b/science-libs/glpk/DEPENDS
index 8cecf43..059eea9 100755
--- a/science-libs/glpk/DEPENDS
+++ b/science-libs/glpk/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends gmp '--enable-gmp' \
- '--disable-gmp' \
+optional_depends gmp '--with-gmp' \
+ '--without-gmp' \
'use GNU MP library'

diff --git a/science-libs/glpk/DETAILS b/science-libs/glpk/DETAILS
index 24f6d50..4b6ac30 100755
--- a/science-libs/glpk/DETAILS
+++ b/science-libs/glpk/DETAILS
@@ -1,5 +1,5 @@
SPELL=glpk
- VERSION=4.47
+ VERSION=4.55
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/science-libs/glpk/HISTORY b/science-libs/glpk/HISTORY
index 8779d00..b17c6f0 100644
--- a/science-libs/glpk/HISTORY
+++ b/science-libs/glpk/HISTORY
@@ -1,3 +1,7 @@
+2014-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.55
+ * DEPENDS: fix gmp flags
+
2011-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.47




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d0a580ff69389681ac7b6e4ac1f76db0d2082844), Treeve Jelbert, 08/23/2014

Archive powered by MHonArc 2.6.24.

Top of Page