Thank you for your contribution to Debian.
Accepted:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 10 Jun 2025 17:47:35 +0200
Source: debian-edu-router
Architecture: source
Version: 2.13.0
Distribution: unstable
Urgency: medium
Maintainer: Debian Edu Developers <debian-edu@lists.debian.org>
Changed-By: Mike Gabriel <sunweaver@debian.org>
Closes: 1102662 1103447 1103907 1104795 1105914 1105963
Changes:
debian-edu-router (2.13.0) unstable; urgency=medium
.
* FINALIZE FOR DEBIAN 13:
.
[ Mike Gabriel ]
* Finalize for inclusion in Debian 13:
- conf/debian-edu/debian-edu-router-fai.conf: Default to trixie in config.
- conf/debian-edu/fai/debian-edu-router-fai.TEMPLATE/NFSROOT: Adjust
according to requirements in Debian 12 and Debian 13 FAI.
- Comment-out development APT repo, hint towards FAI upstream repo (in case
it's needed).
- conf/debian-edu/fai/debian-edu-router-fai.TEMPLATE/NFSROOT: Move
memtest86+ to DEBIAN_13-only installation block. We observed problems
when creating bookworm based FAI installer images during grub.cfg
creation.
* Prepare for trying-out Debian 14 once it becomes available:
- conf/debian-edu/debian-edu-router-fai.conf: Hint that forky is already a
supported distro codename (in theory).
- fai/config/class/DEBIAN_{14,forky}.var: Prepare for Debian 14.
- conf/debian-edu/fai/debian-edu-router-fai.TEMPLATE/apt/sources.list.in:
* Pre-release clean-ups:
- fai/config/package_config/NTP_SERVER: Drop NTP_SERVER class, not needed
(systemd-timesyncd is just fine).
- fai/config/package_config/{FIREWALL,GATEWAY}: Move uif package into
GATEWAY class (and drop FIREWALL package config).
- fai/config/class/z20_debian-edu-router.profile: Drop classes FIREWALL,
DNS_SERVER, NTP_SERVER. They have been replaced by GATEWAY class a long
time ago.
* lintian: Update several overrides to new release.
.
* LOCALIZATION:
.
[ Mike Gabriel ]
* Typo fix: Correct the spelling of the word separate.
* Run debconf-updatepo. (Closes: #1105914).
* Run debconf-updatepo once again after all translation updates had
been applied.
* Update German translation.
* Fix Portuguese translation. Apply the correct file version
now.
* fai/: Mark de_DE.UTF-8 as fully supported languaged in FAI installer.
.
[ Carles Pina i Estany ]
* debian/po: Add po-debconf Catalan translation. (Closes: #1105963).
.
[ Camaleón ]
* po/es: Update Spanish translations. (Closes: #1102662).
* debian/po/es.po: Update Spanish translation. (Closes: #1104795).
.
[ Frans Spiesschaert ]
* debian/po/nl.po: Update Dutch translation. (Closes: #1103907).
.
[ Américo Monteiro ]
* debian/po/pt.po: Update Portuguese translation. (Closes: #1103447).
.
[ Serhii Horichenko ]
* debian/po/uk.po: Add Ukrainian translation.
* debian/po/ru.po: Add Russian translation.
* po/ru: Add initial translation.
* po/uk: Add initial translation.
.
* COPYRIGHT ATTRIBUTIONS:
.
[ Mike Gabriel ]
* debian/copyright:
+ Update auto-generated copyright.in file.
+ Update copyright attributions.
.
* BUG FIXES:
.
[ Mike Gabriel ]
* conf/systemd/squid_d-e-r-p.k-c.conf: Fix key name (ExecPreStart= ->
ExecStartPre=).
* debian/debian-edu-router-plugin.content-filter.postinst: Typo fix in
variable name (filterlists_file -> filterlist_file).
* README.md: For ISO image creation instruct to install debian-edu-router-
fai with --no-install-recommends apt-get option. Otherwise, fai-server
will pull in various network service (e.g. a DHCP server) which might
cause unwanted problems on local networks.
* debian/control: Move utilities for creating FAI installer ISO images
to Depends: field, so that they even get installed if installing
debian-edu-router-fai without recommended packages (see entry above).
.
* UPSTREAM DEVELOPMENT (REGRESSION FIX / REWRITE):
.
[ Mike Gabriel ]
* Bring back e2guardian filterlist support (and various related fixes)
if SSL bumping is enabled, support fluent switching between e2guardian
and squid filterlists:
- debian/debian-edu-router-plugin.content-filter.{config,templates}:
Blacklists auto-refreshing is for squid and e2guardian. Mark it as such
in comments.
- debian-edu-router_refresh-blacklists.sh: Rename to
debian-edu-router_refresh-blacklists_squid.sh.
- bin/debian-edu-router_refresh-blacklists.sh: Re-add, but now as a wrapper
script.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Re-add script
(from commit fcf1c63e).
- bin/*: Set LANG to 'C.UTF-8', not 'c'.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Update copyright
header.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Various variable
syntax hardenings.
- bin/debian-edu-router_refresh-blacklists.sh: In addition to the debian-
edu-router_refresh-blacklists_squid.sh now also wrap the debian-edu-
router_refresh-blacklists_e2guardian.sh script.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Fix spelling
error in variable name.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Align
path naming scheme of WORK_DIR.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Align
path naming schema of SELECTED_CATEGORIES_DIR.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh:
Use LISTS_DIR pathname that can be recognized as e2guardian-specific.
- Re-introduce data/templates/header_{blacklisted,whitelistd}_categories
header templates (required for e2guardian filter config generation).
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Rename variable
and cmdline option (REMOVE_BLACKLIST -> REMOVE_BLACKLISTS,
--remove-blacklist -> --remove-blacklists).
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Use more
similar path names.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Use different path for
squid ACL filterlists and Uni Toulouse derived URL blacklists and
whitelists.
- d-e-r-p.c-f: Make filterlists processor (e2guardian vs. squid) depend on
whether SSL bumping is enabled (then: e2guardian) or disabled (then:
squid).
- debian/debian-edu-router-plugin.content-filter.postinst: Use previously
defined variables (and harden some variable syntax).
- debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Add support
for migrating data created by previous script versions.
- data/blacklists-toulouse.{e2guardian,squid}: Ship different configuration
sets for filterlists by Uni Toulouse (depending on whether used by
e2guardian or squid).
- debian/debian-edu-router-plugin.content-filter.postinst: Add support for
switching between filterlist provides (squid vs. e2guardian).
- conf/debian-edu-router-plugins/d-e-r-p.content-filter.sh: Add loginmenu
option for removing filterlists.
- bin/debian-edu-router_refresh-blacklists_squid.sh: During
remove_blacklist_files() assure that also symlinks get
removed/cleaned-up.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Only mark
FILTERLISTS_PATH with work-in-progress if filterlists get
updated/downloaded.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Ensure that
CURRENT_SQUID_DIR exists / is empty only if filterlists get
updated/downloaded.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Ensure filterlist
directories exist, even if not populated (because all categories are
commented out).
- bin/debian-edu-router_refresh-blacklists_squid.sh: Silence script
entirely if nothing happens (e.g. if in default UPDATE_FILTERLISTS mode
and no filterlists have been downloaded so far).
- bin/debian-edu-router_refresh-blacklists_squid.sh: Typo fix in variable
name.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Notify
about what filterlist mechanism is being cleaned up in
REMOVE_FILTERLISTS mode.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Add
support for skipping service restarts.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Also activate
whitelists if any.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Drop log message
'Updating blacklists...'. This does not apply in REMOVE_FILTERLISTS
mode.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Only download
filterlists from Uni Toulouse if not in REMOVE_FILTERLISTS mode.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Curate
(add/remove) filterlist includes via symlinks in
/etc/debian-edu-router/e2guardian.d/lists/common/.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Catch grep
non-zero exitcode (and ignore it). This can happen if all categories in
a category list are all commented out. Without this, the script aborts
silently on a fully commented-out category file.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Indentation fixup in
generate_squid_acl_file() function.
- debian/debian-edu-router-plugin.content-filter.prerm: Use
'debian-edu-router_refresh-blacklists --purge-filterlists' (the wrapper
script + purge) instead of individual scripts and the '...
--remove-filterlists' cmdline arg.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Add
support for purging filterlists.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Rename
variables (blacklists -> filterlists).
- conf/debian-edu-router-plugins/d-e-r-p.content-filter.sh: Edit selected
categories depending on which service (squid, e2guardian) is in charge
of blacklisting/whitelisting.
- bin/debian-edu-router_refresh-blacklists_squid.sh: Make the
one-category-per-line categories files the primary source of truth and
derive a shellinclude .sh file from it for sourcing.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Skip
blacklisted/whitelisted categories (e2guardian) if not listed in
default_selected_{blacklisted,whitelisted}_categories.
- debian/debian-edu-router-plugin.content-filter.install: Install
default_selected_{blacklisted,whitelisted}_categories to DATADIR (and
not to LOCALSTATEDIR).
- bin/debian-edu-router_{acl-watcher.sh,refresh-blacklists_e2guardian.sh}:
Log exactly what service restarts happen when updating filterlists.
- data/blacklists-toulouse.squid/selected_categories/
default_selected_blacklisted_categories: Warn about enabling too many
filtering categories when using squid-based filtering.
.
[ Daniel Teichmann ]
* Bring back e2guardian filterlist support (and various related fixes)
if SSL bumping is enabled, support fluent switching between e2guardian
and squid filterlists:
- debian/d-e-r-p.c-f.postinst: Do not purge filterlists, but remove them, to
save category selection files. (When switching between e2guardian and
squid based filtering).
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: Keep
LISTS_DIR and WORK_DIR in REMOVE_FILTERLISTS mode, only wipe them in
PURGE_FILTERLISTS mode.
- data/templates/header_{black, white}listed_categories: Update copyright
header again.
- bin/d-e-r_refresh-blacklists_squid.sh: Actually remove 26th Squid ACL
snippet file ${SNIPPETS_PATH}/26_squid_acls.toulouse_d-e-r-p.c-f.conf
if not in use.
- bin/debian-edu-router_refresh-blacklists.sh: Add d-e-r common shell
functions / variables.
- bin/debian-edu-router_refresh-blacklists_e2guardian.sh: Only do
notice_log, if its actually appropriate.
- bin/debian-edu-router_refresh-blacklists_{e2guardian,squid}.sh: If script
is not used, show this at least in a single notice_log line of output.
- conf/debian-edu-router-plugins/d-e-r-p.content-filter.sh: Show the type of
filterlists (e2guardian vs. squid) in the MANUALLY_REFRESH_BLISTS
loginmenu item.
- conf/debian-edu-router-plugins/d-e-r-p.content-filter.sh: Improve inline
docs. Make it easier to recognize menu item names.
- bin/debian-edu-router_refresh-blacklists*.sh: Move squid ACL watcher
inhibitor and re-trigger code into bin/debian-edu-router_refresh-
blacklists.sh wrapper script.
- The squid ACL watcher re-trigger is also required when switching away from
squid-based filterlists over to e2guardian-based filterlists.
Checksums-Sha1:
272cff45fad655b1fb95d6aca4a89ea8fbc53cdc 2547 debian-edu-router_2.13.0.dsc
31f089cbd83928893b443de109ddb0d36d5c747c 1130184 debian-edu-router_2.13.0.tar.xz
314fd79a4641b3e72a8e341c2e834bdfd138ac7e 6440 debian-edu-router_2.13.0_source.buildinfo
Checksums-Sha256:
2e8213d9d25705356d76a2af3a958b05183ead4b380f44ee453fba654519b1ac 2547 debian-edu-router_2.13.0.dsc
c960119b14989c564d1bbd1174fb5206676f00b77d5ffab14d5c4116094ddecb 1130184 debian-edu-router_2.13.0.tar.xz
3492c5084fe7592fdc4acb44104eff82ec748183ecd06b2258898f6df0346a2f 6440 debian-edu-router_2.13.0_source.buildinfo
Files:
0478b8d2515d41f87cc9dc4120a0177f 2547 admin optional debian-edu-router_2.13.0.dsc
52bed52005c4c765c30671c4ba762420 1130184 admin optional debian-edu-router_2.13.0.tar.xz
90b0afe3cae8e15f6c09bbf9331a3397 6440 admin optional debian-edu-router_2.13.0_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJJBAEBCgAzFiEEm/uu6GwKpf+/IgeCmvRrMCV3GzEFAmhJQz8VHHN1bndlYXZl
ckBkZWJpYW4ub3JnAAoJEJr0azAldxsxLM8QAKSV3ji8l+hOOjVGYrxUbwbdJWCD
xv3zC6ArzItEESr+ad3rnG7eKv3C/QWGvjV+8vCfLpoBRM0+aUwMmg9eAo3l9tlU
305wQEgxDWPXqbsdJGlMyKb1niwNYErYj3CQAy49RC4tlEtMvWSXNK5q/0viyyen
bea49GF77aBByxrfHDtKLVuzUBIC2244WAy309ZnBioA5L/5NsrghIUzbENDNVE+
XlPqTgW4hdBL2nTtTcQFfPfJHtUAbjKX5QYdwcLaq8ubWX4g9uDNc86vxV+MU06i
/hPhS9bhxtK7C9tXu9t7pawC7lZBjCpbmtxvK86i9BPGqedlp+OCpZ3Q9qG0VMus
OAuwxDcoNRmBSKa8ZchpOsI3oj5S5DoeUpnGUjNwwogldhb7ehGKLZTuTh3UhHG7
PFvPG35X6/UyRAI41fbDsnIspKpBjxBgyk6vUie+XzZ0uyGLOwrR54qet9tR4t8X
plMQuc/u64SrPgyG8MSfPdNql3rQDCRO1HT0qLZjjo6V2ZQnjrdVeCCrd9tsBxrC
fh6SpV9LezdBvbnXPCY5jgkYfVhUe1XRNifLVVUXkU5B9WVHAwADKVCjkEsjQUii
FZnffqHbUAVA4DvLDDsuzf37iZt33Jn1Hua6Pe7GvOZ3agk90kskXx6/LW5hAVtl
VfN02n9liIdD1Qwi
=zfhv
-----END PGP SIGNATURE-----
Attachment:
pgps6YQiduEWr.pgp
Description: PGP signature