haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

gnutls: bump to 3.4.14 + 3.5.2, drop lib*.la, add TEST(). (#628)

Browse Source 
* Bump to 3.4.14 (current stable) and add 3.5.2, marked untested.
* Move $binDir to a _bin sub-package, for more flexibility with
  regards to package co-installation. 3.4.x and 3.5.x seem to be
  causing problems for other recipes, so this layout change, with
  some other changes (e.g. package basename renames) can help.
* Update the layout of 2.8.x.
* Change the basename of the recipe of 3.4.x to gnutls34.
* Use gnutls35 as basename for the recipe of 3.5.x.
* Declare CONFLICTS, CONFLICTS_{bin,devel} in a way that allows
  gnutls-2.8.x to be installed with either gnutls-3.4.x or
  gnutls-3.5.x. On top of that, a single _bin package may be
  installed (provided the base package is also installed.) Same
  thing for _devel.
* Add cmd:cvs cmd:git to BUILD_PREREQUIRES in order to make
  gl/tests/test-vc-list-files-{cvs,git} succeed.
* Patch gl/tests/test-float.c to enable that test.
* Add cmd:{perl,makeinfo} to BUILD_PREREQUIRES.
This commit is contained in:
fbrosson
2016-07-26 00:51:00 +00:00
committed by waddlesplash
parent 374f646d4b
commit 73360c5a88
5 changed files with 507 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
net-libs/gnutls/patches/gnutls-3.4.14.patchset Normal file
View File

@@ -0,0 +1,131 @@
From 9ae7b7ca24f41d064b6020137e0aecf7e67c0893 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Tue, 7 Jun 2016 03:05:44 +0000
Subject: include sys/select.h
diff --git a/tests/mini-dtls-mtu.c b/tests/mini-dtls-mtu.c
index 6f52e33..4e8ee4d 100644
--- a/tests/mini-dtls-mtu.c
+++ b/tests/mini-dtls-mtu.c
@@ -24,6 +24,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+# include <sys/select.h>
+#endif
#include <stdint.h>
#include <string.h>
#include <errno.h>
diff --git a/tests/mini-dtls-pthread.c b/tests/mini-dtls-pthread.c
index 64cbba5..f447eab 100644
--- a/tests/mini-dtls-pthread.c
+++ b/tests/mini-dtls-pthread.c
@@ -26,6 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+# include <sys/select.h>
+#endif
#include <stdint.h>
#include <string.h>
#include <errno.h>
diff --git a/tests/mini-dtls-record-asym.c b/tests/mini-dtls-record-asym.c
index 9087dc5..0c72b5a 100644
--- a/tests/mini-dtls-record-asym.c
+++ b/tests/mini-dtls-record-asym.c
@@ -26,6 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+# include <sys/select.h>
+#endif
#include <stdint.h>
#include <string.h>
#include <errno.h>
diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c
index a13e9a1..4e86760 100644
--- a/tests/mini-record-failure.c
+++ b/tests/mini-record-failure.c
@@ -26,6 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+# include <sys/select.h>
+#endif
#if defined(_WIN32)
--
2.7.0
From b09109e729147a22a6be72dfc32a8e00151fdb27 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Tue, 7 Jun 2016 03:05:44 +0000
Subject: link mini-dtls-pthread without libpthread.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d546dde..e012ab4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -94,7 +94,7 @@ ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid \
mini-session-verify-function auto-verify mini-x509-default-prio \
global-init-override pcert-list keylog-env
-mini_dtls_pthread_LDADD = $(LDADD) -lpthread
+mini_dtls_pthread_LDADD = $(LDADD)
if ENABLE_PKCS11
if !WINDOWS
--
2.7.0
From aa560535eef19064c892a1051492576fdd54183c Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Wed, 15 Jun 2016 11:04:44 +0000
Subject: Do not skip the test-float test in gl/tests/.
diff --git a/gl/tests/test-float.c b/gl/tests/test-float.c
index 1c95b12..fbc2862 100644
--- a/gl/tests/test-float.c
+++ b/gl/tests/test-float.c
@@ -23,7 +23,7 @@
#include "fpucw.h"
#include "macros.h"
-#if 0
+#if 1
/* Check that FLT_RADIX is a constant expression. */
int a[] = { FLT_RADIX };
--
2.8.4
From b2826162157672e4b8ea7d0ceb03282e596734e1 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Wed, 6 Jul 2016 22:11:20 +0000
Subject: Use /bin/perl instead of /usr/bin/perl.
diff --git a/doc/scripts/split-texi.pl b/doc/scripts/split-texi.pl
index 34978d3..96b1067 100755
--- a/doc/scripts/split-texi.pl
+++ b/doc/scripts/split-texi.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/bin/perl
# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
--
2.9.0

131
net-libs/gnutls/patches/gnutls-3.5.2.patchset Normal file
View File

@@ -0,0 +1,131 @@
From 9ae7b7ca24f41d064b6020137e0aecf7e67c0893 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Tue, 7 Jun 2016 03:05:44 +0000
Subject: include sys/select.h
diff --git a/tests/mini-dtls-mtu.c b/tests/mini-dtls-mtu.c
index 6f52e33..4e8ee4d 100644
--- a/tests/mini-dtls-mtu.c
+++ b/tests/mini-dtls-mtu.c
@@ -24,6 +24,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+# include <sys/select.h>
+#endif
#include <stdint.h>
#include <string.h>
#include <errno.h>
diff --git a/tests/mini-dtls-pthread.c b/tests/mini-dtls-pthread.c
index 64cbba5..f447eab 100644
--- a/tests/mini-dtls-pthread.c
+++ b/tests/mini-dtls-pthread.c
@@ -26,6 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+# include <sys/select.h>
+#endif
#include <stdint.h>
#include <string.h>
#include <errno.h>
diff --git a/tests/mini-dtls-record-asym.c b/tests/mini-dtls-record-asym.c
index 9087dc5..0c72b5a 100644
--- a/tests/mini-dtls-record-asym.c
+++ b/tests/mini-dtls-record-asym.c
@@ -26,6 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+# include <sys/select.h>
+#endif
#include <stdint.h>
#include <string.h>
#include <errno.h>
diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c
index a13e9a1..4e86760 100644
--- a/tests/mini-record-failure.c
+++ b/tests/mini-record-failure.c
@@ -26,6 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+# include <sys/select.h>
+#endif
#if defined(_WIN32)
--
2.7.0
From b09109e729147a22a6be72dfc32a8e00151fdb27 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Tue, 7 Jun 2016 03:05:44 +0000
Subject: link mini-dtls-pthread without libpthread.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e1f365f..385deee 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -114,7 +114,7 @@ if HAVE_SECCOMP_TESTS
ctests += dtls-with-seccomp tls-with-seccomp dtls-client-with-seccomp tls-client-with-seccomp
endif
-mini_dtls_pthread_LDADD = $(LDADD) -lpthread
+mini_dtls_pthread_LDADD = $(LDADD)
resume_psk_CFLAGS = -DUSE_PSK
resume_psk_SOURCES = resume.c
--
2.7.0
From aa560535eef19064c892a1051492576fdd54183c Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Wed, 15 Jun 2016 11:04:44 +0000
Subject: Do not skip the test-float test in gl/tests/.
diff --git a/gl/tests/test-float.c b/gl/tests/test-float.c
index 1c95b12..fbc2862 100644
--- a/gl/tests/test-float.c
+++ b/gl/tests/test-float.c
@@ -23,7 +23,7 @@
#include "fpucw.h"
#include "macros.h"
-#if 0
+#if 1
/* Check that FLT_RADIX is a constant expression. */
int a[] = { FLT_RADIX };
--
2.8.4
From b2826162157672e4b8ea7d0ceb03282e596734e1 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Wed, 6 Jul 2016 22:11:20 +0000
Subject: Use /bin/perl instead of /usr/bin/perl.
diff --git a/doc/scripts/split-texi.pl b/doc/scripts/split-texi.pl
index 34978d3..96b1067 100755
--- a/doc/scripts/split-texi.pl
+++ b/doc/scripts/split-texi.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/bin/perl
# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
--
2.9.0