From 5277b9088e53b9de850ef042e48fbbf9d9b99c6042f18ca4ca9988897afefe26 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 14 Aug 2024 11:34:47 +0000 Subject: [PATCH] [info=5d8260f256301ae7ba2eb9b68e3f6a9fd955ea90fe0974826ed614d4ebb5f94a] OBS-URL: https://build.opensuse.org/package/show/server:mail/system-user-grommunio?expand=0&rev=8 --- _scmsync.obsinfo | 4 ++++ build.specials.obscpio | 3 +++ debian.control | 7 ++++--- debian.rules | 10 +++++----- system-user-grommunio.changes | 6 ++++++ system-user-grommunio.conf | 7 +++++++ system-user-grommunio.dsc | 2 +- system-user-grommunio.spec | 36 +++++------------------------------ 8 files changed, 35 insertions(+), 40 deletions(-) create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 system-user-grommunio.conf diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..e9b12a9 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1723635213 +commit: 5d8260f256301ae7ba2eb9b68e3f6a9fd955ea90fe0974826ed614d4ebb5f94a +url: https://src.opensuse.org/jengelh/system-user-grommunio +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..b9530cb --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85049835eb34ea1130470d5fe8328ef72ff84520237f0cb661c6ec9d3d3f60f0 +size 256 diff --git a/debian.control b/debian.control index efdaf73..18a2fa4 100644 --- a/debian.control +++ b/debian.control @@ -6,11 +6,12 @@ Standards-Version: 4.5.0 Package: system-user-grommunio Architecture: all -Pre-Depends: adduser, passwd, system-group-gromoxcf, ${misc:Pre-Depends} +Pre-Depends: adduser, passwd, ${misc:Pre-Depends} Depends: ${misc:Depends} Provides: system-group-groindex, system-group-grommunio, - system-group-groweb, system-user-grommunio, system-user-groindex, - system-user-groweb + system-group-groweb, system-group-gromoxcf, + system-user-grommunio, system-user-groindex, system-user-groweb +# gromoxcf provided by more than one package -- intentional Replaces: system-user-groweb Breaks: system-user-groweb Description: General grommunio system user identities diff --git a/debian.rules b/debian.rules index bbb9c60..31f3994 100644 --- a/debian.rules +++ b/debian.rules @@ -6,8 +6,8 @@ sufile = ${sudir}/system-user-grommunio.conf override_dh_auto_install: mkdir -p ${sudir} echo 'u grommunio - "user for grommunio administration"' >${sufile} - echo 'u groweb - "user for grommunio-web"' >${sufile} - echo 'u groindex - "user for grommunio-index"' >${sufile} - echo 'm grommunio gromoxcf' >${sufile} - echo 'm groindex groweb' >${sufile} - echo 'm groindex gromoxcf' >${sufile} + echo 'u groweb - "user for grommunio-web"' >>${sufile} + echo 'u groindex - "user for grommunio-index"' >>${sufile} + echo 'm grommunio gromoxcf' >>${sufile} + echo 'm groindex groweb' >>${sufile} + echo 'm groindex gromoxcf' >>${sufile} diff --git a/system-user-grommunio.changes b/system-user-grommunio.changes index 447c0d3..7224f5e 100644 --- a/system-user-grommunio.changes +++ b/system-user-grommunio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 14 11:26:06 UTC 2024 - Jan Engelhardt + +- Update to release 9 + * Switch to sysusers mechanism + ------------------------------------------------------------------- Tue Jun 4 08:03:16 UTC 2024 - Jan Engelhardt diff --git a/system-user-grommunio.conf b/system-user-grommunio.conf new file mode 100644 index 0000000..6d45178 --- /dev/null +++ b/system-user-grommunio.conf @@ -0,0 +1,7 @@ +u grommunio - "user for grommunio administration" +u groweb - "user for grommunio-web" +u groindex - "user for grommunio-index" +g gromoxcf +m grommunio gromoxcf +m groindex groweb +m groindex gromoxcf diff --git a/system-user-grommunio.dsc b/system-user-grommunio.dsc index 6122e5c..238718a 100644 --- a/system-user-grommunio.dsc +++ b/system-user-grommunio.dsc @@ -1,7 +1,7 @@ Format: 1.0 Source: system-user-grommunio Architecture: all -Version: 7 +Version: 9 Maintainer: Grommunio Homepage: https://grommunio.com Standards-Version: 3.9.4 diff --git a/system-user-grommunio.spec b/system-user-grommunio.spec index da293d2..d5074e3 100644 --- a/system-user-grommunio.spec +++ b/system-user-grommunio.spec @@ -17,7 +17,7 @@ Name: system-user-grommunio -Version: 7 +Version: 9 Release: 0 Summary: General grommunio system user identities License: MIT @@ -31,16 +31,9 @@ Provides: system-user-groweb = %version-%release BuildRequires: sysuser-tools %sysusers_requires %else -Provides: group(groindex) -Provides: group(grommunio) -Provides: group(groweb) -Provides: user(groindex) -Provides: user(grommunio) -Provides: user(groweb) Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/groupadd %endif -Requires(pre): group(gromoxcf) %description This package provides identities related to the Grommunio groupware suite: @@ -58,36 +51,17 @@ This package provides identities related to the Grommunio groupware suite: %prep %build -cat <<-EOF >u.conf - u grommunio - "user for grommunio administration" - u groweb - "user for grommunio-web" - u groindex - "user for grommunio-index" - m grommunio gromoxcf - m groindex groweb - m groindex gromoxcf -EOF -%if 0%{?suse_version} -%sysusers_generate_pre u.conf user system-user-grommunio.conf -%else >user.pre +%if 0%{?suse_version} +%sysusers_generate_pre %_sourcedir/system-user-grommunio.conf user system-user-grommunio.conf %endif %install install -Dpm0644 u.conf "%buildroot/%_sysusersdir/system-user-grommunio.conf" %pre -f user.pre -%if !0%{?suse_version} -getent group grommunio >/dev/null || %_sbindir/groupadd -r grommunio -getent passwd grommunio >/dev/null || %_sbindir/useradd -g grommunio -s /sbin/nologin \ - -r -c "user for grommunio administration" -d / grommunio -getent group groweb >/dev/null || %_sbindir/groupadd -r groweb -getent passwd groweb >/dev/null || %_sbindir/useradd -g groweb -s /sbin/nologin \ - -r -c "user for grommunio-web" -d / groweb -getent group groindex >/dev/null || %_sbindir/groupadd -r groindex -getent passwd groindex >/dev/null || %_sbindir/useradd -g groindex -s /sbin/nologin \ - -r -c "user for grommunio-index" -d / groindex -usermod grommunio -aG gromoxcf -usermod groindex -aG gromoxcf +%if 0%{?rhel} || 0%{?fedora_version} +%sysusers_create_compat %_sourcedir/system-user-grommunio.conf %endif %files