From 2b8d1580e57aec77c70bcbffb8f5c23989cf28f8 Mon Sep 17 00:00:00 2001 From: Nathan Fisher Date: Tue, 10 May 2022 09:41:52 -0400 Subject: [PATCH] Bumped a number of package versions including glibc-2.35 and gcc-12.1.0 --- distfiles/Makefile | 4 +-- include/mk/src-config.mk | 2 +- include/mk/versions.mk | 54 +++++++++++++++---------------- toolchain/glibc/Makefile | 5 ++- world/Makefile | 2 +- world/bc/Makefile | 4 +-- world/bc/bc-configure.patch | 11 ------- world/bin/grep/Makefile.bsd | 49 ---------------------------- world/elfutils/Makefile | 2 +- world/expat/Makefile | 1 - world/iproute2/iproute2.config.mk | 3 ++ 11 files changed, 40 insertions(+), 97 deletions(-) delete mode 100644 world/bc/bc-configure.patch delete mode 100644 world/bin/grep/Makefile.bsd diff --git a/distfiles/Makefile b/distfiles/Makefile index fb989bf..fc45a31 100644 --- a/distfiles/Makefile +++ b/distfiles/Makefile @@ -203,7 +203,7 @@ elfutils-${elfutils_version}.tar.bz2: eudev: eudev-${eudev_version}.tar.gz eudev-${eudev_version}.tar.gz: - wget -c https://dev.gentoo.org/~blueness/eudev/$@ + wget -c $(github)/eudev-project/eudev/releases/download/v$(eudev_version)/$@ execline: execline-{execline_version}.tar.gz @@ -213,7 +213,7 @@ execline-${execline_version}.tar.gz: expat: expat-${expat_version}.tar.xz expat-${expat_version}.tar.xz: - wget -c $(github)/libexpat/libexpat/releases/download/R_2_2_10/$@ + wget -c $(github)/libexpat/libexpat/releases/download/R_2_4_8/$@ file: file-${file_version}.tar.gz diff --git a/include/mk/src-config.mk b/include/mk/src-config.mk index ff62d0e..3f5eee2 100644 --- a/include/mk/src-config.mk +++ b/include/mk/src-config.mk @@ -4,7 +4,7 @@ include versions.mk os_name = Hitch Hiker Linux os_abbrev = hhl -os_version = 2021q4 +os_version = 2022q2 basedir = /src include $(basedir)/config.mk diff --git a/include/mk/versions.mk b/include/mk/versions.mk index 90afdf7..c820d8b 100644 --- a/include/mk/versions.mk +++ b/include/mk/versions.mk @@ -3,14 +3,14 @@ # # package versions - hhl base -acl_version = 2.2.53 +acl_version = 2.3.1 argp-standalone_version = 1.4.1 -attr_version = 2.4.48 +attr_version = 2.5.1 autoconf_version = 2.71 -automake_version = 1.16.3 -bc_version = 3.2.5 -binutils_version = 2.37 -bison_version = 3.7.5 +automake_version = 1.16.5 +bc_version = 5.2.2 +binutils_version = 2.38 +bison_version = 3.8.2 busybox_version = 1.31.1 bzip2_version = 1.0.8 cmake_version = 3.18.1 @@ -18,35 +18,35 @@ coreutils_version = 8.32 curl_version = 7.71.0 dash_version = 0.5.11 dbus_version = 1.12.18 -diffutils_version = 3.7 +diffutils_version = 3.8 dhcpcd_version = 8.1.6 -e2fsprogs_version = 1.46.0 -elfutils_version = 0.182 -eudev_version = 3.2.9 -execline_version = 2.7.0.1 -expat_version = 2.2.10 -file_version = 5.40 -findutils_version = 4.8.0 +e2fsprogs_version = 1.46.5 +elfutils_version = 0.186 +eudev_version = 3.2.11 +execline_version = 2.8.3.0 +expat_version = 2.4.8 +file_version = 5.41 +findutils_version = 4.9.0 flex_version = 2.6.4 gawk_version = 5.1.1 -gcc_version = 11.3.0 -gdbm_version = 1.19 +gcc_version = 12.1.0 +gdbm_version = 1.23 gettext_version = 0.21 gettext-tiny_version = 0.3.2 glibc_version = 2.35 gmp_version = 6.2.1 gperf_version = 3.1 -grep_version = 3.6 +grep_version = 3.7 groff_version = 1.22.4 grub_version = 2.06 -gzip_version = 1.10 -haveged_version = 1.9.14 -iana-etc_version = 20210115 -inetutils_version = 1.9.4 +gzip_version = 1.11 +haveged_version = 1.9.18 +iana-etc_version = 20220207 +inetutils_version = 2.2 intltool_version = 0.51.0 -iproute2_version = 5.10.0 +iproute2_version = 5.16.0 kbd_version = 2.4.0 -kmod_version = 28 +kmod_version = 29 less_version = 563 libcap_version = 2.47 libedit_version = 20191231-3.1 @@ -80,12 +80,12 @@ pkgsrc_version = 2020Q3 procps-ng_version = 3.3.16 psmisc_version = 23.3 python_version = 3.9.1 -s6_version = 2.10.0.1 -s6-linux-init_version = 1.0.6.0 -s6-rc_version = 0.5.2.1 +s6_version = 2.11.1.0 +s6-linux-init_version = 1.0.7.3 +s6-rc_version = 0.5.3.1 sed_version = 4.8 shadow_version = 4.8.1 -skalibs_version = 2.10.0.1 +skalibs_version = 2.11.2.0 sysklogd_version = 1.5.1 tar_version = 1.33 texinfo_version = 6.8 diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index d9345ef..49326bb 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -21,7 +21,10 @@ define makelinks ln -sfv ../lib/ld-linux-x86-64.so.2 $(DESTDIR)/lib64/ld-lsb-x86-64.so.3 endef else ifeq ($(arch),armv7l) -makelinks = ln -sfv ld-$(glibc_version).so $(DESTDIR)/lib/ld-linux.so.3 +define makelinks + install $(objdir)/elf/ld.so $(DESTDIR)/lib/ld-$(glibc_version).so + ln -sfv ld-$(glibc_version).so $(DESTDIR)/lib/ld-linux.so.3 +endef else ifeq ($(arch),riscv64) makelinks = ln -sfv ../lib/ld-linux-riscv64-lp64d.so.1 $(DESTDIR)/lib64 endif diff --git a/world/Makefile b/world/Makefile index 51ae7f7..20d2d7d 100644 --- a/world/Makefile +++ b/world/Makefile @@ -68,7 +68,7 @@ subdirs += util-linux # for musl #subdirs += musl-fts subdirs += e2fsprogs -subdirs += haveged +#subdirs += haveged subdirs += eudev subdirs += skalibs subdirs += execline diff --git a/world/bc/Makefile b/world/bc/Makefile index 3c76c4a..5fc37bf 100644 --- a/world/bc/Makefile +++ b/world/bc/Makefile @@ -2,13 +2,11 @@ # Copyright 2020 Nathan Fisher # distname = bc -patches += bc-configure.patch -no_objdir = 1 include world.mk export PREFIX = /usr export CC = $(tgt)-gcc export HOSTCC = gcc export HOSTCFLAGS = -std=c99 export CFLAGS = -std=c99 --sysroot=$(DESTDIR) -config_cmd = $(srcdir)/configure.sh -G -O3 +config_cmd = cd $(objdir) && $(srcdir)/configure.sh -G -O3 include targets.mk diff --git a/world/bc/bc-configure.patch b/world/bc/bc-configure.patch deleted file mode 100644 index 098cba9..0000000 --- a/world/bc/bc-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur bc-3.2.5.orig/configure bc-3.2.5/configure ---- bc-3.2.5.orig/configure.sh 2021-01-30 19:35:41.000000000 -0500 -+++ bc-3.2.5/configure.sh 2021-02-02 11:45:45.393574823 -0500 -@@ -609,7 +609,6 @@ - help* | bc-only* | dc-only* | coverage* | debug*) - usage "No arg allowed for --$arg option" ;; - disable-bc* | disable-dc* | disable-clean*) -- disable-extra-math*) - usage "No arg allowed for --$arg option" ;; - disable-generated-tests* | disable-history*) - usage "No arg allowed for --$arg option" ;; diff --git a/world/bin/grep/Makefile.bsd b/world/bin/grep/Makefile.bsd deleted file mode 100644 index 59abeb5..0000000 --- a/world/bin/grep/Makefile.bsd +++ /dev/null @@ -1,49 +0,0 @@ -# $NetBSD: Makefile,v 1.10 2018/08/12 09:03:21 christos Exp $ -# $FreeBSD: head/usr.bin/grep/Makefile 210389 2010-07-22 19:11:57Z gabor $ -# $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $ - -PROG= grep -SRCS= fastgrep.c file.c grep.c queue.c util.c - -LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ - ${BINDIR}/grep ${BINDIR}/fgrep \ - ${BINDIR}/grep ${BINDIR}/zgrep \ - ${BINDIR}/grep ${BINDIR}/zegrep \ - ${BINDIR}/grep ${BINDIR}/zfgrep - -MLINKS= grep.1 egrep.1 \ - grep.1 fgrep.1 \ - grep.1 zgrep.1 \ - grep.1 zegrep.1 \ - grep.1 zfgrep.1 - -.if empty(HOST_CPPFLAGS:M*-DWITHOUT_GZIP*) -LDADD+= -lz -DPADD+= ${LIBZ} -.endif - -.if empty(HOST_CPPFLAGS:M*-DWITHOUT_BZ2*) -LDADD+= -lbz2 -DPADD+= ${LIBBZ2} -.endif - -.if empty(HOST_CPPFLAGS:M*-DWITHOUT_NLS*) -.PATH: ${.CURDIR}/nls - -NLS= C.msg \ - es_ES.ISO8859-1.msg \ - gl_ES.ISO8859-1.msg \ - hu_HU.ISO8859-2.msg \ - ja_JP.eucJP.msg \ - ja_JP.SJIS.msg \ - ja_JP.UTF-8.msg \ - pt_BR.ISO8859-1.msg \ - ru_RU.KOI8-R.msg \ - uk_UA.UTF-8.msg \ - zh_CN.UTF-8.msg -.endif - -COPTS.grep.c += -Wno-format-nonliteral -COPTS.util.c += -Wno-format-nonliteral - -.include diff --git a/world/elfutils/Makefile b/world/elfutils/Makefile index 90153a9..9b3a452 100644 --- a/world/elfutils/Makefile +++ b/world/elfutils/Makefile @@ -3,7 +3,7 @@ # distname = elfutils distext = bz2 -patches += elfutils-wnoerror.patch +#patches += elfutils-wnoerror.patch #patches += elfutils-musl-no-error.patch #patches += elfutils-musl-no-cdefs.patch include world.mk diff --git a/world/expat/Makefile b/world/expat/Makefile index eab059b..30528a3 100644 --- a/world/expat/Makefile +++ b/world/expat/Makefile @@ -14,7 +14,6 @@ define post_install install -d $(docdir)/expat/$(expat_version) install -m644 $(srcdir)/doc/*.html $(docdir)/expat/$(expat_version) install -m644 $(srcdir)/doc/*.css $(docdir)/expat/$(expat_version) - install -m644 $(srcdir)/doc/*.png $(docdir)/expat/$(expat_version) endef include targets.mk diff --git a/world/iproute2/iproute2.config.mk b/world/iproute2/iproute2.config.mk index 178d815..e407a82 100755 --- a/world/iproute2/iproute2.config.mk +++ b/world/iproute2/iproute2.config.mk @@ -23,8 +23,11 @@ PKG_CONFIG:=pkg-config AR:=$(tgt)-ar CC:=$(tgt)-gcc YACC:=bison +TC_CONFIG_IPSET:=y +LIBDIR:=/usr/lib IP_CONFIG_SETNS:=y CFLAGS += -DHAVE_SETNS +CFLAGS += -DHAVE_HANDLE_AT HAVE_ELF:=y CFLAGS += -DHAVE_ELF LDLIBS += -lelf