[arch-commits] Commit in umurmur/trunk (4 files)
David Runge
dvzrv at archlinux.org
Wed Feb 24 15:00:08 UTC 2021
Date: Wednesday, February 24, 2021 @ 15:00:08
Author: dvzrv
Revision: 871504
upgpkg: umurmur 0.2.19-1: Upgrade to 2.0.19.
Remove previously upstreamed patch.
Add patch offered to upstream to install the configuration file to
a namespaced location by default.
Ensure that the configuration directory has a restrictive file mode,
so that certificate files are guarded by default.
Remove unnecessary flags from the call to umurmurd in the service file.
Fix ReadWritePaths setup in the service file.
Modified:
umurmur/trunk/PKGBUILD
umurmur/trunk/umurmur.service
umurmur/trunk/umurmur.tmpfiles
Deleted:
umurmur/trunk/umurmur-0.2.18-cmake.patch
----------------------------+
PKGBUILD | 27 ++++++++++++++-------------
umurmur-0.2.18-cmake.patch | 26 --------------------------
umurmur.service | 8 ++++----
umurmur.tmpfiles | 1 +
4 files changed, 19 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-24 15:00:03 UTC (rev 871503)
+++ PKGBUILD 2021-02-24 15:00:08 UTC (rev 871504)
@@ -5,7 +5,7 @@
# Contributor: xav <xav at ethertricks dot net>
pkgname=umurmur
-pkgver=0.2.18
+pkgver=0.2.19
pkgrel=1
pkgdesc='Minimalistic Mumble server'
url="https://github.com/umurmur/umurmur"
@@ -15,26 +15,26 @@
makedepends=('cmake' 'libconfig' 'protobuf-c')
backup=('etc/umurmur/umurmur.conf')
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/umurmur/umurmur/archive/${pkgver}.tar.gz
- "${pkgname}-0.2.18-cmake.patch"
+ "${pkgname}-0.2.19-config_location.patch::https://github.com/dvzrv/umurmur/commit/4f3ed41357bb6fcb7afddd5343b59cfef54d65a4.patch"
umurmur.sysusers
umurmur.service
umurmur.tmpfiles)
-sha512sums=('bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656'
- 'b3f0a6c7d7cfe94e6ffceed832b8bcdda256e27f350abf80697d81ba154cd529a8b54fb8dac05273886e75d137ebcd71b4c9c06fdb7d0f45f1345a7cf9418b3f'
+sha512sums=('4a10c41d8396d6bd2b195578ff6a29e69a105f8830daf85141217f768cc2c4ea6204a2b3b65599d07d76c841090750db4ad6264c4e9d7e5afa7f1b4cf27bc768'
+ 'f18b5509e28b79ca7cc81425466fe9a483a3a644109e5bcb4aa01117649a0da355bc34cbf70610914d0b46092e3b0904f3b52a46f7363e51dc68a2a7cf37fef9'
'd84950a32ab8a2e84f5fe333cd2894e52aba624531644d106c982aa4ff04271d318543398fa7f48c719f26338679fa971bb5332472e9040ac9aa8a9b4a1f2832'
- '1e4c7c41fdcc37aa681080ee6f0bb617e7d7245d23e07b586807b2fcb3c04f4d5109e6fad50ec43738007f57e9585b5622f112be3b0def155b5ac144f88930a7'
- '825b50448231b5d791e87d7c4c471fdfe2e9a1560dad6fc90c2f4f8d0c5ed682291bf20b147a6a8c7ae361aeb8b1a11c24c6d41ffc17f06fb0f5ccd8208a899a')
-b2sums=('45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2'
- 'ff64c6179ebd6a21e3d51acef36c23955a4a1fcc1a9794686f8a0a447ec36f7c8b490c0ba553971bb76fbf77bda0600ddb4acf0163fa492d6e1dc75d29ba059d'
+ '0d34548ce1d1b3bc240664f5538d8b7dc31969731ef6ce04c99c9fab011e1d946eb5d5e91b14d66242d4a4955936f08752de9dd9ac7244886a53628079e8cfac'
+ 'b49b65a1e87cba9d8b453dee23f9f1e89d9eeb326e9ce98a32605ac62f72d36c1efbca70ed1a87efe9294ef137d3f673429cd70b5051e03e0e85db310943c39e')
+b2sums=('54d6fe6e67f51f24d6c9f0125fa330292004cd5df71791c40ece6aa7c2938bce98ca981e873a1e2b43598f99ea57c687963fd7cd8708400f5f2ce00ab11386eb'
+ '77784dbc65eb7b5e238ae0888387f88d5c26d0402e5d6b6fd03e312339d68be05945c9ddf934a15a2c0643f685a01a7bbc12931e574b2adbf3a4422329a18101'
'549dda6277c3758d221a259d08d3f91658d7615b0c06ebf2af6f3966fd798ce6228ff9ccb653daeb1d2b592e029e96e756df779ad0d4a809e224f2071e5d76cc'
- 'a4be46591c2e5315826708587a8e9f9416e8ce91580457b0a9fc36dc3749eeb5737a9e1ebc47387c160e1de897ab940c3badaeb03f06f542c4f76536df1d5590'
- '355eb00fc390ff200c96ef179f2f8cab4b4a5aeca3db0781556b567de44996562f12f7cc69225159e8b1cdb26b0bacf38c7776cdc553bbe0745eb0228219df4c')
+ '82783532ec4c21bdd8484175b8eeba53a593c86a92e11d441ee2f92410df90fab132a9bf7d5de24af48ed42eec57ece97b5399545094558d73a370827bbe4118'
+ '935f8ea09c8cbb32dc508959181b707bfadd564c038b2c7a4ce213372242cdefaf75c7f3d76644f28246b666c93a0d89c5b4741f12f63261f19b99d8c0603219')
prepare() {
cd ${pkgname}-${pkgver}
- # fix config install directory
- # https://github.com/umurmur/umurmur/pull/164
- patch -Np1 -i "../${pkgname}-0.2.18-cmake.patch"
+ # install configuration file to a namespaced location and make it the default
+ # for the application as well: https://github.com/umurmur/umurmur/pull/170
+ patch -Np1 -i ../"${pkgname}-0.2.19-config_location.patch"
}
build() {
@@ -53,6 +53,7 @@
depends+=('libconfig.so' 'libprotobuf-c.so')
cd ${pkgname}-${pkgver}
make VERBOSE=1 DESTDIR="${pkgdir}" install -C build
+ install -vdm 750 "${pkgdir}/etc/${pkgname}"
install -vDm 644 "${srcdir}/umurmur.service" -t "${pkgdir}/usr/lib/systemd/system"
install -vDm 644 "${srcdir}/umurmur.sysusers" "${pkgdir}/usr/lib/sysusers.d/umurmur.conf"
install -vDm 644 "${srcdir}/umurmur.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/umurmur.conf"
Deleted: umurmur-0.2.18-cmake.patch
===================================================================
--- umurmur-0.2.18-cmake.patch 2021-02-24 15:00:03 UTC (rev 871503)
+++ umurmur-0.2.18-cmake.patch 2021-02-24 15:00:08 UTC (rev 871504)
@@ -1,26 +0,0 @@
-diff -ruN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2020-12-31 09:56:25.000000000 +0100
-+++ b/CMakeLists.txt 2021-01-07 17:29:04.152477922 +0100
-@@ -18,15 +18,16 @@
-
- include(Options)
- include(Tools)
-+include(GNUInstallDirs)
-
- find_package(Libconfig REQUIRED)
- find_package(ProtobufC REQUIRED)
-
- add_subdirectory(src)
-
--find_path(OLD_CONFIG_FILE NAMES "umurmur.conf" PATHS ${CMAKE_INSTALL_PREFIX} PATH_SUFFIXES "etc")
--
--if(NOT OLD_CONFIG_FILE)
-- install(FILES "umurmur.conf.example" DESTINATION "etc" RENAME "umurmur.conf")
--endif()
--
-+install(
-+ FILES "umurmur.conf.example"
-+ DESTINATION "/${CMAKE_INSTALL_SYSCONFDIR}/umurmur"
-+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
-+ RENAME "umurmur.conf"
-+)
Modified: umurmur.service
===================================================================
--- umurmur.service 2021-02-24 15:00:03 UTC (rev 871503)
+++ umurmur.service 2021-02-24 15:00:08 UTC (rev 871504)
@@ -24,8 +24,8 @@
CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
CPUAccounting=true
DevicePolicy=closed
-ExecStartPre=/usr/bin/umurmurd -t -c /etc/umurmur/umurmur.conf
-ExecStart=/usr/bin/umurmurd -d -r -c /etc/umurmur/umurmur.conf
+ExecStartPre=/usr/bin/umurmurd -t
+ExecStart=/usr/bin/umurmurd -d -r
ExecReload=/bin/kill -HUP $MAINPID
Group=umurmur
IPAccounting=true
@@ -47,7 +47,7 @@
ProtectKernelTunables=true
ProtectProc=invisible
ProtectSystem=strict
-ReadWriteDirectories=/etc/umurmur
+ReadWritePaths=/etc/umurmur
RemoveIPC=true
RestrictAddressFamilies=AF_INET AF_INET6
RestrictNamespaces=true
@@ -59,4 +59,4 @@
User=umurmur
[Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
Modified: umurmur.tmpfiles
===================================================================
--- umurmur.tmpfiles 2021-02-24 15:00:03 UTC (rev 871503)
+++ umurmur.tmpfiles 2021-02-24 15:00:08 UTC (rev 871504)
@@ -1 +1,2 @@
z /etc/umurmur/umurmur.conf 0640 root umurmur
+z /etc/umurmur/ 0750 root umurmur
More information about the arch-commits
mailing list