Date: Thursday, February 24, 2022 @ 07:05:19 Author: grawlinson Revision: 1136336
archrelease: copy trunk to community-x86_64 Added: charm/repos/community-x86_64/PKGBUILD (from rev 1136335, charm/trunk/PKGBUILD) charm/repos/community-x86_64/charm.conf (from rev 1136335, charm/trunk/charm.conf) charm/repos/community-x86_64/systemd.service (from rev 1136335, charm/trunk/systemd.service) charm/repos/community-x86_64/sysusers.conf (from rev 1136335, charm/trunk/sysusers.conf) charm/repos/community-x86_64/tmpfiles.conf (from rev 1136335, charm/trunk/tmpfiles.conf) Deleted: charm/repos/community-x86_64/PKGBUILD charm/repos/community-x86_64/charm.conf charm/repos/community-x86_64/systemd.service charm/repos/community-x86_64/sysusers.conf charm/repos/community-x86_64/tmpfiles.conf -----------------+ PKGBUILD | 196 +++++++++++++++++++++++++++--------------------------- charm.conf | 18 ++-- systemd.service | 92 ++++++++++++------------- sysusers.conf | 2 tmpfiles.conf | 2 5 files changed, 155 insertions(+), 155 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-02-24 07:04:16 UTC (rev 1136335) +++ PKGBUILD 2022-02-24 07:05:19 UTC (rev 1136336) @@ -1,98 +0,0 @@ -# Maintainer: George Rawlinson <grawlin...@archlinux.org> -# Contributor: Christian Muehlhaeuser <muesli at gmail dot com> - -pkgname=charm -pkgver=0.10.1 -pkgrel=1 -pkgdesc="The backend for the Charm cloud" -arch=('x86_64') -url="https://github.com/charmbracelet/charm" -license=('MIT') -depends=('glibc') -makedepends=('git' 'go') -conflicts=('charm-tool') -replaces=('charm-tool') -backup=('etc/charm.conf') -options=('!lto') -_commit='989596b4e1790d2f7a8d3d80d42d3b4549f74064' # v0.10.1 -source=( - "git+$url.git#commit=$_commit" - 'charm.conf' - 'systemd.service' - 'sysusers.conf' - 'tmpfiles.conf' -) -b2sums=('SKIP' - 'c6414097223dde827dfcbaf500d29c45843b3b0a08600a3a69c7d4ec9781675f7b677cc9bc59f88c6c3734a8ee349ee589e5d2070a3aa6afa35f4825766270e6' - 'ad16df43405a2969abfaf3e6f4cd6edcb2a29661a8a27bbaa13b34d3febb979356538340940383d5c737b9bd4fa434920395ea4e960951660073f8d31d225dac' - 'b6b509de048f1d63d3d08dda04f3e5743fc212ec44f4a7a83a98a429f9a8fdf01194b83aba7588d02b5712f9bef3efcface1197d3ca458aee5d1be955f6782cd' - '2eee2c889e4efe83a534249c7048340b67819d81096a0fd7a23522d2eda46b833709eab1a0359538fdfbe27dbe4154c9d235535374e27c441dc7c030277f7218') - -pkgver() { - cd charm - - git describe --tags | sed 's/^v//' -} -prepare() { - cd charm - - # create directory for build output - mkdir build - - # download dependencies - go mod download -} - -build() { - cd charm - - # set Go flags - export CGO_CPPFLAGS="${CPPFLAGS}" - export CGO_CFLAGS="${CFLAGS}" - export CGO_CXXFLAGS="${CXXFLAGS}" - - go build -v \ - -trimpath \ - -buildmode=pie \ - -mod=readonly \ - -modcacherw \ - -ldflags "-linkmode external -extldflags $LDFLAGS \ - -X main.Version=$pkgver \ - -X main.CommitSHA=$_commit" \ - -o build \ - . - - # generate shell completion - for shell in bash fish zsh; do - ./build/charm completion "$shell" > "build/$shell.completion" - done -} - -check() { - cd charm - - go test -v ./... -} - -package() { - # systemd integration - install -vDm644 systemd.service "$pkgdir/usr/lib/systemd/system/charm.service" - install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/charm.conf" - install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/charm.conf" - install -vDm644 charm.conf "$pkgdir/etc/charm.conf" - - cd charm - - # binary - install -vDm755 -t "$pkgdir/usr/bin" build/charm - - # shell completion - install -vDm644 build/bash.completion "$pkgdir/usr/share/bash-completion/completions/charm" - install -vDm644 build/fish.completion "$pkgdir/usr/share/fish/vendor_completions.d/charm.fish" - install -vDm644 build/zsh.completion "$pkgdir/usr/share/zsh/site-functions/_charm" - - # license - install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE -} - -# vim:set ts=2 sw=2 et: Copied: charm/repos/community-x86_64/PKGBUILD (from rev 1136335, charm/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-02-24 07:05:19 UTC (rev 1136336) @@ -0,0 +1,98 @@ +# Maintainer: George Rawlinson <grawlin...@archlinux.org> +# Contributor: Christian Muehlhaeuser <muesli at gmail dot com> + +pkgname=charm +pkgver=0.10.2 +pkgrel=1 +pkgdesc="The backend for the Charm cloud" +arch=('x86_64') +url="https://charm.sh/cloud/" +license=('MIT') +depends=('glibc') +makedepends=('git' 'go') +conflicts=('charm-tool') +replaces=('charm-tool') +backup=('etc/charm.conf') +options=('!lto') +_commit='cc81bc58299b77c23e7eabfd422ac4da448c48a8' # v0.10.2 +source=( + "git+https://github.com/charmbracelet/charm.git#commit=$_commit" + 'charm.conf' + 'systemd.service' + 'sysusers.conf' + 'tmpfiles.conf' +) +b2sums=('SKIP' + 'c6414097223dde827dfcbaf500d29c45843b3b0a08600a3a69c7d4ec9781675f7b677cc9bc59f88c6c3734a8ee349ee589e5d2070a3aa6afa35f4825766270e6' + 'ad16df43405a2969abfaf3e6f4cd6edcb2a29661a8a27bbaa13b34d3febb979356538340940383d5c737b9bd4fa434920395ea4e960951660073f8d31d225dac' + 'b6b509de048f1d63d3d08dda04f3e5743fc212ec44f4a7a83a98a429f9a8fdf01194b83aba7588d02b5712f9bef3efcface1197d3ca458aee5d1be955f6782cd' + '2eee2c889e4efe83a534249c7048340b67819d81096a0fd7a23522d2eda46b833709eab1a0359538fdfbe27dbe4154c9d235535374e27c441dc7c030277f7218') + +pkgver() { + cd charm + + git describe --tags | sed 's/^v//' +} +prepare() { + cd charm + + # create directory for build output + mkdir build + + # download dependencies + go mod download +} + +build() { + cd charm + + # set Go flags + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + + go build -v \ + -trimpath \ + -buildmode=pie \ + -mod=readonly \ + -modcacherw \ + -ldflags "-linkmode external -extldflags $LDFLAGS \ + -X main.Version=$pkgver \ + -X main.CommitSHA=$_commit" \ + -o build \ + . + + # generate shell completion + for shell in bash fish zsh; do + ./build/charm completion "$shell" > "build/$shell.completion" + done +} + +check() { + cd charm + + go test -v ./... +} + +package() { + # systemd integration + install -vDm644 systemd.service "$pkgdir/usr/lib/systemd/system/charm.service" + install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/charm.conf" + install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/charm.conf" + install -vDm644 charm.conf "$pkgdir/etc/charm.conf" + + cd charm + + # binary + install -vDm755 -t "$pkgdir/usr/bin" build/charm + + # shell completion + install -vDm644 build/bash.completion "$pkgdir/usr/share/bash-completion/completions/charm" + install -vDm644 build/fish.completion "$pkgdir/usr/share/fish/vendor_completions.d/charm.fish" + install -vDm644 build/zsh.completion "$pkgdir/usr/share/zsh/site-functions/_charm" + + # license + install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE +} + +# vim:set ts=2 sw=2 et: Deleted: charm.conf =================================================================== --- charm.conf 2022-02-24 07:04:16 UTC (rev 1136335) +++ charm.conf 2022-02-24 07:05:19 UTC (rev 1136336) @@ -1,9 +0,0 @@ -#CHARM_SERVER_HOST="localhost" -#CHARM_SERVER_SSH_PORT="35353" -#CHARM_SERVER_HTTP_PORT=35354" -#CHARM_SERVER_HTTP_SCHEME="http" -#CHARM_SERVER_STATS_PORT="35355" -#CHARM_SERVER_HEALTH_PORT="35356" -CHARM_SERVER_DATA_DIR="/var/lib/charm" -#CHARM_SERVER_TLS_KEY_FILE="" -#CHARM_SERVER_TLS_CERT_FILE="" Copied: charm/repos/community-x86_64/charm.conf (from rev 1136335, charm/trunk/charm.conf) =================================================================== --- charm.conf (rev 0) +++ charm.conf 2022-02-24 07:05:19 UTC (rev 1136336) @@ -0,0 +1,9 @@ +#CHARM_SERVER_HOST="localhost" +#CHARM_SERVER_SSH_PORT="35353" +#CHARM_SERVER_HTTP_PORT=35354" +#CHARM_SERVER_HTTP_SCHEME="http" +#CHARM_SERVER_STATS_PORT="35355" +#CHARM_SERVER_HEALTH_PORT="35356" +CHARM_SERVER_DATA_DIR="/var/lib/charm" +#CHARM_SERVER_TLS_KEY_FILE="" +#CHARM_SERVER_TLS_CERT_FILE="" Deleted: systemd.service =================================================================== --- systemd.service 2022-02-24 07:04:16 UTC (rev 1136335) +++ systemd.service 2022-02-24 07:05:19 UTC (rev 1136336) @@ -1,46 +0,0 @@ -[Unit] -Description=The mystical Charm Cloud 🌟 -Documentation=https://github.com/charmbracelet/charm -Requires=network-online.target -After=network-online.target - -[Service] -Type=simple -User=charm -Group=charm -Restart=always -RestartSec=1 -ExecStart=/usr/bin/charm serve -EnvironmentFile=-/etc/charm.conf - -# Hardening -ReadWritePaths=/var/lib/charm -UMask=0027 -NoNewPrivileges=true -LimitNOFILE=1048576 -ProtectSystem=strict -ProtectHome=true -PrivateUsers=yes -PrivateTmp=true -PrivateDevices=true -ProtectHostname=true -ProtectClock=true -ProtectKernelTunables=true -ProtectKernelModules=true -ProtectKernelLogs=true -ProtectControlGroups=true -RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 -RestrictNamespaces=true -LockPersonality=true -MemoryDenyWriteExecute=true -RestrictRealtime=true -RestrictSUIDSGID=true -RemoveIPC=true -CapabilityBoundingSet= -AmbientCapabilities= -SystemCallFilter=@system-service -SystemCallFilter=~@privileged @resources -SystemCallArchitectures=native - -[Install] -WantedBy=multi-user.target Copied: charm/repos/community-x86_64/systemd.service (from rev 1136335, charm/trunk/systemd.service) =================================================================== --- systemd.service (rev 0) +++ systemd.service 2022-02-24 07:05:19 UTC (rev 1136336) @@ -0,0 +1,46 @@ +[Unit] +Description=The mystical Charm Cloud 🌟 +Documentation=https://github.com/charmbracelet/charm +Requires=network-online.target +After=network-online.target + +[Service] +Type=simple +User=charm +Group=charm +Restart=always +RestartSec=1 +ExecStart=/usr/bin/charm serve +EnvironmentFile=-/etc/charm.conf + +# Hardening +ReadWritePaths=/var/lib/charm +UMask=0027 +NoNewPrivileges=true +LimitNOFILE=1048576 +ProtectSystem=strict +ProtectHome=true +PrivateUsers=yes +PrivateTmp=true +PrivateDevices=true +ProtectHostname=true +ProtectClock=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 +RestrictNamespaces=true +LockPersonality=true +MemoryDenyWriteExecute=true +RestrictRealtime=true +RestrictSUIDSGID=true +RemoveIPC=true +CapabilityBoundingSet= +AmbientCapabilities= +SystemCallFilter=@system-service +SystemCallFilter=~@privileged @resources +SystemCallArchitectures=native + +[Install] +WantedBy=multi-user.target Deleted: sysusers.conf =================================================================== --- sysusers.conf 2022-02-24 07:04:16 UTC (rev 1136335) +++ sysusers.conf 2022-02-24 07:05:19 UTC (rev 1136336) @@ -1 +0,0 @@ -u charm - "Charm Cloud daemon user" /var/lib/charm Copied: charm/repos/community-x86_64/sysusers.conf (from rev 1136335, charm/trunk/sysusers.conf) =================================================================== --- sysusers.conf (rev 0) +++ sysusers.conf 2022-02-24 07:05:19 UTC (rev 1136336) @@ -0,0 +1 @@ +u charm - "Charm Cloud daemon user" /var/lib/charm Deleted: tmpfiles.conf =================================================================== --- tmpfiles.conf 2022-02-24 07:04:16 UTC (rev 1136335) +++ tmpfiles.conf 2022-02-24 07:05:19 UTC (rev 1136336) @@ -1 +0,0 @@ -d /var/lib/charm 0750 charm charm Copied: charm/repos/community-x86_64/tmpfiles.conf (from rev 1136335, charm/trunk/tmpfiles.conf) =================================================================== --- tmpfiles.conf (rev 0) +++ tmpfiles.conf 2022-02-24 07:05:19 UTC (rev 1136336) @@ -0,0 +1 @@ +d /var/lib/charm 0750 charm charm