upg glibc gcc binutils xz mpfr openssl-1.1 elfutils jobo-mirror

2023-08-03 03:39:08 +03:00 · 2023-08-03 03:39:08 +03:00 · c4d512b6dc
parent eb19520732
commit c4d512b6dc
29 changed files with 708 additions and 124 deletions
--- a/binutils/PKGBUILD
+++ b/binutils/PKGBUILD
@ -7,8 +7,8 @@

 pkgname=binutils
 pkgver=2.41
-_commit=2c73aeb8d2e02de7b69cbcb13361cfbca9d76a4e
-pkgrel=01
+_commit=31b78cc991781265d9404bd55151691bedd6d556
+pkgrel=02
 pkgdesc='A set of programs to assemble and manipulate binary and object files'
 #url='https://www.gnu.org/software/binutils'
 url='https://ftp.gnu.org/gnu/binutils'
@ -139,6 +139,5 @@ validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
 sha256sums=(SKIP
 	2d430b66f84a19c154725ec535280c493be1d34f1a90f95208dce02fecd0e4e4) # gold-warn-unsupported.patch

-##  62934ab6e11da459f406f5ab8bffc3327cf5be6427097168a18ac53abfe7184b  binutils-2.41-01-x86_64.pkg.tar.lz
-
+##  e692762cff3ff2154a2db9e37a944d0b8fe8b30698654fe3ab4ce3bd5ad1c09e  binutils-2.41-02-x86_64.pkg.tar.lz

--- a/binutils/PKGBUILD-arch
+++ b/binutils/PKGBUILD-arch
@ -7,8 +7,8 @@

 pkgname=binutils
 pkgver=2.41
-_commit=2c73aeb8d2e02de7b69cbcb13361cfbca9d76a4e
-pkgrel=1
+_commit=31b78cc991781265d9404bd55151691bedd6d556
+pkgrel=2
 pkgdesc='A set of programs to assemble and manipulate binary and object files'
 arch=(x86_64)
 url='https://www.gnu.org/software/binutils/'
--- a/elfutils/PKGBUILD
+++ b/elfutils/PKGBUILD
@ -8,7 +8,7 @@
 pkgbase=elfutils
 pkgname=(debuginfod elfutils libelf)
 pkgver=0.189
-pkgrel=02
+pkgrel=03
 pkgdesc="Handle ELF object files and DWARF debugging information"
 url="https://sourceware.org/elfutils/"
 makedepends=(bzip2 curl gcc-libs libarchive libmicrohttpd sqlite xz zlib zstd)
@ -147,7 +147,6 @@ validpgpkeys=(47CC0331081B8BC6D0FD4DA08370665B57816A6A  # Mark J. Wielaard <mark
 sha256sums=(39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8  # elfutils-0.189.tar.bz2
 	692a90a6a91dc1b76ab82828c8b7927c8d0f60f82b82da425fa7c258f9f2b570) # elfutils-0.189.tar.bz2.sig

-##  97531155c6b0ec46a319b0045d7aae2ce0c5f063c433ec00639e947a1c973f0d  debuginfod-0.189-02-x86_64.pkg.tar.lz
-##  c990b84ba56a93c39f3d924c1d2bbd73777301b661ea07bd171f27d98fb10701  elfutils-0.189-02-x86_64.pkg.tar.lz
-##  dfd15f709a6a040963f85989abb8be39d8769548b9be216d6e5d10f7554a892e  libelf-0.189-02-x86_64.pkg.tar.lz
-
+##  397bec11a26c4a8cb57ec8d56d7d245e7d97f16dfd6a8498526a008f4d13ba55  debuginfod-0.189-03-x86_64.pkg.tar.lz
+##  25ecbf80866f0092243da6a78fcc1def7a1a92275ce976504d5fbdfdb39200ac  elfutils-0.189-03-x86_64.pkg.tar.lz
+##  96262dc18e534da5048177e85301fe15db11cd8ba7c7c4865bc782b4cad9317a  libelf-0.189-03-x86_64.pkg.tar.lz
--- a/elfutils/PKGBUILD-arch
+++ b/elfutils/PKGBUILD-arch
@ -6,7 +6,7 @@
 pkgbase=elfutils
 pkgname=(debuginfod elfutils libelf)
 pkgver=0.189
-pkgrel=2
+pkgrel=3
 pkgdesc="Handle ELF object files and DWARF debugging information"
 arch=(x86_64)
 url="https://sourceware.org/elfutils/"
--- a/gcc/PKGBUILD
+++ b/gcc/PKGBUILD
@ -15,8 +15,8 @@
 pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go gcc-d lto-dump libgccjit)
 pkgver=13.2.1
 _majorver=${pkgver%%.*}
-_commit=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b # 13.2.1
-pkgrel=02
+_commit=860b0f0ef787f756c0e293671b4c4622dff63a79 # 13.2.1
+pkgrel=03
 pkgdesc='The GNU Compiler Collection'
 url='https://gcc.gnu.org'
 makedepends=(
@ -515,14 +515,17 @@ sha256sums=(SKIP
 	2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a # c99
 	1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f) # gcc-ada-repro.patch

-##  292cef1dad934ca3a46c336e62ff7089b03741a726eb270135d9cd4900de8d62  gcc-13.2.1-01-x86_64.pkg.tar.lz
-##  a8426e7e5fc5f92d6ef48fb1d85d6ec80f1bdd21ac606637a2ced6ba06cdebb1  gcc-ada-13.2.1-01-x86_64.pkg.tar.lz
-##  28d6255ee6b9ad3600f1ad61f6dc9e9ce883d85404144e74efd70e90d22938ca  gcc-d-13.2.1-01-x86_64.pkg.tar.lz
-##  cf0ff439e1c870e1d1d1d0459ca54fb6a41a8578028a06528dd89b6a202be1e1  gcc-fortran-13.2.1-01-x86_64.pkg.tar.lz
-##  87ad8074db820ec837571e1a6743a270db410f8dd468e7e1c74f1112d834d373  gcc-go-13.2.1-01-x86_64.pkg.tar.lz
-##  9f71db62428c46f2f9bfba61fcecd82ba1763f91322987aaa2bf2f94b9c74bf0  gcc-libs-13.2.1-01-x86_64.pkg.tar.lz
-##  7fdb8b1f4093e7dac21066bf81384bb20494419932fde53ebf98b3d5463bb4c5  gcc-objc-13.2.1-01-x86_64.pkg.tar.lz
-##  ae3cc9916c2cac2d809cc5491cd315ee20990b661a489c1d3d44011570c51323  lib32-gcc-libs-13.2.1-01-x86_64.pkg.tar.lz
-##  3f11e2fc32ab0151cd21a0b38204465f280a6bb9697d97ad8c3f8e2ba621c36b  libgccjit-13.2.1-01-x86_64.pkg.tar.lz
-##  8f19f20d10edfc689eb10224f08d9a9cf8e1b294813eeb864cafcb8d30ed6e7e  lto-dump-13.2.1-01-x86_64.pkg.tar.lz
+##  
+#450cf52260a57bf542db20e129302e30d5aa9af5e0fdd0349b70bd151913480d  gcc-13.2.1-03-x86_64.pkg.tar.lz
+#539c101ef11cf4c6bae5b50fb1fca3e0785b57ae85a6c9adaaa52793d419b45d  gcc-ada-13.2.1-03-x86_64.pkg.tar.lz
+#085478acd7463fd8359b2c3e91e72501ebac3a3a4449d3b45b64a4d42cb52c8d  gcc-d-13.2.1-03-x86_64.pkg.tar.lz
+#47fc069f62c125e70904c9b12510a48ca6bb0ef656767c14df38026bd5b78c9b  gcc-fortran-13.2.1-03-x86_64.pkg.tar.lz
+#d2b135807dc553323e32fe55febab3dca997f3eb7f3fef0f0341fadbed78b829  gcc-go-13.2.1-03-x86_64.pkg.tar.lz
+#a6f51a02682aa1131605577c67447b13a8e9361d8f2c5aafee46149daa23186e  gcc-libs-13.2.1-03-x86_64.pkg.tar.lz
+#9c89baefa4b2ab93057e4e143c003ba6f84d0796093ffd65fb065d2e3ed31228  gcc-objc-13.2.1-03-x86_64.pkg.tar.lz
+#abbc828e20b80ae1ae3abb3b68b115011fc78aa03206a8d2cac954672ed39a93  lib32-gcc-libs-13.2.1-03-x86_64.pkg.tar.lz
+#27d60694ac0fdb7b4ee4529b3c1c412f9c959db5a84f6132f1905bc2b8c9590e  libgccjit-13.2.1-03-x86_64.pkg.tar.lz
+#3d8296a1fdd2126a8e58aaac143d4326377e90bcedec57af7b2e3ad990b869c1  lto-dump-13.2.1-03-x86_64.pkg.tar.lz
+#
+##

--- a/gcc/PKGBUILD-arch
+++ b/gcc/PKGBUILD-arch
@ -10,8 +10,8 @@
 pkgname=(gcc gcc-libs lib32-gcc-libs gcc-ada gcc-d gcc-fortran gcc-go gcc-objc lto-dump libgccjit)
 pkgver=13.2.1
 _majorver=${pkgver%%.*}
-_commit=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b
-pkgrel=2
+_commit=860b0f0ef787f756c0e293671b4c4622dff63a79
+pkgrel=3
 pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
 license=(GPL3 LGPL FDL custom)
--- a/glibc/PATCH-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch
+++ b/glibc/PATCH-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch
@ -0,0 +1,220 @@
+From mboxrd@z Thu Jan  1 00:00:00 1970
+Return-Path: <SRS0=xFJ7=DS=redhat.com=fweimer@sourceware.org>
+Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124])
+	by sourceware.org (Postfix) with ESMTPS id 5D26B3858D28
+	for <libc-alpha@sourceware.org>; Tue,  1 Aug 2023 14:13:31 +0000 (GMT)
+DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5D26B3858D28
+Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com
+Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
+	s=mimecast20190719; t=1690899210;
+	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
+	 to:to:cc:mime-version:mime-version:content-type:content-type;
+	bh=V+JHgiMkmVZokr9OzsvqE1BzYrJXvG5qaZBzgKJakQ4=;
+	b=VhrsRVYC3hPKEhEDGPIA+Q0nD8f+BrWTPkjE4XsI3pS/SeQoRIz4nRl+dFQGtr6xJrmzGb
+	8kgmy1w+kHlyRs9UhmBG6fwYlbk8qDVxf/D41VYhEI6WhMJolECPNVUmqcjSYcYb05Itdv
+	PV0aldwA6xUr3soWj4a3wcHoy9dgK44=
+Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by
+ relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,
+ cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
+ us-mta-449-ZVR6yPn8M3CvvwxXwD9rXw-1; Tue, 01 Aug 2023 10:13:28 -0400
+X-MC-Unique: ZVR6yPn8M3CvvwxXwD9rXw-1
+Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1])
+	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
+	(No client certificate requested)
+	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4FE4A1C03D8F
+	for <libc-alpha@sourceware.org>; Tue,  1 Aug 2023 14:13:28 +0000 (UTC)
+Received: from oldenburg.str.redhat.com (unknown [10.2.16.12])
+	by smtp.corp.redhat.com (Postfix) with ESMTPS id D398B40C2063
+	for <libc-alpha@sourceware.org>; Tue,  1 Aug 2023 14:13:27 +0000 (UTC)
+From: Florian Weimer <fweimer@redhat.com>
+To: libc-alpha@sourceware.org
+Subject: [PATCH] nscd: Do not rebuild getaddrinfo (bug 30709)
+Date: Tue, 01 Aug 2023 16:13:26 +0200
+Message-ID: <87sf924zqx.fsf@oldenburg.str.redhat.com>
+User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
+MIME-Version: 1.0
+X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1
+X-Mimecast-Spam-Score: 0
+X-Mimecast-Originator: redhat.com
+Content-Type: text/plain
+X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
+X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
+List-Id: <libc-alpha.sourceware.org>
+
+The nscd daemon caches hosts data from NSS modules verbatim, without
+filtering protocol families or sorting them (otherwise separate caches
+would be needed for certain ai_flags combinations).  The cache
+implementation is complete separate from the getaddrinfo code.  This
+means that rebuilding getaddrinfo is not needed.  The only function
+actually used is __bump_nl_timestamp from check_pf.c, and this change
+moves it into nscd/connections.c.
+
+Tested on x86_64-linux-gnu with -fexceptions, built with
+build-many-glibcs.py.  I also backported this patch into a distribution
+that still supports nscd and verified manually that caching still works.
+
+---
+ include/ifaddrs.h                  |  4 ---
+ inet/check_pf.c                    |  9 -------
+ nscd/Makefile                      |  2 +-
+ nscd/connections.c                 | 11 +++++++++
+ nscd/gai.c                         | 50 --------------------------------------
+ sysdeps/unix/sysv/linux/check_pf.c | 17 +------------
+ 6 files changed, 13 insertions(+), 80 deletions(-)
+
+diff --git a/include/ifaddrs.h b/include/ifaddrs.h
+index 416118f1b3..19a3afb19f 100644
+--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
+@@ -34,9 +34,5 @@ extern void __check_native (uint32_t a1_index, int *a1_native,
+ 			    uint32_t a2_index, int *a2_native)
+   attribute_hidden;
+ 
+-#if IS_IN (nscd)
+-extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
+-#endif
+-
+ # endif /* !_ISOMAC */
+ #endif	/* ifaddrs.h */
+diff --git a/inet/check_pf.c b/inet/check_pf.c
+index 5310c99121..6d1475920f 100644
+--- a/inet/check_pf.c
+++ b/inet/check_pf.c
+@@ -60,12 +60,3 @@ __free_in6ai (struct in6addrinfo *in6ai)
+ {
+   /* Nothing to do.  */
+ }
+-
+-
+-#if IS_IN (nscd)
+-uint32_t
+-__bump_nl_timestamp (void)
+-{
+-  return 0;
+-}
+-#endif
+diff --git a/nscd/Makefile b/nscd/Makefile
+index 2a0489f4cf..16b6460ee9 100644
+--- a/nscd/Makefile
+++ b/nscd/Makefile
+@@ -35,7 +35,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
+ 		getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm3_r \
+ 		getsrvbynm_r getsrvbypt_r servicescache \
+ 		dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
+-		xmalloc xstrdup aicache initgrcache gai res_hconf \
+		xmalloc xstrdup aicache initgrcache res_hconf \
+ 		netgroupcache cachedumper
+ 
+ ifeq ($(build-nscd)$(have-thread-library),yesyes)
+diff --git a/nscd/connections.c b/nscd/connections.c
+index a405a44a9b..15693e5090 100644
+--- a/nscd/connections.c
+++ b/nscd/connections.c
+@@ -256,6 +256,17 @@ int inotify_fd = -1;
+ #ifdef HAVE_NETLINK
+ /* Descriptor for netlink status updates.  */
+ static int nl_status_fd = -1;
+
+static uint32_t
+__bump_nl_timestamp (void)
+{
+  static uint32_t nl_timestamp;
+
+  if (atomic_fetch_add_relaxed (&nl_timestamp, 1) + 1 == 0)
+    atomic_fetch_add_relaxed (&nl_timestamp, 1);
+
+  return nl_timestamp;
+}
+ #endif
+ 
+ /* Number of times clients had to wait.  */
+diff --git a/nscd/gai.c b/nscd/gai.c
+deleted file mode 100644
+index e29f3fe583..0000000000
+--- a/nscd/gai.c
+++ /dev/null
+@@ -1,50 +0,0 @@
+-/* Copyright (C) 2004-2023 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   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; version 2 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 <https://www.gnu.org/licenses/>.  */
+-
+-#include <alloca.h>
+-#include <sys/stat.h>
+-
+-/* This file uses the getaddrinfo code but it compiles it without NSCD
+-   support.  We just need a few symbol renames.  */
+-#define __ioctl ioctl
+-#define __getsockname getsockname
+-#define __socket socket
+-#define __recvmsg recvmsg
+-#define __bind bind
+-#define __sendto sendto
+-#define __strchrnul strchrnul
+-#define __getline getline
+-#define __qsort_r qsort_r
+-/* nscd uses 1MB or 2MB thread stacks.  */
+-#define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
+-#define __getifaddrs getifaddrs
+-#define __freeifaddrs freeifaddrs
+-#undef __fstat64
+-#define __fstat64 fstat64
+-#undef __stat64
+-#define __stat64 stat64
+-
+-/* We are nscd, so we don't want to be talking to ourselves.  */
+-#undef  USE_NSCD
+-
+-#include <getaddrinfo.c>
+-
+-/* Support code.  */
+-#include <check_pf.c>
+-#include <check_native.c>
+-
+-/* Some variables normally defined in libc.  */
+-nss_action_list __nss_hosts_database attribute_hidden;
+diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
+index 2b0b8b6368..3aa6a00348 100644
+--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
+@@ -66,25 +66,10 @@ static struct cached_data *cache;
+ __libc_lock_define_initialized (static, lock);
+ 
+ 
+-#if IS_IN (nscd)
+-static uint32_t nl_timestamp;
+-
+-uint32_t
+-__bump_nl_timestamp (void)
+-{
+-  if (atomic_fetch_add_relaxed (&nl_timestamp, 1) + 1 == 0)
+-    atomic_fetch_add_relaxed (&nl_timestamp, 1);
+-
+-  return nl_timestamp;
+-}
+-#endif
+-
+ static inline uint32_t
+ get_nl_timestamp (void)
+ {
+-#if IS_IN (nscd)
+-  return nl_timestamp;
+-#elif defined USE_NSCD
+#if defined USE_NSCD
+   return __nscd_get_nl_timestamp ();
+ #else
+   return 0;
+
+
--- a/glibc/PKGBUILD
+++ b/glibc/PKGBUILD
@ -10,20 +10,21 @@

 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
-pkgver=2.37
-_commit=7c32cb7dd88cf100b0b412163896e30aa2ee671a # 03
-pkgrel=04
+pkgver=2.38
+_commit=36f2487f13e3540be9ee0fb51876b1da72176d3f
+pkgrel=01
 url='https://www.gnu.org/software/libc'
 makedepends=(git gd lib32-gcc-libs python)
 #optdepends=('perl: for mtrace')
 #options=(debug staticlibs !lto)
 options=(staticlibs !lto)
 source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
-         locale.gen.txt
-         locale-gen
-         lib32-glibc.conf
-         sdt.h sdt-config.h
-         reenable_DT_HASH.patch)
+        locale.gen.txt
+        locale-gen
+        lib32-glibc.conf
+        sdt.h sdt-config.h
+        PATCH-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch)
+#         reenable_DT_HASH.patch)

 prepare() {
  mkdir -p glibc-build lib32-glibc-build
@ -31,11 +32,7 @@ prepare() {
  [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
  cd glibc

-  # Re-enable `--hash-style=both` for building shared objects due to issues with EPIC's EAC
-  # which relies on DT_HASH to be present in these libs.
-  # reconsider 2023-01
-  patch -Np1 -i "${srcdir}"/reenable_DT_HASH.patch
-
+  patch -Np1 < ../PATCH-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch
 }

 build() {
@ -45,11 +42,11 @@ build() {
      --with-bugurl=https://bugs.archlinux.org/
      --enable-bind-now
      --enable-cet
+      --enable-fortify-source
      --enable-kernel=4.4
      --enable-multi-arch
      --enable-stack-protector=strong
      --enable-systemtap
-      --disable-crypt
      --disable-profile
      --disable-werror
  )
@ -64,20 +61,13 @@ build() {
  # Credits @allanmcrae
  # https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD
  # remove fortify for building libraries
-  CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2/}
+  # CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2/}

  "$srcdir/glibc/configure" \
      --libdir=/usr/lib \
      --libexecdir=/usr/lib \
      "${_configure_flags[@]}"

-  # build libraries with fortify disabled
-  echo "build-programs=no" >> configparms
-  make -O
-
-  # re-enable fortify for programs
-  sed -i "/build-programs=/s#no#yes#" configparms
-  echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=2" >> configparms
  make -O

  # build info pages manually for reproducibility
@ -98,13 +88,6 @@ build() {
      --libexecdir=/usr/lib32 \
      "${_configure_flags[@]}"

-  # build libraries with fortify disabled
-  echo "build-programs=no" >> configparms
-  make -O
-
-  # re-enable fortify for programs
-  sed -i "/build-programs=/s#no#yes#" configparms
-  echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=2" >> configparms
  make -O

  # pregenerate C.UTF-8 locale until it is built into glibc
@ -112,14 +95,14 @@ build() {
  elf/ld.so --library-path "$PWD" locale/localedef -c -f ../glibc/localedata/charmaps/UTF-8 -i ../glibc/localedata/locales/C ../C.UTF-8/
 }

-## Credits for skip_test() and check() @allanmcrae
-## https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD
+# Credits for skip_test() and check() @allanmcrae
+# https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD
 #skip_test() {
 #  test=${1}
 #  file=${2}
-#  sed -i "s/\b${test}\b//" "${srcdir}"/glibc/${file}
+#  sed -i "/\b${test} /d" "${srcdir}"/glibc/${file}
 #}
-
+#
 #check() {
 #  cd glibc-build
 #
@ -138,13 +121,14 @@ build() {
 #  skip_test tst-ntp_gettime         sysdeps/unix/sysv/linux/Makefile
 #  skip_test tst-ntp_gettimex        sysdeps/unix/sysv/linux/Makefile
 #  skip_test tst-pkey                sysdeps/unix/sysv/linux/Makefile
-#  skip_test tst-ttyname             sysdeps/unix/sysv/linux/Makefile
+###  skip_test tst-ttyname             sysdeps/unix/sysv/linux/Makefile
 #  skip_test tst-process_mrelease    sysdeps/unix/sysv/linux/Makefile
 #  skip_test tst-adjtime             time/Makefile
-#  skip_test tst-clock2              time/Makefile
+###  skip_test tst-clock2              time/Makefile
 #
 #  make -O check
 #}
+#

 package_glibc() {
  pkgdesc='GNU C Library w/o systemd'
@ -194,7 +178,7 @@ package_glibc() {
 }

 package_lib32-glibc() {
-  pkgdesc='GNU C Library (32-bit) w/o systemd'
+  pkgdesc='GNU C Library (32-bit)'
  depends=("glibc=$pkgver")
  options+=('!emptydirs')

@ -232,8 +216,7 @@ sha256sums=(SKIP
 	c27424154a6096ae32c0824b785e05de6acef33d9224fd6147d1936be9b4962b  # lib32-glibc.conf
 	774061aff612a377714a509918a9e0e0aafce708b87d2d7e06b1bd1f6542fe70  # sdt.h
 	cdc234959c6fdb43f000d3bb7d1080b0103f4080f5e67bcfe8ae1aaf477812f0  # sdt-config.h
-	bb2fc5a38158d339a51a4aaab3fe2d5cc496221f77cfce6f74768db91cb5ec1e) # reenable_DT_HASH.patch
-
-##  d5beddfdcbd6a06bb6d542495e89fb386020c05538261f4249e383796bfcd401  glibc-2.37-04-x86_64.pkg.tar.lz
-##  808767bd9493b6651d54f26343fc783de5e96911851e750b2adbed8f65203598  lib32-glibc-2.37-04-x86_64.pkg.tar.lz
+	e749a59ef980a77cf6433c87ed7b5020d65c7a3e2900c577b8a7880386ec670f) # PATCH-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch

+##  4912edc358ae1b136d7f72568c18097629677c1ebd9b1af676d78a4e03066650  lib32-glibc-2.38-01-x86_64.pkg.tar.lz
+##  82f99adf6c5bbc2604383f84ffe551c4eb10c3534077b89d4649bcb2360a8af7  glibc-2.38-01-x86_64.pkg.tar.lz
--- a/glibc/PKGBUILD-arch
+++ b/glibc/PKGBUILD-arch
@ -8,9 +8,9 @@

 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
-pkgver=2.37
-_commit=7c32cb7dd88cf100b0b412163896e30aa2ee671a
-pkgrel=4
+pkgver=2.38
+_commit=36f2487f13e3540be9ee0fb51876b1da72176d3f
+pkgrel=1
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
 license=(GPL LGPL)
@ -21,7 +21,7 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
        locale-gen
        lib32-glibc.conf
        sdt.h sdt-config.h
-        reenable_DT_HASH.patch
+        PATCH-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch
 )
 validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
              BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
@ -31,7 +31,7 @@ b2sums=('SKIP'
        '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a'
        'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
        '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678'
-        '5fdd133c367af2f5454ea1eea7907de12166fb95eb59dbe33eae16aa9e26209b6585972bc1c80e36a0af4bfb04296acaf940ee78cd624cdcbab9669dff46c051')
+        '2a83dad4bcca543a5a85e91ebbe2bbccb4f863044d9e6e65806be0ea43ba70dd4e1e76e1548f9d189e996d4fcda0afc75efebdc9431fe10f2b66d3d2e878615b')

 prepare() {
  mkdir -p glibc-build lib32-glibc-build
@ -39,10 +39,7 @@ prepare() {
  [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
  cd glibc

-  # Re-enable `--hash-style=both` for building shared objects due to issues with EPIC's EAC
-  # which relies on DT_HASH to be present in these libs.
-  # reconsider 2023-01
-  patch -Np1 -i "${srcdir}"/reenable_DT_HASH.patch
+  patch -Np1 < ../PATCH-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch
 }

 build() {
@ -52,11 +49,11 @@ build() {
      --with-bugurl=https://bugs.archlinux.org/
      --enable-bind-now
      --enable-cet
+      --enable-fortify-source
      --enable-kernel=4.4
      --enable-multi-arch
      --enable-stack-protector=strong
      --enable-systemtap
-      --disable-crypt
      --disable-profile
      --disable-werror
  )
@ -71,20 +68,13 @@ build() {
  # Credits @allanmcrae
  # https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD
  # remove fortify for building libraries
-  CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2/}
+  # CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2/}

  "${srcdir}"/glibc/configure \
      --libdir=/usr/lib \
      --libexecdir=/usr/lib \
      "${_configure_flags[@]}"

-  # build libraries with fortify disabled
-  echo "build-programs=no" >> configparms
-  make -O
-
-  # re-enable fortify for programs
-  sed -i "/build-programs=/s#no#yes#" configparms
-  echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=2" >> configparms
  make -O

  # build info pages manually for reproducibility
@ -105,13 +95,6 @@ build() {
      --libexecdir=/usr/lib32 \
      "${_configure_flags[@]}"

-  # build libraries with fortify disabled
-  echo "build-programs=no" >> configparms
-  make -O
-
-  # re-enable fortify for programs
-  sed -i "/build-programs=/s#no#yes#" configparms
-  echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=2" >> configparms
  make -O

  # pregenerate C.UTF-8 locale until it is built into glibc
@ -124,7 +107,7 @@ build() {
 skip_test() {
  test=${1}
  file=${2}
-  sed -i "s/\b${test}\b//" "${srcdir}"/glibc/${file}
+  sed -i "/\b${test} /d" "${srcdir}"/glibc/${file}
 }

 check() {
@ -146,9 +129,7 @@ check() {
  skip_test tst-ntp_gettimex        sysdeps/unix/sysv/linux/Makefile
  skip_test tst-pkey                sysdeps/unix/sysv/linux/Makefile
  skip_test tst-process_mrelease    sysdeps/unix/sysv/linux/Makefile
-  skip_test tst-ttyname             sysdeps/unix/sysv/linux/Makefile
  skip_test tst-adjtime             time/Makefile
-  skip_test tst-clock2              time/Makefile

  make -O check
 }
--- a/jobo-mirror/PKGBUILD
+++ b/jobo-mirror/PKGBUILD
@ -8,7 +8,7 @@
 pkgname=jobo-mirror
 pkgdesc='joborun linux mirrorlist'
 pkgver=0.2
-pkgrel=02
+pkgrel=03
 groups=(base jobbot)
 source=('README.txt'
 	'mirrorlist-jobo'
@ -32,10 +32,10 @@ license=(ISC)

 sha256sums=(507f355b9881c44f0f6388c8a47c24908d3adafc717e5ee447236c6162b02052  # README.txt
 	9c83fe4380d71bfbe9fd7784d14b28ac0740b95a7a6eecbd236d03c6a3bb757f  # mirrorlist-jobo
-	e41e3250696c6fbbda4c8a5c3d44ab5780f26e42f73e3350d203036b040be4ed) # non-sf.sh
+	53a112ac0532e88febf7cdbada0c98b36b738a552c2d495d10bc7662e127637c) # non-sf.sh

 ##  tarball at sourceforge 
-##  841b8cafa5ace090c42d113b9c4bf42e894b612aeaa7bf91683c5a2bce5010b6  # non-sf-pkgs.tar.xz
+##  5d620b833b9dca4b6670723a8061cc57d14c4d3cb3760a9798a6bd691629bdb5  non-sf-pkgs.tar.xz
 ##  this package:
-##  895267f2db2c8b803f4c792f09f4e10ff38308a915cbd1184a48a76dc7735c01  jobo-mirror-0.2-02-x86_64.pkg.tar.lz
+##  82db9c7a5b2bd3bbc73920eef1b2fd7d046e703696c28ceca1c4c8ca22969194  jobo-mirror-0.2-03-x86_64.pkg.tar.lz

--- a/jobo-mirror/non-sf.sh
+++ b/jobo-mirror/non-sf.sh
@ -19,8 +19,8 @@ echo "till we find a better solution and mirrors it will have to do."
    continue
  fi
  echo "checking sums, the two lines must be identical, if not remove the tarball and restart"
-  echo "841b8cafa5ace090c42d113b9c4bf42e894b612aeaa7bf91683c5a2bce5010b6  /tmp/sf01/non-sf-pkgs.tar.xz"
-  sha256sum /tmp/sf01/non-sf-pkgs.tar.xz
+  echo "5d620b833b9dca4b6670723a8061cc57d14c4d3cb3760a9798a6bd691629bdb5  non-sf-pkgs.tar.xz"
+  sha256sum non-sf-pkgs.tar.xz
  echo "enter to continue IF 2 lines identical"
  read
  tar -xf non-sf-pkgs.tar.xz 
@ -29,5 +29,3 @@ echo "till we find a better solution and mirrors it will have to do."
  ls -lh /tmp/sf01   
  echo "now you can resume with upgrades as normal % pacman -Suy "
  echo "We apologize for the inconvenience but this is all we can do for now"
-
-
--- a/jobo-mirror/pkg/jobo-mirror/.BUILDINFO
+++ b/jobo-mirror/pkg/jobo-mirror/.BUILDINFO
@ -0,0 +1,166 @@
+format = 2
+pkgname = jobo-mirror
+pkgbase = jobo-mirror
+pkgver = 0.2-03
+pkgarch = x86_64
+pkgbuild_sha256sum = 369b96a42b89fcd4421d939c45c86411f54790b38cbcf5e80280a5bab346c44f
+packager = joborun <joborun@disroot.org>
+builddate = 1691022786
+builddir = /src/pkg/jobcore/jobo-mirror
+startdir = /src/pkg/jobcore/jobo-mirror
+buildtool = makepkg
+buildtoolver = 6.0.2
+buildenv = !distcc
+buildenv = color
+buildenv = !ccache
+buildenv = check
+buildenv = !sign
+options = strip
+options = docs
+options = !libtool
+options = !staticlibs
+options = emptydirs
+options = zipman
+options = purge
+options = !debug
+options = !lto
+installed = acl-2.3.1-03-x86_64
+installed = archlinux-keyring-20230704-01-x86_64
+installed = attr-2.5.1-03-x86_64
+installed = audit-3.1.1-01-x86_64
+installed = bash-5.2.15-01-x86_64
+installed = binutils-2.41-02-x86_64
+installed = brotli-1.0.9-012-x86_64
+installed = bzip2-1.0.8-05-x86_64
+installed = ca-certificates-20220905-01-any
+installed = ca-certificates-mozilla-3.92-01-x86_64
+installed = ca-certificates-utils-20220905-01-any
+installed = coreutils-9.3-01-x86_64
+installed = cower-0.1.0-01-x86_64
+installed = curl-8.2.1-01-x86_64
+installed = db-6.2.32-01-x86_64
+installed = db5.3-5.3.28-02-x86_64
+installed = dbus-1.14.8-01-x86_64
+installed = diffutils-3.10-01-x86_64
+installed = e2fsprogs-1.47.0-01-x86_64
+installed = elfutils-0.189-03-x86_64
+installed = expat-2.5.0-01-x86_64
+installed = fakeroot-1.32.1-01-x86_64
+installed = file-5.45-01-x86_64
+installed = filesystem-2023.05.09-02-x86_64
+installed = findutils-4.9.0-03-x86_64
+installed = flex-2.6.4-05-x86_64
+installed = gawk-5.2.2-01-x86_64
+installed = gc-8.2.4-01-x86_64
+installed = gcc-13.2.1-03-x86_64
+installed = gcc-libs-13.2.1-03-x86_64
+installed = gdbm-1.23-02-x86_64
+installed = glib2-2.76.4-01-x86_64
+installed = glibc-2.38-01-x86_64
+installed = gmp-6.3.0-01-x86_64
+installed = gnupg-2.2.41-01-x86_64
+installed = gnutls-3.8.0-01-x86_64
+installed = gpgme-1.21.0-01-x86_64
+installed = grep-3.11-01-x86_64
+installed = groff-1.23.0-03-x86_64
+installed = guile-3.0.9-01-x86_64
+installed = gzip-1.12-02-x86_64
+installed = hwdata-0.372-01-x86_64
+installed = iana-etc-20230629-01-any
+installed = icu-73.2-02-x86_64
+installed = iproute2-6.4.0-01-x86_64
+installed = iptables-1:1.8.9-01-x86_64
+installed = iputils-20221126-02-x86_64
+installed = jansson-2.14-02-x86_64
+installed = jobbot-0.3-07-x86_64
+installed = jobo-mirror-0.2-03-x86_64
+installed = joborun-keyring-20220202-02-x86_64
+installed = keyutils-1.6.3-02-x86_64
+installed = kmod-30-03-x86_64
+installed = krb5-1.20.1-01-x86_64
+installed = less-1:633-01-x86_64
+installed = libarchive-3.7.1-01-x86_64
+installed = libassuan-2.5.6-01-x86_64
+installed = libbpf-1.2.2-01-x86_64
+installed = libcap-2.69-01-x86_64
+installed = libcap-ng-0.8.3-02-x86_64
+installed = libelf-0.189-03-x86_64
+installed = libeudev-3.2.12-02-x86_64
+installed = libevent-2.1.12-04-x86_64
+installed = libffi-3.4.4-01-x86_64
+installed = libgcrypt-1.10.2-01-x86_64
+installed = libgpg-error-1.47-01-x86_64
+installed = libidn2-2.3.4-03-x86_64
+installed = libisl-0.26-01-x86_64
+installed = libksba-1.6.4-01-x86_64
+installed = libldap-2.6.6-01-x86_64
+installed = libmnl-1.0.5-01-x86_64
+installed = libmpc-1.3.1-01-x86_64
+installed = libnetfilter_conntrack-1.0.9-01-x86_64
+installed = libnfnetlink-1.0.2-01-x86_64
+installed = libnftnl-1.2.6-01-x86_64
+installed = libnghttp2-1.55.1-01-x86_64
+installed = libnl-3.7.0-03-x86_64
+installed = libp11-kit-0.25.0-01-x86_64
+installed = libpcap-1.10.4-01-x86_64
+installed = libpsl-0.21.2-01-x86_64
+installed = libsasl-2.1.28-04-x86_64
+installed = libseccomp-2.5.4-02-x86_64
+installed = libsecret-0.20.5-02-x86_64
+installed = libssh2-1.11.0-01-x86_64
+installed = libtasn1-4.19.0-01-x86_64
+installed = libtirpc-1.3.3-02-x86_64
+installed = libtool-2.4.7+4+g1ec8fa28-06-x86_64
+installed = libunistring-1.1-02-x86_64
+installed = libutempter-1.2.1-3-x86_64
+installed = libverto-0.3.2-04-x86_64
+installed = libxcrypt-4.4.36-01-x86_64
+installed = licenses-20230729-01-x86_64
+installed = linux-api-headers-6.4-01-x86_64
+installed = lz4-1:1.9.4-01-x86_64
+installed = lzip-1.23-03-x86_64
+installed = m4-1.4.19-03-x86_64
+installed = make-4.4.1-02-x86_64
+installed = mpfr-4.2.0.p12-03-x86_64
+installed = nano-7.2-01-x86_64
+installed = ncurses-6.4_20230520-01-x86_64
+installed = nettle-3.9.1-01-x86_64
+installed = npth-1.6-04-x86_64
+installed = numactl-2.0.16-01-x86_64
+installed = obarun-keyring-20230106-1-x86_64
+installed = openssl-3.1.2-01-x86_64
+installed = openssl-1.1-1.1.1.v-01-x86_64
+installed = opensysusers-0.4.8-06-x86_64
+installed = p11-kit-0.25.0-01-x86_64
+installed = package-query-1.12.r2.g9160ff6-02-x86_64
+installed = pacman-6.0.2-014-x86_64
+installed = pacman-contrib-1.9.1-01-x86_64
+installed = pacman-mirrorlist-20230628-01-any
+installed = pam-1.5.3-03-x86_64
+installed = pambase-20221020-01-any
+installed = patch-2.7.6-010-x86_64
+installed = pciutils-3.10.0-01-x86_64
+installed = pcre-8.45-03-x86_64
+installed = pcre2-10.42-02-x86_64
+installed = perl-5.38.0-01-x86_64
+installed = pinentry-1.2.1-01-x86_64
+installed = pkgconf-1.8.1-01-x86_64
+installed = procps-ng-4.0.3-01-x86_64
+installed = psmisc-23.6-01-x86_64
+installed = readline-8.2.001-02-x86_64
+installed = sed-4.9-03-x86_64
+installed = shadow-4.13-02-x86_64
+installed = sqlite-3.42.0-01-x86_64
+installed = sudo-1.9.14.p3-01-x86_64
+installed = tar-1.35-01-x86_64
+installed = texinfo-7.0.3-01-x86_64
+installed = tzdata-2023c-02-x86_64
+installed = util-linux-2.39.1-01-x86_64
+installed = util-linux-libs-2.39.1-01-x86_64
+installed = wget-1.21.4-01-x86_64
+installed = which-2.21-06-x86_64
+installed = xz-5.4.4-01-x86_64
+installed = yajl-2.1.0-5-x86_64
+installed = zlib-1:1.2.13-03-x86_64
+installed = zsh-5.9-04-x86_64
+installed = zstd-1.5.5-01-x86_64
--- a/jobo-mirror/pkg/jobo-mirror/.INSTALL
+++ b/jobo-mirror/pkg/jobo-mirror/.INSTALL
@ -0,0 +1,63 @@
+#!/bin/sh
+
+post_install() {
+  echo "    ***          ***         ***  "
+  echo "      IMPORTANT  -  ACTION REQUIRED "
+  echo "    ***          ***         ***  "
+  echo "  Non-sf compatible packages with an epoch : on the pkgver"
+  echo "  can not be placed on SourceForge repositories."
+  echo "  This script makes sure that temporarily, if needed they"
+  echo "  will be found in your /var/cache/pacman/pkg/ cache so you"
+  echo "  will not get a 404 error from the server."
+  echo "  The following script will download a tar ball with 37 pkgs"
+  echo "  explode them into /tmp/sf01/ then move them to your cache"
+  echo "  "
+  echo "  To do so you must run the script stored now in /tmp/sf01"
+  echo "    ***          ***         ***  "
+  echo "  "
+  echo "  % sudo sh non-sf.sh "
+  echo "  "
+  echo "    ***          ***         ***  "
+  echo "  It takes a few minutes depending on the speed of your "
+  echo "  connection and at the end it list the contents (tar ball)"
+  echo "  of /tmp/sf01 "
+  read
+  mkdir -p /tmp/sf01
+  cd /tmp/sf01
+  # wget http://downloads.sourceforge.net/joborun/r/non-sf-pkgs.tar.xz
+  # tar -xf non-sf-pkgs.tar.xz 2>/dev/null
+  # mv -f ./*pkg.tar.*z /var/cache/pacman/pkg/ 2>/dev/null
+  ls -lh /tmp/sf01
+
+}
+
+post_upgrade() {
+  echo "    ***          ***         ***  "
+  echo "      IMPORTANT  -  ACTION REQUIRED "
+  echo "    ***          ***         ***  "
+  echo "  Non-sf compatible packages with an epoch : on the pkgver"
+  echo "  can not be placed on SourceForge repositories."
+  echo "  This script makes sure that temporarily, if needed they"
+  echo "  will be found in your /var/cache/pacman/pkg/ cache so you"
+  echo "  will not get a 404 error from the server."
+  echo "  The following script will download a tar ball with 37 pkgs"
+  echo "  explode them into /tmp/sf01/ then move them to your cache"
+  echo "  "
+  echo "  To do so you must run the script stored now in /tmp/sf01"
+  echo "    ***          ***         ***  "
+  echo "  "
+  echo "  % sudo sh non-sf.sh "
+  echo "  "
+  echo "    ***          ***         ***  "
+  echo "  It takes a few minutes depending on the speed of your "
+  echo "  connection and at the end it list the contents (tar ball)"
+  echo "  of /tmp/sf01 "
+  read
+  mkdir -p /tmp/sf01
+  cd /tmp/sf01
+  # wget http://downloads.sourceforge.net/joborun/r/non-sf-pkgs.tar.xz
+  # tar -xf non-sf-pkgs.tar.xz 2>/dev/null
+  # mv -f ./*pkg.tar.*z /var/cache/pacman/pkg/ 2>/dev/null
+  ls -lh /tmp/sf01
+
+}
--- a/jobo-mirror/pkg/jobo-mirror/.MTREE
+++ b/jobo-mirror/pkg/jobo-mirror/.MTREE
--- a/jobo-mirror/pkg/jobo-mirror/.PKGINFO
+++ b/jobo-mirror/pkg/jobo-mirror/.PKGINFO
@ -0,0 +1,17 @@
+# Generated by makepkg 6.0.2
+# using fakeroot version 1.32.1
+pkgname = jobo-mirror
+pkgbase = jobo-mirror
+pkgver = 0.2-03
+pkgdesc = joborun linux mirrorlist
+url = 
+builddate = 1691022786
+packager = joborun <joborun@disroot.org>
+size = 6659
+arch = x86_64
+license = ISC
+group = base
+group = jobbot
+backup = etc/pacman.d/mirrorlist-jobo
+depend = sh
+depend = wget
--- a/jobo-mirror/pkg/jobo-mirror/etc/pacman.d/README.txt
+++ b/jobo-mirror/pkg/jobo-mirror/etc/pacman.d/README.txt
@ -0,0 +1,42 @@
+	OSDN services have become a major obstacle to our work
+	and we sincerely regret relying on them, but seeking other
+	such service has proved more difficult than we thought.
+	At this time and since July 9th 2023 uloads have been
+	blocked, although their mirrors now work and seem
+	synchronized.  To keep users alert of ongoing work
+	and upgrades we have swithced to a temporary solution
+	with disroot which is 100% reliable but limited.
+
+   Since OSDN is more down than up we are in search for new file/binary
+   repositories and mirrors.  Meanwhile, as a source repository
+   git.disroot.org has been 100% reliable, but the total amount of
+   files stores is limited.  This disroot repository only holds
+   the repository databases, not the packages themselves.  In lack
+   of another solution you will have to build any updates to your
+   system using our source, as explained in the wiki.
+   the 3 OSDN mirrors below will be functional once OSDN resumes
+   service, so comment out disroot and uncomment the other three
+   when it is announced in Joborun's webpage (news) or reddit
+   r/joborun board.   Sorry for the inconvenience, this is the
+   best we can do at the moment given the resources available to us.
+
+#   pacman database only, no packages to download
+Server = https://git.disroot.org/joborun-pkg/repos/raw/branch/main/
+
+#   osdn mirrors once they become available for uploads again
+#   DOWN since July 9th 2023
+
+#Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/j/jo/joborun/repos/
+#Server = https://free.nchc.org.tw/osdn/storage/g/j/jo/joborun/repos/
+#Server = https://osdn.net/projects/joborun/storage/repos/
+
+
+##  Unfortunately SourcForge mirrors only partially work
+##  which is the same as not working.  The reason is that SF doesn't
+##  allow a : in their filesystem, being MS-Win oriented, and
+##  without knowing this when we uploaded, SF translates all : in
+##  the pkg name into an _ therefore pkgs like gtk3 or grub
+##  will not be found and you get a 404 errro trying to install them
+##  So we are back to square one.  Waiting for OSDN mirrors to
+##  become operational again.
+
--- a/jobo-mirror/pkg/jobo-mirror/etc/pacman.d/mirrorlist-jobo
+++ b/jobo-mirror/pkg/jobo-mirror/etc/pacman.d/mirrorlist-jobo
@ -0,0 +1,75 @@
+# Since OSDN is more down than up we are in search for new file/binary
+# repositories and mirrors.  Meanwhile, as a source repository
+# git.disroot.org has been 100% reliable, but the total amount of
+# files stores is limited.  This disroot repository only holds
+# the repository databases, not the packages themselves.  In lack
+# of another solution you will have to build any updates to your
+# system using our source, as explained in the wiki.
+
+# ###   pacman database only, no packages to download
+# Server = https://git.disroot.org/joborun-pkg/repos/raw/branch/main/
+
+
+##  Unfortunately the following mirrors only partially work
+##  which is the same as not working.  The reason is that SF doesn't
+##  allow a : in their filesystem, being MS-Win oriented, and
+##  without knowing this when we uploaded, SF translates all : in
+##  the pkg name into an _ therefore pkgs like gtk3 or grub
+##  will not be found and you get a 404 errro trying to install them
+##  So we are back to square one.  Waiting for OSDN mirrors to
+##  become operational again.
+
+
+##### Start Sourceforge mirrors #####
+# Sourceforge 1
+Server = http://downloads.sourceforge.net/joborun/r
+# Sourceforge 2
+Server = http://freefr.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 3
+Server = http://netcologne.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 4
+Server = http://newcontinuum.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 5
+Server = http://razaoinfo.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 6
+Server = http://cfhcable.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 7
+#Server = http://astuteinternet.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 8
+#Server = http://vorboss.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 9
+Server = http://versaweb.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 10
+Server = http://phoenixnap.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 11
+Server = http://netix.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 12
+Server = http://excellmedia.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 13
+Server = http://liquidtelecom.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 14
+#Server = https://jztkft.dl.sourceforge.net/project/joborun/r
+# Sourceforge 15
+#Server = http://sourceforge.mirror.iweb.com/project/joborun/r
+# Sourceforge 16
+Server = https://deac-riga.dl.sourceforge.net/project/joborun/r
+# Sourceforge 17
+Server = http://tenet.dl.sourceforge.net/project/joborun/r
+# Sourceforge 18
+Server = https://nchc.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 19
+#Server = https://kent.dl.sourceforge.net/sourceforge/joborun/r
+# Sourceforge 20
+Server = https://jaist.dl.sourceforge.net/sourceforge/joborun/r
+##### End Sourceforge mirrors #####
+
+##### Begin OSDN Mirrors
+# osdn mirrors once they become available for uploads again
+# DOWN since July 9th 2023
+
+#Server = https://osdn.net/projects/joborun/storage/repo/
+#Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/j/jo/joborun/repo/
+#Server = https://free.nchc.org.tw/osdn/storage/g/j/jo/joborun/repo/
+
+##### End OSDN mirrors #####
+
--- a/jobo-mirror/pkg/jobo-mirror/tmp/sf01/non-sf.sh
+++ b/jobo-mirror/pkg/jobo-mirror/tmp/sf01/non-sf.sh
@ -0,0 +1,31 @@
+#!/usr/bin/sh
+echo "this script downloads the current group of pkgs that sourceforge"
+echo "is unable to serve due to the : colon in the epoch characteristic."
+echo "it explodes the tarball in /tmp/sf01 then moves the packages to"
+echo "your standard pacman cache at /var/cache/pacman/pkg which fools"
+echo "pacman to not attempt a download from the mirror as the pkgs are"
+echo "already in the cache."
+echo "The benefit to all this is when you try to install one of them"
+echo "you will not get a 404 error from the mirror. A dirty hack but"
+echo "till we find a better solution and mirrors it will have to do."
+  mkdir -p /tmp/sf01
+  cd /tmp/sf01
+  if [ ! -f /tmp/sf01/non-sf-pkgs.tar.xz ];
+  then
+    echo "tar-ball not found, downloading now!" \
+      &&  wget http://downloads.sourceforge.net/joborun/r/non-sf-pkgs.tar.xz
+  else
+    echo "tar-ball already here, exploding and moving pkgs to cache"
+    continue
+  fi
+  echo "checking sums, the two lines must be identical, if not remove the tarball and restart"
+  echo "5d620b833b9dca4b6670723a8061cc57d14c4d3cb3760a9798a6bd691629bdb5  non-sf-pkgs.tar.xz"
+  sha256sum non-sf-pkgs.tar.xz
+  echo "enter to continue IF 2 lines identical"
+  read
+  tar -xf non-sf-pkgs.tar.xz 
+  mv -f *pkg.tar.*z /var/cache/pacman/pkg/ 
+  pwd
+  ls -lh /tmp/sf01   
+  echo "now you can resume with upgrades as normal % pacman -Suy "
+  echo "We apologize for the inconvenience but this is all we can do for now"
--- a/jobo-mirror/src/README.txt
+++ b/jobo-mirror/src/README.txt
@ -0,0 +1 @@
+/src/pkg/jobcore/jobo-mirror/README.txt
--- a/jobo-mirror/src/mirrorlist-jobo
+++ b/jobo-mirror/src/mirrorlist-jobo
@ -0,0 +1 @@
+/src/pkg/jobcore/jobo-mirror/mirrorlist-jobo
--- a/jobo-mirror/src/non-sf.sh
+++ b/jobo-mirror/src/non-sf.sh
@ -0,0 +1 @@
+/src/pkg/jobcore/jobo-mirror/non-sf.sh
--- a/mpfr/PKGBUILD
+++ b/mpfr/PKGBUILD
@ -8,7 +8,7 @@
 pkgname=mpfr
 _pkgver=4.2.0
 _patchver=12
-pkgrel=02
+pkgrel=03
 pkgver=${_pkgver}.p${_patchver}
 #pkgver=$_pkgver
 pkgdesc='Multiple-precision floating-point library'
@ -64,5 +64,5 @@ sha256sums=(06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993  #
 	a9099cee74188d5f522b7b3fca0097196c6dd38126f8f042d233010cbf92e8d0) #  patches.diff


-##  a34da07c792cfddbf6b425e0a51784ff9f158459f66c3a316356dc40f952e9d0  mpfr-4.2.0.p12-02-x86_64.pkg.tar.lz
+##  5b315801b7869fc7b36cfa00ad42e0f5fcefef91239fedcbdfc72f1869340344  mpfr-4.2.0.p12-03-x86_64.pkg.tar.lz

--- a/mpfr/PKGBUILD-arch
+++ b/mpfr/PKGBUILD-arch
@ -6,7 +6,7 @@
 pkgname=mpfr
 _pkgver=4.2.0
 _patchver=12
-pkgrel=2
+pkgrel=3
 pkgver=${_pkgver}.p${_patchver}
 #pkgver=$_pkgver
 pkgdesc='Multiple-precision floating-point library'
--- a/openssl-1.1/PKGBUILD
+++ b/openssl-1.1/PKGBUILD
@ -7,7 +7,7 @@

 pkgname=openssl-1.1
 _pkgname=openssl
-_ver=1.1.1u
+_ver=1.1.1v
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=01
@ -82,11 +82,14 @@ arch=(x86_64)
 license=('custom:BSD')

 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
-              '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
-              'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C')
+	'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
+	'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C'
+	'EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5')

-sha256sums=(e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6  # openssl-1.1.1u.tar.gz
-	7f564cada05f055c1534eae3fc7c19864eb2f6831cfcd91546e62476ba99e96e  # openssl-1.1.1u.tar.gz.asc
+sha256sums=(d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0  # openssl-1.1.1v.tar.gz
+	8f3fc7e6c7b685144373c8acdc2c9a64435076b4cfbcb4264293af8093cc5b5c  # openssl-1.1.1v.tar.gz.asc
            75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2) # ca-dir.patch

-##  9ed2e8055bf958a3423fe24096d111c246a937dfb217004215fa0792a87defa7  openssl-1.1-1.1.1.u-01-x86_64.pkg.tar.lz
+##  421a5e6fec289bda090c00cb2c1ed42fdc8843d6e43a4c8932279dd7caa448f9  openssl-1.1-1.1.1.v-01-x86_64.pkg.tar.lz
+
+
--- a/openssl-1.1/PKGBUILD-arch
+++ b/openssl-1.1/PKGBUILD-arch
@ -2,7 +2,7 @@

 pkgname=openssl-1.1
 _pkgname=openssl
-_ver=1.1.1u
+_ver=1.1.1v
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@ -15,12 +15,13 @@ provides=('libcrypto.so' 'libssl.so')
 makedepends=('perl')
 source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"{,.asc}
        'ca-dir.patch')
-sha256sums=('e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6'
+sha256sums=('d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0'
            'SKIP'
            '75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
              '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
-              'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C')
+              'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C'
+              'EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5')

 prepare() {
 	cd "$srcdir/$_pkgname-$_ver"
--- a/openssl-1.1/key
+++ b/openssl-1.1/key
@ -1,3 +1,4 @@
-gpg -v --recv-key D9C4D26D0E604491
-gpg --recv-keys  D5E9E43F7DF9EE8C
+gpg -v --recv-keys D9C4D26D0E604491
+gpg -v --recv-keys D5E9E43F7DF9EE8C
 gpg -v --recv-keys 527466A21CA79E6D
+gpg -v --recv-keys D894E2CE8B3D79F5
--- a/xz/PKGBUILD
+++ b/xz/PKGBUILD
@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=xz
-pkgver=5.4.3
+pkgver=5.4.4
 pkgrel=01
 pkgdesc='Library and command line tools for XZ and LZMA compressed files'
 url='https://tukaani.org/xz/'
@ -55,8 +55,8 @@ license=('GPL' 'LGPL' 'custom')
 validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620'  # Lasse Collin <lasse.collin@tukaani.org>
              '22D465F2B4C173803B20C6DE59FCF207FEA7F445') # Jia Tan <jiat0218@gmail.com>

-sha256sums=(1c382e0bc2e4e0af58398a903dd62fff7e510171d2de47a1ebe06d1528e9b7e9  # xz-5.4.3.tar.gz
-	177dcccf425a106fe1ac8f05f3c403069adf019fc917e523187df2042d01a2f0) # xz-5.4.3.tar.gz.sig
+sha256sums=(aae39544e254cfd27e942d35a048d592959bd7a79f9a624afb0498bb5613bdf8  # xz-5.4.4.tar.gz
+	c447becbf9315e4292ca298d85f952afcd83ed2c8af291994d16059edb78a13b) # xz-5.4.4.tar.gz.sig

-##  ae0459489d08b7321e6979a4f926df10744f188cf14416cf92ca6e2e5f2e08e1  xz-5.4.3-01-x86_64.pkg.tar.lz
+##  86fb762c1d56ad01001d5abf9c12cca9cfeb8b7e7fea5e753443002669c19290  xz-5.4.4-01-x86_64.pkg.tar.lz

--- a/xz/PKGBUILD-arch
+++ b/xz/PKGBUILD-arch
@ -2,7 +2,7 @@
 # Contributor: François Charette <firmicus@gmx.net>

 pkgname=xz
-pkgver=5.4.3
+pkgver=5.4.4
 pkgrel=1
 pkgdesc='Library and command line tools for XZ and LZMA compressed files'
 arch=('x86_64')
@ -13,9 +13,9 @@ provides=('liblzma.so')
 validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620'  # Lasse Collin <lasse.collin@tukaani.org>
              '22D465F2B4C173803B20C6DE59FCF207FEA7F445') # Jia Tan <jiat0218@gmail.com>
 source=("https://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-sha256sums=('1c382e0bc2e4e0af58398a903dd62fff7e510171d2de47a1ebe06d1528e9b7e9'
+sha256sums=('aae39544e254cfd27e942d35a048d592959bd7a79f9a624afb0498bb5613bdf8'
            'SKIP')
-sha512sums=('aff0fe166af6df4491a6f5df2372cab100b081452461a0e8c6fd65b72af3f250f16c64d9fb8fd309141e9b9ae4e41649f48687cc29e63dd82f27f2eab19b4023'
+sha512sums=('2e27d864c9f346e53afc549d7046385b5d35a749af15d84f69de14612657df2f0e2ce71d3be03d57adadf8fd28549ecf4ef1c214bdcd1f061b5a47239e0104e8'
            'SKIP')

 build() {
--- a/xz/deps
+++ b/xz/deps
@ -1,3 +1,2 @@


-
				`@ -0,0 +1 @@`
				`/src/pkg/jobcore/jobo-mirror/mirrorlist-jobo`