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

Drop uneeded patches, CFLAGS, chunks now that we have proper definitions

Browse Source 
for EPROTO and EBADMSG.
This commit is contained in:
ajacoutot 2017-11-09 16:50:39 +00:00
parent e4823104b4
commit 75cb90d918
16 changed files with 25 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mosquitto/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:28 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2017/11/09 16:50:39 ajacoutot Exp $
COMMENT = opensource MQTT broker
DISTNAME = mosquitto-1.4.11
REVISION = 1
REVISION = 2
SHARED_LIBS += mosquitto 0.0 # 1.4
SHARED_LIBS += mosquittopp 0.0 # 1.4

17
net/mosquitto/patches/patch-config_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-config_h,v 1.1 2017/03/28 17:02:01 jasper Exp $
OpenBSD doesn't define EPROTO (yet), so pick the closest thing.
--- config.h.orig Sat Mar 18 14:33:36 2017
+++ config.h Sat Mar 18 14:34:01 2017
@@ -16,6 +16,10 @@
# define EPROTO ECONNABORTED
#endif
+#if defined(__OpenBSD__)
+# define EPROTO EOPNOTSUPP
+#endif
+
#ifdef WIN32
# ifndef strcasecmp
# define strcasecmp strcmpi

11
net/mosquitto/patches/patch-test_lib_c_08-ssl-fake-cacert_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-test_lib_c_08-ssl-fake-cacert_c,v 1.1 2017/04/15 20:46:16 sthen Exp $
--- test/lib/c/08-ssl-fake-cacert.c.orig Fri Apr 14 15:15:51 2017
+++ test/lib/c/08-ssl-fake-cacert.c Fri Apr 14 15:16:34 2017
@@ -1,3 +1,7 @@
+#if defined(__OpenBSD__)
+# define EPROTO EOPNOTSUPP
+#endif
+
#include <errno.h>
#include <stdbool.h>
#include <stdio.h>

4
net/zeromq/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.25 2017/07/26 22:45:28 sthen Exp $
# $OpenBSD: Makefile,v 1.26 2017/11/09 16:50:39 ajacoutot Exp $
COMMENT = open source message queue optimised for performance
DISTNAME = zeromq-4.1.4
REVISION = 0
REVISION = 1
SHARED_LIBS += zmq 4.1 # 5.0

15
net/zeromq/patches/patch-src_ipc_listener_cpp
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_ipc_listener_cpp,v 1.3 2015/06/16 12:22:56 ajacoutot Exp $
OpenBSD doesn't define EPROTO (yet), so pick the closest thing.
--- src/ipc_listener.cpp.orig Tue Jun 2 22:41:21 2015
+++ src/ipc_listener.cpp Tue Jun 16 14:16:47 2015
@@ -288,7 +288,7 @@ zmq::fd_t zmq::ipc_listener_t::accept ()
fd_t sock = ::accept (s, NULL, NULL);
if (sock == -1) {
errno_assert (errno == EAGAIN || errno == EWOULDBLOCK ||
- errno == EINTR || errno == ECONNABORTED || errno == EPROTO ||
+ errno == EINTR || errno == ECONNABORTED || errno == EOPNOTSUPP ||
errno == ENFILE);
return retired_fd;
}

15
net/zeromq/patches/patch-src_tcp_listener_cpp
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_tcp_listener_cpp,v 1.3 2015/06/16 12:22:56 ajacoutot Exp $
OpenBSD doesn't define EPROTO (yet), so pick the closest thing.
--- src/tcp_listener.cpp.orig Tue Jun 2 22:41:22 2015
+++ src/tcp_listener.cpp Tue Jun 16 14:16:47 2015
@@ -291,7 +291,7 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
#else
if (sock == -1) {
errno_assert (errno == EAGAIN || errno == EWOULDBLOCK ||
- errno == EINTR || errno == ECONNABORTED || errno == EPROTO ||
+ errno == EINTR || errno == ECONNABORTED || errno == EOPNOTSUPP ||
errno == ENOBUFS || errno == ENOMEM || errno == EMFILE ||
errno == ENFILE);
return retired_fd;

6
security/libassuan/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2016/10/01 13:56:26 naddy Exp $
# $OpenBSD: Makefile,v 1.18 2017/11/09 16:50:39 ajacoutot Exp $
COMMENT= IPC library used by GnuPG and gpgme
DISTNAME= libassuan-2.4.3
REVISION= 0
REVISION= 1
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS += assuan 2.0 # 7.3
@ -23,6 +23,6 @@ LIB_DEPENDS= security/libgpg-error
CONFIGURE_STYLE=gnu
CFLAGS+= -fPIC -DEPROTO=ENOPROTOOPT
CFLAGS+= -fPIC
.include <bsd.port.mk>

4
security/libfprint/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.25 2017/10/23 17:11:02 sthen Exp $
# $OpenBSD: Makefile,v 1.26 2017/11/09 16:50:39 ajacoutot Exp $
COMMENT= library for fingerprint reader devices
DISTNAME= libfprint-0.4.0
REVISION= 9
REVISION= 10
CATEGORIES= security

13
security/libfprint/patches/patch-libfprint_fp_internal_h
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-libfprint_fp_internal_h,v 1.3 2012/02/22 09:30:20 dcoppa Exp $
--- libfprint/fp_internal.h.orig Fri Apr 8 16:35:37 2011
+++ libfprint/fp_internal.h Fri Nov 18 17:05:08 2011
@@ -93,6 +93,18 @@ enum fp_dev_state {
$OpenBSD: patch-libfprint_fp_internal_h,v 1.4 2017/11/09 16:50:39 ajacoutot Exp $
Index: libfprint/fp_internal.h
--- libfprint/fp_internal.h.orig
+++ libfprint/fp_internal.h
@@ -93,6 +93,14 @@ enum fp_dev_state {
struct fp_driver **fprint_get_drivers (void);
@ -9,10 +10,6 @@ $OpenBSD: patch-libfprint_fp_internal_h,v 1.3 2012/02/22 09:30:20 dcoppa Exp $
+#define ENODATA ENOENT
+#endif
+
+#if !defined(EPROTO) && defined(ENOPROTOOPT)
+#define EPROTO ENOPROTOOPT
+#endif
+
+#if !defined(ETIME) && defined(ETIMEDOUT)
+#define ETIME ETIMEDOUT
+#endif

5
sysutils/riemann-c-client/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2017/09/22 20:52:58 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2017/11/09 16:50:39 ajacoutot Exp $
COMMENT = c client library for the Riemann monitoring system
@ -7,7 +7,7 @@ GH_ACCOUNT = algernon
GH_PROJECT = riemann-c-client
GH_TAGNAME = riemann-c-client-${V}
DISTNAME = ${GH_PROJECT}-${V}
REVISION = 1
REVISION = 2
SHARED_LIBS += riemann-client 0.0 # 0.0
@ -36,7 +36,6 @@ CONFIGURE_STYLE = gnu
USE_GMAKE = Yes
CFLAGS+= -DEPROTO=ENOPROTOOPT
# needs riemann running
NO_TEST= Yes

3
sysutils/sshfs-fuse/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2015/09/25 07:17:57 landry Exp $
# $OpenBSD: Makefile,v 1.6 2017/11/09 16:50:39 ajacoutot Exp $
COMMENT = mount remote directories over ssh
DISTNAME = sshfs-fuse-2.5
CATEGORIES = sysutils
REVISION = 0
HOMEPAGE = http://fuse.sourceforge.net/sshfs.html
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fuse/}

11
sysutils/sshfs-fuse/patches/patch-sshfs_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 07:17:57 landry Exp $
$OpenBSD: patch-sshfs_c,v 1.4 2017/11/09 16:50:39 ajacoutot Exp $
--- sshfs.c.orig Wed Jan 8 16:34:52 2014
+++ sshfs.c Fri Sep 25 09:16:48 2015
@@ -11,7 +11,6 @@
@ -17,12 +17,3 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 07:17:57 landry Exp $
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <glib.h>
@@ -1552,7 +1552,7 @@ static int sftp_error_to_errno(uint32_t error)
case SSH_FX_NO_SUCH_FILE: return ENOENT;
case SSH_FX_PERMISSION_DENIED: return EACCES;
case SSH_FX_FAILURE: return EPERM;
- case SSH_FX_BAD_MESSAGE: return EBADMSG;
+ case SSH_FX_BAD_MESSAGE: return ENOMSG;
case SSH_FX_NO_CONNECTION: return ENOTCONN;
case SSH_FX_CONNECTION_LOST: return ECONNABORTED;
case SSH_FX_OP_UNSUPPORTED: return EOPNOTSUPP;

4
www/phantomjs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2017/10/23 17:11:03 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2017/11/09 16:50:39 ajacoutot Exp $
USE_WXNEEDED = Yes
@ -10,7 +10,7 @@ COMMENT = headless WebKit scriptable with a JavaScript API
MASTER_SITES= ${_MASTER_SITE_FREEBSD}
DISTNAME = phantomjs-2.1.1
REVISION = 3
REVISION = 4
DISTFILES = ariya-${DISTNAME}_GH0.tar.gz \
Vitallium-phantomjs-3rdparty-win-19051aa_GH0.tar.gz \
Vitallium-qtbase-b5cc008_GH0.tar.gz \

14
www/phantomjs/patches/patch-src_qt_qtbase_src_network_socket_qnativesocketengine_unix_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_qt_qtbase_src_network_socket_qnativesocketengine_unix_cpp,v 1.1 2017/07/05 11:54:22 sthen Exp $
$OpenBSD: patch-src_qt_qtbase_src_network_socket_qnativesocketengine_unix_cpp,v 1.2 2017/11/09 16:50:39 ajacoutot Exp $
Index: src/qt/qtbase/src/network/socket/qnativesocketengine_unix.cpp
--- src/qt/qtbase/src/network/socket/qnativesocketengine_unix.cpp.orig
@ -11,17 +11,7 @@ Index: src/qt/qtbase/src/network/socket/qnativesocketengine_unix.cpp
#ifndef QT_NO_IPV6IFNAME
#include <net/if.h>
#endif
@@ -589,7 +590,9 @@ int QNativeSocketEnginePrivate::nativeAccept()
setError(QAbstractSocket::SocketResourceError, NotSocketErrorString);
break;
case EPROTONOSUPPORT:
+#ifdef EPROTO
case EPROTO:
+#endif
case EAFNOSUPPORT:
case EINVAL:
setError(QAbstractSocket::UnsupportedSocketOperationError, ProtocolUnsupportedErrorString);
@@ -1150,48 +1153,31 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeo
@@ -1150,48 +1151,31 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeo
int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) const
{

4
x11/freerdp/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2017/02/01 11:43:23 sthen Exp $
# $OpenBSD: Makefile,v 1.29 2017/11/09 16:50:39 ajacoutot Exp $
BROKEN-arm = unrecognized option -mfpu=neon
# Also: __sync_fetch_and_add_4 __sync_add_and_fetch_4 __sync_sub_and_fetch_4
@ -7,7 +7,7 @@ BROKEN-hppa = undefined reference to __sync_val_compare_and_swap_4
COMMENT = open source client for Windows Terminal Server
DISTNAME = freerdp-1.2.0beta1
CATEGORIES = x11 net
REVISION = 1
REVISION = 2
GH_ACCOUNT = FreeRDP
GH_PROJECT = FreeRDP

15
x11/freerdp/patches/patch-winpr_libwinpr_winsock_winsock_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-winpr_libwinpr_winsock_winsock_c,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- winpr/libwinpr/winsock/winsock.c.orig Thu Oct 29 07:45:37 2015
+++ winpr/libwinpr/winsock/winsock.c Thu Oct 29 07:52:35 2015
@@ -435,9 +435,11 @@ int WSAGetLastError(void)
break;
#endif
+#ifdef EPROTO
case EPROTO:
iError = WSAECONNRESET;
break;
+#endif
}
/**