diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 27 | ||||
| -rw-r--r-- | caddy-systemd-service.patch | 15 |
3 files changed, 45 insertions, 11 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Sep 29 09:37:47 UTC 2016 +# Thu Sep 29 12:04:13 UTC 2016 pkgbase = caddy-full-bin pkgdesc = A configurable, general-purpose HTTP/2 web server for any platform (All features enabled) pkgver = 0.9.3 - pkgrel = 1 + pkgrel = 2 url = https://caddyserver.com install = caddy-full-bin.install arch = i686 @@ -11,18 +11,28 @@ pkgbase = caddy-full-bin arch = armv7h arch = aarch64 license = Apache + depends = systemd>=229 + depends = patch provides = caddy conflicts = caddy conflicts = caddy-git conflicts = caddy-all-features source_i686 = caddy.tar.gz::https://caddyserver.com/download/build?os=linux&features=awslambda,cors,filemanager,git,hugo,ipfilter,jwt,locale,mailout,minify,multipass,prometheus,ratelimit,realip,search,upload,cloudflare,digitalocean,dnsimple,dyn,gandi,googlecloud,namecheap,rfc2136,route53,vultr&arch=386 + source_i686 = caddy-systemd-service.patch md5sums_i686 = SKIP + md5sums_i686 = 61c39378589e5c59314e7a157fbf9a53 source_x86_64 = caddy.tar.gz::https://caddyserver.com/download/build?os=linux&features=awslambda,cors,filemanager,git,hugo,ipfilter,jwt,locale,mailout,minify,multipass,prometheus,ratelimit,realip,search,upload,cloudflare,digitalocean,dnsimple,dyn,gandi,googlecloud,namecheap,rfc2136,route53,vultr&arch=amd64 + source_x86_64 = caddy-systemd-service.patch md5sums_x86_64 = SKIP + md5sums_x86_64 = 61c39378589e5c59314e7a157fbf9a53 source_armv7h = caddy.tar.gz::https://caddyserver.com/download/build?os=linux&features=awslambda,cors,filemanager,git,hugo,ipfilter,jwt,locale,mailout,minify,multipass,prometheus,ratelimit,realip,search,upload,cloudflare,digitalocean,dnsimple,dyn,gandi,googlecloud,namecheap,rfc2136,route53,vultr&arch=arm + source_armv7h = caddy-systemd-service.patch md5sums_armv7h = SKIP + md5sums_armv7h = 61c39378589e5c59314e7a157fbf9a53 source_aarch64 = caddy.tar.gz::https://caddyserver.com/download/build?os=linux&features=awslambda,cors,filemanager,git,hugo,ipfilter,jwt,locale,mailout,minify,multipass,prometheus,ratelimit,realip,search,upload,cloudflare,digitalocean,dnsimple,dyn,gandi,googlecloud,namecheap,rfc2136,route53,vultr&arch=arm64 + source_aarch64 = caddy-systemd-service.patch md5sums_aarch64 = SKIP + md5sums_aarch64 = 61c39378589e5c59314e7a157fbf9a53 pkgname = caddy-full-bin @@ -9,17 +9,22 @@ _features=('awslambda' 'cors' 'filemanager' 'git' 'hugo' 'ipfilter' 'jwt' 'local pkgname=caddy-full-bin _realname=caddy pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="A configurable, general-purpose HTTP/2 web server for any platform (All features enabled)" arch=('i686' 'x86_64' 'armv7h' 'aarch64') url="https://caddyserver.com" license=('Apache') provides=('caddy') conflicts=('caddy' 'caddy-git' 'caddy-all-features') -md5sums_i686=('SKIP') -md5sums_x86_64=('SKIP') -md5sums_armv7h=('SKIP') -md5sums_aarch64=('SKIP') +depends=('systemd>=229' 'patch') +md5sums_i686=('SKIP' + '61c39378589e5c59314e7a157fbf9a53') +md5sums_x86_64=('SKIP' + '61c39378589e5c59314e7a157fbf9a53') +md5sums_armv7h=('SKIP' + '61c39378589e5c59314e7a157fbf9a53') +md5sums_aarch64=('SKIP' + '61c39378589e5c59314e7a157fbf9a53') install='caddy-full-bin.install' # expand the feature array @@ -28,10 +33,14 @@ printf -v _features '%s,' "${_features[@]}" _features=${_features%,} _url_prefix="https://caddyserver.com/download/build?os=linux&features=${_features}" -source_i686=("caddy.tar.gz::${_url_prefix}&arch=386") -source_x86_64=("caddy.tar.gz::${_url_prefix}&arch=amd64") -source_armv7h=("caddy.tar.gz::${_url_prefix}&arch=arm") -source_aarch64=("caddy.tar.gz::${_url_prefix}&arch=arm64") +source_i686=("caddy.tar.gz::${_url_prefix}&arch=386" "caddy-systemd-service.patch") +source_x86_64=("caddy.tar.gz::${_url_prefix}&arch=amd64" "caddy-systemd-service.patch") +source_armv7h=("caddy.tar.gz::${_url_prefix}&arch=arm" "caddy-systemd-service.patch") +source_aarch64=("caddy.tar.gz::${_url_prefix}&arch=arm64" "caddy-systemd-service.patch") + +prepare() { + patch -p0 -i caddy-systemd-service.patch +} package() { echo "Migration guide for caddy <0.9: https://github.com/klingtnet/caddy-AUR/blob/master/README.md" diff --git a/caddy-systemd-service.patch b/caddy-systemd-service.patch new file mode 100644 index 000000000000..779703c9247d --- /dev/null +++ b/caddy-systemd-service.patch @@ -0,0 +1,15 @@ +--- init/linux-systemd/caddy.service 2016-09-28 21:07:57.000000000 +0200 ++++ init/linux-systemd/caddy.service.patched 2016-09-29 13:51:35.533691718 +0200 +@@ -38,9 +38,9 @@ + ; The following additional security directives only work with systemd v229 or later. + ; They further retrict privileges that can be gained by caddy. Uncomment if you like. + ; Note that you may have to add capabilities required by any plugins in use. +-;CapabilityBoundingSet=CAP_NET_BIND_SERVICE +-;AmbientCapabilities=CAP_NET_BIND_SERVICE +-;NoNewPrivileges=true ++CapabilityBoundingSet=CAP_NET_BIND_SERVICE ++AmbientCapabilities=CAP_NET_BIND_SERVICE ++NoNewPrivileges=true + + [Install] + WantedBy=multi-user.target |