Patches for aports can be sent to this list

1

[alpine-aports] [PATCH] testing/rspamd: switch mprotect off, some improvements in init and logrotate

Valery Kartel
Details
Message ID
<1454415678-2342-1-git-send-email-valery.kartel@gmail.com>
Sender timestamp
1454415678
DKIM signature
missing
Download raw message
Patch: +21 -12
---
 testing/rspamd/APKBUILD          | 20 +++++++++++---------
 testing/rspamd/rspamd.initd      | 11 +++++++++--
 testing/rspamd/rspamd.logrotated |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/testing/rspamd/APKBUILD b/testing/rspamd/APKBUILD
index e31a569..5aad39c 100644
--- a/testing/rspamd/APKBUILD
+++ b/testing/rspamd/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 pkgname=rspamd
 pkgver=1.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Rapid spam filtering system"
 url="https://rspamd.com"
 arch="all"
@@ -11,7 +11,7 @@ pkgusers="rspamd"
 pkggroups="rspamd"
 depends=""
 depends_dev=""
-makedepends="$depends_dev cmake openssl-dev libevent-dev glib-dev gmime-dev
+makedepends="$depends_dev cmake paxctl openssl-dev libevent-dev glib-dev gmime-dev
 	luajit-dev sqlite-dev hiredis-dev file-dev pcre-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-web $pkgname-client"
@@ -57,7 +57,9 @@ package() {
 	install -dm750 -g $pkggroups "$pkgdir"/var/log/$pkgname
 
 	mkdir "$pkgdir"/usr/sbin
-	mv "$pkgdir"/usr/bin/rspamd-$pkgver "$pkgdir"/usr/sbin/rspamd
+	mv "$pkgdir"/usr/bin/$pkgname-$pkgver "$pkgdir"/usr/sbin/$pkgname
+	# rspamd needs mprotect off for now
+	paxctl -c -m "$pkgdir"/usr/sbin/$pkgname
 	mv "$pkgdir"/usr/bin/rspamadm-$pkgver "$pkgdir"/usr/bin/rspamadm
 
 	mv "$pkgdir"/usr/share/examples "$pkgdir"/usr/share/doc
@@ -83,22 +85,22 @@ client() {
 }
 
 md5sums="19d43ecc16d6d7f89af50831055220d5  rspamd-1.1.2.tar.xz
-3fd4d0e28cb01224a786c0498266e9a6  rspamd.logrotated
-dba3145a52bee22d8ed1192dc44506ad  rspamd.initd
+978ad5f8b6648041e9dbb53441eddf25  rspamd.logrotated
+0656acc12dcce7cba232857a848d0390  rspamd.initd
 ecfea2a25b95727ae91c04001fbd3e46  rspamd.confd
 a5f0967b3d9aa319909af7e1bfe998e1  rspamd.conf
 74e334227e9244c419abd605787c090e  rspamd.worker_normal
 03bd84228945261e2242564f9bf5f1ca  rspamd.worker_controller"
 sha256sums="211a0ff0c83d3ef4b586f59b0d3d6e12b9e10b2a2c72894c5f9116e649fb6d41  rspamd-1.1.2.tar.xz
-cb02c8c041a0ace2e3c9e4fbf514038871b4444575c9022a75e661130db875fd  rspamd.logrotated
-83acf26538826ce58039236660807cc87b9d4abc628fa6e2ddbb4201eac5424e  rspamd.initd
+d45ff8bd8ab9767dd8376530a4ce6e68a46d5fcf3fd8d959d8f77f7370465e01  rspamd.logrotated
+5bcf68a72e0582859799cd335a14d48914e5291f4087327b3b42562ef64e2958  rspamd.initd
 82be6a663af2e2333b0dfbbbfd05a9ff3d02e05c7e506235b1b0dbd9d0b72972  rspamd.confd
 5a223efb12e962e0f3bfe9f6d08336c6074b0b2930b8da6a22fe6582142ee40c  rspamd.conf
 7805103a2e11cf816e99dba7d67fdc584ece33d9ea3ef95f95f4fce91a34eb90  rspamd.worker_normal
 f50663096866b35095f7a6754e3cfb0bab518645d61646703715cf43da5adf77  rspamd.worker_controller"
 sha512sums="78bbcd0130f3449b5e50f57049b1a0bca48bcfda808e08108c8dc2bfe2bb4a286b2d74084b8b9619299499105e3bf7085d086cc4cb929eb03e427c80aa49021c  rspamd-1.1.2.tar.xz
-3b95882b1804d8dc6524a4c2cdf3f656b2f9bf5db6228b92d1acd539629070aead654c1f58937e1473e4f07340dc3de7b212f87b36143c5cb3fcb3b472a85f5a  rspamd.logrotated
-12b2a92126f911e29d5ace836404ca8170bc19181f3b61896726b0dea79b03bc3b9295d876b96a633a3b4a963646cf7bebfbe10489ad24f373d81fd5a84f21b1  rspamd.initd
+9af0f0250f3c9bda2aee26ca09b29dce17e05cc59c885265c94948cd45f35fbc8876dff6b889cc247b5af34819852d1a163ba769f52c3d648c830def79f1b74a  rspamd.logrotated
+e240983c2fd91d8061b17e35e83a75c56ac2c3625dbe07b83a2e89e3dbf69b57c675d01772b93968aa6b22d150d54d366f2fb4a0c6551b3cfdedc77d82e28652  rspamd.initd
 0b73b159cec9a4a1d337fbb429814f78da23b55f72c9fb8a777ab5f06634206a4f9b25e587f8dbfa7c3242ac5501ebcc90b9a0e926adfd37e14a12ac4607fa62  rspamd.confd
 90885bd8f9fcd47590eedf8f1f058df7c492005fc09058e99ee490e1730f4961909850ecf9e98723bfbd3cbe8df705f86a0de931dedb25bc66b246674f537a72  rspamd.conf
 ddf1af03878ed2f4b1e735ecd9f931f1941adf7b2085aa7a40f3ef303fa5c59791d0d7462064c2ac652af2722b83acd4379f549d341cb62767e74edefb69ba9a  rspamd.worker_normal
diff --git a/testing/rspamd/rspamd.initd b/testing/rspamd/rspamd.initd
index 0fd5b93..93148cc 100644
--- a/testing/rspamd/rspamd.initd
+++ b/testing/rspamd/rspamd.initd
@@ -8,12 +8,13 @@ pidfile=${pidfile:-/run/rspamd/rspamd.pid}
 command=/usr/sbin/rspamd
 command_args="-u $user -g $group -c $cfgfile -p $pidfile"
 required_files="$cfgfile"
-extra_started_commands="reload"
+extra_started_commands="reload reopen"
 description_reload="Reload configuration"
+description_reopen="Reopen log files"
 
 depend() {
 	need localmount net
-	before exim postfix
+	before mta
 }
 
 start_pre() {
@@ -28,3 +29,9 @@ reload() {
 	start-stop-daemon --signal HUP --pidfile $pidfile
 	eend $?
 }
+
+reopen() {
+	ebegin "Reopening ${SVCNAME} log files"
+	start-stop-daemon --signal USR1 --pidfile $pidfile
+	eend $?
+}
diff --git a/testing/rspamd/rspamd.logrotated b/testing/rspamd/rspamd.logrotated
index 8a30971..45feb4b 100644
--- a/testing/rspamd/rspamd.logrotated
+++ b/testing/rspamd/rspamd.logrotated
@@ -6,6 +6,6 @@
     compress
     sharedscripts
     postrotate
-        /etc/init.d/rspamd --ifstarted reload
+        /etc/init.d/rspamd --ifstarted reopen
     endscript
 }
-- 
2.7.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20160215110946.3c05cb6e@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1454415678-2342-1-git-send-email-valery.kartel@gmail.com> (view parent)
Sender timestamp
1455530986
DKIM signature
missing
Download raw message
On Tue,  2 Feb 2016 14:21:18 +0200
Valery Kartel <valery.kartel@gmail.com> wrote:

> ---
>  testing/rspamd/APKBUILD          | 20 +++++++++++---------
>  testing/rspamd/rspamd.initd      | 11 +++++++++--
>  testing/rspamd/rspamd.logrotated |  2 +-
>  3 files changed, 21 insertions(+), 12 deletions(-)
> 
> diff --git a/testing/rspamd/APKBUILD b/testing/rspamd/APKBUILD
> index e31a569..5aad39c 100644
> --- a/testing/rspamd/APKBUILD
> +++ b/testing/rspamd/APKBUILD
> @@ -2,7 +2,7 @@
>  # Contributor: Valery Kartel <valery.kartel@gmail.com>
>  pkgname=rspamd
>  pkgver=1.1.2
> -pkgrel=0
> +pkgrel=1
>  pkgdesc="Rapid spam filtering system"
>  url="https://rspamd.com"
>  arch="all"
> @@ -11,7 +11,7 @@ pkgusers="rspamd"
>  pkggroups="rspamd"
>  depends=""
>  depends_dev=""
> -makedepends="$depends_dev cmake openssl-dev libevent-dev glib-dev gmime-dev
> +makedepends="$depends_dev cmake paxctl openssl-dev libevent-dev glib-dev gmime-dev
>  	luajit-dev sqlite-dev hiredis-dev file-dev pcre-dev"
>  install="$pkgname.pre-install"
>  subpackages="$pkgname-doc $pkgname-web $pkgname-client"
> @@ -57,7 +57,9 @@ package() {
>  	install -dm750 -g $pkggroups "$pkgdir"/var/log/$pkgname
>  
>  	mkdir "$pkgdir"/usr/sbin
> -	mv "$pkgdir"/usr/bin/rspamd-$pkgver "$pkgdir"/usr/sbin/rspamd
> +	mv "$pkgdir"/usr/bin/$pkgname-$pkgver "$pkgdir"/usr/sbin/$pkgname
> +	# rspamd needs mprotect off for now
> +	paxctl -c -m "$pkgdir"/usr/sbin/$pkgname

Would be nice with some explanation why mprotec needs to disabled. It
would also be nice if there could be some indication what needs to be
done or when we can keep mprotect on, since you say "for now".

>  	mv "$pkgdir"/usr/bin/rspamadm-$pkgver "$pkgdir"/usr/bin/rspamadm
>  
>  	mv "$pkgdir"/usr/share/examples "$pkgdir"/usr/share/doc
> @@ -83,22 +85,22 @@ client() {
>  }
>  
>  md5sums="19d43ecc16d6d7f89af50831055220d5  rspamd-1.1.2.tar.xz
> -3fd4d0e28cb01224a786c0498266e9a6  rspamd.logrotated
> -dba3145a52bee22d8ed1192dc44506ad  rspamd.initd
> +978ad5f8b6648041e9dbb53441eddf25  rspamd.logrotated
> +0656acc12dcce7cba232857a848d0390  rspamd.initd
>  ecfea2a25b95727ae91c04001fbd3e46  rspamd.confd
>  a5f0967b3d9aa319909af7e1bfe998e1  rspamd.conf
>  74e334227e9244c419abd605787c090e  rspamd.worker_normal
>  03bd84228945261e2242564f9bf5f1ca  rspamd.worker_controller"
>  sha256sums="211a0ff0c83d3ef4b586f59b0d3d6e12b9e10b2a2c72894c5f9116e649fb6d41  rspamd-1.1.2.tar.xz
> -cb02c8c041a0ace2e3c9e4fbf514038871b4444575c9022a75e661130db875fd  rspamd.logrotated
> -83acf26538826ce58039236660807cc87b9d4abc628fa6e2ddbb4201eac5424e  rspamd.initd
> +d45ff8bd8ab9767dd8376530a4ce6e68a46d5fcf3fd8d959d8f77f7370465e01  rspamd.logrotated
> +5bcf68a72e0582859799cd335a14d48914e5291f4087327b3b42562ef64e2958  rspamd.initd
>  82be6a663af2e2333b0dfbbbfd05a9ff3d02e05c7e506235b1b0dbd9d0b72972  rspamd.confd
>  5a223efb12e962e0f3bfe9f6d08336c6074b0b2930b8da6a22fe6582142ee40c  rspamd.conf
>  7805103a2e11cf816e99dba7d67fdc584ece33d9ea3ef95f95f4fce91a34eb90  rspamd.worker_normal
>  f50663096866b35095f7a6754e3cfb0bab518645d61646703715cf43da5adf77  rspamd.worker_controller"
>  sha512sums="78bbcd0130f3449b5e50f57049b1a0bca48bcfda808e08108c8dc2bfe2bb4a286b2d74084b8b9619299499105e3bf7085d086cc4cb929eb03e427c80aa49021c  rspamd-1.1.2.tar.xz
> -3b95882b1804d8dc6524a4c2cdf3f656b2f9bf5db6228b92d1acd539629070aead654c1f58937e1473e4f07340dc3de7b212f87b36143c5cb3fcb3b472a85f5a  rspamd.logrotated
> -12b2a92126f911e29d5ace836404ca8170bc19181f3b61896726b0dea79b03bc3b9295d876b96a633a3b4a963646cf7bebfbe10489ad24f373d81fd5a84f21b1  rspamd.initd
> +9af0f0250f3c9bda2aee26ca09b29dce17e05cc59c885265c94948cd45f35fbc8876dff6b889cc247b5af34819852d1a163ba769f52c3d648c830def79f1b74a  rspamd.logrotated
> +e240983c2fd91d8061b17e35e83a75c56ac2c3625dbe07b83a2e89e3dbf69b57c675d01772b93968aa6b22d150d54d366f2fb4a0c6551b3cfdedc77d82e28652  rspamd.initd
>  0b73b159cec9a4a1d337fbb429814f78da23b55f72c9fb8a777ab5f06634206a4f9b25e587f8dbfa7c3242ac5501ebcc90b9a0e926adfd37e14a12ac4607fa62  rspamd.confd
>  90885bd8f9fcd47590eedf8f1f058df7c492005fc09058e99ee490e1730f4961909850ecf9e98723bfbd3cbe8df705f86a0de931dedb25bc66b246674f537a72  rspamd.conf
>  ddf1af03878ed2f4b1e735ecd9f931f1941adf7b2085aa7a40f3ef303fa5c59791d0d7462064c2ac652af2722b83acd4379f549d341cb62767e74edefb69ba9a  rspamd.worker_normal
> diff --git a/testing/rspamd/rspamd.initd b/testing/rspamd/rspamd.initd
> index 0fd5b93..93148cc 100644
> --- a/testing/rspamd/rspamd.initd
> +++ b/testing/rspamd/rspamd.initd
> @@ -8,12 +8,13 @@ pidfile=${pidfile:-/run/rspamd/rspamd.pid}
>  command=/usr/sbin/rspamd
>  command_args="-u $user -g $group -c $cfgfile -p $pidfile"
>  required_files="$cfgfile"
> -extra_started_commands="reload"
> +extra_started_commands="reload reopen"
>  description_reload="Reload configuration"
> +description_reopen="Reopen log files"
>  
>  depend() {
>  	need localmount net
> -	before exim postfix
> +	before mta
>  }
>  
>  start_pre() {
> @@ -28,3 +29,9 @@ reload() {
>  	start-stop-daemon --signal HUP --pidfile $pidfile
>  	eend $?
>  }
> +
> +reopen() {
> +	ebegin "Reopening ${SVCNAME} log files"
> +	start-stop-daemon --signal USR1 --pidfile $pidfile
> +	eend $?
> +}
> diff --git a/testing/rspamd/rspamd.logrotated b/testing/rspamd/rspamd.logrotated
> index 8a30971..45feb4b 100644
> --- a/testing/rspamd/rspamd.logrotated
> +++ b/testing/rspamd/rspamd.logrotated
> @@ -6,6 +6,6 @@
>      compress
>      sharedscripts
>      postrotate
> -        /etc/init.d/rspamd --ifstarted reload
> +        /etc/init.d/rspamd --ifstarted reopen
>      endscript
>  }



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---