- gerrit-log - lists.osmocom.org

[M] Change in osmo-smlc[master]: .deb/.rpm: various fixes related to non-root
by osmith 29 Apr '24

29 Apr '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/36665?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade --- M contrib/osmo-smlc.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/65/36665/1 diff --git a/contrib/osmo-smlc.spec.in b/contrib/osmo-smlc.spec.in index 6a6dc4b..6b19a17 100644 --- a/contrib/osmo-smlc.spec.in +++ b/contrib/osmo-smlc.spec.in @@ -84,6 +84,8 @@ chmod 0660 /etc/osmocom/osmo-smlc.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index bdfe6e9..242a797 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Package: osmo-smlc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, libdbd-sqlite3, adduser +Depends: ${misc:Depends}, ${shlibs:Depends}, libdbd-sqlite3 Description: OsmoSMLC: Osmocom's Location Services Center FIXME . diff --git a/debian/postinst b/debian/postinst index ae5fcb4..faecd26 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-smlc.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-smlc.cfg + chmod 0660 /etc/osmocom/osmo-smlc.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/36665?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade Gerrit-Change-Number: 36665 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-hlr[master]: .deb/.rpm: various fixes related to non-root
by osmith 29 Apr '24

29 Apr '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/36659?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories. Let's rather remove this complexity to make the postinst script more maintainable and more similar to the rpm spec file. If users need this, they can achieve something similar by using their own Osmocom config file in a different path with different permissions. * deb: Consistently use tabs throughout postinst, instead of mixing tabs and spaces. Related: OS#4107 Change-Id: Ib20406dd253f5e8720552e92e9002e45591218fa --- M contrib/osmo-hlr.spec.in M debian/control M debian/postinst 3 files changed, 51 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/36659/1 diff --git a/contrib/osmo-hlr.spec.in b/contrib/osmo-hlr.spec.in index a1f92ef..ebf6ee6 100644 --- a/contrib/osmo-hlr.spec.in +++ b/contrib/osmo-hlr.spec.in @@ -155,6 +155,8 @@ chmod 0660 /etc/osmocom/osmo-hlr.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %post -n libosmo-gsup-client0 -p /sbin/ldconfig %postun -n libosmo-gsup-client0 -p /sbin/ldconfig diff --git a/debian/control b/debian/control index 56457c9..ec234a3 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Package: osmo-hlr Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Osmocom Home Location Register OsmoHLR is a Osmocom implementation of HLR (Home Location Registrar) which works over GSUP protocol. The subscribers are store in sqlite DB. diff --git a/debian/postinst b/debian/postinst index 96734df..5dedec4 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,39 +4,30 @@ # to do. /usr/share/osmocom/osmo-hlr-post-upgrade.sh -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-hlr.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-hlr.cfg + chmod 0660 /etc/osmocom/osmo-hlr.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/36659?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib20406dd253f5e8720552e92e9002e45591218fa Gerrit-Change-Number: 36659 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-hnbgw[master]: .deb/.rpm: various fixes related to non-root
by osmith 29 Apr '24

29 Apr '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36660?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 --- M contrib/osmo-hnbgw.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/60/36660/1 diff --git a/contrib/osmo-hnbgw.spec.in b/contrib/osmo-hnbgw.spec.in index 2b98da2..414a4d5 100644 --- a/contrib/osmo-hnbgw.spec.in +++ b/contrib/osmo-hnbgw.spec.in @@ -94,6 +94,8 @@ chmod 0660 /etc/osmocom/osmo-hnbgw.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index 48d95cf..77737b5 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Package: osmo-hnbgw Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: osmo-mgw Description: OsmoHNBGW: Osmocom Home Node B Gateway diff --git a/debian/postinst b/debian/postinst index bdec955..d5bf871 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-hnbgw.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-hnbgw.cfg + chmod 0660 /etc/osmocom/osmo-hnbgw.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36660?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 Gerrit-Change-Number: 36660 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-hnodeb[master]: .deb/.rpm: various fixes related to non-root
by osmith 29 Apr '24

29 Apr '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/36661?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 --- M contrib/osmo-hnodeb.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/61/36661/1 diff --git a/contrib/osmo-hnodeb.spec.in b/contrib/osmo-hnodeb.spec.in index 0f9795b..e28340e 100644 --- a/contrib/osmo-hnodeb.spec.in +++ b/contrib/osmo-hnodeb.spec.in @@ -92,6 +92,8 @@ chmod 0660 /etc/osmocom/osmo-hnodeb.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index 365e07e..86ddb27 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Package: osmo-hnodeb Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: osmo-mgw Description: OsmoHNodeB: Osmocom's Home NodeB for 3G mobile networks diff --git a/debian/postinst b/debian/postinst index bdf0e8b..c65375e 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-hnodeb.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-hnodeb.cfg + chmod 0660 /etc/osmocom/osmo-hnodeb.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/36661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 Gerrit-Change-Number: 36661 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-msc[master]: .deb/.rpm: various fixes related to non-root
by osmith 29 Apr '24

29 Apr '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36662?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: I406ff0d625b02991d580c8382aa4be04dba45a00 --- M contrib/osmo-msc.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/62/36662/1 diff --git a/contrib/osmo-msc.spec.in b/contrib/osmo-msc.spec.in index e6e323a..ad12846 100644 --- a/contrib/osmo-msc.spec.in +++ b/contrib/osmo-msc.spec.in @@ -111,6 +111,8 @@ chmod 0660 /etc/osmocom/osmo-msc.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index 00c1b26..64bb73c 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Package: osmo-msc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: osmo-mgw Description: OsmoMSC: Osmocom's Mobile Switching Center for 2G and 3G circuit-switched mobile networks The Mobile Switching Center (MSC) is the heart of 2G/3G diff --git a/debian/postinst b/debian/postinst index 866c31a..80821c4 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-msc.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-msc.cfg + chmod 0660 /etc/osmocom/osmo-msc.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36662?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I406ff0d625b02991d580c8382aa4be04dba45a00 Gerrit-Change-Number: 36662 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-sccp[master]: .deb/.rpm: various fixes related to non-root
by osmith 29 Apr '24

29 Apr '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36656?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: Ie34e7aa65e576cf1742a33530a6f44d2344c39d0 --- M contrib/libosmo-sccp.spec.in M debian/control M debian/osmo-stp.postinst 3 files changed, 50 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/56/36656/1 diff --git a/contrib/libosmo-sccp.spec.in b/contrib/libosmo-sccp.spec.in index 7e74e18..9d70874 100644 --- a/contrib/libosmo-sccp.spec.in +++ b/contrib/libosmo-sccp.spec.in @@ -158,7 +158,8 @@ chmod 0660 /etc/osmocom/osmo-stp.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom - +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %files -n libosmo-mtp-devel %dir %{_includedir}/%{name} diff --git a/debian/control b/debian/control index 712774c..444604c 100644 --- a/debian/control +++ b/debian/control @@ -100,8 +100,7 @@ Section: net Depends: libosmo-sigtran9, ${shlibs:Depends}, - ${misc:Depends}, - adduser + ${misc:Depends} Description: Osmocom SIGTRAN STP (Signaling Transfer Point) This is the Osmocom (Open Source Mobile Communications) implementation of a Signaling Transfer Point (STP) for SS7/SIGTRAN telecommunication diff --git a/debian/osmo-stp.postinst b/debian/osmo-stp.postinst index 94fb408..bfcc1dc 100755 --- a/debian/osmo-stp.postinst +++ b/debian/osmo-stp.postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-stp.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-stp.cfg + chmod 0660 /etc/osmocom/osmo-stp.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie34e7aa65e576cf1742a33530a6f44d2344c39d0 Gerrit-Change-Number: 36656 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: .deb/.rpm: various fixes related to non-root
by osmith 29 Apr '24

29 Apr '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36657?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: Ie34e7aa65e576cf1742a33530a6f44d2344c39d0 --- M contrib/osmo-bsc.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/36657/1 diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 7b7777d..464630e 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -123,6 +123,8 @@ chmod 0660 /etc/osmocom/osmo-bsc.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check diff --git a/debian/control b/debian/control index 5f1016c..d2abb43 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Package: osmo-bsc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: osmo-mgw Description: OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks diff --git a/debian/postinst b/debian/postinst index 43d0f5e..26cdddf 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-bsc.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-bsc.cfg + chmod 0660 /etc/osmocom/osmo-bsc.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36657?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie34e7aa65e576cf1742a33530a6f44d2344c39d0 Gerrit-Change-Number: 36657 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-cbc[master]: .deb/.rpm: various fixes related to non-root
by osmith 29 Apr '24

29 Apr '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/36658?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 --- M contrib/osmo-cbc.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/58/36658/1 diff --git a/contrib/osmo-cbc.spec.in b/contrib/osmo-cbc.spec.in index 0fee4b9..0e57fa0 100644 --- a/contrib/osmo-cbc.spec.in +++ b/contrib/osmo-cbc.spec.in @@ -110,6 +110,8 @@ chmod 0660 /etc/osmocom/osmo-cbc.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check diff --git a/debian/control b/debian/control index e3937e5..a1b7f04 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Package: osmo-cbc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoCBC: Osmocom's Cell Broadcast Center Package: osmo-cbc-utils diff --git a/debian/postinst b/debian/postinst index 1894ff7..922fa48 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-cbc.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-cbc.cfg + chmod 0660 /etc/osmocom/osmo-cbc.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/36658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73 Gerrit-Change-Number: 36658 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in docker-playground[master]: asterisk-master: Use pjproject from external git repo
by jolly 29 Apr '24

29 Apr '24

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email ) Change subject: asterisk-master: Use pjproject from external git repo ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5 Gerrit-Change-Number: 36649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Apr 2024 07:39:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adaptor: allow keeping an HTTP client connection
by osmith 29 Apr '24

29 Apr '24

Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email ) Change subject: HTTP_Adaptor: allow keeping an HTTP client connection ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646/comment/5b7b5b8f_7fb2… PS1, Line 9: At the moment the HTTP_Adaptor automatically creates a new connection, performs (if you break lines at 72 characters max - except for error/log messages - it wraps properly in gerrit and makes reviewing easier) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic6994c504143820dde498c1a2bad2ad6a523dd70 Gerrit-Change-Number: 36646 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Apr 2024 07:33:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log