@@ -1,7 +1,7 @@

 Summary:          Advanced Trivial File Transfer Protocol (ATFTP) - TFTP server

 Name:             atftp

 Version:          0.8.0

-Release:          4%{?dist}

+Release:          5%{?dist}

 URL:              http://sourceforge.net/projects/atftp

 License:          GPLv2+ and GPLv3+ and LGPLv2+

 Group:            System Environment/Daemons

@@ -133,6 +133,8 @@ rm -rf %{buildroot}

 %{_bindir}/atftp

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 0.8.0-5

+- Resolving systemd-rpm-macros for group creation

 * Mon Jul 24 2023 Brennan Lamoreaux <blamoreaux@vmware.com> 0.8.0-4

 - Version bump as part of pcre2 update

 * Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 0.8.0-3

@@ -1,2 +1,2 @@

-g tftp

+g tftp -

 u tftp - "tftp" /home/tftp /bin/false

@@ -1,7 +1,7 @@

 Summary:        Domain Name System software

 Name:           bindutils

 Version:        9.19.14

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        ISC

 URL:            http://www.isc.org/downloads/bind

 Group:          Development/Tools

@@ -87,14 +87,6 @@ fi

 %postun

 /sbin/ldconfig

-if [ $1 -eq 0 ]; then

-  if getent passwd named >/dev/null; then

-    userdel named

-  fi

-  if getent group named >/dev/null; then

-    groupdel named

-  fi

-fi

 %files

 %defattr(-,root,root)

@@ -132,6 +124,8 @@ fi

 %{_mandir}/man8/*

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 9.19.14-3

+- Resolving systemd-rpm-macros for group creation

 * Fri Jul 28 2023 Srish Srinivasan <ssrish@vmware.com> 9.19.14-2

 - Bump version as a part of krb5 upgrade

 * Thu Jun 22 2023 Dweep Advani <dadvani@vmware.com> 9.19.14-1

@@ -1,2 +1,2 @@

-g named

+g named -

 u named - "" /var/lib/bind /bin/false

@@ -4,7 +4,7 @@

 Summary:        Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store

 Name:           cassandra

 Version:        4.0.8

-Release:        3%{?dist}

+Release:        4%{?dist}

 URL:            http://cassandra.apache.org/

 License:        Apache License, Version 2.0

 Group:          Applications/System

@@ -97,10 +97,6 @@ source %{_sysconfdir}/profile.d/%{name}.sh

 %postun

 %{_sbindir}/ldconfig

 %systemd_postun_with_restart %{name}.service

-if [ $1 -eq 0 ] ; then

-  /usr/sbin/userdel %{name}

-  /usr/sbin/groupdel %{name}

-fi

 %files

 %defattr(-,root,root)

@@ -118,6 +114,8 @@ fi

 %exclude %{_localstatedir}/opt/%{name}/build/lib

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 4.0.8-4

+- Resolving systemd-rpm-macros for group creation

 * Sat Jun 17 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.0.8-3

 - Bump version as a part of openjdk11 upgrade

 * Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 4.0.8-2

@@ -1,3 +1,3 @@

-g cassandra

+g cassandra -

 u cassandra - "Cassandra" /var/opt/cassandra/data /bin/bash

 m cassandra cassandra

@@ -2,7 +2,7 @@

 Name:           consul

 Version:        1.15.4

-Release:        2%{?dist}

+Release:        3%{?dist}

 Summary:        Consul is a tool for service discovery and configuration.

 License:        Mozilla Public License, version 2.0

 Group:          System Environment/Daemons

@@ -63,15 +63,6 @@ if [ $1 -ge 1 ]; then

 fi

 %postun

-if [ $1 -eq 0 ]; then

-  # this is delete operation

-  if getent passwd %{name} >/dev/null; then

-    userdel %{name}

-  fi

-  if getent group %{name} >/dev/null; then

-    groupdel %{name}

-  fi

-fi

 /sbin/ldconfig

 %systemd_postun_with_restart %{name}.service

@@ -91,6 +82,8 @@ rm -rf %{buildroot}

 %{_sysusersdir}/%{name}.sysusers

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.15.4-3

+- Resolving systemd-rpm-macros for group creation

 * Mon Jul 17 2023 Piyush Gupta <gpiyush@vmware.com> 1.15.4-2

 - Bump up version to compile with new go

 * Mon Jul 17 2023 Nitesh Kumar <kunitesh@vmware.com> 1.15.4-1

@@ -1,2 +1,2 @@

-g consul

+g consul -

 u consul - "Consul Agent" /var/lib/consul /bin/false

@@ -1,7 +1,7 @@

 Summary:        Distributed reliable key-value store

 Name:           etcd

 Version:        3.5.9

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        Apache License

 URL:            https://github.com/etcd-io/etcd

 Group:          System Environment/Security

@@ -68,10 +68,6 @@ install -vdm755 %{buildroot}%{_sharedstatedir}/etcd

 %postun

 /sbin/ldconfig

-if [ $1 -eq 0 ] ; then

-  /usr/sbin/userdel %{name}

-  /usr/sbin/groupdel %{name}

-fi

 %clean

 rm -rf %{buildroot}/*

@@ -89,6 +85,8 @@ rm -rf %{buildroot}/*

 %endif

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 3.5.9-3

+- Resolving systemd-rpm-macros for group creation

 * Mon Jul 17 2023 Piyush Gupta <gpiyush@vmware.com> 3.5.9-2

 - Bump up version to compile with new go

 * Thu Jul 06 2023 Prashant S Chauhan <psinghchauha@vmware.com> 3.5.9-1

@@ -1,6 +1,6 @@

 Name:           influxdb

 Version:        1.8.2

-Release:        12%{?dist}

+Release:        13%{?dist}

 Summary:        InfluxDB is an open source time series database

 License:        MIT

 URL:            https://influxdata.com

@@ -84,11 +84,6 @@ chown -R %{name}:%{name} /var/log/%{name}

 %postun

 %systemd_postun_with_restart influxdb.service

-if [ $1 -eq 0 ]; then

-    # Package deletion

-    userdel %{name}

-    groupdel %{name}

-fi

 %files

 %defattr(-,root,root,755)

@@ -108,6 +103,8 @@ fi

 %{_sysusersdir}/%{name}.sysusers

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.8.2-13

+- Resolving systemd-rpm-macros for group creation

 * Mon Jul 17 2023 Piyush Gupta <gpiyush@vmware.com> 1.8.2-12

 - Bump up version to compile with new go

 * Mon Jul 03 2023 Piyush Gupta <gpiyush@vmware.com> 1.8.2-11

@@ -5,7 +5,7 @@

 Summary:       Apache Kafka is publish-subscribe messaging rethought as a distributed commit log.

 Name:          kafka

 Version:       3.3.1

-Release:       3%{?dist}

+Release:       4%{?dist}

 License:       Apache License, Version 2.0

 Group:         Productivity/Networking/Other

 URL:           http://kafka.apache.org/

@@ -89,11 +89,6 @@ rm -rf %{buildroot}

 %postun

 %systemd_postun %{name}.service

-if [ $1 -eq 0 ]

-then

-    /usr/sbin/userdel %{name}

-    /usr/sbin/groupdel %{name}

-fi

 %files

 %defattr(-,root,root)

@@ -107,6 +102,8 @@ fi

 %doc LICENSE

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 3.3.1-4

+- Resolving systemd-rpm-macros for group creation

 * Sat Jun 17 2023 Shreenidhi Shedi <sshedi@vmware.com> 3.3.1-3

 - Bump version as a part of openjdk11 upgrade

 * Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 3.3.1-2

@@ -1,6 +1,6 @@

 Name:           kapacitor

 Version:        1.6.6

-Release:        2%{?dist}

+Release:        3%{?dist}

 Summary:        Open source framework for processing, monitoring, and alerting on time series data

 License:        MIT

 URL:            https://www.influxdata.com/time-series-platform/kapacitor

@@ -76,11 +76,6 @@ chown -R %{name}:%{name} /var/log/%{name}

 %postun

 %systemd_postun_with_restart kapacitor.service

-if [ $1 -eq 0 ]; then

-    # Package deletion

-    userdel %{name}

-    groupdel %{name}

-fi

 %files

 %defattr(-,root,root,755)

@@ -97,6 +92,8 @@ fi

 %{_sysusersdir}/%{name}.sysusers

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.6.6-3

+- Resolving systemd-rpm-macros for group creation

 * Mon Jul 17 2023 Piyush Gupta <gpiyush@vmware.com> 1.6.6-2

 - Bump up version to compile with new go

 * Mon Jul 03 2023 Srish Srinivasan <ssrish@vmware.com> 1.6.6-1

@@ -1,2 +1,2 @@

-g kapacitor

+g kapacitor -

 u kapacitor - "Kapacitor" /var/lib/kapacitor /sbin/nologin

@@ -12,7 +12,7 @@

 Summary:        Kubernetes cluster management

 Name:           kubernetes

 Version:        1.27.3

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        ASL 2.0

 URL:            https://github.com/kubernetes/kubernetes/archive/v%{version}.tar.gz

 Group:          Development/Tools

@@ -210,6 +210,8 @@ fi

 %{_bindir}/pause-%{archname}

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.27.3-3

+- Resolving systemd-rpm-macros for group creation

 * Mon Jul 17 2023 Piyush Gupta <gpiyush@vmware.com> 1.27.3-2

 - Bump up version to compile with new go

 * Tue Jul 04 2023 Prashant S Chauhan <psinghchauha@vmware.com> 1.27.3-1

@@ -1,2 +1,2 @@

-g kube

+g kube -

 u kube - "Kubernetes user" / /sbin/nologin

@@ -1,7 +1,7 @@

 Summary:          NFS client utils

 Name:             nfs-utils

 Version:          2.6.2

-Release:          7%{?dist}

+Release:          8%{?dist}

 License:          GPLv2+

 URL:              http://sourceforge.net/projects/nfs

 Group:            Applications/Nfs-utils-client

@@ -176,6 +176,8 @@ rm -rf %{buildroot}/*

 %{_libdir}/libnfsidmap.so

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 2.6.2-8

+- Resolving systemd-rpm-macros for group creation

 * Fri Jul 28 2023 Srish Srinivasan <ssrish@vmware.com> 2.6.2-7

 - Bump version as a part of krb5 upgrade

 * Mon Jun 19 2023 Piyush Gupta <gpiyush@vmware.com> 2.6.2-6

@@ -1,2 +1,2 @@

-g nobody

+g nobody -

 u nobody - "Unprivileged User" /dev/null /bin/false

@@ -4,7 +4,7 @@

 Summary:        High-performance HTTP server and reverse proxy

 Name:           nginx

 Version:        1.23.1

-Release:        4%{?dist}

+Release:        5%{?dist}

 License:        BSD-2-Clause

 URL:            http://nginx.org

 Group:          Applications/System

@@ -118,6 +118,8 @@ rm -rf %{buildroot}

 %{_var}/log/%{name}

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.23.1-5

+- Resolving systemd-rpm-macros for group creation

 * Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 1.23.1-4

 - Use systemd-rpm-macros for user creation

 * Mon Feb 20 2023 Harinadh D <hdommaraju@vmware.com> 1.23.1-3

@@ -1,2 +1,2 @@

-g nginx

+g nginx -

 u nginx - "Nginx web server" /var/lib/nginx /sbin/nologin

@@ -2,7 +2,7 @@

 Name:           nss-pam-ldapd

 Version:        0.9.12

-Release:        5%{?dist}

+Release:        6%{?dist}

 Summary:        nsswitch module which uses directory servers

 License:        LGPLv2+

 URL:            https://github.com/arthurdejong/nss-pam-ldapd

@@ -96,6 +96,8 @@ rm -rf %{buildroot}/*

 %attr(0775,nslcd,root) /run/nslcd

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 0.9.12-6

+- Resolving systemd-rpm-macros for group creation

 * Fri Jul 28 2023 Srish Srinivasan <ssrish@vmware.com> 0.9.12-5

 - Bump version as a part of krb5 upgrade

 * Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 0.9.12-4

@@ -1,2 +1,2 @@

-g ldap

+g ldapi -

 u nslcd - "nslcd ldap user" / /usr/sbin/nologin

@@ -1,7 +1,7 @@

 Summary:        Improved implementation of Network Time Protocol

 Name:           ntpsec

 Version:        1.2.2

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        BSD-2-Clause AND NTP AND BSD-3-Clause AND MIT

 Group:          System Environment/NetworkingPrograms

 Vendor:         VMware, Inc.

@@ -9,6 +9,8 @@ Distribution:   Photon

 Url:            https://www.ntpsec.org/

 Source0:        https://ftp.ntpsec.org/pub/releases/%{name}-%{version}.tar.gz

 %define sha512  ntpsec=929f07e4183cf7f4c24c15f99391fb6d4d87eeb267ea767adbff0b58d44c419490c52174a01a5819f133e479602bb9343e4853c5a016ff41c04d3c6e76caa958

+Source1:        %{name}.sysusers

+

 Patch0:         ntpstats_path.patch

 BuildRequires:  binutils

@@ -70,6 +72,7 @@ mkdir -p %{buildroot}/{%{_sysconfdir}/logrotate.d,%{_libdir}/systemd/ntp-units.d

 install -p -m755 attic/ntpdate %{buildroot}%{_sbindir}/ntpdate

 install -p -m644 etc/logrotate-config.ntpd \

         %{buildroot}%{_sysconfdir}/logrotate.d/ntpsec.conf

+install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.sysusers

 touch %{buildroot}%{_sharedstatedir}/ntp/ntp.drift

 echo 'ntpd.service' > %{buildroot}%{_libdir}/systemd/ntp-units.d/60-ntpd.list

@@ -88,12 +91,8 @@ rm %{buildroot}%{_bindir}/runtests

 python3 ./waf check --verbose %{?_smp_mflags}

 %pre

-if ! getent group ntp >/dev/null; then

-    groupadd -g 87 ntp

-fi

-if ! getent passwd ntp >/dev/null; then

-    useradd -c "Network Time Protocol" -d /var/lib/ntp -u 87 -g ntp -s /bin/false ntp

-fi

+%sysusers_create_compat %{SOURCE1}

+

 %post

 %{_sbindir}/ldconfig

 %systemd_post ntpd.service ntp-wait.service

@@ -122,11 +121,14 @@ rm -rf %{buildroot}/*

 %{_prefix}/lib/systemd/ntp-units.d/*ntpd.list

 %dir %attr(-,ntp,ntp) %{_sharedstatedir}/ntp

 %dir %attr(-,ntp,ntp) %{_localstatedir}/log/ntpstats

+%{_sysusersdir}/%{name}.sysusers

 %files -n python3-ntp

 %defattr(-,root,root)

 %{python3_sitearch}/ntp*

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.2.2-2

+- Use systemd-rpm-macros for user creation

 * Fri May 27 2022 Prashant S Chauhan <psinghchauha@vmware.com> 1.2.2-1

 - ntpsec initial build

new file mode 100644

@@ -0,0 +1,2 @@

+g ntp 87

+u ntp 87 "Network Time Protocol" /var/lib/ntp /sbin/nologin

@@ -10,7 +10,7 @@

 Summary:    A Fast and Scalable Web Platform by Extending NGINX with Lua

 Name:       openresty

 Version:    1.21.4.1

-Release:    7%{?dist}

+Release:    8%{?dist}

 License:    BSD

 URL:        https://openresty.org/en

 Group:      Applications/System

@@ -223,6 +223,8 @@ rm -rf %{buildroot}

 %{orprefix}/resty.index

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.21.4.1-8

+- Resolving systemd-rpm-macros for group creation

 * Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.21.4.1-7

 - Bump version as a part of lua upgrade

 * Fri Apr 14 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.21.4.1-6

@@ -1,2 +1,2 @@

-g nginx

+g nginx -

 u nginx - "Nginx web server" /var/lib/nginx /sbin/nologin

@@ -1,7 +1,7 @@

 Summary:          Connection pooler for PostgreSQL.

 Name:             pgbouncer

 Version:          1.17.0

-Release:          2%{?dist}

+Release:          3%{?dist}

 License:          BSD

 URL:              https://wiki.postgresql.org/wiki/PgBouncer

 Source0:          https://%{name}.github.io/downloads/files/%{version}/%{name}-%{version}.tar.gz

@@ -74,31 +74,33 @@ fi

 %{_sysusersdir}/%{name}.sysusers

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.17.0-3

+- Resolving systemd-rpm-macros for group creation

 * Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 1.17.0-2

 - Use systemd-rpm-macros for user creation

-*   Mon Apr 18 2022 Gerrit Photon <photon-checkins@vmware.com> 1.17.0-1

--   Automatic Version Bump

-*   Wed Aug 04 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 1.15.0-2

--   Bump up release for openssl

-*   Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 1.15.0-1

--   Automatic Version Bump

-*   Tue Sep 29 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com> 1.14.0-2

--   openssl 1.1.1

-*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 1.14.0-1

--   Automatic Version Bump

-*   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 1.9.0-1

--   Updated to version 1.9.0

-*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.7.2-7

--   Remove shadow from requires and use explicit tools for post actions

-*   Mon Jul 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.7.2-6

--   Seperate the service file from the spec file

-*   Wed May 31 2017 Rongrong Qiu <rqiu@vmware.com> 1.7.2-5

--   Add RuntimeDirectory and Type=forking

-*   Thu Apr 13 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.7.2-4

--   Fixed the requires.

-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.7.2-3

--   GA - Bump release of all rpms

-*   Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 1.7.2-2

--   Edit scriptlets.

-*   Thu Apr 28 2016 Kumar Kaushik <kaushikk@vmware.com> 1.7.2-1

--   Initial Version.

+* Mon Apr 18 2022 Gerrit Photon <photon-checkins@vmware.com> 1.17.0-1

+- Automatic Version Bump

+* Wed Aug 04 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 1.15.0-2

+- Bump up release for openssl

+* Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 1.15.0-1

+- Automatic Version Bump

+* Tue Sep 29 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com> 1.14.0-2

+- openssl 1.1.1

+* Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 1.14.0-1

+- Automatic Version Bump

+* Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 1.9.0-1

+- Updated to version 1.9.0

+* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.7.2-7

+- Remove shadow from requires and use explicit tools for post actions

+* Mon Jul 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.7.2-6

+- Seperate the service file from the spec file

+* Wed May 31 2017 Rongrong Qiu <rqiu@vmware.com> 1.7.2-5

+- Add RuntimeDirectory and Type=forking

+* Thu Apr 13 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.7.2-4

+- Fixed the requires.

+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.7.2-3

+- GA - Bump release of all rpms

+* Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 1.7.2-2

+- Edit scriptlets.

+* Thu Apr 28 2016 Kumar Kaushik <kaushikk@vmware.com> 1.7.2-1

+- Initial Version.

@@ -1,2 +1,2 @@

-g pgbouncer

+g pgbouncer -

 u pgbouncer - "" /home/pgbouncer /bin/bash

@@ -12,7 +12,7 @@

 Name:          rabbitmq-server

 Summary:       RabbitMQ messaging server

 Version:       3.11.3

-Release:       3%{?dist}

+Release:       4%{?dist}

 Group:         Applications

 Vendor:        VMware, Inc.

 Distribution:  Photon

@@ -138,6 +138,8 @@ chmod g+s %{_sysconfdir}/rabbitmq

 %{_sysusersdir}/%{name}.sysusers

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 3.11.3-4

+- Resolving systemd-rpm-macros for group creation

 * Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 3.11.3-3

 - Use systemd-rpm-macros for user creation

 * Tue Dec 06 2022 Prashant S Chauhan <psinghchauha@vmware.com> 3.11.3-2

@@ -1,2 +1,2 @@

-g rabbitmq

+g rabbitmq -

 u rabbitmq - "RabbitMQ messaging server" /var/lib/rabbitmq /sbin/nologin

@@ -1,7 +1,7 @@

 Summary:       advanced key-value store

 Name:          redis

 Version:       7.0.12

-Release:       1%{?dist}

+Release:       2%{?dist}

 License:       BSD

 URL:           http://redis.io

 Group:         Applications/Databases

@@ -90,6 +90,8 @@ make check %{?_smp_mflags}

 %{_sysusersdir}/%{name}.sysusers

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 7.0.12-2

+- Resolving systemd-rpm-macros for group creation

 * Thu Jul 13 2023 Nitesh Kumar <kunitesh@vmware.com> 7.0.12-1

 - Upgrade to v7.0.12 to fix following CVE's:

 - CVE-2022-24834, CVE-2023-36824

@@ -1,2 +1,2 @@

-g redis

+g redis -

 u redis - "Redis Database Server" /var/lib/redis /sbin/nologin

@@ -4,7 +4,7 @@

 Summary:        Caching and forwarding HTTP web proxy

 Name:           squid

 Version:        5.7

-Release:        8%{?dist}

+Release:        9%{?dist}

 License:        GPL-2.0-or-later

 URL:            http://www.squid-cache.org

 Group:          Networking/Web/Proxy

@@ -231,6 +231,8 @@ rm -rf %{buildroot}

 %{_libdir}/%{name}/*

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 5.7-9

+- Resolving systemd-rpm-macros for group creation

 * Fri Jul 28 2023 Srish Srinivasan <ssrish@vmware.com> 5.7-8

 - Bump version as a part of krb5 upgrade

 * Sat May 27 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.7-7

@@ -1,2 +1,2 @@

-g squid

+g squid -

 u squid 53 "" /var/spool/squid /sbin/nologin

@@ -1,15 +1,16 @@

 Summary:        Sudo

 Name:           sudo

 Version:        1.9.14p3

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        ISC

 URL:            https://www.sudo.ws

 Group:          System Environment/Security

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Source0: http://www.sudo.ws/sudo/dist/%{name}-%{version}.tar.gz

-%define sha512 %{name}=d4af836e3316c35d8b81a2c869ca199e8f2d5cb26dbd98b8ad031f29be62b154452afdf5a506ddabad21b80e5988a49f1f7c8f1ec44718ffcbd7e89ccbdef612

+Source0:        http://www.sudo.ws/sudo/dist/%{name}-%{version}.tar.gz

+%define sha512  %{name}=d4af836e3316c35d8b81a2c869ca199e8f2d5cb26dbd98b8ad031f29be62b154452afdf5a506ddabad21b80e5988a49f1f7c8f1ec44718ffcbd7e89ccbdef612

+Source1:        %{name}.sysusers

 BuildRequires:  man-db

 BuildRequires:  Linux-PAM-devel

@@ -63,14 +64,15 @@ mkdir -p %{buildroot}%{_tmpfilesdir}

 touch %{buildroot}%{_tmpfilesdir}/sudo.conf

 %find_lang %{name}

 %{_fixperms} %{buildroot}/*

+install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.sysusers

 %check

 make %{?_smp_mflags} check

 %post

 /sbin/ldconfig

-if [ $1 -eq 1 ]; then

-  getent group wheel > /dev/null || groupadd wheel

+if [ $1 -eq 1 ] ; then

+  %sysusers_create_compat %{SOURCE1}

 fi

 %postun -p /sbin/ldconfig

@@ -97,8 +99,11 @@ rm -rf %{buildroot}/*

 %{_docdir}/%{name}-%{version}/*

 %attr(0644,root,root) %{_tmpfilesdir}/sudo.conf

 %exclude %{_sysconfdir}/sudoers.dist

+%{_sysusersdir}/%{name}.sysusers

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.9.14p3-2

+- Resolving systemd-rpm-macros for group creation

 * Mon Jul 31 2023 Mukul Sikka <msikka@vmware.com> 1.9.14p3-1

 - Version update

 * Wed Jan 18 2023 Shivani Agarwal <shivania2@vmware.com> 1.9.12p1-2

new file mode 100644

@@ -0,0 +1 @@

+g wheel -

@@ -8,7 +8,7 @@

 Name:          systemtap

 Version:       4.8

-Release:       12%{?dist}

+Release:       13%{?dist}

 Summary:       Programmable system-wide instrumentation system

 Group:         Development/System

 Vendor:        VMware, Inc.

@@ -21,6 +21,7 @@ Source0: http://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz

 Source1: systemtap-runtime.sysusers

 Source2: systemtap-server.sysusers

+Source3: systemtap.sysusers

 BuildRequires: elfutils-devel

 BuildRequires: glibc-devel

@@ -203,6 +204,7 @@ touch %{buildroot}%{_localstatedir}/opt/stap-server/log/log

 install -m 644 initscript/logrotate.stap-server %{buildroot}%{_sysconfdir}/logrotate.d/stap-server

 install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/systemtap_runtime.sysusers

 install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/systemtap_server.sysusers

+install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/systemtap.sysusers

 rm -rf %{buildroot}%{_mandir}/cs/

 %find_lang %{name}

@@ -216,8 +218,7 @@ make %{?_smp_mflags} check

 rm -rf %{buildroot}

 %pre

-getent group stap-server >/dev/null || \

-    groupadd -g 155 -r stap-server || groupadd -r stap-server

+%sysusers_create_compat %{SOURCE3}

 %pre runtime

 %sysusers_create_compat %{SOURCE1}

@@ -322,6 +323,7 @@ fi

 %{_mandir}/man8/stapbpf.8*

 %doc AUTHORS COPYING

 %{_bindir}/dtrace

+%{_sysusersdir}/%{name}.sysusers

 %files initscript

 %defattr(-,root,root)

@@ -389,6 +391,8 @@ fi

 %{_libexecdir}/systemtap/python/stap-resolve-module-function.py

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 4.8-13

+- Resolving systemd-rpm-macros for group creation

 * Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.8-12

 - Bump version as a part of elfutils upgrade

 * Tue May 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.8-11

new file mode 100644

@@ -0,0 +1 @@

+g stap-server 155

@@ -1,7 +1,7 @@

 Summary:          agent for collecting, processing, aggregating, and writing metrics.

 Name:             telegraf

 Version:          1.27.1

-Release:          3%{?dist}

+Release:          4%{?dist}

 License:          MIT

 URL:              https://github.com/influxdata/telegraf

 Source0:          https://github.com/influxdata/telegraf/archive/%{name}-%{version}.tar.gz

@@ -89,6 +89,8 @@ systemctl daemon-reload

 %config(noreplace) %{_sysconfdir}/%{name}/telegraf.conf

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.27.1-4

+- Resolving systemd-rpm-macros for group creation

 * Mon Jul 17 2023 Piyush Gupta <gpiyush@vmware.com> 1.27.1-3

 - Bump up version to compile with new go

 * Mon Jul 03 2023 Piyush Gupta <gpiyush@vmware.com> 1.27.1-2

@@ -1,2 +1,2 @@

-g telegraf

+g telegraf -

 u telegraf - "Telegraf" /var/lib/telegraf /sbin/nologin

@@ -1,7 +1,7 @@

 Summary:        unbound dns server

 Name:           unbound

 Version:        1.17.0

-Release:        2%{?dist}

+Release:        3%{?dist}

 Group:          System/Servers

 Vendor:         VMware, Inc.

 License:        BSD

@@ -81,8 +81,10 @@ rm -rf %{buildroot}/*

 %{_mandir}/*

 %changelog

-* Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 1.17.0-2

-- Use systemd-rpm-macros for user creation

+*  Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.17.0-3

+-  Resolving systemd-rpm-macros for group creation

+*  Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 1.17.0-2

+-  Use systemd-rpm-macros for user creation

 *  Fri Oct 28 2022 Gerrit Photon <photon-checkins@vmware.com> 1.17.0-1

 -  Automatic Version Bump

 *  Tue Sep 27 2022 Gerrit Photon <photon-checkins@vmware.com> 1.16.3-1

@@ -1,2 +1,2 @@

-g unbound

+g unbound -

 u unbound - "Unbound DNS resolver" /etc/unbound /sbin/nologin

@@ -1,7 +1,7 @@

 Summary:        Application Container Server for Networked/Clustered Web Applications

 Name:           uwsgi

 Version:        2.0.21

-Release:        9%{?dist}

+Release:        10%{?dist}

 License:        GPLv2 with exceptions

 Group:          Productivity/Networking/Web/Servers

 Vendor:         VMware, Inc.

@@ -234,6 +234,8 @@ rm -rf %{buildroot}/*

 %{python3_sitelib}/uwsgidecorators.py*

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 2.0.21-10

+- Resolving systemd-rpm-macros for group creation

 * Fri Jul 28 2023 Srish Srinivasan <ssrish@vmware.com> 2.0.21-9

 - Bump version as a part of krb5 upgrade

 * Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 2.0.21-8

@@ -1,2 +1,2 @@

-g uwsgi

+g uwsgi -

 u uwsgi - "uWSGI daemon user" /run/uwsgi /sbin/nologin

@@ -1,7 +1,7 @@

 Summary:          VerneMQ is a high-performance, distributed MQTT message broker

 Name:             vernemq

 Version:          1.12.6.2

-Release:          3%{?dist}

+Release:          4%{?dist}

 License:          Apache License, Version 2.0

 URL:              https://github.com/vernemq/vernemq

 Group:            Applications/System

@@ -120,6 +120,8 @@ rm -rf %{buildroot}

 %{_sysusersdir}/%{name}.sysusers

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 1.12.6.2-4

+- Resolving systemd-rpm-macros for group creation

 * Fri Jun 09 2023 Nitesh Kumar <kunitesh@vmware.com> 1.12.6.2-3

 - Bump version as a part of ncurses upgrade to v6.4

 * Fri Mar 10 2023 Mukul Sikka <msikka@vmware.com> 1.12.6.2-2

@@ -1,3 +1,3 @@

-g vernemq

+g vernemq -

 u vernemq - "VerneMQ" /var/lib/vernemq /bin/bash

 m vernemq vernemq

@@ -1,7 +1,7 @@

 Summary:          lightweight java application to send metrics to.

 Name:             wavefront-proxy

 Version:          13.0

-Release:          1%{?dist}

+Release:          2%{?dist}

 License:          Apache 2.0

 URL:              https://github.com/wavefrontHQ/java

 Group:            Development/Tools

@@ -100,6 +100,8 @@ rm -rf %{buildroot}/*

 %{_sysusersdir}/%{name}.sysusers

 %changelog

+* Tue Aug 08 2023 Mukul Sikka <msikka@vmware.com> 13.0-2

+- Resolving systemd-rpm-macros for group creation

 * Mon Jul 31 2023 Prashant S Chauhan <psinghchauha@vmware.com> 13.0-1

 - Update to 13.0

 * Sat Jun 17 2023 Shreenidhi Shedi <sshedi@vmware.com> 12.1-4

@@ -1,2 +1,2 @@

-g wavefront

+g wavefront -

 u wavefront - "Wavefront Proxy Server" /opt/wavefront /sbin/nologin