sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e4fa8f59b6416c6fc05cf77609ac1165e8a29e71)

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 (e4fa8f59b6416c6fc05cf77609ac1165e8a29e71)
Date: Sun, 24 Aug 2014 02:44:23 -0500

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

ftp/wget/CONFIGURE | 2 +-
ftp/wget/DEPENDS | 13 ++++---------
ftp/wget/HISTORY | 4 ++++
ftp/wget/SUB_DEPENDS | 2 +-
printer/cups/CONFIGURE | 7 ++-----
printer/cups/DEPENDS | 14 +++++---------
printer/cups/HISTORY | 3 +++
printer/gutenprint/BUILD | 1 +
printer/gutenprint/DEPENDS | 8 +-------
printer/gutenprint/HISTORY | 5 +++++
10 files changed, 27 insertions(+), 32 deletions(-)

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

gutenprint - fix spurious dependencies

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

tweak ssl choices

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

wget - imporve libressl detection

diff --git a/ftp/wget/CONFIGURE b/ftp/wget/CONFIGURE
index 98c06e0..834161a 100755
--- a/ftp/wget/CONFIGURE
+++ b/ftp/wget/CONFIGURE
@@ -1,4 +1,4 @@
-config_query_list WGET_SSL "Which SSL backend do you want for https and
ftps?" none gnutls openssl &&
+config_query_list WGET_SSL "Which SSL backend do you want for https and
ftps?" none gnutls SSL &&

config_query_option WGET_OPTS "Enable IPv6 support?" y \
"--enable-ipv6" "--disable-ipv6"
diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS
index 520bfd4..a8512ee 100755
--- a/ftp/wget/DEPENDS
+++ b/ftp/wget/DEPENDS
@@ -19,15 +19,10 @@ optional_depends "texinfo" \
case $WGET_SSL in
none)
;;
- gnutls) depends gnutls "--with-ssl=gnutls"
+ gnutls) depends gnutls "--with-ssl=gnutls"
;;
- SSL) depends openssl "--with-ssl=openssl"
+ SSL)
+ depends SSL "--with-ssl=openssl" &&
+ optional_depends ca-certificates '' '' 'provides security certificates'
;;
esac
-
-if is_depends_enabled $SPELL SSL ; then
-optional_depends ca-certificates \
- "" \
- "" \
- "provides security certificates"
-fi
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 8b8d320..e5277f0 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,7 @@
+2014-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS, CONFIGURE: fix libressl support
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: tweak
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/ftp/wget/SUB_DEPENDS b/ftp/wget/SUB_DEPENDS
index ddedadb..a086a33 100755
--- a/ftp/wget/SUB_DEPENDS
+++ b/ftp/wget/SUB_DEPENDS
@@ -5,7 +5,7 @@ case $THIS_SUB_DEPENDS in
case $WGET_SSL in
gnutls) depends gnutls "--with-ssl=gnutls"
;;
- SSL) depends openssl "--with-ssl=openssl"
+ SSL) depends SSL "--with-ssl=openssl"
;;
esac
;;
diff --git a/printer/cups/CONFIGURE b/printer/cups/CONFIGURE
index 2b3c16d..4a0a367 100755
--- a/printer/cups/CONFIGURE
+++ b/printer/cups/CONFIGURE
@@ -7,11 +7,8 @@ if [[ $EXTRA_LANG == y ]]; then
all de es fr ja pl sv
fi &&

-config_query_option CUPS_OPTS \
- "Do you want to use network default printers" \
- y \
- '--enable-use-network-default' \
- '--disable-use-network-default' &&
+config_query_list CUPS_SSL "Which SSL backend do you want for https and
ftps?" none gnutls SSL &&
+
config_query_option CUPS_OPTS \
"Do you want to enable raw printing" \
n \
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index 4a7fc7c..1713424 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -41,15 +41,11 @@ optional_depends "linux-pam" \
"--disable-pam" \
"for pluggable authentication" &&

-optional_depends "gnutls" \
- "--enable-gnutls" \
- "" \
- "use GNU TLS for SSL/TLS support" &&
-
-optional_depends "SSL" \
- "--enable-ssl" \
- "" \
- "for encrypted communications" &&
+case $CUPS_SSL in
+ gnutls) depends gnutls "--enable-gnutls --disable-openssl" ;;
+ SSL) depends SSL "--enable-openssl --disable-gnutls" ;;
+ none) OPTS+=" --disable-ssl " ;;
+esac &&

optional_depends "acl" \
"" \
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index e0f9626..795d441 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,6 @@
+2014-08-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS, CONFIGURE: improve SSL/gnutls choice - remive obsolete
flags
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL
fix ssl
diff --git a/printer/gutenprint/BUILD b/printer/gutenprint/BUILD
index 7e3ff0e..ef085be 100755
--- a/printer/gutenprint/BUILD
+++ b/printer/gutenprint/BUILD
@@ -1,2 +1,3 @@
OPTS="$GTP_LANG $OPTS" &&
+LDFLAGS+=" -Wl,--as-needed" &&
default_build
diff --git a/printer/gutenprint/DEPENDS b/printer/gutenprint/DEPENDS
index 3a5946e..d40a015 100755
--- a/printer/gutenprint/DEPENDS
+++ b/printer/gutenprint/DEPENDS
@@ -12,10 +12,4 @@ optional_depends gimp \
optional_depends "CUPS" \
"--with-cups --enable-cups-ppds" \
"--disable-cups" \
- "for CUPS support" &&
-# make the gnutls dependency explicit
-if is_depends_enabled $SPELL cups;then
- if is_depends_enabled cups gnutls;then
- depends gnutls
- fi
-fi
+ "for CUPS support"
diff --git a/printer/gutenprint/HISTORY b/printer/gutenprint/HISTORY
index ccea0fc..acca22b 100644
--- a/printer/gutenprint/HISTORY
+++ b/printer/gutenprint/HISTORY
@@ -1,3 +1,8 @@
+2014-08-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: temove spurious gnutls check
+ * BUILD: force LDFLAGS="-Wl,--as-needed"
+ this previous misleading references to gnutls/openssl, which are
inherited from cups
+
2014-05-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.2.10

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e4fa8f59b6416c6fc05cf77609ac1165e8a29e71), Treeve Jelbert, 08/24/2014