Attachment 145118 Details for Bug 192235 – Patch generated with `svn diff`

[patch] Patch generated with `svn diff`

userfw_stage.diff (text/plain), 6.20 KB, created by gelraen.ua on 2014-07-29 08:39:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gelraen.ua

Created: 2014-07-29 08:39:31 UTC

Size: 6.20 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 363296)
>+++ Makefile	(working copy)
>@@ -8,20 +8,18 @@
> 		http://imax.in.ua/files/ \
> 		http://projects.ukrweb.net/files/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	gelraen.ua@gmail.com
> COMMENT=	Modular packet filter
> 
>-LICENSE=	BSD
>+LICENSE=	BSD2CLAUSE
> 
> SSP_UNSAFE=	kernel module does not support ssp
>-USE_XZ=		yes
>-USES=		cmake:outsource
>+USES=		cmake:outsource tar:xz
> USE_LDCONFIG=	yes
> 
> KMODDIR?=	/boot/modules
> PLIST_SUB+=	KMODDIR=${KMODDIR}
> 
>-NO_STAGE=	yes
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 800000
>@@ -38,5 +36,10 @@
> 
> 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>
>Index: files/patch-cmake__userfw_module.cmake
>===================================================================
>--- files/patch-cmake__userfw_module.cmake	(revision 0)
>+++ files/patch-cmake__userfw_module.cmake	(working copy)
>@@ -0,0 +1,19 @@
>+--- ./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)
>
>Property changes on: files/patch-cmake__userfw_module.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-core__CMakeLists.txt
>===================================================================
>--- files/patch-core__CMakeLists.txt	(revision 0)
>+++ files/patch-core__CMakeLists.txt	(working copy)
>@@ -0,0 +1,14 @@
>+--- ./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)
>
>Property changes on: files/patch-core__CMakeLists.txt
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: files/patch-modules__dummynet__dummynet.c
>===================================================================
>--- files/patch-modules__dummynet__dummynet.c	(revision 0)
>+++ files/patch-modules__dummynet__dummynet.c	(working copy)
>@@ -0,0 +1,22 @@
>+--- ./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;
>+ }
>
>Property changes on: files/patch-modules__dummynet__dummynet.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-modules__ng_userfw_connector__ng_userfw_connector.c
>===================================================================
>--- files/patch-modules__ng_userfw_connector__ng_userfw_connector.c	(revision 0)
>+++ files/patch-modules__ng_userfw_connector__ng_userfw_connector.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- ./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;
>
>Property changes on: files/patch-modules__ng_userfw_connector__ng_userfw_connector.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 192235: 145118