From 944def3e45ffbdec8302e30ac4ae8627b6105519 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 4 Dec 2019 18:33:34 -0600 Subject: [PATCH] beanstalkd: update to 1.11 Updated to 1.11 and some template cleanup Signed-off-by: Nathan Owens --- srcpkgs/beanstalkd/files/beanstalkd/run | 2 +- srcpkgs/beanstalkd/template | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/srcpkgs/beanstalkd/files/beanstalkd/run b/srcpkgs/beanstalkd/files/beanstalkd/run index 48134184bf3..dfba751acc8 100755 --- a/srcpkgs/beanstalkd/files/beanstalkd/run +++ b/srcpkgs/beanstalkd/files/beanstalkd/run @@ -1,4 +1,4 @@ #!/bin/sh # By default use persistent storage (binary log) [ -r conf ] && . ./conf -exec chpst -u beanstalkd:beanstalkd beanstalkd ${OPTS:=-b /var/lib/beanstalkd} 2>&1 +exec chpst -u _beanstalkd:_beanstalkd beanstalkd ${OPTS:=-b /var/lib/beanstalkd} 2>&1 diff --git a/srcpkgs/beanstalkd/template b/srcpkgs/beanstalkd/template index 34c65389883..b903b3582ae 100644 --- a/srcpkgs/beanstalkd/template +++ b/srcpkgs/beanstalkd/template @@ -1,27 +1,29 @@ # Template file for 'beanstalkd' pkgname=beanstalkd -version=1.10 -revision=4 +version=1.11 +revision=1 +build_style=gnu-makefile short_desc="Simple, fast, general-purpose work queue" maintainer="bougyman " license="MIT" homepage="http://kr.github.io/beanstalkd/" distfiles="https://github.com/kr/beanstalkd/archive/v${version}.tar.gz" -checksum=923b1e195e168c2a91adcc75371231c26dcf23868ed3e0403cd4b1d662a52d59 -system_accounts="beanstalkd" +checksum=5e3414e49d00e9ef9530897983e56bdba98da6f8f1f30f5fe7e6064b2f68c544 +system_accounts="_beanstalkd" replaces="beanstalk>=0" -make_dirs="/var/lib/beanstalkd 755 beanstalkd beanstalkd" +make_dirs="/var/lib/beanstalkd 755 _beanstalkd _beanstalkd" -do_build() { +CFLAGS="-Wno-error" + +pre_build() { sed -i 's,sys/fcntl.h,fcntl.h,' sd-daemon.c - make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs} + vsed -i 's,override,,g' Makefile } -do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install +post_install() { vman doc/beanstalkd.1 - vdoc README + vdoc README.md README vdoc doc/protocol.txt vlicense LICENSE vsv beanstalkd