Attachment 176850 Details for Bug 213979 – Patch that adds the FastDFS option

[patch] Patch that adds the FastDFS option

nginx-fastdfs-rev3.patch (text/plain), 10.75 KB, created by Daniel Ylitalo on 2016-11-10 11:17:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Ylitalo

Created: 2016-11-10 11:17:04 UTC

Size: 10.75 KB

patch

obsolete

>Index: nginx/Makefile
>===================================================================
>--- nginx/Makefile	(revision 425838)
>+++ nginx/Makefile	(working copy)
>@@ -67,6 +67,7 @@
> 	CLOJURE \
> 	CT \
> 	ECHO \
>+	FASTDFS \
> 	HEADERS_MORE \
> 	HTTP_ACCEPT_LANGUAGE \
> 	HTTP_ACCESSKEY \
>@@ -175,6 +176,7 @@
> CLOJURE_DESC=			3rd party clojure module
> CT_DESC=			3rd party cert_transparency module (SSL req.)
> ECHO_DESC=			3rd party echo module
>+FASTDFS_DESC=			3rd party fastdfs module
> HEADERS_MORE_DESC=		3rd party headers_more module
> HTTP_ACCEPT_LANGUAGE_DESC=	3rd party accept_language module
> HTTP_ACCESSKEY_DESC=		3rd party http_accesskey module
>@@ -453,6 +455,24 @@
> .endif
> .endif
> 
>+.if ${PORT_OPTIONS:MFASTDFS}
>+NGINX_FASTDFS_VERSION=     1.18
>+GH_ACCOUNT+=    happyfish100:fastdfs
>+GH_PROJECT+=    fastdfs-nginx-module:fastdfs
>+GH_TAGNAME+=    5a8110f57ec55ff580260cf1fc6aa152a5a4c574:fastdfs
>+
>+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config
>+
>+BUILD_DEPENDS+=	${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
>+		${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
>+
>+LIB_DEPENDS+=	libfastcommon.so:devel/libfastcommon \
>+		libfdfsclient.so:ftp/fastdfs
>+
>+CONFIGURE_ARGS+=--add-module=${WRKSRC_fastdfs}/src --with-cc-opt="-I ${LOCALBASE}/include/fastdfs \
>+                -I ${LOCALBASE}/include/fastcommon"
>+.endif
>+
> .if ${PORT_OPTIONS:MHEADERS_MORE}
> NGINX_HEADERS_MORE_VERSION=	84241e4
> GH_ACCOUNT+=	openresty:headers_more
>@@ -1173,6 +1193,12 @@
> 		's!%%PREFIX%%!${LOCALBASE}!g' \
> 		${WRKSRC_drizzle}/config
> .endif
>+.if ${PORT_OPTIONS:MFASTDFS}
>+	@${REINPLACE_CMD} \
>+		's!%%PREFIX%%!${PREFIX}!g; \
>+		s!%%LOCALBASE%%!${LOCALBASE}!g' \
>+		${WRKSRC_fastdfs}/src/config
>+.endif
> # Respect CFLAGS by remove needless --std=c99 flag
> .if ${PORT_OPTIONS:MGRIDFS}
> 	@${REINPLACE_CMD} \
>@@ -1275,6 +1301,11 @@
> 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
> .endif
> 
>+.if ${PORT_OPTIONS:MFASTDFS}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs
>+	${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample
>+.endif
>+
> # Install dynamic modules
> .if !empty(PORT_OPTIONS:MDSO)
> 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
>@@ -1298,6 +1329,10 @@
> 	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}
> .endif
> 
>+.if ${PORT_OPTIONS:MFASTDFS}
>+	${ECHO_CMD} @sample etc/fdfs/mod_fastdfs.conf.sample
>+.endif
>+
> # Add dynamic modules to the plist
> .if !empty(PORT_OPTIONS:MDSO)
> 	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S|${PREFIX}/||} \
>Index: nginx/distinfo
>===================================================================
>--- nginx/distinfo	(revision 425838)
>+++ nginx/distinfo	(working copy)
>@@ -133,3 +133,5 @@
> SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
> SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
> SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
>+SHA256 (happyfish100-fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574_GH0.tar.gz) = c377481f8cb23aebba5879c5fd1f3508f0925114237de93f4b9eaf3e387e93fb
>+SIZE (happyfish100-fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574_GH0.tar.gz) = 18018
>Index: nginx/files/extra-patch-fastdfs-src-config
>===================================================================
>--- nginx/files/extra-patch-fastdfs-src-config	(nonexistent)
>+++ nginx/files/extra-patch-fastdfs-src-config	(working copy)
>@@ -0,0 +1,23 @@
>+--- ../fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574/src/config.orig	2016-10-12 16:09:34.075804000 +0200
>++++ ../fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574/src/config	2016-10-12 16:10:43.916280000 +0200
>+@@ -3,16 +3,16 @@
>+ if test -n "${ngx_module_link}"; then
>+     ngx_module_type=HTTP
>+     ngx_module_name=$ngx_addon_name
>+-    ngx_module_incs="/usr/include/fastdfs /usr/include/fastcommon/"
>++    ngx_module_incs="%%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
>+     ngx_module_libs="-lfastcommon -lfdfsclient"
>+     ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
>+     ngx_module_deps=
>+-    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
>++    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
>+     . auto/module
>+ else
>+     HTTP_MODULES="$HTTP_MODULES ngx_http_fastdfs_module"
>+     NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fastdfs_module.c"
>+-    CORE_INCS="$CORE_INCS /usr/include/fastdfs /usr/include/fastcommon/"
>++    CORE_INCS="$CORE_INCS %%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
>+     CORE_LIBS="$CORE_LIBS -lfastcommon -lfdfsclient"
>+-    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
>++    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
>+ fi
>
>Property changes on: nginx/files/extra-patch-fastdfs-src-config
>___________________________________________________________________
>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: nginx-devel/Makefile
>===================================================================
>--- nginx-devel/Makefile	(revision 425838)
>+++ nginx-devel/Makefile	(working copy)
>@@ -67,6 +67,7 @@
> 	CLOJURE \
> 	CT \
> 	ECHO \
>+	FASTDFS \
> 	HEADERS_MORE \
> 	HTTP_ACCEPT_LANGUAGE \
> 	HTTP_ACCESSKEY \
>@@ -175,6 +176,7 @@
> CLOJURE_DESC=			3rd party clojure module
> CT_DESC=			3rd party cert_transparency module (SSL req.)
> ECHO_DESC=			3rd party echo module
>+FASTDFS_DESC=			3rd party fastdfs module
> HEADERS_MORE_DESC=		3rd party headers_more module
> HTTP_ACCEPT_LANGUAGE_DESC=	3rd party accept_language module
> HTTP_ACCESSKEY_DESC=		3rd party http_accesskey module
>@@ -455,6 +457,24 @@
> .endif
> .endif
> 
>+.if ${PORT_OPTIONS:MFASTDFS}
>+NGINX_FASTDFS_VERSION=     1.18
>+GH_ACCOUNT+=    happyfish100:fastdfs
>+GH_PROJECT+=    fastdfs-nginx-module:fastdfs
>+GH_TAGNAME+=    5a8110f57ec55ff580260cf1fc6aa152a5a4c574:fastdfs
>+
>+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config
>+
>+BUILD_DEPENDS+=	${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
>+		${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
>+
>+LIB_DEPENDS+=	libfastcommon.so:devel/libfastcommon \
>+		libfdfsclient.so:ftp/fastdfs
>+
>+CONFIGURE_ARGS+=--add-module=${WRKSRC_fastdfs}/src --with-cc-opt="-I ${LOCALBASE}/include/fastdfs \
>+                -I ${LOCALBASE}/include/fastcommon"
>+.endif
>+
> .if ${PORT_OPTIONS:MHEADERS_MORE}
> NGINX_HEADERS_MORE_VERSION=	84241e4
> GH_ACCOUNT+=	openresty:headers_more
>@@ -1178,6 +1198,12 @@
> 		's!%%PREFIX%%!${LOCALBASE}!g' \
> 		${WRKSRC_drizzle}/config
> .endif
>+.if ${PORT_OPTIONS:MFASTDFS}
>+	@${REINPLACE_CMD} \
>+		's!%%PREFIX%%!${PREFIX}!g; \
>+		s!%%LOCALBASE%%!${LOCALBASE}!g' \
>+		${WRKSRC_fastdfs}/src/config
>+.endif
> # Respect CFLAGS by remove needless --std=c99 flag
> .if ${PORT_OPTIONS:MGRIDFS}
> 	@${REINPLACE_CMD} \
>@@ -1280,6 +1306,11 @@
> 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
> .endif
> 
>+.if ${PORT_OPTIONS:MFASTDFS}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs
>+	${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample
>+.endif
>+
> # Install dynamic modules
> .if !empty(PORT_OPTIONS:MDSO)
> 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
>@@ -1303,6 +1334,10 @@
> 	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}
> .endif
> 
>+.if ${PORT_OPTIONS:MFASTDFS}
>+	${ECHO_CMD} @sample etc/fdfs/mod_fastdfs.conf.sample
>+.endif
>+
> # Add dynamic modules to the plist
> .if !empty(PORT_OPTIONS:MDSO)
> 	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S|${PREFIX}/||} \
>Index: nginx-devel/distinfo
>===================================================================
>--- nginx-devel/distinfo	(revision 425838)
>+++ nginx-devel/distinfo	(working copy)
>@@ -133,3 +133,5 @@
> SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
> SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
> SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
>+SHA256 (happyfish100-fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574_GH0.tar.gz) = c377481f8cb23aebba5879c5fd1f3508f0925114237de93f4b9eaf3e387e93fb
>+SIZE (happyfish100-fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574_GH0.tar.gz) = 18018
>Index: nginx-devel/files/extra-patch-fastdfs-src-config
>===================================================================
>--- nginx-devel/files/extra-patch-fastdfs-src-config	(nonexistent)
>+++ nginx-devel/files/extra-patch-fastdfs-src-config	(working copy)
>@@ -0,0 +1,23 @@
>+--- ../fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574/src/config.orig	2016-10-12 16:09:34.075804000 +0200
>++++ ../fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574/src/config	2016-10-12 16:10:43.916280000 +0200
>+@@ -3,16 +3,16 @@
>+ if test -n "${ngx_module_link}"; then
>+     ngx_module_type=HTTP
>+     ngx_module_name=$ngx_addon_name
>+-    ngx_module_incs="/usr/include/fastdfs /usr/include/fastcommon/"
>++    ngx_module_incs="%%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
>+     ngx_module_libs="-lfastcommon -lfdfsclient"
>+     ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
>+     ngx_module_deps=
>+-    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
>++    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
>+     . auto/module
>+ else
>+     HTTP_MODULES="$HTTP_MODULES ngx_http_fastdfs_module"
>+     NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fastdfs_module.c"
>+-    CORE_INCS="$CORE_INCS /usr/include/fastdfs /usr/include/fastcommon/"
>++    CORE_INCS="$CORE_INCS %%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
>+     CORE_LIBS="$CORE_LIBS -lfastcommon -lfdfsclient"
>+-    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
>++    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
>+ fi
>
>Property changes on: nginx-devel/files/extra-patch-fastdfs-src-config
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 213979: 176378 | 176785 | 176850 | 176862 | 176869