X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) by lists.alpinelinux.org (Postfix) with ESMTP id E0F215C442F for ; Thu, 24 Nov 2016 21:28:07 +0000 (GMT) Received: from ost.org.ua ([195.144.25.230] helo=alpine.ost.org.ua) by mail.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1cA1Yt-0008PE-1t for alpine-aports@lists.alpinelinux.org; Thu, 24 Nov 2016 23:28:07 +0200 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH v2] testing/rspamd: upgrade to 1.4.0 Date: Thu, 24 Nov 2016 23:28:06 +0200 Message-Id: <20161124212806.1450-1-valery.kartel@gmail.com> X-Mailer: git-send-email 2.10.2 Sender: droid@infogroup.kiev.ua X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/rspamd/APKBUILD | 90 ++++++++++++++++++++++----------- testing/rspamd/rspamd.conf | 21 ++++++-- testing/rspamd/rspamd.worker_controller | 9 +--- testing/rspamd/rspamd.worker_fuzzy | 6 +++ testing/rspamd/rspamd.worker_normal | 6 +-- 5 files changed, 88 insertions(+), 44 deletions(-) create mode 100644 testing/rspamd/rspamd.worker_fuzzy diff --git a/testing/rspamd/APKBUILD b/testing/rspamd/APKBUILD index ee2b2e3..99e4da1 100644 --- a/testing/rspamd/APKBUILD +++ b/testing/rspamd/APKBUILD @@ -2,9 +2,9 @@ # Contributor: Valery Kartel # Contributor: Nathan Angelacos pkgname=rspamd -pkgver=1.3.4 -pkgrel=1 -pkgdesc="Rapid spam filtering system" +pkgver=1.4.0 +pkgrel=0 +pkgdesc="Fast, free and open-source spam filtering system" url="https://rspamd.com" arch="x86_64 x86 armhf" license="BSD" @@ -12,15 +12,18 @@ pkgusers="rspamd" pkggroups="rspamd" depends="" depends_dev="" -makedepends="$depends_dev cmake libressl-dev libevent-dev glib-dev gmime-dev - lua5.1-dev lua5.1 sqlite-dev hiredis-dev file-dev pcre-dev ragel" +makedepends="$depends_dev cmake ragel perl + luajit-dev glib-dev pcre-dev gmime-dev libevent-dev sqlite-dev + libressl-dev file-dev curl-dev" install="$pkgname.pre-install" -subpackages="$pkgname-doc $pkgname-web $pkgname-client" +subpackages="$pkgname-doc $pkgname-controller::noarch $pkgname-client + $pkgname-fuzzy::noarch $pkgname-utils::noarch" source="https://rspamd.com/downloads/$pkgname-$pkgver.tar.xz $pkgname.logrotated $pkgname.initd $pkgname.confd $pkgname.conf + $pkgname.worker_fuzzy $pkgname.worker_normal $pkgname.worker_controller " @@ -34,7 +37,11 @@ build() { -DRUNDIR=/run/$pkgname \ -DRSPAMD_USER=$pkgusers \ -DRSPAMD_GROUP=$pkggroups \ + -DENABLE_DB=ON \ + -DENABLE_SQLITE=ON \ -DENABLE_HIREDIS=ON \ + -DENABLE_REDIRECTOR=ON \ + -DENABLE_URL_INCLUDE=ON \ -DINSTALL_EXAMPLES=ON \ || return 1 make || return 1 @@ -43,22 +50,27 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 - find "$pkgdir"/usr/bin -type l -delete - rm -fr "$pkgdir"/etc/$pkgname/rspamd* "$pkgdir"/etc/$pkgname/worker* - sed -i -E 's~DBDIR(/rspamd.sock)~RUNDIR\1~' "$pkgdir"/etc/$pkgname/options.inc - install -Dm644 "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname/$pkgname.conf - install -Dm644 "$srcdir"/$pkgname.worker_normal "$pkgdir"/etc/$pkgname/worker.d/normal.conf + rm "$pkgdir"/etc/$pkgname/$pkgname.* + sed -i -r 's~DBDIR(/rspamd.sock)~RUNDIR\1~' \ + -e 's/rspamd_dynamic/dynamic/' \ + "$pkgdir"/etc/$pkgname/options.inc + mkdir -p "$pkgdir"/etc/$pkgname/local.d "$pkgdir"/etc/$pkgname/override.d + install -Dm644 "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname/$pkgname.conf + for i in normal controller fuzzy; do + install -Dm644 "$srcdir"/$pkgname.worker_$i "$pkgdir"/etc/$pkgname/worker-$i.conf + done install -Dm644 "$srcdir"/$pkgname.logrotated "$pkgdir"/etc/logrotate.d/$pkgname install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname - install -dm750 -o $pkgusers -g $pkggroups "$pkgdir"/var/lib/$pkgname/rspamd_dynamic + install -dm750 -o $pkgusers -g $pkggroups "$pkgdir"/var/lib/$pkgname/dynamic install -dm750 -g $pkggroups "$pkgdir"/var/log/$pkgname mkdir "$pkgdir"/usr/sbin + find "$pkgdir"/usr/bin -type l -delete mv "$pkgdir"/usr/bin/rspamd-$pkgver "$pkgdir"/usr/sbin/rspamd mv "$pkgdir"/usr/bin/rspamadm-$pkgver "$pkgdir"/usr/bin/rspamadm @@ -68,14 +80,13 @@ package() { "$pkgdir"/usr/share/doc/$pkgname } -web() { - arch="noarch" +controller() { license="MIT" depends="$pkgname" - pkgdesc="$pkgdesc (web control interface)" - mkdir -p "$subpkgdir"/usr/share/$pkgname "$subpkgdir"/etc/$pkgname/worker.d + pkgdesc="$pkgdesc (controller web interface)" + mkdir -p "$subpkgdir"/usr/share/$pkgname "$subpkgdir"/etc/$pkgname mv "$pkgdir"/usr/share/$pkgname/www "$subpkgdir"/usr/share/$pkgname/ - install -Dm644 "$srcdir"/$pkgname.worker_controller "$subpkgdir"/etc/$pkgname/worker.d/controller.conf + mv "$pkgdir"/etc/$pkgname/worker-controller.* "$subpkgdir"/etc/$pkgname } client() { @@ -84,24 +95,43 @@ client() { mv "$pkgdir"/usr/bin/rspamc-$pkgver "$subpkgdir"/usr/bin/rspamc } -md5sums="ab81d063861d68b1e2260d1c599bf29c rspamd-1.3.4.tar.xz +fuzzy() { + depends="$pkgname" + pkgdesc="$pkgdesc (local fuzzy storage)" + mkdir -p "$subpkgdir"/etc/$pkgname/modules.d + mv "$pkgdir"/etc/$pkgname/worker-fuzzy.* "$subpkgdir"/etc/$pkgname + mv "$pkgdir"/etc/$pkgname/modules.d/fuzzy_* "$subpkgdir"/etc/$pkgname/modules.d +} + +utils() { + depends="perl" + pkgdesc="$pkgdesc (utils)" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/${pkgname}_stats "$subpkgdir"/usr/bin/${pkgname}-stats + mv "$pkgdir"/usr/bin/${pkgname}-redirector "$subpkgdir"/usr/bin +} + +md5sums="923b0d5fae691916feb243d61d48609f rspamd-1.4.0.tar.xz c152c6a90f6ae9e5a7a1d137dfbc0305 rspamd.logrotated 3f32a16e76e1461ffba9231cfb1e3d17 rspamd.initd ecfea2a25b95727ae91c04001fbd3e46 rspamd.confd -0ba1c9aea1820de74d831fd531cce51a rspamd.conf -560b2d4746510fe9a7a2fb1c09181c38 rspamd.worker_normal -15a9f5dde0076eaab4565549b05b991c rspamd.worker_controller" -sha256sums="64fcabb3dc6767b5dc22c89f968414d1028f34ab8a21e1b22482aace069d527c rspamd-1.3.4.tar.xz +aa2864ab557ae1a8496c1a587682943a rspamd.conf +9c56df2d43d18f75c40ef74af2520af5 rspamd.worker_fuzzy +30006ee74107ab0d89fd7f11c9a83df2 rspamd.worker_normal +7d7e5553e5db4a73e576081bc5d2cdfa rspamd.worker_controller" +sha256sums="30c9acf93bdcc6c009524c8b2770931475929c6c9e948faa90d7412306055a1c rspamd-1.4.0.tar.xz 6c5e79e9052d957f3d0d634b2ae7a56bbc0901a5d6946dc991c92f19a72fce97 rspamd.logrotated 6b531f95724b2a3990524ab09b7304ce4e811b6e082dfdbe633f201a6bc7eee3 rspamd.initd 82be6a663af2e2333b0dfbbbfd05a9ff3d02e05c7e506235b1b0dbd9d0b72972 rspamd.confd -8b51fbd06a46adceb8cc4b0dc06e7b98d263336acbff913c34ff8e451173aa23 rspamd.conf -ccb271cc6b1ff69add9d6e00edcb14e1c1ae664ee6ecf28304647f6cb32240c9 rspamd.worker_normal -91848312e707032bb159f042da04b4a15efd43f69a17225481962cb07751e90a rspamd.worker_controller" -sha512sums="41a3aa9b699ca1e40d229ebc9c3fd41ef07ad99b0badda44481fe4ff3003000069352f58379fa47013f96d98b08430a3c7bea0d97cab4a7e6db17a9084b082d6 rspamd-1.3.4.tar.xz -2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated +29dd2ffd52e07f42bb796dcafd47aa1ac52708e2c7f460dae74cb9016f85e27c rspamd.conf +b0aa4e9b3093b511c92c9c8a3f25996cdb94750a33f0f941d6939f136f66988c rspamd.worker_fuzzy +dc086c7e89a06bc8dffa9c1a559b7849ed7525b315aca3c8b59fadd12905a7a4 rspamd.worker_normal +bbfa25e57ba3d9dbfd30653bcff7427a97d3ca8e77fdc59cb2700ba3e9f484c7 rspamd.worker_controller" +sha512sums="39bfccee070b829f3ea5019ebde0020a850abf7fe92f7e5bb5b9212088d4c98544e6f55228984d3422c09c31f356b209237da6a6eb9c18e3feb7940429de663a rspamd-1.4.0.tar.xz +2efe28575c40d1fba84b189bb87\2860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated 30b45812ef68f2b82d0d7f370b44bec52691296c7349c96c8273342eb4f9b5708c13ad97b13f63d81bee588b4e459c0da3092a62adff9e5b8938f44546df3dcd rspamd.initd 0b73b159cec9a4a1d337fbb429814f78da23b55f72c9fb8a777ab5f06634206a4f9b25e587f8dbfa7c3242ac5501ebcc90b9a0e926adfd37e14a12ac4607fa62 rspamd.confd -856000ab9b76dd7acff95ab9a55a0eddfc66486a439fcba7fbb36ecdeaa9740f29301cf7248c982e2d5b745b1bad521abb0f4d5e240d442440a36103d3ee634d rspamd.conf -e669882c35891eee37c4121ea065e72545c618ac5e16044ccd19db4cdb14bed271fa87dc261e43e587a08ea6149e13952626c8cea8a797a59b649203c2ac4731 rspamd.worker_normal -e830ccd5d7999e8cf8d0a82baba1ca80c8b8eb3a7f710c8c067af937258fff49f010cead46619adebc1d481d1131c9e0146fa654a4f4c28749437e5b2c49e755 rspamd.worker_controller" +891713ac5b139d5aa4e3792465526265707c6b3d83e3d76c9bdc3020688cd1955295dd3f2bc18f81eecf37d95ede00c59f5ec098ac70b0e18e9537d87363e48b rspamd.conf +2b2bfdf722af406d7b796ec9acfd1190b681d1f9d49ad132a4ed57d61d7f153ce42b76e6da3091debdd0e84b78214c45e1dae4fff5037ee5156943599230866d rspamd.worker_fuzzy +8fd1402a582e915b8f99a9f1f89e95f6e1bb7a8425f20d12c84c1a75d34202a8f72e43123c7c3c9258bbd6616416fdf9c2e1b3794c05abdb938d85e485f990f6 rspamd.worker_normal +8d662586cf2754f025e691a3ad7974b7d9766569f7f1b1505a19c578d22772d8007d3fa1c2c0401c7aaa55a938c1174ef4be2c252fb3d99e46cad69c1848fd9f rspamd.worker_controller" diff --git a/testing/rspamd/rspamd.conf b/testing/rspamd/rspamd.conf index fe737f9..1e37cb7 100644 --- a/testing/rspamd/rspamd.conf +++ b/testing/rspamd/rspamd.conf @@ -1,9 +1,24 @@ +# Please don't modify this file as your changes might be overwritten with +# the next update. +# +# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine +# parameters defined on the top level +# +# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add +# parameters defined on the top level +# +# For specific modules or configuration you can also modify +# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults +# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults +# +# See https://rspamd.com/doc/tutorials/writing_rules.html for details + .include "$CONFDIR/common.conf" options { pidfile = "$RUNDIR/rspamd.pid"; .include "$CONFDIR/options.inc" - .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/options.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc" } @@ -11,8 +26,8 @@ logging { type = "file"; filename = "$LOGDIR/rspamd.log"; .include "$CONFDIR/logging.inc" - .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/logging.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/logging.inc" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc" } -.include(glob=true) "$CONFDIR/worker.d/*.conf" +.include(glob=true) "$CONFDIR/worker-*.conf" diff --git a/testing/rspamd/rspamd.worker_controller b/testing/rspamd/rspamd.worker_controller index 77464c1..767acdb 100644 --- a/testing/rspamd/rspamd.worker_controller +++ b/testing/rspamd/rspamd.worker_controller @@ -1,11 +1,6 @@ worker { bind_socket = "localhost:11334"; - type = "controller"; - count = 1; - password = "q1"; - secure_ip = "127.0.0.1"; - secure_ip = "::1"; - static_dir = "${WWWDIR}"; - .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-controller.inc" + .include "$CONFDIR/worker-controller.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc" } diff --git a/testing/rspamd/rspamd.worker_fuzzy b/testing/rspamd/rspamd.worker_fuzzy new file mode 100644 index 0000000..449d99b --- /dev/null +++ b/testing/rspamd/rspamd.worker_fuzzy @@ -0,0 +1,6 @@ +worker { + bind_socket = "*:11335"; + .include "$CONFDIR/worker-fuzzy.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc" + .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc" +} diff --git a/testing/rspamd/rspamd.worker_normal b/testing/rspamd/rspamd.worker_normal index 6fbee1d..fc3d7a5 100644 --- a/testing/rspamd/rspamd.worker_normal +++ b/testing/rspamd/rspamd.worker_normal @@ -1,8 +1,6 @@ worker { bind_socket = "*:11333"; - type = "normal"; - mime = true; - task_timeout = 8s; - .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-normal.inc" + .include "$CONFDIR/worker-normal.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-normal.inc" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc" } -- 2.10.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---