diff --git a/.etckeeper b/.etckeeper index 1ea1aaf..1655a3b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1061,23 +1061,23 @@ maybe chmod 0755 'issue.d' maybe chmod 0640 'issue.net' maybe chmod 0755 'java' maybe chmod 0755 'java/java-1.8.0-openjdk' -maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64' -maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/calendars.properties' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/logging.properties' -maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/blacklisted.certs' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/java.policy' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/java.security' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/nss.cfg' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/nss.fips.cfg' -maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy' -maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/limited' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/limited/US_export_policy.jar' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/limited/local_policy.jar' -maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/unlimited' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/unlimited/US_export_policy.jar' -maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/unlimited/local_policy.jar' +maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64' +maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/calendars.properties' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/logging.properties' +maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/blacklisted.certs' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/java.policy' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/java.security' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/nss.cfg' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/nss.fips.cfg' +maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy' +maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/limited' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/limited/US_export_policy.jar' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/limited/local_policy.jar' +maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/unlimited' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/unlimited/US_export_policy.jar' +maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/unlimited/local_policy.jar' maybe chmod 0755 'java/security' maybe chmod 0755 'java/security/security.d' maybe chmod 0755 'jvm' @@ -4058,6 +4058,16 @@ maybe chgrp 'mock' 'mock/eol/fedora-36-s390x.cfg' maybe chmod 0644 'mock/eol/fedora-36-s390x.cfg' maybe chgrp 'mock' 'mock/eol/fedora-36-x86_64.cfg' maybe chmod 0644 'mock/eol/fedora-36-x86_64.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-37-aarch64.cfg' +maybe chmod 0644 'mock/eol/fedora-37-aarch64.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-37-i386.cfg' +maybe chmod 0644 'mock/eol/fedora-37-i386.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-37-ppc64le.cfg' +maybe chmod 0644 'mock/eol/fedora-37-ppc64le.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-37-s390x.cfg' +maybe chmod 0644 'mock/eol/fedora-37-s390x.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-37-x86_64.cfg' +maybe chmod 0644 'mock/eol/fedora-37-x86_64.cfg' maybe chgrp 'mock' 'mock/eol/mageia-6-armv5tl.cfg' maybe chmod 0644 'mock/eol/mageia-6-armv5tl.cfg' maybe chgrp 'mock' 'mock/eol/mageia-6-armv7hl.cfg' @@ -4129,16 +4139,6 @@ maybe chgrp 'mock' 'mock/eurolinux-9-i686.cfg' maybe chmod 0644 'mock/eurolinux-9-i686.cfg' maybe chgrp 'mock' 'mock/eurolinux-9-x86_64.cfg' maybe chmod 0644 'mock/eurolinux-9-x86_64.cfg' -maybe chgrp 'mock' 'mock/fedora-37-aarch64.cfg' -maybe chmod 0644 'mock/fedora-37-aarch64.cfg' -maybe chgrp 'mock' 'mock/fedora-37-i386.cfg' -maybe chmod 0644 'mock/fedora-37-i386.cfg' -maybe chgrp 'mock' 'mock/fedora-37-ppc64le.cfg' -maybe chmod 0644 'mock/fedora-37-ppc64le.cfg' -maybe chgrp 'mock' 'mock/fedora-37-s390x.cfg' -maybe chmod 0644 'mock/fedora-37-s390x.cfg' -maybe chgrp 'mock' 'mock/fedora-37-x86_64.cfg' -maybe chmod 0644 'mock/fedora-37-x86_64.cfg' maybe chgrp 'mock' 'mock/fedora-38-aarch64.cfg' maybe chmod 0644 'mock/fedora-38-aarch64.cfg' maybe chgrp 'mock' 'mock/fedora-38-i386.cfg' @@ -6081,6 +6081,8 @@ maybe chmod 0640 'squid/passwords' maybe chgrp 'squid' 'squid/squid.conf' maybe chmod 0640 'squid/squid.conf' maybe chmod 0644 'squid/squid.conf.default' +maybe chgrp 'squid' 'squid/squid.conf.rpmnew' +maybe chmod 0640 'squid/squid.conf.rpmnew' maybe chmod 0640 'squid/userip.conf' maybe chmod 0755 'ssh' maybe chmod 0644 'ssh/moduli' diff --git a/alternatives/alt-java b/alternatives/alt-java index 5e131f0..4beb7be 120000 --- a/alternatives/alt-java +++ b/alternatives/alt-java @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/alt-java \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/alt-java \ No newline at end of file diff --git a/alternatives/alt-java.1.gz b/alternatives/alt-java.1.gz index 3b7fcaf..daf650f 120000 --- a/alternatives/alt-java.1.gz +++ b/alternatives/alt-java.1.gz @@ -1 +1 @@ -/usr/share/man/man1/alt-java-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/alt-java-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/java b/alternatives/java index 34ad49c..935d5dc 120000 --- a/alternatives/java +++ b/alternatives/java @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/java \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/java \ No newline at end of file diff --git a/alternatives/java.1.gz b/alternatives/java.1.gz index 909c423..d068a65 120000 --- a/alternatives/java.1.gz +++ b/alternatives/java.1.gz @@ -1 +1 @@ -/usr/share/man/man1/java-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/java-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/jjs b/alternatives/jjs index b2834df..9273bf3 120000 --- a/alternatives/jjs +++ b/alternatives/jjs @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/jjs \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/jjs \ No newline at end of file diff --git a/alternatives/jjs.1.gz b/alternatives/jjs.1.gz index b29e07c..a182134 120000 --- a/alternatives/jjs.1.gz +++ b/alternatives/jjs.1.gz @@ -1 +1 @@ -/usr/share/man/man1/jjs-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/jjs-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/jre b/alternatives/jre index de56657..c415e49 120000 --- a/alternatives/jre +++ b/alternatives/jre @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre \ No newline at end of file diff --git a/alternatives/jre_1.8.0 b/alternatives/jre_1.8.0 index de56657..c415e49 120000 --- a/alternatives/jre_1.8.0 +++ b/alternatives/jre_1.8.0 @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre \ No newline at end of file diff --git a/alternatives/jre_1.8.0_openjdk b/alternatives/jre_1.8.0_openjdk index 8516524..7af4b8b 120000 --- a/alternatives/jre_1.8.0_openjdk +++ b/alternatives/jre_1.8.0_openjdk @@ -1 +1 @@ -/usr/lib/jvm/jre-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64 \ No newline at end of file +/usr/lib/jvm/jre-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64 \ No newline at end of file diff --git a/alternatives/jre_openjdk b/alternatives/jre_openjdk index de56657..c415e49 120000 --- a/alternatives/jre_openjdk +++ b/alternatives/jre_openjdk @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre \ No newline at end of file diff --git a/alternatives/keytool b/alternatives/keytool index d51806c..c295054 120000 --- a/alternatives/keytool +++ b/alternatives/keytool @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/keytool \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/keytool \ No newline at end of file diff --git a/alternatives/keytool.1.gz b/alternatives/keytool.1.gz index cfdd282..1a31c3d 120000 --- a/alternatives/keytool.1.gz +++ b/alternatives/keytool.1.gz @@ -1 +1 @@ -/usr/share/man/man1/keytool-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/keytool-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/orbd b/alternatives/orbd index c499dae..df0183b 120000 --- a/alternatives/orbd +++ b/alternatives/orbd @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/orbd \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/orbd \ No newline at end of file diff --git a/alternatives/orbd.1.gz b/alternatives/orbd.1.gz index 6b140ad..1d13aea 120000 --- a/alternatives/orbd.1.gz +++ b/alternatives/orbd.1.gz @@ -1 +1 @@ -/usr/share/man/man1/orbd-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/orbd-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/pack200 b/alternatives/pack200 index e406256..c484b49 120000 --- a/alternatives/pack200 +++ b/alternatives/pack200 @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/pack200 \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/pack200 \ No newline at end of file diff --git a/alternatives/pack200.1.gz b/alternatives/pack200.1.gz index daa1a7c..9d94479 120000 --- a/alternatives/pack200.1.gz +++ b/alternatives/pack200.1.gz @@ -1 +1 @@ -/usr/share/man/man1/pack200-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/pack200-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/policytool b/alternatives/policytool index 49526b8..f03088b 120000 --- a/alternatives/policytool +++ b/alternatives/policytool @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/policytool \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/policytool \ No newline at end of file diff --git a/alternatives/policytool.1.gz b/alternatives/policytool.1.gz index b2c5227..03f32fb 120000 --- a/alternatives/policytool.1.gz +++ b/alternatives/policytool.1.gz @@ -1 +1 @@ -/usr/share/man/man1/policytool-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/policytool-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/rmid b/alternatives/rmid index 4b4f22f..45882e8 120000 --- a/alternatives/rmid +++ b/alternatives/rmid @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/rmid \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/rmid \ No newline at end of file diff --git a/alternatives/rmid.1.gz b/alternatives/rmid.1.gz index faafc5a..c556c4f 120000 --- a/alternatives/rmid.1.gz +++ b/alternatives/rmid.1.gz @@ -1 +1 @@ -/usr/share/man/man1/rmid-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/rmid-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/rmiregistry b/alternatives/rmiregistry index 3537ddb..45f2629 120000 --- a/alternatives/rmiregistry +++ b/alternatives/rmiregistry @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/rmiregistry \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/rmiregistry \ No newline at end of file diff --git a/alternatives/rmiregistry.1.gz b/alternatives/rmiregistry.1.gz index 70df5ef..c217b98 120000 --- a/alternatives/rmiregistry.1.gz +++ b/alternatives/rmiregistry.1.gz @@ -1 +1 @@ -/usr/share/man/man1/rmiregistry-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/rmiregistry-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/servertool b/alternatives/servertool index 6f31d05..077db11 120000 --- a/alternatives/servertool +++ b/alternatives/servertool @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/servertool \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/servertool \ No newline at end of file diff --git a/alternatives/servertool.1.gz b/alternatives/servertool.1.gz index a69cac8..58378a3 120000 --- a/alternatives/servertool.1.gz +++ b/alternatives/servertool.1.gz @@ -1 +1 @@ -/usr/share/man/man1/servertool-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/servertool-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/tnameserv b/alternatives/tnameserv index c235206..75235e7 120000 --- a/alternatives/tnameserv +++ b/alternatives/tnameserv @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/tnameserv \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/tnameserv \ No newline at end of file diff --git a/alternatives/tnameserv.1.gz b/alternatives/tnameserv.1.gz index c47785d..0382e0e 120000 --- a/alternatives/tnameserv.1.gz +++ b/alternatives/tnameserv.1.gz @@ -1 +1 @@ -/usr/share/man/man1/tnameserv-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/tnameserv-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/alternatives/unpack200 b/alternatives/unpack200 index adb0398..0cd24ef 120000 --- a/alternatives/unpack200 +++ b/alternatives/unpack200 @@ -1 +1 @@ -/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/jre/bin/unpack200 \ No newline at end of file +/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/jre/bin/unpack200 \ No newline at end of file diff --git a/alternatives/unpack200.1.gz b/alternatives/unpack200.1.gz index a73828b..d83bc64 120000 --- a/alternatives/unpack200.1.gz +++ b/alternatives/unpack200.1.gz @@ -1 +1 @@ -/usr/share/man/man1/unpack200-java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64.1.gz \ No newline at end of file +/usr/share/man/man1/unpack200-java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64.1.gz \ No newline at end of file diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/calendars.properties b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/calendars.properties similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/calendars.properties rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/calendars.properties diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/logging.properties b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/logging.properties similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/logging.properties rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/logging.properties diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/blacklisted.certs b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/blacklisted.certs similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/blacklisted.certs rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/blacklisted.certs diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/cacerts b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/cacerts similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/cacerts rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/cacerts diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/java.policy b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/java.policy similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/java.policy rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/java.policy diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/java.security b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/java.security similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/java.security rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/java.security diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/nss.cfg b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/nss.cfg similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/nss.cfg rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/nss.cfg diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/nss.fips.cfg b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/nss.fips.cfg similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/nss.fips.cfg rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/nss.fips.cfg diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/limited/US_export_policy.jar b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/limited/US_export_policy.jar similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/limited/US_export_policy.jar rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/limited/US_export_policy.jar diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/limited/local_policy.jar b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/limited/local_policy.jar similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/limited/local_policy.jar rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/limited/local_policy.jar diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/unlimited/US_export_policy.jar b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/unlimited/US_export_policy.jar similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/unlimited/US_export_policy.jar rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/unlimited/US_export_policy.jar diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/unlimited/local_policy.jar b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/unlimited/local_policy.jar similarity index 100% rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.392.b08-4.el8.x86_64/lib/security/policy/unlimited/local_policy.jar rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.402.b06-2.el8.x86_64/lib/security/policy/unlimited/local_policy.jar diff --git a/mock/fedora-37-aarch64.cfg b/mock/eol/fedora-37-aarch64.cfg similarity index 100% rename from mock/fedora-37-aarch64.cfg rename to mock/eol/fedora-37-aarch64.cfg diff --git a/mock/fedora-37-i386.cfg b/mock/eol/fedora-37-i386.cfg similarity index 100% rename from mock/fedora-37-i386.cfg rename to mock/eol/fedora-37-i386.cfg diff --git a/mock/fedora-37-ppc64le.cfg b/mock/eol/fedora-37-ppc64le.cfg similarity index 100% rename from mock/fedora-37-ppc64le.cfg rename to mock/eol/fedora-37-ppc64le.cfg diff --git a/mock/fedora-37-s390x.cfg b/mock/eol/fedora-37-s390x.cfg similarity index 100% rename from mock/fedora-37-s390x.cfg rename to mock/eol/fedora-37-s390x.cfg diff --git a/mock/fedora-37-x86_64.cfg b/mock/eol/fedora-37-x86_64.cfg similarity index 100% rename from mock/fedora-37-x86_64.cfg rename to mock/eol/fedora-37-x86_64.cfg diff --git a/mock/templates/fedora-branched.tpl b/mock/templates/fedora-branched.tpl index 08d082f..24eb021 100644 --- a/mock/templates/fedora-branched.tpl +++ b/mock/templates/fedora-branched.tpl @@ -14,6 +14,7 @@ config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:{{ releaseve config_opts['dnf.conf'] = """ [main] keepcache=1 +system_cachedir=/var/cache/dnf debuglevel=2 reposdir=/dev/null logfile=/var/log/yum.log diff --git a/mock/templates/fedora-rawhide.tpl b/mock/templates/fedora-rawhide.tpl index b6796e1..1d9efc8 100644 --- a/mock/templates/fedora-rawhide.tpl +++ b/mock/templates/fedora-rawhide.tpl @@ -23,6 +23,7 @@ config_opts['description'] = 'Fedora Rawhide' config_opts['dnf.conf'] = """ [main] keepcache=1 +system_cachedir=/var/cache/dnf debuglevel=2 reposdir=/dev/null logfile=/var/log/yum.log diff --git a/rspamd/modules.d/rbl.conf b/rspamd/modules.d/rbl.conf index dcb5661..79dfc84 100644 --- a/rspamd/modules.d/rbl.conf +++ b/rspamd/modules.d/rbl.conf @@ -167,6 +167,7 @@ rbl { RSPAMD_EMAILBL { ignore_whitelist = true; + ignore_url_whitelist = true; ignore_defaults = true; exclude_users = false; emails_delimiter = "."; @@ -182,6 +183,7 @@ rbl { MSBL_EBL { ignore_whitelist = true; + ignore_url_whitelist = true; ignore_defaults = true; exclude_users = false; rbl = "ebl.msbl.org"; diff --git a/rspamd/rspamd.conf.rpmnew b/rspamd/rspamd.conf.rpmnew index 8ce9344..b05a18b 100644 --- a/rspamd/rspamd.conf.rpmnew +++ b/rspamd/rspamd.conf.rpmnew @@ -66,7 +66,7 @@ worker "rspamd_proxy" { worker "fuzzy" { bind_socket = "localhost:11335"; - count = -1; # Disable by default + count = -1; # Disable by default, see #4677 for details .include "$CONFDIR/worker-fuzzy.inc" .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc" diff --git a/selinux/targeted/.policy.sha512 b/selinux/targeted/.policy.sha512 index f27916f..abc5f65 100644 --- a/selinux/targeted/.policy.sha512 +++ b/selinux/targeted/.policy.sha512 @@ -1 +1 @@ -da21fddcacbf8f3ec089e14164092f9fc387952f306da7cb453df6b823b94227ab2d5d5605d49e25350050f62133f9c09fd30eef16a837456b0b59b8c4f6873b +74568de21cee2c805e95bec3f792112650c5c8691323475260068f9bb79bb41952a3d6835ee42584446c1c6d55bf41448475141a64a74f62b12e6a66dac14ac5 diff --git a/selinux/targeted/policy/policy.31 b/selinux/targeted/policy/policy.31 index 933a11a..c11317e 100644 Binary files a/selinux/targeted/policy/policy.31 and b/selinux/targeted/policy/policy.31 differ diff --git a/squid/errorpage.css b/squid/errorpage.css index 38ba434..facee93 100644 --- a/squid/errorpage.css +++ b/squid/errorpage.css @@ -73,7 +73,7 @@ p { pre { } -/* special event: FTP / Gopher directory listing */ +/* special event: FTP directory listing */ #dirmsg { font-family: courier, monospace; color: black; diff --git a/squid/errorpage.css.default b/squid/errorpage.css.default index 38ba434..facee93 100644 --- a/squid/errorpage.css.default +++ b/squid/errorpage.css.default @@ -73,7 +73,7 @@ p { pre { } -/* special event: FTP / Gopher directory listing */ +/* special event: FTP directory listing */ #dirmsg { font-family: courier, monospace; color: black; diff --git a/squid/squid.conf.default b/squid/squid.conf.default index 8d52410..0dcac5c 100644 --- a/squid/squid.conf.default +++ b/squid/squid.conf.default @@ -18,7 +18,6 @@ acl SSL_ports port 443 acl Safe_ports port 80 # http acl Safe_ports port 21 # ftp acl Safe_ports port 443 # https -acl Safe_ports port 70 # gopher acl Safe_ports port 210 # wais acl Safe_ports port 1025-65535 # unregistered ports acl Safe_ports port 280 # http-mgmt @@ -71,6 +70,5 @@ coredump_dir /var/spool/squid # Add any of your own refresh_pattern entries above these. # refresh_pattern ^ftp: 1440 20% 10080 -refresh_pattern ^gopher: 1440 0% 1440 refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 refresh_pattern . 0 20% 4320 diff --git a/squid/squid.conf.rpmnew b/squid/squid.conf.rpmnew new file mode 100644 index 0000000..0dcac5c --- /dev/null +++ b/squid/squid.conf.rpmnew @@ -0,0 +1,74 @@ +# +# Recommended minimum configuration: +# + +# Example rule allowing access from your local networks. +# Adapt to list your (internal) IP networks from where browsing +# should be allowed +acl localnet src 0.0.0.1-0.255.255.255 # RFC 1122 "this" network (LAN) +acl localnet src 10.0.0.0/8 # RFC 1918 local private network (LAN) +acl localnet src 100.64.0.0/10 # RFC 6598 shared address space (CGN) +acl localnet src 169.254.0.0/16 # RFC 3927 link-local (directly plugged) machines +acl localnet src 172.16.0.0/12 # RFC 1918 local private network (LAN) +acl localnet src 192.168.0.0/16 # RFC 1918 local private network (LAN) +acl localnet src fc00::/7 # RFC 4193 local private network range +acl localnet src fe80::/10 # RFC 4291 link-local (directly plugged) machines + +acl SSL_ports port 443 +acl Safe_ports port 80 # http +acl Safe_ports port 21 # ftp +acl Safe_ports port 443 # https +acl Safe_ports port 210 # wais +acl Safe_ports port 1025-65535 # unregistered ports +acl Safe_ports port 280 # http-mgmt +acl Safe_ports port 488 # gss-http +acl Safe_ports port 591 # filemaker +acl Safe_ports port 777 # multiling http +acl CONNECT method CONNECT + +# +# Recommended minimum Access Permission configuration: +# +# Deny requests to certain unsafe ports +http_access deny !Safe_ports + +# Deny CONNECT to other than secure SSL ports +http_access deny CONNECT !SSL_ports + +# Only allow cachemgr access from localhost +http_access allow localhost manager +http_access deny manager + +# We strongly recommend the following be uncommented to protect innocent +# web applications running on the proxy server who think the only +# one who can access services on "localhost" is a local user +#http_access deny to_localhost + +# +# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS +# + +# Example rule allowing access from your local networks. +# Adapt localnet in the ACL section to list your (internal) IP networks +# from where browsing should be allowed +http_access allow localnet +http_access allow localhost + +# And finally deny all other access to this proxy +http_access deny all + +# Squid normally listens to port 3128 +http_port 3128 + +# Uncomment and adjust the following to add a disk cache directory. +#cache_dir ufs /var/spool/squid 100 16 256 + +# Leave coredumps in the first cache dir +coredump_dir /var/spool/squid + +# +# Add any of your own refresh_pattern entries above these. +# +refresh_pattern ^ftp: 1440 20% 10080 +refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 +refresh_pattern . 0 20% 4320