cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make knot successfully build with our libtool & make.

Browse Source 
The patches are needed to avoid putting two different symbols with
same name (net_send). More correct way will be to rename function
in libknotd, of course, but this is more invasive.

okay jca@ (MAINTAINER)
This commit is contained in:
zhuk 2017-07-23 12:39:37 +00:00
parent 8e37ba06e0
commit 504d1be108
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/knot/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2017/06/29 17:10:06 jca Exp $
# $OpenBSD: Makefile,v 1.18 2017/07/23 12:39:37 zhuk Exp $
COMMENT = authoritative DNS server
DISTNAME = knot-2.4.5
REVISION = 0
SHARED_LIBS += zscanner 1.0 # .1.0
SHARED_LIBS += knot 1.1 # .5.0
@ -36,8 +37,6 @@ LIB_DEPENDS = devel/gettext \
devel/jansson \
security/gnutls
USE_GMAKE = Yes
USE_LIBTOOL= gnu
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-storage=${LOCALSTATEDIR}/db/knot \
--with-libidn \

14
net/knot/patches/patch-src_contrib_net_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_contrib_net_c,v 1.1 2017/07/23 12:39:37 zhuk Exp $
make net_send static, avoids conflict with net_send in libknot.
Index: src/contrib/net.c
--- src/contrib/net.c.orig
+++ src/contrib/net.c
@@ -467,6 +467,7 @@ static ssize_t send_data(int sock, struct msghdr *msg,
/* -- generic stream and datagram I/O -------------------------------------- */
+static
ssize_t net_send(int sock, const uint8_t *buffer, size_t size,
const struct sockaddr *addr, int timeout_ms)
{

22
net/knot/patches/patch-src_contrib_net_h Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_contrib_net_h,v 1.1 2017/07/23 12:39:37 zhuk Exp $
make net_send static, avoids conflict with net_send in libknot.
Index: src/contrib/net.h
--- src/contrib/net.h.orig
+++ src/contrib/net.h
@@ -100,6 +100,7 @@ bool net_is_stream(int sock);
*/
int net_accept(int sock, struct sockaddr_storage *addr);
+#if 0
/*!
* \brief Send a message on a socket.
*
@@ -118,6 +119,7 @@ int net_accept(int sock, struct sockaddr_storage *addr
*/
ssize_t net_send(int sock, const uint8_t *buffer, size_t size,
const struct sockaddr *addr, int timeout_ms);
+#endif
/*!
* \brief Receive a message from a socket.