SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SecBSD's official ports repository

Browse source
This commit is contained in:
purplerain 2023-08-16 22:26:55 +00:00
commit 2c0afcbbf3
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
64331 changed files with 5339189 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
devel/commoncpp/patches/patch-config_h_in Normal file
View file

@ -0,0 +1,12 @@
--- config.h.in.orig Mon Sep 1 04:30:44 2008
+++ config.h.in Mon Sep 1 04:39:27 2008
@@ -251,6 +251,9 @@ typedef unsigned long long uint64;
/* Define to 1 if you have the `clock_gettime' function. */
#undef HAVE_CLOCK_GETTIME
+/* Define to 1 if you have the `clock_nanosleep' function. */
+#undef HAVE_CLOCK_NANOSLEEP
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H

24
devel/commoncpp/patches/patch-inc_cc++_string_h Normal file
View file

@ -0,0 +1,24 @@
--- inc/cc++/string.h.orig
+++ inc/cc++/string.h
@@ -74,6 +74,12 @@ class MemPager;
* @author David Sugar <dyfet@ostel.com>
* @short Generic string class.
*/
+
+/* can't put default value in friend */
+
+class String;
+__EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
+
class __EXPORT String
{
protected:
@@ -731,7 +737,7 @@ class __EXPORT String (public)
* @param delim deliminator to use.
* @param size optional size limitor.
*/
- friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
+ friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim, size_t size);
/**
* Stream the content of our string variable directly to a C++

11
devel/commoncpp/patches/patch-m4_ost_pthread_m4 Normal file
View file

@ -0,0 +1,11 @@
--- m4/ost_pthread.m4.orig Fri Jan 16 07:26:48 2009
+++ m4/ost_pthread.m4 Thu Apr 2 04:56:04 2009
@@ -244,6 +244,8 @@ CXXFLAGS="$ac_save_CXXFLAGS"
])
])
+ AC_CHECK_FUNCS(clock_nanosleep)
+
AC_CHECK_LIB(rt, mlockall,[
AC_DEFINE(HAVE_MLOCK, [1], [have mlock])
AC_DEFINE(HAVE_MLOCKALL, [1], [have memlockall])

11
devel/commoncpp/patches/patch-m4_ost_ssl_m4 Normal file
View file

@ -0,0 +1,11 @@
--- m4/ost_ssl.m4.orig Fri Jan 16 07:26:48 2009
+++ m4/ost_ssl.m4 Thu Apr 2 04:56:04 2009
@@ -41,7 +41,7 @@ AC_DEFUN([OST_LIB_SSL],[
# ])
# ],[
AC_CHECK_HEADER(openssl/ssl.h,[
- SSL_LIBS="-lssl"
+ SSL_LIBS="-lssl -lcrypto"
ost_cv_ssl=true
AC_DEFINE(CCXX_OPENSSL, [1], [define openssl])
AC_DEFINE(CCXX_SSL, [OPENSSL], [defines ssl])

20
devel/commoncpp/patches/patch-src_Makefile_in Normal file
View file

@ -0,0 +1,20 @@
--- src/Makefile.in.orig Fri Mar 6 14:41:13 2009
+++ src/Makefile.in Thu Apr 2 04:56:14 2009
@@ -330,7 +330,7 @@ aclocal_DATA = ost_check2.m4
scriptdir = $(bindir)
script_DATA = ccgnu2-config
libccgnu2_la_LIBADD = @THREAD_LIBS@ @DYN_LOADER@ @SSL_LIBS@
-libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+libccgnu2_la_LDFLAGS = $(LT_VERSION) $(SHARED_FLAGS)
noinst_DATA = @STAGE2@
libccgnu2_la_SOURCES = thread.cpp mutex.cpp semaphore.cpp threadkey.cpp \
friends.cpp event.cpp slog.cpp dir.cpp file.cpp inaddr.cpp \
@@ -341,7 +341,7 @@ libccgnu2_la_SOURCES = thread.cpp mutex.cpp semaphore.
cidr.cpp private.h nat.h
@EXTRAS_TRUE@libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@
-@EXTRAS_TRUE@libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+@EXTRAS_TRUE@libccext2_la_LDFLAGS = $(LT_VERSION) $(SHARED_FLAGS)
@EXTRAS_TRUE@@GETOPT_LONG_TRUE@optincludedir = $(includedir)/cc++2
@EXTRAS_TRUE@@GETOPT_LONG_TRUE@optinclude_HEADERS = getopt.h
@EXTRAS_TRUE@@GETOPT_LONG_FALSE@libccext2_la_SOURCES = numbers.cpp zstream.cpp socketport.cpp \

20
devel/commoncpp/patches/patch-src_cidr_cpp Normal file
View file

@ -0,0 +1,20 @@
--- src/cidr.cpp.orig
+++ src/cidr.cpp
@@ -202,7 +202,7 @@ void IPV4Cidr::set(const char *cp)
#if defined(_MSC_VER) && _MSC_VER >= 1500
ep = (char *)strchr(cp, '/');
#else
- ep = strchr(cp, '/');
+ ep = strchr(const_cast<char *>(cp), '/');
#endif
if(ep)
@@ -332,7 +332,7 @@ void IPV6Cidr::set(const char *cp)
memset(&netmask, 0, sizeof(netmask));
bitset((bit_t *)&netmask, getMask(cp));
setString(cbuf, sizeof(cbuf), cp);
- ep = strchr(cp, '/');
+ ep = strchr(const_cast<char *>(cp), '/');
if(ep)
*ep = 0;

11
devel/commoncpp/patches/patch-src_mempager_cpp Normal file
View file

@ -0,0 +1,11 @@
Index: src/mempager.cpp
--- src/mempager.cpp.orig
+++ src/mempager.cpp
@@ -36,6 +36,7 @@
// If you do not wish that, delete this exception notice.
//
+#include <cstdlib>
#include <cc++/config.h>
#include <cc++/export.h>
#include <cc++/slog.h>

29
devel/commoncpp/patches/patch-src_process_cpp Normal file
View file

@ -0,0 +1,29 @@
--- src/process.cpp.orig Fri Jan 16 07:27:00 2009
+++ src/process.cpp Sat Mar 24 10:15:59 2012
@@ -526,7 +526,7 @@ void Process::attach(const char *dev)
void Process::setScheduler(const char *pol)
{
-#ifdef _POSIX_PRIORITY_SCHEDULING
+#if defined(_POSIX_PRIORITY_SCHEDULING) && (_POSIX_PRIORITY_SCHEDULING > 0)
struct sched_param p;
int policy;
@@ -582,7 +582,7 @@ void Process::setScheduler(const char *pol)
void Process::setPriority(int pri)
{
-#ifdef _POSIX_PRIORITY_SCHEDULING
+#if defined(_POSIX_PRIORITY_SCHEDULING) && (_POSIX_PRIORITY_SCHEDULING > 0)
struct sched_param p;
int policy = sched_getscheduler(0);
int min = sched_get_priority_min(policy);
@@ -607,7 +607,7 @@ void Process::setPriority(int pri)
bool Process::isScheduler(void)
{
-#ifdef _POSIX_PRIORITY_SCHEDULING
+#if defined(_POSIX_PRIORITY_SCHEDULING) && (_POSIX_PRIORITY_SCHEDULING > 0)
return true;
#else
return false;

145
devel/commoncpp/patches/patch-src_socket_cpp Normal file
View file

@ -0,0 +1,145 @@
- warning: switch condition has boolean value
- properly namespace bind
Index: src/socket.cpp
--- src/socket.cpp.orig
+++ src/socket.cpp
@@ -880,16 +880,12 @@ void Socket::setCompletion(bool immediate)
#else
int fflags = fcntl(so, F_GETFL);
- switch( immediate ) {
- case false:
- fflags |= O_NONBLOCK;
- fcntl(so, F_SETFL, fflags);
- break;
- case true:
+ if ( immediate )
fflags &=~ O_NONBLOCK;
- fcntl(so, F_SETFL, fflags);
- break;
- }
+ else
+ fflags |= O_NONBLOCK;
+
+ fcntl(so, F_SETFL, fflags);
#endif
}
@@ -1283,7 +1279,7 @@ Socket(fam, SOCK_DGRAM, IPPROTO_UDP)
first = list;
while(list) {
- if(!bind(so, list->ai_addr, (socklen_t)list->ai_addrlen)) {
+ if(!::bind(so, list->ai_addr, (socklen_t)list->ai_addrlen)) {
state = BOUND;
break;
}
@@ -1375,7 +1371,7 @@ Socket(fam, SOCK_DGRAM, IPPROTO_UDP)
(socklen_t)sizeof(opt));
#endif
- if(!bind(so, addr, alen))
+ if(!::bind(so, addr, alen))
state = BOUND;
if(state != BOUND) {
@@ -1415,7 +1411,7 @@ Socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)
int opt = 1;
setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, (socklen_t)sizeof(opt));
#endif
- if(bind(so, (struct sockaddr *)&peer.ipv4, sizeof(peer.ipv4))) {
+ if(::bind(so, (struct sockaddr *)&peer.ipv4, sizeof(peer.ipv4))) {
endSocket();
error(errBindingFailed,(char *)"Could not bind socket",socket_errno);
return;
@@ -1436,7 +1432,7 @@ Socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP)
int opt = 1;
setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, (socklen_t)sizeof(opt));
#endif
- if(bind(so, (struct sockaddr *)&peer.ipv6, sizeof(peer.ipv6))) {
+ if(::bind(so, (struct sockaddr *)&peer.ipv6, sizeof(peer.ipv6))) {
endSocket();
error(errBindingFailed,(char *)"Could not bind socket",socket_errno);
return;
@@ -1921,7 +1917,7 @@ Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)
first = list;
while(list) {
- if(!bind(so, list->ai_addr, (socklen_t)list->ai_addrlen)) {
+ if(!::bind(so, list->ai_addr, (socklen_t)list->ai_addrlen)) {
state = BOUND;
break;
}
@@ -2023,7 +2019,7 @@ Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)
int opt = 1;
setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, (socklen_t)sizeof(opt));
#endif
- if(bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
+ if(::bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
endSocket();
error(errBindingFailed,(char *)"Could not bind socket",socket_errno);
return;
@@ -2102,7 +2098,7 @@ Socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP)
first = list;
while(list) {
- if(!bind(so, list->ai_addr, (socklen_t)list->ai_addrlen)) {
+ if(!::bind(so, list->ai_addr, (socklen_t)list->ai_addrlen)) {
state = BOUND;
break;
}
@@ -2171,7 +2167,7 @@ Socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP)
(socklen_t)sizeof(opt));
#endif
- if(bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
+ if(::bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
endSocket();
error(errBindingFailed,(char *)"Could not bind socket",socket_errno);
return;
@@ -2204,7 +2200,7 @@ Socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP)
int opt = 1;
setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, (socklen_t)sizeof(opt));
#endif
- if(bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
+ if(::bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
endSocket();
error(errBindingFailed,(char *)"Could not bind socket",socket_errno);
return;
@@ -2328,7 +2324,7 @@ Socket(fam, SOCK_DCCP, IPPROTO_DCCP)
first = list;
while(list) {
- if(!bind(so, list->ai_addr, (socklen_t)list->ai_addrlen)) {
+ if(!::bind(so, list->ai_addr, (socklen_t)list->ai_addrlen)) {
state = BOUND;
break;
}
@@ -2417,7 +2413,7 @@ Socket(fam, SOCK_DCCP, IPPROTO_DCCP)
alen = sizeof(addr);
}
- if(bind(so, (struct sockaddr *)ap, alen)) {
+ if(::bind(so, (struct sockaddr *)ap, alen)) {
endSocket();
error(errBindingFailed,(char *)"Could not bind socket",socket_errno);
return;
@@ -2451,7 +2447,7 @@ Socket(AF_INET, SOCK_DCCP, IPPROTO_DCCP)
int opt = 1;
setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, (socklen_t)sizeof(opt));
#endif
- if(bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
+ if(::bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
endSocket();
error(errBindingFailed,(char *)"Could not bind socket",socket_errno);
return;
@@ -2484,7 +2480,7 @@ Socket(AF_INET6, SOCK_DCCP, IPPROTO_DCCP)
int opt = 1;
setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, (socklen_t)sizeof(opt));
#endif
- if(bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
+ if(::bind(so, (struct sockaddr *)&addr, sizeof(addr))) {
endSocket();
error(errBindingFailed,(char *)"Could not bind socket",socket_errno);
return;

11
devel/commoncpp/patches/patch-src_ssl_cpp Normal file
View file

@ -0,0 +1,11 @@
--- src/ssl.cpp.orig Fri Jan 16 05:27:00 2009
+++ src/ssl.cpp Sat Jul 18 12:12:03 2015
@@ -386,7 +386,7 @@ bool SSLStream::getSession(void)
if(so == INVALID_SOCKET)
return false;
- ctx = SSL_CTX_new(SSLv3_client_method());
+ ctx = SSL_CTX_new(SSLv23_client_method());
if(!ctx) {
SSL_CTX_free(ctx);
return false;

32
devel/commoncpp/patches/patch-src_thread_cpp Normal file
View file

@ -0,0 +1,32 @@
--- src/thread.cpp.orig Fri Jan 16 07:27:00 2009
+++ src/thread.cpp Tue May 15 21:52:18 2012
@@ -632,10 +632,7 @@ _cancel(cancelDefault), _start(NULL), priv(new ThreadI
}
#endif
-#ifndef __FreeBSD__
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-#ifdef HAVE_SCHED_GETSCHEDULER
-#define __HAS_PRIORITY_SCHEDULING__
+#if defined(HAVE_SCHED_GETSCHEDULER) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0)
if(pri < 0 && Process::isRealtime())
pri = 0;
@@ -676,16 +673,10 @@ _cancel(cancelDefault), _start(NULL), priv(new ThreadI
pthread_attr_setschedpolicy(&priv->_attr, policy);
pthread_attr_setschedparam(&priv->_attr, &sched);
}
-#endif // ifdef HAVE_SCHED_GETSCHEDULER
-#endif // ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-#endif // ifndef __FreeBSD__
-#ifdef __HAS_PRIORITY_SCHEDULING__
if(!pri)
pthread_attr_setinheritsched(&priv->_attr, PTHREAD_INHERIT_SCHED);
-#else
- pthread_attr_setinheritsched(&priv->_attr, PTHREAD_INHERIT_SCHED);
-#endif
+#endif // ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
_parent = getThread();
priv->_throw = _parent->priv->_throw;

11
devel/commoncpp/patches/patch-src_timer_cpp Normal file
View file

@ -0,0 +1,11 @@
--- src/timer.cpp.orig Fri Jan 16 07:27:00 2009
+++ src/timer.cpp Thu Apr 2 04:56:04 2009
@@ -118,7 +118,7 @@ void TimerPort::decTimer(timeout_t timeout)
active = true;
}
-#ifdef HAVE_HIRES_TIMER
+#if defined(HAVE_HIRES_TIMER) && defined(HAVE_CLOCK_NANOSLEEP)
void TimerPort::sleepTimer(void)
{
struct timespec ts;

14
devel/commoncpp/patches/patch-src_unix_cpp Normal file
View file

@ -0,0 +1,14 @@
properly namespace bind
Index: src/unix.cpp
--- src/unix.cpp.orig
+++ src/unix.cpp
@@ -86,7 +86,7 @@ UnixSocket::UnixSocket(const char* pathname, int backl
len = strlen(addr.sun_path) + sizeof(addr.sun_family) + 1;
#endif
remove(pathname);
- if(bind(so, (struct sockaddr *)&addr, len)) {
+ if(::bind(so, (struct sockaddr *)&addr, len)) {
endSocket();
error(errBindingFailed);
return;