Update to 0.5.14

.gitignore

@@ -3,3 +3,4 @@ munge-0.5.9.tar.bz2
 /munge-0.5.11.tar.bz2
 /munge-0.5.12.tar.xz
 /munge-0.5.13.tar.xz
+/munge-0.5.14.tar.xz

README.md

@@ -4,17 +4,16 @@ The munge package.
 
 MUNGE (**M**UNGE **U**id '**N**' **G**id **E**mporium) is an authentication service for creating and validating credentials.
 
-Bevor starting the service as the first time a secret key has to been created.
+Before starting the service as the first time a secret key has to been created.
 
-For creating the key add store it to the file `/etc/munge/munge.key` the following script is provided:
+For creating the key add store it to the file `/etc/munge/munge.key` use `/sbin/mungekey`. 
-
+For example:
-```bash
-create-munge-key
 ```
+sudo -u munge %{_sbindir}/mungekey -v
+```
+Please read `man 8 mungekey` for more information.
 
-In the second step you can start und enable the munge service.
+In the second step you can start and enable the munge service.
-
 ```bash
 systemctl start munge
 systemctl enalbe munge
-```

dun.gpg

@@ -0,0 +1,76 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+1fi114xbZeLq0Q==
+=te3z
+-----END PGP PUBLIC KEY BLOCK-----

munge-0.5.14.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEpEGIDD1MfDbF3UHhO37LKzDeCHEFAl4eV7oACgkQO37LKzDe
+CHEvEg/+K5tmiNC2+UKL1kO0cXpjR6bos9WtElvoeO665LwZopT/eevHFtRL8BZd
+hTw93X7kzy/aHs0R5WFjM6ByfKkzGhsoMoUH6xJnpHjCvcH4i7oUDX0dhcv8ybbE
+imBR9Zrw46rnVaEvkxmTiTVnR0ByI72kMld+qXkfG+/Wl3r5WDH2XaFnl4ktXfcR
+jWLshGUzLDyhUe91yqoXQ/vLD5VHRrveumSX7cyABJ89fcA68uTXuiOFHGCCsdk1
+Qlho+f96DxACZJOCUeJUxxECQAB7ocb320NbEACsgmAJmEuExd2//HStk+NyYTtq
+R51WVunpG9/IvhYUF05dd5i7cHfQOf8h9cYvjlGBRmx9OhZ90dj9ZOYevtQwBmnp
+hVyLiBBTTbo4rYUEuP9jf1JsglxrtAjgQSLOw17dGi9bAtDetJkh2UVmwv95pyhY
+RIvCDGb8wdZx6UWlhXXnKnVQApG/iBs4im/EKfoN7G/ZjdPNpSsUae18Thmmi+TM
+OD84UTuZqtNO0Y1UxNfxGRVvlPdVXxehSHNLDqoVPQ8bSIdWDbBL1BeU7+Iz4VxY
+C5vnDgW5oJkgbk6lgm6E9tkp3OLy/x3fpFdTUWulhCYyG9YpdRKyDgUG0EmRmU/f
+cImaIWqrbfNylv8z9DbF4z4QBz0JWpUT5jWkzpVX4nkm/tsS7AI=
+=KqQ8
+-----END PGP SIGNATURE-----

munge.spec

@@ -1,22 +1,32 @@
+%bcond_without check
+
 Name:           munge
-Version:        0.5.13
+Version:        0.5.14
-Release:        10%{?dist}
+Release:        1%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 # The libs and devel package is GPLv3+ and LGPLv3+ where as the main package is GPLv3 only.
 License:        GPLv3+ and LGPLv3+
 URL:            https://dun.github.io/munge/
 Source0:        https://github.com/dun/munge/releases/download/munge-%{version}/munge-%{version}.tar.xz
-Source1:        create-munge-key
+Source1:        https://github.com/dun/munge/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz.asc
-Source2:        munge.logrotate
+Source2:        https://github.com/dun.gpg
 Source3:        munge.sysusers
+Source4:        README.md
 
 BuildRequires:  gcc
+BuildRequires:  gnupg2
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
 Requires:       munge-libs = %{version}-%{release}
 Requires:       logrotate
 
+%if %{with check}
+BuildRequires:  procps-ng
+BuildRequires:  util-linux
+%endif
+
+
 Requires(pre):    shadow-utils
 
 %{?systemd_requires}
@@ -48,13 +58,12 @@ Runtime libraries for using MUNGE.
 
 
 %prep
-%setup -q
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-cp -p %{SOURCE1} create-munge-key
+%autosetup
-cp -p %{SOURCE2} munge.logrotate
+cp "%{SOURCE4}"  README-Fedora.md
 
 %build
-%configure  --disable-static --with-crypto-lib=openssl
+%configure  --disable-static --with-crypto-lib=openssl --runstatedir="%{_rundir}" --with-systemdunitdir="%{_unitdir}"  --with-sysconfigdir="%{_sysconfdir}/sysconfig/" --with-logrotateddir="%{_sysconfdir}/logrotate.d/"
-echo "d /run/munge 0755 munge munge -" > src/etc/munge.tmpfiles.conf.in
 # Get rid of some rpaths for /usr/sbin
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -65,14 +74,11 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %make_install
 
 # Install extra files.
-install -p -m 755 create-munge-key %{buildroot}/%{_sbindir}/create-munge-key
-install -p -D -m 644 munge.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/munge
-
 install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/munge.conf
+# Not installed by make
+install -p -D -m 0644 src/etc/munge.tmpfiles.conf  %{buildroot}%{_tmpfilesdir}/%{name}.conf
 
 # rm unneeded files.
-rm %{buildroot}/%{_sysconfdir}/sysconfig/munge
-rm %{buildroot}/%{_sysconfdir}/init.d/munge
 # Exclude .la files
 rm %{buildroot}/%{_libdir}/libmunge.la
 
@@ -84,8 +90,15 @@ chmod 700 %{buildroot}%{_sysconfdir}/munge
 # Create and empty key file and pid file to be marked as a ghost file below.
 # i.e it is not actually included in the rpm, only the record
 # of it is.
-touch %{buildroot}%{_var}/run/munge/munged.pid
+touch %{buildroot}%{_rundir}/munge/munged.pid
-mv %{buildroot}%{_var}/run %{buildroot}
+
+%check
+%if %{with check}
+%make_build check \
+    LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
+    MUNGE_ROOT=/tmp/munge-$$ VERBOSE=t verbose=t
+%endif
+
 
 %pre
 %sysusers_create_compat %{SOURCE3}
@@ -106,12 +119,13 @@ mv %{buildroot}%{_var}/run %{buildroot}
 %{_bindir}/remunge
 %{_bindir}/unmunge
 %{_sbindir}/munged
-%{_sbindir}/create-munge-key
+%{_sbindir}/mungekey
 %{_mandir}/man1/munge.1.gz
 %{_mandir}/man1/remunge.1.gz
 %{_mandir}/man1/unmunge.1.gz
 %{_mandir}/man7/munge.7.gz
 %{_mandir}/man8/munged.8.gz
+%{_mandir}/man8/mungekey.8.gz
 %{_unitdir}/munge.service
 
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
@@ -123,10 +137,12 @@ mv %{buildroot}%{_var}/run %{buildroot}
 %{_tmpfilesdir}/munge.conf
 %{_sysusersdir}/munge.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/munge
+%config(noreplace) %{_sysconfdir}/sysconfig/munge
 
 %license COPYING COPYING.LESSER
+%doc README-Fedora.md
 %doc AUTHORS
-%doc JARGON META NEWS QUICKSTART README
+%doc JARGON NEWS QUICKSTART README
 %doc doc
 
 %files libs
@@ -155,6 +171,13 @@ mv %{buildroot}%{_var}/run %{buildroot}
 
 
 %changelog
+* Tue Nov 17 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.5.14-1
+- Update to latest release
+- Remove unneeded files
+- Update Readme.
+- Enable gpgverify
+- Enable tests
+
 * Tue Sep 29 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.5.13-10
 - Fix spec + build
 

sources

@@ -1 +1 @@
-SHA512 (munge-0.5.13.tar.xz) = 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
+SHA512 (munge-0.5.14.tar.xz) = 742c9f2c1cf9f5b070f91fc6b9e74c5f2712c385bce6820c400e884fb6d78f86dea7ebe8e3918d056bf72e746a6af5481a1a8d9f0834a28836da90a42b4eb166