rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Migrate /var/run to /run, an exercise in pointlessness

Browse Source 
Resolves: #1898410
This commit is contained in:
Robbie Harwood 2020-11-17 17:27:37 +00:00
parent d2da394f67
commit ec1ab43ca2
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kadmin.service
View File

@ -6,9 +6,9 @@ AssertPathExists=!/var/kerberos/krb5kdc/kpropd.acl
[Service] [Service]
Type=forking Type=forking
PIDFile=/var/run/kadmind.pid PIDFile=/run/kadmind.pid
EnvironmentFile=-/etc/sysconfig/kadmin EnvironmentFile=-/etc/sysconfig/kadmin
ExecStart=/usr/sbin/kadmind -P /var/run/kadmind.pid $KADMIND_ARGS ExecStart=/usr/sbin/kadmind -P /run/kadmind.pid $KADMIND_ARGS
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
[Install] [Install]

2
krb5-krb5kdc.conf
View File

@ -1 +1 @@
d /var/run/krb5kdc 0755 root root d /run/krb5kdc 0755 root root

16
krb5.spec
View File

@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.18.2 Version: 1.18.2
# for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces) # for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
Release: 29%{?dist} Release: 30%{?dist}
# rharwood has trust path to signing key and verifies on check-in # rharwood has trust path to signing key and verifies on check-in
Source0: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}%{prerelease}.tar.gz Source0: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}%{prerelease}.tar.gz
@ -258,9 +258,6 @@ sed -i -e s,7778,`expr "$PORT" + 1`,g $cfg
source %{_libdir}/tclConfig.sh source %{_libdir}/tclConfig.sh
pushd src pushd src
# Set this so that configure will have a value even if the current version of
# autoconf doesn't set one.
export runstatedir=%{_localstatedir}/run
# Work out the CFLAGS and CPPFLAGS which we intend to use. # Work out the CFLAGS and CPPFLAGS which we intend to use.
INCLUDES=-I%{_includedir}/et INCLUDES=-I%{_includedir}/et
CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIC -fno-strict-aliasing -fstack-protector-all`" CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIC -fno-strict-aliasing -fstack-protector-all`"
@ -296,13 +293,6 @@ CPPFLAGS="`echo $DEFINES $INCLUDES`"
make make
popd popd
# Sanity check the KDC_RUN_DIR.
configured_kdcrundir=`grep KDC_RUN_DIR src/include/osconf.h | awk '{print $NF}'`
configured_kdcrundir=`eval echo $configured_kdcrundir`
if test "$configured_kdcrundir" != %{_localstatedir}/run/krb5kdc ; then
exit 1
fi
# Build the docs. # Build the docs.
make -C src/doc paths.py version.py make -C src/doc paths.py version.py
cp src/doc/paths.py doc/ cp src/doc/paths.py doc/
@ -642,6 +632,10 @@ exit 0
%{_libdir}/libkadm5srv_mit.so.* %{_libdir}/libkadm5srv_mit.so.*
%changelog %changelog
* Thu Nov 17 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-30
- Migrate /var/run to /run, an exercise in pointlessness
- Resolves: #1898410
* Thu Nov 05 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-29 * Thu Nov 05 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-29
- Add recursion limit for ASN.1 indefinite lengths (CVE-2020-28196) - Add recursion limit for ASN.1 indefinite lengths (CVE-2020-28196)

4
krb5kdc.service
View File

@ -5,9 +5,9 @@ After=syslog.target network.target network-online.target
[Service] [Service]
Type=forking Type=forking
PIDFile=/var/run/krb5kdc.pid PIDFile=/run/krb5kdc.pid
EnvironmentFile=-/etc/sysconfig/krb5kdc EnvironmentFile=-/etc/sysconfig/krb5kdc
ExecStart=/usr/sbin/krb5kdc -P /var/run/krb5kdc.pid $KRB5KDC_ARGS ExecStart=/usr/sbin/krb5kdc -P /run/krb5kdc.pid $KRB5KDC_ARGS
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
[Install] [Install]