HBSD: Resolve merge conflicts

Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>

sysutils/monit/Makefile

@@ -12,12 +12,8 @@ COMMENT=	Unix system management and proactive monitoring
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-<<<<<<< HEAD
 USE_HARDENING=	safestack
 
-GNU_CONFIGURE=	yes
-=======
->>>>>>> upstream/master
 USES=		bison gmake
 USE_RC_SUBR=	${PORTNAME}
 

www/squid3/files/patch-src_ssl_gadgets.cc

-<<<<<<< HEAD
---- src/ssl/gadgets.cc.orig	2019-06-11 04:16:21 UTC
-+++ src/ssl/gadgets.cc
-@@ -321,12 +321,20 @@ mimicExtensions(Ssl::X509_Pointer & cert
-                                                 &ext_der,
-                                                 (const ASN1_ITEM *)ASN1_ITEM_ptr(method->it));
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-                     ASN1_OCTET_STRING *ext_oct = M_ASN1_OCTET_STRING_new();
-+#else
-+                    ASN1_OCTET_STRING *ext_oct = ASN1_OCTET_STRING_new();
-+#endif
-                     ext_oct->data = ext_der;
-                     ext_oct->length = ext_len;
-                     X509_EXTENSION_set_data(ext, ext_oct);
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-                     M_ASN1_OCTET_STRING_free(ext_oct);
-+#else
-+                    ASN1_OCTET_STRING_free(ext_oct);
-+#endif
-                     ASN1_BIT_STRING_free(keyusage);
-                 }
-             }
-=======
 --- src/ssl/gadgets.cc.orig	2018-07-15 20:46:55 UTC
 +++ src/ssl/gadgets.cc
 @@ -321,7 +321,7 @@ mimicExtensions(Ssl::X509_Pointer & cert, Ssl::X509_Po
@@ -34,4 +9,3 @@
                      ext_oct->data = ext_der;
                      ext_oct->length = ext_len;
                      X509_EXTENSION_set_data(ext, ext_oct);
->>>>>>> upstream/master

www/squid3/files/patch-src_ssl_support.cc

 --- src/ssl/support.cc.orig	2018-07-15 20:46:55 UTC
 +++ src/ssl/support.cc
-<<<<<<< HEAD
-@@ -2159,7 +2159,11 @@ remove_session_cb(SSL_CTX *, SSL_SESSION
-=======
 @@ -2159,7 +2159,11 @@ remove_session_cb(SSL_CTX *, SSL_SESSION *sessionID)
->>>>>>> upstream/master
  }
  
  static SSL_SESSION *
 -get_session_cb(SSL *, unsigned char *sessionID, int len, int *copy)
 +get_session_cb(SSL *,
-<<<<<<< HEAD
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20800000L
-+const
-+#endif
-+unsigned char *sessionID, int len, int *copy)
-=======
 +#ifdef LIBRESSL_VERSION_NUMBER
 +  const
 +#endif
 +  unsigned char *sessionID, int len, int *copy)
->>>>>>> upstream/master
  {
      if (!SslSessionCache)
          return NULL;