Attachment 188322 Details for Bug 197368 – freediameter 1.2.0 enhanced

freediameter 1.2.0 enhanced

freediameter-1.2.0-patch.txt (text/plain), 29.15 KB, created by Nikola Kolev on 2017-11-27 17:20:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikola Kolev

Created: 2017-11-27 17:20:52 UTC

Size: 29.15 KB

patch

obsolete

>diff -rupN freediameter.orig/Makefile freediameter/Makefile
>--- freediameter.orig/Makefile	2017-11-27 19:11:28.780088000 +0100
>+++ freediameter/Makefile	2017-11-27 19:11:43.007133000 +0100
>@@ -1,23 +1,163 @@
>-# $FreeBSD: head/net/freediameter/Makefile 441571 2017-05-24 10:28:19Z linimon $
>+# Created by: Pablo Carboni <pcarboni@gmail.com>
>+# $FreeBSD$
> 
>-PORTNAME=	freeDiameter
>+PORTNAME=	freediameter
> PORTVERSION=	1.2.0
>-PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	http://www.freediameter.net/hg/freeDiameter/archive/
>+DISTNAME=	${PORTNAME:S/d/D/}-${PORTVERSION}
> 
> MAINTAINER=	koue@chaosophia.net
>-COMMENT=	Open source Diameter protocol implementation
>+COMMENT=	Free Diameter server implementation
> 
> LICENSE=	BSD3CLAUSE
>-LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
>+LIB_DEPENDS=	libidn.so:dns/libidn \
> 		libgnutls.so:security/gnutls \
>-		libidn.so:dns/libidn
>+		libgcrypt.so:security/libgcrypt \
>+		libpython2.7.so:lang/python27
> 
>-USES=		cmake bison
>+SUB_FILES=	pkg-message pkg-install pkg-deinstall
>+
>+USES=		bison cmake
> USE_LDCONFIG=	yes
>+USE_RC_SUBR=	freediameterd
>+
>+CMAKE_NOCOLOR=	yes
>+CMAKE_VERBOSE=	yes
>+
> CMAKE_ARGS=	-DSCTP_USE_MAPPED_ADDRESSES:BOOL=ON
> 
>+PORTDOCS=	LICENSE NEWS README INSTALL*
>+
>+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/d/D/}
>+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:S/d/D/}
>+ETCDIR=		${PREFIX}/etc/${PORTNAME:S/d/D/}
>+
>+.include "${.CURDIR}/Makefile.options"
>+.include "${.CURDIR}/Makefile.options.desc"
>+
>+BUILD_ACL_WL_CMAKE_ON=				-DBUILD_ACL_WL:BOOL=ON
>+BUILD_ACL_WL_CMAKE_OFF=				-DBUILD_ACL_WL:BOOL=OFF
>+BUILD_DBG_MONITOR_CMAKE_ON=			-DBUILD_DBG_MONITOR:BOOL=ON
>+BUILD_DBG_MONITOR_CMAKE_OFF=			-DBUILD_DBG_MONITOR:BOOL=OFF
>+BUILD_DBG_MSG_DUMPS_CMAKE_ON=			-DBUILD_DBG_MSG_DUMPS:BOOL=ON
>+BUILD_DBG_MSG_DUMPS_CMAKE_OFF=			-DBUILD_DBG_MSG_DUMPS:BOOL=OFF
>+BUILD_DBG_MSG_TIMINGS_CMAKE_ON=			-DBUILD_DBG_MSG_TIMINGS:BOOL=ON
>+BUILD_DBG_MSG_TIMINGS_CMAKE_OFF=		-DBUILD_DBG_MSG_TIMINGS:BOOL=OFF
>+BUILD_DBG_RT_CMAKE_ON=				-DBUILD_DBG_RT:BOOL=ON
>+BUILD_DBG_RT_CMAKE_OFF=				-DBUILD_DBG_RT:BOOL=OFF
>+BUILD_DICT_DCCA_CMAKE_ON=			-DBUILD_DICT_DCCA:BOOL=ON
>+BUILD_DICT_DCCA_CMAKE_OFF=			-DBUILD_DICT_DCCA:BOOL=OFF
>+BUILD_DICT_DCCA_3GPP_CMAKE_ON=			-DBUILD_DICT_DCCA_3GPP:BOOL=ON
>+BUILD_DICT_DCCA_3GPP_CMAKE_OFF=			-DBUILD_DICT_DCCA_3GPP:BOOL=OFF
>+BUILD_DICT_DCCA_STARENT_CMAKE_ON=		-DBUILD_DICT_DCCA_STARENT:BOOL=ON
>+BUILD_DICT_DCCA_STARENT_CMAKE_OFF=		-DBUILD_DICT_DCCA_STARENT:BOOL=OFF
>+BUILD_DICT_EAP_CMAKE_ON=			-DBUILD_DICT_EAP:BOOL=ON
>+BUILD_DICT_EAP_CMAKE_OFF=			-DBUILD_DICT_EAP:BOOL=OFF
>+BUILD_DICT_MIP6A_CMAKE_ON=			-DBUILD_DICT_MIP6A:BOOL=ON
>+BUILD_DICT_MIP6A_CMAKE_OFF=			-DBUILD_DICT_MIP6A:BOOL=OFF
>+BUILD_DICT_MIP6I_CMAKE_ON=			-DBUILD_DICT_MIP6I:BOOL=ON
>+BUILD_DICT_MIP6I_CMAKE_OFF=			-DBUILD_DICT_MIP6I:BOOL=OFF
>+BUILD_DICT_NASREQ_CMAKE_ON=			-DBUILD_DICT_NASREQ:BOOL=ON
>+BUILD_DICT_NASREQ_CMAKE_OFF=			-DBUILD_DICT_NASREQ:BOOL=OFF
>+BUILD_DICT_NAS_MIPV6_CMAKE_ON=			-DBUILD_DICT_NAS_MIPV6:BOOL=ON
>+BUILD_DICT_NAS_MIPV6_CMAKE_OFF=			-DBUILD_DICT_NAS_MIPV6:BOOL=OFF
>+BUILD_DICT_RFC5777_CMAKE_ON=			-DBUILD_DICT_RFC5777:BOOL=ON
>+BUILD_DICT_RFC5777_CMAKE_OFF=			-DBUILD_DICT_RFC5777:BOOL=OFF
>+BUILD_DICT_SIP_CMAKE_ON=			-DBUILD_DICT_SIP:BOOL=ON
>+BUILD_DICT_SIP_CMAKE_OFF=			-DBUILD_DICT_SIP:BOOL=OFF
>+BUILD_RT_BUSYPEERS_CMAKE_ON=			-DBUILD_RT_BUSYPEERS:BOOL=ON
>+BUILD_RT_BUSYPEERS_CMAKE_OFF=			-DBUILD_RT_BUSYPEERS:BOOL=OFF
>+BUILD_RT_DEFAULT_CMAKE_ON=			-DBUILD_RT_DEFAULT:BOOL=ON
>+BUILD_RT_DEFAULT_CMAKE_OFF=			-DBUILD_RT_DEFAULT:BOOL=OFF
>+BUILD_RT_IGNORE_DH_CMAKE_ON=			-DBUILD_RT_IGNORE_DH:BOOL=ON
>+BUILD_RT_IGNORE_DH_CMAKE_OFF=			-DBUILD_RT_IGNORE_DH:BOOL=OFF
>+BUILD_RT_LOAD_BALANCE_CMAKE_ON=			-DBUILD_RT_LOAD_BALANCE:BOOL=ON
>+BUILD_RT_LOAD_BALANCE_CMAKE_OFF=		-DBUILD_RT_LOAD_BALANCE:BOOL=OFF
>+BUILD_RT_REDIRECT_CMAKE_ON=			-DBUILD_RT_REDIRECT:BOOL=ON
>+BUILD_RT_REDIRECT_CMAKE_OFF=			-DBUILD_RT_REDIRECT:BOOL=OFF
>+BUILD_TEST_APP_CMAKE_ON=			-DBUILD_TEST_APP:BOOL=ON
>+BUILD_TEST_APP_CMAKE_OFF=			-DBUILD_TEST_APP:BOOL=OFF
>+
>+BUILD_APP_ACCT_CMAKE_ON=			-DBUILD_APP_ACCT:BOOL=ON
>+BUILD_APP_ACCT_CMAKE_OFF=			-DBUILD_APP_ACCT:BOOL=OFF
>+BUILD_APP_ACCT_USES=				pgsql
>+
>+BUILD_APP_DIAMEAP_CMAKE_ON=			-DBUILD_APP_DIAMEAP:BOOL=ON
>+BUILD_APP_DIAMEAP_CMAKE_OFF=			-DBUILD_APP_DIAMEAP:BOOL=OFF
>+BUILD_APP_DIAMEAP_USES=				pgsql
>+
>+BUILD_APP_RADGW_CMAKE_ON=			-DBUILD_APP_RADGW:BOOL=ON
>+BUILD_APP_RADGW_CMAKE_OFF=			-DBUILD_APP_RADGW:BOOL=OFF
>+BUILD_APP_RADGW_USES=				pgsql
>+
>+BUILD_APP_REDIRECT_CMAKE_ON=			-DBUILD_APP_REDIRECT:BOOL=ON
>+BUILD_APP_REDIRECT_CMAKE_OFF=			-DBUILD_APP_REDIRECT:BOOL=OFF
>+BUILD_APP_REDIRECT_USES=			pgsql
>+
>+BUILD_APP_SIP_CMAKE_ON=				-DBUILD_APP_SIP:BOOL=ON
>+BUILD_APP_SIP_CMAKE_OFF=			-DBUILD_APP_SIP:BOOL=OFF
>+BUILD_APP_SIP_USE=				mysql=client
>+
>+BUILD_DBG_INTERACTIVE_CMAKE_ON=			-DBUILD_DBG_INTERACTIVE:BOOL=ON
>+BUILD_DBG_INTERACTIVE_CMAKE_OFF=		-DBUILD_DBG_INTERACTIVE:BOOL=OFF
>+BUILD_DBG_INTERACTIVE_BUILD_DEPENDS=		swig2.0:devel/swig20
>+
>+BUILD_DICT_LEGACY_XML_CMAKE_ON=			-DBUILD_DICT_LEGACY_XML:BOOL=ON
>+BUILD_DICT_LEGACY_XML_CMAKE_OFF=		-DBUILD_DICT_LEGACY_XML:BOOL=OFF
>+BUILD_DICT_LEGACY_XML_LIB_DEPENDS=		libxml2.so:textproc/libxml2
>+
>+BUILD_RT_EREG_CMAKE_ON=				-DBUILD_RT_EREG:BOOL=ON
>+BUILD_RT_EREG_CMAKE_OFF=			-DBUILD_RT_EREG:BOOL=OFF
>+BUILD_TEST_NETEMUL_CMAKE_ON=			-DBUILD_TEST_NETEMUL:BOOL=ON
>+BUILD_TEST_NETEMUL_CMAKE_OFF=			-DBUILD_TEST_NETEMUL:BOOL=OFF
>+BUILD_TEST_SIP_CMAKE_ON=			-DBUILD_TEST_SIP:BOOL=ON
>+BUILD_TEST_SIP_CMAKE_OFF=			-DBUILD_TEST_SIP:BOOL=OFF
>+DEBUG_SCTP_CMAKE_ON=				-DDEBUG_SCTP:BOOL=ON
>+DEBUG_SCTP_CMAKE_OFF=				-DDEBUG_SCTP:BOOL=OFF
>+DIAMID_IDNA_IGNORE_CMAKE_ON=			-DDIAMID_IDNA_IGNORE:BOOL=ON
>+DIAMID_IDNA_IGNORE_CMAKE_OFF=			-DDIAMID_IDNA_IGNORE:BOOL=OFF
>+DIAMID_IDNA_REJECT_CMAKE_ON=			-DDIAMID_IDNA_REJECT:BOOL=ON
>+DIAMID_IDNA_REJECT_CMAKE_OFF=			-DDIAMID_IDNA_REJECT:BOOL=OFF
>+DISABLE_PEER_EXPIRY_CMAKE_ON=			-DDISABLE_PEER_EXPIRY:BOOL=ON
>+DISABLE_PEER_EXPIRY_CMAKE_OFF=			-DDISABLE_PEER_EXPIRY:BOOL=OFF
>+DISABLE_SCTP_CMAKE_ON=				-DDISABLE_SCTP:BOOL=ON
>+DISABLE_SCTP_CMAKE_OFF=				-DDISABLE_SCTP:BOOL=OFF
>+ERRORS_ON_TODO_CMAKE_ON=			-DERRORS_ON_TODO:BOOL=ON
>+ERRORS_ON_TODO_CMAKE_OFF=			-DERRORS_ON_TODO:BOOL=OFF
>+WORKAROUND_ACCEPT_INVALID_VSAI_CMAKE_ON=	-DWORKAROUND_ACCEPT_INVALID_VSAI:BOOL=ON
>+WORKAROUND_ACCEPT_INVALID_VSAI_CMAKE_OFF=	-DWORKAROUND_ACCEPT_INVALID_VSAI:BOOL=OFF
>+
>+.include <bsd.port.options.mk>
>+
>+pre-build:
>+.if ${PORT_OPTIONS:MBUILD_TESTING} && !${PORT_OPTIONS:MDISABLE_SCTP}
>+BROKEN=	SCTP tests broken. Try again by disabling BUILD_TESTING or by enabling DISABLE_SCTP support
>+.endif
>+
>+pre-install:
>+.if ${PORT_OPTIONS:MDISABLE_SCTP}
>+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} && \
>+	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
>+.endif
>+
>+post-install:
>+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
>+
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
>+	cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${DOCSDIR}
>+
>+	${MKDIR} ${STAGEDIR}${ETCDIR}
>+	cd ${WRKSRC}/doc/single_host && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}
>+
>+	${REINPLACE_CMD} -i "" -e 's|%%ETCDIR%%|${ETCDIR}|g' \
>+				-e 's|%%LIBEXECDIR%%|${PREFIX}/libexec|g' \
>+				${WRKSRC}/doc/single_host/freeDiameter-1.conf
>+
>+	${INSTALL_DATA} ${WRKSRC}/doc/single_host/freeDiameter-1.conf ${STAGEDIR}${ETCDIR}/freeDiameter.conf.sample
>+	${INSTALL_DATA} ${WRKSRC}/doc/single_host/freeDiameter-1.conf ${STAGEDIR}${ETCDIR}/freeDiameter.conf
>+
> .include <bsd.port.mk>
>diff -rupN freediameter.orig/Makefile.options freediameter/Makefile.options
>--- freediameter.orig/Makefile.options	1970-01-01 01:00:00.000000000 +0100
>+++ freediameter/Makefile.options	2017-11-27 19:11:31.531330000 +0100
>@@ -0,0 +1,55 @@
>+OPTIONS_ENABLED_EXTENSIONS=	\
>+				BUILD_ACL_WL \
>+				BUILD_DBG_MONITOR \
>+				BUILD_DBG_MSG_DUMPS \
>+				BUILD_DBG_MSG_TIMINGS \
>+				BUILD_DBG_RT \
>+				BUILD_DICT_DCCA \
>+				BUILD_DICT_DCCA_3GPP \
>+				BUILD_DICT_DCCA_STARENT \
>+				BUILD_DICT_EAP \
>+				BUILD_DICT_MIP6A \
>+				BUILD_DICT_MIP6I \
>+				BUILD_DICT_NASREQ \
>+				BUILD_DICT_NAS_MIPV6 \
>+				BUILD_DICT_RFC5777 \
>+				BUILD_DICT_SIP \
>+				BUILD_RT_BUSYPEERS \
>+				BUILD_RT_DEFAULT \
>+				BUILD_RT_IGNORE_DH \
>+				BUILD_RT_LOAD_BALANCE \
>+				BUILD_RT_REDIRECT \
>+				BUILD_TEST_APP \
>+
>+OPTIONS_OTHER_EXTENSIONS=	\
>+				BUILD_APP_ACCT \
>+				BUILD_APP_DIAMEAP \
>+				BUILD_APP_RADGW \
>+				BUILD_APP_REDIRECT \
>+				BUILD_APP_SIP \
>+				BUILD_DBG_INTERACTIVE \
>+				BUILD_DICT_LEGACY_XML \
>+				BUILD_RT_EREG \
>+				BUILD_TEST_NETEMUL \
>+				BUILD_TEST_SIP \
>+				BUILD_TESTING
>+
>+OPTIONS_OTHER_MISC=		\
>+				DEBUG_SCTP \
>+				DIAMID_IDNA_IGNORE \
>+				DIAMID_IDNA_REJECT \
>+				DISABLE_PEER_EXPIRY \
>+				ERRORS_ON_TODO \
>+				WORKAROUND_ACCEPT_INVALID_VSAI \
>+				DISABLE_SCTP
>+
>+NO_OPTIONS_SORT=		yes
>+
>+OPTIONS_GROUP=			EXTENSIONS MISC
>+OPTIONS_GROUP_EXTENSIONS=	${OPTIONS_ENABLED_EXTENSIONS} \
>+				${OPTIONS_OTHER_EXTENSIONS}
>+OPTIONS_GROUP_MISC=		${OPTIONS_OTHER_MISC}
>+
>+OPTIONS_DEFAULT:=		${OPTIONS_ENABLED_EXTENSIONS}
>+
>+OPTIONS_SUB=			yes
>diff -rupN freediameter.orig/Makefile.options.desc freediameter/Makefile.options.desc
>--- freediameter.orig/Makefile.options.desc	1970-01-01 01:00:00.000000000 +0100
>+++ freediameter/Makefile.options.desc	2017-11-27 19:11:31.531399000 +0100
>@@ -0,0 +1,46 @@
>+# =====================================
>+# Extensions
>+
>+BUILD_ACL_WL_DESC=		White-list based authorization of incoming connections
>+BUILD_APP_ACCT_DESC=		Simple accounting application that stores accounting records in flat database
>+BUILD_APP_DIAMEAP_DESC=		Diameter EAP Application server (RFC 4072)
>+BUILD_APP_RADGW_DESC=		RADIUS/Diameter gateway translation - RADIUS client to Diameter server
>+BUILD_APP_REDIRECT_DESC=	Diameter Redirect server: send configurable Redirect indications to other peers
>+BUILD_APP_SIP_DESC=		Diameter SIP Authentication and Authorization server (RFC 4740)
>+BUILD_DBG_INTERACTIVE_DESC=	Python-interpreter based module
>+BUILD_DBG_MONITOR_DESC=		Outputs periodical status information
>+BUILD_DBG_MSG_DUMPS_DESC=	Show human-readable content of the received & sent messages
>+BUILD_DBG_MSG_TIMINGS_DESC=	Show some timing information for messages
>+BUILD_DBG_RT_DESC=		Routing extension for debugging the routing module
>+BUILD_DICT_DCCA_DESC=		Diameter CC (RFC4006) Dictionary definitions (incomplete)
>+BUILD_DICT_DCCA_3GPP_DESC=	Diameter CC 3GPP Dictionary definitions (incomplete)
>+BUILD_DICT_DCCA_STARENT_DESC=	Diameter CC Starent Dictionary definitions
>+BUILD_DICT_EAP_DESC=		Diameter EAP (RFC4072) Dictionary definitions
>+BUILD_DICT_LEGACY_XML_DESC=	Load Diameter dictionary definitions from XML files.
>+BUILD_DICT_MIP6A_DESC=		Diameter Mobile IPv6 Auth Dictionary definitions
>+BUILD_DICT_MIP6I_DESC=		Diameter Mobile IPv6 IKE Dictionary definitions
>+BUILD_DICT_NASREQ_DESC=		NASREQ (RFC4005) Dictionary definitions
>+BUILD_DICT_NAS_MIPV6_DESC=	Diameter NAS-to-HAAA Interaction Dictionary definitions
>+BUILD_DICT_RFC5777_DESC=	Classification and QoS (RFC 5777) Dictionary definitions
>+BUILD_DICT_SIP_DESC=		Diameter SIP (RFC4740) Dictionary definitions
>+BUILD_RT_BUSYPEERS_DESC=	Handling of Diameter TOO_BUSY messages and relay timeouts
>+BUILD_RT_DEFAULT_DESC=		Configurable routing rules for freeDiameter
>+BUILD_RT_EREG_DESC=		Configurable routing based on regexp matching of AVP values
>+BUILD_RT_IGNORE_DH_DESC=	Stow Destination-Host in Proxy-Info, restore to Origin-Host for answers
>+BUILD_RT_LOAD_BALANCE_DESC=	Balance load over multiple equal hosts, based on outstanding requests
>+BUILD_RT_REDIRECT_DESC=		Handling of Diameter Redirect messages
>+BUILD_TESTING_DESC=		Build the testing tree.(Please enable DISABLE_SCTP option too)
>+BUILD_TEST_APP_DESC=		Testing application to send dummy message to another peer, like a Diameter 'ping'
>+BUILD_TEST_NETEMUL_DESC=	Simple Diameter network emulator proxy extension (latency, PDV, duplicates)
>+BUILD_TEST_SIP_DESC=		Testing application to simulate Diameter-SIP client (RFC4740)
>+
>+# =====================================
>+# Misc
>+
>+DEBUG_SCTP_DESC=			Verbose SCTP (for debug)
>+DIAMID_IDNA_IGNORE_DESC=		Ignore completely invalid characters in Diameter Identities (process blindly)
>+DIAMID_IDNA_REJECT_DESC=		Reject internationalized Diameter Identities, do not attempt to convert it (stringprep)
>+DISABLE_PEER_EXPIRY_DESC=		Disable RFC3539 Peers Connections Expiration after inactivity
>+DISABLE_SCTP_DESC=			Disable SCTP support
>+ERRORS_ON_TODO_DESC=			(DEVELOPERS ONLY!) Generate compilation errors on TODO items
>+WORKAROUND_ACCEPT_INVALID_VSAI_DESC=	Do not reject a CER/CEA with a Vendor-Specific-Application-Id AVP containing both Auth- and Acct- application AVPs
>diff -rupN freediameter.orig/files/freediameterd.in freediameter/files/freediameterd.in
>--- freediameter.orig/files/freediameterd.in	2017-11-27 19:11:28.780684000 +0100
>+++ freediameter/files/freediameterd.in	2017-11-27 19:11:31.531089000 +0100
>@@ -1,6 +1,6 @@
> #!/bin/sh
> 
>-# $FreeBSD: head/net/freediameter/files/freediameterd.in 411828 2016-03-25 09:40:48Z pi $
>+# $FreeBSD$
> #
> # PROVIDE: freediameterd
> # REQUIRE: LOGIN syslogd
>diff -rupN freediameter.orig/files/patch-CMakeLists.txt freediameter/files/patch-CMakeLists.txt
>--- freediameter.orig/files/patch-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ freediameter/files/patch-CMakeLists.txt	2017-11-27 19:11:31.531005000 +0100
>@@ -0,0 +1,14 @@
>+--- CMakeLists.txt.orig	2013-09-14 10:09:01 UTC
>++++ CMakeLists.txt
>+@@ -33,9 +33,9 @@ SET(LIB_INSTALL_DIR lib CACHE PATH "Defa
>+ ENDIF (NOT DEFINED LIB_INSTALL_DIR)
>+ 
>+ SET(INSTALL_HEADERS_SUFFIX 		include/freeDiameter 	CACHE PATH "Directory where the headers are installed (relative to CMAKE_INSTALL_PREFIX).")
>+-SET(INSTALL_DAEMON_SUFFIX 		bin 			CACHE PATH "Directory where the daemon binary is installed (relative to CMAKE_INSTALL_PREFIX).")
>++SET(INSTALL_DAEMON_SUFFIX 		sbin 			CACHE PATH "Directory where the daemon binary is installed (relative to CMAKE_INSTALL_PREFIX).")
>+ SET(INSTALL_LIBRARY_SUFFIX 		${LIB_INSTALL_DIR} 			CACHE PATH "Directory where the freeDiameter libraries are installed (relative to CMAKE_INSTALL_PREFIX).")
>+-SET(INSTALL_EXTENSIONS_SUFFIX 	${LIB_INSTALL_DIR}/freeDiameter	CACHE PATH "Directory where the extensions are installed / searched (relative to CMAKE_INSTALL_PREFIX).")
>++SET(INSTALL_EXTENSIONS_SUFFIX 	libexec/freeDiameter/extensions	CACHE PATH "Directory where the extensions are installed / searched (relative to CMAKE_INSTALL_PREFIX).")
>+ 
>+ # All source code should be POSIX 200112L compatible, but some other extensions might be used, so:
>+ ADD_DEFINITIONS(-D_GNU_SOURCE)
>diff -rupN freediameter.orig/files/patch-doc__single_host__freeDiameter-1.conf freediameter/files/patch-doc__single_host__freeDiameter-1.conf
>--- freediameter.orig/files/patch-doc__single_host__freeDiameter-1.conf	1970-01-01 01:00:00.000000000 +0100
>+++ freediameter/files/patch-doc__single_host__freeDiameter-1.conf	2017-11-27 19:11:31.530920000 +0100
>@@ -0,0 +1,18 @@
>+--- doc/single_host/freeDiameter-1.conf.orig	2013-09-14 10:09:01 UTC
>++++ doc/single_host/freeDiameter-1.conf
>+@@ -6,11 +6,11 @@ Realm = "localdomain";
>+ # Port = 3868;
>+ # SecPort = 3869;
>+ 
>+-TLS_Cred = "peer1.cert.pem",
>+-	   "peer1.key.pem";
>+-TLS_CA = "cacert.pem";
>++TLS_Cred = "%%ETCDIR%%/peer1.cert.pem",
>++	   "%%ETCDIR%%/peer1.key.pem";
>++TLS_CA = "%%ETCDIR%%/cacert.pem";
>+ 
>+-LoadExtension = "extensions/test_app.fdx" : "test_app1.conf";
>++LoadExtension = "%%LIBEXECDIR%%/freeDiameter/extensions/test_app.fdx" : "%%ETCDIR%%/test_app1.conf";
>+ 
>+ ConnectPeer = "peer2.localdomain" { ConnectTo = "127.0.0.1"; No_TLS; port = 30868; };
>+ 
>diff -rupN freediameter.orig/files/patch-libfdcore__sctp.c freediameter/files/patch-libfdcore__sctp.c
>--- freediameter.orig/files/patch-libfdcore__sctp.c	1970-01-01 01:00:00.000000000 +0100
>+++ freediameter/files/patch-libfdcore__sctp.c	2017-11-27 19:11:31.530739000 +0100
>@@ -0,0 +1,11 @@
>+--- libfdcore/sctp.c.orig	2013-09-14 10:09:01 UTC
>++++ libfdcore/sctp.c
>+@@ -575,7 +575,7 @@ static int fd_setsockopt_prebind(int sk)
>+ 		
>+ 		struct sctp_event event;
>+ 		
>+-		for (i = 0; i < (sizeof(events_I_want) / sizeof(events_I_want[0]) - 1; i++) {
>++		for (i = 0; i < (sizeof(events_I_want) / sizeof(events_I_want[0])) - 1; i++) {
>+ 			memset(&event, 0, sizeof(event));
>+ 			event.se_type = events_I_want[i];
>+ 			event.se_on = 1;
>diff -rupN freediameter.orig/files/patch-libfdcore_sctp.c freediameter/files/patch-libfdcore_sctp.c
>--- freediameter.orig/files/patch-libfdcore_sctp.c	2017-11-27 19:11:28.780574000 +0100
>+++ freediameter/files/patch-libfdcore_sctp.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- libfdcore/sctp.c.orig	2013-09-14 10:09:01 UTC
>-+++ libfdcore/sctp.c
>-@@ -575,7 +575,7 @@ static int fd_setsockopt_prebind(int sk)
>- 		
>- 		struct sctp_event event;
>- 		
>--		for (i = 0; i < (sizeof(events_I_want) / sizeof(events_I_want[0]) - 1; i++) {
>-+		for (i = 0; i < (sizeof(events_I_want) / sizeof(events_I_want[0]) - 1); i++) {
>- 			memset(&event, 0, sizeof(event));
>- 			event.se_type = events_I_want[i];
>- 			event.se_on = 1;
>diff -rupN freediameter.orig/files/pkg-deinstall.in freediameter/files/pkg-deinstall.in
>--- freediameter.orig/files/pkg-deinstall.in	1970-01-01 01:00:00.000000000 +0100
>+++ freediameter/files/pkg-deinstall.in	2017-11-27 19:11:31.531258000 +0100
>@@ -0,0 +1,22 @@
>+#!/bin/sh
>+
>+#
>+# Warn about remaining files
>+#
>+
>+if [ "x$2" = "xPOST-DEINSTALL" ]; then
>+
>+	echo "==========================================================="
>+	echo
>+	echo "IMPORTANT!"
>+	echo
>+	echo "Do not forget to remove certificates and/or directory from:"
>+	echo
>+	echo  "%%ETCDIR%%"
>+	echo
>+	echo "==========================================================="
>+
>+fi
>+
>+exit 0
>+
>diff -rupN freediameter.orig/files/pkg-install.in freediameter/files/pkg-install.in
>--- freediameter.orig/files/pkg-install.in	1970-01-01 01:00:00.000000000 +0100
>+++ freediameter/files/pkg-install.in	2017-11-27 19:11:31.531173000 +0100
>@@ -0,0 +1,17 @@
>+#!/bin/sh
>+
>+#
>+# Generate sample certificates
>+#
>+
>+if [ "x$2" = "xPOST-INSTALL" ]; then
>+
>+	echo "========================================================"
>+	echo "Generating certificates into %%ETCDIR%%"
>+	echo "========================================================"
>+	cd %%ETCDIR%% && sh ./make_certs.sh
>+
>+fi
>+
>+exit 0
>+
>diff -rupN freediameter.orig/files/pkg-message.in freediameter/files/pkg-message.in
>--- freediameter.orig/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
>+++ freediameter/files/pkg-message.in	2017-11-27 19:11:31.530832000 +0100
>@@ -0,0 +1,14 @@
>+
>+=======================================================================
>+To enable the freeDiameter daemon, please add the following lines
>+to /etc/rc.conf:
>+
>+# Enable freeDiameterd!
>+freediameter_enable="YES"
>+
>+# (Optional) Extra flags - You can setup config file location,
>+# debug stuff,etc.
>+# E.g.
>+# freediameter_flags="-c %%ETCDIR%%/freeDiameter.conf"
>+
>+=======================================================================
>diff -rupN freediameter.orig/pkg-descr freediameter/pkg-descr
>--- freediameter.orig/pkg-descr	2017-11-27 19:11:28.780283000 +0100
>+++ freediameter/pkg-descr	2017-11-27 19:11:31.531540000 +0100
>@@ -1,6 +1,5 @@
>-freeDiameter provides an extensible platform for deploying
>-a Diameter network for your Authentication, Authorization
>-and Accounting needs, whether you are involved in research
>-or a network operator.
>+freeDiameter provides an extensible platform for deploying a Diameter network 
>+for your Authentication, Authorization and Accounting needs, whether you are 
>+involved in research or a network operator.
> 
> WWW: http://www.freediameter.net/
>diff -rupN freediameter.orig/pkg-plist freediameter/pkg-plist
>--- freediameter.orig/pkg-plist	2017-11-27 19:11:28.780783000 +0100
>+++ freediameter/pkg-plist	2017-11-27 19:11:31.530561000 +0100
>@@ -1,32 +1,172 @@
>-bin/freeDiameterd
>-bin/freeDiameterd-1.2.0
>+%%ETCDIR%%/freeDiameter-1.conf
>+%%ETCDIR%%/freeDiameter-2.conf
>+%%ETCDIR%%/make_certs.sh
>+%%ETCDIR%%/test_app1.conf
>+%%ETCDIR%%/test_app2.conf
>+@sample %%ETCDIR%%/freeDiameter.conf.sample
>+include/freeDiameter/extension.h
> include/freeDiameter/freeDiameter-host.h
>-include/freeDiameter/libfdproto.h
> include/freeDiameter/libfdcore.h
>-include/freeDiameter/extension.h
>-lib/libfdproto.so
>-lib/libfdproto.so.6
>-lib/libfdproto.so.1.2.0
>+include/freeDiameter/libfdproto.h
> lib/libfdcore.so
>-lib/libfdcore.so.6
> lib/libfdcore.so.1.2.0
>-lib/freeDiameter/dict_nasreq.fdx
>-lib/freeDiameter/dict_eap.fdx
>-lib/freeDiameter/dict_dcca.fdx
>-lib/freeDiameter/dict_dcca_3gpp.fdx
>-lib/freeDiameter/dict_dcca_starent.fdx
>-lib/freeDiameter/dict_sip.fdx
>-lib/freeDiameter/dict_mip6a.fdx
>-lib/freeDiameter/dict_mip6i.fdx
>-lib/freeDiameter/dict_nas_mipv6.fdx
>-lib/freeDiameter/dict_rfc5777.fdx
>-lib/freeDiameter/rt_default.fdx
>-lib/freeDiameter/rt_redirect.fdx
>-lib/freeDiameter/rt_busypeers.fdx
>-lib/freeDiameter/rt_ignore_dh.fdx
>-lib/freeDiameter/rt_load_balance.fdx
>-lib/freeDiameter/acl_wl.fdx
>-lib/freeDiameter/dbg_monitor.fdx
>-lib/freeDiameter/dbg_msg_timings.fdx
>-lib/freeDiameter/dbg_rt.fdx
>-lib/freeDiameter/dbg_msg_dumps.fdx
>+lib/libfdcore.so.6
>+lib/libfdproto.so
>+lib/libfdproto.so.1.2.0
>+lib/libfdproto.so.6
>+sbin/freeDiameterd
>+sbin/freeDiameterd-1.2.0
>+%%DOCSDIR%%/contrib/CxDx/README
>+%%DOCSDIR%%/contrib/CxDx/dict_cxdx.c
>+%%DOCSDIR%%/contrib/CxDx/dict_cxdx.xml
>+%%DOCSDIR%%/contrib/OpenWRT/HOWTO
>+%%DOCSDIR%%/contrib/OpenWRT/others/D-Link_DIR-330_netconfig.patch
>+%%DOCSDIR%%/contrib/OpenWRT/packages/freeDiameter/Makefile
>+%%DOCSDIR%%/contrib/OpenWRT/packages/freeDiameter/patches/01-freeDiameter-OpenWRT.patch
>+%%DOCSDIR%%/contrib/OpenWRT/test_required/Makefile
>+%%DOCSDIR%%/contrib/OpenWRT/test_required/testcase.c
>+%%DOCSDIR%%/contrib/PKI/ca_script/Makefile
>+%%DOCSDIR%%/contrib/PKI/ca_script/openssl.cnf
>+%%DOCSDIR%%/contrib/PKI/ca_script2/Makefile
>+%%DOCSDIR%%/contrib/PKI/ca_script2/openssl.cnf
>+%%DOCSDIR%%/contrib/PKI/phpki-0.82.patch
>+%%DOCSDIR%%/contrib/README
>+%%DOCSDIR%%/contrib/RPM/build_rpm.txt
>+%%DOCSDIR%%/contrib/RPM/freeDiameter.spec
>+%%DOCSDIR%%/contrib/app_acct_tools/README
>+%%DOCSDIR%%/contrib/app_acct_tools/app_acct.conf
>+%%DOCSDIR%%/contrib/app_acct_tools/database.sql
>+%%DOCSDIR%%/contrib/app_acct_tools/display_results.php
>+%%DOCSDIR%%/contrib/app_acct_tools/display_self.php
>+%%DOCSDIR%%/contrib/app_acct_tools/display_stats.php
>+%%DOCSDIR%%/contrib/app_acct_tools/process_records.php
>+%%DOCSDIR%%/contrib/app_acct_tools/purge_to_file.php
>+%%DOCSDIR%%/contrib/debian/changelog
>+%%DOCSDIR%%/contrib/debian/compat
>+%%DOCSDIR%%/contrib/debian/control
>+%%DOCSDIR%%/contrib/debian/copyright
>+%%DOCSDIR%%/contrib/debian/dirs
>+%%DOCSDIR%%/contrib/debian/docs
>+%%DOCSDIR%%/contrib/debian/freediameter-accounting-server.examples
>+%%DOCSDIR%%/contrib/debian/freediameter-accounting-server.install
>+%%DOCSDIR%%/contrib/debian/freediameter-common.examples
>+%%DOCSDIR%%/contrib/debian/freediameter-common.install
>+%%DOCSDIR%%/contrib/debian/freediameter-daemon.default
>+%%DOCSDIR%%/contrib/debian/freediameter-daemon.init
>+%%DOCSDIR%%/contrib/debian/freediameter-daemon.install
>+%%DOCSDIR%%/contrib/debian/freediameter-debug-tools.examples
>+%%DOCSDIR%%/contrib/debian/freediameter-debug-tools.install
>+%%DOCSDIR%%/contrib/debian/freediameter-dev.install
>+%%DOCSDIR%%/contrib/debian/freediameter-dictionary-legacy.examples
>+%%DOCSDIR%%/contrib/debian/freediameter-dictionary-legacy.install
>+%%DOCSDIR%%/contrib/debian/freediameter-dictionary-mip6.install
>+%%DOCSDIR%%/contrib/debian/freediameter-dictionary-rfc4005.install
>+%%DOCSDIR%%/contrib/debian/freediameter-dictionary-rfc4006.install
>+%%DOCSDIR%%/contrib/debian/freediameter-dictionary-rfc4072.install
>+%%DOCSDIR%%/contrib/debian/freediameter-dictionary-rfc4740.install
>+%%DOCSDIR%%/contrib/debian/freediameter-eap-server.examples
>+%%DOCSDIR%%/contrib/debian/freediameter-eap-server.install
>+%%DOCSDIR%%/contrib/debian/freediameter-radius-gateway.examples
>+%%DOCSDIR%%/contrib/debian/freediameter-radius-gateway.install
>+%%DOCSDIR%%/contrib/debian/freediameter-sip-server.examples
>+%%DOCSDIR%%/contrib/debian/freediameter-sip-server.install
>+%%DOCSDIR%%/contrib/debian/rules
>+%%DOCSDIR%%/contrib/debian/update_changelog.txt
>+%%DOCSDIR%%/contrib/dict_dcca/README
>+%%DOCSDIR%%/contrib/dict_dcca/dict_dcca_3gpp.c
>+%%DOCSDIR%%/contrib/dict_dcca/dict_dcca_nokia.c
>+%%DOCSDIR%%/contrib/dict_gx/README
>+%%DOCSDIR%%/contrib/dict_gx/dict_gx.xml
>+%%DOCSDIR%%/contrib/dict_legacy/README
>+%%DOCSDIR%%/contrib/dict_legacy/dictionary.dtd
>+%%DOCSDIR%%/contrib/nightly_tests/README
>+%%DOCSDIR%%/contrib/nightly_tests/alldefault.conf
>+%%DOCSDIR%%/contrib/nightly_tests/allext.conf
>+%%DOCSDIR%%/contrib/nightly_tests/allextdbg.conf
>+%%DOCSDIR%%/contrib/nightly_tests/allextdeb.conf
>+%%DOCSDIR%%/contrib/nightly_tests/allextmax.conf
>+%%DOCSDIR%%/contrib/nightly_tests/allextprof.conf
>+%%DOCSDIR%%/contrib/nightly_tests/allextrel.conf
>+%%DOCSDIR%%/contrib/nightly_tests/allextval.conf
>+%%DOCSDIR%%/contrib/nightly_tests/cronjob.sh
>+%%DOCSDIR%%/contrib/nightly_tests/idnaignore.conf
>+%%DOCSDIR%%/contrib/nightly_tests/idnareject.conf
>+%%DOCSDIR%%/contrib/nightly_tests/nosctp.conf
>+%%DOCSDIR%%/contrib/nightly_tests/prereqs.fedora
>+%%DOCSDIR%%/contrib/nightly_tests/prereqs.freebsd
>+%%DOCSDIR%%/contrib/nightly_tests/prereqs.opensuse
>+%%DOCSDIR%%/contrib/nightly_tests/prereqs.ubuntu
>+%%DOCSDIR%%/contrib/nightly_tests/runtests.sh
>+%%DOCSDIR%%/contrib/nightly_tests/tests.list
>+%%DOCSDIR%%/contrib/tools/README
>+%%DOCSDIR%%/contrib/tools/diameter-rfcs.org
>+%%DOCSDIR%%/contrib/tools/org_to_fd.pl
>+%%DOCSDIR%%/contrib/update_copyright.sh
>+%%DOCSDIR%%/contrib/wireshark/HOWTO
>+%%DOCSDIR%%/contrib/wireshark/sample/192.168.103.10.priv.pem
>+%%DOCSDIR%%/contrib/wireshark/sample/192.168.103.20.priv.pem
>+%%DOCSDIR%%/contrib/wireshark/sample/README
>+%%DOCSDIR%%/contrib/wireshark/sample/capture.cap
>+%%DOCSDIR%%/contrib/wireshark/wireshark-1.2.7-diameter-tls.patch
>+%%EXAMPLESDIR%%/eap_tls_plugin.diameap.conf.sample
>+%%EXAMPLESDIR%%/freediameter.conf.sample
>+%%EXAMPLESDIR%%/single_host/freeDiameter-1.conf
>+%%EXAMPLESDIR%%/single_host/freeDiameter-2.conf
>+%%EXAMPLESDIR%%/single_host/make_certs.sh
>+%%EXAMPLESDIR%%/single_host/test_app1.conf
>+%%EXAMPLESDIR%%/single_host/test_app2.conf
>+%%BUILD_ACL_WL%%%%EXAMPLESDIR%%/acl_wl.conf.sample
>+%%BUILD_ACL_WL%%libexec/freeDiameter/extensions/acl_wl.fdx
>+%%BUILD_DBG_MONITOR%%libexec/freeDiameter/extensions/dbg_monitor.fdx
>+%%BUILD_DBG_MSG_DUMPS%%libexec/freeDiameter/extensions/dbg_msg_dumps.fdx
>+%%BUILD_DBG_MSG_TIMINGS%%libexec/freeDiameter/extensions/dbg_msg_timings.fdx
>+%%BUILD_DBG_RT%%libexec/freeDiameter/extensions/dbg_rt.fdx
>+%%BUILD_DICT_DCCA%%libexec/freeDiameter/extensions/dict_dcca.fdx
>+%%BUILD_DICT_DCCA_3GPP%%libexec/freeDiameter/extensions/dict_dcca_3gpp.fdx
>+%%BUILD_DICT_DCCA_STARENT%%libexec/freeDiameter/extensions/dict_dcca_starent.fdx
>+%%BUILD_DICT_EAP%%libexec/freeDiameter/extensions/dict_eap.fdx
>+%%BUILD_DICT_MIP6A%%libexec/freeDiameter/extensions/dict_mip6a.fdx
>+%%BUILD_DICT_MIP6I%%libexec/freeDiameter/extensions/dict_mip6i.fdx
>+%%BUILD_DICT_NASREQ%%libexec/freeDiameter/extensions/dict_nasreq.fdx
>+%%BUILD_DICT_NAS_MIPV6%%libexec/freeDiameter/extensions/dict_nas_mipv6.fdx
>+%%BUILD_DICT_RFC5777%%libexec/freeDiameter/extensions/dict_rfc5777.fdx
>+%%BUILD_DICT_SIP%%libexec/freeDiameter/extensions/dict_sip.fdx
>+%%BUILD_RT_BUSYPEERS%%%%EXAMPLESDIR%%/rt_busypeers.conf.sample
>+%%BUILD_RT_BUSYPEERS%%libexec/freeDiameter/extensions/rt_busypeers.fdx
>+%%BUILD_RT_DEFAULT%%%%EXAMPLESDIR%%/rt_default.conf.sample
>+%%BUILD_RT_DEFAULT%%libexec/freeDiameter/extensions/rt_default.fdx
>+%%BUILD_RT_IGNORE_DH%%libexec/freeDiameter/extensions/rt_ignore_dh.fdx
>+%%BUILD_RT_LOAD_BALANCE%%libexec/freeDiameter/extensions/rt_load_balance.fdx
>+%%BUILD_RT_REDIRECT%%libexec/freeDiameter/extensions/rt_redirect.fdx
>+%%BUILD_APP_ACCT%%%%EXAMPLESDIR%%/app_acct.conf.sample
>+%%BUILD_APP_ACCT%%libexec/freeDiameter/extensions/app_acct.fdx
>+%%BUILD_APP_DIAMEAP%%%%EXAMPLESDIR%%/app_diameap.conf.sample
>+%%BUILD_APP_DIAMEAP%%libexec/freeDiameter/extensions/app_diameap.fdx
>+%%BUILD_APP_DIAMEAP%%libexec/freeDiameter/extensions/eap_identity.emp
>+%%BUILD_APP_RADGW%%libexec/freeDiameter/extensions/acct.rgwx
>+%%BUILD_APP_RADGW%%%%EXAMPLESDIR%%/app_radgw.conf.sample
>+%%BUILD_APP_RADGW%%libexec/freeDiameter/extensions/app_radgw.fdx
>+%%BUILD_APP_RADGW%%libexec/freeDiameter/extensions/auth.rgwx
>+%%BUILD_APP_RADGW%%libexec/freeDiameter/extensions/debug.rgwx
>+%%BUILD_APP_RADGW%%%%EXAMPLESDIR%%/echodrop.rgwx.conf.sample
>+%%BUILD_APP_RADGW%%libexec/freeDiameter/extensions/echodrop.rgwx
>+%%BUILD_APP_REDIRECT%%%%EXAMPLESDIR%%/app_redirect.conf.sample
>+%%BUILD_APP_REDIRECT%%libexec/freeDiameter/extensions/app_redirect.fdx
>+%%BUILD_APP_SIP%%%%EXAMPLESDIR%%/app_sip.conf.sample
>+%%BUILD_APP_SIP%%%%EXAMPLESDIR%%/app_sip.sql
>+%%BUILD_APP_SIP%%%%EXAMPLESDIR%%/app_sip_SL.sql
>+%%BUILD_APP_SIP%%libexec/freeDiameter/extensions/app_sip.fdx
>+%%BUILD_APP_SIP%%sbin/freediameter-sip-ppr
>+%%BUILD_APP_SIP%%sbin/freediameter-sip-rtr
>+%%BUILD_DBG_INTERACTIVE%%%%EXAMPLESDIR%%/dbg_interactive.py.sample
>+%%BUILD_DBG_INTERACTIVE%%libexec/freeDiameter/extensions/dbg_interactive.fdx
>+%%BUILD_DICT_LEGACY_XML%%%%EXAMPLESDIR%%/dict_legacy_xml.conf.sample
>+%%BUILD_DICT_LEGACY_XML%%libexec/freeDiameter/extensions/dict_legacy_xml.fdx
>+%%BUILD_RT_EREG%%%%EXAMPLESDIR%%/rt_ereg.conf.sample
>+%%BUILD_RT_EREG%%libexec/freeDiameter/extensions/rt_ereg.fdx
>+%%BUILD_TEST_APP%%%%EXAMPLESDIR%%/test_app.conf.sample
>+%%BUILD_TEST_APP%%libexec/freeDiameter/extensions/test_app.fdx
>+%%BUILD_TEST_NETEMUL%%%%EXAMPLESDIR%%/test_netemul.conf.sample
>+%%BUILD_TEST_NETEMUL%%libexec/freeDiameter/extensions/test_netemul.fdx
>+%%BUILD_TEST_SIP%%%%EXAMPLESDIR%%/test_sip.conf.sample
>+%%BUILD_TEST_SIP%%libexec/freeDiameter/extensions/test_sip.fdx

Flags:

koue: maintainer-approval+

Actions: View

Attachments on bug 197368: 152614 | 161450 | 188322