* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 019ee8a8849d9cf7de4d8bd39a151e7b1b3135b6
@ 2026-01-15 14:52 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-01-15 14:52 UTC (permalink / raw)
To: ipfire-scm
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 24444 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 019ee8a8849d9cf7de4d8bd39a151e7b1b3135b6 (commit)
via d95591ffdd4f571ad6d428f6ff7936e1a874d7a6 (commit)
via 8f1014822a721b4dfab994f4298af6bcba09f4c0 (commit)
via 2d2c8b9232689b4b146018efaca8178c5e4e637f (commit)
via 770b17653147f6e91889d7730a96ead48cb4d229 (commit)
via 0ebcde8dc8cf33f7663c8788c7f97f3e87937488 (commit)
via 42732fe154b38287278355fd300e878f0786a8fa (commit)
from 5504f0d4682d4162c223c5817ad30d23764fb37f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 019ee8a8849d9cf7de4d8bd39a151e7b1b3135b6
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Jan 15 14:47:00 2026 +0000
core200: Remove reiserfsprogs
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit d95591ffdd4f571ad6d428f6ff7936e1a874d7a6
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Jan 15 15:00:09 2026 +0100
langs: Update for removal of reiserfsprogs
- Removal of two reiserfs warnings from 5 language files that were updated
- Update of missing language items and language issues
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 8f1014822a721b4dfab994f4298af6bcba09f4c0
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Jan 15 15:00:08 2026 +0100
update.sh: Don't allow update if reiserfs used
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 2d2c8b9232689b4b146018efaca8178c5e4e637f
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Jan 15 15:00:07 2026 +0100
index.cgi: Remove reiserfs warning from WUI home page
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 770b17653147f6e91889d7730a96ead48cb4d229
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Jan 15 15:00:06 2026 +0100
make.sh: Remove reiserfsprogs from build
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 0ebcde8dc8cf33f7663c8788c7f97f3e87937488
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Jan 15 15:00:05 2026 +0100
reiserfsprogs: Removal of package as reiserfs no longer supported by kernel 6.18
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 42732fe154b38287278355fd300e878f0786a8fa
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Jan 14 14:36:33 2026 +0000
hostapd: Remove DEBUG= setting on update
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/reiserfsprogs | 31 ----------
config/rootfiles/core/200/update.sh | 16 +++++-
doc/language_issues.de | 2 -
doc/language_issues.en | 2 -
doc/language_issues.it | 2 -
doc/language_issues.nl | 2 -
doc/language_issues.pl | 2 -
doc/language_issues.ru | 2 -
doc/language_issues.tr | 2 -
doc/language_missings | 12 ----
html/cgi-bin/index.cgi | 6 +-
langs/en/cgi-bin/en.pl | 2 -
langs/es/cgi-bin/es.pl | 2 -
langs/fr/cgi-bin/fr.pl | 2 -
langs/tw/cgi-bin/tw.pl | 2 -
langs/zh/cgi-bin/zh.pl | 2 -
lfs/hostapd | 2 +-
lfs/reiserfsprogs | 81 ---------------------------
make.sh | 1 -
src/paks/hostapd/update.sh | 6 ++
src/patches/reiserfsprogs-3.6.27-loff_t.patch | 16 ------
21 files changed, 22 insertions(+), 173 deletions(-)
delete mode 100644 config/rootfiles/common/reiserfsprogs
delete mode 100644 lfs/reiserfsprogs
delete mode 100644 src/patches/reiserfsprogs-3.6.27-loff_t.patch
Difference in files:
diff --git a/config/rootfiles/common/reiserfsprogs b/config/rootfiles/common/reiserfsprogs
deleted file mode 100644
index ac375e9413..0000000000
--- a/config/rootfiles/common/reiserfsprogs
+++ /dev/null
@@ -1,31 +0,0 @@
-#sbin/debugfs.reiserfs
-#sbin/debugreiserfs
-sbin/fsck.reiserfs
-sbin/mkfs.reiserfs
-sbin/mkreiserfs
-sbin/reiserfsck
-sbin/reiserfstune
-sbin/resize_reiserfs
-sbin/tunefs.reiserfs
-#usr/include/reiserfs
-#usr/include/reiserfs/io.h
-#usr/include/reiserfs/misc.h
-#usr/include/reiserfs/reiserfs_err.h
-#usr/include/reiserfs/reiserfs_fs.h
-#usr/include/reiserfs/reiserfs_lib.h
-#usr/include/reiserfs/swab.h
-#usr/lib/libreiserfscore.a
-#usr/lib/libreiserfscore.la
-#usr/lib/libreiserfscore.so
-usr/lib/libreiserfscore.so.0
-usr/lib/libreiserfscore.so.0.0.0
-#usr/lib/pkgconfig/reiserfscore.pc
-#usr/share/man/man8/debugfs.reiserfs.8
-#usr/share/man/man8/debugreiserfs.8
-#usr/share/man/man8/fsck.reiserfs.8
-#usr/share/man/man8/mkfs.reiserfs.8
-#usr/share/man/man8/mkreiserfs.8
-#usr/share/man/man8/reiserfsck.8
-#usr/share/man/man8/reiserfstune.8
-#usr/share/man/man8/resize_reiserfs.8
-#usr/share/man/man8/tunefs.reiserfs.8
diff --git a/config/rootfiles/core/200/update.sh b/config/rootfiles/core/200/update.sh
index 40e07cc8d0..22b090abf2 100644
--- a/config/rootfiles/core/200/update.sh
+++ b/config/rootfiles/core/200/update.sh
@@ -71,6 +71,10 @@ if [ $BOOTSIZE -lt 100000 ]; then
exit_with_error "ERROR cannot update. BOOT partition is to small." 3
fi
+# Check if reiser filesystem is used
+if [ `/bin/grep -c "reiserfs" /proc/self/mounts` > 0 ]; then
+ exit_with_error "ERROR cannot update because reiserfs no longer supported by kernel." 4
+
# Remove the old kernel
rm -rvf \
/boot/System.map-* \
@@ -102,8 +106,16 @@ done
rm -vrf \
/usr/bin/gpg-zip \
/usr/lib/gnupg \
- /var/ipfire/main/gpl_accepted
-
+ /var/ipfire/main/gpl_accepted \
+ /sbin/fsck.reiserfs \
+ /sbin/mkfs.reiserfs \
+ /sbin/mkreiserfs \
+ /sbin/reiserfsck \
+ /sbin/reiserfstune \
+ /sbin/resize_reiserfs \
+ /sbin/tunefs.reiserfs \
+ /usr/lib/libreiserfscore.so.0 \
+ /usr/lib/libreiserfscore.so.0.0.0
# Extract files
extract_files
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 9d8ed9011d..008b9520ff 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -1061,8 +1061,6 @@ WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
WARNING: untranslated string: quality of service = Quality of Service
WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS)
WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
-WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
-WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: remarks = Remarks
WARNING: untranslated string: required = Required
WARNING: untranslated string: route config changed = unknown string
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3e764c9dd8..6ea0f19639 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1605,8 +1605,6 @@ WARNING: untranslated string: refresh = Refresh
WARNING: untranslated string: refresh index page while connected = Refresh index.cgi page while connected
WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS)
WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
-WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
-WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
WARNING: untranslated string: remark = Remark
WARNING: untranslated string: remark title = Remark:
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 83cbc8afaf..5214abda24 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1367,8 +1367,6 @@ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing
WARNING: untranslated string: received = Received
WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS)
WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
-WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
-WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
WARNING: untranslated string: remarks = Remarks
WARNING: untranslated string: remote subnets = Remote Subnets
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 0748c0a56f..d3f8147856 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1388,8 +1388,6 @@ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing
WARNING: untranslated string: received = Received
WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS)
WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
-WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
-WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: remarks = Remarks
WARNING: untranslated string: remote subnets = Remote Subnets
WARNING: untranslated string: required = Required
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index e3b92b923b..24b5429ef4 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1546,8 +1546,6 @@ WARNING: untranslated string: received = Received
WARNING: untranslated string: red1 = RED
WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS)
WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
-WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
-WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
WARNING: untranslated string: remarks = Remarks
WARNING: untranslated string: remote subnets = Remote Subnets
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 1ffc922a25..0682bfd6f2 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1545,8 +1545,6 @@ WARNING: untranslated string: received = Received
WARNING: untranslated string: red1 = RED
WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS)
WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
-WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
-WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
WARNING: untranslated string: remarks = Remarks
WARNING: untranslated string: remote subnets = Remote Subnets
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 475dfaa24b..2ef6920ac5 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1279,8 +1279,6 @@ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing
WARNING: untranslated string: received = Received
WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS)
WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
-WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
-WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
WARNING: untranslated string: remarks = Remarks
WARNING: untranslated string: remote subnets = Remote Subnets
diff --git a/doc/language_missings b/doc/language_missings
index ab82a573d9..1d435f16fd 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -113,8 +113,6 @@
< random number generator daemon
< regenerate host certificate
< reg_file_data_sampling
-< reiserfs warning1
-< reiserfs warning2
< remarks
< report exporting
< required
@@ -894,8 +892,6 @@
< received
< regenerate host certificate
< reg_file_data_sampling
-< reiserfs warning1
-< reiserfs warning2
< release
< remarks
< remote subnets
@@ -1610,8 +1606,6 @@
< received
< regenerate host certificate
< reg_file_data_sampling
-< reiserfs warning1
-< reiserfs warning2
< remarks
< remote subnets
< report exporting
@@ -2665,8 +2659,6 @@
< red1
< regenerate host certificate
< reg_file_data_sampling
-< reiserfs warning1
-< reiserfs warning2
< release
< remarks
< remote subnets
@@ -3832,8 +3824,6 @@
< red1
< regenerate host certificate
< reg_file_data_sampling
-< reiserfs warning1
-< reiserfs warning2
< release
< remarks
< remote subnets
@@ -4481,8 +4471,6 @@
< received
< regenerate host certificate
< reg_file_data_sampling
-< reiserfs warning1
-< reiserfs warning2
< release
< remarks
< remote subnets
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index e0e18dd620..c77707c8f0 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2025 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2026 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -599,10 +599,6 @@ if ( -e "/var/run/need_reboot" ) {
push(@warnings, $Lang::tr{'needreboot'});
}
-if ( `/bin/grep -c "reiserfs" /proc/self/mounts` > 0 ) {
- push (@warnings, $Lang::tr{'reiserfs warning1'} . " " . $Lang::tr{'reiserfs warning2'});
-}
-
# Show any warnings
&Header::warningbox(@warnings);
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 254d1cb33f..79a5124986 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2291,8 +2291,6 @@
'reg_file_data_sampling' => 'Register File Data Sampling (RFDS)',
'regenerate host certificate' => 'Renew Host Certificate',
'registered user rules' => 'Talos VRT rules for registered users',
-'reiserfs warning1' => 'Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.',
-'reiserfs warning2' => 'Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.',
'release' => 'Release',
'released' => 'Released',
'reload' => 'reload',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index fb529805ea..63ad68aa65 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -2252,8 +2252,6 @@
'reg_file_data_sampling' => 'Registro de archivos de muestreo (RFDS)',
'regenerate host certificate' => 'Renovar certificado de host',
'registered user rules' => 'Reglas VRT talos para usuarios registrados',
-'reiserfs warning1' => 'Reiserfs está obsoleto y su eliminación del kernel está prevista para 2025.',
-'reiserfs warning2' => 'Asegúrese de realizar una nueva instalación utilizando sistemas de archivos ext4 o xfs antes de esa fecha.',
'release' => 'Liberación',
'released' => 'Liberado',
'reload' => 'recargar',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 57db1f3948..af960b4e93 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -2216,8 +2216,6 @@
'refresh update list' => 'Actualiser la liste des mises à jour',
'regenerate host certificate' => 'Renouveler le certificat hôte',
'registered user rules' => 'Règles Sourcefire VRT pour les utilisateurs enregistrés',
-'reiserfs warning1' => 'Reiserfs est obsolète et devrait être supprimé du noyau en 2025.',
-'reiserfs warning2' => 'Assurez-vous qu\'une nouvelle installation est effectuée à l\'aide des systèmes de fichiers ext4 ou xfs avant cette date.',
'release' => 'Révision',
'released' => 'Disponible',
'reload' => 'Recharger',
diff --git a/langs/tw/cgi-bin/tw.pl b/langs/tw/cgi-bin/tw.pl
index 563be3a218..ea6646c452 100644
--- a/langs/tw/cgi-bin/tw.pl
+++ b/langs/tw/cgi-bin/tw.pl
@@ -2244,8 +2244,6 @@
'reg_file_data_sampling' => '寄存器文件數據採樣 (RFDS)',
'regenerate host certificate' => '更新主機證書',
'registered user rules' => '註冊用戶的 Talos VRT 規則',
-'reiserfs warning1' => 'Reiserfs 已過時，計劃在 2025 年從內核中刪除。',
-'reiserfs warning2' => '請確保在該日期之前使用 ext4 或 xfs 文件系統進行全新安裝。',
'release' => '發布',
'released' => '已發行',
'reload' => '重新加載',
diff --git a/langs/zh/cgi-bin/zh.pl b/langs/zh/cgi-bin/zh.pl
index ed81953edf..9a37533e98 100644
--- a/langs/zh/cgi-bin/zh.pl
+++ b/langs/zh/cgi-bin/zh.pl
@@ -2244,8 +2244,6 @@
'reg_file_data_sampling' => '寄存器文件数据采样 (RFDS)',
'regenerate host certificate' => '更新主机证书',
'registered user rules' => '注册用户的 Talos VRT 规则',
-'reiserfs warning1' => 'Reiserfs 已过时，计划在 2025 年从内核中删除。',
-'reiserfs warning2' => '请确保在该日期之前使用 ext4 或 xfs 文件系统进行全新安装。',
'release' => '发布',
'released' => '已发行',
'reload' => '重新加载',
diff --git a/lfs/hostapd b/lfs/hostapd
index 4f8a7d4bc0..1bb77a5e83 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
-PAK_VER = 70
+PAK_VER = 71
DEPS =
diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs
deleted file mode 100644
index 048345fae3..0000000000
--- a/lfs/reiserfsprogs
+++ /dev/null
@@ -1,81 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 3.6.27
-
-THISAPP = reiserfsprogs-$(VER)
-DL_FILE = $(THISAPP).tar.xz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
- @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiserfsprogs-3.6.27-loff_t.patch
- cd $(DIR_APP) && autoreconf -vfi
- cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- ln -svf reiserfsck /sbin/fsck.reiserfs
- ln -svf mkreiserfs /sbin/mkfs.reiserfs
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 5372c6be20..433bd70f78 100755
--- a/make.sh
+++ b/make.sh
@@ -1749,7 +1749,6 @@ build_system() {
lfsmake2 xorriso
lfsmake2 dosfstools
lfsmake2 exfatprogs
- lfsmake2 reiserfsprogs
lfsmake2 xfsprogs
lfsmake2 sysfsutils
lfsmake2 fuse
diff --git a/src/paks/hostapd/update.sh b/src/paks/hostapd/update.sh
index 46deb04d1f..05d197603a 100644
--- a/src/paks/hostapd/update.sh
+++ b/src/paks/hostapd/update.sh
@@ -23,5 +23,11 @@
#
. /opt/pakfire/lib/functions.sh
exctract_backup_includes
+
+# Remove any previous DEBUG= statements
+if [ -e "/var/ipfire/wlanap/settings" ]; then
+ sed -e "/^DEBUG=/d" -i /var/ipfire/wlanap/settings
+fi
+
./uninstall.sh
./install.sh
diff --git a/src/patches/reiserfsprogs-3.6.27-loff_t.patch b/src/patches/reiserfsprogs-3.6.27-loff_t.patch
deleted file mode 100644
index 9ab8519e77..0000000000
--- a/src/patches/reiserfsprogs-3.6.27-loff_t.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-glibc-2.28 did hide loff_t indef system-specific macros:
- https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=663e7d784977f6b15c0cab73f754f9f39c9c0c2c
-
-This caused build failure:
- ../include/reiserfs_lib.h:300:55: error: unknown type name 'loff_t'; did you mean 'off_t'?
-
-Re-enable extensions to pull loff_t back.
-
-https://bugs.gentoo.org/663930
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,2 +23,4 @@ AC_PROG_MAKE_SET
- AC_PROG_LIBTOOL
-+dnl pull in loff_t from glibc
-+AC_USE_SYSTEM_EXTENSIONS
-
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-01-15 14:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-01-15 14:52 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 019ee8a8849d9cf7de4d8bd39a151e7b1b3135b6 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox