diff --git a/.etckeeper b/.etckeeper index 9ae37342..def16b79 100755 --- a/.etckeeper +++ b/.etckeeper @@ -511,7 +511,6 @@ maybe chmod 0644 'dpkg/origins/raspbian' maybe chmod 0644 'dpkg/shlibs.default' maybe chmod 0644 'dpkg/shlibs.override' maybe chmod 0644 'dput.cf' -maybe chmod 0644 'drirc' maybe chmod 0755 'elinks' maybe chmod 0755 'emacs' maybe chmod 0755 'emacs/site-start.d' diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove index f7775b18..f9d9e85d 100644 --- a/apt/apt.conf.d/01autoremove +++ b/apt/apt.conf.d/01autoremove @@ -17,6 +17,7 @@ APT "linux-modules"; "linux-modules-extra"; "linux-signed-image"; + "linux-image-unsigned"; # kfreebsd kernels "kfreebsd-image"; "kfreebsd-headers"; @@ -30,6 +31,10 @@ APT # tools "linux-tools"; "linux-cloud-tools"; + # build info + "linux-buildinfo"; + # source code + "linux-source"; }; Never-MarkAuto-Sections diff --git a/debian_version b/debian_version index 2834e582..2f52450b 100644 --- a/debian_version +++ b/debian_version @@ -1 +1 @@ -buster/sid +10.0 diff --git a/drirc b/drirc deleted file mode 100644 index 0cd04bca..00000000 --- a/drirc +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/exim4/conf.d/acl/40_exim4-config_check_data b/exim4/conf.d/acl/40_exim4-config_check_data index 07a949db..5b5c099c 100644 --- a/exim4/conf.d/acl/40_exim4-config_check_data +++ b/exim4/conf.d/acl/40_exim4-config_check_data @@ -50,25 +50,36 @@ acl_check_data: # Add headers to a message if it is judged to be spam. Before enabling this, - # you must install SpamAssassin. You also need to set the spamd_address + # you must install SpamAssassin. You may also need to set the spamd_address # option in the main configuration. # # exim4-daemon-heavy must be used for this section to work. # - # Please note that this is only suiteable as an example. There are - # multiple issues with this configuration method. For example, if you go - # this way, you'll give your spamassassin daemon write access to the - # entire exim spool which might be a security issue in case of a - # spamassassin exploit. + # Please note that this is only suiteable as an example. See + # /usr/share/doc/exim4-base/README.Debian.gz # # See the exim docs and the exim wiki for more suitable examples. # + # # Remove internal headers # warn - # spam = Debian-exim:true - # add_header = X-Spam_score: $spam_score\n\ - # X-Spam_score_int: $spam_score_int\n\ - # X-Spam_bar: $spam_bar\n\ - # X-Spam_report: $spam_report + # remove_header = X-Spam_score: X-Spam_score_int : X-Spam_bar : \ + # X-Spam_report + # + # warn + # condition = ${if <{$message_size}{120k}{1}{0}} + # # ":true" to add headers/acl variables even if not spam + # spam = nobody:true + # add_header = X-Spam_score: $spam_score + # add_header = X-Spam_bar: $spam_bar + # # Do not enable this unless you have shorted SpamAssassin's report + # #add_header = X-Spam_report: $spam_report + # + # Reject spam messages (score >15.0). + # This breaks mailing list and forward messages. + # deny + # message = Classified as spam (score $spam_score) + # condition = ${if <{$message_size}{120k}{1}{0}} + # condition = ${if >{$spam_score_int}{150}{true}{false}} # This hook allows you to hook in your own ACLs without having to diff --git a/exim4/exim4.conf.template b/exim4/exim4.conf.template index 1a81e26d..7ddb5293 100644 --- a/exim4/exim4.conf.template +++ b/exim4/exim4.conf.template @@ -942,25 +942,36 @@ acl_check_data: # Add headers to a message if it is judged to be spam. Before enabling this, - # you must install SpamAssassin. You also need to set the spamd_address + # you must install SpamAssassin. You may also need to set the spamd_address # option in the main configuration. # # exim4-daemon-heavy must be used for this section to work. # - # Please note that this is only suiteable as an example. There are - # multiple issues with this configuration method. For example, if you go - # this way, you'll give your spamassassin daemon write access to the - # entire exim spool which might be a security issue in case of a - # spamassassin exploit. + # Please note that this is only suiteable as an example. See + # /usr/share/doc/exim4-base/README.Debian.gz # # See the exim docs and the exim wiki for more suitable examples. # + # # Remove internal headers # warn - # spam = Debian-exim:true - # add_header = X-Spam_score: $spam_score\n\ - # X-Spam_score_int: $spam_score_int\n\ - # X-Spam_bar: $spam_bar\n\ - # X-Spam_report: $spam_report + # remove_header = X-Spam_score: X-Spam_score_int : X-Spam_bar : \ + # X-Spam_report + # + # warn + # condition = ${if <{$message_size}{120k}{1}{0}} + # # ":true" to add headers/acl variables even if not spam + # spam = nobody:true + # add_header = X-Spam_score: $spam_score + # add_header = X-Spam_bar: $spam_bar + # # Do not enable this unless you have shorted SpamAssassin's report + # #add_header = X-Spam_report: $spam_report + # + # Reject spam messages (score >15.0). + # This breaks mailing list and forward messages. + # deny + # message = Classified as spam (score $spam_score) + # condition = ${if <{$message_size}{120k}{1}{0}} + # condition = ${if >{$spam_score_int}{150}{true}{false}} # This hook allows you to hook in your own ACLs without having to diff --git a/issue b/issue index c339a1ef..0ecbda47 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Raspbian GNU/Linux buster/sid \n \l +Raspbian GNU/Linux 10 \n \l diff --git a/issue.net b/issue.net index 26d981a8..588f12ac 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Raspbian GNU/Linux buster/sid +Raspbian GNU/Linux 10