Attachment #168575 for bug #207768

Lines 3-9 Link Here

(-)audio/ario/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= ario	4	PORTNAME= ario
5	PORTVERSION= 1.5.1	5	PORTVERSION= 1.5.1
6	PORTREVISION= 10	6	PORTREVISION= 11
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= SF/ario-player/ario-player/${PORTVERSION}	8	MASTER_SITES= SF/ario-player/ario-player/${PORTVERSION}
9		9

Lines 3-9 Link Here

(-)audio/pianobar/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= pianobar	4	PORTNAME= pianobar
5	PORTVERSION= 2015.11.22	5	PORTVERSION= 2015.11.22
6	PORTREVISION= 0	6	PORTREVISION= 1
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= http://6xq.net/projects/${PORTNAME}/	8	MASTER_SITES= http://6xq.net/projects/${PORTNAME}/
9		9

Lines 3-8 Link Here

(-)audio/tomahawk/Makefile (+1 lines)
3		3
4	PORTNAME= tomahawk	4	PORTNAME= tomahawk
5	PORTVERSION= 0.8.4	5	PORTVERSION= 0.8.4
		6	PORTREVISION= 1
6	CATEGORIES= audio	7	CATEGORIES= audio
7		8
8	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org

Lines 3-9 Link Here

(-)benchmarks/postal/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= postal	4	PORTNAME= postal
5	PORTVERSION= 0.73	5	PORTVERSION= 0.73
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= benchmarks mail	7	CATEGORIES= benchmarks mail
8	MASTER_SITES= http://www.coker.com.au/postal/	8	MASTER_SITES= http://www.coker.com.au/postal/
9		9

Lines 3-8 Link Here

(-)databases/freetds/Makefile (+1 lines)
3		3
4	PORTNAME= freetds	4	PORTNAME= freetds
5	PORTVERSION= 0.95.87	5	PORTVERSION= 0.95.87
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= databases	8	CATEGORIES= databases
8	MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/	9	MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/

Lines 3-8 Link Here

(-)databases/freetds-devel/Makefile (+1 lines)
3		3
4	PORTNAME= freetds	4	PORTNAME= freetds
5	PORTVERSION= 0.99.614	5	PORTVERSION= 0.99.614
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= databases	8	CATEGORIES= databases
8	MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/current/	9	MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/current/

Lines 3-9 Link Here

(-)databases/glom/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= glom	4	PORTNAME= glom
5	PORTVERSION= 1.28.0	5	PORTVERSION= 1.28.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= databases gnome	7	CATEGORIES= databases gnome
8	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3

Lines 3-9 Link Here

(-)deskutils/fusenshi/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= fusenshi	4	PORTNAME= fusenshi
5	PORTVERSION= 0.9.0	5	PORTVERSION= 0.9.0
6	PORTREVISION= 13	6	PORTREVISION= 14
7	CATEGORIES= deskutils	7	CATEGORIES= deskutils
8	MASTER_SITES= http://www.ongs.co.jp/projects/fusenshi/	8	MASTER_SITES= http://www.ongs.co.jp/projects/fusenshi/
9		9




--- src/net/fusenshisslclientsocket.cpp.orig	2007-04-02 10:44:52 UTC
+++ src/net/fusenshisslclientsocket.cpp
@@ -52,9 +52,6 @@ bool FusenshiSSLClientSocket::connect(un
 {
     // ÄÌ¿®¤ò°Å¹æ²½¤·¤Þ¤¹¤¬¡¢¥Û¥¹¥È¤Î¾ÚÌÀ¤Ï¹Ô¤¤¤Þ¤»¤ó¡£
     int ret;
-	const int cert_priority[] = {
-		GNUTLS_CRT_X509, 0
-	};
 
     if (NULL != m_session) close();
     
@@ -64,7 +61,6 @@ bool FusenshiSSLClientSocket::connect(un
         
 		gnutls_init(&m_session, GNUTLS_CLIENT);
 		gnutls_set_default_priority(m_session);
-		gnutls_certificate_type_set_priority(m_session, cert_priority);
 
 		gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, cert);
 		




--- src/net/fusenshisslserversocket.cpp.orig	2007-04-02 10:44:52 UTC
+++ src/net/fusenshisslserversocket.cpp
@@ -56,9 +56,6 @@ public:
     bool sslAccept(int sock)
     {
     	int ret;
-		const int cert_priority[] = {
-			GNUTLS_CRT_X509, 0
-		};
 
         m_socket = sock;
 
@@ -69,8 +66,7 @@ public:
         if (!cert) return false;
 
 		gnutls_init(&m_session, GNUTLS_SERVER);
-		gnutls_set_default_export_priority(m_session);
-		gnutls_certificate_type_set_priority(m_session, cert_priority);
+		gnutls_set_default_priority(m_session);
 
 		gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, cert);
 		gnutls_certificate_server_set_request(m_session, GNUTLS_CERT_REQUIRE);

Lines 3-9 Link Here

(-)deskutils/taskd/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= taskd	4	PORTNAME= taskd
5	PORTVERSION= 1.1.0	5	PORTVERSION= 1.1.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= deskutils	7	CATEGORIES= deskutils
8	MASTER_SITES= http://taskwarrior.org/download/	8	MASTER_SITES= http://taskwarrior.org/download/
9		9

Lines 3-8 Link Here

(-)deskutils/taskwarrior/Makefile (+1 lines)
3		3
4	PORTNAME= taskwarrior	4	PORTNAME= taskwarrior
5	PORTVERSION= 2.5.0	5	PORTVERSION= 2.5.0
		6	PORTREVISION= 1
6	CATEGORIES= deskutils	7	CATEGORIES= deskutils
7	DISTNAME= task-${PORTVERSION}	8	DISTNAME= task-${PORTVERSION}
8		9

Lines 3-8 Link Here

(-)devel/anjuta/Makefile (+1 lines)
3		3
4	PORTNAME= anjuta	4	PORTNAME= anjuta
5	PORTVERSION= 3.18.2	5	PORTVERSION= 3.18.2
		6	PORTREVISION= 1
6	CATEGORIES= devel gnome	7	CATEGORIES= devel gnome
7	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
8	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3

Lines 3-8 Link Here

(-)devel/gsoap/Makefile (+1 lines)
3		3
4	PORTNAME= gsoap	4	PORTNAME= gsoap
5	PORTVERSION= 2.8.27	5	PORTVERSION= 2.8.27
		6	PORTREVISION= 1
6	CATEGORIES= devel	7	CATEGORIES= devel
7	MASTER_SITES= SF/${PORTNAME}2/gSOAP	8	MASTER_SITES= SF/${PORTNAME}2/gSOAP
8	DISTNAME= ${PORTNAME}_${PORTVERSION}	9	DISTNAME= ${PORTNAME}_${PORTVERSION}

Lines 2-8 Link Here

(-)devel/gwenhywfar/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= gwenhywfar	3	PORTNAME= gwenhywfar
4	PORTVERSION= 4.14.0	4	PORTVERSION= 4.14.0
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	CATEGORIES= devel net security	6	CATEGORIES= devel net security
7	MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=01&file=01&dummy=/	7	MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=01&file=01&dummy=/
8		8




--- src/sio/syncio_tls.c.orig	2014-10-12 13:12:22 UTC
+++ src/sio/syncio_tls.c
@@ -361,12 +361,10 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO 
 
   /* possibly force protocol priority */
   if (lflags & GWEN_SYNCIO_TLS_FLAGS_FORCE_SSL_V3) {
-    const int proto_prio[2] = { GNUTLS_SSL3, 0 };
-
     DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3");
-    rv=gnutls_protocol_set_priority(xio->session, proto_prio);
+    rv=gnutls_priority_set_direct(xio->session, "NORMAL:-VERS-TLS-ALL:+VERS-SSL3.0", NULL);
     if (rv) {
-      DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv));
+      DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_priority_set_direct: %d (%s)", rv, gnutls_strerror(rv));
       gnutls_deinit(xio->session);
       return GWEN_ERROR_GENERIC;
     }

Lines 3-8 Link Here

(-)devel/hs-git-annex/Makefile (+1 lines)
3		3
4	PORTNAME= git-annex	4	PORTNAME= git-annex
5	PORTVERSION= 5.20150727	5	PORTVERSION= 5.20150727
		6	PORTREVISION= 1
6	CATEGORIES= devel haskell	7	CATEGORIES= devel haskell
7		8
8	MAINTAINER= haskell@FreeBSD.org	9	MAINTAINER= haskell@FreeBSD.org

Lines 3-8 Link Here

(-)devel/librelp/Makefile (+1 lines)
3		3
4	PORTNAME= librelp	4	PORTNAME= librelp
5	PORTVERSION= 1.2.9	5	PORTVERSION= 1.2.9
		6	PORTREVISION= 1
6	CATEGORIES= devel	7	CATEGORIES= devel
7	MASTER_SITES= http://download.rsyslog.com/librelp/	8	MASTER_SITES= http://download.rsyslog.com/librelp/
8		9

Lines 3-8 Link Here

(-)devel/libvirt/Makefile (+1 lines)
3		3
4	PORTNAME= libvirt	4	PORTNAME= libvirt
5	PORTVERSION= 1.3.2	5	PORTVERSION= 1.3.2
		6	PORTREVISION= 1
6	CATEGORIES= devel	7	CATEGORIES= devel
7	MASTER_SITES= http://libvirt.org/sources/ \	8	MASTER_SITES= http://libvirt.org/sources/ \
8	ftp://libvirt.org/libvirt/	9	ftp://libvirt.org/libvirt/

Lines 3-8 Link Here

(-)dns/knot2/Makefile (+1 lines)
3		3
4	PORTNAME= knot	4	PORTNAME= knot
5	DISTVERSION= 2.1.1	5	DISTVERSION= 2.1.1
		6	PORTREVISION= 1
6	CATEGORIES= dns ipv6	7	CATEGORIES= dns ipv6
7	MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \	8	MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \
8	http://dns-lab.com/downloads/knot-dns/	9	http://dns-lab.com/downloads/knot-dns/

Lines 3-9 Link Here

(-)editors/abiword/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= abiword	4	PORTNAME= abiword
5	PORTVERSION= 3.0.1	5	PORTVERSION= 3.0.1
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= editors	7	CATEGORIES= editors
8	MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/	8	MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
9	DIST_SUBDIR= AbiWord	9	DIST_SUBDIR= AbiWord




--- plugins/collab/backends/service/xp/tls_tunnel.cpp.orig	2014-11-04 01:12:14 UTC
+++ plugins/collab/backends/service/xp/tls_tunnel.cpp
@@ -306,8 +306,6 @@ void Proxy::tunnel_(transport_ptr_t tran
 	disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr);		
 }
 
-static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
-static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 };
 
 // FIXME: this clientproxy can only handle 1 SSL connection at the same time
 ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, 
@@ -399,9 +397,9 @@ session_ptr_t ClientProxy::setup_tls_ses
 
 	// setup session
 	return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t());
-	return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t());
-	return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t());
-	return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t());
+	return_val_if_neg(gnutls_priority_set_direct(*session_ptr,"NORMAL"
+		":-CIPHER-ALL:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:+ARCFOUR-128"
+		":-KX-ALL:+ANON-DH:+RSA:+DHE-DSS:+DHE-RSA",NULL), session_ptr_t());
 	return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t());
 
 	// setup transport

Lines 3-9 Link Here

(-)editors/emacs/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= emacs	4	PORTNAME= emacs
5	PORTVERSION= ${EMACS_VER}	5	PORTVERSION= ${EMACS_VER}
6	PORTREVISION= 2	6	PORTREVISION= 3
7	PORTEPOCH= 3	7	PORTEPOCH= 3
8	CATEGORIES= editors ipv6	8	CATEGORIES= editors ipv6
9	MASTER_SITES= GNU	9	MASTER_SITES= GNU

Lines 3-8 Link Here

(-)editors/emacs-devel/Makefile (+1 lines)
3		3
4	PORTNAME= emacs	4	PORTNAME= emacs
5	PORTVERSION= ${EMACS_VER}	5	PORTVERSION= ${EMACS_VER}
		6	PORTREVISION= 1
6	PORTEPOCH= 2	7	PORTEPOCH= 2
7	CATEGORIES= editors ipv6	8	CATEGORIES= editors ipv6
8	MASTER_SITES= GNU_ALPHA/emacs/pretest	9	MASTER_SITES= GNU_ALPHA/emacs/pretest

Lines 4-9 Link Here

(-)editors/vanubi/Makefile (+1 lines)
4	PORTNAME= vanubi	4	PORTNAME= vanubi
5	PORTVERSION= 0.0.16	5	PORTVERSION= 0.0.16
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
		7	PORTREVISION= 1
7	CATEGORIES= editors	8	CATEGORIES= editors
8		9
9	MAINTAINER= olivierd@FreeBSD.org	10	MAINTAINER= olivierd@FreeBSD.org

Lines 3-8 Link Here

(-)emulators/qemu/Makefile (+1 lines)
3		3
4	PORTNAME= qemu	4	PORTNAME= qemu
5	PORTVERSION= 2.4.1	5	PORTVERSION= 2.4.1
		6	PORTREVISION= 1
6	CATEGORIES= emulators	7	CATEGORIES= emulators
7	MASTER_SITES= http://wiki.qemu.org/download/	8	MASTER_SITES= http://wiki.qemu.org/download/
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}

Lines 3-9 Link Here

(-)emulators/qemu-devel/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= qemu	4	PORTNAME= qemu
5	DISTVERSION= 2.5.0	5	DISTVERSION= 2.5.0
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= http://wiki.qemu.org/download/	8	MASTER_SITES= http://wiki.qemu.org/download/
9	PKGNAMESUFFIX= -devel	9	PKGNAMESUFFIX= -devel

Lines 3-9 Link Here

(-)emulators/qemu-sbruno/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= qemu	4	PORTNAME= qemu
5	PORTVERSION= 2.5.50.g20160215	5	PORTVERSION= 2.5.50.g20160215
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= GH \	8	MASTER_SITES= GH \
9	LOCAL/nox:dtc \	9	LOCAL/nox:dtc \

Lines 3-9 Link Here

(-)emulators/wine/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= wine	4	PORTNAME= wine
5	DISTVERSION= 1.8.1	5	DISTVERSION= 1.8.1
6	PORTREVISION= 2	6	PORTREVISION= 3
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= emulators	8	CATEGORIES= emulators
9	MASTER_SITES= SF/${PORTNAME}/Source \	9	MASTER_SITES= SF/${PORTNAME}/Source \

Lines 3-8 Link Here

(-)emulators/wine-devel/Makefile (+1 lines)
3		3
4	PORTNAME= wine	4	PORTNAME= wine
5	DISTVERSION= 1.9.6	5	DISTVERSION= 1.9.6
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= emulators	8	CATEGORIES= emulators
8	MASTER_SITES= SF/${PORTNAME}/Source \	9	MASTER_SITES= SF/${PORTNAME}/Source \

Lines 3-8 Link Here

(-)ftp/curl/Makefile (+1 lines)
3		3
4	PORTNAME= curl	4	PORTNAME= curl
5	PORTVERSION= 7.48.0	5	PORTVERSION= 7.48.0
		6	PORTREVISION= 1
6	CATEGORIES= ftp www	7	CATEGORIES= ftp www
7	MASTER_SITES= http://curl.haxx.se/download/ \	8	MASTER_SITES= http://curl.haxx.se/download/ \
8	LOCAL/sunpoet	9	LOCAL/sunpoet

Lines 2-7 Link Here

(-)ftp/filezilla/Makefile (+1 lines)
2		2
3	PORTNAME= filezilla	3	PORTNAME= filezilla
4	PORTVERSION= 3.16.0	4	PORTVERSION= 3.16.0
		5	PORTREVISION= 1
5	CATEGORIES= ftp	6	CATEGORIES= ftp
6	MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
7	DISTNAME= FileZilla_${PORTVERSION}_src	8	DISTNAME= FileZilla_${PORTVERSION}_src

Lines 3-8 Link Here

(-)ftp/lftp/Makefile (+1 lines)
3		3
4	PORTNAME= lftp	4	PORTNAME= lftp
5	PORTVERSION= 4.6.5	5	PORTVERSION= 4.6.5
		6	PORTREVISION= 1
6	CATEGORIES= ftp ipv6	7	CATEGORIES= ftp ipv6
7	MASTER_SITES= http://lftp.yar.ru/ftp/ \	8	MASTER_SITES= http://lftp.yar.ru/ftp/ \
8	http://lftp.yar.ru/ftp/old/ \	9	http://lftp.yar.ru/ftp/old/ \

Lines 3-8 Link Here

(-)ftp/wget/Makefile (+1 lines)
3		3
4	PORTNAME= wget	4	PORTNAME= wget
5	DISTVERSION= 1.16.3	5	DISTVERSION= 1.16.3
		6	PORTREVISION= 1
6	CATEGORIES= ftp www ipv6	7	CATEGORIES= ftp www ipv6
7	MASTER_SITES= GNU	8	MASTER_SITES= GNU
8		9

Lines 3-9 Link Here

(-)ftp/wput/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= wput	4	PORTNAME= wput
5	PORTVERSION= 0.6.2	5	PORTVERSION= 0.6.2
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= ftp	7	CATEGORIES= ftp
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9

Lines 3-9 Link Here

(-)ftp/wzdftpd/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= wzdftpd	4	PORTNAME= wzdftpd
5	PORTVERSION= 0.8.3	5	PORTVERSION= 0.8.3
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= ftp ipv6	7	CATEGORIES= ftp ipv6
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R}
9		9




--- libwzd-core/wzd_tls.c.orig	2007-10-25 17:25:33 UTC
+++ libwzd-core/wzd_tls.c
@@ -946,19 +946,13 @@ int tls_exit(void)
 
 static gnutls_session initialize_tls_session(gnutls_connection_end con_end)
 {
-  /* Allow connections to servers that have OpenPGP keys as well.
-   */
-  const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
-
   gnutls_session session;
 
   gnutls_init(&session, con_end);
 
-  /* avoid calling all the priority functions, since the defaults
-   * are adequate.
+  /* Allow connections to servers that have OpenPGP keys as well.
    */
-  gnutls_set_default_priority(session);
-  gnutls_certificate_type_set_priority(session, cert_type_priority);
+  gnutls_priority_set_direct(session, "NORMAL:+CTYPE-OPENPGP", NULL);
 
   gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
@@ -1001,27 +995,6 @@ int tls_auth (const char *type, wzd_cont
   }
 
   /** \todo XXX parse TLS cipher names */
-  {
-    /** Note that the priority is set on the client. The server does not use
-     * the algorithm's priority except for disabling algorithms that were not
-     * specified.
-     */
-    const int cipherPriority[] =
-    {
-      GNUTLS_CIPHER_ARCFOUR_128,
-      GNUTLS_CIPHER_3DES_CBC,
-      GNUTLS_CIPHER_AES_128_CBC,
-      GNUTLS_CIPHER_AES_256_CBC,
-      GNUTLS_CIPHER_ARCFOUR_40,
-#if ( (LIBGNUTLS_VERSION_MAJOR > 1) || (LIBGNUTLS_VERSION_MINOR >= 3) )
-      GNUTLS_CIPHER_RC2_40_CBC,
-      GNUTLS_CIPHER_DES_CBC,
-#endif
-      0
-    };
-
-    gnutls_cipher_set_priority(session, cipherPriority);
-  }
 
   /* ensure socket is non-blocking */
 #if defined(_MSC_VER) || (defined(__CYGWIN__) && defined(WINSOCK_SUPPORT))

Lines 3-9 Link Here

(-)games/libggz/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libggz	4	PORTNAME= libggz
5	PORTVERSION= ${GGZ_VERSION}	5	PORTVERSION= ${GGZ_VERSION}
6	PORTREVISION= 16	6	PORTREVISION= 17
7	CATEGORIES= games	7	CATEGORIES= games
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org

Lines 3-9 Link Here

(-)games/macopix/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= macopix	4	PORTNAME= macopix
5	PORTVERSION= 1.7.4	5	PORTVERSION= 1.7.4
6	PORTREVISION= 10	6	PORTREVISION= 11
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/	8	MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/
9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}	9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}

Lines 3-9 Link Here

(-)games/pokerth/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= pokerth	4	PORTNAME= pokerth
5	PORTVERSION= 1.1.1	5	PORTVERSION= 1.1.1
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1
9	DISTNAME= PokerTH-${PORTVERSION}-src	9	DISTNAME= PokerTH-${PORTVERSION}-src

Lines 3-8 Link Here

(-)graphics/gnome-color-manager/Makefile (+1 lines)
3		3
4	PORTNAME= gnome-color-manager	4	PORTNAME= gnome-color-manager
5	PORTVERSION= 3.18.0	5	PORTVERSION= 3.18.0
		6	PORTREVISION= 1
6	CATEGORIES= graphics gnome	7	CATEGORIES= graphics gnome
7	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
8	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3

Lines 3-9 Link Here

(-)irc/anope/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= anope	4	PORTNAME= anope
5	PORTVERSION= 2.0.2	5	PORTVERSION= 2.0.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= irc	7	CATEGORIES= irc
8		8
9	MAINTAINER= feld@FreeBSD.org	9	MAINTAINER= feld@FreeBSD.org

Lines 2-8 Link Here

(-)irc/bitlbee/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= bitlbee	3	PORTNAME= bitlbee
4	PORTVERSION= 3.4.1	4	PORTVERSION= 3.4.1
5	PORTREVISION= 4	5	PORTREVISION= 5
6	CATEGORIES= irc	6	CATEGORIES= irc
7	MASTER_SITES= http://get.bitlbee.org/src/ \	7	MASTER_SITES= http://get.bitlbee.org/src/ \
8	LOCAL/brix	8	LOCAL/brix

Lines 3-9 Link Here

(-)irc/ctrlproxy/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= ctrlproxy	4	PORTNAME= ctrlproxy
5	PORTVERSION= 3.0.8	5	PORTVERSION= 3.0.8
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= irc	7	CATEGORIES= irc
8	MASTER_SITES= http://launchpadlibrarian.net/50016234/ \	8	MASTER_SITES= http://launchpadlibrarian.net/50016234/ \
9	LOCAL/ashish/	9	LOCAL/ashish/

Lines 4-10 Link Here

(-)irc/inspircd/Makefile (-1 / +1 lines)
4	PORTNAME= inspircd	4	PORTNAME= inspircd
5	PORTVERSION= 2.0.20	5	PORTVERSION= 2.0.20
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 0	7	PORTREVISION= 1
8	CATEGORIES= irc	8	CATEGORIES= irc
9		9
10	MAINTAINER= feld@FreeBSD.org	10	MAINTAINER= feld@FreeBSD.org

Lines 3-9 Link Here

(-)irc/minbif/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= minbif	4	PORTNAME= minbif
5	PORTVERSION= 1.0.5	5	PORTVERSION= 1.0.5
6	PORTREVISION= 8	6	PORTREVISION= 9
7	CATEGORIES= irc net-im	7	CATEGORIES= irc net-im
8	MASTER_SITES= https://symlink.me/attachments/download/148/	8	MASTER_SITES= https://symlink.me/attachments/download/148/
9		9

Lines 3-8 Link Here

(-)irc/ngircd/Makefile (+1 lines)
3		3
4	PORTNAME= ngircd	4	PORTNAME= ngircd
5	PORTVERSION= 23	5	PORTVERSION= 23
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= irc ipv6	8	CATEGORIES= irc ipv6
8	MASTER_SITES= http://arthur.barton.de/pub/${PORTNAME}/ \	9	MASTER_SITES= http://arthur.barton.de/pub/${PORTNAME}/ \

Lines 4-9 Link Here

(-)irc/scrollz/Makefile (+1 lines)
4	PORTNAME= ScrollZ	4	PORTNAME= ScrollZ
5	PORTVERSION= 2.3	5	PORTVERSION= 2.3
6	DISTVERSIONPREFIX= ${PORTNAME}-	6	DISTVERSIONPREFIX= ${PORTNAME}-
		7	PORTREVISION= 1
7	CATEGORIES= irc ipv6	8	CATEGORIES= irc ipv6
8		9
9	MAINTAINER= freebsd@bitchx.org	10	MAINTAINER= freebsd@bitchx.org

Lines 3-8 Link Here

(-)irc/weechat/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= weechat	4	PORTNAME= weechat
5	PORTVERSION= 1.4	5	PORTVERSION= 1.4
		6	PORTREVISION= 1
6	CATEGORIES= irc	7	CATEGORIES= irc
7	MASTER_SITES= http://weechat.org/files/src/	8	MASTER_SITES= http://weechat.org/files/src/
8		9
Lines 54-60 JAVASCRIPT_LIB_DEPENDS= libv8.so:${PORTS Link Here
54		55
55	GNUTLS_CMAKE_OFF= -DENABLE_GNUTLS=no	56	GNUTLS_CMAKE_OFF= -DENABLE_GNUTLS=no
56	GNUTLS_USES= pkgconfig	57	GNUTLS_USES= pkgconfig
57	GNUTLS_LIB_DEPENDS= libgnutls.so.28:${PORTSDIR}/security/gnutls	58	GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
58		59
59	LUA_CMAKE_OFF= -DENABLE_LUA=no	60	LUA_CMAKE_OFF= -DENABLE_LUA=no
60	LUA_CMAKE_ON= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \	61	LUA_CMAKE_ON= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \

Lines 4-9 Link Here

(-)japanese/jd/Makefile (+1 lines)
4	PORTNAME= jd	4	PORTNAME= jd
5	PORTVERSION= 2.8.9	5	PORTVERSION= 2.8.9
6	DISTVERSIONSUFFIX= -150226	6	DISTVERSIONSUFFIX= -150226
		7	PORTREVISION= 1
7	CATEGORIES= japanese www	8	CATEGORIES= japanese www
8	MASTER_SITES= SFJP/jd4linux/62877	9	MASTER_SITES= SFJP/jd4linux/62877
9		10





PORTNAME=	gnustep-base
PORTVERSION=	1.24.8
PORTREVISION=	2
CATEGORIES=	lang devel gnustep
MASTER_SITES=	GNUSTEP/core


ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
ICU_CONFIGURE_OFF=	--disable-icu

GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
GNUTLS_CONFIGURE_ENABLE=tls
			TLS_CONFIG="pkg-config -gnutls"
GNUTLS_CONFIGURE_OFF=	--disable-tls

OPENSSL_USE=		OPENSSL=yes
OPENSSL_CONFIGURE_OFF=	--disable-openssl

Lines 3-9 Link Here

(-)mail/anubis/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= anubis	4	PORTNAME= anubis
5	PORTVERSION= 4.2	5	PORTVERSION= 4.2
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= GNU	8	MASTER_SITES= GNU
9		9

Lines 3-9 Link Here

(-)mail/courier-imap/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= courier-imap	4	PORTNAME= courier-imap
5	PORTVERSION= 4.16.2	5	PORTVERSION= 4.16.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	PORTEPOCH= 2	7	PORTEPOCH= 2
8	CATEGORIES= mail ipv6	8	CATEGORIES= mail ipv6
9	MASTER_SITES= SF/courier/imap/${PORTVERSION}	9	MASTER_SITES= SF/courier/imap/${PORTVERSION}

Lines 3-8 Link Here

(-)mail/exim/Makefile (+1 lines)
3		3
4	PORTNAME= exim	4	PORTNAME= exim
5	PORTVERSION?= ${EXIM_VERSION}	5	PORTVERSION?= ${EXIM_VERSION}
		6	PORTREVISION= 1
6	CATEGORIES= mail ipv6	7	CATEGORIES= mail ipv6
7	MASTER_SITES= EXIM/exim4/:exim	8	MASTER_SITES= EXIM/exim4/:exim
8	DISTNAME= ${PORTNAME}-${EXIM_VERSION}	9	DISTNAME= ${PORTNAME}-${EXIM_VERSION}

Lines 3-9 Link Here

(-)mail/libetpan/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libetpan	4	PORTNAME= libetpan
5	PORTVERSION= 1.6	5	PORTVERSION= 1.6
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= mail ipv6	7	CATEGORIES= mail ipv6
8		8
9	MAINTAINER= pawel@FreeBSD.org	9	MAINTAINER= pawel@FreeBSD.org

Lines 3-9 Link Here

(-)mail/libvmime/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libvmime	4	PORTNAME= libvmime
5	PORTVERSION= 0.9.2.s20140721	5	PORTVERSION= 0.9.2.s20140721
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= mail	7	CATEGORIES= mail
8		8
9	MAINTAINER= delphij@FreeBSD.org	9	MAINTAINER= delphij@FreeBSD.org

Lines 3-8 Link Here

(-)mail/mpop/Makefile (+1 lines)
3		3
4	PORTNAME= mpop	4	PORTNAME= mpop
5	DISTVERSION= 1.2.4	5	DISTVERSION= 1.2.4
		6	PORTREVISION= 1
6	CATEGORIES= mail	7	CATEGORIES= mail
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
8		9

Lines 3-8 Link Here

(-)mail/msmtp/Makefile (+1 lines)
3		3
4	PORTNAME= msmtp	4	PORTNAME= msmtp
5	PORTVERSION= 1.6.4	5	PORTVERSION= 1.6.4
		6	PORTREVISION= 1
6	CATEGORIES= mail ipv6	7	CATEGORIES= mail ipv6
7	MASTER_SITES= SF	8	MASTER_SITES= SF
8		9

Lines 3-9 Link Here

(-)mail/nullmailer/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= nullmailer	4	PORTNAME= nullmailer
5	PORTVERSION= 1.13	5	PORTVERSION= 1.13
6	PORTREVISION= 2	6	PORTREVISION= 3
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= mail	8	CATEGORIES= mail
9	MASTER_SITES= http://untroubled.org/nullmailer/ \	9	MASTER_SITES= http://untroubled.org/nullmailer/ \

Lines 3-9 Link Here

(-)mail/opendkim/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= opendkim	4	PORTNAME= opendkim
5	PORTVERSION= 2.10.3	5	PORTVERSION= 2.10.3
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= mail security	7	CATEGORIES= mail security
8	MASTER_SITES= SF/${PORTNAME} \	8	MASTER_SITES= SF/${PORTNAME} \
9	SF/${PORTNAME}/Previous%20Releases \	9	SF/${PORTNAME}/Previous%20Releases \

Lines 3-9 Link Here

(-)mail/wmbiff/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= wmbiff	4	PORTNAME= wmbiff
5	PORTVERSION= 0.4.27	5	PORTVERSION= 0.4.27
6	PORTREVISION= 17	6	PORTREVISION= 18
7	CATEGORIES= mail windowmaker afterstep	7	CATEGORIES= mail windowmaker afterstep
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9

Lines 3-9 Link Here

(-)mail/xfce4-mailwatch-plugin/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= xfce4-mailwatch-plugin	4	PORTNAME= xfce4-mailwatch-plugin
5	PORTVERSION= 1.2.0	5	PORTVERSION= 1.2.0
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= mail xfce	7	CATEGORIES= mail xfce
8	MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}	8	MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
9	DIST_SUBDIR= xfce4	9	DIST_SUBDIR= xfce4

Lines 3-8 Link Here

(-)multimedia/ffmpeg/Makefile (+1 lines)
3		3
4	PORTNAME= ffmpeg	4	PORTNAME= ffmpeg
5	PORTVERSION= 2.8.6	5	PORTVERSION= 2.8.6
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= multimedia audio ipv6 net	8	CATEGORIES= multimedia audio ipv6 net
8	MASTER_SITES= http://ffmpeg.org/releases/	9	MASTER_SITES= http://ffmpeg.org/releases/

Lines 2-8 Link Here

(-)multimedia/kodi/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= kodi	3	PORTNAME= kodi
4	DISTVERSION= 15.2	4	DISTVERSION= 15.2
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= multimedia java	6	CATEGORIES= multimedia java
7		7
8	MAINTAINER= mickael.maillot@gmail.com	8	MAINTAINER= mickael.maillot@gmail.com

Lines 2-7 Link Here

(-)multimedia/libav/Makefile (+1 lines)
2		2
3	PORTNAME= libav	3	PORTNAME= libav
4	PORTVERSION= 11.6	4	PORTVERSION= 11.6
		5	PORTREVISION= 1
5	CATEGORIES= multimedia audio ipv6 net	6	CATEGORIES= multimedia audio ipv6 net
6	MASTER_SITES= http://libav.org/releases/	7	MASTER_SITES= http://libav.org/releases/
7		8

Lines 3-8 Link Here

(-)multimedia/mencoder/Makefile (+1 lines)
3		3
4	PORTNAME= mencoder	4	PORTNAME= mencoder
5	PORTVERSION= ${MPLAYER_PORT_VERSION}	5	PORTVERSION= ${MPLAYER_PORT_VERSION}
		6	PORTREVISION= 1
6	CATEGORIES= multimedia audio	7	CATEGORIES= multimedia audio
7		8
8	MAINTAINER= riggs@FreeBSD.org	9	MAINTAINER= riggs@FreeBSD.org

Lines 3-8 Link Here

(-)multimedia/mplayer/Makefile (+1 lines)
3		3
4	PORTNAME= mplayer	4	PORTNAME= mplayer
5	PORTVERSION= ${MPLAYER_PORT_VERSION}	5	PORTVERSION= ${MPLAYER_PORT_VERSION}
		6	PORTREVISION= 1
6	CATEGORIES= multimedia audio	7	CATEGORIES= multimedia audio
7		8
8	MAINTAINER= riggs@FreeBSD.org	9	MAINTAINER= riggs@FreeBSD.org

Lines 3-9 Link Here

(-)multimedia/vlc/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= vlc	4	PORTNAME= vlc
5	DISTVERSION= 2.2.1	5	DISTVERSION= 2.2.1
6	PORTREVISION= 7	6	PORTREVISION= 8
7	PORTEPOCH= 4	7	PORTEPOCH= 4
8	CATEGORIES= multimedia audio ipv6 net www	8	CATEGORIES= multimedia audio ipv6 net www
9	MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \	9	MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \

Lines 3-8 Link Here

(-)net/csync2/Makefile (+1 lines)
3		3
4	PORTNAME= csync2	4	PORTNAME= csync2
5	PORTVERSION= 2.0	5	PORTVERSION= 2.0
		6	PORTREVISION= 1
6	CATEGORIES= net	7	CATEGORIES= net
7	MASTER_SITES= http://oss.linbit.com/csync2/	8	MASTER_SITES= http://oss.linbit.com/csync2/
8		9

Lines 3-8 Link Here

(-)net/glib-networking/Makefile (+1 lines)
3		3
4	PORTNAME= glib-networking	4	PORTNAME= glib-networking
5	PORTVERSION= 2.46.1	5	PORTVERSION= 2.46.1
		6	PORTREVISION= 1
6	CATEGORIES= net	7	CATEGORIES= net
7	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
8	DIST_SUBDIR= gnome2	9	DIST_SUBDIR= gnome2

Lines 3-8 Link Here

(-)net/gtk-vnc/Makefile (+1 lines)
3		3
4	PORTNAME= gtk-vnc	4	PORTNAME= gtk-vnc
5	PORTVERSION= 0.5.4	5	PORTVERSION= 0.5.4
		6	PORTREVISION= 1
6	CATEGORIES= net gnome	7	CATEGORIES= net gnome
7	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
8		9

Lines 2-7 Link Here

(-)net/hs-network-protocol-xmpp/Makefile (+1 lines)
2		2
3	PORTNAME= network-protocol-xmpp	3	PORTNAME= network-protocol-xmpp
4	PORTVERSION= 0.4.8	4	PORTVERSION= 0.4.8
		5	PORTREVISION= 1
5	CATEGORIES= net haskell	6	CATEGORIES= net haskell
6		7
7	MAINTAINER= haskell@FreeBSD.org	8	MAINTAINER= haskell@FreeBSD.org

Lines 3-9 Link Here

(-)net/libvncserver/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libvncserver	4	PORTNAME= libvncserver
5	PORTVERSION= 0.9.9	5	PORTVERSION= 0.9.9
6	PORTREVISION= 11	6	PORTREVISION= 12
7	CATEGORIES= net devel	7	CATEGORIES= net devel
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9	DISTNAME= LibVNCServer-${PORTVERSION}	9	DISTNAME= LibVNCServer-${PORTVERSION}

Lines 3-9 Link Here

(-)net/morebalance/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= morebalance	4	PORTNAME= morebalance
5	PORTVERSION= 0.4	5	PORTVERSION= 0.4
6	PORTREVISION= 13	6	PORTREVISION= 14
7	CATEGORIES= net	7	CATEGORIES= net
8	MASTER_SITES= http://morebalance.coolprojects.org/	8	MASTER_SITES= http://morebalance.coolprojects.org/
9		9

Lines 3-9 Link Here

(-)net/net6/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= net6	4	PORTNAME= net6
5	PORTVERSION= 1.3.14	5	PORTVERSION= 1.3.14
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= net devel	7	CATEGORIES= net devel
8	MASTER_SITES= http://releases.0x539.de/net6/	8	MASTER_SITES= http://releases.0x539.de/net6/
9		9




--- src/encrypt.cpp.orig	2011-09-28 11:15:10 UTC
+++ src/encrypt.cpp
@@ -175,10 +175,7 @@ net6::tcp_encrypted_socket_base::
                                   gnutls_session_t sess):
 	tcp_client_socket(cobj), session(sess), state(DEFAULT)
 {
-	const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
-
-	gnutls_set_default_priority(session);
-	gnutls_kx_set_priority(session, kx_prio);
+	gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ANON-DH", NULL);
 
 	gnutls_transport_set_ptr(
 		session,

Lines 3-8 Link Here

(-)net/ocserv/Makefile (+1 lines)
3		3
4	PORTNAME= ocserv	4	PORTNAME= ocserv
5	PORTVERSION= 0.10.12	5	PORTVERSION= 0.10.12
		6	PORTREVISION= 1
6	CATEGORIES= net security	7	CATEGORIES= net security
7	MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/	8	MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/
8		9

Lines 1-7 Link Here

(-)net/remmina-plugin-vnc/Makefile (-1 / +1 lines)
1	# Created by: Alexander Logvinov <avl@FreeBSD.org>	1	# Created by: Alexander Logvinov <avl@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 5	4	PORTREVISION= 6
5	PKGNAMESUFFIX= -vnc	5	PKGNAMESUFFIX= -vnc
6		6
7	COMMENT= Remmina plugin for VNC protocol	7	COMMENT= Remmina plugin for VNC protocol

Lines 3-9 Link Here

(-)net/samba41/Makefile (-1 / +1 lines)
3		3
4	PORTNAME?= ${SAMBA4_BASENAME}41	4	PORTNAME?= ${SAMBA4_BASENAME}41
5	PORTVERSION?= ${SAMBA4_VERSION}	5	PORTVERSION?= ${SAMBA4_VERSION}
6	PORTREVISION?= 1	6	PORTREVISION?= 2
7	CATEGORIES?= net	7	CATEGORIES?= net
8	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc	8	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
9	DISTNAME= ${SAMBA4_DISTNAME}	9	DISTNAME= ${SAMBA4_DISTNAME}

Lines 3-9 Link Here

(-)net/samba42/Makefile (-1 / +1 lines)
3		3
4	PORTNAME?= ${SAMBA4_BASENAME}42	4	PORTNAME?= ${SAMBA4_BASENAME}42
5	PORTVERSION?= ${SAMBA4_VERSION}	5	PORTVERSION?= ${SAMBA4_VERSION}
6	PORTREVISION?= 1	6	PORTREVISION?= 2
7	CATEGORIES?= net	7	CATEGORIES?= net
8	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc	8	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
9	DISTNAME= ${SAMBA4_DISTNAME}	9	DISTNAME= ${SAMBA4_DISTNAME}

Lines 3-9 Link Here

(-)net/samba43/Makefile (-1 / +1 lines)
3		3
4	PORTNAME?= ${SAMBA4_BASENAME}43	4	PORTNAME?= ${SAMBA4_BASENAME}43
5	PORTVERSION?= ${SAMBA4_VERSION}	5	PORTVERSION?= ${SAMBA4_VERSION}
6	PORTREVISION?= 1	6	PORTREVISION?= 2
7	CATEGORIES?= net	7	CATEGORIES?= net
8	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc	8	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
9	DISTNAME= ${SAMBA4_DISTNAME}	9	DISTNAME= ${SAMBA4_DISTNAME}

Lines 3-9 Link Here

(-)net/sixxs-aiccu/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= aiccu	4	PORTNAME= aiccu
5	PORTVERSION= 20070115	5	PORTVERSION= 20070115
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= net ipv6	7	CATEGORIES= net ipv6
8	MASTER_SITES= http://www.sixxs.net/archive/sixxs/aiccu/unix/	8	MASTER_SITES= http://www.sixxs.net/archive/sixxs/aiccu/unix/
9	PKGNAMEPREFIX= sixxs-	9	PKGNAMEPREFIX= sixxs-
Lines 34-40 OPTIONS_DEFAULT+= GNUTLS Link Here
34	.include <bsd.port.options.mk>	34	.include <bsd.port.options.mk>
35		35
36	.if ${PORT_OPTIONS:MGNUTLS}	36	.if ${PORT_OPTIONS:MGNUTLS}
37	LIB_DEPENDS+= libgnutls-openssl.so:${PORTSDIR}/security/gnutls	37	LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
38	CFLAGS+= -DAICCU_GNUTLS	38	CFLAGS+= -DAICCU_GNUTLS
39	LDFLAGS+= -lgnutls	39	LDFLAGS+= -lgnutls
40	.endif	40	.endif




--- common/common.c.orig	2006-12-21 14:08:50 UTC
+++ common/common.c
@@ -271,8 +271,6 @@ TLSSOCKET sock_alloc(void);
 TLSSOCKET sock_alloc(void)
 {
 #ifdef AICCU_GNUTLS
-	/* Allow connections to servers that have OpenPGP keys as well */
-	const int	cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
 	int		ret;
 #endif /* AICCU_GNUTLS*/
 
@@ -296,11 +294,8 @@ TLSSOCKET sock_alloc(void)
 		return NULL;
 	}
 
-	/* Use default priorities */
-	gnutls_set_default_priority(sock->session);
-	/* XXX: Return value is not documented in GNUTLS documentation! */
-
-	gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
+	/* Allow connections to servers that have OpenPGP keys as well */
+	gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL);
 	/* XXX: Return value is not documented in GNUTLS documentation! */
 
 	/* Configure the x509 credentials for the current session */

Lines 3-10 Link Here

(-)net/tigervnc/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= tigervnc	4	PORTNAME= tigervnc
5	PORTVERSION= 1.6.0	5	PORTVERSION= 1.6.0
6	PORTREVISION= 1
7	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
		7	PORTREVISION= 2
8	CATEGORIES= net x11-servers	8	CATEGORIES= net x11-servers
9		9
10	MAINTAINER= meta+ports@vmeta.jp	10	MAINTAINER= meta+ports@vmeta.jp

Lines 3-8 Link Here

(-)net/uget/Makefile (+1 lines)
3		3
4	PORTNAME= uget	4	PORTNAME= uget
5	PORTVERSION= 2.0.5	5	PORTVERSION= 2.0.5
		6	PORTREVISION= 1
6	CATEGORIES= net	7	CATEGORIES= net
7	MASTER_SITES= SF/urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}	8	MASTER_SITES= SF/urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
8		9

Lines 3-9 Link Here

(-)net/vinagre/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= vinagre	4	PORTNAME= vinagre
5	PORTVERSION= 3.18.2	5	PORTVERSION= 3.18.2
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= net gnome	7	CATEGORIES= net gnome
8	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3

Lines 3-9 Link Here

(-)net/vino/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= vino	4	PORTNAME= vino
5	PORTVERSION= 3.18.1	5	PORTVERSION= 3.18.1
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= net gnome	7	CATEGORIES= net gnome
8	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3

Lines 3-9 Link Here

(-)net/wireshark/Makefile (-1 / +1 lines)
3		3
4	PORTNAME?= wireshark	4	PORTNAME?= wireshark
5	PORTVERSION= 2.0.2	5	PORTVERSION= 2.0.2
6	PORTREVISION?= 0	6	PORTREVISION?= 1
7	CATEGORIES= net ipv6	7	CATEGORIES= net ipv6
8	MASTER_SITES= http://www.wireshark.org/download/src/ \	8	MASTER_SITES= http://www.wireshark.org/download/src/ \
9	http://ftp.uni-kl.de/pub/wireshark/src/ \	9	http://ftp.uni-kl.de/pub/wireshark/src/ \

Lines 3-9 Link Here

(-)net-im/climm/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= climm	4	PORTNAME= climm
5	PORTVERSION= 0.7.1	5	PORTVERSION= 0.7.1
6	PORTREVISION= 11	6	PORTREVISION= 12
7	CATEGORIES= net-im	7	CATEGORIES= net-im
8	MASTER_SITES= http://www.climm.org/source/ \	8	MASTER_SITES= http://www.climm.org/source/ \
9	http://http.bg.climm.org/source/	9	http://http.bg.climm.org/source/

Lines 3-8 Link Here

(-)net-im/empathy/Makefile (+1 lines)
3		3
4	PORTNAME= empathy	4	PORTNAME= empathy
5	PORTVERSION= 3.12.11	5	PORTVERSION= 3.12.11
		6	PORTREVISION= 1
6	CATEGORIES= net-im gnome	7	CATEGORIES= net-im gnome
7	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
8		9

Lines 3-8 Link Here

(-)net-im/gloox/Makefile (+1 lines)
3		3
4	PORTNAME= gloox	4	PORTNAME= gloox
5	PORTVERSION= 1.0.14	5	PORTVERSION= 1.0.14
		6	PORTREVISION= 1
6	CATEGORIES= net-im	7	CATEGORIES= net-im
7	MASTER_SITES= http://camaya.net/download/	8	MASTER_SITES= http://camaya.net/download/
8		9

Lines 3-9 Link Here

(-)net-im/jabber/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= jabber	4	PORTNAME= jabber
5	PORTVERSION= 1.6.1.1	5	PORTVERSION= 1.6.1.1
6	PORTREVISION= 18	6	PORTREVISION= 19
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= net-im ipv6	8	CATEGORIES= net-im ipv6
9	MASTER_SITES= http://download.jabberd.org/jabberd14/%SUBDIR%/	9	MASTER_SITES= http://download.jabberd.org/jabberd14/%SUBDIR%/




--- jabberd/mio_tls.cc.orig	2007-07-16 23:20:44 UTC
+++ jabberd/mio_tls.cc
@@ -39,7 +39,6 @@
 #include <set>
 #include <string>

 #include <vector>
 #include <list>
 #include <iostream>
@@ -612,7 +611,7 @@ static void mio_tls_process_credentials(
 	    }
 
 	    // load OpenPGP key/certificate

 	    if (ret < 0) {
 		log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
 		continue;
@@ -631,7 +630,7 @@ static void mio_tls_process_credentials(
 	    }
 
 	    // load the OpenPGP keyring

 	    if (ret < 0) {
 		log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
 		continue;
@@ -640,23 +639,6 @@ static void mio_tls_process_credentials(
 	    continue;
 	}
 

 	// setup protocols to use
 	if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
 	    char const *const protocols_data = xmlnode_get_data(cur);
@@ -916,7 +898,7 @@ bool mio_tls_early_init() {
     /* load asn1 tree to be used by libtasn1 */
     ret = asn1_array2tree(subjectAltName_asn1_tab, &mio_tls_asn1_tree, NULL);
     if (ret != ASN1_SUCCESS) {

 	return false;
 	/* XXX we have to delete the structure on shutdown using asn1_delete_structure(&mio_tls_asn1_tree) */
     }
@@ -1302,80 +1284,32 @@ int mio_ssl_starttls(mio m, int originat
 
     // overwrite protocol priorities?
     if (mio_tls_protocols.find(identity) != mio_tls_protocols.end()) {
-	ret = gnutls_protocol_set_priority(session, mio_tls_protocols[identity]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting protocol priority: %s", gnutls_strerror(ret));
-	}
     } else if (mio_tls_protocols.find("*") != mio_tls_protocols.end()) {
-	ret = gnutls_protocol_set_priority(session, mio_tls_protocols["*"]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting protocol priority: %s", gnutls_strerror(ret));
-	}
     }
 
     // overwrite kx algorithm priorities?
     if (mio_tls_kx.find(identity) != mio_tls_kx.end()) {
-	ret = gnutls_kx_set_priority(session, mio_tls_kx[identity]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting kx algorithm priority: %s", gnutls_strerror(ret));
-	}
     } else if (mio_tls_kx.find("*") != mio_tls_kx.end()) {
-	ret = gnutls_kx_set_priority(session, mio_tls_kx["*"]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting kx algorithm priority: %s", gnutls_strerror(ret));
-	}
     }
 
     // overwrite cipher priorities?
     if (mio_tls_ciphers.find(identity) != mio_tls_ciphers.end()) {
-	ret = gnutls_cipher_set_priority(session, mio_tls_ciphers[identity]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting cipher algorithm priority: %s", gnutls_strerror(ret));
-	}
     } else if (mio_tls_ciphers.find("*") != mio_tls_ciphers.end()) {
-	ret = gnutls_cipher_set_priority(session, mio_tls_ciphers["*"]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting cipher algorithm priority: %s", gnutls_strerror(ret));
-	}
     }
 
     // overwrite certificate priorities?
     if (mio_tls_certtypes.find(identity) != mio_tls_certtypes.end()) {
-	ret = gnutls_certificate_type_set_priority(session, mio_tls_certtypes[identity]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting certificate priorities: %s", gnutls_strerror(ret));
-	}
     } else if (mio_tls_certtypes.find("*") != mio_tls_certtypes.end()) {
-	ret = gnutls_certificate_type_set_priority(session, mio_tls_certtypes["*"]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting certificate priorities: %s", gnutls_strerror(ret));
-	}
     }
 
     // overwrite mac algorithm priorities?
     if (mio_tls_mac.find(identity) != mio_tls_mac.end()) {
-	ret = gnutls_mac_set_priority(session, mio_tls_mac[identity]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting mac algorithm priorities: %s", gnutls_strerror(ret));
-	}
     } else if (mio_tls_mac.find("*") != mio_tls_mac.end()) {
-	ret = gnutls_mac_set_priority(session, mio_tls_mac["*"]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting mac algorithm priorities: %s", gnutls_strerror(ret));
-	}
     }
 
     // overwrite compression algorithm priorities?
     if (mio_tls_compression.find(identity) != mio_tls_compression.end()) {
-	ret = gnutls_compression_set_priority(session, mio_tls_compression[identity]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting compression algorithm priorities: %s", gnutls_strerror(ret));
-	}
     } else if (mio_tls_compression.find("*") != mio_tls_compression.end()) {
-	ret = gnutls_compression_set_priority(session, mio_tls_compression["*"]);
-	if (ret < 0) {
-	    log_notice(identity, "error setting compression algorithm priorities: %s", gnutls_strerror(ret));
-	}
     }
 
     /* setting certificate credentials */
@@ -1498,7 +1432,6 @@ static int mio_tls_check_openpgp(mio m, 
     const gnutls_datum_t *cert_list = NULL;
     unsigned int cert_list_size = 0;
 

     // get the certificate (it's only a single one for OpenPGP)
     cert_list = gnutls_certificate_get_peers(static_cast<gnutls_session_t>(m->ssl), &cert_list_size);
     if (cert_list == NULL || cert_list_size <= 0) {
@@ -1566,7 +1499,6 @@ static int mio_tls_check_openpgp(mio m, 
     // free memory
     gnutls_openpgp_key_deinit(pgpkey);
     pool_free(jidpool);

     return 0;
 }
 
@@ -1684,14 +1616,14 @@ static int mio_tls_check_x509(mio m, cha
 		    /* init subjectAltName_element */
 		    ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.SubjectAltName", &subjectAltName_element);
 		    if (ret != ASN1_SUCCESS) {

 			asn1_delete_structure(&subjectAltName_element);
 			break;
 		    }
@@ -1712,7 +1644,7 @@ static int mio_tls_check_x509(mio m, cha
 			    break;
 			}
 			if (ret != ASN1_SUCCESS) {

 			    break;
 			}
 
@@ -1732,7 +1664,7 @@ static int mio_tls_check_x509(mio m, cha
 
 				ret = asn1_read_value(subjectAltName_element, access_string, dNSName, &dNSName_len);
 				if (ret != ASN1_SUCCESS) {

 				    break;
 				}
 
@@ -1772,7 +1704,7 @@ static int mio_tls_check_x509(mio m, cha
 			    /* get the OID of the otherName */
 			    ret = asn1_read_value(subjectAltName_element, access_string_type, otherNameType, &otherNameType_len);
 			    if (ret != ASN1_SUCCESS) {

 				break;
 			    }
 
@@ -1785,7 +1717,7 @@ static int mio_tls_check_x509(mio m, cha
 			    /* get the value of the otherName */
 			    ret = asn1_read_value(subjectAltName_element, access_string_value, otherNameValue, &otherNameValue_len);
 			    if (ret != ASN1_SUCCESS) {

 				break;
 			    }
 
@@ -1799,21 +1731,21 @@ static int mio_tls_check_x509(mio m, cha
 
 				ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.DirectoryString", &directoryString_element);
 				if (ret != ASN1_SUCCESS) {

Lines 3-9 Link Here

(-)net-im/libpurple/Makefile (-1 / +1 lines)
3		3
4	PORTNAME?= libpurple	4	PORTNAME?= libpurple
5	PORTVERSION= 2.10.12	5	PORTVERSION= 2.10.12
6	PORTREVISION?= 1	6	PORTREVISION?= 2
7	CATEGORIES?= net-im	7	CATEGORIES?= net-im
8	MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}	8	MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}
9	DISTNAME= pidgin-${PORTVERSION}	9	DISTNAME= pidgin-${PORTVERSION}

Lines 2-8 Link Here

(-)net-im/licq-jabber/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= jabber	3	PORTNAME= jabber
4	PORTVERSION= 1.8.2	4	PORTVERSION= 1.8.2
5	PORTREVISION= 2	5	PORTREVISION= 3
6	CATEGORIES= net-im	6	CATEGORIES= net-im
7		7
8	MAINTAINER= dinoex@FreeBSD.org	8	MAINTAINER= dinoex@FreeBSD.org




#   $MCom: ports/trunk/net-im/loudmouth/Makefile 19914 2014-09-25 22:33:21Z kwm $

PORTNAME=	loudmouth
PORTVERSION=	1.5.3
CATEGORIES=	net-im
MASTER_SITES=	https://mcabber.com/files/loudmouth/ \
		http://www.lilotux.net/~mikael/mcabber/files/loudmouth/

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Lightweight Jabber client library

LICENSE=	LGPL21+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn

USES=		gettext gmake libtool pkgconfig tar:bzip2
USE_GNOME=	glib20
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
CONFIGURE_ARGS=	--disable-gtk-doc --disable-rebuilds \
		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
LDFLAGS+=	-Wl,-Bsymbolic -L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	DOCS
OPTIONS_DEFAULT=GNUTLS
OPTIONS_RADIO=	SSL
OPTIONS_RADIO_SSL=	GNUTLS OPENSSL


.if ${PORT_OPTIONS:MGNUTLS}
LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+=--with-ssl=gnutls
.elif ${PORT_OPTIONS:MOPENSSL}

.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL=	yes
CONFIGURE_ARGS+=--with-ssl=openssl
RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
.else

.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}
CONFIGURE_ARGS+=--without-ssl
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
	    	${WRKSRC}/loudmouth/lm-ssl-gnutls.c

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net-im/loudmouth/distinfo (-2 / +2 lines)
1	SHA256 (loudmouth-1.4.3.tar.bz2) = 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3	1	SHA256 (loudmouth-1.5.3.tar.bz2) = 54329415cb1bacb783c20f5f1f975de4fc460165d0d8a1e3b789367b5f69d32c
2	SIZE (loudmouth-1.4.3.tar.bz2) = 366818	2	SIZE (loudmouth-1.5.3.tar.bz2) = 375974




--- configure.orig	2009-08-17 03:50:55.000000000 -0400
+++ configure	2009-08-17 03:50:59.000000000 -0400
@@ -21983,12 +21983,14 @@ fi
   if test x$libgnutls_config_prefix != x ; then
      libgnutls_config_args="$libgnutls_config_args --prefix=$libgnutls_config_prefix"
      if test x${LIBGNUTLS_CONFIG+set} != xset ; then
-        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
+        LIBGNUTLS_CONFIG=pkg-config
      fi
   fi
 
+  libgnutls_config_args="$libgnutls_config_args gnutls"
+
   # Extract the first word of "libgnutls-config", so it can be a program name with args.
-set dummy libgnutls-config; ac_word=$2
+set dummy pkg-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
@@ -22037,7 +22039,7 @@ echo $ECHO_N "checking for libgnutls - v
   else
     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
     LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
-    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
+    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion`
 
 
       ac_save_CFLAGS="$CFLAGS"




--- loudmouth/Makefile.in.orig	2008-07-06 15:44:25.000000000 -0400
+++ loudmouth/Makefile.in	2008-07-06 15:43:53.000000000 -0400
@@ -306,8 +306,7 @@ libloudmouthinclude_HEADERS = \
 
 libloudmouth_1_la_LIBADD = \
 	$(LOUDMOUTH_LIBS)		\
-	$(LIBIDN_LIBS) \
-	-lresolv
+	$(LIBIDN_LIBS)
 
 libloudmouth_1_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \

Lines 1-11 Link Here

(-)net-im/loudmouth/files/patch-loudmouth_lm-error.c (-11 lines)
1	--- loudmouth/lm-error.c.orig 2012-05-22 10:05:29.000000000 +0200
2	+++ loudmouth/lm-error.c 2012-05-22 10:05:41.000000000 +0200
3	@@ -19,7 +19,7 @@
4	*/
5
6	#include <config.h>
7	-#include <glib/gerror.h>
8	+#include <glib.h>
9	#include "lm-error.h"
10
11	/**




--- loudmouth/lm-ssl-gnutls.c.orig	2010-04-17 15:56:39.000000000 -0400
+++ loudmouth/lm-ssl-gnutls.c	2010-04-17 15:56:43.000000000 -0400
@@ -32,7 +32,7 @@
 
 #include <gnutls/x509.h>
 
-#define CA_PEM_FILE "/etc/ssl/certs/ca-certificates.crt"
+#define CA_PEM_FILE "%%LOCALBASE%%/share/certs/ca-root-nss.crt"
 
 struct _LmSSL {
 	LmSSLBase base;
@@ -200,6 +200,7 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons
 		{ GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
 	const int compression_priority[] =
 		{ GNUTLS_COMP_DEFLATE, GNUTLS_COMP_NULL, 0 };
+	gnutls_priority_t priorities_cache;
 
 	gnutls_init (&ssl->gnutls_session, GNUTLS_CLIENT);
 	gnutls_set_default_priority (ssl->gnutls_session);
@@ -213,6 +214,8 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons
 
 	gnutls_transport_set_ptr (ssl->gnutls_session,
 				  (gnutls_transport_ptr_t)(glong) fd);
+	gnutls_priority_init (&priorities_cache, "NONE:+VERS-TLS1.0:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL:NORMAL:%COMPAT", NULL);
+	gnutls_priority_set (ssl->gnutls_session, priorities_cache);
 
 	ret = gnutls_handshake (ssl->gnutls_session);
 

Lines 1-3 Link Here

(-)net-im/loudmouth/pkg-descr (+2 lines)
1	Loudmouth is a lightweight and easy-to-use C library for programming with the	1	Loudmouth is a lightweight and easy-to-use C library for programming with the
2	Jabber protocol. It's designed to be easy to get started with and yet	2	Jabber protocol. It's designed to be easy to get started with and yet
3	extensible to let you do anything the Jabber protocol allows.	3	extensible to let you do anything the Jabber protocol allows.
		4
		5	WWW: https://mcabber.com/




lib/libloudmouth-1.so.0
lib/libloudmouth-1.so.0.1.0
libdata/pkgconfig/loudmouth-1.0.pc
%%PORTDOCS%%share/gtk-doc/html/loudmouth/ch01.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/home.png
%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.sgml
%%PORTDOCS%%share/gtk-doc/html/loudmouth/left-insensitive.png
%%PORTDOCS%%share/gtk-doc/html/loudmouth/left.png
%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmConnection.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmError.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessage.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageHandler.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageNode.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmProxy.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmSSL.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-Miscellaneous-Utility-Functions.html
%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth.devhelp2
%%PORTDOCS%%share/gtk-doc/html/loudmouth/right-insensitive.png
%%PORTDOCS%%share/gtk-doc/html/loudmouth/right.png
%%PORTDOCS%%share/gtk-doc/html/loudmouth/style.css
%%PORTDOCS%%share/gtk-doc/html/loudmouth/up-insensitive.png
%%PORTDOCS%%share/gtk-doc/html/loudmouth/up.png

Lines 3-9 Link Here

(-)net-im/telepathy-gabble/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= telepathy-gabble	4	PORTNAME= telepathy-gabble
5	PORTVERSION= 0.18.3	5	PORTVERSION= 0.18.3
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= net-im	7	CATEGORIES= net-im
8	MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/	8	MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
9		9

Lines 4-10 Link Here

(-)net-im/telepathy-salut/Makefile (-1 / +1 lines)
4		4
5	PORTNAME= telepathy-salut	5	PORTNAME= telepathy-salut
6	PORTVERSION= 0.8.1	6	PORTVERSION= 0.8.1
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= net-im	8	CATEGORIES= net-im
9	MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/	9	MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
10		10

Lines 3-9 Link Here

(-)net-p2p/gnunet/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gnunet	4	PORTNAME= gnunet
5	PORTVERSION= 0.10.1	5	PORTVERSION= 0.10.1
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= net-p2p ipv6 security	7	CATEGORIES= net-p2p ipv6 security
8	MASTER_SITES= GNU	8	MASTER_SITES= GNU
9		9

Lines 36-41 Link Here

(-)net-p2p/gtk-gnutella/Makefile (+1 lines)
36		36
37	PORTNAME= gtk-gnutella	37	PORTNAME= gtk-gnutella
38	PORTVERSION= 1.1.9	38	PORTVERSION= 1.1.9
		39	PORTREVISION= 1
39	CATEGORIES= net-p2p ipv6	40	CATEGORIES= net-p2p ipv6
40	MASTER_SITES= SF	41	MASTER_SITES= SF
41		42

Lines 3-9 Link Here

(-)net-p2p/ncdc/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= ncdc	4	PORTNAME= ncdc
5	PORTVERSION= 1.19.1	5	PORTVERSION= 1.19.1
6	PORTREVISION= 6	6	PORTREVISION= 7
7	CATEGORIES= net-p2p	7	CATEGORIES= net-p2p
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
9	http://dev.yorhel.nl/download/	9	http://dev.yorhel.nl/download/

Lines 3-9 Link Here

(-)news/nzbget/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= nzbget	4	PORTNAME= nzbget
5	PORTVERSION= 16.4	5	PORTVERSION= 16.4
6	PORTREVISION= 1	6	PORTREVISION= 2
7	DISTVERSIONPREFIX= v	7	DISTVERSIONPREFIX= v
8	CATEGORIES= news	8	CATEGORIES= news
9		9

Lines 3-9 Link Here

(-)polish/ekg2/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= ekg2	4	PORTNAME= ekg2
5	PORTVERSION= 0.3.1	5	PORTVERSION= 0.3.1
6	PORTREVISION= 7	6	PORTREVISION= 8
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= polish net-im	8	CATEGORIES= polish net-im
9	MASTER_SITES= http://pl.ekg2.org/	9	MASTER_SITES= http://pl.ekg2.org/

Lines 4-10 Link Here

(-)print/cups/Makefile (-1 / +1 lines)
4	PORTNAME= cups	4	PORTNAME= cups
5	PORTVERSION= 2.1.3	5	PORTVERSION= 2.1.3
6	DISTVERSIONSUFFIX=-source	6	DISTVERSIONSUFFIX=-source
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= print	8	CATEGORIES= print
9	MASTER_SITES= http://www.cups.org/software/${PORTVERSION}/	9	MASTER_SITES= http://www.cups.org/software/${PORTVERSION}/
10		10

Line 0 Link Here

(-)print/cups/files/patch-cups-config.in (+11 lines)
	1	--- cups-config.in.orig 2013-05-29 11:51:34 UTC
	2	+++ cups-config.in
	3	@@ -105,7 +105,7 @@ while test $# -gt 0; do
	4	;;
	5	--libs)
	6	if test $static = no; then
	7	- libs="@EXTLINKCUPS@ $LIBS";
	8	+ libs="@EXTLINKCUPS@";
	9	if test $image = yes; then
	10	libs="@EXTLINKCUPSIMAGE@ $libs"
	11	fi

Lines 2-8 Link Here

(-)print/cups-bjnp/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= cups-bjnp	3	PORTNAME= cups-bjnp
4	PORTVERSION= 2.0	4	PORTVERSION= 2.0
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8		8

Lines 2-8 Link Here

(-)print/cups-filters/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= cups-filters	3	PORTNAME= cups-filters
4	PORTVERSION= 1.8.2	4	PORTVERSION= 1.8.2
5	PORTREVISION= 4	5	PORTREVISION= 5
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= http://www.openprinting.org/download/cups-filters/	7	MASTER_SITES= http://www.openprinting.org/download/cups-filters/
8		8

Lines 3-9 Link Here

(-)print/ghostscript8-base/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= ghostscript	4	PORTNAME= ghostscript
5	PORTVERSION= 8.71	5	PORTVERSION= 8.71
6	PORTREVISION= 20	6	PORTREVISION= 21
7	CATEGORIES= print	7	CATEGORIES= print
8	MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \	8	MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
9	SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \	9	SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \

Lines 2-8 Link Here

(-)print/ghostscript9-agpl-base/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= ghostscript	3	PORTNAME= ghostscript
4	PORTVERSION= 9.16	4	PORTVERSION= 9.16
5	PORTREVISION= 4	5	PORTREVISION= 5
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \	7	MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
8	SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \	8	SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \

Lines 2-8 Link Here

(-)print/ghostscript9-base/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= ghostscript	3	PORTNAME= ghostscript
4	PORTVERSION= 9.06	4	PORTVERSION= 9.06
5	PORTREVISION= 12	5	PORTREVISION= 13
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \	7	MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
8	SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \	8	SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \

Lines 4-10 Link Here

(-)print/gnome-cups-manager/Makefile (-1 / +1 lines)
4		4
5	PORTNAME= gnome-cups-manager	5	PORTNAME= gnome-cups-manager
6	PORTVERSION= 0.31	6	PORTVERSION= 0.31
7	PORTREVISION= 15	7	PORTREVISION= 16
8	PORTEPOCH= 1	8	PORTEPOCH= 1
9	CATEGORIES= print gnome	9	CATEGORIES= print gnome
10	MASTER_SITES= GNOME	10	MASTER_SITES= GNOME

Lines 4-10 Link Here

(-)print/gtklp/Makefile (-1 / +1 lines)
4	PORTNAME= gtklp	4	PORTNAME= gtklp
5	PORTVERSION= 1.3.1	5	PORTVERSION= 1.3.1
6	DISTVERSIONSUFFIX= .src	6	DISTVERSIONSUFFIX= .src
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= print	8	CATEGORIES= print
9	MASTER_SITES= SF	9	MASTER_SITES= SF
10		10

Lines 2-8 Link Here

(-)print/gutenprint-cups/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3	# $MCom: ports/print/gutenprint-cups/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $	3	# $MCom: ports/print/gutenprint-cups/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
4		4
5	PORTEPOCH= 0	5	PORTREVISION= 3
6	PKGNAMESUFFIX= -cups	6	PKGNAMESUFFIX= -cups
7		7
8	MAINTAINER= cmt@burggraben.net	8	MAINTAINER= cmt@burggraben.net

Lines 2-8 Link Here

(-)print/gutenprint-foomatic/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3	# $MCom: ports/print/gutenprint-foomatic/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $	3	# $MCom: ports/print/gutenprint-foomatic/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
4		4
5	PORTEPOCH= 0	5	PORTREVISION= 2
6	PKGNAMESUFFIX= -foomatic	6	PKGNAMESUFFIX= -foomatic
7		7
8	MAINTAINER= cmt@burggraben.net	8	MAINTAINER= cmt@burggraben.net

Lines 2-8 Link Here

(-)print/gutenprint-ijs/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3	# $MCom: ports/print/gutenprint-ijs/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $	3	# $MCom: ports/print/gutenprint-ijs/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
4		4
5	PORTEPOCH= 0	5	PORTREVISION= 2
6	PKGNAMESUFFIX= -ijs	6	PKGNAMESUFFIX= -ijs
7		7
8	MAINTAINER= cmt@burggraben.net	8	MAINTAINER= cmt@burggraben.net

Lines 3-9 Link Here

(-)print/libgnomecups/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libgnomecups	4	PORTNAME= libgnomecups
5	PORTVERSION= 0.2.3	5	PORTVERSION= 0.2.3
6	PORTREVISION= 7	6	PORTREVISION= 8
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= print gnome	8	CATEGORIES= print gnome
9	MASTER_SITES= GNOME	9	MASTER_SITES= GNOME

Lines 4-10 Link Here

(-)print/libgnomeprint/Makefile (-1 / +1 lines)
4		4
5	PORTNAME= libgnomeprint	5	PORTNAME= libgnomeprint
6	PORTVERSION= 2.18.8	6	PORTVERSION= 2.18.8
7	PORTREVISION= 3	7	PORTREVISION= 4
8	CATEGORIES= print gnome	8	CATEGORIES= print gnome
9	MASTER_SITES= GNOME	9	MASTER_SITES= GNOME
10	DIST_SUBDIR= gnome2	10	DIST_SUBDIR= gnome2

Lines 3-9 Link Here

(-)print/p5-Net-CUPS/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= Net-CUPS	4	PORTNAME= Net-CUPS
5	PORTVERSION= 0.61	5	PORTVERSION= 0.61
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= print perl5	7	CATEGORIES= print perl5
8	MASTER_SITES= CPAN	8	MASTER_SITES= CPAN
9	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-

Lines 3-9 Link Here

(-)print/qpdfview/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= qpdfview	4	PORTNAME= qpdfview
5	PORTVERSION= 0.4.16	5	PORTVERSION= 0.4.16
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= print	7	CATEGORIES= print
8	MASTER_SITES= https://launchpadlibrarian.net/226592308/ \	8	MASTER_SITES= https://launchpadlibrarian.net/226592308/ \
9	https://launchpad.net/${PORTVERSION}/trunk/${PORTVERSION}/+download/	9	https://launchpad.net/${PORTVERSION}/trunk/${PORTVERSION}/+download/





PORTNAME=	splix
PORTVERSION=	2.0.0
PORTREVISION=	8
CATEGORIES?=	print
MASTER_SITES=	SF


BLACKOPTIM_DESC=	Enable black correction algorithm
OPTIONS_DEFAULT=	JBIG BLACKOPTIM

.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e '/^CC.*:= gcc/d' -e '/^CXX.*:= g++/d' \
		-e 's/make/gmake/' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's/g++/$$(CXX)/' ${WRKSRC}/rules.mk

post-configure:

.if ${PORT_OPTIONS:MJBIG}
PPD_SAMSUNG+=	${PPD_SAMSUNG_JBIG}

MAKE_ARGS+=	CACHESIZE=${CACHESIZE}
.endif

post-patch:
	@${REINPLACE_CMD} -e '/^CC.*:= gcc/d' -e '/^CXX.*:= g++/d' \
		-e 's/make/$$(MAKE)/' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} '/cups-config --libs/s/$$/ -pthread/' \
		${WRKSRC}/module.mk
	@${REINPLACE_CMD} 's/g++/$$(CXX)/' ${WRKSRC}/rules.mk

do-install:
	${MKDIR} ${STAGEDIR}${BIN_DEST_DIR}
.for MODEL in ${MODELS}

Lines 3-9 Link Here

(-)security/gnomint/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gnomint	4	PORTNAME= gnomint
5	PORTVERSION= 1.2.1	5	PORTVERSION= 1.2.1
6	PORTREVISION= 8	6	PORTREVISION= 9
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9

Lines 2-8 Link Here

(-)security/gnupg/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= gnupg	3	PORTNAME= gnupg
4	PORTVERSION= 2.1.11	4	PORTVERSION= 2.1.11
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= security	6	CATEGORIES= security
7	MASTER_SITES= GNUPG	7	MASTER_SITES= GNUPG
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig	8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig




# $FreeBSD$

PORTNAME=	gnutls
PORTVERSION=	3.4.10
PORTREVISION=	3
CATEGORIES=	security net
MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R}

MAINTAINER=	tijl@FreeBSD.org
COMMENT=	GNU Transport Layer Security library

		--enable-local-libopts \
		ac_cv_type_max_align_t=yes
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib
MAKE_ENV=	MAKEINFOFLAGS=--no-split
INSTALL_TARGET=	install-strip

CPE_VENDOR=	gnu

OPTIONS_DEFINE=		CRYWRAP DANE EXAMPLES IDN NLS P11KIT TPM ZLIB
OPTIONS_DEFAULT=	CRYWRAP IDN P11KIT TPM ZLIB
OPTIONS_SUB=		yes

CRYWRAP_DESC=			Enable Crywrap TLS proxy service
CRYWRAP_IMPLIES=		IDN
CRYWRAP_CONFIGURE_ENABLE=	crywrap

DANE_DESC=		Certificate verification via DNSSEC
DANE_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound
DANE_CONFIGURE_ENABLE=	libdane

IDN_CONFIGURE_WITH=	idn
IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn

NLS_CONFIGURE_ENABLE=	nls
NLS_USES=		gettext


post-patch:
	@${RM} ${WRKSRC}/doc/*.info*
	${SED} -i '' -e 's|^+_NORETURN_H|_NORETURN_H|' \
	  ${WRKSRC}/src/libopts/Makefile.in

post-install:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnutls*.so.*

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)security/gnutls/distinfo (-2 / +2 lines)
1	SHA256 (gnutls-3.3.17.1.tar.xz) = b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4	1	SHA256 (gnutls-3.4.10.tar.xz) = 6a32c2b4acbd33ff7eefcbd1357009da04c94c60146ef61320b6c076b1bdf59f
2	SIZE (gnutls-3.3.17.1.tar.xz) = 6339588	2	SIZE (gnutls-3.4.10.tar.xz) = 6645892




--- configure.orig	2016-03-03 07:52:15 UTC
+++ configure
@@ -47228,6 +47228,7 @@ fi
 $as_echo "$enable_dane" >&6; }
 
 if test "$enable_dane" != "no"; then
+    oldlibs="$LIBS"
     LIBS="$oldlibs -lunbound"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unbound library" >&5
 $as_echo_n "checking for unbound library... " >&6; }
@@ -47444,6 +47445,7 @@ else
 fi
 
 if test "$with_tpm" != "no"; then
+    oldlibs="$LIBS"
     LIBS="$oldlibs -ltspi"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tss library" >&5
 $as_echo_n "checking for tss library... " >&6; }

Lines 1-10 Link Here

(-)security/gnutls/files/patch-lib__x509__rfc2818_hostname.c (-10 lines)
1	--- lib/x509/rfc2818_hostname.c.orig 2014-10-02 13:35:09.427374817 -0500
2	+++ lib/x509/rfc2818_hostname.c 2014-10-02 13:35:33.657427866 -0500
3	@@ -19,6 +19,7 @@
4	*
5	*/
6
7	+#include <netinet/in.h>
8	#include <gnutls_int.h>
9	#include <gnutls_str.h>
10	#include <x509_int.h>




bin/certtool
%%DANE%%bin/danetool
bin/gnutls-cli
bin/gnutls-cli-debug
bin/gnutls-serv

include/gnutls/abstract.h
include/gnutls/compat.h
include/gnutls/crypto.h
%%DANE%%include/gnutls/dane.h
include/gnutls/dtls.h
include/gnutls/gnutls.h
include/gnutls/gnutlsxx.h
include/gnutls/ocsp.h
include/gnutls/openpgp.h
include/gnutls/openssl.h
include/gnutls/pkcs11.h
include/gnutls/pkcs12.h
include/gnutls/pkcs7.h
include/gnutls/self-test.h
include/gnutls/system-keys.h
include/gnutls/tpm.h
include/gnutls/urls.h
include/gnutls/x509-ext.h
include/gnutls/x509.h
info/gnutls-client-server-use-case.png
info/gnutls-handshake-sequence.png
info/gnutls-handshake-state.png

info/gnutls-pgp.png
info/gnutls-x509.png
info/pkcs11-vision.png
%%DANE%%lib/libgnutls-dane.so
%%DANE%%lib/libgnutls-dane.so.0
%%DANE%%lib/libgnutls-dane.so.0.4.1
lib/libgnutls-openssl.so
lib/libgnutls-openssl.so.27
lib/libgnutls-openssl.so.27.0.2
lib/libgnutls.so
lib/libgnutls.so.30
lib/libgnutls.so.30.6.2
lib/libgnutlsxx.so
lib/libgnutlsxx.so.28
lib/libgnutlsxx.so.28.1.0
libdata/pkgconfig/gnutls.pc
%%DANE%%libdata/pkgconfig/gnutls-dane.pc
man/man1/certtool.1.gz
%%DANE%%man/man1/danetool.1.gz
man/man1/gnutls-cli-debug.1.gz
man/man1/gnutls-cli.1.gz
man/man1/gnutls-serv.1.gz

man/man1/psktool.1.gz
man/man1/srptool.1.gz
man/man1/tpmtool.1.gz
man/man3/gnutls_aead_cipher_decrypt.3.gz
man/man3/gnutls_aead_cipher_deinit.3.gz
man/man3/gnutls_aead_cipher_encrypt.3.gz
man/man3/gnutls_aead_cipher_init.3.gz
man/man3/gnutls_alert_get.3.gz
man/man3/gnutls_alert_get_name.3.gz
man/man3/gnutls_alert_get_strname.3.gz

man/man3/gnutls_auth_client_get_type.3.gz
man/man3/gnutls_auth_get_type.3.gz
man/man3/gnutls_auth_server_get_type.3.gz
man/man3/gnutls_buffer_append_data.3.gz
man/man3/gnutls_bye.3.gz
man/man3/gnutls_certificate_activation_time_peers.3.gz
man/man3/gnutls_certificate_allocate_credentials.3.gz
man/man3/gnutls_certificate_client_get_request_status.3.gz
man/man3/gnutls_certificate_client_set_retrieve_function.3.gz
man/man3/gnutls_certificate_expiration_time_peers.3.gz
man/man3/gnutls_certificate_free_ca_names.3.gz
man/man3/gnutls_certificate_free_cas.3.gz

man/man3/gnutls_certificate_free_keys.3.gz
man/man3/gnutls_certificate_get_crt_raw.3.gz
man/man3/gnutls_certificate_get_issuer.3.gz
man/man3/gnutls_certificate_get_openpgp_crt.3.gz
man/man3/gnutls_certificate_get_openpgp_key.3.gz
man/man3/gnutls_certificate_get_ours.3.gz
man/man3/gnutls_certificate_get_peers.3.gz
man/man3/gnutls_certificate_get_peers_subkey_id.3.gz
man/man3/gnutls_certificate_get_trust_list.3.gz
man/man3/gnutls_certificate_get_verify_flags.3.gz
man/man3/gnutls_certificate_get_x509_crt.3.gz
man/man3/gnutls_certificate_get_x509_key.3.gz
man/man3/gnutls_certificate_send_x509_rdn_sequence.3.gz
man/man3/gnutls_certificate_server_set_request.3.gz
man/man3/gnutls_certificate_server_set_retrieve_function.3.gz
man/man3/gnutls_certificate_set_dh_params.3.gz
man/man3/gnutls_certificate_set_flags.3.gz
man/man3/gnutls_certificate_set_key.3.gz
man/man3/gnutls_certificate_set_ocsp_status_request_file.3.gz
man/man3/gnutls_certificate_set_ocsp_status_request_function.3.gz

man/man3/gnutls_certificate_set_pin_function.3.gz
man/man3/gnutls_certificate_set_retrieve_function.3.gz
man/man3/gnutls_certificate_set_retrieve_function2.3.gz
man/man3/gnutls_certificate_set_rsa_export_params.3.gz
man/man3/gnutls_certificate_set_trust_list.3.gz
man/man3/gnutls_certificate_set_verify_flags.3.gz
man/man3/gnutls_certificate_set_verify_function.3.gz

man/man3/gnutls_certificate_type_get_id.3.gz
man/man3/gnutls_certificate_type_get_name.3.gz
man/man3/gnutls_certificate_type_list.3.gz
man/man3/gnutls_certificate_type_set_priority.3.gz
man/man3/gnutls_certificate_verification_status_print.3.gz
man/man3/gnutls_certificate_verify_peers.3.gz
man/man3/gnutls_certificate_verify_peers2.3.gz

man/man3/gnutls_cipher_list.3.gz
man/man3/gnutls_cipher_self_test.3.gz
man/man3/gnutls_cipher_set_iv.3.gz
man/man3/gnutls_cipher_set_priority.3.gz
man/man3/gnutls_cipher_suite_get_name.3.gz
man/man3/gnutls_cipher_suite_info.3.gz
man/man3/gnutls_cipher_tag.3.gz

man/man3/gnutls_compression_get_id.3.gz
man/man3/gnutls_compression_get_name.3.gz
man/man3/gnutls_compression_list.3.gz
man/man3/gnutls_compression_set_priority.3.gz
man/man3/gnutls_credentials_clear.3.gz
man/man3/gnutls_credentials_get.3.gz
man/man3/gnutls_credentials_set.3.gz
man/man3/gnutls_crypto_register_aead_cipher.3.gz
man/man3/gnutls_crypto_register_cipher.3.gz
man/man3/gnutls_crypto_register_digest.3.gz
man/man3/gnutls_crypto_register_mac.3.gz
man/man3/gnutls_db_check_entry.3.gz
man/man3/gnutls_db_check_entry_time.3.gz
man/man3/gnutls_db_get_default_cache_expiration.3.gz

man/man3/gnutls_dh_params_generate2.3.gz
man/man3/gnutls_dh_params_import_pkcs3.3.gz
man/man3/gnutls_dh_params_import_raw.3.gz
man/man3/gnutls_dh_params_import_raw2.3.gz
man/man3/gnutls_dh_params_init.3.gz
man/man3/gnutls_dh_set_prime_bits.3.gz
man/man3/gnutls_digest_get_id.3.gz
man/man3/gnutls_digest_get_name.3.gz
man/man3/gnutls_digest_get_oid.3.gz
man/man3/gnutls_digest_list.3.gz
man/man3/gnutls_digest_self_test.3.gz
man/man3/gnutls_dtls_cookie_send.3.gz

man/man3/gnutls_dtls_set_mtu.3.gz
man/man3/gnutls_dtls_set_timeouts.3.gz
man/man3/gnutls_ecc_curve_get.3.gz
man/man3/gnutls_ecc_curve_get_id.3.gz
man/man3/gnutls_ecc_curve_get_name.3.gz
man/man3/gnutls_ecc_curve_get_oid.3.gz
man/man3/gnutls_ecc_curve_get_size.3.gz
man/man3/gnutls_ecc_curve_list.3.gz
man/man3/gnutls_error_is_fatal.3.gz
man/man3/gnutls_error_to_alert.3.gz
man/man3/gnutls_est_record_overhead_size.3.gz
man/man3/gnutls_ext_get_data.3.gz
man/man3/gnutls_ext_register.3.gz
man/man3/gnutls_ext_set_data.3.gz
man/man3/gnutls_fingerprint.3.gz
man/man3/gnutls_fips140_mode_enabled.3.gz
man/man3/gnutls_global_deinit.3.gz

man/man3/gnutls_heartbeat_set_timeouts.3.gz
man/man3/gnutls_hex2bin.3.gz
man/man3/gnutls_hex_decode.3.gz
man/man3/gnutls_hex_decode2.3.gz
man/man3/gnutls_hex_encode.3.gz
man/man3/gnutls_hex_encode2.3.gz
man/man3/gnutls_hmac.3.gz
man/man3/gnutls_hmac_deinit.3.gz
man/man3/gnutls_hmac_fast.3.gz

man/man3/gnutls_kx_get_id.3.gz
man/man3/gnutls_kx_get_name.3.gz
man/man3/gnutls_kx_list.3.gz
man/man3/gnutls_kx_set_priority.3.gz
man/man3/gnutls_load_file.3.gz
man/man3/gnutls_mac_get.3.gz
man/man3/gnutls_mac_get_id.3.gz

man/man3/gnutls_mac_get_nonce_size.3.gz
man/man3/gnutls_mac_list.3.gz
man/man3/gnutls_mac_self_test.3.gz
man/man3/gnutls_memcmp.3.gz
man/man3/gnutls_memset.3.gz
man/man3/gnutls_ocsp_req_add_cert.3.gz
man/man3/gnutls_ocsp_req_add_cert_id.3.gz
man/man3/gnutls_ocsp_req_deinit.3.gz

man/man3/gnutls_ocsp_resp_get_nonce.3.gz
man/man3/gnutls_ocsp_resp_get_produced.3.gz
man/man3/gnutls_ocsp_resp_get_responder.3.gz
man/man3/gnutls_ocsp_resp_get_responder_raw_id.3.gz
man/man3/gnutls_ocsp_resp_get_response.3.gz
man/man3/gnutls_ocsp_resp_get_signature.3.gz
man/man3/gnutls_ocsp_resp_get_signature_algorithm.3.gz

man/man3/gnutls_ocsp_status_request_enable_client.3.gz
man/man3/gnutls_ocsp_status_request_get.3.gz
man/man3/gnutls_ocsp_status_request_is_checked.3.gz
man/man3/gnutls_oid_to_digest.3.gz
man/man3/gnutls_oid_to_ecc_curve.3.gz
man/man3/gnutls_oid_to_pk.3.gz
man/man3/gnutls_oid_to_sign.3.gz
man/man3/gnutls_openpgp_crt_check_email.3.gz
man/man3/gnutls_openpgp_crt_check_hostname.3.gz
man/man3/gnutls_openpgp_crt_check_hostname2.3.gz
man/man3/gnutls_openpgp_crt_deinit.3.gz

man/man3/gnutls_packet_deinit.3.gz
man/man3/gnutls_packet_get.3.gz
man/man3/gnutls_pcert_deinit.3.gz
man/man3/gnutls_pcert_export_openpgp.3.gz
man/man3/gnutls_pcert_export_x509.3.gz
man/man3/gnutls_pcert_import_openpgp.3.gz
man/man3/gnutls_pcert_import_openpgp_raw.3.gz
man/man3/gnutls_pcert_import_x509.3.gz
man/man3/gnutls_pcert_import_x509_list.3.gz
man/man3/gnutls_pcert_import_x509_raw.3.gz
man/man3/gnutls_pcert_list_import_x509_raw.3.gz
man/man3/gnutls_pem_base64_decode.3.gz
man/man3/gnutls_pem_base64_decode2.3.gz
man/man3/gnutls_pem_base64_encode.3.gz
man/man3/gnutls_pem_base64_encode2.3.gz
man/man3/gnutls_perror.3.gz
man/man3/gnutls_pk_algorithm_get_name.3.gz
man/man3/gnutls_pk_bits_to_sec_param.3.gz
man/man3/gnutls_pk_get_id.3.gz
man/man3/gnutls_pk_get_name.3.gz
man/man3/gnutls_pk_get_oid.3.gz
man/man3/gnutls_pk_list.3.gz
man/man3/gnutls_pk_self_test.3.gz
man/man3/gnutls_pk_to_sign.3.gz
man/man3/gnutls_pkcs11_add_provider.3.gz
man/man3/gnutls_pkcs11_copy_attached_extension.3.gz
man/man3/gnutls_pkcs11_copy_pubkey.3.gz
man/man3/gnutls_pkcs11_copy_secret_key.3.gz
man/man3/gnutls_pkcs11_copy_x509_crt.3.gz
man/man3/gnutls_pkcs11_copy_x509_crt2.3.gz
man/man3/gnutls_pkcs11_copy_x509_privkey.3.gz
man/man3/gnutls_pkcs11_copy_x509_privkey2.3.gz
man/man3/gnutls_pkcs11_crt_is_known.3.gz
man/man3/gnutls_pkcs11_deinit.3.gz
man/man3/gnutls_pkcs11_delete_url.3.gz
man/man3/gnutls_pkcs11_get_pin_function.3.gz
man/man3/gnutls_pkcs11_get_raw_issuer.3.gz
man/man3/gnutls_pkcs11_get_raw_issuer_by_dn.3.gz
man/man3/gnutls_pkcs11_get_raw_issuer_by_subject_key_id.3.gz
man/man3/gnutls_pkcs11_init.3.gz
man/man3/gnutls_pkcs11_obj_deinit.3.gz
man/man3/gnutls_pkcs11_obj_export.3.gz

man/man3/gnutls_pkcs11_obj_get_type.3.gz
man/man3/gnutls_pkcs11_obj_import_url.3.gz
man/man3/gnutls_pkcs11_obj_init.3.gz
man/man3/gnutls_pkcs11_obj_list_import_url3.3.gz
man/man3/gnutls_pkcs11_obj_list_import_url4.3.gz
man/man3/gnutls_pkcs11_obj_set_info.3.gz
man/man3/gnutls_pkcs11_obj_set_pin_function.3.gz
man/man3/gnutls_pkcs11_privkey_cpy.3.gz
man/man3/gnutls_pkcs11_privkey_deinit.3.gz
man/man3/gnutls_pkcs11_privkey_export_pubkey.3.gz
man/man3/gnutls_pkcs11_privkey_export_url.3.gz
man/man3/gnutls_pkcs11_privkey_generate.3.gz
man/man3/gnutls_pkcs11_privkey_generate2.3.gz
man/man3/gnutls_pkcs11_privkey_generate3.3.gz
man/man3/gnutls_pkcs11_privkey_get_info.3.gz
man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3.gz
man/man3/gnutls_pkcs11_privkey_import_url.3.gz

man/man3/gnutls_pkcs11_type_get_name.3.gz
man/man3/gnutls_pkcs12_bag_decrypt.3.gz
man/man3/gnutls_pkcs12_bag_deinit.3.gz
man/man3/gnutls_pkcs12_bag_enc_info.3.gz
man/man3/gnutls_pkcs12_bag_encrypt.3.gz
man/man3/gnutls_pkcs12_bag_get_count.3.gz
man/man3/gnutls_pkcs12_bag_get_data.3.gz

man/man3/gnutls_pkcs12_bag_set_data.3.gz
man/man3/gnutls_pkcs12_bag_set_friendly_name.3.gz
man/man3/gnutls_pkcs12_bag_set_key_id.3.gz
man/man3/gnutls_pkcs12_bag_set_privkey.3.gz
man/man3/gnutls_pkcs12_deinit.3.gz
man/man3/gnutls_pkcs12_export.3.gz
man/man3/gnutls_pkcs12_export2.3.gz
man/man3/gnutls_pkcs12_generate_mac.3.gz
man/man3/gnutls_pkcs12_generate_mac2.3.gz
man/man3/gnutls_pkcs12_get_bag.3.gz
man/man3/gnutls_pkcs12_import.3.gz
man/man3/gnutls_pkcs12_init.3.gz
man/man3/gnutls_pkcs12_mac_info.3.gz
man/man3/gnutls_pkcs12_set_bag.3.gz
man/man3/gnutls_pkcs12_simple_parse.3.gz
man/man3/gnutls_pkcs12_verify_mac.3.gz
man/man3/gnutls_pkcs7_add_attr.3.gz
man/man3/gnutls_pkcs7_attrs_deinit.3.gz
man/man3/gnutls_pkcs7_deinit.3.gz
man/man3/gnutls_pkcs7_delete_crl.3.gz
man/man3/gnutls_pkcs7_delete_crt.3.gz
man/man3/gnutls_pkcs7_export.3.gz
man/man3/gnutls_pkcs7_export2.3.gz
man/man3/gnutls_pkcs7_get_attr.3.gz
man/man3/gnutls_pkcs7_get_crl_count.3.gz
man/man3/gnutls_pkcs7_get_crl_raw.3.gz
man/man3/gnutls_pkcs7_get_crl_raw2.3.gz
man/man3/gnutls_pkcs7_get_crt_count.3.gz
man/man3/gnutls_pkcs7_get_crt_raw.3.gz
man/man3/gnutls_pkcs7_get_crt_raw2.3.gz
man/man3/gnutls_pkcs7_get_embedded_data.3.gz
man/man3/gnutls_pkcs7_get_signature_count.3.gz
man/man3/gnutls_pkcs7_get_signature_info.3.gz
man/man3/gnutls_pkcs7_import.3.gz
man/man3/gnutls_pkcs7_init.3.gz
man/man3/gnutls_pkcs7_print.3.gz
man/man3/gnutls_pkcs7_set_crl.3.gz
man/man3/gnutls_pkcs7_set_crl_raw.3.gz
man/man3/gnutls_pkcs7_set_crt.3.gz
man/man3/gnutls_pkcs7_set_crt_raw.3.gz
man/man3/gnutls_pkcs7_sign.3.gz
man/man3/gnutls_pkcs7_signature_info_deinit.3.gz
man/man3/gnutls_pkcs7_verify.3.gz
man/man3/gnutls_pkcs7_verify_direct.3.gz
man/man3/gnutls_pkcs8_info.3.gz
man/man3/gnutls_pkcs_schema_get_name.3.gz
man/man3/gnutls_pkcs_schema_get_oid.3.gz
man/man3/gnutls_prf.3.gz
man/man3/gnutls_prf_raw.3.gz
man/man3/gnutls_prf_rfc5705.3.gz
man/man3/gnutls_priority_certificate_type_list.3.gz
man/man3/gnutls_priority_cipher_list.3.gz
man/man3/gnutls_priority_compression_list.3.gz

man/man3/gnutls_priority_set.3.gz
man/man3/gnutls_priority_set_direct.3.gz
man/man3/gnutls_priority_sign_list.3.gz
man/man3/gnutls_priority_string_list.3.gz
man/man3/gnutls_privkey_decrypt_data.3.gz
man/man3/gnutls_privkey_deinit.3.gz
man/man3/gnutls_privkey_export_dsa_raw.3.gz
man/man3/gnutls_privkey_export_ecc_raw.3.gz
man/man3/gnutls_privkey_export_openpgp.3.gz
man/man3/gnutls_privkey_export_pkcs11.3.gz
man/man3/gnutls_privkey_export_rsa_raw.3.gz
man/man3/gnutls_privkey_export_x509.3.gz
man/man3/gnutls_privkey_generate.3.gz
man/man3/gnutls_privkey_get_pk_algorithm.3.gz
man/man3/gnutls_privkey_get_type.3.gz

man/man3/gnutls_privkey_import_ecc_raw.3.gz
man/man3/gnutls_privkey_import_ext.3.gz
man/man3/gnutls_privkey_import_ext2.3.gz
man/man3/gnutls_privkey_import_ext3.3.gz
man/man3/gnutls_privkey_import_openpgp.3.gz
man/man3/gnutls_privkey_import_openpgp_raw.3.gz
man/man3/gnutls_privkey_import_pkcs11.3.gz

man/man3/gnutls_privkey_set_pin_function.3.gz
man/man3/gnutls_privkey_sign_data.3.gz
man/man3/gnutls_privkey_sign_hash.3.gz
man/man3/gnutls_privkey_sign_raw_data.3.gz
man/man3/gnutls_privkey_status.3.gz
man/man3/gnutls_privkey_verify_params.3.gz
man/man3/gnutls_protocol_get_id.3.gz
man/man3/gnutls_protocol_get_name.3.gz
man/man3/gnutls_protocol_get_version.3.gz
man/man3/gnutls_protocol_list.3.gz
man/man3/gnutls_protocol_set_priority.3.gz
man/man3/gnutls_psk_allocate_client_credentials.3.gz
man/man3/gnutls_psk_allocate_server_credentials.3.gz
man/man3/gnutls_psk_client_get_hint.3.gz

man/man3/gnutls_pubkey_get_openpgp_key_id.3.gz
man/man3/gnutls_pubkey_get_pk_algorithm.3.gz
man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3.gz
man/man3/gnutls_pubkey_get_verify_algorithm.3.gz
man/man3/gnutls_pubkey_import.3.gz
man/man3/gnutls_pubkey_import_dsa_raw.3.gz
man/man3/gnutls_pubkey_import_ecc_raw.3.gz

man/man3/gnutls_pubkey_import_openpgp.3.gz
man/man3/gnutls_pubkey_import_openpgp_raw.3.gz
man/man3/gnutls_pubkey_import_pkcs11.3.gz
man/man3/gnutls_pubkey_import_pkcs11_url.3.gz
man/man3/gnutls_pubkey_import_privkey.3.gz
man/man3/gnutls_pubkey_import_rsa_raw.3.gz
man/man3/gnutls_pubkey_import_tpm_raw.3.gz

man/man3/gnutls_pubkey_print.3.gz
man/man3/gnutls_pubkey_set_key_usage.3.gz
man/man3/gnutls_pubkey_set_pin_function.3.gz
man/man3/gnutls_pubkey_verify_data.3.gz
man/man3/gnutls_pubkey_verify_data2.3.gz
man/man3/gnutls_pubkey_verify_hash.3.gz
man/man3/gnutls_pubkey_verify_hash2.3.gz
man/man3/gnutls_pubkey_verify_params.3.gz
man/man3/gnutls_random_art.3.gz

man/man3/gnutls_record_check_pending.3.gz
man/man3/gnutls_record_cork.3.gz
man/man3/gnutls_record_disable_padding.3.gz
man/man3/gnutls_record_discard_queued.3.gz
man/man3/gnutls_record_get_direction.3.gz
man/man3/gnutls_record_get_discarded.3.gz
man/man3/gnutls_record_get_max_size.3.gz
man/man3/gnutls_record_get_state.3.gz
man/man3/gnutls_record_overhead_size.3.gz
man/man3/gnutls_record_recv.3.gz
man/man3/gnutls_record_recv_packet.3.gz
man/man3/gnutls_record_recv_seq.3.gz
man/man3/gnutls_record_send.3.gz
man/man3/gnutls_record_send_range.3.gz
man/man3/gnutls_record_set_max_empty_records.3.gz
man/man3/gnutls_record_set_max_size.3.gz
man/man3/gnutls_record_set_state.3.gz
man/man3/gnutls_record_set_timeout.3.gz
man/man3/gnutls_record_uncork.3.gz
man/man3/gnutls_register_custom_url.3.gz
man/man3/gnutls_rehandshake.3.gz
man/man3/gnutls_rnd.3.gz
man/man3/gnutls_rnd_refresh.3.gz
man/man3/gnutls_rsa_export_get_modulus_bits.3.gz
man/man3/gnutls_rsa_export_get_pubkey.3.gz
man/man3/gnutls_rsa_params_cpy.3.gz
man/man3/gnutls_rsa_params_deinit.3.gz
man/man3/gnutls_rsa_params_export_pkcs1.3.gz
man/man3/gnutls_rsa_params_export_raw.3.gz
man/man3/gnutls_rsa_params_generate2.3.gz
man/man3/gnutls_rsa_params_import_pkcs1.3.gz
man/man3/gnutls_rsa_params_import_raw.3.gz
man/man3/gnutls_rsa_params_init.3.gz
man/man3/gnutls_safe_renegotiation_status.3.gz
man/man3/gnutls_sec_param_get_name.3.gz
man/man3/gnutls_sec_param_to_pk_bits.3.gz

man/man3/gnutls_server_name_set.3.gz
man/man3/gnutls_session_channel_binding.3.gz
man/man3/gnutls_session_enable_compatibility_mode.3.gz
man/man3/gnutls_session_etm_status.3.gz
man/man3/gnutls_session_ext_master_secret_status.3.gz
man/man3/gnutls_session_force_valid.3.gz
man/man3/gnutls_session_get_data.3.gz
man/man3/gnutls_session_get_data2.3.gz

man/man3/gnutls_session_get_id2.3.gz
man/man3/gnutls_session_get_ptr.3.gz
man/man3/gnutls_session_get_random.3.gz
man/man3/gnutls_session_get_verify_cert_status.3.gz
man/man3/gnutls_session_is_resumed.3.gz
man/man3/gnutls_session_resumption_requested.3.gz
man/man3/gnutls_session_set_data.3.gz
man/man3/gnutls_session_set_id.3.gz
man/man3/gnutls_session_set_premaster.3.gz
man/man3/gnutls_session_set_ptr.3.gz
man/man3/gnutls_session_set_verify_cert.3.gz
man/man3/gnutls_session_set_verify_cert2.3.gz
man/man3/gnutls_session_set_verify_function.3.gz
man/man3/gnutls_session_ticket_enable_client.3.gz
man/man3/gnutls_session_ticket_enable_server.3.gz
man/man3/gnutls_session_ticket_key_generate.3.gz
man/man3/gnutls_set_default_export_priority.3.gz
man/man3/gnutls_set_default_priority.3.gz
man/man3/gnutls_sign_algorithm_get.3.gz
man/man3/gnutls_sign_algorithm_get_client.3.gz
man/man3/gnutls_sign_algorithm_get_requested.3.gz
man/man3/gnutls_sign_callback_get.3.gz
man/man3/gnutls_sign_callback_set.3.gz
man/man3/gnutls_sign_get_hash_algorithm.3.gz
man/man3/gnutls_sign_get_id.3.gz
man/man3/gnutls_sign_get_name.3.gz
man/man3/gnutls_sign_get_oid.3.gz
man/man3/gnutls_sign_get_pk_algorithm.3.gz
man/man3/gnutls_sign_is_secure.3.gz
man/man3/gnutls_sign_list.3.gz
man/man3/gnutls_srp_allocate_client_credentials.3.gz
man/man3/gnutls_srp_allocate_server_credentials.3.gz
man/man3/gnutls_srp_base64_decode.3.gz
man/man3/gnutls_srp_base64_decode2.3.gz
man/man3/gnutls_srp_base64_encode.3.gz
man/man3/gnutls_srp_base64_encode2.3.gz
man/man3/gnutls_srp_free_client_credentials.3.gz
man/man3/gnutls_srp_free_server_credentials.3.gz
man/man3/gnutls_srp_server_get_username.3.gz

man/man3/gnutls_subject_alt_names_init.3.gz
man/man3/gnutls_subject_alt_names_set.3.gz
man/man3/gnutls_supplemental_get_name.3.gz
man/man3/gnutls_supplemental_recv.3.gz
man/man3/gnutls_supplemental_register.3.gz
man/man3/gnutls_supplemental_send.3.gz
man/man3/gnutls_system_key_add_x509.3.gz
man/man3/gnutls_system_key_delete.3.gz
man/man3/gnutls_system_key_iter_deinit.3.gz
man/man3/gnutls_system_key_iter_get_info.3.gz
man/man3/gnutls_system_recv_timeout.3.gz
man/man3/gnutls_tdb_deinit.3.gz
man/man3/gnutls_tdb_init.3.gz
man/man3/gnutls_tdb_set_store_commitment_func.3.gz

man/man3/gnutls_x509_crq_get_key_usage.3.gz
man/man3/gnutls_x509_crq_get_pk_algorithm.3.gz
man/man3/gnutls_x509_crq_get_private_key_usage_period.3.gz
man/man3/gnutls_x509_crq_get_signature_algorithm.3.gz
man/man3/gnutls_x509_crq_get_subject_alt_name.3.gz
man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3.gz
man/man3/gnutls_x509_crq_get_version.3.gz

man/man3/gnutls_x509_crq_sign.3.gz
man/man3/gnutls_x509_crq_sign2.3.gz
man/man3/gnutls_x509_crq_verify.3.gz
man/man3/gnutls_x509_crt_check_email.3.gz
man/man3/gnutls_x509_crt_check_hostname.3.gz
man/man3/gnutls_x509_crt_check_hostname2.3.gz
man/man3/gnutls_x509_crt_check_issuer.3.gz

man/man3/gnutls_x509_crt_get_name_constraints.3.gz
man/man3/gnutls_x509_crt_get_pk_algorithm.3.gz
man/man3/gnutls_x509_crt_get_pk_dsa_raw.3.gz
man/man3/gnutls_x509_crt_get_pk_ecc_raw.3.gz
man/man3/gnutls_x509_crt_get_pk_rsa_raw.3.gz
man/man3/gnutls_x509_crt_get_policy.3.gz
man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3.gz

man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3.gz
man/man3/gnutls_x509_crt_get_subject_key_id.3.gz
man/man3/gnutls_x509_crt_get_subject_unique_id.3.gz
man/man3/gnutls_x509_crt_get_verify_algorithm.3.gz
man/man3/gnutls_x509_crt_get_version.3.gz
man/man3/gnutls_x509_crt_import.3.gz
man/man3/gnutls_x509_crt_import_pkcs11.3.gz
man/man3/gnutls_x509_crt_import_url.3.gz
man/man3/gnutls_x509_crt_init.3.gz
man/man3/gnutls_x509_crt_list_import.3.gz
man/man3/gnutls_x509_crt_list_import2.3.gz

man/man3/gnutls_x509_crt_set_issuer_alt_name.3.gz
man/man3/gnutls_x509_crt_set_issuer_dn.3.gz
man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3.gz
man/man3/gnutls_x509_crt_set_issuer_unique_id.3.gz
man/man3/gnutls_x509_crt_set_key.3.gz
man/man3/gnutls_x509_crt_set_key_purpose_oid.3.gz
man/man3/gnutls_x509_crt_set_key_usage.3.gz

man/man3/gnutls_x509_crt_set_subject_alt_name.3.gz
man/man3/gnutls_x509_crt_set_subject_alternative_name.3.gz
man/man3/gnutls_x509_crt_set_subject_key_id.3.gz
man/man3/gnutls_x509_crt_set_subject_unique_id.3.gz
man/man3/gnutls_x509_crt_set_version.3.gz
man/man3/gnutls_x509_crt_sign.3.gz
man/man3/gnutls_x509_crt_sign2.3.gz
man/man3/gnutls_x509_crt_verify.3.gz
man/man3/gnutls_x509_crt_verify_data2.3.gz
man/man3/gnutls_x509_crt_verify_hash.3.gz
man/man3/gnutls_x509_dn_deinit.3.gz
man/man3/gnutls_x509_dn_export.3.gz
man/man3/gnutls_x509_dn_export2.3.gz
man/man3/gnutls_x509_dn_get_rdn_ava.3.gz
man/man3/gnutls_x509_dn_get_str.3.gz
man/man3/gnutls_x509_dn_import.3.gz
man/man3/gnutls_x509_dn_init.3.gz
man/man3/gnutls_x509_dn_oid_known.3.gz

man/man3/gnutls_x509_privkey_import_rsa_raw2.3.gz
man/man3/gnutls_x509_privkey_init.3.gz
man/man3/gnutls_x509_privkey_sec_param.3.gz
man/man3/gnutls_x509_privkey_set_pin_function.3.gz
man/man3/gnutls_x509_privkey_sign_data.3.gz
man/man3/gnutls_x509_privkey_sign_hash.3.gz
man/man3/gnutls_x509_privkey_verify_params.3.gz

man/man3/gnutls_x509_trust_list_add_trust_mem.3.gz
man/man3/gnutls_x509_trust_list_deinit.3.gz
man/man3/gnutls_x509_trust_list_get_issuer.3.gz
man/man3/gnutls_x509_trust_list_get_issuer_by_dn.3.gz
man/man3/gnutls_x509_trust_list_get_issuer_by_subject_key_id.3.gz
man/man3/gnutls_x509_trust_list_init.3.gz
man/man3/gnutls_x509_trust_list_iter_deinit.3.gz
man/man3/gnutls_x509_trust_list_iter_get_ca.3.gz
man/man3/gnutls_x509_trust_list_remove_cas.3.gz
man/man3/gnutls_x509_trust_list_remove_trust_file.3.gz
man/man3/gnutls_x509_trust_list_remove_trust_mem.3.gz

Lines 3-9 Link Here

(-)security/gsasl/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gsasl	4	PORTNAME= gsasl
5	PORTVERSION= 1.8.0	5	PORTVERSION= 1.8.0
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= GNU	8	MASTER_SITES= GNU
9		9

Lines 2-7 Link Here

(-)security/hs-gnutls/Makefile (+1 lines)
2		2
3	PORTNAME= gnutls	3	PORTNAME= gnutls
4	PORTVERSION= 0.2	4	PORTVERSION= 0.2
		5	PORTREVISION= 1
5	CATEGORIES= security haskell	6	CATEGORIES= security haskell
6		7
7	MAINTAINER= haskell@FreeBSD.org	8	MAINTAINER= haskell@FreeBSD.org




# $FreeBSD$

PORTNAME=	libprelude
PORTVERSION=	1.2.6
PORTREVISION=	9
CATEGORIES=	security
MASTER_SITES=	http://www.prelude-siem.org/attachments/download/410/

MAINTAINER=	koobs@FreeBSD.org
COMMENT=	Sensor support library from Prelude SIEM

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
		libgmp.so:${PORTSDIR}/math/gmp \
		libgnutls.so:${PORTSDIR}/security/gnutls \
		libgcrypt.so:${PORTSDIR}/security/libgcrypt
		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
		libnettle.so:${PORTSDIR}/security/nettle \
		libp11-kit.so:${PORTSDIR}/security/p11-kit

BROKEN_sparc64=	does not compile

OPTIONS_DEFINE=	DOCS PERL PYTHON
OPTIONS_SUB=	yes

USES=		charsetfix gettext-runtime gmake iconv libtool pathfix pkgconfig
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--without-lua \
		--without-python3 \
		--without-swig \
		--without-valgrind \
		ac_cv_path_RUBY=
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip

ETCDIR=		${PREFIX}/etc/prelude
PORTDOCS=	*

PERL_CONFIGURE_WITH=	perl=${PERL}
PERL_USES=		perl5
PYTHON_CONFIGURE_WITH=	python2=${PYTHON_CMD}
PYTHON_USES=		python:2.7
PYTHON_PLIST_SUB=	VERSION="${PORTVERSION}"
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MPYTHON}
PLIST_SUB+=	PYTHON_VER="${PYTHON_VER}" VERSION="${PORTVERSION}"
.endif

.include <bsd.port.pre.mk>

post-patch:
	@${REINPLACE_CMD} '\,gnutls/extra\.h,d' \
		${WRKSRC}/prelude-admin/prelude-admin.c \
		${WRKSRC}/prelude-admin/server.c

post-install:
	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1

.for f in client.conf global.conf idmef-client.conf tls.conf
	${MV} ${STAGEDIR}${ETCDIR}/default/${f} \
		${STAGEDIR}${ETCDIR}/default/${f}.sample
	${RM} ${STAGEDIR}${ETCDIR}/default/${f}	# Remove files install-data-local installs
.endfor

.include <bsd.port.mk>
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${STAGEDIR}${DOCSDIR}
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)security/libprelude/distinfo (-2 / +2 lines)
1	SHA256 (libprelude-1.0.1.tar.gz) = 852d981e7d23e49ec25a96a7f54c19a7ee72cd786a0d02c43a27e3e770d5cb6b	1	SHA256 (libprelude-1.2.6.tar.gz) = 37541fc6c0593da09410d74b3801cdc672344bdfd711f689157fd41eac06c9c7
2	SIZE (libprelude-1.0.1.tar.gz) = 2791973	2	SIZE (libprelude-1.2.6.tar.gz) = 2926210




--- src/include/prelude-plugin.h.orig	2012-06-02 00:12:30.000000000 +0900
+++ src/include/prelude-plugin.h	2012-09-11 15:46:33.000000000 +0900
@@ -61,9 +61,9 @@
  */
 #ifdef PRELUDE_APPLICATION_USE_LIBTOOL2
 # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
-#endif
 
 extern const void *lt_preloaded_symbols[];
+#endif
 
 #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS()         \
         prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols)

Lines 1-7 Link Here

(-)security/libprelude/pkg-descr (-5 / +11 lines)
1	Prelude is a new innovative hybrid Intrusion Detection system designed	1	Prelude is a Universal "Security Information & Event Management" (SIEM)
2	to be very modular, distributed, rock solid and fast.	2	system. Prelude collects, normalizes, sorts, aggregates, correlates and
		3	reports all security-related events.
3		4
4	This library provides a number of features to sensors, including	5	As well as being capable of recovering any type of log (system logs, syslog,
5	communication with the manager.	6	flat files, etc.), Prelude benefits from a native support with a number of
		7	systems dedicated to enriching information even further (snort, samhain,
		8	ossec, auditd, etc.).
6		9
7	WWW: http://www.prelude-ids.org/	10	This library provides functionality for sensors (connection with a manager,
		11	handling sensor-exported options,...).
		12
		13	WWW: https://www.prelude-siem.org/




include/libprelude/idmef.hxx
include/libprelude/idmef-additional-data.h
include/libprelude/idmef-class.h
include/libprelude/idmef-class.hxx
include/libprelude/idmef-criteria.h
include/libprelude/idmef-criteria.hxx
include/libprelude/idmef-criterion-value.h

include/libprelude/idmef-message-print.h
include/libprelude/idmef-message-read.h
include/libprelude/idmef-message-write.h
include/libprelude/idmef-object.h
include/libprelude/idmef-path.h
include/libprelude/idmef-path.hxx
include/libprelude/idmef-time.h

include/libprelude/prelude-list.h
include/libprelude/prelude-log.h
include/libprelude/prelude-log.hxx
include/libprelude/prelude-macros.h
include/libprelude/prelude-message-id.h
include/libprelude/prelude-msg.h
include/libprelude/prelude-msgbuf.h

include/libprelude/prelude-string.h
include/libprelude/prelude-thread.h
include/libprelude/prelude-timer.h
lib/libprelude.a
lib/libprelude.so
lib/libprelude.so.23
lib/libprelude.so.23.1.0
lib/libpreludecpp.a
lib/libpreludecpp.so
lib/libpreludecpp.so.8
lib/libpreludecpp.so.8.0.0
man/man1/prelude-admin.1.gz
%%PERL%%%%SITE_ARCH%%/Prelude.pm
%%PERL%%%%SITE_ARCH%%/auto/Prelude/Prelude.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy-%%VERSION%%-py%%PYTHON_VER%%.egg-info
%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_PreludeEasy.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info
%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
libdata/pkgconfig/libprelude.pc
man/man1/prelude-admin.1.gz
share/aclocal/libprelude.m4
%%PORTDOCS%%share/gtk-doc/html/libprelude/api-index-full.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/ch01.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/deprecated-api-index.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/home.png
%%PORTDOCS%%share/gtk-doc/html/libprelude/index.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/index.sgml
%%PORTDOCS%%share/gtk-doc/html/libprelude/left.png
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-additional-data.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criteria.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criterion-value.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-data.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-print.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-read.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-write.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-path.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-time.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-tree-wrap.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-value.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-async.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client-profile.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection-pool.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-error.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-failover.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-hash.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-ident.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-inttypes.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-io.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-linked-object.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-list.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-log.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msg.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msgbuf.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option-wide.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-plugin.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-string.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-timer.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp
%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp2
%%PORTDOCS%%share/gtk-doc/html/libprelude/object-tree.html
%%PORTDOCS%%share/gtk-doc/html/libprelude/right.png
%%PORTDOCS%%share/gtk-doc/html/libprelude/style.css
%%PORTDOCS%%share/gtk-doc/html/libprelude/up.png
%%DATADIR%%/swig/libpreludecpp.i
%%PERL%%%%DATADIR%%/swig/perl/libpreludecpp-perl.i
%%PYTHON%%%%DATADIR%%/swig/python/libpreludecpp-python.i
@dir(,,711) %%ETCDIR%%/profile
@dir(,,711) /var/spool/prelude




# $FreeBSD$

PORTNAME=	libpreludedb
PORTVERSION=	1.2.6
PORTREVISION=	10
CATEGORIES=	security
MASTER_SITES=	http://www.prelude-siem.org/attachments/download/408/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Library to access Prelude IDMEF database

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libprelude.so:${PORTSDIR}/security/libprelude
		libgmp.so:${PORTSDIR}/math/gmp \
		libgnutls.so:${PORTSDIR}/security/gnutls \
		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
		libprelude.so:${PORTSDIR}/security/libprelude \
		libnettle.so:${PORTSDIR}/security/nettle \
		libp11-kit.so:${PORTSDIR}/security/p11-kit

USES=		gmake libtool
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--without-swig \
		--without-python3
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes

OPTIONS_DEFINE=		DOCS PYTHON

OPTIONS_DEFINE=		DOCS PERL PYTHON
OPTIONS_MULTI=		DB
OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
OPTIONS_DEFAULT=	MYSQL

MYSQL_DESC=		MySQL plugin
MYSQL_USE=		mysql=yes
MYSQL_CONFIGURE_WITH=	mysql
PERL_DESC=		Perl bindings
PERL_USES=		perl5
PERL_USE=		perl5=build,run
PERL_CONFIGURE_WITH=	perl
PGSQL_DESC=		PostgreSQL plugin
PGSQL_USES=		pgsql
PGSQL_CONFIGURE_WITH=	postgresql
PYTHON_USES=		python:2.7
PYTHON_CONFIGURE_WITH=	python2=${PYTHON_CMD}
PYTHON_PLIST_SUB=	VERSION=${PORTVERSION}
SQLITE_DESC=		SQLite3 plugin
SQLITE_USE=		sqlite=yes
SQLITE_CONFIGURE_WITH=	sqlite3

post-install:
	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 \
		${STAGEDIR}${MAN1PREFIX}/man/man1

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* \
		${STAGEDIR}${DOCSDIR}

post-install-PERL-on:
	@${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \
		-name "*.so" | ${XARGS} ${STRIP_CMD}

post-install-PYTHON-on:
	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
		-name "*.so" | ${XARGS} ${STRIP_CMD}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)security/libpreludedb/distinfo (-2 / +2 lines)
1	SHA256 (libpreludedb-1.0.1p1.tar.gz) = c62a30d2d96bea4188328124a85a53e2aa1e6effebe15c83dd4440248e0f4f61	1	SHA256 (libpreludedb-1.2.6.tar.gz) = e855358b90811132c5e2e9fecf168eedee3c2bda03cd8eb4ae34a6e31f1540b1
2	SIZE (libpreludedb-1.0.1p1.tar.gz) = 939675	2	SIZE (libpreludedb-1.2.6.tar.gz) = 1230637




--- Makefile.in.orig	2009-07-15 13:49:18.000000000 +0600
+++ Makefile.in	2009-09-04 10:56:03.000000000 +0600
@@ -645,9 +645,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 EXTRA_DIST = LICENSE.README HACKING.README
-SUBDIRS = m4 libmissing src plugins bindings docs
+SUBDIRS = m4 libmissing src plugins bindings
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/aclocal.m4 \

Lines 1-6 Link Here

(-)security/libpreludedb/pkg-descr (-3 / +9 lines)
1	Prelude is a new innovative hybrid Intrusion Detection system designed	1	Prelude is a Universal "Security Information & Event Management" (SIEM)
2	to be very modular, distributed, rock solid and fast.	2	system. Prelude collects, normalizes, sorts, aggregates, correlates and
		3	reports all security-related events.
		4
		5	As well as being capable of recovering any type of log (system logs, syslog,
		6	flat files, etc.), Prelude benefits from a native support with a number of
		7	systems dedicated to enriching information even further (snort, samhain,
		8	ossec, auditd, etc.).
3		9
4	This library provides a framework for easy access to the Prelude database.	10	This library provides a framework for easy access to the Prelude database.
5		11
6	WWW: http://www.prelude-ids.org/	12	WWW: https://www.prelude-siem.org/




bin/libpreludedb-config
bin/preludedb-admin
include/libpreludedb/preludedb.h
include/libpreludedb/preludedb.hxx
include/libpreludedb/preludedb-error.h
include/libpreludedb/preludedb-error.hxx
include/libpreludedb/preludedb-path-selection.h
include/libpreludedb/preludedb-plugin-format.h
include/libpreludedb/preludedb-plugin-sql.h
include/libpreludedb/preludedb-sql-settings.h
include/libpreludedb/preludedb-sql.h
include/libpreludedb/preludedb-sql.hxx
include/libpreludedb/preludedb-version.h
lib/libpreludedb.so
lib/libpreludedb.so.7
lib/libpreludedb.so.7.0.0
lib/libpreludedbcpp.so
lib/libpreludedbcpp.so.2
lib/libpreludedbcpp.so.2.0.0
lib/libpreludedb/plugins/formats/classic.so
%%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
%%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
%%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so
%%PERL%%%%SITE_ARCH%%/PreludeDB.pm
%%PERL%%%%SITE_ARCH%%/auto/PreludeDB/PreludeDB.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-%%VERSION%%-py%%PYTHON_VER%%.egg-info
%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc
man/man1/preludedb-admin.1.gz
share/aclocal/libpreludedb.m4
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/api-index-full.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/ch01.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/deprecated-api-index.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/home.png
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.sgml
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/left.png
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-error.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-path-selection.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-format.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-sql.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql-settings.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-version.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/object-tree.html
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/right.png
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/style.css
%%PORTDOCS%%share/gtk-doc/html/libpreludedb/up.png
%%DATADIR%%/classic/mysql-update-14-1.sql
%%DATADIR%%/classic/mysql-update-14-2.sql
%%DATADIR%%/classic/mysql-update-14-3.sql

Lines 3-8 Link Here

(-)security/openconnect/Makefile (+1 lines)
3		3
4	PORTNAME= openconnect	4	PORTNAME= openconnect
5	PORTVERSION= 7.06	5	PORTVERSION= 7.06
		6	PORTREVISION= 1
6	CATEGORIES= security	7	CATEGORIES= security
7	MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \	8	MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \
8	http://mirrors.rit.edu/zi/	9	http://mirrors.rit.edu/zi/

Lines 2-7 Link Here

(-)security/openvas-cli/Makefile (+1 lines)
2		2
3	PORTNAME= openvas-cli	3	PORTNAME= openvas-cli
4	PORTVERSION= 1.4.3	4	PORTVERSION= 1.4.3
		5	PORTREVISION= 1
5	CATEGORIES= security	6	CATEGORIES= security
6	MASTER_SITES= http://wald.intevation.org/frs/download.php/2209/	7	MASTER_SITES= http://wald.intevation.org/frs/download.php/2209/
7		8

Lines 3-8 Link Here

(-)security/openvas-libraries/Makefile (+1 lines)
3		3
4	PORTNAME= openvas-libraries	4	PORTNAME= openvas-libraries
5	PORTVERSION= 8.0.7	5	PORTVERSION= 8.0.7
		6	PORTREVISION= 1
6	CATEGORIES= security	7	CATEGORIES= security
7	MASTER_SITES= http://wald.intevation.org/frs/download.php/2291/	8	MASTER_SITES= http://wald.intevation.org/frs/download.php/2291/
8		9

Lines 2-7 Link Here

(-)security/openvas-manager/Makefile (+1 lines)
2		2
3	PORTNAME= openvas-manager	3	PORTNAME= openvas-manager
4	PORTVERSION= 6.0.8	4	PORTVERSION= 6.0.8
		5	PORTREVISION= 1
5	CATEGORIES= security	6	CATEGORIES= security
6	MASTER_SITES= http://wald.intevation.org/frs/download.php/2295/	7	MASTER_SITES= http://wald.intevation.org/frs/download.php/2295/
7		8

Lines 3-8 Link Here

(-)security/py-gnutls/Makefile (+1 lines)
3		3
4	PORTNAME= gnutls	4	PORTNAME= gnutls
5	PORTVERSION= 2.0.1	5	PORTVERSION= 2.0.1
		6	PORTREVISION= 1
6	CATEGORIES= security python	7	CATEGORIES= security python
7	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 2-8 Link Here

(-)security/shishi/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= shishi	3	PORTNAME= shishi
4	PORTVERSION= 1.0.2	4	PORTVERSION= 1.0.2
5	PORTREVISION= 8	5	PORTREVISION= 9
6	CATEGORIES= security	6	CATEGORIES= security
7	MASTER_SITES= GNU	7	MASTER_SITES= GNU
8		8

Lines 3-9 Link Here

(-)security/suricata/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= suricata	4	PORTNAME= suricata
5	PORTVERSION= 3.0	5	PORTVERSION= 3.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://www.openinfosecfoundation.org/download/	8	MASTER_SITES= http://www.openinfosecfoundation.org/download/
9		9

Lines 3-9 Link Here

(-)security/xmlsec1/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= xmlsec1	4	PORTNAME= xmlsec1
5	PORTVERSION= 1.2.20	5	PORTVERSION= 1.2.20
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \	8	MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \
9	ftp://ftp.aleksey.com/pub/xmlsec/releases/ \	9	ftp://ftp.aleksey.com/pub/xmlsec/releases/ \

Lines 3-9 Link Here

(-)sysutils/cinnamon-settings-daemon/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= cinnamon-settings-daemon	4	PORTNAME= cinnamon-settings-daemon
5	PORTVERSION= 2.4.3	5	PORTVERSION= 2.4.3
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= sysutils gnome	7	CATEGORIES= sysutils gnome
8	DIST_SUBDIR= gnome3	8	DIST_SUBDIR= gnome3
9		9





PORTNAME=	gkrellm
PORTVERSION=	2.3.5
PORTREVISION=	7
CATEGORIES=	sysutils ipv6
MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
		LOCAL/ume

USE_RC_SUBR=	gkrellmd
WANT_GNOME=	yes

OPTIONS_DEFINE=		DOCS CLIENT NLS NTLM OPENSSL
OPTIONS_RADIO=		SSL
OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
OPTIONS_DEFAULT=	CLIENT NTLM OPENSSL
OPTIONS_SUB=		yes


.else
MAKE_ENV+=	enable_nls=0
.endif
.if ${PORT_OPTIONS:MOPENSSL}
LIB_DEPENDS+=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
MAKE_ENV+=	GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \
		without-ssl=1
.elif ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL=	yes
MAKE_ENV+=	without-gnutls=1
.else

Lines 3-9 Link Here

(-)sysutils/gnome-control-center/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gnome-control-center	4	PORTNAME= gnome-control-center
5	PORTVERSION= 3.18.2	5	PORTVERSION= 3.18.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= sysutils gnome	7	CATEGORIES= sysutils gnome
8	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3

Lines 3-9 Link Here

(-)sysutils/gnome-settings-daemon/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gnome-settings-daemon	4	PORTNAME= gnome-settings-daemon
5	PORTVERSION= 3.18.2	5	PORTVERSION= 3.18.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= sysutils gnome	7	CATEGORIES= sysutils gnome
8	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3

Lines 3-9 Link Here

(-)sysutils/heartbeat/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= heartbeat	4	PORTNAME= heartbeat
5	PORTVERSION= 2.1.4	5	PORTVERSION= 2.1.4
6	PORTREVISION= 26	6	PORTREVISION= 27
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	#MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2	8	#MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
9	MASTER_SITES= LOCAL/kuriyama/heartbeat	9	MASTER_SITES= LOCAL/kuriyama/heartbeat




--- crm/cib/remote.c.orig	2008-08-18 12:32:19 UTC
+++ crm/cib/remote.c
@@ -45,13 +45,6 @@ void cib_send_remote_msg(void *session, 
 
 #ifdef HAVE_GNUTLS_GNUTLS_H
 #  define DH_BITS 1024
-const int tls_kx_order[] = {
-	  GNUTLS_KX_ANON_DH,
-	  GNUTLS_KX_DHE_RSA,
-	  GNUTLS_KX_DHE_DSS,
-	  GNUTLS_KX_RSA,
-	0
-};
 gnutls_dh_params dh_params;
 gnutls_anon_server_credentials anon_cred;
 char *cib_send_tls(gnutls_session *session, HA_Message *msg);
@@ -83,8 +76,7 @@ create_tls_session(int csock)
 	session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
 
 	gnutls_init(session, GNUTLS_SERVER);
-	gnutls_set_default_priority(*session);
- 	gnutls_kx_set_priority (*session, tls_kx_order);
+ 	gnutls_priority_set_direct (*session, "NORMAL:-KX-ALL:+ANON-DH:+DHE-RSA:+DHE-DSS:+RSA", NULL);
 	gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anon_cred);
 	gnutls_transport_set_ptr(*session,
 				 (gnutls_transport_ptr) GINT_TO_POINTER(csock));




--- lib/mgmt/mgmt_tls_lib.c.orig	2008-08-18 12:32:19 UTC
+++ lib/mgmt/mgmt_tls_lib.c
@@ -38,11 +38,6 @@ static gnutls_dh_params dh_params;
 gnutls_anon_server_credentials anoncred_server;
 gnutls_anon_client_credentials anoncred_client;
 
-const int kx_prio[] =
-{
-	GNUTLS_KX_ANON_DH,
-	0
-};
 
 int
 tls_init_client(void)
@@ -58,8 +53,7 @@ tls_attach_client(int sock)
 	int ret;
 	gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
 	gnutls_init(session, GNUTLS_CLIENT);
-	gnutls_set_default_priority(*session);
-	gnutls_kx_set_priority (*session, kx_prio);
+	gnutls_priority_set_direct(*session, "NORMAL:-KX-ALL:+ANON-DH", NULL);
 	gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_client);
 	gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock));
 	ret = gnutls_handshake(*session);
@@ -131,8 +125,7 @@ tls_attach_server(int sock)
 	int ret;
 	gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
 	gnutls_init(session, GNUTLS_SERVER);
-	gnutls_set_default_priority(*session);
-	gnutls_kx_set_priority (*session, kx_prio);
+	gnutls_priority_set_direct(*session, "NORMAL:-KX-ALL:+ANON-DH", NULL);
 	gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_server);
 	gnutls_dh_set_prime_bits(*session, DH_BITS);
 	gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock));




--- lib/plugins/quorum/quorumd.c.orig	2008-08-18 12:32:19 UTC
+++ lib/plugins/quorum/quorumd.c
@@ -327,11 +327,9 @@ initialize_tls_session (int sd)
 {
 	int ret;
 	gnutls_session session;
-	const int cert_type_priority[2] = { GNUTLS_CRT_X509,0};
 	
 	gnutls_init (&session, GNUTLS_CLIENT);
 	gnutls_set_default_priority (session);
-	gnutls_certificate_type_set_priority (session, cert_type_priority);
 	gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
 	gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd));
 	ret = gnutls_handshake (session);
@@ -353,15 +351,28 @@ verify_certificate (gnutls_session sessi
 	unsigned int cert_list_size;
 	const gnutls_datum *cert_list;
 	int ret;
+	int status;
 	gnutls_x509_crt cert;
 




--- membership/quorumd/quorumdtest.c.orig	2008-08-18 12:32:19 UTC
+++ membership/quorumd/quorumdtest.c
@@ -136,11 +136,9 @@ initialize_tls_session (int sd)
 {
 	int ret;
 	gnutls_session session;
-	const int cert_type_priority[2] = { GNUTLS_CRT_X509,0};
 	
 	gnutls_init (&session, GNUTLS_CLIENT);
 	gnutls_set_default_priority (session);
-	gnutls_certificate_type_set_priority (session, cert_type_priority);
 	gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
 	gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd));
 	ret = gnutls_handshake (session);
@@ -162,16 +160,16 @@ verify_certificate (gnutls_session sessi
 	unsigned int cert_list_size;
 	const gnutls_datum *cert_list;
 	int ret;
+	int status;
 	gnutls_x509_crt cert;
 

 	if (status & GNUTLS_CERT_INVALID) {
 		printf("The certificate is not trusted.\n");
 		return -1;
@@ -184,7 +182,6 @@ verify_certificate (gnutls_session sessi
 		printf("The certificate has been revoked.\n");
 		return -1;
 	}

Lines 2-8 Link Here

(-)sysutils/rsyslog7/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= rsyslog	3	PORTNAME= rsyslog
4	PORTVERSION= 7.6.7	4	PORTVERSION= 7.6.7
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/	7	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
8		8

Lines 2-7 Link Here

(-)sysutils/rsyslog8/Makefile (+1 lines)
2		2
3	PORTNAME= rsyslog	3	PORTNAME= rsyslog
4	PORTVERSION= 8.11.0	4	PORTVERSION= 8.11.0
		5	PORTREVISION= 1
5	CATEGORIES= sysutils	6	CATEGORIES= sysutils
6	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/	7	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
7		8

Lines 3-9 Link Here

(-)textproc/iksemel/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= iksemel	4	PORTNAME= iksemel
5	PORTVERSION= 1.4	5	PORTVERSION= 1.4
6	PORTREVISION= 6	6	PORTREVISION= 7
7	CATEGORIES= textproc	7	CATEGORIES= textproc
8	MASTER_SITES= GOOGLE_CODE	8	MASTER_SITES= GOOGLE_CODE
9		9




--- src/stream.c.orig	2009-07-23 11:16:35 UTC
+++ src/stream.c
@@ -63,11 +63,6 @@ tls_pull (iksparser *prs, char *buffer, 
 static int
 handshake (struct stream_data *data)
 {
-	const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
-	const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
-	const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
-	const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
-	const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
 	int ret;
 
 	if (gnutls_global_init () != 0)
@@ -80,11 +75,7 @@ handshake (struct stream_data *data)
 		gnutls_certificate_free_credentials (data->cred);
 		return IKS_NOMEM;
 	}
-	gnutls_protocol_set_priority (data->sess, protocol_priority);
-	gnutls_cipher_set_priority(data->sess, cipher_priority);
-	gnutls_compression_set_priority(data->sess, comp_priority);
-	gnutls_kx_set_priority(data->sess, kx_priority);
-	gnutls_mac_set_priority(data->sess, mac_priority);
+	gnutls_set_default_priority();
 	gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
 
 	gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);

Lines 3-9 Link Here

(-)www/aws/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= aws	4	PORTNAME= aws
5	PORTVERSION= 3.3.0.0	5	PORTVERSION= 3.3.0.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= http://downloads.dragonlace.net/src/	8	MASTER_SITES= http://downloads.dragonlace.net/src/
9		9

Lines 3-9 Link Here

(-)www/gurlchecker/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gurlchecker	4	PORTNAME= gurlchecker
5	PORTVERSION= 0.10.1	5	PORTVERSION= 0.10.1
6	PORTREVISION= 23	6	PORTREVISION= 24
7	CATEGORIES= www gnome	7	CATEGORIES= www gnome
8	MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/547/	8	MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/547/
9		9

Lines 3-9 Link Here

(-)www/hydra/Makefile (-1 / +3 lines)
3		3
4	PORTNAME= hydra	4	PORTNAME= hydra
5	PORTVERSION= 0.1.8	5	PORTVERSION= 0.1.8
6	PORTREVISION= 9	6	PORTREVISION= 10
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= http://hydra.hellug.gr/download/	8	MASTER_SITES= http://hydra.hellug.gr/download/
9	PKGNAMESUFFIX= -web	9	PKGNAMESUFFIX= -web
Lines 13-18 COMMENT= High performance multi-threaded Link Here
13		13
14	LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls	14	LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
15		15
		16	BROKEN= Needs to be ported to GnuTLS 3.4; abandoned upstream
		17
16	USES= perl5 pkgconfig shebangfix	18	USES= perl5 pkgconfig shebangfix
17	SHEBANG_FILES= src/webindex.pl	19	SHEBANG_FILES= src/webindex.pl
18	USE_RC_SUBR= hydra	20	USE_RC_SUBR= hydra

Lines 4-10 Link Here

(-)www/libepc/Makefile (-1 / +1 lines)
4		4
5	PORTNAME= libepc	5	PORTNAME= libepc
6	PORTVERSION= 0.4.4	6	PORTVERSION= 0.4.4
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= www	8	CATEGORIES= www
9	MASTER_SITES= GNOME	9	MASTER_SITES= GNOME
10		10

Lines 3-9 Link Here

(-)www/libmicrohttpd/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libmicrohttpd	4	PORTNAME= libmicrohttpd
5	PORTVERSION= 0.9.37	5	PORTVERSION= 0.9.37
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= GNU	8	MASTER_SITES= GNU
9		9

Lines 3-8 Link Here

(-)www/ocaml-net/Makefile (+1 lines)
3		3
4	PORTNAME= net	4	PORTNAME= net
5	PORTVERSION= 4.0.4	5	PORTVERSION= 4.0.4
		6	PORTREVISION= 1
6	CATEGORIES= www	7	CATEGORIES= www
7	MASTER_SITES= http://download.camlcity.org/download/	8	MASTER_SITES= http://download.camlcity.org/download/
8	PKGNAMEPREFIX= ocaml-	9	PKGNAMEPREFIX= ocaml-

Lines 3-9 Link Here

(-)www/retawq/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= retawq	4	PORTNAME= retawq
5	DISTVERSION= 0.2.6c	5	DISTVERSION= 0.2.6c
6	PORTREVISION= 10	6	PORTREVISION= 11
7	CATEGORIES= www ipv6	7	CATEGORIES= www ipv6
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.6c	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.6c
9		9

Lines 3-9 Link Here

(-)www/tntnet/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= tntnet	4	PORTNAME= tntnet
5	PORTVERSION= 2.2.1	5	PORTVERSION= 2.2.1
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= www devel	7	CATEGORIES= www devel
8	MASTER_SITES= http://www.tntnet.org/download/	8	MASTER_SITES= http://www.tntnet.org/download/
9		9

Lines 3-8 Link Here

(-)www/webkit2-gtk3/Makefile (+1 lines)
3		3
4	PORTNAME= webkit	4	PORTNAME= webkit
5	PORTVERSION= 2.8.5	5	PORTVERSION= 2.8.5
		6	PORTREVISION= 1
6	CATEGORIES= www	7	CATEGORIES= www
7	MASTER_SITES= http://webkitgtk.org/releases/	8	MASTER_SITES= http://webkitgtk.org/releases/
8	PKGNAMESUFFIX= 2-gtk3	9	PKGNAMESUFFIX= 2-gtk3

Lines 2-8 Link Here

(-)www/wwwoffle/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= wwwoffle	3	PORTNAME= wwwoffle
4	PORTVERSION= 2.9i	4	PORTVERSION= 2.9i
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= www ipv6	6	CATEGORIES= www ipv6
7	MASTER_SITES= http://www.gedanken.org.uk/software/wwwoffle/download/	7	MASTER_SITES= http://www.gedanken.org.uk/software/wwwoffle/download/
8		8

Lines 3-9 Link Here

(-)www/xombrero/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= xombrero	4	PORTNAME= xombrero
5	PORTVERSION= 1.6.3	5	PORTVERSION= 1.6.3
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/	8	MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/
9		9

Lines 3-8 Link Here

(-)x11/gnome-terminal/Makefile (+1 lines)
3		3
4	PORTNAME= gnome-terminal	4	PORTNAME= gnome-terminal
5	PORTVERSION= 3.18.1	5	PORTVERSION= 3.18.1
		6	PORTREVISION= 1
6	CATEGORIES= x11 gnome	7	CATEGORIES= x11 gnome
7	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
8	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3

Lines 3-8 Link Here

(-)x11/sakura/Makefile (+1 lines)
3		3
4	PORTNAME= sakura	4	PORTNAME= sakura
5	PORTVERSION= 3.3.4	5	PORTVERSION= 3.3.4
		6	PORTREVISION= 1
6	CATEGORIES= x11 gnome	7	CATEGORIES= x11 gnome
7	MASTER_SITES= http://launchpadlibrarian.net/235602098/	8	MASTER_SITES= http://launchpadlibrarian.net/235602098/
8		9

Lines 3-9 Link Here

(-)x11-toolkits/gnustep-gui/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gnustep-gui	4	PORTNAME= gnustep-gui
5	PORTVERSION= 0.24.1	5	PORTVERSION= 0.24.1
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= x11-toolkits gnustep	7	CATEGORIES= x11-toolkits gnustep
8	MASTER_SITES= GNUSTEP/core	8	MASTER_SITES= GNUSTEP/core
9		9

Lines 3-9 Link Here

(-)x11-toolkits/gtk20/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gtk	4	PORTNAME= gtk
5	PORTVERSION= 2.24.29	5	PORTVERSION= 2.24.29
6	PORTREVISION?= 1	6	PORTREVISION?= 2
7	CATEGORIES= x11-toolkits	7	CATEGORIES= x11-toolkits
8	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}	8	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
9	PKGNAMESUFFIX= 2	9	PKGNAMESUFFIX= 2

Lines 5-11 Link Here

(-)x11-toolkits/gtk30/Makefile (-1 / +1 lines)
5		5
6	PORTNAME= gtk	6	PORTNAME= gtk
7	PORTVERSION= 3.18.8	7	PORTVERSION= 3.18.8
8	PORTREVISION?= 1	8	PORTREVISION?= 3
9	CATEGORIES= x11-toolkits	9	CATEGORIES= x11-toolkits
10	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}	10	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
11	PKGNAMESUFFIX= 3	11	PKGNAMESUFFIX= 3

Lines 3-9 Link Here

(-)x11-toolkits/nucleo/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= nucleo	4	PORTNAME= nucleo
5	PORTVERSION= 0.7.6	5	PORTVERSION= 0.7.6
6	PORTREVISION= 12	6	PORTREVISION= 13
7	CATEGORIES= x11-toolkits	7	CATEGORIES= x11-toolkits
8	MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/	8	MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/
9		9

Lines 3-8 Link Here

(-)x11-toolkits/vte3/Makefile (+1 lines)
3		3
4	PORTNAME= vte	4	PORTNAME= vte
5	PORTVERSION= 0.42.4	5	PORTVERSION= 0.42.4
		6	PORTREVISION= 1
6	CATEGORIES= x11-toolkits gnome	7	CATEGORIES= x11-toolkits gnome
7	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
8	PKGNAMESUFFIX= 3	9	PKGNAMESUFFIX= 3

Return to bug 207768

Line 0 Link Here

(-)deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp (+20 lines)
	1	--- src/net/fusenshisslclientsocket.cpp.orig 2007-04-02 10:44:52 UTC
	2	+++ src/net/fusenshisslclientsocket.cpp
	3	@@ -52,9 +52,6 @@ bool FusenshiSSLClientSocket::connect(un
	4	{
	5	// ÄÌ¿®¤ò°Å¹æ²½¤·¤Þ¤¹¤¬¡¢¥Û¥¹¥È¤Î¾ÚÌÀ¤Ï¹Ô¤¤¤Þ¤»¤ó¡£
	6	int ret;
	7	- const int cert_priority[] = {
	8	- GNUTLS_CRT_X509, 0
	9	- };
	10
	11	if (NULL != m_session) close();
	12
	13	@@ -64,7 +61,6 @@ bool FusenshiSSLClientSocket::connect(un
	14
	15	gnutls_init(&m_session, GNUTLS_CLIENT);
	16	gnutls_set_default_priority(m_session);
	17	- gnutls_certificate_type_set_priority(m_session, cert_priority);
	18
	19	gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, cert);
	20

Line 0 Link Here

(-)deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp (+22 lines)
	1	--- src/net/fusenshisslserversocket.cpp.orig 2007-04-02 10:44:52 UTC
	2	+++ src/net/fusenshisslserversocket.cpp
	3	@@ -56,9 +56,6 @@ public:
	4	bool sslAccept(int sock)
	5	{
	6	int ret;
	7	- const int cert_priority[] = {
	8	- GNUTLS_CRT_X509, 0
	9	- };
	10
	11	m_socket = sock;
	12
	13	@@ -69,8 +66,7 @@ public:
	14	if (!cert) return false;
	15
	16	gnutls_init(&m_session, GNUTLS_SERVER);
	17	- gnutls_set_default_export_priority(m_session);
	18	- gnutls_certificate_type_set_priority(m_session, cert_priority);
	19	+ gnutls_set_default_priority(m_session);
	20
	21	gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, cert);
	22	gnutls_certificate_server_set_request(m_session, GNUTLS_CERT_REQUIRE);

Line 0 Link Here

(-)devel/gwenhywfar/files/patch-src-sio-syncio_tls.c (+17 lines)
	1	--- src/sio/syncio_tls.c.orig 2014-10-12 13:12:22 UTC
	2	+++ src/sio/syncio_tls.c
	3	@@ -361,12 +361,10 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO
	4
	5	/* possibly force protocol priority */
	6	if (lflags & GWEN_SYNCIO_TLS_FLAGS_FORCE_SSL_V3) {
	7	- const int proto_prio[2] = { GNUTLS_SSL3, 0 };
	8	-
	9	DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3");
	10	- rv=gnutls_protocol_set_priority(xio->session, proto_prio);
	11	+ rv=gnutls_priority_set_direct(xio->session, "NORMAL:-VERS-TLS-ALL:+VERS-SSL3.0", NULL);
	12	if (rv) {
	13	- DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv));
	14	+ DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_priority_set_direct: %d (%s)", rv, gnutls_strerror(rv));
	15	gnutls_deinit(xio->session);
	16	return GWEN_ERROR_GENERIC;
	17	}

Line 0 Link Here

(-)editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp (+24 lines)
	1	--- plugins/collab/backends/service/xp/tls_tunnel.cpp.orig 2014-11-04 01:12:14 UTC
	2	+++ plugins/collab/backends/service/xp/tls_tunnel.cpp
	3	@@ -306,8 +306,6 @@ void Proxy::tunnel_(transport_ptr_t tran
	4	disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr);
	5	}
	6
	7	-static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
	8	-static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 };
	9
	10	// FIXME: this clientproxy can only handle 1 SSL connection at the same time
	11	ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port,
	12	@@ -399,9 +397,9 @@ session_ptr_t ClientProxy::setup_tls_ses
	13
	14	// setup session
	15	return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t());
	16	- return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t());
	17	- return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t());
	18	- return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t());
	19	+ return_val_if_neg(gnutls_priority_set_direct(*session_ptr,"NORMAL"
	20	+ ":-CIPHER-ALL:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:+ARCFOUR-128"
	21	+ ":-KX-ALL:+ANON-DH:+RSA:+DHE-DSS:+DHE-RSA",NULL), session_ptr_t());
	22	return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t());
	23
	24	// setup transport

Line 0 Link Here

(-)ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c (+52 lines)
	1	--- libwzd-core/wzd_tls.c.orig 2007-10-25 17:25:33 UTC
	2	+++ libwzd-core/wzd_tls.c
	3	@@ -946,19 +946,13 @@ int tls_exit(void)
	4
	5	static gnutls_session initialize_tls_session(gnutls_connection_end con_end)
	6	{
	7	- /* Allow connections to servers that have OpenPGP keys as well.
	8	- */
	9	- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
	10	-
	11	gnutls_session session;
	12
	13	gnutls_init(&session, con_end);
	14
	15	- /* avoid calling all the priority functions, since the defaults
	16	- * are adequate.
	17	+ /* Allow connections to servers that have OpenPGP keys as well.
	18	*/
	19	- gnutls_set_default_priority(session);
	20	- gnutls_certificate_type_set_priority(session, cert_type_priority);
	21	+ gnutls_priority_set_direct(session, "NORMAL:+CTYPE-OPENPGP", NULL);
	22
	23	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
	24
	25	@@ -1001,27 +995,6 @@ int tls_auth (const char *type, wzd_cont
	26	}
	27
	28	/** \todo XXX parse TLS cipher names */
	29	- {
	30	- /** Note that the priority is set on the client. The server does not use
	31	- * the algorithm's priority except for disabling algorithms that were not
	32	- * specified.
	33	- */
	34	- const int cipherPriority[] =
	35	- {
	36	- GNUTLS_CIPHER_ARCFOUR_128,
	37	- GNUTLS_CIPHER_3DES_CBC,
	38	- GNUTLS_CIPHER_AES_128_CBC,
	39	- GNUTLS_CIPHER_AES_256_CBC,
	40	- GNUTLS_CIPHER_ARCFOUR_40,
	41	-#if ( (LIBGNUTLS_VERSION_MAJOR > 1) \|\| (LIBGNUTLS_VERSION_MINOR >= 3) )
	42	- GNUTLS_CIPHER_RC2_40_CBC,
	43	- GNUTLS_CIPHER_DES_CBC,
	44	-#endif
	45	- 0
	46	- };
	47	-
	48	- gnutls_cipher_set_priority(session, cipherPriority);
	49	- }
	50
	51	/* ensure socket is non-blocking */
	52	#if defined(_MSC_VER) \|\| (defined(__CYGWIN__) && defined(WINSOCK_SUPPORT))

Lines 3-9 Link Here

(-)lang/gnustep-base/Makefile (-5 / +3 lines)
3		3
4	PORTNAME= gnustep-base	4	PORTNAME= gnustep-base
5	PORTVERSION= 1.24.8	5	PORTVERSION= 1.24.8
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= lang devel gnustep	7	CATEGORIES= lang devel gnustep
8	MASTER_SITES= GNUSTEP/core	8	MASTER_SITES= GNUSTEP/core
9		9
Lines 49-58 MDNS_DESC= Zeroconf via mDNSResponder Link Here
49	ICU_LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu	49	ICU_LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu
50	ICU_CONFIGURE_OFF= --disable-icu	50	ICU_CONFIGURE_OFF= --disable-icu
51		51
52	GNUTLS_LIB_DEPENDS= libgnutls-openssl.so:${PORTSDIR}/security/gnutls	52	GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
53	GNUTLS_CONFIGURE_ON= --with-tls-prefix=${LOCALBASE} \	53	GNUTLS_CONFIGURE_ENABLE=tls
54	TLS_CONFIG="pkg-config -gnutls"
55	GNUTLS_CONFIGURE_OFF= --disable-tls
56		54
57	OPENSSL_USE= OPENSSL=yes	55	OPENSSL_USE= OPENSSL=yes
58	OPENSSL_CONFIGURE_OFF= --disable-openssl	56	OPENSSL_CONFIGURE_OFF= --disable-openssl

Line 0 Link Here

(-)net/net6/files/patch-src-encrypt.cpp (+14 lines)
	1	--- src/encrypt.cpp.orig 2011-09-28 11:15:10 UTC
	2	+++ src/encrypt.cpp
	3	@@ -175,10 +175,7 @@ net6::tcp_encrypted_socket_base::
	4	gnutls_session_t sess):
	5	tcp_client_socket(cobj), session(sess), state(DEFAULT)
	6	{
	7	- const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
	8	-
	9	- gnutls_set_default_priority(session);
	10	- gnutls_kx_set_priority(session, kx_prio);
	11	+ gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ANON-DH", NULL);
	12
	13	gnutls_transport_set_ptr(
	14	session,

Line 0 Link Here

(-)net/sixxs-aiccu/files/patch-common-common.c (+25 lines)
	1	--- common/common.c.orig 2006-12-21 14:08:50 UTC
	2	+++ common/common.c
	3	@@ -271,8 +271,6 @@ TLSSOCKET sock_alloc(void);
	4	TLSSOCKET sock_alloc(void)
	5	{
	6	#ifdef AICCU_GNUTLS
	7	- /* Allow connections to servers that have OpenPGP keys as well */
	8	- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
	9	int ret;
	10	#endif /* AICCU_GNUTLS*/
	11
	12	@@ -296,11 +294,8 @@ TLSSOCKET sock_alloc(void)
	13	return NULL;
	14	}
	15
	16	- /* Use default priorities */
	17	- gnutls_set_default_priority(sock->session);
	18	- /* XXX: Return value is not documented in GNUTLS documentation! */
	19	-
	20	- gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
	21	+ /* Allow connections to servers that have OpenPGP keys as well */
	22	+ gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL);
	23	/* XXX: Return value is not documented in GNUTLS documentation! */
	24
	25	/* Configure the x509 credentials for the current session */

Lines 1-5 Link Here

(-)net-im/jabber/files/patch-jabberd-mio_tls.cc (-14 / +95 lines)
1	--- jabberd/mio_tls.cc.orig 2008-03-06 10:21:01.669677189 +0100	1	--- jabberd/mio_tls.cc.orig 2007-07-16 23:20:44 UTC
2	+++ jabberd/mio_tls.cc 2008-03-06 10:35:04.744064592 +0100	2	+++ jabberd/mio_tls.cc
3	@@ -39,7 +39,6 @@	3	@@ -39,7 +39,6 @@
4	#include <set>	4	#include <set>
5	#include <string>	5	#include <string>
Lines 8-14 Link Here
8	#include <vector>	8	#include <vector>
9	#include <list>	9	#include <list>
10	#include <iostream>	10	#include <iostream>
11	@@ -612,7 +611,7 @@	11	@@ -612,7 +611,7 @@ static void mio_tls_process_credentials(
12	}	12	}
13		13
14	// load OpenPGP key/certificate	14	// load OpenPGP key/certificate
Lines 17-23 Link Here
17	if (ret < 0) {	17	if (ret < 0) {
18	log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));	18	log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
19	continue;	19	continue;
20	@@ -631,7 +630,7 @@	20	@@ -631,7 +630,7 @@ static void mio_tls_process_credentials(
21	}	21	}
22		22
23	// load the OpenPGP keyring	23	// load the OpenPGP keyring
Lines 26-32 Link Here
26	if (ret < 0) {	26	if (ret < 0) {
27	log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));	27	log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
28	continue;	28	continue;
29	@@ -640,23 +639,6 @@	29	@@ -640,23 +639,6 @@ static void mio_tls_process_credentials(
30	continue;	30	continue;
31	}	31	}
32		32
Lines 50-56 Link Here
50	// setup protocols to use	50	// setup protocols to use
51	if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {	51	if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
52	char const *const protocols_data = xmlnode_get_data(cur);	52	char const *const protocols_data = xmlnode_get_data(cur);
53	@@ -916,7 +898,7 @@	53	@@ -916,7 +898,7 @@ bool mio_tls_early_init() {
54	/* load asn1 tree to be used by libtasn1 */	54	/* load asn1 tree to be used by libtasn1 */
55	ret = asn1_array2tree(subjectAltName_asn1_tab, &mio_tls_asn1_tree, NULL);	55	ret = asn1_array2tree(subjectAltName_asn1_tab, &mio_tls_asn1_tree, NULL);
56	if (ret != ASN1_SUCCESS) {	56	if (ret != ASN1_SUCCESS) {
Lines 59-65 Link Here
59	return false;	59	return false;
60	/* XXX we have to delete the structure on shutdown using asn1_delete_structure(&mio_tls_asn1_tree) */	60	/* XXX we have to delete the structure on shutdown using asn1_delete_structure(&mio_tls_asn1_tree) */
61	}	61	}
62	@@ -1498,7 +1480,6 @@	62	@@ -1302,80 +1284,32 @@ int mio_ssl_starttls(mio m, int originat
		63
		64	// overwrite protocol priorities?
		65	if (mio_tls_protocols.find(identity) != mio_tls_protocols.end()) {
		66	- ret = gnutls_protocol_set_priority(session, mio_tls_protocols[identity]);
		67	- if (ret < 0) {
		68	- log_notice(identity, "error setting protocol priority: %s", gnutls_strerror(ret));
		69	- }
		70	} else if (mio_tls_protocols.find("*") != mio_tls_protocols.end()) {
		71	- ret = gnutls_protocol_set_priority(session, mio_tls_protocols["*"]);
		72	- if (ret < 0) {
		73	- log_notice(identity, "error setting protocol priority: %s", gnutls_strerror(ret));
		74	- }
		75	}
		76
		77	// overwrite kx algorithm priorities?
		78	if (mio_tls_kx.find(identity) != mio_tls_kx.end()) {
		79	- ret = gnutls_kx_set_priority(session, mio_tls_kx[identity]);
		80	- if (ret < 0) {
		81	- log_notice(identity, "error setting kx algorithm priority: %s", gnutls_strerror(ret));
		82	- }
		83	} else if (mio_tls_kx.find("*") != mio_tls_kx.end()) {
		84	- ret = gnutls_kx_set_priority(session, mio_tls_kx["*"]);
		85	- if (ret < 0) {
		86	- log_notice(identity, "error setting kx algorithm priority: %s", gnutls_strerror(ret));
		87	- }
		88	}
		89
		90	// overwrite cipher priorities?
		91	if (mio_tls_ciphers.find(identity) != mio_tls_ciphers.end()) {
		92	- ret = gnutls_cipher_set_priority(session, mio_tls_ciphers[identity]);
		93	- if (ret < 0) {
		94	- log_notice(identity, "error setting cipher algorithm priority: %s", gnutls_strerror(ret));
		95	- }
		96	} else if (mio_tls_ciphers.find("*") != mio_tls_ciphers.end()) {
		97	- ret = gnutls_cipher_set_priority(session, mio_tls_ciphers["*"]);
		98	- if (ret < 0) {
		99	- log_notice(identity, "error setting cipher algorithm priority: %s", gnutls_strerror(ret));
		100	- }
		101	}
		102
		103	// overwrite certificate priorities?
		104	if (mio_tls_certtypes.find(identity) != mio_tls_certtypes.end()) {
		105	- ret = gnutls_certificate_type_set_priority(session, mio_tls_certtypes[identity]);
		106	- if (ret < 0) {
		107	- log_notice(identity, "error setting certificate priorities: %s", gnutls_strerror(ret));
		108	- }
		109	} else if (mio_tls_certtypes.find("*") != mio_tls_certtypes.end()) {
		110	- ret = gnutls_certificate_type_set_priority(session, mio_tls_certtypes["*"]);
		111	- if (ret < 0) {
		112	- log_notice(identity, "error setting certificate priorities: %s", gnutls_strerror(ret));
		113	- }
		114	}
		115
		116	// overwrite mac algorithm priorities?
		117	if (mio_tls_mac.find(identity) != mio_tls_mac.end()) {
		118	- ret = gnutls_mac_set_priority(session, mio_tls_mac[identity]);
		119	- if (ret < 0) {
		120	- log_notice(identity, "error setting mac algorithm priorities: %s", gnutls_strerror(ret));
		121	- }
		122	} else if (mio_tls_mac.find("*") != mio_tls_mac.end()) {
		123	- ret = gnutls_mac_set_priority(session, mio_tls_mac["*"]);
		124	- if (ret < 0) {
		125	- log_notice(identity, "error setting mac algorithm priorities: %s", gnutls_strerror(ret));
		126	- }
127	}
128
129	// overwrite compression algorithm priorities?
130	if (mio_tls_compression.find(identity) != mio_tls_compression.end()) {
131	- ret = gnutls_compression_set_priority(session, mio_tls_compression[identity]);
132	- if (ret < 0) {
133	- log_notice(identity, "error setting compression algorithm priorities: %s", gnutls_strerror(ret));
134	- }
135	} else if (mio_tls_compression.find("*") != mio_tls_compression.end()) {
136	- ret = gnutls_compression_set_priority(session, mio_tls_compression["*"]);
137	- if (ret < 0) {
138	- log_notice(identity, "error setting compression algorithm priorities: %s", gnutls_strerror(ret));
139	- }
140	}
141
142	/* setting certificate credentials */
143	@@ -1498,7 +1432,6 @@ static int mio_tls_check_openpgp(mio m,
63	const gnutls_datum_t *cert_list = NULL;	144	const gnutls_datum_t *cert_list = NULL;
64	unsigned int cert_list_size = 0;	145	unsigned int cert_list_size = 0;
65		146
Lines 67-73 Link Here
67	// get the certificate (it's only a single one for OpenPGP)	148	// get the certificate (it's only a single one for OpenPGP)
68	cert_list = gnutls_certificate_get_peers(static_cast<gnutls_session_t>(m->ssl), &cert_list_size);	149	cert_list = gnutls_certificate_get_peers(static_cast<gnutls_session_t>(m->ssl), &cert_list_size);
69	if (cert_list == NULL \|\| cert_list_size <= 0) {	150	if (cert_list == NULL \|\| cert_list_size <= 0) {
70	@@ -1566,7 +1547,6 @@	151	@@ -1566,7 +1499,6 @@ static int mio_tls_check_openpgp(mio m,
71	// free memory	152	// free memory
72	gnutls_openpgp_key_deinit(pgpkey);	153	gnutls_openpgp_key_deinit(pgpkey);
73	pool_free(jidpool);	154	pool_free(jidpool);
Lines 75-81 Link Here
75	return 0;	156	return 0;
76	}	157	}
77		158
78	@@ -1684,14 +1664,14 @@	159	@@ -1684,14 +1616,14 @@ static int mio_tls_check_x509(mio m, cha
79	/* init subjectAltName_element */	160	/* init subjectAltName_element */
80	ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.SubjectAltName", &subjectAltName_element);	161	ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.SubjectAltName", &subjectAltName_element);
81	if (ret != ASN1_SUCCESS) {	162	if (ret != ASN1_SUCCESS) {
Lines 92-98 Link Here
92	asn1_delete_structure(&subjectAltName_element);	173	asn1_delete_structure(&subjectAltName_element);
93	break;	174	break;
94	}	175	}
95	@@ -1712,7 +1692,7 @@	176	@@ -1712,7 +1644,7 @@ static int mio_tls_check_x509(mio m, cha
96	break;	177	break;
97	}	178	}
98	if (ret != ASN1_SUCCESS) {	179	if (ret != ASN1_SUCCESS) {
Lines 101-107 Link Here
101	break;	182	break;
102	}	183	}
103		184
104	@@ -1732,7 +1712,7 @@	185	@@ -1732,7 +1664,7 @@ static int mio_tls_check_x509(mio m, cha
105		186
106	ret = asn1_read_value(subjectAltName_element, access_string, dNSName, &dNSName_len);	187	ret = asn1_read_value(subjectAltName_element, access_string, dNSName, &dNSName_len);
107	if (ret != ASN1_SUCCESS) {	188	if (ret != ASN1_SUCCESS) {
Lines 110-116 Link Here
110	break;	191	break;
111	}	192	}
112		193
113	@@ -1772,7 +1752,7 @@	194	@@ -1772,7 +1704,7 @@ static int mio_tls_check_x509(mio m, cha
114	/* get the OID of the otherName */	195	/* get the OID of the otherName */
115	ret = asn1_read_value(subjectAltName_element, access_string_type, otherNameType, &otherNameType_len);	196	ret = asn1_read_value(subjectAltName_element, access_string_type, otherNameType, &otherNameType_len);
116	if (ret != ASN1_SUCCESS) {	197	if (ret != ASN1_SUCCESS) {
Lines 119-125 Link Here
119	break;	200	break;
120	}	201	}
121		202
122	@@ -1785,7 +1765,7 @@	203	@@ -1785,7 +1717,7 @@ static int mio_tls_check_x509(mio m, cha
123	/* get the value of the otherName */	204	/* get the value of the otherName */
124	ret = asn1_read_value(subjectAltName_element, access_string_value, otherNameValue, &otherNameValue_len);	205	ret = asn1_read_value(subjectAltName_element, access_string_value, otherNameValue, &otherNameValue_len);
125	if (ret != ASN1_SUCCESS) {	206	if (ret != ASN1_SUCCESS) {
Lines 128-134 Link Here
128	break;	209	break;
129	}	210	}
130		211
131	@@ -1799,21 +1779,21 @@	212	@@ -1799,21 +1731,21 @@ static int mio_tls_check_x509(mio m, cha
132		213
133	ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.DirectoryString", &directoryString_element);	214	ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.DirectoryString", &directoryString_element);
134	if (ret != ASN1_SUCCESS) {	215	if (ret != ASN1_SUCCESS) {

Lines 3-29 Link Here

(-)net-im/loudmouth/Makefile (-20 / +13 lines)
3	# $MCom: ports/trunk/net-im/loudmouth/Makefile 19914 2014-09-25 22:33:21Z kwm $	3	# $MCom: ports/trunk/net-im/loudmouth/Makefile 19914 2014-09-25 22:33:21Z kwm $
4		4
5	PORTNAME= loudmouth	5	PORTNAME= loudmouth
6	PORTVERSION= 1.4.3	6	PORTVERSION= 1.5.3
7	PORTREVISION= 11	7	CATEGORIES= net-im
8	CATEGORIES= net-im gnome	8	MASTER_SITES= https://mcabber.com/files/loudmouth/ \
9	MASTER_SITES= GNOME	9	http://www.lilotux.net/~mikael/mcabber/files/loudmouth/
10		10
11	MAINTAINER= gnome@FreeBSD.org	11	MAINTAINER= gnome@FreeBSD.org
12	COMMENT= Lightweight Jabber client library	12	COMMENT= Lightweight Jabber client library
13		13
14	LICENSE= GPLv2	14	LICENSE= LGPL21+
		15	LICENSE_FILE= ${WRKSRC}/COPYING
15		16
16	LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn	17	LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn
17		18
18	USES= gettext gmake libtool pathfix pkgconfig tar:bzip2	19	USES= gettext gmake libtool pkgconfig tar:bzip2
19	USE_GNOME= glib20	20	USE_GNOME= glib20
20	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
21	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
22	CONFIGURE_ARGS= --disable-gtk-doc	23	CONFIGURE_ARGS= --disable-gtk-doc --disable-rebuilds \
23	CPPFLAGS+= -I${LOCALBASE}/include	24	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
24	LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib
25	INSTALL_TARGET= install-strip	25	INSTALL_TARGET= install-strip
26		26
		27	OPTIONS_DEFINE= DOCS
27	OPTIONS_DEFAULT=GNUTLS	28	OPTIONS_DEFAULT=GNUTLS
28	OPTIONS_RADIO= SSL	29	OPTIONS_RADIO= SSL
29	OPTIONS_RADIO_SSL= GNUTLS OPENSSL	30	OPTIONS_RADIO_SSL= GNUTLS OPENSSL
Lines 32-52 OPTIONS_RADIO_SSL= GNUTLS OPENSSL Link Here
32		33
33	.if ${PORT_OPTIONS:MGNUTLS}	34	.if ${PORT_OPTIONS:MGNUTLS}
34	LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls	35	LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
35	RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss	36	CONFIGURE_ARGS+=--with-ssl=gnutls
36	.endif	37	.elif ${PORT_OPTIONS:MOPENSSL}
37
38	.if ${PORT_OPTIONS:MOPENSSL}
39	USE_OPENSSL= yes	38	USE_OPENSSL= yes
40	CONFIGURE_ARGS+=--with-ssl=openssl	39	CONFIGURE_ARGS+=--with-ssl=openssl
41	RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss	40	RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
42	.endif	41	.else
43
44	.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}
45	CONFIGURE_ARGS+=--without-ssl	42	CONFIGURE_ARGS+=--without-ssl
46	.endif	43	.endif
47		44
48	post-patch:
49	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \
50	${WRKSRC}/loudmouth/lm-ssl-gnutls.c
51
52	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-28 Link Here

(-)net-im/loudmouth/files/patch-configure (-28 lines)
1	--- configure.orig 2009-08-17 03:50:55.000000000 -0400
2	+++ configure 2009-08-17 03:50:59.000000000 -0400
3	@@ -21983,12 +21983,14 @@ fi
4	if test x$libgnutls_config_prefix != x ; then
5	libgnutls_config_args="$libgnutls_config_args --prefix=$libgnutls_config_prefix"
6	if test x${LIBGNUTLS_CONFIG+set} != xset ; then
7	- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
8	+ LIBGNUTLS_CONFIG=pkg-config
9	fi
10	fi
11
12	+ libgnutls_config_args="$libgnutls_config_args gnutls"
13	+
14	# Extract the first word of "libgnutls-config", so it can be a program name with args.
15	-set dummy libgnutls-config; ac_word=$2
16	+set dummy pkg-config; ac_word=$2
17	{ echo "$as_me:$LINENO: checking for $ac_word" >&5
18	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
19	if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
20	@@ -22037,7 +22039,7 @@ echo $ECHO_N "checking for libgnutls - v
21	else
22	LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
23	LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
24	- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
25	+ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion`
26
27
28	ac_save_CFLAGS="$CFLAGS"

Lines 1-12 Link Here

(-)net-im/loudmouth/files/patch-loudmouth_Makefile.in (-12 lines)
1	--- loudmouth/Makefile.in.orig 2008-07-06 15:44:25.000000000 -0400
2	+++ loudmouth/Makefile.in 2008-07-06 15:43:53.000000000 -0400
3	@@ -306,8 +306,7 @@ libloudmouthinclude_HEADERS = \
4
5	libloudmouth_1_la_LIBADD = \
6	$(LOUDMOUTH_LIBS) \
7	- $(LIBIDN_LIBS) \
8	- -lresolv
9	+ $(LIBIDN_LIBS)
10
11	libloudmouth_1_la_LDFLAGS = \
12	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \

Lines 1-28 Link Here

(-)net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c (-28 lines)
1	--- loudmouth/lm-ssl-gnutls.c.orig 2010-04-17 15:56:39.000000000 -0400
2	+++ loudmouth/lm-ssl-gnutls.c 2010-04-17 15:56:43.000000000 -0400
3	@@ -32,7 +32,7 @@
4
5	#include <gnutls/x509.h>
6
7	-#define CA_PEM_FILE "/etc/ssl/certs/ca-certificates.crt"
8	+#define CA_PEM_FILE "%%LOCALBASE%%/share/certs/ca-root-nss.crt"
9
10	struct _LmSSL {
11	LmSSLBase base;
12	@@ -200,6 +200,7 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons
13	{ GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
14	const int compression_priority[] =
15	{ GNUTLS_COMP_DEFLATE, GNUTLS_COMP_NULL, 0 };
16	+ gnutls_priority_t priorities_cache;
17
18	gnutls_init (&ssl->gnutls_session, GNUTLS_CLIENT);
19	gnutls_set_default_priority (ssl->gnutls_session);
20	@@ -213,6 +214,8 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons
21
22	gnutls_transport_set_ptr (ssl->gnutls_session,
23	(gnutls_transport_ptr_t)(glong) fd);
24	+ gnutls_priority_init (&priorities_cache, "NONE:+VERS-TLS1.0:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL:NORMAL:%COMPAT", NULL);
25	+ gnutls_priority_set (ssl->gnutls_session, priorities_cache);
26
27	ret = gnutls_handshake (ssl->gnutls_session);
28

Lines 12-32 lib/libloudmouth-1.so Link Here

(-)net-im/loudmouth/pkg-plist (-18 / +20 lines)
12	lib/libloudmouth-1.so.0	12	lib/libloudmouth-1.so.0
13	lib/libloudmouth-1.so.0.1.0	13	lib/libloudmouth-1.so.0.1.0
14	libdata/pkgconfig/loudmouth-1.0.pc	14	libdata/pkgconfig/loudmouth-1.0.pc
15	share/gtk-doc/html/loudmouth/ch01.html	15	%%PORTDOCS%%share/gtk-doc/html/loudmouth/ch01.html
16	share/gtk-doc/html/loudmouth/home.png	16	%%PORTDOCS%%share/gtk-doc/html/loudmouth/home.png
17	share/gtk-doc/html/loudmouth/index.html	17	%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.html
18	share/gtk-doc/html/loudmouth/index.sgml	18	%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.sgml
19	share/gtk-doc/html/loudmouth/left.png	19	%%PORTDOCS%%share/gtk-doc/html/loudmouth/left-insensitive.png
20	share/gtk-doc/html/loudmouth/loudmouth-lm-connection.html	20	%%PORTDOCS%%share/gtk-doc/html/loudmouth/left.png
21	share/gtk-doc/html/loudmouth/loudmouth-lm-error.html	21	%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmConnection.html
22	share/gtk-doc/html/loudmouth/loudmouth-lm-message-handler.html	22	%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmError.html
23	share/gtk-doc/html/loudmouth/loudmouth-lm-message.html	23	%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessage.html
24	share/gtk-doc/html/loudmouth/loudmouth-lm-message-node.html	24	%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageHandler.html
25	share/gtk-doc/html/loudmouth/loudmouth-lm-proxy.html	25	%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageNode.html
26	share/gtk-doc/html/loudmouth/loudmouth-lm-ssl.html	26	%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmProxy.html
27	share/gtk-doc/html/loudmouth/loudmouth-lm-utils.html	27	%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmSSL.html
28	share/gtk-doc/html/loudmouth/loudmouth.devhelp	28	%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-Miscellaneous-Utility-Functions.html
29	share/gtk-doc/html/loudmouth/loudmouth.devhelp2	29	%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth.devhelp2
30	share/gtk-doc/html/loudmouth/right.png	30	%%PORTDOCS%%share/gtk-doc/html/loudmouth/right-insensitive.png
31	share/gtk-doc/html/loudmouth/style.css	31	%%PORTDOCS%%share/gtk-doc/html/loudmouth/right.png
32	share/gtk-doc/html/loudmouth/up.png	32	%%PORTDOCS%%share/gtk-doc/html/loudmouth/style.css
		33	%%PORTDOCS%%share/gtk-doc/html/loudmouth/up-insensitive.png
		34	%%PORTDOCS%%share/gtk-doc/html/loudmouth/up.png

Lines 2-8 Link Here

(-)print/splix/Makefile (-9 / +9 lines)
2		2
3	PORTNAME= splix	3	PORTNAME= splix
4	PORTVERSION= 2.0.0	4	PORTVERSION= 2.0.0
5	PORTREVISION= 7	5	PORTREVISION= 8
6	CATEGORIES?= print	6	CATEGORIES?= print
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8		8
Lines 40-53 JBIG_DESC= Enable use of JBIG algorithm Link Here
40	BLACKOPTIM_DESC= Enable black correction algorithm	40	BLACKOPTIM_DESC= Enable black correction algorithm
41	OPTIONS_DEFAULT= JBIG BLACKOPTIM	41	OPTIONS_DEFAULT= JBIG BLACKOPTIM
42		42
43	.include "bsd.port.options.mk"	43	.include <bsd.port.options.mk>
44
45	post-patch:
46	@${REINPLACE_CMD} -e '/^CC.:= gcc/d' -e '/^CXX.:= g++/d' \
47	-e 's/make/gmake/' ${WRKSRC}/Makefile
48	@${REINPLACE_CMD} -e 's/g++/$$(CXX)/' ${WRKSRC}/rules.mk
49
50	post-configure:
51		44
52	.if ${PORT_OPTIONS:MJBIG}	45	.if ${PORT_OPTIONS:MJBIG}
53	PPD_SAMSUNG+= ${PPD_SAMSUNG_JBIG}	46	PPD_SAMSUNG+= ${PPD_SAMSUNG_JBIG}
Lines 65-70 MAKE_ARGS+= DISABLE_BLACKOPTIM=1 Link Here
65	MAKE_ARGS+= CACHESIZE=${CACHESIZE}	58	MAKE_ARGS+= CACHESIZE=${CACHESIZE}
66	.endif	59	.endif
67		60
		61	post-patch:
		62	@${REINPLACE_CMD} -e '/^CC.:= gcc/d' -e '/^CXX.:= g++/d' \
		63	-e 's/make/$$(MAKE)/' ${WRKSRC}/Makefile
		64	@${REINPLACE_CMD} '/cups-config --libs/s/$$/ -pthread/' \
		65	${WRKSRC}/module.mk
		66	@${REINPLACE_CMD} 's/g++/$$(CXX)/' ${WRKSRC}/rules.mk
		67
68	do-install:	68	do-install:
69	${MKDIR} ${STAGEDIR}${BIN_DEST_DIR}	69	${MKDIR} ${STAGEDIR}${BIN_DEST_DIR}
70	.for MODEL in ${MODELS}	70	.for MODEL in ${MODELS}

Lines 1-10 Link Here

(-)security/gnutls/Makefile (-13 / +13 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= gnutls	3	PORTNAME= gnutls
4	PORTVERSION= 3.3.17.1	4	PORTVERSION= 3.4.10
5	PORTREVISION= 3
6	CATEGORIES= security net	5	CATEGORIES= security net
7	MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R:R}	6	MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R}
8		7
9	MAINTAINER= tijl@FreeBSD.org	8	MAINTAINER= tijl@FreeBSD.org
10	COMMENT= GNU Transport Layer Security library	9	COMMENT= GNU Transport Layer Security library
Lines 27-48 CONFIGURE_ARGS= --disable-guile \ Link Here
27	--enable-local-libopts \	26	--enable-local-libopts \
28	ac_cv_type_max_align_t=yes	27	ac_cv_type_max_align_t=yes
29	CPPFLAGS+= -I${LOCALBASE}/include	28	CPPFLAGS+= -I${LOCALBASE}/include
30	LDFLAGS+= -L${LOCALBASE}/lib	29	LIBS+= -L${LOCALBASE}/lib
31	MAKE_ENV= MAKEINFOFLAGS=--no-split	30	MAKE_ENV= MAKEINFOFLAGS=--no-split
		31	INSTALL_TARGET= install-strip
32		32
33	CPE_VENDOR= gnu	33	CPE_VENDOR= gnu
34		34
35	OPTIONS_DEFINE= CRYWRAP EXAMPLES LIBDANE NLS P11KIT TPM ZLIB	35	OPTIONS_DEFINE= CRYWRAP DANE EXAMPLES IDN NLS P11KIT TPM ZLIB
36	OPTIONS_DEFAULT= CRYWRAP P11KIT TPM ZLIB	36	OPTIONS_DEFAULT= CRYWRAP IDN P11KIT TPM ZLIB
37	OPTIONS_SUB= yes	37	OPTIONS_SUB= yes
38		38
39	CRYWRAP_DESC= Enable Crywrap TLS proxy service	39	CRYWRAP_DESC= Enable Crywrap TLS proxy service
40	CRYWRAP_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn	40	CRYWRAP_IMPLIES= IDN
41	CRYWRAP_CONFIGURE_ENABLE= crywrap	41	CRYWRAP_CONFIGURE_ENABLE= crywrap
42		42
43	LIBDANE_DESC= DNSSEC support for DANE (danetool --check)	43	DANE_DESC= Certificate verification via DNSSEC
44	LIBDANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound	44	DANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound
45	LIBDANE_CONFIGURE_ENABLE= libdane	45	DANE_CONFIGURE_ENABLE= libdane
		46
		47	IDN_CONFIGURE_WITH= idn
		48	IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn
46		49
47	NLS_CONFIGURE_ENABLE= nls	50	NLS_CONFIGURE_ENABLE= nls
48	NLS_USES= gettext	51	NLS_USES= gettext
Lines 61-72 INFO= gnutls gnutls-guile Link Here
61		64
62	post-patch:	65	post-patch:
63	@${RM} ${WRKSRC}/doc/.info	66	@${RM} ${WRKSRC}/doc/.info
64	${SED} -i '' -e 's\|^+_NORETURN_H\|_NORETURN_H\|' \
65	${WRKSRC}/src/libopts/Makefile.in
66		67
67	post-install:	68	post-install:
68	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	69	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
69	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}	70	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
70	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnutls.so.
71		71
72	.include <bsd.port.mk>	72	.include <bsd.port.mk>

Line 0 Link Here

(-)security/gnutls/files/patch-configure (+18 lines)
	1	--- configure.orig 2016-03-03 07:52:15 UTC
	2	+++ configure
	3	@@ -47228,6 +47228,7 @@ fi
	4	$as_echo "$enable_dane" >&6; }
	5
	6	if test "$enable_dane" != "no"; then
	7	+ oldlibs="$LIBS"
	8	LIBS="$oldlibs -lunbound"
	9	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unbound library" >&5
	10	$as_echo_n "checking for unbound library... " >&6; }
	11	@@ -47444,6 +47445,7 @@ else
	12	fi
	13
	14	if test "$with_tpm" != "no"; then
	15	+ oldlibs="$LIBS"
	16	LIBS="$oldlibs -ltspi"
	17	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tss library" >&5
	18	$as_echo_n "checking for tss library... " >&6; }

Lines 2-76 Link Here

(-)security/libprelude/Makefile (-47 / +19 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libprelude	4	PORTNAME= libprelude
5	PORTVERSION= 1.0.1	5	PORTVERSION= 1.2.6
6	PORTREVISION= 9
7	CATEGORIES= security	6	CATEGORIES= security
8	MASTER_SITES= http://www.prelude-ids.org/attachments/download/241/	7	MASTER_SITES= http://www.prelude-siem.org/attachments/download/410/
9		8
10	MAINTAINER= koobs@FreeBSD.org	9	MAINTAINER= koobs@FreeBSD.org
11	COMMENT= Framework library for Prelude NIDS	10	COMMENT= Sensor support library from Prelude SIEM
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2+
14	LICENSE_FILE= ${WRKSRC}/LICENSE.README	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \	15	LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \
17	libgmp.so:${PORTSDIR}/math/gmp \
18	libgnutls.so:${PORTSDIR}/security/gnutls \	16	libgnutls.so:${PORTSDIR}/security/gnutls \
19	libgcrypt.so:${PORTSDIR}/security/libgcrypt \	17	libgcrypt.so:${PORTSDIR}/security/libgcrypt
20	libgpg-error.so:${PORTSDIR}/security/libgpg-error \
21	libnettle.so:${PORTSDIR}/security/nettle \
22	libp11-kit.so:${PORTSDIR}/security/p11-kit
23
24	BROKEN_sparc64= does not compile
25		18
26	OPTIONS_DEFINE= DOCS PERL PYTHON	19	OPTIONS_DEFINE= DOCS PERL PYTHON
27	OPTIONS_SUB= yes	20	OPTIONS_SUB= yes
28		21
29	USES= charsetfix gettext gmake iconv libtool pathfix pkgconfig	22	USES= charsetfix gettext-runtime gmake iconv libtool pathfix pkgconfig
30	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
31	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
32	CONFIGURE_ARGS= --enable-static \	25	CONFIGURE_ARGS= --without-lua \
33	--localstatedir=/var \	26	--without-python3 \
34	--enable-gtk-doc=no \	27	--without-swig \
35	--with-html-dir=${PREFIX}/share/doc	28	--without-valgrind \
36		29	ac_cv_path_RUBY=
37	CPPFLAGS+= -I${LOCALBASE}/include	30	CPPFLAGS+= -I${LOCALBASE}/include
38	LDFLAGS+= -L${LOCALBASE}/lib	31	LIBS+= -L${LOCALBASE}/lib
39	INSTALL_TARGET= install-strip	32	INSTALL_TARGET= install-strip
40		33
41	ETCDIR= ${PREFIX}/etc/prelude	34	ETCDIR= ${PREFIX}/etc/prelude
42	PORTDOCS= *
43		35
44	PERL_CONFIGURE_WITH= perl	36	PERL_CONFIGURE_WITH= perl=${PERL}
45	PERL_USES= perl5	37	PERL_USES= perl5
46	PYTHON_CONFIGURE_WITH= python	38	PYTHON_CONFIGURE_WITH= python2=${PYTHON_CMD}
47	PYTHON_USES= python	39	PYTHON_USES= python:2.7
48		40	PYTHON_PLIST_SUB= VERSION="${PORTVERSION}"
49	.include <bsd.port.options.mk>
50
51	.if ${PORT_OPTIONS:MPYTHON}
52	PLIST_SUB+= PYTHON_VER="${PYTHON_VER}" VERSION="${PORTVERSION}"
53	.endif
54
55	.include <bsd.port.pre.mk>
56
57	post-patch:
58	@${REINPLACE_CMD} '\,gnutls/extra\.h,d' \
59	${WRKSRC}/prelude-admin/prelude-admin.c \
60	${WRKSRC}/prelude-admin/server.c
61		41
62	post-install:	42	post-install:
63	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
64
65	.for f in client.conf global.conf idmef-client.conf tls.conf	43	.for f in client.conf global.conf idmef-client.conf tls.conf
66	${INSTALL_DATA} ${WRKSRC}/${f} \	44	${MV} ${STAGEDIR}${ETCDIR}/default/${f} \
67	${STAGEDIR}${ETCDIR}/default/${f}.sample	45	${STAGEDIR}${ETCDIR}/default/${f}.sample
68	${RM} ${STAGEDIR}${ETCDIR}/default/${f} # Remove files install-data-local installs
69	.endfor	46	.endfor
70		47
71	.if ${PORT_OPTIONS:MDOCS}	48	.include <bsd.port.mk>
72	@${MKDIR} ${STAGEDIR}${DOCSDIR}
73	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${STAGEDIR}${DOCSDIR}
74	.endif
75
76	.include <bsd.port.post.mk>

Lines 1-13 Link Here

(-)security/libprelude/files/patch-src__include__prelude-plugin.h (-13 lines)
1	--- src/include/prelude-plugin.h.orig 2012-06-02 00:12:30.000000000 +0900
2	+++ src/include/prelude-plugin.h 2012-09-11 15:46:33.000000000 +0900
3	@@ -61,9 +61,9 @@
4	*/
5	#ifdef PRELUDE_APPLICATION_USE_LIBTOOL2
6	# define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
7	-#endif
8
9	extern const void *lt_preloaded_symbols[];
10	+#endif
11
12	#define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS() \
13	prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols)

Lines 11-16 include/libprelude/idmef.h Link Here

(-)security/libprelude/pkg-plist (-13 / +59 lines)
11	include/libprelude/idmef.hxx	11	include/libprelude/idmef.hxx
12	include/libprelude/idmef-additional-data.h	12	include/libprelude/idmef-additional-data.h
13	include/libprelude/idmef-class.h	13	include/libprelude/idmef-class.h
		14	include/libprelude/idmef-class.hxx
14	include/libprelude/idmef-criteria.h	15	include/libprelude/idmef-criteria.h
15	include/libprelude/idmef-criteria.hxx	16	include/libprelude/idmef-criteria.hxx
16	include/libprelude/idmef-criterion-value.h	17	include/libprelude/idmef-criterion-value.h
Lines 20-25 include/libprelude/idmef-message-id.h Link Here
20	include/libprelude/idmef-message-print.h	21	include/libprelude/idmef-message-print.h
21	include/libprelude/idmef-message-read.h	22	include/libprelude/idmef-message-read.h
22	include/libprelude/idmef-message-write.h	23	include/libprelude/idmef-message-write.h
		24	include/libprelude/idmef-object.h
23	include/libprelude/idmef-path.h	25	include/libprelude/idmef-path.h
24	include/libprelude/idmef-path.hxx	26	include/libprelude/idmef-path.hxx
25	include/libprelude/idmef-time.h	27	include/libprelude/idmef-time.h
Lines 54-59 include/libprelude/prelude-linked-object Link Here
54	include/libprelude/prelude-list.h	56	include/libprelude/prelude-list.h
55	include/libprelude/prelude-log.h	57	include/libprelude/prelude-log.h
56	include/libprelude/prelude-log.hxx	58	include/libprelude/prelude-log.hxx
		59	include/libprelude/prelude-macros.h
57	include/libprelude/prelude-message-id.h	60	include/libprelude/prelude-message-id.h
58	include/libprelude/prelude-msg.h	61	include/libprelude/prelude-msg.h
59	include/libprelude/prelude-msgbuf.h	62	include/libprelude/prelude-msgbuf.h
Lines 63-88 include/libprelude/prelude-plugin.h Link Here
63	include/libprelude/prelude-string.h	66	include/libprelude/prelude-string.h
64	include/libprelude/prelude-thread.h	67	include/libprelude/prelude-thread.h
65	include/libprelude/prelude-timer.h	68	include/libprelude/prelude-timer.h
66	lib/libprelude.a
67	lib/libprelude.so	69	lib/libprelude.so
68	lib/libprelude.so.2	70	lib/libprelude.so.23
69	lib/libprelude.so.2.19.1	71	lib/libprelude.so.23.1.0
70	lib/libpreludecpp.a
71	lib/libpreludecpp.so	72	lib/libpreludecpp.so
72	lib/libpreludecpp.so.0	73	lib/libpreludecpp.so.8
73	lib/libpreludecpp.so.0.3.0	74	lib/libpreludecpp.so.8.0.0
74	man/man1/prelude-admin.1.gz
75	%%PERL%%%%SITE_ARCH%%/Prelude.pm	75	%%PERL%%%%SITE_ARCH%%/Prelude.pm
76	%%PERL%%%%SITE_ARCH%%/auto/Prelude/Prelude.so	76	%%PERL%%%%SITE_ARCH%%/auto/Prelude/Prelude.so
77	%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy-%%VERSION%%-py%%PYTHON_VER%%.egg-info
78	%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.py
79	%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.pyc
80	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_PreludeEasy.so
81	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so	77	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
82	%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info	78	%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info
83	%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py	79	%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
84	%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc	80	%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
85	libdata/pkgconfig/libprelude.pc	81	libdata/pkgconfig/libprelude.pc
		82	man/man1/prelude-admin.1.gz
86	share/aclocal/libprelude.m4	83	share/aclocal/libprelude.m4
87	@dir %%ETCDIR%%/profile	84	%%PORTDOCS%%share/gtk-doc/html/libprelude/api-index-full.html
88	@dir(root,wheel,711) /var/spool/prelude	85	%%PORTDOCS%%share/gtk-doc/html/libprelude/ch01.html
		86	%%PORTDOCS%%share/gtk-doc/html/libprelude/deprecated-api-index.html
		87	%%PORTDOCS%%share/gtk-doc/html/libprelude/home.png
		88	%%PORTDOCS%%share/gtk-doc/html/libprelude/index.html
		89	%%PORTDOCS%%share/gtk-doc/html/libprelude/index.sgml
		90	%%PORTDOCS%%share/gtk-doc/html/libprelude/left.png
		91	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-additional-data.html
		92	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criteria.html
		93	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criterion-value.html
		94	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-data.html
		95	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-print.html
		96	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-read.html
		97	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-write.html
		98	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-path.html
		99	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-time.html
		100	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-tree-wrap.html
		101	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-value.html
		102	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-async.html
		103	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client-profile.html
		104	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client.html
		105	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection-pool.html
		106	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection.html
		107	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-error.html
		108	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-failover.html
		109	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-hash.html
		110	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-ident.html
		111	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-inttypes.html
		112	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-io.html
		113	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-linked-object.html
		114	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-list.html
		115	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-log.html
		116	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msg.html
		117	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msgbuf.html
		118	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option-wide.html
		119	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option.html
		120	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-plugin.html
		121	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-string.html
		122	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-timer.html
		123	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude.html
		124	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp
		125	%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp2
		126	%%PORTDOCS%%share/gtk-doc/html/libprelude/object-tree.html
		127	%%PORTDOCS%%share/gtk-doc/html/libprelude/right.png
		128	%%PORTDOCS%%share/gtk-doc/html/libprelude/style.css
		129	%%PORTDOCS%%share/gtk-doc/html/libprelude/up.png
		130	%%DATADIR%%/swig/libpreludecpp.i
		131	%%PERL%%%%DATADIR%%/swig/perl/libpreludecpp-perl.i
		132	%%PYTHON%%%%DATADIR%%/swig/python/libpreludecpp-python.i
		133	@dir(,,711) %%ETCDIR%%/profile
		134	@dir(,,711) /var/spool/prelude

Lines 2-37 Link Here

(-)security/libpreludedb/Makefile (-42 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libpreludedb	4	PORTNAME= libpreludedb
5	PORTVERSION= 1.0.1p1	5	PORTVERSION= 1.2.6
6	PORTREVISION= 10
7	CATEGORIES= security	6	CATEGORIES= security
8	MASTER_SITES= https://www.prelude-ids.org/attachments/download/287/	7	MASTER_SITES= http://www.prelude-siem.org/attachments/download/408/
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Framework library for access to Prelude NIDS database	10	COMMENT= Library to access Prelude IDMEF database
12		11
13	LICENSE= GPLv2+	12	LICENSE= GPLv2+
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \	15	LIB_DEPENDS= libprelude.so:${PORTSDIR}/security/libprelude
17	libgmp.so:${PORTSDIR}/math/gmp \
18	libgnutls.so:${PORTSDIR}/security/gnutls \
19	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
20	libgpg-error.so:${PORTSDIR}/security/libgpg-error \
21	libprelude.so:${PORTSDIR}/security/libprelude \
22	libnettle.so:${PORTSDIR}/security/nettle \
23	libp11-kit.so:${PORTSDIR}/security/p11-kit
24		16
25	USES= gettext gmake iconv libtool	17	USES= gmake libtool
26	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS= --enable-gtk-doc=no \	19	CONFIGURE_ARGS= --without-swig \
28	--with-html-dir=${PREFIX}/share/doc	20	--without-python3
29	INSTALL_TARGET= install-strip	21	INSTALL_TARGET= install-strip
30	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
31		23
32	PORTDOCS= *	24	OPTIONS_DEFINE= DOCS PYTHON
33
34	OPTIONS_DEFINE= DOCS PERL PYTHON
35	OPTIONS_MULTI= DB	25	OPTIONS_MULTI= DB
36	OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE	26	OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE
37	OPTIONS_DEFAULT= MYSQL	27	OPTIONS_DEFAULT= MYSQL
Lines 40-74 OPTIONS_SUB= yes Link Here
40	MYSQL_DESC= MySQL plugin	30	MYSQL_DESC= MySQL plugin
41	MYSQL_USE= mysql=yes	31	MYSQL_USE= mysql=yes
42	MYSQL_CONFIGURE_WITH= mysql	32	MYSQL_CONFIGURE_WITH= mysql
43	PERL_DESC= Perl bindings
44	PERL_USES= perl5
45	PERL_USE= perl5=build,run
46	PERL_CONFIGURE_WITH= perl
47	PGSQL_DESC= PostgreSQL plugin	33	PGSQL_DESC= PostgreSQL plugin
48	PGSQL_USES= pgsql	34	PGSQL_USES= pgsql
49	PGSQL_CONFIGURE_WITH= postgresql	35	PGSQL_CONFIGURE_WITH= postgresql
50	PYTHON_USES= python	36	PYTHON_USES= python:2.7
51	PYTHON_CONFIGURE_WITH= python	37	PYTHON_CONFIGURE_WITH= python2=${PYTHON_CMD}
52	PYTHON_PLIST_SUB= PYTHON_VER="${PYTHON_VER}"	38	PYTHON_PLIST_SUB= VERSION=${PORTVERSION}
53	SQLITE_DESC= SQLite3 plugin	39	SQLITE_DESC= SQLite3 plugin
54	SQLITE_USE= sqlite=yes	40	SQLITE_USE= sqlite=yes
55	SQLITE_CONFIGURE_WITH= sqlite3	41	SQLITE_CONFIGURE_WITH= sqlite3
56		42
57	post-install:
58	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 \
59	${STAGEDIR}${MAN1PREFIX}/man/man1
60
61	post-install-DOCS-on:
62	@${MKDIR} ${STAGEDIR}${DOCSDIR}
63	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* \
64	${STAGEDIR}${DOCSDIR}
65
66	post-install-PERL-on:
67	@${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \
68	-name "*.so" \| ${XARGS} ${STRIP_CMD}
69
70	post-install-PYTHON-on:
71	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
72	-name "*.so" \| ${XARGS} ${STRIP_CMD}
73
74	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)security/libpreludedb/files/patch-Makefile.in (-13 lines)
1	--- Makefile.in.orig 2009-07-15 13:49:18.000000000 +0600
2	+++ Makefile.in 2009-09-04 10:56:03.000000000 +0600
3	@@ -645,9 +645,8 @@
4	top_builddir = @top_builddir@
5	top_srcdir = @top_srcdir@
6	ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
7	-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
8	EXTRA_DIST = LICENSE.README HACKING.README
9	-SUBDIRS = m4 libmissing src plugins bindings docs
10	+SUBDIRS = m4 libmissing src plugins bindings
11	MAINTAINERCLEANFILES = \
12	$(srcdir)/INSTALL \
13	$(srcdir)/aclocal.m4 \

Lines 1-28 Link Here

(-)security/libpreludedb/pkg-plist (-5 / +30 lines)
1	bin/libpreludedb-config	1	bin/libpreludedb-config
2	bin/preludedb-admin	2	bin/preludedb-admin
3	include/libpreludedb/preludedb.h	3	include/libpreludedb/preludedb.h
		4	include/libpreludedb/preludedb.hxx
4	include/libpreludedb/preludedb-error.h	5	include/libpreludedb/preludedb-error.h
		6	include/libpreludedb/preludedb-error.hxx
5	include/libpreludedb/preludedb-path-selection.h	7	include/libpreludedb/preludedb-path-selection.h
6	include/libpreludedb/preludedb-plugin-format.h	8	include/libpreludedb/preludedb-plugin-format.h
7	include/libpreludedb/preludedb-plugin-sql.h	9	include/libpreludedb/preludedb-plugin-sql.h
8	include/libpreludedb/preludedb-sql-settings.h	10	include/libpreludedb/preludedb-sql-settings.h
9	include/libpreludedb/preludedb-sql.h	11	include/libpreludedb/preludedb-sql.h
		12	include/libpreludedb/preludedb-sql.hxx
10	include/libpreludedb/preludedb-version.h	13	include/libpreludedb/preludedb-version.h
11	lib/libpreludedb.so	14	lib/libpreludedb.so
12	lib/libpreludedb.so.0	15	lib/libpreludedb.so.7
13	lib/libpreludedb.so.0.4.10	16	lib/libpreludedb.so.7.0.0
		17	lib/libpreludedbcpp.so
		18	lib/libpreludedbcpp.so.2
		19	lib/libpreludedbcpp.so.2.0.0
14	lib/libpreludedb/plugins/formats/classic.so	20	lib/libpreludedb/plugins/formats/classic.so
15	%%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so	21	%%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
16	%%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so	22	%%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
17	%%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so	23	%%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so
18	%%PERL%%%%SITE_ARCH%%/PreludeDB.pm
19	%%PERL%%%%SITE_ARCH%%/auto/PreludeDB/PreludeDB.so
20	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so	24	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so
21	%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-0.0.0-py%%PYTHON_VER%%.egg-info	25	%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-%%VERSION%%-py%%PYTHON_VER%%.egg-info
22	%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py	26	%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
23	%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc	27	%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc
24	man/man1/preludedb-admin.1.gz	28	man/man1/preludedb-admin.1.gz
25	share/aclocal/libpreludedb.m4	29	share/aclocal/libpreludedb.m4
		30	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/api-index-full.html
		31	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/ch01.html
		32	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/deprecated-api-index.html
		33	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/home.png
		34	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.html
		35	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.sgml
		36	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/left.png
		37	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-error.html
		38	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-path-selection.html
		39	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-format.html
		40	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-sql.html
		41	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql-settings.html
		42	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql.html
		43	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-version.html
		44	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb.html
		45	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp
		46	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2
		47	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/object-tree.html
		48	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/right.png
		49	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/style.css
		50	%%PORTDOCS%%share/gtk-doc/html/libpreludedb/up.png
26	%%DATADIR%%/classic/mysql-update-14-1.sql	51	%%DATADIR%%/classic/mysql-update-14-1.sql
27	%%DATADIR%%/classic/mysql-update-14-2.sql	52	%%DATADIR%%/classic/mysql-update-14-2.sql
28	%%DATADIR%%/classic/mysql-update-14-3.sql	53	%%DATADIR%%/classic/mysql-update-14-3.sql

Lines 2-8 Link Here

(-)sysutils/gkrellm2/Makefile (-9 / +3 lines)
2		2
3	PORTNAME= gkrellm	3	PORTNAME= gkrellm
4	PORTVERSION= 2.3.5	4	PORTVERSION= 2.3.5
5	PORTREVISION= 6	5	PORTREVISION= 7
6	CATEGORIES= sysutils ipv6	6	CATEGORIES= sysutils ipv6
7	MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \	7	MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \
8	LOCAL/ume	8	LOCAL/ume
Lines 17-25 USES= gmake pkgconfig tar:bzip2 Link Here
17	USE_RC_SUBR= gkrellmd	17	USE_RC_SUBR= gkrellmd
18	WANT_GNOME= yes	18	WANT_GNOME= yes
19		19
20	OPTIONS_DEFINE= DOCS CLIENT NLS NTLM	20	OPTIONS_DEFINE= DOCS CLIENT NLS NTLM OPENSSL
21	OPTIONS_RADIO= SSL
22	OPTIONS_RADIO_SSL= GNUTLS OPENSSL
23	OPTIONS_DEFAULT= CLIENT NTLM OPENSSL	21	OPTIONS_DEFAULT= CLIENT NTLM OPENSSL
24	OPTIONS_SUB= yes	22	OPTIONS_SUB= yes
25		23
Lines 40-50 USES+= gettext Link Here
40	.else	38	.else
41	MAKE_ENV+= enable_nls=0	39	MAKE_ENV+= enable_nls=0
42	.endif	40	.endif
43	.if ${PORT_OPTIONS:MGNUTLS}	41	.if ${PORT_OPTIONS:MOPENSSL}
44	LIB_DEPENDS+= libgnutls-openssl.so:${PORTSDIR}/security/gnutls
45	MAKE_ENV+= GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \
46	without-ssl=1
47	.elif ${PORT_OPTIONS:MOPENSSL}
48	USE_OPENSSL= yes	42	USE_OPENSSL= yes
49	MAKE_ENV+= without-gnutls=1	43	MAKE_ENV+= without-gnutls=1
50	.else	44	.else

Line 0 Link Here

(-)sysutils/heartbeat/files/patch-crm-cib-remote.c (+26 lines)
	1	--- crm/cib/remote.c.orig 2008-08-18 12:32:19 UTC
	2	+++ crm/cib/remote.c
	3	@@ -45,13 +45,6 @@ void cib_send_remote_msg(void *session,
	4
	5	#ifdef HAVE_GNUTLS_GNUTLS_H
	6	# define DH_BITS 1024
	7	-const int tls_kx_order[] = {
	8	- GNUTLS_KX_ANON_DH,
	9	- GNUTLS_KX_DHE_RSA,
	10	- GNUTLS_KX_DHE_DSS,
	11	- GNUTLS_KX_RSA,
	12	- 0
	13	-};
	14	gnutls_dh_params dh_params;
	15	gnutls_anon_server_credentials anon_cred;
	16	char cib_send_tls(gnutls_session session, HA_Message *msg);
	17	@@ -83,8 +76,7 @@ create_tls_session(int csock)
	18	session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
	19
	20	gnutls_init(session, GNUTLS_SERVER);
	21	- gnutls_set_default_priority(*session);
	22	- gnutls_kx_set_priority (*session, tls_kx_order);
	23	+ gnutls_priority_set_direct (*session, "NORMAL:-KX-ALL:+ANON-DH:+DHE-RSA:+DHE-DSS:+RSA", NULL);
	24	gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anon_cred);
	25	gnutls_transport_set_ptr(*session,
	26	(gnutls_transport_ptr) GINT_TO_POINTER(csock));

Line 0 Link Here

(-)sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c (+34 lines)
	1	--- lib/mgmt/mgmt_tls_lib.c.orig 2008-08-18 12:32:19 UTC
	2	+++ lib/mgmt/mgmt_tls_lib.c
	3	@@ -38,11 +38,6 @@ static gnutls_dh_params dh_params;
	4	gnutls_anon_server_credentials anoncred_server;
	5	gnutls_anon_client_credentials anoncred_client;
	6
	7	-const int kx_prio[] =
	8	-{
	9	- GNUTLS_KX_ANON_DH,
	10	- 0
	11	-};
	12
	13	int
	14	tls_init_client(void)
	15	@@ -58,8 +53,7 @@ tls_attach_client(int sock)
	16	int ret;
	17	gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
	18	gnutls_init(session, GNUTLS_CLIENT);
	19	- gnutls_set_default_priority(*session);
	20	- gnutls_kx_set_priority (*session, kx_prio);
	21	+ gnutls_priority_set_direct(*session, "NORMAL:-KX-ALL:+ANON-DH", NULL);
	22	gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_client);
	23	gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock));
	24	ret = gnutls_handshake(*session);
	25	@@ -131,8 +125,7 @@ tls_attach_server(int sock)
	26	int ret;
	27	gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
	28	gnutls_init(session, GNUTLS_SERVER);
	29	- gnutls_set_default_priority(*session);
	30	- gnutls_kx_set_priority (*session, kx_prio);
	31	+ gnutls_priority_set_direct(*session, "NORMAL:-KX-ALL:+ANON-DH", NULL);
	32	gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_server);
	33	gnutls_dh_set_prime_bits(*session, DH_BITS);
	34	gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock));

Lines 1-9 Link Here

(-)sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c (-3 / +15 lines)
1	--- lib/plugins/quorum/quorumd.c.orig	1	--- lib/plugins/quorum/quorumd.c.orig 2008-08-18 12:32:19 UTC
2	+++ lib/plugins/quorum/quorumd.c	2	+++ lib/plugins/quorum/quorumd.c
3	@@ -353,15 +353,28 @@	3	@@ -327,11 +327,9 @@ initialize_tls_session (int sd)
		4	{
		5	int ret;
		6	gnutls_session session;
		7	- const int cert_type_priority[2] = { GNUTLS_CRT_X509,0};
		8
		9	gnutls_init (&session, GNUTLS_CLIENT);
		10	gnutls_set_default_priority (session);
		11	- gnutls_certificate_type_set_priority (session, cert_type_priority);
		12	gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
		13	gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd));
		14	ret = gnutls_handshake (session);
		15	@@ -353,15 +351,28 @@ verify_certificate (gnutls_session sessi
4	unsigned int cert_list_size;	16	unsigned int cert_list_size;
5	const gnutls_datum *cert_list;	17	const gnutls_datum *cert_list;
6	int ret;	18	int ret;
7	+ int status;	19	+ int status;
8	gnutls_x509_crt cert;	20	gnutls_x509_crt cert;
9		21

Lines 1-9 Link Here

(-)sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c (-4 / +16 lines)
1	--- membership/quorumd/quorumdtest.c.orig	1	--- membership/quorumd/quorumdtest.c.orig 2008-08-18 12:32:19 UTC
2	+++ membership/quorumd/quorumdtest.c	2	+++ membership/quorumd/quorumdtest.c
3	@@ -162,16 +162,16 @@	3	@@ -136,11 +136,9 @@ initialize_tls_session (int sd)
		4	{
		5	int ret;
		6	gnutls_session session;
		7	- const int cert_type_priority[2] = { GNUTLS_CRT_X509,0};
		8
		9	gnutls_init (&session, GNUTLS_CLIENT);
		10	gnutls_set_default_priority (session);
		11	- gnutls_certificate_type_set_priority (session, cert_type_priority);
		12	gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
		13	gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd));
		14	ret = gnutls_handshake (session);
		15	@@ -162,16 +160,16 @@ verify_certificate (gnutls_session sessi
4	unsigned int cert_list_size;	16	unsigned int cert_list_size;
5	const gnutls_datum *cert_list;	17	const gnutls_datum *cert_list;
6	int ret;	18	int ret;
7	+ int status;	19	+ int status;
8	gnutls_x509_crt cert;	20	gnutls_x509_crt cert;
9		21
Lines 19-25 Link Here
19	if (status & GNUTLS_CERT_INVALID) {	31	if (status & GNUTLS_CERT_INVALID) {
20	printf("The certificate is not trusted.\n");	32	printf("The certificate is not trusted.\n");
21	return -1;	33	return -1;
22	@@ -184,7 +184,6 @@	34	@@ -184,7 +182,6 @@ verify_certificate (gnutls_session sessi
23	printf("The certificate has been revoked.\n");	35	printf("The certificate has been revoked.\n");
24	return -1;	36	return -1;
25	}	37	}

Line 0 Link Here

(-)textproc/iksemel/files/patch-src-stream.c (+27 lines)
	1	--- src/stream.c.orig 2009-07-23 11:16:35 UTC
	2	+++ src/stream.c
	3	@@ -63,11 +63,6 @@ tls_pull (iksparser prs, char buffer,
	4	static int
	5	handshake (struct stream_data *data)
	6	{
	7	- const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
	8	- const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
	9	- const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
	10	- const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
	11	- const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
	12	int ret;
	13
	14	if (gnutls_global_init () != 0)
	15	@@ -80,11 +75,7 @@ handshake (struct stream_data *data)
	16	gnutls_certificate_free_credentials (data->cred);
	17	return IKS_NOMEM;
	18	}
	19	- gnutls_protocol_set_priority (data->sess, protocol_priority);
	20	- gnutls_cipher_set_priority(data->sess, cipher_priority);
	21	- gnutls_compression_set_priority(data->sess, comp_priority);
	22	- gnutls_kx_set_priority(data->sess, kx_priority);
	23	- gnutls_mac_set_priority(data->sess, mac_priority);
	24	+ gnutls_set_default_priority();
	25	gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
	26
	27	gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);