Attachment #145118 for bug #192235

View | Details | Raw Unified | Return to bug 192235
Collapse All | Expand All




		http://imax.in.ua/files/ \
		http://projects.ukrweb.net/files/

MAINTAINER=	gelraen.ua@gmail.com
COMMENT=	Modular packet filter

LICENSE=	BSD2CLAUSE

SSP_UNSAFE=	kernel module does not support ssp
USES=		cmake:outsource tar:xz
USES=		cmake:outsource
USE_LDCONFIG=	yes

KMODDIR?=	/boot/modules
PLIST_SUB+=	KMODDIR=${KMODDIR}

NO_STAGE=	yes
.include <bsd.port.pre.mk>

.if ${OSVERSION} < 800000


CMAKE_ARGS+=	-DDOMAIN_STUB:BOOL=OFF
CMAKE_ARGS+=	-DOPCODE_VERIFICATION:BOOL=OFF
CMAKE_ARGS+=	-DKMODDIR="${KMODDIR}"

pre-install:
	@${MKDIR} "${STAGEDIR}/boot"
	@${MKDIR} "${STAGEDIR}/boot/modules"

.include <bsd.port.post.mk>




--- ./cmake/userfw_module.cmake.orig	2013-03-29 14:22:50.000000000 +0000
+++ ./cmake/userfw_module.cmake	2014-07-29 09:30:53.000000000 +0100
@@ -11,7 +11,7 @@
 	add_custom_target(userfw_${modname} ALL
 		DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/userfw_${modname}.ko")
 
-	install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=${CMAKE_INSTALL_PREFIX}\"
+	install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\"
 		WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
 endfunction(declare_userfw_module)
 
@@ -28,6 +28,6 @@
 	add_custom_target(userfw_${modname} ALL
 		DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${filename}.ko")
 
-	install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=${CMAKE_INSTALL_PREFIX}\"
+	install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\"
 		WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
 endfunction(declare_userfw_module_with_name)




--- ./core/CMakeLists.txt.orig	2013-03-29 14:22:50.000000000 +0000
+++ ./core/CMakeLists.txt	2014-07-29 09:31:46.000000000 +0100
@@ -27,9 +27,9 @@
 add_custom_target(userfw_core_kmod ALL
 	DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/userfw.ko")
 
-install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=${CMAKE_INSTALL_PREFIX}\"
+install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\"
 		WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
 if (DOMAIN_STUB)
-	install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=${CMAKE_INSTALL_PREFIX}\"
+	install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\"
 			WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}/domain_stub\")")
 endif (DOMAIN_STUB)




--- ./modules/dummynet/dummynet.c.orig	2013-03-29 14:22:50.000000000 +0000
+++ ./modules/dummynet/dummynet.c	2014-07-29 09:30:53.000000000 +0100
@@ -57,15 +57,19 @@
 
 	if (ip_dn_io_ptr != NULL)
 	{
+#if __FreeBSD__ < 10
 		SET_NET_IPLEN(mtod(*mb, struct ip *));
+#endif
 		if (mtod(*mb, struct ip *)->ip_v == 4)
 			ret = ip_dn_io_ptr(mb, dir, &ipfw_args);
 		else if (mtod(*mb, struct ip *)->ip_v == 6)
 			ret = ip_dn_io_ptr(mb, dir | PROTO_IPV6, &ipfw_args);
+#if __FreeBSD__ < 10
 		if ((*mb) != NULL)
 		{
 			SET_HOST_IPLEN(mtod(*mb, struct ip *));
 		}
+#endif
 	}
 	return ret;
 }




--- ./modules/ng_userfw_connector/ng_userfw_connector.c.orig	2013-03-29 14:22:50.000000000 +0000
+++ ./modules/ng_userfw_connector/ng_userfw_connector.c	2014-07-29 09:30:53.000000000 +0100
@@ -196,7 +196,9 @@
 	if (hookp == NULL)
 		return ESRCH;
 
+#if __FreeBSD__ < 10
 	SET_NET_IPLEN(mtod(mb, struct ip *));
+#endif
 	NG_SEND_DATA_ONLY(err, hookp, mb);
 
 	return err;

Return to bug 192235

Lines 8-27 Link Here

(-)Makefile (-5 / +8 lines)
8	http://imax.in.ua/files/ \	8	http://imax.in.ua/files/ \
9	http://projects.ukrweb.net/files/	9	http://projects.ukrweb.net/files/
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= gelraen.ua@gmail.com
12	COMMENT= Modular packet filter	12	COMMENT= Modular packet filter
13		13
14	LICENSE= BSD	14	LICENSE= BSD2CLAUSE
15		15
16	SSP_UNSAFE= kernel module does not support ssp	16	SSP_UNSAFE= kernel module does not support ssp
17	USE_XZ= yes	17	USES= cmake:outsource tar:xz
18	USES= cmake:outsource
19	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
20		19
21	KMODDIR?= /boot/modules	20	KMODDIR?= /boot/modules
22	PLIST_SUB+= KMODDIR=${KMODDIR}	21	PLIST_SUB+= KMODDIR=${KMODDIR}
23		22
24	NO_STAGE= yes
25	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>
26		24
27	.if ${OSVERSION} < 800000	25	.if ${OSVERSION} < 800000
Lines 38-42 Link Here
38		36
39	CMAKE_ARGS+= -DDOMAIN_STUB:BOOL=OFF	37	CMAKE_ARGS+= -DDOMAIN_STUB:BOOL=OFF
40	CMAKE_ARGS+= -DOPCODE_VERIFICATION:BOOL=OFF	38	CMAKE_ARGS+= -DOPCODE_VERIFICATION:BOOL=OFF
		39	CMAKE_ARGS+= -DKMODDIR="${KMODDIR}"
41		40
		41	pre-install:
		42	@${MKDIR} "${STAGEDIR}/boot"
		43	@${MKDIR} "${STAGEDIR}/boot/modules"
		44
42	.include <bsd.port.post.mk>	45	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-cmake__userfw_module.cmake (+19 lines)
	1	--- ./cmake/userfw_module.cmake.orig 2013-03-29 14:22:50.000000000 +0000
	2	+++ ./cmake/userfw_module.cmake 2014-07-29 09:30:53.000000000 +0100
	3	@@ -11,7 +11,7 @@
	4	add_custom_target(userfw_${modname} ALL
	5	DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/userfw_${modname}.ko")
	6
	7	- install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=${CMAKE_INSTALL_PREFIX}\"
	8	+ install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\"
	9	WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
	10	endfunction(declare_userfw_module)
	11
	12	@@ -28,6 +28,6 @@
	13	add_custom_target(userfw_${modname} ALL
	14	DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${filename}.ko")
	15
	16	- install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=${CMAKE_INSTALL_PREFIX}\"
	17	+ install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\"
	18	WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
	19	endfunction(declare_userfw_module_with_name)

Line 0 Link Here

(-)files/patch-core__CMakeLists.txt (+14 lines)
	1	--- ./core/CMakeLists.txt.orig 2013-03-29 14:22:50.000000000 +0000
	2	+++ ./core/CMakeLists.txt 2014-07-29 09:31:46.000000000 +0100
	3	@@ -27,9 +27,9 @@
	4	add_custom_target(userfw_core_kmod ALL
	5	DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/userfw.ko")
	6
	7	-install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=${CMAKE_INSTALL_PREFIX}\"
	8	+install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\"
	9	WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
	10	if (DOMAIN_STUB)
	11	- install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=${CMAKE_INSTALL_PREFIX}\"
	12	+ install(CODE "execute_process(COMMAND make install \"KMODDIR=${KMODDIR}\" \"PREFIX=\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\"
	13	WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}/domain_stub\")")
	14	endif (DOMAIN_STUB)

Line 0 Link Here

(-)files/patch-modules__dummynet__dummynet.c (+22 lines)
	1	--- ./modules/dummynet/dummynet.c.orig 2013-03-29 14:22:50.000000000 +0000
	2	+++ ./modules/dummynet/dummynet.c 2014-07-29 09:30:53.000000000 +0100
	3	@@ -57,15 +57,19 @@
	4
	5	if (ip_dn_io_ptr != NULL)
	6	{
	7	+#if __FreeBSD__ < 10
	8	SET_NET_IPLEN(mtod(mb, struct ip ));
	9	+#endif
	10	if (mtod(mb, struct ip )->ip_v == 4)
	11	ret = ip_dn_io_ptr(mb, dir, &ipfw_args);
	12	else if (mtod(mb, struct ip )->ip_v == 6)
	13	ret = ip_dn_io_ptr(mb, dir \| PROTO_IPV6, &ipfw_args);
	14	+#if __FreeBSD__ < 10
	15	if ((*mb) != NULL)
	16	{
	17	SET_HOST_IPLEN(mtod(mb, struct ip ));
	18	}
	19	+#endif
	20	}
	21	return ret;
	22	}

Line 0 Link Here

(-)files/patch-modules__ng_userfw_connector__ng_userfw_connector.c (+12 lines)
	1	--- ./modules/ng_userfw_connector/ng_userfw_connector.c.orig 2013-03-29 14:22:50.000000000 +0000
	2	+++ ./modules/ng_userfw_connector/ng_userfw_connector.c 2014-07-29 09:30:53.000000000 +0100
	3	@@ -196,7 +196,9 @@
	4	if (hookp == NULL)
	5	return ESRCH;
	6
	7	+#if __FreeBSD__ < 10
	8	SET_NET_IPLEN(mtod(mb, struct ip *));
	9	+#endif
	10	NG_SEND_DATA_ONLY(err, hookp, mb);
	11
	12	return err;