Valery Kartel: 1 testing/rspamd: upgrade to 1.1.3 3 files changed, 21 insertions(+), 22 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/2295/mbox | git am -3Learn more about email & git
This patch include all changes I made in previous commits
Natanael Copa <ncopa@alpinelinux.org>I don't want commit this patch with this commit message. Because it will be recorded in git log forever, but your 2 other commits will not. So think 1 year in the future when someone wants to know why something was done the way it is, and he sees the text: "include all changes I made in my previous commits". What will he think about that? So remember: The git commit message is for the git history. If you want say something for the developers on this mailing list, write that below the '---'
- remove unneeded contrib - improved init and logrotate - do not include paxctl, beause it does not work well on -grsec even with mprotect is off ---
Natanael Copa <ncopa@alpinelinux.org>^^^ The stuff that you write under the '---' will not be recorded in the git history and is intended for the readers of the mailing list. -nc PS. maybe it might be an idea to read a book about git or similar?
testing/rspamd/APKBUILD | 32 ++++++++++++-------------------- testing/rspamd/rspamd.initd | 9 ++++++++- testing/rspamd/rspamd.logrotated | 2 +- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/testing/rspamd/APKBUILD b/testing/rspamd/APKBUILD index 51b2d6f..d493937 100644 --- a/testing/rspamd/APKBUILD +++ b/testing/rspamd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Valery Kartel <valery.kartel@gmail.com> # Contributor: Valery Kartel <valery.kartel@gmail.com> pkgname=rspamd -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=0 pkgdesc="Rapid spam filtering system" url="https://rspamd.com" @@ -14,7 +14,7 @@ depends_dev="" makedepends="$depends_dev cmake 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 $pkgname-contrib" +subpackages="$pkgname-doc $pkgname-web $pkgname-client" source="https://rspamd.com/downloads/$pkgname-$pkgver.tar.xz $pkgname.logrotated $pkgname.initd @@ -53,7 +53,7 @@ package() { 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 + install -dm750 -o $pkgusers -g $pkggroups "$pkgdir"/var/lib/$pkgname/rspamd_dynamic install -dm750 -g $pkggroups "$pkgdir"/var/log/$pkgname mkdir "$pkgdir"/usr/sbin @@ -82,31 +82,23 @@ client() { mv "$pkgdir"/usr/bin/rspamc-$pkgver "$subpkgdir"/usr/bin/rspamc } -contrib() { - arch="noarch" - pkgdesc="Some useful stuff to deploying rspamd to another apps" - mkdir -p "$subpkgdir"/usr/share/$pkgname/contrib - # Exim specific stuff - cp -r "$_builddir"/contrib/exim "$subpkgdir"/usr/share/$pkgname/contrib/ -} - -md5sums="c68e7ad75c302bf910ba76b27d04e238 rspamd-1.1.1.tar.xz -3fd4d0e28cb01224a786c0498266e9a6 rspamd.logrotated -dba3145a52bee22d8ed1192dc44506ad rspamd.initd +md5sums="15ed349ab1cd852301a0040ac400970a rspamd-1.1.3.tar.xz +978ad5f8b6648041e9dbb53441eddf25 rspamd.logrotated +3f32a16e76e1461ffba9231cfb1e3d17 rspamd.initd ecfea2a25b95727ae91c04001fbd3e46 rspamd.confd a5f0967b3d9aa319909af7e1bfe998e1 rspamd.conf 74e334227e9244c419abd605787c090e rspamd.worker_normal 03bd84228945261e2242564f9bf5f1ca rspamd.worker_controller" -sha256sums="3c4bda66b533861a84d82ea26bd7c19ccd1b1befe8b3e33a0fc211c036569a06 rspamd-1.1.1.tar.xz -cb02c8c041a0ace2e3c9e4fbf514038871b4444575c9022a75e661130db875fd rspamd.logrotated -83acf26538826ce58039236660807cc87b9d4abc628fa6e2ddbb4201eac5424e rspamd.initd +sha256sums="8604e980a81d6586d18d02f90236c83384754ef1debce0b4f0ca32f87e1ec135 rspamd-1.1.3.tar.xz +d45ff8bd8ab9767dd8376530a4ce6e68a46d5fcf3fd8d959d8f77f7370465e01 rspamd.logrotated +6b531f95724b2a3990524ab09b7304ce4e811b6e082dfdbe633f201a6bc7eee3 rspamd.initd 82be6a663af2e2333b0dfbbbfd05a9ff3d02e05c7e506235b1b0dbd9d0b72972 rspamd.confd 5a223efb12e962e0f3bfe9f6d08336c6074b0b2930b8da6a22fe6582142ee40c rspamd.conf 7805103a2e11cf816e99dba7d67fdc584ece33d9ea3ef95f95f4fce91a34eb90 rspamd.worker_normal f50663096866b35095f7a6754e3cfb0bab518645d61646703715cf43da5adf77 rspamd.worker_controller" -sha512sums="c971000f9e6c09ae8c4a175fcd96471efa3f5e73689b038a45cc2212dcf296babfd4000fa41f0451b2fdd989e00192cbb234a73cef026c16466bfe78b04b5385 rspamd-1.1.1.tar.xz -3b95882b1804d8dc6524a4c2cdf3f656b2f9bf5db6228b92d1acd539629070aead654c1f58937e1473e4f07340dc3de7b212f87b36143c5cb3fcb3b472a85f5a rspamd.logrotated -12b2a92126f911e29d5ace836404ca8170bc19181f3b61896726b0dea79b03bc3b9295d876b96a633a3b4a963646cf7bebfbe10489ad24f373d81fd5a84f21b1 rspamd.initd +sha512sums="42152dd64f6265e3a17d6d53b041ded3b4a262e4d63237bc11e21dca96a4946334ab33c13fffa779b95717ed48629a9cc7a79f1af897d4dd3a831f7c121061ed rspamd-1.1.3.tar.xz +9af0f0250f3c9bda2aee26ca09b29dce17e05cc59c885265c94948cd45f35fbc8876dff6b889cc247b5af34819852d1a163ba769f52c3d648c830def79f1b74a rspamd.logrotated +30b45812ef68f2b82d0d7f370b44bec52691296c7349c96c8273342eb4f9b5708c13ad97b13f63d81bee588b4e459c0da3092a62adff9e5b8938f44546df3dcd 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..a20f784 100644 --- a/testing/rspamd/rspamd.initd +++ b/testing/rspamd/rspamd.initd @@ -8,8 +8,9 @@ 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 @@ -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 $? +} \ No newline at end of file diff --git a/testing/rspamd/rspamd.logrotated b/testing/rspamd/rspamd.logrotated index 8a30971..2a443f2 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 --quiet reopen endscript }
Natanael Copa <ncopa@alpinelinux.org>--- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
-- 2.7.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---