Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (138b2656dc13cc2e3eb0ae3fd27c325509a87a22)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (138b2656dc13cc2e3eb0ae3fd27c325509a87a22)
  • Date: Wed, 22 Apr 2015 05:55:33 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

crypto/gnutls/HISTORY | 3 +++
crypto/gnutls/PRE_BUILD | 6 ++++++
crypto/gnutls/buildfix.diff | 27 +++++++++++++++++++++++++++
3 files changed, 36 insertions(+)

New commits:
commit 138b2656dc13cc2e3eb0ae3fd27c325509a87a22
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gnults build fix

diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 0d92c44..251ff5f 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2015-04-22 Ladislav Hagara <hgr AT vabo.cz>
+ * PRE_BUILD, buildfix.diff: patch from Arch added
+
2015-04-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated stable branch to 3.4.0

diff --git a/crypto/gnutls/PRE_BUILD b/crypto/gnutls/PRE_BUILD
new file mode 100755
index 0000000..d08434a
--- /dev/null
+++ b/crypto/gnutls/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [[ "$GNUTLS_BRANCH" == "stable" ]]; then
+ patch -p1 < $SPELL_DIRECTORY/buildfix.diff
+fi
diff --git a/crypto/gnutls/buildfix.diff b/crypto/gnutls/buildfix.diff
new file mode 100644
index 0000000..48ed2da
--- /dev/null
+++ b/crypto/gnutls/buildfix.diff
@@ -0,0 +1,27 @@
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 8e793d3..68de757 100644
+--- a/doc/manpages/Makefile.am
++++ b/doc/manpages/Makefile.am
+@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
+ APIMANS += gnutls_certificate_get_peers_subkey_id.3
+ APIMANS += gnutls_certificate_get_trust_list.3
+ APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_key.3
+-APIMANS += gnutls_certificate_get_x509_key.3
+ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
+ APIMANS += gnutls_certificate_server_set_request.3
+ APIMANS += gnutls_certificate_set_dh_params.3
+@@ -1101,7 +1098,7 @@ compare-makefile:
+ @echo
"******************************************************************************"
+ @echo "If the following step fails copy
$(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
+ @echo
"******************************************************************************"
+- FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h |
$(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
++ FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h |
$(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
+ MANS=""; \
+ for i in $$FUNCS; do \
+ MANS="$$MANS\nAPIMANS += $$i.3"; \
+--
+libgit2 0.21.4



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (138b2656dc13cc2e3eb0ae3fd27c325509a87a22), Ladislav Hagara, 04/22/2015

Archive powered by MHonArc 2.6.24.

Top of Page