* [PATCH 02/62] minicom: Update to 2.7.1
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
@ 2020-08-16 10:28 ` Michael Tremer
2020-08-16 10:28 ` [PATCH 03/62] fping: Update to 5.0 Michael Tremer
` (58 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
Fixes build with GCC 10
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/minicom | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lfs/minicom b/lfs/minicom
index 5a233325a..154c31984 100644
--- a/lfs/minicom
+++ b/lfs/minicom
@@ -24,7 +24,7 @@
include Config
-VER = 2.4
+VER = 2.7.1
THISAPP = minicom-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,10 +32,12 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = minicom
-PAK_VER = 0
+PAK_VER = 1
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 700976a3c2dcc8bbd50ab9bb1c08837b
+$(DL_FILE)_MD5 = 9021cb8c5445f6e6e74b2acc39962d62
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 03/62] fping: Update to 5.0
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
2020-08-16 10:28 ` [PATCH 02/62] minicom: Update to 2.7.1 Michael Tremer
@ 2020-08-16 10:28 ` Michael Tremer
2020-08-16 10:28 ` [PATCH 04/62] xfsprogs: Update to 5.7.0 Michael Tremer
` (57 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 806 bytes --]
Fixes build with GCC 10
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/fping | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lfs/fping b/lfs/fping
index c5f178533..f94480608 100644
--- a/lfs/fping
+++ b/lfs/fping
@@ -24,7 +24,7 @@
include Config
-VER = 4.2
+VER = 5.0
THISAPP = fping-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = fping
-PAK_VER = 5
+PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 218e71764177a8ce25564a7810f8e729
+$(DL_FILE)_MD5 = 6af4c39bf012af75f93983d0efa242b0
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 04/62] xfsprogs: Update to 5.7.0
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
2020-08-16 10:28 ` [PATCH 02/62] minicom: Update to 2.7.1 Michael Tremer
2020-08-16 10:28 ` [PATCH 03/62] fping: Update to 5.0 Michael Tremer
@ 2020-08-16 10:28 ` Michael Tremer
2020-08-16 10:28 ` [PATCH 05/62] lsof: Update to 4.91 Michael Tremer
` (56 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2149 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/xfsprogs | 15 +++++++++++++--
lfs/xfsprogs | 4 ++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/config/rootfiles/common/xfsprogs b/config/rootfiles/common/xfsprogs
index 584ded0fe..11518441a 100644
--- a/config/rootfiles/common/xfsprogs
+++ b/config/rootfiles/common/xfsprogs
@@ -3,8 +3,6 @@ lib/libhandle.so.1.0.3
sbin/fsck.xfs
sbin/mkfs.xfs
sbin/xfs_repair
-sbin/xfs_scrub
-sbin/xfs_scrub_all
#usr/include/xfs
#usr/include/xfs/handle.h
#usr/include/xfs/jdm.h
@@ -39,6 +37,8 @@ usr/sbin/xfs_mkfile
usr/sbin/xfs_ncheck
usr/sbin/xfs_quota
usr/sbin/xfs_rtcp
+usr/sbin/xfs_scrub
+usr/sbin/xfs_scrub_all
usr/sbin/xfs_spaceman
#usr/share/doc/xfsprogs
#usr/share/doc/xfsprogs/CHANGES.gz
@@ -46,6 +46,17 @@ usr/sbin/xfs_spaceman
#usr/share/doc/xfsprogs/README
#usr/share/locale/de/LC_MESSAGES/xfsprogs.mo
#usr/share/locale/pl/LC_MESSAGES/xfsprogs.mo
+#usr/share/man/man2/ioctl_xfs_ag_geometry.2
+#usr/share/man/man2/ioctl_xfs_bulkstat.2
+#usr/share/man/man2/ioctl_xfs_fsbulkstat.2
+#usr/share/man/man2/ioctl_xfs_fscounts.2
+#usr/share/man/man2/ioctl_xfs_fsgetxattr.2
+#usr/share/man/man2/ioctl_xfs_fsinumbers.2
+#usr/share/man/man2/ioctl_xfs_fsop_geometry.2
+#usr/share/man/man2/ioctl_xfs_getbmapx.2
+#usr/share/man/man2/ioctl_xfs_getresblks.2
+#usr/share/man/man2/ioctl_xfs_goingdown.2
+#usr/share/man/man2/ioctl_xfs_inumbers.2
#usr/share/man/man2/ioctl_xfs_scrub_metadata.2
#usr/share/man/man3/attr_list_by_handle.3
#usr/share/man/man3/attr_multi_by_handle.3
diff --git a/lfs/xfsprogs b/lfs/xfsprogs
index 07410f720..80770a4f2 100644
--- a/lfs/xfsprogs
+++ b/lfs/xfsprogs
@@ -24,7 +24,7 @@
include Config
-VER = 4.18.0
+VER = 5.7.0
THISAPP = xfsprogs-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5f80b631b68df89a8b9283307e96d2e8
+$(DL_FILE)_MD5 = 4aeba534cf91f24169c64e1073b9ef27
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 05/62] lsof: Update to 4.91
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (2 preceding siblings ...)
2020-08-16 10:28 ` [PATCH 04/62] xfsprogs: Update to 5.7.0 Michael Tremer
@ 2020-08-16 10:28 ` Michael Tremer
2020-08-16 10:28 ` [PATCH 06/62] dnsdist: Update to 1.5.0 Michael Tremer
` (55 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1514 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/lsof | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/lfs/lsof b/lfs/lsof
index 8b429fb60..b2e141f22 100644
--- a/lfs/lsof
+++ b/lfs/lsof
@@ -24,10 +24,10 @@
include Config
-VER = 4.78
+VER = 4.91
-THISAPP = lsof-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+THISAPP = lsof_$(VER)
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0f8aac305454e8cd8e0ac534c6daccea
+$(DL_FILE)_MD5 = 10e1353aa4bf2fd5bbed65db9ef6fd47
install : $(TARGET)
@@ -69,9 +69,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./Configure linux -n
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && install -m 4750 -o root -g nobody lsof /usr/bin
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && tar axf lsof_$(VER)_src.tar
+ cd $(DIR_APP)/lsof_$(VER)_src && ./Configure linux -n
+ cd $(DIR_APP)/lsof_$(VER)_src && make $(MAKETUNING) CC="cc $(CFLAGS) $(LDFLAGS)"
+ cd $(DIR_APP)/lsof_$(VER)_src && install -m 755 -o root -g root lsof /usr/bin
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 06/62] dnsdist: Update to 1.5.0
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (3 preceding siblings ...)
2020-08-16 10:28 ` [PATCH 05/62] lsof: Update to 4.91 Michael Tremer
@ 2020-08-16 10:28 ` Michael Tremer
2020-08-16 10:28 ` [PATCH 07/62] spandsp: Update to 0.0.6 Michael Tremer
` (54 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 795 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/dnsdist | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 9f2040f16..2e7c88f93 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -24,7 +24,7 @@
include Config
-VER = 1.4.0
+VER = 1.5.0
THISAPP = dnsdist-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = x86_64 i586
PROG = dnsdist
-PAK_VER = 4
+PAK_VER = 5
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0fecd7d600c1c094b9fffffd27c44369
+$(DL_FILE)_MD5 = 86532fd9b0e8f838b16ab1a611f52abb
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 07/62] spandsp: Update to 0.0.6
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (4 preceding siblings ...)
2020-08-16 10:28 ` [PATCH 06/62] dnsdist: Update to 1.5.0 Michael Tremer
@ 2020-08-16 10:28 ` Michael Tremer
2020-08-16 10:28 ` [PATCH 08/62] watchdog: Update to 5.16 Michael Tremer
` (53 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4916 bytes --]
This package - for some reason - does not build on i586 with
the latest version of glibc. The reason is that MMX instructions
are being used which are not allowed on i586.
However, since the assembler has not been changed, this should
have been caught before. Weird.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/packages/spandsp | 23 +++++++++++++++++++++--
lfs/spandsp | 8 ++++----
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/config/rootfiles/packages/spandsp b/config/rootfiles/packages/spandsp
index aaff0332e..28fd397f7 100644
--- a/config/rootfiles/packages/spandsp
+++ b/config/rootfiles/packages/spandsp
@@ -1,5 +1,6 @@
#usr/include/spandsp
#usr/include/spandsp.h
+#usr/include/spandsp/ademco_contactid.h
#usr/include/spandsp/adsi.h
#usr/include/spandsp/arctan2.h
#usr/include/spandsp/async.h
@@ -32,8 +33,10 @@
#usr/include/spandsp/gsm0610.h
#usr/include/spandsp/hdlc.h
#usr/include/spandsp/ima_adpcm.h
+#usr/include/spandsp/image_translate.h
#usr/include/spandsp/logging.h
#usr/include/spandsp/lpc10.h
+#usr/include/spandsp/math_fixed.h
#usr/include/spandsp/modem_connect_tones.h
#usr/include/spandsp/modem_echo.h
#usr/include/spandsp/noise.h
@@ -42,6 +45,7 @@
#usr/include/spandsp/plc.h
#usr/include/spandsp/power_meter.h
#usr/include/spandsp/private
+#usr/include/spandsp/private/ademco_contactid.h
#usr/include/spandsp/private/adsi.h
#usr/include/spandsp/private/async.h
#usr/include/spandsp/private/at_interpreter.h
@@ -50,6 +54,7 @@
#usr/include/spandsp/private/bert.h
#usr/include/spandsp/private/bitstream.h
#usr/include/spandsp/private/dtmf.h
+#usr/include/spandsp/private/echo.h
#usr/include/spandsp/private/fax.h
#usr/include/spandsp/private/fax_modems.h
#usr/include/spandsp/private/fsk.h
@@ -59,9 +64,11 @@
#usr/include/spandsp/private/gsm0610.h
#usr/include/spandsp/private/hdlc.h
#usr/include/spandsp/private/ima_adpcm.h
+#usr/include/spandsp/private/image_translate.h
#usr/include/spandsp/private/logging.h
#usr/include/spandsp/private/lpc10.h
#usr/include/spandsp/private/modem_connect_tones.h
+#usr/include/spandsp/private/modem_echo.h
#usr/include/spandsp/private/noise.h
#usr/include/spandsp/private/oki_adpcm.h
#usr/include/spandsp/private/queue.h
@@ -70,14 +77,20 @@
#usr/include/spandsp/private/silence_gen.h
#usr/include/spandsp/private/super_tone_rx.h
#usr/include/spandsp/private/super_tone_tx.h
+#usr/include/spandsp/private/swept_tone.h
#usr/include/spandsp/private/t30.h
+#usr/include/spandsp/private/t30_dis_dtc_dcs_bits.h
#usr/include/spandsp/private/t31.h
#usr/include/spandsp/private/t38_core.h
#usr/include/spandsp/private/t38_gateway.h
#usr/include/spandsp/private/t38_non_ecm_buffer.h
#usr/include/spandsp/private/t38_terminal.h
-#usr/include/spandsp/private/t4.h
+#usr/include/spandsp/private/t4_rx.h
+#usr/include/spandsp/private/t4_t6_decode.h
+#usr/include/spandsp/private/t4_t6_encode.h
+#usr/include/spandsp/private/t4_tx.h
#usr/include/spandsp/private/time_scale.h
+#usr/include/spandsp/private/timezone.h
#usr/include/spandsp/private/tone_detect.h
#usr/include/spandsp/private/tone_generate.h
#usr/include/spandsp/private/v17rx.h
@@ -96,8 +109,10 @@
#usr/include/spandsp/schedule.h
#usr/include/spandsp/sig_tone.h
#usr/include/spandsp/silence_gen.h
+#usr/include/spandsp/stdbool.h
#usr/include/spandsp/super_tone_rx.h
#usr/include/spandsp/super_tone_tx.h
+#usr/include/spandsp/swept_tone.h
#usr/include/spandsp/t30.h
#usr/include/spandsp/t30_api.h
#usr/include/spandsp/t30_fcf.h
@@ -108,9 +123,13 @@
#usr/include/spandsp/t38_gateway.h
#usr/include/spandsp/t38_non_ecm_buffer.h
#usr/include/spandsp/t38_terminal.h
-#usr/include/spandsp/t4.h
+#usr/include/spandsp/t4_rx.h
+#usr/include/spandsp/t4_t6_decode.h
+#usr/include/spandsp/t4_t6_encode.h
+#usr/include/spandsp/t4_tx.h
#usr/include/spandsp/telephony.h
#usr/include/spandsp/time_scale.h
+#usr/include/spandsp/timezone.h
#usr/include/spandsp/timing.h
#usr/include/spandsp/tone_detect.h
#usr/include/spandsp/tone_generate.h
diff --git a/lfs/spandsp b/lfs/spandsp
index 62226d88e..25a3dae1b 100644
--- a/lfs/spandsp
+++ b/lfs/spandsp
@@ -24,15 +24,15 @@
include Config
-VER = 0.0.6pre12
+VER = 0.0.6
THISAPP = spandsp-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/spandsp-0.0.6
+DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = spandsp
-PAK_VER = 4
+PAK_VER = 5
DEPS = libtiff
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 497e04c890ee864c629908a169507238
+$(DL_FILE)_MD5 = 897d839516a6d4edb20397d4757a7ca3
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 08/62] watchdog: Update to 5.16
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (5 preceding siblings ...)
2020-08-16 10:28 ` [PATCH 07/62] spandsp: Update to 0.0.6 Michael Tremer
@ 2020-08-16 10:28 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 09/62] cpio: Package won't build with GCC 10 without -fcommon Michael Tremer
` (52 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 837 bytes --]
Fixed build with GCC 10/glibc 2.32
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/watchdog | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lfs/watchdog b/lfs/watchdog
index abea7b0d1..67438434c 100644
--- a/lfs/watchdog
+++ b/lfs/watchdog
@@ -24,7 +24,7 @@
include Config
-VER = 5.13
+VER = 5.16
THISAPP = watchdog-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = watchdog
-PAK_VER = 4
+PAK_VER = 5
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 153455f008f1cf8f65f6ad9586a21ff1
+$(DL_FILE)_MD5 = 1b4f51cabc64d1bee2fce7cdd626831f
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 09/62] cpio: Package won't build with GCC 10 without -fcommon
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (6 preceding siblings ...)
2020-08-16 10:28 ` [PATCH 08/62] watchdog: Update to 5.16 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 10/62] dhcp: Fix compiling with GCC 10 Michael Tremer
` (51 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/cpio | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/cpio b/lfs/cpio
index 02d72d038..5985cd565 100644
--- a/lfs/cpio
+++ b/lfs/cpio
@@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 10/62] dhcp: Fix compiling with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (7 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 09/62] cpio: Package won't build with GCC 10 without -fcommon Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 11/62] efivar: Fix build " Michael Tremer
` (50 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/dhcp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/dhcp b/lfs/dhcp
index 4c01428f5..38b18813b 100644
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 11/62] efivar: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (8 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 10/62] dhcp: Fix compiling with GCC 10 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 12/62] linux-atm: " Michael Tremer
` (49 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 700 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/efivar | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lfs/efivar b/lfs/efivar
index a2e86a255..4453f99f2 100644
--- a/lfs/efivar
+++ b/lfs/efivar
@@ -74,6 +74,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixes-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixes-2.patch
+
+ # -Werror, not even once
+ cd $(DIR_APP) && sed -e "s/-Werror//g" -i gcc.specs
+
cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKETUNING)
cd $(DIR_APP) && make install
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 12/62] linux-atm: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (9 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 11/62] efivar: Fix build " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 13/62] gnupg: Fix building " Michael Tremer
` (48 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/linux-atm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/linux-atm b/lfs/linux-atm
index a3e23dafb..129109b3f 100644
--- a/lfs/linux-atm
+++ b/lfs/linux-atm
@@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 13/62] gnupg: Fix building with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (10 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 12/62] linux-atm: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 14/62] cdrkit: Fix build " Michael Tremer
` (47 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/gnupg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/gnupg b/lfs/gnupg
index 532a291d8..93e5ac21a 100644
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 14/62] cdrkit: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (11 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 13/62] gnupg: Fix building " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 15/62] logrotate: " Michael Tremer
` (46 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/cdrkit | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/cdrkit b/lfs/cdrkit
index 9b1887a48..608e1692e 100644
--- a/lfs/cdrkit
+++ b/lfs/cdrkit
@@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 15/62] logrotate: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (12 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 14/62] cdrkit: Fix build " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 16/62] libtirpc: " Michael Tremer
` (45 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/logrotate | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/logrotate b/lfs/logrotate
index 5f7314bbd..d23a6f80d 100644
--- a/lfs/logrotate
+++ b/lfs/logrotate
@@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 16/62] libtirpc: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (13 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 15/62] logrotate: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 17/62] sysfsutils: " Michael Tremer
` (44 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/libtirpc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/libtirpc b/lfs/libtirpc
index 92c38e82a..59ac91354 100644
--- a/lfs/libtirpc
+++ b/lfs/libtirpc
@@ -36,6 +36,8 @@ PAK_VER = 2
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 17/62] sysfsutils: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (14 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 16/62] libtirpc: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 18/62] cups-filters: " Michael Tremer
` (43 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 994 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/sysfsutils | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lfs/sysfsutils b/lfs/sysfsutils
index 6da94cfec..b177cb322 100644
--- a/lfs/sysfsutils
+++ b/lfs/sysfsutils
@@ -33,6 +33,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -73,7 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure --prefix=""
- cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make $(MAKETUNING) \
+ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 18/62] cups-filters: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (15 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 17/62] sysfsutils: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 19/62] foomatic: " Michael Tremer
` (42 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/cups-filters | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/cups-filters b/lfs/cups-filters
index de862aa92..1c82b0dbb 100644
--- a/lfs/cups-filters
+++ b/lfs/cups-filters
@@ -36,6 +36,8 @@ PAK_VER = 3
DEPS = cups ghostscript
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 19/62] foomatic: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (16 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 18/62] cups-filters: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 20/62] htop: " Michael Tremer
` (41 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/foomatic | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/foomatic b/lfs/foomatic
index 1b50dd85c..1288277e4 100644
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -39,6 +39,8 @@ PAK_VER = 4
DEPS = cups ghostscript libtiff hplip
+CFLAGS += -fcommon
+
export LIB_CUPS=/usr/lib/cups
export CUPS_BACKENDS=/usr/lib/cups/backends
export CUPS_FILTERS=/usr/lib/cups/filters
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 20/62] htop: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (17 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 19/62] foomatic: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 21/62] squidguard: " Michael Tremer
` (40 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/htop | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/htop b/lfs/htop
index 9bb951fad..272c8feb9 100644
--- a/lfs/htop
+++ b/lfs/htop
@@ -36,6 +36,8 @@ PAK_VER = 12
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 21/62] squidguard: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (18 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 20/62] htop: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 22/62] netatalk: " Michael Tremer
` (39 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/squidguard | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/squidguard b/lfs/squidguard
index 0aea8dbb6..eb13c41dd 100644
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 22/62] netatalk: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (19 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 21/62] squidguard: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 23/62] 7zip: Fix build against " Michael Tremer
` (38 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/netatalk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lfs/netatalk b/lfs/netatalk
index 16fd292eb..e1147c032 100644
--- a/lfs/netatalk
+++ b/lfs/netatalk
@@ -36,7 +36,7 @@ PAK_VER = 2
DEPS = avahi dbus krb5
-CFLAGS += -Wno-unused-result
+CFLAGS += -fcommon -Wno-unused-result
###############################################################################
# Top-level Rules
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 23/62] 7zip: Fix build against GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (20 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 22/62] netatalk: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 24/62] collectd: Fix build with " Michael Tremer
` (37 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 16470 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/7zip | 4 +-
.../p7zip-16.02-consolidated_fixes-1.patch | 466 ++++++++++++++++++
src/patches/p7zip_change_install_folder.patch | 10 -
3 files changed, 469 insertions(+), 11 deletions(-)
create mode 100644 src/patches/p7zip-16.02-consolidated_fixes-1.patch
delete mode 100644 src/patches/p7zip_change_install_folder.patch
diff --git a/lfs/7zip b/lfs/7zip
index d2f819256..443119b6e 100644
--- a/lfs/7zip
+++ b/lfs/7zip
@@ -36,6 +36,8 @@ PAK_VER = 7
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -77,7 +79,7 @@ dist:
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip_change_install_folder.patch
+ cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip-16.02-consolidated_fixes-1.patch
cd $(DIR_APP) && make 7z $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/src/patches/p7zip-16.02-consolidated_fixes-1.patch b/src/patches/p7zip-16.02-consolidated_fixes-1.patch
new file mode 100644
index 000000000..3f6da9cde
--- /dev/null
+++ b/src/patches/p7zip-16.02-consolidated_fixes-1.patch
@@ -0,0 +1,466 @@
+Submitted By: Bruce Dubbs <bdubbs(a)linuxfromscratch.org>
+Date: 2020-05-12
+Initial Package Version: 16.02
+Upstream Status: Unknown.
+Origin: Arch and Fedora
+Description: Updates for CVE-2016-9296, CVE-2017-17969, CVE-2018-5996,
+ CVE-2018-10115 and GCC10.
+
+diff -Naur p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp
+--- p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp 2016-05-20 03:20:03.000000000 -0500
++++ p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp 2020-05-12 15:34:34.513287566 -0500
+@@ -1097,7 +1097,8 @@
+ if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
+ ThrowIncorrect();
+ }
+- HeadersSize += folders.PackPositions[folders.NumPackStreams];
++ if (folders.PackPositions)
++ HeadersSize += folders.PackPositions[folders.NumPackStreams];
+ return S_OK;
+ }
+
+diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp
+--- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp 2015-09-01 13:04:52.000000000 -0500
++++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp 2020-05-12 15:35:00.897548643 -0500
+@@ -29,7 +29,7 @@
+ };
+ */
+
+-CDecoder::CDecoder(): m_IsSolid(false) { }
++CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), _errorMode(false) { }
+
+ void CDecoder::InitStructures()
+ {
+@@ -345,7 +345,7 @@
+
+ void CDecoder::InitData()
+ {
+- if (!m_IsSolid)
++ if (!_isSolid)
+ {
+ AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0;
+ AvrPlc = 0x3500;
+@@ -391,6 +391,11 @@
+ if (inSize == NULL || outSize == NULL)
+ return E_INVALIDARG;
+
++ if (_isSolid && !_solidAllowed)
++ return S_FALSE;
++
++ _solidAllowed = false;
++
+ if (!m_OutWindowStream.Create(kHistorySize))
+ return E_OUTOFMEMORY;
+ if (!m_InBitStream.Create(1 << 20))
+@@ -398,17 +403,22 @@
+
+ m_UnpackSize = (Int64)*outSize;
+ m_OutWindowStream.SetStream(outStream);
+- m_OutWindowStream.Init(m_IsSolid);
++ m_OutWindowStream.Init(_isSolid);
+ m_InBitStream.SetStream(inStream);
+ m_InBitStream.Init();
+
+ // CCoderReleaser coderReleaser(this);
+ InitData();
+- if (!m_IsSolid)
++ if (!_isSolid)
+ {
++ _errorMode = false;
+ InitStructures();
+ InitHuff();
+ }
++
++ if (_errorMode)
++ return S_FALSE;
++
+ if (m_UnpackSize > 0)
+ {
+ GetFlagsBuf();
+@@ -470,6 +480,7 @@
+ }
+ if (m_UnpackSize < 0)
+ return S_FALSE;
++ _solidAllowed = true;
+ return m_OutWindowStream.Flush();
+ }
+
+@@ -477,16 +488,16 @@
+ const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
+ {
+ try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
+- catch(const CInBufferException &e) { return e.ErrorCode; }
+- catch(const CLzOutWindowException &e) { return e.ErrorCode; }
+- catch(...) { return S_FALSE; }
++ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; }
++ catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; }
++ catch(...) { _errorMode = true; return S_FALSE; }
+ }
+
+ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+ if (size < 1)
+ return E_INVALIDARG;
+- m_IsSolid = ((data[0] & 1) != 0);
++ _isSolid = ((data[0] & 1) != 0);
+ return S_OK;
+ }
+
+diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h
+--- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h 2014-12-21 06:44:00.000000000 -0600
++++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h 2020-05-12 15:35:00.897548643 -0500
+@@ -38,7 +38,9 @@
+ UInt32 LastLength;
+
+ Int64 m_UnpackSize;
+- bool m_IsSolid;
++ bool _isSolid;
++ bool _solidAllowed;
++ bool _errorMode;
+
+ UInt32 ReadBits(int numBits);
+ HRESULT CopyBlock(UInt32 distance, UInt32 len);
+diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp
+--- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp 2015-10-03 03:49:14.000000000 -0500
++++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp 2020-05-12 15:35:00.897548643 -0500
+@@ -80,7 +80,9 @@
+ static const UInt32 kWindowReservSize = (1 << 22) + 256;
+
+ CDecoder::CDecoder():
+- m_IsSolid(false)
++ _isSolid(false),
++ _solidAllowed(false),
++ m_TablesOK(false)
+ {
+ }
+
+@@ -100,6 +102,8 @@
+
+ bool CDecoder::ReadTables(void)
+ {
++ m_TablesOK = false;
++
+ Byte levelLevels[kLevelTableSize];
+ Byte newLevels[kMaxTableSize];
+ m_AudioMode = (ReadBits(1) == 1);
+@@ -170,6 +174,8 @@
+ }
+
+ memcpy(m_LastLevels, newLevels, kMaxTableSize);
++ m_TablesOK = true;
++
+ return true;
+ }
+
+@@ -315,6 +321,10 @@
+ if (inSize == NULL || outSize == NULL)
+ return E_INVALIDARG;
+
++ if (_isSolid && !_solidAllowed)
++ return S_FALSE;
++ _solidAllowed = false;
++
+ if (!m_OutWindowStream.Create(kHistorySize))
+ return E_OUTOFMEMORY;
+ if (!m_InBitStream.Create(1 << 20))
+@@ -325,12 +335,12 @@
+ UInt64 pos = 0, unPackSize = *outSize;
+
+ m_OutWindowStream.SetStream(outStream);
+- m_OutWindowStream.Init(m_IsSolid);
++ m_OutWindowStream.Init(_isSolid);
+ m_InBitStream.SetStream(inStream);
+ m_InBitStream.Init();
+
+ // CCoderReleaser coderReleaser(this);
+- if (!m_IsSolid)
++ if (!_isSolid)
+ {
+ InitStructures();
+ if (unPackSize == 0)
+@@ -338,12 +348,16 @@
+ if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect;
+ if (!ReadTables())
+ return S_FALSE;
++ _solidAllowed = true;
+ return S_OK;
+ }
+ if (!ReadTables())
+ return S_FALSE;
+ }
+
++ if (!m_TablesOK)
++ return S_FALSE;
++
+ UInt64 startPos = m_OutWindowStream.GetProcessedSize();
+ while (pos < unPackSize)
+ {
+@@ -378,6 +392,9 @@
+
+ if (!ReadLastTables())
+ return S_FALSE;
++
++ _solidAllowed = true;
++
+ return m_OutWindowStream.Flush();
+ }
+
+@@ -394,7 +411,7 @@
+ {
+ if (size < 1)
+ return E_INVALIDARG;
+- m_IsSolid = ((data[0] & 1) != 0);
++ _isSolid = ((data[0] & 1) != 0);
+ return S_OK;
+ }
+
+diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h
+--- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h 2015-06-19 05:52:06.000000000 -0500
++++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h 2020-05-12 15:35:00.898548653 -0500
+@@ -138,7 +138,9 @@
+ Byte m_LastLevels[kMaxTableSize];
+
+ UInt64 m_PackSize;
+- bool m_IsSolid;
++ bool _isSolid;
++ bool _solidAllowed;
++ bool m_TablesOK;
+
+ void InitStructures();
+ UInt32 ReadBits(unsigned numBits);
+diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp
+--- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp 2016-05-20 03:20:03.000000000 -0500
++++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp 2020-05-12 15:35:00.898548653 -0500
+@@ -92,7 +92,9 @@
+ _writtenFileSize(0),
+ _vmData(0),
+ _vmCode(0),
+- m_IsSolid(false)
++ _isSolid(false),
++ _solidAllowed(false),
++ _errorMode(false)
+ {
+ Ppmd7_Construct(&_ppmd);
+ }
+@@ -545,6 +547,9 @@
+ return InitPPM();
+ }
+
++ TablesRead = false;
++ TablesOK = false;
++
+ _lzMode = true;
+ PrevAlignBits = 0;
+ PrevAlignCount = 0;
+@@ -606,6 +611,9 @@
+ }
+ }
+ }
++ if (InputEofError())
++ return S_FALSE;
++
+ TablesRead = true;
+
+ // original code has check here:
+@@ -623,6 +631,9 @@
+ RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize]));
+
+ memcpy(m_LastLevels, newLevels, kTablesSizesSum);
++
++ TablesOK = true;
++
+ return S_OK;
+ }
+
+@@ -811,7 +822,7 @@
+ {
+ _writtenFileSize = 0;
+ _unsupportedFilter = false;
+- if (!m_IsSolid)
++ if (!_isSolid)
+ {
+ _lzSize = 0;
+ _winPos = 0;
+@@ -824,13 +835,21 @@
+ PpmEscChar = 2;
+ PpmError = true;
+ InitFilters();
++ _errorMode = false;
+ }
+- if (!m_IsSolid || !TablesRead)
++
++ if (_errorMode)
++ return S_FALSE;
++
++ if (!_isSolid || !TablesRead)
+ {
+ bool keepDecompressing;
+ RINOK(ReadTables(keepDecompressing));
+ if (!keepDecompressing)
++ {
++ _solidAllowed = true;
+ return S_OK;
++ }
+ }
+
+ for (;;)
+@@ -838,6 +857,8 @@
+ bool keepDecompressing;
+ if (_lzMode)
+ {
++ if (!TablesOK)
++ return S_FALSE;
+ RINOK(DecodeLZ(keepDecompressing))
+ }
+ else
+@@ -853,6 +874,9 @@
+ if (!keepDecompressing)
+ break;
+ }
++
++ _solidAllowed = true;
++
+ RINOK(WriteBuf());
+ UInt64 packSize = m_InBitStream.BitDecoder.GetProcessedSize();
+ RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize));
+@@ -873,6 +897,10 @@
+ if (!inSize)
+ return E_INVALIDARG;
+
++ if (_isSolid && !_solidAllowed)
++ return S_FALSE;
++ _solidAllowed = false;
++
+ if (!_vmData)
+ {
+ _vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax);
+@@ -901,8 +929,8 @@
+ _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1;
+ return CodeReal(progress);
+ }
+- catch(const CInBufferException &e) { return e.ErrorCode; }
+- catch(...) { return S_FALSE; }
++ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; }
++ catch(...) { _errorMode = true; return S_FALSE; }
+ // CNewException is possible here. But probably CNewException is caused
+ // by error in data stream.
+ }
+@@ -911,7 +939,7 @@
+ {
+ if (size < 1)
+ return E_INVALIDARG;
+- m_IsSolid = ((data[0] & 1) != 0);
++ _isSolid = ((data[0] & 1) != 0);
+ return S_OK;
+ }
+
+diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.h
+--- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.h 2015-10-03 03:49:12.000000000 -0500
++++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.h 2020-05-12 15:35:00.898548653 -0500
+@@ -191,7 +191,9 @@
+ CRecordVector<CTempFilter *> _tempFilters;
+ UInt32 _lastFilter;
+
+- bool m_IsSolid;
++ bool _isSolid;
++ bool _solidAllowed;
++ bool _errorMode;
+
+ bool _lzMode;
+ bool _unsupportedFilter;
+@@ -200,6 +202,7 @@
+ UInt32 PrevAlignCount;
+
+ bool TablesRead;
++ bool TablesOK;
+
+ CPpmd7 _ppmd;
+ int PpmEscChar;
+diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.cpp
+--- p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.cpp 2016-05-20 03:20:04.000000000 -0500
++++ p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.cpp 2020-05-12 15:35:00.899548663 -0500
+@@ -72,6 +72,7 @@
+ _writtenFileSize(0),
+ _dictSizeLog(0),
+ _isSolid(false),
++ _solidAllowed(false),
+ _wasInit(false),
+ _inputBuf(NULL)
+ {
+@@ -801,7 +802,10 @@
+ */
+
+ if (res == S_OK)
++ {
++ _solidAllowed = true;
+ res = res2;
++ }
+
+ if (res == S_OK && _unpackSize_Defined && _writtenFileSize != _unpackSize)
+ return S_FALSE;
+@@ -821,6 +825,10 @@
+ {
+ try
+ {
++ if (_isSolid && !_solidAllowed)
++ return S_FALSE;
++ _solidAllowed = false;
++
+ if (_dictSizeLog >= sizeof(size_t) * 8)
+ return E_NOTIMPL;
+
+diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.h
+--- p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.h 2015-09-01 13:04:50.000000000 -0500
++++ p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.h 2020-05-12 15:35:00.899548663 -0500
+@@ -271,6 +271,7 @@
+ Byte _dictSizeLog;
+ bool _tableWasFilled;
+ bool _isSolid;
++ bool _solidAllowed;
+ bool _wasInit;
+
+ UInt32 _reps[kNumReps];
+diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/ShrinkDecoder.cpp p7zip_16.02/CPP/7zip/Compress/ShrinkDecoder.cpp
+--- p7zip_16.02.orig/CPP/7zip/Compress/ShrinkDecoder.cpp 2016-05-18 12:31:02.000000000 -0500
++++ p7zip_16.02/CPP/7zip/Compress/ShrinkDecoder.cpp 2020-05-12 15:34:45.120392530 -0500
+@@ -121,7 +121,12 @@
+ {
+ _stack[i++] = _suffixes[cur];
+ cur = _parents[cur];
++ if (cur >= kNumItems || i >= kNumItems)
++ break;
+ }
++
++ if (cur >= kNumItems || i >= kNumItems)
++ break;
+
+ _stack[i++] = (Byte)cur;
+ lastChar2 = (Byte)cur;
+diff -Naur p7zip_16.02.orig/CPP/Windows/ErrorMsg.cpp p7zip_16.02/CPP/Windows/ErrorMsg.cpp
+--- p7zip_16.02.orig/CPP/Windows/ErrorMsg.cpp 2015-01-18 12:20:28.000000000 -0600
++++ p7zip_16.02/CPP/Windows/ErrorMsg.cpp 2020-05-12 15:37:52.688247586 -0500
+@@ -14,15 +14,15 @@
+ AString msg;
+
+ switch(errorCode) {
+- case ERROR_NO_MORE_FILES : txt = "No more files"; break ;
+- case E_NOTIMPL : txt = "E_NOTIMPL"; break ;
+- case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ;
+- case E_ABORT : txt = "E_ABORT"; break ;
+- case E_FAIL : txt = "E_FAIL"; break ;
+- case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
+- case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ;
+- case E_INVALIDARG : txt = "E_INVALIDARG"; break ;
+- case ERROR_DIRECTORY : txt = "Error Directory"; break ;
++ case unsigned (ERROR_NO_MORE_FILES) : txt = "No more files"; break ;
++ case unsigned (E_NOTIMPL) : txt = "E_NOTIMPL"; break ;
++ case unsigned (E_NOINTERFACE) : txt = "E_NOINTERFACE"; break ;
++ case unsigned (E_ABORT) : txt = "E_ABORT"; break ;
++ case unsigned (E_FAIL) : txt = "E_FAIL"; break ;
++ case unsigned (STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; break ;
++ case unsigned (E_OUTOFMEMORY) : txt = "E_OUTOFMEMORY"; break ;
++ case unsigned (E_INVALIDARG) : txt = "E_INVALIDARG"; break ;
++ case ERROR_DIRECTORY : txt = "Error Directory"; break ;
+ default:
+ txt = strerror(errorCode);
+ }
diff --git a/src/patches/p7zip_change_install_folder.patch b/src/patches/p7zip_change_install_folder.patch
deleted file mode 100644
index 4a8334329..000000000
--- a/src/patches/p7zip_change_install_folder.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- p7zip_15.14.1/makefile.common
-+++ p7zip_15.14.1/makefile.common
-@@ -1,6 +1,6 @@
- MKDIR = mkdir -p
-
--DEST_HOME=/usr/local
-+DEST_HOME=/usr
- DEST_BIN=$(DEST_HOME)/bin
- DEST_SHARE=$(DEST_HOME)/lib/p7zip
- DEST_SHARE_DOC=$(DEST_HOME)/share/doc/p7zip
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 24/62] collectd: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (21 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 23/62] 7zip: Fix build against " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 25/62] icinga: " Michael Tremer
` (36 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/collectd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lfs/collectd b/lfs/collectd
index ad780f50d..e3fcc1013 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -36,7 +36,7 @@ PROG = collectd
DEPS =
-CFLAGS += -Wno-error=deprecated-declarations
+CFLAGS += -fcommon -Wno-error=deprecated-declarations
###############################################################################
# Top-level Rules
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 25/62] icinga: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (22 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 24/62] collectd: Fix build with " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 26/62] openvmtools: Update to 11.1.0 Michael Tremer
` (35 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/icinga | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/icinga b/lfs/icinga
index 0e2625682..6534722ac 100644
--- a/lfs/icinga
+++ b/lfs/icinga
@@ -36,6 +36,8 @@ PAK_VER = 4
DEPS = nagios-plugins
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 26/62] openvmtools: Update to 11.1.0
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (23 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 25/62] icinga: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 27/62] motion: Fix build with GCC 10 Michael Tremer
` (34 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3763 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/packages/openvmtools | 20 ++++++++++++++++++--
lfs/openvmtools | 8 +++++---
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools
index de1ec10c4..0a9d13d9e 100644
--- a/config/rootfiles/packages/openvmtools
+++ b/config/rootfiles/packages/openvmtools
@@ -12,9 +12,9 @@ etc/vmware-tools/scripts/vmware/network
etc/vmware-tools/statechange.subr
etc/vmware-tools/suspend-vm-default
etc/vmware-tools/tools.conf.example
-etc/vmware-tools/vm-support
lib/udev/rules.d/99-vmware-scsi-udev.rules
sbin/mount.vmhgfs
+usr/bin/vm-support
usr/bin/vmhgfs-fuse
usr/bin/vmtoolsd
usr/bin/vmware-checkvm
@@ -52,12 +52,12 @@ usr/lib/open-vm-tools/plugins/common/libhgfsServer.so
#usr/lib/open-vm-tools/plugins/common/libvix.la
usr/lib/open-vm-tools/plugins/common/libvix.so
usr/lib/open-vm-tools/plugins/vmsvc
+usr/lib/open-vm-tools/plugins/vmsvc/libappInfo.so
usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
usr/lib/open-vm-tools/plugins/vmsvc/libresolutionKMS.so
usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
-usr/lib/open-vm-tools/plugins/vmusr
#usr/lib/pkgconfig/vmguestlib.pc
usr/sbin/mount.vmhgfs
#usr/share/open-vm-tools
@@ -65,6 +65,18 @@ usr/sbin/mount.vmhgfs
#usr/share/open-vm-tools/messages/de
#usr/share/open-vm-tools/messages/de/toolboxcmd.vmsg
#usr/share/open-vm-tools/messages/de/vmtoolsd.vmsg
+#usr/share/open-vm-tools/messages/en
+#usr/share/open-vm-tools/messages/en/toolboxcmd.vmsg
+#usr/share/open-vm-tools/messages/en/vmtoolsd.vmsg
+#usr/share/open-vm-tools/messages/es
+#usr/share/open-vm-tools/messages/es/toolboxcmd.vmsg
+#usr/share/open-vm-tools/messages/es/vmtoolsd.vmsg
+#usr/share/open-vm-tools/messages/fr
+#usr/share/open-vm-tools/messages/fr/toolboxcmd.vmsg
+#usr/share/open-vm-tools/messages/fr/vmtoolsd.vmsg
+#usr/share/open-vm-tools/messages/it
+#usr/share/open-vm-tools/messages/it/toolboxcmd.vmsg
+#usr/share/open-vm-tools/messages/it/vmtoolsd.vmsg
#usr/share/open-vm-tools/messages/ja
#usr/share/open-vm-tools/messages/ja/toolboxcmd.vmsg
#usr/share/open-vm-tools/messages/ja/vmtoolsd.vmsg
@@ -73,3 +85,7 @@ usr/sbin/mount.vmhgfs
#usr/share/open-vm-tools/messages/ko/vmtoolsd.vmsg
#usr/share/open-vm-tools/messages/zh_CN
#usr/share/open-vm-tools/messages/zh_CN/toolboxcmd.vmsg
+#usr/share/open-vm-tools/messages/zh_CN/vmtoolsd.vmsg
+#usr/share/open-vm-tools/messages/zh_TW
+#usr/share/open-vm-tools/messages/zh_TW/toolboxcmd.vmsg
+#usr/share/open-vm-tools/messages/zh_TW/vmtoolsd.vmsg
diff --git a/lfs/openvmtools b/lfs/openvmtools
index 36a2ca22c..fe0e0b16b 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -24,7 +24,7 @@
include Config
-VER = 11.0.0-14549434
+VER = 11.1.0-16036546
THISAPP = open-vm-tools-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -33,10 +33,12 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = x86_64 i586
PROG = openvmtools
-PAK_VER = 4
+PAK_VER = 5
DEPS =
+CFLAGS += -Wno-error=array-bounds
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -45,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d3d4e23b143c921f1afc90e5331d3a70
+$(DL_FILE)_MD5 = 349fc0eba5e37788750c5895d74ef855
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 27/62] motion: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (24 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 26/62] openvmtools: Update to 11.1.0 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 28/62] tftpd: " Michael Tremer
` (33 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/motion | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/motion b/lfs/motion
index f28e4ba99..4197fd1f5 100644
--- a/lfs/motion
+++ b/lfs/motion
@@ -36,6 +36,8 @@ PROG = motion
PAK_VER = 3
DEPS = ffmpeg libmicrohttpd
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 28/62] tftpd: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (25 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 27/62] motion: Fix build with GCC 10 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 29/62] w_scan: " Michael Tremer
` (32 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/tftpd | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/tftpd b/lfs/tftpd
index ed2f1ad43..81f9f3c95 100644
--- a/lfs/tftpd
+++ b/lfs/tftpd
@@ -36,6 +36,8 @@ PAK_VER = 1
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 29/62] w_scan: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (26 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 28/62] tftpd: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 30/62] minidlna: " Michael Tremer
` (31 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/w_scan | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/w_scan b/lfs/w_scan
index 62e77962d..df8d3ffe9 100644
--- a/lfs/w_scan
+++ b/lfs/w_scan
@@ -37,6 +37,8 @@ PAK_VER = 7
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 30/62] minidlna: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (27 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 29/62] w_scan: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 31/62] sarg: " Michael Tremer
` (30 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/minidlna | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/minidlna b/lfs/minidlna
index 1b6e6b51c..218b596a4 100644
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -36,6 +36,8 @@ PAK_VER = 6
DEPS = ffmpeg flac libexif libid3tag libogg
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 31/62] sarg: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (28 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 30/62] minidlna: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 32/62] bird: " Michael Tremer
` (29 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/sarg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/sarg b/lfs/sarg
index dbdee1f33..697ce7513 100644
--- a/lfs/sarg
+++ b/lfs/sarg
@@ -36,6 +36,8 @@ PAK_VER = 4
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 32/62] bird: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (29 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 31/62] sarg: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 33/62] frr: " Michael Tremer
` (28 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/bird | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/bird b/lfs/bird
index e1bf19bb2..9b045528f 100644
--- a/lfs/bird
+++ b/lfs/bird
@@ -36,6 +36,8 @@ PAK_VER = 6
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 33/62] frr: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (30 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 32/62] bird: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 34/62] iftop: " Michael Tremer
` (27 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/frr | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/frr b/lfs/frr
index 8030dc817..052e4c176 100644
--- a/lfs/frr
+++ b/lfs/frr
@@ -36,6 +36,8 @@ PAK_VER = 1
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 34/62] iftop: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (31 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 33/62] frr: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 35/62] lcdproc: " Michael Tremer
` (26 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/iftop | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/iftop b/lfs/iftop
index 2048fcfc8..09f29bfa3 100644
--- a/lfs/iftop
+++ b/lfs/iftop
@@ -36,6 +36,8 @@ PAK_VER = 2
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 35/62] lcdproc: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (32 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 34/62] iftop: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 36/62] ipfire-netboot: " Michael Tremer
` (25 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/lcdproc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/lcdproc b/lfs/lcdproc
index 855cb16a4..88afec5d6 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -36,6 +36,8 @@ PAK_VER = 2
DEPS =
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 36/62] ipfire-netboot: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (33 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 35/62] lcdproc: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 37/62] syslinux: " Michael Tremer
` (24 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2465 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/ipfire-netboot | 1 +
...cit-about-fcommon-compiler-directive.patch | 27 +++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch
diff --git a/lfs/ipfire-netboot b/lfs/ipfire-netboot
index 23f5d4375..af9ef8e92 100644
--- a/lfs/ipfire-netboot
+++ b/lfs/ipfire-netboot
@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && tar axf $(DIR_DL)/ipxe-$(PXE_VER).tar.gz
cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-fix-stringop-truncation-warning-with-gcc-8-x.patch
cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-handle-R_X86_64_PLT32.patch
+ cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch
cd $(DIR_APP) && rm -rfv ipxe && ln -s ipxe-$(PXE_VER) ipxe
cd $(DIR_APP) && make $(MAKETUNING) bin/ipxe.lkrn
ifeq "$(BUILD_ARCH)" "x86_64"
diff --git a/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch b/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch
new file mode 100644
index 000000000..9df561f67
--- /dev/null
+++ b/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch
@@ -0,0 +1,27 @@
+From f982a712979619dbae2c6e0d741757e2ce94be11 Mon Sep 17 00:00:00 2001
+From: Bruce Rogers <brogers(a)suse.com>
+Date: Wed, 6 May 2020 15:03:02 -0600
+Subject: [PATCH] [build] Be explicit about -fcommon compiler directive
+
+gcc10 switched default behavior from -fcommon to -fno-common. Since
+"__shared" relies on the legacy behavior, explicitly specify it.
+
+Signed-off-by: Bruce Rogers <brogers(a)suse.com>
+Modified-by: Michael Brown <mcb30(a)ipxe.org>
+Signed-off-by: Michael Brown <mcb30(a)ipxe.org>
+---
+ src/Makefile.housekeeping | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
+index 66d6dd449..b6c61c112 100644
+--- a/src/Makefile.housekeeping
++++ b/src/Makefile.housekeeping
+@@ -418,6 +418,7 @@ CFLAGS += -Os
+ CFLAGS += -g
+ ifeq ($(CCTYPE),gcc)
+ CFLAGS += -ffreestanding
++CFLAGS += -fcommon
+ CFLAGS += -Wall -W -Wformat-nonliteral
+ HOST_CFLAGS += -Wall -W -Wformat-nonliteral
+ endif
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 37/62] syslinux: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (34 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 36/62] ipfire-netboot: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 38/62] u-boot: " Michael Tremer
` (23 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4723 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/syslinux | 2 +
src/patches/syslinux-6.04_pre1-fcommon.patch | 54 +++++++++++++++++++
...strlen-that-appears-to-get-optimized.patch | 28 ++++++++++
3 files changed, 84 insertions(+)
create mode 100644 src/patches/syslinux-6.04_pre1-fcommon.patch
create mode 100644 src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to-get-optimized.patch
diff --git a/lfs/syslinux b/lfs/syslinux
index 1670da27e..b2eec0d5b 100644
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -77,6 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Apply patches
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.03-sysmacros.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to-get-optimized.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_pre1-fcommon.patch
# Build
cd $(DIR_APP) && make bios $(MAKETUNING)
diff --git a/src/patches/syslinux-6.04_pre1-fcommon.patch b/src/patches/syslinux-6.04_pre1-fcommon.patch
new file mode 100644
index 000000000..7d061db26
--- /dev/null
+++ b/src/patches/syslinux-6.04_pre1-fcommon.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/705730
+
+gcc-10 enabled f-no-common by default. Broke syslinux linking.
+--- a/mk/com32.mk
++++ b/mk/com32.mk
+@@ -47,6 +47,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+
+ ifeq ($(FWCLASS),EFI)
+ GCCOPT += -mno-red-zone
+--- a/mk/elf.mk
++++ b/mk/elf.mk
+@@ -42,6 +42,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+
+ com32 = $(topdir)/com32
+ core = $(topdir)/core
+--- a/mk/embedded.mk
++++ b/mk/embedded.mk
+@@ -51,6 +51,7 @@ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
+ GCCOPT += $(call gcc_ok,-fvisibility=hidden)
++GCCOPT += $(call gcc_ok,-fcommon)
+
+ LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
+
+--- a/mk/lib.mk
++++ b/mk/lib.mk
+@@ -28,6 +28,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+
+ INCLUDE = -I$(SRC)
+ STRIP = strip --strip-all -R .comment -R .note
+--- a/mk/efi.mk
++++ b/mk/efi.mk
+@@ -7,7 +7,7 @@ core = $(topdir)/core
+ # Set up architecture specifics; for cross compilation, set ARCH as apt
+ # gnuefi sets up architecture specifics in ia32 or x86_64 sub directories
+ # set up the LIBDIR and EFIINC for building for the appropriate architecture
+-GCCOPT := $(call gcc_ok,-fno-stack-protector,)
++GCCOPT := $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-fcommon)
+ EFIINC = $(objdir)/include/efi
+ LIBDIR = $(objdir)/lib
+
diff --git a/src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to-get-optimized.patch b/src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to-get-optimized.patch
new file mode 100644
index 000000000..c70769fce
--- /dev/null
+++ b/src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to-get-optimized.patch
@@ -0,0 +1,28 @@
+diff --git a/dos/string.h b/dos/string.h
+index f648de2d..407d0233 100644
+--- a/dos/string.h
++++ b/dos/string.h
+@@ -5,12 +5,22 @@
+ #ifndef _STRING_H
+ #define _STRING_H
+
++#include <stddef.h>
++
+ /* Standard routines */
+ #define memcpy(a,b,c) __builtin_memcpy(a,b,c)
+ #define memmove(a,b,c) __builtin_memmove(a,b,c)
+ #define memset(a,b,c) __builtin_memset(a,b,c)
+ #define strcpy(a,b) __builtin_strcpy(a,b)
+-#define strlen(a) __builtin_strlen(a)
++#define strlen(a) inline_strlen(a)
++
++/* replacement for builtin strlen that appears to get optimized away */
++static inline size_t inline_strlen(const char *str)
++{
++ size_t l;
++ for (l = 0; *str++; l++);
++ return l;
++}
+
+ /* This only returns true or false */
+ static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 38/62] u-boot: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (35 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 37/62] syslinux: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 39/62] kbd: Update to 2.2.0 Michael Tremer
` (22 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/u-boot | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/u-boot b/lfs/u-boot
index ffd558bdd..a0f8dac54 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -33,6 +33,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-$(MKIMAGE)
SUP_ARCH = armv5tel aarch64
+CFLAGS += -fcommon
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 39/62] kbd: Update to 2.2.0
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (36 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 38/62] u-boot: " Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 40/62] bacula: Fix build with GCC 10 Michael Tremer
` (21 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 31277 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/kbd | 158 ++++++++++++++-
lfs/kbd | 21 +-
src/patches/kbd-2.2.0-backspace-1.patch | 250 ++++++++++++++++++++++++
3 files changed, 411 insertions(+), 18 deletions(-)
create mode 100644 src/patches/kbd-2.2.0-backspace-1.patch
diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd
index 5f694ff0c..7f3296559 100644
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -26,11 +26,15 @@ bin/setfont
#lib/kbd/consolefonts/GohaClassic-12.psfu.gz
#lib/kbd/consolefonts/GohaClassic-14.psfu.gz
#lib/kbd/consolefonts/GohaClassic-16.psfu.gz
+#lib/kbd/consolefonts/Lat2-Terminus16.psfu.gz
#lib/kbd/consolefonts/LatArCyrHeb-08.psfu.gz
#lib/kbd/consolefonts/LatArCyrHeb-14.psfu.gz
lib/kbd/consolefonts/LatArCyrHeb-16+.psfu.gz
lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
#lib/kbd/consolefonts/LatArCyrHeb-19.psfu.gz
+#lib/kbd/consolefonts/LatGrkCyr-12x22.psfu.gz
+#lib/kbd/consolefonts/LatGrkCyr-8x16.psfu.gz
+#lib/kbd/consolefonts/LatKaCyrHeb-14.psfu.gz
#lib/kbd/consolefonts/Mik_8x16.gz
#lib/kbd/consolefonts/README.12x22
#lib/kbd/consolefonts/README.Arabic
@@ -38,13 +42,22 @@ lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
#lib/kbd/consolefonts/README.Ethiopic
#lib/kbd/consolefonts/README.Greek
#lib/kbd/consolefonts/README.Hebrew
+#lib/kbd/consolefonts/README.Lat2-Terminus16
+#lib/kbd/consolefonts/README.LatGrkCyr
+#lib/kbd/consolefonts/README.Sun
#lib/kbd/consolefonts/README.cp1250
#lib/kbd/consolefonts/README.cybercafe
#lib/kbd/consolefonts/README.drdos
+#lib/kbd/consolefonts/README.eurlatgr
+#lib/kbd/consolefonts/README.eurlatgr.mappings
#lib/kbd/consolefonts/README.lat0
#lib/kbd/consolefonts/README.lat7
#lib/kbd/consolefonts/README.lat9
#lib/kbd/consolefonts/README.psfu
+#lib/kbd/consolefonts/UniCyrExt_8x16.psf.gz
+#lib/kbd/consolefonts/UniCyr_8x14.psf.gz
+#lib/kbd/consolefonts/UniCyr_8x16.psf.gz
+#lib/kbd/consolefonts/UniCyr_8x8.psf.gz
#lib/kbd/consolefonts/alt-8x14.gz
#lib/kbd/consolefonts/alt-8x16.gz
#lib/kbd/consolefonts/alt-8x8.gz
@@ -72,6 +85,7 @@ lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
#lib/kbd/consolefonts/drdos8x16.psfu.gz
#lib/kbd/consolefonts/drdos8x6.psfu.gz
#lib/kbd/consolefonts/drdos8x8.psfu.gz
+#lib/kbd/consolefonts/eurlatgr.psfu.gz
#lib/kbd/consolefonts/gr737a-8x8.psfu.gz
#lib/kbd/consolefonts/gr737a-9x14.psfu.gz
#lib/kbd/consolefonts/gr737a-9x16.psfu.gz
@@ -191,6 +205,8 @@ lib/kbd/consolefonts/lat5-16.psfu.gz
#lib/kbd/consolefonts/lat9w-14.psfu.gz
#lib/kbd/consolefonts/lat9w-16.psfu.gz
lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz
+#lib/kbd/consolefonts/latarcyrheb-sun32.psfu.gz
+#lib/kbd/consolefonts/pancyrillic.f16.psfu.gz
#lib/kbd/consolefonts/partialfonts
#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.08.gz
#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.14.gz
@@ -307,10 +323,29 @@ lib/kbd/keymaps/i386
#lib/kbd/keymaps/i386/azerty/fr.map.gz
#lib/kbd/keymaps/i386/azerty/wangbe.map.gz
#lib/kbd/keymaps/i386/azerty/wangbe2.map.gz
+#lib/kbd/keymaps/i386/bepo
+#lib/kbd/keymaps/i386/bepo/fr-bepo-latin9.map.gz
+#lib/kbd/keymaps/i386/bepo/fr-bepo.map.gz
+#lib/kbd/keymaps/i386/carpalx
+#lib/kbd/keymaps/i386/carpalx/carpalx-full.map.gz
+#lib/kbd/keymaps/i386/carpalx/carpalx.map.gz
+#lib/kbd/keymaps/i386/colemak
+#lib/kbd/keymaps/i386/colemak/en-latin9.map.gz
#lib/kbd/keymaps/i386/dvorak
#lib/kbd/keymaps/i386/dvorak/ANSI-dvorak.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-ca-fr.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-es.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-fr.map.gz
#lib/kbd/keymaps/i386/dvorak/dvorak-l.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-la.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-no.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-programmer.map.gz
#lib/kbd/keymaps/i386/dvorak/dvorak-r.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-ru.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-sv-a1.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-sv-a5.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-uk.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-ukp.map.gz
#lib/kbd/keymaps/i386/dvorak/dvorak.map.gz
#lib/kbd/keymaps/i386/fgGIod
#lib/kbd/keymaps/i386/fgGIod/tr_f-latin5.map.gz
@@ -319,6 +354,7 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/include/applkey.map.gz
#lib/kbd/keymaps/i386/include/azerty-layout.inc
#lib/kbd/keymaps/i386/include/backspace.map.gz
+#lib/kbd/keymaps/i386/include/compose.inc
#lib/kbd/keymaps/i386/include/ctrl.map.gz
#lib/kbd/keymaps/i386/include/euro.map.gz
#lib/kbd/keymaps/i386/include/euro1.inc
@@ -334,7 +370,11 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/include/qwertz-layout.inc
#lib/kbd/keymaps/i386/include/unicode.map.gz
#lib/kbd/keymaps/i386/include/windowkeys.map.gz
+#lib/kbd/keymaps/i386/olpc
+#lib/kbd/keymaps/i386/olpc/es.map.gz
+#lib/kbd/keymaps/i386/olpc/pt.map.gz
#lib/kbd/keymaps/i386/qwerty
+#lib/kbd/keymaps/i386/qwerty/bashkir.map.gz
#lib/kbd/keymaps/i386/qwerty/bg-cp1251.map.gz
#lib/kbd/keymaps/i386/qwerty/bg-cp855.map.gz
#lib/kbd/keymaps/i386/qwerty/bg_bds-cp1251.map.gz
@@ -345,7 +385,9 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwerty/br-abnt2.map.gz
#lib/kbd/keymaps/i386/qwerty/br-latin1-abnt2.map.gz
#lib/kbd/keymaps/i386/qwerty/br-latin1-us.map.gz
+#lib/kbd/keymaps/i386/qwerty/by-cp1251.map.gz
#lib/kbd/keymaps/i386/qwerty/by.map.gz
+#lib/kbd/keymaps/i386/qwerty/bywin-cp1251.map.gz
#lib/kbd/keymaps/i386/qwerty/cf.map.gz
#lib/kbd/keymaps/i386/qwerty/cz-cp1250.map.gz
#lib/kbd/keymaps/i386/qwerty/cz-lat2-prog.map.gz
@@ -361,8 +403,7 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwerty/es.map.gz
#lib/kbd/keymaps/i386/qwerty/et-nodeadkeys.map.gz
#lib/kbd/keymaps/i386/qwerty/et.map.gz
-#lib/kbd/keymaps/i386/qwerty/fi-latin1.map.gz
-#lib/kbd/keymaps/i386/qwerty/fi-latin9.map.gz
+#lib/kbd/keymaps/i386/qwerty/fa.map.gz
#lib/kbd/keymaps/i386/qwerty/fi.map.gz
#lib/kbd/keymaps/i386/qwerty/gr-pc.map.gz
#lib/kbd/keymaps/i386/qwerty/gr.map.gz
@@ -377,10 +418,15 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwerty/it.map.gz
#lib/kbd/keymaps/i386/qwerty/it2.map.gz
#lib/kbd/keymaps/i386/qwerty/jp106.map.gz
+#lib/kbd/keymaps/i386/qwerty/kazakh.map.gz
+#lib/kbd/keymaps/i386/qwerty/ky_alt_sh-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/kyrgyz.map.gz
#lib/kbd/keymaps/i386/qwerty/la-latin1.map.gz
#lib/kbd/keymaps/i386/qwerty/lt.baltic.map.gz
#lib/kbd/keymaps/i386/qwerty/lt.l4.map.gz
#lib/kbd/keymaps/i386/qwerty/lt.map.gz
+#lib/kbd/keymaps/i386/qwerty/lv-tilde.map.gz
+#lib/kbd/keymaps/i386/qwerty/lv.map.gz
#lib/kbd/keymaps/i386/qwerty/mk-cp1251.map.gz
#lib/kbd/keymaps/i386/qwerty/mk-utf.map.gz
#lib/kbd/keymaps/i386/qwerty/mk.map.gz
@@ -392,9 +438,14 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwerty/no.map.gz
#lib/kbd/keymaps/i386/qwerty/pc110.map.gz
#lib/kbd/keymaps/i386/qwerty/pl.map.gz
+#lib/kbd/keymaps/i386/qwerty/pl1.map.gz
#lib/kbd/keymaps/i386/qwerty/pl2.map.gz
+#lib/kbd/keymaps/i386/qwerty/pl3.map.gz
+#lib/kbd/keymaps/i386/qwerty/pl4.map.gz
#lib/kbd/keymaps/i386/qwerty/pt-latin1.map.gz
#lib/kbd/keymaps/i386/qwerty/pt-latin9.map.gz
+#lib/kbd/keymaps/i386/qwerty/ro.map.gz
+#lib/kbd/keymaps/i386/qwerty/ro_std.map.gz
#lib/kbd/keymaps/i386/qwerty/ro_win.map.gz
#lib/kbd/keymaps/i386/qwerty/ru-cp1251.map.gz
#lib/kbd/keymaps/i386/qwerty/ru-ms.map.gz
@@ -405,6 +456,19 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwerty/ru3.map.gz
#lib/kbd/keymaps/i386/qwerty/ru4.map.gz
#lib/kbd/keymaps/i386/qwerty/ru_win.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_alt-CP1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_cplk-CP1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map.gz
+#lib/kbd/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map.gz
#lib/kbd/keymaps/i386/qwerty/se-fi-ir209.map.gz
#lib/kbd/keymaps/i386/qwerty/se-fi-lat6.map.gz
#lib/kbd/keymaps/i386/qwerty/se-ir209.map.gz
@@ -413,9 +477,16 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwerty/sk-qwerty.map.gz
#lib/kbd/keymaps/i386/qwerty/sr-cy.map.gz
#lib/kbd/keymaps/i386/qwerty/sv-latin1.map.gz
+#lib/kbd/keymaps/i386/qwerty/tj_alt-UTF8.map.gz
#lib/kbd/keymaps/i386/qwerty/tr_q-latin5.map.gz
#lib/kbd/keymaps/i386/qwerty/tralt.map.gz
+#lib/kbd/keymaps/i386/qwerty/trf.map.gz
#lib/kbd/keymaps/i386/qwerty/trq.map.gz
+#lib/kbd/keymaps/i386/qwerty/ttwin_alt-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ttwin_cplk-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ttwin_ct_sh-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ttwin_ctrl-UTF-8.map.gz
+#lib/kbd/keymaps/i386/qwerty/ua-cp1251.map.gz
#lib/kbd/keymaps/i386/qwerty/ua-utf-ws.map.gz
#lib/kbd/keymaps/i386/qwerty/ua-utf.map.gz
#lib/kbd/keymaps/i386/qwerty/ua-ws.map.gz
@@ -426,10 +497,13 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwertz
#lib/kbd/keymaps/i386/qwertz/croat.map.gz
#lib/kbd/keymaps/i386/qwertz/cz-us-qwertz.map.gz
+#lib/kbd/keymaps/i386/qwertz/cz.map.gz
#lib/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz
#lib/kbd/keymaps/i386/qwertz/de-latin1.map.gz
+#lib/kbd/keymaps/i386/qwertz/de-mobii.map.gz
#lib/kbd/keymaps/i386/qwertz/de.map.gz
#lib/kbd/keymaps/i386/qwertz/de_CH-latin1.map.gz
+#lib/kbd/keymaps/i386/qwertz/de_alt_UTF-8.map.gz
#lib/kbd/keymaps/i386/qwertz/fr_CH-latin1.map.gz
#lib/kbd/keymaps/i386/qwertz/fr_CH.map.gz
#lib/kbd/keymaps/i386/qwertz/hu.map.gz
@@ -439,6 +513,7 @@ lib/kbd/keymaps/i386/include
#lib/kbd/keymaps/i386/qwertz/sk-prog-qwertz.map.gz
#lib/kbd/keymaps/i386/qwertz/sk-qwertz.map.gz
#lib/kbd/keymaps/i386/qwertz/slovene.map.gz
+#lib/kbd/keymaps/i386/qwertz/sr-latin.map.gz
lib/kbd/keymaps/include
#lib/kbd/keymaps/include/compose.8859_7
#lib/kbd/keymaps/include/compose.8859_8
@@ -450,6 +525,11 @@ lib/kbd/keymaps/include
#lib/kbd/keymaps/include/vim-compose.latin1
#lib/kbd/keymaps/mac
#lib/kbd/keymaps/mac/all
+#lib/kbd/keymaps/mac/all/apple-a1048-sv.map.gz
+#lib/kbd/keymaps/mac/all/apple-a1243-sv-fn-reverse.map.gz
+#lib/kbd/keymaps/mac/all/apple-a1243-sv.map.gz
+#lib/kbd/keymaps/mac/all/apple-internal-0x0253-sv-fn-reverse.map.gz
+#lib/kbd/keymaps/mac/all/apple-internal-0x0253-sv.map.gz
#lib/kbd/keymaps/mac/all/mac-be.map.gz
#lib/kbd/keymaps/mac/all/mac-de-latin1-nodeadkeys.map.gz
#lib/kbd/keymaps/mac/all/mac-de-latin1.map.gz
@@ -461,14 +541,20 @@ lib/kbd/keymaps/include
#lib/kbd/keymaps/mac/all/mac-fr.map.gz
#lib/kbd/keymaps/mac/all/mac-fr_CH-latin1.map.gz
#lib/kbd/keymaps/mac/all/mac-it.map.gz
+#lib/kbd/keymaps/mac/all/mac-no-latin1.map.gz
+#lib/kbd/keymaps/mac/all/mac-pl.map.gz
#lib/kbd/keymaps/mac/all/mac-pt-latin1.map.gz
#lib/kbd/keymaps/mac/all/mac-se.map.gz
#lib/kbd/keymaps/mac/all/mac-template.map.gz
#lib/kbd/keymaps/mac/all/mac-uk.map.gz
#lib/kbd/keymaps/mac/all/mac-us.map.gz
#lib/kbd/keymaps/mac/include
+#lib/kbd/keymaps/mac/include/apple-a1048-base.inc
+#lib/kbd/keymaps/mac/include/apple-a1243-fn-reverse.inc
+#lib/kbd/keymaps/mac/include/apple-a1243-fn.inc
#lib/kbd/keymaps/mac/include/mac-azerty-layout.inc
#lib/kbd/keymaps/mac/include/mac-euro.map.gz
+#lib/kbd/keymaps/mac/include/mac-euro2.map.gz
#lib/kbd/keymaps/mac/include/mac-linux-keys-bare.inc
#lib/kbd/keymaps/mac/include/mac-qwerty-layout.inc
#lib/kbd/keymaps/mac/include/mac-qwertz-layout.inc
@@ -489,6 +575,65 @@ lib/kbd/keymaps/include
#lib/kbd/keymaps/sun/sunt5-ru.map.gz
#lib/kbd/keymaps/sun/sunt5-uk.map.gz
#lib/kbd/keymaps/sun/sunt5-us-cz.map.gz
+#lib/kbd/keymaps/sun/sunt6-uk.map.gz
+#lib/kbd/locale
+#lib/kbd/locale/cs
+#lib/kbd/locale/cs/LC_MESSAGES
+#lib/kbd/locale/cs/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/da
+#lib/kbd/locale/da/LC_MESSAGES
+#lib/kbd/locale/da/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/de
+#lib/kbd/locale/de/LC_MESSAGES
+#lib/kbd/locale/de/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/el
+#lib/kbd/locale/el/LC_MESSAGES
+#lib/kbd/locale/el/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/eo
+#lib/kbd/locale/eo/LC_MESSAGES
+#lib/kbd/locale/eo/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/es
+#lib/kbd/locale/es/LC_MESSAGES
+#lib/kbd/locale/es/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/fr
+#lib/kbd/locale/fr/LC_MESSAGES
+#lib/kbd/locale/fr/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/gr
+#lib/kbd/locale/gr/LC_MESSAGES
+#lib/kbd/locale/gr/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/id
+#lib/kbd/locale/id/LC_MESSAGES
+#lib/kbd/locale/id/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/it
+#lib/kbd/locale/it/LC_MESSAGES
+#lib/kbd/locale/it/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/nl
+#lib/kbd/locale/nl/LC_MESSAGES
+#lib/kbd/locale/nl/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/pl
+#lib/kbd/locale/pl/LC_MESSAGES
+#lib/kbd/locale/pl/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/ro
+#lib/kbd/locale/ro/LC_MESSAGES
+#lib/kbd/locale/ro/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/ru
+#lib/kbd/locale/ru/LC_MESSAGES
+#lib/kbd/locale/ru/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/sv
+#lib/kbd/locale/sv/LC_MESSAGES
+#lib/kbd/locale/sv/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/tr
+#lib/kbd/locale/tr/LC_MESSAGES
+#lib/kbd/locale/tr/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/uk
+#lib/kbd/locale/uk/LC_MESSAGES
+#lib/kbd/locale/uk/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/vi
+#lib/kbd/locale/vi/LC_MESSAGES
+#lib/kbd/locale/vi/LC_MESSAGES/kbd.mo
+#lib/kbd/locale/zh_CN
+#lib/kbd/locale/zh_CN/LC_MESSAGES
+#lib/kbd/locale/zh_CN/LC_MESSAGES/kbd.mo
lib/kbd/unimaps
#lib/kbd/unimaps/8859-1.a0-ff.uni
#lib/kbd/unimaps/8859-10.a0-ff.uni
@@ -559,7 +704,7 @@ usr/bin/deallocvt
usr/bin/dumpkeys
usr/bin/fgconsole
usr/bin/getkeycodes
-usr/bin/getunimap
+usr/bin/kbdinfo
#usr/bin/kbdrate
usr/bin/loadunimap
#usr/bin/mapscrn
@@ -570,9 +715,8 @@ usr/bin/loadunimap
#usr/bin/resizecons
usr/bin/setkeycodes
usr/bin/setleds
-usr/bin/setlogcons
usr/bin/setmetamode
-usr/bin/setvesablank
+usr/bin/setvtrgb
usr/bin/showconsolefont
usr/bin/showkey
usr/bin/unicode_start
@@ -582,6 +726,7 @@ usr/bin/unicode_stop
#usr/share/man/man1/dumpkeys.1
#usr/share/man/man1/fgconsole.1
#usr/share/man/man1/kbd_mode.1
+#usr/share/man/man1/kbdinfo.1
#usr/share/man/man1/loadkeys.1
#usr/share/man/man1/openvt.1
#usr/share/man/man1/psfaddtable.1
@@ -595,12 +740,11 @@ usr/bin/unicode_stop
#usr/share/man/man1/unicode_stop.1
#usr/share/man/man5/keymaps.5
#usr/share/man/man8/getkeycodes.8
-#usr/share/man/man8/getunimap.8
#usr/share/man/man8/kbdrate.8
#usr/share/man/man8/loadunimap.8
#usr/share/man/man8/mapscrn.8
#usr/share/man/man8/resizecons.8
#usr/share/man/man8/setfont.8
#usr/share/man/man8/setkeycodes.8
-#usr/share/man/man8/setvesablank.8
+#usr/share/man/man8/setvtrgb.8
#usr/share/man/man8/showconsolefont.8
diff --git a/lfs/kbd b/lfs/kbd
index b126f27a7..590f8afe7 100644
--- a/lfs/kbd
+++ b/lfs/kbd
@@ -24,10 +24,10 @@
include Config
-VER = 1.12
+VER = 2.2.0
THISAPP = kbd-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -35,16 +35,14 @@ TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch \
+objects = $(DL_FILE) \
kbd-latarcyrheb-16-fixed.tar.bz2 kbd-latsun-fonts.tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-more-programs-1.patch = $(DL_FROM)/kbd-$(VER)-more-programs-1.patch
kbd-latarcyrheb-16-fixed.tar.bz2 = $(DL_FROM)/kbd-latarcyrheb-16-fixed.tar.bz2
kbd-latsun-fonts.tar.bz2 = $(DL_FROM)/kbd-latsun-fonts.tar.bz2
-$(DL_FILE)_MD5 = 069d1175b4891343b107a8ac2b4a39f6
-$(THISAPP)-more-programs-1.patch_MD5 = dc70180a6bc0afa2b741cd38e3cc2e18
+$(DL_FILE)_MD5 = d1d7ae0b5fb875dc082731e09cd0c8bc
kbd-latarcyrheb-16-fixed.tar.bz2_MD5 = 884fdbb0b952b2e3e8389a0c40a3e301
kbd-latsun-fonts.tar.bz2_MD5 = e22ee88353968df8d4a4b1bf1fa8fc31
@@ -75,18 +73,19 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-more-programs-1.patch
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-backspace-1.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-1.patch
# Extract our own fonts
cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2
cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latsun-fonts.tar.bz2
- cd $(DIR_APP) && ./configure --datadir=/lib/kbd --disable-nls
+ cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/lib/kbd --disable-vlock
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin
+
+ # Move some tools to /bin
+ mv -v /usr/bin/{loadkeys,kbd_mode,openvt,setfont} /bin
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/patches/kbd-2.2.0-backspace-1.patch b/src/patches/kbd-2.2.0-backspace-1.patch
new file mode 100644
index 000000000..8fec17180
--- /dev/null
+++ b/src/patches/kbd-2.2.0-backspace-1.patch
@@ -0,0 +1,250 @@
+Submitted By: Matt Burgess
+Date: 2008-12-06
+Initial Package Version: 1.15
+Upstream Status: Not submitted, possibly incomplete
+Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
+Makes the Backspace key send character code 127, and Delete send a well known
+escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386.
+
+Original patch for 1.12 by Alexander Patrakov.
+Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map,
+ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>.
+Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
+
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20 12:36:01.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03 22:27:55.000000000 +0000
+@@ -43,7 +43,7 @@
+ keycode 11 = three numbersign
+ keycode 12 = two at
+ keycode 13 = one exclam
+- keycode 14 = BackSpace Delete
++ keycode 14 = Delete Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20 12:36:01.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03 22:28:13.000000000 +0000
+@@ -43,7 +43,7 @@
+ keycode 11 = slash question
+ keycode 12 = bracketleft braceleft
+ keycode 13 = bracketright braceright
+- keycode 14 = BackSpace Delete
++ keycode 14 = Delete Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000
+@@ -51,7 +51,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = minus underscore
+ alt keycode 13 = Meta_equal
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Meta_Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000
+@@ -205,7 +205,7 @@
+ # edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode 14 = \
+- BackSpace BackSpace BackSpace BackSpace \
++ Delete Delete Delete Delete \
+ Delete Delete Delete Delete \
+ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete
+@@ -506,7 +506,7 @@
+
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete F111 Delete F111 \
++keycode 111 = Remove F111 Remove F111 \
+ Remove Remove Remove Remove \
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete \
+ Boot Boot Boot Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03 22:42:58.000000000 +0000
+@@ -204,7 +204,7 @@
+ # edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode 14 = \
+- BackSpace BackSpace BackSpace BackSpace \
++ Delete Delete Delete Delete \
+ Delete Delete Delete Delete \
+ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete
+@@ -505,7 +505,7 @@
+
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete F111 Delete F111 \
++keycode 111 = Remove F111 Remove F111 \
+ Remove Remove Remove Remove \
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete \
+ Boot Boot Boot Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20 12:36:00.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03 22:44:25.000000000 +0000
+@@ -3,7 +3,7 @@
+ # Send comments to Kjetil T. Homme <kjetilho(a)ifi.uio.no>
+ include "linux-with-alt-and-altgr"
+ plain keycode 83 = KP_Comma
+- plain keycode 111 = Delete # "Remove" originally, weird...
++ plain keycode 111 = Remove
+ strings as usual
+
+ keycode 1 = Escape
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000
+@@ -143,8 +143,8 @@
+
+ # The keycode "0xFF" is too dangerous for many programs (including emacs).
+ # So let it be bracket instead of Hard Sign.
+-# altgr keycode 27 = +0xDF
+-# altgr shift keycode 27 = +0xFF
++altgr keycode 27 = +0xDF
++altgr shift keycode 27 = +0xFF
+ control keycode 27 = Control_bracketright
+ altgr control keycode 27 = Control_bracketright
+ alt keycode 27 = Meta_bracketright
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03 22:46:15.000000000 +0000
+@@ -46,7 +46,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = equal plus equal plus
+ alt keycode 13 = Meta_equal
+- keycode 14 = BackSpace BackSpace BackSpace BackSpace
++ keycode 14 = Delete Delete Delete Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Tab Tab Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000
+@@ -39,7 +39,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = equal plus equal plus
+ alt keycode 13 = Meta_equal
+- keycode 14 = BackSpace
++ keycode 14 = Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000
+@@ -89,8 +89,8 @@
+ altgr alt keycode 13 = Meta_equal
+ shift alt keycode 13 = Meta_plus
+ altgr shift alt keycode 13 = Meta_plus
+- keycode 14 = BackSpace BackSpace BackSpace BackSpace
+-# keycode 14 = Delete Delete Delete Delete
++# keycode 14 = BackSpace BackSpace BackSpace BackSpace
++ keycode 14 = Delete Delete Delete Delete
+ alt keycode 14 = Meta_Delete
+ altgr alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Tab Tab Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000
+@@ -42,7 +42,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = equal plus equal plus
+ alt keycode 13 = Meta_equal
+- keycode 14 = BackSpace BackSpace BackSpace BackSpace
++ keycode 14 = Delete Delete Delete Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Tab Tab Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000
+@@ -345,7 +345,7 @@
+ keycode 109 = Next Scroll_Forward
+ keycode 110 = Insert
+
+- keycode 111 = Delete # "Remove" originally, weird...
++ keycode 111 = Remove
+ control alt keycode 111 = Boot
+ control altgr keycode 111 = Boot
+
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000
+@@ -374,6 +374,6 @@
+ keycode 109 = Next Scroll_Forward
+ keycode 110 = Insert
+
+- keycode 111 = Delete # "Remove" originally, weird...
++ keycode 111 = Remove
+ control alt keycode 111 = Boot
+ control altgr keycode 111 = Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03 22:52:09.000000000 +0000
+@@ -49,7 +49,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = minus underscore
+ alt keycode 13 = Meta_equal
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Meta_Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03 22:52:52.000000000 +0000
+@@ -249,7 +249,7 @@
+ shift ctrll ctrlr keycode 13 = plus
+ alt ctrll ctrlr keycode 13 = Meta_equal
+ shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+ ctrlr keycode 14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03 22:53:36.000000000 +0000
+@@ -250,7 +250,7 @@
+ shift ctrll ctrlr keycode 13 = plus
+ alt ctrll ctrlr keycode 13 = Meta_equal
+ shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+ ctrlr keycode 14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03 22:54:06.000000000 +0000
+@@ -260,7 +260,7 @@
+ shift ctrll ctrlr keycode 13 = plus
+ alt ctrll ctrlr keycode 13 = Meta_equal
+ shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+ ctrlr keycode 14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03 22:54:23.000000000 +0000
+@@ -260,7 +260,7 @@
+ shift ctrll ctrlr keycode 13 = plus
+ alt ctrll ctrlr keycode 13 = Meta_equal
+ shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+ ctrlr keycode 14 = BackSpace
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 40/62] bacula: Fix build with GCC 10
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (37 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 39/62] kbd: Update to 2.2.0 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 42/62] make.sh: Remove -mindirect-branch=thunk and -mfunction-return=thunk as default Michael Tremer
` (20 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1845 bytes --]
GCC 10 aborts compilation when nunbers are (potentially) out of range
when casted from one type to another:
fstype.c: In function 'bool fstype(FF_PKT*, char*, int)':
fstype.c:207:12: error: narrowing conversion of '4283649346' from
'unsigned int' to 'int' [-Wnarrowing]
207 | case 0xFF534D42: fstype = "cifs"; break; /*
CIFS_MAGIC_NUMBER */
| ^~~~~~~~~~
fstype.c:216:12: error: narrowing conversion of '4187351113' from
'unsigned int' to 'int' [-Wnarrowing]
216 | case 0xf995e849: fstype = "hpfs"; break; /*
HPFS_SUPER_MAGIC */
| ^~~~~~~~~~
fstype.c:217:12: error: narrowing conversion of '2508478710' from
'unsigned int' to 'int' [-Wnarrowing]
217 | case 0x958458f6: fstype = "hugetlbfs"; break; /*
HUGETLBFS_MAGIC */
| ^~~~~~~~~~
fstype.c:234:12: error: narrowing conversion of '2768370933' from
'unsigned int' to 'int' [-Wnarrowing]
234 | case 0xa501FCF5: fstype = "vxfs"; break;
| ^~~~~~~~~~
fstype.c:237:12: error: narrowing conversion of '2435016766' from
'unsigned int' to 'int' [-Wnarrowing]
237 | case 0x9123683e: fstype = "btrfs"; break;
| ^~~~~~~~~~
Does nobody build this for 32 bit any more?
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/bacula | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lfs/bacula b/lfs/bacula
index f5220bf16..3201688f4 100644
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -36,6 +36,9 @@ PAK_VER = 6
DEPS =
+# For GCC 10
+CFLAGS += -Wno-error=narrowing
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 42/62] make.sh: Remove -mindirect-branch=thunk and -mfunction-return=thunk as default
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (38 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 40/62] bacula: Fix build with GCC 10 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 43/62] Update glibc to 2.32 Michael Tremer
` (19 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
I cannot find any evidence that this is helpful and no other
distribution has this as default. Packages that are vulnerable to these
attacks (i.e. the kernel) add these flags as appropriate automatically.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
make.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make.sh b/make.sh
index 799aeee66..1a1960674 100755
--- a/make.sh
+++ b/make.sh
@@ -146,14 +146,14 @@ configure_build() {
BUILDTARGET="${build_arch}-unknown-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="x86"
- CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
+ CFLAGS_ARCH="-m64 -mtune=generic"
;;
i586)
BUILDTARGET="${build_arch}-pc-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="x86"
- CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
+ CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
;;
aarch64)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 43/62] Update glibc to 2.32
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (39 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 42/62] make.sh: Remove -mindirect-branch=thunk and -mfunction-return=thunk as default Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 44/62] rpcsvc-proto: New package Michael Tremer
` (18 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 34073 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/aarch64/glibc | 127 +++++++-----------------
config/rootfiles/common/armv5tel/glibc | 127 +++++++-----------------
config/rootfiles/common/i586/glibc | 127 +++++++-----------------
config/rootfiles/common/x86_64/glibc | 131 ++++++++-----------------
lfs/glibc | 9 +-
5 files changed, 153 insertions(+), 368 deletions(-)
diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc
index 7f0359dbc..6a01217e0 100644
--- a/config/rootfiles/common/aarch64/glibc
+++ b/config/rootfiles/common/aarch64/glibc
@@ -1,47 +1,43 @@
#etc/ld.so.cache
etc/rpc
-lib/ld-2.31.so
+lib/ld-2.32.so
lib/ld-linux-aarch64.so.1
-lib/libBrokenLocale-2.31.so
+lib/libBrokenLocale-2.32.so
lib/libBrokenLocale.so.1
#lib/libSegFault.so
-lib/libanl-2.31.so
+lib/libanl-2.32.so
lib/libanl.so.1
-lib/libc-2.31.so
+lib/libc-2.32.so
lib/libc.so.6
-lib/libcrypt-2.31.so
+lib/libcrypt-2.32.so
lib/libcrypt.so.1
-lib/libdl-2.31.so
+lib/libdl-2.32.so
lib/libdl.so.2
-lib/libm-2.31.so
+lib/libm-2.32.so
lib/libm.so.6
#lib/libmemusage.so
-lib/libnsl-2.31.so
+lib/libnsl-2.32.so
lib/libnsl.so.1
-lib/libnss_compat-2.31.so
+lib/libnss_compat-2.32.so
lib/libnss_compat.so.2
-lib/libnss_db-2.31.so
+lib/libnss_db-2.32.so
lib/libnss_db.so.2
-lib/libnss_dns-2.31.so
+lib/libnss_dns-2.32.so
lib/libnss_dns.so.2
-lib/libnss_files-2.31.so
+lib/libnss_files-2.32.so
lib/libnss_files.so.2
-lib/libnss_hesiod-2.31.so
+lib/libnss_hesiod-2.32.so
lib/libnss_hesiod.so.2
-lib/libnss_nis-2.31.so
-lib/libnss_nis.so.2
-lib/libnss_nisplus-2.31.so
-lib/libnss_nisplus.so.2
#lib/libpcprofile.so
-lib/libpthread-2.31.so
+lib/libpthread-2.32.so
lib/libpthread.so.0
-lib/libresolv-2.31.so
+lib/libresolv-2.32.so
lib/libresolv.so.2
-lib/librt-2.31.so
+lib/librt-2.32.so
lib/librt.so.1
lib/libthread_db-1.0.so
lib/libthread_db.so.1
-lib/libutil-2.31.so
+lib/libutil-2.32.so
lib/libutil.so.1
sbin/ldconfig
#sbin/sln
@@ -57,7 +53,6 @@ usr/bin/locale
#usr/bin/mtrace
#usr/bin/pcprofiledump
#usr/bin/pldd
-#usr/bin/rpcgen
#usr/bin/sotruss
#usr/bin/sprof
#usr/bin/tzselect
@@ -101,7 +96,6 @@ usr/bin/locale
#usr/include/bits/fcntl.h
#usr/include/bits/fcntl2.h
#usr/include/bits/fenv.h
-#usr/include/bits/fenvinline.h
#usr/include/bits/floatn-common.h
#usr/include/bits/floatn.h
#usr/include/bits/flt-eval-method.h
@@ -132,7 +126,6 @@ usr/bin/locale
#usr/include/bits/mathcalls-narrow.h
#usr/include/bits/mathcalls.h
#usr/include/bits/mathdef.h
-#usr/include/bits/mathinline.h
#usr/include/bits/mman-linux.h
#usr/include/bits/mman-map-flags-generic.h
#usr/include/bits/mman-shared.h
@@ -140,7 +133,6 @@ usr/bin/locale
#usr/include/bits/monetary-ldbl.h
#usr/include/bits/mqueue.h
#usr/include/bits/mqueue2.h
-#usr/include/bits/msq-pad.h
#usr/include/bits/msq.h
#usr/include/bits/netdb.h
#usr/include/bits/param.h
@@ -161,12 +153,10 @@ usr/bin/locale
#usr/include/bits/sched.h
#usr/include/bits/select.h
#usr/include/bits/select2.h
-#usr/include/bits/sem-pad.h
#usr/include/bits/sem.h
#usr/include/bits/semaphore.h
#usr/include/bits/setjmp.h
#usr/include/bits/setjmp2.h
-#usr/include/bits/shm-pad.h
#usr/include/bits/shm.h
#usr/include/bits/shmlba.h
#usr/include/bits/sigaction.h
@@ -177,8 +167,8 @@ usr/bin/locale
#usr/include/bits/siginfo-consts.h
#usr/include/bits/signal_ext.h
#usr/include/bits/signalfd.h
+#usr/include/bits/signum-arch.h
#usr/include/bits/signum-generic.h
-#usr/include/bits/signum.h
#usr/include/bits/sigstack.h
#usr/include/bits/sigthread.h
#usr/include/bits/sockaddr.h
@@ -207,9 +197,7 @@ usr/bin/locale
#usr/include/bits/strings_fortified.h
#usr/include/bits/struct_mutex.h
#usr/include/bits/struct_rwlock.h
-#usr/include/bits/sys_errlist.h
#usr/include/bits/syscall.h
-#usr/include/bits/sysctl.h
#usr/include/bits/syslog-ldbl.h
#usr/include/bits/syslog-path.h
#usr/include/bits/syslog.h
@@ -256,9 +244,12 @@ usr/bin/locale
#usr/include/bits/types/struct_FILE.h
#usr/include/bits/types/struct_iovec.h
#usr/include/bits/types/struct_itimerspec.h
+#usr/include/bits/types/struct_msqid_ds.h
#usr/include/bits/types/struct_osockaddr.h
#usr/include/bits/types/struct_rusage.h
#usr/include/bits/types/struct_sched_param.h
+#usr/include/bits/types/struct_semid_ds.h
+#usr/include/bits/types/struct_shmid_ds.h
#usr/include/bits/types/struct_sigstack.h
#usr/include/bits/types/struct_statx.h
#usr/include/bits/types/struct_statx_timestamp.h
@@ -406,61 +397,7 @@ usr/bin/locale
#usr/include/regexp.h
#usr/include/resolv.h
#usr/include/rpc
-#usr/include/rpc/auth.h
-#usr/include/rpc/auth_des.h
-#usr/include/rpc/auth_unix.h
-#usr/include/rpc/clnt.h
-#usr/include/rpc/key_prot.h
#usr/include/rpc/netdb.h
-#usr/include/rpc/pmap_clnt.h
-#usr/include/rpc/pmap_prot.h
-#usr/include/rpc/pmap_rmt.h
-#usr/include/rpc/rpc.h
-#usr/include/rpc/rpc_msg.h
-#usr/include/rpc/svc.h
-#usr/include/rpc/svc_auth.h
-#usr/include/rpc/types.h
-#usr/include/rpc/xdr.h
-#usr/include/rpcsvc
-#usr/include/rpcsvc/bootparam.h
-#usr/include/rpcsvc/bootparam_prot.h
-#usr/include/rpcsvc/bootparam_prot.x
-#usr/include/rpcsvc/key_prot.h
-#usr/include/rpcsvc/key_prot.x
-#usr/include/rpcsvc/klm_prot.h
-#usr/include/rpcsvc/klm_prot.x
-#usr/include/rpcsvc/mount.h
-#usr/include/rpcsvc/mount.x
-#usr/include/rpcsvc/nfs_prot.h
-#usr/include/rpcsvc/nfs_prot.x
-#usr/include/rpcsvc/nis.h
-#usr/include/rpcsvc/nis.x
-#usr/include/rpcsvc/nis_callback.h
-#usr/include/rpcsvc/nis_callback.x
-#usr/include/rpcsvc/nis_object.x
-#usr/include/rpcsvc/nis_tags.h
-#usr/include/rpcsvc/nislib.h
-#usr/include/rpcsvc/nlm_prot.h
-#usr/include/rpcsvc/nlm_prot.x
-#usr/include/rpcsvc/rex.h
-#usr/include/rpcsvc/rex.x
-#usr/include/rpcsvc/rquota.h
-#usr/include/rpcsvc/rquota.x
-#usr/include/rpcsvc/rstat.h
-#usr/include/rpcsvc/rstat.x
-#usr/include/rpcsvc/rusers.h
-#usr/include/rpcsvc/rusers.x
-#usr/include/rpcsvc/sm_inter.h
-#usr/include/rpcsvc/sm_inter.x
-#usr/include/rpcsvc/spray.h
-#usr/include/rpcsvc/spray.x
-#usr/include/rpcsvc/yp.h
-#usr/include/rpcsvc/yp.x
-#usr/include/rpcsvc/yp_prot.h
-#usr/include/rpcsvc/ypclnt.h
-#usr/include/rpcsvc/yppasswd.h
-#usr/include/rpcsvc/yppasswd.x
-#usr/include/rpcsvc/ypupd.h
#usr/include/sched.h
#usr/include/scsi/scsi.h
#usr/include/scsi/scsi_ioctl.h
@@ -526,6 +463,7 @@ usr/bin/locale
#usr/include/sys/shm.h
#usr/include/sys/signal.h
#usr/include/sys/signalfd.h
+#usr/include/sys/single_threaded.h
#usr/include/sys/socket.h
#usr/include/sys/socketvar.h
#usr/include/sys/soundcard.h
@@ -534,7 +472,6 @@ usr/bin/locale
#usr/include/sys/statvfs.h
#usr/include/sys/swap.h
#usr/include/sys/syscall.h
-#usr/include/sys/sysctl.h
#usr/include/sys/sysinfo.h
#usr/include/sys/syslog.h
#usr/include/sys/sysmacros.h
@@ -865,20 +802,15 @@ usr/lib/gconv
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
-#usr/lib/libnsl.a
-#usr/lib/libnsl.so
#usr/lib/libnss_compat.so
#usr/lib/libnss_db.so
#usr/lib/libnss_dns.so
#usr/lib/libnss_files.so
#usr/lib/libnss_hesiod.so
-#usr/lib/libnss_nis.so
-#usr/lib/libnss_nisplus.so
#usr/lib/libpthread.a
#usr/lib/libpthread.so
#usr/lib/libresolv.a
#usr/lib/libresolv.so
-#usr/lib/librpcsvc.a
#usr/lib/librt.a
#usr/lib/librt.so
#usr/lib/libthread_db.so
@@ -2145,6 +2077,20 @@ usr/lib/locale
#usr/lib/locale/chr_US/LC_PAPER
#usr/lib/locale/chr_US/LC_TELEPHONE
#usr/lib/locale/chr_US/LC_TIME
+#usr/lib/locale/ckb_IQ
+#usr/lib/locale/ckb_IQ/LC_ADDRESS
+#usr/lib/locale/ckb_IQ/LC_COLLATE
+#usr/lib/locale/ckb_IQ/LC_CTYPE
+#usr/lib/locale/ckb_IQ/LC_IDENTIFICATION
+#usr/lib/locale/ckb_IQ/LC_MEASUREMENT
+#usr/lib/locale/ckb_IQ/LC_MESSAGES
+#usr/lib/locale/ckb_IQ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ckb_IQ/LC_MONETARY
+#usr/lib/locale/ckb_IQ/LC_NAME
+#usr/lib/locale/ckb_IQ/LC_NUMERIC
+#usr/lib/locale/ckb_IQ/LC_PAPER
+#usr/lib/locale/ckb_IQ/LC_TELEPHONE
+#usr/lib/locale/ckb_IQ/LC_TIME
#usr/lib/locale/cmn_TW
#usr/lib/locale/cmn_TW/LC_ADDRESS
#usr/lib/locale/cmn_TW/LC_COLLATE
@@ -8005,6 +7951,7 @@ usr/lib/locale
#usr/share/i18n/locales/ca_IT
#usr/share/i18n/locales/ce_RU
#usr/share/i18n/locales/chr_US
+#usr/share/i18n/locales/ckb_IQ
#usr/share/i18n/locales/cmn_TW
#usr/share/i18n/locales/cns11643_stroke
#usr/share/i18n/locales/crh_UA
diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc
index 6c63154e3..dce188845 100644
--- a/config/rootfiles/common/armv5tel/glibc
+++ b/config/rootfiles/common/armv5tel/glibc
@@ -1,47 +1,43 @@
#etc/ld.so.cache
etc/rpc
-lib/ld-2.31.so
+lib/ld-2.32.so
lib/ld-linux.so.3
-lib/libBrokenLocale-2.31.so
+lib/libBrokenLocale-2.32.so
lib/libBrokenLocale.so.1
#lib/libSegFault.so
-lib/libanl-2.31.so
+lib/libanl-2.32.so
lib/libanl.so.1
-lib/libc-2.31.so
+lib/libc-2.32.so
lib/libc.so.6
-lib/libcrypt-2.31.so
+lib/libcrypt-2.32.so
lib/libcrypt.so.1
-lib/libdl-2.31.so
+lib/libdl-2.32.so
lib/libdl.so.2
-lib/libm-2.31.so
+lib/libm-2.32.so
lib/libm.so.6
#lib/libmemusage.so
-lib/libnsl-2.31.so
+lib/libnsl-2.32.so
lib/libnsl.so.1
-lib/libnss_compat-2.31.so
+lib/libnss_compat-2.32.so
lib/libnss_compat.so.2
-lib/libnss_db-2.31.so
+lib/libnss_db-2.32.so
lib/libnss_db.so.2
-lib/libnss_dns-2.31.so
+lib/libnss_dns-2.32.so
lib/libnss_dns.so.2
-lib/libnss_files-2.31.so
+lib/libnss_files-2.32.so
lib/libnss_files.so.2
-lib/libnss_hesiod-2.31.so
+lib/libnss_hesiod-2.32.so
lib/libnss_hesiod.so.2
-lib/libnss_nis-2.31.so
-lib/libnss_nis.so.2
-lib/libnss_nisplus-2.31.so
-lib/libnss_nisplus.so.2
#lib/libpcprofile.so
-lib/libpthread-2.31.so
+lib/libpthread-2.32.so
lib/libpthread.so.0
-lib/libresolv-2.31.so
+lib/libresolv-2.32.so
lib/libresolv.so.2
-lib/librt-2.31.so
+lib/librt-2.32.so
lib/librt.so.1
lib/libthread_db-1.0.so
lib/libthread_db.so.1
-lib/libutil-2.31.so
+lib/libutil-2.32.so
lib/libutil.so.1
sbin/ldconfig
#sbin/sln
@@ -57,7 +53,6 @@ usr/bin/locale
#usr/bin/mtrace
#usr/bin/pcprofiledump
#usr/bin/pldd
-#usr/bin/rpcgen
#usr/bin/sotruss
#usr/bin/sprof
#usr/bin/tzselect
@@ -101,7 +96,6 @@ usr/bin/locale
#usr/include/bits/fcntl.h
#usr/include/bits/fcntl2.h
#usr/include/bits/fenv.h
-#usr/include/bits/fenvinline.h
#usr/include/bits/floatn-common.h
#usr/include/bits/floatn.h
#usr/include/bits/flt-eval-method.h
@@ -132,7 +126,6 @@ usr/bin/locale
#usr/include/bits/mathcalls-narrow.h
#usr/include/bits/mathcalls.h
#usr/include/bits/mathdef.h
-#usr/include/bits/mathinline.h
#usr/include/bits/mman-linux.h
#usr/include/bits/mman-map-flags-generic.h
#usr/include/bits/mman-shared.h
@@ -140,7 +133,6 @@ usr/bin/locale
#usr/include/bits/monetary-ldbl.h
#usr/include/bits/mqueue.h
#usr/include/bits/mqueue2.h
-#usr/include/bits/msq-pad.h
#usr/include/bits/msq.h
#usr/include/bits/netdb.h
#usr/include/bits/param.h
@@ -161,12 +153,10 @@ usr/bin/locale
#usr/include/bits/sched.h
#usr/include/bits/select.h
#usr/include/bits/select2.h
-#usr/include/bits/sem-pad.h
#usr/include/bits/sem.h
#usr/include/bits/semaphore.h
#usr/include/bits/setjmp.h
#usr/include/bits/setjmp2.h
-#usr/include/bits/shm-pad.h
#usr/include/bits/shm.h
#usr/include/bits/shmlba.h
#usr/include/bits/sigaction.h
@@ -177,8 +167,8 @@ usr/bin/locale
#usr/include/bits/siginfo-consts.h
#usr/include/bits/signal_ext.h
#usr/include/bits/signalfd.h
+#usr/include/bits/signum-arch.h
#usr/include/bits/signum-generic.h
-#usr/include/bits/signum.h
#usr/include/bits/sigstack.h
#usr/include/bits/sigthread.h
#usr/include/bits/sockaddr.h
@@ -207,9 +197,7 @@ usr/bin/locale
#usr/include/bits/strings_fortified.h
#usr/include/bits/struct_mutex.h
#usr/include/bits/struct_rwlock.h
-#usr/include/bits/sys_errlist.h
#usr/include/bits/syscall.h
-#usr/include/bits/sysctl.h
#usr/include/bits/syslog-ldbl.h
#usr/include/bits/syslog-path.h
#usr/include/bits/syslog.h
@@ -256,9 +244,12 @@ usr/bin/locale
#usr/include/bits/types/struct_FILE.h
#usr/include/bits/types/struct_iovec.h
#usr/include/bits/types/struct_itimerspec.h
+#usr/include/bits/types/struct_msqid_ds.h
#usr/include/bits/types/struct_osockaddr.h
#usr/include/bits/types/struct_rusage.h
#usr/include/bits/types/struct_sched_param.h
+#usr/include/bits/types/struct_semid_ds.h
+#usr/include/bits/types/struct_shmid_ds.h
#usr/include/bits/types/struct_sigstack.h
#usr/include/bits/types/struct_statx.h
#usr/include/bits/types/struct_statx_timestamp.h
@@ -406,61 +397,7 @@ usr/bin/locale
#usr/include/regexp.h
#usr/include/resolv.h
#usr/include/rpc
-#usr/include/rpc/auth.h
-#usr/include/rpc/auth_des.h
-#usr/include/rpc/auth_unix.h
-#usr/include/rpc/clnt.h
-#usr/include/rpc/key_prot.h
#usr/include/rpc/netdb.h
-#usr/include/rpc/pmap_clnt.h
-#usr/include/rpc/pmap_prot.h
-#usr/include/rpc/pmap_rmt.h
-#usr/include/rpc/rpc.h
-#usr/include/rpc/rpc_msg.h
-#usr/include/rpc/svc.h
-#usr/include/rpc/svc_auth.h
-#usr/include/rpc/types.h
-#usr/include/rpc/xdr.h
-#usr/include/rpcsvc
-#usr/include/rpcsvc/bootparam.h
-#usr/include/rpcsvc/bootparam_prot.h
-#usr/include/rpcsvc/bootparam_prot.x
-#usr/include/rpcsvc/key_prot.h
-#usr/include/rpcsvc/key_prot.x
-#usr/include/rpcsvc/klm_prot.h
-#usr/include/rpcsvc/klm_prot.x
-#usr/include/rpcsvc/mount.h
-#usr/include/rpcsvc/mount.x
-#usr/include/rpcsvc/nfs_prot.h
-#usr/include/rpcsvc/nfs_prot.x
-#usr/include/rpcsvc/nis.h
-#usr/include/rpcsvc/nis.x
-#usr/include/rpcsvc/nis_callback.h
-#usr/include/rpcsvc/nis_callback.x
-#usr/include/rpcsvc/nis_object.x
-#usr/include/rpcsvc/nis_tags.h
-#usr/include/rpcsvc/nislib.h
-#usr/include/rpcsvc/nlm_prot.h
-#usr/include/rpcsvc/nlm_prot.x
-#usr/include/rpcsvc/rex.h
-#usr/include/rpcsvc/rex.x
-#usr/include/rpcsvc/rquota.h
-#usr/include/rpcsvc/rquota.x
-#usr/include/rpcsvc/rstat.h
-#usr/include/rpcsvc/rstat.x
-#usr/include/rpcsvc/rusers.h
-#usr/include/rpcsvc/rusers.x
-#usr/include/rpcsvc/sm_inter.h
-#usr/include/rpcsvc/sm_inter.x
-#usr/include/rpcsvc/spray.h
-#usr/include/rpcsvc/spray.x
-#usr/include/rpcsvc/yp.h
-#usr/include/rpcsvc/yp.x
-#usr/include/rpcsvc/yp_prot.h
-#usr/include/rpcsvc/ypclnt.h
-#usr/include/rpcsvc/yppasswd.h
-#usr/include/rpcsvc/yppasswd.x
-#usr/include/rpcsvc/ypupd.h
#usr/include/sched.h
#usr/include/scsi/scsi.h
#usr/include/scsi/scsi_ioctl.h
@@ -525,6 +462,7 @@ usr/bin/locale
#usr/include/sys/shm.h
#usr/include/sys/signal.h
#usr/include/sys/signalfd.h
+#usr/include/sys/single_threaded.h
#usr/include/sys/socket.h
#usr/include/sys/socketvar.h
#usr/include/sys/soundcard.h
@@ -533,7 +471,6 @@ usr/bin/locale
#usr/include/sys/statvfs.h
#usr/include/sys/swap.h
#usr/include/sys/syscall.h
-#usr/include/sys/sysctl.h
#usr/include/sys/sysinfo.h
#usr/include/sys/syslog.h
#usr/include/sys/sysmacros.h
@@ -867,20 +804,15 @@ usr/lib/gconv
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
-#usr/lib/libnsl.a
-#usr/lib/libnsl.so
#usr/lib/libnss_compat.so
#usr/lib/libnss_db.so
#usr/lib/libnss_dns.so
#usr/lib/libnss_files.so
#usr/lib/libnss_hesiod.so
-#usr/lib/libnss_nis.so
-#usr/lib/libnss_nisplus.so
#usr/lib/libpthread.a
#usr/lib/libpthread.so
#usr/lib/libresolv.a
#usr/lib/libresolv.so
-#usr/lib/librpcsvc.a
#usr/lib/librt.a
#usr/lib/librt.so
#usr/lib/libthread_db.so
@@ -2147,6 +2079,20 @@ usr/lib/locale
#usr/lib/locale/chr_US/LC_PAPER
#usr/lib/locale/chr_US/LC_TELEPHONE
#usr/lib/locale/chr_US/LC_TIME
+#usr/lib/locale/ckb_IQ
+#usr/lib/locale/ckb_IQ/LC_ADDRESS
+#usr/lib/locale/ckb_IQ/LC_COLLATE
+#usr/lib/locale/ckb_IQ/LC_CTYPE
+#usr/lib/locale/ckb_IQ/LC_IDENTIFICATION
+#usr/lib/locale/ckb_IQ/LC_MEASUREMENT
+#usr/lib/locale/ckb_IQ/LC_MESSAGES
+#usr/lib/locale/ckb_IQ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ckb_IQ/LC_MONETARY
+#usr/lib/locale/ckb_IQ/LC_NAME
+#usr/lib/locale/ckb_IQ/LC_NUMERIC
+#usr/lib/locale/ckb_IQ/LC_PAPER
+#usr/lib/locale/ckb_IQ/LC_TELEPHONE
+#usr/lib/locale/ckb_IQ/LC_TIME
#usr/lib/locale/cmn_TW
#usr/lib/locale/cmn_TW/LC_ADDRESS
#usr/lib/locale/cmn_TW/LC_COLLATE
@@ -8007,6 +7953,7 @@ usr/lib/locale
#usr/share/i18n/locales/ca_IT
#usr/share/i18n/locales/ce_RU
#usr/share/i18n/locales/chr_US
+#usr/share/i18n/locales/ckb_IQ
#usr/share/i18n/locales/cmn_TW
#usr/share/i18n/locales/cns11643_stroke
#usr/share/i18n/locales/crh_UA
diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc
index e5afe3c88..a397b906e 100644
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -1,47 +1,43 @@
#etc/ld.so.cache
etc/rpc
-lib/ld-2.31.so
+lib/ld-2.32.so
lib/ld-linux.so.2
-lib/libBrokenLocale-2.31.so
+lib/libBrokenLocale-2.32.so
lib/libBrokenLocale.so.1
#lib/libSegFault.so
-lib/libanl-2.31.so
+lib/libanl-2.32.so
lib/libanl.so.1
-lib/libc-2.31.so
+lib/libc-2.32.so
lib/libc.so.6
-lib/libcrypt-2.31.so
+lib/libcrypt-2.32.so
lib/libcrypt.so.1
-lib/libdl-2.31.so
+lib/libdl-2.32.so
lib/libdl.so.2
-lib/libm-2.31.so
+lib/libm-2.32.so
lib/libm.so.6
#lib/libmemusage.so
-lib/libnsl-2.31.so
+lib/libnsl-2.32.so
lib/libnsl.so.1
-lib/libnss_compat-2.31.so
+lib/libnss_compat-2.32.so
lib/libnss_compat.so.2
-lib/libnss_db-2.31.so
+lib/libnss_db-2.32.so
lib/libnss_db.so.2
-lib/libnss_dns-2.31.so
+lib/libnss_dns-2.32.so
lib/libnss_dns.so.2
-lib/libnss_files-2.31.so
+lib/libnss_files-2.32.so
lib/libnss_files.so.2
-lib/libnss_hesiod-2.31.so
+lib/libnss_hesiod-2.32.so
lib/libnss_hesiod.so.2
-lib/libnss_nis-2.31.so
-lib/libnss_nis.so.2
-lib/libnss_nisplus-2.31.so
-lib/libnss_nisplus.so.2
#lib/libpcprofile.so
-lib/libpthread-2.31.so
+lib/libpthread-2.32.so
lib/libpthread.so.0
-lib/libresolv-2.31.so
+lib/libresolv-2.32.so
lib/libresolv.so.2
-lib/librt-2.31.so
+lib/librt-2.32.so
lib/librt.so.1
lib/libthread_db-1.0.so
lib/libthread_db.so.1
-lib/libutil-2.31.so
+lib/libutil-2.32.so
lib/libutil.so.1
sbin/ldconfig
#sbin/sln
@@ -58,7 +54,6 @@ usr/bin/locale
#usr/bin/mtrace
#usr/bin/pcprofiledump
#usr/bin/pldd
-#usr/bin/rpcgen
#usr/bin/sotruss
#usr/bin/sprof
#usr/bin/tzselect
@@ -102,7 +97,6 @@ usr/bin/locale
#usr/include/bits/fcntl.h
#usr/include/bits/fcntl2.h
#usr/include/bits/fenv.h
-#usr/include/bits/fenvinline.h
#usr/include/bits/floatn-common.h
#usr/include/bits/floatn.h
#usr/include/bits/flt-eval-method.h
@@ -133,7 +127,6 @@ usr/bin/locale
#usr/include/bits/mathcalls-narrow.h
#usr/include/bits/mathcalls.h
#usr/include/bits/mathdef.h
-#usr/include/bits/mathinline.h
#usr/include/bits/mman-linux.h
#usr/include/bits/mman-map-flags-generic.h
#usr/include/bits/mman-shared.h
@@ -141,7 +134,6 @@ usr/bin/locale
#usr/include/bits/monetary-ldbl.h
#usr/include/bits/mqueue.h
#usr/include/bits/mqueue2.h
-#usr/include/bits/msq-pad.h
#usr/include/bits/msq.h
#usr/include/bits/netdb.h
#usr/include/bits/param.h
@@ -162,12 +154,10 @@ usr/bin/locale
#usr/include/bits/sched.h
#usr/include/bits/select.h
#usr/include/bits/select2.h
-#usr/include/bits/sem-pad.h
#usr/include/bits/sem.h
#usr/include/bits/semaphore.h
#usr/include/bits/setjmp.h
#usr/include/bits/setjmp2.h
-#usr/include/bits/shm-pad.h
#usr/include/bits/shm.h
#usr/include/bits/shmlba.h
#usr/include/bits/sigaction.h
@@ -178,8 +168,8 @@ usr/bin/locale
#usr/include/bits/siginfo-consts.h
#usr/include/bits/signal_ext.h
#usr/include/bits/signalfd.h
+#usr/include/bits/signum-arch.h
#usr/include/bits/signum-generic.h
-#usr/include/bits/signum.h
#usr/include/bits/sigstack.h
#usr/include/bits/sigthread.h
#usr/include/bits/sockaddr.h
@@ -208,9 +198,7 @@ usr/bin/locale
#usr/include/bits/strings_fortified.h
#usr/include/bits/struct_mutex.h
#usr/include/bits/struct_rwlock.h
-#usr/include/bits/sys_errlist.h
#usr/include/bits/syscall.h
-#usr/include/bits/sysctl.h
#usr/include/bits/syslog-ldbl.h
#usr/include/bits/syslog-path.h
#usr/include/bits/syslog.h
@@ -257,9 +245,12 @@ usr/bin/locale
#usr/include/bits/types/struct_FILE.h
#usr/include/bits/types/struct_iovec.h
#usr/include/bits/types/struct_itimerspec.h
+#usr/include/bits/types/struct_msqid_ds.h
#usr/include/bits/types/struct_osockaddr.h
#usr/include/bits/types/struct_rusage.h
#usr/include/bits/types/struct_sched_param.h
+#usr/include/bits/types/struct_semid_ds.h
+#usr/include/bits/types/struct_shmid_ds.h
#usr/include/bits/types/struct_sigstack.h
#usr/include/bits/types/struct_statx.h
#usr/include/bits/types/struct_statx_timestamp.h
@@ -407,61 +398,7 @@ usr/bin/locale
#usr/include/regexp.h
#usr/include/resolv.h
#usr/include/rpc
-#usr/include/rpc/auth.h
-#usr/include/rpc/auth_des.h
-#usr/include/rpc/auth_unix.h
-#usr/include/rpc/clnt.h
-#usr/include/rpc/key_prot.h
#usr/include/rpc/netdb.h
-#usr/include/rpc/pmap_clnt.h
-#usr/include/rpc/pmap_prot.h
-#usr/include/rpc/pmap_rmt.h
-#usr/include/rpc/rpc.h
-#usr/include/rpc/rpc_msg.h
-#usr/include/rpc/svc.h
-#usr/include/rpc/svc_auth.h
-#usr/include/rpc/types.h
-#usr/include/rpc/xdr.h
-#usr/include/rpcsvc
-#usr/include/rpcsvc/bootparam.h
-#usr/include/rpcsvc/bootparam_prot.h
-#usr/include/rpcsvc/bootparam_prot.x
-#usr/include/rpcsvc/key_prot.h
-#usr/include/rpcsvc/key_prot.x
-#usr/include/rpcsvc/klm_prot.h
-#usr/include/rpcsvc/klm_prot.x
-#usr/include/rpcsvc/mount.h
-#usr/include/rpcsvc/mount.x
-#usr/include/rpcsvc/nfs_prot.h
-#usr/include/rpcsvc/nfs_prot.x
-#usr/include/rpcsvc/nis.h
-#usr/include/rpcsvc/nis.x
-#usr/include/rpcsvc/nis_callback.h
-#usr/include/rpcsvc/nis_callback.x
-#usr/include/rpcsvc/nis_object.x
-#usr/include/rpcsvc/nis_tags.h
-#usr/include/rpcsvc/nislib.h
-#usr/include/rpcsvc/nlm_prot.h
-#usr/include/rpcsvc/nlm_prot.x
-#usr/include/rpcsvc/rex.h
-#usr/include/rpcsvc/rex.x
-#usr/include/rpcsvc/rquota.h
-#usr/include/rpcsvc/rquota.x
-#usr/include/rpcsvc/rstat.h
-#usr/include/rpcsvc/rstat.x
-#usr/include/rpcsvc/rusers.h
-#usr/include/rpcsvc/rusers.x
-#usr/include/rpcsvc/sm_inter.h
-#usr/include/rpcsvc/sm_inter.x
-#usr/include/rpcsvc/spray.h
-#usr/include/rpcsvc/spray.x
-#usr/include/rpcsvc/yp.h
-#usr/include/rpcsvc/yp.x
-#usr/include/rpcsvc/yp_prot.h
-#usr/include/rpcsvc/ypclnt.h
-#usr/include/rpcsvc/yppasswd.h
-#usr/include/rpcsvc/yppasswd.x
-#usr/include/rpcsvc/ypupd.h
#usr/include/sched.h
#usr/include/scsi/scsi.h
#usr/include/scsi/scsi_ioctl.h
@@ -530,6 +467,7 @@ usr/bin/locale
#usr/include/sys/shm.h
#usr/include/sys/signal.h
#usr/include/sys/signalfd.h
+#usr/include/sys/single_threaded.h
#usr/include/sys/socket.h
#usr/include/sys/socketvar.h
#usr/include/sys/soundcard.h
@@ -538,7 +476,6 @@ usr/bin/locale
#usr/include/sys/statvfs.h
#usr/include/sys/swap.h
#usr/include/sys/syscall.h
-#usr/include/sys/sysctl.h
#usr/include/sys/sysinfo.h
#usr/include/sys/syslog.h
#usr/include/sys/sysmacros.h
@@ -873,20 +810,15 @@ usr/lib/gconv
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
-#usr/lib/libnsl.a
-#usr/lib/libnsl.so
#usr/lib/libnss_compat.so
#usr/lib/libnss_db.so
#usr/lib/libnss_dns.so
#usr/lib/libnss_files.so
#usr/lib/libnss_hesiod.so
-#usr/lib/libnss_nis.so
-#usr/lib/libnss_nisplus.so
#usr/lib/libpthread.a
#usr/lib/libpthread.so
#usr/lib/libresolv.a
#usr/lib/libresolv.so
-#usr/lib/librpcsvc.a
#usr/lib/librt.a
#usr/lib/librt.so
#usr/lib/libthread_db.so
@@ -2153,6 +2085,20 @@ usr/lib/locale
#usr/lib/locale/chr_US/LC_PAPER
#usr/lib/locale/chr_US/LC_TELEPHONE
#usr/lib/locale/chr_US/LC_TIME
+#usr/lib/locale/ckb_IQ
+#usr/lib/locale/ckb_IQ/LC_ADDRESS
+#usr/lib/locale/ckb_IQ/LC_COLLATE
+#usr/lib/locale/ckb_IQ/LC_CTYPE
+#usr/lib/locale/ckb_IQ/LC_IDENTIFICATION
+#usr/lib/locale/ckb_IQ/LC_MEASUREMENT
+#usr/lib/locale/ckb_IQ/LC_MESSAGES
+#usr/lib/locale/ckb_IQ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ckb_IQ/LC_MONETARY
+#usr/lib/locale/ckb_IQ/LC_NAME
+#usr/lib/locale/ckb_IQ/LC_NUMERIC
+#usr/lib/locale/ckb_IQ/LC_PAPER
+#usr/lib/locale/ckb_IQ/LC_TELEPHONE
+#usr/lib/locale/ckb_IQ/LC_TIME
#usr/lib/locale/cmn_TW
#usr/lib/locale/cmn_TW/LC_ADDRESS
#usr/lib/locale/cmn_TW/LC_COLLATE
@@ -8013,6 +7959,7 @@ usr/lib/locale
#usr/share/i18n/locales/ca_IT
#usr/share/i18n/locales/ce_RU
#usr/share/i18n/locales/chr_US
+#usr/share/i18n/locales/ckb_IQ
#usr/share/i18n/locales/cmn_TW
#usr/share/i18n/locales/cns11643_stroke
#usr/share/i18n/locales/crh_UA
diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc
index f2d142375..b99f52212 100644
--- a/config/rootfiles/common/x86_64/glibc
+++ b/config/rootfiles/common/x86_64/glibc
@@ -1,49 +1,45 @@
#etc/ld.so.cache
etc/rpc
-lib/ld-2.31.so
+lib/ld-2.32.so
lib/ld-linux-x86-64.so.2
-lib/libBrokenLocale-2.31.so
+lib/libBrokenLocale-2.32.so
lib/libBrokenLocale.so.1
#lib/libSegFault.so
-lib/libanl-2.31.so
+lib/libanl-2.32.so
lib/libanl.so.1
-lib/libc-2.31.so
+lib/libc-2.32.so
lib/libc.so.6
-lib/libcrypt-2.31.so
+lib/libcrypt-2.32.so
lib/libcrypt.so.1
-lib/libdl-2.31.so
+lib/libdl-2.32.so
lib/libdl.so.2
-lib/libm-2.31.so
+lib/libm-2.32.so
lib/libm.so.6
#lib/libmemusage.so
-lib/libmvec-2.31.so
+lib/libmvec-2.32.so
lib/libmvec.so.1
-lib/libnsl-2.31.so
+lib/libnsl-2.32.so
lib/libnsl.so.1
-lib/libnss_compat-2.31.so
+lib/libnss_compat-2.32.so
lib/libnss_compat.so.2
-lib/libnss_db-2.31.so
+lib/libnss_db-2.32.so
lib/libnss_db.so.2
-lib/libnss_dns-2.31.so
+lib/libnss_dns-2.32.so
lib/libnss_dns.so.2
-lib/libnss_files-2.31.so
+lib/libnss_files-2.32.so
lib/libnss_files.so.2
-lib/libnss_hesiod-2.31.so
+lib/libnss_hesiod-2.32.so
lib/libnss_hesiod.so.2
-lib/libnss_nis-2.31.so
-lib/libnss_nis.so.2
-lib/libnss_nisplus-2.31.so
-lib/libnss_nisplus.so.2
#lib/libpcprofile.so
-lib/libpthread-2.31.so
+lib/libpthread-2.32.so
lib/libpthread.so.0
-lib/libresolv-2.31.so
+lib/libresolv-2.32.so
lib/libresolv.so.2
-lib/librt-2.31.so
+lib/librt-2.32.so
lib/librt.so.1
lib/libthread_db-1.0.so
lib/libthread_db.so.1
-lib/libutil-2.31.so
+lib/libutil-2.32.so
lib/libutil.so.1
sbin/ldconfig
#sbin/sln
@@ -59,7 +55,6 @@ usr/bin/locale
#usr/bin/mtrace
#usr/bin/pcprofiledump
#usr/bin/pldd
-#usr/bin/rpcgen
#usr/bin/sotruss
#usr/bin/sprof
#usr/bin/tzselect
@@ -103,7 +98,6 @@ usr/bin/locale
#usr/include/bits/fcntl.h
#usr/include/bits/fcntl2.h
#usr/include/bits/fenv.h
-#usr/include/bits/fenvinline.h
#usr/include/bits/floatn-common.h
#usr/include/bits/floatn.h
#usr/include/bits/flt-eval-method.h
@@ -134,7 +128,6 @@ usr/bin/locale
#usr/include/bits/mathcalls-narrow.h
#usr/include/bits/mathcalls.h
#usr/include/bits/mathdef.h
-#usr/include/bits/mathinline.h
#usr/include/bits/mman-linux.h
#usr/include/bits/mman-map-flags-generic.h
#usr/include/bits/mman-shared.h
@@ -142,7 +135,6 @@ usr/bin/locale
#usr/include/bits/monetary-ldbl.h
#usr/include/bits/mqueue.h
#usr/include/bits/mqueue2.h
-#usr/include/bits/msq-pad.h
#usr/include/bits/msq.h
#usr/include/bits/netdb.h
#usr/include/bits/param.h
@@ -163,12 +155,10 @@ usr/bin/locale
#usr/include/bits/sched.h
#usr/include/bits/select.h
#usr/include/bits/select2.h
-#usr/include/bits/sem-pad.h
#usr/include/bits/sem.h
#usr/include/bits/semaphore.h
#usr/include/bits/setjmp.h
#usr/include/bits/setjmp2.h
-#usr/include/bits/shm-pad.h
#usr/include/bits/shm.h
#usr/include/bits/shmlba.h
#usr/include/bits/sigaction.h
@@ -179,8 +169,8 @@ usr/bin/locale
#usr/include/bits/siginfo-consts.h
#usr/include/bits/signal_ext.h
#usr/include/bits/signalfd.h
+#usr/include/bits/signum-arch.h
#usr/include/bits/signum-generic.h
-#usr/include/bits/signum.h
#usr/include/bits/sigstack.h
#usr/include/bits/sigthread.h
#usr/include/bits/sockaddr.h
@@ -209,9 +199,7 @@ usr/bin/locale
#usr/include/bits/strings_fortified.h
#usr/include/bits/struct_mutex.h
#usr/include/bits/struct_rwlock.h
-#usr/include/bits/sys_errlist.h
#usr/include/bits/syscall.h
-#usr/include/bits/sysctl.h
#usr/include/bits/syslog-ldbl.h
#usr/include/bits/syslog-path.h
#usr/include/bits/syslog.h
@@ -258,9 +246,12 @@ usr/bin/locale
#usr/include/bits/types/struct_FILE.h
#usr/include/bits/types/struct_iovec.h
#usr/include/bits/types/struct_itimerspec.h
+#usr/include/bits/types/struct_msqid_ds.h
#usr/include/bits/types/struct_osockaddr.h
#usr/include/bits/types/struct_rusage.h
#usr/include/bits/types/struct_sched_param.h
+#usr/include/bits/types/struct_semid_ds.h
+#usr/include/bits/types/struct_shmid_ds.h
#usr/include/bits/types/struct_sigstack.h
#usr/include/bits/types/struct_statx.h
#usr/include/bits/types/struct_statx_timestamp.h
@@ -408,61 +399,7 @@ usr/bin/locale
#usr/include/regexp.h
#usr/include/resolv.h
#usr/include/rpc
-#usr/include/rpc/auth.h
-#usr/include/rpc/auth_des.h
-#usr/include/rpc/auth_unix.h
-#usr/include/rpc/clnt.h
-#usr/include/rpc/key_prot.h
#usr/include/rpc/netdb.h
-#usr/include/rpc/pmap_clnt.h
-#usr/include/rpc/pmap_prot.h
-#usr/include/rpc/pmap_rmt.h
-#usr/include/rpc/rpc.h
-#usr/include/rpc/rpc_msg.h
-#usr/include/rpc/svc.h
-#usr/include/rpc/svc_auth.h
-#usr/include/rpc/types.h
-#usr/include/rpc/xdr.h
-#usr/include/rpcsvc
-#usr/include/rpcsvc/bootparam.h
-#usr/include/rpcsvc/bootparam_prot.h
-#usr/include/rpcsvc/bootparam_prot.x
-#usr/include/rpcsvc/key_prot.h
-#usr/include/rpcsvc/key_prot.x
-#usr/include/rpcsvc/klm_prot.h
-#usr/include/rpcsvc/klm_prot.x
-#usr/include/rpcsvc/mount.h
-#usr/include/rpcsvc/mount.x
-#usr/include/rpcsvc/nfs_prot.h
-#usr/include/rpcsvc/nfs_prot.x
-#usr/include/rpcsvc/nis.h
-#usr/include/rpcsvc/nis.x
-#usr/include/rpcsvc/nis_callback.h
-#usr/include/rpcsvc/nis_callback.x
-#usr/include/rpcsvc/nis_object.x
-#usr/include/rpcsvc/nis_tags.h
-#usr/include/rpcsvc/nislib.h
-#usr/include/rpcsvc/nlm_prot.h
-#usr/include/rpcsvc/nlm_prot.x
-#usr/include/rpcsvc/rex.h
-#usr/include/rpcsvc/rex.x
-#usr/include/rpcsvc/rquota.h
-#usr/include/rpcsvc/rquota.x
-#usr/include/rpcsvc/rstat.h
-#usr/include/rpcsvc/rstat.x
-#usr/include/rpcsvc/rusers.h
-#usr/include/rpcsvc/rusers.x
-#usr/include/rpcsvc/sm_inter.h
-#usr/include/rpcsvc/sm_inter.x
-#usr/include/rpcsvc/spray.h
-#usr/include/rpcsvc/spray.x
-#usr/include/rpcsvc/yp.h
-#usr/include/rpcsvc/yp.x
-#usr/include/rpcsvc/yp_prot.h
-#usr/include/rpcsvc/ypclnt.h
-#usr/include/rpcsvc/yppasswd.h
-#usr/include/rpcsvc/yppasswd.x
-#usr/include/rpcsvc/ypupd.h
#usr/include/sched.h
#usr/include/scsi/scsi.h
#usr/include/scsi/scsi_ioctl.h
@@ -531,6 +468,7 @@ usr/bin/locale
#usr/include/sys/shm.h
#usr/include/sys/signal.h
#usr/include/sys/signalfd.h
+#usr/include/sys/single_threaded.h
#usr/include/sys/socket.h
#usr/include/sys/socketvar.h
#usr/include/sys/soundcard.h
@@ -539,7 +477,6 @@ usr/bin/locale
#usr/include/sys/statvfs.h
#usr/include/sys/swap.h
#usr/include/sys/syscall.h
-#usr/include/sys/sysctl.h
#usr/include/sys/sysinfo.h
#usr/include/sys/syslog.h
#usr/include/sys/sysmacros.h
@@ -868,26 +805,21 @@ usr/lib/gconv
#usr/lib/libdl.a
#usr/lib/libdl.so
#usr/lib/libg.a
-#usr/lib/libm-2.31.a
+#usr/lib/libm-2.32.a
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
#usr/lib/libmvec.a
#usr/lib/libmvec.so
-#usr/lib/libnsl.a
-#usr/lib/libnsl.so
#usr/lib/libnss_compat.so
#usr/lib/libnss_db.so
#usr/lib/libnss_dns.so
#usr/lib/libnss_files.so
#usr/lib/libnss_hesiod.so
-#usr/lib/libnss_nis.so
-#usr/lib/libnss_nisplus.so
#usr/lib/libpthread.a
#usr/lib/libpthread.so
#usr/lib/libresolv.a
#usr/lib/libresolv.so
-#usr/lib/librpcsvc.a
#usr/lib/librt.a
#usr/lib/librt.so
#usr/lib/libthread_db.so
@@ -2154,6 +2086,20 @@ usr/lib/locale
#usr/lib/locale/chr_US/LC_PAPER
#usr/lib/locale/chr_US/LC_TELEPHONE
#usr/lib/locale/chr_US/LC_TIME
+#usr/lib/locale/ckb_IQ
+#usr/lib/locale/ckb_IQ/LC_ADDRESS
+#usr/lib/locale/ckb_IQ/LC_COLLATE
+#usr/lib/locale/ckb_IQ/LC_CTYPE
+#usr/lib/locale/ckb_IQ/LC_IDENTIFICATION
+#usr/lib/locale/ckb_IQ/LC_MEASUREMENT
+#usr/lib/locale/ckb_IQ/LC_MESSAGES
+#usr/lib/locale/ckb_IQ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ckb_IQ/LC_MONETARY
+#usr/lib/locale/ckb_IQ/LC_NAME
+#usr/lib/locale/ckb_IQ/LC_NUMERIC
+#usr/lib/locale/ckb_IQ/LC_PAPER
+#usr/lib/locale/ckb_IQ/LC_TELEPHONE
+#usr/lib/locale/ckb_IQ/LC_TIME
#usr/lib/locale/cmn_TW
#usr/lib/locale/cmn_TW/LC_ADDRESS
#usr/lib/locale/cmn_TW/LC_COLLATE
@@ -8014,6 +7960,7 @@ usr/lib/locale
#usr/share/i18n/locales/ca_IT
#usr/share/i18n/locales/ce_RU
#usr/share/i18n/locales/chr_US
+#usr/share/i18n/locales/ckb_IQ
#usr/share/i18n/locales/cmn_TW
#usr/share/i18n/locales/cns11643_stroke
#usr/share/i18n/locales/crh_UA
diff --git a/lfs/glibc b/lfs/glibc
index f9959c6e3..7c12ea48a 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,7 @@
include Config
-VER = 2.31
+VER = 2.32
THISAPP = glibc-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -74,15 +74,12 @@ endif
# Add some general configuration flags
EXTRA_CONFIG += \
- --enable-obsolete-rpc \
--disable-profile \
- --enable-kernel=3.2 \
+ --enable-kernel=4.14.0 \
--enable-add-ons \
--without-selinux \
--enable-experimental-malloc \
--enable-bind-now \
- --enable-obsolete-rpc \
- --enable-obsolete-nsl \
--disable-nss-crypt
###############################################################################
@@ -93,7 +90,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 78a720f17412f3c3282be5a6f3363ec6
+$(DL_FILE)_MD5 = 720c7992861c57cf97d66a2f36d8d1fa
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 44/62] rpcsvc-proto: New package
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (40 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 43/62] Update glibc to 2.32 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 45/62] Build libtirpc earlier because RPC does not come with glibc any more Michael Tremer
` (17 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5255 bytes --]
This is required since it is no longer included in glibc
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/rpcsvc-proto | 27 ++++++++++
lfs/rpcsvc-proto | 77 ++++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 105 insertions(+)
create mode 100644 config/rootfiles/common/rpcsvc-proto
create mode 100644 lfs/rpcsvc-proto
diff --git a/config/rootfiles/common/rpcsvc-proto b/config/rootfiles/common/rpcsvc-proto
new file mode 100644
index 000000000..80ff48f53
--- /dev/null
+++ b/config/rootfiles/common/rpcsvc-proto
@@ -0,0 +1,27 @@
+#usr/bin/rpcgen
+#usr/include/rpcsvc
+#usr/include/rpcsvc/bootparam_prot.h
+#usr/include/rpcsvc/bootparam_prot.x
+#usr/include/rpcsvc/key_prot.h
+#usr/include/rpcsvc/key_prot.x
+#usr/include/rpcsvc/klm_prot.h
+#usr/include/rpcsvc/klm_prot.x
+#usr/include/rpcsvc/mount.h
+#usr/include/rpcsvc/mount.x
+#usr/include/rpcsvc/nfs_prot.h
+#usr/include/rpcsvc/nfs_prot.x
+#usr/include/rpcsvc/nlm_prot.h
+#usr/include/rpcsvc/nlm_prot.x
+#usr/include/rpcsvc/rex.h
+#usr/include/rpcsvc/rex.x
+#usr/include/rpcsvc/rquota.h
+#usr/include/rpcsvc/rquota.x
+#usr/include/rpcsvc/rstat.h
+#usr/include/rpcsvc/rstat.x
+#usr/include/rpcsvc/rusers.h
+#usr/include/rpcsvc/rusers.x
+#usr/include/rpcsvc/sm_inter.h
+#usr/include/rpcsvc/sm_inter.x
+#usr/include/rpcsvc/spray.h
+#usr/include/rpcsvc/spray.x
+#usr/share/man/man1/rpcgen.1
diff --git a/lfs/rpcsvc-proto b/lfs/rpcsvc-proto
new file mode 100644
index 000000000..a9a042ff3
--- /dev/null
+++ b/lfs/rpcsvc-proto
@@ -0,0 +1,77 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)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 = 1.4.2
+
+THISAPP = rpcsvc-proto-$(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)_MD5 = 629c91bbc8281fcdf64442f59a9d1705
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 1a1960674..226d39dd7 100755
--- a/make.sh
+++ b/make.sh
@@ -1436,6 +1436,7 @@ buildipfire() {
lfsmake2 libtirpc
lfsmake2 rpcbind
lfsmake2 keyutils
+ lfsmake2 rpcsvc-proto
lfsmake2 nfs
lfsmake2 gnu-netcat
lfsmake2 ncat
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 45/62] Build libtirpc earlier because RPC does not come with glibc any more
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (41 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 44/62] rpcsvc-proto: New package Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 46/62] python(2/3): Remove nis module Michael Tremer
` (16 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.sh b/make.sh
index 226d39dd7..9ec868670 100755
--- a/make.sh
+++ b/make.sh
@@ -1300,6 +1300,7 @@ buildipfire() {
lfsmake2 sdparm
lfsmake2 mtools
lfsmake2 whatmask
+ lfsmake2 libtirpc
lfsmake2 conntrack-tools
lfsmake2 libupnp
lfsmake2 ipaddr
@@ -1433,7 +1434,6 @@ buildipfire() {
lfsmake2 libmpeg2
lfsmake2 gnump3d
lfsmake2 rsync
- lfsmake2 libtirpc
lfsmake2 rpcbind
lfsmake2 keyutils
lfsmake2 rpcsvc-proto
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 46/62] python(2/3): Remove nis module
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (42 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 45/62] Build libtirpc earlier because RPC does not come with glibc any more Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 47/62] squid: Remove basic_nis_auth Michael Tremer
` (15 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5259 bytes --]
This requires SunRPC and we do not use it.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/aarch64/python | 1 -
config/rootfiles/common/armv5tel/python | 1 -
config/rootfiles/common/armv5tel/python3 | 1 -
config/rootfiles/common/i586/python | 1 -
config/rootfiles/common/i586/python3 | 1 -
config/rootfiles/common/python3 | 1 -
config/rootfiles/common/x86_64/python | 1 -
7 files changed, 7 deletions(-)
diff --git a/config/rootfiles/common/aarch64/python b/config/rootfiles/common/aarch64/python
index fa6064eec..d4c38e32c 100644
--- a/config/rootfiles/common/aarch64/python
+++ b/config/rootfiles/common/aarch64/python
@@ -1977,7 +1977,6 @@ usr/lib/python2.7/lib-dynload/itertools.so
#usr/lib/python2.7/lib-dynload/linuxaudiodev.so
usr/lib/python2.7/lib-dynload/math.so
usr/lib/python2.7/lib-dynload/mmap.so
-usr/lib/python2.7/lib-dynload/nis.so
usr/lib/python2.7/lib-dynload/operator.so
#usr/lib/python2.7/lib-dynload/ossaudiodev.so
usr/lib/python2.7/lib-dynload/parser.so
diff --git a/config/rootfiles/common/armv5tel/python b/config/rootfiles/common/armv5tel/python
index 67841c911..f7da1f66c 100644
--- a/config/rootfiles/common/armv5tel/python
+++ b/config/rootfiles/common/armv5tel/python
@@ -1979,7 +1979,6 @@ usr/lib/python2.7/lib-dynload/itertools.so
#usr/lib/python2.7/lib-dynload/linuxaudiodev.so
usr/lib/python2.7/lib-dynload/math.so
usr/lib/python2.7/lib-dynload/mmap.so
-usr/lib/python2.7/lib-dynload/nis.so
usr/lib/python2.7/lib-dynload/operator.so
#usr/lib/python2.7/lib-dynload/ossaudiodev.so
usr/lib/python2.7/lib-dynload/parser.so
diff --git a/config/rootfiles/common/armv5tel/python3 b/config/rootfiles/common/armv5tel/python3
index 00aa82916..595866748 100644
--- a/config/rootfiles/common/armv5tel/python3
+++ b/config/rootfiles/common/armv5tel/python3
@@ -827,7 +827,6 @@ usr/lib/python3.8/lib-dynload/fcntl.cpython-38-arm-linux-gnueabi.so
usr/lib/python3.8/lib-dynload/grp.cpython-38-arm-linux-gnueabi.so
usr/lib/python3.8/lib-dynload/math.cpython-38-arm-linux-gnueabi.so
usr/lib/python3.8/lib-dynload/mmap.cpython-38-arm-linux-gnueabi.so
-usr/lib/python3.8/lib-dynload/nis.cpython-38-arm-linux-gnueabi.so
usr/lib/python3.8/lib-dynload/ossaudiodev.cpython-38-arm-linux-gnueabi.so
usr/lib/python3.8/lib-dynload/parser.cpython-38-arm-linux-gnueabi.so
usr/lib/python3.8/lib-dynload/pyexpat.cpython-38-arm-linux-gnueabi.so
diff --git a/config/rootfiles/common/i586/python b/config/rootfiles/common/i586/python
index 67841c911..f7da1f66c 100644
--- a/config/rootfiles/common/i586/python
+++ b/config/rootfiles/common/i586/python
@@ -1979,7 +1979,6 @@ usr/lib/python2.7/lib-dynload/itertools.so
#usr/lib/python2.7/lib-dynload/linuxaudiodev.so
usr/lib/python2.7/lib-dynload/math.so
usr/lib/python2.7/lib-dynload/mmap.so
-usr/lib/python2.7/lib-dynload/nis.so
usr/lib/python2.7/lib-dynload/operator.so
#usr/lib/python2.7/lib-dynload/ossaudiodev.so
usr/lib/python2.7/lib-dynload/parser.so
diff --git a/config/rootfiles/common/i586/python3 b/config/rootfiles/common/i586/python3
index a60be400b..bb77414c7 100644
--- a/config/rootfiles/common/i586/python3
+++ b/config/rootfiles/common/i586/python3
@@ -827,7 +827,6 @@ usr/lib/python3.8/lib-dynload/fcntl.cpython-38-i386-linux-gnu.so
usr/lib/python3.8/lib-dynload/grp.cpython-38-i386-linux-gnu.so
usr/lib/python3.8/lib-dynload/math.cpython-38-i386-linux-gnu.so
usr/lib/python3.8/lib-dynload/mmap.cpython-38-i386-linux-gnu.so
-usr/lib/python3.8/lib-dynload/nis.cpython-38-i386-linux-gnu.so
usr/lib/python3.8/lib-dynload/ossaudiodev.cpython-38-i386-linux-gnu.so
usr/lib/python3.8/lib-dynload/parser.cpython-38-i386-linux-gnu.so
usr/lib/python3.8/lib-dynload/pyexpat.cpython-38-i386-linux-gnu.so
diff --git a/config/rootfiles/common/python3 b/config/rootfiles/common/python3
index 6359e0099..381042c14 100644
--- a/config/rootfiles/common/python3
+++ b/config/rootfiles/common/python3
@@ -827,7 +827,6 @@ usr/lib/python3.8/lib-dynload/fcntl.cpython-38-xxxMACHINExxx-linux-gnu.so
usr/lib/python3.8/lib-dynload/grp.cpython-38-xxxMACHINExxx-linux-gnu.so
usr/lib/python3.8/lib-dynload/math.cpython-38-xxxMACHINExxx-linux-gnu.so
usr/lib/python3.8/lib-dynload/mmap.cpython-38-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.8/lib-dynload/nis.cpython-38-xxxMACHINExxx-linux-gnu.so
usr/lib/python3.8/lib-dynload/ossaudiodev.cpython-38-xxxMACHINExxx-linux-gnu.so
usr/lib/python3.8/lib-dynload/parser.cpython-38-xxxMACHINExxx-linux-gnu.so
usr/lib/python3.8/lib-dynload/pyexpat.cpython-38-xxxMACHINExxx-linux-gnu.so
diff --git a/config/rootfiles/common/x86_64/python b/config/rootfiles/common/x86_64/python
index 5cdaf47cd..eb7f8fa18 100644
--- a/config/rootfiles/common/x86_64/python
+++ b/config/rootfiles/common/x86_64/python
@@ -1977,7 +1977,6 @@ usr/lib/python2.7/lib-dynload/itertools.so
#usr/lib/python2.7/lib-dynload/linuxaudiodev.so
usr/lib/python2.7/lib-dynload/math.so
usr/lib/python2.7/lib-dynload/mmap.so
-usr/lib/python2.7/lib-dynload/nis.so
usr/lib/python2.7/lib-dynload/operator.so
#usr/lib/python2.7/lib-dynload/ossaudiodev.so
usr/lib/python2.7/lib-dynload/parser.so
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 47/62] squid: Remove basic_nis_auth
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (43 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 46/62] python(2/3): Remove nis module Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 48/62] conntrack-tools: Fix build against libtirpc Michael Tremer
` (14 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 681 bytes --]
This depends on SunRPC in glibc which was removed in 2.32.
We do not use this file.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/squid | 1 -
1 file changed, 1 deletion(-)
diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 6c8998f93..2a407ed44 100644
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -21,7 +21,6 @@ usr/lib/squid/basic_fake_auth
usr/lib/squid/basic_getpwnam_auth
usr/lib/squid/basic_ldap_auth
usr/lib/squid/basic_ncsa_auth
-usr/lib/squid/basic_nis_auth
usr/lib/squid/basic_pam_auth
usr/lib/squid/basic_pop3_auth
usr/lib/squid/basic_radius_auth
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 48/62] conntrack-tools: Fix build against libtirpc
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (44 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 47/62] squid: Remove basic_nis_auth Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 49/62] xinetd: Fix build against glibc 2.32 (without RPC) Michael Tremer
` (13 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 638 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/conntrack-tools | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/conntrack-tools b/lfs/conntrack-tools
index 20e2978b3..ebf952d28 100644
--- a/lfs/conntrack-tools
+++ b/lfs/conntrack-tools
@@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -I/usr/include/tirpc
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 49/62] xinetd: Fix build against glibc 2.32 (without RPC)
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (45 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 48/62] conntrack-tools: Fix build against libtirpc Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 50/62] libnfsidmap: Split into a separate package Michael Tremer
` (12 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 587 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/xinetd | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/xinetd b/lfs/xinetd
index d592c90ab..9e14279d4 100644
--- a/lfs/xinetd
+++ b/lfs/xinetd
@@ -34,6 +34,8 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = xinetd
PAK_VER = 1
+CFLAGS += -fcommon -I/usr/include/tirpc -Wl,-ltirpc
+
###############################################################################
# Top-level Rules
###############################################################################
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 50/62] libnfsidmap: Split into a separate package
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (46 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 49/62] xinetd: Fix build against glibc 2.32 (without RPC) Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 51/62] nfs: Update to 2.5.1 and remove bundled libnfsidmap Michael Tremer
` (11 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4998 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/packages/libnfsidmap | 15 +++++
lfs/libnfsidmap | 88 +++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 104 insertions(+)
create mode 100644 config/rootfiles/packages/libnfsidmap
create mode 100644 lfs/libnfsidmap
diff --git a/config/rootfiles/packages/libnfsidmap b/config/rootfiles/packages/libnfsidmap
new file mode 100644
index 000000000..0c9d3ab12
--- /dev/null
+++ b/config/rootfiles/packages/libnfsidmap
@@ -0,0 +1,15 @@
+#usr/include/nfsidmap.h
+#usr/lib/libnfsidmap
+#usr/lib/libnfsidmap.la
+#usr/lib/libnfsidmap.so
+usr/lib/libnfsidmap.so.0
+usr/lib/libnfsidmap.so.0.3.0
+#usr/lib/libnfsidmap/nsswitch.la
+usr/lib/libnfsidmap/nsswitch.so
+#usr/lib/libnfsidmap/static.la
+usr/lib/libnfsidmap/static.so
+#usr/lib/libnfsidmap/umich_ldap.la
+usr/lib/libnfsidmap/umich_ldap.so
+#usr/lib/pkgconfig/libnfsidmap.pc
+#usr/share/man/man3/nfs4_uid_to_name.3
+#usr/share/man/man5/idmapd.conf.5
diff --git a/lfs/libnfsidmap b/lfs/libnfsidmap
new file mode 100644
index 000000000..d0fd46355
--- /dev/null
+++ b/lfs/libnfsidmap
@@ -0,0 +1,88 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)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 = 0.26
+
+THISAPP = libnfsidmap-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = libnfsidmap
+PAK_VER = 1
+
+#CFLAGS += -I/usr/include/tirpc
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 2c0cf0e2b1665d51fa9a783679494888
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ $(UPDATE_AUTOMAKE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-static
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 9ec868670..0f3917adf 100755
--- a/make.sh
+++ b/make.sh
@@ -1437,6 +1437,7 @@ buildipfire() {
lfsmake2 rpcbind
lfsmake2 keyutils
lfsmake2 rpcsvc-proto
+ lfsmake2 libnfsidmap
lfsmake2 nfs
lfsmake2 gnu-netcat
lfsmake2 ncat
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 51/62] nfs: Update to 2.5.1 and remove bundled libnfsidmap
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (47 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 50/62] libnfsidmap: Split into a separate package Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 52/62] cmake: Do not limit compile processes to only two Michael Tremer
` (10 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4293 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/packages/nfs | 27 +++++++++++----------------
lfs/nfs | 26 ++++++--------------------
2 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs
index 16059abdc..dba272c8a 100644
--- a/config/rootfiles/packages/nfs
+++ b/config/rootfiles/packages/nfs
@@ -2,32 +2,25 @@ etc/rc.d/init.d/nfs-server
sbin/mount.nfs
sbin/mount.nfs4
sbin/nfsdcltrack
-sbin/osd_login
sbin/umount.nfs
sbin/umount.nfs4
-#usr/include/nfsidmap.h
#usr/include/nfsidmap_plugin.h
-#usr/lib/libnfsidmap
#usr/lib/libnfsidmap.a
-#usr/lib/libnfsidmap.la
-#usr/lib/libnfsidmap.so
-usr/lib/libnfsidmap.so.0
-usr/lib/libnfsidmap.so.0.3.0
usr/lib/libnfsidmap.so.1
usr/lib/libnfsidmap.so.1.0.0
#usr/lib/libnfsidmap/nsswitch.a
-#usr/lib/libnfsidmap/nsswitch.la
-usr/lib/libnfsidmap/nsswitch.so
+#usr/lib/libnfsidmap/regex.a
+#usr/lib/libnfsidmap/regex.la
+usr/lib/libnfsidmap/regex.so
#usr/lib/libnfsidmap/static.a
-#usr/lib/libnfsidmap/static.la
-usr/lib/libnfsidmap/static.so
#usr/lib/libnfsidmap/umich_ldap.a
-#usr/lib/libnfsidmap/umich_ldap.la
-usr/lib/libnfsidmap/umich_ldap.so
-#usr/lib/pkgconfig/libnfsidmap.pc
+#usr/sbin/blkmapd
usr/sbin/exportfs
usr/sbin/mountstats
usr/sbin/nfsconf
+usr/sbin/nfsdcld
+usr/sbin/nfsdclddb
+usr/sbin/nfsdclnts
usr/sbin/nfsidmap
usr/sbin/nfsiostat
usr/sbin/nfsstat
@@ -39,14 +32,13 @@ usr/sbin/rpcdebug
usr/sbin/showmount
usr/sbin/sm-notify
usr/sbin/start-statd
-#usr/share/man/man3/nfs4_uid_to_name.3
#usr/share/man/man5/exports.5
-#usr/share/man/man5/idmapd.conf.5
#usr/share/man/man5/nfs.5
#usr/share/man/man5/nfs.conf.5
#usr/share/man/man5/nfsmount.conf.5
#usr/share/man/man7/nfs.systemd.7
#usr/share/man/man7/nfsd.7
+#usr/share/man/man8/blkmapd.8
#usr/share/man/man8/exportfs.8
#usr/share/man/man8/idmapd.8
#usr/share/man/man8/mount.nfs.8
@@ -54,6 +46,9 @@ usr/sbin/start-statd
#usr/share/man/man8/mountstats.8
#usr/share/man/man8/nfsconf.8
#usr/share/man/man8/nfsd.8
+#usr/share/man/man8/nfsdcld.8
+#usr/share/man/man8/nfsdclddb.8
+#usr/share/man/man8/nfsdclnts.8
#usr/share/man/man8/nfsdcltrack.8
#usr/share/man/man8/nfsidmap.8
#usr/share/man/man8/nfsiostat.8
diff --git a/lfs/nfs b/lfs/nfs
index 882792684..3e2f56b7e 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,7 +24,7 @@
include Config
-VER = 2.3.3
+VER = 2.5.1
THISAPP = nfs-utils-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,24 +32,19 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nfs
-PAK_VER = 13
+PAK_VER = 14
-DEPS = rpcbind
-
-LIBNFSIDMAP = 0.25
+DEPS = libnfsidmap rpcbind
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) \
- libnfsidmap-$(LIBNFSIDMAP).tar.gz
+objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
-$(DL_FILE)_MD5 = 11490e3f85a8676c647fe1bddbf32f99
-libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
+$(DL_FILE)_MD5 = d14294d5efcd9aada28f4dab871a44a6
install : $(TARGET)
@@ -82,23 +77,14 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && tar zxf $(DIR_DL)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
-
- $(UPDATE_AUTOMAKE)
- cd $(DIR_APP)/libnfsidmap* && ./configure --prefix=/usr
- cd $(DIR_APP)/libnfsidmap* && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP)/libnfsidmap* && make install
-
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--disable-gss \
- --disable-tirpc \
- --disable-nfsv41 \
--without-tcp-wrappers \
--disable-ipv6
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
# Install initscript
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 52/62] cmake: Do not limit compile processes to only two
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (48 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 51/62] nfs: Update to 2.5.1 and remove bundled libnfsidmap Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 53/62] mpfr: Update to 4.1.0 Michael Tremer
` (9 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 620 bytes --]
We can launch more when we have the memory for it
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lfs/cmake b/lfs/cmake
index 5ad5ebb70..5b98644db 100644
--- a/lfs/cmake
+++ b/lfs/cmake
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-MAKETUNING = -j2
+MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 512)))
###############################################################################
# Top-level Rules
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 53/62] mpfr: Update to 4.1.0
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (49 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 52/62] cmake: Do not limit compile processes to only two Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 54/62] gcc: Bundle against OS versions of gmp/mpfr Michael Tremer
` (8 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/mpfr | 3 ++-
lfs/mpfr | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/rootfiles/common/mpfr b/config/rootfiles/common/mpfr
index 4b6cdf424..ae0701d0f 100644
--- a/config/rootfiles/common/mpfr
+++ b/config/rootfiles/common/mpfr
@@ -4,7 +4,7 @@
#usr/lib/libmpfr.la
#usr/lib/libmpfr.so
usr/lib/libmpfr.so.6
-usr/lib/libmpfr.so.6.0.2
+usr/lib/libmpfr.so.6.1.0
#usr/lib/pkgconfig/mpfr.pc
#usr/share/doc/mpfr
#usr/share/doc/mpfr/AUTHORS
@@ -20,5 +20,6 @@ usr/lib/libmpfr.so.6.0.2
#usr/share/doc/mpfr/examples/divworst.c
#usr/share/doc/mpfr/examples/rndo-add.c
#usr/share/doc/mpfr/examples/sample.c
+#usr/share/doc/mpfr/examples/threads.c
#usr/share/doc/mpfr/examples/version.c
#usr/share/info/mpfr.info
diff --git a/lfs/mpfr b/lfs/mpfr
index daedd013c..9ce57e276 100644
--- a/lfs/mpfr
+++ b/lfs/mpfr
@@ -24,7 +24,7 @@
include Config
-VER = 4.0.2
+VER = 4.1.0
THISAPP = mpfr-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 320fbc4463d4c8cb1e566929d8adc4f8
+$(DL_FILE)_MD5 = bdd3d5efba9c17da8d83a35ec552baef
install : $(TARGET)
@@ -72,7 +72,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
--enable-thread-safe
-
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 54/62] gcc: Bundle against OS versions of gmp/mpfr
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (50 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 53/62] mpfr: Update to 4.1.0 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 55/62] make.sh: Enable -fstack-clash-protection for x86_64/aarch64 Michael Tremer
` (7 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 991 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/gcc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lfs/gcc b/lfs/gcc
index 77466a572..7cbc8e9e8 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -26,8 +26,8 @@ include Config
VER = 10.2.0
-GMP_VER = 6.1.2
-MPFR_VER = 4.0.2
+GMP_VER = 6.2.0
+MPFR_VER = 4.1.0
MPC_VER = 1.1.0
THISAPP = gcc-$(VER)
@@ -195,8 +195,8 @@ mpfr-$(MPFR_VER).tar.xz = $(DL_FROM)/mpfr-$(MPFR_VER).tar.xz
mpc-$(MPC_VER).tar.gz = $(DL_FROM)/mpc-$(MPC_VER).tar.gz
$(DL_FILE)_MD5 = e9fd9b1789155ad09bcf3ae747596b50
-gmp-$(GMP_VER).tar.xz_MD5 = f58fa8001d60c4c77595fbbb62b63c1d
-mpfr-$(MPFR_VER).tar.xz_MD5 = 320fbc4463d4c8cb1e566929d8adc4f8
+gmp-$(GMP_VER).tar.xz_MD5 = a325e3f09e6d91e62101e59f9bda3ec1
+mpfr-$(MPFR_VER).tar.xz_MD5 = bdd3d5efba9c17da8d83a35ec552baef
mpc-$(MPC_VER).tar.gz_MD5 = 4125404e41e482ec68282a2e687f6c73
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 55/62] make.sh: Enable -fstack-clash-protection for x86_64/aarch64
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (51 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 54/62] gcc: Bundle against OS versions of gmp/mpfr Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 56/62] make.sh: Add -fcf-protection for x86_64/i586 Michael Tremer
` (6 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]
This patch turns on instrumentation to avoid skipping the guard page
in large stack frames.
Without this flag, vulnerabilities can result in where the stack
overlaps with the heap, or thread stacks spill into other regions
of memory.
This flag in only available on x86_64 and aarch64.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
make.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make.sh b/make.sh
index 0f3917adf..fae75fdc9 100755
--- a/make.sh
+++ b/make.sh
@@ -146,7 +146,7 @@ configure_build() {
BUILDTARGET="${build_arch}-unknown-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="x86"
- CFLAGS_ARCH="-m64 -mtune=generic"
+ CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection"
;;
i586)
@@ -160,7 +160,7 @@ configure_build() {
BUILDTARGET="${build_arch}-unknown-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="arm"
- CFLAGS_ARCH=""
+ CFLAGS_ARCH="-fstack-clash-protection"
;;
armv7hl)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 56/62] make.sh: Add -fcf-protection for x86_64/i586
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (52 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 55/62] make.sh: Enable -fstack-clash-protection for x86_64/aarch64 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 57/62] make.sh: Bump toolchain version Michael Tremer
` (5 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 986 bytes --]
Instrument binaries to guard against ROP/JOP attacks.
This flag in only available on x86_64 and i586.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
make.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make.sh b/make.sh
index fae75fdc9..99ac1bc85 100755
--- a/make.sh
+++ b/make.sh
@@ -146,14 +146,14 @@ configure_build() {
BUILDTARGET="${build_arch}-unknown-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="x86"
- CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection"
+ CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection -fcf-protection"
;;
i586)
BUILDTARGET="${build_arch}-pc-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="x86"
- CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
+ CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer -fcf-protection"
;;
aarch64)
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 57/62] make.sh: Bump toolchain version
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (53 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 56/62] make.sh: Add -fcf-protection for x86_64/i586 Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 58/62] glibc: Drop any custom CFLAGS Michael Tremer
` (4 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.sh b/make.sh
index 99ac1bc85..f371a36a5 100755
--- a/make.sh
+++ b/make.sh
@@ -39,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch
GIT_TAG="$(git tag | tail -1)" # Git Tag
GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
-TOOLCHAINVER=20200324
+TOOLCHAINVER=20200814
###############################################################################
#
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 58/62] glibc: Drop any custom CFLAGS
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (54 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 57/62] make.sh: Bump toolchain version Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 59/62] glibc: Pass -Wno-error=maybe-uninitialized Michael Tremer
` (3 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 999 bytes --]
glibc is nothing special and can and should be built with
the same flags than the rest of the system.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/glibc | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/lfs/glibc b/lfs/glibc
index 7c12ea48a..546b53b12 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -51,21 +51,6 @@ else
libc_cv_c_cleanup=yes
endif
-# Enable some extra optimization for the glibc code
-CFLAGS = -O3 -DNDEBUG -fasynchronous-unwind-tables -fPIC -DPIC
-
-ifeq "$(BUILD_ARCH)" "armv7hl"
- CFLAGS += -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard
-endif
-
-ifeq "$(BUILD_ARCH)" "i586"
- CFLAGS += -march=i586 -mtune=generic -mindirect-branch=thunk -mfunction-return=thunk -mno-tls-direct-seg-refs
-endif
-
-ifeq "$(BUILD_ARCH)" "x86_64"
- CFLAGS += -mindirect-branch=thunk -mfunction-return=thunk
-endif
-
# Disable hardware FP for armv5tel
ifeq "$(BUILD_ARCH)" "armv5tel"
EXTRA_CONFIG += \
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 59/62] glibc: Pass -Wno-error=maybe-uninitialized
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (55 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 58/62] glibc: Drop any custom CFLAGS Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 60/62] make: Run autoreconf after applying patches Michael Tremer
` (2 subsequent siblings)
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
This is required to build glibc in the toolchain stage on
aarch64 due to messy headers on the host system.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/glibc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lfs/glibc b/lfs/glibc
index 546b53b12..abb8b54bb 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -49,6 +49,8 @@ else
--with-headers=$(TOOLS_DIR)/include \
libc_cv_forced_unwind=yes \
libc_cv_c_cleanup=yes
+
+ CFLAGS += -Wno-error=maybe-uninitialized
endif
# Disable hardware FP for armv5tel
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 60/62] make: Run autoreconf after applying patches
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (56 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 59/62] glibc: Pass -Wno-error=maybe-uninitialized Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 61/62] perl: Fix build in toolchain stage Michael Tremer
2020-08-16 10:29 ` [PATCH 62/62] make.sh: Increase maximum size of ramdisk to 8GB Michael Tremer
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 715 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/make | 1 +
1 file changed, 1 insertion(+)
diff --git a/lfs/make b/lfs/make
index 411a1b008..971b705df 100644
--- a/lfs/make
+++ b/lfs/make
@@ -90,6 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-build-fix.patch
cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-SEGV.patch
+ cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 61/62] perl: Fix build in toolchain stage
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (57 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 60/62] make: Run autoreconf after applying patches Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
2020-08-16 10:29 ` [PATCH 62/62] make.sh: Increase maximum size of ramdisk to 8GB Michael Tremer
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5103 bytes --]
perl searches for headers and libraries in the wrong paths
and detects GCC 10 as GCC 1.x.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/perl | 6 +-
...0.0-fix-build-failure-against-gcc-10.patch | 99 +++++++++++++++++++
2 files changed, 102 insertions(+), 3 deletions(-)
create mode 100644 src/patches/perl-5.30.0-fix-build-failure-against-gcc-10.patch
diff --git a/lfs/perl b/lfs/perl
index 690d5df29..bc0d67d5f 100644
--- a/lfs/perl
+++ b/lfs/perl
@@ -80,15 +80,15 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && sed -i -e 's|-fstack-protector|-fno-stack-protector|g' Configure
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/perl-5.30.0-fix-build-failure-against-gcc-10.patch
ifeq "$(ROOT)" ""
cd $(DIR_APP) && ./configure.gnu --prefix=/usr -Dman1dir=/usr/share/man/man1 \
-Dman3dir=/usr/share/man/man3 -Dpager="/usr/bin/less -isR" -Dusethreads
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
else
- cd $(DIR_APP) && ./Configure -des -Dprefix=$(TOOLS_DIR)
- cd $(DIR_APP) && make
+ cd $(DIR_APP) && ./Configure -des -Dprefix=$(TOOLS_DIR) -Dlibs="-lpthread -lm" -Uloclibpth -Ulocincpth
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && cp -v perl cpan/podlators/scripts/pod2man $(TOOLS_DIR)/bin
cd $(DIR_APP) && mkdir -pv $(TOOLS_DIR)/lib/perl5/$(VER)
cd $(DIR_APP) && cp -Rv lib/* $(TOOLS_DIR)/lib/perl5/$(VER)
diff --git a/src/patches/perl-5.30.0-fix-build-failure-against-gcc-10.patch b/src/patches/perl-5.30.0-fix-build-failure-against-gcc-10.patch
new file mode 100644
index 000000000..bb9252785
--- /dev/null
+++ b/src/patches/perl-5.30.0-fix-build-failure-against-gcc-10.patch
@@ -0,0 +1,99 @@
+https://bugs.gentoo.org/708744
+
+From 6bd6308fcea3541e505651bf8e8127a4a03d22cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
+Date: Tue, 12 Nov 2019 09:19:18 +0100
+Subject: [PATCH] Adapt Configure to GCC version 10
+
+I got a notice from Jeff Law <law(a)redhat.com>:
+
+ Your particular package fails its testsuite. This was ultimately
+ tracked down to a Configure problem. The perl configure script treated
+ gcc-10 as gcc-1 and turned on -fpcc-struct-return. This is an ABI
+ changing flag and caused Perl to not be able to interact properly with
+ the dbm libraries on the system leading to a segfault.
+
+His proposed patch corrected only this one instance of the version
+mismatch. Reading the Configure script revealed more issues. This
+patch fixes all of them I found.
+
+Please note I do not have GCC 10 available, I tested it by faking the version
+with:
+
+--- a/Configure
++++ b/Configure
+@@ -4701,7 +4701,7 @@ else
+ fi
+ $rm -f try try.*
+ case "$gccversion" in
+-1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
++1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
+ esac
+ case "$gccversion" in
+ '') gccosandvers='' ;;
+@@ -4741,7 +4741,7 @@ esac
+ # gcc 3.* complain about adding -Idirectories that they already know about,
+ # so we will take those off from locincpth.
+ case "$gccversion" in
+-3*)
++3.*)
+ echo "main(){}">try.c
+ for incdir in $locincpth; do
+ warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
+@@ -5467,13 +5467,13 @@ fi
+ case "$hint" in
+ default|recommended)
+ case "$gccversion" in
+- 1*) dflt="$dflt -fpcc-struct-return" ;;
++ 1.*) dflt="$dflt -fpcc-struct-return" ;;
+ esac
+ case "$optimize:$DEBUGGING" in
+ *-g*:old) dflt="$dflt -DDEBUGGING";;
+ esac
+ case "$gccversion" in
+- 2*) if $test -d /etc/conf/kconfig.d &&
++ 2.*) if $test -d /etc/conf/kconfig.d &&
+ $contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
+ then
+ # Interactive Systems (ISC) POSIX mode.
+@@ -5482,7 +5482,7 @@ default|recommended)
+ ;;
+ esac
+ case "$gccversion" in
+- 1*) ;;
++ 1.*) ;;
+ 2.[0-8]*) ;;
+ ?*) set strict-aliasing -fno-strict-aliasing
+ eval $checkccflag
+@@ -5600,7 +5600,7 @@ case "$cppflags" in
+ ;;
+ esac
+ case "$gccversion" in
+-1*) cppflags="$cppflags -D__GNUC__"
++1.*) cppflags="$cppflags -D__GNUC__"
+ esac
+ case "$mips_type" in
+ '');;
+@@ -23103,7 +23103,7 @@ fi
+
+ : add -D_FORTIFY_SOURCE if feasible and not already there
+ case "$gccversion" in
+-[456789].*) case "$optimize$ccflags" in
++[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
+ *-O*) case "$ccflags$cppsymbols" in
+ *_FORTIFY_SOURCE=*) # Don't add it again.
+ echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
+--- a/cflags.SH
++++ b/cflags.SH
+@@ -156,7 +156,7 @@ esac
+
+ case "$gccversion" in
+ '') ;;
+-[12]*) ;; # gcc versions 1 (gasp!) and 2 are not good for this.
++[12].*) ;; # gcc versions 1 (gasp!) and 2 are not good for this.
+ Intel*) ;; # # Is that you, Intel C++?
+ #
+ # NOTE 1: the -std=c89 without -pedantic is a bit pointless.
+--
+2.25.0
+
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread* [PATCH 62/62] make.sh: Increase maximum size of ramdisk to 8GB
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
` (58 preceding siblings ...)
2020-08-16 10:29 ` [PATCH 61/62] perl: Fix build in toolchain stage Michael Tremer
@ 2020-08-16 10:29 ` Michael Tremer
59 siblings, 0 replies; 61+ messages in thread
From: Michael Tremer @ 2020-08-16 10:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 730 bytes --]
The previous 4GB were not enough for a full GCC bootstrap
in the toolchain stage.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.sh b/make.sh
index f371a36a5..ee34db1ac 100755
--- a/make.sh
+++ b/make.sh
@@ -476,7 +476,7 @@ prepareenv() {
if [ "${ENABLE_RAMDISK}" = "on" ]; then
mkdir -p $BASEDIR/build/usr/src
- mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src
+ mount -t tmpfs tmpfs -o size=8G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src
mkdir -p ${BASEDIR}/build/tmp
mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 ${BASEDIR}/build/tmp
--
2.20.1
^ permalink raw reply [flat|nested] 61+ messages in thread