Rename rspamd13 to rspamd14.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Rename rspamd13 to rspamd14.
From: Bartosz Kuzma <bartosz.kuzma%gmail.com@localhost>
Date: Thu, 16 Feb 2017 05:47:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Bartosz Kuzma <bartosz.kuzma%gmail.com@localhost>
Pushed By:	bartosz.kuzma
Date:		Thu Feb 16 06:47:42 2017 +0100
Changeset:	0d6da89e9cdf8b41aeb21c2c5bb2183214323710

Modified Files:
	Makefile
Added Files:
	rspamd14/DESCR
	rspamd14/Makefile
	rspamd14/PLIST
	rspamd14/distinfo
	rspamd14/files/smf/manifest.xml
	rspamd14/patches/patch-CMakeLists.txt
	rspamd14/patches/patch-src__CMakeLists.txt
Removed Files:
	rspamd13/DESCR
	rspamd13/Makefile
	rspamd13/PLIST
	rspamd13/distinfo
	rspamd13/files/smf/manifest.xml
	rspamd13/patches/patch-CMakeLists.txt
	rspamd13/patches/patch-src__CMakeLists.txt

Log Message:
Rename rspamd13 to rspamd14.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0d6da89e9cdf8b41aeb21c2c5bb2183214323710

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                   |   2 +-
 rspamd13/DESCR                             |   3 -
 rspamd13/Makefile                          | 129 ----------------------------
 rspamd13/PLIST                             | 131 -----------------------------
 rspamd13/distinfo                          |   8 --
 rspamd13/files/smf/manifest.xml            |  45 ----------
 rspamd13/patches/patch-CMakeLists.txt      |  35 --------
 rspamd13/patches/patch-src__CMakeLists.txt |  16 ----
 rspamd14/DESCR                             |   3 +
 rspamd14/Makefile                          | 129 ++++++++++++++++++++++++++++
 rspamd14/PLIST                             | 131 +++++++++++++++++++++++++++++
 rspamd14/distinfo                          |   8 ++
 rspamd14/files/smf/manifest.xml            |  45 ++++++++++
 rspamd14/patches/patch-CMakeLists.txt      |  35 ++++++++
 rspamd14/patches/patch-src__CMakeLists.txt |  16 ++++
 15 files changed, 368 insertions(+), 368 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 5bcc80bf0f..e0f387ea10 100644
--- a/Makefile
+++ b/Makefile
@@ -3767,7 +3767,7 @@ SUBDIR+=	rpm5
 SUBDIR+=	rsem
 SUBDIR+=	rsget
 SUBDIR+=	rsound
-SUBDIR+=	rspamd13
+SUBDIR+=	rspamd14
 SUBDIR+=	rsstail
 SUBDIR+=	rst-mode
 SUBDIR+=	rstudio
diff --git a/rspamd13/DESCR b/rspamd13/DESCR
deleted file mode 100644
index 1a571c9fc7..0000000000
--- a/rspamd13/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Rspamd is fast, modular and lightweight spam filter. It is designed to work
-with big ammount of mail and can be easily extended with own filters written in
-lua.
diff --git a/rspamd13/Makefile b/rspamd13/Makefile
deleted file mode 100644
index aaff7cbf72..0000000000
--- a/rspamd13/Makefile
+++ /dev/null
@@ -1,129 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	rspamd-1.4.1
-CATEGORIES=	mail
-MASTER_SITES=	http://www.rspamd.com/downloads/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	bartosz.kuzma%gmail.com@localhost
-HOMEPAGE=	https://www.rspamd.com/
-COMMENT=	Fast, free and open-source spam filtering system
-LICENSE=	2-clause-bsd
-
-DEPENDS+=	ragel-[0-9]*:../../devel/ragel
-
-USE_CMAKE=	yes
-USE_TOOLS+=	perl pkg-config
-USE_LANGUAGES=	c99
-BUILD_DEFS+=	VARBASE
-
-LUA_VERSIONS_ACCEPTED=	53
-
-CPPFLAGS.SunOS+=	-D__EXTENSIONS__
-LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd
-TEST_TARGET=	run-test
-
-RSPAMD_USER?=	rspamd
-RSPAMD_GROUP?=	rspamd
-PKG_GROUPS=	${RSPAMD_GROUP}
-PKG_USERS=	${RSPAMD_USER}:${RSPAMD_GROUP}
-
-PKG_GROUPS_VARS=	RSPAMD_GROUP
-PKG_USERS_VARS=		RSPAMD_USER
-
-PKG_GECOS.${RSPAMD_USER}=	rspamd user
-
-PKG_SYSCONFSUBDIR=	rspamd
-EGDIR=		${PREFIX}/share/examples/${PKGBASE}
-LOGDIR=		${VARBASE}/log/rspamd
-DBDIR=		${VARBASE}/db/rspamd
-RUNDIR=		${VARBASE}/run/rspamd
-
-CMAKE_ARGS+=	-DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+=	-DLOGDIR:PATH=${LOGDIR}
-CMAKE_ARGS+=	-DRUNDIR:PATH=${VARBASE}/run/rspamd
-CMAKE_ARGS+=	-DDBDIR:PATH=${DBDIR}
-CMAKE_ARGS+=	-DCONFDIR:PATH=${PKG_SYSCONFDIR}
-CMAKE_ARGS+=	-DRSPAMD_USER=${RSPAMD_USER}
-CMAKE_ARGS+=	-DRSPAMD_GROUP=${RSPAMD_GROUP}
-CMAKE_ARGS+=	-DENABLE_LUAJIT=OFF
-
-REPLACE_PERL+=	utils/rspamd_stats.pl
-
-MAKE_DIRS+=	${PKG_SYSCONFDIR}/modules.d
-
-OWN_DIRS_PERMS+=	${DBDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0700
-OWN_DIRS_PERMS+=	${LOGDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0750
-OWN_DIRS_PERMS+=	${RUNDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0755
-
-CONF_FILES=	${EGDIR}/2tld.inc ${PKG_SYSCONFDIR}/2tld.inc
-CONF_FILES+=	${EGDIR}/common.conf ${PKG_SYSCONFDIR}/common.conf
-CONF_FILES+=	${EGDIR}/composites.conf ${PKG_SYSCONFDIR}/composites.conf
-CONF_FILES+=	${EGDIR}/logging.inc ${PKG_SYSCONFDIR}/logging.inc
-CONF_FILES+=	${EGDIR}/metrics.conf ${PKG_SYSCONFDIR}/metrics.conf
-CONF_FILES+=	${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf
-CONF_FILES+=	${EGDIR}/options.inc ${PKG_SYSCONFDIR}/options.inc
-CONF_FILES+=	${EGDIR}/redirectors.inc ${PKG_SYSCONFDIR}/redirectors.inc
-CONF_FILES+=	${EGDIR}/rspamd.conf ${PKG_SYSCONFDIR}/rspamd.conf
-CONF_FILES+=	${EGDIR}/statistic.conf ${PKG_SYSCONFDIR}/statistic.conf
-CONF_FILES+=	${EGDIR}/surbl-whitelist.inc \
-	${PKG_SYSCONFDIR}/surbl-whitelist.inc
-CONF_FILES+=	${EGDIR}/worker-controller.inc \
-	${PKG_SYSCONFDIR}/worker-controller.inc
-CONF_FILES+=	${EGDIR}/worker-fuzzy.inc \
-	${PKG_SYSCONFDIR}/worker-fuzzy.inc
-CONF_FILES+=	${EGDIR}/worker-normal.inc \
-	${PKG_SYSCONFDIR}/worker-normal.inc
-CONF_FILES+=	${EGDIR}/modules.d/chartable.conf \
-	${PKG_SYSCONFDIR}/modules.d/chartable.conf
-CONF_FILES+=	${EGDIR}/modules.d/dkim.conf \
-	${PKG_SYSCONFDIR}/modules.d/dkim.conf
-CONF_FILES+=	${EGDIR}/modules.d/dmarc.conf \
-	${PKG_SYSCONFDIR}/modules.d/dmarc.conf
-CONF_FILES+=	${EGDIR}/modules.d/emails.conf \
-	${PKG_SYSCONFDIR}/modules.d/emails.conf
-CONF_FILES+=	${EGDIR}/modules.d/forged_recipients.conf \
-	${PKG_SYSCONFDIR}/modules.d/forged_recipients.conf
-CONF_FILES+=	${EGDIR}/modules.d/fuzzy_check.conf \
-	${PKG_SYSCONFDIR}/modules.d/fuzzy_check.conf
-CONF_FILES+=	${EGDIR}/modules.d/hfilter.conf \
-	${PKG_SYSCONFDIR}/modules.d/hfilter.conf
-CONF_FILES+=	${EGDIR}/modules.d/ip_score.conf \
-	${PKG_SYSCONFDIR}/modules.d/ip_score.conf
-CONF_FILES+=	${EGDIR}/modules.d/maillist.conf \
-	${PKG_SYSCONFDIR}/modules.d/maillist.conf
-CONF_FILES+=	${EGDIR}/modules.d/mime_types.conf \
-	${PKG_SYSCONFDIR}/modules.d/mime_types.conf
-CONF_FILES+=	${EGDIR}/modules.d/multimap.conf \
-	${PKG_SYSCONFDIR}/modules.d/multimap.conf
-CONF_FILES+=	${EGDIR}/modules.d/once_received.conf \
-	${PKG_SYSCONFDIR}/modules.d/once_received.conf
-CONF_FILES+=	${EGDIR}/modules.d/phishing.conf \
-	${PKG_SYSCONFDIR}/modules.d/phishing.conf
-CONF_FILES+=	${EGDIR}/modules.d/ratelimit.conf \
-	${PKG_SYSCONFDIR}/modules.d/ratelimit.conf
-CONF_FILES+=	${EGDIR}/modules.d/rbl.conf \
-	${PKG_SYSCONFDIR}/modules.d/rbl.conf
-CONF_FILES+=	${EGDIR}/modules.d/regexp.conf \
-	${PKG_SYSCONFDIR}/modules.d/regexp.conf
-CONF_FILES+=	${EGDIR}/modules.d/rspamd_update.conf \
-	${PKG_SYSCONFDIR}/modules.d/rspamd_update.conf
-CONF_FILES+=	${EGDIR}/modules.d/spf.conf \
-	${PKG_SYSCONFDIR}/modules.d/spf.conf
-CONF_FILES+=	${EGDIR}/modules.d/surbl.conf \
-	${PKG_SYSCONFDIR}/modules.d/surbl.conf
-CONF_FILES+=	${EGDIR}/modules.d/whitelist.conf \
-	${PKG_SYSCONFDIR}/modules.d/whitelist.conf
-
-post-extract:
-	${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \;
-	${FIND} ${WRKSRC}/conf -type f -exec ${CHMOD} ${DOCMODE} {} \;
-
-.include "../../databases/hiredis/buildlink3.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libevent/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
-.include "../../mail/gmime/buildlink3.mk"
-.include "../../sysutils/file/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/rspamd13/PLIST b/rspamd13/PLIST
deleted file mode 100644
index effbcc458c..0000000000
--- a/rspamd13/PLIST
+++ /dev/null
@@ -1,131 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2015/06/05 00:49:35 wiedi Exp $
-bin/rspamadm
-bin/rspamadm-${PKGVERSION}
-bin/rspamc
-bin/rspamc-${PKGVERSION}
-bin/rspamd
-bin/rspamd-${PKGVERSION}
-bin/rspamd_stats
-lib/rspamd/librspamd-actrie.so
-man/man1/rspamadm.1
-man/man1/rspamc.1
-man/man8/rspamd.8
-share/examples/rspamd/2tld.inc
-share/examples/rspamd/common.conf
-share/examples/rspamd/composites.conf
-share/examples/rspamd/dmarc_whitelist.inc
-share/examples/rspamd/logging.inc
-share/examples/rspamd/maillist.inc
-share/examples/rspamd/metrics.conf
-share/examples/rspamd/mid.inc
-share/examples/rspamd/mime_types.inc
-share/examples/rspamd/modules.conf
-share/examples/rspamd/modules.d/chartable.conf
-share/examples/rspamd/modules.d/dkim.conf
-share/examples/rspamd/modules.d/dmarc.conf
-share/examples/rspamd/modules.d/emails.conf
-share/examples/rspamd/modules.d/fann_redis.conf
-share/examples/rspamd/modules.d/forged_recipients.conf
-share/examples/rspamd/modules.d/fuzzy_check.conf
-share/examples/rspamd/modules.d/hfilter.conf
-share/examples/rspamd/modules.d/ip_score.conf
-share/examples/rspamd/modules.d/maillist.conf
-share/examples/rspamd/modules.d/mid.conf
-share/examples/rspamd/modules.d/mime_types.conf
-share/examples/rspamd/modules.d/multimap.conf
-share/examples/rspamd/modules.d/once_received.conf
-share/examples/rspamd/modules.d/phishing.conf
-share/examples/rspamd/modules.d/ratelimit.conf
-share/examples/rspamd/modules.d/rbl.conf
-share/examples/rspamd/modules.d/redis.conf
-share/examples/rspamd/modules.d/regexp.conf
-share/examples/rspamd/modules.d/rspamd_update.conf
-share/examples/rspamd/modules.d/spf.conf
-share/examples/rspamd/modules.d/surbl.conf
-share/examples/rspamd/modules.d/whitelist.conf
-share/examples/rspamd/options.inc
-share/examples/rspamd/redirectors.inc
-share/examples/rspamd/rspamd.conf
-share/examples/rspamd/rspamd.systemd.conf
-share/examples/rspamd/rspamd.sysvinit.conf
-share/examples/rspamd/spf_dkim_whitelist.inc
-share/examples/rspamd/statistic.conf
-share/examples/rspamd/surbl-whitelist.inc
-share/examples/rspamd/worker-controller.inc
-share/examples/rspamd/worker-fuzzy.inc
-share/examples/rspamd/worker-normal.inc
-share/rspamd/effective_tld_names.dat
-share/rspamd/lua/antivirus.lua
-share/rspamd/lua/asn.lua
-share/rspamd/lua/clickhouse.lua
-share/rspamd/lua/dcc.lua
-share/rspamd/lua/dmarc.lua
-share/rspamd/lua/dynamic_conf.lua
-share/rspamd/lua/emails.lua
-share/rspamd/lua/fann_classifier.lua
-share/rspamd/lua/fann_redis.lua
-share/rspamd/lua/fann_scores.lua
-share/rspamd/lua/forged_recipients.lua
-share/rspamd/lua/fun.lua
-share/rspamd/lua/greylist.lua
-share/rspamd/lua/hfilter.lua
-share/rspamd/lua/ip_score.lua
-share/rspamd/lua/maillist.lua
-share/rspamd/lua/metadata_exporter.lua
-share/rspamd/lua/metric_exporter.lua
-share/rspamd/lua/mid.lua
-share/rspamd/lua/mime_types.lua
-share/rspamd/lua/multimap.lua
-share/rspamd/lua/mx_check.lua
-share/rspamd/lua/once_received.lua
-share/rspamd/lua/phishing.lua
-share/rspamd/lua/ratelimit.lua
-share/rspamd/lua/rbl.lua
-share/rspamd/lua/replies.lua
-share/rspamd/lua/rspamd_update.lua
-share/rspamd/lua/settings.lua
-share/rspamd/lua/spamassassin.lua
-share/rspamd/lua/trie.lua
-share/rspamd/lua/whitelist.lua
-share/rspamd/rules/forwarding.lua
-share/rspamd/rules/html.lua
-share/rspamd/rules/http_headers.lua
-share/rspamd/rules/mid.lua
-share/rspamd/rules/misc.lua
-share/rspamd/rules/regexp/compromised_hosts.lua
-share/rspamd/rules/regexp/drugs.lua
-share/rspamd/rules/regexp/fraud.lua
-share/rspamd/rules/regexp/headers.lua
-share/rspamd/rules/regexp/lotto.lua
-share/rspamd/rules/regexp/misc.lua
-share/rspamd/rules/regexp/upstream_spam_filters.lua
-share/rspamd/rules/rspamd.classifiers.lua
-share/rspamd/rules/rspamd.lua
-share/rspamd/www/README.md
-share/rspamd/www/css/bootstrap.min.css
-share/rspamd/www/css/d3evolution.css
-share/rspamd/www/css/datatables.min.css
-share/rspamd/www/css/glyphicons-halflings-regular.woff
-share/rspamd/www/css/glyphicons-halflings-regular.woff2
-share/rspamd/www/css/rspamd.css
-share/rspamd/www/favicon.ico
-share/rspamd/www/fonts/glyphicons-halflings-regular.ttf
-share/rspamd/www/fonts/glyphicons-halflings-regular.woff
-share/rspamd/www/fonts/glyphicons-halflings-regular.woff2
-share/rspamd/www/img/asc.png
-share/rspamd/www/img/desc.png
-share/rspamd/www/img/rspamd_logo_navbar.png
-share/rspamd/www/img/spinner.gif
-share/rspamd/www/img/spinner.png
-share/rspamd/www/index.html
-share/rspamd/www/js/bootstrap.min.js
-share/rspamd/www/js/d3.min.js
-share/rspamd/www/js/d3evolution.min.js
-share/rspamd/www/js/d3pie.min.js
-share/rspamd/www/js/datatables.min.js
-share/rspamd/www/js/humanize.min.js
-share/rspamd/www/js/jquery-3.1.1.min.js
-share/rspamd/www/js/jquery.cookie.min.js
-share/rspamd/www/js/rspamd.js
-share/rspamd/www/plugins.txt
-share/rspamd/www/react-index.html
diff --git a/rspamd13/distinfo b/rspamd13/distinfo
deleted file mode 100644
index 231b5f5b76..0000000000
--- a/rspamd13/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:27:19 agc Exp $
-
-SHA1 (rspamd-1.4.1.tar.xz) = 5d2e709c493dd24e528ba2d66e24235ca570afaf
-RMD160 (rspamd-1.4.1.tar.xz) = bd9284281cd8a91f7e2bc0a234b4317d22c8146f
-SHA512 (rspamd-1.4.1.tar.xz) = bc3be3f20a9692a5d188d9a254ad459dba4ca01ae3c917689943be7eed85e17ab638e0d0b9f4dd574864b4f39eb7a728b7b0ecf3088727a92dfb99a2df4a5a6d
-Size (rspamd-1.4.1.tar.xz) = 1779492 bytes
-SHA1 (patch-CMakeLists.txt) = 81b847220b8c8736b13209fb5bedf0020a8d7acf
-SHA1 (patch-src__CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a
diff --git a/rspamd13/files/smf/manifest.xml b/rspamd13/files/smf/manifest.xml
deleted file mode 100644
index be47e3d170..0000000000
--- a/rspamd13/files/smf/manifest.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="export">
-
-    <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
-
-        <create_default_instance enabled="false"/>
-        
-        <single_instance/>
-
-        <dependency name="network" grouping="require_all" restart_on="error" type="service">
-            <service_fmri value="svc:/milestone/network:default"/>
-        </dependency>
-
-        <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
-            <service_fmri value="svc:/system/filesystem/local"/>
-        </dependency>
-        
-        <method_context>
-        </method_context>
-
-        <exec_method type="method" name="start" exec="@PREFIX@/bin/rspamd -i -f -c %{config_file}" timeout_seconds="60"/>
-        <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
-
-        <property_group name="startd" type="framework">
-            <propval name="duration" type="astring" value="child"/>
-            <propval name="ignore_error" type="astring" value="core,signal"/>
-        </property_group>
-
-        <property_group name="application" type="application">
-            <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/rspamd.conf"/>
-        </property_group>
-        
-
-        <template>
-            <common_name>
-                <loctext xml:lang="C">
-                    Rspamd spam filtering system.
-                </loctext>
-            </common_name>
-        </template>
-
-    </service>
-
-</service_bundle>
diff --git a/rspamd13/patches/patch-CMakeLists.txt b/rspamd13/patches/patch-CMakeLists.txt
deleted file mode 100644
index e86d460867..0000000000
--- a/rspamd13/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-For pkgsrc. Install config files to examples directory.
-
---- CMakeLists.txt.orig	2016-09-01 11:42:54.000000000 +0000
-+++ CMakeLists.txt
-@@ -1244,9 +1244,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
- 	"${CMAKE_CURRENT_SOURCE_DIR}/conf/*" )
- FOREACH(CONF_FILE ${CONF_FILES})
- 	GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH)
--	INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR}/${_rp})")
-+	INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${EXAMPLESDIR}/${_rp})")
- 	INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/conf/${CONF_FILE}"
--		DESTINATION ${CONFDIR}/${_rp})
-+		DESTINATION ${EXAMPLESDIR}/${_rp})
- ENDFOREACH(CONF_FILE)
- 
- # Main config is special due to systemd
-@@ -1256,13 +1256,13 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
- 	SET(MAIN_CONF "conf/rspamd.sysvinit.conf")
- ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
- IF(BUILD_PORT)
--	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" ".sample")
- ELSE(BUILD_PORT)
--	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "")
-+	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" "")
- ENDIF(BUILD_PORT)
- # Debian is also special
- IF(DEBIAN_BUILD)
--	INSTALL_IF_NOT_EXISTS("conf/rspamd.sysvinit.conf" ${CONFDIR} "rspamd.sysvinit.conf" "")
-+	INSTALL_IF_NOT_EXISTS("conf/rspamd.sysvinit.conf" ${EXAMPLESDIR} "rspamd.sysvinit.conf" "")
- ENDIF(DEBIAN_BUILD)
- IF(INSTALL_EXAMPLES MATCHES "ON")
- 	INSTALL(FILES ${MAIN_CONF} DESTINATION ${EXAMPLESDIR})
diff --git a/rspamd13/patches/patch-src__CMakeLists.txt b/rspamd13/patches/patch-src__CMakeLists.txt
deleted file mode 100644
index c615a53945..0000000000
--- a/rspamd13/patches/patch-src__CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Add librt to link line for shm_open().
-
---- src/CMakeLists.txt.orig	2016-10-17 14:30:59.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -141,6 +141,9 @@ TARGET_LINK_LIBRARIES(rspamd-server rspa
- TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
- 
-+# for shm_open
-+TARGET_LINK_LIBRARIES(rspamd-server rt)
-+
- IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
- 	ADD_DEPENDENCIES(rspamd-server rspamd-clang)
- ENDIF()
diff --git a/rspamd14/DESCR b/rspamd14/DESCR
new file mode 100644
index 0000000000..1a571c9fc7
--- /dev/null
+++ b/rspamd14/DESCR
@@ -0,0 +1,3 @@
+Rspamd is fast, modular and lightweight spam filter. It is designed to work
+with big ammount of mail and can be easily extended with own filters written in
+lua.
diff --git a/rspamd14/Makefile b/rspamd14/Makefile
new file mode 100644
index 0000000000..aaff7cbf72
--- /dev/null
+++ b/rspamd14/Makefile
@@ -0,0 +1,129 @@
+# $NetBSD$
+
+DISTNAME=	rspamd-1.4.1
+CATEGORIES=	mail
+MASTER_SITES=	http://www.rspamd.com/downloads/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	bartosz.kuzma%gmail.com@localhost
+HOMEPAGE=	https://www.rspamd.com/
+COMMENT=	Fast, free and open-source spam filtering system
+LICENSE=	2-clause-bsd
+
+DEPENDS+=	ragel-[0-9]*:../../devel/ragel
+
+USE_CMAKE=	yes
+USE_TOOLS+=	perl pkg-config
+USE_LANGUAGES=	c99
+BUILD_DEFS+=	VARBASE
+
+LUA_VERSIONS_ACCEPTED=	53
+
+CPPFLAGS.SunOS+=	-D__EXTENSIONS__
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd
+TEST_TARGET=	run-test
+
+RSPAMD_USER?=	rspamd
+RSPAMD_GROUP?=	rspamd
+PKG_GROUPS=	${RSPAMD_GROUP}
+PKG_USERS=	${RSPAMD_USER}:${RSPAMD_GROUP}
+
+PKG_GROUPS_VARS=	RSPAMD_GROUP
+PKG_USERS_VARS=		RSPAMD_USER
+
+PKG_GECOS.${RSPAMD_USER}=	rspamd user
+
+PKG_SYSCONFSUBDIR=	rspamd
+EGDIR=		${PREFIX}/share/examples/${PKGBASE}
+LOGDIR=		${VARBASE}/log/rspamd
+DBDIR=		${VARBASE}/db/rspamd
+RUNDIR=		${VARBASE}/run/rspamd
+
+CMAKE_ARGS+=	-DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
+CMAKE_ARGS+=	-DLOGDIR:PATH=${LOGDIR}
+CMAKE_ARGS+=	-DRUNDIR:PATH=${VARBASE}/run/rspamd
+CMAKE_ARGS+=	-DDBDIR:PATH=${DBDIR}
+CMAKE_ARGS+=	-DCONFDIR:PATH=${PKG_SYSCONFDIR}
+CMAKE_ARGS+=	-DRSPAMD_USER=${RSPAMD_USER}
+CMAKE_ARGS+=	-DRSPAMD_GROUP=${RSPAMD_GROUP}
+CMAKE_ARGS+=	-DENABLE_LUAJIT=OFF
+
+REPLACE_PERL+=	utils/rspamd_stats.pl
+
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/modules.d
+
+OWN_DIRS_PERMS+=	${DBDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0700
+OWN_DIRS_PERMS+=	${LOGDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0750
+OWN_DIRS_PERMS+=	${RUNDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0755
+
+CONF_FILES=	${EGDIR}/2tld.inc ${PKG_SYSCONFDIR}/2tld.inc
+CONF_FILES+=	${EGDIR}/common.conf ${PKG_SYSCONFDIR}/common.conf
+CONF_FILES+=	${EGDIR}/composites.conf ${PKG_SYSCONFDIR}/composites.conf
+CONF_FILES+=	${EGDIR}/logging.inc ${PKG_SYSCONFDIR}/logging.inc
+CONF_FILES+=	${EGDIR}/metrics.conf ${PKG_SYSCONFDIR}/metrics.conf
+CONF_FILES+=	${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf
+CONF_FILES+=	${EGDIR}/options.inc ${PKG_SYSCONFDIR}/options.inc
+CONF_FILES+=	${EGDIR}/redirectors.inc ${PKG_SYSCONFDIR}/redirectors.inc
+CONF_FILES+=	${EGDIR}/rspamd.conf ${PKG_SYSCONFDIR}/rspamd.conf
+CONF_FILES+=	${EGDIR}/statistic.conf ${PKG_SYSCONFDIR}/statistic.conf
+CONF_FILES+=	${EGDIR}/surbl-whitelist.inc \
+	${PKG_SYSCONFDIR}/surbl-whitelist.inc
+CONF_FILES+=	${EGDIR}/worker-controller.inc \
+	${PKG_SYSCONFDIR}/worker-controller.inc
+CONF_FILES+=	${EGDIR}/worker-fuzzy.inc \
+	${PKG_SYSCONFDIR}/worker-fuzzy.inc
+CONF_FILES+=	${EGDIR}/worker-normal.inc \
+	${PKG_SYSCONFDIR}/worker-normal.inc
+CONF_FILES+=	${EGDIR}/modules.d/chartable.conf \
+	${PKG_SYSCONFDIR}/modules.d/chartable.conf
+CONF_FILES+=	${EGDIR}/modules.d/dkim.conf \
+	${PKG_SYSCONFDIR}/modules.d/dkim.conf
+CONF_FILES+=	${EGDIR}/modules.d/dmarc.conf \
+	${PKG_SYSCONFDIR}/modules.d/dmarc.conf
+CONF_FILES+=	${EGDIR}/modules.d/emails.conf \
+	${PKG_SYSCONFDIR}/modules.d/emails.conf
+CONF_FILES+=	${EGDIR}/modules.d/forged_recipients.conf \
+	${PKG_SYSCONFDIR}/modules.d/forged_recipients.conf
+CONF_FILES+=	${EGDIR}/modules.d/fuzzy_check.conf \
+	${PKG_SYSCONFDIR}/modules.d/fuzzy_check.conf
+CONF_FILES+=	${EGDIR}/modules.d/hfilter.conf \
+	${PKG_SYSCONFDIR}/modules.d/hfilter.conf
+CONF_FILES+=	${EGDIR}/modules.d/ip_score.conf \
+	${PKG_SYSCONFDIR}/modules.d/ip_score.conf
+CONF_FILES+=	${EGDIR}/modules.d/maillist.conf \
+	${PKG_SYSCONFDIR}/modules.d/maillist.conf
+CONF_FILES+=	${EGDIR}/modules.d/mime_types.conf \
+	${PKG_SYSCONFDIR}/modules.d/mime_types.conf
+CONF_FILES+=	${EGDIR}/modules.d/multimap.conf \
+	${PKG_SYSCONFDIR}/modules.d/multimap.conf
+CONF_FILES+=	${EGDIR}/modules.d/once_received.conf \
+	${PKG_SYSCONFDIR}/modules.d/once_received.conf
+CONF_FILES+=	${EGDIR}/modules.d/phishing.conf \
+	${PKG_SYSCONFDIR}/modules.d/phishing.conf
+CONF_FILES+=	${EGDIR}/modules.d/ratelimit.conf \
+	${PKG_SYSCONFDIR}/modules.d/ratelimit.conf
+CONF_FILES+=	${EGDIR}/modules.d/rbl.conf \
+	${PKG_SYSCONFDIR}/modules.d/rbl.conf
+CONF_FILES+=	${EGDIR}/modules.d/regexp.conf \
+	${PKG_SYSCONFDIR}/modules.d/regexp.conf
+CONF_FILES+=	${EGDIR}/modules.d/rspamd_update.conf \
+	${PKG_SYSCONFDIR}/modules.d/rspamd_update.conf
+CONF_FILES+=	${EGDIR}/modules.d/spf.conf \
+	${PKG_SYSCONFDIR}/modules.d/spf.conf
+CONF_FILES+=	${EGDIR}/modules.d/surbl.conf \
+	${PKG_SYSCONFDIR}/modules.d/surbl.conf
+CONF_FILES+=	${EGDIR}/modules.d/whitelist.conf \
+	${PKG_SYSCONFDIR}/modules.d/whitelist.conf
+
+post-extract:
+	${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \;
+	${FIND} ${WRKSRC}/conf -type f -exec ${CHMOD} ${DOCMODE} {} \;
+
+.include "../../databases/hiredis/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libevent/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
+.include "../../sysutils/file/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/rspamd14/PLIST b/rspamd14/PLIST
new file mode 100644
index 0000000000..effbcc458c
--- /dev/null
+++ b/rspamd14/PLIST
@@ -0,0 +1,131 @@
+@comment $NetBSD: PLIST,v 1.3 2015/06/05 00:49:35 wiedi Exp $
+bin/rspamadm
+bin/rspamadm-${PKGVERSION}
+bin/rspamc
+bin/rspamc-${PKGVERSION}
+bin/rspamd
+bin/rspamd-${PKGVERSION}
+bin/rspamd_stats
+lib/rspamd/librspamd-actrie.so
+man/man1/rspamadm.1
+man/man1/rspamc.1
+man/man8/rspamd.8
+share/examples/rspamd/2tld.inc
+share/examples/rspamd/common.conf
+share/examples/rspamd/composites.conf
+share/examples/rspamd/dmarc_whitelist.inc
+share/examples/rspamd/logging.inc
+share/examples/rspamd/maillist.inc
+share/examples/rspamd/metrics.conf
+share/examples/rspamd/mid.inc
+share/examples/rspamd/mime_types.inc
+share/examples/rspamd/modules.conf
+share/examples/rspamd/modules.d/chartable.conf
+share/examples/rspamd/modules.d/dkim.conf
+share/examples/rspamd/modules.d/dmarc.conf
+share/examples/rspamd/modules.d/emails.conf
+share/examples/rspamd/modules.d/fann_redis.conf
+share/examples/rspamd/modules.d/forged_recipients.conf
+share/examples/rspamd/modules.d/fuzzy_check.conf
+share/examples/rspamd/modules.d/hfilter.conf
+share/examples/rspamd/modules.d/ip_score.conf
+share/examples/rspamd/modules.d/maillist.conf
+share/examples/rspamd/modules.d/mid.conf
+share/examples/rspamd/modules.d/mime_types.conf
+share/examples/rspamd/modules.d/multimap.conf
+share/examples/rspamd/modules.d/once_received.conf
+share/examples/rspamd/modules.d/phishing.conf
+share/examples/rspamd/modules.d/ratelimit.conf
+share/examples/rspamd/modules.d/rbl.conf
+share/examples/rspamd/modules.d/redis.conf
+share/examples/rspamd/modules.d/regexp.conf
+share/examples/rspamd/modules.d/rspamd_update.conf
+share/examples/rspamd/modules.d/spf.conf
+share/examples/rspamd/modules.d/surbl.conf
+share/examples/rspamd/modules.d/whitelist.conf
+share/examples/rspamd/options.inc
+share/examples/rspamd/redirectors.inc
+share/examples/rspamd/rspamd.conf
+share/examples/rspamd/rspamd.systemd.conf
+share/examples/rspamd/rspamd.sysvinit.conf
+share/examples/rspamd/spf_dkim_whitelist.inc
+share/examples/rspamd/statistic.conf
+share/examples/rspamd/surbl-whitelist.inc
+share/examples/rspamd/worker-controller.inc
+share/examples/rspamd/worker-fuzzy.inc
+share/examples/rspamd/worker-normal.inc
+share/rspamd/effective_tld_names.dat
+share/rspamd/lua/antivirus.lua
+share/rspamd/lua/asn.lua
+share/rspamd/lua/clickhouse.lua
+share/rspamd/lua/dcc.lua
+share/rspamd/lua/dmarc.lua
+share/rspamd/lua/dynamic_conf.lua
+share/rspamd/lua/emails.lua
+share/rspamd/lua/fann_classifier.lua
+share/rspamd/lua/fann_redis.lua
+share/rspamd/lua/fann_scores.lua
+share/rspamd/lua/forged_recipients.lua
+share/rspamd/lua/fun.lua
+share/rspamd/lua/greylist.lua
+share/rspamd/lua/hfilter.lua
+share/rspamd/lua/ip_score.lua
+share/rspamd/lua/maillist.lua
+share/rspamd/lua/metadata_exporter.lua
+share/rspamd/lua/metric_exporter.lua
+share/rspamd/lua/mid.lua
+share/rspamd/lua/mime_types.lua
+share/rspamd/lua/multimap.lua
+share/rspamd/lua/mx_check.lua
+share/rspamd/lua/once_received.lua
+share/rspamd/lua/phishing.lua
+share/rspamd/lua/ratelimit.lua
+share/rspamd/lua/rbl.lua
+share/rspamd/lua/replies.lua
+share/rspamd/lua/rspamd_update.lua
+share/rspamd/lua/settings.lua
+share/rspamd/lua/spamassassin.lua
+share/rspamd/lua/trie.lua
+share/rspamd/lua/whitelist.lua
+share/rspamd/rules/forwarding.lua
+share/rspamd/rules/html.lua
+share/rspamd/rules/http_headers.lua
+share/rspamd/rules/mid.lua
+share/rspamd/rules/misc.lua
+share/rspamd/rules/regexp/compromised_hosts.lua
+share/rspamd/rules/regexp/drugs.lua
+share/rspamd/rules/regexp/fraud.lua
+share/rspamd/rules/regexp/headers.lua
+share/rspamd/rules/regexp/lotto.lua
+share/rspamd/rules/regexp/misc.lua
+share/rspamd/rules/regexp/upstream_spam_filters.lua
+share/rspamd/rules/rspamd.classifiers.lua
+share/rspamd/rules/rspamd.lua
+share/rspamd/www/README.md
+share/rspamd/www/css/bootstrap.min.css
+share/rspamd/www/css/d3evolution.css
+share/rspamd/www/css/datatables.min.css
+share/rspamd/www/css/glyphicons-halflings-regular.woff
+share/rspamd/www/css/glyphicons-halflings-regular.woff2
+share/rspamd/www/css/rspamd.css
+share/rspamd/www/favicon.ico
+share/rspamd/www/fonts/glyphicons-halflings-regular.ttf
+share/rspamd/www/fonts/glyphicons-halflings-regular.woff
+share/rspamd/www/fonts/glyphicons-halflings-regular.woff2
+share/rspamd/www/img/asc.png
+share/rspamd/www/img/desc.png
+share/rspamd/www/img/rspamd_logo_navbar.png
+share/rspamd/www/img/spinner.gif
+share/rspamd/www/img/spinner.png
+share/rspamd/www/index.html
+share/rspamd/www/js/bootstrap.min.js
+share/rspamd/www/js/d3.min.js
+share/rspamd/www/js/d3evolution.min.js
+share/rspamd/www/js/d3pie.min.js
+share/rspamd/www/js/datatables.min.js
+share/rspamd/www/js/humanize.min.js
+share/rspamd/www/js/jquery-3.1.1.min.js
+share/rspamd/www/js/jquery.cookie.min.js
+share/rspamd/www/js/rspamd.js
+share/rspamd/www/plugins.txt
+share/rspamd/www/react-index.html
diff --git a/rspamd14/distinfo b/rspamd14/distinfo
new file mode 100644
index 0000000000..231b5f5b76
--- /dev/null
+++ b/rspamd14/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.7 2015/11/03 23:27:19 agc Exp $
+
+SHA1 (rspamd-1.4.1.tar.xz) = 5d2e709c493dd24e528ba2d66e24235ca570afaf
+RMD160 (rspamd-1.4.1.tar.xz) = bd9284281cd8a91f7e2bc0a234b4317d22c8146f
+SHA512 (rspamd-1.4.1.tar.xz) = bc3be3f20a9692a5d188d9a254ad459dba4ca01ae3c917689943be7eed85e17ab638e0d0b9f4dd574864b4f39eb7a728b7b0ecf3088727a92dfb99a2df4a5a6d
+Size (rspamd-1.4.1.tar.xz) = 1779492 bytes
+SHA1 (patch-CMakeLists.txt) = 81b847220b8c8736b13209fb5bedf0020a8d7acf
+SHA1 (patch-src__CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a
diff --git a/rspamd14/files/smf/manifest.xml b/rspamd14/files/smf/manifest.xml
new file mode 100644
index 0000000000..be47e3d170
--- /dev/null
+++ b/rspamd14/files/smf/manifest.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="export">
+
+    <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+
+        <create_default_instance enabled="false"/>
+        
+        <single_instance/>
+
+        <dependency name="network" grouping="require_all" restart_on="error" type="service">
+            <service_fmri value="svc:/milestone/network:default"/>
+        </dependency>
+
+        <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+            <service_fmri value="svc:/system/filesystem/local"/>
+        </dependency>
+        
+        <method_context>
+        </method_context>
+
+        <exec_method type="method" name="start" exec="@PREFIX@/bin/rspamd -i -f -c %{config_file}" timeout_seconds="60"/>
+        <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
+
+        <property_group name="startd" type="framework">
+            <propval name="duration" type="astring" value="child"/>
+            <propval name="ignore_error" type="astring" value="core,signal"/>
+        </property_group>
+
+        <property_group name="application" type="application">
+            <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/rspamd.conf"/>
+        </property_group>
+        
+
+        <template>
+            <common_name>
+                <loctext xml:lang="C">
+                    Rspamd spam filtering system.
+                </loctext>
+            </common_name>
+        </template>
+
+    </service>
+
+</service_bundle>
diff --git a/rspamd14/patches/patch-CMakeLists.txt b/rspamd14/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..e86d460867
--- /dev/null
+++ b/rspamd14/patches/patch-CMakeLists.txt
@@ -0,0 +1,35 @@
+$NetBSD$
+
+For pkgsrc. Install config files to examples directory.
+
+--- CMakeLists.txt.orig	2016-09-01 11:42:54.000000000 +0000
++++ CMakeLists.txt
+@@ -1244,9 +1244,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
+ 	"${CMAKE_CURRENT_SOURCE_DIR}/conf/*" )
+ FOREACH(CONF_FILE ${CONF_FILES})
+ 	GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH)
+-	INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR}/${_rp})")
++	INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${EXAMPLESDIR}/${_rp})")
+ 	INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/conf/${CONF_FILE}"
+-		DESTINATION ${CONFDIR}/${_rp})
++		DESTINATION ${EXAMPLESDIR}/${_rp})
+ ENDFOREACH(CONF_FILE)
+ 
+ # Main config is special due to systemd
+@@ -1256,13 +1256,13 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
+ 	SET(MAIN_CONF "conf/rspamd.sysvinit.conf")
+ ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
+ IF(BUILD_PORT)
+-	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
++	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" ".sample")
+ ELSE(BUILD_PORT)
+-	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "")
++	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" "")
+ ENDIF(BUILD_PORT)
+ # Debian is also special
+ IF(DEBIAN_BUILD)
+-	INSTALL_IF_NOT_EXISTS("conf/rspamd.sysvinit.conf" ${CONFDIR} "rspamd.sysvinit.conf" "")
++	INSTALL_IF_NOT_EXISTS("conf/rspamd.sysvinit.conf" ${EXAMPLESDIR} "rspamd.sysvinit.conf" "")
+ ENDIF(DEBIAN_BUILD)
+ IF(INSTALL_EXAMPLES MATCHES "ON")
+ 	INSTALL(FILES ${MAIN_CONF} DESTINATION ${EXAMPLESDIR})
diff --git a/rspamd14/patches/patch-src__CMakeLists.txt b/rspamd14/patches/patch-src__CMakeLists.txt
new file mode 100644
index 0000000000..c615a53945
--- /dev/null
+++ b/rspamd14/patches/patch-src__CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Add librt to link line for shm_open().
+
+--- src/CMakeLists.txt.orig	2016-10-17 14:30:59.000000000 +0000
++++ src/CMakeLists.txt
+@@ -141,6 +141,9 @@ TARGET_LINK_LIBRARIES(rspamd-server rspa
+ TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ 
++# for shm_open
++TARGET_LINK_LIBRARIES(rspamd-server rt)
++
+ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+ 	ADD_DEPENDENCIES(rspamd-server rspamd-clang)
+ ENDIF()
Prev by Date: Upgrade rspamd to 1.4.1
Next by Date: sqlmap: Import sqlmap-1.1.2 as wip/sqlmap
Previous by Thread: Upgrade rspamd to 1.4.1
Next by Thread: sqlmap: Import sqlmap-1.1.2 as wip/sqlmap
Indexes:
Home | Main Index | Thread Index | Old Index